projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
thp: update futex compound knowledge
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
taskstats.c
diff --git
a/kernel/taskstats.c
b/kernel/taskstats.c
index 3308fd7f1b52f170e4da5dd7e26749aca652ef1b..3971c6b9d58db668c029365a1120506dda3179d8 100644
(file)
--- a/
kernel/taskstats.c
+++ b/
kernel/taskstats.c
@@
-89,8
+89,7
@@
static int prepare_reply(struct genl_info *info, u8 cmd, struct sk_buff **skbp,
return -ENOMEM;
if (!info) {
return -ENOMEM;
if (!info) {
- int seq = get_cpu_var(taskstats_seqnum)++;
- put_cpu_var(taskstats_seqnum);
+ int seq = this_cpu_inc_return(taskstats_seqnum) - 1;
reply = genlmsg_put(skb, 0, seq, &family, 0, cmd);
} else
reply = genlmsg_put(skb, 0, seq, &family, 0, cmd);
} else
@@
-349,7
+348,7
@@
static int parse(struct nlattr *na, struct cpumask *mask)
return ret;
}
return ret;
}
-#if
def CONFIG_IA64
+#if
defined(CONFIG_64BIT) && !defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)
#define TASKSTATS_NEEDS_PADDING 1
#endif
#define TASKSTATS_NEEDS_PADDING 1
#endif
@@
-612,7
+611,7
@@
void taskstats_exit(struct task_struct *tsk, int group_dead)
fill_tgid_exit(tsk);
}
fill_tgid_exit(tsk);
}
- listeners =
&__raw_get_cpu_var(
listener_array);
+ listeners =
__this_cpu_ptr(&
listener_array);
if (list_empty(&listeners->list))
return;
if (list_empty(&listeners->list))
return;