Changeset 2b95d13 in mainline for kernel/arch/mips64

Timestamp:

2013-03-12T21:07:15Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

606f6a1

Parents:

976c434 (diff), eceff5f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/arch/mips64

Files:

• include/arch/arch.h (moved) (moved from kernel/arch/mips64/include/arch.h )
• include/arch/asm.h (moved) (moved from kernel/arch/mips64/include/asm.h )
• include/arch/asm/boot.h (moved) (moved from kernel/arch/mips64/include/asm/boot.h )
• include/arch/asm/regname.h (moved) (moved from kernel/arch/mips64/include/asm/regname.h )
• include/arch/atomic.h (moved) (moved from kernel/arch/mips64/include/atomic.h )
• include/arch/barrier.h (moved) (moved from kernel/arch/mips64/include/barrier.h )
• include/arch/cache.h (moved) (moved from kernel/arch/mips64/include/cache.h )
• include/arch/context.h (moved) (moved from kernel/arch/mips64/include/context.h )
• include/arch/context_offset.h (moved) (moved from kernel/arch/mips64/include/context_offset.h )
• include/arch/cp0.h (moved) (moved from kernel/arch/mips64/include/cp0.h )
• include/arch/cpu.h (moved) (moved from kernel/arch/mips64/include/cpu.h )
• include/arch/cycle.h (moved) (moved from kernel/arch/mips64/include/cycle.h )
• include/arch/debug.h (moved) (moved from kernel/arch/mips64/include/debug.h )
• include/arch/debugger.h (moved) (moved from kernel/arch/mips64/include/debugger.h )
• include/arch/drivers/msim.h (moved) (moved from kernel/arch/mips64/include/drivers/msim.h )
• include/arch/elf.h (moved) (moved from kernel/arch/mips64/include/elf.h )
• include/arch/exception.h (moved) (moved from kernel/arch/mips64/include/exception.h )
• include/arch/faddr.h (moved) (moved from kernel/arch/mips64/include/faddr.h )
• include/arch/fpu_context.h (moved) (moved from kernel/arch/mips64/include/fpu_context.h )
• include/arch/interrupt.h (moved) (moved from kernel/arch/mips64/include/interrupt.h )
• include/arch/istate.h (moved) (moved from kernel/arch/mips64/include/istate.h )
• include/arch/mm/as.h (moved) (moved from kernel/arch/mips64/include/mm/as.h )
• include/arch/mm/asid.h (moved) (moved from kernel/arch/mips64/include/mm/asid.h )
• include/arch/mm/frame.h (moved) (moved from kernel/arch/mips64/include/mm/frame.h )
• include/arch/mm/km.h (moved) (moved from kernel/arch/mips64/include/mm/km.h )
• include/arch/mm/page.h (moved) (moved from kernel/arch/mips64/include/mm/page.h )
• include/arch/mm/tlb.h (moved) (moved from kernel/arch/mips64/include/mm/tlb.h )
• include/arch/proc/task.h (moved) (moved from kernel/arch/mips64/include/proc/task.h )
• include/arch/proc/thread.h (moved) (moved from kernel/arch/mips64/include/proc/thread.h )
• include/arch/smp/dorder.h (moved) (moved from kernel/arch/mips64/include/smp/dorder.h )
• include/arch/stack.h (moved) (moved from kernel/arch/mips64/include/stack.h ) (1 diff)
• include/arch/types.h (moved) (moved from kernel/arch/mips64/include/types.h )
• src/mips64.c (modified) (1 diff)

kernel/arch/mips64/include/arch/stack.h

@@ -36 +36 @@
 #define KERN_mips64_STACK_H_
 
+#include <config.h>
+
+#define MEM_STACK_SIZE  STACK_SIZE
+
 #define STACK_ITEM_SIZE  8
 #define STACK_ALIGNMENT  8

kernel/arch/mips64/src/mips64.c

@@ -208 +208 @@
 {
         supervisor_sp =
-            (uintptr_t) &THREAD->kstack[STACK_SIZE - SP_DELTA];
+            (uintptr_t) &THREAD->kstack[STACK_SIZE];
 }