Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 12 insertions, 5 deletions

diff --git a/arch/microblaze/include/asm/unaligned.h b/arch/microblaze/include/asm/unaligned.h
index 3658d91ac0fb..b162ed880495 100644
--- a/arch/microblaze/include/asm/unaligned.h
+++ b/arch/microblaze/include/asm/unaligned.h
@@ -12,12 +12,19 @@
 
 # ifdef __KERNEL__
 
-# include <linux/unaligned/be_struct.h>
-# include <linux/unaligned/le_byteshift.h>
-# include <linux/unaligned/generic.h>
+#  ifdef __MICROBLAZEEL__
+#   include <linux/unaligned/le_struct.h>
+#   include <linux/unaligned/be_byteshift.h>
+#   define get_unaligned        __get_unaligned_le
+#   define put_unaligned        __put_unaligned_le
+#  else
+#   include <linux/unaligned/be_struct.h>
+#   include <linux/unaligned/le_byteshift.h>
+#   define get_unaligned        __get_unaligned_be
+#   define put_unaligned        __put_unaligned_be
+#  endif
 
-# define get_unaligned  __get_unaligned_be
-# define put_unaligned  __put_unaligned_be
+# include <linux/unaligned/generic.h>
 
 # endif /* __KERNEL__ */
 #endif /* _ASM_MICROBLAZE_UNALIGNED_H */