Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/powerpc/kernel/setup_32.c

+2 −1
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ void __init setup_arch(char **cmdline_p) 
	conswitchp = &dummy_con;

#endif



	if (ppc_md.setup_arch)

		ppc_md.setup_arch();

	if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab);

arch/powerpc/kernel/setup_64.c

+2 −1
Original line number Diff line number Diff line
@@ -530,6 +530,7 @@ void __init setup_arch(char **cmdline_p) 
	conswitchp = &dummy_con;

#endif



	if (ppc_md.setup_arch)

		ppc_md.setup_arch();



	paging_init();

include/asm-powerpc/machdep.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ struct machdep_calls { 
#endif /* CONFIG_PPC64 */



	int		(*probe)(void);

	void		(*setup_arch)(void);

	void		(*setup_arch)(void); /* Optional, may be NULL */

	void		(*init_early)(void);

	/* Optional, may be NULL. */

	void		(*show_cpuinfo)(struct seq_file *m);