summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/hugetlb.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-20 14:21:11 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-20 14:21:11 +0900
commit172de656b98efd81399aec83837dccaa276622c4 (patch)
tree0efb12dc5f4a35682be0eb3fe092759cf9e796ad /arch/x86/include/asm/hugetlb.h
parent95d08585e093a9f07562b4a3984370b4d72f1a57 (diff)
parentfa81511bb0bbb2b1aace3695ce869da9762624ff (diff)
downloadblackbird-op-linux-172de656b98efd81399aec83837dccaa276622c4.tar.gz
blackbird-op-linux-172de656b98efd81399aec83837dccaa276622c4.zip
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin. * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86-64, modify_ldt: Make support for 16-bit segments a runtime option x86, mm, hugetlb: Add missing TLB page invalidation for hugetlb_cow() x86, rdrand: When nordrand is specified, disable RDSEED as well
Diffstat (limited to 'arch/x86/include/asm/hugetlb.h')
-rw-r--r--arch/x86/include/asm/hugetlb.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/hugetlb.h b/arch/x86/include/asm/hugetlb.h
index a8091216963b..68c05398bba9 100644
--- a/arch/x86/include/asm/hugetlb.h
+++ b/arch/x86/include/asm/hugetlb.h
@@ -52,6 +52,7 @@ static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
unsigned long addr, pte_t *ptep)
{
+ ptep_clear_flush(vma, addr, ptep);
}
static inline int huge_pte_none(pte_t pte)
OpenPOWER on IntegriCloud