projects
/
cascardo
/
linux.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://git390.osdl.marist.edu/pub/scm/linux-2.6
[cascardo/linux.git]
/
arch
/
powerpc
/
mm
/
slb_low.S
diff --git
a/arch/powerpc/mm/slb_low.S
b/arch/powerpc/mm/slb_low.S
index
1328a81
..
657f6b3
100644
(file)
--- a/
arch/powerpc/mm/slb_low.S
+++ b/
arch/powerpc/mm/slb_low.S
@@
-227,8
+227,9
@@
END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
7: ld r10,PACASTABRR(r13)
addi r10,r10,1
- /* use a cpu feature mask if we ever change our slb size */
- cmpldi r10,SLB_NUM_ENTRIES
+ /* This gets soft patched on boot. */
+_GLOBAL(slb_compare_rr_to_size)
+ cmpldi r10,0
blt+ 4f
li r10,SLB_NUM_BOLTED