From patchwork Thu Feb 1 18:18:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 126564 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1950031ljc; Thu, 1 Feb 2018 10:19:24 -0800 (PST) X-Google-Smtp-Source: AH8x227yX3WrZuFDILYK2h0PcF0zkP5zDjA8tzCFCH1wmvHpzx/P+khBYA0ZdYX511D565sWW0mD X-Received: by 10.37.135.4 with SMTP id a4mr25293405ybl.109.1517509164548; Thu, 01 Feb 2018 10:19:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517509164; cv=none; d=google.com; s=arc-20160816; b=ulV4pD1HgdEXppHacIqSz8u4a/B0vWeu9mZLoHp93S/WfMmgA6MS+jDcFcyvwK8XX+ fAfLwo3XVaBZ6mNhFvUDtgoZg993fmrorAfHKXy3n8gVsmMBKnmENm3kbGKzHfXN269t TWjUygaNBvIabS7cU+t2yvzJOKHMX9XdVDUqEZte/LVzzWvJOV0COlhBWKLk7xAnzY7Y sSN6H4PJ/+Q4pm298d2l90v59+nTz1x4zwiyVaqmATvNWgMkDmGoNddUDPaKxLqjAw0h cbuct3lmh1ilR2BlQ3O2pPbO5uxLtgRnlTj1thYqMdqelcTJOUynTHKt/uY5rGLhWFKn lfUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature:arc-authentication-results; bh=tFxbbph4gcaSh/i9Knbnwn1aFUhGX936LbvrLvX74P0=; b=aGqDA2C89ny/8Y7QHmiuGGDLAiIStM1rqzqFxN6ONIek+vZVmmrxziX9uAg1ZgR+S9 q6xBkpCsA17BamY3MHLX3w1VVXDMw3OXX29GxzQB0CEucYMKulsZXTASrtzhD6c88c82 tXWVz8jbzn6pjngqfDAKqt03skE9u1lglXLOKpaiXCFH2RxYN+gupIBvc3G88k3+tcfX VSExqPOnY6X/pljHlcdwOQsoShkx3EKeNFXdrVPV0eYZL/lczCr+kH5mK4o7UnVme4ki 7fZGjhIYmVY9GoscOO1oG3bs680BSGb9cc1zH/gNFBJJpkNTvA8/gXzOeHwplHaaBAEc BKFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YZL43TX4; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=grub-devel-bounces+patch=linaro.org@gnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 204si31906ywl.561.2018.02.01.10.19.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Feb 2018 10:19:24 -0800 (PST) Received-SPF: pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YZL43TX4; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=grub-devel-bounces+patch=linaro.org@gnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJSF-0003pL-Oy for patch@linaro.org; Thu, 01 Feb 2018 13:19:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJRz-0003mE-Km for grub-devel@gnu.org; Thu, 01 Feb 2018 13:19:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehJRx-0003EQ-Gy for grub-devel@gnu.org; Thu, 01 Feb 2018 13:19:07 -0500 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:46579) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehJRx-0003C5-9x for grub-devel@gnu.org; Thu, 01 Feb 2018 13:19:05 -0500 Received: by mail-wr0-x243.google.com with SMTP id g21so20007946wrb.13 for ; Thu, 01 Feb 2018 10:19:05 -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:in-reply-to:references; bh=o/viKKYWb2AO14TdeEDzESMXQiHm56sNzAXeQWA4I3k=; b=YZL43TX4kK826goJuPqaoGnftLdo86JCpl1WahwfyAOChdLixtKtrge1Zl94LcJpnr 7rQtuFrnCrIQlWzF3vlWZNk5H0t9f0mw3b5+FpLshTzMOOLeNK8+eo3I0IdsKVXxqxTP Yb644En39RbcCwn6PkCwvspNaQfhuolcczphU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o/viKKYWb2AO14TdeEDzESMXQiHm56sNzAXeQWA4I3k=; b=OVOED8yGE4jN5f0LQdlDkeiBpTQfoHjswQGM1Vly/k/PxLx8Ac9EocXFFuuazTZR/Z sKJVNrwK2nTd+URyssw4oTzjGqCE5AVTjbuOh6hn9RsiovEE4RT1DtrPADlaIEeCu5WB w4JmCNLXg1XEC1UKCAV0TETIcTvMQPrsFdN0c5HH0Wq2GZbXsxEjE3dqsuqbpRdCKfPq z7N6TRpYRgbOBi01IkOP90j+K9cUgTJLsOjYkSEaHnM9BCqKyP05Q7CqoLhPmcr+Etaj RcaQeYw5SXbAuhjH/G4YE+TheaEvOAK9gWi0qOi/qYXW2Cg4HJ2wMWfUXoQk+jb4PkPR l7VQ== X-Gm-Message-State: AKwxytdePR9qtajpk+ujTlXH48n0LoQD2iJgDIvK7Q/XnZkuAZBKB4Gc 3LOR/rZ8BgAR8mdk49cNjOWXPqD4B3U= X-Received: by 10.223.156.145 with SMTP id d17mr32233638wre.61.1517509144003; Thu, 01 Feb 2018 10:19:04 -0800 (PST) Received: from vanye.hemma.eciton.net (cpc92316-cmbg19-2-0-cust118.5-4.cable.virginm.net. [82.12.0.119]) by smtp.gmail.com with ESMTPSA id b11sm163911wrf.23.2018.02.01.10.19.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:19:03 -0800 (PST) From: Leif Lindholm To: grub-devel@gnu.org Subject: [PATCH 02/10] Make arch-specific linux.h include guards architecture unique Date: Thu, 1 Feb 2018 18:18:50 +0000 Message-Id: <20180201181858.1472-3-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180201181858.1472-1-leif.lindholm@linaro.org> References: <20180201181858.1472-1-leif.lindholm@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The development of GNU GRUB Cc: Daniel Kiper MIME-Version: 1.0 Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org Sender: "Grub-devel" Replace uses of GRUB_LINUX_MACHINE_HEADER and GRUB_LINUX_CPU_HEADER with GRUB__LINUX_HEADER include guards to prevent issues when including more than one of them. Signed-off-by: Leif Lindholm --- include/grub/arm/linux.h | 6 +++--- include/grub/arm64/linux.h | 6 +++--- include/grub/i386/linux.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) -- 2.11.0 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel Reviewed-by: Daniel Kiper diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h index f217f8281..3706c46c6 100644 --- a/include/grub/arm/linux.h +++ b/include/grub/arm/linux.h @@ -17,8 +17,8 @@ * along with GRUB. If not, see . */ -#ifndef GRUB_LINUX_CPU_HEADER -#define GRUB_LINUX_CPU_HEADER 1 +#ifndef GRUB_ARM_LINUX_HEADER +#define GRUB_ARM_LINUX_HEADER 1 #define LINUX_ZIMAGE_OFFSET 0x24 #define LINUX_ZIMAGE_MAGIC 0x016f2818 @@ -66,4 +66,4 @@ grub_arm_firmware_get_machine_type (void) #define FDT_ADDITIONAL_ENTRIES_SIZE 0x300 -#endif /* ! GRUB_LINUX_CPU_HEADER */ +#endif /* ! GRUB_ARM_LINUX_HEADER */ diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h index a981df5d1..a8edf50dc 100644 --- a/include/grub/arm64/linux.h +++ b/include/grub/arm64/linux.h @@ -16,8 +16,8 @@ * along with GRUB. If not, see . */ -#ifndef GRUB_LINUX_CPU_HEADER -#define GRUB_LINUX_CPU_HEADER 1 +#ifndef GRUB_ARM64_LINUX_HEADER +#define GRUB_ARM64_LINUX_HEADER 1 #include @@ -43,4 +43,4 @@ grub_err_t grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header grub_err_t grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size, char *args); -#endif /* ! GRUB_LINUX_CPU_HEADER */ +#endif /* ! GRUB_ARM64_LINUX_HEADER */ diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h index da0ca3b83..2ff1621a4 100644 --- a/include/grub/i386/linux.h +++ b/include/grub/i386/linux.h @@ -16,8 +16,8 @@ * along with GRUB. If not, see . */ -#ifndef GRUB_LINUX_MACHINE_HEADER -#define GRUB_LINUX_MACHINE_HEADER 1 +#ifndef GRUB_I386_LINUX_HEADER +#define GRUB_I386_LINUX_HEADER 1 #define GRUB_LINUX_MAGIC_SIGNATURE 0x53726448 /* "HdrS" */ #define GRUB_LINUX_DEFAULT_SETUP_SECTS 4 @@ -312,4 +312,4 @@ struct linux_kernel_params } GRUB_PACKED; #endif /* ! ASM_FILE */ -#endif /* ! GRUB_LINUX_MACHINE_HEADER */ +#endif /* ! GRUB_I386_LINUX_HEADER */