summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2022-04-20 13:34:28 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2022-06-09 15:37:03 -0400
commita0274748f0e479eb52370a0d11e9ff0896c370cd (patch)
tree77abffab84456301530748dded76ffd36c1e69d4
parent625938ea31d4e87b6cbdc1228eaa9cd64daf1510 (diff)
mm: Move lib/show_mem.c to mm/
show_mem.c is really mm specific, and the next patch in the series is going to require mm/slab.h, so let's move it before doing more work on it. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
-rw-r--r--lib/Makefile2
-rw-r--r--mm/Makefile2
-rw-r--r--mm/show_mem.c (renamed from lib/show_mem.c)0
3 files changed, 2 insertions, 2 deletions
diff --git a/lib/Makefile b/lib/Makefile
index e94ae5d8bc57..9230bc9ebcd7 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -30,7 +30,7 @@ endif
lib-y := ctype.o string.o vsprintf.o cmdline.o \
rbtree.o radix-tree.o timerqueue.o xarray.o \
idr.o extable.o sha1.o irq_regs.o argv_split.o \
- flex_proportions.o ratelimit.o show_mem.o \
+ flex_proportions.o ratelimit.o \
is_single_threaded.o plist.o decompress.o kobject_uevent.o \
earlycpio.o siphash.o dec_and_lock.o \
nmi_backtrace.o nodemask.o win_minmax.o memcat_p.o \
diff --git a/mm/Makefile b/mm/Makefile
index 4cc13f3179a5..7e852599b917 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -54,7 +54,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
mm_init.o percpu.o slab_common.o \
compaction.o vmacache.o \
interval_tree.o list_lru.o workingset.o \
- debug.o gup.o mmap_lock.o $(mmu-y)
+ debug.o gup.o mmap_lock.o show_mem.o $(mmu-y)
# Give 'page_alloc' its own module-parameter namespace
page-alloc-y := page_alloc.o
diff --git a/lib/show_mem.c b/mm/show_mem.c
index 1c26c14ffbb9..1c26c14ffbb9 100644
--- a/lib/show_mem.c
+++ b/mm/show_mem.c