projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[powerpc.git]
/
drivers
/
char
/
selection.c
diff --git
a/drivers/char/selection.c
b/drivers/char/selection.c
index
5b187c8
..
74cff83
100644
(file)
--- a/
drivers/char/selection.c
+++ b/
drivers/char/selection.c
@@
-33,7
+33,7
@@
extern void poke_blanked_console(void);
/* Variables for selection control. */
/* Use a dynamic buffer, instead of static (Dec 1994) */
/* Variables for selection control. */
/* Use a dynamic buffer, instead of static (Dec 1994) */
-struct vc_data *sel_cons; /* must not be d
is
allocated */
+struct vc_data *sel_cons; /* must not be d
e
allocated */
static volatile int sel_start = -1; /* cleared by clear_selection */
static int sel_end;
static int sel_buffer_lth;
static volatile int sel_start = -1; /* cleared by clear_selection */
static int sel_end;
static int sel_buffer_lth;
@@
-275,7
+275,8
@@
int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *t
int paste_selection(struct tty_struct *tty)
{
struct vc_data *vc = (struct vc_data *)tty->driver_data;
int paste_selection(struct tty_struct *tty)
{
struct vc_data *vc = (struct vc_data *)tty->driver_data;
- int pasted = 0, count;
+ int pasted = 0;
+ unsigned int count;
struct tty_ldisc *ld;
DECLARE_WAITQUEUE(wait, current);
struct tty_ldisc *ld;
DECLARE_WAITQUEUE(wait, current);
@@
-293,7
+294,7
@@
int paste_selection(struct tty_struct *tty)
continue;
}
count = sel_buffer_lth - pasted;
continue;
}
count = sel_buffer_lth - pasted;
- count = min(count, tty->
ldisc.receive_room(tty)
);
+ count = min(count, tty->
receive_room
);
tty->ldisc.receive_buf(tty, sel_buffer + pasted, NULL, count);
pasted += count;
}
tty->ldisc.receive_buf(tty, sel_buffer + pasted, NULL, count);
pasted += count;
}