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: 13454543 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC3F93C067 for ; Mon, 13 Nov 2023 23:08:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="QFerk8wX" Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 715411B5 for ; Mon, 13 Nov 2023 15:08:55 -0800 (PST) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-507a29c7eefso6993122e87.1 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=vbkkhUlKfb4rRvVmu4Tz0xJ8SjSGDSGjr+vXUFx/+4ADWgxRQi/a4MgYpH2JqZU5UB E5nLEj/c6LVXBeB9gE2sq3yiayYmG5JpQbz9sUpaMBEnCbQI1AZGpYbV6V83COkAcFiF QvirR/eiwJj+VhArvbaCq+DJ48jZuMYJpPvSp1Z5N/y58j+ghOpqTtsIb+U8/2WS01Cc 30hAGRiKYMsUIq1PRAorZdTvFS121GwVNbf4RwNaoXK95A1t1J36zdNIvAG0Vr2V2QSZ WDgXykTkjg1JAjnC88a2pTHwk6NRpaPhsa/m1FFSBqdeVHZMA+mt+gtcttLZ44TC1EZr AHBg== X-Gm-Message-State: AOJu0YykqRNZCSSQdn8aoeYhGZrAtILiRszMQ5AzTjQ2Kqu+08jA1Ksl CcTOoDsSRL0JHvGHt2sSwrrD4qB5wNuzi8qKdc8= X-Google-Smtp-Source: AGHT+IHTUId+0HJ4T45+iwtwHrEWqjSbHl2ub84wm4qF/7cvEBUNB/FCXGvBhq2OudQkog7DHYvxzQ== 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 Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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__)