Changeset 878e181 in mainline for kernel

Timestamp:

2013-03-12T07:30:11Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b92a0ee

Parents:

7f25c4e (diff), 623bab8f (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

Files:

• arch/abs32le/include/arch/stack.h (added)
• arch/amd64/include/arch/stack.h (added)
• arch/arm32/include/arch/stack.h (modified) (1 diff)
• arch/ia32/include/arch/stack.h (added)
• arch/ia64/include/arch/stack.h (modified) (1 diff)
• arch/mips32/include/arch/stack.h (modified) (1 diff)
• arch/mips64/include/arch/stack.h (modified) (1 diff)
• arch/ppc32/include/arch/stack.h (added)
• arch/sparc64/include/arch/stack.h (modified) (1 diff)
• generic/src/interrupt/interrupt.c (modified) (2 diffs)

kernel/arch/arm32/include/arch/stack.h

@@ -37 +37 @@
 #define KERN_arm32_STACK_H_
 
+#include <config.h>
+
+#define MEM_STACK_SIZE  STACK_SIZE
+
 #define STACK_ITEM_SIZE         4
 

kernel/arch/ia64/include/arch/stack.h

@@ -36 +36 @@
 #define KERN_ia64_STACK_H_
 
+#include <config.h>
+
+#define MEM_STACK_SIZE  (STACK_SIZE / 2)
+
 #define STACK_ITEM_SIZE                 8
 #define STACK_ALIGNMENT                 16

kernel/arch/mips32/include/arch/stack.h

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

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/sparc64/include/arch/stack.h

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

kernel/generic/src/interrupt/interrupt.c

@@ -54 +54 @@
 #include <proc/thread.h>
 #include <arch/cycle.h>
+#include <arch/stack.h>
 #include <str.h>
 #include <trace.h>
@@ -222 +223 @@
         /*
          * The istate structure should be right at the bottom of the kernel
-         * stack.
+         * memory stack.
          */
-        return (istate_t *) ((uint8_t *)
-            thread->kstack + STACK_SIZE - sizeof(istate_t));
+        return (istate_t *) &thread->kstack[MEM_STACK_SIZE - sizeof(istate_t)];
 }