diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-11 12:04:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-11 12:04:15 -0700 |
| commit | 40e9963e622cf28ecef258e3dddb04457b65681c (patch) | |
| tree | f8df0dec584da3ea243bc3feef5a3e143dff08bd /arch/arm64/include/asm/tlb.h | |
| parent | 8eab6cd031c11071cf88138b2fed19beaa216435 (diff) | |
| parent | 0534af01cca338193abbfdb53650af91e65dbf10 (diff) | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pullx86 core platform updates from Peter Anvin:
"This is the x86/platform branch with the objectionable IOSF patches
removed.
What is left is proper memory handling for Intel GPUs, and a change to
the Calgary IOMMU code which will be required to make kexec work
sanely on those platforms after some upcoming kexec changes"
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, calgary: Use 8M TCE table size by default
x86/gpu: Print the Intel graphics stolen memory range
x86/gpu: Add Intel graphics stolen memory quirk for gen2 platforms
x86/gpu: Add vfunc for Intel graphics stolen memory base address
Diffstat (limited to 'arch/arm64/include/asm/tlb.h')
0 files changed, 0 insertions, 0 deletions