highmem: Fix debug_kmap_atomic() to also handle KM_IRQ_PTE, KM_NMI, and KM_NMI_PTE
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:
parent
5ebd4c2289
commit
d451564669
13
mm/highmem.c
13
mm/highmem.c
|
@ -432,10 +432,15 @@ void debug_kmap_atomic(enum km_type type)
|
|||
return;
|
||||
|
||||
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 &&
|
||||
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_count--;
|
||||
}
|
||||
|
@ -452,7 +457,9 @@ void debug_kmap_atomic(enum km_type type)
|
|||
}
|
||||
|
||||
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()) {
|
||||
WARN_ON(1);
|
||||
warn_count--;
|
||||
|
|
Loading…
Reference in a new issue