diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-07 16:14:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-07 16:14:37 -0400 |
| commit | 950b0d28378c4ee63a30dad732a8319c8a41c95d (patch) | |
| tree | e7e8a41ac5b11b650180a84c92f517d15907a9ba /include | |
| parent | 2557a933b795c1988c721ebb871cd735128bb9cb (diff) | |
| parent | 871de939030c903fd5ed50a7c4c88e02998e1cbc (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: fix 64-bit asm NOPS for CONFIG_GENERIC_CPU
x86: fix call to set_cyc2ns_scale() from time_cpufreq_notifier()
revert "x86: tsc prevent time going backwards"
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/nops.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/asm-x86/nops.h b/include/asm-x86/nops.h index e3b2bce0aff8..b3930ae539b3 100644 --- a/include/asm-x86/nops.h +++ b/include/asm-x86/nops.h | |||
| @@ -73,16 +73,7 @@ | |||
| 73 | #define P6_NOP7 ".byte 0x0f,0x1f,0x80,0,0,0,0\n" | 73 | #define P6_NOP7 ".byte 0x0f,0x1f,0x80,0,0,0,0\n" |
| 74 | #define P6_NOP8 ".byte 0x0f,0x1f,0x84,0x00,0,0,0,0\n" | 74 | #define P6_NOP8 ".byte 0x0f,0x1f,0x84,0x00,0,0,0,0\n" |
| 75 | 75 | ||
| 76 | #if defined(CONFIG_MK8) | 76 | #if defined(CONFIG_MK7) |
| 77 | #define ASM_NOP1 K8_NOP1 | ||
| 78 | #define ASM_NOP2 K8_NOP2 | ||
| 79 | #define ASM_NOP3 K8_NOP3 | ||
| 80 | #define ASM_NOP4 K8_NOP4 | ||
| 81 | #define ASM_NOP5 K8_NOP5 | ||
| 82 | #define ASM_NOP6 K8_NOP6 | ||
| 83 | #define ASM_NOP7 K8_NOP7 | ||
| 84 | #define ASM_NOP8 K8_NOP8 | ||
| 85 | #elif defined(CONFIG_MK7) | ||
| 86 | #define ASM_NOP1 K7_NOP1 | 77 | #define ASM_NOP1 K7_NOP1 |
| 87 | #define ASM_NOP2 K7_NOP2 | 78 | #define ASM_NOP2 K7_NOP2 |
| 88 | #define ASM_NOP3 K7_NOP3 | 79 | #define ASM_NOP3 K7_NOP3 |
| @@ -100,6 +91,15 @@ | |||
| 100 | #define ASM_NOP6 P6_NOP6 | 91 | #define ASM_NOP6 P6_NOP6 |
| 101 | #define ASM_NOP7 P6_NOP7 | 92 | #define ASM_NOP7 P6_NOP7 |
| 102 | #define ASM_NOP8 P6_NOP8 | 93 | #define ASM_NOP8 P6_NOP8 |
| 94 | #elif defined(CONFIG_X86_64) | ||
| 95 | #define ASM_NOP1 K8_NOP1 | ||
| 96 | #define ASM_NOP2 K8_NOP2 | ||
| 97 | #define ASM_NOP3 K8_NOP3 | ||
| 98 | #define ASM_NOP4 K8_NOP4 | ||
| 99 | #define ASM_NOP5 K8_NOP5 | ||
| 100 | #define ASM_NOP6 K8_NOP6 | ||
| 101 | #define ASM_NOP7 K8_NOP7 | ||
| 102 | #define ASM_NOP8 K8_NOP8 | ||
| 103 | #else | 103 | #else |
| 104 | #define ASM_NOP1 GENERIC_NOP1 | 104 | #define ASM_NOP1 GENERIC_NOP1 |
| 105 | #define ASM_NOP2 GENERIC_NOP2 | 105 | #define ASM_NOP2 GENERIC_NOP2 |