[5.4,274/344] objtool: Fix ARCH=x86_64 build error

Message ID	20200221072414.609965291@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=vU/u=4J=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Shile Zhang <shile.zhang@linux.alibaba.com>, Josh Poimboeuf <jpoimboe@redhat.com>, Ingo Molnar <mingo@kernel.org>, Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.4 274/344] objtool: Fix ARCH=x86_64 build error Date: Fri, 21 Feb 2020 08:41:13 +0100 Message-Id: <20200221072414.609965291@linuxfoundation.org> In-Reply-To: <20200221072349.335551332@linuxfoundation.org> References: <20200221072349.335551332@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.4,003/344] net/smc: fix leak of kernel memory to user space [5.4,006/344] net/sched: flower: add missing validation of TCA_FLOWER_FLAGS [5.4,007/344] drm/gma500: Fixup fbdev stolen size usage evaluation [5.4,008/344] ath10k: Fix qmi init error handling [5.4,011/344] nfsd4: avoid NULL deference on strange COPY compounds [5.4,014/344] soc: fsl: qe: change return type of cpm_muram_alloc() to s32 [5.4,016/344] f2fs: preallocate DIO blocks when forcing buffered_io [5.4,017/344] f2fs: call f2fs_balance_fs outside of locked page [5.4,018/344] media: meson: add missing allocation failure check on new_buf [5.4,019/344] clk: meson: pll: Fix by 0 division in __pll_params_to_rate() [5.4,022/344] brcmfmac: Fix use after free in brcmf_sdio_readframes() [5.4,024/344] drm/amd/display: Map ODM memory correctly when doing ODM combine [5.4,025/344] leds: pca963x: Fix open-drain initialization [5.4,028/344] gianfar: Fix TX timestamping with a stacked DSA driver [5.4,032/344] drm/msm/adreno: fix zap vs no-zap handling [5.4,033/344] pxa168fb: Fix the function used to release some memory in an error handling path [5.4,036/344] media: sun4i-csi: Deal with DRAM offset [5.4,039/344] clk: at91: sam9x60: fix programmable clock prescaler [5.4,041/344] clk: meson: meson8b: make the CCF use the glitch-free mali mux [5.4,042/344] gpio: gpio-grgpio: fix possible sleep-in-atomic-context bugs in grgpio_irq_map/unmap() [5.4,045/344] char/random: silence a lockdep splat with printk() [5.4,048/344] IB/core: Let IB core distribute cache update events [5.4,049/344] pinctrl: baytrail: Do not clear IRQ flags on direct-irq enabled pins [5.4,051/344] MIPS: Loongson: Fix potential NULL dereference in loongson3_platform_init() [5.4,052/344] sparc: Add .exit.data section. [5.4,055/344] uio: fix a sleep-in-atomic-context bug in uio_dmem_genirq_irqcontrol() [5.4,057/344] spi: fsl-lpspi: fix only one cs-gpio working [5.4,059/344] usb: gadget: udc: fix possible sleep-in-atomic-context bugs in gr_probe() [5.4,061/344] clocksource/drivers/bcm2835_timer: Fix memory leak of timer [5.4,063/344] kselftest: Minimise dependency of get_size on C library interfaces [5.4,064/344] jbd2: clear JBD2_ABORT flag before journal_reset to update log tail info when load ... [5.4,065/344] ext4: fix deadlock allocating bio_post_read_ctx from mempool [5.4,067/344] x86/sysfb: Fix check for bad VRAM size [5.4,069/344] udf: Allow writing to Rewritable partitions [5.4,071/344] wan/hdlc_x25: fix skb handling [5.4,073/344] powerpc/iov: Move VF pdev fixup into pcibios_fixup_iov() [5.4,074/344] tracing: Fix tracing_stat return values in error handling paths [5.4,075/344] tracing: Fix very unlikely race of registering two stat tracers [5.4,077/344] ext4, jbd2: ensure panic when aborting with zero errno [5.4,079/344] rtw88: fix rate mask for 1SS chip [5.4,082/344] rtc: i2c/spi: Avoid inclusion of REGMAP support when not needed [5.4,084/344] tracing: Simplify assignment parsing for hist triggers [5.4,085/344] nbd: add a flush_workqueue in nbd_start_device [5.4,086/344] KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups [5.4,089/344] block, bfq: do not plug I/O for bfq_queues with no proc refs [5.4,090/344] kconfig: fix broken dependency in randconfig-generated .config [5.4,093/344] drm/amdkfd: Fix a bug in SDMA RLC queue counting under HWS mode [5.4,095/344] drm/amdgpu: remove 4 set but not used variable in amdgpu_atombios_get_connector_inf... [5.4,098/344] drm/panel: simple: Add Logic PD Type 28 display support [5.4,100/344] modules: lockdep: Suppress suspicious RCU usage warning [5.4,101/344] ASoC: intel: sof_rt5682: Add quirk for number of HDMI DAIs [5.4,103/344] regulator: rk808: Lower log level on optional GPIOs being not available [5.4,105/344] NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu(). [5.4,108/344] arm: dts: allwinner: H3: Add PMU node [5.4,110/344] selinux: ensure we cleanup the internal AVC counters on error in avc_insert() [5.4,115/344] ARM: exynos_defconfig: Bring back explicitly wanted options [5.4,116/344] ARM: dts: imx6: rdu2: Disable WP for USDHC2 and USDHC3 [5.4,118/344] bus: ti-sysc: Implement quirk handling for CLKDM_NOAUTO [5.4,119/344] PCI: iproc: Apply quirk_paxc_bridge() for module as well as built-in [5.4,121/344] PCI: Add generic quirk for increasing D3hot delay [5.4,123/344] Revert "nfp: abm: fix memory leak in nfp_abm_u32_knode_replace" [5.4,127/344] reiserfs: Fix spurious unlock in reiserfs_fill_super() error handling [5.4,128/344] samples/bpf: Set -fno-stack-protector when building BPF programs [5.4,129/344] r8169: check that Realtek PHY driver module is loaded [5.4,132/344] ARM: OMAP2+: pdata-quirks: add PRM data for reset support [5.4,133/344] netfilter: nft_tunnel: add the missing ERSPAN_VERSION nla_policy [5.4,134/344] ALSA: usx2y: Adjust indentation in snd_usX2Y_hwdep_dsp_status [5.4,137/344] b43legacy: Fix -Wcast-function-type [5.4,138/344] ipw2x00: Fix -Wcast-function-type [5.4,141/344] orinoco: avoid assertion in case of NULL pointer [5.4,142/344] drm/amdgpu: fix KIQ ring test fail in TDR of SRIOV [5.4,143/344] clk: qcom: smd: Add missing bimc clock [5.4,144/344] ACPICA: Disassembler: create buffer fields in ACPI_PARSE_LOAD_PASS1 [5.4,147/344] scsi: aic7xxx: Adjust indentation in ahc_find_syncrate [5.4,148/344] crypto: inside-secure - add unspecified HAS_IOMEM dependency [5.4,151/344] ARM: dts: r8a7779: Add device node for ARM global timer [5.4,152/344] selinux: ensure we cleanup the internal AVC counters on error in avc_update() [5.4,156/344] iommu/amd: Only support x2APIC with IVHD type 11h/40h [5.4,158/344] clk: actually call the clock init before any other callback of the clock [5.4,159/344] dmaengine: Store module owner in dma_device struct [5.4,160/344] dmaengine: imx-sdma: Fix memory leak [5.4,162/344] net: phy: realtek: add logging for the RGMII TX delay configuration [5.4,167/344] drm/fbdev: Fallback to non tiled mode if all tiles not present [5.4,168/344] pinctrl: sh-pfc: sh7269: Fix CAN function GPIOs [5.4,171/344] fbdev: fix numbering of fbcon options [5.4,172/344] RDMA/rxe: Fix error type of mmap_offset [5.4,173/344] clk: sunxi-ng: add mux and pll notifiers for A64 CPU clock [5.4,176/344] clk: uniphier: Add SCSSI clock gate for each channel [5.4,178/344] ALSA: sh: Fix compile warning wrt const [5.4,183/344] x86/unwind/orc: Fix !CONFIG_MODULES build warning [5.4,185/344] iommu/vt-d: Match CPU and IOMMU paging mode [5.4,187/344] drm/amdkfd: Fix permissions of hang_hws [5.4,188/344] mlx5: work around high stack usage with gcc [5.4,190/344] drm: remove the newline for CRC source name. [5.4,191/344] usb: dwc3: use proper initializers for property entries [5.4,193/344] usbip: Fix unsafe unaligned pointer usage [5.4,194/344] udf: Fix free space reporting for metadata and virtual partitions [5.4,196/344] staging: rtl8188: avoid excessive stack usage [5.4,197/344] IB/hfi1: Add software counter for ctxt0 seq drop [5.4,200/344] efi/x86: Dont panic or BUG() on non-critical error conditions [5.4,201/344] rcu: Use WRITE_ONCE() for assignments to ->pprev for hlist_nulls [5.4,202/344] Input: edt-ft5x06 - work around first register access error [5.4,206/344] clocksource: davinci: only enable clockevents once tim34 is initialized [5.4,208/344] arm64: dts: rockchip: add reg property to brcmf sub-nodes [5.4,211/344] ASoC: atmel: fix build error with CONFIG_SND_ATMEL_SOC_DMA=m [5.4,212/344] raid6/test: fix a compilation warning [5.4,214/344] tty: synclinkmp: Adjust indentation in several functions [5.4,217/344] visorbus: fix uninitialized variable access [5.4,218/344] driver core: platform: Prevent resouce overflow from causing infinite loops [5.4,219/344] driver core: Print device when resources present in really_probe() [5.4,220/344] ASoC: SOF: Intel: hda-dai: fix compilation warning in pcm_prepare [5.4,221/344] bpf: Return -EBADRQC for invalid map type in __bpf_tx_xdp_map [5.4,223/344] drm/nouveau/secboot/gm20b: initialize pointer in gm20b_secboot_new() [5.4,225/344] drm/nouveau: Fix copy-paste error in nouveau_fence_wait_uevent_handler [5.4,227/344] drm/nouveau/fault/gv100-: fix memory leak on module unload [5.4,229/344] gpiolib: Set lockdep class for hierarchical irq domains [5.4,231/344] perf/imx_ddr: Fix cpu hotplug state cleanup [5.4,232/344] usb: musb: omap2430: Get rid of musb .set_vbus for omap2430 glue [5.4,235/344] ALSA: usb-audio: unlock on error in probe [5.4,236/344] f2fs: set I_LINKABLE early to avoid wrong access by vfs [5.4,240/344] scsi: iscsi: Dont destroy session if there are outstanding connections [5.4,242/344] ALSA: usb-audio: add implicit fb quirk for MOTU M Series [5.4,245/344] arm64: fix alternatives with LLVMs integrated assembler [5.4,246/344] drm/amd/display: fixup DML dependencies [5.4,248/344] KVM: PPC: Remove set but not used variable ra, rs, rt [5.4,250/344] sched/core: Fix size of rq::uclamp initialization [5.4,252/344] perf/x86/amd: Constrain Large Increment per Cycle events [5.4,255/344] debugobjects: Fix various data races [5.4,257/344] regulator: vctrl-regulator: Avoid deadlock getting and setting the voltage [5.4,262/344] ide: serverworks: potential overflow in svwks_set_pio_mode() [5.4,264/344] btrfs: fix possible NULL-pointer dereference in integrity checks [5.4,266/344] btrfs: device stats, log when stats are zeroed [5.4,269/344] regulator: core: Fix exported symbols to the exported GPL version [5.4,270/344] irqchip/mbigen: Set driver .suppress_bind_attrs to avoid remove problems [5.4,271/344] ALSA: hda/hdmi - add retry logic to parse_intel_hdmi() [5.4,274/344] objtool: Fix ARCH=x86_64 build error [5.4,276/344] s390: adjust -mpacked-stack support check for clang 10 [5.4,277/344] s390/ftrace: generate traced function stack frame [5.4,278/344] driver core: platform: fix u32 greater or equal to zero comparison [5.4,281/344] sunrpc: Fix potential leaks in sunrpc_cache_unhash() [5.4,283/344] powerpc/sriov: Remove VF eeh_dev state when disabling SR-IOV [5.4,286/344] btrfs: Fix split-brain handling when changing FSID to metadata uuid [5.4,287/344] bcache: cached_dev_free needs to put the sb page [5.4,288/344] bcache: rework error unwinding in register_bcache [5.4,291/344] alarmtimer: Make alarmtimer platform device child of RTC device [5.4,292/344] selftests: bpf: Reset global state between reuseport test runs [5.4,294/344] jbd2: make sure ESHUTDOWN to be recorded in the journal superblock [5.4,297/344] ARM: 8951/1: Fix Kexec compilation issue. [5.4,299/344] hostap: Adjust indentation in prism2_hostapd_add_sta [5.4,300/344] rtw88: fix potential NULL skb access in TX ISR [5.4,303/344] cifs: Fix mount options set in automount [5.4,304/344] cifs: fix NULL dereference in match_prepath [5.4,306/344] powerpc/mm: Dont log user reads to 0xffffffff [5.4,308/344] rbd: work around -Wuninitialized warning [5.4,312/344] char: hpet: Fix out-of-bounds read bug [5.4,313/344] ftrace: fpid_next() should increase position index [5.4,315/344] radeon: insert 10ms sleep in dce5_crtc_load_lut [5.4,317/344] btrfs: do not do delalloc reservation under page lock [5.4,319/344] ocfs2: fix a NULL pointer dereference when call ocfs2_update_inode_fsync_trans() [5.4,320/344] lib/scatterlist.c: adjust indentation in __sg_alloc_table [5.4,324/344] bcache: fix incorrect data type usage in btree_flush_write() [5.4,327/344] nvme-pci: remove nvmeq->tags [5.4,328/344] iwlwifi: mvm: Fix thermal zone registration [5.4,329/344] iwlwifi: mvm: Check the sta is not NULL in iwl_mvm_cfg_he_sta() [5.4,331/344] microblaze: Prevent the overflow of the start [5.4,332/344] brd: check and limit max_part par [5.4,334/344] drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_voltage [5.4,336/344] help_next should increase position index [5.4,338/344] cifs: log warning message (once) if out of disk space [5.4,339/344] virtio_balloon: prevent pfn array overflow [5.4,340/344] fuse: dont overflow LLONG_MAX with end offset [5.4,341/344] mlxsw: spectrum_dpipe: Add missing error path

