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 8dcf0820111c2..4c4e85a87a384 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -15,7 +15,7 @@ config ARC select ARCH_HAS_SG_CHAIN select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC select ARCH_32BIT_OFF_T - 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 481af793473b7..b9455d212c028 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -26,7 +26,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 dec367ac6e2dd..02ea3bc5c1d34 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 6432b66209dea..8dc00891256d2 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -8,7 +8,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 60d5914c6e8d9..d2fefde97d086 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -14,7 +14,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 4e445d3f08741..8a5172768f415 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -19,7 +19,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 3365514becd8c..5329ef16decdc 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -155,7 +155,7 @@ config PPC select ARCH_WANT_IPC_PARSE_VERSION 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 dc7ecbee614fe..18fb5ece51de8 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 dc05faccc387a..1f135344cb83a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -84,7 +84,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 74145aa292b8a..94b862405ce94 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -11,7 +11,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 1386cf410c6af..7334599eef536 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 61affa300d25d..6cc8cb19d902a 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -15,13 +15,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 HOSTLDLIBS_sign-file = -lcrypto HOSTLDLIBS_extract-cert = -lcrypto 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