diff options
author | James Bottomley <JBottomley@Parallels.com> | 2012-05-15 11:04:19 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-01 15:12:52 +0800 |
commit | 34f3f91d9ec7b735217dcba820636827f42d2811 (patch) | |
tree | 1640b5ab1b5c35ee92c4decfc0c9454e93fab8bb | |
parent | 37a8457773c266cdb77fcddec008cd73e81786be (diff) | |
download | kernel_samsung_smdk4412-34f3f91d9ec7b735217dcba820636827f42d2811.zip kernel_samsung_smdk4412-34f3f91d9ec7b735217dcba820636827f42d2811.tar.gz kernel_samsung_smdk4412-34f3f91d9ec7b735217dcba820636827f42d2811.tar.bz2 |
PARISC: fix PA1.1 oops on boot
commit 5e185581d7c46ddd33cd9c01106d1fc86efb9376 upstream.
All PA1.1 systems have been oopsing on boot since
commit f311847c2fcebd81912e2f0caf8a461dec28db41
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.
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | arch/parisc/kernel/entry.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index 6f05944..5350342 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S @@ -581,7 +581,11 @@ */ cmpiclr,= 0x01,\tmp,%r0 ldi (_PAGE_DIRTY|_PAGE_READ|_PAGE_WRITE),\prot +#ifdef CONFIG_64BIT 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". * Check "subtle" note in pacache.S re: r23/r26. |