summaryrefslogtreecommitdiffstats
path: root/include/asm-mips/thread_info.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@tglx.tec.linutronix.de>2005-06-26 23:20:36 +0200
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-06-26 23:20:36 +0200
commit7ca6448dbfb398bba36eda3c01bc14b86c3675be (patch)
tree82d934ebf07f22a2c64c3b6d82ec24082878b43a /include/asm-mips/thread_info.h
parentf1f67a9874f1a4bba1adff6d694aa52e5f52ff1a (diff)
parent7d681b23d6cc14a8c026ea6756242cb522cbbcae (diff)
downloadop-kernel-dev-7ca6448dbfb398bba36eda3c01bc14b86c3675be.zip
op-kernel-dev-7ca6448dbfb398bba36eda3c01bc14b86c3675be.tar.gz
Merge with rsync://fileserver/linux
Update to Linus latest
Diffstat (limited to 'include/asm-mips/thread_info.h')
-rw-r--r--include/asm-mips/thread_info.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/thread_info.h b/include/asm-mips/thread_info.h
index 7689003..42fcd6f 100644
--- a/include/asm-mips/thread_info.h
+++ b/include/asm-mips/thread_info.h
@@ -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
OpenPOWER on IntegriCloud