diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-04-13 07:11:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-04-13 07:11:33 -0700 |
| commit | 051ea726ee4518ac5279eecaa40a4421f1ac69b6 (patch) | |
| tree | ca82bca3e3ff5e88536618ee127812b8d1b5c946 /tools/testing | |
| parent | 7cdabafc001202de9984f22c973305f424e0a8b7 (diff) | |
| parent | ed471e1984939a500eea179bc16e1c2aadf00db5 (diff) | |
Merge tag 'fixes-2025-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
Pull memblock fix from Mike Rapoport:
"Fix build of memblock test.
Add missing stubs for mutex and free_reserved_area() to memblock
tests"
* tag 'fixes-2025-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
memblock tests: Fix mutex related build error
Diffstat (limited to 'tools/testing')
| -rw-r--r-- | tools/testing/memblock/internal.h | 6 | ||||
| -rw-r--r-- | tools/testing/memblock/linux/mutex.h | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/tools/testing/memblock/internal.h b/tools/testing/memblock/internal.h index 1cf82acb2a3e..0ab4b53bb4f3 100644 --- a/tools/testing/memblock/internal.h +++ b/tools/testing/memblock/internal.h @@ -24,4 +24,10 @@ static inline void accept_memory(phys_addr_t start, unsigned long size) { } +static inline unsigned long free_reserved_area(void *start, void *end, + int poison, const char *s) +{ + return 0; +} + #endif diff --git a/tools/testing/memblock/linux/mutex.h b/tools/testing/memblock/linux/mutex.h new file mode 100644 index 000000000000..ae3f497165d6 --- /dev/null +++ b/tools/testing/memblock/linux/mutex.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _MUTEX_H +#define _MUTEX_H + +#define DEFINE_MUTEX(name) int name + +static inline void dummy_mutex_guard(int *name) +{ +} + +#define guard(mutex) \ + dummy_##mutex##_guard + +#endif /* _MUTEX_H */
\ No newline at end of file |