File tree Expand file tree Collapse file tree 4 files changed +25
-25
lines changed Expand file tree Collapse file tree 4 files changed +25
-25
lines changed Original file line number Diff line number Diff line change @@ -313,13 +313,9 @@ static const char *g_statenames[] = {
313
313
"Inactive" ,
314
314
"Semaphore wait" ,
315
315
"To be unblocked wait"
316
- #ifndef CONFIG_DISABLE_MQUEUE
317
316
"Signal wait" ,
318
- #endif
319
- #ifndef CONFIG_DISABLE_MQUEUE
320
317
"MQ not empty wait" ,
321
318
"MQ no full wait"
322
- #endif
323
319
};
324
320
325
321
static const char * g_ttypenames [4 ] = {
Original file line number Diff line number Diff line change 79
79
****************************************************************************/
80
80
enum {
81
81
BIN_TEXT ,
82
- #ifdef CONFIG_BINFMT_CONSTRUCTORS
83
82
BIN_CTOR ,
84
83
BIN_DTOR ,
85
- #endif
86
- #ifdef CONFIG_OPTIMIZE_APP_RELOAD_TIME
87
84
BIN_RO ,
88
- #endif
89
85
BIN_DATA ,
90
86
BIN_BSS ,
91
87
BIN_HEAP ,
Original file line number Diff line number Diff line change @@ -225,16 +225,10 @@ enum tstate_e {
225
225
TSTATE_TASK_INACTIVE , /* BLOCKED - Initialized but not yet activated */
226
226
TSTATE_WAIT_SEM , /* BLOCKED - Waiting for a semaphore */
227
227
TSTATE_WAIT_FIN , /* BLOCKED - Waiting to be unblocked by fin */
228
- #ifndef CONFIG_DISABLE_SIGNALS
229
228
TSTATE_WAIT_SIG , /* BLOCKED - Waiting for a signal */
230
- #endif
231
- #ifndef CONFIG_DISABLE_MQUEUE
232
229
TSTATE_WAIT_MQNOTEMPTY , /* BLOCKED - Waiting for a MQ to become not empty. */
233
230
TSTATE_WAIT_MQNOTFULL , /* BLOCKED - Waiting for a MQ to become not full. */
234
- #endif
235
- #ifdef CONFIG_PAGING
236
231
TSTATE_WAIT_PAGEFILL , /* BLOCKED - Waiting for page fill */
237
- #endif
238
232
NUM_TASK_STATES /* Must be last */
239
233
};
240
234
typedef enum tstate_e tstate_t ;
Original file line number Diff line number Diff line change @@ -172,7 +172,9 @@ volatile dq_queue_t g_readytorun;
172
172
* always the CPU's IDLE task.
173
173
*/
174
174
175
+ #ifdef CONFIG_SMP
175
176
volatile dq_queue_t g_assignedtasks [CONFIG_SMP_NCPUS ];
177
+ #endif
176
178
177
179
/* g_running_tasks[] holds a references to the running task for each cpu.
178
180
* It is valid only when up_interrupt_context() returns true.
@@ -317,33 +319,45 @@ const struct tasklist_s g_tasklisttable[NUM_TASK_STATES] =
317
319
& g_waitingforfin ,
318
320
TLIST_ATTR_PRIORITIZED
319
321
},
322
+ #ifndef CONFIG_DISABLE_SIGNALS
320
323
{ /* TSTATE_WAIT_SIG */
321
324
& g_waitingforsignal ,
322
325
0
323
- }
326
+ },
327
+ #else
328
+ {
329
+ NULL ,
330
+ 0
331
+ },
332
+ #endif
324
333
#ifndef CONFIG_DISABLE_MQUEUE
325
- ,
326
334
{ /* TSTATE_WAIT_MQNOTEMPTY */
327
335
& g_waitingformqnotempty ,
328
336
TLIST_ATTR_PRIORITIZED
329
337
},
330
338
{ /* TSTATE_WAIT_MQNOTFULL */
331
339
& g_waitingformqnotfull ,
332
340
TLIST_ATTR_PRIORITIZED
333
- }
341
+ },
342
+ #else
343
+ {
344
+ NULL ,
345
+ 0
346
+ },
347
+ {
348
+ NULL ,
349
+ 0
350
+ },
334
351
#endif
335
352
#ifdef CONFIG_PAGING
336
- ,
337
353
{ /* TSTATE_WAIT_PAGEFILL */
338
354
& g_waitingforfill ,
339
355
TLIST_ATTR_PRIORITIZED
340
- }
341
- #endif
342
- #ifdef CONFIG_SIG_SIGSTOP_ACTION
343
- ,
344
- { /* TSTATE_TASK_STOPPED */
345
- & g_stoppedtasks ,
346
- 0 /* See tcb->prev_state */
356
+ },
357
+ #else
358
+ {
359
+ NULL ,
360
+ 0
347
361
},
348
362
#endif
349
363
};
You can’t perform that action at this time.
0 commit comments