From nobody Sun Dec 14 12:13:44 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 00C4B23ED75; Wed, 10 Dec 2025 14:45:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765377919; cv=none; b=M5r4QAtCZM8SBHRY4k8qV/7Fcs9FHaSd5GFzxX1EA9hHZE+B2yG6yUNdxKl+TrvOGhaFBJwdyAd3g3PK7NxOV7MiCKOZkGbh76yzKUVr0yWU5qSWx4q+zcTnBS4jCl+q8eIYsAUNM0i15+LZQ95T5ywA1yPa7jj5/Qp0onI1eDA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765377919; c=relaxed/simple; bh=rFUtwguG5/wwZfFnpFmopp4L9YEp1dSeOPOmek71TRY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kvKz1oGGRlVVvAU2w94wBqVKAzlG25CDg4ed4gZnRSRRMViiiZ7ZD2mqVo04glPewGSYnWFvVd9ODJe1sRAAEvisOan2KkkQfO2i/V3QeYScnECCAohHB47x2yPdM1Hind6bD67lEW/U8xBuMfN+0zuSpMeVvZEBjwF2rBHyGRQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BFDA0153B; Wed, 10 Dec 2025 06:45:08 -0800 (PST) Received: from e132581.arm.com (e132581.arm.com [10.1.196.87]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C0B593F73B; Wed, 10 Dec 2025 06:45:14 -0800 (PST) From: Leo Yan Date: Wed, 10 Dec 2025 14:44:56 +0000 Subject: [PATCH v2 2/3] Revert "perf tools: Fix arm64 build by generating unistd_64.h" Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251210-perf_fix_syscall_header-v2-2-b18b6016e0ea@arm.com> References: <20251210-perf_fix_syscall_header-v2-0-b18b6016e0ea@arm.com> In-Reply-To: <20251210-perf_fix_syscall_header-v2-0-b18b6016e0ea@arm.com> To: Arnaldo Carvalho de Melo , Namhyung Kim , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Leo Yan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1765377911; l=2519; i=leo.yan@arm.com; s=20250604; h=from:subject:message-id; bh=rFUtwguG5/wwZfFnpFmopp4L9YEp1dSeOPOmek71TRY=; b=g3jPJIHdQUONlJjfwkzZrVBXbVg5fqqDvcNEHzuz3YE618SQ4hSO+R1zAFSNgyeP4dakdZ36F 3Jy4DVZIt1QCUiyJCRMqWTDQKq0HPXJBoCf5ssuySbsT9Bc2EZ+DVGG X-Developer-Key: i=leo.yan@arm.com; a=ed25519; pk=k4BaDbvkCXzBFA7Nw184KHGP5thju8lKqJYIrOWxDhI= This reverts: commit 8988c4b91945 ("perf tools: Fix in-source libperf build") commit bfb713ea53c7 ("perf tools: Fix arm64 build by generating unistd_64.h= ") Since we now have a static unistd_64.h for the arm64 build, there is no need to generate unistd_64.h in libperf. Revert all patches related to generating unistd_64.h. Signed-off-by: Leo Yan --- tools/lib/perf/Makefile | 14 ++------------ tools/perf/Makefile.config | 1 - 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/tools/lib/perf/Makefile b/tools/lib/perf/Makefile index 7fbb50b74c00b3b99ac538821124e04bfbc6da6a..ffcfd777c45181960afc7505ef8= f85d0b7ea7e8d 100644 --- a/tools/lib/perf/Makefile +++ b/tools/lib/perf/Makefile @@ -42,7 +42,6 @@ libdir_relative_SQ =3D $(subst ','\'',$(libdir_relative)) TEST_ARGS :=3D $(if $(V),-v) =20 INCLUDES =3D \ --I$(OUTPUT)arch/$(SRCARCH)/include/generated/uapi \ -I$(srctree)/tools/lib/perf/include \ -I$(srctree)/tools/lib/ \ -I$(srctree)/tools/include \ @@ -100,16 +99,7 @@ $(LIBAPI)-clean: $(call QUIET_CLEAN, libapi) $(Q)$(MAKE) -C $(LIB_DIR) O=3D$(OUTPUT) clean >/dev/null =20 -uapi-asm :=3D $(OUTPUT)arch/$(SRCARCH)/include/generated/uapi/asm -ifeq ($(SRCARCH),arm64) - syscall-y :=3D $(uapi-asm)/unistd_64.h -endif -uapi-asm-generic: - $(if $(syscall-y),\ - $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-headers obj=3D$(uapi-asm)= \ - generic=3Dinclude/uapi/asm-generic $(syscall-y),) - -$(LIBPERF_IN): uapi-asm-generic FORCE +$(LIBPERF_IN): FORCE $(Q)$(MAKE) $(build)=3Dlibperf =20 $(LIBPERF_A): $(LIBPERF_IN) @@ -130,7 +120,7 @@ all: fixdep clean: $(LIBAPI)-clean $(call QUIET_CLEAN, libperf) $(RM) $(LIBPERF_A) \ *.o *~ *.a *.so *.so.$(VERSION) *.so.$(LIBPERF_VERSION) .*= .d .*.cmd tests/*.o LIBPERF-CFLAGS $(LIBPERF_PC) \ - $(TESTS_STATIC) $(TESTS_SHARED) $(syscall-y) + $(TESTS_STATIC) $(TESTS_SHARED) =20 TESTS_IN =3D tests-in.o =20 diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index bd9f4804d56babeeefd0c02758bebf1ff0c040dd..c97ed1190ea097c41ca83f2ace0= 6c008cd7f0ca9 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -64,7 +64,6 @@ include $(srctree)/tools/scripts/Makefile.arch $(call detected_var,SRCARCH) =20 CFLAGS +=3D -I$(OUTPUT)arch/$(SRCARCH)/include/generated -CFLAGS +=3D -I$(OUTPUT)libperf/arch/$(SRCARCH)/include/generated/uapi =20 # Additional ARCH settings for ppc ifeq ($(SRCARCH),powerpc) --=20 2.34.1