summaryrefslogtreecommitdiffstats
path: root/arch/sparc64
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-02-23 02:28:25 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-03-20 01:13:59 -0800
commit074d82cf688fe2dfa7ba4a2317c56f62d13fb522 (patch)
tree6e29e9a1994a7e82f4250cca83731a9b37a1b862 /arch/sparc64
parentb2bef4424cb4522f53e34d98d3deb0916478338b (diff)
downloadlinux-stable-074d82cf688fe2dfa7ba4a2317c56f62d13fb522.tar.gz
linux-stable-074d82cf688fe2dfa7ba4a2317c56f62d13fb522.tar.bz2
linux-stable-074d82cf688fe2dfa7ba4a2317c56f62d13fb522.zip
[SPARC64]: Put syscall tables after trap table.
Otherwise with too much stuff enabled in the kernel config we can end up with an unaligned trap table. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/kernel/head.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index 8c6c4694be94..3eadac5e171e 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -622,7 +622,6 @@ setup_tba:
restore
sparc64_boot_end:
-#include "systbls.S"
#include "ktlb.S"
#include "tsb.S"
#include "etrap.S"
@@ -650,6 +649,8 @@ swapper_tsb:
#include "ttable.S"
+#include "systbls.S"
+
.data
.align 8
.globl prom_tba, tlb_type