diff options
| author | Jennifer Averett <jennifer.averett@oarcorp.com> | 2012-02-23 10:43:58 -0600 |
|---|---|---|
| committer | Jennifer Averett <jennifer.averett@oarcorp.com> | 2012-02-23 10:43:58 -0600 |
| commit | 8f7f6caaef26f9067aeb2feaa85a2d50c0853ba8 (patch) | |
| tree | 050baab928e64c77bb3055ed0f7fd9cdd31f8ce8 | |
| parent | Avoid NULL dereference in printk() before libchip console initialized (diff) | |
| parent | psxtests: Fix typo in psxstat (diff) | |
| download | rtems-8f7f6caaef26f9067aeb2feaa85a2d50c0853ba8.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | c/src/lib/libbsp/arm/lpc32xx/include/nand-mlc.h | 2 | ||||
| -rw-r--r-- | cpukit/libfs/src/rfs/rtems-rfs-mutex.c | 9 | ||||
| -rw-r--r-- | testsuites/psxtests/psxstat/test.c | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/arm/lpc32xx/include/nand-mlc.h b/c/src/lib/libbsp/arm/lpc32xx/include/nand-mlc.h index cc91a7956b..5fed9031b6 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/include/nand-mlc.h +++ b/c/src/lib/libbsp/arm/lpc32xx/include/nand-mlc.h @@ -263,7 +263,7 @@ rtems_status_code lpc32xx_mlc_read_page( * @brief Checks if the block with index @a block_index is valid. * * The initial valid block information of the manufacturer will be used. - * Unfortunatly there seems to be no standard for this. A block will be + * Unfortunately there seems to be no standard for this. A block will be * considered as bad if the first or second page of this block does not contain * 0xff at the 6th byte of the spare area. This should work for flashes with * small pages and a 8-bit IO width. diff --git a/cpukit/libfs/src/rfs/rtems-rfs-mutex.c b/cpukit/libfs/src/rfs/rtems-rfs-mutex.c index 04d700a916..f35350f653 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-mutex.c +++ b/cpukit/libfs/src/rfs/rtems-rfs-mutex.c @@ -24,15 +24,10 @@ #if __rtems__ /** * RTEMS_RFS Mutex Attributes - * - * @warning Do not configure as inherit priority. If a driver is in the driver - * initialisation table this locked semaphore will have the IDLE task - * as the holder and a blocking task will raise the priority of the - * IDLE task which can cause unsual side effects like not work. */ #define RTEMS_RFS_MUTEX_ATTRIBS \ - (RTEMS_PRIORITY | RTEMS_SIMPLE_BINARY_SEMAPHORE | \ - RTEMS_NO_INHERIT_PRIORITY | RTEMS_NO_PRIORITY_CEILING | RTEMS_LOCAL) + (RTEMS_PRIORITY | RTEMS_BINARY_SEMAPHORE | \ + RTEMS_INHERIT_PRIORITY | RTEMS_NO_PRIORITY_CEILING | RTEMS_LOCAL) #endif int diff --git a/testsuites/psxtests/psxstat/test.c b/testsuites/psxtests/psxstat/test.c index e3b7f23b8e..c5d344d8fc 100644 --- a/testsuites/psxtests/psxstat/test.c +++ b/testsuites/psxtests/psxstat/test.c @@ -705,7 +705,7 @@ void Cause_faults(void) status = rmdir( longer_name ); rtems_test_assert( status == 0 ); - printf("unlink %s\n", Links_to_Dirs[5]); + printf("unlink %s\n", Links_to_dirlinks[5]); status = unlink( Links_to_dirlinks[5] ); rtems_test_assert( status == 0 ); |