From 22d29a6257f7c46ab36575a1083e7daedd0934f5 Mon Sep 17 00:00:00 2001
From: Harry Chen <i@harrychen.xyz>
Date: Tue, 14 May 2019 00:11:25 +0800
Subject: [PATCH] Revert "Revert "Fix trapframe.""

This reverts commit 6a83de78465d5a17dddb90ef57d9046f0c658bee.
---
 kernel/src/arch/mipsel/boot/trap.S | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kernel/src/arch/mipsel/boot/trap.S b/kernel/src/arch/mipsel/boot/trap.S
index 4ec8650..012d792 100644
--- a/kernel/src/arch/mipsel/boot/trap.S
+++ b/kernel/src/arch/mipsel/boot/trap.S
@@ -32,6 +32,12 @@ trap_from_kernel:
 	 *  k1 = old stack pointer
 	 *  sp = kernel stack */
 
+#ifdef board_thinpad
+#define TRAPFRAME_SIZE 304
+#else
+#define TRAPFRAME_SIZE 176
+#endif
+
 	# align stack pointer
 	andi k0, sp, 0xf
 	beqz k0, sp_aligned
@@ -39,18 +45,12 @@ trap_from_kernel:
 
 	la k0, 0xfffffff0
 	and k0, sp, k0
-	sw sp, -176(k0)
+	sw sp, -TRAPFRAME_SIZE(k0)
 	move sp, k0
 	
 sp_aligned:
 	# allocate 38 / 70 words for trapframe + 6 extra words
 
-#ifdef board_thinpad
-#define TRAPFRAME_SIZE 304
-#else
-#define TRAPFRAME_SIZE 176
-#endif
-
 	addiu sp, sp, -TRAPFRAME_SIZE
 
 	# save general registers