Merge tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6

Pull PARISC misc updates from James Bottomley:
 "This is a couple of minor updates (fixing lws futex locking and
  removing some obsolete cpu_*_map calls)."

* tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  [PARISC] remove references to cpu_*_map.
  [PARISC] futex: Use same lock set as lws calls

diff --combined arch/parisc/kernel/smp.c
index 5006e8ea305183eb5998d6f273cd3ad15dd2df7c,e30ff2e5521c414e3a849e0c5eef8ce8e903dc03..0bb1d63907f88a4ac915c2398b9a154744d91265
--- 1/arch/parisc/kernel/smp.c
--- 2/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@@ -32,6 -32,7 +32,6 @@@
  #include <linux/bitops.h>
  #include <linux/ftrace.h>
  
 -#include <asm/system.h>
  #include <linux/atomic.h>
  #include <asm/current.h>
  #include <asm/delay.h>
@@@ -290,8 -291,7 +290,7 @@@ smp_cpu_init(int cpunum
        mb();
  
        /* Well, support 2.4 linux scheme as well. */
-       if (cpu_isset(cpunum, cpu_online_map))
-       {
+       if (cpu_online(cpunum)) {
                extern void machine_halt(void); /* arch/parisc.../process.c */
  
                printk(KERN_CRIT "CPU#%d already initialized!\n", cpunum);