diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:15:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 13:13:31 +0200 |
| commit | 38c3b2455edea648f38d3e11baf478488fd698ed (patch) | |
| tree | a66280a235dfd3fdb5c0411f4efc64b2b98aec0c /arch/efi | |
| parent | 5b7b7ee5d943c6b58d9b7f974167d0105ca1b787 (diff) | |
| parent | ca22ccd7cdbb6b2bd720dd7e14280ee1efa29074 (diff) | |
| download | barebox-38c3b2455edea648f38d3e11baf478488fd698ed.tar.gz barebox-38c3b2455edea648f38d3e11baf478488fd698ed.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
lib/Makefile
Diffstat (limited to 'arch/efi')
| -rw-r--r-- | arch/efi/Kconfig | 1 | ||||
| -rw-r--r-- | arch/efi/include/asm/bitops.h | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/efi/Kconfig b/arch/efi/Kconfig index 71ac1c74e8..26fecaa392 100644 --- a/arch/efi/Kconfig +++ b/arch/efi/Kconfig @@ -7,6 +7,7 @@ config ARCH_EFI select EFI_GUID select EFI_DEVICEPATH select PRINTF_UUID + select GENERIC_FIND_NEXT_BIT config ARCH_TEXT_BASE hex diff --git a/arch/efi/include/asm/bitops.h b/arch/efi/include/asm/bitops.h index 94646d4d0d..447023da63 100644 --- a/arch/efi/include/asm/bitops.h +++ b/arch/efi/include/asm/bitops.h @@ -12,4 +12,11 @@ #include <asm-generic/bitops/hweight.h> #include <asm-generic/bitops/ops.h> +#define set_bit(x, y) __set_bit(x, y) +#define clear_bit(x, y) __clear_bit(x, y) +#define change_bit(x, y) __change_bit(x, y) +#define test_and_set_bit(x, y) __test_and_set_bit(x, y) +#define test_and_clear_bit(x, y) __test_and_clear_bit(x, y) +#define test_and_change_bit(x, y) __test_and_change_bit(x, y) + #endif |