Skip to contentSkip to conversation

2.5.70-mm5: fix ieee1394_core.c compile if !CONFIG_PROC_FS

PATCH In review Adrian Bunk 3 participants 3 messages Jun 7, 2003

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 2.5.70-mm5: fix ieee1394_core.c compile if !CONFIG_PROC_FS

I got the following compile error with !CONFIG_PROC_FS:

<-- snip -->

...
CC drivers/ieee1394/ieee1394_core.o
drivers/ieee1394/ieee1394_core.c: In function `ieee1394_cleanup':
drivers/ieee1394/ieee1394_core.c:1231: `proc_bus' undeclared (first use in this function) drivers/ieee1394/ieee1394_core.c:1231: (Each undeclared identifier is reported only once drivers/ieee1394/ieee1394_core.c:1231: for each function it appears in.) make[2]: *** [drivers/ieee1394/ieee1394_core.o] Error 1

<-- snip -->

The following patch fixes it:

drivers/ieee1394/ieee1394_core.c renamed from drivers/ieee1394/ieee1394_core.c.old +2 -0
@@ -1228,7 +1228,9 @@
 
 	unregister_chrdev(IEEE1394_MAJOR, "ieee1394");
 	devfs_remove("ieee1394");
+#ifdef CONFIG_PROC_FS
 	remove_proc_entry("ieee1394", proc_bus);
+#endif
 }
 
 module_init(ieee1394_init);

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#1 lore raw
Quoted 7 lines · Adrian Bunk

I got the following compile error with !CONFIG_PROC_FS:

The following patch fixes it:

drivers/ieee1394/ieee1394_core.c line 1235

Quoted 8 lines
drivers/ieee1394/ieee1394_core.c renamed from drivers/ieee1394/ieee1394_core.c.old +2 -0
@@ -1228,7 +1228,9 @@
 
 	unregister_chrdev(IEEE1394_MAJOR, "ieee1394");
 	devfs_remove("ieee1394");
+#ifdef CONFIG_PROC_FS
 	remove_proc_entry("ieee1394", proc_bus);
+#endif
 }

proc_fs.h has:

static inline void remove_proc_entry(const char *name, struct proc_dir_entry *parent) {};

for the !CONFIG_PROC_FS case, so that _should_ have prevented this problem.
What went wrong?

#2 lore raw
Quoted 19 lines · Andrew Morton
Quoted 7 lines · Adrian Bunk

I got the following compile error with !CONFIG_PROC_FS:

The following patch fixes it:

drivers/ieee1394/ieee1394_core.c line 1235

Quoted 8 lines
drivers/ieee1394/ieee1394_core.c renamed from drivers/ieee1394/ieee1394_core.c.old +2 -0
@@ -1228,7 +1228,9 @@
 
 	unregister_chrdev(IEEE1394_MAJOR, "ieee1394");
 	devfs_remove("ieee1394");
+#ifdef CONFIG_PROC_FS
 	remove_proc_entry("ieee1394", proc_bus);
+#endif
 }

proc_fs.h has:

Quoted 4 lines

static inline void remove_proc_entry(const char *name, struct proc_dir_entry *parent) {};

for the !CONFIG_PROC_FS case, so that _should_ have prevented this problem.
What went wrong?

proc_bus is only defined when CONFIG_PROC

Sam