From 5289be9ac4e60cc1917946b32331aa3e4c3e396b Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 5 Aug 2006 16:51:26 -0400 Subject: [PATCH] m68k headers breakage lockdep has changed the includes' order Signed-off-by: Al Viro --- include/asm-m68k/system.h | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/asm-m68k/system.h b/include/asm-m68k/system.h index 131a0cb..5173144 100644 --- a/include/asm-m68k/system.h +++ b/include/asm-m68k/system.h @@ -45,6 +45,23 @@ #define switch_to(prev,next,last) do { \ (last) = _last; \ } while (0) +/* + * Force strict CPU ordering. + * Not really required on m68k... + */ +#define nop() do { asm volatile ("nop"); barrier(); } while (0) +#define mb() barrier() +#define rmb() barrier() +#define wmb() barrier() +#define read_barrier_depends() do { } while(0) +#define set_mb(var, value) do { xchg(&var, value); } while (0) + +#define smp_mb() barrier() +#define smp_rmb() barrier() +#define smp_wmb() barrier() +#define smp_read_barrier_depends() do { } while(0) + + /* interrupt control.. */ #if 0 @@ -70,23 +87,6 @@ static inline int irqs_disabled(void) /* For spinlocks etc */ #define local_irq_save(x) ({ local_save_flags(x); local_irq_disable(); }) -/* - * Force strict CPU ordering. - * Not really required on m68k... - */ -#define nop() do { asm volatile ("nop"); barrier(); } while (0) -#define mb() barrier() -#define rmb() barrier() -#define wmb() barrier() -#define read_barrier_depends() do { } while(0) -#define set_mb(var, value) do { xchg(&var, value); } while (0) - -#define smp_mb() barrier() -#define smp_rmb() barrier() -#define smp_wmb() barrier() -#define smp_read_barrier_depends() do { } while(0) - - #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) #define tas(ptr) (xchg((ptr),1)) -- 1.4.2.GIT From 0292f4f60a0a4a93c19bd7b38a20f53040181fe8 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 12 Dec 2005 13:51:22 -0500 Subject: [PATCH] m68k: fix macro syntax to make current binutils happy recent as(1) doesn't think that . terminates a macro name, so getuser.l is _not_ treated as invoking getuser with .l as the first argument. Signed-off-by: Al Viro --- arch/m68k/math-emu/fp_cond.S | 2 +- arch/m68k/math-emu/fp_decode.h | 4 ++-- arch/m68k/math-emu/fp_move.S | 14 +++++++------- arch/m68k/math-emu/fp_movem.S | 16 ++++++++-------- arch/m68k/math-emu/fp_scan.S | 22 +++++++++++----------- arch/m68k/math-emu/fp_util.S | 16 ++++++++-------- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/arch/m68k/math-emu/fp_cond.S b/arch/m68k/math-emu/fp_cond.S index ddae8b1..1cddeb0 100644 --- a/arch/m68k/math-emu/fp_cond.S +++ b/arch/m68k/math-emu/fp_cond.S @@ -163,7 +163,7 @@ fp_absolute_long: fp_do_scc: swap %d1 - putuser.b %d1,(%a0),fp_err_ua1,%a0 + putuser .b,%d1,(%a0),fp_err_ua1,%a0 printf PDECODE,"\n" jra fp_end diff --git a/arch/m68k/math-emu/fp_decode.h b/arch/m68k/math-emu/fp_decode.h index 759679d..a2595d9 100644 --- a/arch/m68k/math-emu/fp_decode.h +++ b/arch/m68k/math-emu/fp_decode.h @@ -311,7 +311,7 @@ debug move.l "(%sp)+,%d1" btst #2,%d2 jne 1f printf PDECODE,")@(" - getuser.l (%a1),%a1,fp_err_ua1,%a1 + getuser .l,(%a1),%a1,fp_err_ua1,%a1 debug jra "2f" 1: printf PDECODE,"," 2: @@ -322,7 +322,7 @@ debug jra "2f" btst #2,%d2 jeq 1f printf PDECODE,")@(" - getuser.l (%a1),%a1,fp_err_ua1,%a1 + getuser .l,(%a1),%a1,fp_err_ua1,%a1 debug jra "2f" 1: printf PDECODE,"," 2: diff --git a/arch/m68k/math-emu/fp_move.S b/arch/m68k/math-emu/fp_move.S index 71bdf83..9bd0334 100644 --- a/arch/m68k/math-emu/fp_move.S +++ b/arch/m68k/math-emu/fp_move.S @@ -200,12 +200,12 @@ fp_putdest: fp_format_long: jsr fp_conv_ext2long - putuser.l %d0,(%a1),fp_err_ua1,%a1 + putuser .l,%d0,(%a1),fp_err_ua1,%a1 jra fp_finish_move fp_format_single: jsr fp_conv_ext2single - putuser.l %d0,(%a1),fp_err_ua1,%a1 + putuser .l,%d0,(%a1),fp_err_ua1,%a1 jra fp_finish_move fp_format_extended: @@ -213,11 +213,11 @@ fp_format_extended: lsl.w #1,%d0 lsl.l #7,%d0 lsl.l #8,%d0 - putuser.l %d0,(%a1)+,fp_err_ua1,%a1 + putuser .l,%d0,(%a1)+,fp_err_ua1,%a1 move.l (%a0)+,%d0 - putuser.l %d0,(%a1)+,fp_err_ua1,%a1 + putuser .l,%d0,(%a1)+,fp_err_ua1,%a1 move.l (%a0),%d0 - putuser.l %d0,(%a1),fp_err_ua1,%a1 + putuser .l,%d0,(%a1),fp_err_ua1,%a1 jra fp_finish_move fp_format_packed: @@ -227,7 +227,7 @@ fp_format_packed: fp_format_word: jsr fp_conv_ext2short - putuser.w %d0,(%a1),fp_err_ua1,%a1 + putuser .w,%d0,(%a1),fp_err_ua1,%a1 jra fp_finish_move fp_format_double: @@ -236,7 +236,7 @@ fp_format_double: fp_format_byte: jsr fp_conv_ext2byte - putuser.b %d0,(%a1),fp_err_ua1,%a1 + putuser .b,%d0,(%a1),fp_err_ua1,%a1 | jra fp_finish_move fp_finish_move: diff --git a/arch/m68k/math-emu/fp_movem.S b/arch/m68k/math-emu/fp_movem.S index 8354d39..9c74134 100644 --- a/arch/m68k/math-emu/fp_movem.S +++ b/arch/m68k/math-emu/fp_movem.S @@ -141,14 +141,14 @@ fpr_do_movem: | move register from memory into fpu jra 3f 1: printf PMOVEM,"(%p>%p)",2,%a0,%a1 - getuser.l (%a0)+,%d2,fp_err_ua1,%a0 + getuser .l,(%a0)+,%d2,fp_err_ua1,%a0 lsr.l #8,%d2 lsr.l #7,%d2 lsr.w #1,%d2 move.l %d2,(%a1)+ - getuser.l (%a0)+,%d2,fp_err_ua1,%a0 + getuser .l,(%a0)+,%d2,fp_err_ua1,%a0 move.l %d2,(%a1)+ - getuser.l (%a0),%d2,fp_err_ua1,%a0 + getuser .l,(%a0),%d2,fp_err_ua1,%a0 move.l %d2,(%a1) subq.l #8,%a0 subq.l #8,%a1 @@ -164,11 +164,11 @@ fpr_do_movem: lsl.w #1,%d2 lsl.l #7,%d2 lsl.l #8,%d2 - putuser.l %d2,(%a0)+,fp_err_ua1,%a0 + putuser .l,%d2,(%a0)+,fp_err_ua1,%a0 move.l (%a1)+,%d2 - putuser.l %d2,(%a0)+,fp_err_ua1,%a0 + putuser .l,%d2,(%a0)+,fp_err_ua1,%a0 move.l (%a1),%d2 - putuser.l %d2,(%a0),fp_err_ua1,%a0 + putuser .l,%d2,(%a0),fp_err_ua1,%a0 subq.l #8,%a1 subq.l #8,%a0 add.l %d0,%a0 @@ -325,7 +325,7 @@ fpc_do_movem: | move register from memory into fpu jra 3f 1: printf PMOVEM,"(%p>%p)",2,%a0,%a1 - getuser.l (%a0)+,%d0,fp_err_ua1,%a0 + getuser .l,(%a0)+,%d0,fp_err_ua1,%a0 move.l %d0,(%a1) 2: addq.l #4,%a1 3: lsl.b #1,%d1 @@ -336,7 +336,7 @@ fpc_do_movem: | move register from fpu into memory 1: printf PMOVEM,"(%p>%p)",2,%a1,%a0 move.l (%a1),%d0 - putuser.l %d0,(%a0)+,fp_err_ua1,%a0 + putuser .l,%d0,(%a0)+,fp_err_ua1,%a0 2: addq.l #4,%a1 4: lsl.b #1,%d1 jcs 1b diff --git a/arch/m68k/math-emu/fp_scan.S b/arch/m68k/math-emu/fp_scan.S index e4146ed..5f49b93 100644 --- a/arch/m68k/math-emu/fp_scan.S +++ b/arch/m68k/math-emu/fp_scan.S @@ -64,7 +64,7 @@ fp_scan: | normal fpu instruction? (this excludes fsave/frestore) fp_get_pc %a0 printf PDECODE,"%08x: ",1,%a0 - getuser.b (%a0),%d0,fp_err_ua1,%a0 + getuser .b,(%a0),%d0,fp_err_ua1,%a0 #if 1 cmp.b #0xf2,%d0 | cpid = 1 #else @@ -72,7 +72,7 @@ #else #endif jne fp_nonstd | first two instruction words are kept in %d2 - getuser.l (%a0)+,%d2,fp_err_ua1,%a0 + getuser .l,(%a0)+,%d2,fp_err_ua1,%a0 fp_put_pc %a0 fp_decode_cond: | separate conditional instr fp_decode_cond_instr_type @@ -230,7 +230,7 @@ #ifdef FPU_EMU_DEBUG movel %a0,%a1 clr.l %d1 jra 2f -1: getuser.b (%a1)+,%d1,fp_err_ua1,%a1 +1: getuser .b,(%a1)+,%d1,fp_err_ua1,%a1 printf PDECODE,"%02x",1,%d1 2: dbra %d0,1b movem.l (%sp)+,%d0/%d1 @@ -252,24 +252,24 @@ fp_fetchsource: .long fp_byte, fp_ill fp_long: - getuser.l (%a1),%d0,fp_err_ua1,%a1 + getuser .l,(%a1),%d0,fp_err_ua1,%a1 jsr fp_conv_long2ext jra fp_getdest fp_single: - getuser.l (%a1),%d0,fp_err_ua1,%a1 + getuser .l,(%a1),%d0,fp_err_ua1,%a1 jsr fp_conv_single2ext jra fp_getdest fp_ext: - getuser.l (%a1)+,%d0,fp_err_ua1,%a1 + getuser .l,(%a1)+,%d0,fp_err_ua1,%a1 lsr.l #8,%d0 lsr.l #7,%d0 lsr.w #1,%d0 move.l %d0,(%a0)+ - getuser.l (%a1)+,%d0,fp_err_ua1,%a1 + getuser .l,(%a1)+,%d0,fp_err_ua1,%a1 move.l %d0,(%a0)+ - getuser.l (%a1),%d0,fp_err_ua1,%a1 + getuser .l,(%a1),%d0,fp_err_ua1,%a1 move.l %d0,(%a0) subq.l #8,%a0 jra fp_getdest @@ -279,7 +279,7 @@ fp_pack: jra fp_ill fp_word: - getuser.w (%a1),%d0,fp_err_ua1,%a1 + getuser .w,(%a1),%d0,fp_err_ua1,%a1 ext.l %d0 jsr fp_conv_long2ext jra fp_getdest @@ -289,7 +289,7 @@ fp_double: jra fp_getdest fp_byte: - getuser.b (%a1),%d0,fp_err_ua1,%a1 + getuser .b,(%a1),%d0,fp_err_ua1,%a1 extb.l %d0 jsr fp_conv_long2ext | jra fp_getdest @@ -465,7 +465,7 @@ fp_fdsub: fp_nonstd: fp_get_pc %a0 - getuser.l (%a0),%d0,fp_err_ua1,%a0 + getuser .l,(%a0),%d0,fp_err_ua1,%a0 printf ,"nonstd ((%08x)=%08x)\n",2,%a0,%d0 moveq #-1,%d0 rts diff --git a/arch/m68k/math-emu/fp_util.S b/arch/m68k/math-emu/fp_util.S index b093b85..4eb25b7 100644 --- a/arch/m68k/math-emu/fp_util.S +++ b/arch/m68k/math-emu/fp_util.S @@ -159,11 +159,11 @@ fp_s2e_large: fp_conv_double2ext: #ifdef FPU_EMU_DEBUG - getuser.l %a1@(0),%d0,fp_err_ua2,%a1 - getuser.l %a1@(4),%d1,fp_err_ua2,%a1 + getuser .l,%a1@(0),%d0,fp_err_ua2,%a1 + getuser .l,%a1@(4),%d1,fp_err_ua2,%a1 printf PCONV,"d2e: %p%p -> %p(",3,%d0,%d1,%a0 #endif - getuser.l (%a1)+,%d0,fp_err_ua2,%a1 + getuser .l,(%a1)+,%d0,fp_err_ua2,%a1 move.l %d0,%d1 lsl.l #8,%d0 | shift high mantissa lsl.l #3,%d0 @@ -177,7 +177,7 @@ #endif add.w #0x3fff-0x3ff,%d1 | re-bias the exponent. 9: move.l %d1,(%a0)+ | fp_ext.sign, fp_ext.exp move.l %d0,(%a0)+ - getuser.l (%a1)+,%d0,fp_err_ua2,%a1 + getuser .l,(%a1)+,%d0,fp_err_ua2,%a1 move.l %d0,%d1 lsl.l #8,%d0 lsl.l #3,%d0 @@ -1286,17 +1286,17 @@ fp_conv_ext2double: lsr.l #4,%d0 lsr.l #8,%d0 or.l %d2,%d0 - putuser.l %d0,(%a1)+,fp_err_ua2,%a1 + putuser .l,%d0,(%a1)+,fp_err_ua2,%a1 moveq #21,%d0 lsl.l %d0,%d1 move.l (%a0),%d0 lsr.l #4,%d0 lsr.l #7,%d0 or.l %d1,%d0 - putuser.l %d0,(%a1),fp_err_ua2,%a1 + putuser .l,%d0,(%a1),fp_err_ua2,%a1 #ifdef FPU_EMU_DEBUG - getuser.l %a1@(-4),%d0,fp_err_ua2,%a1 - getuser.l %a1@(0),%d1,fp_err_ua2,%a1 + getuser .l,%a1@(-4),%d0,fp_err_ua2,%a1 + getuser .l,%a1@(0),%d1,fp_err_ua2,%a1 printf PCONV,"%p(%08x%08x)\n",3,%a1,%d0,%d1 #endif rts -- 1.4.2.GIT From 325bf8c0885d9c15a3381d0954d438e46eb5fe98 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 12 Dec 2005 19:55:22 -0500 Subject: [PATCH] m68k: more workarounds for recent binutils idiocy cretinous thing doesn't believe that (%a0)+ is one macro argument and splits it in two; worked around by quoting the argument... Signed-off-by: Al Viro --- arch/m68k/math-emu/fp_move.S | 4 ++-- arch/m68k/math-emu/fp_movem.S | 12 ++++++------ arch/m68k/math-emu/fp_scan.S | 6 +++--- arch/m68k/math-emu/fp_util.S | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/m68k/math-emu/fp_move.S b/arch/m68k/math-emu/fp_move.S index 9bd0334..19363b3 100644 --- a/arch/m68k/math-emu/fp_move.S +++ b/arch/m68k/math-emu/fp_move.S @@ -213,9 +213,9 @@ fp_format_extended: lsl.w #1,%d0 lsl.l #7,%d0 lsl.l #8,%d0 - putuser .l,%d0,(%a1)+,fp_err_ua1,%a1 + putuser .l,%d0,"(%a1)+",fp_err_ua1,%a1 move.l (%a0)+,%d0 - putuser .l,%d0,(%a1)+,fp_err_ua1,%a1 + putuser .l,%d0,"(%a1)+",fp_err_ua1,%a1 move.l (%a0),%d0 putuser .l,%d0,(%a1),fp_err_ua1,%a1 jra fp_finish_move diff --git a/arch/m68k/math-emu/fp_movem.S b/arch/m68k/math-emu/fp_movem.S index 9c74134..4173655 100644 --- a/arch/m68k/math-emu/fp_movem.S +++ b/arch/m68k/math-emu/fp_movem.S @@ -141,12 +141,12 @@ fpr_do_movem: | move register from memory into fpu jra 3f 1: printf PMOVEM,"(%p>%p)",2,%a0,%a1 - getuser .l,(%a0)+,%d2,fp_err_ua1,%a0 + getuser .l,"(%a0)+",%d2,fp_err_ua1,%a0 lsr.l #8,%d2 lsr.l #7,%d2 lsr.w #1,%d2 move.l %d2,(%a1)+ - getuser .l,(%a0)+,%d2,fp_err_ua1,%a0 + getuser .l,"(%a0)+",%d2,fp_err_ua1,%a0 move.l %d2,(%a1)+ getuser .l,(%a0),%d2,fp_err_ua1,%a0 move.l %d2,(%a1) @@ -164,9 +164,9 @@ fpr_do_movem: lsl.w #1,%d2 lsl.l #7,%d2 lsl.l #8,%d2 - putuser .l,%d2,(%a0)+,fp_err_ua1,%a0 + putuser .l,%d2,"(%a0)+",fp_err_ua1,%a0 move.l (%a1)+,%d2 - putuser .l,%d2,(%a0)+,fp_err_ua1,%a0 + putuser .l,%d2,"(%a0)+",fp_err_ua1,%a0 move.l (%a1),%d2 putuser .l,%d2,(%a0),fp_err_ua1,%a0 subq.l #8,%a1 @@ -325,7 +325,7 @@ fpc_do_movem: | move register from memory into fpu jra 3f 1: printf PMOVEM,"(%p>%p)",2,%a0,%a1 - getuser .l,(%a0)+,%d0,fp_err_ua1,%a0 + getuser .l,"(%a0)+",%d0,fp_err_ua1,%a0 move.l %d0,(%a1) 2: addq.l #4,%a1 3: lsl.b #1,%d1 @@ -336,7 +336,7 @@ fpc_do_movem: | move register from fpu into memory 1: printf PMOVEM,"(%p>%p)",2,%a1,%a0 move.l (%a1),%d0 - putuser .l,%d0,(%a0)+,fp_err_ua1,%a0 + putuser .l,%d0,"(%a0)+",fp_err_ua1,%a0 2: addq.l #4,%a1 4: lsl.b #1,%d1 jcs 1b diff --git a/arch/m68k/math-emu/fp_scan.S b/arch/m68k/math-emu/fp_scan.S index 5f49b93..6a71ed1 100644 --- a/arch/m68k/math-emu/fp_scan.S +++ b/arch/m68k/math-emu/fp_scan.S @@ -72,7 +72,7 @@ #else #endif jne fp_nonstd | first two instruction words are kept in %d2 - getuser .l,(%a0)+,%d2,fp_err_ua1,%a0 + getuser .l,"(%a0)+",%d2,fp_err_ua1,%a0 fp_put_pc %a0 fp_decode_cond: | separate conditional instr fp_decode_cond_instr_type @@ -262,12 +262,12 @@ fp_single: jra fp_getdest fp_ext: - getuser .l,(%a1)+,%d0,fp_err_ua1,%a1 + getuser .l,"(%a1)+",%d0,fp_err_ua1,%a1 lsr.l #8,%d0 lsr.l #7,%d0 lsr.w #1,%d0 move.l %d0,(%a0)+ - getuser .l,(%a1)+,%d0,fp_err_ua1,%a1 + getuser .l,"(%a1)+",%d0,fp_err_ua1,%a1 move.l %d0,(%a0)+ getuser .l,(%a1),%d0,fp_err_ua1,%a1 move.l %d0,(%a0) diff --git a/arch/m68k/math-emu/fp_util.S b/arch/m68k/math-emu/fp_util.S index 4eb25b7..09bc5f4 100644 --- a/arch/m68k/math-emu/fp_util.S +++ b/arch/m68k/math-emu/fp_util.S @@ -163,7 +163,7 @@ #ifdef FPU_EMU_DEBUG getuser .l,%a1@(4),%d1,fp_err_ua2,%a1 printf PCONV,"d2e: %p%p -> %p(",3,%d0,%d1,%a0 #endif - getuser .l,(%a1)+,%d0,fp_err_ua2,%a1 + getuser .l,"(%a1)+",%d0,fp_err_ua2,%a1 move.l %d0,%d1 lsl.l #8,%d0 | shift high mantissa lsl.l #3,%d0 @@ -177,7 +177,7 @@ #endif add.w #0x3fff-0x3ff,%d1 | re-bias the exponent. 9: move.l %d1,(%a0)+ | fp_ext.sign, fp_ext.exp move.l %d0,(%a0)+ - getuser .l,(%a1)+,%d0,fp_err_ua2,%a1 + getuser .l,"(%a1)+",%d0,fp_err_ua2,%a1 move.l %d0,%d1 lsl.l #8,%d0 lsl.l #3,%d0 @@ -1286,7 +1286,7 @@ fp_conv_ext2double: lsr.l #4,%d0 lsr.l #8,%d0 or.l %d2,%d0 - putuser .l,%d0,(%a1)+,fp_err_ua2,%a1 + putuser .l,%d0,"(%a1)+",fp_err_ua2,%a1 moveq #21,%d0 lsl.l %d0,%d1 move.l (%a0),%d0 -- 1.4.2.GIT From 0f3cab41d92366f31033e2380b8348002805b84f Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 5 Aug 2006 18:47:21 -0400 Subject: [PATCH] m68k/kernel/dma.c assumes !MMU_SUN3 Signed-off-by: Al Viro --- arch/m68k/kernel/Makefile | 3 ++- include/asm-m68k/dma-mapping.h | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile index dae6097..1c9ecaa 100644 --- a/arch/m68k/kernel/Makefile +++ b/arch/m68k/kernel/Makefile @@ -9,10 +9,11 @@ else endif extra-y += vmlinux.lds -obj-y := entry.o process.o traps.o ints.o dma.o signal.o ptrace.o \ +obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o \ sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o obj-$(CONFIG_PCI) += bios32.o obj-$(CONFIG_MODULES) += module.o +obj-y$(CONFIG_MMU_SUN3) += dma.o # no, it's not a typo EXTRA_AFLAGS := -traditional diff --git a/include/asm-m68k/dma-mapping.h b/include/asm-m68k/dma-mapping.h index cebbb03..ad33e57 100644 --- a/include/asm-m68k/dma-mapping.h +++ b/include/asm-m68k/dma-mapping.h @@ -5,6 +5,7 @@ #include struct scatterlist; +#ifndef CONFIG_MMU_SUN3 static inline int dma_supported(struct device *dev, u64 mask) { return 1; @@ -88,4 +89,8 @@ static inline int dma_mapping_error(dma_ return 0; } +#else +#include +#endif + #endif /* _M68K_DMA_MAPPING_H */ -- 1.4.2.GIT From a87897ea49378acd0608928799aa0551f1988b17 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 18 Jan 2006 18:41:42 -0500 Subject: [PATCH] m68k: rename pmu_queue_request() in pmu68 ... has to be done, since our static function conflicts with global from via-pmu Signed-off-by: Al Viro --- drivers/macintosh/via-pmu68k.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c index 9f4eff1..851a924 100644 --- a/drivers/macintosh/via-pmu68k.c +++ b/drivers/macintosh/via-pmu68k.c @@ -112,7 +112,7 @@ static int pmu_send_request(struct adb_r static int pmu_autopoll(int devs); void pmu_poll(void); static int pmu_reset_bus(void); -static int pmu_queue_request(struct adb_request *req); +static int pmu68k_queue_request(struct adb_request *req); static void pmu_start(void); static void send_byte(int x); @@ -298,7 +298,7 @@ pmu_send_request(struct adb_request *req req->reply_len = 1; } else req->reply_len = 0; - ret = pmu_queue_request(req); + ret = pmu68k_queue_request(req); break; case CUDA_PACKET: switch (req->data[1]) { @@ -311,7 +311,7 @@ pmu_send_request(struct adb_request *req req->reply[0] = CUDA_PACKET; req->reply[1] = 0; req->reply[2] = CUDA_GET_TIME; - ret = pmu_queue_request(req); + ret = pmu68k_queue_request(req); break; case CUDA_SET_TIME: if (req->nbytes != 6) @@ -324,7 +324,7 @@ pmu_send_request(struct adb_request *req req->reply[0] = CUDA_PACKET; req->reply[1] = 0; req->reply[2] = CUDA_SET_TIME; - ret = pmu_queue_request(req); + ret = pmu68k_queue_request(req); break; case CUDA_GET_PRAM: if (req->nbytes != 4) @@ -337,7 +337,7 @@ pmu_send_request(struct adb_request *req req->reply[0] = CUDA_PACKET; req->reply[1] = 0; req->reply[2] = CUDA_GET_PRAM; - ret = pmu_queue_request(req); + ret = pmu68k_queue_request(req); break; case CUDA_SET_PRAM: if (req->nbytes != 5) @@ -351,7 +351,7 @@ pmu_send_request(struct adb_request *req req->reply[0] = CUDA_PACKET; req->reply[1] = 0; req->reply[2] = CUDA_SET_PRAM; - ret = pmu_queue_request(req); + ret = pmu68k_queue_request(req); break; } break; @@ -365,7 +365,7 @@ pmu_send_request(struct adb_request *req req->nbytes += 2; req->reply_expected = 1; req->reply_len = 0; - ret = pmu_queue_request(req); + ret = pmu68k_queue_request(req); break; } if (ret) @@ -426,9 +426,9 @@ pmu_reset_bus(void) req.data[4] = 0; req.reply_len = 0; req.reply_expected = 1; - if (pmu_queue_request(&req) != 0) + if (pmu68k_queue_request(&req) != 0) { - printk(KERN_ERR "pmu_adb_reset_bus: pmu_queue_request failed\n"); + printk(KERN_ERR "pmu_adb_reset_bus: pmu68k_queue_request failed\n"); return -EIO; } while (!req.complete) @@ -474,11 +474,11 @@ pmu_request(struct adb_request *req, voi } else req->reply_len = 0; req->reply_expected = 0; - return pmu_queue_request(req); + return pmu68k_queue_request(req); } static int -pmu_queue_request(struct adb_request *req) +pmu68k_queue_request(struct adb_request *req) { unsigned long flags; int nsend; -- 1.4.2.GIT From 4134f4453fc7cc77fa3ec3020df0674539466dfa Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 16 Jun 2006 09:12:01 -0400 Subject: [PATCH] m68k needs -fno-builtin-sprintf Signed-off-by: Al Viro --- arch/m68k/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index 34d826d..a4d3670 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -31,7 +31,7 @@ endif CHECKFLAGS += -D__mc68000__ # without -fno-strength-reduce the 53c7xx.c driver fails ;-( -CFLAGS += -pipe -fno-strength-reduce -ffixed-a2 +CFLAGS += -pipe -fno-strength-reduce -ffixed-a2 -fno-builtin-sprintf # enable processor switch if compiled only for a single cpu ifndef CONFIG_M68020 -- 1.4.2.GIT From 95421a52837697753fc56c22e531f0880843efce Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 23 Jun 2006 14:27:25 -0400 Subject: [PATCH] use %zu for size_t Signed-off-by: Al Viro --- drivers/scsi/dc395x.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index ff2b179..968dd78 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c @@ -1219,7 +1219,7 @@ static void dump_register_info(struct Ad srb, srb->cmd, srb->cmd->pid, srb->cmd->cmnd[0], srb->cmd->device->id, srb->cmd->device->lun); - printk(" sglist=%p cnt=%i idx=%i len=%i\n", + printk(" sglist=%p cnt=%i idx=%i len=%zu\n", srb->segment_x, srb->sg_count, srb->sg_index, srb->total_xfer_length); printk(" state=0x%04x status=0x%02x phase=0x%02x (%sconn.)\n", -- 1.4.2.GIT From b8290eaed71cd19804d32a520675355d349465ae Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 3 Jul 2006 22:04:17 -0400 Subject: [PATCH] use %p for pointers Signed-off-by: Al Viro --- drivers/sbus/char/uctrl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c index 575b1f7..d45d5d3 100644 --- a/drivers/sbus/char/uctrl.c +++ b/drivers/sbus/char/uctrl.c @@ -400,7 +400,7 @@ static int __init ts102_uctrl_init(void) } driver->regs->uctrl_intr = UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK; - printk("uctrl: 0x%x (irq %d)\n", driver->regs, driver->irq); + printk("uctrl: 0x%p (irq %d)\n", driver->regs, driver->irq); uctrl_get_event_status(); uctrl_get_external_status(); return 0; -- 1.4.2.GIT From 425c37cfaa130dc82f2bd1d24beb7cf3638b9dd9 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 31 May 2006 00:02:02 -0400 Subject: [PATCH] CONFIG_COMPUTONE should depend on ISA|EISA|PCI Signed-off-by: Al Viro --- drivers/char/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index bde1c66..999db8e 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -97,7 +97,7 @@ config SERIAL_NONSTANDARD config COMPUTONE tristate "Computone IntelliPort Plus serial support" - depends on SERIAL_NONSTANDARD + depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI) ---help--- This driver supports the entire family of Intelliport II/Plus controllers with the exception of the MicroChannel controllers and -- 1.4.2.GIT From eb0cf09374f51a03d2531cfba9e2554f05cd0240 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 5 Aug 2006 12:30:28 -0400 Subject: [PATCH] appldata_mem dependes on vm counters Signed-off-by: Al Viro --- arch/s390/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index f900a51..1aa98c1 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -401,7 +401,7 @@ config APPLDATA_BASE config APPLDATA_MEM tristate "Monitor memory management statistics" - depends on APPLDATA_BASE + depends on APPLDATA_BASE && VM_EVENT_COUNTERS help This provides memory management related data to the Linux - VM Monitor Stream, like paging/swapping rate, memory utilisation, etc. -- 1.4.2.GIT