diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2015-08-05 23:55:52 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-08-06 00:00:32 +0200 |
| commit | b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8 (patch) | |
| tree | 221d6c5be36fa3b2133200ebc3e520d4382dca8f /lib/dma-debug.c | |
| parent | x86/apic: Drop local_irq_save/restore in timer callbacks (diff) | |
| parent | Linux 4.2-rc4 (diff) | |
| download | wireguard-linux-b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8.tar.xz wireguard-linux-b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8.zip | |
Merge branch 'linus' into x86/apic
Pull in upstream changes to avoid conflicts
Diffstat (limited to 'lib/dma-debug.c')
| -rw-r--r-- | lib/dma-debug.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index ae4b65e17e64..dace71fe41f7 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -574,6 +574,9 @@ void debug_dma_assert_idle(struct page *page) unsigned long flags; phys_addr_t cln; + if (dma_debug_disabled()) + return; + if (!page) return; |