Commit 02f9a04d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'memblock-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock 

Pull memblock updates from Mike Rapoport:
 "Test suite and a small cleanup:

   - A small cleanup of unused variable in __next_mem_pfn_range_in_zone

   - Initial test suite to simulate memblock behaviour in userspace"

* tag 'memblock-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock: (27 commits)
  memblock tests: Add TODO and README files
  memblock tests: Add memblock_alloc_try_nid tests for bottom up
  memblock tests: Add memblock_alloc_try_nid tests for top down
  memblock tests: Add memblock_alloc_from tests for bottom up
  memblock tests: Add memblock_alloc_from tests for top down
  memblock tests: Add memblock_alloc tests for bottom up
  memblock tests: Add memblock_alloc tests for top down
  memblock tests: Add simulation of physical memory
  memblock tests: Split up reset_memblock function
  memblock tests: Fix testing with 32-bit physical addresses
  memblock: __next_mem_pfn_range_in_zone: remove unneeded local variable nid
  memblock tests: Add memblock_free tests
  memblock tests: Add memblock_add_node test
  memblock tests: Add memblock_remove tests
  memblock tests: Add memblock_reserve tests
  memblock tests: Add memblock_add tests
  memblock tests: Add memblock reset function
  memblock tests: Add skeleton of the memblock simulator
  tools/include: Add debugfs.h stub
  tools/include: Add pfn.h stub
  ...
parents 88b3be5c 58ffc348

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -12550,6 +12550,7 @@ S: Maintained 
F:	Documentation/core-api/boot-time-mm.rst

F:	include/linux/memblock.h

F:	mm/memblock.c

F:	tools/testing/memblock/









MEMORY CONTROLLER DRIVERS









M:	Krzysztof Kozlowski <krzk@kernel.org>
































mm/memblock.c



+2
−3






























Original line number
Diff line number
Diff line







@@ -1284,11 +1284,10 @@ __next_mem_pfn_range_in_zone(u64 *idx, struct zone *zone,







{









	int zone_nid = zone_to_nid(zone);









	phys_addr_t spa, epa;









	int nid;



















	__next_mem_range(idx, zone_nid, MEMBLOCK_NONE,









			 &memblock.memory, &memblock.reserved,









			 &spa, &epa, &nid);









			 &spa, &epa, NULL);



















	while (*idx != U64_MAX) {









		unsigned long epfn = PFN_DOWN(epa);








@@ -1315,7 +1314,7 @@ __next_mem_pfn_range_in_zone(u64 *idx, struct zone *zone,

















		__next_mem_range(idx, zone_nid, MEMBLOCK_NONE,









				 &memblock.memory, &memblock.reserved,









				 &spa, &epa, &nid);









				 &spa, &epa, NULL);









	}



















	/* signal end of iteration */
































tools/include/linux/atomic.h



+2
−0






























Original line number
Diff line number
Diff line







@@ -4,6 +4,8 @@

















#include <asm/atomic.h>



















void atomic_long_set(atomic_long_t *v, long i);



















/* atomic_cmpxchg_relaxed */









#ifndef atomic_cmpxchg_relaxed









#define  atomic_cmpxchg_relaxed		atomic_cmpxchg
































tools/include/linux/cache.h
0 → 100644



+10
−0






























Original line number
Diff line number
Diff line









/* SPDX-License-Identifier: GPL-2.0 */









#ifndef _TOOLS_LINUX_CACHE_H









#define _TOOLS_LINUX_CACHE_H



















#define L1_CACHE_SHIFT		5









#define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)



















#define SMP_CACHE_BYTES L1_CACHE_BYTES



















#endif
























tools/include/linux/debugfs.h
0 → 100644



+5
−0






























Original line number
Diff line number
Diff line









/* SPDX-License-Identifier: GPL-2.0 */









#ifndef _TOOLS_DEBUGFS_H









#define _TOOLS_DEBUGFS_H



















#endif