Commit 5e185581 authored May 15, 2012 by James Bottomley

[PARISC] fix PA1.1 oops on boot



All PA1.1 systems have been oopsing on boot since

commit f311847c
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Wed Dec 22 10:22:11 2010 -0600

    parisc: flush pages through tmpalias space

because a PA2.0 instruction was accidentally introduced into the PA1.1 TLB
insertion interruption path when it was consolidated with the do_alias macro.
Fix the do_alias macro only to use PA2.0 instructions if compiled for 64 bit.
Cc: stable@vger.kernel.org  #2.6.39+
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 568b4455

arch/parisc/kernel/entry.S

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -581,7 +581,11 @@
	*/		*/
	cmpiclr,= 0x01,\tmp,%r0		cmpiclr,= 0x01,\tmp,%r0
	ldi (_PAGE_DIRTY\|_PAGE_READ\|_PAGE_WRITE),\prot		ldi (_PAGE_DIRTY\|_PAGE_READ\|_PAGE_WRITE),\prot
			#ifdef CONFIG_64BIT
	depd,z \prot,8,7,\prot		depd,z \prot,8,7,\prot
			#else
			depw,z \prot,8,7,\prot
			#endif
	/*		/*
	* OK, it is in the temp alias region, check whether "from" or "to".		* OK, it is in the temp alias region, check whether "from" or "to".
	* Check "subtle" note in pacache.S re: r23/r26.		* Check "subtle" note in pacache.S re: r23/r26.