Skip to content

Commit

Permalink
um: remove dead code
Browse files Browse the repository at this point in the history
GCC 4.6's -Wunused-but-set-variable found some dead code.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Richard Weinberger authored and Linus Torvalds committed Jul 26, 2011
1 parent 39073db commit f1c93e4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions arch/um/drivers/chan_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -543,11 +543,10 @@ int parse_chan_pair(char *str, struct line *line, int device,
const struct chan_opts *opts, char **error_out)
{
struct list_head *chans = &line->chan_list;
struct chan *new, *chan;
struct chan *new;
char *in, *out;

if (!list_empty(chans)) {
chan = list_entry(chans->next, struct chan, list);
free_chan(chans, 0);
INIT_LIST_HEAD(chans);
}
Expand Down
3 changes: 1 addition & 2 deletions arch/um/drivers/line.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,9 @@ void line_flush_buffer(struct tty_struct *tty)
{
struct line *line = tty->driver_data;
unsigned long flags;
int err;

spin_lock_irqsave(&line->lock, flags);
err = flush_buffer(line);
flush_buffer(line);
spin_unlock_irqrestore(&line->lock, flags);
}

Expand Down
3 changes: 1 addition & 2 deletions arch/um/kernel/reboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ static void kill_off_processes(void)
os_kill_ptraced_process(userspace_pid[0], 1);
else {
struct task_struct *p;
int pid, me;
int pid;

me = os_getpid();
for_each_process(p) {
if (p->mm == NULL)
continue;
Expand Down

0 comments on commit f1c93e4

Please sign in to comment.