Commit 34db8aaf authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

proc: Move some bits from linux/proc_fs.h to linux/{of.h,signal.h,tty.h} 



Move some bits from linux/proc_fs.h to linux/of.h, signal.h and tty.h.

Also move proc_tty_init() and proc_device_tree_init() to fs/proc/internal.h as
they're internal to procfs.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
cc: devicetree-discuss@lists.ozlabs.org
cc: linux-arch@vger.kernel.org
cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
cc: Jri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 4abfd029

fs/proc/internal.h

+16 −0
Original line number Diff line number Diff line
@@ -198,3 +198,19 @@ extern const struct inode_operations proc_ns_dir_inode_operations; 
extern const struct file_operations proc_ns_dir_operations;



extern int proc_setup_self(struct super_block *);



/*

 * proc_devtree.c

 */

#ifdef CONFIG_PROC_DEVICETREE

extern void proc_device_tree_init(void);

#endif /* CONFIG_PROC_DEVICETREE */



/*

 * proc_tty.c

 */

#ifdef CONFIG_TTY

extern void proc_tty_init(void);

#else

static inline void proc_tty_init(void) {}

#endif

include/linux/of.h

+10 −0
Original line number Diff line number Diff line
@@ -540,4 +540,14 @@ static inline int of_property_read_u32(const struct device_node *np, 
	return of_property_read_u32_array(np, propname, out_value, 1);

}



#if defined(CONFIG_PROC_FS) && defined(CONFIG_PROC_DEVICETREE)

extern void proc_device_tree_add_node(struct device_node *, struct proc_dir_entry *);

extern void proc_device_tree_add_prop(struct proc_dir_entry *pde, struct property *prop);

extern void proc_device_tree_remove_prop(struct proc_dir_entry *pde,

					 struct property *prop);

extern void proc_device_tree_update_prop(struct proc_dir_entry *pde,

					 struct property *newprop,

					 struct property *oldprop);

#endif



#endif /* _LINUX_OF_H */

include/linux/proc_fs.h

+0 −37
Original line number Diff line number Diff line
@@ -70,36 +70,6 @@ struct proc_dir_entry *proc_create_data(const char *name, umode_t mode, 
extern void remove_proc_entry(const char *name, struct proc_dir_entry *parent);

extern int remove_proc_subtree(const char *name, struct proc_dir_entry *parent);





/*

 * proc_tty.c

 */

struct tty_driver;

#ifdef CONFIG_TTY

extern void proc_tty_init(void);

#else

static inline void proc_tty_init(void)

{ }

#endif

extern void proc_tty_register_driver(struct tty_driver *driver);

extern void proc_tty_unregister_driver(struct tty_driver *driver);



/*

 * proc_devtree.c

 */

#ifdef CONFIG_PROC_DEVICETREE

struct device_node;

struct property;

extern void proc_device_tree_init(void);

extern void proc_device_tree_add_node(struct device_node *, struct proc_dir_entry *);

extern void proc_device_tree_add_prop(struct proc_dir_entry *pde, struct property *prop);

extern void proc_device_tree_remove_prop(struct proc_dir_entry *pde,

					 struct property *prop);

extern void proc_device_tree_update_prop(struct proc_dir_entry *pde,

					 struct property *newprop,

					 struct property *oldprop);

#endif /* CONFIG_PROC_DEVICETREE */



extern struct proc_dir_entry *proc_symlink(const char *,

		struct proc_dir_entry *, const char *);

extern struct proc_dir_entry *proc_mkdir(const char *,struct proc_dir_entry *);
@@ -143,10 +113,6 @@ static inline struct proc_dir_entry *proc_mkdir_mode(const char *name, 
static inline void proc_set_size(struct proc_dir_entry *de, loff_t size) {}

static inline void proc_set_user(struct proc_dir_entry *de, kuid_t uid, kgid_t gid) {}



struct tty_driver;

static inline void proc_tty_register_driver(struct tty_driver *driver) {};

static inline void proc_tty_unregister_driver(struct tty_driver *driver) {};



#endif /* CONFIG_PROC_FS */
@@ -187,7 +153,4 @@ static inline void *PDE_DATA(const struct inode *inode) 
	return PROC_I(inode)->pde->data;

}



#include <linux/signal.h>



void render_sigset_t(struct seq_file *m, const char *header, sigset_t *set);

#endif /* _LINUX_PROC_FS_H */

include/linux/signal.h

+5 −0
Original line number Diff line number Diff line
@@ -434,4 +434,9 @@ void signals_init(void); 
int restore_altstack(const stack_t __user *);

int __save_altstack(stack_t __user *, unsigned long);



#ifdef CONFIG_PROC_FS

struct seq_file;

extern void render_sigset_t(struct seq_file *, const char *, sigset_t *);

#endif



#endif /* _LINUX_SIGNAL_H */

include/linux/tty.h

+7 −0
Original line number Diff line number Diff line
@@ -658,5 +658,12 @@ do { \ 
	finish_wait(&wq, &__wait);					\

} while (0)



#ifdef CONFIG_PROC_FS

extern void proc_tty_register_driver(struct tty_driver *);

extern void proc_tty_unregister_driver(struct tty_driver *);

#else

static inline void proc_tty_register_driver(struct tty_driver *d) {}

static inline void proc_tty_unregister_driver(struct tty_driver *d) {}

#endif



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE