diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:43:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:43:21 -0400 |
| commit | acbaa41a780490c791492c41144c774c04875af1 (patch) | |
| tree | 31f1f046875eb071e2aed031e5d9d1584742314f /arch/x86/kernel/traps_32.c | |
| parent | 8d89adf44cf750e49691ba5b744b2ad77a05e997 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/quirks
Conflicts:
arch/x86/kernel/early-quirks.c
Diffstat (limited to 'arch/x86/kernel/traps_32.c')
| -rw-r--r-- | arch/x86/kernel/traps_32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index 03df8e45e5a1..da5a5964fccb 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c | |||
| @@ -1228,7 +1228,6 @@ void __init trap_init(void) | |||
| 1228 | 1228 | ||
| 1229 | set_bit(SYSCALL_VECTOR, used_vectors); | 1229 | set_bit(SYSCALL_VECTOR, used_vectors); |
| 1230 | 1230 | ||
| 1231 | init_thread_xstate(); | ||
| 1232 | /* | 1231 | /* |
| 1233 | * Should be a barrier for any external CPU state: | 1232 | * Should be a barrier for any external CPU state: |
| 1234 | */ | 1233 | */ |