]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'tee-drv-dynamic-shm+fixes-for-v4.16' of https://git.linaro.org/people...
authorOlof Johansson <olof@lixom.net>
Fri, 12 Jan 2018 02:05:06 +0000 (18:05 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 12 Jan 2018 02:05:06 +0000 (18:05 -0800)
commit36e99016aa245bc00d3e07bb2292aa3b1591017d
tree7bb4bb58ac4efa60c4263e72394557e39c74ec02
parent73e397f7859ae1cd4a1c38df36a1f208d4262d36
parentfb4352b26b0bb9e5c14c410354baca46ba953421
Merge tag 'tee-drv-dynamic-shm+fixes-for-v4.16' of https://git.linaro.org/people/jens.wiklander/linux-tee into next/drivers

This pull request updates the previous tee-drv-dynamic-shm-for-v4.16 pull
request with five new patches fixing review comments and errors.

Apart from three small fixes there's two larger patches that in the end
checks that memory to be registered really is normal cached memory.

* tag 'tee-drv-dynamic-shm+fixes-for-v4.16' of https://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: shm: Potential NULL dereference calling tee_shm_register()
  tee: shm: don't put_page on null shm->pages
  tee: shm: make function __tee_shm_alloc static
  tee: optee: check type of registered shared memory
  tee: add start argument to shm_register callback

Signed-off-by: Olof Johansson <olof@lixom.net>
drivers/tee/optee/call.c
drivers/tee/optee/optee_private.h
include/linux/tee_drv.h