diff options
| author |   Andrew Morton <akpm@osdl.org> | 2005-06-21 17:14:28 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 18:46:11 -0700 |
| commit | 9a558cb4ec43ccbe82e2cf899ced37f29ac017df (patch) | |
| tree | 360f64dcf8ecdb04371a2fd524fddb2424392564 /include/asm-arm/system.h | |
| parent | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-dev-9a558cb4ec43ccbe82e2cf899ced37f29ac017df.tar.xz linux-dev-9a558cb4ec43ccbe82e2cf899ced37f29ac017df.zip | |
[PATCH] arm: irqs_disabled() type fix
kernel/sched.c: In function `__might_sleep':
kernel/sched.c:5461: warning: int format, long unsigned int arg (arg 3)
We expect irqs_disabled() to return an int (poor man's bool).
Acked-by: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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 { \ ({ \ unsigned long flags; \ local_save_flags(flags); \ - flags & PSR_I_BIT; \ + (int)(flags & PSR_I_BIT); \ }) #ifdef CONFIG_SMP |