diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-14 14:42:52 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-14 14:42:52 +0000 |
| commit | 0d36830a37fcdb64c2b2d00990e084e7f8d63456 (patch) | |
| tree | 78cc505c6874907ce2a37ab2b94d15c848c0ce50 /nuttx/arch/sh/src/sh1 | |
| parent | 5be9588ed42d1a4ed297bdc76d9e05e582e78969 (diff) | |
| download | px4-nuttx-0d36830a37fcdb64c2b2d00990e084e7f8d63456.tar.gz px4-nuttx-0d36830a37fcdb64c2b2d00990e084e7f8d63456.tar.bz2 px4-nuttx-0d36830a37fcdb64c2b2d00990e084e7f8d63456.zip | |
Rename g_heapbase to g_idle_topstack; Fix kernel build heap allocation which cannot use g_heapbase
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5739 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/sh/src/sh1')
| -rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_dumpstate.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_head.S | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/arch/sh/src/sh1/sh1_dumpstate.c b/nuttx/arch/sh/src/sh1/sh1_dumpstate.c index 3d101c92d..8990f6615 100644 --- a/nuttx/arch/sh/src/sh1/sh1_dumpstate.c +++ b/nuttx/arch/sh/src/sh1/sh1_dumpstate.c @@ -160,7 +160,7 @@ void up_dumpstate(void) if (rtcb->pid == 0) { - ustackbase = g_heapbase - 4; + ustackbase = g_idle_topstack - 4; ustacksize = CONFIG_IDLETHREAD_STACKSIZE; } else diff --git a/nuttx/arch/sh/src/sh1/sh1_head.S b/nuttx/arch/sh/src/sh1/sh1_head.S index 9a52b9bb3..774d22784 100644 --- a/nuttx/arch/sh/src/sh1/sh1_head.S +++ b/nuttx/arch/sh/src/sh1/sh1_head.S @@ -507,18 +507,18 @@ __start0: .section .data - /* This global variable is unsigned long g_heapbase and is + /* This global variable is unsigned long g_idle_topstack and is * exported from here only because of its coupling to the stack * above. */ .data .align 4 - .globl _g_heapbase - .type _g_heapbase, object -_g_heapbase: + .globl _g_idle_topstack + .type _g_idle_topstack, object +_g_idle_topstack: .long _ebss+CONFIG_IDLETHREAD_STACKSIZE - .size _g_heapbase, .-_g_heapbase + .size _g_idle_topstack, .-_g_idle_topstack .end |