tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'kbuild-v4.21-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull more Kbuild updates from Masahiro Yamada:

- improve boolinit.cocci and use_after_iter.cocci semantic patches

- fix alignment for kallsyms

- move 'asm goto' compiler test to Kconfig and clean up jump_label
CONFIG option

- generate asm-generic wrappers automatically if arch does not
implement mandatory UAPI headers

- remove redundant generic-y defines

- misc cleanups

* tag 'kbuild-v4.21-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kconfig: rename generated .*conf-cfg to *conf-cfg
kbuild: remove unnecessary stubs for archheader and archscripts
kbuild: use assignment instead of define ... endef for filechk_* rules
arch: remove redundant UAPI generic-y defines
kbuild: generate asm-generic wrappers if mandatory headers are missing
arch: remove stale comments "UAPI Header export list"
riscv: remove redundant kernel-space generic-y
kbuild: change filechk to surround the given command with { }
kbuild: remove redundant target cleaning on failure
kbuild: clean up rule_dtc_dt_yaml
kbuild: remove UIMAGE_IN and UIMAGE_OUT
jump_label: move 'asm goto' support test to Kconfig
kallsyms: lower alignment on ARM
scripts: coccinelle: boolinit: drop warnings on named constants
scripts: coccinelle: check for redeclaration
kconfig: remove unused "file" field of yylval union
nds32: remove redundant kernel-space generic-y
nios2: remove unneeded HAS_DMA define

Linus Torvalds 85e1ffbd ac5eed2b

