diff options
| author | Jeff Garzik <jgarzik@redhat.com> | 2002-12-04 09:22:34 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2002-12-04 09:22:34 -0500 |
| commit | 047d0b01465994e4122dbb3861903f40ad1e40c6 (patch) | |
| tree | d2e9edb52081f3f7e07c6e83681e3015b20fba1e /include | |
| parent | 2becf2fd04bdad4a7d0acb94fef355a0b3febfdb (diff) | |
| parent | 35c8838f3ec342c5ded92fe1bf85bb03a781c0e5 (diff) | |
Merge redhat.com:/home/jgarzik/repo/linus-2.5
into redhat.com:/home/jgarzik/repo/exitp-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/init.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index e2bf29a635bf..26a518d9cfc1 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -42,10 +42,15 @@ discard it in modules) */ #define __init __attribute__ ((__section__ (".init.text"))) #define __initdata __attribute__ ((__section__ (".init.data"))) -#define __exit __attribute__ ((__section__(".exit.text"))) #define __exitdata __attribute__ ((__section__(".exit.data"))) #define __exit_call __attribute__ ((unused,__section__ (".exitcall.exit"))) +#ifdef MODULE +#define __exit __attribute__ ((__section__(".exit.text"))) +#else +#define __exit __attribute__ ((unused,__section__(".exit.text"))) +#endif + /* For assembly routines */ #define __INIT .section ".init.text","ax" #define __FINIT .previous @@ -185,4 +190,10 @@ extern struct kernel_param __setup_start, __setup_end; #define __devexit_p(x) NULL #endif +#ifdef MODULE +#define __exit_p(x) x +#else +#define __exit_p(x) NULL +#endif + #endif /* _LINUX_INIT_H */ |