diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-06-08 09:49:03 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-08 09:49:03 -0400 |
| commit | 86dd7909c2c4ae3f219a9233bf0f095b05632ecf (patch) | |
| tree | 1808de2a661434cc8a930bc8f8a248c5cf70ca2c /arch/x86/kernel | |
| parent | d7ebe75b065a7c2d58ffc12f9d2e00d5ea4e71eb (diff) | |
| parent | cbf74cea070fa1f705de4712e25d9e56ae6543c7 (diff) | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
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) | |||
| 390 | 390 | ||
| 391 | /* | 391 | /* |
| 392 | * If mask=1, the LVT entry does not generate interrupts while mask=0 | 392 | * If mask=1, the LVT entry does not generate interrupts while mask=0 |
| 393 | * enables the vector. See also the BKDGs. | 393 | * enables the vector. See also the BKDGs. Must be called with |
| 394 | * preemption disabled. | ||
| 394 | */ | 395 | */ |
| 395 | 396 | ||
| 396 | int setup_APIC_eilvt(u8 offset, u8 vector, u8 msg_type, u8 mask) | 397 | int setup_APIC_eilvt(u8 offset, u8 vector, u8 msg_type, u8 mask) |