From bc2971bce09335ac199919a298bedc09f798603f Mon Sep 17 00:00:00 2001
From: hinus <hinus@163.com>
Date: Fri, 18 Jun 2021 05:27:24 +0800
Subject: [PATCH] Title: Move mm directory to root dir. Issue:
 https://gitee.com/hinus/linux_kernel_011/issues/I3VEW6 Description: 'kernel'
 dir should not contain 'mm', move 'mm' out of 'kernel'.

---
 kernel/Makefile            | 8 ++++----
 {kernel/mm => mm}/Makefile | 2 +-
 {kernel/mm => mm}/memory.c | 0
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename {kernel/mm => mm}/Makefile (71%)
 rename {kernel/mm => mm}/memory.c (100%)

diff --git a/kernel/Makefile b/kernel/Makefile
index f8f04ec..dcc6f1f 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -2,7 +2,7 @@ GCC := gcc
 CCFLAG := -I../include -nostdinc -Wall -fomit-frame-pointer -fno-stack-protector -c -m32
 LDFLAG := -Ttext 0x0 -s --oformat binary -m elf_i386
 INCDIR := ../include
-OBJS   := head.o main.o sys_call.o sched.o printk.o vsprintf.o chr_drv/chr_drv.a mm/mm.o
+OBJS   := head.o main.o sys_call.o sched.o printk.o vsprintf.o chr_drv/chr_drv.a ../mm/mm.o
 
 system: $(OBJS)
 	$(LD) $(LDFLAG) -e startup_32 -o $@ $^
@@ -28,12 +28,12 @@ vsprintf.o : vsprintf.c
 chr_drv/chr_drv.a: chr_drv/*.c
 	cd chr_drv; make chr_drv.a; cd ..
 
-mm/mm.o : mm/*.c
-	cd mm; make mm.o; cd ..
+../mm/mm.o : ../mm/*.c
+	cd ../mm; make mm.o; cd ../kernel
 
 clean : 
 	rm *.o
 	rm system
 	cd chr_drv; make clean; cd ..
-	cd mm; make clean; cd ..
+	cd ../mm; make clean; cd ../kernel
 
diff --git a/kernel/mm/Makefile b/mm/Makefile
similarity index 71%
rename from kernel/mm/Makefile
rename to mm/Makefile
index 6c0e8cb..b84f028 100644
--- a/kernel/mm/Makefile
+++ b/mm/Makefile
@@ -1,6 +1,6 @@
 GCC := gcc
 LD  := ld
-CCFLAG := -I../../include -nostdinc -Wall -fomit-frame-pointer -fno-stack-protector -c -m32
+CCFLAG := -I../include -nostdinc -Wall -fomit-frame-pointer -fno-stack-protector -c -m32
 LDFLAG := -Ttext 0x0 -s --oformat binary -m elf_i386
 INCDIR := ../include
 OBJS   := memory.o
diff --git a/kernel/mm/memory.c b/mm/memory.c
similarity index 100%
rename from kernel/mm/memory.c
rename to mm/memory.c
-- 
Gitee