linux-next: manual merge of the akpm tree with the vfstree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/proc/internal.h between commit 4608da4a9433 ("proc: Move non-public
stuff from linux/proc_fs.h to fs/proc/internal.h") from the vfs tree and
commit "pagemap: introduce the /proc/PID/pagemap2 file" from the akpm
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/proc/internal.h
index d600fb0,188b886..0000000
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@@ -223,76 -191,4 +223,77 @@@ extern void proc_device_tree_init(void)
  extern const struct inode_operations proc_ns_dir_inode_operations;
  extern const struct file_operations proc_ns_dir_operations;
  
 +/*
 + * proc_net.c
 + */
 +extern const struct file_operations proc_net_operations;
 +extern const struct inode_operations proc_net_inode_operations;
 +
 +#ifdef CONFIG_NET
 +extern int proc_net_init(void);
 +#else
 +static inline int proc_net_init(void) { return 0; }
 +#endif
 +
 +/*
 + * proc_self.c
 + */
  extern int proc_setup_self(struct super_block *);
 +
 +/*
 + * proc_sysctl.c
 + */
 +#ifdef CONFIG_PROC_SYSCTL
 +extern int proc_sys_init(void);
 +extern void sysctl_head_put(struct ctl_table_header *);
 +#else
 +static inline void proc_sys_init(void) { }
 +static inline void sysctl_head_put(struct ctl_table_header *head) { }
 +#endif
 +
 +/*
 + * proc_tty.c
 + */
 +#ifdef CONFIG_TTY
 +extern void proc_tty_init(void);
 +#else
 +static inline void proc_tty_init(void) {}
 +#endif
 +
 +/*
 + * root.c
 + */
 +extern struct proc_dir_entry proc_root;
 +
 +extern void proc_self_init(void);
 +extern int proc_remount(struct super_block *, int *, char *);
 +
 +/*
 + * task_[no]mmu.c
 + */
 +struct proc_maps_private {
 +	struct pid *pid;
 +	struct task_struct *task;
 +#ifdef CONFIG_MMU
 +	struct vm_area_struct *tail_vma;
 +#endif
 +#ifdef CONFIG_NUMA
 +	struct mempolicy *task_mempolicy;
 +#endif
 +};
 +
 +extern const struct file_operations proc_pid_maps_operations;
 +extern const struct file_operations proc_tid_maps_operations;
 +extern const struct file_operations proc_pid_numa_maps_operations;
 +extern const struct file_operations proc_tid_numa_maps_operations;
 +extern const struct file_operations proc_pid_smaps_operations;
 +extern const struct file_operations proc_tid_smaps_operations;
 +extern const struct file_operations proc_clear_refs_operations;
 +extern const struct file_operations proc_pagemap_operations;
++extern const struct file_operations proc_pagemap2_operations;
 +
 +extern unsigned long task_vsize(struct mm_struct *);
 +extern unsigned long task_statm(struct mm_struct *,
 +				unsigned long *, unsigned long *,
 +				unsigned long *, unsigned long *);
 +extern void task_mem(struct seq_file *, struct mm_struct *);

Attachment: pgp00000.pgp
Description: PGP signature