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

Commit cdf0c7de authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f3179748 ab44f462

arch/powerpc/kernel/cpu_setup_44x.S

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/powerpc/kernel/cputable.c

+3 −0
Original line number Diff line number Diff line
@@ -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 */