summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorviresh kumar <viresh.kumar@st.com>2011-02-16 07:41:06 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-02-21 19:29:23 +0000
commitac1556b37e9b06a41d7691dca0d50a28210488f9 (patch)
treed20a18386bb46dfd003ce852c86397ba446f1951 /arch
parentd16613586aa064d87ef05e3b929e3b4fdc714cc4 (diff)
downloadlinux-3.10-ac1556b37e9b06a41d7691dca0d50a28210488f9.tar.gz
linux-3.10-ac1556b37e9b06a41d7691dca0d50a28210488f9.tar.bz2
linux-3.10-ac1556b37e9b06a41d7691dca0d50a28210488f9.zip
ARM: 6712/1: SPEAr: replace readl(), writel() with relaxed versions in uncompress.h
readl() and writel() calls the outer cache maintainance operations which are not available during Linux uncompression. This patch replaces readl() and writel() with readl_relaxed() and writel_relaxed() to avoid the link time errors. Reviewed-by: Stanley Miao <stanley.miao@windriver.com> Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-spear/include/plat/uncompress.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-spear/include/plat/uncompress.h b/arch/arm/plat-spear/include/plat/uncompress.h
index 99ba6789cc9..6dd455bafdf 100644
--- a/arch/arm/plat-spear/include/plat/uncompress.h
+++ b/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)