From 17b6629198c3cd4ef1d7b72650bbcde4c9313f07 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Sat, 14 Jan 2006 16:18:07 +0000
Subject: [PATCH] --- yaml --- r: 18546 b: refs/heads/master c:
 da2b1cd61903c8e9796e76be2d606584f26a78e5 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/asm-arm/page.h | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 812118aeb4c3..cc8680008ca6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa0fe48fcca9ea7f8c13e21d2646bbaa1747d183
+refs/heads/master: da2b1cd61903c8e9796e76be2d606584f26a78e5
diff --git a/trunk/include/asm-arm/page.h b/trunk/include/asm-arm/page.h
index 4da1d532cbeb..416320d95419 100644
--- a/trunk/include/asm-arm/page.h
+++ b/trunk/include/asm-arm/page.h
@@ -170,6 +170,13 @@ extern pmd_t *top_pmd;
 #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
 				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
+/*
+ * With EABI on ARMv5 and above we must have 64-bit aligned slab pointers.
+ */
+#if defined(CONFIG_AEABI) && (__LINUX_ARM_ARCH__ >= 5)
+#define ARCH_SLAB_MINALIGN 8
+#endif
+
 #endif /* __KERNEL__ */
 
 #include <asm-generic/page.h>