git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
ia64
/
kernel
/
smpboot.c
diff --git
a/arch/ia64/kernel/smpboot.c
b/arch/ia64/kernel/smpboot.c
index
f0dd8c3
..
02dc1fc
100644
(file)
--- a/
arch/ia64/kernel/smpboot.c
+++ b/
arch/ia64/kernel/smpboot.c
@@
-29,9
+29,9
@@
#include <linux/spinlock.h>
#include <linux/efi.h>
#include <linux/percpu.h>
#include <linux/spinlock.h>
#include <linux/efi.h>
#include <linux/percpu.h>
+#include <linux/bitops.h>
#include <asm/atomic.h>
#include <asm/atomic.h>
-#include <asm/bitops.h>
#include <asm/cache.h>
#include <asm/current.h>
#include <asm/delay.h>
#include <asm/cache.h>
#include <asm/current.h>
#include <asm/delay.h>
@@
-68,7
+68,7
@@
#define NUM_ROUNDS 64 /* magic value */
#define NUM_ITERS 5 /* likewise */
#define NUM_ROUNDS 64 /* magic value */
#define NUM_ITERS 5 /* likewise */
-static
spinlock_t itc_sync_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(itc_sync_lock)
;
static volatile unsigned long go[SLAVE + 1];
#define DEBUG_ITC_SYNC 0
static volatile unsigned long go[SLAVE + 1];
#define DEBUG_ITC_SYNC 0
@@
-343,8
+343,6
@@
smp_callin (void)
int __devinit
start_secondary (void *unused)
{
int __devinit
start_secondary (void *unused)
{
- extern int cpu_idle (void);
-
/* Early console may use I/O ports */
ia64_set_kr(IA64_KR_IO_BASE, __pa(ia64_iobase));
/* Early console may use I/O ports */
ia64_set_kr(IA64_KR_IO_BASE, __pa(ia64_iobase));
@@
-353,7
+351,8
@@
start_secondary (void *unused)
cpu_init();
smp_callin();
cpu_init();
smp_callin();
- return cpu_idle();
+ cpu_idle();
+ return 0;
}
struct pt_regs * __devinit idle_regs(struct pt_regs *regs)
}
struct pt_regs * __devinit idle_regs(struct pt_regs *regs)
@@
-613,8
+612,7
@@
void __cpu_die(unsigned int cpu)
*/
return;
}
*/
return;
}
- current->state = TASK_UNINTERRUPTIBLE;
- schedule_timeout(HZ/10);
+ msleep(100);
}
printk(KERN_ERR "CPU %u didn't die...\n", cpu);
}
}
printk(KERN_ERR "CPU %u didn't die...\n", cpu);
}