Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 25a76ab8 in mainline for boot/arch/sparc64/include/asm.h


Ignore:
Timestamp:
2010-05-08T07:53:23Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
051bc69a
Parents:
6c39a907 (diff), 1317380 (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 moved

Legend:

Unmodified
Added
Removed
  • boot/arch/sparc64/include/asm.h

    r6c39a907 r25a76ab8  
    11/*
     2 * Copyright (c) 2006 Martin Decky
    23 * Copyright (c) 2006 Jakub Jermar
    34 * All rights reserved.
     
    2728 */
    2829
    29 #ifndef BOOT_sparc64_REGISTER_H_
    30 #define BOOT_sparc64_REGISTER_H_
     30#ifndef BOOT_sparc64_ASM_H_
     31#define BOOT_sparc64_ASM_H_
    3132
    32 #define PSTATE_IE_BIT    2
    33 #define PSTATE_PRIV_BIT  4
    34 #define PSTATE_AM_BIT    8
     33#include <typedefs.h>
    3534
    36 #define ASI_ICBUS_CONFIG        0x4a
    37 #define ICBUS_CONFIG_MID_SHIFT  17
     35extern void jump_to_kernel(void *entry, bootinfo_t *bootinfo,
     36    uintptr_t physmem_start, uint8_t subarch) __attribute__((noreturn));
    3837
    3938#endif
Note: See TracChangeset for help on using the changeset viewer.