From patchwork Fri Jun 22 11:30:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 166583 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 730ABB6F86 for ; Fri, 22 Jun 2012 21:31:29 +1000 (EST) Received: from localhost ([::1]:38023 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Si25H-0004FA-9H for incoming@patchwork.ozlabs.org; Fri, 22 Jun 2012 07:31:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Si251-0004F0-IV for qemu-devel@nongnu.org; Fri, 22 Jun 2012 07:31:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Si24z-0005N3-Tx for qemu-devel@nongnu.org; Fri, 22 Jun 2012 07:31:11 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:53418) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Si24z-0005L6-MO; Fri, 22 Jun 2012 07:31:09 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1Si24q-0005GJ-0k; Fri, 22 Jun 2012 12:31:00 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 22 Jun 2012 12:30:59 +0100 Message-Id: <1340364659-20200-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1340364659-20200-1-git-send-email-peter.maydell@linaro.org> References: <1340364659-20200-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: qemu-trivial@nongnu.org, patches@linaro.org Subject: [Qemu-devel] [PATCH 2/2] cpu-common.h: Remove a pointless ifndef CONFIG_USER_ONLY X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Remove an ifndef CONFIG_USER_ONLY guard that was pointless because it is already inside an if !defined(CONFIG_USER_ONLY). Signed-off-by: Peter Maydell Acked-by: Andreas Färber --- cpu-common.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/cpu-common.h b/cpu-common.h index 321037f..85548de 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -69,9 +69,7 @@ void cpu_physical_memory_unmap(void *buffer, target_phys_addr_t len, void *cpu_register_map_client(void *opaque, void (*callback)(void *opaque)); void cpu_unregister_map_client(void *cookie); -#ifndef CONFIG_USER_ONLY bool cpu_physical_memory_is_io(target_phys_addr_t phys_addr); -#endif /* Coalesced MMIO regions are areas where write operations can be reordered. * This usually implies that write operations are side-effect free. This allows