Ignore:
Timestamp:
2016-05-02T20:58:16Z (8 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7c4b26c
Parents:
6adb775f (diff), 5035ba05 (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 mainline, which has dltest and fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia32/src/proc/scheduler.c

    r6adb775f r32573ff  
    7070        CPU->arch.tss->esp0 = kstk;
    7171        CPU->arch.tss->ss0 = GDT_SELECTOR(KDATA_DES);
    72        
    73         /* Set up TLS in GS register */
    74         set_tls_desc(THREAD->arch.tls);
    7572}
    7673
Note: See TracChangeset for help on using the changeset viewer.