Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 apic fix from Ingo Molnar: "A single commit that simplifies the code and gets rid of a compiler warning" * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/apic/uv: Avoid unused variable warning
This commit is contained in:
commit
435dd727a4
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue