2003-09-04 03:32:34

by Trivial Patch Monkey

[permalink] [raw]
Subject: [TRIVIAL] eliminate warnings in mtrr_if.c when !CONFIG_PROC_FS

From: Stephen Hemminger <[email protected]>

Patch against 2.6.0-test1 latest (post-bk2). Get's rid of unused variable and function
warnings if /proc is not configured on.

--- trivial-2.6.0-test4-bk5/arch/i386/kernel/cpu/mtrr/if.c.orig 2003-09-04 13:02:00.000000000 +1000
+++ trivial-2.6.0-test4-bk5/arch/i386/kernel/cpu/mtrr/if.c 2003-09-04 13:02:00.000000000 +1000
@@ -13,6 +13,7 @@
/* RED-PEN: this is accessed without any locking */
extern unsigned int *usage_table;

+#ifdef CONFIG_PROC_FS
static int mtrr_seq_show(struct seq_file *seq, void *offset);

#define FILE_FCOUNT(f) (((struct seq_file *)((f)->private_data))->private)
@@ -310,11 +311,9 @@
.release = mtrr_close,
};

-# ifdef CONFIG_PROC_FS

static struct proc_dir_entry *proc_root_mtrr;

-# endif /* CONFIG_PROC_FS */

static int mtrr_seq_show(struct seq_file *seq, void *offset)
{
@@ -349,6 +348,8 @@
return 0;
}

+# endif /* CONFIG_PROC_FS */
+
static int __init mtrr_if_init(void)
{
#ifdef CONFIG_PROC_FS
--
What is this? http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/
Don't blame me: the Monkey is driving
File: Stephen Hemminger <[email protected]>: [PATCH] eliminate warnings in mtrr_if.c when !CONFIG_PROC_FS