Changeset 283 for trunk


Ignore:
Timestamp:
Jul 27, 2017, 11:22:39 AM (7 years ago)
Author:
max@…
Message:

horror

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/hal/x86_64/core/hal_init.c

    r276 r283  
    290290                }
    291291
    292                 smp_stkva = (vaddr_t)cpudata[i].boot_stack + STKSIZE;
     292                smp_stkva = ((vaddr_t)&cpudata[i].boot_stack + STKSIZE) & ~0xF;
    293293
    294294                cpuN_booted = 0;
     
    611611
    612612        /* tss->tss_rsp0 */
    613         tss->tss_ist[0] = (uint64_t)data->intr_stack[lid] + STKSIZE;
    614         tss->tss_ist[1] = (uint64_t)data->dbfl_stack[lid] + STKSIZE;
    615         tss->tss_ist[2] = (uint64_t)data->nmfl_stack[lid] + STKSIZE;
     613        tss->tss_ist[0] = ((uint64_t)&data->intr_stack + STKSIZE) & ~0xF;
     614        tss->tss_ist[1] = ((uint64_t)&data->dbfl_stack + STKSIZE) & ~0xF;
     615        tss->tss_ist[2] = ((uint64_t)&data->nmfl_stack + STKSIZE) & ~0xF;
    616616        tss->tss_iobase = IOMAP_INVALOFF << 16;
    617617        sel = tss_alloc(tss, lid);
Note: See TracChangeset for help on using the changeset viewer.