diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-17 13:08:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-17 13:08:17 -0700 |
| commit | d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b (patch) | |
| tree | 7887d95ec36087946a2c4b4c9ee0850c361fe22f /arch/ia64/kernel | |
| parent | c231c7db30faf93419fc22d680f74d816bea70e2 (diff) | |
| parent | c149ec05dcd09d525e6778e339122827c7cd79b8 (diff) | |
| download | linux-stable-d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b.tar.gz linux-stable-d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b.tar.bz2 linux-stable-d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b.zip | |
Merge head 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/perfmon.c | 1 | ||||
| -rw-r--r-- | arch/ia64/kernel/salinfo.c | 3 |
2 files changed, 3 insertions, 1 deletions
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) DPRINT(("before cmpxchg() old_ctx=%p new_ctx=%p\n", thread->pfm_context, ctx)); + ret = -EBUSY; old = ia64_cmpxchg(acq, &thread->pfm_context, NULL, ctx, sizeof(pfm_context_t *)); if (old != NULL) { 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 { static struct salinfo_data salinfo_data[ARRAY_SIZE(salinfo_log_name)]; -static spinlock_t data_lock, data_saved_lock; +static DEFINE_SPINLOCK(data_lock); +static DEFINE_SPINLOCK(data_saved_lock); /** salinfo_platform_oemdata - optional callback to decode oemdata from an error * record. |