|   | 
      | 
  
  
      | 
      | 
  
 
     | 
    | 
  
  
     | 
    | 
  
  
    |   | 
      | 
  
  
    | 
         
xen-devel
[Xen-devel] [PATCH RFC V4 09/10] x86/jump_label: use	GENERIC_NOP5_ATOMIC
 
| 
To:  | 
Steven Rostedt <rostedt@xxxxxxxxxxx> | 
 
| 
Subject:  | 
[Xen-devel] [PATCH RFC V4 09/10] x86/jump_label: use	GENERIC_NOP5_ATOMIC instead of jmp5 +0 | 
 
| 
From:  | 
Jeremy Fitzhardinge <jeremy@xxxxxxxx> | 
 
| 
Date:  | 
Wed, 12 Oct 2011 17:08:40 -0700 | 
 
| 
Cc:  | 
Xen Devel <xen-devel@xxxxxxxxxxxxxxxxxxx>,	Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>,	Peter Zijlstra <peterz@xxxxxxxxxxxxx>, Jason Baron <jbaron@xxxxxxxxxx>,	the arch/x86 maintainers <x86@xxxxxxxxxx>,	David Daney <david.daney@xxxxxxxxxx>,	Linux Kernel Mailing List <linux-kernel@xxxxxxxxxxxxxxx>,	Michael Ellerman <michael@xxxxxxxxxxxxxx>,	Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>,	"H. Peter Anvin" <hpa@xxxxxxxxx>, Ingo Molnar <mingo@xxxxxxx>,	"David S. Miller" <davem@xxxxxxxxxxxxx> | 
 
| 
Delivery-date:  | 
Wed, 12 Oct 2011 17:18:54 -0700 | 
 
| 
Envelope-to:  | 
www-data@xxxxxxxxxxxxxxxxxxx | 
 
| 
In-reply-to:  | 
<cover.1318464169.git.jeremy.fitzhardinge@xxxxxxxxxx> | 
 
| 
In-reply-to:  | 
<cover.1318464413.git.jeremy.fitzhardinge@xxxxxxxxxx> | 
 
| 
List-help:  | 
<mailto:xen-devel-request@lists.xensource.com?subject=help> | 
 
| 
List-id:  | 
Xen developer discussion <xen-devel.lists.xensource.com> | 
 
| 
List-post:  | 
<mailto:xen-devel@lists.xensource.com> | 
 
| 
List-subscribe:  | 
<http://lists.xensource.com/mailman/listinfo/xen-devel>,	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe> | 
 
| 
List-unsubscribe:  | 
<http://lists.xensource.com/mailman/listinfo/xen-devel>,	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe> | 
 
| 
References:  | 
<cover.1318464169.git.jeremy.fitzhardinge@xxxxxxxxxx> | 
 
| 
References:  | 
<cover.1318464413.git.jeremy.fitzhardinge@xxxxxxxxxx> | 
 
| 
Sender:  | 
xen-devel-bounces@xxxxxxxxxxxxxxxxxxx | 
 
 
 
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
GENERIC_NOP5_ATOMIC should make a better nop.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
---
 arch/x86/include/asm/jump_label.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/jump_label.h 
b/arch/x86/include/asm/jump_label.h
index a32b18c..189100e 100644
--- a/arch/x86/include/asm/jump_label.h
+++ b/arch/x86/include/asm/jump_label.h
@@ -4,12 +4,13 @@
 #ifdef __KERNEL__
 
 #include <linux/types.h>
+#include <linux/stringify.h>
 #include <asm/nops.h>
 #include <asm/asm.h>
 
 #define JUMP_LABEL_NOP_SIZE 5
 
-#define JUMP_LABEL_INITIAL_NOP ".byte 0xe9 \n\t .long 0\n\t"
+#define JUMP_LABEL_INITIAL_NOP ".byte " __stringify(GENERIC_NOP5_ATOMIC) "\n\t"
 
 static __always_inline bool arch_static_branch(struct jump_label_key *key)
 {
-- 
1.7.6.4
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
 |   
 
 | 
    | 
  
  
    |   | 
    |