summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-31 22:54:13 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-31 22:54:13 +0300
commit2d959e95658a0224b0dd0d787926d5ffc95f9574 (patch)
tree50654e11ffbc1ee913f6ebd174add04d2daeabe7 /lib
parent9d6e323c687c7b94c703c9b0900a74e5d262d462 (diff)
parentf405d2c02395a74d3883bd03ded36457aa3697ad (diff)
downloadlinux-2d959e95658a0224b0dd0d787926d5ffc95f9574.tar.xz
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86/agp: Fix agp_amd64_init() initialization with CONFIG_GART_IOMMU enabled x86: SGI UV: Fix writes to led registers on remote uv hubs x86, kmemcheck: Use KERN_WARNING for error reporting x86: Use KERN_DEFAULT log-level in __show_regs() x86, compress: Force i386 instructions for the decompressor x86/amd-iommu: Fix initialization failure panic dma-debug: Do not add notifier when dma debugging is disabled. x86: Fix objdump version check in chkobjdump.awk for different formats. Trivial conflicts in arch/x86/include/asm/uv/uv_hub.h due to me having applied an earlier version of an SGI UV fix.
Diffstat (limited to 'lib')
-rw-r--r--lib/dma-debug.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index d9b08e0f7f55..739974460c32 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -676,6 +676,8 @@ static int dma_debug_device_change(struct notifier_block *nb,
struct device *dev = data;
int count;
+ if (global_disable)
+ return;
switch (action) {
case BUS_NOTIFY_UNBOUND_DRIVER:
@@ -697,6 +699,9 @@ void dma_debug_add_bus(struct bus_type *bus)
{
struct notifier_block *nb;
+ if (global_disable)
+ return;
+
nb = kzalloc(sizeof(struct notifier_block), GFP_KERNEL);
if (nb == NULL) {
pr_err("dma_debug_add_bus: out of memory\n");