summaryrefslogtreecommitdiff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-02 23:23:50 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-02 23:23:50 (GMT)
commit57935b262c40a3cbe54c5a61be230331a48f0a3a (patch)
tree335764408d67ef041f967ed721fbe2dfaff7aff0 /arch/x86/include
parent5f16a8cf2da76f75e127a370e4dcfe223107922f (diff)
parentf037e416afb38b9ee8ac598d68733fcbaf665384 (diff)
downloadlinux-fsl-qoriq-57935b262c40a3cbe54c5a61be230331a48f0a3a.tar.xz
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar: "Misc x86 cleanups" * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, reloc: Use xorl instead of xorq in relocate_kernel_64.S x86, cleanups: Remove extra tab in __flush_tlb_one() x86/mce: Remove check for CONFIG_X86_MCE_P4THERMAL
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/tlbflush.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index 50a7fc0..cf51200 100644
--- a/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@ -62,7 +62,7 @@ static inline void __flush_tlb_all(void)
static inline void __flush_tlb_one(unsigned long addr)
{
- __flush_tlb_single(addr);
+ __flush_tlb_single(addr);
}
#define TLB_FLUSH_ALL -1UL