From: Stephen Hemminger <shemminger@osdl.org>
To: Linus Torvalds <torvalds@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] mtrr w/o proc_fs
Date: Fri, 12 Sep 2003 11:06:54 -0700 [thread overview]
Message-ID: <20030912110654.4cb0b22b.shemminger@osdl.org> (raw)
Get rid of warnings (and dead code) if MTRR is compiled without /proc
diff -Nru a/arch/i386/kernel/cpu/mtrr/if.c b/arch/i386/kernel/cpu/mtrr/if.c
--- a/arch/i386/kernel/cpu/mtrr/if.c Fri Sep 12 10:57:50 2003
+++ b/arch/i386/kernel/cpu/mtrr/if.c Fri Sep 12 10:57:50 2003
@@ -13,7 +13,6 @@
/* RED-PEN: this is accessed without any locking */
extern unsigned int *usage_table;
-static int mtrr_seq_show(struct seq_file *seq, void *offset);
#define FILE_FCOUNT(f) (((struct seq_file *)((f)->private_data))->private)
@@ -33,6 +32,8 @@
return (x <= 6) ? mtrr_strings[x] : "?";
}
+#ifdef CONFIG_PROC_FS
+
static int
mtrr_file_add(unsigned long base, unsigned long size,
unsigned int type, char increment, struct file *file, int page)
@@ -291,6 +292,8 @@
return single_release(ino, file);
}
+static int mtrr_seq_show(struct seq_file *seq, void *offset);
+
static int mtrr_open(struct inode *inode, struct file *file)
{
if (!mtrr_if)
@@ -310,11 +313,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)
{
@@ -351,15 +352,14 @@
static int __init mtrr_if_init(void)
{
-#ifdef CONFIG_PROC_FS
proc_root_mtrr =
create_proc_entry("mtrr", S_IWUSR | S_IRUGO, &proc_root);
if (proc_root_mtrr) {
proc_root_mtrr->owner = THIS_MODULE;
proc_root_mtrr->proc_fops = &mtrr_fops;
}
-#endif
return 0;
}
arch_initcall(mtrr_if_init);
+#endif /* CONFIG_PROC_FS */
reply other threads:[~2003-09-12 18:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20030912110654.4cb0b22b.shemminger@osdl.org \
--to=shemminger@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®