Merge branch 'upstream-merged'

1 files changed, 20 insertions, 0 deletions

diff --git a/libdde-linux26/include/ARCH-arm/asm-arm/current.h b/libdde-linux26/include/ARCH-arm/asm-arm/current.h
new file mode 100644
index 00000000..cbc90464
--- /dev/null
+++ b/libdde-linux26/include/ARCH-arm/asm-arm/current.h
@@ -0,0 +1,20 @@
+#ifndef _ASMARM_CURRENT_H
+#define _ASMARM_CURRENT_H
+
+#include <linux/thread_info.h>
+
+#ifndef DDE_LINUX
+static inline struct task_struct *get_current(void) __attribute_const__;
+
+static inline struct task_struct *get_current(void)
+{
+	return current_thread_info()->task;
+}
+#else
+struct task_struct *get_current(void);
+#endif
+
+
+#define current (get_current())
+
+#endif /* _ASMARM_CURRENT_H */