summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-05-13 11:42:40 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-05-13 11:42:40 +1000
commit131c6c9eddfa252e376edb4aeff9c7fe1b96a798 (patch)
tree4eb6909139decb6330f55cf6c53a554a6c22641f /arch
parent0fe1ac48bef018bed896307cd12f6ca9b5e704ab (diff)
parentb8b14c66765ccba884c5c4570bf8be361d211d95 (diff)
downloadop-kernel-dev-131c6c9eddfa252e376edb4aeff9c7fe1b96a798.zip
op-kernel-dev-131c6c9eddfa252e376edb4aeff9c7fe1b96a798.tar.gz
Merge commit 'kumar/merge' into merge
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/dma-swiotlb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c
index 59c9285..4ff4da2c 100644
--- a/arch/powerpc/kernel/dma-swiotlb.c
+++ b/arch/powerpc/kernel/dma-swiotlb.c
@@ -1,7 +1,8 @@
/*
* Contains routines needed to support swiotlb for ppc.
*
- * Copyright (C) 2009 Becky Bruce, Freescale Semiconductor
+ * Copyright (C) 2009-2010 Freescale Semiconductor, Inc.
+ * Author: Becky Bruce
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -70,7 +71,7 @@ static int ppc_swiotlb_bus_notify(struct notifier_block *nb,
sd->max_direct_dma_addr = 0;
/* May need to bounce if the device can't address all of DRAM */
- if (dma_get_mask(dev) < lmb_end_of_DRAM())
+ if ((dma_get_mask(dev) + 1) < lmb_end_of_DRAM())
set_dma_ops(dev, &swiotlb_dma_ops);
return NOTIFY_DONE;
OpenPOWER on IntegriCloud