diff --git a/reactos/drivers/bus/acpi/CMakeLists.txt b/reactos/drivers/bus/acpi/CMakeLists.txt index 1793c66bf8c..05ac856d11e 100644 --- a/reactos/drivers/bus/acpi/CMakeLists.txt +++ b/reactos/drivers/bus/acpi/CMakeLists.txt @@ -121,7 +121,6 @@ add_library(acpica acpica/utilities/uttrack.c acpica/utilities/utxface.c) -set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE") add_dependencies(acpica bugcodes) add_library(acpi SHARED diff --git a/reactos/drivers/bus/acpi/acpica/acpica.rbuild b/reactos/drivers/bus/acpi/acpica/acpica.rbuild index ce6fee8791f..719e125c76e 100644 --- a/reactos/drivers/bus/acpi/acpica/acpica.rbuild +++ b/reactos/drivers/bus/acpi/acpica/acpica.rbuild @@ -1,7 +1,6 @@ - include dsfield.c diff --git a/reactos/drivers/bus/acpi/osl.c b/reactos/drivers/bus/acpi/osl.c index 4eeb71f8f51..a4c47ceb8dc 100644 --- a/reactos/drivers/bus/acpi/osl.c +++ b/reactos/drivers/bus/acpi/osl.c @@ -149,19 +149,6 @@ AcpiOsFree(void *ptr) #ifndef ACPI_USE_LOCAL_CACHE -void* -AcpiOsAcquireObjectHelper ( - POOL_TYPE PoolType, - SIZE_T NumberOfBytes, - ULONG Tag) -{ - void* Alloc = ExAllocatePool(PoolType, NumberOfBytes); - - /* acpica expects memory allocated from cache to be zeroed */ - RtlZeroMemory(Alloc,NumberOfBytes); - return Alloc; -} - ACPI_STATUS AcpiOsCreateCache ( char *CacheName, @@ -173,7 +160,7 @@ AcpiOsCreateCache ( ExAllocatePool(NonPagedPool,sizeof(NPAGED_LOOKASIDE_LIST)); ExInitializeNPagedLookasideList(Lookaside, - (PALLOCATE_FUNCTION)AcpiOsAcquireObjectHelper,// custom memory allocator + NULL, NULL, 0, ObjectSize, @@ -283,7 +270,7 @@ AcpiOsInstallInterruptHandler ( Internal, 0, InterruptNumber, - 0, + InterruptNumber, &DIrql, &Affinity);