diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-18 22:14:39 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-18 22:14:39 -0400 |
commit | a3bc068022b968a3042b48eb9a8e8b0418fb9cdd (patch) | |
tree | 6bbc2806756924105802f4584157396fb98d282c /arch/ia64/kernel | |
parent | 54cfb5aa0f4859bd38706eabe0118175780a542f (diff) | |
parent | 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 (diff) |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ia64/kernel')
-rw-r--r-- | arch/ia64/kernel/domain.c | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/perfmon.c | 1 | ||||
-rw-r--r-- | arch/ia64/kernel/salinfo.c | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/ia64/kernel/domain.c b/arch/ia64/kernel/domain.c index d65e87b6394f..bbb8efe126b7 100644 --- a/arch/ia64/kernel/domain.c +++ b/arch/ia64/kernel/domain.c | |||
@@ -341,7 +341,7 @@ next_sg: | |||
341 | #endif | 341 | #endif |
342 | 342 | ||
343 | /* Attach the domains */ | 343 | /* Attach the domains */ |
344 | for_each_online_cpu(i) { | 344 | for_each_cpu_mask(i, *cpu_map) { |
345 | struct sched_domain *sd; | 345 | struct sched_domain *sd; |
346 | #ifdef CONFIG_SCHED_SMT | 346 | #ifdef CONFIG_SCHED_SMT |
347 | sd = &per_cpu(cpu_domains, i); | 347 | sd = &per_cpu(cpu_domains, i); |
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index b8ebb8e427ef..f1201ac8a116 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
@@ -4312,6 +4312,7 @@ pfm_context_load(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs) | |||
4312 | DPRINT(("before cmpxchg() old_ctx=%p new_ctx=%p\n", | 4312 | DPRINT(("before cmpxchg() old_ctx=%p new_ctx=%p\n", |
4313 | thread->pfm_context, ctx)); | 4313 | thread->pfm_context, ctx)); |
4314 | 4314 | ||
4315 | ret = -EBUSY; | ||
4315 | old = ia64_cmpxchg(acq, &thread->pfm_context, NULL, ctx, sizeof(pfm_context_t *)); | 4316 | old = ia64_cmpxchg(acq, &thread->pfm_context, NULL, ctx, sizeof(pfm_context_t *)); |
4316 | if (old != NULL) { | 4317 | if (old != NULL) { |
4317 | DPRINT(("load_pid [%d] already has a context\n", req->load_pid)); | 4318 | DPRINT(("load_pid [%d] already has a context\n", req->load_pid)); |
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c index d227fabecd02..6f0cc7a6634e 100644 --- a/arch/ia64/kernel/salinfo.c +++ b/arch/ia64/kernel/salinfo.c | |||
@@ -143,7 +143,8 @@ struct salinfo_data { | |||
143 | 143 | ||
144 | static struct salinfo_data salinfo_data[ARRAY_SIZE(salinfo_log_name)]; | 144 | static struct salinfo_data salinfo_data[ARRAY_SIZE(salinfo_log_name)]; |
145 | 145 | ||
146 | static spinlock_t data_lock, data_saved_lock; | 146 | static DEFINE_SPINLOCK(data_lock); |
147 | static DEFINE_SPINLOCK(data_saved_lock); | ||
147 | 148 | ||
148 | /** salinfo_platform_oemdata - optional callback to decode oemdata from an error | 149 | /** salinfo_platform_oemdata - optional callback to decode oemdata from an error |
149 | * record. | 150 | * record. |