GIT 6b9134efdde96f976a94f7cb59fd1d56ff50db05 git+ssh://master.kernel.org/pub/scm/linux/kernel/git/viro/bird.git#m32r.b9 commit 6b9134efdde96f976a94f7cb59fd1d56ff50db05 Author: Al Viro Date: Tue Feb 21 10:25:25 2006 -0500 [PATCH] m32r: more __user annotations Signed-off-by: Al Viro commit f7a5010ef48a9dc5fcb5c11715eb72ace3544050 Author: Al Viro Date: Fri Dec 23 02:11:04 2005 -0500 [PATCH] m32r: signal __user annotations Signed-off-by: Al Viro commit 00f8e98af02a74e3b2aeba254679ac6676eae330 Author: Al Viro Date: Fri Dec 23 02:06:42 2005 -0500 [PATCH] m32r: NULL noise removal Signed-off-by: Al Viro commit 95ff9cab3e5b5daa300deb2febbe2bb29fa68d9d Author: Al Viro Date: Fri Dec 23 02:03:44 2005 -0500 [PATCH] m32r: C99 initializers in setup.c Signed-off-by: Al Viro commit f032f05b62552294fe1a7750472b18068377e673 Author: Al Viro Date: Tue Dec 13 05:40:37 2005 -0500 [PATCH] m32r: more binutils fallout recent as(1) refuses to do .equ with external symbols; use preprocessor instead... Signed-off-by: Al Viro commit 67660fc4187e6da6e8e2fa1cdc44c6fdfe4e0bc3 Author: Al Viro Date: Sun Dec 11 09:46:34 2005 -0500 [PATCH] m32r: play it safer with ld24 arguments (64bit issues in cross-as(1)) workaround for binutils breakage ;-/ Signed-off-by: Al Viro commit 7ceac59a2cab329b1087d09aca3a4ea492533380 Author: Al Viro Date: Thu Dec 1 01:33:24 2005 -0500 [PATCH] m32r: Kconfig fix (m32r smc91x) due to crap in drivers/net/smc91x.h combination of M32R, SMC91X and ISA is broken (ISA defines picked instead of the M32R ones). Marked as such. Signed-off-by: Al Viro --- diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S index 3871b65..a96a3f2 100644 --- a/arch/m32r/kernel/entry.S +++ b/arch/m32r/kernel/entry.S @@ -301,7 +301,7 @@ syscall_badsys: .global eit_vector - .equ ei_vec_table, eit_vector + 0x0200 +#define ei_vec_table eit_vector + 0x0200 /* * EI handler routine diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c index d742037..e987ff1 100644 --- a/arch/m32r/kernel/setup.c +++ b/arch/m32r/kernel/setup.c @@ -371,10 +371,10 @@ static void c_stop(struct seq_file *m, v } struct seq_operations cpuinfo_op = { - start: c_start, - next: c_next, - stop: c_stop, - show: show_cpuinfo, + .start = c_start, + .next = c_next, + .stop = c_stop, + .show = show_cpuinfo, }; #endif /* CONFIG_PROC_FS */ diff --git a/arch/m32r/kernel/setup_mappi.c b/arch/m32r/kernel/setup_mappi.c index 00f2532..69b9bca 100644 --- a/arch/m32r/kernel/setup_mappi.c +++ b/arch/m32r/kernel/setup_mappi.c @@ -96,7 +96,7 @@ void __init init_IRQ(void) /* MFT2 : system timer */ irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED; irq_desc[M32R_IRQ_MFT2].handler = &mappi_irq_type; - irq_desc[M32R_IRQ_MFT2].action = 0; + irq_desc[M32R_IRQ_MFT2].action = NULL; irq_desc[M32R_IRQ_MFT2].depth = 1; icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN; disable_mappi_irq(M32R_IRQ_MFT2); @@ -105,7 +105,7 @@ void __init init_IRQ(void) /* SIO0_R : uart receive data */ irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED; irq_desc[M32R_IRQ_SIO0_R].handler = &mappi_irq_type; - irq_desc[M32R_IRQ_SIO0_R].action = 0; + irq_desc[M32R_IRQ_SIO0_R].action = NULL; irq_desc[M32R_IRQ_SIO0_R].depth = 1; icu_data[M32R_IRQ_SIO0_R].icucr = 0; disable_mappi_irq(M32R_IRQ_SIO0_R); @@ -113,7 +113,7 @@ void __init init_IRQ(void) /* SIO0_S : uart send data */ irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED; irq_desc[M32R_IRQ_SIO0_S].handler = &mappi_irq_type; - irq_desc[M32R_IRQ_SIO0_S].action = 0; + irq_desc[M32R_IRQ_SIO0_S].action = NULL; irq_desc[M32R_IRQ_SIO0_S].depth = 1; icu_data[M32R_IRQ_SIO0_S].icucr = 0; disable_mappi_irq(M32R_IRQ_SIO0_S); @@ -121,7 +121,7 @@ void __init init_IRQ(void) /* SIO1_R : uart receive data */ irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED; irq_desc[M32R_IRQ_SIO1_R].handler = &mappi_irq_type; - irq_desc[M32R_IRQ_SIO1_R].action = 0; + irq_desc[M32R_IRQ_SIO1_R].action = NULL; irq_desc[M32R_IRQ_SIO1_R].depth = 1; icu_data[M32R_IRQ_SIO1_R].icucr = 0; disable_mappi_irq(M32R_IRQ_SIO1_R); @@ -129,7 +129,7 @@ void __init init_IRQ(void) /* SIO1_S : uart send data */ irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED; irq_desc[M32R_IRQ_SIO1_S].handler = &mappi_irq_type; - irq_desc[M32R_IRQ_SIO1_S].action = 0; + irq_desc[M32R_IRQ_SIO1_S].action = NULL; irq_desc[M32R_IRQ_SIO1_S].depth = 1; icu_data[M32R_IRQ_SIO1_S].icucr = 0; disable_mappi_irq(M32R_IRQ_SIO1_S); @@ -139,7 +139,7 @@ void __init init_IRQ(void) /* INT1 : pccard0 interrupt */ irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED; irq_desc[M32R_IRQ_INT1].handler = &mappi_irq_type; - irq_desc[M32R_IRQ_INT1].action = 0; + irq_desc[M32R_IRQ_INT1].action = NULL; irq_desc[M32R_IRQ_INT1].depth = 1; icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD00; disable_mappi_irq(M32R_IRQ_INT1); @@ -147,7 +147,7 @@ void __init init_IRQ(void) /* INT2 : pccard1 interrupt */ irq_desc[M32R_IRQ_INT2].status = IRQ_DISABLED; irq_desc[M32R_IRQ_INT2].handler = &mappi_irq_type; - irq_desc[M32R_IRQ_INT2].action = 0; + irq_desc[M32R_IRQ_INT2].action = NULL; irq_desc[M32R_IRQ_INT2].depth = 1; icu_data[M32R_IRQ_INT2].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD00; disable_mappi_irq(M32R_IRQ_INT2); diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index 71763f7..08ef17c 100644 --- a/arch/m32r/kernel/signal.c +++ b/arch/m32r/kernel/signal.c @@ -34,7 +34,7 @@ int do_signal(struct pt_regs *, sigset_t *); asmlinkage int -sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize, +sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize, unsigned long r2, unsigned long r3, unsigned long r4, unsigned long r5, unsigned long r6, struct pt_regs regs) { @@ -79,8 +79,8 @@ sys_sigaltstack(const stack_t __user *us struct rt_sigframe { int sig; - struct siginfo *pinfo; - void *puc; + struct siginfo __user *pinfo; + void __user *puc; struct siginfo info; struct ucontext uc; // struct _fpstate fpstate; diff --git a/arch/m32r/kernel/smp.c b/arch/m32r/kernel/smp.c index 8b1f6eb..7e1f25b 100644 --- a/arch/m32r/kernel/smp.c +++ b/arch/m32r/kernel/smp.c @@ -231,7 +231,7 @@ void smp_flush_tlb_all(void) local_irq_save(flags); __flush_tlb_all(); local_irq_restore(flags); - smp_call_function(flush_tlb_all_ipi, 0, 1, 1); + smp_call_function(flush_tlb_all_ipi, NULL, 1, 1); preempt_enable(); } diff --git a/arch/m32r/kernel/sys_m32r.c b/arch/m32r/kernel/sys_m32r.c index 670cb49..a244e0a 100644 --- a/arch/m32r/kernel/sys_m32r.c +++ b/arch/m32r/kernel/sys_m32r.c @@ -30,7 +30,7 @@ /* * sys_tas() - test-and-set */ -asmlinkage int sys_tas(int *addr) +asmlinkage int sys_tas(int __user *addr) { int oldval; @@ -89,7 +89,7 @@ sys_pipe(unsigned long r0, unsigned long error = do_pipe(fd); if (!error) { - if (copy_to_user((void *)r0, (void *)fd, 2*sizeof(int))) + if (copy_to_user((void __user *)r0, fd, 2*sizeof(int))) error = -EFAULT; } return error; @@ -200,7 +200,7 @@ asmlinkage int sys_ipc(uint call, int fi } } -asmlinkage int sys_uname(struct old_utsname * name) +asmlinkage int sys_uname(struct old_utsname __user * name) { int err; if (!name) diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c index 5fe8ed6..7a40bac 100644 --- a/arch/m32r/kernel/traps.c +++ b/arch/m32r/kernel/traps.c @@ -269,7 +269,7 @@ static __inline__ void do_trap(int trapn #define DO_ERROR(trapnr, signr, str, name) \ asmlinkage void do_##name(struct pt_regs * regs, long error_code) \ { \ - do_trap(trapnr, signr, 0, regs, error_code, NULL); \ + do_trap(trapnr, signr, NULL, regs, error_code, NULL); \ } #define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr) \ diff --git a/arch/m32r/mm/mmu.S b/arch/m32r/mm/mmu.S index 0c28f11..704e37b 100644 --- a/arch/m32r/mm/mmu.S +++ b/arch/m32r/mm/mmu.S @@ -140,7 +140,7 @@ ENTRY(tme_handler) ;; r2: pte_data ;; r3: free ; pgd = *(unsigned long *)MPTB; - ld24 r2, #(-MPTB - 1) + ld24 r2, #(0xffffffff-MPTB) srl3 r3, r0, #22 #ifdef CONFIG_ISA_DUAL_ISSUE not r2, r2 || slli r3, #2 ; r3: pgd offset @@ -255,7 +255,7 @@ ENTRY(tme_handler) ; r0: address, r2: entry ; r1,r3,r4: (free) ; pgd = *(unsigned long *)MPTB; - ld24 r1, #(-MPTB-1) + ld24 r1, #(0xffffffff-MPTB) not r1, r1 ld r1, @r1 srl3 r4, r0, #22 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index e45a8f9..4cc91d1 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -823,7 +823,7 @@ config SMC91X tristate "SMC 91C9x/91C1xxx support" select CRC32 select MII - depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00) + depends on NET_ETHERNET && (ARM || REDWOOD_5 || REDWOOD_6 || (M32R && (BROKEN || !ISA)) || SUPERH || SOC_AU1X00) help This is a driver for SMC's 91x series of Ethernet chipsets, including the SMC91C94 and the SMC91C111. Say Y if you want it