Commit 1c8950ff authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[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: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 9f1067c2

arch/powerpc/xmon/xmon.c

+6 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
#define skipbl	xmon_skipbl



#ifdef CONFIG_SMP

cpumask_t cpus_in_xmon = CPU_MASK_NONE;

static cpumask_t cpus_in_xmon = CPU_MASK_NONE;

static unsigned long xmon_taken = 1;

static int xmon_owner;

static int xmon_gate;
@@ -327,6 +327,11 @@ static void release_output_lock(void) 
{

	xmon_speaker = 0;

}



int cpus_are_in_xmon(void)

{

	return !cpus_empty(cpus_in_xmon);

}

#endif



static int xmon_core(struct pt_regs *regs, int fromipi)

drivers/char/hvc_console.c

+1 −7
Original line number Diff line number Diff line
@@ -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);

drivers/char/hvc_console.h

+10 −0
Original line number Diff line number Diff line
@@ -60,4 +60,14 @@ extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq, 
/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */

extern int __devexit hvc_remove(struct hvc_struct *hp);





#if defined(CONFIG_XMON) && defined(CONFIG_SMP)

#include <asm/xmon.h>

#else

static inline int cpus_are_in_xmon(void)

{

	return 0;

}

#endif



#endif // HVC_CONSOLE_H

include/asm-powerpc/xmon.h

+4 −0
Original line number Diff line number Diff line
@@ -25,5 +25,9 @@ static inline void xmon_setup(void) { }; 
static inline void xmon_register_spus(struct list_head *list) { };

#endif



#if defined(CONFIG_XMON) && defined(CONFIG_SMP)

extern int cpus_are_in_xmon(void);

#endif



#endif /* __KERNEL __ */

#endif /* __ASM_POWERPC_XMON_H */