diff -urN linux/fs/adfs/super.c linux-2.3.14-work/fs/adfs/super.c
--- linux/fs/adfs/super.c	Tue Jun  8 18:47:58 1999
+++ linux-2.3.14-work/fs/adfs/super.c	Fri Aug 20 12:45:01 1999
@@ -385,7 +385,7 @@
 	"adfs", FS_REQUIRES_DEV, adfs_read_super, NULL
 };
 
-__initfunc(int init_adfs_fs(void))
+int __init init_adfs_fs(void)
 {
 	return register_filesystem(&adfs_fs_type);
 }
diff -urN linux/fs/affs/super.c linux-2.3.14-work/fs/affs/super.c
--- linux/fs/affs/super.c	Tue Jun  8 18:47:58 1999
+++ linux-2.3.14-work/fs/affs/super.c	Fri Aug 20 12:43:28 1999
@@ -688,7 +688,7 @@
 	NULL
 };
 
-__initfunc(int init_affs_fs(void))
+int __init init_affs_fs(void)
 {
 	return register_filesystem(&affs_fs_type);
 }
diff -urN linux/fs/autofs/init.c linux-2.3.14-work/fs/autofs/init.c
--- linux/fs/autofs/init.c	Tue Oct 27 22:13:53 1998
+++ linux-2.3.14-work/fs/autofs/init.c	Fri Aug 20 12:44:01 1999
@@ -34,7 +34,7 @@
 
 #else /* MODULE */
 
-__initfunc(int init_autofs_fs(void))
+int __init init_autofs_fs(void)
 {
 	return register_filesystem(&autofs_fs_type);
 }
diff -urN linux/fs/coda/psdev.c linux-2.3.14-work/fs/coda/psdev.c
--- linux/fs/coda/psdev.c	Wed Jun  2 19:29:13 1999
+++ linux-2.3.14-work/fs/coda/psdev.c	Fri Aug 20 12:44:34 1999
@@ -334,7 +334,7 @@
 
 
 
-__initfunc(int init_coda(void)) 
+int __init init_coda(void)
 {
 	int status;
 	printk(KERN_INFO "Coda Kernel/Venus communications, v4.6.0, braam@cs.cmu.edu\n");
diff -urN linux/fs/devpts/inode.c linux-2.3.14-work/fs/devpts/inode.c
--- linux/fs/devpts/inode.c	Tue Jun  8 18:47:58 1999
+++ linux-2.3.14-work/fs/devpts/inode.c	Fri Aug 20 12:45:35 1999
@@ -348,7 +348,7 @@
 	}
 }
 
-__initfunc(int init_devpts_fs(void))
+int __init init_devpts_fs(void)
 {
 	return register_filesystem(&devpts_fs_type);
 
diff -urN linux/fs/efs/super.c linux-2.3.14-work/fs/efs/super.c
--- linux/fs/efs/super.c	Tue Jun  8 18:47:58 1999
+++ linux-2.3.14-work/fs/efs/super.c	Fri Aug 20 12:45:55 1999
@@ -32,7 +32,7 @@
 	NULL		/* remount */
 };
 
-__initfunc(int init_efs_fs(void)) {
+int __init init_efs_fs(void) {
 	return register_filesystem(&efs_fs_type);
 }
 
diff -urN linux/fs/ext2/super.c linux-2.3.14-work/fs/ext2/super.c
--- linux/fs/ext2/super.c	Tue Jun  8 18:47:58 1999
+++ linux-2.3.14-work/fs/ext2/super.c	Fri Aug 20 12:42:01 1999
@@ -739,7 +739,7 @@
 	NULL
 };
 
-__initfunc(int init_ext2_fs(void))
+int __init init_ext2_fs(void)
 {
         return register_filesystem(&ext2_fs_type);
 }
diff -urN linux/fs/hfs/super.c linux-2.3.14-work/fs/hfs/super.c
--- linux/fs/hfs/super.c	Tue Jun  8 18:47:58 1999
+++ linux-2.3.14-work/fs/hfs/super.c	Fri Aug 20 12:44:48 1999
@@ -493,7 +493,7 @@
 	return NULL;	
 }
 
-__initfunc(int init_hfs_fs(void))
+int __init init_hfs_fs(void)
 {
         hfs_cat_init();
 	return register_filesystem(&hfs_fs);
diff -urN linux/fs/isofs/inode.c linux-2.3.14-work/fs/isofs/inode.c
--- linux/fs/isofs/inode.c	Sun Jun 27 18:10:41 1999
+++ linux-2.3.14-work/fs/isofs/inode.c	Fri Aug 20 12:40:15 1999
@@ -1469,7 +1469,7 @@
 	NULL
 };
 
