Patched in Tegra support.

1 files changed, 16 insertions, 43 deletions

diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 32676b35d2f..643b96c7a94 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -28,11 +28,7 @@ struct mm_struct;
  */
 
 enum {
-        PROC_ROOT_INO           = 1,
-        PROC_IPC_INIT_INO       = 0xEFFFFFFFU,
-        PROC_UTS_INIT_INO       = 0xEFFFFFFEU,
-        PROC_USER_INIT_INO      = 0xEFFFFFFDU,
-        PROC_PID_INIT_INO       = 0xEFFFFFFCU,
+        PROC_ROOT_INO = 1,
 };
 
 /*
@@ -54,10 +50,10 @@ typedef	int (write_proc_t)(struct file *file, const char __user *buffer,
 
 struct proc_dir_entry {
         unsigned int low_ino;
-        umode_t mode;
+        mode_t mode;
         nlink_t nlink;
-        kuid_t uid;
-        kgid_t gid;
+        uid_t uid;
+        gid_t gid;
         loff_t size;
         const struct inode_operations *proc_iops;
         /*
@@ -110,9 +106,9 @@ extern void proc_root_init(void);
 
 void proc_flush_task(struct task_struct *task);
 
-extern struct proc_dir_entry *create_proc_entry(const char *name, umode_t mode,
+extern struct proc_dir_entry *create_proc_entry(const char *name, mode_t mode,
                                                 struct proc_dir_entry *parent);
-struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
+struct proc_dir_entry *proc_create_data(const char *name, mode_t mode,
                                 struct proc_dir_entry *parent,
                                 const struct file_operations *proc_fops,
                                 void *data);
@@ -150,17 +146,17 @@ extern void proc_device_tree_update_prop(struct proc_dir_entry *pde,
 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 *);
-extern struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
+extern struct proc_dir_entry *proc_mkdir_mode(const char *name, mode_t mode,
                         struct proc_dir_entry *parent);
 
-static inline struct proc_dir_entry *proc_create(const char *name, umode_t mode,
+static inline struct proc_dir_entry *proc_create(const char *name, mode_t mode,
         struct proc_dir_entry *parent, const struct file_operations *proc_fops)
 {
         return proc_create_data(name, mode, parent, proc_fops, NULL);
 }
 
 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
-        umode_t mode, struct proc_dir_entry *base, 
+        mode_t mode, struct proc_dir_entry *base, 
         read_proc_t *read_proc, void * data)
 {
         struct proc_dir_entry *res=create_proc_entry(name,mode,base);
@@ -172,16 +168,13 @@ static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
 }
  
 extern struct proc_dir_entry *proc_net_fops_create(struct net *net,
-        const char *name, umode_t mode, const struct file_operations *fops);
+        const char *name, mode_t mode, const struct file_operations *fops);
 extern void proc_net_remove(struct net *net, const char *name);
 extern struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name,
         struct proc_dir_entry *parent);
 
 extern struct file *proc_ns_fget(int fd);
-extern bool proc_ns_inode(struct inode *inode);
 
-extern int proc_alloc_inum(unsigned int *pino);
-extern void proc_free_inum(unsigned int inum);
 #else
 
 #define proc_net_fops_create(net, name, mode, fops)  ({ (void)(mode), NULL; })
@@ -192,15 +185,15 @@ static inline void proc_flush_task(struct task_struct *task)
 }
 
 static inline struct proc_dir_entry *create_proc_entry(const char *name,
-        umode_t mode, struct proc_dir_entry *parent) { return NULL; }
+        mode_t mode, struct proc_dir_entry *parent) { return NULL; }
 static inline struct proc_dir_entry *proc_create(const char *name,
-        umode_t mode, struct proc_dir_entry *parent,
+        mode_t mode, struct proc_dir_entry *parent,
         const struct file_operations *proc_fops)
 {
         return NULL;
 }
 static inline struct proc_dir_entry *proc_create_data(const char *name,
-        umode_t mode, struct proc_dir_entry *parent,
+        mode_t mode, struct proc_dir_entry *parent,
         const struct file_operations *proc_fops, void *data)
 {
         return NULL;
@@ -212,10 +205,10 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
 static inline struct proc_dir_entry *proc_mkdir(const char *name,
         struct proc_dir_entry *parent) {return NULL;}
 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
-        umode_t mode, struct proc_dir_entry *parent) { return NULL; }
+        mode_t mode, struct proc_dir_entry *parent) { return NULL; }
 
 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
-        umode_t mode, struct proc_dir_entry *base, 
+        mode_t mode, struct proc_dir_entry *base, 
         read_proc_t *read_proc, void * data) { return NULL; }
 
 struct tty_driver;
@@ -236,19 +229,6 @@ static inline struct file *proc_ns_fget(int fd)
         return ERR_PTR(-EINVAL);
 }
 
-static inline bool proc_ns_inode(struct inode *inode)
-{
-        return false;
-}
-
-static inline int proc_alloc_inum(unsigned int *inum)
-{
-        *inum = 1;
-        return 0;
-}
-static inline void proc_free_inum(unsigned int inum)
-{
-}
 #endif /* CONFIG_PROC_FS */
 
 #if !defined(CONFIG_PROC_KCORE)
@@ -267,17 +247,13 @@ struct proc_ns_operations {
         void *(*get)(struct task_struct *task);
         void (*put)(void *ns);
         int (*install)(struct nsproxy *nsproxy, void *ns);
-        unsigned int (*inum)(void *ns);
 };
 extern const struct proc_ns_operations netns_operations;
 extern const struct proc_ns_operations utsns_operations;
 extern const struct proc_ns_operations ipcns_operations;
-extern const struct proc_ns_operations pidns_operations;
-extern const struct proc_ns_operations userns_operations;
-extern const struct proc_ns_operations mntns_operations;
 
 union proc_op {
-        int (*proc_get_link)(struct dentry *, struct path *);
+        int (*proc_get_link)(struct inode *, struct path *);
         int (*proc_read)(struct task_struct *task, char *page);
         int (*proc_show)(struct seq_file *m,
                 struct pid_namespace *ns, struct pid *pid,
@@ -314,7 +290,4 @@ static inline struct net *PDE_NET(struct proc_dir_entry *pde)
         return pde->parent->data;
 }
 
-#include <linux/signal.h>
-
-void render_sigset_t(struct seq_file *m, const char *header, sigset_t *set);
 #endif /* _LINUX_PROC_FS_H */