diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-06-09 09:26:44 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-06-09 09:26:44 +0200 |
| commit | 7a429bfb3b11a4af5ab0a328a22c354b3838a7a7 (patch) | |
| tree | ba8f6854c8a267c1ea6a5a591456de52ca45e02e /arch | |
| parent | 760e652a7aca15c3ba67f3e7ad4488d49f7a629a (diff) | |
| parent | 79eba3029f330682d9ba1f5d248720c761de14a7 (diff) | |
| download | barebox-7a429bfb3b11a4af5ab0a328a22c354b3838a7a7.tar.gz barebox-7a429bfb3b11a4af5ab0a328a22c354b3838a7a7.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/lowlevel.h | 4 | ||||
| -rw-r--r-- | arch/mips/include/asm/debug_ll_ns16550.h | 2 | ||||
| -rw-r--r-- | arch/mips/mach-ath79/include/mach/debug_ll.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/include/mach/lowlevel.h b/arch/arm/mach-tegra/include/mach/lowlevel.h index f1fea86cf6..768b13d968 100644 --- a/arch/arm/mach-tegra/include/mach/lowlevel.h +++ b/arch/arm/mach-tegra/include/mach/lowlevel.h @@ -111,9 +111,9 @@ u32 tegra_get_odmdata(void) return 0; } - bctptr = cpu_readl(TEGRA_IRAM_BASE + bctptr_offset); + bctptr = __raw_readl(TEGRA_IRAM_BASE + bctptr_offset); - return cpu_readl(bctptr + odmdata_offset); + return __raw_readl(bctptr + odmdata_offset); } static __always_inline diff --git a/arch/mips/include/asm/debug_ll_ns16550.h b/arch/mips/include/asm/debug_ll_ns16550.h index a3e1c52f63..4a6562f7c1 100644 --- a/arch/mips/include/asm/debug_ll_ns16550.h +++ b/arch/mips/include/asm/debug_ll_ns16550.h @@ -57,7 +57,7 @@ #include <asm/io.h> -static __inline__ void PUTC_LL(char ch) +static inline void PUTC_LL(char ch) { #ifdef CONFIG_DEBUG_LL while (!(__raw_readb((u8 *)DEBUG_LL_UART_ADDR + UART_LSR) & UART_LSR_THRE)) diff --git a/arch/mips/mach-ath79/include/mach/debug_ll.h b/arch/mips/mach-ath79/include/mach/debug_ll.h index c697318488..64db67499c 100644 --- a/arch/mips/mach-ath79/include/mach/debug_ll.h +++ b/arch/mips/mach-ath79/include/mach/debug_ll.h @@ -41,12 +41,12 @@ static inline void ar933x_debug_ll_writel(u32 b, int offset) { - cpu_writel(b, (u8 *)DEBUG_LL_UART_ADDR + offset); + __raw_writel(b, (u8 *)DEBUG_LL_UART_ADDR + offset); } static inline u32 ar933x_debug_ll_readl(int offset) { - return cpu_readl((u8 *)DEBUG_LL_UART_ADDR + offset); + return __raw_readl((u8 *)DEBUG_LL_UART_ADDR + offset); } static inline void PUTC_LL(int ch) |