From 01616f8bd6fb6a510f268a6288bb3f0242519b0a Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Wed, 9 Mar 2011 22:22:25 +0800 Subject: [PATCH] ioapic: Function renaming --- sys/platform/pc32/i386/mp_machdep.c | 4 ++-- sys/platform/pc32/include/smp.h | 2 +- sys/platform/pc64/include/smp.h | 2 +- sys/platform/pc64/x86_64/mp_machdep.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/platform/pc32/i386/mp_machdep.c b/sys/platform/pc32/i386/mp_machdep.c index be83a34390..f6e582888e 100644 --- a/sys/platform/pc32/i386/mp_machdep.c +++ b/sys/platform/pc32/i386/mp_machdep.c @@ -948,7 +948,7 @@ mptable_pass2(struct mptable_pos *mpt) M_DEVBUF, M_WAITOK); for (x = 0; x < mp_napics; x++) - ioapic[x] = permanent_io_mapping(io_apic_address[x]); + ioapic[x] = ioapic_map(io_apic_address[x]); /* clear various tables */ for (x = 0; x < NAPICID; ++x) { @@ -2104,7 +2104,7 @@ mptable_default(int type) * block is assumed not to cross a page boundary. */ void * -permanent_io_mapping(vm_paddr_t pa) +ioapic_map(vm_paddr_t pa) { vm_offset_t vaddr; int pgeflag; diff --git a/sys/platform/pc32/include/smp.h b/sys/platform/pc32/include/smp.h index 41deb994cd..28cbd9aaa7 100644 --- a/sys/platform/pc32/include/smp.h +++ b/sys/platform/pc32/include/smp.h @@ -87,7 +87,7 @@ extern struct apic_intmapinfo int_to_apicintpin[]; extern struct pcb stoppcbs[]; /* functions in mp_machdep.c */ -void *permanent_io_mapping(vm_paddr_t); +void *ioapic_map(vm_paddr_t); u_int mp_bootaddress (u_int); void mp_start (void); void mp_announce (void); diff --git a/sys/platform/pc64/include/smp.h b/sys/platform/pc64/include/smp.h index ad2d2e5ec6..0079d82025 100644 --- a/sys/platform/pc64/include/smp.h +++ b/sys/platform/pc64/include/smp.h @@ -97,7 +97,7 @@ extern struct apic_intmapinfo int_to_apicintpin[]; extern struct pcb stoppcbs[]; /* functions in mp_machdep.c */ -void *permanent_io_mapping(vm_paddr_t); +void *ioapic_map(vm_paddr_t); u_int mp_bootaddress (u_int); void mp_start (void); void mp_announce (void); diff --git a/sys/platform/pc64/x86_64/mp_machdep.c b/sys/platform/pc64/x86_64/mp_machdep.c index e0fa588285..c23d9c239d 100644 --- a/sys/platform/pc64/x86_64/mp_machdep.c +++ b/sys/platform/pc64/x86_64/mp_machdep.c @@ -969,7 +969,7 @@ mptable_pass2(struct mptable_pos *mpt) M_DEVBUF, M_WAITOK); for (x = 0; x < mp_napics; x++) - ioapic[x] = permanent_io_mapping(io_apic_address[x]); + ioapic[x] = ioapic_map(io_apic_address[x]); /* clear various tables */ for (x = 0; x < NAPICID; ++x) { @@ -2129,7 +2129,7 @@ mptable_default(int type) * block is assumed not to cross a page boundary. */ void * -permanent_io_mapping(vm_paddr_t pa) +ioapic_map(vm_paddr_t pa) { KKASSERT(pa < 0x100000000LL); -- 2.41.0