Commit 527ed4f7 authored by Kefeng Wang's avatar Kefeng Wang Committed by Andrew Morton

mm: remove arguments of show_mem()

All callers of show_mem() pass 0 and NULL, so we can remove the two
arguments by directly calling __show_mem(0, NULL, MAX_NR_ZONES - 1) in
show_mem().

Link: https://lkml.kernel.org/r/20230630062253.189440-1-wangkefeng.wang@huawei.comSigned-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 626e98cb
...@@ -1084,7 +1084,7 @@ cmds(struct pt_regs *excp) ...@@ -1084,7 +1084,7 @@ cmds(struct pt_regs *excp)
memzcan(); memzcan();
break; break;
case 'i': case 'i':
show_mem(0, NULL); show_mem();
break; break;
default: default:
termch = cmd; termch = cmd;
......
...@@ -342,7 +342,7 @@ static const struct sysrq_key_op sysrq_ftrace_dump_op = { ...@@ -342,7 +342,7 @@ static const struct sysrq_key_op sysrq_ftrace_dump_op = {
static void sysrq_handle_showmem(int key) static void sysrq_handle_showmem(int key)
{ {
show_mem(0, NULL); show_mem();
} }
static const struct sysrq_key_op sysrq_showmem_op = { static const struct sysrq_key_op sysrq_showmem_op = {
.handler = sysrq_handle_showmem, .handler = sysrq_handle_showmem,
......
...@@ -606,7 +606,7 @@ static void fn_scroll_back(struct vc_data *vc) ...@@ -606,7 +606,7 @@ static void fn_scroll_back(struct vc_data *vc)
static void fn_show_mem(struct vc_data *vc) static void fn_show_mem(struct vc_data *vc)
{ {
show_mem(0, NULL); show_mem();
} }
static void fn_show_state(struct vc_data *vc) static void fn_show_state(struct vc_data *vc)
......
...@@ -3068,9 +3068,9 @@ extern void mem_init(void); ...@@ -3068,9 +3068,9 @@ extern void mem_init(void);
extern void __init mmap_init(void); extern void __init mmap_init(void);
extern void __show_mem(unsigned int flags, nodemask_t *nodemask, int max_zone_idx); extern void __show_mem(unsigned int flags, nodemask_t *nodemask, int max_zone_idx);
static inline void show_mem(unsigned int flags, nodemask_t *nodemask) static inline void show_mem(void)
{ {
__show_mem(flags, nodemask, MAX_NR_ZONES - 1); __show_mem(0, NULL, MAX_NR_ZONES - 1);
} }
extern long si_mem_available(void); extern long si_mem_available(void);
extern void si_meminfo(struct sysinfo * val); extern void si_meminfo(struct sysinfo * val);
......
...@@ -61,7 +61,7 @@ static void __init error(char *x) ...@@ -61,7 +61,7 @@ static void __init error(char *x)
} }
#define panic_show_mem(fmt, ...) \ #define panic_show_mem(fmt, ...) \
({ show_mem(0, NULL); panic(fmt, ##__VA_ARGS__); }) ({ show_mem(); panic(fmt, ##__VA_ARGS__); })
/* link hash */ /* link hash */
......
...@@ -216,7 +216,7 @@ static void panic_print_sys_info(bool console_flush) ...@@ -216,7 +216,7 @@ static void panic_print_sys_info(bool console_flush)
show_state(); show_state();
if (panic_print & PANIC_PRINT_MEM_INFO) if (panic_print & PANIC_PRINT_MEM_INFO)
show_mem(0, NULL); show_mem();
if (panic_print & PANIC_PRINT_TIMER_INFO) if (panic_print & PANIC_PRINT_TIMER_INFO)
sysrq_timer_list_show(); sysrq_timer_list_show();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment