Skip to contentSkip to conversation

uml: fix mainline lazyness about TTY layer patch

PATCH In review [email protected] 2 participants 3 messages Oct 28, 2004 User-mode Linux (UML)

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 uml: fix mainline lazyness about TTY layer patch

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(-)
arch/um/drivers/ssl.c renamed from arch/um/drivers/ssl.c~uml-mainline-is-lazy-fix +1 -1
diff -puN arch/um/drivers/ssl.c~uml-mainline-is-lazy-fix arch/um/drivers/ssl.c
@@ -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)
arch/um/drivers/line.c renamed from arch/um/drivers/line.c~uml-mainline-is-lazy-fix +0 -2
diff -puN arch/um/drivers/line.c~uml-mainline-is-lazy-fix arch/um/drivers/line.c
@@ -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);
 }

_

#1 lore raw
Quoted 40 lines · On Thu, 28 Oct 2004 22:04:51 +0200, [email protected]…

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

arch/um/drivers/ssl.c 2004-10-27 01:48:07.000000000 +0200 renamed from arch/um/drivers/ssl.c~uml-mainline-is-lazy-fix 2004-10-27 01:47:58.000000000 +0200 +1 -1
@@ -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

arch/um/drivers/line.c 2004-10-27 01:49:47.000000000 +0200 renamed from arch/um/drivers/line.c~uml-mainline-is-lazy-fix 2004-10-27 01:49:16.000000000 +0200 +0 -1
@@ -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;

arch/um/drivers/line.c 2004-10-27 01:49:47.000000000 +0200 int line_write(struct line *lines, struc · line 147

Quoted 7 lines
arch/um/drivers/line.c 2004-10-27 01:49:47.000000000 +0200 renamed from arch/um/drivers/line.c~uml-mainline-is-lazy-fix 2004-10-27 01:49:16.000000000 +0200 +0 -1
@@ -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

Signature · 1 line
I know I broke SOMETHING but its their fault for not fixing it before me
author
#2 lore raw
Quoted 7 lines · DaMouse

On Thu, 28 Oct 2004 22:04:51 +0200, [email protected]

Quoted 4 lines · <[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.

Quoted 7 lines
Quoted 3 lines

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.

Quoted 3 lines

-DaMouse

Signature · 1 line
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

Signature · 2 lines
Paolo Giarrusso, aka Blaisorblade
Linux registered user n. 292729