git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
block
/
genhd.c
diff --git
a/block/genhd.c
b/block/genhd.c
index
25d1f42
..
5a8d3bf
100644
(file)
--- a/
block/genhd.c
+++ b/
block/genhd.c
@@
-2,6
+2,7
@@
* gendisk handling
*/
* gendisk handling
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/genhd.h>
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/genhd.h>
@@
-16,7
+17,8
@@
#include <linux/buffer_head.h>
#include <linux/mutex.h>
#include <linux/buffer_head.h>
#include <linux/mutex.h>
-struct subsystem block_subsys;
+static struct subsystem block_subsys;
+
static DEFINE_MUTEX(block_subsys_lock);
/*
static DEFINE_MUTEX(block_subsys_lock);
/*
@@
-509,7
+511,9
@@
static struct kset_uevent_ops block_uevent_ops = {
.uevent = block_uevent,
};
.uevent = block_uevent,
};
-decl_subsys(block, &ktype_block, &block_uevent_ops);
+/* declare block_subsys. */
+static decl_subsys(block, &ktype_block, &block_uevent_ops);
+
/*
* aggregate disk stat collector. Uses the same stats that the sysfs
/*
* aggregate disk stat collector. Uses the same stats that the sysfs