From dd6f5f93d77b74b26117aa67ea121f173a9a931f Mon Sep 17 00:00:00 2001
From: Kevin Winchester <kjwinchester@gmail.com>
Date: Mon, 9 Aug 2010 17:20:32 -0700
Subject: [PATCH] --- yaml --- r: 207303 b: refs/heads/master c:
 e446127134de06c4aceaa511f411d06eac91634b h: refs/heads/master i:   207301:
 2eb7e37f51fcc6f1a3111ce5667e486cbe28831f   207299:
 2c7083cfdcc1394f39bae19e3d9ddf448fb32a94   207295:
 ad4292048064e8652435514bd52bfd78031e7430 v: v3

---
 [refs]            | 2 +-
 trunk/init/main.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c4577cc92769..5ac910706281 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22c5c03b42c082ab57b5d24824769ada0d90f8dc
+refs/heads/master: e446127134de06c4aceaa511f411d06eac91634b
diff --git a/trunk/init/main.c b/trunk/init/main.c
index dbee132923c5..86cbfd085b01 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -721,7 +721,7 @@ core_param(initcall_debug, initcall_debug, bool, 0644);
 
 static char msgbuf[64];
 
-static int do_one_initcall_debug(initcall_t fn)
+static int __init_or_module do_one_initcall_debug(initcall_t fn)
 {
 	ktime_t calltime, delta, rettime;
 	unsigned long long duration;
@@ -739,7 +739,7 @@ static int do_one_initcall_debug(initcall_t fn)
 	return ret;
 }
 
-int do_one_initcall(initcall_t fn)
+int __init_or_module do_one_initcall(initcall_t fn)
 {
 	int count = preempt_count();
 	int ret;