diff --git a/[refs] b/[refs]
index e54b2f2dd08e..7ae4f64d74b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8313524a0d466f451a62709aaedf988d8257b21c
+refs/heads/master: ec7381d6bfd3e7b8d2880dd5e9d03b131b0603f6
diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c
index 13b5fd5854a8..56d97f1d108f 100644
--- a/trunk/drivers/acpi/osl.c
+++ b/trunk/drivers/acpi/osl.c
@@ -896,14 +896,6 @@ u8 acpi_os_writable(void *ptr, acpi_size len)
 }
 #endif
 
-u32 acpi_os_get_thread_id(void)
-{
-	if (!in_atomic())
-		return current->pid;
-
-	return 0;
-}
-
 acpi_status acpi_os_signal(u32 function, void *info)
 {
 	switch (function) {
diff --git a/trunk/include/acpi/platform/aclinux.h b/trunk/include/acpi/platform/aclinux.h
index 2f5bb5bd76b7..b5655a665ba8 100644
--- a/trunk/include/acpi/platform/aclinux.h
+++ b/trunk/include/acpi/platform/aclinux.h
@@ -99,4 +99,8 @@
 
 #define acpi_cpu_flags unsigned long
 
+#define acpi_thread_id u32
+
+static inline acpi_thread_id acpi_os_get_thread_id(void) { return 0; }
+
 #endif				/* __ACLINUX_H__ */