From patchwork Wed Mar 21 20:46:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Clark X-Patchwork-Id: 10300363 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ED10060386 for ; Wed, 21 Mar 2018 20:49:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D56AF290A6 for ; Wed, 21 Mar 2018 20:49:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C883E290B0; Wed, 21 Mar 2018 20:49:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 48FCD290A6 for ; Wed, 21 Mar 2018 20:49:47 +0000 (UTC) Received: from localhost ([::1]:57355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eykg6-0003ox-Eo for patchwork-qemu-devel@patchwork.kernel.org; Wed, 21 Mar 2018 16:49:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eykeR-00023L-G9 for qemu-devel@nongnu.org; Wed, 21 Mar 2018 16:48:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eykeP-00027N-63 for qemu-devel@nongnu.org; Wed, 21 Mar 2018 16:48:02 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:41237) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eykeO-000277-Vx for qemu-devel@nongnu.org; Wed, 21 Mar 2018 16:48:01 -0400 Received: by mail-pg0-x241.google.com with SMTP id m24so2398510pgv.8 for ; Wed, 21 Mar 2018 13:48:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BzoWDjqOkLr1gXTgXEqkRe19OYL1d4M1Ffyez2Cfl2s=; b=R28uniEE5kEPBX/CyO/O3MD/nQw2/0IYlMUCnH8Obsvii6EejIlvWpL96++ZpFJR3/ xmPdWf9QcSXfStRbaL1X0aC7N1zgk/w2DZvv6SSFnsPSKl4dWKBhDMPAw58QcY12uFcA qwHT7qI2E9AnN1LU+6ukCwKKCkI0oPXSayagnHUxpAboeDT2t0sUUfQ39KWyIYAXEwl+ ppRs4jHOHQSpw7O/e//GgBaft4YbLdTEMdIfaM90+Cz/1LQ/ib3sAaF6xHmrbQNA+POf FyE3eYwokTuRhBRH93WplRMxWHEBEMElTIQAOUslgKDKGXSVaLVz6olf183aQ4BsudIS wCUQ== 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:mime-version:content-transfer-encoding; bh=BzoWDjqOkLr1gXTgXEqkRe19OYL1d4M1Ffyez2Cfl2s=; b=WECEwqPMM7voe1GX6R9tQ2m5ZPLhtsTCC9/Lhxgu3VJjGfjVCAE9yrHhTwOH48wGcj /y3KjOeERN6JUU1snWU+0RVjgMu3Gv5lgXe9D+Q8GOr565+L8PoCIlnywZ8xQFaebaJu byzrmk7glgXqVs8iY8Ecffx8Zrf2Ul2j1R2dykx1zrg859MoLU5UGjpD8lY5b6zSoQ9U AFelvntEOK+42bFsaUj375jakoNOrcYJ/lprob2mmEIZLs7X6sbhJ/45fAnJxu3VXI5b hhlJcoLpuLaULjCPzXMC4Ju9nzz+bGSm32l9Gn8X2ODiN9d5ERYc6IKJqk5MbB992FDB Sm9Q== X-Gm-Message-State: AElRT7Ey4e20fZNuYOCVbHkpeNInD4LZCta64Uq2Xr+EaG7mqmds/z91 IahjDsyF4zMAK2Knj0JTOd6rhi75Qms= X-Google-Smtp-Source: AG47ELvDixiwiRZEaFvdrW2BbP+2eBli63LKVT+EFnX9YIbzP/u2IFoTVczZ9ldSqJtGICkFC+f9Vg== X-Received: by 10.99.140.77 with SMTP id q13mr3135922pgn.44.1521665279998; Wed, 21 Mar 2018 13:47:59 -0700 (PDT) Received: from monty.com ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id w10sm8244499pgr.57.2018.03.21.13.47.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Mar 2018 13:47:59 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Wed, 21 Mar 2018 13:46:48 -0700 Message-Id: <1521665220-3869-13-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1521665220-3869-1-git-send-email-mjc@sifive.com> References: <1521665220-3869-1-git-send-email-mjc@sifive.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PULL 12/24] RISC-V: Make some header guards more specific X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: patches@groups.riscv.org, Michael Clark , Palmer Dabbelt , Sagar Karandikar , Bastian Koppelmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Cc: Sagar Karandikar Cc: Bastian Koppelmann Signed-off-by: Michael Clark Signed-off-by: Palmer Dabbelt Reviewed-by: Philippe Mathieu-Daudé --- include/hw/riscv/spike.h | 4 ++-- include/hw/riscv/virt.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/riscv/spike.h b/include/hw/riscv/spike.h index 8410430..641b70d 100644 --- a/include/hw/riscv/spike.h +++ b/include/hw/riscv/spike.h @@ -16,8 +16,8 @@ * this program. If not, see . */ -#ifndef HW_SPIKE_H -#define HW_SPIKE_H +#ifndef HW_RISCV_SPIKE_H +#define HW_RISCV_SPIKE_H typedef struct { /*< private >*/ diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index b91a412..3a4f23e 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -16,8 +16,8 @@ * this program. If not, see . */ -#ifndef HW_VIRT_H -#define HW_VIRT_H +#ifndef HW_RISCV_VIRT_H +#define HW_RISCV_VIRT_H typedef struct { /*< private >*/