Changeset b50b5af2 in mainline for boot/arch/ia64/loader/asm.h

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (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:

• boot/arch/ia64/loader/asm.h (modified) (1 diff)

boot/arch/ia64/loader/asm.h

@@ -34 +34 @@
 #include "main.h"
 
-#define PAGE_WIDTH      14
-#define PAGE_SIZE       (1 << PAGE_WIDTH)
+#define PAGE_WIDTH  14
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
 
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
+#define BALLOC_MAX_SIZE  (128 * 1024)
 
 extern void halt(void);
-/*extern void jump_to_kernel(void *entry, uint64_t cfg, bootinfo_t *bootinfo,
-        unsigned int bootinfo_size) __attribute__((noreturn));*/
-
 extern void jump_to_kernel(void *) __attribute__((noreturn));