Message ID

20200221072414.609965291@linuxfoundation.org

State

New

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org,
	Shile Zhang <shile.zhang@linux.alibaba.com>,
	Josh Poimboeuf <jpoimboe@redhat.com>, Ingo Molnar <mingo@kernel.org>,
	Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>,
	Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.4 274/344] objtool: Fix ARCH=x86_64 build error
Date: Fri, 21 Feb 2020 08:41:13 +0100
Message-Id: <20200221072414.609965291@linuxfoundation.org>
In-Reply-To: <20200221072349.335551332@linuxfoundation.org>
References: <20200221072349.335551332@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: stable-owner@vger.kernel.org
Precedence: bulk

Series

None | expand

Commit Message

Greg KH Feb. 21, 2020, 7:41 a.m. UTC

From: Shile Zhang <shile.zhang@linux.alibaba.com>

[ Upstream commit 8580bed7e751e6d4f17881e059daf3cb37ba4717 ]

Building objtool with ARCH=x86_64 fails with:

   $make ARCH=x86_64 -C tools/objtool
   ...
     CC       arch/x86/decode.o
   arch/x86/decode.c:10:22: fatal error: asm/insn.h: No such file or directory
    #include <asm/insn.h>
                         ^
   compilation terminated.
   mv: cannot stat ‘arch/x86/.decode.o.tmp’: No such file or directory
   make[2]: *** [arch/x86/decode.o] Error 1
   ...

