xen: consolidate implementations of LOG() macro
PATCH 1/1 xen: consolidate implementations of LOG() macro
arm64 is going to add another one shortly, so take control now.
Signed-off-by Ian Campbell <[email protected]>
--- xen/arch/arm/arm32/asm-offsets.c | 8 +------- xen/arch/x86/x86_64/asm-offsets.c | 8 +------- xen/include/xen/bitops.h | 7 +++++++ 3 files changed, 9 insertions(+), 14 deletions(-)
xen/arch/arm/arm32/asm-offsets.c +1 -7
@@ -8,6 +8,7 @@#include <xen/config.h> #include <xen/types.h> #include <xen/sched.h> +#include <xen/bitops.h> #include <public/xen.h> #include <asm/current.h>
@@ -18,13 +19,6 @@#define OFFSET (_sym, _str, _mem) \ DEFINE(_sym, offsetof(_str, _mem)); -/* base-2 logarithm */ -#define __L2 (_x) (((_x) & 0x00000002) ? 1 : 0) -#define __L4 (_x) (((_x) & 0x0000000c) ? ( 2 + __L2( (_x)>> 2)) : __L2( _x)) -#define __L8 (_x) (((_x) & 0x000000f0) ? ( 4 + __L4( (_x)>> 4)) : __L4( _x)) -#define __L16 (_x) (((_x) & 0x0000ff00) ? ( 8 + __L8( (_x)>> 8)) : __L8( _x)) -#define LOG_2 (_x) (((_x) & 0xffff0000) ? (16 + __L16((_x)>>16)) : __L16(_x)) -void __dummy__ (void ) { OFFSET(UREGS_sp, struct cpu_user_regs, sp);
xen/arch/x86/x86_64/asm-offsets.c +1 -7
@@ -8,6 +8,7 @@#include <xen/config.h> #include <xen/perfc.h> #include <xen/sched.h> +#include <xen/bitops.h> #include <compat/xen.h> #include <asm/fixmap.h> #include <asm/hardirq.h>
@@ -20,13 +21,6 @@#define OFFSET (_sym, _str, _mem) \ DEFINE(_sym, offsetof(_str, _mem)); -/* base-2 logarithm */ -#define __L2 (_x) (((_x) & 0x00000002) ? 1 : 0) -#define __L4 (_x) (((_x) & 0x0000000c) ? ( 2 + __L2( (_x)>> 2)) : __L2( _x)) -#define __L8 (_x) (((_x) & 0x000000f0) ? ( 4 + __L4( (_x)>> 4)) : __L4( _x)) -#define __L16 (_x) (((_x) & 0x0000ff00) ? ( 8 + __L8( (_x)>> 8)) : __L8( _x)) -#define LOG_2 (_x) (((_x) & 0xffff0000) ? (16 + __L16((_x)>>16)) : __L16(_x)) -void __dummy__ (void ) { OFFSET(UREGS_r15, struct cpu_user_regs, r15);
xen/include/xen/bitops.h +7 -0
@@ -175,4 +175,11 @@ static inline __u32 ror32(__u32 word, unsigned int shift) return (word >> shift) | (word << (32 - shift)); } +/* base-2 logarithm */ +#define __L2 (_x) (((_x) & 0x00000002) ? 1 : 0) +#define __L4 (_x) (((_x) & 0x0000000c) ? ( 2 + __L2( (_x)>> 2)) : __L2( _x)) +#define __L8 (_x) (((_x) & 0x000000f0) ? ( 4 + __L4( (_x)>> 4)) : __L4( _x)) +#define __L16 (_x) (((_x) & 0x0000ff00) ? ( 8 + __L8( (_x)>> 8)) : __L8( _x)) +#define LOG_2 (_x) (((_x) & 0xffff0000) ? (16 + __L16((_x)>>16)) : __L16(_x)) +#endif
Signature · 1 line
1.7.2.5
Quoted 6 lines · Ian Campbell
arm64 is going to add another one shortly, so take control now.
Signed-off-by Ian Campbell <[email protected]>
Acked-by Tim Deegan <[email protected]>
Keir Fraser
Acked-byQuoted 10 lines · Tim Deegan
Quoted 6 lines · Ian Campbell
arm64 is going to add another one shortly, so take control now.
Signed-off-by Ian Campbell <[email protected]>Acked-by Tim Deegan <[email protected]>
Acked-by Keir Fraser <[email protected]>