From patchwork Mon Nov 13 23:08:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 164668 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1529430vqg; Mon, 13 Nov 2023 15:09:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IHK2J5Npi6SudJm1mADpbQc9i4Tnl/jsH9e1P7927n9w98l2PVWcIDMc0jGUd4VrlGAUEtE X-Received: by 2002:a05:6808:14c:b0:3b6:c4dd:be83 with SMTP id h12-20020a056808014c00b003b6c4ddbe83mr9623638oie.52.1699916951886; Mon, 13 Nov 2023 15:09:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699916951; cv=none; d=google.com; s=arc-20160816; b=cpF3U3UHVQGHkua/dj+f8yRPdyRT0dyI/juEud3fAdXjID9CFWInRB8e49G980bQTV E8jb8cWFkrkcwVGRUbmJngTfQqf4vSYHWcQ1P2+lupa7evpCcbBpOJft3WUgdIELShk4 1/KnP+/NkCayvASZoR2lJbVs1Dl0qipwr+TxgGw5zAtmtuQXF1xoOJsZPOMNrzqVSJMh iwcanw8O+LgdSeJJj3gYlIrQNCzcYHqroIiXi8bMNANvNIPO+kTdeuRZrOUsiukiAF6S f5dlzrznD+csJGPGc7lqp3ZoAweL/7rTBMBtYOQIjsCesZ8Mi2GTAbmzcecTO0HAQDbb ghoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=ACmx3TNz3KrSPf31LlnpB3IxofbprNijom9dYNvkSxs=; fh=CImX+tKSQ38Ax8+C0xC+uwfkZ+Ou/Wt+RACk9xWlhkE=; b=xz/5rm3SS7V+kEJMHJC9PWTG5SeoBrttE1cwc1YjA3M4jlU8gurLUlfnUwXXMGbYq+ 3GRZMRUNxON37yksJvEi6FXufd3Rf8sh3aihXzn+EoQ7g95jub33PKG6QmUdwHyTp9/f YpNHeqcsfYNueLaO20p+rT3ZkglNeUtYXBtV+SJojDhP+42WkbO9cjuvmmJdum7jZVAS nHJxCpUsn0aSpssurwArYT+lXDlB3z0Qhiu3dTfBb8+pz1liKnZn8+bkHPQltR5TicKF cg7WGmqAoOJNkjgqwbovVe5QaraisJHW8RRamaVYOfAZEPbasL03mYHVBAG4f9qa3BUu wznw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QFerk8wX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id u10-20020a655c0a000000b005c1b30caebasi774218pgr.654.2023.11.13.15.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 15:09:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QFerk8wX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id C5BE88026DCE; Mon, 13 Nov 2023 15:09:10 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230223AbjKMXJB (ORCPT + 30 others); Mon, 13 Nov 2023 18:09:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229677AbjKMXI6 (ORCPT ); Mon, 13 Nov 2023 18:08:58 -0500 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E287D48 for ; Mon, 13 Nov 2023 15:08:55 -0800 (PST) Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-507a0907896so6972263e87.2 for ; Mon, 13 Nov 2023 15:08:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699916934; x=1700521734; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=ACmx3TNz3KrSPf31LlnpB3IxofbprNijom9dYNvkSxs=; b=QFerk8wXy69JkWtiT+9/uJFQWJp29vYvZW8IcP4rKjX0BZp1NgmEYbTQrQJ5Ms50nE pM1Pae2eNbYnxO3frMsRctKmb+up6NkUnXaGWWUHY6kxeQqPdHE+vXU7DG/UbatRpB5K rlGomcLOaQhz0T6EsEtqSUzoYlhy0Fuml+S2zY9PIRpsCT/HECn011fRg4fUan+f7Fze zv6dRIdW4E1qcdulOBGEoD6obA5D4u+3qGWwlC45FkeCqYdrDT4tcrth5+2VbVDcZfnX W3zbUBOw8yYW58ujyZWBTX7xyvPBmSxRiTS+Rxg1mKzO5F8fRGR0uf0EUa/hikuQ4+uF rZrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699916934; x=1700521734; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ACmx3TNz3KrSPf31LlnpB3IxofbprNijom9dYNvkSxs=; b=OvQN9UrRJiSlk2kwt6ZZagtFAsnz1qL8K3byHVfCuL7WhOZXRjI4OE8VUTxPq3wjum f5cTEQJik3RGySVZDC+iI25/TT0JMywMEmTc8Z8DP1Bs+KihSsQYdNay35ZUtyeSFPb6 1K+U6cEUIhqubNQ/3dGjldw1ALshiFIQL7VhhLLcOcQmh3BXypO2I74Tpy8St3n5B/j3 LMdN8dpN82LizEJirKAYZeRTFG1hA6+Y3Ae3RvfGe28M6u9MpKZUudG3dPglOzlUsqJB 2YO6Kym8y9IahJBdfMoCh0YzTqKsBPYqqXrLi7OWPwWxAxWLnP62pOPXFWmfusPYECfe joeA== X-Gm-Message-State: AOJu0YxyExRiV7i7C7PpQTp+SDLXC389euHxMkpXGJEQQPzgobXugxH0 sN64qD2ViEqfOGC2jk7YUHBAKg== X-Received: by 2002:ac2:43a6:0:b0:509:38de:9917 with SMTP id t6-20020ac243a6000000b0050938de9917mr5282007lfl.21.1699916933673; Mon, 13 Nov 2023 15:08:53 -0800 (PST) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id m9-20020ac24ac9000000b0050307bf2bcdsm1114292lfp.247.2023.11.13.15.08.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 15:08:53 -0800 (PST) From: Linus Walleij Date: Tue, 14 Nov 2023 00:08:47 +0100 Subject: [PATCH] ACPI: acenv: Permit compilation from within the kernel MIME-Version: 1.0 Message-Id: <20231114-arm-build-bug-v1-1-458745fe32a4@linaro.org> X-B4-Tracking: v=1; b=H4sIAH6sUmUC/x2MQQqAIBAAvxJ7Tmi1DvaV6GC52kJZKEUg/j3pM jCHmQyJIlOCsckQ6eHEZ6iCbQPrZoInwbY6yE4qRFTCxEMsN++20gtDQ6+clYhaQ22uSI7f/zf NpXyuNDVMXwAAAA== To: "Rafael J. Wysocki" , Len Brown , Robert Moore , Dave Jiang , Jonathan Cameron , Dan Williams , Hanjun Guo , Arnd Bergmann Cc: "Rafael J. Wysocki" , linux-acpi@vger.kernel.org, acpica-devel@lists.linux.dev, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linus Walleij X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 13 Nov 2023 15:09:10 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782492117889786747 X-GMAIL-MSGID: 1782492117889786747 After commit a103f46633fd the kernel stopped compiling for several ARM32 platforms that I am building with a bare metal compiler. Bare metal compilers (arm-none-eabi-) don't define __linux__. This is because the header is now in the include path for : CC arch/arm/kernel/irq.o CC kernel/sysctl.o CC crypto/api.o In file included from ../include/acpi/acpi.h:22, from ../include/linux/fw_table.h:29, from ../include/linux/acpi.h:18, from ../include/linux/irqchip.h:14, from ../arch/arm/kernel/irq.c:25: ../include/acpi/platform/acenv.h:218:2: error: #error Unknown target environment 218 | #error Unknown target environment | ^~~~~ One solution to make compilation with a bare metal compiler work again is to say the file is used with Linux from within the kernel if __KERNEL__ is defined so I did that. Fixes: a103f46633fd ("acpi: Move common tables helper functions to common lib") Signed-off-by: Linus Walleij --- include/acpi/platform/acenv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: 9bacdd8996c77c42ca004440be610692275ff9d0 change-id: 20231113-arm-build-bug-ae543fd21199 Best regards, diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h index 337ffa931ee8..76444ffdc549 100644 --- a/include/acpi/platform/acenv.h +++ b/include/acpi/platform/acenv.h @@ -156,7 +156,7 @@ #endif -#if defined(_LINUX) || defined(__linux__) +#if defined(_LINUX) || defined(__linux__) || defined(__KERNEL__) #include #elif defined(_APPLE) || defined(__APPLE__)