From 3a7e997bd8b393c40c77b5b67efb6883b5f5cae9 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Thu, 20 Oct 2011 22:32:04 +0800 Subject: [PATCH] Kernel/armv7 - Fixed Proc_NewKThread, included lib.S in Makefile --- Kernel/arch/armv7/Makefile | 2 +- Kernel/arch/armv7/proc.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Kernel/arch/armv7/Makefile b/Kernel/arch/armv7/Makefile index 21da1726..83fd17c0 100644 --- a/Kernel/arch/armv7/Makefile +++ b/Kernel/arch/armv7/Makefile @@ -20,7 +20,7 @@ endif CPPFLAGS += -DMMU_PRESENT=$(MMU_PRESENT) -DPCI_ADDRESS=$(PCI_ADDRESS) LDFLAGS += `$(CC) --print-libgcc-file-name` -A_OBJ = start.ao main.o lib.o time.o pci.o debug.o +A_OBJ = start.ao main.o lib.o lib.ao time.o pci.o debug.o A_OBJ += mm_phys.o mm_virt.o proc.o proc.ao main.c: Makefile.BuildNum.$(ARCH) diff --git a/Kernel/arch/armv7/proc.c b/Kernel/arch/armv7/proc.c index ccc6b8fe..284c9d70 100644 --- a/Kernel/arch/armv7/proc.c +++ b/Kernel/arch/armv7/proc.c @@ -172,7 +172,6 @@ tTID Proc_NewKThread( void (*Fnc)(void*), void *Ptr ) sp = new->KernelStack; *(Uint32*)(sp -= 4) = (Uint)Ptr; - *(Uint32*)(sp -= 4) = 1; *(Uint32*)(sp -= 4) = (Uint)Fnc; *(Uint32*)(sp -= 4) = (Uint)new; -- 2.20.1