diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2002-10-28 21:30:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-10-28 21:30:34 -0800 |
| commit | 267ebfd662f32df647e0803ca5d2a26e7d7cc060 (patch) | |
| tree | e6b8e4e05219645e13ab2af4fba0ff85f40cf850 /init | |
| parent | 9179a307bffc558ccd8cff8334ca08ef2b68ea1b (diff) | |
| parent | efdddf70cc1946feb4b00b1771cce3aef8efcc0e (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.5
into kroah.com:/home/greg/linux/BK/lsm-2.5
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 1e4fe1ed4439..cf268dba3628 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -12,6 +12,7 @@ #include <linux/init.h> #include <linux/suspend.h> #include <linux/root_dev.h> +#include <linux/security.h> #include <linux/nfs_fs.h> #include <linux/nfs_fs_sb.h> @@ -799,7 +800,7 @@ out: sys_umount("/dev", 0); sys_mount(".", "/", NULL, MS_MOVE, NULL); sys_chroot("."); - security_ops->sb_post_mountroot(); + security_sb_post_mountroot(); mount_devfs_fs (); } |