Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

of: remove HAVE_ARCH_DEVTREE_FIXUPS

HAVE_ARCH_DEVTREE_FIXUPS appears to always be needed except for sparc,
but it is only used for /proc/device-teee and sparc does not enable
/proc/device-tree. So this option is redundant. Remove the option and
always enable it. This has the side effect of fixing /proc/device-tree
on arches such as arm64 which failed to define this option.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Vineet Gupta <vgupta@synopsys.com>
Acked-by: Grant Likely <grant.likely@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>

-18
-2
arch/arc/include/asm/prom.h
··· 9 9 #ifndef _ASM_ARC_PROM_H_ 10 10 #define _ASM_ARC_PROM_H_ 11 11 12 - #define HAVE_ARCH_DEVTREE_FIXUPS 13 - 14 12 #endif
-2
arch/arm/include/asm/prom.h
··· 11 11 #ifndef __ASMARM_PROM_H 12 12 #define __ASMARM_PROM_H 13 13 14 - #define HAVE_ARCH_DEVTREE_FIXUPS 15 - 16 14 #ifdef CONFIG_OF 17 15 18 16 extern const struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
-1
arch/metag/include/asm/prom.h
··· 14 14 #ifndef __ASM_METAG_PROM_H 15 15 #define __ASM_METAG_PROM_H 16 16 17 - #define HAVE_ARCH_DEVTREE_FIXUPS 18 17 19 18 extern void copy_fdt(void); 20 19
-2
arch/microblaze/include/asm/prom.h
··· 16 16 17 17 #include <linux/of.h> 18 18 19 - #define HAVE_ARCH_DEVTREE_FIXUPS 20 - 21 19 /* Other Prototypes */ 22 20 enum early_consoles { 23 21 UARTLITE = 1,
-2
arch/openrisc/include/asm/prom.h
··· 17 17 #ifndef _ASM_OPENRISC_PROM_H 18 18 #define _ASM_OPENRISC_PROM_H 19 19 20 - #define HAVE_ARCH_DEVTREE_FIXUPS 21 - 22 20 #endif /* _ASM_OPENRISC_PROM_H */
-2
arch/powerpc/include/asm/prom.h
··· 20 20 #include <asm/irq.h> 21 21 #include <linux/atomic.h> 22 22 23 - #define HAVE_ARCH_DEVTREE_FIXUPS 24 - 25 23 /* 26 24 * OF address retreival & translation 27 25 */
-2
arch/x86/include/asm/prom.h
··· 39 39 40 40 extern char cmd_line[COMMAND_LINE_SIZE]; 41 41 42 - #define HAVE_ARCH_DEVTREE_FIXUPS 43 - 44 42 #endif /* __ASSEMBLY__ */ 45 43 #endif
-2
arch/xtensa/include/asm/prom.h
··· 1 1 #ifndef _XTENSA_ASM_PROM_H 2 2 #define _XTENSA_ASM_PROM_H 3 3 4 - #define HAVE_ARCH_DEVTREE_FIXUPS 5 - 6 4 #endif /* _XTENSA_ASM_PROM_H */
-3
fs/proc/proc_devtree.c
··· 14 14 #include <linux/of.h> 15 15 #include <linux/export.h> 16 16 #include <linux/slab.h> 17 - #include <asm/prom.h> 18 17 #include <asm/uaccess.h> 19 18 #include "internal.h" 20 19 21 20 static inline void set_node_proc_entry(struct device_node *np, 22 21 struct proc_dir_entry *de) 23 22 { 24 - #ifdef HAVE_ARCH_DEVTREE_FIXUPS 25 23 np->pde = de; 26 - #endif 27 24 } 28 25 29 26 static struct proc_dir_entry *proc_device_tree;