From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD7A530DD21 for ; Tue, 6 Jan 2026 09:51:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767693073; cv=none; b=PWBEnV+F1NdimySAdH2Pi3W3rqpaZ2hcQbyUYegz17BKjhFd+WVZJTK9yBq9ebJK+Te75kY+iVP2oh1pS+/SCOzCONYCVM2hTvhwrjvvyMuhiNJu+Pv7gSRxY8P8vzxO837R9zqdohh0b7GMCovS/17Mcq5QWEtMnnpjCHiSzTY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767693073; c=relaxed/simple; bh=zyJZzS5fe2Hgo3vR4VjPwvDleUdEDnTGhQNKXyFstUM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k/0l08tPkYp0Q+iT89nHgrV83UdPLRITEK7pJoJQJEir7XgFoBD9aXjMN9YHkUycTQbgaDn9frhyD0y9e9PRwxw5dWlIWMfoF+L/gGOk+j1kCvOK3LEMoYkkqwGUGPNedPMIT+sYzIttegcrMJgMrurGN1GxD4xOuYAwFzLMRr4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=fYsqY71s; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=M/vdfM2E; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fYsqY71s"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="M/vdfM2E" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767693070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cZgrTjb26V9hHLjA734rJjLqTVSsFQ/64lxp+Kz3lkM=; b=fYsqY71s3VpXdcm6O+TAQ0O+37TG7O5on31fDOpA38twdn4suqq6+pVgKm1JF0J4AxlRJG lHOxOx+1gWAlR5qJMZMEIxJNQYQPwuP6O7ijoHDmePYg2ksZJf2jTfbsNxP+VCwJQTo9+J yyt686LIGJaIH0SDUizrc7sp5SarYHk= Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-455-3DSDgWk1OVqBeoxiLqNV2A-1; Tue, 06 Jan 2026 04:51:09 -0500 X-MC-Unique: 3DSDgWk1OVqBeoxiLqNV2A-1 X-Mimecast-MFC-AGG-ID: 3DSDgWk1OVqBeoxiLqNV2A_1767693068 Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2a0bae9acd4so7849405ad.3 for ; Tue, 06 Jan 2026 01:51:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1767693068; x=1768297868; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cZgrTjb26V9hHLjA734rJjLqTVSsFQ/64lxp+Kz3lkM=; b=M/vdfM2E1/3A3uQa6d6fIchyvWxmw07Rr6MEl4AKYVEXK5zN6kAvF4QY9MWiYDxP0g KsPJHFtWQzf/eKeOc3BTZE81OzThpYfHZUbDItTMOQjmaWQt5/XzIZ1PM+uk3QF6rrJS T9GlFB1tgjAd9B5oyMeKaGZCwFDqT2y8iIavahJcW4HWK/FCC97w8TR9RalElW3NuC9m AUBkSeasiZfU0kEVP/ckr/IpHJTsPDmv3CGCqR+uBToU5Ybi4ijBSadGm9u6tOjfP2uS fWbhZqANm8VREXKc+DKPoKHq46ypBlbw7713qNGwL2wG3/Uei5SCg6q0Z4MEiUuYmicG t53Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767693068; x=1768297868; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=cZgrTjb26V9hHLjA734rJjLqTVSsFQ/64lxp+Kz3lkM=; b=f8AwzjE4fpjIr8LJ4ovkQGgLPaCjXAHdQSKbOMvlg0nCGrJvk3kJa0mlIx4HXfXrxr 76sqlOXBWSAXmtNhUd+M33ssu0pAiObU1KuFDrRGMkfR2GZVuvhtvbXPCEil8zYBXXFL H8JxPI6mCFTf/X+aK/1F6tSYHaGuXTVbjXzpv5jlRoxXbZj81AfMrZX9oe25g73VxjTO fsiLdgNMBbkrDu6OWzqIvE4+k8Up4JPSsrJJk5xSB9ZdcGj6ygbqYZ+N+8NHhZgA910e Oguo1osR1X0F6Fg2GdRsFeJtFjn7iHixsKprCC2mxcHn05f22bmME5Hi1jJctuDQwgZW +Ipg== X-Forwarded-Encrypted: i=1; AJvYcCXfuYNpey7Gt6DBcDJCjzDT+FASM9HtP/K8RAVTrs19Dzkr2Z26W04j4m7NJ50P7B1Ym8enVq8SqBKR/yU=@vger.kernel.org X-Gm-Message-State: AOJu0YwUG4ENvuZROh0cE1BEs5vV+XRIuMYVrWwM6JcQLZkYx9HRtDKU z6DJpYs3ixhDCgDi5ThSRBHhBKXSgXjXuGcTXVdTcmRC0KhyYyjbWEvgwA9/0N4Ta5XNhPnsstn 2SgQ1ffInD3IM3EW8cNpRIG7Q7Dcjx2A2DYbrZUiWvOQHfWJBz3P49tPcHl5DRaMVRQ== X-Gm-Gg: AY/fxX6W5eFT74qBx/p6t/VaCGER2sWIMxNI/6B49viSeDE4328JSACpY7EAzkImaje QT14g/r3XcdyBbp1OwdgFkUZuZD3EyMjjcdri2YjF26uaRD2a0jav9e/tHnhngIaxv0D3FE2VYg 1VacrL3bSkFsy0U6Hc+gceEqyPrx/MIHeWMpFJkd+xcNAzBlRsdPWDSsvJVYUXCP86hY4dw0Ua8 /ubJoCihC+DEoI8DUzOMF4rLYivITvWDH0O+r45rsttjFb0LmVlRsbthN+l65OxMNK+BJOALNQR nYEceMxwO8yUjzBymi0WjuVKc9TtihFC/ezceHVagnaOov+JXVhQIyvaJfF1NI27vZQ48QFql+J s X-Received: by 2002:a17:902:f685:b0:2a0:d629:903f with SMTP id d9443c01a7336-2a3e2c8e298mr16967895ad.9.1767693068292; Tue, 06 Jan 2026 01:51:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IG8NbRx4BSQbdF0wpyEd4iUJI5Lk3MVNn58sSFSHtDOCxUKIVyXD4gxNvJ9dtols1xg/4FT+w== X-Received: by 2002:a17:902:f685:b0:2a0:d629:903f with SMTP id d9443c01a7336-2a3e2c8e298mr16967745ad.9.1767693067731; Tue, 06 Jan 2026 01:51:07 -0800 (PST) Received: from localhost ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-819c59e755bsm1664799b3a.48.2026.01.06.01.51.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jan 2026 01:51:07 -0800 (PST) From: Coiby Xu To: kexec@lists.infradead.org, x86@kernel.org Cc: Andrew Morton , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)) Subject: [PATCH 2/2] Reapply "x86/mm: Remove unused __set_memory_prot()" Date: Tue, 6 Jan 2026 17:50:59 +0800 Message-ID: <20260106095100.656292-2-coxu@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260106095100.656292-1-coxu@redhat.com> References: <20260106095100.656292-1-coxu@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This reverts commit e1e6cd01d93359e22be84a23c8bb24ee4e04e142 as __set_memory_prot is unsued (again) after set_memory_p is used instead for x86_64 kdump LUKS support (CONFIG_CRASH_DM_CRYPT). Signed-off-by: Coiby Xu --- arch/x86/include/asm/set_memory.h | 2 -- arch/x86/mm/pat/set_memory.c | 13 ------------- 2 files changed, 15 deletions(-) diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h index 61f56cdaccb5..8d9f1c9aaa4c 100644 --- a/arch/x86/include/asm/set_memory.h +++ b/arch/x86/include/asm/set_memory.h @@ -4,7 +4,6 @@ #include #include -#include #define set_memory_rox set_memory_rox int set_memory_rox(unsigned long addr, int numpages); @@ -38,7 +37,6 @@ int set_memory_rox(unsigned long addr, int numpages); * The caller is required to take care of these. */ -int __set_memory_prot(unsigned long addr, int numpages, pgprot_t prot); int _set_memory_uc(unsigned long addr, int numpages); int _set_memory_wc(unsigned long addr, int numpages); int _set_memory_wt(unsigned long addr, int numpages); diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 6c6eb486f7a6..40581a720fe8 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -2145,19 +2145,6 @@ static inline int cpa_clear_pages_array(struct page **pages, int numpages, CPA_PAGES_ARRAY, pages); } -/* - * __set_memory_prot is an internal helper for callers that have been passed - * a pgprot_t value from upper layers and a reservation has already been taken. - * If you want to set the pgprot to a specific page protocol, use the - * set_memory_xx() functions. - */ -int __set_memory_prot(unsigned long addr, int numpages, pgprot_t prot) -{ - return change_page_attr_set_clr(&addr, numpages, prot, - __pgprot(~pgprot_val(prot)), 0, 0, - NULL); -} - int _set_memory_uc(unsigned long addr, int numpages) { /* -- 2.52.0