diff --git a/[refs] b/[refs] index 4dd941d280d3..f758936083de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ec220e27f5040aec1e88901c1b6ea3d135787ad +refs/heads/master: dfe6b7d9406c631d697f8bbe1eae5569b808154f diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index eb7b4654d6aa..a9ccc1252731 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/fs/proc/base.c @@ -306,9 +306,9 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer) struct mm_struct *mm = get_task_mm(task); if (mm) { unsigned int nwords = 0; - do + do { nwords += 2; - while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */ + } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */ res = nwords * sizeof(mm->saved_auxv[0]); if (res > PAGE_SIZE) res = PAGE_SIZE;