diff options
Diffstat (limited to 'arch/x86/include/asm/thread_info.h')
| -rw-r--r-- | arch/x86/include/asm/thread_info.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index 27811190cbd7..c46a46be1ec6 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h | |||
| @@ -28,8 +28,7 @@ struct thread_info { | |||
| 28 | __u32 flags; /* low level flags */ | 28 | __u32 flags; /* low level flags */ |
| 29 | __u32 status; /* thread synchronous flags */ | 29 | __u32 status; /* thread synchronous flags */ |
| 30 | __u32 cpu; /* current CPU */ | 30 | __u32 cpu; /* current CPU */ |
| 31 | int preempt_count; /* 0 => preemptable, | 31 | int saved_preempt_count; |
| 32 | <0 => BUG */ | ||
| 33 | mm_segment_t addr_limit; | 32 | mm_segment_t addr_limit; |
| 34 | struct restart_block restart_block; | 33 | struct restart_block restart_block; |
| 35 | void __user *sysenter_return; | 34 | void __user *sysenter_return; |
| @@ -49,7 +48,7 @@ struct thread_info { | |||
| 49 | .exec_domain = &default_exec_domain, \ | 48 | .exec_domain = &default_exec_domain, \ |
| 50 | .flags = 0, \ | 49 | .flags = 0, \ |
| 51 | .cpu = 0, \ | 50 | .cpu = 0, \ |
| 52 | .preempt_count = INIT_PREEMPT_COUNT, \ | 51 | .saved_preempt_count = INIT_PREEMPT_COUNT, \ |
| 53 | .addr_limit = KERNEL_DS, \ | 52 | .addr_limit = KERNEL_DS, \ |
| 54 | .restart_block = { \ | 53 | .restart_block = { \ |
| 55 | .fn = do_no_restart_syscall, \ | 54 | .fn = do_no_restart_syscall, \ |