The cirros image was rebuilt against the 3.13.0-83 kernel, drivers e1000e, igbvf...
[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / package / devmem2 / 0001-be-coherent-in-type-usage.patch
1 From 6570e7afe1eebd64022b871b9ebd9a76be267f57 Mon Sep 17 00:00:00 2001
2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3 Date: Sun, 29 Jun 2014 16:27:49 +0200
4 Subject: [PATCH] Be coherent in type usage
5
6 - no need to use off_t because it is read from strtoul()
7 - print unsigned int type correctly
8
9 When built with _FILE_OFFSET_BITS=64, off_t becomes an long long int
10 and was printed as an unsigned int which lead to a garbled output.
11
12 Signed-off-by: Colin Didier <colin.didier@devialet.com>
13 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
14 ---
15  devmem2.c | 7 +++----
16  1 file changed, 3 insertions(+), 4 deletions(-)
17
18 diff --git a/devmem2.c b/devmem2.c
19 index 7732ecb..7aa5c79 100644
20 --- a/devmem2.c
21 +++ b/devmem2.c
22 @@ -58,8 +58,7 @@
23  int main(int argc, char **argv) {
24      int fd;
25      void *map_base, *virt_addr; 
26 -       unsigned long read_result, writeval;
27 -       off_t target;
28 +       unsigned long target, read_result, writeval;
29         int access_type = 'w';
30         
31         if(argc < 2) {
32 @@ -101,7 +100,7 @@ int main(int argc, char **argv) {
33                         fprintf(stderr, "Illegal data type '%c'.\n", access_type);
34                         exit(2);
35         }
36 -    printf("Value at address 0x%X (%p): 0x%X\n", target, virt_addr, read_result); 
37 +    printf("Value at address 0x%lX (%p): 0x%X\n", target, virt_addr, read_result); 
38      fflush(stdout);
39  
40         if(argc > 3) {
41 @@ -120,7 +119,7 @@ int main(int argc, char **argv) {
42                                 read_result = *((unsigned long *) virt_addr);
43                                 break;
44                 }
45 -               printf("Written 0x%X; readback 0x%X\n", writeval, read_result); 
46 +               printf("Written 0x%lX; readback 0x%X\n", writeval, read_result); 
47                 fflush(stdout);
48         }
49         
50 -- 
51 2.0.0
52