Page MenuHomeFreeBSD
Files F163277906

D53406.id165224.diff
No OneTemporary
Actions

D53406.id165224.diff
View Options

diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
--- a/sys/dev/acpica/acpi_cpu.c
+++ b/sys/dev/acpica/acpi_cpu.c
@@ -924,7 +924,7 @@
{
cx_ptr->res_rid = sc->cpu_cx_count;
acpi_PkgGas(sc->cpu_dev, pkg, 0, &cx_ptr->res_type,
- &cx_ptr->res_rid, &cx_ptr->p_lvlx, RF_SHAREABLE);
+ cx_ptr->res_rid, &cx_ptr->p_lvlx, RF_SHAREABLE);
if (cx_ptr->p_lvlx) {
cx_ptr->do_mwait = false;
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
diff --git a/sys/dev/acpica/acpi_package.c b/sys/dev/acpica/acpi_package.c
--- a/sys/dev/acpica/acpi_package.c
+++ b/sys/dev/acpica/acpi_package.c
@@ -113,7 +113,7 @@
}
int
-acpi_PkgGas(device_t dev, ACPI_OBJECT *res, int idx, int *type, int *rid,
+acpi_PkgGas(device_t dev, ACPI_OBJECT *res, int idx, int *type, int rid,
struct resource **dst, u_int flags)
{
ACPI_GENERIC_ADDRESS gas;
@@ -126,7 +126,7 @@
memcpy(&gas, obj->Buffer.Pointer + 3, sizeof(gas));
- return (acpi_bus_alloc_gas(dev, type, *rid, &gas, dst, flags));
+ return (acpi_bus_alloc_gas(dev, type, rid, &gas, dst, flags));
}
int
diff --git a/sys/dev/acpica/acpi_perf.c b/sys/dev/acpica/acpi_perf.c
--- a/sys/dev/acpica/acpi_perf.c
+++ b/sys/dev/acpica/acpi_perf.c
@@ -191,7 +191,7 @@
pkg = (ACPI_OBJECT *)buf.Pointer;
if (ACPI_PKG_VALID(pkg, 2)) {
rid = 0;
- error = acpi_PkgGas(dev, pkg, 0, &type, &rid, &res, 0);
+ error = acpi_PkgGas(dev, pkg, 0, &type, rid, &res, 0);
switch (error) {
case 0:
bus_release_resource(dev, type, rid, res);
@@ -326,7 +326,7 @@
goto out;
}
- error = acpi_PkgGas(sc->dev, pkg, 0, &sc->perf_ctrl_type, &sc->px_rid,
+ error = acpi_PkgGas(sc->dev, pkg, 0, &sc->perf_ctrl_type, sc->px_rid,
&sc->perf_ctrl, 0);
if (error) {
/*
@@ -342,7 +342,7 @@
}
sc->px_rid++;
- error = acpi_PkgGas(sc->dev, pkg, 1, &sc->perf_sts_type, &sc->px_rid,
+ error = acpi_PkgGas(sc->dev, pkg, 1, &sc->perf_sts_type, sc->px_rid,
&sc->perf_status, 0);
if (error) {
if (error == EOPNOTSUPP) {
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -573,7 +573,7 @@
int acpi_PkgInt16(ACPI_OBJECT *res, int idx, uint16_t *dst);
int acpi_PkgStr(ACPI_OBJECT *res, int idx, void *dst, size_t size);
int acpi_PkgGas(device_t dev, ACPI_OBJECT *res, int idx, int *type,
- int *rid, struct resource **dst, u_int flags);
+ int rid, struct resource **dst, u_int flags);
int acpi_PkgFFH_IntelCpu(ACPI_OBJECT *res, int idx, int *vendor,
int *class, uint64_t *address, int *accsize);
ACPI_HANDLE acpi_GetReference(ACPI_HANDLE scope, ACPI_OBJECT *obj);

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 4:25 PM (6 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35372024
Default Alt Text
D53406.id165224.diff (2 KB)

Event Timeline