diff options
| author | Uwe Kleine-Koenig <ukl@pengutronix.de> | 2008-12-12 11:18:54 +0100 |
|---|---|---|
| committer | Uwe Kleine-Koenig <ukl@pengutronix.de> | 2008-12-12 11:18:54 +0100 |
| commit | 7971db5a4b4176ad5df590fce07a962c643a2740 (patch) | |
| tree | 6ad8e09c5376c4e4c532c3411b0171ba1011acd9 /arch/powerpc | |
| parent | d403700bf8fc903584e830967f5d64075770848c (diff) | |
| parent | c4edfced662fa64deeed89c7d8c9f96d86130c19 (diff) | |
| download | kernel_samsung_smdk4412-7971db5a4b4176ad5df590fce07a962c643a2740.zip kernel_samsung_smdk4412-7971db5a4b4176ad5df590fce07a962c643a2740.tar.gz kernel_samsung_smdk4412-7971db5a4b4176ad5df590fce07a962c643a2740.tar.bz2 | |
Merge branch 'for-rmk-misc' into for-rmk
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/cpu_setup_44x.S | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/cputable.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S index 31c18b5..10b4ab1 100644 --- a/arch/powerpc/kernel/cpu_setup_44x.S +++ b/arch/powerpc/kernel/cpu_setup_44x.S @@ -40,6 +40,7 @@ _GLOBAL(__setup_cpu_460gt) mtlr r4 blr +_GLOBAL(__setup_cpu_440x5) _GLOBAL(__setup_cpu_440gx) _GLOBAL(__setup_cpu_440spe) b __fixup_440A_mcheck diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index b1eb834..7e87195 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c @@ -39,6 +39,7 @@ extern void __setup_cpu_440epx(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec); +extern void __setup_cpu_440x5(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec); @@ -1500,6 +1501,8 @@ static struct cpu_spec __initdata cpu_specs[] = { .cpu_user_features = COMMON_USER_BOOKE, .icache_bsize = 32, .dcache_bsize = 32, + .cpu_setup = __setup_cpu_440x5, + .machine_check = machine_check_440A, .platform = "ppc440", }, { /* 460EX */ |