summaryrefslogtreecommitdiffstats
path: root/include/asm-um/processor-generic.h
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-06-15 23:06:48 +0200
committerTony Luck <tony.luck@intel.com>2005-06-15 23:06:48 +0200
commitf2cbb4f01936a3e4225692e03b084b78c56d386d (patch)
treef89f3d8baa250589a38a4dd2df56f84cddae3c76 /include/asm-um/processor-generic.h
parentMerge with temp tree to get David's gdb inferior calls patch (diff)
parent[PATCH] update ppc64 defconfig (diff)
downloadlinux-f2cbb4f01936a3e4225692e03b084b78c56d386d.tar.xz
linux-f2cbb4f01936a3e4225692e03b084b78c56d386d.zip
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/asm-um/processor-generic.h')
-rw-r--r--include/asm-um/processor-generic.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h
index b953b1ad3b02..b2fc94fbc2d9 100644
--- a/include/asm-um/processor-generic.h
+++ b/include/asm-um/processor-generic.h
@@ -24,9 +24,6 @@ struct thread_struct {
int forking;
int nsyscalls;
struct pt_regs regs;
- unsigned long cr2;
- int err;
- unsigned long trap_no;
int singlestep_syscall;
void *fault_addr;
void *fault_catcher;
@@ -74,8 +71,6 @@ struct thread_struct {
.forking = 0, \
.nsyscalls = 0, \
.regs = EMPTY_REGS, \
- .cr2 = 0, \
- .err = 0, \
.fault_addr = NULL, \
.prev_sched = NULL, \
.temp_stack = 0, \