10 files changed, 27 insertions, 34 deletions

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 3cfb8be3ff6d..56c34e7fd4ee 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -55,6 +55,10 @@ config NR_CPUS
         depends on SMP
         default "32"
 
+config SPARC
+        bool
+        default y
+
 # Identify this as a Sparc32 build
 config SPARC32
         bool
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index dea48f6cff38..4cdbb2d59ed0 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -34,7 +34,7 @@ libs-y += arch/sparc/prom/ arch/sparc/lib/
 # Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-)
 INIT_Y          := $(patsubst %/, %/built-in.o, $(init-y))
 CORE_Y          := $(core-y)
-CORE_Y          += kernel/ mm/ fs/ ipc/ security/ crypto/
+CORE_Y          += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
 CORE_Y          := $(patsubst %/, %/built-in.o, $(CORE_Y))
 DRIVERS_Y       := $(patsubst %/, %/built-in.o, $(drivers-y))
 NET_Y           := $(patsubst %/, %/built-in.o, $(net-y))
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c
index 1754192c69d0..5c3529ceb5d6 100644
--- a/arch/sparc/kernel/ebus.c
+++ b/arch/sparc/kernel/ebus.c
@@ -22,7 +22,7 @@
 #include <asm/oplib.h>
 #include <asm/bpp.h>
 
-struct linux_ebus *ebus_chain = 0;
+struct linux_ebus *ebus_chain = NULL;
 
 /* We are together with pcic.c under CONFIG_PCI. */
 extern unsigned int pcic_pin_to_irq(unsigned int, char *name);
@@ -46,7 +46,7 @@ static struct ebus_device_irq je1_1[] = {
         { "SUNW,CS4231",         0 },
         { "parallel",            0 },
         { "se",                  2 },
-        { 0, 0 }
+        { NULL, 0 }
 };
 
 /*
@@ -55,7 +55,7 @@ static struct ebus_device_irq je1_1[] = {
  */
 static struct ebus_system_entry ebus_blacklist[] = {
         { "SUNW,JavaEngine1", je1_1 },
-        { 0, 0 }
+        { NULL, NULL }
 };
 
 static struct ebus_device_irq *ebus_blackp = NULL;
@@ -233,7 +233,7 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev)
                         ebus_alloc(sizeof(struct linux_ebus_child));
 
                 child = dev->children;
-                child->next = 0;
+                child->next = NULL;
                 child->parent = dev;
                 child->bus = dev->bus;
                 fill_ebus_child(node, &regs[0], child);
@@ -243,7 +243,7 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev)
                                 ebus_alloc(sizeof(struct linux_ebus_child));
 
                         child = child->next;
-                        child->next = 0;
+                        child->next = NULL;
                         child->parent = dev;
                         child->bus = dev->bus;
                         fill_ebus_child(node, &regs[0], child);
@@ -275,7 +275,7 @@ void __init ebus_init(void)
                 }
         }
 
-        pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, 0);
+        pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, NULL);
         if (!pdev) {
                 return;
         }
@@ -284,7 +284,7 @@ void __init ebus_init(void)
 
         ebus_chain = ebus = (struct linux_ebus *)
                         ebus_alloc(sizeof(struct linux_ebus));
-        ebus->next = 0;
+        ebus->next = NULL;
 
         while (ebusnd) {
 
@@ -325,8 +325,8 @@ void __init ebus_init(void)
                                 ebus_alloc(sizeof(struct linux_ebus_device));
 
                 dev = ebus->devices;
-                dev->next = 0;
-                dev->children = 0;
+                dev->next = NULL;
+                dev->children = NULL;
                 dev->bus = ebus;
                 fill_ebus_device(nd, dev);
 
@@ -335,8 +335,8 @@ void __init ebus_init(void)
                                 ebus_alloc(sizeof(struct linux_ebus_device));
 
                         dev = dev->next;
-                        dev->next = 0;
-                        dev->children = 0;
+                        dev->next = NULL;
+                        dev->children = NULL;
                         dev->bus = ebus;
                         fill_ebus_device(nd, dev);
                 }
@@ -353,7 +353,7 @@ void __init ebus_init(void)
                 ebus->next = (struct linux_ebus *)
                         ebus_alloc(sizeof(struct linux_ebus));
                 ebus = ebus->next;
