summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2010-09-22 17:37:43 -0400
committerSteven Rostedt <rostedt@goodmis.org>2010-09-22 17:37:43 -0400
commit95fccd465eefb3d6bf80dae0496607b534d38313 (patch)
treeb2c6f4f7ba439fdc2de7ed09b455798165019704
parentdff9d3c215251022dd8bb3823c9f75edb4b63fe9 (diff)
downloadlinux-stable-95fccd465eefb3d6bf80dae0496607b534d38313.tar.gz
linux-stable-95fccd465eefb3d6bf80dae0496607b534d38313.tar.bz2
linux-stable-95fccd465eefb3d6bf80dae0496607b534d38313.zip
jump label: Remove duplicate structure for x86
The structure in the x86 jump label code uses the typedef jump_label_t, which is defined by the #ifdef arch type. The structure does not need to be duplicated there. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--arch/x86/include/asm/jump_label.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h
index b4a2cb403370..f52d42e80585 100644
--- a/arch/x86/include/asm/jump_label.h
+++ b/arch/x86/include/asm/jump_label.h
@@ -23,18 +23,10 @@
#endif /* __KERNEL__ */
#ifdef CONFIG_X86_64
-
typedef u64 jump_label_t;
-
-struct jump_entry {
- jump_label_t code;
- jump_label_t target;
- jump_label_t key;
-};
-
#else
-
typedef u32 jump_label_t;
+#endif
struct jump_entry {
jump_label_t code;
@@ -43,5 +35,3 @@ struct jump_entry {
};
#endif
-
-#endif