[MIPS] Fix build errors related to wbflush.h on tx4927/tx4938. (f5c70dd7) · Commits · 戴 / test

arch/mips/tx4927/common/tx4927_setup.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -53,19 +53,9 @@ void __init tx4927_time_init(void);
		void dump_cp0(char *key);


		void (*__wbflush) (void);

		static void tx4927_write_buffer_flush(void)
		{
		__asm__ __volatile__
		("sync\n\t" "nop\n\t" "loop: bc0f loop\n\t" "nop\n\t");
		}


		void __init plat_mem_setup(void)
		{
		board_time_init = tx4927_time_init;
		__wbflush = tx4927_write_buffer_flush;

		#ifdef CONFIG_TOSHIBA_RBTX4927
		{

+1 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,7 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
		#include <asm/processor.h>
		#include <asm/reboot.h>
		#include <asm/time.h>
		#include <asm/wbflush.h>
		#include <linux/bootmem.h>
		#include <linux/blkdev.h>
		#ifdef CONFIG_RTC_DS1742

+1 −0

+0 −19

Original line number	Diff line number	Diff line
		@@ -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();
		}

+1 −0