From 03bc77efb9eb5543ba43c1c3ac6b66d2e7effc01 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Tue, 16 Dec 2008 12:17:35 -0800
Subject: [PATCH] --- yaml --- r: 123211 b: refs/heads/master c:
 8ce7996009bab7b2d23e7af7ad831fed7eb6faa1 h: refs/heads/master i:   123209:
 db3380390932dd0d5fb6efe86ab7f8f31db0abe6   123207:
 06490ce26c458f27b70b18aa70c563b729d1a560 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/x86/kernel/pci-swiotlb_64.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index aca62b8c0f9e..0b657a0c7aa4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e5b2b86b65fe36bb8401e5608eb0b7603aa1cab
+refs/heads/master: 8ce7996009bab7b2d23e7af7ad831fed7eb6faa1
diff --git a/trunk/arch/x86/kernel/pci-swiotlb_64.c b/trunk/arch/x86/kernel/pci-swiotlb_64.c
index 3c539d111abb..f47a097a135b 100644
--- a/trunk/arch/x86/kernel/pci-swiotlb_64.c
+++ b/trunk/arch/x86/kernel/pci-swiotlb_64.c
@@ -3,6 +3,8 @@
 #include <linux/pci.h>
 #include <linux/cache.h>
 #include <linux/module.h>
+#include <linux/swiotlb.h>
+#include <linux/bootmem.h>
 #include <linux/dma-mapping.h>
 
 #include <asm/iommu.h>
@@ -11,6 +13,16 @@
 
 int swiotlb __read_mostly;
 
+void *swiotlb_alloc_boot(size_t size, unsigned long nslabs)
+{
+	return alloc_bootmem_low_pages(size);
+}
+
+void *swiotlb_alloc(unsigned order, unsigned long nslabs)
+{
+	return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order);
+}
+
 static dma_addr_t
 swiotlb_map_single_phys(struct device *hwdev, phys_addr_t paddr, size_t size,
 			int direction)