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 | |
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')
-rw-r--r-- | arch/ia64/kernel/mca.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/pci/pcibr/pcibr_ate.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/pci/pcibr/pcibr_dma.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/firmware.c | 7 | ||||
-rw-r--r-- | arch/v850/kernel/memcons.c | 2 | ||||
-rw-r--r-- | arch/v850/kernel/rte_cb_leds.c | 2 | ||||
-rw-r--r-- | arch/v850/kernel/rte_mb_a_pci.c | 12 |
7 files changed, 15 insertions, 14 deletions
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index bfbd8986153b..663230183254 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c | |||
@@ -388,7 +388,7 @@ ia64_log_get(int sal_info_type, u8 **buffer, int irq_safe) | |||
388 | { | 388 | { |
389 | sal_log_record_header_t *log_buffer; | 389 | sal_log_record_header_t *log_buffer; |
390 | u64 total_len = 0; | 390 | u64 total_len = 0; |
391 | int s; | 391 | unsigned long s; |
392 | 392 | ||
393 | IA64_LOG_LOCK(sal_info_type); | 393 | IA64_LOG_LOCK(sal_info_type); |
394 | 394 | ||
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_ate.c b/arch/ia64/sn/pci/pcibr/pcibr_ate.c index 1f0253bfe0a0..5eb1e1e078b4 100644 --- a/arch/ia64/sn/pci/pcibr/pcibr_ate.c +++ b/arch/ia64/sn/pci/pcibr/pcibr_ate.c | |||
@@ -160,7 +160,7 @@ void pcibr_ate_free(struct pcibus_info *pcibus_info, int index) | |||
160 | 160 | ||
161 | volatile u64 ate; | 161 | volatile u64 ate; |
162 | int count; | 162 | int count; |
163 | u64 flags; | 163 | unsigned long flags; |
164 | 164 | ||
165 | if (pcibr_invalidate_ate) { | 165 | if (pcibr_invalidate_ate) { |
166 | /* For debugging purposes, clear the valid bit in the ATE */ | 166 | /* For debugging purposes, clear the valid bit in the ATE */ |
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_dma.c b/arch/ia64/sn/pci/pcibr/pcibr_dma.c index a86c7b945962..1ee977fb6ebb 100644 --- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c +++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c | |||
@@ -237,7 +237,7 @@ void sn_dma_flush(u64 addr) | |||
237 | int is_tio; | 237 | int is_tio; |
238 | int wid_num; | 238 | int wid_num; |
239 | int i, j; | 239 | int i, j; |
240 | u64 flags; | 240 | unsigned long flags; |
241 | u64 itte; | 241 | u64 itte; |
242 | struct hubdev_info *hubinfo; | 242 | struct hubdev_info *hubinfo; |
243 | struct sn_flush_device_kernel *p; | 243 | struct sn_flush_device_kernel *p; |
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; |
diff --git a/arch/v850/kernel/memcons.c b/arch/v850/kernel/memcons.c index 491614c435cd..815f8a43926f 100644 --- a/arch/v850/kernel/memcons.c +++ b/arch/v850/kernel/memcons.c | |||
@@ -30,7 +30,7 @@ static DEFINE_SPINLOCK(memcons_lock); | |||
30 | 30 | ||
31 | static size_t write (const char *buf, size_t len) | 31 | static size_t write (const char *buf, size_t len) |
32 | { | 32 | { |
33 | int flags; | 33 | unsigned long flags; |
34 | char *point; | 34 | char *point; |
35 | 35 | ||
36 | spin_lock_irqsave (memcons_lock, flags); | 36 | spin_lock_irqsave (memcons_lock, flags); |
diff --git a/arch/v850/kernel/rte_cb_leds.c b/arch/v850/kernel/rte_cb_leds.c index f654088b2760..996bd4f33ecb 100644 --- a/arch/v850/kernel/rte_cb_leds.c +++ b/arch/v850/kernel/rte_cb_leds.c | |||
@@ -42,7 +42,7 @@ do { \ | |||
42 | len = LED_NUM_DIGITS - pos; \ | 42 | len = LED_NUM_DIGITS - pos; \ |
43 | \ | 43 | \ |
44 | if (len > 0) { \ | 44 | if (len > 0) { \ |
45 | int _flags; \ | 45 | unsigned long _flags; \ |
46 | const char *_end = buf + len; \ | 46 | const char *_end = buf + len; \ |
47 | img_decl = &leds_image[pos]; \ | 47 | img_decl = &leds_image[pos]; \ |
48 | \ | 48 | \ |
diff --git a/arch/v850/kernel/rte_mb_a_pci.c b/arch/v850/kernel/rte_mb_a_pci.c index f36b778f1432..35213fa9f7d8 100644 --- a/arch/v850/kernel/rte_mb_a_pci.c +++ b/arch/v850/kernel/rte_mb_a_pci.c | |||
@@ -365,7 +365,7 @@ static DEFINE_SPINLOCK(mb_sram_lock); | |||
365 | static void *alloc_mb_sram (size_t size) | 365 | static void *alloc_mb_sram (size_t size) |
366 | { | 366 | { |
367 | struct mb_sram_free_area *prev, *fa; | 367 | struct mb_sram_free_area *prev, *fa; |
368 | int flags; | 368 | unsigned long flags; |
369 | void *mem = 0; | 369 | void *mem = 0; |
370 | 370 | ||
371 | spin_lock_irqsave (mb_sram_lock, flags); | 371 | spin_lock_irqsave (mb_sram_lock, flags); |
@@ -406,7 +406,7 @@ static void *alloc_mb_sram (size_t size) | |||
406 | static void free_mb_sram (void *mem, size_t size) | 406 | static void free_mb_sram (void *mem, size_t size) |
407 | { | 407 | { |
408 | struct mb_sram_free_area *prev, *fa, *new_fa; | 408 | struct mb_sram_free_area *prev, *fa, *new_fa; |
409 | int flags; | 409 | unsigned long flags; |
410 | void *end = mem + size; | 410 | void *end = mem + size; |
411 | 411 | ||
412 | spin_lock_irqsave (mb_sram_lock, flags); | 412 | spin_lock_irqsave (mb_sram_lock, flags); |
@@ -517,7 +517,7 @@ static DEFINE_SPINLOCK(dma_mappings_lock); | |||
517 | 517 | ||
518 | static struct dma_mapping *new_dma_mapping (size_t size) | 518 | static struct dma_mapping *new_dma_mapping (size_t size) |
519 | { | 519 | { |
520 | int flags; | 520 | unsigned long flags; |
521 | struct dma_mapping *mapping; | 521 | struct dma_mapping *mapping; |
522 | void *mb_sram_block = alloc_mb_sram (size); | 522 | void *mb_sram_block = alloc_mb_sram (size); |
523 | 523 | ||
@@ -575,7 +575,7 @@ static struct dma_mapping *new_dma_mapping (size_t size) | |||
575 | 575 | ||
576 | static struct dma_mapping *find_dma_mapping (void *mb_sram_addr) | 576 | static struct dma_mapping *find_dma_mapping (void *mb_sram_addr) |
577 | { | 577 | { |
578 | int flags; | 578 | unsigned long flags; |
579 | struct dma_mapping *mapping; | 579 | struct dma_mapping *mapping; |
580 | 580 | ||
581 | spin_lock_irqsave (dma_mappings_lock, flags); | 581 | spin_lock_irqsave (dma_mappings_lock, flags); |
@@ -592,7 +592,7 @@ static struct dma_mapping *find_dma_mapping (void *mb_sram_addr) | |||
592 | 592 | ||
593 | static struct dma_mapping *deactivate_dma_mapping (void *mb_sram_addr) | 593 | static struct dma_mapping *deactivate_dma_mapping (void *mb_sram_addr) |
594 | { | 594 | { |
595 | int flags; | 595 | unsigned long flags; |
596 | struct dma_mapping *mapping, *prev; | 596 | struct dma_mapping *mapping, *prev; |
597 | 597 | ||
598 | spin_lock_irqsave (dma_mappings_lock, flags); | 598 | spin_lock_irqsave (dma_mappings_lock, flags); |
@@ -622,7 +622,7 @@ static struct dma_mapping *deactivate_dma_mapping (void *mb_sram_addr) | |||
622 | static inline void | 622 | static inline void |
623 | free_dma_mapping (struct dma_mapping *mapping) | 623 | free_dma_mapping (struct dma_mapping *mapping) |
624 | { | 624 | { |
625 | int flags; | 625 | unsigned long flags; |
626 | 626 | ||
627 | free_mb_sram (mapping->mb_sram_addr, mapping->size); | 627 | free_mb_sram (mapping->mb_sram_addr, mapping->size); |
628 | 628 | ||