Messages in this thread Patch in this message | | | Date | Thu, 4 Sep 2003 17:09:07 +0100 | From | Russell King <> | Subject | [PATCH] Don't #ifdef prototypes |
| |
It seems that changing CONFIG_BLK_DEV_INITRD causes the whole kernel to rebuild due to an inappropriate ifdef in linux/fs.h - we should not conditionalise prototypes.
In addition, real_root_dev is only used by two files (kernel/sysctl.c and init/do_mounts_initrd.c) so it makes even less sense that it was in linux/fs.h
--- orig/include/linux/fs.h Thu Sep 4 16:37:56 2003 +++ linux/include/linux/fs.h Thu Sep 4 16:34:09 2003 @@ -1372,10 +1372,6 @@ extern int simple_pin_fs(char *name, struct vfsmount **mount, int *count); extern void simple_release_fs(struct vfsmount **mount, int *count); -#ifdef CONFIG_BLK_DEV_INITRD -extern unsigned int real_root_dev; -#endif - extern int inode_change_ok(struct inode *, struct iattr *); extern int inode_setattr(struct inode *, struct iattr *); --- orig/include/linux/initrd.h Mon May 5 17:40:12 2003 +++ linux/include/linux/initrd.h Thu Sep 4 16:34:31 2003 @@ -16,3 +16,5 @@ /* free_initrd_mem always gets called with the next two as arguments.. */ extern unsigned long initrd_start, initrd_end; extern void free_initrd_mem(unsigned long, unsigned long); + +extern unsigned int real_root_dev; --- orig/kernel/sysctl.c Wed Aug 13 10:33:59 2003 +++ linux/kernel/sysctl.c Thu Sep 4 16:34:00 2003 @@ -35,6 +35,7 @@ #include <linux/writeback.h> #include <linux/hugetlb.h> #include <linux/security.h> +#include <linux/initrd.h> #include <asm/uaccess.h> #ifdef CONFIG_ROOT_NFS -- Russell King (rmk@arm.linux.org.uk) http://www.arm.linux.org.uk/personal/ Maintainer of: 2.6 ARM Linux - http://www.arm.linux.org.uk/ 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/ 2.6 Serial core
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |