Commit e1ec517e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
  ...
parents 19b39c38 f0735310

arch/arm/kernel/atags_parse.c

+0 −2
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ __tagtable(ATAG_VIDEOTEXT, parse_tag_videotext); 
static int __init parse_tag_ramdisk(const struct tag *tag)

{

	rd_image_start = tag->u.ramdisk.start;

	rd_doload = (tag->u.ramdisk.flags & 1) == 0;

	rd_prompt = (tag->u.ramdisk.flags & 2) == 0;



	if (tag->u.ramdisk.size)

		rd_size = tag->u.ramdisk.size;

arch/sh/kernel/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -290,8 +290,6 @@ void __init setup_arch(char **cmdline_p) 


#ifdef CONFIG_BLK_DEV_RAM

	rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK;

	rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0);

	rd_doload = ((RAMDISK_FLAGS & RAMDISK_LOAD_FLAG) != 0);

#endif



	if (!MOUNT_ROOT_RDONLY)

arch/sparc/kernel/setup_32.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

arch/sparc/kernel/setup_64.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -870,8 +870,6 @@ void __init setup_arch(char **cmdline_p) 


#ifdef CONFIG_BLK_DEV_RAM

	rd_image_start = boot_params.hdr.ram_size & RAMDISK_IMAGE_START_MASK;

	rd_prompt = ((boot_params.hdr.ram_size & RAMDISK_PROMPT_FLAG) != 0);

	rd_doload = ((boot_params.hdr.ram_size & RAMDISK_LOAD_FLAG) != 0);

#endif

#ifdef CONFIG_EFI

	if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,

CRA Git | Maintained and supported by SUSTech CRA and CCSE