Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge

1 files changed, 3 insertions, 6 deletions

diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index f3f4af4b8b0f..6b4a12558e88 100644
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -277,12 +277,9 @@ static int __init init_sched_debug_procfs(void)
 {
         struct proc_dir_entry *pe;
 
-        pe = create_proc_entry("sched_debug", 0644, NULL);
+        pe = proc_create("sched_debug", 0644, NULL, &sched_debug_fops);
         if (!pe)
                 return -ENOMEM;
-
-        pe->proc_fops = &sched_debug_fops;
-
         return 0;
 }
 
@@ -360,8 +357,8 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
 
                 avg_per_cpu = p->se.sum_exec_runtime;
                 if (p->se.nr_migrations) {
-                        avg_per_cpu = div64_64(avg_per_cpu,
-                                               p->se.nr_migrations);
+                        avg_per_cpu = div64_u64(avg_per_cpu,
+                                                p->se.nr_migrations);
                 } else {
                         avg_per_cpu = -1LL;
                 }