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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
sh
/
kernel
/
cpu
/
sh4
/
sq.c
diff --git
a/arch/sh/kernel/cpu/sh4/sq.c
b/arch/sh/kernel/cpu/sh4/sq.c
index
b09805f
..
8437ea7
100644
(file)
--- a/
arch/sh/kernel/cpu/sh4/sq.c
+++ b/
arch/sh/kernel/cpu/sh4/sq.c
@@
-19,6
+19,7
@@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/config.h>
#include <linux/slab.h>
#include <linux/list.h>
#include <linux/proc_fs.h>
#include <linux/slab.h>
#include <linux/list.h>
#include <linux/proc_fs.h>
@@
-416,27
+417,24
@@
static struct file_operations sq_fops = {
static struct miscdevice sq_dev = {
.minor = STORE_QUEUE_MINOR,
.name = "sq",
static struct miscdevice sq_dev = {
.minor = STORE_QUEUE_MINOR,
.name = "sq",
+ .devfs_name = "cpu/sq",
.fops = &sq_fops,
};
static int __init sq_api_init(void)
{
.fops = &sq_fops,
};
static int __init sq_api_init(void)
{
- int ret;
printk(KERN_NOTICE "sq: Registering store queue API.\n");
printk(KERN_NOTICE "sq: Registering store queue API.\n");
+#ifdef CONFIG_PROC_FS
create_proc_read_entry("sq_mapping", 0, 0, sq_mapping_read_proc, 0);
create_proc_read_entry("sq_mapping", 0, 0, sq_mapping_read_proc, 0);
+#endif
- ret = misc_register(&sq_dev);
- if (ret)
- remove_proc_entry("sq_mapping", NULL);
-
- return ret;
+ return misc_register(&sq_dev);
}
static void __exit sq_api_exit(void)
{
misc_deregister(&sq_dev);
}
static void __exit sq_api_exit(void)
{
misc_deregister(&sq_dev);
- remove_proc_entry("sq_mapping", NULL);
}
module_init(sq_api_init);
}
module_init(sq_api_init);