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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 4 insertions, 6 deletions

diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 170459c224a1..16bfae2d3217 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -18,14 +18,10 @@ extern "C" {
 struct file {
         struct file *next;
         struct file *parent;
-        char *name;
+        const char *name;
         int lineno;
-        int flags;
 };
 
-#define FILE_BUSY               0x0001
-#define FILE_SCANNED            0x0002
-
 typedef enum tristate {
         no, mod, yes
 } tristate;
@@ -164,6 +160,7 @@ struct menu {
         struct menu *list;
         struct symbol *sym;
         struct property *prompt;
+        struct expr *visibility;
         struct expr *dep;
         unsigned int flags;
         char *help;
@@ -191,7 +188,7 @@ struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e
 struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2);
 struct expr *expr_alloc_and(struct expr *e1, struct expr *e2);
 struct expr *expr_alloc_or(struct expr *e1, struct expr *e2);
-struct expr *expr_copy(struct expr *org);
+struct expr *expr_copy(const struct expr *org);
 void expr_free(struct expr *e);
 int expr_eq(struct expr *e1, struct expr *e2);
 void expr_eliminate_eq(struct expr **ep1, struct expr **ep2);
@@ -206,6 +203,7 @@ struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2);
 struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2);
 void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2);
 struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym);
+struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2);
 
 void expr_fprint(struct expr *e, FILE *out);
 struct gstr; /* forward */