The root cause is that the command-line variable 'ARCH' cannot be
overridden.  It can be replaced by 'SRCARCH', which is defined in
'tools/scripts/Makefile.arch'.

Signed-off-by: Shile Zhang <shile.zhang@linux.alibaba.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Link: https://lore.kernel.org/r/d5d11370ae116df6c653493acd300ec3d7f5e925.1579543924.git.jpoimboe@redhat.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 tools/objtool/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
index d2a19b0bc05aa..ee08aeff30a19 100644
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
@@ -2,10 +2,6 @@ 
 include ../scripts/Makefile.include
 include ../scripts/Makefile.arch
 
-ifeq ($(ARCH),x86_64)
-ARCH := x86
-endif
-
 # always use the host compiler
 HOSTAR	?= ar
 HOSTCC	?= gcc
@@ -33,7 +29,7 @@  all: $(OBJTOOL)
 
 INCLUDES := -I$(srctree)/tools/include \
 	    -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \
-	    -I$(srctree)/tools/arch/$(ARCH)/include
+	    -I$(srctree)/tools/arch/$(SRCARCH)/include
 WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed
 CFLAGS   := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)
 LDFLAGS  += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)

[5.4,274/344] objtool: Fix ARCH=x86_64 build error

Commit Message

Patch