aboutsummaryrefslogtreecommitdiffstats
path: root/arch/v850
diff options
context:
space:
mode:
Diffstat (limited to 'arch/v850')
-rw-r--r--arch/v850/kernel/memcons.c2
-rw-r--r--arch/v850/kernel/rte_cb_leds.c2
-rw-r--r--arch/v850/kernel/rte_mb_a_pci.c12
3 files changed, 8 insertions, 8 deletions
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
31static size_t write (const char *buf, size_t len) 31static 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);
365static void *alloc_mb_sram (size_t size) 365static 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)
406static void free_mb_sram (void *mem, size_t size) 406static 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
518static struct dma_mapping *new_dma_mapping (size_t size) 518static 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
576static struct dma_mapping *find_dma_mapping (void *mb_sram_addr) 576static 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
593static struct dma_mapping *deactivate_dma_mapping (void *mb_sram_addr) 593static 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)
622static inline void 622static inline void
623free_dma_mapping (struct dma_mapping *mapping) 623free_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