4 files changed, 106 insertions, 80 deletions

diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index b76dc03fc318..722d67d32961 100644
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -56,7 +56,7 @@
 #define SMP_NOP2
 #define SMP_NOP3
 #endif /* SMP */
-unsigned long __local_irq_save(void)
+unsigned long __raw_local_irq_save(void)
 {
         unsigned long retval;
         unsigned long tmp;
@@ -74,7 +74,7 @@ unsigned long __local_irq_save(void)
         return retval;
 }
 
-void local_irq_enable(void)
+void raw_local_irq_enable(void)
 {
         unsigned long tmp;
 
@@ -89,7 +89,7 @@ void local_irq_enable(void)
                 : "memory");
 }
 
-void local_irq_restore(unsigned long old_psr)
+void raw_local_irq_restore(unsigned long old_psr)
 {
         unsigned long tmp;
 
@@ -105,9 +105,9 @@ void local_irq_restore(unsigned long old_psr)
                 : "memory");
 }
 
-EXPORT_SYMBOL(__local_irq_save);
-EXPORT_SYMBOL(local_irq_enable);
-EXPORT_SYMBOL(local_irq_restore);
+EXPORT_SYMBOL(__raw_local_irq_save);
+EXPORT_SYMBOL(raw_local_irq_enable);
+EXPORT_SYMBOL(raw_local_irq_restore);
 
 /*
  * Dave Redman (djhr@tadpole.co.uk)
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c
index 36383f73d685..fb2caef79cec 100644
--- a/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
@@ -588,7 +588,10 @@ __setup("of_debug=", of_debug);
 int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
 {
         /* initialize common driver fields */
-        drv->driver.name = drv->name;
+        if (!drv->driver.name)
+                drv->driver.name = drv->name;
+        if (!drv->driver.owner)
+                drv->driver.owner = drv->owner;
         drv->driver.bus = bus;
 
         /* register with core */
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index 6a2513321620..4bf78a5e8e0f 100644
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -347,9 +347,11 @@ static struct of_device_id clock_match[] = {
 };
 
 static struct of_platform_driver clock_driver = {
-        .name           = "clock",
         .match_table    = clock_match,
         .probe          = clock_probe,
+        .driver         = {
+                .name   = "clock",
+        },
 };
 
 
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S
index 15109c156e83..a8b4200f9cc3 100644
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@@ -1,6 +1,7 @@
 /* ld script to make SparcLinux kernel */
 
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/page.h>
 
 OUTPUT_FORMAT("elf32-sparc", "elf32-sparc", "elf32-sparc")
 OUTPUT_ARCH(sparc)
@@ -8,84 +9,104 @@ ENTRY(_start)
 jiffies = jiffies_64 + 4;
 SECTIONS
 {
-  . = 0x10000 + SIZEOF_HEADERS;
-  .text 0xf0004000 :
-  {
-    _text = .;
-    TEXT_TEXT
-    SCHED_TEXT
-    LOCK_TEXT
-    *(.gnu.warning)
-  } =0
-  _etext = .;
-  PROVIDE (etext = .);
-  RODATA
-  .data    :
-  {
-    DATA_DATA
-    CONSTRUCTORS
-  }
-  .data1   : { *(.data1) }
-  _edata  =  .;
-  PROVIDE (edata = .);
-  __start___fixup = .;
-  .fixup   : { *(.fixup) }
-  __stop___fixup = .;
-  __start___ex_table = .;
-  __ex_table : { *(__ex_table) }
-  __stop___ex_table = .;
+        . = 0x10000 + SIZEOF_HEADERS;
+        .text 0xf0004000 :
+        {
+                _text = .;
+                TEXT_TEXT
+                SCHED_TEXT
+                LOCK_TEXT
+                *(.gnu.warning)
+        } = 0
+        _etext = .;
+        PROVIDE (etext = .);
+        RODATA
+        .data : {
+                DATA_DATA
+                CONSTRUCTORS
+        }
+        .data1 : {
+                *(.data1)
+        }
+        _edata = .;
+        PROVIDE (edata = .);
 
-  NOTES
+        .fixup : {
+                __start___fixup = .;
+                *(.fixup)
+                __stop___fixup = .;
+        }
+        __ex_table : {
+                __start___ex_table = .;
+                *(__ex_table)
+                __stop___ex_table = .;
+        }
 
-  . = ALIGN(4096);
-  __init_begin = .;
-  _sinittext = .;
-  .init.text : { 
-        *(.init.text)
-  }
-  _einittext = .;
-  __init_text_end = .;
-  .init.data : { *(.init.data) }
-  . = ALIGN(16);
-  __setup_start = .;
-  .init.setup : { *(.init.setup) }
-  __setup_end = .;
-  __initcall_start = .;
-  .initcall.init : {
-        INITCALLS
-  }
-  __initcall_end = .;
-  __con_initcall_start = .;
-  .con_initcall.init : { *(.con_initcall.init) }
-  __con_initcall_end = .;
-  SECURITY_INIT
+        NOTES
+
+        . = ALIGN(PAGE_SIZE);
+        __init_begin = .;
+        .init.text : {
+                _sinittext = .;
+                *(.init.text)
+                _einittext = .;
+        }
+        __init_text_end = .;
+        .init.data : {
+                *(.init.data)
+        }
+        . = ALIGN(16);
+        .init.setup : {
+                __setup_start = .;
+                *(.init.setup)
+                __setup_end = .;
+        }
+        .initcall.init : {
+                __initcall_start = .;
+                INITCALLS
+        __initcall_end = .;
+        }
+        .con_initcall.init : {
+                __con_initcall_start = .;
+                *(.con_initcall.init)
+                __con_initcall_end = .;
+        }
+        SECURITY_INIT
 
 #ifdef CONFIG_BLK_DEV_INITRD
-  . = ALIGN(4096);
-  __initramfs_start = .;
-  .init.ramfs : { *(.init.ramfs) }
-  __initramfs_end = .;
+        . = ALIGN(PAGE_SIZE);
+        .init.ramfs : {
+        __initramfs_start = .;
+                *(.init.ramfs)
+        __initramfs_end = .;
+        }
 #endif
 
-  PERCPU(4096)
-  . = ALIGN(4096);
-  __init_end = .;
-  . = ALIGN(32);
-  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
-
-  __bss_start = .;
-  .sbss      : { *(.sbss) *(.scommon) }
-  .bss       :
-  {
-   *(.dynbss)
-   *(.bss)
-   *(COMMON)
-  }
-  _end = . ;
-  PROVIDE (end = .);
-  /DISCARD/ : { *(.exit.text) *(.exit.data) *(.exitcall.exit) }
+        PERCPU(PAGE_SIZE)
+        . = ALIGN(PAGE_SIZE);
+        __init_end = .;
+        . = ALIGN(32);
+        .data.cacheline_aligned : {
+                *(.data.cacheline_aligned)
+        }
 
-  STABS_DEBUG
+        __bss_start = .;
+        .sbss : {
+                *(.sbss)
+                *(.scommon) }
+        .bss : {
+                *(.dynbss)
+                *(.bss)
+                *(COMMON)
+        }
+        _end = . ;
+        PROVIDE (end = .);
+        /DISCARD/ : {
+                *(.exit.text)
+                *(.exit.data)
+                *(.exitcall.exit)
+        }
 
-  DWARF_DEBUG
+        STABS_DEBUG
+        DWARF_DEBUG
 }