From: Cao jin Date: Thu, 11 Mar 2021 08:39:19 +0000 (+0800) Subject: x86/setup: Remove unused RESERVE_BRK_ARRAY() X-Git-Tag: v5.13-rc1~191^2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81519f778830d1ab02274eeaaeab6797fdc4ec52;p=thirdparty%2Flinux.git x86/setup: Remove unused RESERVE_BRK_ARRAY() Since a13f2ef168cb ("x86/xen: remove 32-bit Xen PV guest support"), RESERVE_BRK_ARRAY() has no user anymore so drop it. Update related comments too. Signed-off-by: Cao jin Signed-off-by: Borislav Petkov Link: https://lkml.kernel.org/r/20210311083919.27530-1-jojing64@gmail.com --- diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index 389d851a02c4f..a12458a7a8d4a 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -130,11 +130,6 @@ void *extend_brk(size_t size, size_t align); : : "i" (sz)); \ } -/* Helper for reserving space for arrays of things */ -#define RESERVE_BRK_ARRAY(type, name, entries) \ - type *name; \ - RESERVE_BRK(name, sizeof(type) * entries) - extern void probe_roms(void); #ifdef __i386__ diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d883176ef2ce0..cdf7bbdc07e2c 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -65,7 +65,7 @@ RESERVE_BRK(dmi_alloc, 65536); /* * Range of the BSS area. The size of the BSS area is determined - * at link time, with RESERVE_BRK*() facility reserving additional + * at link time, with RESERVE_BRK() facility reserving additional * chunks. */ unsigned long _brk_start = (unsigned long)__brk_base; @@ -1038,8 +1038,8 @@ void __init setup_arch(char **cmdline_p) /* * Need to conclude brk, before e820__memblock_setup() - * it could use memblock_find_in_range, could overlap with - * brk area. + * it could use memblock_find_in_range, could overlap with + * brk area. */ reserve_brk();