From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3974B4D8D9C for ; Thu, 2 Jul 2026 09:50:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782985804; cv=none; b=sGCazJYcK72sCTGgeaSS0Rm/0wOLIhqf9SVer7/ITNcd1+tGMMX7Bsrak0Gm23b7aCEliTp15s8Q51vPQUuxhFpbpOVwhoFsnyFP5xPmJr8BfXqeTKSJjomRUwmHZiu5JgntPKjfXZti9a7DiljYG0QO7Y8wFs4h8F/+1abtwbg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782985804; c=relaxed/simple; bh=KNqrD2+2Bt6o9OriZEPOrcJLAbYLOMYUdx5zH9TW50c=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=c9bMAKKDf2f6qYz3DLSmU//GXJrNNV09R5YfUnYAk9Q8b4Ulf/EzdXiLjRDwLOGiWaklqClcMQtXJDMa94JXAUDpYYRlM/hHiZTH7EMVtXp88tes89+7gifMbvJDL5CNIHhELIUJAmxVGnNI9bF3MKdHeLsjgQBAf4Zi+7UP/4c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=dxq5d6K/; arc=none smtp.client-ip=209.85.221.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dxq5d6K/" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-47248bd8bc0so1441630f8f.1 for ; Thu, 02 Jul 2026 02:50:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782985801; x=1783590601; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=oi2WdNtyn6OBAE6+L/wDlXe84IAgE1icOUsCwlXzl0o=; b=dxq5d6K/BplPC0K9mB6nyomUZlEHIGg6cBayV0CWweygjMmykmfFXp7XF5hmsi47ft P8X7jrkE9RtjCUId95kwrVR8BihIVXF+ihawh/b6Lvu3t8t+RCjVVoS4Keb75AyjL8dX OCbHdJjRxzAdNVoIhDXoTh1InF4eELBYRVpQLUU4W7Sqx/9EVDdXDICd86cxWBs6wIpq BNrLycNJpIO1uPs4mRJJeoQihBiC0OfbBBreqrSL43a8ANYi33Rz0eA4u3yLY+tC2jAF ZgwqpkICpLc88Lur52lW0QCaj2IKX6j+1mnJieIlOf+kVrVSatIL5m8eTZ2U1WTT2g+n YcuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782985801; x=1783590601; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oi2WdNtyn6OBAE6+L/wDlXe84IAgE1icOUsCwlXzl0o=; b=qtAk8RIY+C64rsmMJEypPFNJSB1G03/GYCYsSGPCIo1Kkbi1YID1QYTv954KKPpl9g MAKP1tXW7r5OVtXLmwxQq23NArSOfTKUv9IhQv45+QTbfj/7kZMTiPELj+n3HNUKgsZD 4tcKC2ZkDPkxCHvyTvumul6sFL5xEgH4wtMTj8kxoX7IqFesm/kT+NPFbVmAV5jXzGm1 IP/VHMotbvvHCXnjtb43xrhkzu+L/jmv56JJ2au2l6Os83bCat2V8iDbZdm46XlnnyBC IDN5iadK4ULui5fOrzTWveIYd73T7wxmZdWkkNI/dGTf2B5ervB79luEuJNzw/m+JNXX RUHw== X-Forwarded-Encrypted: i=1; AHgh+Rpdc/VlI/kHVH4MtA6lTXcFMj31xpQLlwAoGYnM1VHudj8faZ6Ji2NOc9c/qqZHq98INxYbWe1KVISg00g=@vger.kernel.org X-Gm-Message-State: AOJu0Ywn8qgo8IxQGHZVu1UEl/YX03dP7h64TzSJsHFiMAHjirmbRLXS rKEHgZ1wuamjMKUao7KuljbXr/v9EUM/zt0r5kgLkFAW15ZnmDJD3bQ9/jvw+9qXr0oSwVhlBrs wcZXzPeyeI5b4ZQ== X-Received: from wrry9.prod.google.com ([2002:adf:fa49:0:b0:470:9980:87b1]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:adf:fe8a:0:b0:475:f0d1:eb5e with SMTP id ffacd0b85a97d-477b206b4bcmr5224333f8f.57.1782985800390; Thu, 02 Jul 2026 02:50:00 -0700 (PDT) Date: Thu, 02 Jul 2026 09:49:42 +0000 In-Reply-To: <20260702-alloc-trylock-v4-0-0af8ff387e80@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260702-alloc-trylock-v4-0-0af8ff387e80@google.com> X-Mailer: b4 0.15.2 Message-ID: <20260702-alloc-trylock-v4-11-0af8ff387e80@google.com> Subject: [PATCH v4 11/18] sgi-xp: Use higher-level allocator API From: Brendan Jackman To: Andrew Morton , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Johannes Weiner , Zi Yan , Muchun Song , Oscar Salvador , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Mike Rapoport , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Ying Huang , Alistair Popple , Hao Li , Christoph Lameter , David Rientjes , Roman Gushchin , Sebastian Andrzej Siewior , Clark Williams , Steven Rostedt Cc: "Harry Yoo (Oracle)" , Gregory Price , Johannes Weiner , Alexei Starovoitov , Matthew Wilcox , Hao Ge , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, derkling@google.com, reijiw@google.com, Brendan Jackman , Yosry Ahmed , Robin Holt , Steve Wahl , Arnd Bergmann , Greg Kroah-Hartman Content-Type: text/plain; charset="utf-8" The difference between __alloc_pages_node() and alloc_pages_node() is that the latter allows you to pass NUMA_NO_NODE. The former is going away and the latter works fine here so switch over. No functional change intended. Cc: Robin Holt Cc: Steve Wahl Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Assisted-by: Gemini:unknown-model Acked-by: Greg Kroah-Hartman Reviewed-by: Suren Baghdasaryan Acked-by: Steve Wahl Reviewed-by: Vlastimil Babka (SUSE) Signed-off-by: Brendan Jackman --- drivers/misc/sgi-xp/xpc_uv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c index 772c787268932..79c2f00ed4d70 100644 --- a/drivers/misc/sgi-xp/xpc_uv.c +++ b/drivers/misc/sgi-xp/xpc_uv.c @@ -170,9 +170,8 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name, mq->mmr_blade = uv_cpu_to_blade_id(cpu); nid = cpu_to_node(cpu); - page = __alloc_pages_node(nid, - GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE, - pg_order); + page = alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE, + pg_order); if (page == NULL) { dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to alloc %d " "bytes of memory on nid=%d for GRU mq\n", mq_size, nid); -- 2.54.0