From 7bfbcb6ea08fc8d51b1d693cb804092df099a10b Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 14 Jan 2010 20:36:55 +0100 Subject: [PATCH] --- yaml --- r: 179609 b: refs/heads/master c: b53e9b5ebd5c6e718f54bcacd4e97b71533ca681 h: refs/heads/master i: 179607: 9c9f7681de040cf48790e5c1621ebc24a37025f5 v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/compressed/misc.c | 1 - trunk/arch/arm/mach-gemini/include/mach/uncompress.h | 4 +++- trunk/arch/arm/plat-mxc/include/mach/uncompress.h | 4 +++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2e762bf85f27..9ab3b9033e46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95b8f20fd6a2694a16b8addb190b942bfb670c88 +refs/heads/master: b53e9b5ebd5c6e718f54bcacd4e97b71533ca681 diff --git a/trunk/arch/arm/boot/compressed/misc.c b/trunk/arch/arm/boot/compressed/misc.c index 7e0fe4d42c7b..af6479fae931 100644 --- a/trunk/arch/arm/boot/compressed/misc.c +++ b/trunk/arch/arm/boot/compressed/misc.c @@ -88,7 +88,6 @@ static void icedcc_putc(int ch) #endif #define putc(ch) icedcc_putc(ch) -#define flush() do { } while (0) #endif static void putstr(const char *ptr) diff --git a/trunk/arch/arm/mach-gemini/include/mach/uncompress.h b/trunk/arch/arm/mach-gemini/include/mach/uncompress.h index 59c5df7e716c..5483f61a8061 100644 --- a/trunk/arch/arm/mach-gemini/include/mach/uncompress.h +++ b/trunk/arch/arm/mach-gemini/include/mach/uncompress.h @@ -30,7 +30,9 @@ static inline void putc(char c) UART[UART_TX] = c; } -#define flush() do { } while (0) +static inline void flush(void) +{ +} /* * nothing to do diff --git a/trunk/arch/arm/plat-mxc/include/mach/uncompress.h b/trunk/arch/arm/plat-mxc/include/mach/uncompress.h index 4d5d395ad63b..d49384cb1e97 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/uncompress.h +++ b/trunk/arch/arm/plat-mxc/include/mach/uncompress.h @@ -60,7 +60,9 @@ static void putc(int ch) UART(TXR) = ch; } -#define flush() do { } while (0) +static inline void flush(void) +{ +} #define MX1_UART1_BASE_ADDR 0x00206000 #define MX25_UART1_BASE_ADDR 0x43f90000