Changeset 61c0402 in mainline for kernel/arch/arm32/src/userspace.c

Timestamp:

2010-01-15T19:36:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

92bee46

Parents:

50f9c3a (diff), 963462af (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.

File:

• kernel/arch/arm32/src/userspace.c (modified) (2 diffs)

kernel/arch/arm32/src/userspace.c

@@ -35 +35 @@
 
 #include <userspace.h>
+#include <arch/ras.h>
 
 /** Struct for holding all general purpose registers.
@@ -74 +75 @@
         ustate.r1 = 0;
 
+        /* pass the RAS page address in %r2 */
+        ustate.r2 = (uintptr_t) ras_page;
+
         /* clear other registers */
-        ustate.r2 = ustate.r3  = ustate.r4  = ustate.r5 =
-            ustate.r6  = ustate.r7  = ustate.r8  = ustate.r9 = ustate.r10 = 
-            ustate.r11 = ustate.r12 = ustate.lr = 0;
+        ustate.r3  = ustate.r4  = ustate.r5 = ustate.r6 = ustate.r7 =
+            ustate.r8 = ustate.r9 = ustate.r10 = ustate.r11 = ustate.r12 =
+            ustate.lr = 0;
 
         /* set user stack */