2003-09-04 13:53:21

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: [PATCH] add MODULE_ALIAS_LDISC to asm-parisc/termios.h

Hi,

I noticed this one on parisc64 with the latest bk tree:

CC [M] drivers/char/n_hdlc.o
drivers/char/n_hdlc.c:985: parse error before numeric constant
drivers/char/n_hdlc.c:985: warning: type defaults to `int' in declaration of `MODULE_ALIAS_LDISC'
drivers/char/n_hdlc.c:985: warning: function declaration isn't a prototype
drivers/char/n_hdlc.c:985: warning: data definition has no type or storage classmake[2]: *** [drivers/char/n_hdlc.o] Error 1
make[1]: *** [drivers/char] Error 2
make: *** [drivers] Error 2

This patch makes it compile, doing the same thing that was done to
include/asm-i386/termios.h, please see if this is acceptable, if it is I can
provide the same patch for all the other arches.

- Arnaldo

===== include/asm-parisc/termios.h 1.4 vs edited =====
--- 1.4/include/asm-parisc/termios.h Sat Jul 20 06:52:25 2002
+++ edited/include/asm-parisc/termios.h Thu Sep 4 13:43:57 2003
@@ -101,6 +101,8 @@
#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))

+#define MODULE_ALIAS_LDISC(ldisc) \
+ MODULE_ALIAS("tty-ldisc-" __stringify(ldisc))
#endif /* __KERNEL__ */

#endif /* _PARISC_TERMIOS_H */


2003-09-04 14:19:33

by Matthew Wilcox

[permalink] [raw]
Subject: Re: [PATCH] add MODULE_ALIAS_LDISC to asm-parisc/termios.h

On Thu, Sep 04, 2003 at 10:53:15AM -0300, Arnaldo Carvalho de Melo wrote:
> This patch makes it compile, doing the same thing that was done to
> include/asm-i386/termios.h, please see if this is acceptable, if it is I can
> provide the same patch for all the other arches.

if it's the same for all arches, why not put it in <linux/termios.h>?

--
"It's not Hollywood. War is real, war is primarily not about defeat or
victory, it is about death. I've seen thousands and thousands of dead bodies.
Do you think I want to have an academic debate on this subject?" -- Robert Fisk

2003-09-04 14:26:00

by James Bottomley

[permalink] [raw]
Subject: Re: [parisc-linux] [PATCH] add MODULE_ALIAS_LDISC to asm-parisc/termios.h

On Thu, 2003-09-04 at 09:53, Arnaldo Carvalho de Melo wrote:
> +#define MODULE_ALIAS_LDISC(ldisc) \
> + MODULE_ALIAS("tty-ldisc-" __stringify(ldisc))

These are the strings used to identify the required line discipline
module to kmod, aren't they?

Since modprobe.conf seems to be generated without much regard for
architectures, is there any reason why this definition should differ
amongst architectures? I think the answer's "no", so I think this fix
should be in linux/termios.h (or somewhere architecture independent).

James