diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 14:27:27 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 14:27:27 +0100 |
| commit | 38b22b6e9f46ab8f73ef5734f0e0a000766a9258 (patch) | |
| tree | 2ccc41ef55918d3af43e444bde7648562a031559 /include/asm-sh64/thread_info.h | |
| parent | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (diff) | |
| parent | b3e112bcc19abd8e9657dca34a87316786e096f3 (diff) | |
| download | linux-38b22b6e9f46ab8f73ef5734f0e0a000766a9258.tar.gz linux-38b22b6e9f46ab8f73ef5734f0e0a000766a9258.tar.bz2 linux-38b22b6e9f46ab8f73ef5734f0e0a000766a9258.zip | |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'include/asm-sh64/thread_info.h')
| -rw-r--r-- | include/asm-sh64/thread_info.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 { 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; |