[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>
This commit is contained in:

committed by
Paul Mackerras

parent
9f1067c2d9
commit
1c8950ff87
@@ -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);
|
||||
|
Reference in New Issue
Block a user