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
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[safe/jmp/linux-2.6]
/
kernel
/
hung_task.c
diff --git
a/kernel/hung_task.c
b/kernel/hung_task.c
index
022a492
..
0c642d5
100644
(file)
--- a/
kernel/hung_task.c
+++ b/
kernel/hung_task.c
@@
-144,7
+144,7
@@
static void check_hung_uninterruptible_tasks(unsigned long timeout)
rcu_read_lock();
do_each_thread(g, t) {
rcu_read_lock();
do_each_thread(g, t) {
- if (!
--max_count
)
+ if (!
max_count--
)
goto unlock;
if (!--batch_count) {
batch_count = HUNG_TASK_BATCHING;
goto unlock;
if (!--batch_count) {
batch_count = HUNG_TASK_BATCHING;
@@
-171,12
+171,12
@@
static unsigned long timeout_jiffies(unsigned long timeout)
* Process updating of timeout sysctl
*/
int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
* Process updating of timeout sysctl
*/
int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
-
struct file *filp,
void __user *buffer,
+ void __user *buffer,
size_t *lenp, loff_t *ppos)
{
int ret;
size_t *lenp, loff_t *ppos)
{
int ret;
- ret = proc_doulongvec_minmax(table, write,
filp,
buffer, lenp, ppos);
+ ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
if (ret || !write)
goto out;
if (ret || !write)
goto out;