Merge branch 'akpm' (patches from Andrew)

[cascardo/linux.git] / arch / parisc / kernel / vmlinux.lds.S

diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index 308f290..b37787d 100644 (file)
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -69,9 +69,11 @@ SECTIONS
        .text ALIGN(PAGE_SIZE) : {
                TEXT_TEXT
                SCHED_TEXT
+               CPUIDLE_TEXT
                LOCK_TEXT
                KPROBES_TEXT
                IRQENTRY_TEXT
+               SOFTIRQENTRY_TEXT
                *(.text.do_softirq)
                *(.text.sys_exit)
                *(.text.do_sigaltstack)
@@ -137,8 +139,6 @@ SECTIONS
        /* BSS */
        BSS_SECTION(PAGE_SIZE, PAGE_SIZE, PAGE_SIZE)
 
-       /* bootmap is allocated in setup_bootmem() directly behind bss. */
-
        . = ALIGN(HUGEPAGE_SIZE);
        _end = . ;