diff options
| author | Thomas Gleixner <tglx@tglx.tec.linutronix.de> | 2005-06-26 17:20:36 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-06-26 17:20:36 -0400 |
| commit | 7ca6448dbfb398bba36eda3c01bc14b86c3675be (patch) | |
| tree | 82d934ebf07f22a2c64c3b6d82ec24082878b43a /include/asm-h8300/thread_info.h | |
| parent | f1f67a9874f1a4bba1adff6d694aa52e5f52ff1a (diff) | |
| parent | 7d681b23d6cc14a8c026ea6756242cb522cbbcae (diff) | |
Merge with rsync://fileserver/linux
Update to Linus latest
Diffstat (limited to 'include/asm-h8300/thread_info.h')
| -rw-r--r-- | include/asm-h8300/thread_info.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||