diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2007-10-10 14:48:18 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-10-11 06:39:36 -0400 |
commit | 38db7e740ade7f07f6315e3a3b1172d7e456b793 (patch) | |
tree | 578140e34e21dd720632387f29263d0de8610d99 /arch | |
parent | dc9b43d0f706852fc4abce5bf28958db41524328 (diff) |
[POWERPC] Only call ppc_md.setup_arch() if it is provided
This allows platforms which don't have anything to do at setup_arch time
(like a bunch of the 4xx platforms) to eliminate an empty setup_arch hook.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/setup_32.c | 3 | ||||
-rw-r--r-- | arch/powerpc/kernel/setup_64.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 7474502dace5..cd870a823d18 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c | |||
@@ -290,7 +290,8 @@ void __init setup_arch(char **cmdline_p) | |||
290 | conswitchp = &dummy_con; | 290 | conswitchp = &dummy_con; |
291 | #endif | 291 | #endif |
292 | 292 | ||
293 | ppc_md.setup_arch(); | 293 | if (ppc_md.setup_arch) |
294 | ppc_md.setup_arch(); | ||
294 | if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab); | 295 | if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab); |
295 | 296 | ||
296 | paging_init(); | 297 | paging_init(); |
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 3089eaed3256..008ab6823b02 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
@@ -530,7 +530,8 @@ void __init setup_arch(char **cmdline_p) | |||
530 | conswitchp = &dummy_con; | 530 | conswitchp = &dummy_con; |
531 | #endif | 531 | #endif |
532 | 532 | ||
533 | ppc_md.setup_arch(); | 533 | if (ppc_md.setup_arch) |
534 | ppc_md.setup_arch(); | ||
534 | 535 | ||
535 | paging_init(); | 536 | paging_init(); |
536 | ppc64_boot_msg(0x15, "Setup Done"); | 537 | ppc64_boot_msg(0x15, "Setup Done"); |