diff options
| author | Clark Williams <williams@redhat.com> | 2012-02-29 09:50:56 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-02-29 09:50:56 -0600 |
| commit | 5f269e50cb10cd1a74b89f7fda87b0c9082754f0 (patch) | |
| tree | 76f82e09728bbed59baebcff2e0b008f0ab5eead /arch/x86/include/asm/processor.h | |
| parent | a0c034c3726715d1928b301ddd43c51799c0c07a (diff) | |
| parent | 1de504ea25617f701ac3a246a1c9dfd2246d4900 (diff) | |
Merge commit 'v3.2.8' into rt-3.2.7-rt13v3.2.8-rt13
Conflicts:
arch/x86/kernel/process_32.c
Diffstat (limited to 'arch/x86/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index b650435ffb53..bb3ee3629a0f 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -456,6 +456,7 @@ struct thread_struct { unsigned long trap_no; unsigned long error_code; /* floating point and extended processor state */ + unsigned long has_fpu; struct fpu fpu; #ifdef CONFIG_X86_32 /* Virtual 86 mode info */ |