Use d_thread_t for cdevsw functions instead of struct thread * so that it

is easier to share this code with 4-stable.

3 files changed, 11 insertions, 11 deletions

diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c
index f6771e5..dc03e98 100644
--- a/sys/amd64/acpica/acpi_machdep.c
+++ b/sys/amd64/acpica/acpi_machdep.c
@@ -194,19 +194,19 @@ acpi_capm_get_pwstatus(apm_pwstatus_t app)
 }
 
 static int
-apmopen(dev_t dev, int flag, int fmt, struct thread *td)
+apmopen(dev_t dev, int flag, int fmt, d_thread_t *td)
 {
 	return (0);
 }
 
 static int
-apmclose(dev_t dev, int flag, int fmt, struct thread *td)
+apmclose(dev_t dev, int flag, int fmt, d_thread_t *td)
 {
 	return (0);
 }
 
 static int
-apmioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
+apmioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, d_thread_t *td)
 {
 	int	error = 0;
 	struct	acpi_softc *acpi_sc;
@@ -304,7 +304,7 @@ apmwrite(dev_t dev, struct uio *uio, int ioflag)
 }
 
 static int
-apmpoll(dev_t dev, int events, struct thread *td)
+apmpoll(dev_t dev, int events, d_thread_t *td)
 {
 	return (0);
 }
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 5a7df11..29c17db 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -1786,19 +1786,19 @@ acpi_deregister_ioctl(u_long cmd, int (* fn)(u_long cmd, caddr_t addr, void *arg
 }
 
 static int
-acpiopen(dev_t dev, int flag, int fmt, struct thread *td)
+acpiopen(dev_t dev, int flag, int fmt, d_thread_t *td)
 {
     return(0);
 }
 
 static int
-acpiclose(dev_t dev, int flag, int fmt, struct thread *td)
+acpiclose(dev_t dev, int flag, int fmt, d_thread_t *td)
 {
     return(0);
 }
 
 static int
-acpiioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
+acpiioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, d_thread_t *td)
 {
     struct acpi_softc		*sc;
     struct acpi_ioctl_hook	*hp;
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c
index f6771e5..dc03e98 100644
--- a/sys/i386/acpica/acpi_machdep.c
+++ b/sys/i386/acpica/acpi_machdep.c
@@ -194,19 +194,19 @@ acpi_capm_get_pwstatus(apm_pwstatus_t app)
 }
 
 static int
-apmopen(dev_t dev, int flag, int fmt, struct thread *td)
+apmopen(dev_t dev, int flag, int fmt, d_thread_t *td)
 {
 	return (0);
 }
 
 static int
-apmclose(dev_t dev, int flag, int fmt, struct thread *td)
+apmclose(dev_t dev, int flag, int fmt, d_thread_t *td)
 {
 	return (0);
 }
 
 static int
-apmioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
+apmioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, d_thread_t *td)
 {
 	int	error = 0;
 	struct	acpi_softc *acpi_sc;
@@ -304,7 +304,7 @@ apmwrite(dev_t dev, struct uio *uio, int ioflag)
 }
 
 static int
-apmpoll(dev_t dev, int events, struct thread *td)
+apmpoll(dev_t dev, int events, d_thread_t *td)
 {
 	return (0);
 }