leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM guys broke ia64 build ... but gave me fixes, so it's all good now

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWlqGdAAoJEKurIx+X31iBp50P/izqc4AOE3v12xC+Hn0zsClU
 3rhBHN4U2G/EzV6rtExhVRHggWRt5A3lcWrRwwbs83cqdtrKMNNyyzWzLzC8qUWC
 GQetV15ihUoHkSn5IsbJwAR99RosOvAcjpbN8c/4SwNO4JR6Ydgi63id/l1pz4wE
 NyMlLbfzkAFn+2VPpPrylA1F4mXFDv6b09RjGynwqnDAah/vP4RQur6FPbRw4zu8
 FPCQ1mLiRB4qPgS9oAGn9Tu1iBSjsV6H32/h0/A3mG8kDS9Pp5njlWLs3reXeQ3f
 5UwdlcuA6ekxxV74gzXyhpvaqbiJw0rgaObGGtX44q0C3H1/QFYMa6MHWxN783pv
 1sarVVw74eQcWDnw5Rii4za/ZNsRFUUN9e4MyEw3Joadnb5OnBAI0dqu2IwEgSqc
 vDnka4rSFNASz2vRgGLLqWi6FDs3nAUZxzGjBe/ZgUH6kGHUzalcBTQF+6UOVDeo
 Zio+mbeD1komGs3R4h3t1pdlrAQ1d4hYut0XrKjhgjyfB4BKBH9SVmKmam5RX8G6
 wKLyEmMEMDp0BU8e4yhnvceDF4qIkerSlKTFkPOlW8bw/gSG5W8EMRp34WORZR/V
 UpjNG5+JQSHEDO9JXn+pl5wK/RzPMP4o4ZdtBhZtE98210R24n1PBOr6KlzPCbpk
 quR3r1lu8otjk29dFwgJ
 =+rdc
 -----END PGP SIGNATURE-----

Merge tag 'please-pull-fixefi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull ia64 build fixes from Tony Luck:
 "The ARM guys broke the ia64 build ...  but gave me fixes, so it's all
  good now"

* tag 'please-pull-fixefi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  efi: include asm/early_ioremap.h not asm/efi.h to get early_memremap
  ia64: split off early_ioremap() declarations into asm/early_ioremap.h
This commit is contained in:
Linus Torvalds 2016-01-13 12:49:04 -08:00
commit 928b3f12e5
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/ia64/include/asm/early_ioremap.h Normal file
View File

@ -0,0 +1,10 @@
#ifndef _ASM_IA64_EARLY_IOREMAP_H
#define _ASM_IA64_EARLY_IOREMAP_H
extern void __iomem * early_ioremap (unsigned long phys_addr, unsigned long size);
#define early_memremap(phys_addr, size) early_ioremap(phys_addr, size)
extern void early_iounmap (volatile void __iomem *addr, unsigned long size);
#define early_memunmap(addr, size) early_iounmap(addr, size)
#endif

5
arch/ia64/include/asm/io.h
View File

@ -20,6 +20,7 @@
*/
#include <asm/unaligned.h>
#include <asm/early_ioremap.h>
/* We don't use IO slowdowns on the ia64, but.. */
#define __SLOW_DOWN_IO do { } while (0)
@ -427,10 +428,6 @@ __writeq (unsigned long val, volatile void __iomem *addr)
extern void __iomem * ioremap(unsigned long offset, unsigned long size);
extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);
extern void iounmap (volatile void __iomem *addr);
extern void __iomem * early_ioremap (unsigned long phys_addr, unsigned long size);
#define early_memremap(phys_addr, size) early_ioremap(phys_addr, size)
extern void early_iounmap (volatile void __iomem *addr, unsigned long size);
#define early_memunmap(addr, size) early_iounmap(addr, size)
static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned long size)
{
return ioremap(phys_addr, size);

2
drivers/firmware/efi/efi.c
View File

@ -25,7 +25,7 @@
#include <linux/io.h>
#include <linux/platform_device.h>
#include <asm/efi.h>
#include <asm/early_ioremap.h>
struct efi __read_mostly efi = {
.mps = EFI_INVALID_TABLE_ADDR,