diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-25 17:02:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-25 17:02:24 -0800 |
| commit | e1171aca7da6407c0e65ffb1f38509ee4486a3e7 (patch) | |
| tree | fdcb399884487631d112719669662dbf0293c425 /net/unix/af_unix.c | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | xtensa: support DMA buffers in high memory (diff) | |
| download | wireguard-linux-e1171aca7da6407c0e65ffb1f38509ee4486a3e7.tar.xz wireguard-linux-e1171aca7da6407c0e65ffb1f38509ee4486a3e7.zip | |
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 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions