leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qualcomm ARM Based Driver Updates for v4.21 Part 2 - Redo

Browse Source 
* Fix SCM compilation error
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJcE8+2AAoJEFKiBbHx2RXVWvYQAL31XfV+aoSM8QHmozvyBOOD
 VEi29a5V1Su1EpNlIBT91v29wDew/O0knWNbtQnMbFMnQFcplb6S2iW3W+/1OfdN
 qtfpQEbnZCUARMto0ICuDiw9ltk3Lcl7qDJaftgRCJwy/3VJ7Dk3udBWCRb6vGke
 zIDjBad1uZvjwJvP8vflfu6hMpZpnTLlci1MnXVWdZ2aiFRxsOYhYzbEh11+XPSF
 M+HrYdUJTpxsS7KpoAXTHvsYPiJekod57fwCo3T1wbZmPBJAwDuFSpdcBdW/+n8e
 Jx5Wc5VfJSMx3T0F/Uer/YRQB1RxtLE5KU04eui8CkMpzaJ7gyrXywamOcnK0yNE
 UPkyqV+YWbJHOX9/yn/t2y484vMfHgIYIWxuDOQRb39KLZ0kruddMIDsexVd+k3i
 wWCWRQnbxYwCcfh2dTjloJblyWfWMZDtEOrya9tj3BTCFfPRuc1SUPdPWt+oh+A3
 dbNqqOeB6m/hhJGwgHQxqN1rVwjVe+JUbdULZapqZ9esUAfck+h2RSUZItr2FPZl
 ZH5y8GCNNNhHM0rTqYS+FXpHHjS25E2OKhC5InuzB4mVok1lR2d+TH9Vc0cNxztx
 i511zw5LAELpiPV+mANwBFFgZGo6vn7+NLR3y7dFSuNPCL5JNt1RTLhKy7QEgRBn
 5yv1sf3Qo9pVTxwFcElK
 =CGYP
 -----END PGP SIGNATURE-----

Merge tag 'qcom-drivers-for-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers

Qualcomm ARM Based Driver Updates for v4.21 Part 2 - Redo

* Fix SCM compilation error

* tag 'qcom-drivers-for-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  firmware: qcom: scm: fix compilation error when disabled

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2018-12-20 16:11:02 +01:00
commit 3e730e8581
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/qcom_scm.h
View File

@ -67,6 +67,9 @@ extern int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare);
extern int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val);
extern int qcom_scm_io_writel(phys_addr_t addr, unsigned int val);
#else
#include <linux/errno.h>
static inline
int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus)
{