diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-13 03:42:40 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-13 03:42:40 +0200 |
| commit | 131c6c9eddfa252e376edb4aeff9c7fe1b96a798 (patch) | |
| tree | 4eb6909139decb6330f55cf6c53a554a6c22641f /arch | |
| parent | powerpc/perf_event: Fix oops due to perf_event_do_pending call (diff) | |
| parent | powerpc/swiotlb: Fix off by one in determining boundary of which ops to use (diff) | |
| download | linux-131c6c9eddfa252e376edb4aeff9c7fe1b96a798.tar.xz linux-131c6c9eddfa252e376edb4aeff9c7fe1b96a798.zip | |
Merge commit 'kumar/merge' into merge
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/dma-swiotlb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c index 59c928564a03..4ff4da2c238b 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; |