diff options
author | Michal Hocko <mhocko@suse.com> | 2017-09-06 19:23:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-06 20:27:29 -0400 |
commit | c41f012ade0b95b0a6e25c7150673e0554736165 (patch) | |
tree | c3270264283dff1de402a6609b155c804c097320 /mm/nommu.c | |
parent | 4da243ac1cf6aeb30b7c555d56208982d66d6d33 (diff) |
mm: rename global_page_state to global_zone_page_state
global_page_state is error prone as a recent bug report pointed out [1].
It only returns proper values for zone based counters as the enum it
gets suggests. We already have global_node_page_state so let's rename
global_page_state to global_zone_page_state to be more explicit here.
All existing users seems to be correct:
$ git grep "global_page_state(NR_" | sed 's@.*(\(NR_[A-Z_]*\)).*@\1@' | sort | uniq -c
2 NR_BOUNCE
2 NR_FREE_CMA_PAGES
11 NR_FREE_PAGES
1 NR_KERNEL_STACK_KB
1 NR_MLOCK
2 NR_PAGETABLE
This patch shouldn't introduce any functional change.
[1] http://lkml.kernel.org/r/201707260628.v6Q6SmaS030814@www262.sakura.ne.jp
Link: http://lkml.kernel.org/r/20170801134256.5400-2-hannes@cmpxchg.org
Signed-off-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/nommu.c')
-rw-r--r-- | mm/nommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index fc184f597d59..53d5175a5c14 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
@@ -1962,7 +1962,7 @@ static int __meminit init_user_reserve(void) | |||
1962 | { | 1962 | { |
1963 | unsigned long free_kbytes; | 1963 | unsigned long free_kbytes; |
1964 | 1964 | ||
1965 | free_kbytes = global_page_state(NR_FREE_PAGES) << (PAGE_SHIFT - 10); | 1965 | free_kbytes = global_zone_page_state(NR_FREE_PAGES) << (PAGE_SHIFT - 10); |
1966 | 1966 | ||
1967 | sysctl_user_reserve_kbytes = min(free_kbytes / 32, 1UL << 17); | 1967 | sysctl_user_reserve_kbytes = min(free_kbytes / 32, 1UL << 17); |
1968 | return 0; | 1968 | return 0; |
@@ -1983,7 +1983,7 @@ static int __meminit init_admin_reserve(void) | |||
1983 | { | 1983 | { |
1984 | unsigned long free_kbytes; | 1984 | unsigned long free_kbytes; |
1985 | 1985 | ||
1986 | free_kbytes = global_page_state(NR_FREE_PAGES) << (PAGE_SHIFT - 10); | 1986 | free_kbytes = global_zone_page_state(NR_FREE_PAGES) << (PAGE_SHIFT - 10); |
1987 | 1987 | ||
1988 | sysctl_admin_reserve_kbytes = min(free_kbytes / 32, 1UL << 13); | 1988 | sysctl_admin_reserve_kbytes = min(free_kbytes / 32, 1UL << 13); |
1989 | return 0; | 1989 | return 0; |