[PATCH 9/10] ppc64: Move setup of systemcfg->platform into iSeries device tree
Michael Ellerman
michael at ellerman.id.au
Wed Aug 10 14:18:45 EST 2005
Add /chosen/linux,platform to the device tree so we can remove iSeries
specific code in setup_system() to set systemcfg->platform.
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
---
arch/ppc64/kernel/iSeries_setup.c | 5 +++++
arch/ppc64/kernel/setup.c | 9 ---------
2 files changed, 5 insertions(+), 9 deletions(-)
Index: work/arch/ppc64/kernel/iSeries_setup.c
===================================================================
--- work.orig/arch/ppc64/kernel/iSeries_setup.c
+++ work/arch/ppc64/kernel/iSeries_setup.c
@@ -1052,6 +1052,11 @@ void build_flat_dt(struct iseries_flat_d
dt_prop_u64_list(dt, "reg", tmp, 2);
dt_end_node(dt);
+ /* /chosen */
+ dt_start_node(dt, "chosen");
+ dt_prop_u32(dt, "linux,platform", PLATFORM_ISERIES_LPAR);
+ dt_end_node(dt);
+
dt_end_node(dt);
dt_push_u32(dt, OF_DT_END);
Index: work/arch/ppc64/kernel/setup.c
===================================================================
--- work.orig/arch/ppc64/kernel/setup.c
+++ work/arch/ppc64/kernel/setup.c
@@ -576,14 +576,6 @@ void __init setup_system(void)
{
DBG(" -> setup_system()\n");
-#ifdef CONFIG_PPC_ISERIES
- /* pSeries systems are identified in prom.c via OF. */
- if (itLpNaca.xLparInstalled == 1)
- systemcfg->platform = PLATFORM_ISERIES_LPAR;
-
- ppc_md.init_early();
-#else /* CONFIG_PPC_ISERIES */
-
/*
* Unflatten the device-tree passed by prom_init or kexec
*/
@@ -642,7 +634,6 @@ void __init setup_system(void)
strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
parse_early_param();
-#endif /* !CONFIG_PPC_ISERIES */
#ifdef CONFIG_SMP
/*
More information about the Linuxppc64-dev
mailing list