summaryrefslogtreecommitdiffstats
path: root/kernel/arch/m68k/sun3
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/arch/m68k/sun3')
-rw-r--r--kernel/arch/m68k/sun3/config.c4
-rw-r--r--kernel/arch/m68k/sun3/idprom.c5
2 files changed, 3 insertions, 6 deletions
diff --git a/kernel/arch/m68k/sun3/config.c b/kernel/arch/m68k/sun3/config.c
index a8b942bf7..2a5f43a68 100644
--- a/kernel/arch/m68k/sun3/config.c
+++ b/kernel/arch/m68k/sun3/config.c
@@ -118,13 +118,13 @@ static void __init sun3_bootmem_alloc(unsigned long memory_start,
memory_end = memory_end & PAGE_MASK;
start_page = __pa(memory_start) >> PAGE_SHIFT;
- num_pages = __pa(memory_end) >> PAGE_SHIFT;
+ max_pfn = num_pages = __pa(memory_end) >> PAGE_SHIFT;
high_memory = (void *)memory_end;
availmem = memory_start;
m68k_setup_node(0);
- availmem += init_bootmem_node(NODE_DATA(0), start_page, 0, num_pages);
+ availmem += init_bootmem(start_page, num_pages);
availmem = (availmem + (PAGE_SIZE-1)) & PAGE_MASK;
free_bootmem(__pa(availmem), memory_end - (availmem));
diff --git a/kernel/arch/m68k/sun3/idprom.c b/kernel/arch/m68k/sun3/idprom.c
index c86ac37d1..cfe9aa422 100644
--- a/kernel/arch/m68k/sun3/idprom.c
+++ b/kernel/arch/m68k/sun3/idprom.c
@@ -125,8 +125,5 @@ void __init idprom_init(void)
display_system_type(idprom->id_machtype);
- printk("Ethernet address: %x:%x:%x:%x:%x:%x\n",
- idprom->id_ethaddr[0], idprom->id_ethaddr[1],
- idprom->id_ethaddr[2], idprom->id_ethaddr[3],
- idprom->id_ethaddr[4], idprom->id_ethaddr[5]);
+ printk("Ethernet address: %pM\n", idprom->id_ethaddr);
}