diff options
author | Jiri Kosina <jkosina@suse.cz> | 2007-02-10 04:43:51 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:21 -0500 |
commit | 5cf885d01f30be710a339976c485f92bb8a8946d (patch) | |
tree | c482a9b7bf0f3e895a1798345c4ae469c5f7dd9a /arch/cris/arch-v10/mm | |
parent | 8447157a1ac467fae2125074f3693f557c8e05d3 (diff) |
[PATCH] CRIS: TLB handling: turn local_save_flags() + local_irq_disable() into local_irq_save()
TLB handling for CRIS contains local_irq_disable() after local_save_flags().
Turn this into local_irq_save().
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris/arch-v10/mm')
-rw-r--r-- | arch/cris/arch-v10/mm/tlb.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/cris/arch-v10/mm/tlb.c b/arch/cris/arch-v10/mm/tlb.c index 70a5523eff78..7d9fec88dee5 100644 --- a/arch/cris/arch-v10/mm/tlb.c +++ b/arch/cris/arch-v10/mm/tlb.c | |||
@@ -42,8 +42,7 @@ flush_tlb_all(void) | |||
42 | * in the same 4-way entry group. details.. | 42 | * in the same 4-way entry group. details.. |
43 | */ | 43 | */ |
44 | 44 | ||
45 | local_save_flags(flags); | 45 | local_irq_save(flags); |
46 | local_irq_disable(); | ||
47 | for(i = 0; i < NUM_TLB_ENTRIES; i++) { | 46 | for(i = 0; i < NUM_TLB_ENTRIES; i++) { |
48 | *R_TLB_SELECT = ( IO_FIELD(R_TLB_SELECT, index, i) ); | 47 | *R_TLB_SELECT = ( IO_FIELD(R_TLB_SELECT, index, i) ); |
49 | *R_TLB_HI = ( IO_FIELD(R_TLB_HI, page_id, INVALID_PAGEID ) | | 48 | *R_TLB_HI = ( IO_FIELD(R_TLB_HI, page_id, INVALID_PAGEID ) | |
@@ -78,8 +77,7 @@ flush_tlb_mm(struct mm_struct *mm) | |||
78 | * global pages. is it worth the extra I/O ? | 77 | * global pages. is it worth the extra I/O ? |
79 | */ | 78 | */ |
80 | 79 | ||
81 | local_save_flags(flags); | 80 | local_irq_save(flags); |
82 | local_irq_disable(); | ||
83 | for(i = 0; i < NUM_TLB_ENTRIES; i++) { | 81 | for(i = 0; i < NUM_TLB_ENTRIES; i++) { |
84 | *R_TLB_SELECT = IO_FIELD(R_TLB_SELECT, index, i); | 82 | *R_TLB_SELECT = IO_FIELD(R_TLB_SELECT, index, i); |
85 | if (IO_EXTRACT(R_TLB_HI, page_id, *R_TLB_HI) == page_id) { | 83 | if (IO_EXTRACT(R_TLB_HI, page_id, *R_TLB_HI) == page_id) { |
@@ -118,8 +116,7 @@ flush_tlb_page(struct vm_area_struct *vma, | |||
118 | * and the virtual address requested | 116 | * and the virtual address requested |
119 | */ | 117 | */ |
120 | 118 | ||
121 | local_save_flags(flags); | 119 | local_irq_save(flags); |
122 | local_irq_disable(); | ||
123 | for(i = 0; i < NUM_TLB_ENTRIES; i++) { | 120 | for(i = 0; i < NUM_TLB_ENTRIES; i++) { |
124 | unsigned long tlb_hi; | 121 | unsigned long tlb_hi; |
125 | *R_TLB_SELECT = IO_FIELD(R_TLB_SELECT, index, i); | 122 | *R_TLB_SELECT = IO_FIELD(R_TLB_SELECT, index, i); |