diff options
author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-01-30 07:31:27 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:31:27 -0500 |
commit | 746ff60f2627626fca0d8ddbf6b1f04d505782f4 (patch) | |
tree | ce99d5fb66a6fc683b7f9d89c49d64fcfc1c5da8 /include | |
parent | 053de044411111da00272d1b4e174e7dd743f499 (diff) |
x86: move desc_empty to where they belong
This patch moves the (duplicated) desc_empty implementation to desc.h,
where the descriptor things belong.
Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/desc.h | 6 | ||||
-rw-r--r-- | include/asm-x86/processor_32.h | 6 | ||||
-rw-r--r-- | 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 e9356a852020..e17581ad8824 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, | |||
71 | 71 | ||
72 | #endif | 72 | #endif |
73 | 73 | ||
74 | static inline int desc_empty(const void *ptr) | ||
75 | { | ||
76 | const u32 *desc = ptr; | ||
77 | return !(desc[0] | desc[1]); | ||
78 | } | ||
79 | |||
74 | #ifdef CONFIG_PARAVIRT | 80 | #ifdef CONFIG_PARAVIRT |
75 | #include <asm/paravirt.h> | 81 | #include <asm/paravirt.h> |
76 | #else | 82 | #else |
diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h index b9dbe4668e75..cadeffb54a72 100644 --- a/include/asm-x86/processor_32.h +++ b/include/asm-x86/processor_32.h | |||
@@ -21,12 +21,6 @@ | |||
21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
22 | #include <asm/desc_defs.h> | 22 | #include <asm/desc_defs.h> |
23 | 23 | ||
24 | static inline int desc_empty(const void *ptr) | ||
25 | { | ||
26 | const u32 *desc = ptr; | ||
27 | return !(desc[0] | desc[1]); | ||
28 | } | ||
29 | |||
30 | /* | 24 | /* |
31 | * Default implementation of macro that returns current | 25 | * Default implementation of macro that returns current |
32 | * instruction pointer ("program counter"). | 26 | * instruction pointer ("program counter"). |
diff --git a/include/asm-x86/processor_64.h b/include/asm-x86/processor_64.h index c49716a76644..acecef80a510 100644 --- a/include/asm-x86/processor_64.h +++ b/include/asm-x86/processor_64.h | |||
@@ -20,12 +20,6 @@ | |||
20 | #include <linux/cpumask.h> | 20 | #include <linux/cpumask.h> |
21 | #include <asm/desc_defs.h> | 21 | #include <asm/desc_defs.h> |
22 | 22 | ||
23 | static inline int desc_empty(const void *ptr) | ||
24 | { | ||
25 | const u32 *desc = ptr; | ||
26 | return !(desc[0] | desc[1]); | ||
27 | } | ||
28 | |||
29 | /* | 23 | /* |
30 | * Default implementation of macro that returns current | 24 | * Default implementation of macro that returns current |
31 | * instruction pointer ("program counter"). | 25 | * instruction pointer ("program counter"). |