diff options
| author | Andrea Arcangeli <aarcange@redhat.com> | 2011-01-14 00:47:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 02:32:45 +0100 |
| commit | 4b7167b9ff9b7f3f528cbc4c7d02ebd275b9b10c (patch) | |
| tree | ad2c23c28b9dea009daf3719aefeb79103e2c152 /mm/huge_memory.c | |
| parent | thp: avoid breaking huge pmd invariants in case of vma_adjust failures (diff) | |
| download | linux-4b7167b9ff9b7f3f528cbc4c7d02ebd275b9b10c.tar.xz linux-4b7167b9ff9b7f3f528cbc4c7d02ebd275b9b10c.zip | |
thp: don't allow transparent hugepage support without PSE
Archs implementing Transparent Hugepage Support must implement a function
called has_transparent_hugepage to be sure the virtual or physical CPU
supports Transparent Hugepages.
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/huge_memory.c')
| -rw-r--r-- | mm/huge_memory.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index b6facc35e893..915809b16edf 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -487,7 +487,15 @@ static int __init hugepage_init(void) int err; #ifdef CONFIG_SYSFS static struct kobject *hugepage_kobj; +#endif + err = -EINVAL; + if (!has_transparent_hugepage()) { + transparent_hugepage_flags = 0; + goto out; + } + +#ifdef CONFIG_SYSFS err = -ENOMEM; hugepage_kobj = kobject_create_and_add("transparent_hugepage", mm_kobj); if (unlikely(!hugepage_kobj)) { |