Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[linux-2.6.git] / arch / x86 / kernel / vmlinux.lds.S

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 624a2016198ef9317992069aaf676da19e5bd6b9..61682f0ac264853cabc8e3b72a8a8ddf1d387bc4 100644 (file)
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -305,6 +305,13 @@ SECTIONS
                __iommu_table_end = .;
        }
 
+       . = ALIGN(8);
+       .apicdrivers : AT(ADDR(.apicdrivers) - LOAD_OFFSET) {
+               __apicdrivers = .;
+               *(.apicdrivers);
+               __apicdrivers_end = .;
+       }
+
        . = ALIGN(8);
        /*
         * .exit.text is discard at runtime, not link time, to deal with
@@ -319,7 +326,7 @@ SECTIONS
        }
 
 #if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
-       PERCPU(INTERNODE_CACHE_BYTES, PAGE_SIZE)
+       PERCPU_SECTION(INTERNODE_CACHE_BYTES)
 #endif
 
        . = ALIGN(PAGE_SIZE);