aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/xmon
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2008-05-08 00:27:17 -0400
committerPaul Mackerras <paulus@samba.org>2008-05-14 08:31:57 -0400
commit1c8950ff87de950a3b6ccfb26650fc0a56278836 (patch)
tree6491e5a9148fd8e4d275faf725f490065b007715 /arch/powerpc/xmon
parent9f1067c2d98ac1c43f0c82892f5647774a6ac759 (diff)
[POWERPC] Make cpus_in_xmon static and remove extern mess from hvc_console.c
This is a little messier than I'd like because xmon.h only exists on powerpc and we can't have a static inline and an extern declaration visible at the same time. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/xmon')
-rw-r--r--arch/powerpc/xmon/xmon.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 95f24c9822b..6726da07c06 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -54,7 +54,7 @@
54#define skipbl xmon_skipbl 54#define skipbl xmon_skipbl
55 55
56#ifdef CONFIG_SMP 56#ifdef CONFIG_SMP
57cpumask_t cpus_in_xmon = CPU_MASK_NONE; 57static cpumask_t cpus_in_xmon = CPU_MASK_NONE;
58static unsigned long xmon_taken = 1; 58static unsigned long xmon_taken = 1;
59static int xmon_owner; 59static int xmon_owner;
60static int xmon_gate; 60static int xmon_gate;
@@ -327,6 +327,11 @@ static void release_output_lock(void)
327{ 327{
328 xmon_speaker = 0; 328 xmon_speaker = 0;
329} 329}
330
331int cpus_are_in_xmon(void)
332{
333 return !cpus_empty(cpus_in_xmon);
334}
330#endif 335#endif
331 336
332static int xmon_core(struct pt_regs *regs, int fromipi) 337static int xmon_core(struct pt_regs *regs, int fromipi)