Commit 13bbb050 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppc64: fixes for compile with CONFIG_PROC_DEVICETREE=n, from Nathan Lynch

From: Anton Blanchard <anton@samba.org>

- nop out proc_device_tree_add_node if CONFIG_PROC_DEVICETREE=n

- stubs for procfs-related functions when CONFIG_PROC_DEVICETREE=n
parent f18a9012
...@@ -2560,6 +2560,7 @@ int of_remove_node(struct device_node *np) ...@@ -2560,6 +2560,7 @@ int of_remove_node(struct device_node *np)
return 0; return 0;
} }
#ifdef CONFIG_PROC_DEVICETREE
/* /*
* Add a node to /proc/device-tree. * Add a node to /proc/device-tree.
*/ */
...@@ -2592,6 +2593,17 @@ static void remove_node_proc_entries(struct device_node *np) ...@@ -2592,6 +2593,17 @@ static void remove_node_proc_entries(struct device_node *np)
if (np->pde) if (np->pde)
remove_proc_entry(np->pde->name, parent->pde); remove_proc_entry(np->pde->name, parent->pde);
} }
#else /* !CONFIG_PROC_DEVICETREE */
static void add_node_proc_entries(struct device_node *np)
{
return;
}
static void remove_node_proc_entries(struct device_node *np)
{
return;
}
#endif /* CONFIG_PROC_DEVICETREE */
/* /*
* Fix up the uninitialized fields in a new device node: * Fix up the uninitialized fields in a new device node:
......
...@@ -133,8 +133,14 @@ extern void proc_tty_unregister_driver(struct tty_driver *driver); ...@@ -133,8 +133,14 @@ extern void proc_tty_unregister_driver(struct tty_driver *driver);
*/ */
struct device_node; struct device_node;
extern void proc_device_tree_init(void); extern void proc_device_tree_init(void);
#ifdef CONFIG_PROC_DEVICETREE
extern void proc_device_tree_add_node(struct device_node *, struct proc_dir_entry *); extern void proc_device_tree_add_node(struct device_node *, struct proc_dir_entry *);
#else /* !CONFIG_PROC_DEVICETREE */
static inline void proc_device_tree_add_node(struct device_node *np, struct proc_dir_entry *pde)
{
return;
}
#endif /* CONFIG_PROC_DEVICETREE */
/* /*
* proc_rtas.c * proc_rtas.c
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment