Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-2
+1
-1
kernel/dma/map_benchmark.c
+1
-1
kernel/dma/map_benchmark.c
···
36
36
__s32 node; /* which numa node this benchmark will run on */
37
37
__u32 dma_bits; /* DMA addressing capability */
38
38
__u32 dma_dir; /* DMA data direction */
39
-
__u64 expansion[10]; /* For future use */
39
+
__u8 expansion[84]; /* For future use */
40
40
};
41
41
42
42
struct map_benchmark_data {
+3
-1
tools/testing/selftests/dma/dma_map_benchmark.c
+3
-1
tools/testing/selftests/dma/dma_map_benchmark.c
···
6
6
#include <fcntl.h>
7
7
#include <stdio.h>
8
8
#include <stdlib.h>
9
+
#include <string.h>
9
10
#include <unistd.h>
10
11
#include <sys/ioctl.h>
11
12
#include <sys/mman.h>
···
36
35
__s32 node; /* which numa node this benchmark will run on */
37
36
__u32 dma_bits; /* DMA addressing capability */
38
37
__u32 dma_dir; /* DMA data direction */
39
-
__u64 expansion[10]; /* For future use */
38
+
__u8 expansion[84]; /* For future use */
40
39
};
41
40
42
41
int main(int argc, char **argv)
···
103
102
exit(1);
104
103
}
105
104
105
+
memset(&map, 0, sizeof(map));
106
106
map.seconds = seconds;
107
107
map.threads = threads;
108
108
map.node = node;