diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-03-02 19:48:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-03-02 19:48:17 +0100 |
| commit | febbe9b9c0b5fd77b03d4c6795ef7b8bcabac984 (patch) | |
| tree | 13834e9343d69114bcfd7c97d1f513d07960acfa | |
| parent | mei: Add Meteor Lake support for IVSC device (diff) | |
| parent | counter: fix privdata alignment (diff) | |
| download | wireguard-linux-febbe9b9c0b5fd77b03d4c6795ef7b8bcabac984.tar.xz wireguard-linux-febbe9b9c0b5fd77b03d4c6795ef7b8bcabac984.zip | |
Merge tag 'counter-fixes-for-6.8b' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-linus
William writes:
First set of Counter fixes for 6.8
One fix to ensure private data in struct counter_device_allochelper has
minimum alignment for safe DMA operations.
* tag 'counter-fixes-for-6.8b' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter:
counter: fix privdata alignment
Diffstat (limited to '')
| -rw-r--r-- | drivers/counter/counter-core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/counter/counter-core.c b/drivers/counter/counter-core.c index 09c77afb33ca..3f24481fc04a 100644 --- a/drivers/counter/counter-core.c +++ b/drivers/counter/counter-core.c @@ -31,10 +31,11 @@ struct counter_device_allochelper { struct counter_device counter; /* - * This is cache line aligned to ensure private data behaves like if it - * were kmalloced separately. + * This ensures private data behaves like if it were kmalloced + * separately. Also ensures the minimum alignment for safe DMA + * operations (which may or may not mean cache alignment). */ - unsigned long privdata[] ____cacheline_aligned; + unsigned long privdata[] __aligned(ARCH_DMA_MINALIGN); }; static void counter_device_release(struct device *dev) |