Commit cdfef17d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents e4a7b1d1 7d809ba3

arch/mips/sgi-ip32/ip32-platform.c

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ static struct platform_device uart8250_device = { 


static int __init uart8250_init(void)

{

	uart8250_data[0].iobase = (unsigned long) &mace->isa.serial1;

	uart8250_data[1].iobase = (unsigned long) &mace->isa.serial1;

	uart8250_data[0].membase = (void __iomem *) &mace->isa.serial1;

	uart8250_data[1].membase = (void __iomem *) &mace->isa.serial1;



	return platform_device_register(&uart8250_device);

}

include/asm-mips/page.h

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; 
/*

 * __pa()/__va() should be used only during mem init.

 */

#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)

#ifdef CONFIG_64BIT

#define __pa(x)								\

({									\

    unsigned long __x = (unsigned long)(x);				\