From nobody Sun Sep 14 22:49:45 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8CEBC54EE9 for ; Tue, 13 Sep 2022 14:41:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231366AbiIMOlv (ORCPT ); Tue, 13 Sep 2022 10:41:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230150AbiIMOkr (ORCPT ); Tue, 13 Sep 2022 10:40:47 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C85E6D9E3; Tue, 13 Sep 2022 07:21:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 38EAA614AE; Tue, 13 Sep 2022 14:20:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49D2DC433C1; Tue, 13 Sep 2022 14:20:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663078842; bh=tZ63s44RQjryfuCe0CUUP58SoCsvCG597kk38pNZ/W4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wb48VH/FJ58+DR1JSNqNgtz8Gk4lApCCZCs1Kzcyf4p6CCBWMm73aDiSprY3a4zEc wgTjqKo3p3c6CxpiYnOtxTUU5bOEC+4GMZB3v5q+Od7+1k9iuI8RCuvy44zBuxLYaW +xjYJJ+ilke7PjPxmPPuY1tmTicBmnjxzq6S6Vhc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masahiro Yamada , Richard Weinberger , Sasha Levin Subject: [PATCH 5.15 104/121] kbuild: disable header exports for UML in a straightforward way Date: Tue, 13 Sep 2022 16:04:55 +0200 Message-Id: <20220913140401.818922514@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220913140357.323297659@linuxfoundation.org> References: <20220913140357.323297659@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Masahiro Yamada [ Upstream commit 1b620d539ccc18a1aca1613d9ff078115a7891a1 ] Previously 'make ARCH=3Dum headers' stopped because of missing arch/um/include/uapi/asm/Kbuild. The error is not shown since commit ed102bf2afed ("um: Fix W=3D1 missing-include-dirs warnings") added arch/um/include/uapi/asm/Kbuild. Hard-code the unsupported architecture, so it works like before. Fixes: ed102bf2afed ("um: Fix W=3D1 missing-include-dirs warnings") Signed-off-by: Masahiro Yamada Acked-by: Richard Weinberger Signed-off-by: Sasha Levin --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index eca45b7be9c1e..32253ea989217 100644 --- a/Makefile +++ b/Makefile @@ -1332,8 +1332,7 @@ hdr-inst :=3D -f $(srctree)/scripts/Makefile.headersi= nst obj =20 PHONY +=3D headers headers: $(version_h) scripts_unifdef uapi-asm-generic archheaders archscr= ipts - $(if $(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/Kbuild),, \ - $(error Headers not exportable for the $(SRCARCH) architecture)) + $(if $(filter um, $(SRCARCH)), $(error Headers not exportable for UML)) $(Q)$(MAKE) $(hdr-inst)=3Dinclude/uapi $(Q)$(MAKE) $(hdr-inst)=3Darch/$(SRCARCH)/include/uapi =20 --=20 2.35.1