X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=include%2Fasm-um%2Fprocessor-generic.h;h=d99bbddffdb99781730f50d66155abf80d80afc1;hb=d9f7a745d55527d0d41684b22506a86c4381f7f1;hp=824c2889638215177fb372219df2cf4c968fc61e;hpb=2683e88413977a7f382106f8e8b3b684a597c761;p=~andy%2Flinux

diff --git a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h
index 824c2889638..d99bbddffdb 100644
--- a/include/asm-um/processor-generic.h
+++ b/include/asm-um/processor-generic.h
@@ -13,6 +13,7 @@ struct task_struct;
 #include "asm/ptrace.h"
 #include "choose-mode.h"
 #include "registers.h"
+#include "sysdep/archsetjmp.h"
 
 struct mm_struct;
 
@@ -43,8 +44,7 @@ struct thread_struct {
 #endif
 #ifdef CONFIG_MODE_SKAS
 		struct {
-			void *switch_buf;
-			void *fork_buf;
+			jmp_buf switch_buf;
 			int mm_count;
 		} skas;
 #endif
@@ -138,9 +138,7 @@ extern struct cpuinfo_um cpu_data[];
 
 #ifdef CONFIG_MODE_SKAS
 #define KSTK_REG(tsk, reg) \
-	({ union uml_pt_regs regs; \
-	   get_thread_regs(&regs, tsk->thread.mode.skas.switch_buf); \
-	   UPT_REG(&regs, reg); })
+	get_thread_reg(reg, &tsk->thread.mode.skas.switch_buf)
 #else
 #define KSTK_REG(tsk, reg) (0xbadbabe)
 #endif