aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/prom.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-07-26 14:55:59 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-07-26 14:55:59 +0100
commitff69a4c855066592f9e293cff8f54813614dd544 (patch)
treec1fcee172f8bfb62c7c6b970b0c9f57ae35f9df4 /arch/arm/include/asm/prom.h
parentLinux 3.11-rc2 (diff)
downloadlinux-dev-ff69a4c855066592f9e293cff8f54813614dd544.tar.xz
linux-dev-ff69a4c855066592f9e293cff8f54813614dd544.zip
ARM: constify machine_desc structure uses
struct machine_desc records are defined everywhere as a 'const' structure, but unfortuantely it loses its const-ness through the use of linker magic - the symbols which surround the section are not declared const so it becomes possible not to use 'const' for pointers to these const structures. Let's fix this oversight - all pointers to these structures should be marked const too. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/prom.h')
-rw-r--r--arch/arm/include/asm/prom.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h
index a219227c3e43..4a2985e21969 100644
--- a/arch/arm/include/asm/prom.h
+++ b/arch/arm/include/asm/prom.h
@@ -15,13 +15,13 @@
#ifdef CONFIG_OF
-extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
+extern const struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
extern void arm_dt_memblock_reserve(void);
extern void __init arm_dt_init_cpu_maps(void);
#else /* CONFIG_OF */
-static inline struct machine_desc *setup_machine_fdt(unsigned int dt_phys)
+static inline const struct machine_desc *setup_machine_fdt(unsigned int dt_phys)
{
return NULL;
}