From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.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 2894A39A7E7 for ; Mon, 22 Jun 2026 10:01:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782122519; cv=none; b=nyoj6mLiPapoU8TRJGsj9MAzRl3o4Un6zf8kYxg5LJkEfWqS57RjE51g5LVYz7FrsecYzyk5+wyArt83g4U+WW29DTC6W2/vexWzxTvZxftGimXL7RP55zNqHPW1LfvaC1kusgok/JH4edSpuRtO8siJZ1XKYT3XLUvEYj9K9HA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782122519; c=relaxed/simple; bh=fqDDoNx0gA8PaVQ9DiZkZ4IxAQW675N6jb5nQtG5Jfo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ijnL1vCpydDF9rpL9xn4zAlGe8lsBRsV6+Ol4b+gnB3c1KVDM1MbqvTfBJaaf1V9ATTJyQNaVKV6Wc4r3x67ZiUMIsBKUplJIXgFSGrTrZ2aX6a2pia64PDXEZCXTM38j6lQu7LS7cwZoa46QjUhjAj1E9OIQ0BCvQF4vfhMJlg= 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=SZ8PIHQ6; arc=none smtp.client-ip=209.85.128.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="SZ8PIHQ6" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4923411f041so33915495e9.2 for ; Mon, 22 Jun 2026 03:01:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782122512; x=1782727312; 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=anP6XoH/y5KwBW1jK93UnwjV54q17yZa+JENUx+IL4g=; b=SZ8PIHQ6pwVDSHYOV4BUHb4PoKB8YY6kIp4/WqggGeNtN0aLbPb94y0KBrrcjLzDJd r/Kzns+m8z52utZyrWpjRnEm9RlbmK8kQC9Nl1Qx94CG+u4riHpktloj3BVxAbbL023C PW4J4GNg7btA4KitlgHvI+1fz1ia3mATvhzVyZYtDVzqdmcplYUWAbAcNCxzQ+3N3jVw FIfX3Ofsd+BSXmJnlAHx2uhbHFWKwm3ItU30Pec5KVjO8qRQwjIftSUk+FgIlfVhSsmZ gHZxvpAsqEZRF+DFspoLz5mz4wrcXlFL3ZZcV1CSfRHDKue/RDhXlBvu9nr8YZpCgnQx Wn2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782122512; x=1782727312; 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=anP6XoH/y5KwBW1jK93UnwjV54q17yZa+JENUx+IL4g=; b=LE65DGzrcZVFNA8db5iYzNuihaNbLypexRDDgQ1ysge7NvFwt/9wim8HsZ3OGSTc8x UxRRLCiltWJmjWP72e106Gn+T+2FiI0P895LLrn+G2gtlZVovirxrpRGxzEvg/kJ6E1m kLco7T28tYhICaXFNrQOo/dbo6D5E/ShRBb6CpLhHu31OMGmOvdR//vCQOCWaUgLzGMT on7UiZ36GHKrEKMg+ze0eLM8J3TyqyM0bkjoEaS7j9Q+Tjd/WIWp6UdYxKst2QJQ9ypr GKpExYLeyde5sRhkESwBSCMDIxYvmcCOStiBJn5WjxRKrGx+fmIALWnEGCgnZA89rkdL X+Dg== X-Forwarded-Encrypted: i=1; AFNElJ8xd93QyduTWR+XHEylUO0QYcYjMqErh30pay0Ju5R74BUgo8eB4tc2U+CW7HJvNq7BgtcV8d/If8XIUuo=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5YzRxNV9FNWMwbr99D4fqZ6hP9VD+IniAKkQYCE7Q0Ms985LP KMiuMcp9HUmScW74MeTyUIKIl0nQT8HkEJLRWGAWWa1a1N291HsqzJMAitw3cbppY4vVPnAqCwx C8O6GTuTH57BM9Q== X-Received: from wmk16.prod.google.com ([2002:a05:600c:290:b0:490:e9bc:6058]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:5020:b0:490:d946:47cf with SMTP id 5b1f17b1804b1-4923ef47d08mr224907005e9.4.1782122512201; Mon, 22 Jun 2026 03:01:52 -0700 (PDT) Date: Mon, 22 Jun 2026 10:01:35 +0000 In-Reply-To: <20260622-alloc-trylock-v2-0-31f31367d420@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260622-alloc-trylock-v2-0-31f31367d420@google.com> X-Mailer: b4 0.15.2 Message-ID: <20260622-alloc-trylock-v2-8-31f31367d420@google.com> Subject: [PATCH v2 08/13] sgi-xp: Use higher-level allocator 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 , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, Brendan Jackman , 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 former allows you to pass NUMA_NO_NODE. The former is going away and the latter works fine here so switch over. Cc: Robin Holt Cc: Steve Wahl Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Assisted-by: Gemini:unknown-model Signed-off-by: Brendan Jackman --- drivers/misc/sgi-xp/xpc_uv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c index 772c787268932..aacff70204241 100644 --- a/drivers/misc/sgi-xp/xpc_uv.c +++ b/drivers/misc/sgi-xp/xpc_uv.c @@ -170,7 +170,7 @@ 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, + page = alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE, pg_order); if (page == NULL) { -- 2.54.0