-__initfunc(int init_iso9660_fs(void))
+int __init init_iso9660_fs(void)
 {
         return register_filesystem(&iso9660_fs_type);
 }
diff -urN linux/fs/minix/inode.c linux-2.3.14-work/fs/minix/inode.c
--- linux/fs/minix/inode.c	Sun Jun 27 18:10:41 1999
+++ linux-2.3.14-work/fs/minix/inode.c	Fri Aug 20 12:39:58 1999
@@ -1238,7 +1238,7 @@
 	NULL
 };
 
-__initfunc(int init_minix_fs(void))
+int __init init_minix_fs(void)
 {
         return register_filesystem(&minix_fs_type);
 }
diff -urN linux/fs/msdos/msdosfs_syms.c linux-2.3.14-work/fs/msdos/msdosfs_syms.c
--- linux/fs/msdos/msdosfs_syms.c	Fri May 14 07:18:20 1999
+++ linux-2.3.14-work/fs/msdos/msdosfs_syms.c	Fri Aug 20 12:39:35 1999
@@ -34,7 +34,7 @@
 	NULL
 };
 
-__initfunc(int init_msdos_fs(void))
+int __init init_msdos_fs(void)
 {
 	return register_filesystem(&msdos_fs_type);
 }
diff -urN linux/fs/ncpfs/inode.c linux-2.3.14-work/fs/ncpfs/inode.c
--- linux/fs/ncpfs/inode.c	Sat Aug  7 20:59:40 1999
+++ linux-2.3.14-work/fs/ncpfs/inode.c	Fri Aug 20 12:43:01 1999
@@ -720,7 +720,7 @@
 	NULL
 };
 
-__initfunc(int init_ncp_fs(void))
+int __init init_ncp_fs(void)
 {
 	return register_filesystem(&ncp_fs_type);
 }
diff -urN linux/fs/nfs/nfsroot.c linux-2.3.14-work/fs/nfs/nfsroot.c
--- linux/fs/nfs/nfsroot.c	Fri Apr 24 02:12:21 1998
+++ linux-2.3.14-work/fs/nfs/nfsroot.c	Fri Aug 20 12:41:40 1999
@@ -154,7 +154,7 @@
  *  need to have root_server_addr set _before_ IPConfig gets called as it
  *  can override it.
  */
-__initfunc(static void root_nfs_parse_addr(char *name))
+static void __init root_nfs_parse_addr(char *name)
 {
 	int octets = 0;
 	char *cp, *cq;
@@ -183,7 +183,7 @@
 /*
  *  Parse option string.
  */
-__initfunc(static void root_nfs_parse(char *name, char *buf))
+static void __init root_nfs_parse(char *name, char *buf)
 {
 	char *options, *val, *cp;
 
@@ -220,7 +220,7 @@
 /*
  *  Prepare the NFS data structure and parse all options.
  */
-__initfunc(static int root_nfs_name(char *name))
+static int __init root_nfs_name(char *name)
 {
 	char buf[NFS_MAXPATHLEN];
 	char *cp;
@@ -261,7 +261,7 @@
 /*
  *  Get NFS server address.
  */
-__initfunc(static int root_nfs_addr(void))
+static int __init root_nfs_addr(void)
 {
 	if ((servaddr = root_server_addr) == INADDR_NONE) {
 		printk(KERN_ERR "Root-NFS: No NFS server available, giving up.\n");
@@ -277,7 +277,7 @@
  *  Tell the user what's going on.
  */
 #ifdef NFSROOT_DEBUG
-__initfunc(static void root_nfs_print(void))
+static void __init root_nfs_print(void)
 {
 	printk(KERN_NOTICE "Root-NFS: Mounting %s on server %s as root\n",
 		nfs_path, nfs_data.hostname);
@@ -292,7 +292,7 @@
 #endif
 
 
-__initfunc(int root_nfs_init(void))
+int __init root_nfs_init(void)
 {
 #ifdef NFSROOT_DEBUG
 	nfs_debug |= NFSDBG_ROOT;
@@ -320,7 +320,7 @@
  *  Parse NFS server and directory information passed on the kernel
  *  command line.
  */
-__initfunc(void nfs_root_setup(char *line, int *ints))
+void __init nfs_root_setup(char *line, int *ints)
 {
 	ROOT_DEV = MKDEV(UNNAMED_MAJOR, 255);
 	if (line[0] == '/' || line[0] == ',' || (line[0] >= '0' && line[0] <= '9')) {
@@ -356,7 +356,7 @@
 /*
  *  Query server portmapper for the port of a daemon program.
  */
-__initfunc(static int root_nfs_getport(int program, int version))
+static int __init root_nfs_getport(int program, int version)
 {
 	struct sockaddr_in sin;
 
@@ -372,7 +372,7 @@
  *  by the user. Use defaults if portmapper is not available.
  *  XXX: Is there any nfs server with no portmapper?
  */
-__initfunc(static int root_nfs_ports(void))
+static int __init root_nfs_ports(void)
 {
 	int port;
 
@@ -403,7 +403,7 @@
  *  Get a file handle from the server for the directory which is to be
  *  mounted.
  */
-__initfunc(static int root_nfs_get_handle(void))
+static int __init root_nfs_get_handle(void)
 {
 	struct sockaddr_in sin;
 	int status;
@@ -421,7 +421,7 @@
 /*
  *  Now actually mount the given directory.
  */
-__initfunc(static int root_nfs_do_mount(struct super_block *sb))
+static int __init root_nfs_do_mount(struct super_block *sb)
 {
 	/* Pass the server address to NFS */
 	set_sockaddr((struct sockaddr_in *) &nfs_data.addr, servaddr, nfs_port);
@@ -437,7 +437,7 @@
  *  Get the NFS port numbers and file handle, and then read the super-
  *  block for mounting.
  */
-__initfunc(int nfs_root_mount(struct super_block *sb))
+int __init nfs_root_mount(struct super_block *sb)
 {
 	if (root_nfs_init() < 0
 	 || root_nfs_ports() < 0
diff -urN linux/fs/ntfs/fs.c linux-2.3.14-work/fs/ntfs/fs.c
--- linux/fs/ntfs/fs.c	Sun Jun 27 18:10:41 1999
+++ linux-2.3.14-work/fs/ntfs/fs.c	Fri Aug 20 12:45:24 1999
@@ -1028,10 +1028,10 @@
 /* When this code is not compiled as a module, this is the main entry point,
  * called by do_sys_setup() in fs/filesystems.c
  *
- * NOTE : __initfunc() is a macro used to remove this function from memory
+ * NOTE : __init is a macro used to remove this function from memory
  * once initialization is done
  */
-__initfunc(int init_ntfs_fs(void))
+int __init init_ntfs_fs(void)
 {
 	/* Comment this if you trust klogd. There are reasons not to trust it
 	 */
diff -urN linux/fs/proc/base.c linux-2.3.14-work/fs/proc/base.c
--- linux/fs/proc/base.c	Sat Jun 26 20:04:39 1999
+++ linux-2.3.14-work/fs/proc/base.c	Fri Aug 20 12:36:53 1999
@@ -178,7 +178,7 @@
 };
 #endif
 
-__initfunc(void proc_base_init(void))
+void __init proc_base_init(void)
 {
 #if CONFIG_AP1000
 	proc_register(&proc_pid, &proc_pid_ringbuf);
diff -urN linux/fs/proc/openpromfs.c linux-2.3.14-work/fs/proc/openpromfs.c
--- linux/fs/proc/openpromfs.c	Tue Jun 29 17:22:08 1999
+++ linux-2.3.14-work/fs/proc/openpromfs.c	Fri Aug 20 12:38:19 1999
@@ -990,7 +990,7 @@
 
 /* {{{ init section */
 #ifndef MODULE
-__initfunc(static int check_space (u16 n))
+static int __init check_space (u16 n)
 #else
 static int check_space (u16 n)
 #endif
@@ -1014,7 +1014,7 @@
 }
 
 #ifndef MODULE
-__initfunc(static u16 get_nodes (u16 parent, u32 node))
+static u16 __init get_nodes (u16 parent, u32 node)
 #else
 static u16 get_nodes (u16 parent, u32 node)
 #endif
@@ -1132,7 +1132,7 @@
 
 #ifndef MODULE
 #define RET(x)
-__initfunc(void openpromfs_init (void))
+void __init openpromfs_init (void)
 #else
 
 EXPORT_NO_SYMBOLS;
diff -urN linux/fs/proc/proc_tty.c linux-2.3.14-work/fs/proc/proc_tty.c
--- linux/fs/proc/proc_tty.c	Tue Aug  4 18:57:13 1998
+++ linux-2.3.14-work/fs/proc/proc_tty.c	Fri Aug 20 12:38:33 1999
@@ -170,7 +170,7 @@
 /*
  * Called by proc_root_init() to initialize the /proc/tty subtree
  */
-__initfunc(void proc_tty_init(void))
+void __init proc_tty_init(void)
 {
 	struct proc_dir_entry *ent;
 	
diff -urN linux/fs/proc/root.c linux-2.3.14-work/fs/proc/root.c
--- linux/fs/proc/root.c	Thu Aug  5 01:19:09 1999
+++ linux-2.3.14-work/fs/proc/root.c	Fri Aug 20 12:38:45 1999
@@ -704,7 +704,7 @@
 };
 #endif
 
-__initfunc(void proc_root_init(void))
+void __init proc_root_init(void)
 {
 	proc_base_init();
 	proc_register(&proc_root, &proc_root_loadavg);
diff -urN linux/fs/qnx4/inode.c linux-2.3.14-work/fs/qnx4/inode.c
--- linux/fs/qnx4/inode.c	Tue Jun  8 18:47:58 1999
+++ linux-2.3.14-work/fs/qnx4/inode.c	Fri Aug 20 12:44:21 1999
@@ -430,7 +430,7 @@
 	NULL
 };
 
-__initfunc(int init_qnx4_fs(void))
+int __init init_qnx4_fs(void)
 {
 	printk("QNX4 filesystem v0.2 registered.\n");
 	return register_filesystem(&qnx4_fs_type);
diff -urN linux/fs/romfs/inode.c linux-2.3.14-work/fs/romfs/inode.c
--- linux/fs/romfs/inode.c	Thu Aug 12 18:19:59 1999
+++ linux-2.3.14-work/fs/romfs/inode.c	Fri Aug 20 12:43:41 1999
@@ -692,7 +692,7 @@
 	NULL
 };
 
-__initfunc(int init_romfs_fs(void))
+int __init init_romfs_fs(void)
 {
 	return register_filesystem(&romfs_fs_type);
 }
diff -urN linux/fs/smbfs/inode.c linux-2.3.14-work/fs/smbfs/inode.c
--- linux/fs/smbfs/inode.c	Wed Jun 30 19:24:55 1999
+++ linux-2.3.14-work/fs/smbfs/inode.c	Fri Aug 20 12:42:48 1999
@@ -575,7 +575,7 @@
 	NULL
 };
 
-__initfunc(int init_smb_fs(void))
+int __init init_smb_fs(void)
 {
 	return register_filesystem(&smb_fs_type);
 }
diff -urN linux/fs/sysv/inode.c linux-2.3.14-work/fs/sysv/inode.c
--- linux/fs/sysv/inode.c	Sun Jun 27 18:10:41 1999
+++ linux-2.3.14-work/fs/sysv/inode.c	Fri Aug 20 12:42:29 1999
@@ -1174,7 +1174,7 @@
 	{"coherent", FS_REQUIRES_DEV, sysv_read_super, NULL}
 };
 
-__initfunc(int init_sysv_fs(void))
+int __init init_sysv_fs(void)
 {
 	int i;
 	int ouch;
diff -urN linux/fs/ufs/super.c linux-2.3.14-work/fs/ufs/super.c
--- linux/fs/ufs/super.c	Thu Jul  1 18:45:57 1999
+++ linux-2.3.14-work/fs/ufs/super.c	Fri Aug 20 12:43:14 1999
@@ -935,7 +935,7 @@
 	NULL
 };
 
-__initfunc(int init_ufs_fs(void))
+int __init init_ufs_fs(void)
 {
 	return register_filesystem(&ufs_fs_type);
 }
diff -urN linux/fs/umsdos/inode.c linux-2.3.14-work/fs/umsdos/inode.c
--- linux/fs/umsdos/inode.c	Mon Aug  9 19:44:49 1999
+++ linux-2.3.14-work/fs/umsdos/inode.c	Fri Aug 20 12:42:16 1999
@@ -434,7 +434,7 @@
 	NULL
 };
 
-__initfunc (int init_umsdos_fs (void))
+int __init init_umsdos_fs (void)
 {
 	return register_filesystem (&umsdos_fs_type);
 }

.