tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 11786191 c6570114

+7 -7
+6 -6
drivers/hwspinlock/Kconfig
··· 9 9 config HWSPINLOCK_OMAP 10 10 tristate "OMAP Hardware Spinlock device" 11 11 depends on HWSPINLOCK 12 - depends on ARCH_OMAP4 || SOC_OMAP5 || SOC_DRA7XX || SOC_AM33XX || SOC_AM43XX || ARCH_K3 12 + depends on ARCH_OMAP4 || SOC_OMAP5 || SOC_DRA7XX || SOC_AM33XX || SOC_AM43XX || ARCH_K3 || COMPILE_TEST 13 13 help 14 14 Say y here to support the OMAP Hardware Spinlock device (firstly 15 15 introduced in OMAP4). ··· 19 19 config HWSPINLOCK_QCOM 20 20 tristate "Qualcomm Hardware Spinlock device" 21 21 depends on HWSPINLOCK 22 - depends on ARCH_QCOM 22 + depends on ARCH_QCOM || COMPILE_TEST 23 23 select MFD_SYSCON 24 24 help 25 25 Say y here to support the Qualcomm Hardware Mutex functionality, which ··· 31 31 config HWSPINLOCK_SIRF 32 32 tristate "SIRF Hardware Spinlock device" 33 33 depends on HWSPINLOCK 34 - depends on ARCH_SIRF 34 + depends on ARCH_SIRF || COMPILE_TEST 35 35 help 36 36 Say y here to support the SIRF Hardware Spinlock device, which 37 37 provides a synchronisation mechanism for the various processors ··· 42 42 43 43 config HWSPINLOCK_SPRD 44 44 tristate "SPRD Hardware Spinlock device" 45 - depends on ARCH_SPRD 45 + depends on ARCH_SPRD || COMPILE_TEST 46 46 depends on HWSPINLOCK 47 47 help 48 48 Say y here to support the SPRD Hardware Spinlock device. ··· 51 51 52 52 config HWSPINLOCK_STM32 53 53 tristate "STM32 Hardware Spinlock device" 54 - depends on MACH_STM32MP157 54 + depends on MACH_STM32MP157 || COMPILE_TEST 55 55 depends on HWSPINLOCK 56 56 help 57 57 Say y here to support the STM32 Hardware Spinlock device. ··· 61 61 config HSEM_U8500 62 62 tristate "STE Hardware Semaphore functionality" 63 63 depends on HWSPINLOCK 64 - depends on ARCH_U8500 64 + depends on ARCH_U8500 || COMPILE_TEST 65 65 help 66 66 Say y here to support the STE Hardware Semaphore functionality, which 67 67 provides a synchronisation mechanism for the various processor on the
+1 -1
drivers/hwspinlock/hwspinlock_internal.h
··· 56 56 const struct hwspinlock_ops *ops; 57 57 int base_id; 58 58 int num_locks; 59 - struct hwspinlock lock[0]; 59 + struct hwspinlock lock[]; 60 60 }; 61 61 62 62 static inline int hwlock_to_id(struct hwspinlock *hwlock)