diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-29 16:23:46 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-29 16:23:46 -0600 |
| commit | bad65d0c62ee527bbb839ab87b01abc0c874c8c9 (patch) | |
| tree | c6316029e8e2a7b27422a2a8bbf10ccfb26aadd3 /nuttx/arch/arm/src/common | |
| parent | c7153c08bd9b6ebce31e6dbeb835b01aee4fabbb (diff) | |
| download | nuttx-bad65d0c62ee527bbb839ab87b01abc0c874c8c9.tar.gz nuttx-bad65d0c62ee527bbb839ab87b01abc0c874c8c9.tar.bz2 nuttx-bad65d0c62ee527bbb839ab87b01abc0c874c8c9.zip | |
Various changes/fixes to get configs/stm32f4discovery/kostest working after the big configuration renaming (and after a long period of bit rot)
Diffstat (limited to 'nuttx/arch/arm/src/common')
| -rw-r--r-- | nuttx/arch/arm/src/common/up_pthread_start.c | 5 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/common/up_signal_dispatch.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/common/up_pthread_start.c b/nuttx/arch/arm/src/common/up_pthread_start.c index 31ccb80c1..59fd7073b 100644 --- a/nuttx/arch/arm/src/common/up_pthread_start.c +++ b/nuttx/arch/arm/src/common/up_pthread_start.c @@ -44,9 +44,8 @@ #include "svcall.h" #include "up_internal.h" -#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__) || \ - defined(defined(CONFIG_BUILD_KERNEL)) && \ - !defined(CONFIG_DISABLE_PTHREAD) +#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \ + defined(CONFIG_BUILD_KERNEL)) && !defined(CONFIG_DISABLE_PTHREAD) /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/arch/arm/src/common/up_signal_dispatch.c b/nuttx/arch/arm/src/common/up_signal_dispatch.c index 75725237f..f0cf91a49 100644 --- a/nuttx/arch/arm/src/common/up_signal_dispatch.c +++ b/nuttx/arch/arm/src/common/up_signal_dispatch.c @@ -43,9 +43,8 @@ #include "svcall.h" #include "up_internal.h" -#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__) || \ - defined(defined(CONFIG_BUILD_KERNEL)) && \ - !defined(CONFIG_DISABLE_SIGNALS) +#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \ + defined(CONFIG_BUILD_KERNEL)) && !defined(CONFIG_DISABLE_SIGNALS) /**************************************************************************** * Pre-processor Definitions |