ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2021-02-07 10:40:48 -08:00
parent fc6c0ae53a 9f5f8ec501
commit ff92acb220
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/dma/map_benchmark.c
View File

@@ -36,7 +36,7 @@ struct map_benchmark {
__s32 node; /* which numa node this benchmark will run on */ __s32 node; /* which numa node this benchmark will run on */
__u32 dma_bits; /* DMA addressing capability */ __u32 dma_bits; /* DMA addressing capability */
__u32 dma_dir; /* DMA data direction */ __u32 dma_dir; /* DMA data direction */
__u64 expansion[10]; /* For future use */ __u8 expansion[84]; /* For future use */
}; };
struct map_benchmark_data { struct map_benchmark_data {

4
tools/testing/selftests/dma/dma_map_benchmark.c
View File

@@ -6,6 +6,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
@@ -35,7 +36,7 @@ struct map_benchmark {
__s32 node; /* which numa node this benchmark will run on */ __s32 node; /* which numa node this benchmark will run on */
__u32 dma_bits; /* DMA addressing capability */ __u32 dma_bits; /* DMA addressing capability */
__u32 dma_dir; /* DMA data direction */ __u32 dma_dir; /* DMA data direction */
__u64 expansion[10]; /* For future use */ __u8 expansion[84]; /* For future use */
}; };
int main(int argc, char **argv) int main(int argc, char **argv)
@@ -102,6 +103,7 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
memset(&map, 0, sizeof(map));
map.seconds = seconds; map.seconds = seconds;
map.threads = threads; map.threads = threads;
map.node = node; map.node = node;