Commit 869e333a authored by Anton Blanchard's avatar Anton Blanchard

Merge samba.org:/scratch/anton/tmp3

into samba.org:/scratch/anton/linux-2.5_ppc64drivers
parents 269d44df 93c79bbe
...@@ -227,7 +227,12 @@ static void hvc_poll(int index) ...@@ -227,7 +227,12 @@ static void hvc_poll(int index)
spin_unlock_irqrestore(&hp->lock, flags); spin_unlock_irqrestore(&hp->lock, flags);
} }
#if defined (CONFIG_XMON)
extern unsigned long cpus_in_xmon; extern unsigned long cpus_in_xmon;
#else
unsigned long cpus_in_xmon=0;
#endif
int khvcd(void *unused) int khvcd(void *unused)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment