projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ipmi' into release
[platform/kernel/linux-rpi.git]
/
kernel
/
posix-cpu-timers.c
diff --git
a/kernel/posix-cpu-timers.c
b/kernel/posix-cpu-timers.c
index
6842eeb
..
05bb717
100644
(file)
--- a/
kernel/posix-cpu-timers.c
+++ b/
kernel/posix-cpu-timers.c
@@
-37,13
+37,13
@@
static int check_clock(const clockid_t which_clock)
if (pid == 0)
return 0;
if (pid == 0)
return 0;
- r
ead_lock(&tasklist_lock
);
+ r
cu_read_lock(
);
p = find_task_by_vpid(pid);
if (!p || !(CPUCLOCK_PERTHREAD(which_clock) ?
p = find_task_by_vpid(pid);
if (!p || !(CPUCLOCK_PERTHREAD(which_clock) ?
- same_thread_group(p, current) :
thread_group_leader
(p))) {
+ same_thread_group(p, current) :
has_group_leader_pid
(p))) {
error = -EINVAL;
}
error = -EINVAL;
}
- r
ead_unlock(&tasklist_lock
);
+ r
cu_read_unlock(
);
return error;
}
return error;
}
@@
-390,7
+390,7
@@
int posix_cpu_timer_create(struct k_itimer *new_timer)
INIT_LIST_HEAD(&new_timer->it.cpu.entry);
INIT_LIST_HEAD(&new_timer->it.cpu.entry);
- r
ead_lock(&tasklist_lock
);
+ r
cu_read_lock(
);
if (CPUCLOCK_PERTHREAD(new_timer->it_clock)) {
if (pid == 0) {
p = current;
if (CPUCLOCK_PERTHREAD(new_timer->it_clock)) {
if (pid == 0) {
p = current;
@@
-404,7
+404,7
@@
int posix_cpu_timer_create(struct k_itimer *new_timer)
p = current->group_leader;
} else {
p = find_task_by_vpid(pid);
p = current->group_leader;
} else {
p = find_task_by_vpid(pid);
- if (p && !
thread_group_leader
(p))
+ if (p && !
has_group_leader_pid
(p))
p = NULL;
}
}
p = NULL;
}
}
@@
-414,7
+414,7
@@
int posix_cpu_timer_create(struct k_itimer *new_timer)
} else {
ret = -EINVAL;
}
} else {
ret = -EINVAL;
}
- r
ead_unlock(&tasklist_lock
);
+ r
cu_read_unlock(
);
return ret;
}
return ret;
}