diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2018-03-20 10:56:18 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-03-20 10:56:18 +0100 |
| commit | edc39c9b4589a4ce9a69273b5a27a1459c3423d4 (patch) | |
| tree | e5850fe4a533579b0de12c02e48f7dcdd60e8e38 /mm/hugetlb.c | |
| parent | x86/build: Drop superfluous ALIGN from the linker script (diff) | |
| parent | Merge branch 'for-4.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup (diff) | |
| download | wireguard-linux-edc39c9b4589a4ce9a69273b5a27a1459c3423d4.tar.xz wireguard-linux-edc39c9b4589a4ce9a69273b5a27a1459c3423d4.zip | |
Merge branch 'linus' into x86/build to pick up dependencies
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 7c204e3d132b..a963f2034dfc 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1583,7 +1583,7 @@ static struct page *alloc_surplus_huge_page(struct hstate *h, gfp_t gfp_mask, page = NULL; } else { h->surplus_huge_pages++; - h->nr_huge_pages_node[page_to_nid(page)]++; + h->surplus_huge_pages_node[page_to_nid(page)]++; } out_unlock: |