diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-09 19:48:30 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-09 19:48:30 +0300 |
commit | b8dcef877ab5f2637fccd3efb6fe169c8211961a (patch) | |
tree | ce4911c5bfca8a3189a5c2d64bf6f5dd551b1c03 /tools/testing/memblock/linux | |
parent | 15886321a426c7f4f1a0ff788f5b48e49230c0f3 (diff) | |
parent | 04d9490986d1e04a38db88276115e6b3c9ec3faa (diff) | |
download | linux-b8dcef877ab5f2637fccd3efb6fe169c8211961a.tar.xz |
Merge tag 'memblock-v5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
Pull memblock updates from Mike Rapoport:
- An optimization in memblock_add_range() to reduce array traversals
- Improvements to the memblock test suite
* tag 'memblock-v5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
memblock test: Modify the obsolete description in README
memblock tests: fix compilation errors
memblock tests: change build options to run-time options
memblock tests: remove completed TODO items
memblock tests: set memblock_debug to enable memblock_dbg() messages
memblock tests: add verbose output to memblock tests
memblock tests: Makefile: add arguments to control verbosity
memblock: avoid some repeat when add new range
Diffstat (limited to 'tools/testing/memblock/linux')
-rw-r--r-- | tools/testing/memblock/linux/memory_hotplug.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/testing/memblock/linux/memory_hotplug.h b/tools/testing/memblock/linux/memory_hotplug.h index 47988765a219..dabe2c556858 100644 --- a/tools/testing/memblock/linux/memory_hotplug.h +++ b/tools/testing/memblock/linux/memory_hotplug.h @@ -7,13 +7,11 @@ #include <linux/cache.h> #include <linux/types.h> +extern bool movable_node_enabled; + static inline bool movable_node_is_enabled(void) { -#ifdef MOVABLE_NODE - return true; -#else - return false; -#endif + return movable_node_enabled; } #endif |