From patchwork Wed Dec 23 09:29:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 58969 Delivered-To: patch@linaro.org Received: by 10.112.89.199 with SMTP id bq7csp3744812lbb; Wed, 23 Dec 2015 01:31:19 -0800 (PST) X-Received: by 10.66.65.109 with SMTP id w13mr42178685pas.142.1450863078854; Wed, 23 Dec 2015 01:31:18 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id hl6si282397pac.123.2015.12.23.01.31.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Dec 2015 01:31:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aBfkA-0002yi-1E; Wed, 23 Dec 2015 09:30:02 +0000 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aBfk6-0002so-6z for linux-arm-kernel@lists.infradead.org; Wed, 23 Dec 2015 09:29:59 +0000 Received: by mail-wm0-x236.google.com with SMTP id p187so138849151wmp.1 for ; Wed, 23 Dec 2015 01:29:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=7VZzff5Fubch3WA7GSLC3gvEd2m2sZRpAerOzli496o=; b=bhjUQQNrm5aI9BaF0D423YdjjuCVZagWLRP6zb2gVeTNOrqKyuURO2bNBKSOh3Xitm ega21yQewEZp8jRw3FlA4ZXWDGEXResBxuReA0gZeqhq65vy7BAjDN6edi2A4kcx+kAp H5BzOxDTDWsl+PSJdI5DmV58FFAz0B7qSxElg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7VZzff5Fubch3WA7GSLC3gvEd2m2sZRpAerOzli496o=; b=bGwrzLljf8jfoBP3DsGu8MjG5gKAnKq0pqbMPEN11ACyMLjo4CriUlF2AW1ag0Bybi LYtJr46dHGnyrkO/B3B/gVKEAXxDaUdH6ooJCb6qNDJsANCuW6QmAhW334UknpkgZs49 7ia7quZWEWB7Ii+ZxdvzkIUOh96+Y2WvgzPifKdDUMQ8hK7q/KCxVXGwl/N4L2ghcubc piw82bYhkWWPJuqGVWDkYo4lOhjU0PNCCAusFN6KtELqY/2lqrwOL6YjD2duNnKdj5iU Wxpq3mjtShNA3k3SgKbLANJAA1UWC28FZmy4uwgvZ144aHR/XMGrq9RkwbZsNG9QHMu+ myYA== X-Gm-Message-State: ALoCoQlU7/rr5erfX49OVm1A74M02lSCsmjhl874Bwn37+GUCeEguV4O7VwVAnzW0qcjquNP3hyJo0q9YrtA6R13vA8wWYNUGA== X-Received: by 10.194.23.162 with SMTP id n2mr35979147wjf.152.1450862975908; Wed, 23 Dec 2015 01:29:35 -0800 (PST) Received: from localhost.localdomain (cag06-7-83-153-85-71.fbx.proxad.net. [83.153.85.71]) by smtp.gmail.com with ESMTPSA id cl2sm36513447wjc.33.2015.12.23.01.29.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Dec 2015 01:29:35 -0800 (PST) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, matt@codeblueprint.co.uk, will.deacon@arm.com, catalin.marinas@arm.com Subject: [PATCH] efi: stub: define DISABLE_BRANCH_PROFILING for all architectures Date: Wed, 23 Dec 2015 10:29:28 +0100 Message-Id: <1450862968-20222-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151223_012958_638238_52E171A3 X-CRM114-Status: GOOD ( 10.85 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:236 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org This moves the DISABLE_BRANCH_PROFILING define from the x86 specific to the general CFLAGS definition for the stub. This fixes build errors when building for arm64 with CONFIG_PROFILE_ALL_BRANCHES_ENABLED. Reported-by: Will Deacon Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/libstub/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.5.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel Reviewed-by: Matt Fleming diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile index 3c0467d3688c..c0ddd1b8dca3 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -8,7 +8,7 @@ cflags-$(CONFIG_X86_32) := -march=i386 cflags-$(CONFIG_X86_64) := -mcmodel=small cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 \ -fPIC -fno-strict-aliasing -mno-red-zone \ - -mno-mmx -mno-sse -DDISABLE_BRANCH_PROFILING + -mno-mmx -mno-sse cflags-$(CONFIG_ARM64) := $(subst -pg,,$(KBUILD_CFLAGS)) cflags-$(CONFIG_ARM) := $(subst -pg,,$(KBUILD_CFLAGS)) \ @@ -16,7 +16,7 @@ cflags-$(CONFIG_ARM) := $(subst -pg,,$(KBUILD_CFLAGS)) \ cflags-$(CONFIG_EFI_ARMSTUB) += -I$(srctree)/scripts/dtc/libfdt -KBUILD_CFLAGS := $(cflags-y) \ +KBUILD_CFLAGS := $(cflags-y) -DDISABLE_BRANCH_PROFILING \ $(call cc-option,-ffreestanding) \ $(call cc-option,-fno-stack-protector)