git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: MTRR workaround for system with stange var MTRRs
[safe/jmp/linux-2.6]
/
arch
/
x86
/
kernel
/
doublefault_32.c
diff --git
a/arch/x86/kernel/doublefault_32.c
b/arch/x86/kernel/doublefault_32.c
index
d16122a
..
b4f14c6
100644
(file)
--- a/
arch/x86/kernel/doublefault_32.c
+++ b/
arch/x86/kernel/doublefault_32.c
@@
-33,7
+33,7
@@
static void doublefault_fn(void)
printk(KERN_EMERG "double fault, tss at %08lx\n", tss);
if (ptr_ok(tss)) {
printk(KERN_EMERG "double fault, tss at %08lx\n", tss);
if (ptr_ok(tss)) {
- struct
i386_hw_tss *t = (struct i3
86_hw_tss *)tss;
+ struct
x86_hw_tss *t = (struct x
86_hw_tss *)tss;
printk(KERN_EMERG "eip = %08lx, esp = %08lx\n",
t->ip, t->sp);
printk(KERN_EMERG "eip = %08lx, esp = %08lx\n",
t->ip, t->sp);
@@
-66,6
+66,6
@@
struct tss_struct doublefault_tss __cacheline_aligned = {
.ds = __USER_DS,
.fs = __KERNEL_PERCPU,
.ds = __USER_DS,
.fs = __KERNEL_PERCPU,
- .__cr3 = __pa
(swapper_pg_dir)
+ .__cr3 = __pa
_nodebug(swapper_pg_dir),
}
};
}
};