From 4e4a81cbd2c47eb57f2887b425a6ce681af7ca7b Mon Sep 17 00:00:00 2001
From: Tony Luck <tony.luck@intel.com>
Date: Thu, 10 May 2007 11:57:58 -0700
Subject: [PATCH] --- yaml --- r: 56042 b: refs/heads/master c:
 9a86bbb90f3c42e10fce2b9634961ec18f5ca2cb h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/ia64/hp/common/hwsw_iommu.c | 2 +-
 trunk/arch/ia64/kernel/machvec.c       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d24d02349c58..97b9bc45065f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9ae3bd255c3e25880b60a997f1b34ad9535b249
+refs/heads/master: 9a86bbb90f3c42e10fce2b9634961ec18f5ca2cb
diff --git a/trunk/arch/ia64/hp/common/hwsw_iommu.c b/trunk/arch/ia64/hp/common/hwsw_iommu.c
index 2153bcacbe6c..94e57109fad6 100644
--- a/trunk/arch/ia64/hp/common/hwsw_iommu.c
+++ b/trunk/arch/ia64/hp/common/hwsw_iommu.c
@@ -63,7 +63,7 @@ use_swiotlb (struct device *dev)
 	return dev && dev->dma_mask && !hwiommu_dma_supported(dev, *dev->dma_mask);
 }
 
-void
+void __init
 hwsw_init (void)
 {
 	/* default to a smallish 2MB sw I/O TLB */
diff --git a/trunk/arch/ia64/kernel/machvec.c b/trunk/arch/ia64/kernel/machvec.c
index 9620822270a6..13df337508e7 100644
--- a/trunk/arch/ia64/kernel/machvec.c
+++ b/trunk/arch/ia64/kernel/machvec.c
@@ -35,7 +35,7 @@ lookup_machvec (const char *name)
 	return 0;
 }
 
-void
+void __init
 machvec_init (const char *name)
 {
 	struct ia64_machine_vector *mv;