Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/sh/kernel/vmlinux.lds.S

1 files changed, 7 insertions, 10 deletions

diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 8ef8a14abc95..58da4070723d 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -37,12 +37,6 @@ jiffies = jiffies_64 + 4;
 #endif
 SECTIONS
 {
-        /* Sections to be discarded. */
-        /DISCARD/ : {
-        *(.exitcall.exit)
-        EXIT_DATA
-        }
-
         . = KERNELBASE;
 
 /*
@@ -245,10 +239,6 @@ SECTIONS
         }
 #endif
 
-        . = ALIGN(PAGE_SIZE);
-        _edata  =  .;
-        PROVIDE32 (edata = .);
-
         /* The initial task and kernel stack */
 #ifdef CONFIG_PPC32
         . = ALIGN(8192);
@@ -282,6 +272,10 @@ SECTIONS
                 __nosave_end = .;
         }
 
+        . = ALIGN(PAGE_SIZE);
+        _edata  =  .;
+        PROVIDE32 (edata = .);
+
 /*
  * And finally the bss
  */
@@ -298,4 +292,7 @@ SECTIONS
         . = ALIGN(PAGE_SIZE);
         _end = . ;
         PROVIDE32 (end = .);
+
+        /* Sections to be discarded. */
+        DISCARDS
 }