1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/base/devres.c b/drivers/base/devres.c
index 4aaf00d2098b..e038e2b3b7ea 100644
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
@@ -26,8 +26,14 @@ struct devres_node {
 
 struct devres {
         struct devres_node              node;
-        /* -- 3 pointers */
-        unsigned long long              data[]; /* guarantee ull alignment */
+        /*
+         * Some archs want to perform DMA into kmalloc caches
+         * and need a guaranteed alignment larger than
+         * the alignment of a 64-bit integer.
+         * Thus we use ARCH_KMALLOC_MINALIGN here and get exactly the same
+         * buffer alignment as if it was allocated by plain kmalloc().
+         */
+        u8 __aligned(ARCH_KMALLOC_MINALIGN) data[];
 };
 
 struct devres_group {