| Message ID | 20191020050322.2634-1-mayhs11saini@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [V2] kernel: dma: contigous: Make CMA parameters __initdata/__initconst | expand |
On 20/10/2019 06:03, Shyam Saini wrote: > These parameters are only referenced by __init routine calls during early > boot so they should be marked as __initdata and __initconst accordingly. Reviewed-by: Robin Murphy <robin.murphy@arm.com> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Marek Szyprowski <m.szyprowski@samsung.com> > Cc: Robin Murphy <robin.murphy@arm.com> > Cc: Matthew Wilcox <willy@infradead.org> > Cc: Christopher Lameter <cl@linux.com> > Cc: Kees Cook <keescook@chromium.org> > Signed-off-by: Shyam Saini <mayhs11saini@gmail.com> > --- > V1->V2: > mark cma parameters as __initdata/__initconst > instead of __ro_after_init. As these parameters > are only used by __init calls and never used afterwards > which contrast the __ro_after_init usage. > --- > kernel/dma/contiguous.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c > index 69cfb4345388..10bfc8c44c54 100644 > --- a/kernel/dma/contiguous.c > +++ b/kernel/dma/contiguous.c > @@ -42,10 +42,10 @@ struct cma *dma_contiguous_default_area; > * Users, who want to set the size of global CMA area for their system > * should use cma= kernel parameter. > */ > -static const phys_addr_t size_bytes = (phys_addr_t)CMA_SIZE_MBYTES * SZ_1M; > -static phys_addr_t size_cmdline = -1; > -static phys_addr_t base_cmdline; > -static phys_addr_t limit_cmdline; > +static const phys_addr_t size_bytes __initconst = (phys_addr_t)CMA_SIZE_MBYTES * SZ_1M; > +static phys_addr_t size_cmdline __initdata = -1; > +static phys_addr_t base_cmdline __initdata; > +static phys_addr_t limit_cmdline __initdata; > > static int __init early_cma(char *p) > { >
Applied to the dma-mapping for-next branch after fixing up the commit message and an overly long line.
diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c index 69cfb4345388..10bfc8c44c54 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -42,10 +42,10 @@ struct cma *dma_contiguous_default_area; * Users, who want to set the size of global CMA area for their system * should use cma= kernel parameter. */ -static const phys_addr_t size_bytes = (phys_addr_t)CMA_SIZE_MBYTES * SZ_1M; -static phys_addr_t size_cmdline = -1; -static phys_addr_t base_cmdline; -static phys_addr_t limit_cmdline; +static const phys_addr_t size_bytes __initconst = (phys_addr_t)CMA_SIZE_MBYTES * SZ_1M; +static phys_addr_t size_cmdline __initdata = -1; +static phys_addr_t base_cmdline __initdata; +static phys_addr_t limit_cmdline __initdata; static int __init early_cma(char *p) {
These parameters are only referenced by __init routine calls during early boot so they should be marked as __initdata and __initconst accordingly. Cc: Christoph Hellwig <hch@lst.de> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Robin Murphy <robin.murphy@arm.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Christopher Lameter <cl@linux.com> Cc: Kees Cook <keescook@chromium.org> Signed-off-by: Shyam Saini <mayhs11saini@gmail.com> --- V1->V2: mark cma parameters as __initdata/__initconst instead of __ro_after_init. As these parameters are only used by __init calls and never used afterwards which contrast the __ro_after_init usage. --- kernel/dma/contiguous.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)