Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] uml: workqueue build fix

Browse source 
arch/um/drivers/chan_kern.c:643: error: conflicting types for 'chan_interrupt'
  arch/um/include/chan_kern.h:31: error: previous declaration of 'chan_interrupt'

Cc: David Howells <dhowells@redhat.com>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew Morton 2006-12-06 20:31:36 -08:00 committed by Linus Torvalds
parent 822191a2fa
commit a2ce774096
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/um/drivers/line.c
View file

@ -31,9 +31,9 @@ static irqreturn_t line_interrupt(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void line_timer_cb(void *arg) static void line_timer_cb(struct work_struct *work)
{ {
struct line *line = arg; struct line *line = container_of(work, struct line, task.work);
if(!line->throttled) if(!line->throttled)
chan_interrupt(&line->chan_list, &line->task, line->tty, chan_interrupt(&line->chan_list, &line->task, line->tty,
@ -443,7 +443,7 @@ int line_open(struct line *lines, struct tty_struct *tty)
* is registered. * is registered.
*/ */
enable_chan(line); enable_chan(line);
INIT_WORK(&line->task, line_timer_cb, line); INIT_DELAYED_WORK(&line->task, line_timer_cb);
if(!line->sigio){ if(!line->sigio){
chan_enable_winch(&line->chan_list, tty); chan_enable_winch(&line->chan_list, tty);

2
arch/um/include/chan_kern.h
View file

@ -27,7 +27,7 @@ struct chan {
void *data; void *data;
}; };
extern void chan_interrupt(struct list_head *chans, struct work_struct *task, extern void chan_interrupt(struct list_head *chans, struct delayed_work *task,
struct tty_struct *tty, int irq); struct tty_struct *tty, int irq);
extern int parse_chan_pair(char *str, struct line *line, int device, extern int parse_chan_pair(char *str, struct line *line, int device,
const struct chan_opts *opts); const struct chan_opts *opts);

2
arch/um/include/line.h
View file

@ -51,7 +51,7 @@ struct line {
char *tail; char *tail;
int sigio; int sigio;
struct work_struct task; struct delayed_work task;
const struct line_driver *driver; const struct line_driver *driver;
int have_irq; int have_irq;
}; };