diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-26 04:02:24 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-26 04:02:24 +0300 |
commit | e1171aca7da6407c0e65ffb1f38509ee4486a3e7 (patch) | |
tree | fdcb399884487631d112719669662dbf0293c425 /ipc/shm.c | |
parent | c23a75759191e84f4ba15b85ea4f97bd544b5362 (diff) | |
parent | 6137e4166004e2ec383ac05d5ca15831f4668806 (diff) | |
download | linux-e1171aca7da6407c0e65ffb1f38509ee4486a3e7.tar.xz |
Merge tag 'xtensa-20180225' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa fixes from Max Filippov:
"Two fixes for reserved memory/DMA buffers allocation in high memory on
xtensa architecture
- fix memory accounting when reserved memory is in high memory region
- fix DMA allocation from high memory"
* tag 'xtensa-20180225' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: support DMA buffers in high memory
xtensa: fix high memory/reserved memory collision
Diffstat (limited to 'ipc/shm.c')
0 files changed, 0 insertions, 0 deletions