From 05f0e9d1ded11fa2a3e96e702aea4a3c4b127f51 Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Wed, 20 Aug 2008 21:07:47 +0200
Subject: [PATCH] --- yaml --- r: 109037 b: refs/heads/master c:
 7701e8c59b0e7cbcf21c1bc49d8b8c6db43027a4 h: refs/heads/master i:   109035:
 47faa44c40a2cf6c570d9d0c2c3882046d639658 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/mm/mmio-mod.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 450e914b39ea..6575da1f2a75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bde78a79a6eb015f33aa4660df1b06f5135def20
+refs/heads/master: 7701e8c59b0e7cbcf21c1bc49d8b8c6db43027a4
diff --git a/trunk/arch/x86/mm/mmio-mod.c b/trunk/arch/x86/mm/mmio-mod.c
index e7397e108beb..635b50e85581 100644
--- a/trunk/arch/x86/mm/mmio-mod.c
+++ b/trunk/arch/x86/mm/mmio-mod.c
@@ -430,7 +430,9 @@ static void enter_uniprocessor(void)
 						"may miss events.\n");
 }
 
-static void leave_uniprocessor(void)
+/* __ref because leave_uniprocessor calls cpu_up which is __cpuinit,
+   but this whole function is ifdefed CONFIG_HOTPLUG_CPU */
+static void __ref leave_uniprocessor(void)
 {
 	int cpu;
 	int err;