diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-04-29 02:18:16 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-05-11 08:53:18 -0400 |
commit | 85f60ae4ee817174b0f78928bc7066f28c3551ab (patch) | |
tree | 826dac347531b88a8c7de2a1168626393eaceea1 /arch/powerpc/kernel | |
parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) |
dt/flattree: explicitly pass command line pointer to early_init_dt_scan_chosen
This patch drops the reference to a global 'cmd_line' variable from
early_init_dt_scan_chosen, and instead passes the pointer to the command
line string via the *data argument. Each architecture does something
slightly different with the initial command line, so it makes sense for
the architecture to be able to specify the variable name.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/prom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index e74fa12afc82..c173bee09cee 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
@@ -691,7 +691,7 @@ void __init early_init_devtree(void *params) | |||
691 | * device-tree, including the platform type, initrd location and | 691 | * device-tree, including the platform type, initrd location and |
692 | * size, TCE reserve, and more ... | 692 | * size, TCE reserve, and more ... |
693 | */ | 693 | */ |
694 | of_scan_flat_dt(early_init_dt_scan_chosen_ppc, NULL); | 694 | of_scan_flat_dt(early_init_dt_scan_chosen_ppc, cmd_line); |
695 | 695 | ||
696 | /* Scan memory nodes and rebuild MEMBLOCKs */ | 696 | /* Scan memory nodes and rebuild MEMBLOCKs */ |
697 | memblock_init(); | 697 | memblock_init(); |