/[linux-patches]/genpatches-2.6/trunk/2.6.14/1409_15.2_swiotlb-alloc-mask-gfp.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14/1409_15.2_swiotlb-alloc-mask-gfp.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 328 - (show annotations) (download) (as text)
Tue Mar 14 13:34:17 2006 UTC (14 years, 8 months ago) by johnm
File MIME type: text/x-diff
File size: 1229 byte(s)
2.6.14-11, rebase against local tree
1 Backported for 2.6.14 by Kerin Millar <kerframil@gmail.com>:
2
3 From stable-bounces@linux.kernel.org Sat Jan 21 13:18:41 2006
4 Date: Sat, 21 Jan 2006 13:13:13 -0800
5 From: Andrew Morton <akpm@osdl.org>
6 To: stable@kernel.org
7 Message-Id: <20060121131313.551c624f.akpm@osdl.org>
8 Cc: Andi Kleen <ak@muc.de>
9 Subject: [PATCH] Mask off GFP flags before swiotlb_alloc_coherent
10
11 From: Andi Kleen <ak@muc.de>
12
13 Mask off GFP flags before swiotlb_alloc_coherent
14
15 Signed-off-by: Andi Kleen <ak@suse.de>
16 Signed-off-by: Chris Wright <chris@sous-sol.org>
17 ---
18
19 akpm: Guys, this is a simple patch from Andi to fix a gfp.h BUG due to us
20 passing bad gfp flags into gfp_zone.
21
22 This is not a 2.6.16-x backport - because the pci-gart code in mainline gt
23 radically redone.
24
25 This is, I think, a new problem for -stable. This code hasn't had the
26 normal external testing...
27
28 --- linux-2.6.14.orig/arch/x86_64/kernel/pci-gart.c 2005-10-27 19:02:08.000000000 -0500
29 +++ linux-2.6.14/arch/x86_64/kernel/pci-gart.c 2006-01-27 09:40:55.000000000 -0500
30 @@ -238,6 +238,7 @@ dma_alloc_coherent(struct device *dev, s
31 get_order(size));
32
33 if (swiotlb) {
34 + gfp &= ~GFP_DMA;
35 return
36 swiotlb_alloc_coherent(dev, size,
37 dma_handle,

  ViewVC Help
Powered by ViewVC 1.1.20