summaryrefslogtreecommitdiff
path: root/arch/powerpc/include
diff options
context:
space:
mode:
authorMichael Neuling <mikey@neuling.org>2012-11-05 17:10:35 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-11-15 15:08:03 +1100
commit61e2390ede3cea186cc01f5f3d0c9eb570c42c40 (patch)
tree503eea0cd552d61e29505bc3442a0d630ba6184f /arch/powerpc/include
parentfaab4dd2d281d42cb46b16e36f769be59c0a7338 (diff)
downloadlinux-3.10-61e2390ede3cea186cc01f5f3d0c9eb570c42c40.tar.gz
linux-3.10-61e2390ede3cea186cc01f5f3d0c9eb570c42c40.tar.bz2
linux-3.10-61e2390ede3cea186cc01f5f3d0c9eb570c42c40.zip
powerpc: Make load_hander handle upto 64k offset
If we change load_hander() to use an ori instead of addi, we can load handlers upto 64k away provided we are still 64k aligned. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r--arch/powerpc/include/asm/exception-64s.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index a43c1473915..9258daac496 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -55,7 +55,8 @@
* word.
*/
#define LOAD_HANDLER(reg, label) \
- addi reg,reg,(label)-_stext; /* virt addr of handler ... */
+ /* Handlers must be within 64K of kbase, which must be 64k aligned */ \
+ ori reg,reg,(label)-_stext; /* virt addr of handler ... */
/* Exception register prefixes */
#define EXC_HV H