debuggers.hg

view xen/arch/ia64/patch/linux-2.6.11/mmzone.h @ 4619:5b9e241131fb

bitkeeper revision 1.1329 (42661815u5WPq8d5f4_axi2xWheybA)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xeno-unstable-ia64.bk
author kaf24@firebug.cl.cam.ac.uk
date Wed Apr 20 08:51:33 2005 +0000 (2005-04-20)
parents 58efb3448933
children
line source
1 mmzone.h | 4 ++++
2 1 files changed, 4 insertions(+)
4 Index: linux-2.6.11/include/linux/mmzone.h
5 ===================================================================
6 --- linux-2.6.11.orig/include/linux/mmzone.h 2005-03-02 01:38:10.000000000 -0600
7 +++ linux-2.6.11/include/linux/mmzone.h 2005-03-19 13:49:30.427573139 -0600
8 @@ -209,7 +209,11 @@ struct zone {
9 * rarely used fields:
10 */
11 char *name;
12 +#ifdef XEN
13 +};
14 +#else
15 } ____cacheline_maxaligned_in_smp;
16 +#endif
19 /*