aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-02-23 05:28:25 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-03-20 04:13:59 -0500
commit074d82cf688fe2dfa7ba4a2317c56f62d13fb522 (patch)
tree6e29e9a1994a7e82f4250cca83731a9b37a1b862 /arch
parentb2bef4424cb4522f53e34d98d3deb0916478338b (diff)
[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')
-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:
622 restore 622 restore
623sparc64_boot_end: 623sparc64_boot_end:
624 624
625#include "systbls.S"
626#include "ktlb.S" 625#include "ktlb.S"
627#include "tsb.S" 626#include "tsb.S"
628#include "etrap.S" 627#include "etrap.S"
@@ -650,6 +649,8 @@ swapper_tsb:
650 649
651#include "ttable.S" 650#include "ttable.S"
652 651
652#include "systbls.S"
653
653 .data 654 .data
654 .align 8 655 .align 8
655 .globl prom_tba, tlb_type 656 .globl prom_tba, tlb_type