Brutally deal with __func__ being 'const char *' on gcc-3.1.

14 files changed, 64 insertions, 64 deletions

diff --git a/sys/dev/acpica/Osd/OsdInterrupt.c b/sys/dev/acpica/Osd/OsdInterrupt.c
index 4cad507..927d8d9 100644
--- a/sys/dev/acpica/Osd/OsdInterrupt.c
+++ b/sys/dev/acpica/Osd/OsdInterrupt.c
@@ -55,7 +55,7 @@ AcpiOsInstallInterruptHandler(UINT32 InterruptNumber, OSD_HANDLER ServiceRoutine
 {
     struct acpi_softc	*sc;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     if ((sc = devclass_get_softc(devclass_find("acpi"), 0)) == NULL)
 	panic("can't find ACPI device to register interrupt");
@@ -101,7 +101,7 @@ AcpiOsRemoveInterruptHandler (UINT32 InterruptNumber, OSD_HANDLER ServiceRoutine
 {
     struct acpi_softc	*sc;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     if ((InterruptNumber < 0) || (InterruptNumber > 255))
 	return_ACPI_STATUS(AE_BAD_PARAMETER);
diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c
index 82bcdd0..d8aca62 100644
--- a/sys/dev/acpica/Osd/OsdSchedule.c
+++ b/sys/dev/acpica/Osd/OsdSchedule.c
@@ -164,7 +164,7 @@ AcpiOsQueueForExecution(UINT32 Priority, OSD_EXECUTION_CALLBACK Function, void *
     struct acpi_task	*at;
     int pri;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     if (Function == NULL)
 	return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -207,7 +207,7 @@ AcpiOsExecuteQueue(void *arg, int pending)
     OSD_EXECUTION_CALLBACK	Function;
     void			*Context;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     at = (struct acpi_task *)arg;
     atq = NULL;
@@ -248,7 +248,7 @@ AcpiOsSleep (UINT32 Seconds, UINT32 Milliseconds)
     int		timo;
     static int	dummy;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     timo = (Seconds * hz) + Milliseconds * hz / 1000;
     if (timo == 0)
@@ -260,7 +260,7 @@ AcpiOsSleep (UINT32 Seconds, UINT32 Milliseconds)
 void
 AcpiOsStall (UINT32 Microseconds)
 {
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     DELAY(Microseconds);
     return_VOID;
diff --git a/sys/dev/acpica/Osd/OsdSynch.c b/sys/dev/acpica/Osd/OsdSynch.c
index 2cd0daf..0103d67 100644
--- a/sys/dev/acpica/Osd/OsdSynch.c
+++ b/sys/dev/acpica/Osd/OsdSynch.c
@@ -74,7 +74,7 @@ AcpiOsCreateSemaphore(UINT32 MaxUnits, UINT32 InitialUnits, ACPI_HANDLE *OutHand
 #ifndef ACPI_NO_SEMAPHORES
     struct acpi_semaphore	*as;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     if (OutHandle == NULL)
 	return(AE_BAD_PARAMETER);
@@ -108,7 +108,7 @@ AcpiOsDeleteSemaphore (ACPI_HANDLE Handle)
 #ifndef ACPI_NO_SEMAPHORES
     struct acpi_semaphore *as = (struct acpi_semaphore *)Handle;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "destroyed semaphore %p\n", as));
     mtx_destroy(&as->as_mtx);
@@ -133,7 +133,7 @@ AcpiOsWaitSemaphore(ACPI_HANDLE Handle, UINT32 Units, UINT32 Timeout)
     int				rv, tmo;
     struct timeval		timeouttv, currenttv, timelefttv;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     if (as == NULL)
 	return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -288,7 +288,7 @@ AcpiOsSignalSemaphore(ACPI_HANDLE Handle, UINT32 Units)
 #ifndef ACPI_NO_SEMAPHORES
     struct acpi_semaphore	*as = (struct acpi_semaphore *)Handle;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     if (as == NULL)
 	return_ACPI_STATUS(AE_BAD_PARAMETER);
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index b591ae8..93c9625 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -213,7 +213,7 @@ acpi_identify(driver_t *driver, device_t parent)
     char			*debugpoint;
 #endif
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     if(!cold){
 	    printf("Don't load this driver from userland!!\n");
@@ -296,7 +296,7 @@ acpi_probe(device_t dev)
     ACPI_STATUS		status;
     int			error;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     if (power_pm_get_type() != POWER_PM_TYPE_NONE &&
         power_pm_get_type() != POWER_PM_TYPE_ACPI) {
@@ -330,7 +330,7 @@ acpi_attach(device_t dev)
     char		*debugpoint;
 #endif
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
     ACPI_LOCK;
     sc = device_get_softc(dev);
     bzero(sc, sizeof(*sc));
@@ -732,7 +732,7 @@ acpi_isa_get_logicalid(device_t dev)
     ACPI_STATUS		error;
     u_int32_t		pnpid;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     pnpid = 0;
     ACPI_LOCK;
@@ -757,7 +757,7 @@ acpi_isa_pnp_probe(device_t bus, device_t child, struct isa_pnp_id *ids)
     int			result;
     u_int32_t		pnpid;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     /*
      * ISA-style drivers attached to ACPI may persist and
@@ -792,7 +792,7 @@ acpi_probe_children(device_t bus)
     static char		*scopes[] = {"\\_PR_", "\\_TZ_", "\\_SI", "\\_SB_", NULL};
     int			i;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
     ACPI_ASSERTLOCK;
 
     /*
@@ -842,7 +842,7 @@ acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status)
     ACPI_OBJECT_TYPE	type;
     device_t		child, bus = (device_t)context;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     /*
      * Skip this device if we think we'll have trouble with it.
@@ -1312,7 +1312,7 @@ acpi_SetSleepState(struct acpi_softc *sc, int state)
     UINT8	TypeA;
     UINT8	TypeB;
 
-    ACPI_FUNCTION_TRACE_U32(__func__, state);
+    ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state);
     ACPI_ASSERTLOCK;
 
     if (sc->acpi_sstate != ACPI_STATE_S0)
@@ -1411,7 +1411,7 @@ acpi_Enable(struct acpi_softc *sc)
     ACPI_STATUS	status;
     u_int32_t	flags;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
     ACPI_ASSERTLOCK;
 
     flags = ACPI_NO_ADDRESS_SPACE_INIT | ACPI_NO_HARDWARE_INIT |
@@ -1431,7 +1431,7 @@ acpi_Disable(struct acpi_softc *sc)
 {
     ACPI_STATUS	status;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
     ACPI_ASSERTLOCK;
 
     if (sc->acpi_enabled) {
@@ -1453,7 +1453,7 @@ acpi_Disable(struct acpi_softc *sc)
 static void
 acpi_system_eventhandler_sleep(void *arg, int state)
 {
-    ACPI_FUNCTION_TRACE_U32(__func__, state);
+    ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state);
 
     ACPI_LOCK;
     if (state >= ACPI_STATE_S0 && state <= ACPI_S_STATES_MAX)
@@ -1465,7 +1465,7 @@ acpi_system_eventhandler_sleep(void *arg, int state)
 static void
 acpi_system_eventhandler_wakeup(void *arg, int state)
 {
-    ACPI_FUNCTION_TRACE_U32(__func__, state);
+    ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state);
 
     /* Well, what to do? :-) */
 
@@ -1483,7 +1483,7 @@ acpi_eventhandler_power_button_for_sleep(void *context)
 {
     struct acpi_softc	*sc = (struct acpi_softc *)context;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     EVENTHANDLER_INVOKE(acpi_sleep_event, sc->acpi_power_button_sx);
 
@@ -1495,7 +1495,7 @@ acpi_eventhandler_power_button_for_wakeup(void *context)
 {
     struct acpi_softc	*sc = (struct acpi_softc *)context;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     EVENTHANDLER_INVOKE(acpi_wakeup_event, sc->acpi_power_button_sx);
 
@@ -1507,7 +1507,7 @@ acpi_eventhandler_sleep_button_for_sleep(void *context)
 {
     struct acpi_softc	*sc = (struct acpi_softc *)context;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     EVENTHANDLER_INVOKE(acpi_sleep_event, sc->acpi_sleep_button_sx);
 
@@ -1519,7 +1519,7 @@ acpi_eventhandler_sleep_button_for_wakeup(void *context)
 {
     struct acpi_softc	*sc = (struct acpi_softc *)context;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     EVENTHANDLER_INVOKE(acpi_wakeup_event, sc->acpi_sleep_button_sx);
 
diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c
index 720eaa9..fb93377 100644
--- a/sys/dev/acpica/acpi_button.c
+++ b/sys/dev/acpica/acpi_button.c
@@ -103,7 +103,7 @@ acpi_button_attach(device_t dev)
     struct acpi_button_softc	*sc;
     ACPI_STATUS			status;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     sc = device_get_softc(dev);
     sc->button_dev = dev;
@@ -123,7 +123,7 @@ acpi_button_notify_pressed_for_sleep(void *arg)
     struct acpi_button_softc	*sc;
     struct acpi_softc		*acpi_sc;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     sc = (struct acpi_button_softc *)arg;
     acpi_sc = acpi_device_get_parent_softc(sc->button_dev);
@@ -154,7 +154,7 @@ acpi_button_notify_pressed_for_wakeup(void *arg)
     struct acpi_button_softc	*sc;
     struct acpi_softc		*acpi_sc;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     sc = (struct acpi_button_softc *)arg;
     acpi_sc = acpi_device_get_parent_softc(sc->button_dev);
@@ -188,7 +188,7 @@ acpi_button_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context)
 {
     struct acpi_button_softc	*sc = (struct acpi_button_softc *)context;
 
-    ACPI_FUNCTION_TRACE_U32(__func__, notify);
+    ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, notify);
 
     switch (notify) {
     case ACPI_NOTIFY_BUTTON_PRESSED_FOR_SLEEP:
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
index 7014705..d37ccfd 100644
--- a/sys/dev/acpica/acpi_cpu.c
+++ b/sys/dev/acpica/acpi_cpu.c
@@ -144,7 +144,7 @@ acpi_cpu_attach(device_t dev)
     u_int32_t			duty_end;
     int				rid;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     ACPI_ASSERTLOCK;
 
diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c
index a48600c..96da6d3 100644
--- a/sys/dev/acpica/acpi_ec.c
+++ b/sys/dev/acpica/acpi_ec.c
@@ -322,7 +322,7 @@ DRIVER_MODULE(acpi_ec, acpi, acpi_ec_driver, acpi_ec_devclass, 0, 0);
 static void
 acpi_ec_identify(driver_t driver, device_t bus)
 {
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     /* XXX implement - need an ACPI 2.0 system to test this */
 
@@ -358,7 +358,7 @@ acpi_ec_attach(device_t dev)
     ACPI_STATUS			Status;
     int errval = 0;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     /*
      * Fetch/initialise softc
@@ -457,7 +457,7 @@ EcGpeQueryHandler(void *Context)
     ACPI_STATUS			Status;
     char			qxx[5];
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     for (;;) {
 
@@ -548,7 +548,7 @@ static ACPI_STATUS
 EcSpaceSetup(ACPI_HANDLE Region, UINT32 Function, void *Context, void **RegionContext)
 {
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     /*
      * Just pass the context through, there's nothing to do here.
@@ -567,7 +567,7 @@ EcSpaceHandler(UINT32 Function, ACPI_PHYSICAL_ADDRESS Address, UINT32 width, ACP
     EC_REQUEST			EcRequest;
     int				i;
 
-    ACPI_FUNCTION_TRACE_U32(__func__, (UINT32)Address);
+    ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, (UINT32)Address);
 
     if ((Address > 0xFF) || (width % 8 != 0) || (Value == NULL) || (Context == NULL))
         return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -615,7 +615,7 @@ EcWaitEventIntr(struct acpi_ec_softc *sc, EC_EVENT Event)
     EC_STATUS	EcStatus;
     int		i;
 
-    ACPI_FUNCTION_TRACE_U32(__func__, (UINT32)Event);
+    ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, (UINT32)Event);
 
     /* XXX this should test whether interrupts are available some other way */
     if(cold)
diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c
index 5482cde..bd186a5 100644
--- a/sys/dev/acpica/acpi_lid.c
+++ b/sys/dev/acpica/acpi_lid.c
@@ -92,7 +92,7 @@ acpi_lid_attach(device_t dev)
 {
     struct acpi_lid_softc	*sc;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     sc = device_get_softc(dev);
     sc->lid_dev = dev;
@@ -111,7 +111,7 @@ acpi_lid_notify_status_changed(void *arg)
     struct acpi_lid_softc	*sc;
     struct acpi_softc		*acpi_sc;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     sc = (struct acpi_lid_softc *)arg;
 
@@ -148,7 +148,7 @@ acpi_lid_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context)
 {
     struct acpi_lid_softc	*sc = (struct acpi_lid_softc *)context;
 
-    ACPI_FUNCTION_TRACE_U32(__func__, notify);
+    ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, notify);
 
     switch (notify) {
     case ACPI_NOTIFY_STATUS_CHANGED:
diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c
index 2ed237c..5bc7794 100644
--- a/sys/dev/acpica/acpi_pcib.c
+++ b/sys/dev/acpica/acpi_pcib.c
@@ -128,7 +128,7 @@ acpi_pcib_attach(device_t dev)
     ACPI_STATUS			status;
     int				result;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     sc = device_get_softc(dev);
     sc->ap_dev = dev;
@@ -310,7 +310,7 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin)
     int				i;
     uintptr_t			up;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
     
     crsbuf.Pointer = NULL;
     prsbuf.Pointer = NULL;
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c
index 2ed237c..5bc7794 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_acpi.c
@@ -128,7 +128,7 @@ acpi_pcib_attach(device_t dev)
     ACPI_STATUS			status;
     int				result;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     sc = device_get_softc(dev);
     sc->ap_dev = dev;
@@ -310,7 +310,7 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin)
     int				i;
     uintptr_t			up;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
     
     crsbuf.Pointer = NULL;
     prsbuf.Pointer = NULL;
diff --git a/sys/dev/acpica/acpi_powerres.c b/sys/dev/acpica/acpi_powerres.c
index 0f4104d..2836cde 100644
--- a/sys/dev/acpica/acpi_powerres.c
+++ b/sys/dev/acpica/acpi_powerres.c
@@ -148,7 +148,7 @@ acpi_pwr_register_resource(ACPI_HANDLE res)
     ACPI_OBJECT			*obj;
     struct acpi_powerresource	*rp, *srp;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     rp = NULL;
     buf.Pointer = NULL;
@@ -212,7 +212,7 @@ acpi_pwr_deregister_resource(ACPI_HANDLE res)
 {
     struct acpi_powerresource	*rp;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     rp = NULL;
     
@@ -243,7 +243,7 @@ acpi_pwr_register_consumer(ACPI_HANDLE consumer)
 {
     struct acpi_powerconsumer	*pc;
     
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     /* check to see whether we know about this consumer already */
     if ((pc = acpi_pwr_find_consumer(consumer)) != NULL)
@@ -274,7 +274,7 @@ acpi_pwr_deregister_consumer(ACPI_HANDLE consumer)
 {
     struct acpi_powerconsumer	*pc;
     
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     /* find the consumer */
     if ((pc = acpi_pwr_find_consumer(consumer)) == NULL)
@@ -307,7 +307,7 @@ acpi_pwr_switch_consumer(ACPI_HANDLE consumer, int state)
     char			*method_name, *reslist_name;
     int				res_changed;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     /* find the consumer */
     if ((pc = acpi_pwr_find_consumer(consumer)) == NULL) {
@@ -482,7 +482,7 @@ acpi_pwr_reference_resource(ACPI_OBJECT *obj, void *arg)
     ACPI_HANDLE			res;
     ACPI_STATUS			status;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     /* check the object type */
     if (obj->Type != ACPI_TYPE_STRING) {
@@ -540,7 +540,7 @@ acpi_pwr_switch_power(void)
     ACPI_STATUS			status;
     int				cur;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     /*
      * Sweep the list forwards turning things on.
@@ -620,7 +620,7 @@ acpi_pwr_find_resource(ACPI_HANDLE res)
 {
     struct acpi_powerresource	*rp;
     
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     TAILQ_FOREACH(rp, &acpi_powerresources, ap_link)
 	if (rp->ap_resource == res)
@@ -636,7 +636,7 @@ acpi_pwr_find_consumer(ACPI_HANDLE consumer)
 {
     struct acpi_powerconsumer	*pc;
     
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     TAILQ_FOREACH(pc, &acpi_powerconsumers, ac_link)
 	if (pc->ac_consumer == consumer)
diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c
index 66d0222..4ee5c0e 100644
--- a/sys/dev/acpica/acpi_resource.c
+++ b/sys/dev/acpica/acpi_resource.c
@@ -65,7 +65,7 @@ acpi_parse_resources(device_t dev, ACPI_HANDLE handle, struct acpi_parse_resourc
     ACPI_STATUS		status;
     void		*context;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     /*
      * Special-case some devices that abuse _PRS/_CRS to mean
diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c
index 15acc1d..d567c0f 100644
--- a/sys/dev/acpica/acpi_thermal.c
+++ b/sys/dev/acpica/acpi_thermal.c
@@ -172,7 +172,7 @@ acpi_tz_attach(device_t dev)
     int				error;
     char			oidname[8];
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     ACPI_LOCK;
 
@@ -288,7 +288,7 @@ acpi_tz_establish(struct acpi_tz_softc *sc)
     int		i;
     char	nbuf[8];
     
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     ACPI_ASSERTLOCK;
 
@@ -380,7 +380,7 @@ acpi_tz_monitor(struct acpi_tz_softc *sc)
     struct	timespec curtime;
     ACPI_STATUS	status;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     ACPI_ASSERTLOCK;
 
@@ -499,7 +499,7 @@ acpi_tz_all_off(struct acpi_tz_softc *sc)
 {
     int		i;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     ACPI_ASSERTLOCK;
     
@@ -531,7 +531,7 @@ acpi_tz_switch_cooler_off(ACPI_OBJECT *obj, void *arg)
 {
     ACPI_HANDLE		cooler;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     ACPI_ASSERTLOCK;
 
@@ -571,7 +571,7 @@ acpi_tz_switch_cooler_on(ACPI_OBJECT *obj, void *arg)
     ACPI_HANDLE			cooler;
     ACPI_STATUS			status;
     
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     ACPI_ASSERTLOCK;
 
@@ -613,7 +613,7 @@ static void
 acpi_tz_getparam(struct acpi_tz_softc *sc, char *node, int *data)
 {
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     ACPI_ASSERTLOCK;
 
@@ -683,7 +683,7 @@ acpi_tz_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context)
 {
     struct acpi_tz_softc	*sc = (struct acpi_tz_softc *)context;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     ACPI_ASSERTLOCK;
 
@@ -781,7 +781,7 @@ acpi_tz_thread(void *arg)
     device_t	*devs;
     int		devcount, i;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
 
     devs = NULL;
diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c
index 43aff32..4da8390 100644
--- a/sys/dev/acpica/acpi_timer.c
+++ b/sys/dev/acpica/acpi_timer.c
@@ -147,7 +147,7 @@ acpi_timer_identify(driver_t *driver, device_t parent)
     char	desc[40];
     int		rid, i, j;
 
-    ACPI_FUNCTION_TRACE(__func__);
+    ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     if (acpi_disabled("timer"))
 	return_VOID;