Commit 4991c215 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Revert bogus x86-64 change

From: Andi Kleen <ak@muc.de>

The 32bit generic nops added with a previous patch to x86-64 alternative()
are not completely 64bit clean.  This caused crashes in some cases.  This
patch reverts this broken change.
parent 5ec9222a
...@@ -345,17 +345,7 @@ struct extended_sigtable { ...@@ -345,17 +345,7 @@ struct extended_sigtable {
/* '6' because it used to be for P6 only (but now covers Pentium 4 as well) */ /* '6' because it used to be for P6 only (but now covers Pentium 4 as well) */
#define MICROCODE_IOCFREE _IO('6',0) #define MICROCODE_IOCFREE _IO('6',0)
/* generic versions from gas */
#define GENERIC_NOP1 ".byte 0x90\n"
#define GENERIC_NOP2 ".byte 0x89,0xf6\n"
#define GENERIC_NOP3 ".byte 0x8d,0x76,0x00\n"
#define GENERIC_NOP4 ".byte 0x8d,0x74,0x26,0x00\n"
#define GENERIC_NOP5 GENERIC_NOP1 GENERIC_NOP4
#define GENERIC_NOP6 ".byte 0x8d,0xb6,0x00,0x00,0x00,0x00\n"
#define GENERIC_NOP7 ".byte 0x8d,0xb4,0x26,0x00,0x00,0x00,0x00\n"
#define GENERIC_NOP8 GENERIC_NOP1 GENERIC_NOP7
#ifdef CONFIG_MK8
#define ASM_NOP1 K8_NOP1 #define ASM_NOP1 K8_NOP1
#define ASM_NOP2 K8_NOP2 #define ASM_NOP2 K8_NOP2
#define ASM_NOP3 K8_NOP3 #define ASM_NOP3 K8_NOP3
...@@ -364,16 +354,6 @@ struct extended_sigtable { ...@@ -364,16 +354,6 @@ struct extended_sigtable {
#define ASM_NOP6 K8_NOP6 #define ASM_NOP6 K8_NOP6
#define ASM_NOP7 K8_NOP7 #define ASM_NOP7 K8_NOP7
#define ASM_NOP8 K8_NOP8 #define ASM_NOP8 K8_NOP8
#else
#define ASM_NOP1 GENERIC_NOP1
#define ASM_NOP2 GENERIC_NOP2
#define ASM_NOP3 GENERIC_NOP3
#define ASM_NOP4 GENERIC_NOP4
#define ASM_NOP5 GENERIC_NOP5
#define ASM_NOP6 GENERIC_NOP6
#define ASM_NOP7 GENERIC_NOP7
#define ASM_NOP8 GENERIC_NOP8
#endif
/* Opteron nops */ /* Opteron nops */
#define K8_NOP1 ".byte 0x90\n" #define K8_NOP1 ".byte 0x90\n"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment