Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: (30 commits)
  sparc: Fix minor SPARC32 compile error
  sparc: Remove reg*.h from Kbuild
  sparc: Clean arch-specific code in prom_common.c
  sparc: Kill asm/reg*.h
  sparc: Use 64BIT config entry
  MAINTAINERS: update sparc maintainer
  sparc: unify ipcbuf.h
  sparc: Update 64-bit defconfig.
  sparc: remove NO_PROC_ID - it is no longer used
  sparc: drop get_tbr() in traps.h
  sparc: fix warning in userspace header traps.h
  sparc: fix warnings in userspace header byteorder.h
  sparc: fix warning in userspace header jsflash.h
  sparc: unify openprom.h
  sparc64: delete unused linux_prom64_ranges from openprom_64.h
  sparc: prepare openprom for unification
  sparc: remove linux_prom_pci_assigned_addresses from openprom_32.h
  sparc: remove ebus definitions from openprom*.h
  sparc: unify siginfo.h
  sparc: unify ptrace.h
  ...

10 files changed, 38 insertions, 47 deletions

diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c
index f3488c45d57a..1eff942fe22f 100644
--- a/arch/sparc/kernel/irq_32.c
+++ b/arch/sparc/kernel/irq_32.c
@@ -669,7 +669,9 @@ void __init init_IRQ(void)
         btfixup();
 }
 
+#ifdef CONFIG_PROC_FS
 void init_irq_proc(void)
 {
         /* For now, nothing... */
 }
+#endif /* CONFIG_PROC_FS */
diff --git a/arch/sparc/kernel/kgdb_32.c b/arch/sparc/kernel/kgdb_32.c
index 757805ce02ee..04df4edc0073 100644
--- a/arch/sparc/kernel/kgdb_32.c
+++ b/arch/sparc/kernel/kgdb_32.c
@@ -14,14 +14,14 @@ extern unsigned long trapbase;
 
 void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)
 {
-        struct reg_window *win;
+        struct reg_window32 *win;
         int i;
 
         gdb_regs[GDB_G0] = 0;
         for (i = 0; i < 15; i++)
                 gdb_regs[GDB_G1 + i] = regs->u_regs[UREG_G1 + i];
 
-        win = (struct reg_window *) regs->u_regs[UREG_FP];
+        win = (struct reg_window32 *) regs->u_regs[UREG_FP];
         for (i = 0; i < 8; i++)
                 gdb_regs[GDB_L0 + i] = win->locals[i];
         for (i = 0; i < 8; i++)
@@ -43,7 +43,7 @@ void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)
 void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)
 {
         struct thread_info *t = task_thread_info(p);
-        struct reg_window *win;
+        struct reg_window32 *win;
         int i;
 
         for (i = GDB_G0; i < GDB_G6; i++)
@@ -55,7 +55,7 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)
         gdb_regs[GDB_SP] = t->ksp;
         gdb_regs[GDB_O7] = 0;
 
-        win = (struct reg_window *) t->ksp;
+        win = (struct reg_window32 *) t->ksp;
         for (i = 0; i < 8; i++)
                 gdb_regs[GDB_L0 + i] = win->locals[i];
         for (i = 0; i < 8; i++)
@@ -77,7 +77,7 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)
 
 void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs)
 {
-        struct reg_window *win;
+        struct reg_window32 *win;
         int i;
 
         for (i = 0; i < 15; i++)
@@ -96,7 +96,7 @@ void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs)
         regs->npc = gdb_regs[GDB_NPC];
         regs->y = gdb_regs[GDB_Y];
 
-        win = (struct reg_window *) regs->u_regs[UREG_FP];
+        win = (struct reg_window32 *) regs->u_regs[UREG_FP];
         for (i = 0; i < 8; i++)
                 win->locals[i] = gdb_regs[GDB_L0 + i];
         for (i = 0; i < 8; i++)
diff --git a/arch/sparc/kernel/muldiv.c b/arch/sparc/kernel/muldiv.c
index ba960c02bb55..6ce1021d487c 100644
--- a/arch/sparc/kernel/muldiv.c
+++ b/arch/sparc/kernel/muldiv.c
@@ -60,7 +60,7 @@ static inline void maybe_flush_windows(unsigned int rs1, unsigned int rs2,
 }
 
 #define fetch_reg(reg, regs) ({                                         \
