Merge branch 'x86/urgent' into x86/asm, to fix semantic conflict
authorIngo Molnar <mingo@kernel.org>
Fri, 22 Apr 2016 08:12:19 +0000 (10:12 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 22 Apr 2016 08:13:53 +0000 (10:13 +0200)
'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>
1  2 
arch/x86/include/asm/hugetlb.h

index f8a29d2c97b012febc3728809a5daa53de22cf0f,e6a8613fbfb0ea19f8d507c4ce6ae1f0d4a35be6..3a106165e03ad035484df5fb97989265798263df
@@@ -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,