The following commit has been merged into the x86/platform branch of tip: Commit-ID: 148c277165cdc72d97d1711b9a1e566d66521828 Gitweb: https://git.kernel.org/tip/148c277165cdc72d97d1711b9a1e566d66521828 Author: Mike Travis <mike.tra...@hpe.com> AuthorDate: Fri, 27 Nov 2020 21:42:26 -06:00 Committer: Borislav Petkov <b...@suse.de> CommitterDate: Mon, 07 Dec 2020 20:03:09 +01:00
x86/platform/uv: Add deprecated messages to /proc info leaves Add "deprecated" message to any access to old /proc/sgi_uv/* leaves. [ bp: Do not have a trailing function opening brace and the arguments continuing on the next line and align them on the opening brace. ] Signed-off-by: Mike Travis <mike.tra...@hpe.com> Signed-off-by: Borislav Petkov <b...@suse.de> Reviewed-by: Steve Wahl <steve.w...@hpe.com> Acked-by: Hans de Goede <hdego...@redhat.com> Link: https://lkml.kernel.org/r/20201128034227.120869-5-mike.tra...@hpe.com --- arch/x86/kernel/apic/x2apic_uv_x.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 4874603..d75e1d9 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -1615,21 +1615,30 @@ static void check_efi_reboot(void) reboot_type = BOOT_ACPI; } -/* Setup user proc fs files */ +/* + * User proc fs file handling now deprecated. + * Recommend using /sys/firmware/sgi_uv/... instead. + */ static int __maybe_unused proc_hubbed_show(struct seq_file *file, void *data) { + pr_notice_once("%s: using deprecated /proc/sgi_uv/hubbed, use /sys/firmware/sgi_uv/hub_type\n", + current->comm); seq_printf(file, "0x%x\n", uv_hubbed_system); return 0; } static int __maybe_unused proc_hubless_show(struct seq_file *file, void *data) { + pr_notice_once("%s: using deprecated /proc/sgi_uv/hubless, use /sys/firmware/sgi_uv/hubless\n", + current->comm); seq_printf(file, "0x%x\n", uv_hubless_system); return 0; } static int __maybe_unused proc_archtype_show(struct seq_file *file, void *data) { + pr_notice_once("%s: using deprecated /proc/sgi_uv/archtype, use /sys/firmware/sgi_uv/archtype\n", + current->comm); seq_printf(file, "%s/%s\n", uv_archtype, oem_table_id); return 0; }
