git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
[pandora-kernel.git]
/
arch
/
blackfin
/
kernel
/
cplb-mpu
/
cplbmgr.c
diff --git
a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
index
87b25b1
..
8de9229
100644
(file)
--- a/
arch/blackfin/kernel/cplb-mpu/cplbmgr.c
+++ b/
arch/blackfin/kernel/cplb-mpu/cplbmgr.c
@@
-318,7
+318,7
@@
void flush_switched_cplbs(unsigned int cpu)
nr_cplb_flush[cpu]++;
nr_cplb_flush[cpu]++;
-
local_irq_save_hw(flags
);
+
flags = hard_local_irq_save(
);
_disable_icplb();
for (i = first_switched_icplb; i < MAX_CPLBS; i++) {
icplb_tbl[cpu][i].data = 0;
_disable_icplb();
for (i = first_switched_icplb; i < MAX_CPLBS; i++) {
icplb_tbl[cpu][i].data = 0;
@@
-332,7
+332,7
@@
void flush_switched_cplbs(unsigned int cpu)
bfin_write32(DCPLB_DATA0 + i * 4, 0);
}
_enable_dcplb();
bfin_write32(DCPLB_DATA0 + i * 4, 0);
}
_enable_dcplb();
-
local_irq_restore_hw
(flags);
+
hard_local_irq_restore
(flags);
}
}
@@
-348,7
+348,7
@@
void set_mask_dcplbs(unsigned long *masks, unsigned int cpu)
return;
}
return;
}
-
local_irq_save_hw(flags
);
+
flags = hard_local_irq_save(
);
current_rwx_mask[cpu] = masks;
if (L2_LENGTH && addr >= L2_START && addr < L2_START + L2_LENGTH) {
current_rwx_mask[cpu] = masks;
if (L2_LENGTH && addr >= L2_START && addr < L2_START + L2_LENGTH) {
@@
-373,5
+373,5
@@
void set_mask_dcplbs(unsigned long *masks, unsigned int cpu)
addr += PAGE_SIZE;
}
_enable_dcplb();
addr += PAGE_SIZE;
}
_enable_dcplb();
-
local_irq_restore_hw
(flags);
+
hard_local_irq_restore
(flags);
}
}