diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-08-24 16:32:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-08-24 16:32:24 -0400 |
| commit | 83bc90e11576f9c100f8ef4ba2bcd0b89212e3fb (patch) | |
| tree | e59186b4d315c80255851e0d204143ecc21399a0 /include/linux/klist.h | |
| parent | e21ded5ecc531a64d6fc0c1693285e890b4e9569 (diff) | |
| parent | 451fd72219dd6f3355e2d036c598544c760ee532 (diff) | |
Merge branch 'linus' into perf/core, to fix conflicts
Conflicts:
arch/x86/kernel/cpu/perf_event_intel_uncore*.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/klist.h')
| -rw-r--r-- | include/linux/klist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/klist.h b/include/linux/klist.h index a370ce57cf1d..61e5b723ae73 100644 --- a/include/linux/klist.h +++ b/include/linux/klist.h | |||
| @@ -44,7 +44,7 @@ struct klist_node { | |||
| 44 | 44 | ||
| 45 | extern void klist_add_tail(struct klist_node *n, struct klist *k); | 45 | extern void klist_add_tail(struct klist_node *n, struct klist *k); |
| 46 | extern void klist_add_head(struct klist_node *n, struct klist *k); | 46 | extern void klist_add_head(struct klist_node *n, struct klist *k); |
| 47 | extern void klist_add_after(struct klist_node *n, struct klist_node *pos); | 47 | extern void klist_add_behind(struct klist_node *n, struct klist_node *pos); |
| 48 | extern void klist_add_before(struct klist_node *n, struct klist_node *pos); | 48 | extern void klist_add_before(struct klist_node *n, struct klist_node *pos); |
| 49 | 49 | ||
| 50 | extern void klist_del(struct klist_node *n); | 50 | extern void klist_del(struct klist_node *n); |