tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc/virtex5: Fix Virtex5 machine check handling

Linus Torvalds cdf0c7de f3179748

+4
unified split
+1
arch/powerpc/kernel/cpu_setup_44x.S
··· 40 40 mtlr r4 41 41 blr 42 42 43 + _GLOBAL(__setup_cpu_440x5) 43 44 _GLOBAL(__setup_cpu_440gx) 44 45 _GLOBAL(__setup_cpu_440spe) 45 46 b __fixup_440A_mcheck
+3
arch/powerpc/kernel/cputable.c
··· 39 39 extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec); 40 40 extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec); 41 41 extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec); 42 + extern void __setup_cpu_440x5(unsigned long offset, struct cpu_spec* spec); 42 43 extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec); 43 44 extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec); 44 45 extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec); ··· 1501 1500 .cpu_user_features = COMMON_USER_BOOKE, 1502 1501 .icache_bsize = 32, 1503 1502 .dcache_bsize = 32, 1503 + .cpu_setup = __setup_cpu_440x5, 1504 + .machine_check = machine_check_440A, 1504 1505 .platform = "ppc440", 1505 1506 }, 1506 1507 { /* 460EX */