-                ebus->next = 0;
+                ebus->next = NULL;
                 ++num_ebus;
         }
         if (pdev)
diff --git a/arch/sparc/kernel/led.c b/arch/sparc/kernel/led.c
index 2a3afca453c9..313d1620ae8e 100644
--- a/arch/sparc/kernel/led.c
+++ b/arch/sparc/kernel/led.c
@@ -55,7 +55,7 @@ static int led_read_proc(char *buf, char **start, off_t offset, int count,
         return len;
 }
 
-static int led_write_proc(struct file *file, const char *buffer,
+static int led_write_proc(struct file *file, const char __user *buffer,
                           unsigned long count, void *data)
 {
         char *buf = NULL;
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index cccfc12802ed..42002b742deb 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -161,7 +161,7 @@ static struct pcic_sn2list pcic_known_sysnames[] = {
 static int pcic0_up;
 static struct linux_pcic pcic0;
 
-void * __iomem pcic_regs;
+void __iomem *pcic_regs;
 volatile int pcic_speculative;
 volatile int pcic_trapped;
 
diff --git a/arch/sparc/kernel/sys_sunos.c b/arch/sparc/kernel/sys_sunos.c
index 81c894acd0db..d07ae02101ad 100644
--- a/arch/sparc/kernel/sys_sunos.c
+++ b/arch/sparc/kernel/sys_sunos.c
@@ -894,7 +894,7 @@ asmlinkage long sunos_sysconf (int name)
                 ret = ARG_MAX;
                 break;
         case _SC_CHILD_MAX:
-                ret = CHILD_MAX;
+                ret = -1; /* no limit */
                 break;
         case _SC_CLK_TCK:
                 ret = HZ;
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index 24814d58f9e1..7dadcdb4ca42 100644
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -49,7 +49,7 @@ DEFINE_SPINLOCK(rtc_lock);
 enum sparc_clock_type sp_clock_typ;
 DEFINE_SPINLOCK(mostek_lock);
 void __iomem *mstk48t02_regs = NULL;
-static struct mostek48t08 *mstk48t08_regs = NULL;
+static struct mostek48t08 __iomem *mstk48t08_regs = NULL;
 static int set_rtc_mmss(unsigned long);
 static int sbus_do_settimeofday(struct timespec *tv);
 
@@ -342,7 +342,7 @@ static __inline__ void clock_probe(void)
                 /* XXX r/o attribute is somewhere in r.flags */
                 r.flags = clk_reg[0].which_io;
                 r.start = clk_reg[0].phys_addr;
-                mstk48t08_regs = (struct mostek48t08 *) sbus_ioremap(&r, 0,
+                mstk48t08_regs = sbus_ioremap(&r, 0,
                     sizeof(struct mostek48t08), "mk48t08");
 
                 mstk48t02_regs = &mstk48t08_regs->regs;
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S
index 38938d2e63aa..346c19a949fd 100644
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@@ -85,19 +85,9 @@ SECTIONS
   }
   _end = . ;
   PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-  .debug          0 : { *(.debug) }
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  .line           0 : { *(.line) }
   /DISCARD/ : { *(.exit.text) *(.exit.data) *(.exitcall.exit) }
+
+  STABS_DEBUG
+
+  DWARF_DEBUG
 }
diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c
index cb3cf0f22822..de84f8534bac 100644
--- a/arch/sparc/lib/atomic32.c
+++ b/arch/sparc/lib/atomic32.c
@@ -66,7 +66,6 @@ int atomic_add_unless(atomic_t *v, int a, int u)
         return ret != u;
 }
 
-static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
 /* Atomic operations are already serializing */
 void atomic_set(atomic_t *v, int i)
 {
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index 1d560390e282..731f19603cad 100644
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@@ -497,7 +497,7 @@ static void __init sun4c_probe_mmu(void)
         patch_kernel_fault_handler();
 }
 
-volatile unsigned long *sun4c_memerr_reg = NULL;
+volatile unsigned long __iomem *sun4c_memerr_reg = NULL;
 
 void __init sun4c_probe_memerr_reg(void)
 {