diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-05-05 09:01:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 09:01:49 +0200 |
| commit | 64b7aad5798478ffff52e110878ccaae4c3aaa34 (patch) | |
| tree | 211764492dba48c45cbf186c66efa320ab7540db /arch/x86/include | |
| parent | x86/mm, sched/core: Turn off IRQs in switch_mm() (diff) | |
| parent | nohz/full, sched/rt: Fix missed tick-reenabling bug in sched_can_stop_tick() (diff) | |
| download | linux-dev-64b7aad5798478ffff52e110878ccaae4c3aaa34.tar.xz linux-dev-64b7aad5798478ffff52e110878ccaae4c3aaa34.zip | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/hugetlb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/hugetlb.h b/arch/x86/include/asm/hugetlb.h index f8a29d2c97b0..e6a8613fbfb0 100644 --- a/arch/x86/include/asm/hugetlb.h +++ b/arch/x86/include/asm/hugetlb.h @@ -4,6 +4,7 @@ #include <asm/page.h> #include <asm-generic/hugetlb.h> +#define hugepages_supported() cpu_has_pse static inline int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, |