* patches for PROC_FS=n (2.6.0-test7)
@ 2003-10-10 21:16 Randy.Dunlap
2003-10-11 19:08 ` David S. Miller
0 siblings, 1 reply; 6+ messages in thread
From: Randy.Dunlap @ 2003-10-10 21:16 UTC (permalink / raw)
To: lkml; +Cc: netdev
drivers/char/toshiba.c and
net/atm/clip.c don't build if PROC_FS=n.
Patches for them are available at:
http://developer.osdl.org/rddunlap/patches/toshiba_inline_260t7.patch
http://developer.osdl.org/rddunlap/patches/atmprocfs_260t7.patch
There are several other drivers/protocols that don't build
with PROC_FS=n, like arlan, siimage, ipx, llc, and bluetooth.
--
~Randy
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: patches for PROC_FS=n (2.6.0-test7)
2003-10-10 21:16 patches for PROC_FS=n (2.6.0-test7) Randy.Dunlap
@ 2003-10-11 19:08 ` David S. Miller
2003-10-11 19:40 ` Sam Ravnborg
0 siblings, 1 reply; 6+ messages in thread
From: David S. Miller @ 2003-10-11 19:08 UTC (permalink / raw)
To: Randy.Dunlap; +Cc: linux-kernel, netdev
On Fri, 10 Oct 2003 14:16:46 -0700
"Randy.Dunlap" <rddunlap@osdl.org> wrote:
> http://developer.osdl.org/rddunlap/patches/atmprocfs_260t7.patch
How can this be needed? When procfs is disabled then
remove_proc_entry() is defined as "do { } while (0)", ie. a nop.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: patches for PROC_FS=n (2.6.0-test7)
2003-10-11 19:08 ` David S. Miller
@ 2003-10-11 19:40 ` Sam Ravnborg
2003-10-11 19:40 ` David S. Miller
0 siblings, 1 reply; 6+ messages in thread
From: Sam Ravnborg @ 2003-10-11 19:40 UTC (permalink / raw)
To: David S. Miller; +Cc: Randy.Dunlap, linux-kernel, netdev
On Sat, Oct 11, 2003 at 12:08:52PM -0700, David S. Miller wrote:
> On Fri, 10 Oct 2003 14:16:46 -0700
> "Randy.Dunlap" <rddunlap@osdl.org> wrote:
>
> > http://developer.osdl.org/rddunlap/patches/atmprocfs_260t7.patch
>
> How can this be needed? When procfs is disabled then
> remove_proc_entry() is defined as "do { } while (0)", ie. a nop.
Due to this - the real offender:
from: net/atm/clip.c:
#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#endif
Sam
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: patches for PROC_FS=n (2.6.0-test7)
2003-10-11 19:40 ` Sam Ravnborg
@ 2003-10-11 19:40 ` David S. Miller
0 siblings, 0 replies; 6+ messages in thread
From: David S. Miller @ 2003-10-11 19:40 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: rddunlap, linux-kernel, netdev
On Sat, 11 Oct 2003 21:40:08 +0200
Sam Ravnborg <sam@ravnborg.org> wrote:
> Due to this - the real offender:
>
> from: net/atm/clip.c:
> #ifdef CONFIG_PROC_FS
> #include <linux/proc_fs.h>
> #include <linux/seq_file.h>
> #endif
That makes a whole lot more sense, here is the fix I just
checked in:
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1352 -> 1.1353
# net/atm/clip.c 1.26 -> 1.27
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/10/11 davem@nuts.ninka.net 1.1353
# [ATM]: Kill PROC_FS ifdef around includes.
# --------------------------------------------
#
diff -Nru a/net/atm/clip.c b/net/atm/clip.c
--- a/net/atm/clip.c Sat Oct 11 12:43:12 2003
+++ b/net/atm/clip.c Sat Oct 11 12:43:12 2003
@@ -24,10 +24,8 @@
#include <linux/if.h> /* for IFF_UP */
#include <linux/inetdevice.h>
#include <linux/bitops.h>
-#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#endif
#include <net/route.h> /* for struct rtable and routing */
#include <net/icmp.h> /* icmp_send */
#include <asm/param.h> /* for HZ */
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: patches for PROC_FS=n (2.6.0-test7)
2003-10-10 23:06 Noah J. Misch
@ 2003-10-11 2:45 ` Randy.Dunlap
0 siblings, 0 replies; 6+ messages in thread
From: Randy.Dunlap @ 2003-10-11 2:45 UTC (permalink / raw)
To: Noah J. Misch; +Cc: linux-kernel
On Fri, 10 Oct 2003 16:06:29 -0700 (PDT) "Noah J. Misch" <noah@caltech.edu> wrote:
| > drivers/char/toshiba.c and
| > net/atm/clip.c don't build if PROC_FS=n.
|
| > Patches for them are available at:
|
| > http://developer.osdl.org/rddunlap/patches/toshiba_inline_260t7.patch
|
| Consider the patch at the bottom of this message instead. The tosh_get_info
| function is really internal to drivers/char/toshiba.c, so instead I changed it
| to static in that file and completely removed the prototype in toshiba.h.
|
| BTW, both your patch (I think) and mine also solve a duplicate symbol problem -
| see the ChangeSet log for details.
Yes, your patch is good and should be applied.
| > http://developer.osdl.org/rddunlap/patches/atmprocfs_260t7.patch
|
| Cool.
|
| > There are several other drivers/protocols that don't build
| > with PROC_FS=n, like arlan, siimage, ipx, llc, and bluetooth.
|
| I put in a patch for ipx yesterday, and I have patches for siimage and llc
| pretty much ready to go. I noticed the others but I have not done much.
Good, thanks for the info.
~Randy
| Thanks,
| Noah
|
| Toshiba patch:
|
| # This is a BitKeeper generated patch for the following project:
| # Project Name: Linux kernel tree
| # This patch format is intended for GNU patch command version 2.5 or higher.
| # This patch includes the following deltas:
| # ChangeSet 1.1344 -> 1.1345
| # include/linux/toshiba.h 1.3 -> 1.4
| # drivers/char/toshiba.c 1.11 -> 1.12
| #
| # The following is the BitKeeper ChangeSet Log
| # --------------------------------------------
| # 03/10/10 noah@caltech.edu 1.1345
| # Remove the prototypes for tosh_get_info from include/linux/toshiba.h and
| # make the function's definition in drivers/char/toshiba.c static. This
| # function is specific to toshiba.c, so no other file needs the prototype.
| #
| # This allows drivers/char/toshiba.c to compile with CONFIG_PROC_FS=n and
| # allows one to link more than one driver that includes toshiba.h into the
| # kernel at the same time without a multiple declaration; for example, both
| # drivers/char/toshiba.c and drivers/video/neofb.c.
| # --------------------------------------------
| #
| diff -Nru a/drivers/char/toshiba.c b/drivers/char/toshiba.c
| --- a/drivers/char/toshiba.c Fri Oct 10 18:50:17 2003
| +++ b/drivers/char/toshiba.c Fri Oct 10 18:50:17 2003
| @@ -292,7 +292,7 @@
| * Print the information for /proc/toshiba
| */
| #ifdef CONFIG_PROC_FS
| -int tosh_get_info(char *buffer, char **start, off_t fpos, int length)
| +static int tosh_get_info(char *buffer, char **start, off_t fpos, int length)
| {
| char *temp;
| int key;
| diff -Nru a/include/linux/toshiba.h b/include/linux/toshiba.h
| --- a/include/linux/toshiba.h Fri Oct 10 18:50:17 2003
| +++ b/include/linux/toshiba.h Fri Oct 10 18:50:17 2003
| @@ -33,13 +33,4 @@
| unsigned int edi __attribute__ ((packed));
| } SMMRegisters;
|
| -#ifdef CONFIG_PROC_FS
| -static int tosh_get_info(char *, char **, off_t, int);
| -#else /* !CONFIG_PROC_FS */
| -inline int tosh_get_info(char *buffer, char **start, off_t fpos, int lenght)
| -{
| - return 0;
| -}
| -#endif /* CONFIG_PROC_FS */
| -
| #endif
|
| -
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: patches for PROC_FS=n (2.6.0-test7)
@ 2003-10-10 23:06 Noah J. Misch
2003-10-11 2:45 ` Randy.Dunlap
0 siblings, 1 reply; 6+ messages in thread
From: Noah J. Misch @ 2003-10-10 23:06 UTC (permalink / raw)
To: rddunlap; +Cc: linux-kernel
> drivers/char/toshiba.c and
> net/atm/clip.c don't build if PROC_FS=n.
> Patches for them are available at:
> http://developer.osdl.org/rddunlap/patches/toshiba_inline_260t7.patch
Consider the patch at the bottom of this message instead. The tosh_get_info
function is really internal to drivers/char/toshiba.c, so instead I changed it
to static in that file and completely removed the prototype in toshiba.h.
BTW, both your patch (I think) and mine also solve a duplicate symbol problem -
see the ChangeSet log for details.
> http://developer.osdl.org/rddunlap/patches/atmprocfs_260t7.patch
Cool.
> There are several other drivers/protocols that don't build
> with PROC_FS=n, like arlan, siimage, ipx, llc, and bluetooth.
I put in a patch for ipx yesterday, and I have patches for siimage and llc
pretty much ready to go. I noticed the others but I have not done much.
Thanks,
Noah
Toshiba patch:
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1344 -> 1.1345
# include/linux/toshiba.h 1.3 -> 1.4
# drivers/char/toshiba.c 1.11 -> 1.12
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/10/10 noah@caltech.edu 1.1345
# Remove the prototypes for tosh_get_info from include/linux/toshiba.h and
# make the function's definition in drivers/char/toshiba.c static. This
# function is specific to toshiba.c, so no other file needs the prototype.
#
# This allows drivers/char/toshiba.c to compile with CONFIG_PROC_FS=n and
# allows one to link more than one driver that includes toshiba.h into the
# kernel at the same time without a multiple declaration; for example, both
# drivers/char/toshiba.c and drivers/video/neofb.c.
# --------------------------------------------
#
diff -Nru a/drivers/char/toshiba.c b/drivers/char/toshiba.c
--- a/drivers/char/toshiba.c Fri Oct 10 18:50:17 2003
+++ b/drivers/char/toshiba.c Fri Oct 10 18:50:17 2003
@@ -292,7 +292,7 @@
* Print the information for /proc/toshiba
*/
#ifdef CONFIG_PROC_FS
-int tosh_get_info(char *buffer, char **start, off_t fpos, int length)
+static int tosh_get_info(char *buffer, char **start, off_t fpos, int length)
{
char *temp;
int key;
diff -Nru a/include/linux/toshiba.h b/include/linux/toshiba.h
--- a/include/linux/toshiba.h Fri Oct 10 18:50:17 2003
+++ b/include/linux/toshiba.h Fri Oct 10 18:50:17 2003
@@ -33,13 +33,4 @@
unsigned int edi __attribute__ ((packed));
} SMMRegisters;
-#ifdef CONFIG_PROC_FS
-static int tosh_get_info(char *, char **, off_t, int);
-#else /* !CONFIG_PROC_FS */
-inline int tosh_get_info(char *buffer, char **start, off_t fpos, int lenght)
-{
- return 0;
-}
-#endif /* CONFIG_PROC_FS */
-
#endif
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2003-10-11 19:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-10-10 21:16 patches for PROC_FS=n (2.6.0-test7) Randy.Dunlap
2003-10-11 19:08 ` David S. Miller
2003-10-11 19:40 ` Sam Ravnborg
2003-10-11 19:40 ` David S. Miller
2003-10-10 23:06 Noah J. Misch
2003-10-11 2:45 ` Randy.Dunlap
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®