From patchwork Tue Jul 18 11:41:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijay Kilari X-Patchwork-Id: 9848101 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 27C5260392 for ; Tue, 18 Jul 2017 11:45:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1570D27480 for ; Tue, 18 Jul 2017 11:45:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09FE228462; Tue, 18 Jul 2017 11:45:24 +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=-2.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM, RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BB68127480 for ; Tue, 18 Jul 2017 11:45:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXQuK-000735-Jk; Tue, 18 Jul 2017 11:43:16 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXQuJ-0006yP-9E for xen-devel@lists.xen.org; Tue, 18 Jul 2017 11:43:15 +0000 Received: from [85.158.143.35] by server-6.bemta-6.messagelabs.com id CA/26-03937-254FD695; Tue, 18 Jul 2017 11:43:14 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRWlGSWpSXmKPExsXiVRvsohv0JTf SYE0Pu8WSj4tZHBg9ju7+zRTAGMWamZeUX5HAmvF4xxT2gqlcFaf+vGBuYHzM0cXIxSEkMJFR Ys/qjWwgDovASxaJOQeWsIM4EgL9rBLz991n6WLkBHLiJFbO2sfcxcgBZFdJvPqVBRIWElCV6 Pj/lh1iUhuTxObFi1lBEmwCMhJHnh9gArFFBKQlrn2+zAhSxCywjUli0/Wp7CAJYYFQiccXbz KD2CxAk3qutIPFeQVcJToPdUItU5CYM8kGJMwp4CaxqOsSO8RiV4kbfStZJzAKLGBkWMWoUZx aVJZapGtkoZdUlJmeUZKbmJmja2hgppebWlycmJ6ak5hUrJecn7uJERhaDECwg/H82sBDjJIc TEqivKsP5EYK8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuBN+gyUEyxKTU+tSMvMAQY5TFqCg0dJh PcYSJq3uCAxtzgzHSJ1itGYY9KB7V+YOF5N+P+NSYglLz8vVUqcdyFIqQBIaUZpHtwgWPRdYp SVEuZlBDpNiKcgtSg3swRV/hWjOAejkjDvNZApPJl5JXD7XgGdwgR0irBvDsgpJYkIKakGxhk c6dYrM0xWXDU3f9p91vTvrb+fKh7+N/n584zWSld+/y+3VRqdWp+/XZBUF3aR90F0klnUlMUT BXinTp6V2mh2+/2R62tSLW0cOGJv927d73pG6Dr/siWPlv+X3lWqlb3zoobV7yPOl2qXJh5cW j17EnOlZ+bmqPfdp07uPGjNeO7k5/cvjZ8rsRRnJBpqMRcVJwIA8Ekjp7kCAAA= X-Env-Sender: vijay.kilari@gmail.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1500378192!67146246!1 X-Originating-IP: [74.125.83.68] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44556 invoked from network); 18 Jul 2017 11:43:13 -0000 Received: from mail-pg0-f68.google.com (HELO mail-pg0-f68.google.com) (74.125.83.68) by server-10.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 18 Jul 2017 11:43:13 -0000 Received: by mail-pg0-f68.google.com with SMTP id y129so2533193pgy.3 for ; Tue, 18 Jul 2017 04:43:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=a91eWvPF5Ass4YszAFWTffrpY+tqoI1eZzDFrBGLpRw=; b=ggJKM4yzzOzueVVd0q6AWr9iWf2TdXFrWwVPOIwALWu6qWGSKFiKQ/O5PARlkKKssr 6ko4lKJ/8u4KEc4PVjzIUsu9w/RVTD1u81QiUaIJVok7gF7obiG4hroZkRUJxqGLzWmH SM7T/eqnjdnZBAFpdFYxSyPEwQKCeqNG94smcH8LL4ppa9cYeqM10vbs8F0eEmjFBz9X wEP5UOnLyfX1ViMppNqFEwkvU6qnC3BluSuKfyn3eE1qKYqCiz8+aImoed1XjctYD8U2 gp6ecFeufhBtPkgZIbd8g3UZ2VHYDIn86iIMEjgMQy3hajW0D+DPmQlvAjEvZcSOYG9N 6olw== 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=a91eWvPF5Ass4YszAFWTffrpY+tqoI1eZzDFrBGLpRw=; b=Hwc379EPZwfZ77k6yOfbEVYKL/Or65XJz5zMJcvqfM13Cd591IBZimQIVKiL9cFJqU NSWQAxkk3dEAOi0TIlPlTs2HEaGH6vzhMLUuDT68l2xwXmP+au2lE4CYOkI8/0NvDLFb YZuPE+kRXykwSOTqaODLHDZ3F19OqJZETl7M6ijv2VxHyaNyHmQ1d0vcPdsFJDTnxF3G BuVVVsbQfYMnHA0b3pRqMwZmEyHwTHxb0QKs+RQ5x9XEKq8ZiGjRC5pMjD8zPs+dDsv+ 2PJz91/xoqHakpDBlZOpvifNdHRXbighUeDcirui5PvMR3OaJUjRHfEucXjjowg+x8O/ B9IA== X-Gm-Message-State: AIVw111REbbNKKqAS6KdfWJGQv4kltzEOHtdtMP1Wdnb7WtVj/80S6Se vUSdWWtcvxigSQAn X-Received: by 10.84.217.208 with SMTP id d16mr1342028plj.208.1500378161220; Tue, 18 Jul 2017 04:42:41 -0700 (PDT) Received: from cavium-Vostro-2520.caveonetworks.com ([111.93.218.67]) by smtp.gmail.com with ESMTPSA id r27sm4879707pfe.0.2017.07.18.04.42.37 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 04:42:40 -0700 (PDT) From: vijay.kilari@gmail.com To: xen-devel@lists.xen.org Date: Tue, 18 Jul 2017 17:11:29 +0530 Message-Id: <1500378106-2620-8-git-send-email-vijay.kilari@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1500378106-2620-1-git-send-email-vijay.kilari@gmail.com> References: <1500378106-2620-1-git-send-email-vijay.kilari@gmail.com> Cc: kevin.tian@intel.com, sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, julien.grall@arm.com, jbeulich@suse.com, Vijaya Kumar K Subject: [Xen-devel] [RFC PATCH v3 07/24] ARM: NUMA: Add existing ARM numa code under CONFIG_NUMA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Vijaya Kumar K Right now CONFIG_NUMA is not enabled for ARM and existing code in asm-arm/numa.h is for !CONFIG_NUMA. Hence put this code under #ifndef CONFIG_NUMA. This help to make this changes work when CONFIG_NUMA is not enabled. Though CONFIG_NUMA is enabled by default, manually disabling this option is possible and compilation should go through. Hence kept the these changes under !CONFIG_NUMA. Signed-off-by: Vijaya Kumar K --- v3: - Dropped NODE_SHIFT define --- xen/include/asm-arm/numa.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/include/asm-arm/numa.h b/xen/include/asm-arm/numa.h index 53f99af..7f00a36 100644 --- a/xen/include/asm-arm/numa.h +++ b/xen/include/asm-arm/numa.h @@ -3,6 +3,7 @@ typedef uint8_t nodeid_t; +#ifndef CONFIG_NUMA /* Fake one node for now. See also node_online_map. */ #define cpu_to_node(cpu) 0 #define node_to_cpumask(node) (cpu_online_map) @@ -16,6 +17,7 @@ static inline __attribute__((pure)) nodeid_t phys_to_nid(paddr_t addr) #define node_spanned_pages(nid) (total_pages) #define node_start_pfn(nid) (pdx_to_pfn(frametable_base_pdx)) #define __node_distance(a, b) (20) +#endif /* CONFIG_NUMA */ static inline unsigned int arch_get_dma_bitsize(void) {