diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-03-05 06:41:14 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-03-05 06:41:14 -0600 |
| commit | c22fe5519089b2897bbf13b576e17127b4ea764b (patch) | |
| tree | 1d2b4f1937988c2baef5a32c77835af5722c9e13 | |
| parent | 03f109cf29adb14e2611dc0d602acf03e9fba783 (diff) | |
| download | px4-nuttx-c22fe5519089b2897bbf13b576e17127b4ea764b.tar.gz px4-nuttx-c22fe5519089b2897bbf13b576e17127b4ea764b.tar.bz2 px4-nuttx-c22fe5519089b2897bbf13b576e17127b4ea764b.zip | |
Fix two uses of DEBUG_COLORATION vs STACK_COLORATION (from David Sidrane). Also some corrected comments
| -rw-r--r-- | apps/system/stackmonitor/Kconfig | 6 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sam34/sam_udp.h | 2 | ||||
| -rw-r--r-- | nuttx/fs/procfs/fs_procfsproc.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/system/stackmonitor/Kconfig b/apps/system/stackmonitor/Kconfig index 9756066c0..ca69e5161 100644 --- a/apps/system/stackmonitor/Kconfig +++ b/apps/system/stackmonitor/Kconfig @@ -6,10 +6,10 @@ config SYSTEM_STACKMONITOR bool "Stack monitor" default n - depends on DEBUG_COLORATION && !KERNEL_BUILD + depends on STACK_COLORATION && !KERNEL_BUILD ---help--- - If the stack coloration feature is enabled (DEBUG_COLORATION) this - option will select the Stack Moitor. The stack monitor is a daemoni + If the stack coloration feature is enabled (STACK_COLORATION) this + option will select the Stack Monitor. The stack monitor is a daemon that will periodically assess stack usage by all tasks and threads in the system. This feature depends on internal OS features and, hence, is not available if the NuttX kernel build is selected. diff --git a/nuttx/arch/arm/src/sam34/sam_udp.h b/nuttx/arch/arm/src/sam34/sam_udp.h index 95268ee4a..497cf2992 100644 --- a/nuttx/arch/arm/src/sam34/sam_udp.h +++ b/nuttx/arch/arm/src/sam34/sam_udp.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/sam34/sam_udphs.h + * arch/arm/src/sam34/sam_udp.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/fs/procfs/fs_procfsproc.c b/nuttx/fs/procfs/fs_procfsproc.c index 071ace89f..021a2cd84 100644 --- a/nuttx/fs/procfs/fs_procfsproc.c +++ b/nuttx/fs/procfs/fs_procfsproc.c @@ -631,7 +631,7 @@ static ssize_t proc_stack(FAR struct proc_file_s *procfile, buffer += copysize; remaining -= copysize; -#ifdef CONFIG_DEBUG_COLORATION +#ifdef CONFIG_STACK_COLORATION if (totalsize >= buflen) { return totalsize; |