patch-2.4.22 linux-2.4.22/arch/mips/lib/r3k_dump_tlb.c
Next file: linux-2.4.22/arch/mips/lib/rtc-no.c
Previous file: linux-2.4.22/arch/mips/lib/promlib.c
Back to the patch index
Back to the overall index
- Lines: 81
- Date:
2003-08-25 04:44:40.000000000 -0700
- Orig file:
linux-2.4.21/arch/mips/lib/r3k_dump_tlb.c
- Orig date:
2002-08-02 17:39:43.000000000 -0700
diff -urN linux-2.4.21/arch/mips/lib/r3k_dump_tlb.c linux-2.4.22/arch/mips/lib/r3k_dump_tlb.c
@@ -26,18 +26,18 @@
unsigned int asid;
unsigned long entryhi, entrylo0;
- asid = get_entryhi() & 0xfc0;
+ asid = read_c0_entryhi() & 0xfc0;
for(i=first;i<=last;i++)
{
- write_32bit_cp0_register(CP0_INDEX, i<<8);
+ write_c0_index(i<<8);
__asm__ __volatile__(
".set\tnoreorder\n\t"
"tlbr\n\t"
"nop\n\t"
".set\treorder");
- entryhi = read_32bit_cp0_register(CP0_ENTRYHI);
- entrylo0 = read_32bit_cp0_register(CP0_ENTRYLO0);
+ entryhi = read_c0_entryhi();
+ entrylo0 = read_c0_entrylo0();
/* Unused entries have a virtual address of KSEG0. */
if ((entryhi & 0xffffe000) != 0x80000000
@@ -60,19 +60,19 @@
}
printk("\n");
- set_entryhi(asid);
+ write_c0_entryhi(asid);
}
void
dump_tlb_all(void)
{
- dump_tlb(0, mips_cpu.tlbsize - 1);
+ dump_tlb(0, current_cpu_data.tlbsize - 1);
}
void
dump_tlb_wired(void)
{
- int wired = r3k_have_wired_reg ? get_wired() : 8;
+ int wired = r3k_have_wired_reg ? read_c0_wired() : 8;
printk("Wired: %d", wired);
dump_tlb(0, wired - 1);
@@ -81,16 +81,16 @@
void
dump_tlb_addr(unsigned long addr)
{
- unsigned int flags, oldpid;
+ unsigned long flags, oldpid;
int index;
- __save_and_cli(flags);
- oldpid = get_entryhi() & 0xff;
- set_entryhi((addr & PAGE_MASK) | oldpid);
+ local_irq_save(flags);
+ oldpid = read_c0_entryhi() & 0xff;
+ write_c0_entryhi((addr & PAGE_MASK) | oldpid);
tlb_probe();
- index = get_index();
- set_entryhi(oldpid);
- __restore_flags(flags);
+ index = read_c0_index();
+ write_c0_entryhi(oldpid);
+ local_irq_restore(flags);
if (index < 0) {
printk("No entry for address 0x%08lx in TLB\n", addr);
@@ -104,8 +104,8 @@
void
dump_tlb_nonwired(void)
{
- int wired = r3k_have_wired_reg ? get_wired() : 8;
- dump_tlb(wired, mips_cpu.tlbsize - 1);
+ int wired = r3k_have_wired_reg ? read_c0_wired() : 8;
+ dump_tlb(wired, current_cpu_data.tlbsize - 1);
}
void
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)