Changeset bc73be3 in mainline for kernel/arch/mips32/src/mips32.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

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

kernel/arch/mips32/src/mips32.c

@@ -71 +71 @@
 arch_ops_t *arch_ops = &mips32_ops;
 
-/*
- * Why the linker moves the variable 64K away in assembler
- * when not in .text section?
- */
-
 /* Stack pointer saved when entering user mode */
-uintptr_t supervisor_sp __attribute__((section(".text")));
+// FIXME: This won't work with SMP unless thread creation is globally serialized.
+uintptr_t supervisor_sp;
 
 size_t cpu_count = 0;
@@ -106 +102 @@
         sdram_size = bootinfo->sdram_size;
 #endif
+
+        str_cpy(bargs, CONFIG_BOOT_ARGUMENTS_BUFLEN, bootinfo->bootargs);
 
         /* Initialize machine_ops pointer. */