From 266b2d16fcc7290d6fc6ff50d3ab974149bd8ebb Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 6 Mar 2018 13:11:13 -0500 Subject: linux-yocto/4.12: fix aufs compile warning From: "Kexin(Casey) Chen" 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 Signed-off-by: Dengke Du (From OE-Core rev: 1ba624ec410b13da9645efe7bc72908195c08259) Signed-off-by: Bruce Ashfield Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb') 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 () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "ba4e0e2d358124def579da9ba5992f6dcb94eea8" -SRCREV_meta ?= "19d815d5a34bfaad95d87cc097cef18b594daac8" +SRCREV_machine ?= "7a02176b872012f95036453dfd2e12dc0c02a612" +SRCREV_meta ?= "ca1bda8dfd3325db04dda19a531edeb66ac0d84b" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" -- cgit v1.2.3-54-g00ecf