Commit fa3f1220 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

[PATCH] cdrom: handle SYSCTL without PROC_FS

Fixes oops (reference to cdrom_root_table->child->) when CONFIG_SYSCTL=y
and CONFIG_PROC_FS=n.
Signed-off-by: default avatarRandy Dunlap <rddunlap@osdl.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4fefea8f
...@@ -3336,7 +3336,6 @@ ctl_table cdrom_cdrom_table[] = { ...@@ -3336,7 +3336,6 @@ ctl_table cdrom_cdrom_table[] = {
/* Make sure that /proc/sys/dev is there */ /* Make sure that /proc/sys/dev is there */
ctl_table cdrom_root_table[] = { ctl_table cdrom_root_table[] = {
#ifdef CONFIG_PROC_FS
{ {
.ctl_name = CTL_DEV, .ctl_name = CTL_DEV,
.procname = "dev", .procname = "dev",
...@@ -3344,7 +3343,6 @@ ctl_table cdrom_root_table[] = { ...@@ -3344,7 +3343,6 @@ ctl_table cdrom_root_table[] = {
.mode = 0555, .mode = 0555,
.child = cdrom_cdrom_table, .child = cdrom_cdrom_table,
}, },
#endif /* CONFIG_PROC_FS */
{ .ctl_name = 0 } { .ctl_name = 0 }
}; };
static struct ctl_table_header *cdrom_sysctl_header; static struct ctl_table_header *cdrom_sysctl_header;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment