Commit fb8b1b93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 2af5acba 55122e01

tools/include/linux/mm.h

+1 −3
Original line number Diff line number Diff line
@@ -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)

{

tools/include/linux/seq_file.h

+2 −0
Original line number Diff line number Diff line 
#ifndef _TOOLS_INCLUDE_LINUX_SEQ_FILE_H

#define _TOOLS_INCLUDE_LINUX_SEQ_FILE_H



struct seq_file;



#endif /* _TOOLS_INCLUDE_LINUX_SEQ_FILE_H */

tools/testing/memblock/internal.h

+4 −0
Original line number Diff line number Diff line
@@ -20,4 +20,8 @@ void memblock_free_pages(struct page *page, unsigned long pfn, 
{

}



static inline void accept_memory(phys_addr_t start, phys_addr_t end)

{

}



#endif

tools/testing/memblock/mmzone.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ struct pglist_data *next_online_pgdat(struct pglist_data *pgdat) 
	return NULL;

}



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)

{

}

tools/testing/memblock/tests/basic_api.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

#include "basic_api.h"

#include <string.h>

#include <linux/memblock.h>

#include "basic_api.h"



#define EXPECTED_MEMBLOCK_REGIONS			128

#define FUNC_ADD					"memblock_add"