Menu
▾
▴
[Linux-mips-commits]CVS: linux/arch/mips/mm c-rm7k.c,1.4,1.5 c-sb1.c,1.13,1.14 pg-andes.S,1.1,1.2 pg-r4k.S,1.3,1.4 tlbex-r3k.S,1.3,1.4 tlbex-r4k.S,1.7,1.8
|
From: Paul M. <le...@us...> - 2002-04-21 20:02:47
|
Update of /cvsroot/linux-mips/linux/arch/mips/mm
In directory usw-pr-cvs1:/tmp/cvs-serv3535/arch/mips/mm
Modified Files:
c-rm7k.c c-sb1.c pg-andes.S pg-r4k.S tlbex-r3k.S tlbex-r4k.S
Log Message:
More OSS syncing..
Index: c-rm7k.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-rm7k.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- c-rm7k.c 30 Nov 2001 18:34:09 -0000 1.4
+++ c-rm7k.c 21 Apr 2002 20:01:13 -0000 1.5
@@ -133,7 +133,6 @@
end = (addr + size) & ~(sc_lsize - 1);
while (1) {
flush_dcache_line(a); /* Hit_Writeback_Inv_D */
- flush_icache_line(a); /* Hit_Invalidate_I */
flush_scache_line(a); /* Hit_Writeback_Inv_SD */
if (a == end) break;
a += sc_lsize;
@@ -160,7 +159,6 @@
end = (addr + size) & ~(sc_lsize - 1);
while (1) {
invalidate_dcache_line(a); /* Hit_Invalidate_D */
- flush_icache_line(a); /* Hit_Invalidate_I */
invalidate_scache_line(a); /* Hit_Invalidate_SD */
if (a == end) break;
a += sc_lsize;
Index: c-sb1.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-sb1.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- c-sb1.c 18 Mar 2002 22:19:21 -0000 1.13
+++ c-sb1.c 21 Apr 2002 20:01:13 -0000 1.14
@@ -325,16 +325,14 @@
/*
* A signal trampoline must fit into a single cacheline.
*/
-static inline void local_sb1_flush_cache_sigtramp(unsigned long addr)
+static void local_sb1_flush_cache_sigtramp(unsigned long addr)
{
unsigned long daddr, iaddr;
daddr = addr & ~(dcache_line_size - 1);
protected_writeback_dcache_line(daddr);
- protected_writeback_dcache_line(daddr + dcache_line_size);
iaddr = addr & ~(icache_line_size - 1);
protected_flush_icache_line(iaddr);
- protected_flush_icache_line(iaddr + icache_line_size);
}
#ifdef CONFIG_SMP
Index: pg-andes.S
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/pg-andes.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pg-andes.S 23 Oct 2001 17:20:14 -0000 1.1
+++ pg-andes.S 21 Apr 2002 20:01:13 -0000 1.2
@@ -10,8 +10,7 @@
*/
#include <asm/asm.h>
#include <asm/regdef.h>
-
-#define PAGE_SIZE 0x1000
+#include <asm/offset.h>
.text
.set mips4
@@ -24,7 +23,7 @@
*/
LEAF(andes_clear_page)
- LONG_ADDIU AT, a0, PAGE_SIZE
+ LONG_ADDIU AT, a0, _PAGE_SIZE
1: pref 7, 512(a0)
LONG_S zero, 0*SZREG(a0)
LONG_S zero, 1*SZREG(a0)
@@ -41,7 +40,7 @@
END(andes_clear_page)
LEAF(andes_copy_page)
- LONG_ADDIU AT, a0, PAGE_SIZE
+ LONG_ADDIU AT, a0, _PAGE_SIZE
1: pref 0, 2*128(a1)
pref 1, 2*128(a0)
LONG_L a3, 0*SZREG(a1)
Index: pg-r4k.S
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/pg-r4k.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pg-r4k.S 2 Jan 2002 18:10:40 -0000 1.3
+++ pg-r4k.S 21 Apr 2002 20:01:13 -0000 1.4
@@ -14,8 +14,8 @@
#include <asm/regdef.h>
#include <asm/cacheops.h>
#include <asm/mipsregs.h>
+#include <asm/offset.h>
-#define PAGE_SIZE 0x1000
#ifdef CONFIG_64BIT_PHYS_ADDR
#define PGD_SIZE 0x2000
#else
@@ -40,7 +40,7 @@
*/
LEAF(r4k_clear_page_d16)
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: cache Create_Dirty_Excl_D, (a0)
sd zero, (a0)
sd zero, 8(a0)
@@ -59,7 +59,7 @@
END(r4k_clear_page_d16)
LEAF(r4k_clear_page_d32)
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: cache Create_Dirty_Excl_D, (a0)
sd zero, (a0)
sd zero, 8(a0)
@@ -104,7 +104,7 @@
*/
LEAF(r4k_clear_page_r4600_v1)
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: nop
nop
nop
@@ -141,7 +141,7 @@
lw zero, (AT)
.set novolatile
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: cache Create_Dirty_Excl_D, (a0)
sd zero, (a0)
sd zero, 8(a0)
@@ -179,7 +179,7 @@
*/
LEAF(r4k_clear_page_s16)
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: cache Create_Dirty_Excl_SD, (a0)
sd zero, (a0)
sd zero, 8(a0)
@@ -198,7 +198,7 @@
END(r4k_clear_page_s16)
LEAF(r4k_clear_page_s32)
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: cache Create_Dirty_Excl_SD, (a0)
sd zero, (a0)
sd zero, 8(a0)
@@ -215,7 +215,7 @@
END(r4k_clear_page_s32)
LEAF(r4k_clear_page_s64)
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: cache Create_Dirty_Excl_SD, (a0)
sd zero, (a0)
sd zero, 8(a0)
@@ -231,7 +231,7 @@
END(r4k_clear_page_s64)
LEAF(r4k_clear_page_s128)
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: cache Create_Dirty_Excl_SD, (a0)
sd zero, (a0)
sd zero, 8(a0)
@@ -260,7 +260,7 @@
*/
LEAF(r4k_copy_page_d16)
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: cache Create_Dirty_Excl_D, (a0)
lw a3, (a1)
lw a2, 4(a1)
@@ -304,7 +304,7 @@
END(r4k_copy_page_d16)
LEAF(r4k_copy_page_d32)
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: cache Create_Dirty_Excl_D, (a0)
lw a3, (a1)
lw a2, 4(a1)
@@ -350,7 +350,7 @@
*/
LEAF(r4k_copy_page_r4600_v1)
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: nop
nop
nop
@@ -409,7 +409,7 @@
nop
nop
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: nop
nop
nop
@@ -473,7 +473,7 @@
*/
LEAF(r4k_copy_page_s16)
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: cache Create_Dirty_Excl_SD, (a0)
lw a3, (a1)
lw a2, 4(a1)
@@ -517,7 +517,7 @@
END(r4k_copy_page_s16)
LEAF(r4k_copy_page_s32)
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: cache Create_Dirty_Excl_SD, (a0)
lw a3, (a1)
lw a2, 4(a1)
@@ -559,7 +559,7 @@
END(r4k_copy_page_s32)
LEAF(r4k_copy_page_s64)
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: cache Create_Dirty_Excl_SD, (a0)
lw a3, (a1)
lw a2, 4(a1)
@@ -600,7 +600,7 @@
END(r4k_copy_page_s64)
LEAF(r4k_copy_page_s128)
- addiu AT, a0, PAGE_SIZE
+ addiu AT, a0, _PAGE_SIZE
1: cache Create_Dirty_Excl_SD, (a0)
lw a3, (a1)
lw a2, 4(a1)
Index: tlbex-r3k.S
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/tlbex-r3k.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tlbex-r3k.S 4 Jan 2002 18:04:53 -0000 1.3
+++ tlbex-r3k.S 21 Apr 2002 20:01:13 -0000 1.4
@@ -19,7 +19,7 @@
#include <asm/fpregdef.h>
#include <asm/mipsregs.h>
#include <asm/page.h>
-#include <asm/pgtable.h>
+#include <asm/pgtable-bits.h>
#include <asm/processor.h>
#include <asm/regdef.h>
#include <asm/stackframe.h>
Index: tlbex-r4k.S
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/tlbex-r4k.S,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tlbex-r4k.S 9 Mar 2002 01:39:31 -0000 1.7
+++ tlbex-r4k.S 21 Apr 2002 20:01:13 -0000 1.8
@@ -18,7 +18,7 @@
#include <asm/fpregdef.h>
#include <asm/mipsregs.h>
#include <asm/page.h>
-#include <asm/pgtable.h>
+#include <asm/pgtable-bits.h>
#include <asm/processor.h>
#include <asm/regdef.h>
#include <asm/stackframe.h>
@@ -77,7 +77,7 @@
lw k1, pgd_current # get pgd pointer
#endif
mfc0 k0, CP0_BADVADDR # Get faulting address
- srl k0, k0, PGDIR_SHIFT # get pgd only bits
+ srl k0, k0, _PGDIR_SHIFT # get pgd only bits
sll k0, k0, 2
addu k1, k1, k0 # add in pgd offset
@@ -103,7 +103,7 @@
LEAF(except_vec0_r4600)
.set mips3
mfc0 k0, CP0_BADVADDR
- srl k0, k0, PGDIR_SHIFT
+ srl k0, k0, _PGDIR_SHIFT
lw k1, pgd_current # get pgd pointer
sll k0, k0, 2 # log2(sizeof(pgd_t)
addu k1, k1, k0
@@ -141,7 +141,7 @@
LEAF(except_vec0_nevada)
.set mips3
mfc0 k0, CP0_BADVADDR # Get faulting address
- srl k0, k0, PGDIR_SHIFT # get pgd only bits
+ srl k0, k0, _PGDIR_SHIFT # get pgd only bits
lw k1, pgd_current # get pgd pointer
sll k0, k0, 2 # log2(sizeof(pgd_t)
addu k1, k1, k0 # add in pgd offset
@@ -169,7 +169,7 @@
LEAF(except_vec0_r45k_bvahwbug)
.set mips3
mfc0 k0, CP0_BADVADDR
- srl k0, k0, PGDIR_SHIFT
+ srl k0, k0, _PGDIR_SHIFT
lw k1, pgd_current # get pgd pointer
sll k0, k0, 2 # log2(sizeof(pgd_t)
addu k1, k1, k0
@@ -201,7 +201,7 @@
LEAF(except_vec0_r4k_mphwbug)
.set mips3
mfc0 k0, CP0_BADVADDR
- srl k0, k0, PGDIR_SHIFT
+ srl k0, k0, _PGDIR_SHIFT
lw k1, pgd_current # get pgd pointer
sll k0, k0, 2 # log2(sizeof(pgd_t)
addu k1, k1, k0
@@ -233,7 +233,7 @@
LEAF(except_vec0_r4k_250MHZhwbug)
.set mips3
mfc0 k0, CP0_BADVADDR
- srl k0, k0, PGDIR_SHIFT
+ srl k0, k0, _PGDIR_SHIFT
lw k1, pgd_current # get pgd pointer
sll k0, k0, 2 # log2(sizeof(pgd_t)
addu k1, k1, k0
@@ -264,7 +264,7 @@
LEAF(except_vec0_r4k_MP250MHZhwbug)
.set mips3
mfc0 k0, CP0_BADVADDR
- srl k0, k0, PGDIR_SHIFT
+ srl k0, k0, _PGDIR_SHIFT
lw k1, pgd_current # get pgd pointer
sll k0, k0, 2 # log2(sizeof(pgd_t)
addu k1, k1, k0
@@ -320,7 +320,7 @@
#define LOAD_PTE(pte, ptr) \
GET_PGD(pte, ptr) \
mfc0 pte, CP0_BADVADDR; \
- srl pte, pte, PGDIR_SHIFT; \
+ srl pte, pte, _PGDIR_SHIFT; \
sll pte, pte, 2; \
addu ptr, ptr, pte; \
mfc0 pte, CP0_BADVADDR; \
|
