diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-03-06 13:11:13 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-08 10:39:33 -0800 |
commit | 266b2d16fcc7290d6fc6ff50d3ab974149bd8ebb (patch) | |
tree | ccc5ec1f4c8221d291a811366354ed451ebc16f4 | |
parent | b4992cf0361cd45bb9de00606e71a215858bfa66 (diff) | |
download | poky-266b2d16fcc7290d6fc6ff50d3ab974149bd8ebb.tar.gz |
linux-yocto/4.12: fix aufs compile warning
From: "Kexin(Casey) Chen" <Casey.Chen@windriver.com>
Forward port linux-yocto-4.8's patch to fix the build warning.
http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-4.8/commit/?h=standard/base&id=7e0dd2f2b0971f0e3191e1ddc088e09eb9855567
fs/aufs/debug.h:95:19: warning: comparison of constant '0'
with boolean expression is always false [-Wbool-compare]
if (unlikely((e) < 0)) \
^
fs/aufs/vdir.c:852:2: note: in expansion of macro 'AuTraceErr'
AuTraceErr(!valid);
^~~~~~~~~~
In expansion of AuTraceErr(!valid), comparison of (!valid)
and constant '0' always passes unlikely(x) false. function
'static int seek_vdir(struct file *file, struct dir_context *ctx)'
is to find whether there is a valid vd_deblk following ctx->pos.
return 1 means valid, 0 for not. Change to AuTraceErr(valid - 1)
makes more sense.
Signed-off-by: Kexin(Casey) Chen <Casey.Chen@windriver.com>
Signed-off-by: Dengke Du <dengke.du@windriver.com>
(From OE-Core rev: 1ba624ec410b13da9645efe7bc72908195c08259)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.12.bb | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb index a31c3559e9..722315e843 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "ba4e0e2d358124def579da9ba5992f6dcb94eea8" | 14 | SRCREV_machine ?= "7a02176b872012f95036453dfd2e12dc0c02a612" |
15 | SRCREV_meta ?= "19d815d5a34bfaad95d87cc097cef18b594daac8" | 15 | SRCREV_meta ?= "ca1bda8dfd3325db04dda19a531edeb66ac0d84b" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb index 79bd962b94..998c017515 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.12.20" | |||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "22f73c1fe99198a7b37aa5c76978fe19d301fd88" | 12 | SRCREV_machine ?= "392959d6dad698bfb62de561164c2d19e17841dd" |
13 | SRCREV_meta ?= "19d815d5a34bfaad95d87cc097cef18b594daac8" | 13 | SRCREV_meta ?= "ca1bda8dfd3325db04dda19a531edeb66ac0d84b" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb index 57ef700d05..ca664fec5d 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.12.bb | |||
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "standard/base" | 11 | KBRANCH_qemux86-64 ?= "standard/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "7122a8d189df29393419b3352ea11482efaa417a" | 14 | SRCREV_machine_qemuarm ?= "6155fbae7a6b42a7608b9f251fa46cef28c0fe67" |
15 | SRCREV_machine_qemuarm64 ?= "22f73c1fe99198a7b37aa5c76978fe19d301fd88" | 15 | SRCREV_machine_qemuarm64 ?= "392959d6dad698bfb62de561164c2d19e17841dd" |
16 | SRCREV_machine_qemumips ?= "1cff37b7a2bbee4bb99118e57d228ac301fb880b" | 16 | SRCREV_machine_qemumips ?= "d46a4aebe29dcced0fea9718c249c536ab06977f" |
17 | SRCREV_machine_qemuppc ?= "22f73c1fe99198a7b37aa5c76978fe19d301fd88" | 17 | SRCREV_machine_qemuppc ?= "392959d6dad698bfb62de561164c2d19e17841dd" |
18 | SRCREV_machine_qemux86 ?= "22f73c1fe99198a7b37aa5c76978fe19d301fd88" | 18 | SRCREV_machine_qemux86 ?= "392959d6dad698bfb62de561164c2d19e17841dd" |
19 | SRCREV_machine_qemux86-64 ?= "22f73c1fe99198a7b37aa5c76978fe19d301fd88" | 19 | SRCREV_machine_qemux86-64 ?= "392959d6dad698bfb62de561164c2d19e17841dd" |
20 | SRCREV_machine_qemumips64 ?= "3879cb9ed592f8d5db6b35c51761818ad60494da" | 20 | SRCREV_machine_qemumips64 ?= "10216660f9d902f76f36514ea4ef04530e87702d" |
21 | SRCREV_machine ?= "22f73c1fe99198a7b37aa5c76978fe19d301fd88" | 21 | SRCREV_machine ?= "392959d6dad698bfb62de561164c2d19e17841dd" |
22 | SRCREV_meta ?= "19d815d5a34bfaad95d87cc097cef18b594daac8" | 22 | SRCREV_meta ?= "ca1bda8dfd3325db04dda19a531edeb66ac0d84b" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" |