diff --git a/[refs] b/[refs] index 728aadba7352..7d10d19bf209 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9723d95d1076e9ef394ff26162fb0b47531089b0 +refs/heads/master: 9a558cb4ec43ccbe82e2cf899ced37f29ac017df diff --git a/trunk/include/asm-arm/system.h b/trunk/include/asm-arm/system.h index 8405eb6558ed..39dd7008013c 100644 --- a/trunk/include/asm-arm/system.h +++ b/trunk/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