lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 17 Jul 2014 15:06:15 -0700 From: Andrew Morton <akpm@...ux-foundation.org> To: Marek Szyprowski <m.szyprowski@...sung.com> Cc: Joonsoo Kim <iamjoonsoo.kim@....com>, "Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com>, Michal Nazarewicz <mina86@...a86.com>, Minchan Kim <minchan@...nel.org>, Russell King - ARM Linux <linux@....linux.org.uk>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Paolo Bonzini <pbonzini@...hat.com>, Gleb Natapov <gleb@...nel.org>, Alexander Graf <agraf@...e.de>, Benjamin Herrenschmidt <benh@...nel.crashing.org>, Paul Mackerras <paulus@...ba.org>, linux-mm@...ck.org, linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org, kvm@...r.kernel.org, kvm-ppc@...r.kernel.org, linuxppc-dev@...ts.ozlabs.org, Zhang Yanfei <zhangyanfei@...fujitsu.com> Subject: Re: [PATCH] CMA: generalize CMA reserved area management functionality (fixup) On Thu, 17 Jul 2014 11:36:07 +0200 Marek Szyprowski <m.szyprowski@...sung.com> wrote: > MAX_CMA_AREAS is used by other subsystems (i.e. arch/arm/mm/dma-mapping.c), > so we need to provide correct definition even if CMA is disabled. > This patch fixes this issue. > > Reported-by: Sylwester Nawrocki <s.nawrocki@...sung.com> > Signed-off-by: Marek Szyprowski <m.szyprowski@...sung.com> > --- > include/linux/cma.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/include/linux/cma.h b/include/linux/cma.h > index 9a18a2b1934c..c077635cad76 100644 > --- a/include/linux/cma.h > +++ b/include/linux/cma.h > @@ -5,7 +5,11 @@ > * There is always at least global CMA area and a few optional > * areas configured in kernel .config. > */ > +#ifdef CONFIG_CMA > #define MAX_CMA_AREAS (1 + CONFIG_CMA_AREAS) > +#else > +#define MAX_CMA_AREAS (0) > +#endif > > struct cma; Joonsoo already fixed this up, a bit differently: http://ozlabs.org/~akpm/mmots/broken-out/cma-generalize-cma-reserved-area-management-functionality-fix.patch Which approach makes more sense? From: Joonsoo Kim <iamjoonsoo.kim@....com> Subject: CMA: fix ARM build failure related to MAX_CMA_AREAS definition If CMA is disabled, CONFIG_CMA_AREAS isn't defined so compile error happens. To fix it, define MAX_CMA_AREAS if CONFIG_CMA_AREAS isn't defined. Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@....com> Reported-by: Stephen Rothwell <sfr@...b.auug.org.au> Signed-off-by: Andrew Morton <akpm@...ux-foundation.org> --- include/linux/cma.h | 6 ++++++ 1 file changed, 6 insertions(+) diff -puN include/linux/cma.h~cma-generalize-cma-reserved-area-management-functionality-fix include/linux/cma.h --- a/include/linux/cma.h~cma-generalize-cma-reserved-area-management-functionality-fix +++ a/include/linux/cma.h @@ -5,8 +5,14 @@ * There is always at least global CMA area and a few optional * areas configured in kernel .config. */ +#ifdef CONFIG_CMA_AREAS #define MAX_CMA_AREAS (1 + CONFIG_CMA_AREAS) +#else +#define MAX_CMA_AREAS (0) + +#endif + struct cma; extern phys_addr_t cma_get_base(struct cma *cma); _ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists