Commit 38db7e74 authored by Grant Likely's avatar Grant Likely Committed by Paul Mackerras

[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: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent dc9b43d0
...@@ -290,6 +290,7 @@ void __init setup_arch(char **cmdline_p) ...@@ -290,6 +290,7 @@ void __init setup_arch(char **cmdline_p)
conswitchp = &dummy_con; conswitchp = &dummy_con;
#endif #endif
if (ppc_md.setup_arch)
ppc_md.setup_arch(); ppc_md.setup_arch();
if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab); if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab);
......
...@@ -530,6 +530,7 @@ void __init setup_arch(char **cmdline_p) ...@@ -530,6 +530,7 @@ void __init setup_arch(char **cmdline_p)
conswitchp = &dummy_con; conswitchp = &dummy_con;
#endif #endif
if (ppc_md.setup_arch)
ppc_md.setup_arch(); ppc_md.setup_arch();
paging_init(); paging_init();
......
...@@ -99,7 +99,7 @@ struct machdep_calls { ...@@ -99,7 +99,7 @@ struct machdep_calls {
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC64 */
int (*probe)(void); int (*probe)(void);
void (*setup_arch)(void); void (*setup_arch)(void); /* Optional, may be NULL */
void (*init_early)(void); void (*init_early)(void);
/* Optional, may be NULL. */ /* Optional, may be NULL. */
void (*show_cpuinfo)(struct seq_file *m); void (*show_cpuinfo)(struct seq_file *m);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment