diff options
-rw-r--r-- | include/asm-arm/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-arm26/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-cris/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-frv/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-h8300/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-i386/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-ia64/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-m32r/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-m68k/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-m68knommu/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-mips/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-parisc/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-ppc/thread_info.h | 3 | ||||
-rw-r--r-- | include/asm-ppc64/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-s390/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-sh/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-sh64/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-sparc/thread_info.h | 4 | ||||
-rw-r--r-- | include/asm-sparc64/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-um/thread_info.h | 2 | ||||
-rw-r--r-- | include/asm-v850/thread_info.h | 3 | ||||
-rw-r--r-- | include/asm-x86_64/thread_info.h | 2 |
22 files changed, 25 insertions, 23 deletions
diff --git a/include/asm-arm/thread_info.h b/include/asm-arm/thread_info.h index 66c585c50cf9..8252a4cd860f 100644 --- a/include/asm-arm/thread_info.h +++ b/include/asm-arm/thread_info.h | |||
@@ -49,7 +49,7 @@ struct cpu_context_save { | |||
49 | */ | 49 | */ |
50 | struct thread_info { | 50 | struct thread_info { |
51 | unsigned long flags; /* low level flags */ | 51 | unsigned long flags; /* low level flags */ |
52 | __s32 preempt_count; /* 0 => preemptable, <0 => bug */ | 52 | int preempt_count; /* 0 => preemptable, <0 => bug */ |
53 | mm_segment_t addr_limit; /* address limit */ | 53 | mm_segment_t addr_limit; /* address limit */ |
54 | struct task_struct *task; /* main task structure */ | 54 | struct task_struct *task; /* main task structure */ |
55 | struct exec_domain *exec_domain; /* execution domain */ | 55 | struct exec_domain *exec_domain; /* execution domain */ |
diff --git a/include/asm-arm26/thread_info.h b/include/asm-arm26/thread_info.h index 50f41b50268a..aff3e5699c64 100644 --- a/include/asm-arm26/thread_info.h +++ b/include/asm-arm26/thread_info.h | |||
@@ -44,7 +44,7 @@ struct cpu_context_save { | |||
44 | */ | 44 | */ |
45 | struct thread_info { | 45 | struct thread_info { |
46 | unsigned long flags; /* low level flags */ | 46 | unsigned long flags; /* low level flags */ |
47 | __s32 preempt_count; /* 0 => preemptable, <0 => bug */ | 47 | int preempt_count; /* 0 => preemptable, <0 => bug */ |
48 | mm_segment_t addr_limit; /* address limit */ | 48 | mm_segment_t addr_limit; /* address limit */ |
49 | struct task_struct *task; /* main task structure */ | 49 | struct task_struct *task; /* main task structure */ |
50 | struct exec_domain *exec_domain; /* execution domain */ | 50 | struct exec_domain *exec_domain; /* execution domain */ |
diff --git a/include/asm-cris/thread_info.h b/include/asm-cris/thread_info.h index 53193feb0826..5ba4b7865cc5 100644 --- a/include/asm-cris/thread_info.h +++ b/include/asm-cris/thread_info.h | |||
@@ -31,7 +31,7 @@ struct thread_info { | |||
31 | struct exec_domain *exec_domain; /* execution domain */ | 31 | struct exec_domain *exec_domain; /* execution domain */ |
32 | unsigned long flags; /* low level flags */ | 32 | unsigned long flags; /* low level flags */ |
33 | __u32 cpu; /* current CPU */ | 33 | __u32 cpu; /* current CPU */ |
34 | __s32 preempt_count; /* 0 => preemptable, <0 => BUG */ | 34 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
35 | 35 | ||
36 | mm_segment_t addr_limit; /* thread address space: | 36 | mm_segment_t addr_limit; /* thread address space: |
37 | 0-0xBFFFFFFF for user-thead | 37 | 0-0xBFFFFFFF for user-thead |
diff --git a/include/asm-frv/thread_info.h b/include/asm-frv/thread_info.h index b80a97f50af6..c8cba7836f0d 100644 --- a/include/asm-frv/thread_info.h +++ b/include/asm-frv/thread_info.h | |||
@@ -33,7 +33,7 @@ struct thread_info { | |||
33 | unsigned long flags; /* low level flags */ | 33 | unsigned long flags; /* low level flags */ |
34 | unsigned long status; /* thread-synchronous flags */ | 34 | unsigned long status; /* thread-synchronous flags */ |
35 | __u32 cpu; /* current CPU */ | 35 | __u32 cpu; /* current CPU */ |
36 | __s32 preempt_count; /* 0 => preemptable, <0 => BUG */ | 36 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
37 | 37 | ||
38 | mm_segment_t addr_limit; /* thread address space: | 38 | mm_segment_t addr_limit; /* thread address space: |
39 | 0-0xBFFFFFFF for user-thead | 39 | 0-0xBFFFFFFF for user-thead |
diff --git a/include/asm-h8300/thread_info.h b/include/asm-h8300/thread_info.h index b07c9344776f..bfcc755c3bb1 100644 --- a/include/asm-h8300/thread_info.h +++ b/include/asm-h8300/thread_info.h | |||
@@ -23,7 +23,7 @@ struct thread_info { | |||
23 | struct exec_domain *exec_domain; /* execution domain */ | 23 | struct exec_domain *exec_domain; /* execution domain */ |
24 | unsigned long flags; /* low level flags */ | 24 | unsigned long flags; /* low level flags */ |
25 | int cpu; /* cpu we're on */ | 25 | int cpu; /* cpu we're on */ |
26 | int preempt_count; /* 0 => preemptable, <0 => BUG*/ | 26 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
27 | struct restart_block restart_block; | 27 | struct restart_block restart_block; |
28 | }; | 28 | }; |
29 | 29 | ||
diff --git a/include/asm-i386/thread_info.h b/include/asm-i386/thread_info.h index 2cd57271801d..95add81237ea 100644 --- a/include/asm-i386/thread_info.h +++ b/include/asm-i386/thread_info.h | |||
@@ -31,7 +31,7 @@ struct thread_info { | |||
31 | unsigned long flags; /* low level flags */ | 31 | unsigned long flags; /* low level flags */ |
32 | unsigned long status; /* thread-synchronous flags */ | 32 | unsigned long status; /* thread-synchronous flags */ |
33 | __u32 cpu; /* current CPU */ | 33 | __u32 cpu; /* current CPU */ |
34 | __s32 preempt_count; /* 0 => preemptable, <0 => BUG */ | 34 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
35 | 35 | ||
36 | 36 | ||
37 | mm_segment_t addr_limit; /* thread address space: | 37 | mm_segment_t addr_limit; /* thread address space: |
diff --git a/include/asm-ia64/thread_info.h b/include/asm-ia64/thread_info.h index 8d5b7e77028c..7dc8951708a3 100644 --- a/include/asm-ia64/thread_info.h +++ b/include/asm-ia64/thread_info.h | |||
@@ -25,7 +25,7 @@ struct thread_info { | |||
25 | __u32 flags; /* thread_info flags (see TIF_*) */ | 25 | __u32 flags; /* thread_info flags (see TIF_*) */ |
26 | __u32 cpu; /* current CPU */ | 26 | __u32 cpu; /* current CPU */ |
27 | mm_segment_t addr_limit; /* user-level address space limit */ | 27 | mm_segment_t addr_limit; /* user-level address space limit */ |
28 | __s32 preempt_count; /* 0=premptable, <0=BUG; will also serve as bh-counter */ | 28 | int preempt_count; /* 0=premptable, <0=BUG; will also serve as bh-counter */ |
29 | struct restart_block restart_block; | 29 | struct restart_block restart_block; |
30 | struct { | 30 | struct { |
31 | int signo; | 31 | int signo; |
diff --git a/include/asm-m32r/thread_info.h b/include/asm-m32r/thread_info.h index 9f3a0fcf6e2b..7a6be7727a92 100644 --- a/include/asm-m32r/thread_info.h +++ b/include/asm-m32r/thread_info.h | |||
@@ -28,7 +28,7 @@ struct thread_info { | |||
28 | unsigned long flags; /* low level flags */ | 28 | unsigned long flags; /* low level flags */ |
29 | unsigned long status; /* thread-synchronous flags */ | 29 | unsigned long status; /* thread-synchronous flags */ |
30 | __u32 cpu; /* current CPU */ | 30 | __u32 cpu; /* current CPU */ |
31 | __s32 preempt_count; /* 0 => preemptable, <0 => BUG */ | 31 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
32 | 32 | ||
33 | mm_segment_t addr_limit; /* thread address space: | 33 | mm_segment_t addr_limit; /* thread address space: |
34 | 0-0xBFFFFFFF for user-thread | 34 | 0-0xBFFFFFFF for user-thread |
diff --git a/include/asm-m68k/thread_info.h b/include/asm-m68k/thread_info.h index 5f58939c59db..2aed24f6fd2e 100644 --- a/include/asm-m68k/thread_info.h +++ b/include/asm-m68k/thread_info.h | |||
@@ -8,7 +8,7 @@ | |||
8 | struct thread_info { | 8 | struct thread_info { |
9 | struct task_struct *task; /* main task structure */ | 9 | struct task_struct *task; /* main task structure */ |
10 | struct exec_domain *exec_domain; /* execution domain */ | 10 | struct exec_domain *exec_domain; /* execution domain */ |
11 | __s32 preempt_count; /* 0 => preemptable, <0 => BUG */ | 11 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
12 | __u32 cpu; /* should always be 0 on m68k */ | 12 | __u32 cpu; /* should always be 0 on m68k */ |
13 | struct restart_block restart_block; | 13 | struct restart_block restart_block; |
14 | 14 | ||
diff --git a/include/asm-m68knommu/thread_info.h b/include/asm-m68knommu/thread_info.h index c8153b7c1f5c..7b9a3fa3af5d 100644 --- a/include/asm-m68knommu/thread_info.h +++ b/include/asm-m68knommu/thread_info.h | |||
@@ -36,7 +36,7 @@ struct thread_info { | |||
36 | struct exec_domain *exec_domain; /* execution domain */ | 36 | struct exec_domain *exec_domain; /* execution domain */ |
37 | unsigned long flags; /* low level flags */ | 37 | unsigned long flags; /* low level flags */ |
38 | int cpu; /* cpu we're on */ | 38 | int cpu; /* cpu we're on */ |
39 | int preempt_count; /* 0 => preemptable, <0 => BUG*/ | 39 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
40 | struct restart_block restart_block; | 40 | struct restart_block restart_block; |
41 | }; | 41 | }; |
42 | 42 | ||
diff --git a/include/asm-mips/thread_info.h b/include/asm-mips/thread_info.h index 768900305e2f..42fcd6f2c206 100644 --- a/include/asm-mips/thread_info.h +++ b/include/asm-mips/thread_info.h | |||
@@ -27,7 +27,7 @@ struct thread_info { | |||
27 | struct exec_domain *exec_domain; /* execution domain */ | 27 | struct exec_domain *exec_domain; /* execution domain */ |
28 | unsigned long flags; /* low level flags */ | 28 | unsigned long flags; /* low level flags */ |
29 | __u32 cpu; /* current CPU */ | 29 | __u32 cpu; /* current CPU */ |
30 | __s32 preempt_count; /* 0 => preemptable, <0 => BUG */ | 30 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
31 | 31 | ||
32 | mm_segment_t addr_limit; /* thread address space: | 32 | mm_segment_t addr_limit; /* thread address space: |
33 | 0-0xBFFFFFFF for user-thead | 33 | 0-0xBFFFFFFF for user-thead |
diff --git a/include/asm-parisc/thread_info.h b/include/asm-parisc/thread_info.h index fe9b7f8ae4c6..57bbb76cb6c1 100644 --- a/include/asm-parisc/thread_info.h +++ b/include/asm-parisc/thread_info.h | |||
@@ -12,7 +12,7 @@ struct thread_info { | |||
12 | unsigned long flags; /* thread_info flags (see TIF_*) */ | 12 | unsigned long flags; /* thread_info flags (see TIF_*) */ |
13 | mm_segment_t addr_limit; /* user-level address space limit */ | 13 | mm_segment_t addr_limit; /* user-level address space limit */ |
14 | __u32 cpu; /* current CPU */ | 14 | __u32 cpu; /* current CPU */ |
15 | __s32 preempt_count; /* 0=premptable, <0=BUG; will also serve as bh-counter */ | 15 | int preempt_count; /* 0=premptable, <0=BUG; will also serve as bh-counter */ |
16 | struct restart_block restart_block; | 16 | struct restart_block restart_block; |
17 | }; | 17 | }; |
18 | 18 | ||
diff --git a/include/asm-ppc/thread_info.h b/include/asm-ppc/thread_info.h index e3b5284a6f91..27903db42efc 100644 --- a/include/asm-ppc/thread_info.h +++ b/include/asm-ppc/thread_info.h | |||
@@ -20,7 +20,8 @@ struct thread_info { | |||
20 | unsigned long flags; /* low level flags */ | 20 | unsigned long flags; /* low level flags */ |
21 | unsigned long local_flags; /* non-racy flags */ | 21 | unsigned long local_flags; /* non-racy flags */ |
22 | int cpu; /* cpu we're on */ | 22 | int cpu; /* cpu we're on */ |
23 | int preempt_count; | 23 | int preempt_count; /* 0 => preemptable, |
24 | <0 => BUG */ | ||
24 | struct restart_block restart_block; | 25 | struct restart_block restart_block; |
25 | }; | 26 | }; |
26 | 27 | ||
diff --git a/include/asm-ppc64/thread_info.h b/include/asm-ppc64/thread_info.h index 48b7900e90ec..0494df6fca74 100644 --- a/include/asm-ppc64/thread_info.h +++ b/include/asm-ppc64/thread_info.h | |||
@@ -24,7 +24,7 @@ struct thread_info { | |||
24 | struct task_struct *task; /* main task structure */ | 24 | struct task_struct *task; /* main task structure */ |
25 | struct exec_domain *exec_domain; /* execution domain */ | 25 | struct exec_domain *exec_domain; /* execution domain */ |
26 | int cpu; /* cpu we're on */ | 26 | int cpu; /* cpu we're on */ |
27 | int preempt_count; | 27 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
28 | struct restart_block restart_block; | 28 | struct restart_block restart_block; |
29 | /* set by force_successful_syscall_return */ | 29 | /* set by force_successful_syscall_return */ |
30 | unsigned char syscall_noerror; | 30 | unsigned char syscall_noerror; |
diff --git a/include/asm-s390/thread_info.h b/include/asm-s390/thread_info.h index aade85c53a63..fe101d41e849 100644 --- a/include/asm-s390/thread_info.h +++ b/include/asm-s390/thread_info.h | |||
@@ -50,7 +50,7 @@ struct thread_info { | |||
50 | struct exec_domain *exec_domain; /* execution domain */ | 50 | struct exec_domain *exec_domain; /* execution domain */ |
51 | unsigned long flags; /* low level flags */ | 51 | unsigned long flags; /* low level flags */ |
52 | unsigned int cpu; /* current CPU */ | 52 | unsigned int cpu; /* current CPU */ |
53 | unsigned int preempt_count; /* 0 => preemptable */ | 53 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
54 | struct restart_block restart_block; | 54 | struct restart_block restart_block; |
55 | }; | 55 | }; |
56 | 56 | ||
diff --git a/include/asm-sh/thread_info.h b/include/asm-sh/thread_info.h index 4bbbd9f3c37e..46080cefaff8 100644 --- a/include/asm-sh/thread_info.h +++ b/include/asm-sh/thread_info.h | |||
@@ -20,7 +20,7 @@ struct thread_info { | |||
20 | struct exec_domain *exec_domain; /* execution domain */ | 20 | struct exec_domain *exec_domain; /* execution domain */ |
21 | __u32 flags; /* low level flags */ | 21 | __u32 flags; /* low level flags */ |
22 | __u32 cpu; | 22 | __u32 cpu; |
23 | __s32 preempt_count; /* 0 => preemptable, <0 => BUG */ | 23 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
24 | struct restart_block restart_block; | 24 | struct restart_block restart_block; |
25 | __u8 supervisor_stack[0]; | 25 | __u8 supervisor_stack[0]; |
26 | }; | 26 | }; |
diff --git a/include/asm-sh64/thread_info.h b/include/asm-sh64/thread_info.h index 8a32d6bd0b79..10f024c6a2e3 100644 --- a/include/asm-sh64/thread_info.h +++ b/include/asm-sh64/thread_info.h | |||
@@ -22,7 +22,7 @@ struct thread_info { | |||
22 | struct exec_domain *exec_domain; /* execution domain */ | 22 | struct exec_domain *exec_domain; /* execution domain */ |
23 | unsigned long flags; /* low level flags */ | 23 | unsigned long flags; /* low level flags */ |
24 | /* Put the 4 32-bit fields together to make asm offsetting easier. */ | 24 | /* Put the 4 32-bit fields together to make asm offsetting easier. */ |
25 | __s32 preempt_count; /* 0 => preemptable, <0 => BUG */ | 25 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
26 | __u16 cpu; | 26 | __u16 cpu; |
27 | 27 | ||
28 | mm_segment_t addr_limit; | 28 | mm_segment_t addr_limit; |
diff --git a/include/asm-sparc/thread_info.h b/include/asm-sparc/thread_info.h index 104f03c55416..ff6ccb3d24c6 100644 --- a/include/asm-sparc/thread_info.h +++ b/include/asm-sparc/thread_info.h | |||
@@ -30,9 +30,9 @@ struct thread_info { | |||
30 | struct task_struct *task; /* main task structure */ | 30 | struct task_struct *task; /* main task structure */ |
31 | struct exec_domain *exec_domain; /* execution domain */ | 31 | struct exec_domain *exec_domain; /* execution domain */ |
32 | unsigned long flags; /* low level flags */ | 32 | unsigned long flags; /* low level flags */ |
33 | |||
34 | int cpu; /* cpu we're on */ | 33 | int cpu; /* cpu we're on */ |
35 | int preempt_count; | 34 | int preempt_count; /* 0 => preemptable, |
35 | <0 => BUG */ | ||
36 | int softirq_count; | 36 | int softirq_count; |
37 | int hardirq_count; | 37 | int hardirq_count; |
38 | 38 | ||
diff --git a/include/asm-sparc64/thread_info.h b/include/asm-sparc64/thread_info.h index 517caaba1c87..0cd652956929 100644 --- a/include/asm-sparc64/thread_info.h +++ b/include/asm-sparc64/thread_info.h | |||
@@ -46,7 +46,7 @@ struct thread_info { | |||
46 | unsigned long fault_address; | 46 | unsigned long fault_address; |
47 | struct pt_regs *kregs; | 47 | struct pt_regs *kregs; |
48 | struct exec_domain *exec_domain; | 48 | struct exec_domain *exec_domain; |
49 | int preempt_count; | 49 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
50 | int __pad; | 50 | int __pad; |
51 | 51 | ||
52 | unsigned long *utraps; | 52 | unsigned long *utraps; |
diff --git a/include/asm-um/thread_info.h b/include/asm-um/thread_info.h index 1feaaf148ef1..97267f059ef5 100644 --- a/include/asm-um/thread_info.h +++ b/include/asm-um/thread_info.h | |||
@@ -17,7 +17,7 @@ struct thread_info { | |||
17 | struct exec_domain *exec_domain; /* execution domain */ | 17 | struct exec_domain *exec_domain; /* execution domain */ |
18 | unsigned long flags; /* low level flags */ | 18 | unsigned long flags; /* low level flags */ |
19 | __u32 cpu; /* current CPU */ | 19 | __u32 cpu; /* current CPU */ |
20 | __s32 preempt_count; /* 0 => preemptable, | 20 | int preempt_count; /* 0 => preemptable, |
21 | <0 => BUG */ | 21 | <0 => BUG */ |
22 | mm_segment_t addr_limit; /* thread address space: | 22 | mm_segment_t addr_limit; /* thread address space: |
23 | 0-0xBFFFFFFF for user | 23 | 0-0xBFFFFFFF for user |
diff --git a/include/asm-v850/thread_info.h b/include/asm-v850/thread_info.h index e2ef44593752..e4cfad94a553 100644 --- a/include/asm-v850/thread_info.h +++ b/include/asm-v850/thread_info.h | |||
@@ -30,7 +30,8 @@ struct thread_info { | |||
30 | struct exec_domain *exec_domain; /* execution domain */ | 30 | struct exec_domain *exec_domain; /* execution domain */ |
31 | unsigned long flags; /* low level flags */ | 31 | unsigned long flags; /* low level flags */ |
32 | int cpu; /* cpu we're on */ | 32 | int cpu; /* cpu we're on */ |
33 | int preempt_count; | 33 | int preempt_count; /* 0 => preemptable, |
34 | <0 => BUG */ | ||
34 | struct restart_block restart_block; | 35 | struct restart_block restart_block; |
35 | }; | 36 | }; |
36 | 37 | ||
diff --git a/include/asm-x86_64/thread_info.h b/include/asm-x86_64/thread_info.h index f4b3b249639c..08eb6e4f3737 100644 --- a/include/asm-x86_64/thread_info.h +++ b/include/asm-x86_64/thread_info.h | |||
@@ -29,7 +29,7 @@ struct thread_info { | |||
29 | __u32 flags; /* low level flags */ | 29 | __u32 flags; /* low level flags */ |
30 | __u32 status; /* thread synchronous flags */ | 30 | __u32 status; /* thread synchronous flags */ |
31 | __u32 cpu; /* current CPU */ | 31 | __u32 cpu; /* current CPU */ |
32 | int preempt_count; | 32 | int preempt_count; /* 0 => preemptable, <0 => BUG */ |
33 | 33 | ||
34 | mm_segment_t addr_limit; | 34 | mm_segment_t addr_limit; |
35 | struct restart_block restart_block; | 35 | struct restart_block restart_block; |