+150 -694
+6 -3
Documentation/kbuild/makefiles.txt
··· 1296 1296 1297 1297 --- 7.4 mandatory-y 1298 1298 1299 - mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm 1300 - to define the minimum set of headers that must be exported in 1301 - include/asm. 1299 + mandatory-y is essentially used by include/(uapi/)asm-generic/Kbuild.asm 1300 + to define the minimum set of ASM headers that all architectures must have. 1301 + 1302 + This works like optional generic-y. If a mandatory header is missing 1303 + in arch/$(ARCH)/include/(uapi/)/asm, Kbuild will automatically generate 1304 + a wrapper of the asm-generic one. 1302 1305 1303 1306 The convention is to list one subdir per line and 1304 1307 preferably in alphabetic order.
+1 -3
Kbuild
··· 26 26 27 27 targets += $(timeconst-file) 28 28 29 - define filechk_gentimeconst 30 - (echo $(CONFIG_HZ) | bc -q $< ) 31 - endef 29 + filechk_gentimeconst = echo $(CONFIG_HZ) | bc -q $< 32 30 33 31 $(timeconst-file): kernel/time/timeconst.bc FORCE 34 32 $(call filechk,gentimeconst)
+5 -17
Makefile
··· 514 514 export RETPOLINE_CFLAGS 515 515 export RETPOLINE_VDSO_CFLAGS 516 516 517 - # check for 'asm goto' 518 - ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) 519 - CC_HAVE_ASM_GOTO := 1 520 - KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO 521 - KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO 522 - endif 523 - 524 517 # The expansion should be delayed until arch/$(SRCARCH)/Makefile is included. 525 518 # Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile. 526 519 # CC_VERSION_TEXT is referenced from Kconfig (so it needs export), ··· 1041 1048 $(vmlinux-dirs): prepare 1042 1049 $(Q)$(MAKE) $(build)=$@ need-builtin=1 1043 1050 1044 - define filechk_kernel.release 1051 + filechk_kernel.release = \ 1045 1052 echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" 1046 - endef 1047 1053 1048 1054 # Store (new) KERNELRELEASE string in include/config/kernel.release 1049 1055 include/config/kernel.release: $(srctree)/Makefile FORCE ··· 1126 1134 echo '"$(KERNELRELEASE)" exceeds $(uts_len) characters' >&2; \ 1127 1135 exit 1; \ 1128 1136 fi; \ 1129 - (echo \#define UTS_RELEASE \"$(KERNELRELEASE)\";) 1137 + echo \#define UTS_RELEASE \"$(KERNELRELEASE)\" 1130 1138 endef 1131 1139 1132 1140 define filechk_version.h 1133 - (echo \#define LINUX_VERSION_CODE $(shell \ 1141 + echo \#define LINUX_VERSION_CODE $(shell \ 1134 1142 expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \ 1135 - echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';) 1143 + echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))' 1136 1144 endef 1137 1145 1138 1146 $(version_h): FORCE ··· 1156 1164 # If we do an all arch process set dst to include/arch-$(SRCARCH) 1157 1165 hdr-dst = $(if $(KBUILD_HEADERS), dst=include/arch-$(SRCARCH), dst=include) 1158 1166 1159 - PHONY += archheaders 1160 - archheaders: 1161 - 1162 - PHONY += archscripts 1163 - archscripts: 1167 + PHONY += archheaders archscripts 1164 1168 1165 1169 PHONY += __headers 1166 1170 __headers: $(version_h) scripts_basic uapi-asm-generic archheaders archscripts
+1
arch/Kconfig
··· 71 71 config JUMP_LABEL 72 72 bool "Optimize very unlikely/likely branches" 73 73 depends on HAVE_ARCH_JUMP_LABEL 74 + depends on CC_HAS_ASM_GOTO 74 75 help 75 76 This option enables a transparent branch optimization that 76 77 makes certain almost-always-true or almost-always-false branch
-7
arch/alpha/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 3 generated-y += unistd_32.h 5 - generic-y += bpf_perf_event.h 6 - generic-y += ipcbuf.h 7 - generic-y += msgbuf.h 8 - generic-y += poll.h 9 - generic-y += sembuf.h 10 - generic-y += shmbuf.h
-25
arch/arc/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 - generic-y += auxvec.h 5 - generic-y += bitsperlong.h 6 - generic-y += bpf_perf_event.h 7 - generic-y += errno.h 8 - generic-y += fcntl.h 9 - generic-y += ioctl.h 10 - generic-y += ioctls.h 11 - generic-y += ipcbuf.h 12 3 generic-y += kvm_para.h 13 - generic-y += mman.h 14 - generic-y += msgbuf.h 15 - generic-y += param.h 16 - generic-y += poll.h 17 - generic-y += posix_types.h 18 - generic-y += resource.h 19 - generic-y += sembuf.h 20 - generic-y += shmbuf.h 21 - generic-y += siginfo.h 22 - generic-y += socket.h 23 - generic-y += sockios.h 24 - generic-y += stat.h 25 - generic-y += statfs.h 26 - generic-y += termbits.h 27 - generic-y += termios.h 28 - generic-y += types.h 29 4 generic-y += ucontext.h
+1 -1
arch/arm/boot/Makefile
··· 32 32 ifeq ($(CONFIG_XIP_KERNEL),y) 33 33 34 34 cmd_deflate_xip_data = $(CONFIG_SHELL) -c \ 35 - '$(srctree)/$(src)/deflate_xip_data.sh $< $@ || { rm -f $@; false; }' 35 + '$(srctree)/$(src)/deflate_xip_data.sh $< $@' 36 36 37 37 ifeq ($(CONFIG_XIP_DEFLATED_DATA),y) 38 38 quiet_cmd_mkxip = XIPZ $@
+1 -1
arch/arm/boot/compressed/Makefile
··· 170 170 bad_syms=$$($(CROSS_COMPILE)nm $@ | sed -n 's/^.\{8\} [bc] \(.*\)/\1/p') && \ 171 171 [ -z "$$bad_syms" ] || \ 172 172 ( echo "following symbols must have non local/private scope:" >&2; \ 173 - echo "$$bad_syms" >&2; rm -f $@; false ) 173 + echo "$$bad_syms" >&2; false ) 174 174 175 175 check_for_multiple_zreladdr = \ 176 176 if [ $(words $(ZRELADDR)) -gt 1 -a "$(CONFIG_AUTO_ZRELADDR)" = "" ]; then \
-18
arch/arm/include/uapi/asm/Kbuild
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - # UAPI Header export list 3 2 include include/uapi/asm-generic/Kbuild.asm 4 3 5 4 generated-y += unistd-common.h 6 5 generated-y += unistd-oabi.h 7 6 generated-y += unistd-eabi.h 8 - 9 - generic-y += bitsperlong.h 10 - generic-y += bpf_perf_event.h 11 - generic-y += errno.h 12 - generic-y += ioctl.h 13 - generic-y += ipcbuf.h 14 - generic-y += msgbuf.h 15 - generic-y += param.h 16 - generic-y += poll.h 17 - generic-y += resource.h 18 - generic-y += sembuf.h 19 - generic-y += shmbuf.h 20 - generic-y += siginfo.h 21 - generic-y += socket.h 22 - generic-y += sockios.h 23 - generic-y += termbits.h 24 - generic-y += termios.h
-4
arch/arm/kernel/jump_label.c
··· 4 4 #include <asm/patch.h> 5 5 #include <asm/insn.h> 6 6 7 - #ifdef HAVE_JUMP_LABEL 8 - 9 7 static void __arch_jump_label_transform(struct jump_entry *entry, 10 8 enum jump_label_type type, 11 9 bool is_static) ··· 33 35 { 34 36 __arch_jump_label_transform(entry, type, true); 35 37 } 36 - 37 - #endif
+1 -2
arch/arm/tools/Makefile
··· 35 35 36 36 quiet_cmd_gen_mach = GEN $@ 37 37 cmd_gen_mach = mkdir -p $(dir $@) && \ 38 - $(AWK) -f $(filter-out $(PHONY),$^) > $@ || \ 39 - { rm -f $@; /bin/false; } 38 + $(AWK) -f $(filter-out $(PHONY),$^) > $@ 40 39 41 40 $(kapi)/mach-types.h: $(src)/gen-mach-types $(src)/mach-types FORCE 42 41 $(call if_changed,gen_mach)
-18
arch/arm64/include/uapi/asm/Kbuild
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - # UAPI Header export list 3 2 include include/uapi/asm-generic/Kbuild.asm 4 3 5 - generic-y += errno.h 6 - generic-y += ioctl.h 7 - generic-y += ioctls.h 8 - generic-y += ipcbuf.h 9 4 generic-y += kvm_para.h 10 - generic-y += mman.h 11 - generic-y += msgbuf.h 12 - generic-y += poll.h 13 - generic-y += resource.h 14 - generic-y += sembuf.h 15 - generic-y += shmbuf.h 16 - generic-y += socket.h 17 - generic-y += sockios.h 18 - generic-y += swab.h 19 - generic-y += termbits.h 20 - generic-y += termios.h 21 - generic-y += types.h 22 - generic-y += siginfo.h
-4
arch/arm64/kernel/jump_label.c
··· 20 20 #include <linux/jump_label.h> 21 21 #include <asm/insn.h> 22 22 23 - #ifdef HAVE_JUMP_LABEL 24 - 25 23 void arch_jump_label_transform(struct jump_entry *entry, 26 24 enum jump_label_type type) 27 25 { ··· 47 49 * NOP needs to be replaced by a branch. 48 50 */ 49 51 } 50 - 51 - #endif /* HAVE_JUMP_LABEL */
-27
arch/c6x/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 - generic-y += auxvec.h 5 - generic-y += bitsperlong.h 6 - generic-y += bpf_perf_event.h 7 - generic-y += errno.h 8 - generic-y += fcntl.h 9 - generic-y += ioctl.h 10 - generic-y += ioctls.h 11 - generic-y += ipcbuf.h 12 3 generic-y += kvm_para.h 13 - generic-y += mman.h 14 - generic-y += msgbuf.h 15 - generic-y += param.h 16 - generic-y += poll.h 17 - generic-y += posix_types.h 18 - generic-y += resource.h 19 - generic-y += sembuf.h 20 - generic-y += shmbuf.h 21 - generic-y += shmparam.h 22 - generic-y += siginfo.h 23 - generic-y += signal.h 24 - generic-y += socket.h 25 - generic-y += sockios.h 26 - generic-y += stat.h 27 - generic-y += statfs.h 28 - generic-y += termbits.h 29 - generic-y += termios.h 30 - generic-y += types.h 31 4 generic-y += ucontext.h
-27
arch/csky/include/uapi/asm/Kbuild
··· 1 1 include include/uapi/asm-generic/Kbuild.asm 2 2 3 - generic-y += auxvec.h 4 - generic-y += param.h 5 - generic-y += bpf_perf_event.h 6 - generic-y += errno.h 7 - generic-y += fcntl.h 8 - generic-y += ioctl.h 9 - generic-y += ioctls.h 10 - generic-y += ipcbuf.h 11 - generic-y += shmbuf.h 12 - generic-y += bitsperlong.h 13 - generic-y += mman.h 14 - generic-y += msgbuf.h 15 - generic-y += poll.h 16 - generic-y += posix_types.h 17 - generic-y += resource.h 18 - generic-y += sembuf.h 19 - generic-y += siginfo.h 20 - generic-y += signal.h 21 - generic-y += socket.h 22 - generic-y += sockios.h 23 - generic-y += statfs.h 24 - generic-y += stat.h 25 - generic-y += setup.h 26 - generic-y += swab.h 27 - generic-y += termbits.h 28 - generic-y += termios.h 29 - generic-y += types.h 30 3 generic-y += ucontext.h
-27
arch/h8300/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 - generic-y += auxvec.h 5 - generic-y += bpf_perf_event.h 6 - generic-y += errno.h 7 - generic-y += fcntl.h 8 - generic-y += ioctl.h 9 - generic-y += ioctls.h 10 - generic-y += ipcbuf.h 11 3 generic-y += kvm_para.h 12 - generic-y += mman.h 13 - generic-y += msgbuf.h 14 - generic-y += param.h 15 - generic-y += poll.h 16 - generic-y += posix_types.h 17 - generic-y += resource.h 18 - generic-y += sembuf.h 19 - generic-y += setup.h 20 - generic-y += shmbuf.h 21 - generic-y += shmparam.h 22 - generic-y += siginfo.h 23 - generic-y += socket.h 24 - generic-y += sockios.h 25 - generic-y += stat.h 26 - generic-y += statfs.h 27 - generic-y += swab.h 28 - generic-y += termbits.h 29 - generic-y += termios.h 30 - generic-y += types.h 31 4 generic-y += ucontext.h
-24
arch/hexagon/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 - generic-y += auxvec.h 5 - generic-y += bpf_perf_event.h 6 - generic-y += errno.h 7 - generic-y += fcntl.h 8 - generic-y += ioctl.h 9 - generic-y += ioctls.h 10 - generic-y += ipcbuf.h 11 - generic-y += mman.h 12 - generic-y += msgbuf.h 13 - generic-y += poll.h 14 - generic-y += posix_types.h 15 - generic-y += resource.h 16 - generic-y += sembuf.h 17 - generic-y += shmbuf.h 18 - generic-y += shmparam.h 19 - generic-y += siginfo.h 20 - generic-y += socket.h 21 - generic-y += sockios.h 22 - generic-y += stat.h 23 - generic-y += statfs.h 24 - generic-y += termbits.h 25 - generic-y += termios.h 26 - generic-y += types.h 27 3 generic-y += ucontext.h
-7
arch/ia64/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 3 generated-y += unistd_64.h 5 - generic-y += bpf_perf_event.h 6 - generic-y += ipcbuf.h 7 4 generic-y += kvm_para.h 8 - generic-y += msgbuf.h 9 - generic-y += poll.h 10 - generic-y += sembuf.h 11 - generic-y += shmbuf.h
-20
arch/m68k/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 3 generated-y += unistd_32.h 5 - generic-y += auxvec.h 6 - generic-y += bitsperlong.h 7 - generic-y += bpf_perf_event.h 8 - generic-y += errno.h 9 - generic-y += ioctl.h 10 - generic-y += ipcbuf.h 11 4 generic-y += kvm_para.h 12 - generic-y += mman.h 13 - generic-y += msgbuf.h 14 - generic-y += resource.h 15 - generic-y += sembuf.h 16 - generic-y += shmbuf.h 17 - generic-y += shmparam.h 18 - generic-y += siginfo.h 19 - generic-y += socket.h 20 - generic-y += sockios.h 21 - generic-y += statfs.h 22 - generic-y += termbits.h 23 - generic-y += termios.h 24 - generic-y += types.h
-26
arch/microblaze/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 3 generated-y += unistd_32.h 5 - generic-y += bitsperlong.h 6 - generic-y += bpf_perf_event.h 7 - generic-y += errno.h 8 - generic-y += fcntl.h 9 - generic-y += ioctl.h 10 - generic-y += ioctls.h 11 - generic-y += ipcbuf.h 12 4 generic-y += kvm_para.h 13 - generic-y += mman.h 14 - generic-y += msgbuf.h 15 - generic-y += param.h 16 - generic-y += poll.h 17 - generic-y += resource.h 18 - generic-y += sembuf.h 19 - generic-y += shmbuf.h 20 - generic-y += shmparam.h 21 - generic-y += siginfo.h 22 - generic-y += signal.h 23 - generic-y += socket.h 24 - generic-y += sockios.h 25 - generic-y += stat.h 26 - generic-y += statfs.h 27 - generic-y += swab.h 28 - generic-y += termbits.h 29 - generic-y += termios.h 30 - generic-y += types.h 31 5 generic-y += ucontext.h
-3
arch/mips/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 3 generated-y += unistd_n32.h ··· 6 7 generated-y += unistd_nr_n32.h 7 8 generated-y += unistd_nr_n64.h 8 9 generated-y += unistd_nr_o32.h 9 - generic-y += bpf_perf_event.h 10 - generic-y += ipcbuf.h
-4
arch/mips/kernel/jump_label.c
··· 16 16 #include <asm/cacheflush.h> 17 17 #include <asm/inst.h> 18 18 19 - #ifdef HAVE_JUMP_LABEL 20 - 21 19 /* 22 20 * Define parameters for the standard MIPS and the microMIPS jump 23 21 * instruction encoding respectively: ··· 68 70 69 71 mutex_unlock(&text_mutex); 70 72 } 71 - 72 - #endif /* HAVE_JUMP_LABEL */
-10
arch/nds32/include/asm/Kbuild
··· 1 1 generic-y += asm-offsets.h 2 2 generic-y += atomic.h 3 3 generic-y += bitops.h 4 - generic-y += bitsperlong.h 5 - generic-y += bpf_perf_event.h 6 4 generic-y += bug.h 7 5 generic-y += bugs.h 8 6 generic-y += checksum.h ··· 14 16 generic-y += dma.h 15 17 generic-y += dma-mapping.h 16 18 generic-y += emergency-restart.h 17 - generic-y += errno.h 18 19 generic-y += exec.h 19 20 generic-y += export.h 20 21 generic-y += fb.h 21 - generic-y += fcntl.h 22 - generic-y += ftrace.h 23 22 generic-y += gpio.h 24 23 generic-y += hardirq.h 25 24 generic-y += hw_irq.h 26 - generic-y += ioctl.h 27 - generic-y += ioctls.h 28 25 generic-y += irq.h 29 26 generic-y += irq_regs.h 30 27 generic-y += irq_work.h ··· 31 38 generic-y += local.h 32 39 generic-y += local64.h 33 40 generic-y += mm-arch-hooks.h 34 - generic-y += mman.h 35 41 generic-y += parport.h 36 42 generic-y += pci.h 37 43 generic-y += percpu.h ··· 38 46 generic-y += sections.h 39 47 generic-y += segment.h 40 48 generic-y += serial.h 41 - generic-y += shmbuf.h 42 49 generic-y += sizes.h 43 - generic-y += stat.h 44 50 generic-y += switch_to.h 45 51 generic-y += timex.h 46 52 generic-y += topology.h
-26
arch/nds32/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 - generic-y += bpf_perf_event.h 5 - generic-y += errno.h 6 - generic-y += ioctl.h 7 - generic-y += ioctls.h 8 - generic-y += ipcbuf.h 9 - generic-y += shmbuf.h 10 - generic-y += bitsperlong.h 11 - generic-y += fcntl.h 12 - generic-y += stat.h 13 - generic-y += mman.h 14 - generic-y += msgbuf.h 15 - generic-y += poll.h 16 - generic-y += posix_types.h 17 - generic-y += resource.h 18 - generic-y += sembuf.h 19 - generic-y += setup.h 20 - generic-y += siginfo.h 21 - generic-y += signal.h 22 - generic-y += socket.h 23 - generic-y += sockios.h 24 - generic-y += swab.h 25 - generic-y += statfs.h 26 - generic-y += termbits.h 27 - generic-y += termios.h 28 - generic-y += types.h 29 3 generic-y += ucontext.h
-3
arch/nios2/Kconfig
··· 36 36 config NO_IOPORT_MAP 37 37 def_bool y 38 38 39 - config HAS_DMA 40 - def_bool y 41 - 42 39 config FPU 43 40 def_bool n 44 41
-26
arch/nios2/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 - generic-y += auxvec.h 5 - generic-y += bitsperlong.h 6 - generic-y += bpf_perf_event.h 7 - generic-y += errno.h 8 - generic-y += fcntl.h 9 - generic-y += ioctl.h 10 - generic-y += ioctls.h 11 - generic-y += ipcbuf.h 12 3 generic-y += kvm_para.h 13 - generic-y += mman.h 14 - generic-y += msgbuf.h 15 - generic-y += param.h 16 - generic-y += poll.h 17 - generic-y += posix_types.h 18 - generic-y += resource.h 19 - generic-y += sembuf.h 20 - generic-y += setup.h 21 - generic-y += shmbuf.h 22 - generic-y += siginfo.h 23 - generic-y += socket.h 24 - generic-y += sockios.h 25 - generic-y += stat.h 26 - generic-y += statfs.h 27 - generic-y += termbits.h 28 - generic-y += termios.h 29 - generic-y += types.h 30 4 generic-y += ucontext.h
-28
arch/openrisc/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 - generic-y += auxvec.h 5 - generic-y += bitsperlong.h 6 - generic-y += bpf_perf_event.h 7 - generic-y += errno.h 8 - generic-y += fcntl.h 9 - generic-y += ioctl.h 10 - generic-y += ioctls.h 11 - generic-y += ipcbuf.h 12 3 generic-y += kvm_para.h 13 - generic-y += mman.h 14 - generic-y += msgbuf.h 15 - generic-y += poll.h 16 - generic-y += posix_types.h 17 - generic-y += resource.h 18 - generic-y += sembuf.h 19 - generic-y += setup.h 20 - generic-y += shmbuf.h 21 - generic-y += shmparam.h 22 - generic-y += siginfo.h 23 - generic-y += signal.h 24 - generic-y += socket.h 25 - generic-y += sockios.h 26 - generic-y += stat.h 27 - generic-y += statfs.h 28 - generic-y += swab.h 29 - generic-y += termbits.h 30 - generic-y += termios.h 31 - generic-y += types.h 32 4 generic-y += ucontext.h
-7
arch/parisc/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 3 generated-y += unistd_32.h 5 4 generated-y += unistd_64.h 6 - generic-y += auxvec.h 7 - generic-y += bpf_perf_event.h 8 5 generic-y += kvm_para.h 9 - generic-y += param.h 10 - generic-y += poll.h 11 - generic-y += resource.h 12 - generic-y += siginfo.h
+1 -1
arch/powerpc/include/asm/asm-prototypes.h
··· 38 38 void __trace_hcall_entry(unsigned long opcode, unsigned long *args); 39 39 void __trace_hcall_exit(long opcode, long retval, unsigned long *retbuf); 40 40 /* OPAL tracing */ 41 - #ifdef HAVE_JUMP_LABEL 41 + #ifdef CONFIG_JUMP_LABEL 42 42 extern struct static_key opal_tracepoint_key; 43 43 #endif 44 44
-7
arch/powerpc/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 3 generated-y += unistd_32.h 5 4 generated-y += unistd_64.h 6 - generic-y += param.h 7 - generic-y += poll.h 8 - generic-y += resource.h 9 - generic-y += sockios.h 10 - generic-y += statfs.h 11 - generic-y += siginfo.h
-2
arch/powerpc/kernel/jump_label.c
··· 11 11 #include <linux/jump_label.h> 12 12 #include <asm/code-patching.h> 13 13 14 - #ifdef HAVE_JUMP_LABEL 15 14 void arch_jump_label_transform(struct jump_entry *entry, 16 15 enum jump_label_type type) 17 16 { ··· 21 22 else 22 23 patch_instruction(addr, PPC_INST_NOP); 23 24 } 24 - #endif
+1 -1
arch/powerpc/platforms/powernv/opal-tracepoints.c
··· 4 4 #include <asm/trace.h> 5 5 #include <asm/asm-prototypes.h> 6 6 7 - #ifdef HAVE_JUMP_LABEL 7 + #ifdef CONFIG_JUMP_LABEL 8 8 struct static_key opal_tracepoint_key = STATIC_KEY_INIT; 9 9 10 10 int opal_tracepoint_regfunc(void)
+1 -1
arch/powerpc/platforms/powernv/opal-wrappers.S
··· 20 20 .section ".text" 21 21 22 22 #ifdef CONFIG_TRACEPOINTS 23 - #ifdef HAVE_JUMP_LABEL 23 + #ifdef CONFIG_JUMP_LABEL 24 24 #define OPAL_BRANCH(LABEL) \ 25 25 ARCH_STATIC_BRANCH(LABEL, opal_tracepoint_key) 26 26 #else
+2 -2
arch/powerpc/platforms/pseries/hvCall.S
··· 19 19 20 20 #ifdef CONFIG_TRACEPOINTS 21 21 22 - #ifndef HAVE_JUMP_LABEL 22 + #ifndef CONFIG_JUMP_LABEL 23 23 .section ".toc","aw" 24 24 25 25 .globl hcall_tracepoint_refcount ··· 79 79 mr r5,BUFREG; \ 80 80 __HCALL_INST_POSTCALL 81 81 82 - #ifdef HAVE_JUMP_LABEL 82 + #ifdef CONFIG_JUMP_LABEL 83 83 #define HCALL_BRANCH(LABEL) \ 84 84 ARCH_STATIC_BRANCH(LABEL, hcall_tracepoint_key) 85 85 #else
+1 -1
arch/powerpc/platforms/pseries/lpar.c
··· 1040 1040 #endif /* CONFIG_PPC_BOOK3S_64 */ 1041 1041 1042 1042 #ifdef CONFIG_TRACEPOINTS 1043 - #ifdef HAVE_JUMP_LABEL 1043 + #ifdef CONFIG_JUMP_LABEL 1044 1044 struct static_key hcall_tracepoint_key = STATIC_KEY_INIT; 1045 1045 1046 1046 int hcall_tracepoint_regfunc(void)
-25
arch/riscv/include/asm/Kbuild
··· 1 1 generic-y += bugs.h 2 - generic-y += cacheflush.h 3 2 generic-y += checksum.h 4 3 generic-y += compat.h 5 4 generic-y += cputime.h ··· 8 9 generic-y += dma-contiguous.h 9 10 generic-y += dma-mapping.h 10 11 generic-y += emergency-restart.h 11 - generic-y += errno.h 12 12 generic-y += exec.h 13 13 generic-y += fb.h 14 - generic-y += fcntl.h 15 14 generic-y += hardirq.h 16 15 generic-y += hash.h 17 16 generic-y += hw_irq.h 18 - generic-y += ioctl.h 19 - generic-y += ioctls.h 20 - generic-y += ipcbuf.h 21 17 generic-y += irq_regs.h 22 18 generic-y += irq_work.h 23 19 generic-y += kdebug.h ··· 21 27 generic-y += local.h 22 28 generic-y += local64.h 23 29 generic-y += mm-arch-hooks.h 24 - generic-y += mman.h 25 - generic-y += module.h 26 - generic-y += msgbuf.h 27 30 generic-y += mutex.h 28 - generic-y += param.h 29 31 generic-y += percpu.h 30 - generic-y += poll.h 31 - generic-y += posix_types.h 32 32 generic-y += preempt.h 33 - generic-y += resource.h 34 33 generic-y += scatterlist.h 35 34 generic-y += sections.h 36 - generic-y += sembuf.h 37 35 generic-y += serial.h 38 - generic-y += setup.h 39 - generic-y += shmbuf.h 40 36 generic-y += shmparam.h 41 - generic-y += signal.h 42 - generic-y += socket.h 43 - generic-y += sockios.h 44 - generic-y += stat.h 45 - generic-y += statfs.h 46 - generic-y += swab.h 47 - generic-y += termbits.h 48 - generic-y += termios.h 49 37 generic-y += topology.h 50 38 generic-y += trace_clock.h 51 - generic-y += types.h 52 39 generic-y += unaligned.h 53 40 generic-y += user.h 54 41 generic-y += vga.h
-28
arch/riscv/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 - 4 - generic-y += setup.h 5 - generic-y += unistd.h 6 - generic-y += bpf_perf_event.h 7 - generic-y += errno.h 8 - generic-y += fcntl.h 9 - generic-y += ioctl.h 10 - generic-y += ioctls.h 11 - generic-y += ipcbuf.h 12 - generic-y += mman.h 13 - generic-y += msgbuf.h 14 - generic-y += param.h 15 - generic-y += poll.h 16 - generic-y += posix_types.h 17 - generic-y += resource.h 18 - generic-y += sembuf.h 19 - generic-y += shmbuf.h 20 - generic-y += signal.h 21 - generic-y += socket.h 22 - generic-y += sockios.h 23 - generic-y += stat.h 24 - generic-y += statfs.h 25 - generic-y += swab.h 26 - generic-y += termbits.h 27 - generic-y += termios.h 28 - generic-y += types.h 29 - generic-y += siginfo.h
-16
arch/s390/include/uapi/asm/Kbuild
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - # UAPI Header export list 3 2 include include/uapi/asm-generic/Kbuild.asm 4 3 5 4 generated-y += unistd_32.h 6 5 generated-y += unistd_64.h 7 - 8 - generic-y += errno.h 9 - generic-y += fcntl.h 10 - generic-y += ioctl.h 11 - generic-y += mman.h 12 - generic-y += msgbuf.h 13 - generic-y += param.h 14 - generic-y += poll.h 15 - generic-y += resource.h 16 - generic-y += sembuf.h 17 - generic-y += shmbuf.h 18 - generic-y += sockios.h 19 - generic-y += swab.h 20 - generic-y += termbits.h 21 - generic-y += siginfo.h
+2 -1
arch/s390/kernel/Makefile
··· 48 48 obj-y := traps.o time.o process.o base.o early.o setup.o idle.o vtime.o 49 49 obj-y += processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o 50 50 obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o early_nobss.o 51 - obj-y += sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o 51 + obj-y += sysinfo.o lgr.o os_info.o machine_kexec.o pgm_check.o 52 52 obj-y += runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o 53 53 obj-y += entry.o reipl.o relocate_kernel.o kdebugfs.o alternative.o 54 54 obj-y += nospec-branch.o ipl_vmparm.o ··· 72 72 obj-$(CONFIG_FUNCTION_TRACER) += mcount.o ftrace.o 73 73 obj-$(CONFIG_CRASH_DUMP) += crash_dump.o 74 74 obj-$(CONFIG_UPROBES) += uprobes.o 75 + obj-$(CONFIG_JUMP_LABEL) += jump_label.o 75 76 76 77 obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o kexec_image.o 77 78 obj-$(CONFIG_KEXEC_FILE) += kexec_elf.o
-4
arch/s390/kernel/jump_label.c
··· 10 10 #include <linux/jump_label.h> 11 11 #include <asm/ipl.h> 12 12 13 - #ifdef HAVE_JUMP_LABEL 14 - 15 13 struct insn { 16 14 u16 opcode; 17 15 s32 offset; ··· 101 103 { 102 104 __jump_label_transform(entry, type, 1); 103 105 } 104 - 105 - #endif
+3 -9
arch/s390/kernel/syscalls/Makefile
··· 24 24 _dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \ 25 25 $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)') 26 26 27 - define filechk_syshdr 28 - $(CONFIG_SHELL) '$(systbl)' -H -a $(syshdr_abi_$(basetarget)) -f "$2" < $< 29 - endef 27 + filechk_syshdr = $(CONFIG_SHELL) '$(systbl)' -H -a $(syshdr_abi_$(basetarget)) -f "$2" < $< 30 28 31 - define filechk_sysnr 32 - $(CONFIG_SHELL) '$(systbl)' -N -a $(sysnr_abi_$(basetarget)) < $< 33 - endef 29 + filechk_sysnr = $(CONFIG_SHELL) '$(systbl)' -N -a $(sysnr_abi_$(basetarget)) < $< 34 30 35 - define filechk_syscalls 36 - $(CONFIG_SHELL) '$(systbl)' -S < $< 37 - endef 31 + filechk_syscalls = $(CONFIG_SHELL) '$(systbl)' -S < $< 38 32 39 33 syshdr_abi_unistd_32 := common,32 40 34 $(uapi)/unistd_32.h: $(syscall) FORCE
+3 -6
arch/s390/tools/Makefile
··· 20 20 # Ensure output directory exists 21 21 _dummy := $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)') 22 22 23 - define filechk_facility-defs.h 24 - $(obj)/gen_facilities 25 - endef 23 + filechk_facility-defs.h = $(obj)/gen_facilities 26 24 27 - define filechk_dis-defs.h 28 - ( $(obj)/gen_opcode_table < $(srctree)/arch/$(ARCH)/tools/opcodes.txt ) 29 - endef 25 + filechk_dis-defs.h = \ 26 + $(obj)/gen_opcode_table < $(srctree)/arch/$(ARCH)/tools/opcodes.txt 30 27 31 28 $(kapi)/facility-defs.h: $(obj)/gen_facilities FORCE 32 29 $(call filechk,facility-defs.h)
-19
arch/sh/include/uapi/asm/Kbuild
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - # UAPI Header export list 3 2 include include/uapi/asm-generic/Kbuild.asm 4 3 5 4 generated-y += unistd_32.h 6 - generic-y += bitsperlong.h 7 - generic-y += bpf_perf_event.h 8 - generic-y += errno.h 9 - generic-y += fcntl.h 10 - generic-y += ioctl.h 11 - generic-y += ipcbuf.h 12 5 generic-y += kvm_para.h 13 - generic-y += mman.h 14 - generic-y += msgbuf.h 15 - generic-y += param.h 16 - generic-y += poll.h 17 - generic-y += resource.h 18 - generic-y += sembuf.h 19 - generic-y += shmbuf.h 20 - generic-y += siginfo.h 21 - generic-y += socket.h 22 - generic-y += statfs.h 23 - generic-y += termbits.h 24 - generic-y += termios.h 25 6 generic-y += ucontext.h
+1 -1
arch/sh/tools/Makefile
··· 13 13 include/generated/machtypes.h: $(src)/gen-mach-types $(src)/mach-types 14 14 @echo ' Generating $@' 15 15 $(Q)mkdir -p $(dir $@) 16 - $(Q)LC_ALL=C $(AWK) -f $^ > $@ || { rm -f $@; /bin/false; } 16 + $(Q)LC_ALL=C $(AWK) -f $^ > $@
-3
arch/sparc/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 3 generated-y += unistd_32.h 5 4 generated-y += unistd_64.h 6 - generic-y += bpf_perf_event.h 7 - generic-y += types.h
+1 -1
arch/sparc/kernel/Makefile
··· 118 118 obj-$(CONFIG_SPARC64) += $(pc--y) 119 119 120 120 obj-$(CONFIG_UPROBES) += uprobes.o 121 - obj-$(CONFIG_SPARC64) += jump_label.o 121 + obj-$(CONFIG_JUMP_LABEL) += jump_label.o
-4
arch/sparc/kernel/jump_label.c
··· 9 9 10 10 #include <asm/cacheflush.h> 11 11 12 - #ifdef HAVE_JUMP_LABEL 13 - 14 12 void arch_jump_label_transform(struct jump_entry *entry, 15 13 enum jump_label_type type) 16 14 { ··· 45 47 flushi(insn); 46 48 mutex_unlock(&text_mutex); 47 49 } 48 - 49 - #endif
-29
arch/unicore32/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 - generic-y += auxvec.h 5 - generic-y += bitsperlong.h 6 - generic-y += bpf_perf_event.h 7 - generic-y += errno.h 8 - generic-y += fcntl.h 9 - generic-y += ioctl.h 10 - generic-y += ioctls.h 11 - generic-y += ipcbuf.h 12 3 generic-y += kvm_para.h 13 - generic-y += mman.h 14 - generic-y += msgbuf.h 15 - generic-y += param.h 16 - generic-y += poll.h 17 - generic-y += posix_types.h 18 - generic-y += resource.h 19 - generic-y += sembuf.h 20 - generic-y += setup.h 21 - generic-y += shmbuf.h 22 - generic-y += shmparam.h 23 - generic-y += siginfo.h 24 - generic-y += signal.h 25 - generic-y += socket.h 26 - generic-y += sockios.h 27 - generic-y += stat.h 28 - generic-y += statfs.h 29 - generic-y += swab.h 30 - generic-y += termbits.h 31 - generic-y += termios.h 32 - generic-y += types.h 33 4 generic-y += ucontext.h
+1 -1
arch/x86/Makefile
··· 289 289 290 290 archprepare: checkbin 291 291 checkbin: 292 - ifndef CC_HAVE_ASM_GOTO 292 + ifndef CONFIG_CC_HAS_ASM_GOTO 293 293 @echo Compiler lacks asm-goto support. 294 294 @exit 1 295 295 endif
+1 -1
arch/x86/boot/compressed/Makefile
··· 151 151 suffix-$(CONFIG_KERNEL_LZ4) := lz4 152 152 153 153 quiet_cmd_mkpiggy = MKPIGGY $@ 154 - cmd_mkpiggy = $(obj)/mkpiggy $< > $@ || ( rm -f $@ ; false ) 154 + cmd_mkpiggy = $(obj)/mkpiggy $< > $@ 155 155 156 156 targets += piggy.S 157 157 $(obj)/piggy.S: $(obj)/vmlinux.bin.$(suffix-y) $(obj)/mkpiggy FORCE
+1 -1
arch/x86/entry/calling.h
··· 351 351 */ 352 352 .macro CALL_enter_from_user_mode 353 353 #ifdef CONFIG_CONTEXT_TRACKING 354 - #ifdef HAVE_JUMP_LABEL 354 + #ifdef CONFIG_JUMP_LABEL 355 355 STATIC_JUMP_IF_FALSE .Lafter_call_\@, context_tracking_enabled, def=0 356 356 #endif 357 357 call enter_from_user_mode
+1 -1
arch/x86/include/asm/cpufeature.h
··· 140 140 141 141 #define setup_force_cpu_bug(bit) setup_force_cpu_cap(bit) 142 142 143 - #if defined(__clang__) && !defined(CC_HAVE_ASM_GOTO) 143 + #if defined(__clang__) && !defined(CONFIG_CC_HAS_ASM_GOTO) 144 144 145 145 /* 146 146 * Workaround for the sake of BPF compilation which utilizes kernel
-13
arch/x86/include/asm/jump_label.h
··· 2 2 #ifndef _ASM_X86_JUMP_LABEL_H 3 3 #define _ASM_X86_JUMP_LABEL_H 4 4 5 - #ifndef HAVE_JUMP_LABEL 6 - /* 7 - * For better or for worse, if jump labels (the gcc extension) are missing, 8 - * then the entire static branch patching infrastructure is compiled out. 9 - * If that happens, the code in here will malfunction. Raise a compiler 10 - * error instead. 11 - * 12 - * In theory, jump labels and the static branch patching infrastructure 13 - * could be decoupled to fix this. 14 - */ 15 - #error asm/jump_label.h included on a non-jump-label kernel 16 - #endif 17 - 18 5 #define JUMP_LABEL_NOP_SIZE 5 19 6 20 7 #ifdef CONFIG_X86_64
+3 -3
arch/x86/include/asm/rmwcc.h
··· 11 11 12 12 #define __CLOBBERS_MEM(clb...) "memory", ## clb 13 13 14 - #if !defined(__GCC_ASM_FLAG_OUTPUTS__) && defined(CC_HAVE_ASM_GOTO) 14 + #if !defined(__GCC_ASM_FLAG_OUTPUTS__) && defined(CONFIG_CC_HAS_ASM_GOTO) 15 15 16 16 /* Use asm goto */ 17 17 ··· 27 27 c; \ 28 28 }) 29 29 30 - #else /* defined(__GCC_ASM_FLAG_OUTPUTS__) || !defined(CC_HAVE_ASM_GOTO) */ 30 + #else /* defined(__GCC_ASM_FLAG_OUTPUTS__) || !defined(CONFIG_CC_HAS_ASM_GOTO) */ 31 31 32 32 /* Use flags output or a set instruction */ 33 33 ··· 40 40 c; \ 41 41 }) 42 42 43 - #endif /* defined(__GCC_ASM_FLAG_OUTPUTS__) || !defined(CC_HAVE_ASM_GOTO) */ 43 + #endif /* defined(__GCC_ASM_FLAG_OUTPUTS__) || !defined(CONFIG_CC_HAS_ASM_GOTO) */ 44 44 45 45 #define GEN_UNARY_RMWcc_4(op, var, cc, arg0) \ 46 46 __GEN_RMWcc(op " " arg0, var, cc, __CLOBBERS_MEM())
-3
arch/x86/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 - generic-y += bpf_perf_event.h 5 3 generated-y += unistd_32.h 6 4 generated-y += unistd_64.h 7 5 generated-y += unistd_x32.h 8 - generic-y += poll.h
+2 -1
arch/x86/kernel/Makefile
··· 49 49 obj-y += traps.o idt.o irq.o irq_$(BITS).o dumpstack_$(BITS).o 50 50 obj-y += time.o ioport.o dumpstack.o nmi.o 51 51 obj-$(CONFIG_MODIFY_LDT_SYSCALL) += ldt.o 52 - obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o 52 + obj-y += setup.o x86_init.o i8259.o irqinit.o 53 + obj-$(CONFIG_JUMP_LABEL) += jump_label.o 53 54 obj-$(CONFIG_IRQ_WORK) += irq_work.o 54 55 obj-y += probe_roms.o 55 56 obj-$(CONFIG_X86_64) += sys_x86_64.o
-4
arch/x86/kernel/jump_label.c
··· 16 16 #include <asm/alternative.h> 17 17 #include <asm/text-patching.h> 18 18 19 - #ifdef HAVE_JUMP_LABEL 20 - 21 19 union jump_code_union { 22 20 char code[JUMP_LABEL_NOP_SIZE]; 23 21 struct { ··· 128 130 if (jlstate == JL_STATE_UPDATE) 129 131 __jump_label_transform(entry, type, text_poke_early, 1); 130 132 } 131 - 132 - #endif
+1 -1
arch/x86/kvm/emulate.c
··· 456 456 457 457 /* 458 458 * XXX: inoutclob user must know where the argument is being expanded. 459 - * Relying on CC_HAVE_ASM_GOTO would allow us to remove _fault. 459 + * Relying on CONFIG_CC_HAS_ASM_GOTO would allow us to remove _fault. 460 460 */ 461 461 #define asm_safe(insn, inoutclob...) \ 462 462 ({ \
+1 -1
arch/x86/lib/Makefile
··· 9 9 inat_tables_script = $(srctree)/arch/x86/tools/gen-insn-attr-x86.awk 10 10 inat_tables_maps = $(srctree)/arch/x86/lib/x86-opcode-map.txt 11 11 quiet_cmd_inat_tables = GEN $@ 12 - cmd_inat_tables = $(AWK) -f $(inat_tables_script) $(inat_tables_maps) > $@ || rm -f $@ 12 + cmd_inat_tables = $(AWK) -f $(inat_tables_script) $(inat_tables_maps) > $@ 13 13 14 14 $(obj)/inat-tables.c: $(inat_tables_script) $(inat_tables_maps) 15 15 $(call cmd,inat_tables)
-10
arch/xtensa/include/uapi/asm/Kbuild
··· 1 - # UAPI Header export list 2 1 include include/uapi/asm-generic/Kbuild.asm 3 2 4 3 generated-y += unistd_32.h 5 - generic-y += bitsperlong.h 6 - generic-y += bpf_perf_event.h 7 - generic-y += errno.h 8 - generic-y += fcntl.h 9 - generic-y += ioctl.h 10 4 generic-y += kvm_para.h 11 - generic-y += resource.h 12 - generic-y += siginfo.h 13 - generic-y += statfs.h 14 - generic-y += termios.h
-4
arch/xtensa/kernel/jump_label.c
··· 10 10 11 11 #include <asm/cacheflush.h> 12 12 13 - #ifdef HAVE_JUMP_LABEL 14 - 15 13 #define J_OFFSET_MASK 0x0003ffff 16 14 #define J_SIGN_MASK (~(J_OFFSET_MASK >> 1)) 17 15 ··· 93 95 94 96 patch_text(jump_entry_code(e), &insn, JUMP_LABEL_NOP_SIZE); 95 97 } 96 - 97 - #endif /* HAVE_JUMP_LABEL */
+1 -1
certs/Makefile
··· 22 22 AFLAGS_system_certificates.o := -I$(srctree) 23 23 24 24 quiet_cmd_extract_certs = EXTRACT_CERTS $(patsubst "%",%,$(2)) 25 - cmd_extract_certs = scripts/extract-cert $(2) $@ || ( rm $@; exit 1) 25 + cmd_extract_certs = scripts/extract-cert $(2) $@ 26 26 27 27 targets += x509_certificate_list 28 28 $(obj)/x509_certificate_list: scripts/extract-cert $(SYSTEM_TRUSTED_KEYS_SRCPREFIX)$(SYSTEM_TRUSTED_KEYS_FILENAME) FORCE
+2 -3
firmware/Makefile
··· 13 13 ASM_ALIGN = $(if $(CONFIG_64BIT),3,2) 14 14 PROGBITS = $(if $(CONFIG_ARM),%,@)progbits 15 15 16 - filechk_fwbin = { \ 16 + filechk_fwbin = \ 17 17 echo "/* Generated by $(src)/Makefile */" ;\ 18 18 echo " .section .rodata" ;\ 19 19 echo " .p2align $(ASM_ALIGN)" ;\ ··· 28 28 echo " .p2align $(ASM_ALIGN)" ;\ 29 29 echo " $(ASM_WORD) _fw_$(FWSTR)_name" ;\ 30 30 echo " $(ASM_WORD) _fw_$(FWSTR)_bin" ;\ 31 - echo " $(ASM_WORD) _fw_end - _fw_$(FWSTR)_bin" ;\ 32 - } 31 + echo " $(ASM_WORD) _fw_end - _fw_$(FWSTR)_bin" 33 32 34 33 $(obj)/%.gen.S: FORCE 35 34 $(call filechk,fwbin)
+3 -3
include/linux/dynamic_debug.h
··· 2 2 #ifndef _DYNAMIC_DEBUG_H 3 3 #define _DYNAMIC_DEBUG_H 4 4 5 - #if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL) 5 + #if defined(CONFIG_JUMP_LABEL) 6 6 #include <linux/jump_label.h> 7 7 #endif 8 8 ··· 38 38 #define _DPRINTK_FLAGS_DEFAULT 0 39 39 #endif 40 40 unsigned int flags:8; 41 - #ifdef HAVE_JUMP_LABEL 41 + #ifdef CONFIG_JUMP_LABEL 42 42 union { 43 43 struct static_key_true dd_key_true; 44 44 struct static_key_false dd_key_false; ··· 83 83 dd_key_init(key, init) \ 84 84 } 85 85 86 - #ifdef HAVE_JUMP_LABEL 86 + #ifdef CONFIG_JUMP_LABEL 87 87 88 88 #define dd_key_init(key, init) key = (init) 89 89
+9 -13
include/linux/jump_label.h
··· 71 71 * Additional babbling in: Documentation/static-keys.txt 72 72 */ 73 73 74 - #if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL) 75 - # define HAVE_JUMP_LABEL 76 - #endif 77 - 78 74 #ifndef __ASSEMBLY__ 79 75 80 76 #include <linux/types.h> ··· 82 86 "%s(): static key '%pS' used before call to jump_label_init()", \ 83 87 __func__, (key)) 84 88 85 - #ifdef HAVE_JUMP_LABEL 89 + #ifdef CONFIG_JUMP_LABEL 86 90 87 91 struct static_key { 88 92 atomic_t enabled; ··· 110 114 struct static_key { 111 115 atomic_t enabled; 112 116 }; 113 - #endif /* HAVE_JUMP_LABEL */ 117 + #endif /* CONFIG_JUMP_LABEL */ 114 118 #endif /* __ASSEMBLY__ */ 115 119 116 - #ifdef HAVE_JUMP_LABEL 120 + #ifdef CONFIG_JUMP_LABEL 117 121 #include <asm/jump_label.h> 118 122 119 123 #ifndef __ASSEMBLY__ ··· 188 192 189 193 struct module; 190 194 191 - #ifdef HAVE_JUMP_LABEL 195 + #ifdef CONFIG_JUMP_LABEL 192 196 193 197 #define JUMP_TYPE_FALSE 0UL 194 198 #define JUMP_TYPE_TRUE 1UL ··· 241 245 { .enabled = { 0 }, \ 242 246 { .entries = (void *)JUMP_TYPE_FALSE } } 243 247 244 - #else /* !HAVE_JUMP_LABEL */ 248 + #else /* !CONFIG_JUMP_LABEL */ 245 249 246 250 #include <linux/atomic.h> 247 251 #include <linux/bug.h> ··· 326 330 #define STATIC_KEY_INIT_TRUE { .enabled = ATOMIC_INIT(1) } 327 331 #define STATIC_KEY_INIT_FALSE { .enabled = ATOMIC_INIT(0) } 328 332 329 - #endif /* HAVE_JUMP_LABEL */ 333 + #endif /* CONFIG_JUMP_LABEL */ 330 334 331 335 #define STATIC_KEY_INIT STATIC_KEY_INIT_FALSE 332 336 #define jump_label_enabled static_key_enabled ··· 390 394 static_key_count((struct static_key *)x) > 0; \ 391 395 }) 392 396 393 - #ifdef HAVE_JUMP_LABEL 397 + #ifdef CONFIG_JUMP_LABEL 394 398 395 399 /* 396 400 * Combine the right initial value (type) with the right branch order ··· 472 476 unlikely(branch); \ 473 477 }) 474 478 475 - #else /* !HAVE_JUMP_LABEL */ 479 + #else /* !CONFIG_JUMP_LABEL */ 476 480 477 481 #define static_branch_likely(x) likely(static_key_enabled(&(x)->key)) 478 482 #define static_branch_unlikely(x) unlikely(static_key_enabled(&(x)->key)) 479 483 480 - #endif /* HAVE_JUMP_LABEL */ 484 + #endif /* CONFIG_JUMP_LABEL */ 481 485 482 486 /* 483 487 * Advanced usage; refcount, branch is enabled when: count != 0
+3 -5
include/linux/jump_label_ratelimit.h
··· 5 5 #include <linux/jump_label.h> 6 6 #include <linux/workqueue.h> 7 7 8 - #if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL) 8 + #if defined(CONFIG_JUMP_LABEL) 9 9 struct static_key_deferred { 10 10 struct static_key key; 11 11 unsigned long timeout; 12 12 struct delayed_work work; 13 13 }; 14 - #endif 15 14 16 - #ifdef HAVE_JUMP_LABEL 17 15 extern void static_key_slow_dec_deferred(struct static_key_deferred *key); 18 16 extern void static_key_deferred_flush(struct static_key_deferred *key); 19 17 extern void 20 18 jump_label_rate_limit(struct static_key_deferred *key, unsigned long rl); 21 19 22 - #else /* !HAVE_JUMP_LABEL */ 20 + #else /* !CONFIG_JUMP_LABEL */ 23 21 struct static_key_deferred { 24 22 struct static_key key; 25 23 }; ··· 36 38 { 37 39 STATIC_KEY_CHECK_USE(key); 38 40 } 39 - #endif /* HAVE_JUMP_LABEL */ 41 + #endif /* CONFIG_JUMP_LABEL */ 40 42 #endif /* _LINUX_JUMP_LABEL_RATELIMIT_H */
+1 -1
include/linux/module.h
··· 436 436 unsigned int num_bpf_raw_events; 437 437 struct bpf_raw_event_map *bpf_raw_events; 438 438 #endif 439 - #ifdef HAVE_JUMP_LABEL 439 + #ifdef CONFIG_JUMP_LABEL 440 440 struct jump_entry *jump_entries; 441 441 unsigned int num_jump_entries; 442 442 #endif
+2 -2
include/linux/netfilter.h
··· 176 176 int nf_register_sockopt(struct nf_sockopt_ops *reg); 177 177 void nf_unregister_sockopt(struct nf_sockopt_ops *reg); 178 178 179 - #ifdef HAVE_JUMP_LABEL 179 + #ifdef CONFIG_JUMP_LABEL 180 180 extern struct static_key nf_hooks_needed[NFPROTO_NUMPROTO][NF_MAX_HOOKS]; 181 181 #endif 182 182 ··· 198 198 struct nf_hook_entries *hook_head = NULL; 199 199 int ret = 1; 200 200 201 - #ifdef HAVE_JUMP_LABEL 201 + #ifdef CONFIG_JUMP_LABEL 202 202 if (__builtin_constant_p(pf) && 203 203 __builtin_constant_p(hook) && 204 204 !static_key_false(&nf_hooks_needed[pf][hook]))
+1 -1
include/linux/netfilter_ingress.h
··· 8 8 #ifdef CONFIG_NETFILTER_INGRESS 9 9 static inline bool nf_hook_ingress_active(const struct sk_buff *skb) 10 10 { 11 - #ifdef HAVE_JUMP_LABEL 11 + #ifdef CONFIG_JUMP_LABEL 12 12 if (!static_key_false(&nf_hooks_needed[NFPROTO_NETDEV][NF_NETDEV_INGRESS])) 13 13 return false; 14 14 #endif
-2
include/uapi/linux/Kbuild
··· 1 - # UAPI Header export list 2 - 3 1 ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),) 4 2 no-export-headers += a.out.h 5 3 endif
+3
init/Kconfig
··· 23 23 int 24 24 default $(shell,$(srctree)/scripts/clang-version.sh $(CC)) 25 25 26 + config CC_HAS_ASM_GOTO 27 + def_bool $(success,$(srctree)/scripts/gcc-goto.sh $(CC)) 28 + 26 29 config CONSTRUCTORS 27 30 bool 28 31 depends on !UML
+5 -1
kernel/Makefile
··· 122 122 $(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE 123 123 $(call if_changed,gzip) 124 124 125 - filechk_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;") 125 + filechk_ikconfiggz = \ 126 + echo "static const char kernel_config_data[] __used = MAGIC_START"; \ 127 + cat $< | scripts/bin2c; \ 128 + echo "MAGIC_END;" 129 + 126 130 targets += config_data.h 127 131 $(obj)/config_data.h: $(obj)/config_data.gz FORCE 128 132 $(call filechk,ikconfiggz)
+3 -7
kernel/jump_label.c
··· 18 18 #include <linux/cpu.h> 19 19 #include <asm/sections.h> 20 20 21 - #ifdef HAVE_JUMP_LABEL 22 - 23 21 /* mutex to protect coming/going of the the jump_label table */ 24 22 static DEFINE_MUTEX(jump_label_mutex); 25 23 ··· 78 80 static void jump_label_update(struct static_key *key); 79 81 80 82 /* 81 - * There are similar definitions for the !HAVE_JUMP_LABEL case in jump_label.h. 83 + * There are similar definitions for the !CONFIG_JUMP_LABEL case in jump_label.h. 82 84 * The use of 'atomic_read()' requires atomic.h and its problematic for some 83 85 * kernel headers such as kernel.h and others. Since static_key_count() is not 84 - * used in the branch statements as it is for the !HAVE_JUMP_LABEL case its ok 86 + * used in the branch statements as it is for the !CONFIG_JUMP_LABEL case its ok 85 87 * to have it be a function here. Similarly, for 'static_key_enable()' and 86 88 * 'static_key_disable()', which require bug.h. This should allow jump_label.h 87 - * to be included from most/all places for HAVE_JUMP_LABEL. 89 + * to be included from most/all places for CONFIG_JUMP_LABEL. 88 90 */ 89 91 int static_key_count(struct static_key *key) 90 92 { ··· 789 791 } 790 792 early_initcall(jump_label_test); 791 793 #endif /* STATIC_KEYS_SELFTEST */ 792 - 793 - #endif /* HAVE_JUMP_LABEL */
+1 -1
kernel/module.c
··· 3102 3102 sizeof(*mod->bpf_raw_events), 3103 3103 &mod->num_bpf_raw_events); 3104 3104 #endif 3105 - #ifdef HAVE_JUMP_LABEL 3105 + #ifdef CONFIG_JUMP_LABEL 3106 3106 mod->jump_entries = section_objs(info, "__jump_table", 3107 3107 sizeof(*mod->jump_entries), 3108 3108 &mod->num_jump_entries);
+1 -1
kernel/sched/core.c
··· 24 24 25 25 DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); 26 26 27 - #if defined(CONFIG_SCHED_DEBUG) && defined(HAVE_JUMP_LABEL) 27 + #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_JUMP_LABEL) 28 28 /* 29 29 * Debugging: various feature bits 30 30 *
+2 -2
kernel/sched/debug.c
··· 73 73 return 0; 74 74 } 75 75 76 - #ifdef HAVE_JUMP_LABEL 76 + #ifdef CONFIG_JUMP_LABEL 77 77 78 78 #define jump_label_key__true STATIC_KEY_INIT_TRUE 79 79 #define jump_label_key__false STATIC_KEY_INIT_FALSE ··· 99 99 #else 100 100 static void sched_feat_disable(int i) { }; 101 101 static void sched_feat_enable(int i) { }; 102 - #endif /* HAVE_JUMP_LABEL */ 102 + #endif /* CONFIG_JUMP_LABEL */ 103 103 104 104 static int sched_feat_set(char *cmp) 105 105 {
+3 -3
kernel/sched/fair.c
··· 4217 4217 4218 4218 #ifdef CONFIG_CFS_BANDWIDTH 4219 4219 4220 - #ifdef HAVE_JUMP_LABEL 4220 + #ifdef CONFIG_JUMP_LABEL 4221 4221 static struct static_key __cfs_bandwidth_used; 4222 4222 4223 4223 static inline bool cfs_bandwidth_used(void) ··· 4234 4234 { 4235 4235 static_key_slow_dec_cpuslocked(&__cfs_bandwidth_used); 4236 4236 } 4237 - #else /* HAVE_JUMP_LABEL */ 4237 + #else /* CONFIG_JUMP_LABEL */ 4238 4238 static bool cfs_bandwidth_used(void) 4239 4239 { 4240 4240 return true; ··· 4242 4242 4243 4243 void cfs_bandwidth_usage_inc(void) {} 4244 4244 void cfs_bandwidth_usage_dec(void) {} 4245 - #endif /* HAVE_JUMP_LABEL */ 4245 + #endif /* CONFIG_JUMP_LABEL */ 4246 4246 4247 4247 /* 4248 4248 * default period for cfs group bandwidth.
+3 -3
kernel/sched/sched.h
··· 1488 1488 1489 1489 #undef SCHED_FEAT 1490 1490 1491 - #if defined(CONFIG_SCHED_DEBUG) && defined(HAVE_JUMP_LABEL) 1491 + #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_JUMP_LABEL) 1492 1492 1493 1493 /* 1494 1494 * To support run-time toggling of sched features, all the translation units ··· 1508 1508 extern struct static_key sched_feat_keys[__SCHED_FEAT_NR]; 1509 1509 #define sched_feat(x) (static_branch_##x(&sched_feat_keys[__SCHED_FEAT_##x])) 1510 1510 1511 - #else /* !(SCHED_DEBUG && HAVE_JUMP_LABEL) */ 1511 + #else /* !(SCHED_DEBUG && CONFIG_JUMP_LABEL) */ 1512 1512 1513 1513 /* 1514 1514 * Each translation unit has its own copy of sysctl_sched_features to allow ··· 1524 1524 1525 1525 #define sched_feat(x) !!(sysctl_sched_features & (1UL << __SCHED_FEAT_##x)) 1526 1526 1527 - #endif /* SCHED_DEBUG && HAVE_JUMP_LABEL */ 1527 + #endif /* SCHED_DEBUG && CONFIG_JUMP_LABEL */ 1528 1528 1529 1529 extern struct static_key_false sched_numa_balancing; 1530 1530 extern struct static_key_false sched_schedstats;
+1 -1
lib/dynamic_debug.c
··· 188 188 newflags = (dp->flags & mask) | flags; 189 189 if (newflags == dp->flags) 190 190 continue; 191 - #ifdef HAVE_JUMP_LABEL 191 + #ifdef CONFIG_JUMP_LABEL 192 192 if (dp->flags & _DPRINTK_FLAGS_PRINT) { 193 193 if (!(flags & _DPRINTK_FLAGS_PRINT)) 194 194 static_branch_disable(&dp->key.dd_key_true);
+2 -3
lib/raid6/Makefile
··· 13 13 hostprogs-y += mktables 14 14 15 15 quiet_cmd_unroll = UNROLL $@ 16 - cmd_unroll = $(AWK) -f$(srctree)/$(src)/unroll.awk -vN=$(UNROLL) \ 17 - < $< > $@ || ( rm -f $@ && exit 1 ) 16 + cmd_unroll = $(AWK) -f$(srctree)/$(src)/unroll.awk -vN=$(UNROLL) < $< > $@ 18 17 19 18 ifeq ($(CONFIG_ALTIVEC),y) 20 19 altivec_flags := -maltivec $(call cc-option,-mabi=altivec) ··· 159 160 $(call if_changed,unroll) 160 161 161 162 quiet_cmd_mktable = TABLE $@ 162 - cmd_mktable = $(obj)/mktables > $@ || ( rm -f $@ && exit 1 ) 163 + cmd_mktable = $(obj)/mktables > $@ 163 164 164 165 targets += tables.c 165 166 $(obj)/tables.c: $(obj)/mktables FORCE
+3 -3
net/core/dev.c
··· 1821 1821 #endif 1822 1822 1823 1823 static DEFINE_STATIC_KEY_FALSE(netstamp_needed_key); 1824 - #ifdef HAVE_JUMP_LABEL 1824 + #ifdef CONFIG_JUMP_LABEL 1825 1825 static atomic_t netstamp_needed_deferred; 1826 1826 static atomic_t netstamp_wanted; 1827 1827 static void netstamp_clear(struct work_struct *work) ··· 1840 1840 1841 1841 void net_enable_timestamp(void) 1842 1842 { 1843 - #ifdef HAVE_JUMP_LABEL 1843 + #ifdef CONFIG_JUMP_LABEL 1844 1844 int wanted; 1845 1845 1846 1846 while (1) { ··· 1860 1860 1861 1861 void net_disable_timestamp(void) 1862 1862 { 1863 - #ifdef HAVE_JUMP_LABEL 1863 + #ifdef CONFIG_JUMP_LABEL 1864 1864 int wanted; 1865 1865 1866 1866 while (1) {
+3 -3
net/netfilter/core.c
··· 33 33 DEFINE_PER_CPU(bool, nf_skb_duplicated); 34 34 EXPORT_SYMBOL_GPL(nf_skb_duplicated); 35 35 36 - #ifdef HAVE_JUMP_LABEL 36 + #ifdef CONFIG_JUMP_LABEL 37 37 struct static_key nf_hooks_needed[NFPROTO_NUMPROTO][NF_MAX_HOOKS]; 38 38 EXPORT_SYMBOL(nf_hooks_needed); 39 39 #endif ··· 347 347 if (pf == NFPROTO_NETDEV && reg->hooknum == NF_NETDEV_INGRESS) 348 348 net_inc_ingress_queue(); 349 349 #endif 350 - #ifdef HAVE_JUMP_LABEL 350 + #ifdef CONFIG_JUMP_LABEL 351 351 static_key_slow_inc(&nf_hooks_needed[pf][reg->hooknum]); 352 352 #endif 353 353 BUG_ON(p == new_hooks); ··· 405 405 if (pf == NFPROTO_NETDEV && reg->hooknum == NF_NETDEV_INGRESS) 406 406 net_dec_ingress_queue(); 407 407 #endif 408 - #ifdef HAVE_JUMP_LABEL 408 + #ifdef CONFIG_JUMP_LABEL 409 409 static_key_slow_dec(&nf_hooks_needed[pf][reg->hooknum]); 410 410 #endif 411 411 } else {
+5 -5
scripts/Kbuild.include
··· 41 41 ### 42 42 # filechk is used to check if the content of a generated file is updated. 43 43 # Sample usage: 44 - # define filechk_sample 45 - # echo $KERNELRELEASE 46 - # endef 47 - # version.h : Makefile 44 + # 45 + # filechk_sample = echo $(KERNELRELEASE) 46 + # version.h: FORCE 48 47 # $(call filechk,sample) 48 + # 49 49 # The rule defined shall write to stdout the content of the new file. 50 50 # The existing file will be compared with the new one. 51 51 # - If no file exist it is created ··· 56 56 define filechk 57 57 $(Q)set -e; \ 58 58 mkdir -p $(dir $@); \ 59 - $(filechk_$(1)) > $@.tmp; \ 59 + { $(filechk_$(1)); } > $@.tmp; \ 60 60 if [ -r $@ ] && cmp -s $@ $@.tmp; then \ 61 61 rm -f $@.tmp; \ 62 62 else \
+4
scripts/Makefile.asm-generic
··· 14 14 15 15 include scripts/Kbuild.include 16 16 17 + # If arch does not implement mandatory headers, fallback to asm-generic ones. 18 + mandatory-y := $(filter-out $(generated-y), $(mandatory-y)) 19 + generic-y += $(foreach f, $(mandatory-y), $(if $(wildcard $(srctree)/$(src)/$(f)),,$(f))) 20 + 17 21 generic-y := $(addprefix $(obj)/, $(generic-y)) 18 22 generated-y := $(addprefix $(obj)/, $(generated-y)) 19 23
-7
scripts/Makefile.headersinst
··· 56 56 all-files := $(header-files) $(genhdr-files) 57 57 output-files := $(addprefix $(installdir)/, $(all-files)) 58 58 59 - ifneq ($(mandatory-y),) 60 - missing := $(filter-out $(all-files),$(mandatory-y)) 61 - ifneq ($(missing),) 62 - $(error Some mandatory headers ($(missing)) are missing in $(obj)) 63 - endif 64 - endif 65 - 66 59 # Work out what needs to be removed 67 60 oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h)) 68 61 unwanted := $(filter-out $(all-files),$(oldheaders))
+12 -22
scripts/Makefile.lib
··· 242 242 # --------------------------------------------------------------------------- 243 243 244 244 quiet_cmd_gzip = GZIP $@ 245 - cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \ 246 - (rm -f $@ ; false) 245 + cmd_gzip = cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@ 247 246 248 247 # DTC 249 248 # --------------------------------------------------------------------------- ··· 304 305 cmd_dtb_check = $(DT_CHECKER) -p $(DT_TMP_SCHEMA) $@ ; 305 306 306 307 define rule_dtc_dt_yaml 307 - $(call cmd_and_fixdep,dtc,yaml) \ 308 - $(call echo-cmd,dtb_check) $(cmd_dtb_check) 308 + $(call cmd_and_fixdep,dtc,yaml) 309 + $(call cmd,dtb_check) 309 310 endef 310 311 311 312 $(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE ··· 335 336 336 337 quiet_cmd_bzip2 = BZIP2 $@ 337 338 cmd_bzip2 = (cat $(filter-out FORCE,$^) | \ 338 - bzip2 -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ 339 - (rm -f $@ ; false) 339 + bzip2 -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ 340 340 341 341 # Lzma 342 342 # --------------------------------------------------------------------------- 343 343 344 344 quiet_cmd_lzma = LZMA $@ 345 345 cmd_lzma = (cat $(filter-out FORCE,$^) | \ 346 - lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ 347 - (rm -f $@ ; false) 346 + lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ 348 347 349 348 quiet_cmd_lzo = LZO $@ 350 349 cmd_lzo = (cat $(filter-out FORCE,$^) | \ 351 - lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ 352 - (rm -f $@ ; false) 350 + lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ 353 351 354 352 quiet_cmd_lz4 = LZ4 $@ 355 353 cmd_lz4 = (cat $(filter-out FORCE,$^) | \ 356 - lz4c -l -c1 stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ 357 - (rm -f $@ ; false) 354 + lz4c -l -c1 stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ 358 355 359 356 # U-Boot mkimage 360 357 # --------------------------------------------------------------------------- ··· 366 371 UIMAGE_LOADADDR ?= arch_must_set_this 367 372 UIMAGE_ENTRYADDR ?= $(UIMAGE_LOADADDR) 368 373 UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)' 369 - UIMAGE_IN ?= $< 370 - UIMAGE_OUT ?= $@ 371 374 372 - quiet_cmd_uimage = UIMAGE $(UIMAGE_OUT) 375 + quiet_cmd_uimage = UIMAGE $@ 373 376 cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(UIMAGE_ARCH) -O linux \ 374 377 -C $(UIMAGE_COMPRESSION) $(UIMAGE_OPTS-y) \ 375 378 -T $(UIMAGE_TYPE) \ 376 379 -a $(UIMAGE_LOADADDR) -e $(UIMAGE_ENTRYADDR) \ 377 - -n $(UIMAGE_NAME) -d $(UIMAGE_IN) $(UIMAGE_OUT) 380 + -n $(UIMAGE_NAME) -d $< $@ 378 381 379 382 # XZ 380 383 # --------------------------------------------------------------------------- ··· 394 401 quiet_cmd_xzkern = XZKERN $@ 395 402 cmd_xzkern = (cat $(filter-out FORCE,$^) | \ 396 403 sh $(srctree)/scripts/xz_wrap.sh && \ 397 - $(call size_append, $(filter-out FORCE,$^))) > $@ || \ 398 - (rm -f $@ ; false) 404 + $(call size_append, $(filter-out FORCE,$^))) > $@ 399 405 400 406 quiet_cmd_xzmisc = XZMISC $@ 401 407 cmd_xzmisc = (cat $(filter-out FORCE,$^) | \ 402 - xz --check=crc32 --lzma2=dict=1MiB) > $@ || \ 403 - (rm -f $@ ; false) 408 + xz --check=crc32 --lzma2=dict=1MiB) > $@ 404 409 405 410 # ASM offsets 406 411 # --------------------------------------------------------------------------- ··· 417 426 # Use filechk to avoid rebuilds when a header changes, but the resulting file 418 427 # does not 419 428 define filechk_offsets 420 - ( \ 421 429 echo "#ifndef $2"; \ 422 430 echo "#define $2"; \ 423 431 echo "/*"; \ ··· 427 437 echo ""; \ 428 438 sed -ne $(sed-offsets) < $<; \ 429 439 echo ""; \ 430 - echo "#endif" ) 440 + echo "#endif" 431 441 endef
+3
scripts/coccinelle/iterators/use_after_iter.cocci
··· 35 35 iterator name hlist_for_each_entry_safe; 36 36 statement S; 37 37 position p1,p2; 38 + type T; 38 39 @@ 39 40 40 41 ( ··· 125 124 sizeof(<+...c...+>) 126 125 | 127 126 &c->member 127 + | 128 + T c; 128 129 | 129 130 c = E 130 131 |
+5
scripts/coccinelle/misc/boolinit.cocci
··· 136 136 @r4 depends on !patch@ 137 137 bool b; 138 138 position p2; 139 + identifier i; 139 140 constant c != {0,1}; 140 141 @@ 142 + ( 143 + b = i 144 + | 141 145 *b@p2 = c 146 + ) 142 147 143 148 @script:python depends on org@ 144 149 p << r1.p;
+1 -1
scripts/gcc-goto.sh
··· 3 3 # Test for gcc 'asm goto' support 4 4 # Copyright (C) 2010, Jason Baron <jbaron@redhat.com> 5 5 6 - cat << "END" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y" 6 + cat << "END" | $@ -x c - -fno-PIE -c -o /dev/null 7 7 int main(void) 8 8 { 9 9 #if defined(__arm__) || defined(__aarch64__)
+2 -2
scripts/kallsyms.c
··· 334 334 printf("#include <asm/types.h>\n"); 335 335 printf("#if BITS_PER_LONG == 64\n"); 336 336 printf("#define PTR .quad\n"); 337 - printf("#define ALGN .align 8\n"); 337 + printf("#define ALGN .balign 8\n"); 338 338 printf("#else\n"); 339 339 printf("#define PTR .long\n"); 340 - printf("#define ALGN .align 4\n"); 340 + printf("#define ALGN .balign 4\n"); 341 341 printf("#endif\n"); 342 342 343 343 printf("\t.section .rodata, \"a\"\n");
+1
scripts/kconfig/.gitignore
··· 2 2 # Generated files 3 3 # 4 4 *.moc 5 + *conf-cfg 5 6 6 7 # 7 8 # configuration programs
+19 -21
scripts/kconfig/Makefile
··· 157 157 hostprogs-y += nconf 158 158 nconf-objs := nconf.o nconf.gui.o $(common-objs) 159 159 160 - HOSTLDLIBS_nconf = $(shell . $(obj)/.nconf-cfg && echo $$libs) 161 - HOSTCFLAGS_nconf.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags) 162 - HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags) 160 + HOSTLDLIBS_nconf = $(shell . $(obj)/nconf-cfg && echo $$libs) 161 + HOSTCFLAGS_nconf.o = $(shell . $(obj)/nconf-cfg && echo $$cflags) 162 + HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/nconf-cfg && echo $$cflags) 163 163 164 - $(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/.nconf-cfg 164 + $(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/nconf-cfg 165 165 166 166 # mconf: Used for the menuconfig target based on lxdialog 167 167 hostprogs-y += mconf 168 168 lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o 169 169 mconf-objs := mconf.o $(addprefix lxdialog/, $(lxdialog)) $(common-objs) 170 170 171 - HOSTLDLIBS_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs) 171 + HOSTLDLIBS_mconf = $(shell . $(obj)/mconf-cfg && echo $$libs) 172 172 $(foreach f, mconf.o $(lxdialog), \ 173 - $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/.mconf-cfg && echo $$$$cflags))) 173 + $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/mconf-cfg && echo $$$$cflags))) 174 174 175 - $(obj)/mconf.o: $(obj)/.mconf-cfg 176 - $(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/.mconf-cfg 175 + $(obj)/mconf.o: $(obj)/mconf-cfg 176 + $(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/mconf-cfg 177 177 178 178 # qconf: Used for the xconfig target based on Qt 179 179 hostprogs-y += qconf 180 180 qconf-cxxobjs := qconf.o 181 181 qconf-objs := images.o $(common-objs) 182 182 183 - HOSTLDLIBS_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs) 184 - HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags) 183 + HOSTLDLIBS_qconf = $(shell . $(obj)/qconf-cfg && echo $$libs) 184 + HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/qconf-cfg && echo $$cflags) 185 185 186 - $(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc 186 + $(obj)/qconf.o: $(obj)/qconf-cfg $(obj)/qconf.moc 187 187 188 188 quiet_cmd_moc = MOC $@ 189 - cmd_moc = $(shell . $(obj)/.qconf-cfg && echo $$moc) -i $< -o $@ 189 + cmd_moc = $(shell . $(obj)/qconf-cfg && echo $$moc) -i $< -o $@ 190 190 191 - $(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg 191 + $(obj)/%.moc: $(src)/%.h $(obj)/qconf-cfg 192 192 $(call cmd,moc) 193 193 194 194 # gconf: Used for the gconfig target based on GTK+ 195 195 hostprogs-y += gconf 196 196 gconf-objs := gconf.o images.o $(common-objs) 197 197 198 - HOSTLDLIBS_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs) 199 - HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags) 198 + HOSTLDLIBS_gconf = $(shell . $(obj)/gconf-cfg && echo $$libs) 199 + HOSTCFLAGS_gconf.o = $(shell . $(obj)/gconf-cfg && echo $$cflags) 200 200 201 - $(obj)/gconf.o: $(obj)/.gconf-cfg 201 + $(obj)/gconf.o: $(obj)/gconf-cfg 202 202 203 203 # check if necessary packages are available, and configure build flags 204 - define filechk_conf_cfg 205 - $(CONFIG_SHELL) $< 206 - endef 204 + filechk_conf_cfg = $(CONFIG_SHELL) $< 207 205 208 - $(obj)/.%conf-cfg: $(src)/%conf-cfg.sh FORCE 206 + $(obj)/%conf-cfg: $(src)/%conf-cfg.sh FORCE 209 207 $(call filechk,conf_cfg) 210 208 211 - clean-files += .*conf-cfg 209 + clean-files += conf-cfg
-1
scripts/kconfig/zconf.y
··· 35 35 %union 36 36 { 37 37 char *string; 38 - struct file *file; 39 38 struct symbol *symbol; 40 39 struct expr *expr; 41 40 struct menu *menu;
+3 -3
tools/arch/x86/include/asm/rmwcc.h
··· 2 2 #ifndef _TOOLS_LINUX_ASM_X86_RMWcc 3 3 #define _TOOLS_LINUX_ASM_X86_RMWcc 4 4 5 - #ifdef CC_HAVE_ASM_GOTO 5 + #ifdef CONFIG_CC_HAS_ASM_GOTO 6 6 7 7 #define __GEN_RMWcc(fullop, var, cc, ...) \ 8 8 do { \ ··· 20 20 #define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \ 21 21 __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val)) 22 22 23 - #else /* !CC_HAVE_ASM_GOTO */ 23 + #else /* !CONFIG_CC_HAS_ASM_GOTO */ 24 24 25 25 #define __GEN_RMWcc(fullop, var, cc, ...) \ 26 26 do { \ ··· 37 37 #define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \ 38 38 __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val)) 39 39 40 - #endif /* CC_HAVE_ASM_GOTO */ 40 + #endif /* CONFIG_CC_HAS_ASM_GOTO */ 41 41 42 42 #endif /* _TOOLS_LINUX_ASM_X86_RMWcc */