From: Chen Gang <xili_gchen_5257@hotmail.com>
Date: Tue, 3 Mar 2015 20:55:06 +0000 (+0800)
Subject: c6x: kernel: setup: Remove 'const' for local variables in machine_init
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1a394e1a36aa9f47b411a8e4cb53dfca6f134401;p=linux-beck.git

c6x: kernel: setup: Remove 'const' for local variables in machine_init

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>
---

diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c
index f016128ece13..1d9f39920a67 100644
--- a/arch/c6x/kernel/setup.c
+++ b/arch/c6x/kernel/setup.c
@@ -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);