git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-um
/
processor-generic.h
diff --git
a/include/asm-um/processor-generic.h
b/include/asm-um/processor-generic.h
index
da07a69
..
d99bbdd
100644
(file)
--- a/
include/asm-um/processor-generic.h
+++ b/
include/asm-um/processor-generic.h
@@
-10,10
+10,10
@@
struct pt_regs;
struct task_struct;
struct task_struct;
-#include "linux/config.h"
#include "asm/ptrace.h"
#include "choose-mode.h"
#include "registers.h"
#include "asm/ptrace.h"
#include "choose-mode.h"
#include "registers.h"
+#include "sysdep/archsetjmp.h"
struct mm_struct;
struct mm_struct;
@@
-44,8
+44,7
@@
struct thread_struct {
#endif
#ifdef CONFIG_MODE_SKAS
struct {
#endif
#ifdef CONFIG_MODE_SKAS
struct {
- void *switch_buf;
- void *fork_buf;
+ jmp_buf switch_buf;
int mm_count;
} skas;
#endif
int mm_count;
} skas;
#endif
@@
-139,9
+138,7
@@
extern struct cpuinfo_um cpu_data[];
#ifdef CONFIG_MODE_SKAS
#define KSTK_REG(tsk, reg) \
#ifdef CONFIG_MODE_SKAS
#define KSTK_REG(tsk, reg) \
- ({ union uml_pt_regs regs; \
- get_thread_regs(®s, tsk->thread.mode.skas.switch_buf); \
- UPT_REG(®s, reg); })
+ get_thread_reg(reg, &tsk->thread.mode.skas.switch_buf)
#else
#define KSTK_REG(tsk, reg) (0xbadbabe)
#endif
#else
#define KSTK_REG(tsk, reg) (0xbadbabe)
#endif