From: Shile Zhang shile.zhang@linux.alibaba.com
mainline inclusion from mainline-v5.6-rc1 commit 1091670637be8bd34a39dd1ddcc0a10a7c88d4e2 category: feature bugzilla: NA CVE: NA
-------------------------------------------------
Use a more generic name for additional table sorting usecases, such as the upcoming ORC table sorting feature. This tool is not tied to exception table sorting anymore.
No functional changes intended.
[ mingo: Rewrote the changelog. ]
Signed-off-by: Shile Zhang shile.zhang@linux.alibaba.com Acked-by: Peter Zijlstra (Intel) peterz@infradead.org Cc: Josh Poimboeuf jpoimboe@redhat.com Cc: Masahiro Yamada yamada.masahiro@socionext.com Cc: Michal Marek michal.lkml@markovi.net Cc: linux-kbuild@vger.kernel.org Link: https://lkml.kernel.org/r/20191204004633.88660-6-shile.zhang@linux.alibaba.c... Signed-off-by: Ingo Molnar mingo@kernel.org Conflicts: scripts/link-vmlinux.sh scripts/Makefile scripts/.gitignore arch/x86/Kconfig arch/microblaze/Kconfig arch/xtensa/Kconfig arch/parisc/Kconfig arch/powerpc/Kconfig arch/arc/Kconfig arch/mips/Kconfig arch/arm/Kconfig Signed-off-by: Yang Yingliang yangyingliang@huawei.com Reviewed-by: Jian Cheng cj.chengjian@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- arch/arc/Kconfig | 2 +- arch/arm/Kconfig | 2 +- arch/arm64/Kconfig | 2 +- arch/microblaze/Kconfig | 2 +- arch/mips/Kconfig | 2 +- arch/parisc/Kconfig | 2 +- arch/powerpc/Kconfig | 2 +- arch/s390/Kconfig | 2 +- arch/x86/Kconfig | 2 +- arch/xtensa/Kconfig | 2 +- init/Kconfig | 2 +- scripts/.gitignore | 2 +- scripts/Makefile | 4 ++-- scripts/link-vmlinux.sh | 10 +++++----- scripts/{sortextable.c => sorttable.c} | 10 +++++----- scripts/{sortextable.h => sorttable.h} | 4 ++-- 16 files changed, 26 insertions(+), 26 deletions(-) rename scripts/{sortextable.c => sorttable.c} (97%) rename scripts/{sortextable.h => sorttable.h} (99%)
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 0cce54182cc57..ac4a6219e8d3e 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -14,7 +14,7 @@ config ARC select ARCH_HAS_SYNC_DMA_FOR_DEVICE select ARCH_HAS_SG_CHAIN select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select COMMON_CLK select DMA_NONCOHERENT_OPS diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4bf1346a9f72d..fc5f9cc3207a1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -25,7 +25,7 @@ config ARM select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_CMPXCHG_LOCKREF select ARCH_WANT_IPC_PARSE_VERSION - select BUILDTIME_EXTABLE_SORT if MMU + select BUILDTIME_TABLE_SORT if MMU select CLONE_BACKWARDS select CPU_PM if (SUSPEND || CPU_IDLE) select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 9ce8615af5867..99905ee64625f 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -71,7 +71,7 @@ config ARM64 select ARM_GIC_V3 select ARM_GIC_V3_ITS if PCI select ARM_PSCI_FW - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select COMMON_CLK select CPU_PM if (SUSPEND || CPU_IDLE) diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 75ba19226ea3a..32be224ec2202 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -7,7 +7,7 @@ config MICROBLAZE select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_NO_COHERENT_DMA_MMAP if !MMU select ARCH_WANT_IPC_PARSE_VERSION - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select TIMER_OF select CLONE_BACKWARDS3 select COMMON_CLK diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index cc8c8d22afaf5..2dddc60dd9a64 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -13,7 +13,7 @@ config MIPS select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKS select ARCH_WANT_IPC_PARSE_VERSION - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select CPU_PM if CPU_IDLE select DMA_DIRECT_OPS diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 8e6d83f79e72b..0a6d0ba85e470 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -18,7 +18,7 @@ config PARISC select HAVE_MEMBLOCK select NO_BOOTMEM select BUG - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select HAVE_PERF_EVENTS select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_GZIP diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index faadce5106edc..c20c22bae8796 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -155,7 +155,7 @@ config PPC select ARCH_WANT_IRQS_OFF_ACTIVATE_MM select ARCH_WEAK_RELEASE_ACQUIRE select BINFMT_ELF - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN select DYNAMIC_FTRACE if FUNCTION_TRACER diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index fed155fd19a55..1c6c847b8f387 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -107,7 +107,7 @@ config S390 select ARCH_USE_CMPXCHG_LOCKREF select ARCH_WANTS_DYNAMIC_TASK_STRUCT select ARCH_WANT_IPC_PARSE_VERSION - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS2 select DYNAMIC_FTRACE if FUNCTION_TRACER select GENERIC_CLOCKEVENTS diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index dd4dfb80ac6ca..2b89cf510913a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -82,7 +82,7 @@ config X86 select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH select ARCH_WANTS_DYNAMIC_TASK_STRUCT select ARCH_WANTS_THP_SWAP if X86_64 - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLKEVT_I8253 select CLOCKSOURCE_VALIDATE_LAST_CYCLE select CLOCKSOURCE_WATCHDOG diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index b9ad83a0ee5db..c212a7490d445 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -10,7 +10,7 @@ config XTENSA select ARCH_NO_COHERENT_DMA_MMAP if !MMU select ARCH_WANT_FRAME_POINTERS select ARCH_WANT_IPC_PARSE_VERSION - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select COMMON_CLK select DMA_NONCOHERENT_OPS diff --git a/init/Kconfig b/init/Kconfig index 43791a6d40da5..b890162cde14f 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -33,7 +33,7 @@ config CONSTRUCTORS config IRQ_WORK bool
-config BUILDTIME_EXTABLE_SORT +config BUILDTIME_TABLE_SORT bool
config THREAD_INFO_IN_TASK diff --git a/scripts/.gitignore b/scripts/.gitignore index 12d302d70128f..7642c39959d66 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -9,7 +9,7 @@ unifdef ihex2fw recordmcount check-lc_ctype -sortextable +sorttable asn1_compiler extract-cert sign-file diff --git a/scripts/Makefile b/scripts/Makefile index 3ce4981bb2b66..19b752959678a 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -18,13 +18,13 @@ hostprogs-$(CONFIG_KALLSYMS) += kallsyms hostprogs-$(CONFIG_LOGO) += pnmtologo hostprogs-$(CONFIG_VT) += conmakehash hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount -hostprogs-$(CONFIG_BUILDTIME_EXTABLE_SORT) += sortextable +hostprogs-$(CONFIG_BUILDTIME_TABLE_SORT) += sorttable hostprogs-$(CONFIG_ASN1) += asn1_compiler hostprogs-$(CONFIG_MODULE_SIG) += sign-file hostprogs-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += extract-cert hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert
-HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include +HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include HOSTCFLAGS_sign-file.o = $(CRYPTO_CFLAGS) HOSTLDLIBS_sign-file = $(CRYPTO_LIBS) diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index c09e87e9c2b9f..2adbeca4136cd 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -149,9 +149,9 @@ mksysmap() ${CONFIG_SHELL} "${srctree}/scripts/mksysmap" ${1} ${2} }
-sortextable() +sorttable() { - ${objtree}/scripts/sortextable ${1} + ${objtree}/scripts/sorttable ${1} }
# Delete output files in case of error @@ -284,9 +284,9 @@ fi info LD vmlinux vmlinux_link "${kallsymso}" vmlinux
-if [ -n "${CONFIG_BUILDTIME_EXTABLE_SORT}" ]; then - info SORTEX vmlinux - sortextable vmlinux +if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then + info SORTTAB vmlinux + sorttable vmlinux fi
info SYSMAP System.map diff --git a/scripts/sortextable.c b/scripts/sorttable.c similarity index 97% rename from scripts/sortextable.c rename to scripts/sorttable.c index efa2839865cdb..ff98b7db20c67 100644 --- a/scripts/sortextable.c +++ b/scripts/sorttable.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * sortextable.c: Sort the kernel's exception table + * sorttable.c: Sort the kernel's table * * Copyright 2011 - 2012 Cavium, Inc. * @@ -182,9 +182,9 @@ static inline unsigned int get_secindex(unsigned int shndx, }
/* 32 bit and 64 bit are very similar */ -#include "sortextable.h" -#define SORTEXTABLE_64 -#include "sortextable.h" +#include "sorttable.h" +#define SORTTABLE_64 +#include "sorttable.h"
static int compare_relative_table(const void *a, const void *b) { @@ -351,7 +351,7 @@ int main(int argc, char *argv[]) void *addr = NULL;
if (argc < 2) { - fprintf(stderr, "usage: sortextable vmlinux...\n"); + fprintf(stderr, "usage: sorttable vmlinux...\n"); return 0; }
diff --git a/scripts/sortextable.h b/scripts/sorttable.h similarity index 99% rename from scripts/sortextable.h rename to scripts/sorttable.h index 6485513f7caeb..82589ff90e259 100644 --- a/scripts/sortextable.h +++ b/scripts/sorttable.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * sortextable.h + * sorttable.h * * Copyright 2011 - 2012 Cavium, Inc. * @@ -31,7 +31,7 @@ #undef _r #undef _w
-#ifdef SORTEXTABLE_64 +#ifdef SORTTABLE_64 # define extable_ent_size 16 # define compare_extable compare_extable_64 # define do_sort do_sort_64