debuggers.hg

view xen/arch/ia64/patch/linux-2.6.11/bootmem.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 bootmem.h | 2 ++
2 1 files changed, 2 insertions(+)
4 Index: linux-2.6.11/include/linux/bootmem.h
5 ===================================================================
6 --- linux-2.6.11.orig/include/linux/bootmem.h 2005-03-02 01:38:25.000000000 -0600
7 +++ linux-2.6.11/include/linux/bootmem.h 2005-03-19 12:39:36.915887729 -0600
8 @@ -41,7 +41,9 @@ extern unsigned long __init init_bootmem
9 extern void __init free_bootmem (unsigned long addr, unsigned long size);
10 extern void * __init __alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal);
11 #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
12 +#ifndef XEN
13 extern void __init reserve_bootmem (unsigned long addr, unsigned long size);
14 +#endif
15 #define alloc_bootmem(x) \
16 __alloc_bootmem((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
17 #define alloc_bootmem_low(x) \