From patchwork Thu Feb 9 15:56:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijay Kilari X-Patchwork-Id: 9565005 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 728856020C for ; Thu, 9 Feb 2017 16:01:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62832237A5 for ; Thu, 9 Feb 2017 16:01:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5739D27F4B; Thu, 9 Feb 2017 16:01:28 +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=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, 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 170AA237A5 for ; Thu, 9 Feb 2017 16:01:27 +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 1cbr7n-0007no-23; Thu, 09 Feb 2017 15:59:11 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cbr7m-0007nT-Ig for xen-devel@lists.xenproject.org; Thu, 09 Feb 2017 15:59:10 +0000 Received: from [85.158.143.35] by server-9.bemta-6.messagelabs.com id 38/C8-27165-DC19C985; Thu, 09 Feb 2017 15:59:09 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHIsWRWlGSWpSXmKPExsXiVRvsqHt24pw Igxutohbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aFCd8YC1o5K179XsncwPiMvYuRi0NIYBqj xLlv99lAHBaBlywSmx6vZgJxJAT6WSWe7XrI2MXIAeTESGw9otzFyAlkVkrcOXaIGcQWElCV6 Pj/lh3C/sEo8WuBNIjNJiAjceT5ASYQW0QgTeLY6rVsIDazgK/Ey0UTwXqFBUIl+ratZgSxWY DmrHz5lwXE5hVwlVi3bgITxFoFiTmTbEDCnAJuEsv3XGKBWOUq8aC7jXUCo8ACRoZVjBrFqUV lqUW6hqZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTmJScV6yfm5mxiBYcUABDsYvy0LOMQoycGk JMorWzAnQogvKT+lMiOxOCO+qDQntfgQowwHh5IErwkwTIUEi1LTUyvSMnOAAQ6TluDgURLh/ TsBKM1bXJCYW5yZDpE6xajLsWvX5ZdMQix5+XmpUuK8wSBFAiBFGaV5cCNg0XaJUVZKmJcR6C ghnoLUotzMElT5V4ziHIxKwrx3QabwZOaVwG16BXQEE9AR10/PAjmiJBEhJdXAWPDdYs72wu6 jcXcXPPoqNTVM3NksksNr/yGhfzYfipoVHvizBbE+F5jBJihVXDKP319W/MPc6b8C8+R8bbwi pNR/P18etO/A2fwollfnhFM9Kpg/lwdwWqw8m/fgxuVgec1jLg9OFdpEVu9fnj2hVefh1gWKW W+37OTz/hkeEBW3plnlbuQjJZbijERDLeai4kQAfxvUwbECAAA= X-Env-Sender: vijay.kilari@gmail.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1486655948!52468493!1 X-Originating-IP: [74.125.83.65] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18430 invoked from network); 9 Feb 2017 15:59:09 -0000 Received: from mail-pg0-f65.google.com (HELO mail-pg0-f65.google.com) (74.125.83.65) by server-16.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 9 Feb 2017 15:59:09 -0000 Received: by mail-pg0-f65.google.com with SMTP id 194so628384pgd.0 for ; Thu, 09 Feb 2017 07:59:09 -0800 (PST) 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=8Q7jpdZ3Vi2SW+q4YRxtgGL4OBxY/SMWugzYL63jG4o=; b=sai++77CM4OzBdukfHHdOsdoEvSvf9ioVJtS+rDUJqIuPkIn4zIqCxLzRC+CaOuiIv fhCUe0ETTvQawnqqzSsneUPcu2wa6RUuD12QqmoqzM2pqT+ItX72DQJKKGjHZyp2lzU/ XYy0tuNOZAAsYkEVAMbq/O8tH0L3Wxe8+J9M2Dnnv9a0p1eriWlpPIuXvrPO/a4bZicp 5Uz1930aN04M7+LLCzlmiCbwu2L41uPPvB+sSBQUXpTfWzL2F3Vk5UIJG3rQwTY4fHv7 AJ3xylsUwlEFIoK2FOKGXwXzSANItx/fpjZk1T1rTUvLMDPIpmIDMgvzZbfjMOFMGHb7 iG/w== 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=8Q7jpdZ3Vi2SW+q4YRxtgGL4OBxY/SMWugzYL63jG4o=; b=a00wdQo/ifL1AJGVqJW30OGFZ/KGYwGFIYLzQTXJpPffuVUPAHdm4KA0/97fXL/JdD 2NRc2vdnJRl2WIh+VDt7LhzbV8vi9jERR/JbncBOlbnY14dpXUNmgUaetnT32UH4BvRJ uCHZgyQapA6lFgayTk2pxfaHM9WLdt+mbWjEMF2YHm2b3eYTPaWR/RQtJDV2RNX8jDY0 /X1goicORkthDvMYnLP6hKaSCjLqkokR1i8HC7Ib0S3Nxylp7WDOnFoDm7yUTrCosetu MkcrCu/SA1Jv4YX8IeHVSf+bHb4wtvDdC/U28f8SQY7EBUiRDPaR1dIRF0kh7Svbqpyn mcgA== X-Gm-Message-State: AMke39nYbLeMGiybPpF5wDbTAdKOiP4LH+JesezSkhBK+h7fNiiBTmvihXFsaRvNLi2SjQ== X-Received: by 10.84.215.149 with SMTP id l21mr5176939pli.16.1486655947642; Thu, 09 Feb 2017 07:59:07 -0800 (PST) Received: from localhost.localdomain ([14.140.2.178]) by smtp.gmail.com with ESMTPSA id m29sm30093842pfi.54.2017.02.09.07.59.05 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Feb 2017 07:59:07 -0800 (PST) From: vijay.kilari@gmail.com To: julien.grall@arm.com, sstabellini@kernel.org, andre.przywara@arm.com, dario.faggioli@citrix.com Date: Thu, 9 Feb 2017 21:26:53 +0530 Message-Id: <1486655834-9708-2-git-send-email-vijay.kilari@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1486655834-9708-1-git-send-email-vijay.kilari@gmail.com> References: <1486655834-9708-1-git-send-email-vijay.kilari@gmail.com> Cc: xen-devel@lists.xenproject.org, Vijaya Kumar K Subject: [Xen-devel] [RFC PATCH v1 01/21] 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 not CONFIG_NUMA is not enabled for ARM and existing code in asm-arm/numa.h is for !COFIG_NUMA. Hence put this code under #ifndef CONFIG_NUMA. This help to make this changes work when CONFIG_NUMA is not enabled. Also define NODES_SHIFT macro for ARM. Signed-off-by: Vijaya Kumar K --- xen/include/asm-arm/numa.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/include/asm-arm/numa.h b/xen/include/asm-arm/numa.h index a2c1a34..a60c7eb 100644 --- a/xen/include/asm-arm/numa.h +++ b/xen/include/asm-arm/numa.h @@ -3,6 +3,9 @@ typedef u8 nodeid_t; +#define NODES_SHIFT 2 + +#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 +19,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) {