Re: [PATCH v4 03/12] xen: move for_each_set_bit to xen/bitops.h

[Keir Fraser <keir.xen@gmail.com>]

On 26/04/2013 16:28, "Stefano Stabellini" <stefano.stabellini@eu.citrix.com>
wrote:

> Move for_each_set_bit from asm-x86/bitops.h to xen/bitops.h.
> Replace #include <asm/bitops.h> with #include <xen/bitops.h> everywhere.
> 
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> CC: keir@xen.org
> CC: JBeulich@suse.com

Acked-by: Keir Fraser <keir@xen.org>

> ---
>  xen/arch/x86/i8259.c         |    2 +-
>  xen/arch/x86/mpparse.c       |    2 +-
>  xen/arch/x86/setup.c         |    2 +-
>  xen/arch/x86/traps.c         |    2 +-
>  xen/include/asm-x86/bitops.h |   11 -----------
>  xen/include/asm-x86/smp.h    |    2 +-
>  xen/include/asm-x86/system.h |    2 +-
>  xen/include/xen/bitops.h     |   11 +++++++++++
>  xen/include/xen/event.h      |    2 +-
>  xen/include/xen/softirq.h    |    2 +-
>  xen/xsm/xsm_policy.c         |    2 +-
>  11 files changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
> index b537c5f..6fdcce8 100644
> --- a/xen/arch/x86/i8259.c
> +++ b/xen/arch/x86/i8259.c
> @@ -16,7 +16,7 @@
>  #include <asm/system.h>
>  #include <asm/io.h>
>  #include <asm/desc.h>
> -#include <asm/bitops.h>
> +#include <xen/bitops.h>
>  #include <xen/delay.h>
>  #include <asm/apic.h>
>  #include <asm/asm_defns.h>
> diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c
> index 97ab5d3..97d34bc 100644
> --- a/xen/arch/x86/mpparse.c
> +++ b/xen/arch/x86/mpparse.c
> @@ -22,7 +22,7 @@
>  #include <xen/efi.h>
>  #include <xen/sched.h>
>  
> -#include <asm/bitops.h>
> +#include <xen/bitops.h>
>  #include <asm/smp.h>
>  #include <asm/acpi.h>
>  #include <asm/mtrr.h>
> diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
> index 43301a5..744335d 100644
> --- a/xen/arch/x86/setup.c
> +++ b/xen/arch/x86/setup.c
> @@ -29,7 +29,7 @@
>  #include <public/version.h>
>  #include <compat/platform.h>
>  #include <compat/xen.h>
> -#include <asm/bitops.h>
> +#include <xen/bitops.h>
>  #include <asm/smp.h>
>  #include <asm/processor.h>
>  #include <asm/mpspec.h>
> diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
> index d36eddd..5200940 100644
> --- a/xen/arch/x86/traps.c
> +++ b/xen/arch/x86/traps.c
> @@ -52,7 +52,7 @@
>  #include <asm/system.h>
>  #include <asm/io.h>
>  #include <asm/atomic.h>
> -#include <asm/bitops.h>
> +#include <xen/bitops.h>
>  #include <asm/desc.h>
>  #include <asm/debugreg.h>
>  #include <asm/smp.h>
> diff --git a/xen/include/asm-x86/bitops.h b/xen/include/asm-x86/bitops.h
> index c3cbd26..f5a84ef 100644
> --- a/xen/include/asm-x86/bitops.h
> +++ b/xen/include/asm-x86/bitops.h
> @@ -368,17 +368,6 @@ static inline unsigned int __scanbit(unsigned long val,
> unsigned long max)
>    __find_next_zero_bit(addr,size,off)))
>  
>  /**
> - * for_each_set_bit - iterate over every set bit in a memory region
> - * @bit: The integer iterator
> - * @addr: The address to base the search on
> - * @size: The maximum size to search
> - */
> -#define for_each_set_bit(bit, addr, size)               \
> -    for ( (bit) = find_first_bit(addr, size);           \
> -          (bit) < (size);                               \
> -          (bit) = find_next_bit(addr, size, (bit) + 1) )
> -
> -/**
>   * find_first_set_bit - find the first set bit in @word
>   * @word: the word to search
>   * 
> diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h
> index 301f8c7..81f8610 100644
> --- a/xen/include/asm-x86/smp.h
> +++ b/xen/include/asm-x86/smp.h
> @@ -12,7 +12,7 @@
>  #endif
>  
>  #ifndef __ASSEMBLY__
> -#include <asm/bitops.h>
> +#include <xen/bitops.h>
>  #include <asm/mpspec.h>
>  #endif
>  
> diff --git a/xen/include/asm-x86/system.h b/xen/include/asm-x86/system.h
> index b0876d6..6ab7d56 100644
> --- a/xen/include/asm-x86/system.h
> +++ b/xen/include/asm-x86/system.h
> @@ -2,7 +2,7 @@
>  #define __ASM_SYSTEM_H
>  
>  #include <xen/lib.h>
> -#include <asm/bitops.h>
> +#include <xen/bitops.h>
>  
>  #define read_segment_register(name)                             \
>  ({  u16 __sel;                                                  \
> diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h
> index c6a78b6..6054155 100644
> --- a/xen/include/xen/bitops.h
> +++ b/xen/include/xen/bitops.h
> @@ -182,4 +182,15 @@ static inline __u32 ror32(__u32 word, unsigned int shift)
>  #define __L16(_x) (((_x) & 0x0000ff00) ? ( 8 + __L8( (_x)>> 8)) : __L8( _x))
>  #define LOG_2(_x) (((_x) & 0xffff0000) ? (16 + __L16((_x)>>16)) : __L16(_x))
>  
> +/**
> + * for_each_set_bit - iterate over every set bit in a memory region
> + * @bit: The integer iterator
> + * @addr: The address to base the search on
> + * @size: The maximum size to search
> + */
> +#define for_each_set_bit(bit, addr, size)               \
> +    for ( (bit) = find_first_bit(addr, size);           \
> +          (bit) < (size);                               \
> +          (bit) = find_next_bit(addr, size, (bit) + 1) )
> +
>  #endif
> diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h
> index 71c3e92..4ac39ad 100644
> --- a/xen/include/xen/event.h
> +++ b/xen/include/xen/event.h
> @@ -12,7 +12,7 @@
>  #include <xen/sched.h>
>  #include <xen/smp.h>
>  #include <xen/softirq.h>
> -#include <asm/bitops.h>
> +#include <xen/bitops.h>
>  #include <asm/event.h>
>  
>  /*
> diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h
> index 193351d..0c0d481 100644
> --- a/xen/include/xen/softirq.h
> +++ b/xen/include/xen/softirq.h
> @@ -13,7 +13,7 @@ enum {
>  
>  #include <xen/lib.h>
>  #include <xen/smp.h>
> -#include <asm/bitops.h>
> +#include <xen/bitops.h>
>  #include <asm/current.h>
>  #include <asm/hardirq.h>
>  #include <asm/softirq.h>
> diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c
> index 65be61d..cad7964 100644
> --- a/xen/xsm/xsm_policy.c
> +++ b/xen/xsm/xsm_policy.c
> @@ -20,7 +20,7 @@
>  
>  #include <xsm/xsm.h>
>  #include <xen/multiboot.h>
> -#include <asm/bitops.h>
> +#include <xen/bitops.h>
>  
>  char *__initdata policy_buffer = NULL;
>  u32 __initdata policy_size = 0;