diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-16 14:54:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-16 14:54:13 -0400 |
| commit | 0d0fc3a2d6901bdedd8497acdb3358e2da9abefc (patch) | |
| tree | 6c8a85670c48cb4bd0b95eefcb11a020436f2ff1 /arch/ia64/kernel/perfmon.c | |
| parent | 06168d8a10ceccced51380d683245b33474d428a (diff) | |
| parent | 20305e59724381365096b6ab0a48054723367c80 (diff) | |
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/perfmon.c')
| -rw-r--r-- | arch/ia64/kernel/perfmon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 1650353e3f77..af42cda6be80 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
| @@ -574,7 +574,7 @@ pfm_protect_ctx_ctxsw(pfm_context_t *x) | |||
| 574 | return 0UL; | 574 | return 0UL; |
| 575 | } | 575 | } |
| 576 | 576 | ||
| 577 | static inline unsigned long | 577 | static inline void |
| 578 | pfm_unprotect_ctx_ctxsw(pfm_context_t *x, unsigned long f) | 578 | pfm_unprotect_ctx_ctxsw(pfm_context_t *x, unsigned long f) |
| 579 | { | 579 | { |
| 580 | spin_unlock(&(x)->ctx_lock); | 580 | spin_unlock(&(x)->ctx_lock); |