Changeset a1e98de in mainline for kernel/arch/ia32/src/pm.c


Ignore:
Timestamp:
2010-08-11T15:24:08Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ff586e06
Parents:
482dde7 (diff), 17ccb9d7 (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 small cleanups (no change in functionality)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia32/src/pm.c

    r482dde7 ra1e98de  
    8686
    8787/* gdtr is changed by kmp before next CPU is initialized */
    88 ptr_16_32_t bootstrap_gdtr = { .limit = sizeof(gdt), .base = KA2PA((uintptr_t) gdt) };
    8988ptr_16_32_t gdtr = { .limit = sizeof(gdt), .base = (uintptr_t) gdt };
    9089
    … …  
    128127
    129128                d->unused = 0;
    130                 d->selector = gdtselector(KTEXT_DES);
     129                d->selector = GDT_SELECTOR(KTEXT_DES);
    131130
    132131                if (i == VECTOR_SYSCALL) {
    … …  
    283282         * to its own TSS. We just need to load the TR register.
    284283         */
    285         tr_load(gdtselector(TSS_DES));
     284        tr_load(GDT_SELECTOR(TSS_DES));
    286285       
    287286        clean_IOPL_NT_flags();    /* Disable I/O on nonprivileged levels and clear NT flag. */
Note: See TracChangeset for help on using the changeset viewer.