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: 9541 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 12FF623EE3 for ; Fri, 22 Jun 2012 11:31:08 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id D6C20A1815D for ; Fri, 22 Jun 2012 11:31:07 +0000 (UTC) Received: by yenq6 with SMTP id q6so1506907yen.11 for ; Fri, 22 Jun 2012 04:31:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=rzSe+A5JcybN/hk1i7HyOYpYiK/f6QptMZTBDMMMPr0=; b=Jgh8gaDMcQY4N3/EmY3p0251ZOISB8YdoXgJai1vqCR3EO1L2KF97YLQHtcl5Ka2sC SsmbTc1TCgP5GbDfma6BTHe3WkUhKlPVCP9YTefPiR7hzEhR5ZqfFXGqpd9JywWCC0Ae G4CHrvOkO3srljuy0fDdfxDRAGFp09zhi5ugkTmU8MQ/v5TsZMfGnHx7AVmqpeg0d5aA 7ejWwavF1lD6NbXOEQFIihst1C9lTJssypMRxGsm2bmCgfBjXrpu+HTGPeMV8kFVRInV sDLQOxzWW70mXBXubM8I85xtmyiTXOP+zRCYxC0UCXrtuA8bTVKJHLGfFLYc+5c4s/aC 6Avg== Received: by 10.50.163.99 with SMTP id yh3mr1070094igb.53.1340364667067; Fri, 22 Jun 2012 04:31:07 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp62030ibb; Fri, 22 Jun 2012 04:31:04 -0700 (PDT) Received: by 10.204.157.144 with SMTP id b16mr643577bkx.12.1340364664063; Fri, 22 Jun 2012 04:31:04 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id fw3si4830820bkc.38.2012.06.22.04.31.02 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 22 Jun 2012 04:31:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk 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 Cc: qemu-trivial@nongnu.org, patches@linaro.org Subject: [PATCH 2/2] cpu-common.h: Remove a pointless ifndef CONFIG_USER_ONLY 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-Gm-Message-State: ALoCoQlXnU+8UYyJVF9tCa96iDWd18GUcAb5waceAea4qufpSVnvJ+D1ulD1FqnLKOIAlXTpyEm0 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