Skip to contentSkip to conversation

x86, CPU: Drop superfluous get_cpu_cap prototype

PATCH In review Borislav Petkov 2 participants 2 messages Nov 29, 2011 – Dec 9, 2011 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86, CPU: Drop superfluous get_cpu_cap prototype

From: Borislav Petkov <[email protected]>

get_cpu_cap() external function prototype was declared twice so lose one of them.

Cleanup header while at it.

---
 arch/x86/kernel/cpu/cpu.h |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
arch/x86/kernel/cpu/cpu.h +1 -4
index 1b22dcc..8bacc78 100644
@@ -1,5 +1,4 @@
 #ifndef ARCH_X86_CPU_H
-
 #define ARCH_X86_CPU_H
 
 struct cpu_model_info {
@@ -35,6 +34,4 @@ extern const struct cpu_dev *const __x86_cpu_dev_start[],
 
 extern void get_cpu_cap(struct cpuinfo_x86 *c);
 extern void cpu_detect_cache_sizes(struct cpuinfo_x86 *c);
-extern void get_cpu_cap(struct cpuinfo_x86 *c);
-
-#endif
+#endif /* ARCH_X86_CPU_H */
Signature · 1 line
1.7.8.rc0
#1 lore raw

[tip:x86/cleanups] x86, CPU: Drop superfluous get_cpu_cap() prototype

Commit-ID:  d059f24a9680805bd73fc5675504d465bfe28b72
Gitweb:     http://git.kernel.org/tip/d059f24a9680805bd73fc5675504d465bfe28b72
Author:     Borislav Petkov <[email protected]>
AuthorDate: Tue, 29 Nov 2011 20:14:43 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 9 Dec 2011 08:00:53 +0100

x86, CPU: Drop superfluous get_cpu_cap() prototype

The get_cpu_cap() external function prototype was declared twice so lose one of them.

Clean up the header guard while at it.

---
 arch/x86/kernel/cpu/cpu.h |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
arch/x86/kernel/cpu/cpu.h +1 -4
index 1b22dcc..8bacc78 100644
@@ -1,5 +1,4 @@
 #ifndef ARCH_X86_CPU_H
-
 #define ARCH_X86_CPU_H
 
 struct cpu_model_info {
@@ -35,6 +34,4 @@ extern const struct cpu_dev *const __x86_cpu_dev_start[],
 
 extern void get_cpu_cap(struct cpuinfo_x86 *c);
 extern void cpu_detect_cache_sizes(struct cpuinfo_x86 *c);
-extern void get_cpu_cap(struct cpuinfo_x86 *c);
-
-#endif
+#endif /* ARCH_X86_CPU_H */