Patches contributed by Eötvös Lorand University
commit fd2c17e1777d46cff14c25ea774a4d17459d188a
Merge: 74e411cb6443 066519068ad2
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 16 11:20:57 2008 +0200
Merge branch 'linus' into x86/timers
commit 3557b18fcbe0e29706214f3c7cc680a7823605eb
Merge: 4226ab93d8ae 066519068ad2
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 16 11:20:37 2008 +0200
Merge branch 'linus' into x86/ptemask
commit faeca31d068090285b77c39574d2bda14b079c50
Merge: 499f8f84b832 066519068ad2
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 16 11:20:28 2008 +0200
Merge branch 'linus' into x86/pat
commit 064a32d82c20cdcb0119a8b316eb520608d8c647
Merge: 0327318445d5 066519068ad2
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 16 11:19:53 2008 +0200
Merge branch 'linus' into x86/memtest
commit 1791a78c0b10fe548bf08a2ed7f84a4ea1385430
Merge: bf07dc864902 066519068ad2
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 16 11:17:50 2008 +0200
Merge branch 'linus' into x86/cleanups
commit ed9e4996d9a123b7550e63713d563f524fa9d9f0
Merge: 4d2df795f0c3 066519068ad2
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 16 11:17:19 2008 +0200
Merge branch 'linus' into tracing/sysprof
diff --cc kernel/sched.c
index e2e985eeee78,eaf6751e7612..c994d12abbf6
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@@ -2631,11 -2275,8 +2297,11 @@@ void wake_up_new_task(struct task_struc
* management (if any):
*/
p->sched_class->task_new(rq, p);
- inc_nr_running(rq);
+ inc_nr_running(p, rq);
}
+ trace_mark(kernel_sched_wakeup_new,
+ "pid %d state %ld ## rq %p task %p rq->curr %p",
+ p->pid, p->state, rq, p, rq->curr);
check_preempt_curr(rq, p);
#ifdef CONFIG_SMP
if (p->sched_class->task_wake_up)
commit cb9aa97c21c59ad01c9514d7faf45dc166fba226
Merge: 668a6c365456 066519068ad2
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 16 11:16:46 2008 +0200
Merge branch 'linus' into tracing/mmiotrace-mergefixups
diff --cc kernel/sched.c
index e2e985eeee78,eaf6751e7612..c994d12abbf6
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@@ -2631,11 -2275,8 +2297,11 @@@ void wake_up_new_task(struct task_struc
* management (if any):
*/
p->sched_class->task_new(rq, p);
- inc_nr_running(rq);
+ inc_nr_running(p, rq);
}
+ trace_mark(kernel_sched_wakeup_new,
+ "pid %d state %ld ## rq %p task %p rq->curr %p",
+ p->pid, p->state, rq, p, rq->curr);
check_preempt_curr(rq, p);
#ifdef CONFIG_SMP
if (p->sched_class->task_wake_up)
commit e765ee90da62535ac7d7a97f2464f9646539d683
Merge: a4500b84c516 066519068ad2
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 16 11:15:58 2008 +0200
Merge branch 'linus' into tracing/ftrace
diff --cc kernel/sched.c
index b8c9fe676221,eaf6751e7612..96fbbbf3722c
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@@ -2631,11 -2275,8 +2297,11 @@@ void wake_up_new_task(struct task_struc
* management (if any):
*/
p->sched_class->task_new(rq, p);
- inc_nr_running(rq);
+ inc_nr_running(p, rq);
}
+ trace_mark(kernel_sched_wakeup_new,
+ "pid %d state %ld ## rq %p task %p rq->curr %p",
+ p->pid, p->state, rq, p, rq->curr);
check_preempt_curr(rq, p);
#ifdef CONFIG_SMP
if (p->sched_class->task_wake_up)
commit f9e8e07e074a880e110922759dcdb369fecdf07c
Merge: e9886ca3a93d 066519068ad2
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 16 11:15:21 2008 +0200
Merge branch 'linus' into sched-devel
diff --cc kernel/sched.c
index 07d5472dee99,eaf6751e7612..554de4009803
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@@ -310,12 -307,15 +310,15 @@@ static DEFINE_SPINLOCK(task_group_lock)
#ifdef CONFIG_FAIR_GROUP_SCHED
#ifdef CONFIG_USER_SCHED
# define INIT_TASK_GROUP_LOAD (2*NICE_0_LOAD)
-#else
+#else /* !CONFIG_USER_SCHED */
# define INIT_TASK_GROUP_LOAD NICE_0_LOAD
-#endif
+#endif /* CONFIG_USER_SCHED */
/*
- * A weight of 0, 1 or ULONG_MAX can cause arithmetics problems.
+ * A weight of 0 or 1 can cause arithmetics problems.
+ * A weight of a cfs_rq is the sum of weights of which entities
+ * are queued on this cfs_rq, so a weight of a entity should not be
+ * too large, so as the shares value of a task group.
* (The default weight is 1024 - so there's no practical
* limitation from this.)
*/
commit 28638ea4f8adb63f837e4436560ab16ab0388587
Merge: f781b03c4b1c 066519068ad2
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 16 10:17:15 2008 +0200
Merge branch 'linus' into x86/nmi
Conflicts:
arch/x86/kernel/nmi_32.c