Changeset 32573ff in mainline for kernel/arch/ia32/include/arch/pm.h


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/include/arch/pm.h

    r6adb775f r32573ff  
    4545#define UDATA_DES  4
    4646#define TSS_DES    5
    47 #define TLS_DES    6  /* Pointer to Thread-Local-Storage data */
     47#define VREG_DES   6  /* Virtual registers */
    4848
    4949#ifdef CONFIG_FB
    … …  
    169169
    170170extern void tss_initialize(tss_t *t);
    171 extern void set_tls_desc(uintptr_t tls);
    172171
    173172#endif /* __ASM__ */
Note: See TracChangeset for help on using the changeset viewer.