2010-08-31 07:02:26

by Andreas Herrmann

[permalink] [raw]
Subject: [PATCH] x86, amd: Remove superfluous CPU family/model check

From: Andreas Herrmann <[email protected]>

amd_fixup_dcm() already checks for existence of a CPUID flag, so there
is no point in further restricting this function to run only on
specific CPUs.

In particular this prevents amd_fixup_dcm() to be executed on future
AMD CPU families which might also be available as multi-node
processors. (IMHO this is good reason to tag this patch for stable
trees.)

Cc: [email protected] [.32.x .34.x, .35.x]
Signed-off-by: Andreas Herrmann <[email protected]>
---
arch/x86/kernel/cpu/amd.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

Patch is against tip/master as of today
(v2.6.36-rc3-1233-gf3d0a67)

Please apply.


Thanks,
Andreas

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 9fb3ab3..fcf9895 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -305,8 +305,7 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c)
/* use socket ID also for last level cache */
per_cpu(cpu_llc_id, cpu) = c->phys_proc_id;
/* fixup topology information on multi-node processors */
- if ((c->x86 == 0x10) && (c->x86_model == 9))
- amd_fixup_dcm(c);
+ amd_fixup_dcm(c);
#endif
}

--
1.6.4.4