From: Steven Rostedt <srostedt@redhat.com>
Date: Wed, 22 Sep 2010 21:37:43 +0000 (-0400)
Subject: jump label: Remove duplicate structure for x86
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=95fccd465eefb3d6bf80dae0496607b534d38313;p=linux-beck.git

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>
---

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