[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-d059f24a9680805bd73fc5675504d465bfe28b72@git.kernel.org>
Date: Fri, 9 Dec 2011 12:07:24 -0800
From: tip-bot for Borislav Petkov <borislav.petkov@....com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
tglx@...utronix.de, mingo@...e.hu, borislav.petkov@....com
Subject: [tip:x86/cleanups] x86, CPU: Drop superfluous get_cpu_cap() prototype
Commit-ID: d059f24a9680805bd73fc5675504d465bfe28b72
Gitweb: http://git.kernel.org/tip/d059f24a9680805bd73fc5675504d465bfe28b72
Author: Borislav Petkov <borislav.petkov@....com>
AuthorDate: Tue, 29 Nov 2011 20:14:43 +0100
Committer: Ingo Molnar <mingo@...e.hu>
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.
Signed-off-by: Borislav Petkov <borislav.petkov@....com>
Link: http://lkml.kernel.org/r/1322594083-14507-1-git-send-email-bp@amd64.org
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/kernel/cpu/cpu.h | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h
index 1b22dcc..8bacc78 100644
--- a/arch/x86/kernel/cpu/cpu.h
+++ b/arch/x86/kernel/cpu/cpu.h
@@ -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 */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists