>>>>> On Thu, 24 Apr 2003 12:47:50 +0100, ralf@linux-mips.org said: ralf> Modified files: ralf> arch/mips64/mm : Tag: linux_2_4 pg-r4k.c ralf> Log message: ralf> Fix build for MIPS III. It seems the .mips4 was added in wrong place (both 2.4 and 2.5). This patch is for 2.4. Please apply to both tree. Thank you. diff -u linux-mips/arch/mips64/mm/pg-r4k.c linux.new/arch/mips64/mm/ --- linux-mips-cvs/arch/mips64/mm/pg-r4k.c Mon Apr 28 09:44:54 2003 +++ linux.new/arch/mips64/mm/pg-r4k.c Mon Apr 28 19:15:22 2003 @@ -337,8 +337,6 @@ unsigned long dummy1, dummy2, reg1, reg2; __asm__ __volatile__( - ".set\tpush\n\t" - ".set\tmips4\n\t" ".set\tnoreorder\n\t" ".set\tnoat\n\t" "daddiu\t$1,%0,%6\n" @@ -365,7 +363,8 @@ "sd\t%2,-16(%0)\n\t" "bne\t$1,%0,1b\n\t" " sd\t%3,-8(%0)\n\t" - ".set\tpop" + ".set\tat\n\t" + ".set\treorder" :"=r" (dummy1), "=r" (dummy2), "=&r" (reg1), "=&r" (reg2) :"0" (to), "1" (from), "I" (PAGE_SIZE), "i" (Create_Dirty_Excl_D)); @@ -676,6 +675,8 @@ unsigned long dummy1, dummy2, reg1, reg2, reg3, reg4; __asm__ __volatile__( + ".set\tpush\n\t" + ".set\tmips4\n\t" ".set\tnoreorder\n\t" ".set\tnoat\n\t" "daddiu\t$1,%0,%8\n" @@ -700,8 +701,7 @@ "sd\t%4,-16(%0)\n\t" "bne\t$1,%0,1b\n\t" " sd\t%5,-8(%0)\n\t" - ".set\tat\n\t" - ".set\treorder" + ".set\tpop" :"=r" (dummy1), "=r" (dummy2), "=&r" (reg1), "=&r" (reg2), "=&r" (reg3), "=&r" (reg4) :"0" (to), "1" (from), "I" (PAGE_SIZE)); --- Atsushi Nemoto
