diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2006-08-20 22:55:52 +0900 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2006-10-09 23:20:48 +0100 |
| commit | f5c70dd7f384db4c524c35288d9be3ed61ac41a9 (patch) | |
| tree | 1307e583bbbfa067422dc803f4de775a9c9bfb25 /arch/mips/tx4938 | |
| parent | 5536b2351425136e629bd9fc18135c6e21e125c2 (diff) | |
| download | kernel_samsung_tuna-f5c70dd7f384db4c524c35288d9be3ed61ac41a9.zip kernel_samsung_tuna-f5c70dd7f384db4c524c35288d9be3ed61ac41a9.tar.gz kernel_samsung_tuna-f5c70dd7f384db4c524c35288d9be3ed61ac41a9.tar.bz2 | |
[MIPS] Fix build errors related to wbflush.h on tx4927/tx4938.
TX49 CPUs have a SYNC instruction so that CONFIG_CPU_HAS_WB is no
longer needed.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/tx4938')
| -rw-r--r-- | arch/mips/tx4938/common/irq.c | 1 | ||||
| -rw-r--r-- | arch/mips/tx4938/common/setup.c | 19 | ||||
| -rw-r--r-- | arch/mips/tx4938/toshiba_rbtx4938/irq.c | 1 |
3 files changed, 2 insertions, 19 deletions
diff --git a/arch/mips/tx4938/common/irq.c b/arch/mips/tx4938/common/irq.c index b602474..77fe245 100644 --- a/arch/mips/tx4938/common/irq.c +++ b/arch/mips/tx4938/common/irq.c @@ -30,6 +30,7 @@ #include <asm/irq.h> #include <asm/mipsregs.h> #include <asm/system.h> +#include <asm/wbflush.h> #include <asm/tx4938/rbtx4938.h> /**********************************************************************************/ diff --git a/arch/mips/tx4938/common/setup.c b/arch/mips/tx4938/common/setup.c index 71859c4..f415a1f 100644 --- a/arch/mips/tx4938/common/setup.c +++ b/arch/mips/tx4938/common/setup.c @@ -41,29 +41,10 @@ void __init tx4938_setup(void); void __init tx4938_time_init(void); void dump_cp0(char *key); -void (*__wbflush) (void); - -static void -tx4938_write_buffer_flush(void) -{ - mmiowb(); - - __asm__ __volatile__( - ".set push\n\t" - ".set noreorder\n\t" - "lw $0,%0\n\t" - "nop\n\t" - ".set pop" - : /* no output */ - : "m" (*(int *)KSEG1) - : "memory"); -} - void __init plat_mem_setup(void) { board_time_init = tx4938_time_init; - __wbflush = tx4938_write_buffer_flush; toshiba_rbtx4938_setup(); } diff --git a/arch/mips/tx4938/toshiba_rbtx4938/irq.c b/arch/mips/tx4938/toshiba_rbtx4938/irq.c index bbb3390..102e473 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c +++ b/arch/mips/tx4938/toshiba_rbtx4938/irq.c @@ -83,6 +83,7 @@ IRQ Device #include <asm/processor.h> #include <asm/reboot.h> #include <asm/time.h> +#include <asm/wbflush.h> #include <linux/bootmem.h> #include <asm/tx4938/rbtx4938.h> |