tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix CONFIG_BUILD_ELF64 kernels with symbols in CKSEG0.
[MIPS] IP32: Fix initialization of UART base addresses.

Linus Torvalds cdfef17d e4a7b1d1

+3 -3
unified split
+2 -2
arch/mips/sgi-ip32/ip32-platform.c
··· 41 41 42 42 static int __init uart8250_init(void) 43 43 { 44 - uart8250_data[0].iobase = (unsigned long) &mace->isa.serial1; 45 - uart8250_data[1].iobase = (unsigned long) &mace->isa.serial1; 44 + uart8250_data[0].membase = (void __iomem *) &mace->isa.serial1; 45 + uart8250_data[1].membase = (void __iomem *) &mace->isa.serial1; 46 46 47 47 return platform_device_register(&uart8250_device); 48 48 }
+1 -1
include/asm-mips/page.h
··· 142 142 /* 143 143 * __pa()/__va() should be used only during mem init. 144 144 */ 145 - #if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64) 145 + #ifdef CONFIG_64BIT 146 146 #define __pa(x) \ 147 147 ({ \ 148 148 unsigned long __x = (unsigned long)(x); \