This patch moves the (duplicated) desc_empty implementation to desc.h, where the descriptor things belong. Signed-off-by: Glauber de Oliveira Costa <gcosta@xxxxxxxxxx> --- include/asm-x86/desc.h | 6 ++++++ include/asm-x86/processor_32.h | 6 ------ include/asm-x86/processor_64.h | 6 ------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h index 161a6d6..6c781bf 100644 --- a/include/asm-x86/desc.h +++ b/include/asm-x86/desc.h @@ -71,6 +71,12 @@ static inline void pack_gate(gate_desc *gate, unsigned char type, #endif +static inline int desc_empty(const void *ptr) +{ + const u32 *desc = ptr; + return !(desc[0] | desc[1]); +} + #ifdef CONFIG_PARAVIRT #include <asm/paravirt.h> #else diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h index b9dbe46..cadeffb 100644 --- a/include/asm-x86/processor_32.h +++ b/include/asm-x86/processor_32.h @@ -21,12 +21,6 @@ #include <linux/init.h> #include <asm/desc_defs.h> -static inline int desc_empty(const void *ptr) -{ - const u32 *desc = ptr; - return !(desc[0] | desc[1]); -} - /* * Default implementation of macro that returns current * instruction pointer ("program counter"). diff --git a/include/asm-x86/processor_64.h b/include/asm-x86/processor_64.h index a5d06d7..6207292 100644 --- a/include/asm-x86/processor_64.h +++ b/include/asm-x86/processor_64.h @@ -20,12 +20,6 @@ #include <linux/cpumask.h> #include <asm/desc_defs.h> -static inline int desc_empty(const void *ptr) -{ - const u32 *desc = ptr; - return !(desc[0] | desc[1]); -} - /* * Default implementation of macro that returns current * instruction pointer ("program counter"). -- 1.4.4.2 _______________________________________________ Virtualization mailing list Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/virtualization