26c26
< * $FreeBSD: head/sys/amd64/include/acpica_machdep.h 136366 2004-10-11 05:39:15Z njl $
---
> * $FreeBSD: head/sys/amd64/include/acpica_machdep.h 167814 2007-03-22 18:16:43Z jkim $
37c37
< #define __ACPICA_MACHDEP_H__
---
> #define __ACPICA_MACHDEP_H__
48,51c48,51
< #define ACPI_SYSTEM_XFACE
< #define ACPI_EXTERNAL_XFACE
< #define ACPI_INTERNAL_XFACE
< #define ACPI_INTERNAL_VAR_XFACE
---
> #define ACPI_SYSTEM_XFACE
> #define ACPI_EXTERNAL_XFACE
> #define ACPI_INTERNAL_XFACE
> #define ACPI_INTERNAL_VAR_XFACE
55,58c55,58
< #define ACPI_ASM_MACROS
< #define BREAKPOINT3
< #define ACPI_DISABLE_IRQS() disable_intr()
< #define ACPI_ENABLE_IRQS() enable_intr()
---
> #define ACPI_ASM_MACROS
> #define BREAKPOINT3
> #define ACPI_DISABLE_IRQS() disable_intr()
> #define ACPI_ENABLE_IRQS() enable_intr()
60c60
< #define ACPI_FLUSH_CPU_CACHE() wbinvd()
---
> #define ACPI_FLUSH_CPU_CACHE() wbinvd()
65,68c65,70
< #define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \
< ((Acq) = acpi_acquire_global_lock(GLptr))
< #define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \
< ((Acq) = acpi_release_global_lock(GLptr))
---
> #define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) do { \
> (Acq) = acpi_acquire_global_lock(&((GLptr)->GlobalLock)); \
> } while (0)
> #define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) do { \
> (Acq) = acpi_release_global_lock(&((GLptr)->GlobalLock)); \
> } while (0)
72,74c74,76
< #define ACPI_MACHINE_WIDTH 64
< #define COMPILER_DEPENDENT_INT64 long
< #define COMPILER_DEPENDENT_UINT64 unsigned long
---
> #define ACPI_MACHINE_WIDTH 64
> #define COMPILER_DEPENDENT_INT64 long
> #define COMPILER_DEPENDENT_UINT64 unsigned long