diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 0cce54182cc578119084c96f1dab8c9158bfc96c..ac4a6219e8d3ed04f18128e3a356739d24482ad6 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 185e552f1461057b697a0de07539628cacc13dd0..d08c8b062880c3c9311ae99b27cf6858652da61a 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 51fe21f5d0783745b70e38c6be86c0d30bdcba64..111d0743eefabe55ed026f2e2422ddf10c8d014a 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 ace5c5bf18361f52ca438f5a2b8da073abd05403..abf899c09289389868adb435d9554f5f0fe295d5 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 201caf226b47b4b841ea4267ac0d6fd430475de6..2b2f82335891c2ce36a0fa5058db73f1896c1c7e 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 8e6d83f79e72bcd6a64dc4956f4f882b7352bd7a..0a6d0ba85e470dde59d9f7d29e66dacaff9d71b2 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 a80669209155383343ba8adbb90b3e8427e2afdb..0f6e164eee3a487a767579b9abaf2098abe2b884 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -154,7 +154,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 9a9c7a6fe925915f561dd48c454e1e02d5ee7a51..6e88b027d6b68720b933d06bf7cd2471b1c4d5bf 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 a970f146e70898e8e5c1252e9121a7f5708ae91e..f7eaab0de8632755a10a1ee5898b2d989cfa5574 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 DCACHE_WORD_ACCESS diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index b9ad83a0ee5dbf1604acc3c4edc90698e7eea1a6..c212a7490d445de6284b2342698b4fd91e30168c 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 d674fd81b171cebf3e90b1e9f4e1a61330c0fe17..7fc1349f5a7ef3f0de8eee799397f784abeb5647 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 12d302d70128f8a9ee2909d12b4d666c77b74c42..7642c39959d66d57a5b89046983a73fb6e11a079 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 61affa300d25de814ac564a590dcd24fe45b251c..6cc8cb19d902a3fa63b0984867239baf21c80d38 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 c8cf45362bd6f223dc15be63438b1ce71dcbefa3..e5ee28390108e106feba1a84027eccc5cd62059e 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 @@ -281,9 +281,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 34df5ccd24b2c3860edb87eaa8704ceafa71ad2c..d87bc3df6f8ca3aedba6bd087e505e6d5f092bdb 100644 --- a/scripts/sortextable.c +++ b/scripts/sorttable.c @@ -1,5 +1,5 @@ /* - * 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 fa37d2b3226ff7678e1831a0e170f9e3fe77f8bb..9eeea1198c08599bbf1994cfd4642a4f2ba50582 100644 --- a/scripts/sortextable.h +++ b/scripts/sorttable.h @@ -1,5 +1,5 @@ /* - * sortextable.h + * sorttable.h * * Copyright 2011 - 2012 Cavium, Inc. * @@ -33,7 +33,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