diff options
| -rw-r--r-- | arch/x86/include/asm/intel-family.h | 2 | ||||
| -rw-r--r-- | drivers/idle/intel_idle.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index 6999f7d01a0d..2a01701609d5 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h | |||
| @@ -18,10 +18,10 @@ | |||
| 18 | #define INTEL_FAM6_CORE2_DUNNINGTON 0x1D | 18 | #define INTEL_FAM6_CORE2_DUNNINGTON 0x1D |
| 19 | 19 | ||
| 20 | #define INTEL_FAM6_NEHALEM 0x1E | 20 | #define INTEL_FAM6_NEHALEM 0x1E |
| 21 | #define INTEL_FAM6_NEHALEM_G 0x1F /* Auburndale / Havendale */ | ||
| 21 | #define INTEL_FAM6_NEHALEM_EP 0x1A | 22 | #define INTEL_FAM6_NEHALEM_EP 0x1A |
| 22 | #define INTEL_FAM6_NEHALEM_EX 0x2E | 23 | #define INTEL_FAM6_NEHALEM_EX 0x2E |
| 23 | #define INTEL_FAM6_WESTMERE 0x25 | 24 | #define INTEL_FAM6_WESTMERE 0x25 |
| 24 | #define INTEL_FAM6_WESTMERE2 0x1F | ||
| 25 | #define INTEL_FAM6_WESTMERE_EP 0x2C | 25 | #define INTEL_FAM6_WESTMERE_EP 0x2C |
| 26 | #define INTEL_FAM6_WESTMERE_EX 0x2F | 26 | #define INTEL_FAM6_WESTMERE_EX 0x2F |
| 27 | 27 | ||
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index b5dd41d13d3d..d103adc57778 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c | |||
| @@ -1023,7 +1023,7 @@ static const struct idle_cpu idle_cpu_bxt = { | |||
| 1023 | static const struct x86_cpu_id intel_idle_ids[] __initconst = { | 1023 | static const struct x86_cpu_id intel_idle_ids[] __initconst = { |
| 1024 | ICPU(INTEL_FAM6_NEHALEM_EP, idle_cpu_nehalem), | 1024 | ICPU(INTEL_FAM6_NEHALEM_EP, idle_cpu_nehalem), |
| 1025 | ICPU(INTEL_FAM6_NEHALEM, idle_cpu_nehalem), | 1025 | ICPU(INTEL_FAM6_NEHALEM, idle_cpu_nehalem), |
| 1026 | ICPU(INTEL_FAM6_WESTMERE2, idle_cpu_nehalem), | 1026 | ICPU(INTEL_FAM6_NEHALEM_G, idle_cpu_nehalem), |
| 1027 | ICPU(INTEL_FAM6_WESTMERE, idle_cpu_nehalem), | 1027 | ICPU(INTEL_FAM6_WESTMERE, idle_cpu_nehalem), |
| 1028 | ICPU(INTEL_FAM6_WESTMERE_EP, idle_cpu_nehalem), | 1028 | ICPU(INTEL_FAM6_WESTMERE_EP, idle_cpu_nehalem), |
| 1029 | ICPU(INTEL_FAM6_NEHALEM_EX, idle_cpu_nehalem), | 1029 | ICPU(INTEL_FAM6_NEHALEM_EX, idle_cpu_nehalem), |
