diff options
| author |   Christoph Hellwig <hch@lst.de> | 2019-08-13 09:25:10 +0200 |
|---|---|---|
| committer |   Tony Luck <tony.luck@intel.com> | 2019-08-16 11:33:57 -0700 |
| commit | fa809d709e7acb99aa1c74987829ae13d908af38 (patch) | |
| tree | 4895064acd827af04915b61bfff180908cb3ac1d /arch/ia64 | |
| parent | ia64: rework iommu probing (diff) | |
| download | linux-dev-fa809d709e7acb99aa1c74987829ae13d908af38.tar.xz linux-dev-fa809d709e7acb99aa1c74987829ae13d908af38.zip | |
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>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/dig/setup.c | 9 | ||||
| -rw-r--r-- | arch/ia64/kernel/setup.c | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/ia64/dig/setup.c b/arch/ia64/dig/setup.c index cc14fdce6db6..0b1866d2462a 100644 --- a/arch/ia64/dig/setup.c +++ b/arch/ia64/dig/setup.c @@ -13,13 +13,11 @@ #include <linux/init.h> #include <linux/delay.h> #include <linux/kernel.h> -#include <linux/kdev_t.h> #include <linux/string.h> #include <linux/screen_info.h> #include <linux/console.h> #include <linux/timex.h> #include <linux/sched.h> -#include <linux/root_dev.h> #include <asm/io.h> #include <asm/machvec.h> @@ -30,13 +28,6 @@ dig_setup (char **cmdline_p) { unsigned int orig_x, orig_y, num_cols, num_rows, font_height; - /* - * Default to /dev/sda2. This assumes that the EFI partition - * is physical disk 1 partition 1 and the Linux root disk is - * physical disk 1 partition 2. - */ - ROOT_DEV = Root_SDA2; /* default to second partition on first drive */ - #ifdef CONFIG_SMP init_smp_config(); #endif diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 8d47836d932c..560f9833c665 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -30,6 +30,7 @@ #include <linux/console.h> #include <linux/delay.h> #include <linux/cpu.h> +#include <linux/kdev_t.h> #include <linux/kernel.h> #include <linux/memblock.h> #include <linux/reboot.h> @@ -41,6 +42,7 @@ #include <linux/threads.h> #include <linux/screen_info.h> #include <linux/dmi.h> +#include <linux/root_dev.h> #include <linux/serial.h> #include <linux/serial_core.h> #include <linux/efi.h> @@ -599,6 +601,13 @@ setup_arch (char **cmdline_p) if (!nomca) ia64_mca_init(); + /* + * Default to /dev/sda2. This assumes that the EFI partition + * is physical disk 1 partition 1 and the Linux root disk is + * physical disk 1 partition 2. + */ + ROOT_DEV = Root_SDA2; /* default to second partition on first drive */ + platform_setup(cmdline_p); paging_init(); |