blob: eabba0c2f0000490b2522b9b711101133e2fb92f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
$NetBSD: patch-hw_ppc_mac__newworld.c,v 1.1 2013/10/13 12:37:58 ryoon Exp $
Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
--- hw/ppc/mac_newworld.c.orig 2013-10-09 19:20:32.000000000 +0000
+++ hw/ppc/mac_newworld.c
@@ -125,7 +125,7 @@ static uint64_t translate_kernel_address
return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
}
-static hwaddr round_page(hwaddr addr)
+static hwaddr round_pageq(hwaddr addr)
{
return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
}
@@ -252,7 +252,7 @@ static void ppc_core99_init(QEMUMachineI
}
/* load initrd */
if (initrd_filename) {
- initrd_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
+ initrd_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
initrd_size = load_image_targphys(initrd_filename, initrd_base,
ram_size - initrd_base);
if (initrd_size < 0) {
@@ -260,11 +260,11 @@ static void ppc_core99_init(QEMUMachineI
initrd_filename);
exit(1);
}
- cmdline_base = round_page(initrd_base + initrd_size);
+ cmdline_base = round_pageq(initrd_base + initrd_size);
} else {
initrd_base = 0;
initrd_size = 0;
- cmdline_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
+ cmdline_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
}
ppc_boot_device = 'm';
} else {
|
