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-2.6.27' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
cell
/
beat_htab.c
diff --git
a/arch/powerpc/platforms/cell/beat_htab.c
b/arch/powerpc/platforms/cell/beat_htab.c
index
81467ff
..
2e67bd8
100644
(file)
--- a/
arch/powerpc/platforms/cell/beat_htab.c
+++ b/
arch/powerpc/platforms/cell/beat_htab.c
@@
-112,7
+112,7
@@
static long beat_lpar_hpte_insert(unsigned long hpte_group,
if (!(vflags & HPTE_V_BOLTED))
DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
if (!(vflags & HPTE_V_BOLTED))
DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
- if (rflags &
(_PAGE_GUARDED|_PAGE_NO_CACHE)
)
+ if (rflags &
_PAGE_NO_CACHE
)
hpte_r &= ~_PAGE_COHERENT;
spin_lock(&beat_htab_lock);
hpte_r &= ~_PAGE_COHERENT;
spin_lock(&beat_htab_lock);
@@
-334,7
+334,7
@@
static long beat_lpar_hpte_insert_v3(unsigned long hpte_group,
if (!(vflags & HPTE_V_BOLTED))
DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
if (!(vflags & HPTE_V_BOLTED))
DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
- if (rflags &
(_PAGE_GUARDED|_PAGE_NO_CACHE)
)
+ if (rflags &
_PAGE_NO_CACHE
)
hpte_r &= ~_PAGE_COHERENT;
/* insert into not-volted entry */
hpte_r &= ~_PAGE_COHERENT;
/* insert into not-volted entry */