Ignore:
Timestamp:
2014-09-12T13:22:33Z (10 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9b20126
Parents:
8db09e4 (diff), 105d8d6 (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 changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/sparc64/src/sun4v/start.S

    r8db09e4 r15d0046  
    3131#include <arch/stack.h>
    3232#include <arch/regdef.h>
    33 #include <arch/context_offset.h>
     33#include <arch/context_struct.h>
    3434#include <arch/sun4v/regdef.h>
    3535#include <arch/sun4v/hypercall.h>
    … …  
    291291         */
    292292        set ctx, %g1
    293         add %g1, OFFSET_SP, %g1
     293        add %g1, CONTEXT_OFFSET_SP, %g1
    294294        ldx [%g1], %o6
    295295
Note: See TracChangeset for help on using the changeset viewer.