lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'kumar/merge' into merge

Browse Source
This commit is contained in:
Benjamin Herrenschmidt
2010-05-13 11:42:40 +10:00
parent 0fe1ac48be b8b14c6676
commit 131c6c9edd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/kernel/dma-swiotlb.c
View File

@@ -1,7 +1,8 @@
/* /*
* Contains routines needed to support swiotlb for ppc. * 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 * 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 * 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; sd->max_direct_dma_addr = 0;
/* May need to bounce if the device can't address all of DRAM */ /* 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); set_dma_ops(dev, &swiotlb_dma_ops);
return NOTIFY_DONE; return NOTIFY_DONE;