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

Commit fff5f528 authored by Kumar Gala's avatar Kumar Gala
Browse files

Merge branch '85xx' into for_paulus

parents f909f106 02ed82cc

arch/powerpc/kernel/head_fsl_booke.S

+0 −2
Original line number Original line Diff line number Diff line
@@ -892,7 +892,6 @@ load_up_spe: 
	REST_GPR(9, r11)

	REST_GPR(9, r11)

	REST_GPR(12, r11)

	REST_GPR(12, r11)

	lwz	r11,GPR11(r11)

	lwz	r11,GPR11(r11)

	SYNC

	rfi

	rfi





/*

/*
@@ -956,7 +955,6 @@ _GLOBAL(giveup_altivec) 
_GLOBAL(giveup_spe)

_GLOBAL(giveup_spe)

	mfmsr	r5

	mfmsr	r5

	oris	r5,r5,MSR_SPE@h

	oris	r5,r5,MSR_SPE@h

	SYNC

	mtmsr	r5			/* enable use of SPE now */

	mtmsr	r5			/* enable use of SPE now */

	isync

	isync

	cmpi	0,r3,0

	cmpi	0,r3,0

arch/ppc/kernel/head_fsl_booke.S

+0 −2
Original line number Original line Diff line number Diff line
@@ -892,7 +892,6 @@ load_up_spe: 
	REST_GPR(9, r11)

	REST_GPR(9, r11)

	REST_GPR(12, r11)

	REST_GPR(12, r11)

	lwz	r11,GPR11(r11)

	lwz	r11,GPR11(r11)

	SYNC

	rfi

	rfi





/*

/*
@@ -956,7 +955,6 @@ _GLOBAL(giveup_altivec) 
_GLOBAL(giveup_spe)

_GLOBAL(giveup_spe)

	mfmsr	r5

	mfmsr	r5

	oris	r5,r5,MSR_SPE@h

	oris	r5,r5,MSR_SPE@h

	SYNC

	mtmsr	r5			/* enable use of SPE now */

	mtmsr	r5			/* enable use of SPE now */

	isync

	isync

	cmpi	0,r3,0

	cmpi	0,r3,0