diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2008-05-08 08:27:17 +0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-14 16:31:57 +0400 |
| commit | 1c8950ff87de950a3b6ccfb26650fc0a56278836 (patch) | |
| tree | 6491e5a9148fd8e4d275faf725f490065b007715 /drivers/char/hvc_console.c | |
| parent | 9f1067c2d98ac1c43f0c82892f5647774a6ac759 (diff) | |
| download | linux-1c8950ff87de950a3b6ccfb26650fc0a56278836.tar.xz | |
[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 'drivers/char/hvc_console.c')
| -rw-r--r-- | drivers/char/hvc_console.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index 44160d5ebca0..2f9759d625cc 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c @@ -675,12 +675,6 @@ static int hvc_poll(struct hvc_struct *hp) return poll_mask; } -#if defined(CONFIG_XMON) && defined(CONFIG_SMP) -extern cpumask_t cpus_in_xmon; -#else -static const cpumask_t cpus_in_xmon = CPU_MASK_NONE; -#endif - /* * This kthread is either polling or interrupt driven. This is determined by * calling hvc_poll() who determines whether a console adapter support @@ -698,7 +692,7 @@ static int khvcd(void *unused) hvc_kicked = 0; try_to_freeze(); wmb(); - if (cpus_empty(cpus_in_xmon)) { + if (!cpus_are_in_xmon()) { spin_lock(&hvc_structs_lock); list_for_each_entry(hp, &hvc_structs, next) { poll_mask |= hvc_poll(hp); |