From efa5f7b02f7b31454623c65632e2572cdff3fd08 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 12 May 2008 15:43:37 +0200
Subject: [PATCH] --- yaml --- r: 99366 b: refs/heads/master c:
 311f83494830fec17f086401a5b43984bb447cd2 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/pci-dma.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3055a3ac8e25..c377b5980617 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 968cbfad1a727b5689ae620f4d970abf6ce73340
+refs/heads/master: 311f83494830fec17f086401a5b43984bb447cd2
diff --git a/trunk/arch/x86/kernel/pci-dma.c b/trunk/arch/x86/kernel/pci-dma.c
index c5ef1af8e79d..5bc29ca4196e 100644
--- a/trunk/arch/x86/kernel/pci-dma.c
+++ b/trunk/arch/x86/kernel/pci-dma.c
@@ -357,7 +357,7 @@ int dma_supported(struct device *dev, u64 mask)
 EXPORT_SYMBOL(dma_supported);
 
 /* Allocate DMA memory on node near device */
-noinline struct page *
+static noinline struct page *
 dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order)
 {
 	int node;