summaryrefslogtreecommitdiff
path: root/arch/x86/lib/cpu.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-08-10 16:24:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-08-10 16:24:03 -0700
commit6d8f809cb55a8fc0ebfae27984215e4a0b201984 (patch)
tree9aa44f9fbede01bd85d0e7376919048da39c3ef8 /arch/x86/lib/cpu.c
parentd2359a5153ebb16412daedd8f104b886643cbd1a (diff)
parent04f5bda84b0712d6f172556a7e8dca9ded5e73b9 (diff)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner: "A few fixes for x86: - Don't reset the carefully adjusted build flags for the purgatory and remove the unwanted flags instead. The 'reset all' approach led to build fails under certain circumstances. - Unbreak CLANG build of the purgatory by avoiding the builtin memcpy/memset implementations. - Address missing prototype warnings by including the proper header - Fix yet more fall-through issues" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/lib/cpu: Address missing prototypes warning x86/purgatory: Use CFLAGS_REMOVE rather than reset KBUILD_CFLAGS x86/purgatory: Do not use __builtin_memcpy and __builtin_memset x86: mtrr: cyrix: Mark expected switch fall-through x86/ptrace: Mark expected switch fall-through
Diffstat (limited to 'arch/x86/lib/cpu.c')
-rw-r--r--arch/x86/lib/cpu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/lib/cpu.c b/arch/x86/lib/cpu.c
index 04967cdce5d1..7ad68917a51e 100644
--- a/arch/x86/lib/cpu.c
+++ b/arch/x86/lib/cpu.c
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
#include <linux/types.h>
#include <linux/export.h>
+#include <asm/cpu.h>
unsigned int x86_family(unsigned int sig)
{