While changing the TTY layer, an API parameter was removed, so it was removed
by almost all calls, changing their prototype. But one use of one such
function was not updated, breaking UML compilation. This is the fix.
Should go in directly - trivial fix.
Thanks for the breakage, too :-).
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[email protected]>
---
vanilla-linux-2.6.9-paolo/arch/um/drivers/line.c | 2 --
vanilla-linux-2.6.9-paolo/arch/um/drivers/ssl.c | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff -puN arch/um/drivers/ssl.c~uml-mainline-is-lazy-fix arch/um/drivers/ssl.c
--- vanilla-linux-2.6.9/arch/um/drivers/ssl.c~uml-mainline-is-lazy-fix 2004-10-27 01:47:58.000000000 +0200
+++ vanilla-linux-2.6.9-paolo/arch/um/drivers/ssl.c 2004-10-27 01:48:07.000000000 +0200
@@ -119,7 +119,7 @@ static int ssl_write(struct tty_struct *
static void ssl_put_char(struct tty_struct *tty, unsigned char ch)
{
- line_write(serial_lines, tty, 0, &ch, sizeof(ch));
+ line_write(serial_lines, tty, &ch, sizeof(ch));
}
static void ssl_flush_chars(struct tty_struct *tty)
diff -puN arch/um/drivers/line.c~uml-mainline-is-lazy-fix arch/um/drivers/line.c
--- vanilla-linux-2.6.9/arch/um/drivers/line.c~uml-mainline-is-lazy-fix 2004-10-27 01:49:16.000000000 +0200
+++ vanilla-linux-2.6.9-paolo/arch/um/drivers/line.c 2004-10-27 01:49:47.000000000 +0200
@@ -110,7 +110,6 @@ static int flush_buffer(struct line *lin
int line_write(struct line *lines, struct tty_struct *tty, const char *buf, int len)
{
struct line *line;
- char *new;
unsigned long flags;
int n, err, i, ret = 0;
@@ -143,7 +142,6 @@ int line_write(struct line *lines, struc
}
out_up:
up(&line->sem);
- out_free:
return(ret);
}
_
On Thu, 28 Oct 2004 22:04:51 +0200, [email protected]
<[email protected]> wrote:
>
> While changing the TTY layer, an API parameter was removed, so it was removed
> by almost all calls, changing their prototype. But one use of one such
> function was not updated, breaking UML compilation. This is the fix.
>
> Should go in directly - trivial fix.
>
> Thanks for the breakage, too :-).
>
> Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[email protected]>
> ---
>
> vanilla-linux-2.6.9-paolo/arch/um/drivers/line.c | 2 --
> vanilla-linux-2.6.9-paolo/arch/um/drivers/ssl.c | 2 +-
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff -puN arch/um/drivers/ssl.c~uml-mainline-is-lazy-fix arch/um/drivers/ssl.c
> --- vanilla-linux-2.6.9/arch/um/drivers/ssl.c~uml-mainline-is-lazy-fix 2004-10-27 01:47:58.000000000 +0200
> +++ vanilla-linux-2.6.9-paolo/arch/um/drivers/ssl.c 2004-10-27 01:48:07.000000000 +0200
> @@ -119,7 +119,7 @@ static int ssl_write(struct tty_struct *
>
> static void ssl_put_char(struct tty_struct *tty, unsigned char ch)
> {
> - line_write(serial_lines, tty, 0, &ch, sizeof(ch));
> + line_write(serial_lines, tty, &ch, sizeof(ch));
> }
>
> static void ssl_flush_chars(struct tty_struct *tty)
> diff -puN arch/um/drivers/line.c~uml-mainline-is-lazy-fix arch/um/drivers/line.c
> --- vanilla-linux-2.6.9/arch/um/drivers/line.c~uml-mainline-is-lazy-fix 2004-10-27 01:49:16.000000000 +0200
> +++ vanilla-linux-2.6.9-paolo/arch/um/drivers/line.c 2004-10-27 01:49:47.000000000 +0200
> @@ -110,7 +110,6 @@ static int flush_buffer(struct line *lin
> int line_write(struct line *lines, struct tty_struct *tty, const char *buf, int len)
> {
> struct line *line;
> - char *new;
> unsigned long flags;
> int n, err, i, ret = 0;
>
> @@ -143,7 +142,6 @@ int line_write(struct line *lines, struc
> }
> out_up:
> up(&line->sem);
> - out_free:
> return(ret);
> }
>
http://dictionary.reference.com/search?q=lazyness
NOW who's lazy :P
-DaMouse
--
I know I broke SOMETHING but its their fault for not fixing it before me
On Thursday 28 October 2004 22:26, DaMouse wrote:
> On Thu, 28 Oct 2004 22:04:51 +0200, [email protected]
>
> <[email protected]> wrote:
> > While changing the TTY layer, an API parameter was removed, so it was
> > removed by almost all calls, changing their prototype. But one use of one
> > such function was not updated, breaking UML compilation. This is the fix.
> >
> > Should go in directly - trivial fix.
> >
> > Thanks for the breakage, too :-).
>
> http://dictionary.reference.com/search?q=lazyness
> NOW who's lazy :P
Ok, I've flamed a bit, and I get it back.
I'm not English, however that does not qualify as a good reason.
> -DaMouse
> --
> I know I broke SOMETHING but its their fault for not fixing it before me
Is that the signature or the actual answer :-)?
However, let's code well, ok? (I don't know whether you're the author, but
however, that's not the problem).
Bye
--
Paolo Giarrusso, aka Blaisorblade
Linux registered user n. 292729