aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2006-11-10 12:01:02 -0800
committerPaul Mackerras <paulus@samba.org>2006-11-13 14:49:18 +1100
commit57744ea95edd340d7140852ce86c743df2cd588c (patch)
treec48065dd375b4ddcc817814ee889556a4d1978c3
parentfc9e8b4e275b6882cb537154c8fc7cde3692eea0 (diff)
[PATCH] Check for null init_early routine
Add a check for a null ppc_md.init_early to allow platforms that don't require an init_early routine to just set this member to null. Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/kernel/setup_64.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index ae6b67ce54e..2fef772edfc 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -380,7 +380,8 @@ void __init setup_system(void)
* setting up the hash table pointers. It also sets up some interrupt-mapping
* related options that will be used by finish_device_tree()
*/
- ppc_md.init_early();
+ if (ppc_md.init_early)
+ ppc_md.init_early();
/*
* We can discover serial ports now since the above did setup the