summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-12-03 07:54:31 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-12-03 07:54:31 +0100
commit7782b57ccc60534d6edd21f6b2bbdc4fda777fdf (patch)
tree2d5415984048f476675f21226bb00dd0023ca5e9 /drivers/base
parentf88184bfee48d482dfff04cd1eed6906f289db4a (diff)
parent2595646791c319cadfdbf271563aac97d0843dc7 (diff)
downloadlinux-7782b57ccc60534d6edd21f6b2bbdc4fda777fdf.tar.gz
Merge 4.20-rc5 into driver-core-next
We need the fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/devres.c10
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 {