Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / x86 / xen / setup.c

diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index fd91568090f4fb5d1e9e0d9d3b2900efee5ae9e8..2341492bf7a056743097e06bfabd0b8c01f7436f 100644 (file)
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -38,7 +38,8 @@ char * __init xen_memory_setup(void)
        unsigned long max_pfn = xen_start_info->nr_pages;
 
        e820.nr_map = 0;
-       add_memory_region(0, PFN_PHYS(max_pfn), E820_RAM);
+       add_memory_region(0, LOWMEMSIZE(), E820_RAM);
+       add_memory_region(HIGH_MEMORY, PFN_PHYS(max_pfn)-HIGH_MEMORY, E820_RAM);
 
        return "Xen";
 }
@@ -60,10 +61,10 @@ static void xen_idle(void)
 /*
  * Set the bit indicating "nosegneg" library variants should be used.
  */
-static void fiddle_vdso(void)
+static void __init fiddle_vdso(void)
 {
-       extern char vsyscall_int80_start;
-       u32 *mask = VDSO32_SYMBOL(&vsyscall_int80_start, NOTE_MASK);
+       extern const char vdso32_default_start;
+       u32 *mask = VDSO32_SYMBOL(&vdso32_default_start, NOTE_MASK);
        *mask |= 1 << VDSO_NOTE_NONEGSEG_BIT;
 }