projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 07361938 GKH |
1 | From 5e185581d7c46ddd33cd9c01106d1fc86efb9376 Mon Sep 17 00:00:00 2001 |
| 2 | From: James Bottomley <JBottomley@Parallels.com> | |
| 3 | Date: Tue, 15 May 2012 11:04:19 +0100 | |
| 4 | Subject: PARISC: fix PA1.1 oops on boot | |
| 5 | ||
| 6 | From: James Bottomley <JBottomley@Parallels.com> | |
| 7 | ||
| 8 | commit 5e185581d7c46ddd33cd9c01106d1fc86efb9376 upstream. | |
| 9 | ||
| 10 | All PA1.1 systems have been oopsing on boot since | |
| 11 | ||
| 12 | commit f311847c2fcebd81912e2f0caf8a461dec28db41 | |
| 13 | Author: James Bottomley <James.Bottomley@HansenPartnership.com> | |
| 14 | Date: Wed Dec 22 10:22:11 2010 -0600 | |
| 15 | ||
| 16 | parisc: flush pages through tmpalias space | |
| 17 | ||
| 18 | because a PA2.0 instruction was accidentally introduced into the PA1.1 TLB | |
| 19 | insertion interruption path when it was consolidated with the do_alias macro. | |
| 20 | Fix the do_alias macro only to use PA2.0 instructions if compiled for 64 bit. | |
| 21 | ||
| 22 | Signed-off-by: James Bottomley <JBottomley@Parallels.com> | |
| 23 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 24 | ||
| 25 | --- | |
| 26 | arch/parisc/kernel/entry.S | 4 ++++ | |
| 27 | 1 file changed, 4 insertions(+) | |
| 28 | ||
| 29 | --- a/arch/parisc/kernel/entry.S | |
| 30 | +++ b/arch/parisc/kernel/entry.S | |
| 31 | @@ -581,7 +581,11 @@ | |
| 32 | */ | |
| 33 | cmpiclr,= 0x01,\tmp,%r0 | |
| 34 | ldi (_PAGE_DIRTY|_PAGE_READ|_PAGE_WRITE),\prot | |
| 35 | +#ifdef CONFIG_64BIT | |
| 36 | depd,z \prot,8,7,\prot | |
| 37 | +#else | |
| 38 | + depw,z \prot,8,7,\prot | |
| 39 | +#endif | |
| 40 | /* | |
| 41 | * OK, it is in the temp alias region, check whether "from" or "to". | |
| 42 | * Check "subtle" note in pacache.S re: r23/r26. |