Changeset 371bd7d in mainline for kernel/arch/mips32/include/asm.h


Ignore:
Timestamp:
2010-03-27T09:22:17Z (16 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
36a75a2
Parents:
cd82bb1 (diff), eaf22d4 (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/mips32/include/asm.h

    rcd82bb1 r371bd7d  
    3636#define KERN_mips32_ASM_H_
    3737
    38 #include <arch/types.h>
    3938#include <typedefs.h>
    4039#include <config.h>
    … …  
    6665}
    6766
    68 extern void cpu_halt(void);
     67extern void cpu_halt(void) __attribute__((noreturn));
    6968extern void asm_delay_loop(uint32_t t);
    7069extern void userspace_asm(uintptr_t ustack, uintptr_t uspace_uarg,
Note: See TracChangeset for help on using the changeset viewer.