3 files changed, 52 insertions, 50 deletions

diff --git a/arch/mn10300/kernel/module.c b/arch/mn10300/kernel/module.c
index 4fa0e3648d8..6aea7fd7699 100644
--- a/arch/mn10300/kernel/module.c
+++ b/arch/mn10300/kernel/module.c
@@ -1,6 +1,6 @@
 /* MN10300 Kernel module helper routines
  *
- * Copyright (C) 2007, 2008 Red Hat, Inc. All Rights Reserved.
+ * Copyright (C) 2007, 2008, 2009 Red Hat, Inc. All Rights Reserved.
  * Written by Mark Salter (msalter@redhat.com)
  * - Derived from arch/i386/kernel/module.c
  *
@@ -103,10 +103,10 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
                        unsigned int relsec,
                        struct module *me)
 {
-        unsigned int i;
+        unsigned int i, sym_diff_seen = 0;
         Elf32_Rela *rel = (void *)sechdrs[relsec].sh_addr;
         Elf32_Sym *sym;
-        Elf32_Addr relocation;
+        Elf32_Addr relocation, sym_diff_val = 0;
         uint8_t *location;
         uint32_t value;
 
@@ -126,6 +126,22 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
                 /* this is the adjustment to be made */
                 relocation = sym->st_value + rel[i].r_addend;
 
+                if (sym_diff_seen) {
+                        switch (ELF32_R_TYPE(rel[i].r_info)) {
+                        case R_MN10300_32:
+                        case R_MN10300_24:
+                        case R_MN10300_16:
+                        case R_MN10300_8:
+                                relocation -= sym_diff_val;
+                                sym_diff_seen = 0;
+                                break;
+                        default:
+                                printk(KERN_ERR "module %s: Unexpected SYM_DIFF relocation: %u\n",
+                                       me->name, ELF32_R_TYPE(rel[i].r_info));
+                                return -ENOEXEC;
+                        }
+                }
+
                 switch (ELF32_R_TYPE(rel[i].r_info)) {
                         /* for the first four relocation types, we simply
                          * store the adjustment at the location given */
@@ -157,12 +173,29 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
                         *location = relocation - (uint32_t) location;
                         break;
 
+                case R_MN10300_SYM_DIFF:
+                        /* This is used to adjust the next reloc as required
+                         * by relaxation. */
+                        sym_diff_seen = 1;
+                        sym_diff_val = sym->st_value;
+                        break;
+
+                case R_MN10300_ALIGN:
+                        /* Just ignore the ALIGN relocs.
+                         * Only interesting if kernel performed relaxation. */
+                        continue;
+
                 default:
                         printk(KERN_ERR "module %s: Unknown relocation: %u\n",
                                me->name, ELF32_R_TYPE(rel[i].r_info));
                         return -ENOEXEC;
                 }
         }
+        if (sym_diff_seen) {
+                printk(KERN_ERR "module %s: Nothing follows SYM_DIFF relocation: %u\n",
+                                       me->name, ELF32_R_TYPE(rel[i].r_info));
+                return -ENOEXEC;
+        }
         return 0;
 }
 
diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c
index 234cf344cdc..892cce82867 100644
--- a/arch/mn10300/kernel/process.c
+++ b/arch/mn10300/kernel/process.c
@@ -281,9 +281,6 @@ asmlinkage long sys_execve(char __user *name,
         error = PTR_ERR(filename);
         if (!IS_ERR(filename)) {
                 error = do_execve(filename, argv, envp, __frame);
-                if (error == 0)
-                        current->ptrace &= ~PT_DTRACE;
-
                 putname(filename);
         }
 
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S
index 24de6b90f40..bcebcefb4ad 100644
--- a/arch/mn10300/kernel/vmlinux.lds.S
+++ b/arch/mn10300/kernel/vmlinux.lds.S
@@ -38,14 +38,10 @@ SECTIONS
 
   _etext = .;                   /* End of text section */
 
-  . = ALIGN(16);                /* Exception table */
-  __start___ex_table = .;
-  __ex_table : { *(__ex_table) }
-  __stop___ex_table = .;
-
+  EXCEPTION_TABLE(16)
   BUG_TABLE
 
-  RODATA
+  RO_DATA(PAGE_SIZE)
 
   /* writeable */
   .data : {                     /* Data */
@@ -53,27 +49,19 @@ SECTIONS
         CONSTRUCTORS
         }
 
-  . = ALIGN(PAGE_SIZE);
-  __nosave_begin = .;
-  .data_nosave : { *(.data.nosave) }
-  . = ALIGN(PAGE_SIZE);
-  __nosave_end = .;
-
-  . = ALIGN(PAGE_SIZE);
-  .data.page_aligned : { *(.data.idt) }
+  .data_nosave : { NOSAVE_DATA; }
 
-  . = ALIGN(32);
-  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
+  .data.page_aligned : { PAGE_ALIGNED_DATA(PAGE_SIZE); }
+  .data.cacheline_aligned : { CACHELINE_ALIGNED_DATA(32); }
 
   /* rarely changed data like cpu maps */
   . = ALIGN(32);
   .data.read_mostly : AT(ADDR(.data.read_mostly)) {
-        *(.data.read_mostly)
+        READ_MOSTLY_DATA(32);
         _edata = .;             /* End of data section */
   }
 
-  . = ALIGN(THREAD_SIZE);       /* init_task */
-  .data.init_task : { *(.data.init_task) }
+  .data.init_task : { INIT_TASK(THREAD_SIZE); }
 
   /* might get freed after init */
   . = ALIGN(PAGE_SIZE);
@@ -88,23 +76,18 @@ SECTIONS
   __init_begin = .;
   .init.text : {
         _sinittext = .;
-        *(.init.text)
+        INIT_TEXT;
         _einittext = .;
   }
-  .init.data : { *(.init.data) }
-  . = ALIGN(16);
-  __setup_start = .;
-  .setup.init : { KEEP(*(.init.setup)) }
-  __setup_end = .;
+  .init.data : { INIT_DATA; }
+  .setup.init : { INIT_SETUP(16); }
 
   __initcall_start = .;
   .initcall.init : {
         INITCALLS
   }
   __initcall_end = .;
-  __con_initcall_start = .;
-  .con_initcall.init : { *(.con_initcall.init) }
-  __con_initcall_end = .;
+  .con_initcall.init : { CON_INITCALL; }
 
   SECURITY_INIT
   . = ALIGN(4);
@@ -114,28 +97,17 @@ SECTIONS
  .altinstr_replacement : { *(.altinstr_replacement) }
   /* .exit.text is discard at runtime, not link time, to deal with references
      from .altinstructions and .eh_frame */
-  .exit.text : { *(.exit.text) }
-  .exit.data : { *(.exit.data) }
+        .exit.text : { EXIT_TEXT; }
+        .exit.data : { EXIT_DATA; }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-  . = ALIGN(PAGE_SIZE);
-  __initramfs_start = .;
-  .init.ramfs : { *(.init.ramfs) }
-  __initramfs_end = .;
-#endif
+  .init.ramfs : { INIT_RAM_FS; }
 
   PERCPU(32)
   . = ALIGN(PAGE_SIZE);
   __init_end = .;
   /* freed after init ends here */
 
-  __bss_start = .;              /* BSS */
-  .bss : {
-        *(.bss.page_aligned)
-        *(.bss)
-  }
-  . = ALIGN(4);
-  __bss_stop = .;
+  BSS(4)
 
   _end = . ;
 
@@ -145,7 +117,7 @@ SECTIONS
 
   /* Sections to be discarded */
   /DISCARD/ : {
-        *(.exitcall.exit)
+        EXIT_CALL
         }
 
   STABS_DEBUG