Changeset b5ba8f6 in mainline for kernel/arch/mips32


Ignore:
Timestamp:
2013-09-13T13:11:53Z (13 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1eaa3cf
Parents:
95027b5 (diff), 1c5f6f8 (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

Location:
kernel/arch/mips32/include/arch
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/mips32/include/arch/asm.h

    r95027b5 rb5ba8f6  
    4242NO_TRACE static inline void cpu_sleep(void)
    4343{
    44         /*
    45          * Unfortunatelly most of the simulators do not support
    46          *
    47          * asm volatile (
    48          *     "wait"
    49          * );
    50          *
    51          */
     44        asm volatile ("wait");
    5245}
    5346

  • kernel/arch/mips32/include/arch/mm/frame.h

    r95027b5 rb5ba8f6  
    3939#define FRAME_SIZE   (1 << FRAME_WIDTH)
    4040
     41#define FRAME_LOWPRIO  0
     42
    4143#ifndef __ASM__
    4244
Note: See TracChangeset for help on using the changeset viewer.