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 remote branch 'kumar/merge' into merge
[pandora-kernel.git]
/
arch
/
arm
/
common
/
pl330.c
diff --git
a/arch/arm/common/pl330.c
b/arch/arm/common/pl330.c
index
8f0f86d
..
97912fa
100644
(file)
--- a/
arch/arm/common/pl330.c
+++ b/
arch/arm/common/pl330.c
@@
-1045,7
+1045,7
@@
static inline int _loop(unsigned dry_run, u8 buf[],
unsigned lcnt0, lcnt1, ljmp0, ljmp1;
struct _arg_LPEND lpend;
unsigned lcnt0, lcnt1, ljmp0, ljmp1;
struct _arg_LPEND lpend;
- /* Max iterations possib
i
le in DMALP is 256 */
+ /* Max iterations possible in DMALP is 256 */
if (*bursts >= 256*256) {
lcnt1 = 256;
lcnt0 = 256;
if (*bursts >= 256*256) {
lcnt1 = 256;
lcnt0 = 256;
@@
-1446,7
+1446,7
@@
int pl330_update(const struct pl330_info *pi)
}
for (ev = 0; ev < pi->pcfg.num_events; ev++) {
}
for (ev = 0; ev < pi->pcfg.num_events; ev++) {
- if (val & (1 << ev)) { /* Event occured */
+ if (val & (1 << ev)) { /* Event occur
r
ed */
struct pl330_thread *thrd;
u32 inten = readl(regs + INTEN);
int active;
struct pl330_thread *thrd;
u32 inten = readl(regs + INTEN);
int active;