Browse Source

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>
master
Rob Herring 8 years ago
parent
commit
32df8dca50
  1. 2
      arch/arc/include/asm/prom.h
  2. 2
      arch/arm/include/asm/prom.h
  3. 1
      arch/metag/include/asm/prom.h
  4. 2
      arch/microblaze/include/asm/prom.h
  5. 2
      arch/openrisc/include/asm/prom.h
  6. 2
      arch/powerpc/include/asm/prom.h
  7. 2
      arch/x86/include/asm/prom.h
  8. 2
      arch/xtensa/include/asm/prom.h
  9. 3
      fs/proc/proc_devtree.c

2
arch/arc/include/asm/prom.h

@ -9,6 +9,4 @@
#ifndef _ASM_ARC_PROM_H_
#define _ASM_ARC_PROM_H_
#define HAVE_ARCH_DEVTREE_FIXUPS
#endif

2
arch/arm/include/asm/prom.h

@ -11,8 +11,6 @@
#ifndef __ASMARM_PROM_H
#define __ASMARM_PROM_H
#define HAVE_ARCH_DEVTREE_FIXUPS
#ifdef CONFIG_OF
extern const struct machine_desc *setup_machine_fdt(unsigned int dt_phys);

1
arch/metag/include/asm/prom.h

@ -14,7 +14,6 @@
#ifndef __ASM_METAG_PROM_H
#define __ASM_METAG_PROM_H
#define HAVE_ARCH_DEVTREE_FIXUPS
extern void copy_fdt(void);

2
arch/microblaze/include/asm/prom.h

@ -16,8 +16,6 @@
#include <linux/of.h>
#define HAVE_ARCH_DEVTREE_FIXUPS
/* Other Prototypes */
enum early_consoles {
UARTLITE = 1,

2
arch/openrisc/include/asm/prom.h

@ -17,6 +17,4 @@
#ifndef _ASM_OPENRISC_PROM_H
#define _ASM_OPENRISC_PROM_H
#define HAVE_ARCH_DEVTREE_FIXUPS
#endif /* _ASM_OPENRISC_PROM_H */

2
arch/powerpc/include/asm/prom.h

@ -20,8 +20,6 @@
#include <asm/irq.h>
#include <linux/atomic.h>
#define HAVE_ARCH_DEVTREE_FIXUPS
/*
* OF address retreival & translation
*/

2
arch/x86/include/asm/prom.h

@ -39,7 +39,5 @@ static inline void x86_dtb_init(void) { }
extern char cmd_line[COMMAND_LINE_SIZE];
#define HAVE_ARCH_DEVTREE_FIXUPS
#endif /* __ASSEMBLY__ */
#endif

2
arch/xtensa/include/asm/prom.h

@ -1,6 +1,4 @@
#ifndef _XTENSA_ASM_PROM_H
#define _XTENSA_ASM_PROM_H
#define HAVE_ARCH_DEVTREE_FIXUPS
#endif /* _XTENSA_ASM_PROM_H */

3
fs/proc/proc_devtree.c

@ -14,16 +14,13 @@
#include <linux/of.h>
#include <linux/export.h>
#include <linux/slab.h>
#include <asm/prom.h>
#include <asm/uaccess.h>
#include "internal.h"
static inline void set_node_proc_entry(struct device_node *np,
struct proc_dir_entry *de)
{
#ifdef HAVE_ARCH_DEVTREE_FIXUPS
np->pde = de;
#endif
}
static struct proc_dir_entry *proc_device_tree;

Loading…
Cancel
Save