Commit ff92acb2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-5.11-2' of git://git.infradead.org/users/hch/dma-mapping 

Pull dma-mapping fix from Christoph Hellwig:
 "Fix a 32 vs 64-bit padding issue in the new benchmark code (Barry
  Song)"

* tag 'dma-mapping-5.11-2' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: benchmark: use u8 for reserved field in uAPI structure
parents fc6c0ae5 9f5f8ec5

kernel/dma/map_benchmark.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct map_benchmark { 
	__s32 node; /* which numa node this benchmark will run on */

	__u32 dma_bits; /* DMA addressing capability */

	__u32 dma_dir; /* DMA data direction */

	__u64 expansion[10];	/* For future use */

	__u8 expansion[84];	/* For future use */

};



struct map_benchmark_data {

tools/testing/selftests/dma/dma_map_benchmark.c

+3 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <fcntl.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>

#include <sys/ioctl.h>

#include <sys/mman.h>
@@ -35,7 +36,7 @@ struct map_benchmark { 
	__s32 node; /* which numa node this benchmark will run on */

	__u32 dma_bits; /* DMA addressing capability */

	__u32 dma_dir; /* DMA data direction */

	__u64 expansion[10];	/* For future use */

	__u8 expansion[84];	/* For future use */

};



int main(int argc, char **argv)
@@ -102,6 +103,7 @@ int main(int argc, char **argv) 
		exit(1);

	}



	memset(&map, 0, sizeof(map));

	map.seconds = seconds;

	map.threads = threads;

	map.node = node;