|
@@ -1199,7 +1199,7 @@ static void __init prom_initialize_tce_table(void)
|
|
if ((type[0] == 0) || (strstr(type, RELOC("pci")) == NULL))
|
|
if ((type[0] == 0) || (strstr(type, RELOC("pci")) == NULL))
|
|
continue;
|
|
continue;
|
|
|
|
|
|
- /* Keep the old logic in tack to avoid regression. */
|
|
|
|
|
|
+ /* Keep the old logic intact to avoid regression. */
|
|
if (compatible[0] != 0) {
|
|
if (compatible[0] != 0) {
|
|
if ((strstr(compatible, RELOC("python")) == NULL) &&
|
|
if ((strstr(compatible, RELOC("python")) == NULL) &&
|
|
(strstr(compatible, RELOC("Speedwagon")) == NULL) &&
|
|
(strstr(compatible, RELOC("Speedwagon")) == NULL) &&
|
|
@@ -2231,7 +2231,7 @@ static void __init fixup_device_tree(void)
|
|
|
|
|
|
static void __init prom_find_boot_cpu(void)
|
|
static void __init prom_find_boot_cpu(void)
|
|
{
|
|
{
|
|
- struct prom_t *_prom = &RELOC(prom);
|
|
|
|
|
|
+ struct prom_t *_prom = &RELOC(prom);
|
|
u32 getprop_rval;
|
|
u32 getprop_rval;
|
|
ihandle prom_cpu;
|
|
ihandle prom_cpu;
|
|
phandle cpu_pkg;
|
|
phandle cpu_pkg;
|
|
@@ -2251,7 +2251,7 @@ static void __init prom_find_boot_cpu(void)
|
|
static void __init prom_check_initrd(unsigned long r3, unsigned long r4)
|
|
static void __init prom_check_initrd(unsigned long r3, unsigned long r4)
|
|
{
|
|
{
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
|
- struct prom_t *_prom = &RELOC(prom);
|
|
|
|
|
|
+ struct prom_t *_prom = &RELOC(prom);
|
|
|
|
|
|
if (r3 && r4 && r4 != 0xdeadbeef) {
|
|
if (r3 && r4 && r4 != 0xdeadbeef) {
|
|
unsigned long val;
|
|
unsigned long val;
|
|
@@ -2284,7 +2284,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
|
|
unsigned long pp,
|
|
unsigned long pp,
|
|
unsigned long r6, unsigned long r7)
|
|
unsigned long r6, unsigned long r7)
|
|
{
|
|
{
|
|
- struct prom_t *_prom;
|
|
|
|
|
|
+ struct prom_t *_prom;
|
|
unsigned long hdr;
|
|
unsigned long hdr;
|
|
unsigned long offset = reloc_offset();
|
|
unsigned long offset = reloc_offset();
|
|
|
|
|
|
@@ -2343,8 +2343,8 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
|
|
/*
|
|
/*
|
|
* Copy the CPU hold code
|
|
* Copy the CPU hold code
|
|
*/
|
|
*/
|
|
- if (RELOC(of_platform) != PLATFORM_POWERMAC)
|
|
|
|
- copy_and_flush(0, KERNELBASE + offset, 0x100, 0);
|
|
|
|
|
|
+ if (RELOC(of_platform) != PLATFORM_POWERMAC)
|
|
|
|
+ copy_and_flush(0, KERNELBASE + offset, 0x100, 0);
|
|
|
|
|
|
/*
|
|
/*
|
|
* Do early parsing of command line
|
|
* Do early parsing of command line
|