diff options
author | Tony Lindgren <tony@atomide.com> | 2010-12-22 11:30:12 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-22 11:30:12 -0800 |
commit | c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 (patch) | |
tree | b2a44e08e9e683078e9d20d6072a513798788314 /arch/mips/pmc-sierra/yosemite/py-console.c | |
parent | 4931445b94f49672028b81ace9d4eee8ddf19ab2 (diff) | |
parent | da1f026b532ce944d74461497dc6d8c16456466e (diff) | |
download | linux-next-c10abbb26513f4ccff89c4d80912cb4d36fcd3e8.tar.gz |
Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus
Diffstat (limited to 'arch/mips/pmc-sierra/yosemite/py-console.c')
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/py-console.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/mips/pmc-sierra/yosemite/py-console.c b/arch/mips/pmc-sierra/yosemite/py-console.c index b7f1d9c4a8a3..434d7b1a8c6a 100644 --- a/arch/mips/pmc-sierra/yosemite/py-console.c +++ b/arch/mips/pmc-sierra/yosemite/py-console.c @@ -65,11 +65,15 @@ static unsigned char readb_outer_space(unsigned long long phys) __asm__ __volatile__ ( " .set mips3 \n" + " .set push \n" + " .set noreorder \n" + " .set nomacro \n" " ld %0, %1 \n" + " .set pop \n" " lbu %0, (%0) \n" " .set mips0 \n" : "=r" (res) - : "m" (vaddr)); + : "R" (vaddr)); write_c0_status(sr); ssnop_4(); @@ -89,11 +93,15 @@ static void writeb_outer_space(unsigned long long phys, unsigned char c) __asm__ __volatile__ ( " .set mips3 \n" + " .set push \n" + " .set noreorder \n" + " .set nomacro \n" " ld %0, %1 \n" + " .set pop \n" " sb %2, (%0) \n" " .set mips0 \n" : "=&r" (tmp) - : "m" (vaddr), "r" (c)); + : "R" (vaddr), "r" (c)); write_c0_status(sr); ssnop_4(); |