From 9f3a1d12229f41d4a89b5d546dbd509dacabce32 Mon Sep 17 00:00:00 2001
From: Steffen Persvold <sp@numascale.com>
Date: Thu, 15 Mar 2012 15:20:29 +0100
Subject: [PATCH] --- yaml --- r: 294820 b: refs/heads/master c:
 cebd5fa4d3046d5b43ce1836a0120612822a7fb0 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/iommu/amd_iommu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b61771efc643..cf1e3253c761 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 474d567db3d459d08ed0e683f4ace9b00ac2aa4b
+refs/heads/master: cebd5fa4d3046d5b43ce1836a0120612822a7fb0
diff --git a/trunk/drivers/iommu/amd_iommu.c b/trunk/drivers/iommu/amd_iommu.c
index f75e0608be5b..ae2ec929e52f 100644
--- a/trunk/drivers/iommu/amd_iommu.c
+++ b/trunk/drivers/iommu/amd_iommu.c
@@ -2804,7 +2804,7 @@ static int amd_iommu_dma_supported(struct device *dev, u64 mask)
  * we don't need to preallocate the protection domains anymore.
  * For now we have to.
  */
-static void prealloc_protection_domains(void)
+static void __init prealloc_protection_domains(void)
 {
 	struct iommu_dev_data *dev_data;
 	struct dma_ops_domain *dma_dom;