Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 5 insertions, 2 deletions

diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index 78b5c04e736b..6330cc871a47 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -12,15 +12,18 @@
 struct file *file_lookup(const char *name)
 {
         struct file *file;
+        const char *file_name = sym_expand_string_value(name);
 
         for (file = file_list; file; file = file->next) {
-                if (!strcmp(name, file->name))
+                if (!strcmp(name, file->name)) {
+                        free((void *)file_name);
                         return file;
+                }
         }
 
         file = malloc(sizeof(*file));
         memset(file, 0, sizeof(*file));
-        file->name = strdup(name);
+        file->name = file_name;
         file->next = file_list;
         file_list = file;
         return file;