Commit c8376994 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

initrd: remove support for multiple floppies 



Remove the special handling for multiple floppies in the initrd code.
No one should be using floppies for booting these days. (famous last
words..)

Includes a spelling fix from Colin Ian King <colin.king@canonical.com>.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7e0adbfc

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,