Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 47481
b: refs/heads/master
c: 4cffb7f
h: refs/heads/master
i:
  47479: 9a19581
v: v3
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Feb 11, 2007
1 parent 476e903 commit 401b794
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d9f9d31983aac7764d178583d0777199d081cb1a
refs/heads/master: 4cffb7fa69349d48d900d98766dc9ad52d9c851e
11 changes: 0 additions & 11 deletions trunk/arch/um/include/sigio.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,3 @@ extern void sigio_lock(void);
extern void sigio_unlock(void);

#endif

/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
6 changes: 3 additions & 3 deletions trunk/arch/um/kernel/sigio.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ static irqreturn_t sigio_interrupt(int irq, void *data)

os_read_file(sigio_irq_fd, &c, sizeof(c));
reactivate_fd(sigio_irq_fd, SIGIO_WRITE_IRQ);
return(IRQ_HANDLED);
return IRQ_HANDLED;
}

int write_sigio_irq(int fd)
Expand All @@ -36,10 +36,10 @@ int write_sigio_irq(int fd)
if(err){
printk("write_sigio_irq : um_request_irq failed, err = %d\n",
err);
return(-1);
return -1;
}
sigio_irq_fd = fd;
return(0);
return 0;
}

/* These are called from os-Linux/sigio.c to protect its pollfds arrays. */
Expand Down

0 comments on commit 401b794

Please sign in to comment.