Merge branch 'x86/mm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into aarch64/for-next/core

Browse source

Pull in core ioremap changes from -tip, since we depend on these for
re-enabling huge I/O mappings on arm64.

Signed-off-by: Will Deacon <will.deacon@arm.com>

...

This commit is contained in:

Will Deacon 2018-07-06 13:15:06 +01:00

parent 693350a799 5e0fb5df2e

commit f355152041

4 changed files with 61 additions and 16 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

arch/arm64/mm/mmu.c

View file

61

arch/x86/mm/pgtable.c

View file

8

include/asm-generic/pgtable.h

View file

4

lib/ioremap.c

View file