diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-02 15:45:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-02 15:45:45 -0700 |
| commit | 11786191e2d946410cf5fde482b10cdd5356e76c (patch) | |
| tree | 231cb6fd6a7c3cb656b83212347b68e3669cff35 | |
| parent | c6570114316fbbce4ac5f970578adaf3cbf07ec3 (diff) | |
| parent | ef17f5193edd42e8913c93d0b601c101c56a15bb (diff) | |
| download | unicode-11786191e2d946410cf5fde482b10cdd5356e76c.tar.gz | |
Merge tag 'hwlock-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc
Pull hwspinlock updates from Bjorn Andersson:
"This marks all hwspinlock driver COMPILE_TESTable and replaces the
zero-length array in hwspinlock_device with a flexible-array member"
* tag 'hwlock-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc:
hwspinlock: hwspinlock_internal.h: Replace zero-length array with flexible-array member
hwspinlock: Allow drivers to be built with COMPILE_TEST
| -rw-r--r-- | drivers/hwspinlock/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/hwspinlock/hwspinlock_internal.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/hwspinlock/Kconfig b/drivers/hwspinlock/Kconfig index 37740e992cfad4..826a1054100d0d 100644 --- a/drivers/hwspinlock/Kconfig +++ b/drivers/hwspinlock/Kconfig @@ -9,7 +9,7 @@ menuconfig HWSPINLOCK config HWSPINLOCK_OMAP tristate "OMAP Hardware Spinlock device" depends on HWSPINLOCK - depends on ARCH_OMAP4 || SOC_OMAP5 || SOC_DRA7XX || SOC_AM33XX || SOC_AM43XX || ARCH_K3 + depends on ARCH_OMAP4 || SOC_OMAP5 || SOC_DRA7XX || SOC_AM33XX || SOC_AM43XX || ARCH_K3 || COMPILE_TEST help Say y here to support the OMAP Hardware Spinlock device (firstly introduced in OMAP4). @@ -19,7 +19,7 @@ config HWSPINLOCK_OMAP config HWSPINLOCK_QCOM tristate "Qualcomm Hardware Spinlock device" depends on HWSPINLOCK - depends on ARCH_QCOM + depends on ARCH_QCOM || COMPILE_TEST select MFD_SYSCON help Say y here to support the Qualcomm Hardware Mutex functionality, which @@ -31,7 +31,7 @@ config HWSPINLOCK_QCOM config HWSPINLOCK_SIRF tristate "SIRF Hardware Spinlock device" depends on HWSPINLOCK - depends on ARCH_SIRF + depends on ARCH_SIRF || COMPILE_TEST help Say y here to support the SIRF Hardware Spinlock device, which provides a synchronisation mechanism for the various processors @@ -42,7 +42,7 @@ config HWSPINLOCK_SIRF config HWSPINLOCK_SPRD tristate "SPRD Hardware Spinlock device" - depends on ARCH_SPRD + depends on ARCH_SPRD || COMPILE_TEST depends on HWSPINLOCK help Say y here to support the SPRD Hardware Spinlock device. @@ -51,7 +51,7 @@ config HWSPINLOCK_SPRD config HWSPINLOCK_STM32 tristate "STM32 Hardware Spinlock device" - depends on MACH_STM32MP157 + depends on MACH_STM32MP157 || COMPILE_TEST depends on HWSPINLOCK help Say y here to support the STM32 Hardware Spinlock device. @@ -61,7 +61,7 @@ config HWSPINLOCK_STM32 config HSEM_U8500 tristate "STE Hardware Semaphore functionality" depends on HWSPINLOCK - depends on ARCH_U8500 + depends on ARCH_U8500 || COMPILE_TEST help Say y here to support the STE Hardware Semaphore functionality, which provides a synchronisation mechanism for the various processor on the diff --git a/drivers/hwspinlock/hwspinlock_internal.h b/drivers/hwspinlock/hwspinlock_internal.h index 9eb6bd020dc702..29892767bb7a0a 100644 --- a/drivers/hwspinlock/hwspinlock_internal.h +++ b/drivers/hwspinlock/hwspinlock_internal.h @@ -56,7 +56,7 @@ struct hwspinlock_device { const struct hwspinlock_ops *ops; int base_id; int num_locks; - struct hwspinlock lock[0]; + struct hwspinlock lock[]; }; static inline int hwlock_to_id(struct hwspinlock *hwlock) |