Commit febbe9b9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'counter-fixes-for-6.8b' of... 

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
parents daaf5286 c83ccdc9

drivers/counter/counter-core.c

+4 −3
Original line number Diff line number Diff line
@@ -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)