projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[linux-2.6-block.git]
/
arch
/
sparc
/
include
/
asm
/
tsb.h
diff --git
a/arch/sparc/include/asm/tsb.h
b/arch/sparc/include/asm/tsb.h
index 25b6abdb39083c6286d1c59984c8ff3179ba4852..522a677e050d757d9d19afb663b3adeda02245a1 100644
(file)
--- a/
arch/sparc/include/asm/tsb.h
+++ b/
arch/sparc/include/asm/tsb.h
@@
-217,7
+217,7
@@
extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end;
sllx REG2, 32, REG2; \
andcc REG1, REG2, %g0; \
be,pt %xcc, 700f; \
- sethi %hi(0x
1ffc
0000), REG2; \
+ sethi %hi(0x
ffe0
0000), REG2; \
sllx REG2, 1, REG2; \
brgez,pn REG1, FAIL_LABEL; \
andn REG1, REG2, REG1; \