adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

highmem: Fix debug_kmap_atomic() to also handle KM_IRQ_PTE, KM_NMI, and KM_NMI_PTE

Browse source 
Previously calling debug_kmap_atomic() with these types would
cause spurious warnings.

(triggered by SysProf using perf events)

Signed-off-by: Soeren Sandmann Pedersen <sandmann@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: a.p.zijlstra@chello.nl
Cc: <stable@kernel.org> # .31.x
LKML-Reference: <ye8vdhz8krw.fsf@camel23.daimi.au.dk>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Soeren Sandmann 2009-10-28 18:56:35 +01:00 committed by Ingo Molnar
parent 5ebd4c2289
commit d451564669
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mm/highmem.c
View file

@ -432,10 +432,15 @@ void debug_kmap_atomic(enum km_type type)
return; return;
if (unlikely(in_interrupt())) { if (unlikely(in_interrupt())) {
if (in_irq()) { if (in_nmi()) {
if (type != KM_NMI && type != KM_NMI_PTE) {
WARN_ON(1);
warn_count--;
}
} else if (in_irq()) {
if (type != KM_IRQ0 && type != KM_IRQ1 && if (type != KM_IRQ0 && type != KM_IRQ1 &&
type != KM_BIO_SRC_IRQ && type != KM_BIO_DST_IRQ && type != KM_BIO_SRC_IRQ && type != KM_BIO_DST_IRQ &&
type != KM_BOUNCE_READ) { type != KM_BOUNCE_READ && type != KM_IRQ_PTE) {
WARN_ON(1); WARN_ON(1);
warn_count--; warn_count--;
} }
@ -452,7 +457,9 @@ void debug_kmap_atomic(enum km_type type)
} }
if (type == KM_IRQ0 || type == KM_IRQ1 || type == KM_BOUNCE_READ || if (type == KM_IRQ0 || type == KM_IRQ1 || type == KM_BOUNCE_READ ||
type == KM_BIO_SRC_IRQ || type == KM_BIO_DST_IRQ) { type == KM_BIO_SRC_IRQ || type == KM_BIO_DST_IRQ ||
type == KM_IRQ_PTE || type == KM_NMI ||
type == KM_NMI_PTE ) {
if (!irqs_disabled()) { if (!irqs_disabled()) {
WARN_ON(1); WARN_ON(1);
warn_count--; warn_count--;