diff options
| author |   Gerald Schaefer <gerald.schaefer@de.ibm.com> | 2016-07-04 14:47:01 +0200 |
|---|---|---|
| committer |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-07-06 08:46:43 +0200 |
| commit | d08de8e2d86744f91d9d5d57c56ca2b6e33bf6ec (patch) | |
| tree | 2bcf0bcb5ec30e48eb82fbc7e3a216cab8671f04 /mm/hugetlb.c | |
| parent | s390: have unique symbol for __switch_to address (diff) | |
| download | linux-dev-d08de8e2d86744f91d9d5d57c56ca2b6e33bf6ec.tar.xz linux-dev-d08de8e2d86744f91d9d5d57c56ca2b6e33bf6ec.zip | |
s390/mm: add support for 2GB hugepages
This adds support for 2GB hugetlbfs pages on s390.
Reviewed-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 388c2bb9b55c..7f0fa87cc66d 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1022,7 +1022,9 @@ static int hstate_next_node_to_free(struct hstate *h, nodemask_t *nodes_allowed) ((node = hstate_next_node_to_free(hs, mask)) || 1); \ nr_nodes--) -#if defined(CONFIG_X86_64) && ((defined(CONFIG_MEMORY_ISOLATION) && defined(CONFIG_COMPACTION)) || defined(CONFIG_CMA)) +#if (defined(CONFIG_X86_64) || defined(CONFIG_S390)) && \ + ((defined(CONFIG_MEMORY_ISOLATION) && defined(CONFIG_COMPACTION)) || \ + defined(CONFIG_CMA)) static void destroy_compound_gigantic_page(struct page *page, unsigned int order) { |