From patchwork Sun Dec 17 21:27:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 10117927 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 4FD6160327 for ; Sun, 17 Dec 2017 21:46:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42B5928932 for ; Sun, 17 Dec 2017 21:46:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37A8828945; Sun, 17 Dec 2017 21:46:12 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 9CBB828932 for ; Sun, 17 Dec 2017 21:46:10 +0000 (UTC) Received: from localhost ([::1]:55664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQgl7-0005kR-U5 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 17 Dec 2017 16:46:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQgjz-0004mY-D8 for qemu-devel@nongnu.org; Sun, 17 Dec 2017 16:45:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQgjw-0006EE-AI for qemu-devel@nongnu.org; Sun, 17 Dec 2017 16:44:59 -0500 Received: from isrv.corpit.ru ([86.62.121.231]:55633) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQgjv-0006Cq-VE; Sun, 17 Dec 2017 16:44:56 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 46CB441174; Mon, 18 Dec 2017 00:44:55 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id AB284D5A; Mon, 18 Dec 2017 00:25:49 +0300 (MSK) Received: (nullmailer pid 30957 invoked by uid 1000); Sun, 17 Dec 2017 21:28:08 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 18 Dec 2017 00:27:41 +0300 Message-Id: <721320d511ade48643e30a19a54704a1d7fbd620.1513545944.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 36/61] nios2: remove duplicated includes (in code commented out) 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Philippe Mathieu-Daudé applied using ./scripts/clean-includes Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- disas/nios2.c | 3 --- hw/nios2/boot.c | 1 - target/nios2/cpu.h | 1 - target/nios2/helper.c | 5 +---- target/nios2/op_helper.c | 1 + target/nios2/translate.c | 1 + 6 files changed, 3 insertions(+), 9 deletions(-) diff --git a/disas/nios2.c b/disas/nios2.c index b342936d21..de11f04cc4 100644 --- a/disas/nios2.c +++ b/disas/nios2.c @@ -1756,7 +1756,6 @@ extern const int nios2_num_r2_reg_range_mappings; #endif /* _NIOS2_H */ /*#include "sysdep.h" -#include #include "opcode/nios2.h" */ /* Register string table */ @@ -2521,8 +2520,6 @@ const int nios2_num_r2_reg_range_mappings = 8; #include "dis-asm.h" #include "opcode/nios2.h" #include "libiberty.h" -#include -#include */ /* No symbol table is available when this code runs out in an embedded system as when it is used for disassembler support in a monitor. */ diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c index 2b31f5b844..94f436e7fb 100644 --- a/hw/nios2/boot.c +++ b/hw/nios2/boot.c @@ -34,7 +34,6 @@ #include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/error-report.h" -#include "qemu-common.h" #include "sysemu/device_tree.h" #include "sysemu/sysemu.h" #include "hw/loader.h" diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index 9119eee587..88823a6d4d 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -20,7 +20,6 @@ #ifndef CPU_NIOS2_H #define CPU_NIOS2_H -#include "qemu/osdep.h" #include "qemu-common.h" #define TARGET_LONG_BITS 32 diff --git a/target/nios2/helper.c b/target/nios2/helper.c index ef9ee05798..9f741a8f19 100644 --- a/target/nios2/helper.c +++ b/target/nios2/helper.c @@ -18,12 +18,9 @@ * */ -#include -#include -#include +#include "qemu/osdep.h" #include "cpu.h" -#include "qemu/osdep.h" #include "qemu/host-utils.h" #include "qapi/error.h" #include "exec/exec-all.h" diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c index efb1c489c9..c853aeae02 100644 --- a/target/nios2/op_helper.c +++ b/target/nios2/op_helper.c @@ -18,6 +18,7 @@ * */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" #include "exec/cpu_ldst.h" diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 72329002ac..51a54ff760 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -21,6 +21,7 @@ * */ +#include "qemu/osdep.h" #include "cpu.h" #include "tcg-op.h" #include "exec/exec-all.h"