From 237e84086088b507ebb0268a323efda5fa9b1f91 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 9 Aug 2010 18:12:55 +0200
Subject: [PATCH] --- yaml --- r: 207860 b: refs/heads/master c:
 2e85ba510ede4aea1b150493407ae911e8ea5051 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/arch/s390/mm/cmm.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f0354f8577a4..5a749692c930 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c304db8a860c10abfaf72f7faa3df598079e2f0c
+refs/heads/master: 2e85ba510ede4aea1b150493407ae911e8ea5051
diff --git a/trunk/arch/s390/mm/cmm.c b/trunk/arch/s390/mm/cmm.c
index eb6a2ef5f82e..4bddf8d3a150 100644
--- a/trunk/arch/s390/mm/cmm.c
+++ b/trunk/arch/s390/mm/cmm.c
@@ -427,7 +427,7 @@ static struct notifier_block cmm_power_notifier = {
 	.notifier_call = cmm_power_event,
 };
 
-static int cmm_init(void)
+static int __init cmm_init(void)
 {
 	int rc = -ENOMEM;
 
@@ -467,7 +467,7 @@ static int cmm_init(void)
 }
 module_init(cmm_init);
 
-static void cmm_exit(void)
+static void __exit cmm_exit(void)
 {
 	unregister_sysctl_table(cmm_sysctl_header);
 #ifdef CONFIG_CMM_IUCV