diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
| commit | ea0daab4ae4a2f853f06c76961c0ed324fd0804c (patch) | |
| tree | f6fbe2db5772695181b7a7257b05e43343bd8d75 /include/asm-arm/system.h | |
| parent | 58aab753de605c14b9878a897e7349c3063afeff (diff) | |
| parent | 1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'include/asm-arm/system.h')
| -rw-r--r-- | include/asm-arm/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h index 8405eb6558ed..39dd7008013c 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h | |||
| @@ -308,7 +308,7 @@ do { \ | |||
| 308 | ({ \ | 308 | ({ \ |
| 309 | unsigned long flags; \ | 309 | unsigned long flags; \ |
| 310 | local_save_flags(flags); \ | 310 | local_save_flags(flags); \ |
| 311 | flags & PSR_I_BIT; \ | 311 | (int)(flags & PSR_I_BIT); \ |
| 312 | }) | 312 | }) |
| 313 | 313 | ||
| 314 | #ifdef CONFIG_SMP | 314 | #ifdef CONFIG_SMP |