lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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.
This commit is contained in:
Linus Torvalds
2007-09-27 19:47:53 -07:00
parent e4a7b1d1d9 7d809ba3f9
commit cdfef17d93
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/mips/sgi-ip32/ip32-platform.c
View File

@@ -41,8 +41,8 @@ static struct platform_device uart8250_device = {
static int __init uart8250_init(void) static int __init uart8250_init(void)
{ {
uart8250_data[0].iobase = (unsigned long) &mace->isa.serial1; uart8250_data[0].membase = (void __iomem *) &mace->isa.serial1;
uart8250_data[1].iobase = (unsigned long) &mace->isa.serial1; uart8250_data[1].membase = (void __iomem *) &mace->isa.serial1;
return platform_device_register(&uart8250_device); return platform_device_register(&uart8250_device);
} }

2
include/asm-mips/page.h
View File

@@ -142,7 +142,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
/* /*
* __pa()/__va() should be used only during mem init. * __pa()/__va() should be used only during mem init.
*/ */
#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64) #ifdef CONFIG_64BIT
#define __pa(x) \ #define __pa(x) \
({ \ ({ \
unsigned long __x = (unsigned long)(x); \ unsigned long __x = (unsigned long)(x); \