git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kgdb: gdb "monitor" -> kdb passthrough
[safe/jmp/linux-2.6]
/
kernel
/
sched_rt.c
diff --git
a/kernel/sched_rt.c
b/kernel/sched_rt.c
index
c4fb42a
..
8afb953
100644
(file)
--- a/
kernel/sched_rt.c
+++ b/
kernel/sched_rt.c
@@
-613,7
+613,7
@@
static void update_curr_rt(struct rq *rq)
if (unlikely((s64)delta_exec < 0))
delta_exec = 0;
if (unlikely((s64)delta_exec < 0))
delta_exec = 0;
- schedstat_set(curr->se.
exec_max, max(curr->se
.exec_max, delta_exec));
+ schedstat_set(curr->se.
statistics.exec_max, max(curr->se.statistics
.exec_max, delta_exec));
curr->se.sum_exec_runtime += delta_exec;
account_group_exec_runtime(curr, delta_exec);
curr->se.sum_exec_runtime += delta_exec;
account_group_exec_runtime(curr, delta_exec);
@@
-888,20
+888,20
@@
static void dequeue_rt_entity(struct sched_rt_entity *rt_se)
* Adding/removing a task to/from a priority array:
*/
static void
* Adding/removing a task to/from a priority array:
*/
static void
-enqueue_task_rt(struct rq *rq, struct task_struct *p, int
wakeup, bool head
)
+enqueue_task_rt(struct rq *rq, struct task_struct *p, int
flags
)
{
struct sched_rt_entity *rt_se = &p->rt;
{
struct sched_rt_entity *rt_se = &p->rt;
- if (
wakeup
)
+ if (
flags & ENQUEUE_WAKEUP
)
rt_se->timeout = 0;
rt_se->timeout = 0;
- enqueue_rt_entity(rt_se,
head
);
+ enqueue_rt_entity(rt_se,
flags & ENQUEUE_HEAD
);
if (!task_current(rq, p) && p->rt.nr_cpus_allowed > 1)
enqueue_pushable_task(rq, p);
}
if (!task_current(rq, p) && p->rt.nr_cpus_allowed > 1)
enqueue_pushable_task(rq, p);
}
-static void dequeue_task_rt(struct rq *rq, struct task_struct *p, int
sleep
)
+static void dequeue_task_rt(struct rq *rq, struct task_struct *p, int
flags
)
{
struct sched_rt_entity *rt_se = &p->rt;
{
struct sched_rt_entity *rt_se = &p->rt;
@@
-948,10
+948,9
@@
static void yield_task_rt(struct rq *rq)
#ifdef CONFIG_SMP
static int find_lowest_rq(struct task_struct *task);
#ifdef CONFIG_SMP
static int find_lowest_rq(struct task_struct *task);
-static int select_task_rq_rt(struct task_struct *p, int sd_flag, int flags)
+static int
+select_task_rq_rt(struct rq *rq, struct task_struct *p, int sd_flag, int flags)
{
{
- struct rq *rq = task_rq(p);
-
if (sd_flag != SD_BALANCE_WAKE)
return smp_processor_id();
if (sd_flag != SD_BALANCE_WAKE)
return smp_processor_id();
@@
-1667,8
+1666,9
@@
static void watchdog(struct rq *rq, struct task_struct *p)
if (!p->signal)
return;
if (!p->signal)
return;
- soft = p->signal->rlim[RLIMIT_RTTIME].rlim_cur;
- hard = p->signal->rlim[RLIMIT_RTTIME].rlim_max;
+ /* max may change after cur was read, this will be fixed next tick */
+ soft = task_rlimit(p, RLIMIT_RTTIME);
+ hard = task_rlimit_max(p, RLIMIT_RTTIME);
if (soft != RLIM_INFINITY) {
unsigned long next;
if (soft != RLIM_INFINITY) {
unsigned long next;