| setup.c (d8a382d2662822248a97ce9d670b90e68aefbd3a) | setup.c (95f72d1ed41a66f1c1c29c24d479de81a0bea36f) |
|---|---|
| 1/* 2 * Powermac setup and early boot code plus other random bits. 3 * 4 * PowerPC version 5 * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) 6 * 7 * Adapted for Power Macintosh by Paul Mackerras 8 * Copyright (C) 1996 Paul Mackerras (paulus@samba.org) --- 37 unchanged lines hidden (view full) --- 46#include <linux/pmu.h> 47#include <linux/irq.h> 48#include <linux/seq_file.h> 49#include <linux/root_dev.h> 50#include <linux/bitops.h> 51#include <linux/suspend.h> 52#include <linux/of_device.h> 53#include <linux/of_platform.h> | 1/* 2 * Powermac setup and early boot code plus other random bits. 3 * 4 * PowerPC version 5 * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) 6 * 7 * Adapted for Power Macintosh by Paul Mackerras 8 * Copyright (C) 1996 Paul Mackerras (paulus@samba.org) --- 37 unchanged lines hidden (view full) --- 46#include <linux/pmu.h> 47#include <linux/irq.h> 48#include <linux/seq_file.h> 49#include <linux/root_dev.h> 50#include <linux/bitops.h> 51#include <linux/suspend.h> 52#include <linux/of_device.h> 53#include <linux/of_platform.h> |
| 54#include <linux/lmb.h> | 54#include <linux/memblock.h> |
| 55 56#include <asm/reg.h> 57#include <asm/sections.h> 58#include <asm/prom.h> 59#include <asm/system.h> 60#include <asm/pgtable.h> 61#include <asm/io.h> 62#include <asm/pci-bridge.h> --- 551 unchanged lines hidden (view full) --- 614#endif /* CONFIG_PPC32 */ 615 616#ifdef CONFIG_PMAC_SMU 617 /* 618 * SMU based G5s need some memory below 2Gb, at least the current 619 * driver needs that. We have to allocate it now. We allocate 4k 620 * (1 small page) for now. 621 */ | 55 56#include <asm/reg.h> 57#include <asm/sections.h> 58#include <asm/prom.h> 59#include <asm/system.h> 60#include <asm/pgtable.h> 61#include <asm/io.h> 62#include <asm/pci-bridge.h> --- 551 unchanged lines hidden (view full) --- 614#endif /* CONFIG_PPC32 */ 615 616#ifdef CONFIG_PMAC_SMU 617 /* 618 * SMU based G5s need some memory below 2Gb, at least the current 619 * driver needs that. We have to allocate it now. We allocate 4k 620 * (1 small page) for now. 621 */ |
| 622 smu_cmdbuf_abs = lmb_alloc_base(4096, 4096, 0x80000000UL); | 622 smu_cmdbuf_abs = memblock_alloc_base(4096, 4096, 0x80000000UL); |
| 623#endif /* CONFIG_PMAC_SMU */ 624 625 return 1; 626} 627 628#ifdef CONFIG_PPC64 629/* Move that to pci.c */ 630static int pmac_pci_probe_mode(struct pci_bus *bus) --- 101 unchanged lines hidden --- | 623#endif /* CONFIG_PMAC_SMU */ 624 625 return 1; 626} 627 628#ifdef CONFIG_PPC64 629/* Move that to pci.c */ 630static int pmac_pci_probe_mode(struct pci_bus *bus) --- 101 unchanged lines hidden --- |