diff options
Diffstat (limited to 'arch/blackfin/kernel/cplb-mpu')
-rw-r--r-- | arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c index 5ef5d1a787fc..87463ce87f5a 100644 --- a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c +++ b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c | |||
@@ -332,7 +332,7 @@ void flush_switched_cplbs(unsigned int cpu) | |||
332 | 332 | ||
333 | nr_cplb_flush[cpu]++; | 333 | nr_cplb_flush[cpu]++; |
334 | 334 | ||
335 | local_irq_save(flags); | 335 | local_irq_save_hw(flags); |
336 | disable_icplb(); | 336 | disable_icplb(); |
337 | for (i = first_switched_icplb; i < MAX_CPLBS; i++) { | 337 | for (i = first_switched_icplb; i < MAX_CPLBS; i++) { |
338 | icplb_tbl[cpu][i].data = 0; | 338 | icplb_tbl[cpu][i].data = 0; |
@@ -346,7 +346,7 @@ void flush_switched_cplbs(unsigned int cpu) | |||
346 | bfin_write32(DCPLB_DATA0 + i * 4, 0); | 346 | bfin_write32(DCPLB_DATA0 + i * 4, 0); |
347 | } | 347 | } |
348 | enable_dcplb(); | 348 | enable_dcplb(); |
349 | local_irq_restore(flags); | 349 | local_irq_restore_hw(flags); |
350 | 350 | ||
351 | } | 351 | } |
352 | 352 | ||
@@ -362,7 +362,7 @@ void set_mask_dcplbs(unsigned long *masks, unsigned int cpu) | |||
362 | return; | 362 | return; |
363 | } | 363 | } |
364 | 364 | ||
365 | local_irq_save(flags); | 365 | local_irq_save_hw(flags); |
366 | current_rwx_mask[cpu] = masks; | 366 | current_rwx_mask[cpu] = masks; |
367 | 367 | ||
368 | d_data = CPLB_SUPV_WR | CPLB_VALID | CPLB_DIRTY | PAGE_SIZE_4KB; | 368 | d_data = CPLB_SUPV_WR | CPLB_VALID | CPLB_DIRTY | PAGE_SIZE_4KB; |
@@ -382,5 +382,5 @@ void set_mask_dcplbs(unsigned long *masks, unsigned int cpu) | |||
382 | addr += PAGE_SIZE; | 382 | addr += PAGE_SIZE; |
383 | } | 383 | } |
384 | enable_dcplb(); | 384 | enable_dcplb(); |
385 | local_irq_restore(flags); | 385 | local_irq_restore_hw(flags); |
386 | } | 386 | } |