mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge ../linux-2.6
This commit is contained in:
commit
bac30d1a78
779 changed files with 22983 additions and 7760 deletions
|
|
@ -560,7 +560,7 @@ static void proc_kill_inodes(struct proc_dir_entry *de)
|
|||
struct file * filp = list_entry(p, struct file, f_u.fu_list);
|
||||
struct dentry * dentry = filp->f_dentry;
|
||||
struct inode * inode;
|
||||
struct file_operations *fops;
|
||||
const struct file_operations *fops;
|
||||
|
||||
if (dentry->d_op != &proc_dentry_operations)
|
||||
continue;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ do { \
|
|||
|
||||
#endif
|
||||
|
||||
extern void create_seq_entry(char *name, mode_t mode, struct file_operations *f);
|
||||
extern void create_seq_entry(char *name, mode_t mode, const struct file_operations *f);
|
||||
extern int proc_exe_link(struct inode *, struct dentry **, struct vfsmount **);
|
||||
extern int proc_tid_stat(struct task_struct *, char *);
|
||||
extern int proc_tgid_stat(struct task_struct *, char *);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ static int open_kcore(struct inode * inode, struct file * filp)
|
|||
|
||||
static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *);
|
||||
|
||||
struct file_operations proc_kcore_operations = {
|
||||
const struct file_operations proc_kcore_operations = {
|
||||
.read = read_kcore,
|
||||
.open = open_kcore,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ static unsigned int kmsg_poll(struct file *file, poll_table *wait)
|
|||
}
|
||||
|
||||
|
||||
struct file_operations proc_kmsg_operations = {
|
||||
const struct file_operations proc_kmsg_operations = {
|
||||
.read = kmsg_read,
|
||||
.poll = kmsg_poll,
|
||||
.open = kmsg_open,
|
||||
|
|
|
|||
|
|
@ -534,7 +534,7 @@ static int show_stat(struct seq_file *p, void *v)
|
|||
if (wall_to_monotonic.tv_nsec)
|
||||
--jif;
|
||||
|
||||
for_each_cpu(i) {
|
||||
for_each_possible_cpu(i) {
|
||||
int j;
|
||||
|
||||
user = cputime64_add(user, kstat_cpu(i).cpustat.user);
|
||||
|
|
@ -731,7 +731,7 @@ static struct file_operations proc_sysrq_trigger_operations = {
|
|||
|
||||
struct proc_dir_entry *proc_root_kcore;
|
||||
|
||||
void create_seq_entry(char *name, mode_t mode, struct file_operations *f)
|
||||
void create_seq_entry(char *name, mode_t mode, const struct file_operations *f)
|
||||
{
|
||||
struct proc_dir_entry *entry;
|
||||
entry = create_proc_entry(name, mode, NULL);
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ static int open_vmcore(struct inode *inode, struct file *filp)
|
|||
return 0;
|
||||
}
|
||||
|
||||
struct file_operations proc_vmcore_operations = {
|
||||
const struct file_operations proc_vmcore_operations = {
|
||||
.read = read_vmcore,
|
||||
.open = open_vmcore,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue