svn commit: r192324 - in head/sys/ia64: ia64 include
Marcel Moolenaar
marcel at FreeBSD.org
Mon May 18 18:44:56 UTC 2009
Author: marcel
Date: Mon May 18 18:44:54 2009
New Revision: 192324
URL: http://svn.freebsd.org/changeset/base/192324
Log:
Rename ia64_invalidate_icache() to ia64_sync_icache(). We're
not invalidating anything.
Modified:
head/sys/ia64/ia64/elf_machdep.c
head/sys/ia64/ia64/machdep.c
head/sys/ia64/ia64/pmap.c
head/sys/ia64/include/md_var.h
Modified: head/sys/ia64/ia64/elf_machdep.c
==============================================================================
--- head/sys/ia64/ia64/elf_machdep.c Mon May 18 18:37:18 2009 (r192323)
+++ head/sys/ia64/ia64/elf_machdep.c Mon May 18 18:44:54 2009 (r192324)
@@ -300,9 +300,12 @@ elf_cpu_load_file(linker_file_t lf)
++ph;
}
- /* Invalidate the I-cache, but not for the kernel itself. */
+ /*
+ * Make the I-cache coherent, but don't worry obout the kernel
+ * itself because the loader needs to do that.
+ */
if (lf->id != 1)
- ia64_invalidate_icache((uintptr_t)lf->address, lf->size);
+ ia64_sync_icache((uintptr_t)lf->address, lf->size);
return (0);
}
Modified: head/sys/ia64/ia64/machdep.c
==============================================================================
--- head/sys/ia64/ia64/machdep.c Mon May 18 18:37:18 2009 (r192323)
+++ head/sys/ia64/ia64/machdep.c Mon May 18 18:44:54 2009 (r192324)
@@ -122,7 +122,7 @@ struct fpswa_iface *fpswa_iface;
u_int64_t ia64_pal_base;
u_int64_t ia64_port_base;
-static int ia64_inval_icache_needed;
+static int ia64_sync_icache_needed;
char machine[] = MACHINE;
SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "");
@@ -216,7 +216,7 @@ identifycpu(void)
}
break;
case 0x20:
- ia64_inval_icache_needed = 1;
+ ia64_sync_icache_needed = 1;
family_name = "Itanium 2";
switch (model) {
@@ -1537,11 +1537,11 @@ ia64_highfp_save(struct thread *td)
}
void
-ia64_invalidate_icache(vm_offset_t va, vm_offset_t sz)
+ia64_sync_icache(vm_offset_t va, vm_offset_t sz)
{
vm_offset_t lim;
- if (!ia64_inval_icache_needed)
+ if (!ia64_sync_icache_needed)
return;
lim = va + sz;
Modified: head/sys/ia64/ia64/pmap.c
==============================================================================
--- head/sys/ia64/ia64/pmap.c Mon May 18 18:37:18 2009 (r192323)
+++ head/sys/ia64/ia64/pmap.c Mon May 18 18:44:54 2009 (r192324)
@@ -1500,7 +1500,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sv
}
if (prot & VM_PROT_EXECUTE)
- ia64_invalidate_icache(sva, PAGE_SIZE);
+ ia64_sync_icache(sva, PAGE_SIZE);
pmap_pte_prot(pmap, pte, prot);
pmap_invalidate_page(pmap, sva);
@@ -1635,7 +1635,7 @@ validate:
/* Invalidate the I-cache when needed. */
if (icache_inval)
- ia64_invalidate_icache(va, PAGE_SIZE);
+ ia64_sync_icache(va, PAGE_SIZE);
if ((prot & VM_PROT_WRITE) != 0)
vm_page_flag_set(m, PG_WRITEABLE);
Modified: head/sys/ia64/include/md_var.h
==============================================================================
--- head/sys/ia64/include/md_var.h Mon May 18 18:37:18 2009 (r192323)
+++ head/sys/ia64/include/md_var.h Mon May 18 18:44:54 2009 (r192324)
@@ -88,8 +88,8 @@ uint64_t ia64_get_hcdp(void);
int ia64_highfp_drop(struct thread *);
int ia64_highfp_save(struct thread *);
struct ia64_init_return ia64_init(void);
-void ia64_invalidate_icache(vm_offset_t, vm_size_t);
void ia64_probe_sapics(void);
+void ia64_sync_icache(vm_offset_t, vm_size_t);
void interrupt(struct trapframe *);
void map_gateway_page(void);
void map_pal_code(void);
More information about the svn-src-head
mailing list