From 2af010c58ef98143a2273cc5f040d70010e17174 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 1 Aug 2008 16:39:19 +0200
Subject: [PATCH] --- yaml --- r: 107180 b: refs/heads/master c:
 8f8470032570988af2eeff520ca01a32fd908b2b h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/s390/kernel/time.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 59fafcbb47d0..fcbde5e8d91c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d918fe2bd72830dfbe8ca2bb30d49930d1356e6d
+refs/heads/master: 8f8470032570988af2eeff520ca01a32fd908b2b
diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c
index ab70d9bd9261..ca114fe46ffb 100644
--- a/trunk/arch/s390/kernel/time.c
+++ b/trunk/arch/s390/kernel/time.c
@@ -1348,7 +1348,7 @@ early_param("stp", early_parse_stp);
 /*
  * Reset STP attachment.
  */
-static void stp_reset(void)
+static void __init stp_reset(void)
 {
 	int rc;