-        struct reg_window __user *win;                                  \
+        struct reg_window32 __user *win;                                        \
         register unsigned long ret;                                     \
                                                                         \
         if (!(reg)) ret = 0;                                            \
@@ -68,7 +68,7 @@ static inline void maybe_flush_windows(unsigned int rs1, unsigned int rs2,
                 ret = regs->u_regs[(reg)];                              \
         } else {                                                        \
                 /* Ho hum, the slightly complicated case. */            \
-                win = (struct reg_window __user *)regs->u_regs[UREG_FP];\
+                win = (struct reg_window32 __user *)regs->u_regs[UREG_FP];\
                 if (get_user (ret, &win->locals[(reg) - 16])) return -1;\
         }                                                               \
         ret;                                                            \
@@ -77,7 +77,7 @@ static inline void maybe_flush_windows(unsigned int rs1, unsigned int rs2,
 static inline int
 store_reg(unsigned int result, unsigned int reg, struct pt_regs *regs)
 {
-        struct reg_window __user *win;
+        struct reg_window32 __user *win;
 
         if (!reg)
                 return 0;
@@ -86,7 +86,7 @@ store_reg(unsigned int result, unsigned int reg, struct pt_regs *regs)
                 return 0;
         } else {
                 /* need to use put_user() in this case: */
-                win = (struct reg_window __user *) regs->u_regs[UREG_FP];
+                win = (struct reg_window32 __user *) regs->u_regs[UREG_FP];
                 return (put_user(result, &win->locals[reg - 16]));
         }
 }
diff --git a/arch/sparc/kernel/pci_psycho.c b/arch/sparc/kernel/pci_psycho.c
index dfb3ec892987..3b34344082ef 100644
--- a/arch/sparc/kernel/pci_psycho.c
+++ b/arch/sparc/kernel/pci_psycho.c
@@ -307,10 +307,7 @@ static void psycho_register_error_handlers(struct pci_pbm_info *pbm)
 
         /* We really mean to ignore the return result here.  Two
          * PCI controller share the same interrupt numbers and
-         * drive the same front-end hardware.  Whichever of the
-         * two get in here first will register the IRQ handler
-         * the second will just error out since we do not pass in
-         * IRQF_SHARED.
+         * drive the same front-end hardware.
          */
         err = request_irq(op->irqs[1], psycho_ue_intr, IRQF_SHARED,
                           "PSYCHO_UE", pbm);
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
index 69d9315f4a93..5a8d8ced33da 100644
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -180,13 +180,13 @@ static DEFINE_SPINLOCK(sparc_backtrace_lock);
 
 void __show_backtrace(unsigned long fp)
 {
-        struct reg_window *rw;
+        struct reg_window32 *rw;
         unsigned long flags;
         int cpu = smp_processor_id();
 
         spin_lock_irqsave(&sparc_backtrace_lock, flags);
 
-        rw = (struct reg_window *)fp;
+        rw = (struct reg_window32 *)fp;
         while(rw && (((unsigned long) rw) >= PAGE_OFFSET) &&
             !(((unsigned long) rw) & 0x7)) {
                 printk("CPU[%d]: ARGS[%08lx,%08lx,%08lx,%08lx,%08lx,%08lx] "
@@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
                        rw->ins[6],
                        rw->ins[7]);
                 printk("%pS\n", (void *) rw->ins[7]);
-                rw = (struct reg_window *) rw->ins[6];
+                rw = (struct reg_window32 *) rw->ins[6];
         }
         spin_unlock_irqrestore(&sparc_backtrace_lock, flags);
 }
@@ -258,7 +258,7 @@ void show_stackframe(struct sparc_stackf *sf)
 
 void show_regs(struct pt_regs *r)
 {
-        struct reg_window *rw = (struct reg_window *) r->u_regs[14];
+        struct reg_window32 *rw = (struct reg_window32 *) r->u_regs[14];
 
         printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx    %s\n",
                r->psr, r->pc, r->npc, r->y, print_tainted());
