From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 22 Apr 2016 08:12:19 +0000 (+0200)
Subject: Merge branch 'x86/urgent' into x86/asm, to fix semantic conflict
X-Git-Tag: v4.7-rc1~188^2~15
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b2eafe890d4a09bfa63ab31ff018d7d6bb8cfefc;p=linux.git

Merge branch 'x86/urgent' into x86/asm, to fix semantic conflict

'cpu_has_pse' has changed to boot_cpu_has(X86_FEATURE_PSE), fix this
up in the merge commit when merging the x86/urgent tree that includes
the following commit:

  103f6112f253 ("x86/mm/xen: Suppress hugetlbfs in PV guests")

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

b2eafe890d4a09bfa63ab31ff018d7d6bb8cfefc
diff --cc arch/x86/include/asm/hugetlb.h
index f8a29d2c97b0,e6a8613fbfb0..3a106165e03a
--- a/arch/x86/include/asm/hugetlb.h
+++ b/arch/x86/include/asm/hugetlb.h
@@@ -4,6 -4,7 +4,7 @@@
  #include <asm/page.h>
  #include <asm-generic/hugetlb.h>
  
 -#define hugepages_supported() cpu_has_pse
++#define hugepages_supported() boot_cpu_has(X86_FEATURE_PSE)
  
  static inline int is_hugepage_only_range(struct mm_struct *mm,
  					 unsigned long addr,