public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
	Zwane Mwaikambo <zwane@arm.linux.org.uk>,
	"Theodore Ts'o" <tytso@mit.edu>,
	Randy Dunlap <rdunlap@xenotime.net>,
	Dave Jones <davej@redhat.com>,
	Chuck Wolber <chuckw@quantumlinux.com>,
	torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk,
	ak@suse.de
Subject: [patch 09/12] Mask off GFP flags before swiotlb_alloc_coherent
Date: Fri, 27 Jan 2006 18:21:21 -0800	[thread overview]
Message-ID: <20060128022121.GJ17001@kroah.com> (raw)
In-Reply-To: <20060128022023.GA17001@kroah.com>

[-- Attachment #1: mask-off-GFP-flags-before-swiotlb_alloc_coherent.patch --]
[-- Type: text/plain, Size: 732 bytes --]

2.6.15.2 -stable review patch.  If anyone has any objections, please let 
us know.

------------------

From: Andi Kleen <ak@muc.de>

Mask off GFP flags before swiotlb_alloc_coherent

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Chris Wright <chris@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 arch/x86_64/kernel/pci-gart.c |    1 +
 1 file changed, 1 insertion(+)

--- linux-2.6.15.1.orig/arch/x86_64/kernel/pci-gart.c
+++ linux-2.6.15.1/arch/x86_64/kernel/pci-gart.c
@@ -244,6 +244,7 @@ dma_alloc_coherent(struct device *dev, s
 					   get_order(size));
 
 				if (swiotlb) {
+					gfp &= ~(GFP_DMA32|GFP_DMA);
 					return
 					swiotlb_alloc_coherent(dev, size,
 							       dma_handle,

--

  parent reply	other threads:[~2006-01-28  2:23 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20060128020629.908825000@press.kroah.org>
2006-01-28  2:20 ` [patch 00/12] 2.6.15.2 -stable review Greg KH
2006-01-28  2:20   ` [patch 01/12] usb-audio: don't use empty packets at start of playback Greg KH
2006-01-28  2:20   ` [patch 02/12] [BLOCK] Kill blk_attempt_remerge() Greg KH
2006-01-28  2:20   ` [patch 03/12] Input: HID - fix an oops in PID initialization code Greg KH
2006-01-28  2:20   ` [patch 04/12] Fix double decrement of mqueue_mnt->mnt_count in sys_mq_open (CVE-2005-3356) Greg KH
2006-01-28  2:20   ` [patch 05/12] Fix oops in ufs_fill_super at mount time Greg KH
2006-01-28  2:21   ` [patch 06/12] elevator=as back-compatibility Greg KH
2006-01-28 19:19     ` Jens Axboe
2006-01-31  7:09       ` [stable] " Greg KH
2006-01-28  2:21   ` [patch 07/12] Fix timekeeping on sparc64 ultra-IIe machines Greg KH
2006-01-28  2:21   ` [patch 08/12] [NET]: Make second arg to skb_reserved() signed Greg KH
2006-01-28  2:21   ` Greg KH [this message]
2006-01-28  2:33     ` [patch 09/12] Mask off GFP flags before swiotlb_alloc_coherent Andi Kleen
2006-01-28  3:49       ` Andrew Morton
2006-01-28  6:04         ` Andi Kleen
2006-01-28  2:21   ` [patch 10/12] Someone broke reiserfs v3 mount options and this fixes it Greg KH
2006-01-28  2:21   ` [patch 11/12] Fix i2o_scsi oops on abort Greg KH
2006-01-28  2:21   ` [patch 12/12] Fix mkiss locking bug Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060128022121.GJ17001@kroah.com \
    --to=gregkh@suse.de \
    --cc=ak@suse.de \
    --cc=akpm@osdl.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=chuckw@quantumlinux.com \
    --cc=davej@redhat.com \
    --cc=jmforbes@linuxtx.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rdunlap@xenotime.net \
    --cc=stable@kernel.org \
    --cc=torvalds@osdl.org \
    --cc=tytso@mit.edu \
    --cc=zwane@arm.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox