]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
dtc: check.c fix compile error
authorShuah Khan <shuahkh@osg.samsung.com>
Tue, 16 May 2017 16:08:08 +0000 (10:08 -0600)
committerRob Herring <robh@kernel.org>
Wed, 17 May 2017 16:12:32 +0000 (11:12 -0500)
Fix the following compile error found on odroid-xu4:

checks.c: In function ‘check_simple_bus_reg’:
checks.c:876:41: error: format ‘%lx’ expects argument of type
‘long unsigned int’, but argument 4 has type
‘uint64_t{aka long long unsigned int}’ [-Werror=format=]
  snprintf(unit_addr, sizeof(unit_addr), "%lx", reg);
                                         ^
checks.c:876:41: error: format ‘%lx’ expects argument of type
‘long unsigned int’, but argument 4 has type
‘uint64_t {aka long long unsigned int}’ [-Werror=format=]
cc1: all warnings being treated as errors
Makefile:304: recipe for target 'checks.o' failed
make: *** [checks.o] Error 1

Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
[dwg: Correct new format to be correct in general]
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
[robh: cherry-picked from upstream dtc commit 2a42b14d0d03]
Signed-off-by: Rob Herring <robh@kernel.org>
scripts/dtc/checks.c

index 5adfc8f52b4fd23e0533cb2084cc893753dd9abf..4b72b530c84f1f4b4e98d8342d9d62fefe8d34d6 100644 (file)
@@ -873,7 +873,7 @@ static void check_simple_bus_reg(struct check *c, struct dt_info *dti, struct no
        while (size--)
                reg = (reg << 32) | fdt32_to_cpu(*(cells++));
 
-       snprintf(unit_addr, sizeof(unit_addr), "%lx", reg);
+       snprintf(unit_addr, sizeof(unit_addr), "%zx", reg);
        if (!streq(unitname, unit_addr))
                FAIL(c, dti, "Node %s simple-bus unit address format error, expected \"%s\"",
                     node->fullpath, unit_addr);