Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / arch / x86 / boot / bitops.h

diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
index 878e4b9940d9212ce581c5bea0ac518ae6bbf85f..0d41d68131cc43bcfae0bf88da2561cce6b0129b 100644 (file)
--- a/arch/x86/boot/bitops.h
+++ b/arch/x86/boot/bitops.h
@@ -16,14 +16,16 @@
 #define BOOT_BITOPS_H
 #define _LINUX_BITOPS_H                /* Inhibit inclusion of <linux/bitops.h> */
 
-static inline int constant_test_bit(int nr, const void *addr)
+#include <linux/types.h>
+
+static inline bool constant_test_bit(int nr, const void *addr)
 {
        const u32 *p = (const u32 *)addr;
        return ((1UL << (nr & 31)) & (p[nr >> 5])) != 0;
 }
-static inline int variable_test_bit(int nr, const void *addr)
+static inline bool variable_test_bit(int nr, const void *addr)
 {
-       u8 v;
+       bool v;
        const u32 *p = (const u32 *)addr;
 
        asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));