Skip to content

Commit 1178619

Browse files
committed
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
2 parents c657011 + ef17f51 commit 1178619

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

drivers/hwspinlock/Kconfig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ menuconfig HWSPINLOCK
99
config HWSPINLOCK_OMAP
1010
tristate "OMAP Hardware Spinlock device"
1111
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
1313
help
1414
Say y here to support the OMAP Hardware Spinlock device (firstly
1515
introduced in OMAP4).
@@ -19,7 +19,7 @@ config HWSPINLOCK_OMAP
1919
config HWSPINLOCK_QCOM
2020
tristate "Qualcomm Hardware Spinlock device"
2121
depends on HWSPINLOCK
22-
depends on ARCH_QCOM
22+
depends on ARCH_QCOM || COMPILE_TEST
2323
select MFD_SYSCON
2424
help
2525
Say y here to support the Qualcomm Hardware Mutex functionality, which
@@ -31,7 +31,7 @@ config HWSPINLOCK_QCOM
3131
config HWSPINLOCK_SIRF
3232
tristate "SIRF Hardware Spinlock device"
3333
depends on HWSPINLOCK
34-
depends on ARCH_SIRF
34+
depends on ARCH_SIRF || COMPILE_TEST
3535
help
3636
Say y here to support the SIRF Hardware Spinlock device, which
3737
provides a synchronisation mechanism for the various processors
@@ -42,7 +42,7 @@ config HWSPINLOCK_SIRF
4242

4343
config HWSPINLOCK_SPRD
4444
tristate "SPRD Hardware Spinlock device"
45-
depends on ARCH_SPRD
45+
depends on ARCH_SPRD || COMPILE_TEST
4646
depends on HWSPINLOCK
4747
help
4848
Say y here to support the SPRD Hardware Spinlock device.
@@ -51,7 +51,7 @@ config HWSPINLOCK_SPRD
5151

5252
config HWSPINLOCK_STM32
5353
tristate "STM32 Hardware Spinlock device"
54-
depends on MACH_STM32MP157
54+
depends on MACH_STM32MP157 || COMPILE_TEST
5555
depends on HWSPINLOCK
5656
help
5757
Say y here to support the STM32 Hardware Spinlock device.
@@ -61,7 +61,7 @@ config HWSPINLOCK_STM32
6161
config HSEM_U8500
6262
tristate "STE Hardware Semaphore functionality"
6363
depends on HWSPINLOCK
64-
depends on ARCH_U8500
64+
depends on ARCH_U8500 || COMPILE_TEST
6565
help
6666
Say y here to support the STE Hardware Semaphore functionality, which
6767
provides a synchronisation mechanism for the various processor on the

drivers/hwspinlock/hwspinlock_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct hwspinlock_device {
5656
const struct hwspinlock_ops *ops;
5757
int base_id;
5858
int num_locks;
59-
struct hwspinlock lock[0];
59+
struct hwspinlock lock[];
6060
};
6161

6262
static inline int hwlock_to_id(struct hwspinlock *hwlock)

0 commit comments

Comments
 (0)