Merge tag 'v3.18-rc1' into x86/urgent

Reason:
Need to apply audit patch on top of v3.18-rc1.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index b7d477fbda02..34fc7c8672e4 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -13,12 +13,18 @@
 #include <symbol/kallsyms.h>
 #include "unwind.h"
 
+static void dsos__init(struct dsos *dsos)
+{
+        INIT_LIST_HEAD(&dsos->head);
+        dsos->root = RB_ROOT;
+}
+
 int machine__init(struct machine *machine, const char *root_dir, pid_t pid)
 {
         map_groups__init(&machine->kmaps);
         RB_CLEAR_NODE(&machine->rb_node);
-        INIT_LIST_HEAD(&machine->user_dsos.head);
-        INIT_LIST_HEAD(&machine->kernel_dsos.head);
+        dsos__init(&machine->user_dsos);
+        dsos__init(&machine->kernel_dsos);
 
         machine->threads = RB_ROOT;
         INIT_LIST_HEAD(&machine->dead_threads);