]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
c6x: kernel: setup: Remove 'const' for local variables in machine_init
authorChen Gang <xili_gchen_5257@hotmail.com>
Tue, 3 Mar 2015 20:55:06 +0000 (04:55 +0800)
committerMark Salter <msalter@redhat.com>
Thu, 26 Mar 2015 14:31:48 +0000 (10:31 -0400)
early_init_dt_scan() accepts "void *", the related warning:

    CC      arch/c6x/kernel/setup.o
  arch/c6x/kernel/setup.c: In function 'machine_init':
  arch/c6x/kernel/setup.c:290:21: warning: passing argument 1 of 'early_init_dt_scan' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    early_init_dt_scan(fdt);
                       ^
  In file included from arch/c6x/kernel/setup.c:19:0:
  include/linux/of_fdt.h:75:13: note: expected 'void *' but argument is of type 'const void *'
   extern bool early_init_dt_scan(void *params);
               ^

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Mark Salter <msalter@redhat.com>
arch/c6x/kernel/setup.c

index f016128ece13afa63fae9090e2e9d9c3018a4738..1d9f39920a6799a8a41ac5eaad7893d58927b432 100644 (file)
@@ -265,8 +265,8 @@ int __init c6x_add_memory(phys_addr_t start, unsigned long size)
  */
 notrace void __init machine_init(unsigned long dt_ptr)
 {
-       const void *dtb = __va(dt_ptr);
-       const void *fdt = _fdt_start;
+       void *dtb = __va(dt_ptr);
+       void *fdt = _fdt_start;
 
        /* interrupts must be masked */
        set_creg(IER, 2);