diff options
Diffstat (limited to '')
-rw-r--r-- | cpukit/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/sapi/include/confdefs.h | 13 | ||||
-rw-r--r-- | cpukit/score/cpu/i386/cpu.c | 4 |
3 files changed, 17 insertions, 5 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 044c0ee218..e0bafb876b 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2011-04-11 Joel Sherrill <joel.sherrill@oarcorp.com> + + * sapi/include/confdefs.h, score/cpu/i386/cpu.c: Fix typos so you + really can define a user scheduler. + 2011-04-05 Joel Sherrill <joel.sherrilL@OARcorp.com> PR 1701/filesystems diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index e7e2a8505d..43fbf45a69 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -601,7 +601,7 @@ rtems_fs_init_functions_t rtems_fs_init_helper = */ #if defined(CONFIGURE_SCHEDULER_PRIORITY) #include <rtems/score/schedulerpriority.h> - #define SCHEDULER_ENTRY_POINTS SCHEDULER_PRIORITY_ENTRY_POINTS + #define CONFIGURE_SCHEDULER_ENTRY_POINTS SCHEDULER_PRIORITY_ENTRY_POINTS /** * This defines the memory used by the priority scheduler. @@ -619,7 +619,7 @@ rtems_fs_init_functions_t rtems_fs_init_helper = */ #if defined(CONFIGURE_SCHEDULER_SIMPLE) #include <rtems/score/schedulersimple.h> - #define SCHEDULER_ENTRY_POINTS SCHEDULER_SIMPLE_ENTRY_POINTS + #define CONFIGURE_SCHEDULER_ENTRY_POINTS SCHEDULER_SIMPLE_ENTRY_POINTS /** * define the memory used by the simple scheduler @@ -630,14 +630,19 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #define CONFIGURE_MEMORY_PER_TASK_FOR_SCHEDULER (0) #endif +#if defined(CONFIGURE_SCHEDULER_USER) + #define CONFIGURE_SCHEDULER_ENTRY_POINTS \ + CONFIGURE_SCHEDULER_USER_ENTRY_POINTS +#endif + /* * Set up the scheduler entry points table. The scheduling code uses * this code to know which scheduler is configured by the user. */ #ifdef CONFIGURE_INIT Scheduler_Control _Scheduler = { - NULL, /* Scheduler Specific Data Pointer */ - SCHEDULER_ENTRY_POINTS /* Scheduler Operations */ + NULL, /* Scheduler Specific Data Pointer */ + CONFIGURE_SCHEDULER_ENTRY_POINTS /* Scheduler Operations */ }; #endif diff --git a/cpukit/score/cpu/i386/cpu.c b/cpukit/score/cpu/i386/cpu.c index 56971b63d5..f2fcacf2f9 100644 --- a/cpukit/score/cpu/i386/cpu.c +++ b/cpukit/score/cpu/i386/cpu.c @@ -1,7 +1,6 @@ /* * Intel i386 Dependent Source * - * * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). * @@ -171,8 +170,11 @@ void _defaultExcHandler (CPU_Exception_frame *ctx) * OK I could probably use a simplified version but at least this * should work. */ +#if 0 printk(" ************ FAULTY THREAD WILL BE SUSPENDED **************\n"); rtems_task_suspend(_Thread_Executing->Object.id); +#endif + bsp_reset(); } } |