lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'perf/urgent' into perf/core

Browse Source 
Conflicts:
	tools/perf/builtin-record.c
	tools/perf/builtin-top.c
	tools/perf/perf.h
	tools/perf/util/top.h

Merge reason: resolve these cherry-picking conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2012-03-05 09:20:08 +01:00
parent 8eedce9965 b7c924274c
commit 737f24bda7
920 changed files with 7209 additions and 46124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/core/sock.c
View File

@ -1171,13 +1171,10 @@ EXPORT_SYMBOL(sock_update_classid);
void sock_update_netprioidx(struct sock *sk)
{
struct cgroup_netprio_state *state;
if (in_interrupt())
return;
rcu_read_lock();
state = task_netprio_state(current);
sk->sk_cgrp_prioidx = state ? state->prioidx : 0;
rcu_read_unlock();
sk->sk_cgrp_prioidx = task_netprioidx(current);
}
EXPORT_SYMBOL_GPL(sock_update_netprioidx);
#endif