Commit b2a5082d authored by Russell King's avatar Russell King Committed by Linus Torvalds

[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
parent 155f364c
...@@ -1391,10 +1391,6 @@ extern int simple_fill_super(struct super_block *, int, struct tree_descr *); ...@@ -1391,10 +1391,6 @@ extern int simple_fill_super(struct super_block *, int, struct tree_descr *);
extern int simple_pin_fs(char *name, struct vfsmount **mount, int *count); extern int simple_pin_fs(char *name, struct vfsmount **mount, int *count);
extern void simple_release_fs(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_change_ok(struct inode *, struct iattr *);
extern int inode_setattr(struct inode *, struct iattr *); extern int inode_setattr(struct inode *, struct iattr *);
......
...@@ -16,3 +16,5 @@ extern int initrd_below_start_ok; ...@@ -16,3 +16,5 @@ extern int initrd_below_start_ok;
/* free_initrd_mem always gets called with the next two as arguments.. */ /* free_initrd_mem always gets called with the next two as arguments.. */
extern unsigned long initrd_start, initrd_end; extern unsigned long initrd_start, initrd_end;
extern void free_initrd_mem(unsigned long, unsigned long); extern void free_initrd_mem(unsigned long, unsigned long);
extern unsigned int real_root_dev;
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <linux/writeback.h> #include <linux/writeback.h>
#include <linux/hugetlb.h> #include <linux/hugetlb.h>
#include <linux/security.h> #include <linux/security.h>
#include <linux/initrd.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#ifdef CONFIG_ROOT_NFS #ifdef CONFIG_ROOT_NFS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment