diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-02-10 04:44:24 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:23 -0500 |
commit | 4cffb7fa69349d48d900d98766dc9ad52d9c851e (patch) | |
tree | 99c079d4a4f8fde74acb55ac252e492db80f92ec | |
parent | d9f9d31983aac7764d178583d0777199d081cb1a (diff) |
[PATCH] uml: SIGIO formatting fixes
Fix formatting in the sigio code.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/um/include/sigio.h | 11 | ||||
-rw-r--r-- | arch/um/kernel/sigio.c | 6 |
2 files changed, 3 insertions, 14 deletions
diff --git a/arch/um/include/sigio.h b/arch/um/include/sigio.h index fe99ea163c2e..434f1a9ae4b3 100644 --- a/arch/um/include/sigio.h +++ b/arch/um/include/sigio.h | |||
@@ -12,14 +12,3 @@ extern void sigio_lock(void); | |||
12 | extern void sigio_unlock(void); | 12 | extern void sigio_unlock(void); |
13 | 13 | ||
14 | #endif | 14 | #endif |
15 | |||
16 | /* | ||
17 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
18 | * Emacs will notice this stuff at the end of the file and automatically | ||
19 | * adjust the settings for this buffer only. This must remain at the end | ||
20 | * of the file. | ||
21 | * --------------------------------------------------------------------------- | ||
22 | * Local variables: | ||
23 | * c-file-style: "linux" | ||
24 | * End: | ||
25 | */ | ||
diff --git a/arch/um/kernel/sigio.c b/arch/um/kernel/sigio.c index 1c831f9ee09f..89f9866a1354 100644 --- a/arch/um/kernel/sigio.c +++ b/arch/um/kernel/sigio.c | |||
@@ -23,7 +23,7 @@ static irqreturn_t sigio_interrupt(int irq, void *data) | |||
23 | 23 | ||
24 | os_read_file(sigio_irq_fd, &c, sizeof(c)); | 24 | os_read_file(sigio_irq_fd, &c, sizeof(c)); |
25 | reactivate_fd(sigio_irq_fd, SIGIO_WRITE_IRQ); | 25 | reactivate_fd(sigio_irq_fd, SIGIO_WRITE_IRQ); |
26 | return(IRQ_HANDLED); | 26 | return IRQ_HANDLED; |
27 | } | 27 | } |
28 | 28 | ||
29 | int write_sigio_irq(int fd) | 29 | int write_sigio_irq(int fd) |
@@ -36,10 +36,10 @@ int write_sigio_irq(int fd) | |||
36 | if(err){ | 36 | if(err){ |
37 | printk("write_sigio_irq : um_request_irq failed, err = %d\n", | 37 | printk("write_sigio_irq : um_request_irq failed, err = %d\n", |
38 | err); | 38 | err); |
39 | return(-1); | 39 | return -1; |
40 | } | 40 | } |
41 | sigio_irq_fd = fd; | 41 | sigio_irq_fd = fd; |
42 | return(0); | 42 | return 0; |
43 | } | 43 | } |
44 | 44 | ||
45 | /* These are called from os-Linux/sigio.c to protect its pollfds arrays. */ | 45 | /* These are called from os-Linux/sigio.c to protect its pollfds arrays. */ |