diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-13 10:45:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-13 10:45:49 -0700 |
commit | c78a9b9b8e36b8de302eddbe7a1688af3d9650ff (patch) | |
tree | 3857996cf30ae6a60b5afe2e1e3e30f75fbca05e /arch/x86/kernel | |
parent | 842c895d140a75e5d67fa346213deb3ca2b460f8 (diff) | |
parent | 5f127133ee432d0b83ee26e8e3a3d7828ab5f2b1 (diff) | |
download | blackbird-op-linux-c78a9b9b8e36b8de302eddbe7a1688af3d9650ff.tar.gz blackbird-op-linux-c78a9b9b8e36b8de302eddbe7a1688af3d9650ff.zip |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ftrace: Revert 8ab2b7efd ftrace: Remove unnecessary disabling of irqs
kprobes/trace: Fix kprobe selftest for gcc 4.6
ftrace: Fix possible undefined return code
oprofile, dcookies: Fix possible circular locking dependency
oprofile: Fix locking dependency in sync_start()
oprofile: Free potentially owned tasks in case of errors
oprofile, x86: Add comments to IBS LVT offset initialization
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/apic/apic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index b961af86bfea..b9338b8cf420 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -390,7 +390,8 @@ static unsigned int reserve_eilvt_offset(int offset, unsigned int new) /* * If mask=1, the LVT entry does not generate interrupts while mask=0 - * enables the vector. See also the BKDGs. + * enables the vector. See also the BKDGs. Must be called with + * preemption disabled. */ int setup_APIC_eilvt(u8 offset, u8 vector, u8 msg_type, u8 mask) |