Skip to content

L
linux-davinci
Commit e92b9257 authored by David S. Miller's avatar David S. Miller
Browse files
Options

[SPARC64]: Handle hypervisor case correctly in copy_tsb(). 

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 02fd473b
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
arch/sparc64/mm/tsb.c
View file @ e92b9257
...@@ -231,7 +231,13 @@ static void copy_tsb(struct tsb *old_tsb, unsigned long old_size, ...@@ -231,7 +231,13 @@ static void copy_tsb(struct tsb *old_tsb, unsigned long old_size,
register unsigned long pte asm("o5"); register unsigned long pte asm("o5");
unsigned long v, hash; unsigned long v, hash;
if (tlb_type == cheetah_plus) { if (tlb_type == hypervisor) {
__asm__ __volatile__(
"ldda [%2] %3, %0"
: "=r" (tag), "=r" (pte)
: "r" (__pa(&old_tsb[i])),
"i" (ASI_QUAD_LDD_PHYS_4V));
} else if (tlb_type == cheetah_plus) {
__asm__ __volatile__( __asm__ __volatile__(
"ldda [%2] %3, %0" "ldda [%2] %3, %0"
: "=r" (tag), "=r" (pte) : "=r" (tag), "=r" (pte)
...@@ -267,7 +273,8 @@ static void copy_tsb(struct tsb *old_tsb, unsigned long old_size, ...@@ -267,7 +273,8 @@ static void copy_tsb(struct tsb *old_tsb, unsigned long old_size,
v |= (i & (512UL - 1UL)) << 13UL; v |= (i & (512UL - 1UL)) << 13UL;
hash = tsb_hash(v, new_nentries); hash = tsb_hash(v, new_nentries);
if (tlb_type == cheetah_plus) { if (tlb_type == cheetah_plus ||
tlb_type == hypervisor) {
__asm__ __volatile__( __asm__ __volatile__(
"stxa %0, [%1] %2\n\t" "stxa %0, [%1] %2\n\t"
"stxa %3, [%4] %2" "stxa %3, [%4] %2"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment