Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 2921
b: refs/heads/master
c: dcd497f
h: refs/heads/master
i:
  2919: a15c1a7
v: v3
  • Loading branch information
Jesper Juhl authored and Linus Torvalds committed Jun 23, 2005
1 parent 834bef2 commit 5c48d34
Show file tree
Hide file tree
Showing 23 changed files with 26 additions and 24 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 35a82d1a53e1a9ad54efafcc940f9335beaed5c3
refs/heads/master: dcd497f99a1ef29a7c5e76142965be77e9dacabd
2 changes: 1 addition & 1 deletion trunk/include/asm-arm/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct cpu_context_save {
*/
struct thread_info {
unsigned long flags; /* low level flags */
__s32 preempt_count; /* 0 => preemptable, <0 => bug */
int preempt_count; /* 0 => preemptable, <0 => bug */
mm_segment_t addr_limit; /* address limit */
struct task_struct *task; /* main task structure */
struct exec_domain *exec_domain; /* execution domain */
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-arm26/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ struct cpu_context_save {
*/
struct thread_info {
unsigned long flags; /* low level flags */
__s32 preempt_count; /* 0 => preemptable, <0 => bug */
int preempt_count; /* 0 => preemptable, <0 => bug */
mm_segment_t addr_limit; /* address limit */
struct task_struct *task; /* main task structure */
struct exec_domain *exec_domain; /* execution domain */
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-cris/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct thread_info {
struct exec_domain *exec_domain; /* execution domain */
unsigned long flags; /* low level flags */
__u32 cpu; /* current CPU */
__s32 preempt_count; /* 0 => preemptable, <0 => BUG */
int preempt_count; /* 0 => preemptable, <0 => BUG */

mm_segment_t addr_limit; /* thread address space:
0-0xBFFFFFFF for user-thead
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-frv/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct thread_info {
unsigned long flags; /* low level flags */
unsigned long status; /* thread-synchronous flags */
__u32 cpu; /* current CPU */
__s32 preempt_count; /* 0 => preemptable, <0 => BUG */
int preempt_count; /* 0 => preemptable, <0 => BUG */

mm_segment_t addr_limit; /* thread address space:
0-0xBFFFFFFF for user-thead
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-h8300/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct thread_info {
struct exec_domain *exec_domain; /* execution domain */
unsigned long flags; /* low level flags */
int cpu; /* cpu we're on */
int preempt_count; /* 0 => preemptable, <0 => BUG*/
int preempt_count; /* 0 => preemptable, <0 => BUG */
struct restart_block restart_block;
};

Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-i386/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct thread_info {
unsigned long flags; /* low level flags */
unsigned long status; /* thread-synchronous flags */
__u32 cpu; /* current CPU */
__s32 preempt_count; /* 0 => preemptable, <0 => BUG */
int preempt_count; /* 0 => preemptable, <0 => BUG */


mm_segment_t addr_limit; /* thread address space:
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-ia64/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct thread_info {
__u32 flags; /* thread_info flags (see TIF_*) */
__u32 cpu; /* current CPU */
mm_segment_t addr_limit; /* user-level address space limit */
__s32 preempt_count; /* 0=premptable, <0=BUG; will also serve as bh-counter */
int preempt_count; /* 0=premptable, <0=BUG; will also serve as bh-counter */
struct restart_block restart_block;
struct {
int signo;
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-m32r/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct thread_info {
unsigned long flags; /* low level flags */
unsigned long status; /* thread-synchronous flags */
__u32 cpu; /* current CPU */
__s32 preempt_count; /* 0 => preemptable, <0 => BUG */
int preempt_count; /* 0 => preemptable, <0 => BUG */

mm_segment_t addr_limit; /* thread address space:
0-0xBFFFFFFF for user-thread
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-m68k/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
struct thread_info {
struct task_struct *task; /* main task structure */
struct exec_domain *exec_domain; /* execution domain */
__s32 preempt_count; /* 0 => preemptable, <0 => BUG */
int preempt_count; /* 0 => preemptable, <0 => BUG */
__u32 cpu; /* should always be 0 on m68k */
struct restart_block restart_block;

Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-m68knommu/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct thread_info {
struct exec_domain *exec_domain; /* execution domain */
unsigned long flags; /* low level flags */
int cpu; /* cpu we're on */
int preempt_count; /* 0 => preemptable, <0 => BUG*/
int preempt_count; /* 0 => preemptable, <0 => BUG */
struct restart_block restart_block;
};

Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-mips/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct thread_info {
struct exec_domain *exec_domain; /* execution domain */
unsigned long flags; /* low level flags */
__u32 cpu; /* current CPU */
__s32 preempt_count; /* 0 => preemptable, <0 => BUG */
int preempt_count; /* 0 => preemptable, <0 => BUG */

mm_segment_t addr_limit; /* thread address space:
0-0xBFFFFFFF for user-thead
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-parisc/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ struct thread_info {
unsigned long flags; /* thread_info flags (see TIF_*) */
mm_segment_t addr_limit; /* user-level address space limit */
__u32 cpu; /* current CPU */
__s32 preempt_count; /* 0=premptable, <0=BUG; will also serve as bh-counter */
int preempt_count; /* 0=premptable, <0=BUG; will also serve as bh-counter */
struct restart_block restart_block;
};

Expand Down
3 changes: 2 additions & 1 deletion trunk/include/asm-ppc/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ struct thread_info {
unsigned long flags; /* low level flags */
unsigned long local_flags; /* non-racy flags */
int cpu; /* cpu we're on */
int preempt_count;
int preempt_count; /* 0 => preemptable,
<0 => BUG */
struct restart_block restart_block;
};

Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-ppc64/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ struct thread_info {
struct task_struct *task; /* main task structure */
struct exec_domain *exec_domain; /* execution domain */
int cpu; /* cpu we're on */
int preempt_count;
int preempt_count; /* 0 => preemptable, <0 => BUG */
struct restart_block restart_block;
/* set by force_successful_syscall_return */
unsigned char syscall_noerror;
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-s390/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ struct thread_info {
struct exec_domain *exec_domain; /* execution domain */
unsigned long flags; /* low level flags */
unsigned int cpu; /* current CPU */
unsigned int preempt_count; /* 0 => preemptable */
int preempt_count; /* 0 => preemptable, <0 => BUG */
struct restart_block restart_block;
};

Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-sh/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ struct thread_info {
struct exec_domain *exec_domain; /* execution domain */
__u32 flags; /* low level flags */
__u32 cpu;
__s32 preempt_count; /* 0 => preemptable, <0 => BUG */
int preempt_count; /* 0 => preemptable, <0 => BUG */
struct restart_block restart_block;
__u8 supervisor_stack[0];
};
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-sh64/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ struct thread_info {
struct exec_domain *exec_domain; /* execution domain */
unsigned long flags; /* low level flags */
/* Put the 4 32-bit fields together to make asm offsetting easier. */
__s32 preempt_count; /* 0 => preemptable, <0 => BUG */
int preempt_count; /* 0 => preemptable, <0 => BUG */
__u16 cpu;

mm_segment_t addr_limit;
Expand Down
4 changes: 2 additions & 2 deletions trunk/include/asm-sparc/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ struct thread_info {
struct task_struct *task; /* main task structure */
struct exec_domain *exec_domain; /* execution domain */
unsigned long flags; /* low level flags */

int cpu; /* cpu we're on */
int preempt_count;
int preempt_count; /* 0 => preemptable,
<0 => BUG */
int softirq_count;
int hardirq_count;

Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-sparc64/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ struct thread_info {
unsigned long fault_address;
struct pt_regs *kregs;
struct exec_domain *exec_domain;
int preempt_count;
int preempt_count; /* 0 => preemptable, <0 => BUG */
int __pad;

unsigned long *utraps;
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-um/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ struct thread_info {
struct exec_domain *exec_domain; /* execution domain */
unsigned long flags; /* low level flags */
__u32 cpu; /* current CPU */
__s32 preempt_count; /* 0 => preemptable,
int preempt_count; /* 0 => preemptable,
<0 => BUG */
mm_segment_t addr_limit; /* thread address space:
0-0xBFFFFFFF for user
Expand Down
3 changes: 2 additions & 1 deletion trunk/include/asm-v850/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ struct thread_info {
struct exec_domain *exec_domain; /* execution domain */
unsigned long flags; /* low level flags */
int cpu; /* cpu we're on */
int preempt_count;
int preempt_count; /* 0 => preemptable,
<0 => BUG */
struct restart_block restart_block;
};

Expand Down
2 changes: 1 addition & 1 deletion trunk/include/asm-x86_64/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct thread_info {
__u32 flags; /* low level flags */
__u32 status; /* thread synchronous flags */
__u32 cpu; /* current CPU */
int preempt_count;
int preempt_count; /* 0 => preemptable, <0 => BUG */

mm_segment_t addr_limit;
struct restart_block restart_block;
Expand Down

0 comments on commit 5c48d34

Please sign in to comment.