OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm64: Fix overlapping VA allocations
[android-x86/kernel.git]
/
arch
/
arm64
/
include
/
asm
/
io.h
diff --git
a/arch/arm64/include/asm/io.h
b/arch/arm64/include/asm/io.h
index
949c406
..
540f7c0
100644
(file)
--- a/
arch/arm64/include/asm/io.h
+++ b/
arch/arm64/include/asm/io.h
@@
-26,6
+26,7
@@
#include <asm/byteorder.h>
#include <asm/barrier.h>
#include <asm/byteorder.h>
#include <asm/barrier.h>
+#include <asm/memory.h>
#include <asm/pgtable.h>
#include <asm/early_ioremap.h>
#include <asm/alternative.h>
#include <asm/pgtable.h>
#include <asm/early_ioremap.h>
#include <asm/alternative.h>
@@
-145,8
+146,8
@@
static inline u64 __raw_readq(const volatile void __iomem *addr)
* I/O port access primitives.
*/
#define arch_has_dev_port() (1)
* I/O port access primitives.
*/
#define arch_has_dev_port() (1)
-#define IO_SPACE_LIMIT (
SZ_32M
- 1)
-#define PCI_IOBASE ((void __iomem *)
(MODULES_VADDR - SZ_32M)
)
+#define IO_SPACE_LIMIT (
PCI_IO_SIZE
- 1)
+#define PCI_IOBASE ((void __iomem *)
PCI_IO_START
)
/*
* String version of I/O memory access operations.
/*
* String version of I/O memory access operations.