This is a note to let you know that I've just added the patch titled
PARISC: fix panic on prefetch(NULL) on PA7300LC
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
parisc-fix-panic-on-prefetch-null-on-pa7300lc.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From b3cb8674811d1851bbf1486a73d62b90c119b994 Mon Sep 17 00:00:00 2001
From: James Bottomley <[email protected]>
Date: Wed, 16 May 2012 11:10:27 +0100
Subject: PARISC: fix panic on prefetch(NULL) on PA7300LC
From: James Bottomley <[email protected]>
commit b3cb8674811d1851bbf1486a73d62b90c119b994 upstream.
Due to an errata, the PA7300LC generates a TLB miss interruption even on the
prefetch instruction. This means that prefetch(NULL), which is supposed to be
a nop on linux actually generates a NULL deref fault. Fix this by testing the
address of prefetch against NULL before doing the prefetch.
Signed-off-by: James Bottomley <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
arch/parisc/include/asm/prefetch.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- a/arch/parisc/include/asm/prefetch.h
+++ b/arch/parisc/include/asm/prefetch.h
@@ -21,7 +21,12 @@
#define ARCH_HAS_PREFETCH
static inline void prefetch(const void *addr)
{
- __asm__("ldw 0(%0), %%r0" : : "r" (addr));
+ __asm__(
+#ifndef CONFIG_PA20
+ /* Need to avoid prefetch of NULL on PA7300LC */
+ " extrw,u,= %0,31,32,%%r0\n"
+#endif
+ " ldw 0(%0), %%r0" : : "r" (addr));
}
/* LDD is a PA2.0 addition. */
Patches currently in stable-queue which might be from [email protected]
are
queue-3.0/parisc-fix-crash-in-flush_icache_page_asm-on-pa1.1.patch
queue-3.0/parisc-fix-panic-on-prefetch-null-on-pa7300lc.patch
queue-3.0/parisc-fix-pa1.1-oops-on-boot.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
