The patch titled
kconfig: remove SYMBOL_{YES,MOD,NO}
has been removed from the -mm tree. Its filename is
kconfig-remove-symbol_yesmodno.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: kconfig: remove SYMBOL_{YES,MOD,NO}
From: Roman Zippel <zippel@xxxxxxxxxxxxxx>
The SYMBOL_{YES,MOD,NO} are not really used anymore (they were more used be
the cml1 converter), so just remove them.
Signed-off-by: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
scripts/kconfig/expr.c | 3 ++-
scripts/kconfig/expr.h | 5 +----
scripts/kconfig/gconf.c | 6 ------
scripts/kconfig/symbol.c | 6 +++---
4 files changed, 6 insertions(+), 14 deletions(-)
diff -puN scripts/kconfig/expr.c~kconfig-remove-symbol_yesmodno scripts/kconfig/expr.c
--- devel/scripts/kconfig/expr.c~kconfig-remove-symbol_yesmodno 2006-04-09 23:44:33.000000000 -0700
+++ devel-akpm/scripts/kconfig/expr.c 2006-04-09 23:44:33.000000000 -0700
@@ -145,7 +145,8 @@ static void __expr_eliminate_eq(enum exp
return;
}
if (e1->type == E_SYMBOL && e2->type == E_SYMBOL &&
- e1->left.sym == e2->left.sym && (e1->left.sym->flags & (SYMBOL_YES|SYMBOL_NO)))
+ e1->left.sym == e2->left.sym &&
+ (e1->left.sym == &symbol_yes || e1->left.sym == &symbol_no))
return;
if (!expr_eq(e1, e2))
return;
diff -puN scripts/kconfig/expr.h~kconfig-remove-symbol_yesmodno scripts/kconfig/expr.h
--- devel/scripts/kconfig/expr.h~kconfig-remove-symbol_yesmodno 2006-04-09 23:44:33.000000000 -0700
+++ devel-akpm/scripts/kconfig/expr.h 2006-04-09 23:44:33.000000000 -0700
@@ -78,10 +78,7 @@ struct symbol {
#define for_all_symbols(i, sym) for (i = 0; i < 257; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER)
-#define SYMBOL_YES 0x0001
-#define SYMBOL_MOD 0x0002
-#define SYMBOL_NO 0x0004
-#define SYMBOL_CONST 0x0007
+#define SYMBOL_CONST 0x0001
#define SYMBOL_CHECK 0x0008
#define SYMBOL_CHOICE 0x0010
#define SYMBOL_CHOICEVAL 0x0020
diff -puN scripts/kconfig/gconf.c~kconfig-remove-symbol_yesmodno scripts/kconfig/gconf.c
--- devel/scripts/kconfig/gconf.c~kconfig-remove-symbol_yesmodno 2006-04-09 23:44:33.000000000 -0700
+++ devel-akpm/scripts/kconfig/gconf.c 2006-04-09 23:44:33.000000000 -0700
@@ -114,12 +114,6 @@ const char *dbg_print_flags(int val)
bzero(buf, 256);
- if (val & SYMBOL_YES)
- strcat(buf, "yes/");
- if (val & SYMBOL_MOD)
- strcat(buf, "mod/");
- if (val & SYMBOL_NO)
- strcat(buf, "no/");
if (val & SYMBOL_CONST)
strcat(buf, "const/");
if (val & SYMBOL_CHECK)
diff -puN scripts/kconfig/symbol.c~kconfig-remove-symbol_yesmodno scripts/kconfig/symbol.c
--- devel/scripts/kconfig/symbol.c~kconfig-remove-symbol_yesmodno 2006-04-09 23:44:33.000000000 -0700
+++ devel-akpm/scripts/kconfig/symbol.c 2006-04-09 23:44:33.000000000 -0700
@@ -15,15 +15,15 @@
struct symbol symbol_yes = {
.name = "y",
.curr = { "y", yes },
- .flags = SYMBOL_YES|SYMBOL_VALID,
+ .flags = SYMBOL_CONST|SYMBOL_VALID,
}, symbol_mod = {
.name = "m",
.curr = { "m", mod },
- .flags = SYMBOL_MOD|SYMBOL_VALID,
+ .flags = SYMBOL_CONST|SYMBOL_VALID,
}, symbol_no = {
.name = "n",
.curr = { "n", no },
- .flags = SYMBOL_NO|SYMBOL_VALID,
+ .flags = SYMBOL_CONST|SYMBOL_VALID,
}, symbol_empty = {
.name = "",
.curr = { "", no },
_
Patches currently in -mm which might be from zippel@xxxxxxxxxxxxxx are
git-kbuild.patch
m68k-completely-initialize-hw_regs_t-in-ide_setup_ports.patch
m68k-atyfb_base-compile-fix-for-config_pci=n.patch
m68k-cleanup-unistdh.patch
m68k-remove-some-unused-definitions-in-zorroh.patch
m68k-use-c99-initializer.patch
m68k-print-correct-stack-trace.patch
m68k-restore-amikbd-compatibility-with-24.patch
m68k-extra-delay.patch
m68k-use-proper-defines-for-zone-initialization.patch
m68k-adjust-to-changed-hardirq_mask.patch
m68k-m68k-mac-via2-fixes-and-cleanups.patch
m68k-clean-up-uaccessh.patch
fix-incorrect-sa_onstack-behaviour-for-64-bit-processes.patch
adjust-handle_irr_event-return-type.patch
time-use-clocksource-abstraction-for-ntp-adjustments-optimize-out-some-mults-since-gcc-cant-avoid-them.patch
time-rename-clocksource-functions.patch
fix-rt-mutex-defaults-and-dependencies.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
