On Fri, 21 Mar 2014 00:02:03 +0300 Sergey Senozhatsky <[email protected]> wrote:
> zcomp returns error-valued pointer, also include err.h header > in zram_drv. > > Per Arnd Bergmann: > The zram driver uses the ERR_PTR macro defined in <linux/err.h> > and relies on this header to be included implicitly through > other headers, which is not (always) the case on the ARM architecture. > > ... > > --- a/drivers/block/zram/zram_drv.c > +++ b/drivers/block/zram/zram_drv.c > @@ -31,6 +31,7 @@ > #include <linux/slab.h> > #include <linux/string.h> > #include <linux/vmalloc.h> > +#include <linux/err.h> > > #include "zram_drv.h" I can find no occurrence of ERR_PTR in any version of drivers/block/zram/zram_drv.c which I can find. zram-return-error-valued-pointer-from-zcomp_create.patch adds IS_ERR to drivers/block/zram/zram_drv.c which is presumably what you meant. zram-return-error-valued-pointer-from-zcomp_create.patch also adds ERR_PTR() calls into drivers/block/zram/zcomp.c so that file should include err.h also. Here's what I added, as zram-return-error-valued-pointer-from-zcomp_create-fix-2.patch From: Sergey Senozhatsky <[email protected]> Subject: zram: include err.h [[email protected]: fix zcomp.h as well] Signed-off-by: Sergey Senozhatsky <[email protected]> Reported-by: Arnd Bergmann <[email protected]> Signed-off-by: Andrew Morton <[email protected]> --- drivers/block/zram/zcomp.c | 1 + drivers/block/zram/zram_drv.c | 1 + 2 files changed, 2 insertions(+) diff -puN drivers/block/zram/zram_drv.c~zram-include-errh-in-zram_drv drivers/block/zram/zram_drv.c --- a/drivers/block/zram/zram_drv.c~zram-include-errh-in-zram_drv +++ a/drivers/block/zram/zram_drv.c @@ -31,6 +31,7 @@ #include <linux/slab.h> #include <linux/string.h> #include <linux/vmalloc.h> +#include <linux/err.h> #include "zram_drv.h" diff -puN drivers/block/zram/zcomp.c~zram-include-errh-in-zram_drv drivers/block/zram/zcomp.c --- a/drivers/block/zram/zcomp.c~zram-include-errh-in-zram_drv +++ a/drivers/block/zram/zcomp.c @@ -9,6 +9,7 @@ #include <linux/kernel.h> #include <linux/string.h> +#include <linux/err.h> #include <linux/slab.h> #include <linux/wait.h> #include <linux/sched.h> _ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