@@ -287,7 +287,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
 {
         unsigned long pc, fp;
         unsigned long task_base;
-        struct reg_window *rw;
+        struct reg_window32 *rw;
         int count = 0;
 
         if (tsk != NULL)
@@ -301,7 +301,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
                 if (fp < (task_base + sizeof(struct thread_info)) ||
                     fp >= (task_base + (PAGE_SIZE << 1)))
                         break;
-                rw = (struct reg_window *) fp;
+                rw = (struct reg_window32 *) fp;
                 pc = rw->ins[7];
                 printk("[%08lx : ", pc);
                 printk("%pS ] ", (void *) pc);
@@ -679,7 +679,7 @@ unsigned long get_wchan(struct task_struct *task)
         unsigned long pc, fp, bias = 0;
         unsigned long task_base = (unsigned long) task;
         unsigned long ret = 0;
-        struct reg_window *rw;
+        struct reg_window32 *rw;
         int count = 0;
 
         if (!task || task == current ||
@@ -692,7 +692,7 @@ unsigned long get_wchan(struct task_struct *task)
                 if (fp < (task_base + sizeof(struct thread_info)) ||
                     fp >= (task_base + (2 * PAGE_SIZE)))
                         break;
-                rw = (struct reg_window *) fp;
+                rw = (struct reg_window32 *) fp;
                 pc = rw->ins[7];
                 if (!in_sched_functions(pc)) {
                         ret = pc;
diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
index 4e9af593db49..ff7b591c8946 100644
--- a/arch/sparc/kernel/prom_common.c
+++ b/arch/sparc/kernel/prom_common.c
@@ -155,20 +155,12 @@ static struct property * __init build_one_prop(phandle node, char *prev,
                 p->value = prom_early_alloc(special_len);
                 memcpy(p->value, special_val, special_len);
         } else {
-#ifdef CONFIG_SPARC32
-                if (prev == NULL) {
-                        name = prom_firstprop(node, NULL);
-                } else {
-                        name = prom_nextprop(node, prev, NULL);
-                }
-#else
                 if (prev == NULL) {
-                        prom_firstprop(node, p->name);
+                        name = prom_firstprop(node, p->name);
                 } else {
-                        prom_nextprop(node, prev, p->name);
+                        name = prom_nextprop(node, prev, p->name);
                 }
-                name = p->name;
-#endif
+
                 if (strlen(name) == 0) {
                         tmp = p;
                         return NULL;
diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c
index c94f91c8b6e0..181d069a2d44 100644
--- a/arch/sparc/kernel/signal_32.c
+++ b/arch/sparc/kernel/signal_32.c
@@ -34,7 +34,7 @@ extern void fpload(unsigned long *fpregs, unsigned long *fsr);
 
 struct signal_frame {
         struct sparc_stackf     ss;
-        __siginfo_t             info;
+        __siginfo32_t           info;
         __siginfo_fpu_t __user  *fpu_save;
         unsigned long           insns[2] __attribute__ ((aligned (8)));
         unsigned int            extramask[_NSIG_WORDS - 1];
@@ -351,7 +351,7 @@ static void setup_frame(struct k_sigaction *ka, struct pt_regs *regs,
         err |= __copy_to_user(sf->extramask, &oldset->sig[1],
                               (_NSIG_WORDS - 1) * sizeof(unsigned int));
         err |= __copy_to_user(sf, (char *) regs->u_regs[UREG_FP],
-                              sizeof(struct reg_window));
+                              sizeof(struct reg_window32));
         if (err)
                 goto sigsegv;
         
@@ -433,7 +433,7 @@ static void setup_rt_frame(struct k_sigaction *ka, struct pt_regs *regs,
         err |= __put_user(current->sas_ss_size, &sf->stack.ss_size);
         
         err |= __copy_to_user(sf, (char *) regs->u_regs[UREG_FP],
-                              sizeof(struct reg_window));       
+                              sizeof(struct reg_window32));
 
         err |= copy_siginfo_to_user(&sf->info, info);
 
diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
index 716f3946c494..213645be6e92 100644
--- a/arch/sparc/kernel/traps_32.c
+++ b/arch/sparc/kernel/traps_32.c
@@ -67,7 +67,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
         __RESTORE; __RESTORE; __RESTORE; __RESTORE;
 
         {
-                struct reg_window *rw = (struct reg_window *)regs->u_regs[UREG_FP];
+                struct reg_window32 *rw = (struct reg_window32 *)regs->u_regs[UREG_FP];
 
                 /* Stop the back trace when we hit userland or we
                  * find some badly aligned kernel stack. Set an upper
@@ -79,7 +79,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
                       !(((unsigned long) rw) & 0x7)) {
                         printk("Caller[%08lx]: %pS\n", rw->ins[7],
                                (void *) rw->ins[7]);
-                        rw = (struct reg_window *)rw->ins[6];
+                        rw = (struct reg_window32 *)rw->ins[6];
                 }
         }
         printk("Instruction DUMP:");
diff --git a/arch/sparc/kernel/unaligned_32.c b/arch/sparc/kernel/unaligned_32.c
index c2a28c5ad650..6b1e6cde6fff 100644
--- a/arch/sparc/kernel/unaligned_32.c
+++ b/arch/sparc/kernel/unaligned_32.c
@@ -97,26 +97,26 @@ static inline int sign_extend_imm13(int imm)
 
 static inline unsigned long fetch_reg(unsigned int reg, struct pt_regs *regs)
 {
-        struct reg_window *win;
+        struct reg_window32 *win;
 
         if(reg < 16)
                 return (!reg ? 0 : regs->u_regs[reg]);
 
         /* Ho hum, the slightly complicated case. */
-        win = (struct reg_window *) regs->u_regs[UREG_FP];
+        win = (struct reg_window32 *) regs->u_regs[UREG_FP];
         return win->locals[reg - 16]; /* yes, I know what this does... */
 }
 
 static inline unsigned long safe_fetch_reg(unsigned int reg, struct pt_regs *regs)
 {
-        struct reg_window __user *win;
+        struct reg_window32 __user *win;
         unsigned long ret;
 
         if (reg < 16)
                 return (!reg ? 0 : regs->u_regs[reg]);
 
         /* Ho hum, the slightly complicated case. */
-        win = (struct reg_window __user *) regs->u_regs[UREG_FP];
+        win = (struct reg_window32 __user *) regs->u_regs[UREG_FP];
 
         if ((unsigned long)win & 3)
                 return -1;
@@ -129,11 +129,11 @@ static inline unsigned long safe_fetch_reg(unsigned int reg, struct pt_regs *reg
 
 static inline unsigned long *fetch_reg_addr(unsigned int reg, struct pt_regs *regs)
 {
-        struct reg_window *win;
+        struct reg_window32 *win;
 
         if(reg < 16)
                 return &regs->u_regs[reg];
-        win = (struct reg_window *) regs->u_regs[UREG_FP];
+        win = (struct reg_window32 *) regs->u_regs[UREG_FP];
         return &win->locals[reg - 16];
 }
 
diff --git a/arch/sparc/kernel/windows.c b/arch/sparc/kernel/windows.c
index 9cc93eaa4abf..f24d298bda29 100644
--- a/arch/sparc/kernel/windows.c
+++ b/arch/sparc/kernel/windows.c
@@ -42,7 +42,7 @@ static inline void shift_window_buffer(int first_win, int last_win, struct threa
 
         for(i = first_win; i < last_win; i++) {
                 tp->rwbuf_stkptrs[i] = tp->rwbuf_stkptrs[i+1];
-                memcpy(&tp->reg_window[i], &tp->reg_window[i+1], sizeof(struct reg_window));
+                memcpy(&tp->reg_window[i], &tp->reg_window[i+1], sizeof(struct reg_window32));
         }
 }
 
@@ -70,7 +70,7 @@ void synchronize_user_stack(void)
 
                 /* Ok, let it rip. */
                 if (copy_to_user((char __user *) sp, &tp->reg_window[window],
-                                 sizeof(struct reg_window)))
+                                 sizeof(struct reg_window32)))
                         continue;
 
                 shift_window_buffer(window, tp->w_saved - 1, tp);
@@ -119,7 +119,7 @@ void try_to_clear_window_buffer(struct pt_regs *regs, int who)
 
                 if ((sp & 7) ||
                     copy_to_user((char __user *) sp, &tp->reg_window[window],
-                                 sizeof(struct reg_window)))
+                                 sizeof(struct reg_window32)))
                         do_exit(SIGILL);
         }
         tp->w_saved = 0;