Ignore:
Timestamp:
2014-09-12T03:45:25Z (11 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c53b58e
Parents:
3eb0c85 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r3eb0c85 r8e7c9fe  
    3939
    4040#ifdef CONFIG_SMP
    41 #include <arch/context_offset.h>
     41#include <arch/context_struct.h>
    4242#endif
    4343
    … …  
    356356         */
    357357        set ctx, %g1
    358         add %g1, OFFSET_SP, %g1
     358        add %g1, CONTEXT_OFFSET_SP, %g1
    359359        ldx [%g1], %o6
    360360
Note: See TracChangeset for help on using the changeset viewer.