diff options
Diffstat (limited to 'arch/arm/mach-realview')
-rw-r--r-- | arch/arm/mach-realview/hotplug.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/debug-macro.S | 17 |
2 files changed, 3 insertions, 16 deletions
diff --git a/arch/arm/mach-realview/hotplug.c b/arch/arm/mach-realview/hotplug.c index a87523d095e6..ac1aed2a8da4 100644 --- a/arch/arm/mach-realview/hotplug.c +++ b/arch/arm/mach-realview/hotplug.c | |||
@@ -69,7 +69,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious) | |||
69 | : | 69 | : |
70 | : "memory", "cc"); | 70 | : "memory", "cc"); |
71 | 71 | ||
72 | if (pen_release == cpu) { | 72 | if (pen_release == cpu_logical_map(cpu)) { |
73 | /* | 73 | /* |
74 | * OK, proper wakeup, we're done | 74 | * OK, proper wakeup, we're done |
75 | */ | 75 | */ |
diff --git a/arch/arm/mach-realview/include/mach/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S index fb4901c4ef04..8cc372dc66a8 100644 --- a/arch/arm/mach-realview/include/mach/debug-macro.S +++ b/arch/arm/mach-realview/include/mach/debug-macro.S | |||
@@ -10,23 +10,10 @@ | |||
10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #if defined(CONFIG_MACH_REALVIEW_EB) || \ | 13 | #ifdef CONFIG_DEBUG_REALVIEW_STD_PORT |
14 | defined(CONFIG_MACH_REALVIEW_PB11MP) || \ | ||
15 | defined(CONFIG_MACH_REALVIEW_PBA8) || \ | ||
16 | defined(CONFIG_MACH_REALVIEW_PBX) | ||
17 | #ifndef DEBUG_LL_UART_OFFSET | ||
18 | #define DEBUG_LL_UART_OFFSET 0x00009000 | 14 | #define DEBUG_LL_UART_OFFSET 0x00009000 |
19 | #elif DEBUG_LL_UART_OFFSET != 0x00009000 | 15 | #elif defined(CONFIG_DEBUG_REALVIEW_PB1176_PORT) |
20 | #warning "DEBUG_LL_UART_OFFSET already defined to a different value" | ||
21 | #endif | ||
22 | #endif | ||
23 | |||
24 | #ifdef CONFIG_MACH_REALVIEW_PB1176 | ||
25 | #ifndef DEBUG_LL_UART_OFFSET | ||
26 | #define DEBUG_LL_UART_OFFSET 0x0010c000 | 16 | #define DEBUG_LL_UART_OFFSET 0x0010c000 |
27 | #elif DEBUG_LL_UART_OFFSET != 0x0010c000 | ||
28 | #warning "DEBUG_LL_UART_OFFSET already defined to a different value" | ||
29 | #endif | ||
30 | #endif | 17 | #endif |
31 | 18 | ||
32 | #ifndef DEBUG_LL_UART_OFFSET | 19 | #ifndef DEBUG_LL_UART_OFFSET |