xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

Browse Source
This commit is contained in:
David S. Miller
2011-10-24 18:18:09 -04:00
parent 78d81d15b7 f42af6c486
commit 1805b2f048
130 changed files with 850 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/posix-cpu-timers.c
View File

@@ -274,9 +274,7 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times)
struct task_cputime sum;
unsigned long flags;
spin_lock_irqsave(&cputimer->lock, flags);
if (!cputimer->running) {
cputimer->running = 1;
/*
* The POSIX timer interface allows for absolute time expiry
* values through the TIMER_ABSTIME flag, therefore we have
@@ -284,8 +282,11 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times)
* it.
*/
thread_group_cputime(tsk, &sum);
spin_lock_irqsave(&cputimer->lock, flags);
cputimer->running = 1;
update_gt_cputime(&cputimer->cputime, &sum);
}
} else
spin_lock_irqsave(&cputimer->lock, flags);
*times = cputimer->cputime;
spin_unlock_irqrestore(&cputimer->lock, flags);
}

2
kernel/sys.c
View File

@@ -1172,7 +1172,7 @@ DECLARE_RWSEM(uts_sem);
static int override_release(char __user *release, int len)
{
int ret = 0;
char buf[len];
char buf[65];
if (current->personality & UNAME26) {
char *rest = UTS_RELEASE;