diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-21 08:21:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-21 08:21:23 -0700 |
| commit | fb8b1b93eed0f5ddb2f9903c2de2d9de8b372e8f (patch) | |
| tree | 38052390d261c3cd5bd894c95509d125cf7cf433 /tools/include/linux/mm.h | |
| parent | 2af5acbaa74c91266457fa1494685729d6f9e540 (diff) | |
| parent | 55122e0130e51eb71f5ec62d10525db0468f28e8 (diff) | |
| download | linux-fb8b1b93eed0f5ddb2f9903c2de2d9de8b372e8f.tar.gz linux-fb8b1b93eed0f5ddb2f9903c2de2d9de8b372e8f.tar.bz2 linux-fb8b1b93eed0f5ddb2f9903c2de2d9de8b372e8f.zip | |
Merge tag 'fixes-2023-09-21' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
Pull memblock test fixes from Mike Rapoport:
"Fix several compilation errors and warnings in memblock tests"
* tag 'fixes-2023-09-21' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
memblock tests: fix warning ‘struct seq_file’ declared inside parameter list
memblock tests: fix warning: "__ALIGN_KERNEL" redefined
memblock tests: Fix compilation errors.
Diffstat (limited to 'tools/include/linux/mm.h')
| -rw-r--r-- | tools/include/linux/mm.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/include/linux/mm.h b/tools/include/linux/mm.h index a03d9bba5151..f3c82ab5b14c 100644 --- a/tools/include/linux/mm.h +++ b/tools/include/linux/mm.h @@ -11,8 +11,6 @@ #define PHYS_ADDR_MAX (~(phys_addr_t)0) -#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) -#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) #define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) #define ALIGN_DOWN(x, a) __ALIGN_KERNEL((x) - ((a) - 1), (a)) @@ -29,7 +27,7 @@ static inline void *phys_to_virt(unsigned long address) return __va(address); } -void reserve_bootmem_region(phys_addr_t start, phys_addr_t end); +void reserve_bootmem_region(phys_addr_t start, phys_addr_t end, int nid); static inline void totalram_pages_inc(void) { |