acpica: Fix most warnings

3 files changed, 19 insertions, 26 deletions

diff --git a/acpica/Makefrag.am b/acpica/Makefrag.am
index 2fa4605e..d5a0a42e 100644
--- a/acpica/Makefrag.am
+++ b/acpica/Makefrag.am
@@ -30,7 +30,12 @@ libacpica_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_builddir)/acpica/src/include \
 	-I$(srcdir)/acpica/src/include \
 	-I$(top_builddir)/acpica/src/acpi \
-	-I$(srcdir)/acpica/src/acpi
+	-I$(srcdir)/acpica/src/acpi \
+	-I$(srcdir)/$(systype)/linux/dev/include \
+	-I$(top_builddir)/linux/dev/include \
+	-I$(srcdir)/linux/dev/include \
+	-I$(top_builddir)/linux/src/include \
+	-I$(srcdir)/linux/src/include
 
 # Optimize for small size
 libacpica_a_CFLAGS = -Os -D__KERNEL__ $(AM_CFLAGS)
diff --git a/acpica/src/include/acpi/platform/acgnu.h b/acpica/src/include/acpi/platform/acgnu.h
index 4ab9e990..3bbc0f81 100644
--- a/acpica/src/include/acpi/platform/acgnu.h
+++ b/acpica/src/include/acpi/platform/acgnu.h
@@ -25,24 +25,11 @@
 #define ACPI_MUTEX_DEBUG
 #endif
 
-#include <string.h>
-#include <inttypes.h>
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
-typedef int8_t s8;
-typedef int16_t s16;
-typedef int32_t s32;
-typedef int64_t s64;
-
-typedef struct {
-	int lock;
-} spinlock_t;
-
-struct acpi_cache {
-	void *data;
-};
+#include <kern/lock.h> // simple_lock
+#include <kern/ipc_kobject.h>
+
+#define MACH_INCLUDE
+#include <linux/malloc.h> // kmalloc kfree
 
 #define ACPI_INIT_FUNCTION
 
@@ -57,11 +44,12 @@ struct acpi_cache {
 /* Host-dependent types and defines for in-kernel ACPICA */
 
 #define ACPI_MACHINE_WIDTH          32
+#define ACPI_USE_NATIVE_DIVIDE
 #define ACPI_USE_NATIVE_MATH64
 #define ACPI_EXPORT_SYMBOL(symbol)
 
-#define acpi_cache_t                        struct acpi_cache
-#define acpi_spinlock                       spinlock_t *
+#define acpi_cache_t                        struct kmem_cache
+#define acpi_spinlock                       simple_lock_t
 #define acpi_cpu_flags                      unsigned long
 
 /* Use native linux version of acpi_os_allocate_zeroed */
diff --git a/acpica/src/include/acpi/platform/acgnuex.h b/acpica/src/include/acpi/platform/acgnuex.h
index c65db895..1e3429dd 100644
--- a/acpica/src/include/acpi/platform/acgnuex.h
+++ b/acpica/src/include/acpi/platform/acgnuex.h
@@ -12,7 +12,7 @@ acpi_status acpi_os_terminate(void);
 
 static inline void *acpi_os_allocate(acpi_size size)
 {
-	return kmalloc(size, GFP_ATOMIC);
+	return linux_kmalloc(size, GFP_ATOMIC);
 }
 
 static inline void *acpi_os_allocate_zeroed(acpi_size size)
@@ -24,12 +24,12 @@ static inline void *acpi_os_allocate_zeroed(acpi_size size)
 
 static inline void acpi_os_free(void *memory)
 {
-	kfree(memory); 
+	linux_kfree(memory); 
 }
 
 static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
 {
-	return kmem_cache_alloc(cache);
+	return (void *)kmem_cache_alloc(cache);
 }
 
 static inline acpi_thread_id acpi_os_get_thread_id(void)
@@ -46,7 +46,7 @@ static inline acpi_thread_id acpi_os_get_thread_id(void)
  */
 #define acpi_os_create_lock(__handle) \
 	({ \
-		int *lock = ACPI_ALLOCATE(sizeof(*lock)); \
+		simple_lock_t lock = ACPI_ALLOCATE(sizeof(lock)); \
 		if (lock) { \
 			*(__handle) = lock; \
 			simple_lock_init(*(__handle)); \
@@ -61,7 +61,7 @@ static inline u8 acpi_os_readable(void *pointer, acpi_size length)
 
 static inline acpi_status acpi_os_initialize_debugger(void)
 {
-	return AE_OK;
+	return 0;
 }
 
 static inline void acpi_os_terminate_debugger(void)