From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD05DC433DF for ; Mon, 17 Aug 2020 13:05:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8884520825 for ; Mon, 17 Aug 2020 13:05:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597669523; bh=lpn272Zb2FTONMg0okxrDdB2sHalU7iOEFyBXL3lRyk=; h=Subject:To:Cc:From:Date:List-ID:From; b=Mn2/1574dNdHF4lsyYW9y6bsATAzvmCzEGM2u3qh3F2RFilQsG6YAKqy4daq7u0lP wRSM50NSCc25eL6i063W73tjYnRbWqYWRwtGCNzUIPaxBI6rywayhsTsatDmeMFw4x 91x8/HqEaaw8mKE9gheudoMWQr+9l6S9Z3vuVk6A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728274AbgHQNFX (ORCPT ); Mon, 17 Aug 2020 09:05:23 -0400 Received: from forward1-smtp.messagingengine.com ([66.111.4.223]:53209 "EHLO forward1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728388AbgHQNFV (ORCPT ); Mon, 17 Aug 2020 09:05:21 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.nyi.internal (Postfix) with ESMTP id 0E38F194144B; Mon, 17 Aug 2020 09:05:20 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 17 Aug 2020 09:05:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=aknfJh /TJGV9psITdu+2YzXflLqzc/OVPmC8fgVbMec=; b=VtchVOvIYmgva65zdlQcF1 i7RB6BQQ7zNRIKPiSsR6KDMX8bJRlSMlmVLmCp8w29dbqePBf4RiAjM52DuTlp/m jComglYvqvuYX+37P84ku84XYTK5HfDx8Fgx25TOB/5U27MuN9WWnXWkHZ75sS/d Y2DDmQ/z/cV2Z6Z9LZXnSFWw3mK3rdcUNsAORuJk2PlaJY8es4AK4q1KYMX5iTsD zWGJ5x/LpJQQoCkd//RdwCxXE3wAoTZjldaA7i3r9qH34RPBb80nEYeDAB1QQE+7 5Yn4fmLXghjFNjE85ght8Agi0H+1CNgaHO1kSyLD3bwCYDLBsuJlND+i9uyioVfQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedruddtfedgheelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuggftrfgrthhtvghrnhepieetveehuedvhfdtgfdvieeiheehfeelveevheejud etveeuveeludejjefgteehnecukfhppeekfedrkeeirdekledruddtjeenucevlhhushht vghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhh drtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 9ADBB3280060; Mon, 17 Aug 2020 09:05:19 -0400 (EDT) Subject: FAILED: patch "[PATCH] s390/numa: set node distance to LOCAL_DISTANCE" failed to apply to 4.9-stable tree To: agordeev@linux.ibm.com, hca@linux.ibm.com, stable@vger.kernel.org Cc: From: Date: Mon, 17 Aug 2020 15:05:28 +0200 Message-ID: <1597669528118236@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 535e4fc623fab2e09a0653fc3a3e17f382ad0251 Mon Sep 17 00:00:00 2001 From: Alexander Gordeev Date: Tue, 4 Aug 2020 20:35:49 +0200 Subject: [PATCH] s390/numa: set node distance to LOCAL_DISTANCE The node distance is hardcoded to 0, which causes a trouble for some user-level applications. In particular, "libnuma" expects the distance of a node to itself as LOCAL_DISTANCE. This update removes the offending node distance override. Cc: # 4.4 Fixes: 3a368f742da1 ("s390/numa: add core infrastructure") Signed-off-by: Alexander Gordeev Signed-off-by: Heiko Carstens diff --git a/arch/s390/include/asm/topology.h b/arch/s390/include/asm/topology.h index fbb507504a3b..3a0ac0c7a9a3 100644 --- a/arch/s390/include/asm/topology.h +++ b/arch/s390/include/asm/topology.h @@ -86,12 +86,6 @@ static inline const struct cpumask *cpumask_of_node(int node) #define pcibus_to_node(bus) __pcibus_to_node(bus) -#define node_distance(a, b) __node_distance(a, b) -static inline int __node_distance(int a, int b) -{ - return 0; -} - #else /* !CONFIG_NUMA */ #define numa_node_id numa_node_id