Changeset a33f0a6 in mainline for kernel/generic/include/cpu.h


Ignore:
Timestamp:
2011-08-03T17:34:57Z (15 years ago)
Author:
Oleg Romanenko <romanenko.oleg@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
1940326
Parents:
52a79081 (diff), 3fab770 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from mainline

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/cpu.h

    r52a79081 ra33f0a6  
    4242#include <arch/context.h>
    4343
    44 #define CPU_STACK_SIZE  STACK_SIZE
    45 
    4644/** CPU structure.
    4745 *
    … …  
    6159       
    6260        IRQ_SPINLOCK_DECLARE(timeoutlock);
    63         link_t timeout_active_head;
     61        list_t timeout_active_list;
    6462       
    6563        /**
Note: See TracChangeset for help on using the changeset viewer.