Merge branch 'hch.init_path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull init and set_fs() cleanups from Al Viro: "Christoph's 'getting rid of ksys_...() uses under KERNEL_DS' series" * 'hch.init_path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (50 commits) init: add an init_dup helper init: add an init_utimes helper init: add an init_stat helper init: add an init_mknod helper init: add an init_mkdir helper init: add an init_symlink helper init: add an init_link helper init: add an init_eaccess helper init: add an init_chmod helper init: add an init_chown helper init: add an init_chroot helper init: add an init_chdir helper init: add an init_rmdir helper init: add an init_unlink helper init: add an init_umount helper init: add an init_mount helper init: mark create_dev as __init init: mark console_on_rootfs as __init init: initialize ramdisk_execute_command at compile time devtmpfs: refactor devtmpfsd() ...
This commit is contained in:
@@ -353,8 +353,6 @@ void __init setup_arch(char **cmdline_p)
|
||||
ROOT_DEV = old_decode_dev(root_dev);
|
||||
#ifdef CONFIG_BLK_DEV_RAM
|
||||
rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK;
|
||||
rd_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0);
|
||||
rd_doload = ((ram_flags & RAMDISK_LOAD_FLAG) != 0);
|
||||
#endif
|
||||
|
||||
prom_setsync(prom_sync_me);
|
||||
|
@@ -659,8 +659,6 @@ void __init setup_arch(char **cmdline_p)
|
||||
ROOT_DEV = old_decode_dev(root_dev);
|
||||
#ifdef CONFIG_BLK_DEV_RAM
|
||||
rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK;
|
||||
rd_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0);
|
||||
rd_doload = ((ram_flags & RAMDISK_LOAD_FLAG) != 0);
|
||||
#endif
|
||||
|
||||
task_thread_info(&init_task)->kregs = &fake_swapper_regs;
|
||||
|
Reference in New Issue
Block a user