Kernel/armv7 - Fixed Proc_NewKThread, included lib.S in Makefile

diff --git a/Kernel/arch/armv7/Makefile b/Kernel/arch/armv7/Makefile
index 21da172..83fd17c 100644 (file)
--- 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 ccc6b8f..284c9d7 100644 (file)
--- 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;