---

yaml
---
r: 68639
b: refs/heads/master
c: 34627f0
h: refs/heads/master
i:
  68637: 173930a
  68635: 975c718
  68631: f1024d0
  68623: 9a81308
  68607: 55b50b9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbe619b162121577bc1e8ed4384dfb85f19e43d8
+refs/heads/master: 34627f0e768de6af95e3523c29a16cbb95ce3197

trunk/Documentation/sparc/sbus_drivers.txt

@@ -67,12 +67,10 @@ probe in an SBUS driver under Linux:
 	MODULE_DEVICE_TABLE(of, mydevice_match);
 
 	static struct of_platform_driver mydevice_driver = {
+		.name		= "mydevice",
 		.match_table	= mydevice_match,
 		.probe		= mydevice_probe,
 		.remove		= __devexit_p(mydevice_remove),
-		.driver		= {
-			.name		= "mydevice",
-		},
 	};
 
 	static int __init mydevice_init(void)

trunk/arch/powerpc/platforms/52xx/lite5200.c

@@ -158,6 +158,18 @@ static void __init lite5200_setup_arch(void)
 		of_node_put(np);
 	}
 #endif
+
+#ifdef CONFIG_BLK_DEV_INITRD
+	if (initrd_start)
+		ROOT_DEV = Root_RAM0;
+	else
+#endif
+#ifdef  CONFIG_ROOT_NFS
+		ROOT_DEV = Root_NFS;
+#else
+		ROOT_DEV = Root_HDA1;
+#endif
+
 }
 
 /*

trunk/arch/sparc/Kconfig.debug

@@ -1,9 +1,5 @@
 menu "Kernel hacking"
 
-config TRACE_IRQFLAGS_SUPPORT
-	bool
-	default y
-
 source "lib/Kconfig.debug"
 
 config DEBUG_STACK_USAGE

trunk/arch/sparc/kernel/irq.c

@@ -56,7 +56,7 @@
 #define SMP_NOP2
 #define SMP_NOP3
 #endif /* SMP */
-unsigned long __raw_local_irq_save(void)
+unsigned long __local_irq_save(void)
 {
 	unsigned long retval;
 	unsigned long tmp;
@@ -74,7 +74,7 @@ unsigned long __raw_local_irq_save(void)
 	return retval;
 }
 
-void raw_local_irq_enable(void)
+void local_irq_enable(void)
 {
 	unsigned long tmp;
 
@@ -89,7 +89,7 @@ void raw_local_irq_enable(void)
 		: "memory");
 }
 
-void raw_local_irq_restore(unsigned long old_psr)
+void local_irq_restore(unsigned long old_psr)
 {
 	unsigned long tmp;
 
@@ -105,9 +105,9 @@ void raw_local_irq_restore(unsigned long old_psr)
 		: "memory");
 }
 
-EXPORT_SYMBOL(__raw_local_irq_save);
-EXPORT_SYMBOL(raw_local_irq_enable);
-EXPORT_SYMBOL(raw_local_irq_restore);
+EXPORT_SYMBOL(__local_irq_save);
+EXPORT_SYMBOL(local_irq_enable);
+EXPORT_SYMBOL(local_irq_restore);
 
 /*
  * Dave Redman (djhr@tadpole.co.uk)

trunk/arch/sparc/kernel/of_device.c

@@ -588,10 +588,7 @@ __setup("of_debug=", of_debug);
 int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
 {
 	/* initialize common driver fields */
-	if (!drv->driver.name)
-		drv->driver.name = drv->name;
-	if (!drv->driver.owner)
-		drv->driver.owner = drv->owner;
+	drv->driver.name = drv->name;
 	drv->driver.bus = bus;
 
 	/* register with core */

trunk/arch/sparc/kernel/time.c

@@ -347,11 +347,9 @@ 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",
-	},
 };
 
 

trunk/arch/sparc/kernel/vmlinux.lds.S

@@ -1,112 +1,91 @@
 /* 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)
 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 = .);
+  . = 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 = .;
 
-	.fixup : {
-		__start___fixup = .;
-		*(.fixup)
-		__stop___fixup = .;
-	}
-	__ex_table : {
-		__start___ex_table = .;
-		*(__ex_table)
-		__stop___ex_table = .;
-	}
+  NOTES
 
-	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
+  . = 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
 
 #ifdef CONFIG_BLK_DEV_INITRD
-	. = ALIGN(PAGE_SIZE);
-	.init.ramfs : {
-	__initramfs_start = .;
-		*(.init.ramfs)
-	__initramfs_end = .;
-	}
+  . = ALIGN(4096);
+  __initramfs_start = .;
+  .init.ramfs : { *(.init.ramfs) }
+  __initramfs_end = .;
 #endif
 
-	PERCPU(PAGE_SIZE)
-	. = ALIGN(PAGE_SIZE);
-	__init_end = .;
-	. = ALIGN(32);
-	.data.cacheline_aligned : {
-		*(.data.cacheline_aligned)
-	}
+  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) }
 
-	__bss_start = .;
-	.sbss : {
-		*(.sbss)
-		*(.scommon) }
-	.bss : {
-		*(.dynbss)
-		*(.bss)
-		*(COMMON)
-	}
-	_end = . ;
-	PROVIDE (end = .);
-	/DISCARD/ : {
-		*(.exit.text)
-		*(.exit.data)
-		*(.exitcall.exit)
-	}
+  STABS_DEBUG
 
-	STABS_DEBUG
-	DWARF_DEBUG
+  DWARF_DEBUG
 }