[meta-intel] [PATCH] cryptodev-module: update 0001-zc-Force-4.10-get_user_pages_remote-API.patch

[Wold, Saul]

On Thu, 2017-07-20 at 00:09 +0000, Wold, Saul wrote:
> On Wed, 2017-07-12 at 19:42 -0700, Robert Yang wrote:
> > 
> > Update it for cryptodev-module 1.9.
> > 
> 
> Not sure what happened, but I am getting the following failures in
> the
> World build.  I seem to be OK building this on a local machine.
> 
> http://yocto-ab-master.jf.intel.com:8012/builders/nightly-meta-intel-
> wo
> rld/builds/9/steps/BuildImages_1/logs/stdio
> 
This may not be accessible, so here is the actual error:


ERROR: cryptodev-module-1.8-r0 do_patch: Command Error: 'quilt --
quiltrc /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-meta-
intel-world/build/build/tmp/work/intel_corei7_64-poky-linux/cryptodev-
module/1.8-r0/recipe-sysroot-native/etc/quiltrc push' exited with
0  Output:
Applying patch 0001-zc-Force-4.10-get_user_pages_remote-API.patch
patching file zc.c
Hunk #1 FAILED at 65.
1 out of 1 hunk FAILED -- rejects in file zc.c
Patch 0001-zc-Force-4.10-get_user_pages_remote-API.patch does not apply
(enforce with -f)
ERROR: cryptodev-module-1.8-r0 do_patch: Function failed:
patch_do_patch
ERROR: Logfile of failure stored in: /home/pokybuild/yocto-
autobuilder/yocto-worker/nightly-meta-intel-
world/build/build/tmp/work/intel_corei7_64-poky-linux/cryptodev-
module/1.8-r0/temp/log.do_patch.138982
NOTE: recipe cryptodev-module-1.8-r0: task do_patch: Failed
ERROR: Task (/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-
meta-intel-world/build/meta/recipes-kernel/cryptodev/cryptodev-
module_1.8.bb:do_patch) failed with exit code '1'
> Can you please take a quick look?
> 
> Sau!
> 
> > 
> > Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
> > ---
> >  .../0001-zc-Force-4.10-get_user_pages_remote-API.patch      | 13
> > +++++--------
> >  1 file changed, 5 insertions(+), 8 deletions(-)
> > 
> > diff --git a/common/recipes-kernel/cryptodev/cryptodev-module/0001-
> > zc-Force-4.10-get_user_pages_remote-API.patch b/common/recipes-
> > kernel/cryptodev/cryptodev-module/0001-zc-Force-4.10-
> > get_user_pages_remote-API.patch
> > index 6722b8c..353126f 100644
> > --- a/common/recipes-kernel/cryptodev/cryptodev-module/0001-zc-
> > Force-
> > 4.10-get_user_pages_remote-API.patch
> > +++ b/common/recipes-kernel/cryptodev/cryptodev-module/0001-zc-
> > Force-
> > 4.10-get_user_pages_remote-API.patch
> > @@ -12,18 +12,15 @@ Signed-off-by: Saul Wold <sgw at linux.intel.com>
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >  
> >  diff --git a/zc.c b/zc.c
> > -index 2f4ea99..fcd0669 100644
> > +index ae464ff..b2759ce 100644
> >  --- a/zc.c
> >  +++ b/zc.c
> > -@@ -67,7 +67,7 @@ int __get_userbuf(uint8_t __user *addr, uint32_t
> > len, int write,
> > +@@ -65,7 +65,7 @@ int __get_userbuf(uint8_t __user *addr, uint32_t
> > len, int write,
> > + #elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0))
> >   	ret = get_user_pages_remote(task, mm,
> >   			(unsigned long)addr, pgcount, write, 0,
> > pg,
> > NULL);
> > - #  else
> > --#    if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0))
> > -+#    if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) & 0)
> > +-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0))
> > ++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) & 0)
> >   	ret = get_user_pages_remote(task, mm,
> >   			(unsigned long)addr, pgcount, write ?
> > FOLL_WRITE : 0,
> >   			pg, NULL);
> > --- 
> > -2.7.4
> > -
> > -- 
> > 2.10.2