Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ia64: move the ROOT_DEV setup to common code

I'm not sure how useful a platform default ROOT_DEV is these days,
but it pretty sure isn't machvec dependent.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lkml.kernel.org/r/20190813072514.23299-25-hch@lst.de
Signed-off-by: Tony Luck <tony.luck@intel.com>

authored by

Christoph Hellwig and committed by
Tony Luck
fa809d70 974f83ec

+9 -9
-9
arch/ia64/dig/setup.c
··· 13 13 #include <linux/init.h> 14 14 #include <linux/delay.h> 15 15 #include <linux/kernel.h> 16 - #include <linux/kdev_t.h> 17 16 #include <linux/string.h> 18 17 #include <linux/screen_info.h> 19 18 #include <linux/console.h> 20 19 #include <linux/timex.h> 21 20 #include <linux/sched.h> 22 - #include <linux/root_dev.h> 23 21 24 22 #include <asm/io.h> 25 23 #include <asm/machvec.h> ··· 27 29 dig_setup (char **cmdline_p) 28 30 { 29 31 unsigned int orig_x, orig_y, num_cols, num_rows, font_height; 30 - 31 - /* 32 - * Default to /dev/sda2. This assumes that the EFI partition 33 - * is physical disk 1 partition 1 and the Linux root disk is 34 - * physical disk 1 partition 2. 35 - */ 36 - ROOT_DEV = Root_SDA2; /* default to second partition on first drive */ 37 32 38 33 #ifdef CONFIG_SMP 39 34 init_smp_config();
+9
arch/ia64/kernel/setup.c
··· 30 30 #include <linux/console.h> 31 31 #include <linux/delay.h> 32 32 #include <linux/cpu.h> 33 + #include <linux/kdev_t.h> 33 34 #include <linux/kernel.h> 34 35 #include <linux/memblock.h> 35 36 #include <linux/reboot.h> ··· 42 41 #include <linux/threads.h> 43 42 #include <linux/screen_info.h> 44 43 #include <linux/dmi.h> 44 + #include <linux/root_dev.h> 45 45 #include <linux/serial.h> 46 46 #include <linux/serial_core.h> 47 47 #include <linux/efi.h> ··· 600 598 /* enable IA-64 Machine Check Abort Handling unless disabled */ 601 599 if (!nomca) 602 600 ia64_mca_init(); 601 + 602 + /* 603 + * Default to /dev/sda2. This assumes that the EFI partition 604 + * is physical disk 1 partition 1 and the Linux root disk is 605 + * physical disk 1 partition 2. 606 + */ 607 + ROOT_DEV = Root_SDA2; /* default to second partition on first drive */ 603 608 604 609 platform_setup(cmdline_p); 605 610 paging_init();