Commit 051ea726 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7cdabafc ed471e19

tools/testing/memblock/internal.h

+6 −0
Original line number Diff line number Diff line
@@ -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

tools/testing/memblock/linux/mutex.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/* 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