[PATCH 3.2 039/104] x86/cpu: Factor out application of forced CPU caps

[Ben Hutchings]

3.2.101-rc1 review patch.  If anyone has any objections, please let me know.

--

From: Andy Lutomirski 

commit 8bf1ebca215c262e48c15a4a15f175991776f57f upstream.

There are multiple call sites that apply forced CPU caps.  Factor
them into a helper.

Signed-off-by: Andy Lutomirski 
Reviewed-by: Borislav Petkov 
Cc: Borislav Petkov 
Cc: Brian Gerst 
Cc: Dave Hansen 
Cc: Fenghua Yu 
Cc: H. Peter Anvin 
Cc: Linus Torvalds 
Cc: Matthew Whitehead 
Cc: Oleg Nesterov 
Cc: One Thousand Gnomes 
Cc: Peter Zijlstra 
Cc: Rik van Riel 
Cc: Thomas Gleixner 
Cc: Yu-cheng Yu 
Link: 
http://lkml.kernel.org/r/623ff7555488122143e4417de09b18be2085ad06.1484705016.git.l...@kernel.org
Signed-off-by: Ingo Molnar 
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings 
---
 arch/x86/kernel/cpu/common.c | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -632,6 +632,16 @@ void __cpuinit cpu_detect(struct cpuinfo
}
 }
 
+static void apply_forced_caps(struct cpuinfo_x86 *c)
+{
+   int i;
+
+   for (i = 0; i < NCAPINTS; i++) {
+   c->x86_capability[i] &= ~cpu_caps_cleared[i];
+   c->x86_capability[i] |= cpu_caps_set[i];
+   }
+}
+
 void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)
 {
u32 tfms, xlvl;
@@ -880,10 +890,7 @@ static void __cpuinit identify_cpu(struc
this_cpu->c_identify(c);
 
/* Clear/Set all flags overriden by options, after probe */
-   for (i = 0; i < NCAPINTS; i++) {
-   c->x86_capability[i] &= ~cpu_caps_cleared[i];
-   c->x86_capability[i] |= cpu_caps_set[i];
-   }
+   apply_forced_caps(c);
 
 #ifdef CONFIG_X86_64
c->apicid = apic->phys_pkg_id(c->initial_apicid, 0);
@@ -939,10 +946,7 @@ static void __cpuinit identify_cpu(struc
 * Clear/Set all flags overriden by options, need do it
 * before following smp all cpus cap AND.
 */
-   for (i = 0; i < NCAPINTS; i++) {
-   c->x86_capability[i] &= ~cpu_caps_cleared[i];
-   c->x86_capability[i] |= cpu_caps_set[i];
-   }
+   apply_forced_caps(c);
 
/*
 * On SMP, boot_cpu_data holds the common feature set between

[PATCH 3.2 039/104] x86/cpu: Factor out application of forced CPU caps

[Ben Hutchings]

3.2.101-rc1 review patch.  If anyone has any objections, please let me know.

--

From: Andy Lutomirski 

commit 8bf1ebca215c262e48c15a4a15f175991776f57f upstream.

There are multiple call sites that apply forced CPU caps.  Factor
them into a helper.

Signed-off-by: Andy Lutomirski 
Reviewed-by: Borislav Petkov 
Cc: Borislav Petkov 
Cc: Brian Gerst 
Cc: Dave Hansen 
Cc: Fenghua Yu 
Cc: H. Peter Anvin 
Cc: Linus Torvalds 
Cc: Matthew Whitehead 
Cc: Oleg Nesterov 
Cc: One Thousand Gnomes 
Cc: Peter Zijlstra 
Cc: Rik van Riel 
Cc: Thomas Gleixner 
Cc: Yu-cheng Yu 
Link: 
http://lkml.kernel.org/r/623ff7555488122143e4417de09b18be2085ad06.1484705016.git.l...@kernel.org
Signed-off-by: Ingo Molnar 
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings 
---
 arch/x86/kernel/cpu/common.c | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -632,6 +632,16 @@ void __cpuinit cpu_detect(struct cpuinfo
}
 }
 
+static void apply_forced_caps(struct cpuinfo_x86 *c)
+{
+   int i;
+
+   for (i = 0; i < NCAPINTS; i++) {
+   c->x86_capability[i] &= ~cpu_caps_cleared[i];
+   c->x86_capability[i] |= cpu_caps_set[i];
+   }
+}
+
 void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)
 {
u32 tfms, xlvl;
@@ -880,10 +890,7 @@ static void __cpuinit identify_cpu(struc
this_cpu->c_identify(c);
 
/* Clear/Set all flags overriden by options, after probe */
-   for (i = 0; i < NCAPINTS; i++) {
-   c->x86_capability[i] &= ~cpu_caps_cleared[i];
-   c->x86_capability[i] |= cpu_caps_set[i];
-   }
+   apply_forced_caps(c);
 
 #ifdef CONFIG_X86_64
c->apicid = apic->phys_pkg_id(c->initial_apicid, 0);
@@ -939,10 +946,7 @@ static void __cpuinit identify_cpu(struc
 * Clear/Set all flags overriden by options, need do it
 * before following smp all cpus cap AND.
 */
-   for (i = 0; i < NCAPINTS; i++) {
-   c->x86_capability[i] &= ~cpu_caps_cleared[i];
-   c->x86_capability[i] |= cpu_caps_set[i];
-   }
+   apply_forced_caps(c);
 
/*
 * On SMP, boot_cpu_data holds the common feature set between