x86/apic fix
Subsystems (2)
Linus,
Please pull the latest x86-apic-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-apic-for-linus
# HEAD: d0b7788804482b2689946cd8d910ac3e03126c8d x86/apic/uv: Avoid unused variable warning
A single commit that simplifies the code and gets rid of a compiler warning.
Thanks,
Ingo
------------------>
Arnd Bergmann (1):
x86/apic/uv: Avoid unused variable warning
arch/x86/kernel/apic/x2apic_uv_x.c | 43 ++++++-------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-)
arch/x86/kernel/apic/x2apic_uv_x.c +6 -37
@@ -1493,65 +1493,34 @@ static void check_efi_reboot(void) }/* Setup user proc fs files */ -static int proc_hubbed_show (struct seq_file *file,void *data) +static int __maybe_unused proc_hubbed_show (struct seq_file *file,void *data) {seq_printf (file,"0x%x\n" , uv_hubbed_system);return 0 ; } -static int proc_hubless_show (struct seq_file *file,void *data) +static int __maybe_unused proc_hubless_show (struct seq_file *file,void *data) {seq_printf (file,"0x%x\n" , uv_hubless_system);return 0 ; } -static int proc_oemid_show (struct seq_file *file,void *data) +static int __maybe_unused proc_oemid_show (struct seq_file *file,void *data) {seq_printf (file,"%s/%s\n" , oem_id, oem_table_id);return 0 ; } -static int proc_hubbed_open (struct inode *inode,struct file *file) -{ -return single_open (file, proc_hubbed_show, (void *)NULL ); -} - -static int proc_hubless_open (struct inode *inode,struct file *file) -{ -return single_open (file, proc_hubless_show, (void *)NULL ); -} - -static int proc_oemid_open (struct inode *inode,struct file *file) -{ -return single_open (file, proc_oemid_show, (void *)NULL ); -} - -/* (struct is "non-const" as open function is set at runtime) */ -static struct file_operations proc_version_fops = { - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static const struct file_operations proc_oemid_fops = { - .open = proc_oemid_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; -static __init void uv_setup_proc_files (int hubless) {struct proc_dir_entry *pde; -char *name = hubless ?"hubless" :"hubbed" ; pde =proc_mkdir (UV_PROC_NODE ,NULL ); -proc_create ("oemid" ,0 , pde, &proc_oemid_fops); -proc_create (name,0 , pde, &proc_version_fops); +proc_create_single ("oemid" ,0 , pde, proc_oemid_show);if (hubless) - proc_version_fops.open = proc_hubless_open; +proc_create_single ("hubless" ,0 , pde, proc_hubless_show);else - proc_version_fops.open = proc_hubbed_open; +proc_create_single ("hubbed" ,0 , pde, proc_hubbed_show); }/* Initialize UV hubless systems */
The pull request you sent on Tue, 28 Jan 2020 17:35:30 +0100:
The pull request you sent on Tue, 28 Jan 2020 17:35:30 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitx86-apic-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/435dd727a411004d9402ad0c868c958408271a48
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker