Changeset 46c20c8 in mainline for boot/arch/ia64/include/asm.h


Ignore:
Timestamp:
2010-11-26T20:08:10Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
45df59a
Parents:
fb150d78 (diff), ffdd2b9 (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/ia64/include/asm.h

    rfb150d78 r46c20c8  
    3131#define BOOT_ia64_ASM_H_
    3232
    33 #include "types.h"
    34 #include "main.h"
    35 
    36 #define PAGE_WIDTH  14
    37 #define PAGE_SIZE   (1 << PAGE_WIDTH)
    38 
    39 #define BALLOC_MAX_SIZE  (128 * 1024)
    40 
    41 extern void halt(void);
    4233extern void jump_to_kernel(void *) __attribute__((noreturn));
    4334
    44 
    4535#endif
Note: See TracChangeset for help on using the changeset viewer.