From 2b45b188d68e4f8ab8d5605b9493a83cb2e711e8 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 20 Sep 2006 15:59:12 +0200
Subject: [PATCH] --- yaml --- r: 34175 b: refs/heads/master c:
 1375fc1fb0434a26f93c59b1b9f3fdb8bf90bba5 h: refs/heads/master i:   34173:
 848c5bee8bbc009ffd8d0a8ccf1385702fb89378   34171:
 e5ee04c465db0000f1e15105c680d49b7160d500   34167:
 940c56452492c2729054b06179062e1fb9c289b3   34159:
 ee1f5c7facce2c832db2c6d7d9769fb10d501a6f   34143:
 639995327c54e5159287db0494c59cbbf95ff74a   34111:
 d85ee9dbfe1e2404aac5ef554056ee26dec3b3a2   34047:
 2c5286a02cc4784b956a9050c3fe2e7fe1692041 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/s390/hypfs/hypfs_diag.c   | 2 +-
 trunk/arch/s390/kernel/vmlinux.lds.S | 2 +-
 trunk/drivers/s390/block/dasd_eer.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ea03383b4bab..9f1906bda5fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fee644ada12c524abbf723132fbea6a082ecfc2
+refs/heads/master: 1375fc1fb0434a26f93c59b1b9f3fdb8bf90bba5
diff --git a/trunk/arch/s390/hypfs/hypfs_diag.c b/trunk/arch/s390/hypfs/hypfs_diag.c
index fee5aee605f6..75144efbb92b 100644
--- a/trunk/arch/s390/hypfs/hypfs_diag.c
+++ b/trunk/arch/s390/hypfs/hypfs_diag.c
@@ -535,7 +535,7 @@ __init int hypfs_diag_init(void)
 	return rc;
 }
 
-__exit void hypfs_diag_exit(void)
+void hypfs_diag_exit(void)
 {
 	diag224_delete_name_table();
 	diag204_free_buffer();
diff --git a/trunk/arch/s390/kernel/vmlinux.lds.S b/trunk/arch/s390/kernel/vmlinux.lds.S
index df0c16ab8e92..af9e69a03011 100644
--- a/trunk/arch/s390/kernel/vmlinux.lds.S
+++ b/trunk/arch/s390/kernel/vmlinux.lds.S
@@ -118,7 +118,7 @@ SECTIONS
 
   /* Sections to be discarded */
   /DISCARD/ : {
-	*(.exitcall.exit)
+	*(.exit.text) *(.exit.data) *(.exitcall.exit)
 	}
 
   /* Stabs debugging sections.  */
diff --git a/trunk/drivers/s390/block/dasd_eer.c b/trunk/drivers/s390/block/dasd_eer.c
index da65f1b032f5..e0bf30ebb215 100644
--- a/trunk/drivers/s390/block/dasd_eer.c
+++ b/trunk/drivers/s390/block/dasd_eer.c
@@ -678,7 +678,7 @@ int __init dasd_eer_init(void)
 	return 0;
 }
 
-void __exit dasd_eer_exit(void)
+void dasd_eer_exit(void)
 {
 	WARN_ON(misc_deregister(&dasd_eer_dev) != 0);
 }