gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Following arm64-support to development branch

Browse Source 
This includes the following fixes:
* fix build of arch/arm64/kernel/vdso

Change-Id: I73b05034d29f7f8731ac17f9736edbba4fb2c639
This commit is contained in:
Takehiro Shiratori
2019-01-30 16:27:03 +09:00
committed by Dominique Martinet
parent e52d748744
commit d4d78e9c61
66 changed files with 3110 additions and 1209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/Makefile.build.in
View File

@@ -8,13 +8,13 @@ OBJS += process.o copy.o waitq.o futex.o timer.o plist.o fileobj.o shmobj.o
OBJS += zeroobj.o procfs.o devobj.o sysfs.o xpmem.o profile.o freeze.o
OBJS += rbtree.o hugefileobj.o
OBJS += pager.o
# POSTK_DEBUG_ARCH_DEP_18 coredump arch separation.
DEPSRCS=$(wildcard $(SRC)/*.c)
# OBJS added gencore.o
ifeq ($(ARCH), arm64)
OBJS += gencore.o
DEPSRCS += $(SRC)/../arch/arm64/kernel/gencore.c
# POSTK_DEBUG_ARCH_DEP_18 coredump arch separation, delete unnecessary code.
#DEPSRCS += $(SRC)/../arch/arm64/kernel/gencore.c
endif
CFLAGS += -I$(SRC)/include -I@abs_builddir@/../ -I@abs_builddir@/include -D__KERNEL__ -g -fno-omit-frame-pointer -fno-inline -fno-inline-small-functions
@@ -77,8 +77,9 @@ $(IHKOBJ): FORCE
%.o: $(SRC)/%.c
$(cc_cmd)
gencore.o: ../arch/arm64/kernel/gencore.c
$(cc_cmd)
# POSTK_DEBUG_ARCH_DEP_18 coredump arch separation, delete unnecessary code.
#gencore.o: ../arch/arm64/kernel/gencore.c
# $(cc_cmd)
FORCE:

4
kernel/Makefile.in
View File

@@ -44,7 +44,9 @@ $(O):
clean:
rm -rf $(O)
ifeq ($(ARCH), arm64)
@rm -f $(vdsodir)/*.o $(vdsodir)/vdso.* $(vdsodir)/Makefile.dep -r $(vdsodir)/../include
@rm -f $(vdsodir)/*.o $(vdsodir)/vdso.lds $(vdsodir)/vdso.so* $(vdsodir)/Makefile.dep
@rm -f $(vdsodir)/../include/vdso-offsets.h $(vdsodir)/../include/vdso-so-path.h
@if [ -d $(vdsodir)/../include ]; then rmdir --ignore-fail-on-non-empty $(vdsodir)/../include; fi
endif
install:

5
kernel/include/syscall.h
View File

@@ -379,13 +379,8 @@ struct coretable { /* table entry for a core chunk */
unsigned long addr; /* physical addr of the chunk */
};
#ifdef POSTK_DEBUG_TEMP_FIX_1
void create_proc_procfs_files(int pid, int tid, int cpuid);
void delete_proc_procfs_files(int pid, int tid);
#else /* POSTK_DEBUG_TEMP_FIX_1 */
void create_proc_procfs_files(int pid, int cpuid);
void delete_proc_procfs_files(int pid);
#endif /* POSTK_DEBUG_TEMP_FIX_1 */
void create_os_procfs_files(void);
void delete_os_procfs_files(void);

4
kernel/mem.c
View File

@@ -979,7 +979,6 @@ void coredump(struct thread *thread, void *regs)
return;
}
#ifndef POSTK_DEBUG_ARCH_DEP_18
ret = gencore(thread, regs, &coretable, &chunks);
if (ret != 0) {
dkprintf("could not generate a core file image\n");
@@ -996,7 +995,6 @@ void coredump(struct thread *thread, void *regs)
kprintf("core dump failed.\n");
}
freecore(&coretable);
#endif /* POSTK_DEBUG_ARCH_DEP_18 */
}
#ifndef POSTK_DEBUG_ARCH_DEP_8
@@ -1665,7 +1663,7 @@ void *ihk_mc_map_virtual(unsigned long phys, int npages,
flush_tlb_single((unsigned long)(p + (i << PAGE_SHIFT)));
}
barrier();
barrier(); /* Temporary fix for Thunder-X */
return (char *)p + offset;
}

2
kernel/process.c
View File

@@ -1,4 +1,4 @@
/* process.c COPYRIGHT FUJITSU LIMITED 2015-2017 */
/* process.c COPYRIGHT FUJITSU LIMITED 2015-2018 */
/**
* \file process.c
* License details are found in the file LICENSE.