Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 4 insertions, 1 deletions

diff --git a/arch/m68k/include/asm/thread_info_mm.h b/arch/m68k/include/asm/thread_info_mm.h
index b6da3882be9..167e518db41 100644
--- a/arch/m68k/include/asm/thread_info_mm.h
+++ b/arch/m68k/include/asm/thread_info_mm.h
@@ -4,10 +4,12 @@
 #ifndef ASM_OFFSETS_C
 #include <asm/asm-offsets.h>
 #endif
-#include <asm/current.h>
 #include <asm/types.h>
 #include <asm/page.h>
 
+#ifndef __ASSEMBLY__
+#include <asm/current.h>
+
 struct thread_info {
         struct task_struct      *task;          /* main task structure */
         unsigned long           flags;
@@ -16,6 +18,7 @@ struct thread_info {
         __u32 cpu; /* should always be 0 on m68k */
         struct restart_block    restart_block;
 };
+#endif /* __ASSEMBLY__ */
 
 #define PREEMPT_ACTIVE          0x4000000