diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-10-01 02:27:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:21 -0400 |
commit | c53421b18f205c5f97c604ae55c6a921f034b0f6 (patch) | |
tree | 375e5196d5649714737132ac287b12c1ac7091ec /arch/parisc/kernel/firmware.c | |
parent | f5579f8c7d7e2c9eb62b566c511b21091a778157 (diff) |
[PATCH] proper flags type of spin_lock_irqsave()
Convert various spin_lock_irqsave() callers to correctly use `unsigned long'.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Miles Bader <uclinux-v850@lsi.nec.co.jp>
Cc: "Luck, Tony" <tony.luck@intel.com>
Acked-by: Kyle McMartin <kyle@mcmartin.ca>
Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/parisc/kernel/firmware.c')
-rw-r--r-- | arch/parisc/kernel/firmware.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c index 4398d2a95789..c2531ae032cf 100644 --- a/arch/parisc/kernel/firmware.c +++ b/arch/parisc/kernel/firmware.c | |||
@@ -1049,7 +1049,7 @@ void pdc_iodc_putc(unsigned char c) | |||
1049 | static int __attribute__((aligned(8))) iodc_retbuf[32]; | 1049 | static int __attribute__((aligned(8))) iodc_retbuf[32]; |
1050 | static char __attribute__((aligned(64))) iodc_dbuf[4096]; | 1050 | static char __attribute__((aligned(64))) iodc_dbuf[4096]; |
1051 | unsigned int n; | 1051 | unsigned int n; |
1052 | unsigned int flags; | 1052 | unsigned long flags; |
1053 | 1053 | ||
1054 | switch (c) { | 1054 | switch (c) { |
1055 | case '\n': | 1055 | case '\n': |
@@ -1088,7 +1088,8 @@ void pdc_iodc_putc(unsigned char c) | |||
1088 | */ | 1088 | */ |
1089 | void pdc_iodc_outc(unsigned char c) | 1089 | void pdc_iodc_outc(unsigned char c) |
1090 | { | 1090 | { |
1091 | unsigned int n, flags; | 1091 | unsigned int n; |
1092 | unsigned long flags; | ||
1092 | 1093 | ||
1093 | /* fill buffer with one caracter and print it */ | 1094 | /* fill buffer with one caracter and print it */ |
1094 | static int __attribute__((aligned(8))) iodc_retbuf[32]; | 1095 | static int __attribute__((aligned(8))) iodc_retbuf[32]; |
@@ -1113,7 +1114,7 @@ void pdc_iodc_outc(unsigned char c) | |||
1113 | */ | 1114 | */ |
1114 | int pdc_iodc_getc(void) | 1115 | int pdc_iodc_getc(void) |
1115 | { | 1116 | { |
1116 | unsigned int flags; | 1117 | unsigned long flags; |
1117 | static int __attribute__((aligned(8))) iodc_retbuf[32]; | 1118 | static int __attribute__((aligned(8))) iodc_retbuf[32]; |
1118 | static char __attribute__((aligned(64))) iodc_dbuf[4096]; | 1119 | static char __attribute__((aligned(64))) iodc_dbuf[4096]; |
1119 | int ch; | 1120 | int ch; |