diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-10 00:41:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-10 00:41:02 +0100 |
| commit | 92e2d508464b6293ad274fb606f766a458894142 (patch) | |
| tree | 39bf383364530e5cdeacb205d32d69a4b78e253d /arch/x86/include/asm/processor.h | |
| parent | Merge branch 'x86/uaccess' into core/percpu (diff) | |
| parent | x86: fix math_emu register frame access (diff) | |
| download | linux-92e2d508464b6293ad274fb606f766a458894142.tar.xz linux-92e2d508464b6293ad274fb606f766a458894142.zip | |
Merge branch 'x86/urgent' into core/percpu
Conflicts:
arch/x86/kernel/acpi/boot.c
Diffstat (limited to 'arch/x86/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 373d3f628d24..9763eb700138 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -353,7 +353,7 @@ struct i387_soft_struct { u8 no_update; u8 rm; u8 alimit; - struct info *info; + struct math_emu_info *info; u32 entry_eip; }; |