From fb1f7b9759dbcce6c1d4af5358c668900c575efe Mon Sep 17 00:00:00 2001 From: viresh kumar Date: Wed, 16 Feb 2011 07:41:06 +0100 Subject: [PATCH] --- yaml --- r: 233486 b: refs/heads/master c: ac1556b37e9b06a41d7691dca0d50a28210488f9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-spear/include/plat/uncompress.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3af472653e14..d103a97e021d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d16613586aa064d87ef05e3b929e3b4fdc714cc4 +refs/heads/master: ac1556b37e9b06a41d7691dca0d50a28210488f9 diff --git a/trunk/arch/arm/plat-spear/include/plat/uncompress.h b/trunk/arch/arm/plat-spear/include/plat/uncompress.h index 99ba6789cc97..6dd455bafdfd 100644 --- a/trunk/arch/arm/plat-spear/include/plat/uncompress.h +++ b/trunk/arch/arm/plat-spear/include/plat/uncompress.h @@ -24,10 +24,10 @@ static inline void putc(int c) { void __iomem *base = (void __iomem *)SPEAR_DBG_UART_BASE; - while (readl(base + UART01x_FR) & UART01x_FR_TXFF) + while (readl_relaxed(base + UART01x_FR) & UART01x_FR_TXFF) barrier(); - writel(c, base + UART01x_DR); + writel_relaxed(c, base + UART01x_DR); } static inline void flush(void)