From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Jan Beulich" <jbeulich@novell.com>
Subject: [PATCH] linux: add __exit to module_exit() handlers
Date: Tue, 11 Dec 2007 16:40:57 +0000
Message-ID: <475ECBA9.76E4.0078.0@novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

As usual, written and tested on 2.6.24-rc4 and made apply to the 2.6.18
tree without further testing.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

Index: head-2007-12-11/drivers/xen/balloon/balloon.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- head-2007-12-11.orig/drivers/xen/balloon/balloon.c	2007-10-23 =
08:59:39.000000000 +0200
+++ head-2007-12-11/drivers/xen/balloon/balloon.c	2007-12-11 =
13:17:53.000000000 +0100
@@ -527,7 +527,7 @@ static int __init balloon_init(void)
=20
 subsys_initcall(balloon_init);
=20
-static void balloon_exit(void)=20
+static void __exit balloon_exit(void)
 {
     /* XXX - release balloon here */
     return;=20
Index: head-2007-12-11/drivers/xen/blkfront/blkfront.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- head-2007-12-11.orig/drivers/xen/blkfront/blkfront.c	2007-12-11 =
11:21:54.000000000 +0100
+++ head-2007-12-11/drivers/xen/blkfront/blkfront.c	2007-12-11 =
13:12:17.000000000 +0100
@@ -911,7 +911,7 @@ static int __init xlblk_init(void)
 module_init(xlblk_init);
=20
=20
-static void xlblk_exit(void)
+static void __exit xlblk_exit(void)
 {
 	return xenbus_unregister_driver(&blkfront);
 }
Index: head-2007-12-11/drivers/xen/core/xen_sysfs.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- head-2007-12-11.orig/drivers/xen/core/xen_sysfs.c	2007-12-11 =
11:13:33.000000000 +0100
+++ head-2007-12-11/drivers/xen/core/xen_sysfs.c	2007-12-11 =
13:12:49.000000000 +0100
@@ -364,7 +364,7 @@ out:
 	return ret;
 }
=20
-static void hyper_sysfs_exit(void)
+static void __exit hyper_sysfs_exit(void)
 {
 	xen_properties_destroy();
 	xen_compilation_destroy();
Index: head-2007-12-11/drivers/xen/evtchn/evtchn.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- head-2007-12-11.orig/drivers/xen/evtchn/evtchn.c	2007-12-11 =
13:10:58.000000000 +0100
+++ head-2007-12-11/drivers/xen/evtchn/evtchn.c	2007-12-11 11:45:10.0000000=
00 +0100
@@ -544,7 +544,7 @@ static int __init evtchn_init(void)
 	return 0;
 }
=20
-static void evtchn_cleanup(void)
+static void __exit evtchn_cleanup(void)
 {
 	misc_deregister(&evtchn_miscdev);
 	unregister_cpu_notifier(&evtchn_cpu_nfb);