diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 11:54:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 11:54:24 +0200 |
| commit | 3825c9e8d01e4310c40a3903a354c433c32a7b6f (patch) | |
| tree | 87c94a8076bbb38bd2cf20ab9bc23d6f74f6a0a8 /drivers/misc/sgi-xp/xpc_main.c | |
| parent | 5d7b605245b1aa1a9cd6549b1f57d69273eb0c37 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
| download | op-kernel-dev-3825c9e8d01e4310c40a3903a354c433c32a7b6f.zip op-kernel-dev-3825c9e8d01e4310c40a3903a354c433c32a7b6f.tar.gz | |
Merge commit 'v2.6.27-rc1' into x86/microcode
Conflicts:
arch/x86/kernel/microcode.c
Manual resolutions:
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_intel.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/misc/sgi-xp/xpc_main.c')
| -rw-r--r-- | drivers/misc/sgi-xp/xpc_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c index 579b01f..c3b4227 100644 --- a/drivers/misc/sgi-xp/xpc_main.c +++ b/drivers/misc/sgi-xp/xpc_main.c @@ -229,11 +229,10 @@ xpc_hb_checker(void *ignore) int last_IRQ_count = 0; int new_IRQ_count; int force_IRQ = 0; - cpumask_of_cpu_ptr(cpumask, XPC_HB_CHECK_CPU); /* this thread was marked active by xpc_hb_init() */ - set_cpus_allowed_ptr(current, cpumask); + set_cpus_allowed_ptr(current, &cpumask_of_cpu(XPC_HB_CHECK_CPU)); /* set our heartbeating to other partitions into motion */ xpc_hb_check_timeout = jiffies + (xpc_hb_check_interval * HZ); |
