Re: [-mm PATCH] drivers/char/speakup/synthlist.h - Fix warnings with -Wundef
Nick Sillik wrote: Alexey Dobriyan wrote: -#define CFG_TEST(name) (name) +#define CFG_TEST(name) defined(name) No. Just remove this obfuscating macro. Agreed, here is the fixed patch Signed-Off-By: Nick Sillik <[EMAIL PROTECTED]> No here it really is... (sorry) Signed-Off-By: Nick Sillik <[EMAIL PROTECTED]> diff -urN -X linux-2.6.13-rc6-mm2/Documentation/dontdiff linux-2.6.13-rc6-mm2/drivers/char/speakup/synthlist.h linux-2.6.13-rc6-mm2-patched/drivers/char/speakup/synthlist.h --- linux-2.6.13-rc6-mm2/drivers/char/speakup/synthlist.h 2005-08-24 01:37:59.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/drivers/char/speakup/synthlist.h 2005-08-24 01:37:37.0 -0400 @@ -2,53 +2,51 @@ #if defined(PASS2) /* table of built in synths */ #define SYNTH_DECL(who) _##who, -#define CFG_TEST(name) (name) #else /* declare extern built in synths */ #define SYNTH_DECL(who) extern struct spk_synth synth_##who; #define PASS2 -#define CFG_TEST(name) (name) #endif -#if CFG_TEST(CONFIG_SPEAKUP_ACNTPC) +#ifdef CONFIG_SPEAKUP_ACNTPC SYNTH_DECL(acntpc) #endif -#if CFG_TEST(CONFIG_SPEAKUP_ACNTSA) +#ifdef CONFIG_SPEAKUP_ACNTSA SYNTH_DECL(acntsa) #endif -#if CFG_TEST(CONFIG_SPEAKUP_APOLLO) +#ifdef CONFIG_SPEAKUP_APOLLO SYNTH_DECL(apollo) #endif -#if CFG_TEST(CONFIG_SPEAKUP_AUDPTR) +#ifdef CONFIG_SPEAKUP_AUDPTR SYNTH_DECL(audptr) #endif -#if CFG_TEST(CONFIG_SPEAKUP_BNS) +#ifdef CONFIG_SPEAKUP_BNS SYNTH_DECL(bns) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DECEXT) +#ifdef CONFIG_SPEAKUP_DECEXT SYNTH_DECL(decext) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DECTLK) +#ifdef CONFIG_SPEAKUP_DECTLK SYNTH_DECL(dectlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DTLK) +#ifdef CONFIG_SPEAKUP_DTLK SYNTH_DECL(dtlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_KEYPC) +#ifdef CONFIG_SPEAKUP_KEYPC SYNTH_DECL(keypc) #endif -#if CFG_TEST(CONFIG_SPEAKUP_LTLK) +#ifdef CONFIG_SPEAKUP_LTLK SYNTH_DECL(ltlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_SFTSYN) +#ifdef CONFIG_SPEAKUP_SFTSYN SYNTH_DECL(sftsyn) #endif -#if CFG_TEST(CONFIG_SPEAKUP_SPKOUT) +#ifdef CONFIG_SPEAKUP_SPKOUT SYNTH_DECL(spkout) #endif -#if CFG_TEST(CONFIG_SPEAKUP_TXPRT) +#ifdef CONFIG_SPEAKUP_TXPRT SYNTH_DECL(txprt) #endif #undef SYNTH_DECL -#undef CFG_TEST +#undef
Re: [-mm PATCH] drivers/char/speakup/synthlist.h - Fix warnings with -Wundef
Alexey Dobriyan wrote: -#define CFG_TEST(name) (name) +#define CFG_TEST(name) defined(name) No. Just remove this obfuscating macro. Agreed, here is the fixed patch Signed-Off-By: Nick Sillik <[EMAIL PROTECTED]> - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[-mm PATCH] fix -Wundef warnings in reiser4 code
This patch fixes the following wundef errors in fs/reiser4/* . Signed-off-by: Nick Sillik <[EMAIL PROTECTED]> diff -urN linux-2.6.13-rc6-mm2/fs/reiser4/plugin/cryptcompress.c linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/cryptcompress.c --- linux-2.6.13-rc6-mm2/fs/reiser4/plugin/cryptcompress.c 2005-08-23 15:51:47.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/cryptcompress.c 2005-08-23 16:08:32.0 -0400 @@ -597,7 +597,7 @@ return 0; } -#if REISER4_TRACE +#ifdef REISER4_TRACE #define reserve4cluster(inode, clust, msg)__reserve4cluster(inode, clust) #else #define reserve4cluster(inode, clust, msg)__reserve4cluster(inode, clust) diff -urN linux-2.6.13-rc6-mm2/fs/reiser4/plugin/dir/hashed_dir.c linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/dir/hashed_dir.c --- linux-2.6.13-rc6-mm2/fs/reiser4/plugin/dir/hashed_dir.c 2005-08-23 15:51:47.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/dir/hashed_dir.c 2005-08-23 16:09:27.0 -0400 @@ -1206,7 +1206,7 @@ reiser4_key *key; /* how many entries with duplicate key was scanned so far. */ int non_uniq; -#if REISER4_USE_COLLISION_LIMIT || REISER4_STATS +#if defined(REISER4_USE_COLLISION_LIMIT) || defined(REISER4_STATS) /* scan limit */ int max_non_uniq; #endif diff -urN linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/cde.c linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/cde.c --- linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/cde.c 2005-08-23 15:51:47.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/cde.c 2005-08-23 16:04:25.0 -0400 @@ -463,7 +463,7 @@ (extract_dir_id_from_key(_key) == extract_dir_id_from_key(key)); } -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT /* ->print() method for this item plugin. */ reiser4_internal void print_cde(const char *prefix /* prefix to print */ , diff -urN linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/ctail.c linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/ctail.c --- linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/ctail.c 2005-08-23 15:51:47.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/ctail.c 2005-08-23 16:04:50.0 -0400 @@ -195,7 +195,7 @@ return data->length; } -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT /* ->print() method for this item plugin. */ reiser4_internal void print_ctail(const char *prefix /* prefix to print */ , diff -urN linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/internal.c linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/internal.c --- linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/internal.c 2005-08-23 15:51:47.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/internal.c 2005-08-23 16:04:40.0 -0400 @@ -210,7 +210,7 @@ return 0; } -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT /* debugging aid: print human readable information about internal item at @coord */ reiser4_internal void diff -urN linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/item.c linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/item.c --- linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/item.c 2005-08-23 15:51:47.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/item.c 2005-08-23 16:05:45.0 -0400 @@ -350,7 +350,7 @@ .max_unit_key = NULL, .estimate = NULL, .item_data_by_flow = NULL, -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT .print = print_sd, .item_stat = item_stat_static_sd, #endif @@ -403,7 +403,7 @@ .max_unit_key = NULL, .estimate = NULL, .item_data_by_flow = NULL, -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT .print = print_de, .item_stat = NULL, #endif @@ -460,7 +460,7 @@ .max_unit_key = unit_key_cde, .estimate = estimate_cde, .item_data_by_flow = NULL -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT , .print = print_cde, .item_stat = NULL #endif @@ -517,7 +517,7 @@ .max_unit_key = NULL, .estimate = NULL, .item_data_by_flow = NULL -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT , .print = print_internal, .item_stat = NULL #endif @@ -678,7 +678,7 @@ .max_unit_key = unit_key_tail, .estimate = estimate_ctail, .item_data_by_flow = NULL -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT , .print = print_ctail, .item_stat = NULL #endif @@ -738,7 +738,7 @@ .max_unit_key = NULL, .estimate = NULL, .item_data_by_flow = NULL, -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT .print = NULL, .item_stat = NULL, #endif diff -urN linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/sde.c linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/sde.c --- linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/sde.c 2005-08-23 15:51:47.0 -0400 +++ linux
[-mm PATCH] drivers/char/speakup/synthlist.h - Fix warnings with -Wundef
This patch fixes (it should) the following warnings generated with -Wundef in the file drivers/char/speakup/synthlist.h drivers/char/speakup/synthlist.h:13:35: warning: "CONFIG_SPEAKUP_ACNTPC" is not defined drivers/char/speakup/synthlist.h:16:35: warning: "CONFIG_SPEAKUP_ACNTSA" is not defined drivers/char/speakup/synthlist.h:19:35: warning: "CONFIG_SPEAKUP_APOLLO" is not defined drivers/char/speakup/synthlist.h:22:35: warning: "CONFIG_SPEAKUP_AUDPTR" is not defined drivers/char/speakup/synthlist.h:25:32: warning: "CONFIG_SPEAKUP_BNS" is not defined drivers/char/speakup/synthlist.h:28:35: warning: "CONFIG_SPEAKUP_DECEXT" is not defined drivers/char/speakup/synthlist.h:31:35: warning: "CONFIG_SPEAKUP_DECTLK" is not defined drivers/char/speakup/synthlist.h:34:33: warning: "CONFIG_SPEAKUP_DTLK" is not defined drivers/char/speakup/synthlist.h:37:34: warning: "CONFIG_SPEAKUP_KEYPC" is not defined drivers/char/speakup/synthlist.h:40:33: warning: "CONFIG_SPEAKUP_LTLK" is not defined drivers/char/speakup/synthlist.h:43:35: warning: "CONFIG_SPEAKUP_SFTSYN" is not defined drivers/char/speakup/synthlist.h:46:35: warning: "CONFIG_SPEAKUP_SPKOUT" is not defined drivers/char/speakup/synthlist.h:49:34: warning: "CONFIG_SPEAKUP_TXPRT" is not defined drivers/char/speakup/synthlist.h:13:35: warning: "CONFIG_SPEAKUP_ACNTPC" is not defined drivers/char/speakup/synthlist.h:16:35: warning: "CONFIG_SPEAKUP_ACNTSA" is not defined drivers/char/speakup/synthlist.h:19:35: warning: "CONFIG_SPEAKUP_APOLLO" is not defined drivers/char/speakup/synthlist.h:22:35: warning: "CONFIG_SPEAKUP_AUDPTR" is not defined drivers/char/speakup/synthlist.h:25:32: warning: "CONFIG_SPEAKUP_BNS" is not defined drivers/char/speakup/synthlist.h:28:35: warning: "CONFIG_SPEAKUP_DECEXT" is not defined drivers/char/speakup/synthlist.h:31:35: warning: "CONFIG_SPEAKUP_DECTLK" is not defined drivers/char/speakup/synthlist.h:34:33: warning: "CONFIG_SPEAKUP_DTLK" is not defined drivers/char/speakup/synthlist.h:37:34: warning: "CONFIG_SPEAKUP_KEYPC" is not defined drivers/char/speakup/synthlist.h:40:33: warning: "CONFIG_SPEAKUP_LTLK" is not defined drivers/char/speakup/synthlist.h:43:35: warning: "CONFIG_SPEAKUP_SFTSYN" is not defined drivers/char/speakup/synthlist.h:46:35: warning: "CONFIG_SPEAKUP_SPKOUT" is not defined drivers/char/speakup/synthlist.h:49:34: warning: "CONFIG_SPEAKUP_TXPRT" is not defined drivers/char/speakup/synthlist.h:13:35: warning: "CONFIG_SPEAKUP_ACNTPC" is not defined drivers/char/speakup/synthlist.h:16:35: warning: "CONFIG_SPEAKUP_ACNTSA" is not defined drivers/char/speakup/synthlist.h:19:35: warning: "CONFIG_SPEAKUP_APOLLO" is not defined drivers/char/speakup/synthlist.h:22:35: warning: "CONFIG_SPEAKUP_AUDPTR" is not defined drivers/char/speakup/synthlist.h:25:32: warning: "CONFIG_SPEAKUP_BNS" is not defined drivers/char/speakup/synthlist.h:28:35: warning: "CONFIG_SPEAKUP_DECEXT" is not defined drivers/char/speakup/synthlist.h:31:35: warning: "CONFIG_SPEAKUP_DECTLK" is not defined drivers/char/speakup/synthlist.h:34:33: warning: "CONFIG_SPEAKUP_DTLK" is not defined drivers/char/speakup/synthlist.h:37:34: warning: "CONFIG_SPEAKUP_KEYPC" is not defined drivers/char/speakup/synthlist.h:40:33: warning: "CONFIG_SPEAKUP_LTLK" is not defined drivers/char/speakup/synthlist.h:43:35: warning: "CONFIG_SPEAKUP_SFTSYN" is not defined drivers/char/speakup/synthlist.h:46:35: warning: "CONFIG_SPEAKUP_SPKOUT" is not defined drivers/char/speakup/synthlist.h:49:34: warning: "CONFIG_SPEAKUP_TXPRT" is not defined drivers/char/speakup/synthlist.h:13:35: warning: "CONFIG_SPEAKUP_ACNTPC" is not defined drivers/char/speakup/synthlist.h:16:35: warning: "CONFIG_SPEAKUP_ACNTSA" is not defined drivers/char/speakup/synthlist.h:19:35: warning: "CONFIG_SPEAKUP_APOLLO" is not defined drivers/char/speakup/synthlist.h:22:35: warning: "CONFIG_SPEAKUP_AUDPTR" is not defined drivers/char/speakup/synthlist.h:25:32: warning: "CONFIG_SPEAKUP_BNS" is not defined drivers/char/speakup/synthlist.h:28:35: warning: "CONFIG_SPEAKUP_DECEXT" is not defined drivers/char/speakup/synthlist.h:31:35: warning: "CONFIG_SPEAKUP_DECTLK" is not defined drivers/char/speakup/synthlist.h:34:33: warning: "CONFIG_SPEAKUP_DTLK" is not defined drivers/char/speakup/synthlist.h:37:34: warning: "CONFIG_SPEAKUP_KEYPC" is not defined drivers/char/speakup/synthlist.h:40:33: warning: "CONFIG_SPEAKUP_LTLK" is not defined drivers/char/speakup/synthlist.h:43:35: warning: &quo
[-mm PATCH] drivers/char/speakup/synthlist.h - Fix warnings with -Wundef
This patch fixes (it should) the following warnings generated with -Wundef in the file drivers/char/speakup/synthlist.h drivers/char/speakup/synthlist.h:13:35: warning: CONFIG_SPEAKUP_ACNTPC is not defined drivers/char/speakup/synthlist.h:16:35: warning: CONFIG_SPEAKUP_ACNTSA is not defined drivers/char/speakup/synthlist.h:19:35: warning: CONFIG_SPEAKUP_APOLLO is not defined drivers/char/speakup/synthlist.h:22:35: warning: CONFIG_SPEAKUP_AUDPTR is not defined drivers/char/speakup/synthlist.h:25:32: warning: CONFIG_SPEAKUP_BNS is not defined drivers/char/speakup/synthlist.h:28:35: warning: CONFIG_SPEAKUP_DECEXT is not defined drivers/char/speakup/synthlist.h:31:35: warning: CONFIG_SPEAKUP_DECTLK is not defined drivers/char/speakup/synthlist.h:34:33: warning: CONFIG_SPEAKUP_DTLK is not defined drivers/char/speakup/synthlist.h:37:34: warning: CONFIG_SPEAKUP_KEYPC is not defined drivers/char/speakup/synthlist.h:40:33: warning: CONFIG_SPEAKUP_LTLK is not defined drivers/char/speakup/synthlist.h:43:35: warning: CONFIG_SPEAKUP_SFTSYN is not defined drivers/char/speakup/synthlist.h:46:35: warning: CONFIG_SPEAKUP_SPKOUT is not defined drivers/char/speakup/synthlist.h:49:34: warning: CONFIG_SPEAKUP_TXPRT is not defined drivers/char/speakup/synthlist.h:13:35: warning: CONFIG_SPEAKUP_ACNTPC is not defined drivers/char/speakup/synthlist.h:16:35: warning: CONFIG_SPEAKUP_ACNTSA is not defined drivers/char/speakup/synthlist.h:19:35: warning: CONFIG_SPEAKUP_APOLLO is not defined drivers/char/speakup/synthlist.h:22:35: warning: CONFIG_SPEAKUP_AUDPTR is not defined drivers/char/speakup/synthlist.h:25:32: warning: CONFIG_SPEAKUP_BNS is not defined drivers/char/speakup/synthlist.h:28:35: warning: CONFIG_SPEAKUP_DECEXT is not defined drivers/char/speakup/synthlist.h:31:35: warning: CONFIG_SPEAKUP_DECTLK is not defined drivers/char/speakup/synthlist.h:34:33: warning: CONFIG_SPEAKUP_DTLK is not defined drivers/char/speakup/synthlist.h:37:34: warning: CONFIG_SPEAKUP_KEYPC is not defined drivers/char/speakup/synthlist.h:40:33: warning: CONFIG_SPEAKUP_LTLK is not defined drivers/char/speakup/synthlist.h:43:35: warning: CONFIG_SPEAKUP_SFTSYN is not defined drivers/char/speakup/synthlist.h:46:35: warning: CONFIG_SPEAKUP_SPKOUT is not defined drivers/char/speakup/synthlist.h:49:34: warning: CONFIG_SPEAKUP_TXPRT is not defined drivers/char/speakup/synthlist.h:13:35: warning: CONFIG_SPEAKUP_ACNTPC is not defined drivers/char/speakup/synthlist.h:16:35: warning: CONFIG_SPEAKUP_ACNTSA is not defined drivers/char/speakup/synthlist.h:19:35: warning: CONFIG_SPEAKUP_APOLLO is not defined drivers/char/speakup/synthlist.h:22:35: warning: CONFIG_SPEAKUP_AUDPTR is not defined drivers/char/speakup/synthlist.h:25:32: warning: CONFIG_SPEAKUP_BNS is not defined drivers/char/speakup/synthlist.h:28:35: warning: CONFIG_SPEAKUP_DECEXT is not defined drivers/char/speakup/synthlist.h:31:35: warning: CONFIG_SPEAKUP_DECTLK is not defined drivers/char/speakup/synthlist.h:34:33: warning: CONFIG_SPEAKUP_DTLK is not defined drivers/char/speakup/synthlist.h:37:34: warning: CONFIG_SPEAKUP_KEYPC is not defined drivers/char/speakup/synthlist.h:40:33: warning: CONFIG_SPEAKUP_LTLK is not defined drivers/char/speakup/synthlist.h:43:35: warning: CONFIG_SPEAKUP_SFTSYN is not defined drivers/char/speakup/synthlist.h:46:35: warning: CONFIG_SPEAKUP_SPKOUT is not defined drivers/char/speakup/synthlist.h:49:34: warning: CONFIG_SPEAKUP_TXPRT is not defined drivers/char/speakup/synthlist.h:13:35: warning: CONFIG_SPEAKUP_ACNTPC is not defined drivers/char/speakup/synthlist.h:16:35: warning: CONFIG_SPEAKUP_ACNTSA is not defined drivers/char/speakup/synthlist.h:19:35: warning: CONFIG_SPEAKUP_APOLLO is not defined drivers/char/speakup/synthlist.h:22:35: warning: CONFIG_SPEAKUP_AUDPTR is not defined drivers/char/speakup/synthlist.h:25:32: warning: CONFIG_SPEAKUP_BNS is not defined drivers/char/speakup/synthlist.h:28:35: warning: CONFIG_SPEAKUP_DECEXT is not defined drivers/char/speakup/synthlist.h:31:35: warning: CONFIG_SPEAKUP_DECTLK is not defined drivers/char/speakup/synthlist.h:34:33: warning: CONFIG_SPEAKUP_DTLK is not defined drivers/char/speakup/synthlist.h:37:34: warning: CONFIG_SPEAKUP_KEYPC is not defined drivers/char/speakup/synthlist.h:40:33: warning: CONFIG_SPEAKUP_LTLK is not defined drivers/char/speakup/synthlist.h:43:35: warning: CONFIG_SPEAKUP_SFTSYN is not defined drivers/char/speakup/synthlist.h:46:35: warning: CONFIG_SPEAKUP_SPKOUT is not defined drivers/char/speakup/synthlist.h:49:34: warning: CONFIG_SPEAKUP_TXPRT is not defined Signed-off-by: Nick Sillik [EMAIL PROTECTED] diff -urN linux-2.6.13-rc6-mm2/drivers/char/speakup/synthlist.h linux-2.6.13-rc6-mm2-patched/drivers/char/speakup/synthlist.h --- linux-2.6.13-rc6-mm2/drivers/char/speakup/synthlist.h 2005-08-23 15:51:31.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/drivers/char/speakup/synthlist.h 2005-08-23 15:57:30.0 -0400 @@ -7,7 +7,7
[-mm PATCH] fix -Wundef warnings in reiser4 code
This patch fixes the following wundef errors in fs/reiser4/* . Signed-off-by: Nick Sillik [EMAIL PROTECTED] diff -urN linux-2.6.13-rc6-mm2/fs/reiser4/plugin/cryptcompress.c linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/cryptcompress.c --- linux-2.6.13-rc6-mm2/fs/reiser4/plugin/cryptcompress.c 2005-08-23 15:51:47.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/cryptcompress.c 2005-08-23 16:08:32.0 -0400 @@ -597,7 +597,7 @@ return 0; } -#if REISER4_TRACE +#ifdef REISER4_TRACE #define reserve4cluster(inode, clust, msg)__reserve4cluster(inode, clust) #else #define reserve4cluster(inode, clust, msg)__reserve4cluster(inode, clust) diff -urN linux-2.6.13-rc6-mm2/fs/reiser4/plugin/dir/hashed_dir.c linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/dir/hashed_dir.c --- linux-2.6.13-rc6-mm2/fs/reiser4/plugin/dir/hashed_dir.c 2005-08-23 15:51:47.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/dir/hashed_dir.c 2005-08-23 16:09:27.0 -0400 @@ -1206,7 +1206,7 @@ reiser4_key *key; /* how many entries with duplicate key was scanned so far. */ int non_uniq; -#if REISER4_USE_COLLISION_LIMIT || REISER4_STATS +#if defined(REISER4_USE_COLLISION_LIMIT) || defined(REISER4_STATS) /* scan limit */ int max_non_uniq; #endif diff -urN linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/cde.c linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/cde.c --- linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/cde.c 2005-08-23 15:51:47.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/cde.c 2005-08-23 16:04:25.0 -0400 @@ -463,7 +463,7 @@ (extract_dir_id_from_key(item_key) == extract_dir_id_from_key(key)); } -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT /* -print() method for this item plugin. */ reiser4_internal void print_cde(const char *prefix /* prefix to print */ , diff -urN linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/ctail.c linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/ctail.c --- linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/ctail.c 2005-08-23 15:51:47.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/ctail.c 2005-08-23 16:04:50.0 -0400 @@ -195,7 +195,7 @@ return data-length; } -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT /* -print() method for this item plugin. */ reiser4_internal void print_ctail(const char *prefix /* prefix to print */ , diff -urN linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/internal.c linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/internal.c --- linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/internal.c 2005-08-23 15:51:47.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/internal.c 2005-08-23 16:04:40.0 -0400 @@ -210,7 +210,7 @@ return 0; } -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT /* debugging aid: print human readable information about internal item at @coord */ reiser4_internal void diff -urN linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/item.c linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/item.c --- linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/item.c 2005-08-23 15:51:47.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/item.c 2005-08-23 16:05:45.0 -0400 @@ -350,7 +350,7 @@ .max_unit_key = NULL, .estimate = NULL, .item_data_by_flow = NULL, -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT .print = print_sd, .item_stat = item_stat_static_sd, #endif @@ -403,7 +403,7 @@ .max_unit_key = NULL, .estimate = NULL, .item_data_by_flow = NULL, -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT .print = print_de, .item_stat = NULL, #endif @@ -460,7 +460,7 @@ .max_unit_key = unit_key_cde, .estimate = estimate_cde, .item_data_by_flow = NULL -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT , .print = print_cde, .item_stat = NULL #endif @@ -517,7 +517,7 @@ .max_unit_key = NULL, .estimate = NULL, .item_data_by_flow = NULL -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT , .print = print_internal, .item_stat = NULL #endif @@ -678,7 +678,7 @@ .max_unit_key = unit_key_tail, .estimate = estimate_ctail, .item_data_by_flow = NULL -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT , .print = print_ctail, .item_stat = NULL #endif @@ -738,7 +738,7 @@ .max_unit_key = NULL, .estimate = NULL, .item_data_by_flow = NULL, -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT .print = NULL, .item_stat = NULL, #endif diff -urN linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/sde.c linux-2.6.13-rc6-mm2-patched/fs/reiser4/plugin/item/sde.c --- linux-2.6.13-rc6-mm2/fs/reiser4/plugin/item/sde.c 2005-08-23 15:51:47.0 -0400 +++ linux-2.6.13-rc6-mm2
Re: [-mm PATCH] drivers/char/speakup/synthlist.h - Fix warnings with -Wundef
Alexey Dobriyan wrote: -#define CFG_TEST(name) (name) +#define CFG_TEST(name) defined(name) No. Just remove this obfuscating macro. Agreed, here is the fixed patch Signed-Off-By: Nick Sillik [EMAIL PROTECTED] - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [-mm PATCH] drivers/char/speakup/synthlist.h - Fix warnings with -Wundef
Nick Sillik wrote: Alexey Dobriyan wrote: -#define CFG_TEST(name) (name) +#define CFG_TEST(name) defined(name) No. Just remove this obfuscating macro. Agreed, here is the fixed patch Signed-Off-By: Nick Sillik [EMAIL PROTECTED] No here it really is... (sorry) Signed-Off-By: Nick Sillik [EMAIL PROTECTED] diff -urN -X linux-2.6.13-rc6-mm2/Documentation/dontdiff linux-2.6.13-rc6-mm2/drivers/char/speakup/synthlist.h linux-2.6.13-rc6-mm2-patched/drivers/char/speakup/synthlist.h --- linux-2.6.13-rc6-mm2/drivers/char/speakup/synthlist.h 2005-08-24 01:37:59.0 -0400 +++ linux-2.6.13-rc6-mm2-patched/drivers/char/speakup/synthlist.h 2005-08-24 01:37:37.0 -0400 @@ -2,53 +2,51 @@ #if defined(PASS2) /* table of built in synths */ #define SYNTH_DECL(who) synth_##who, -#define CFG_TEST(name) (name) #else /* declare extern built in synths */ #define SYNTH_DECL(who) extern struct spk_synth synth_##who; #define PASS2 -#define CFG_TEST(name) (name) #endif -#if CFG_TEST(CONFIG_SPEAKUP_ACNTPC) +#ifdef CONFIG_SPEAKUP_ACNTPC SYNTH_DECL(acntpc) #endif -#if CFG_TEST(CONFIG_SPEAKUP_ACNTSA) +#ifdef CONFIG_SPEAKUP_ACNTSA SYNTH_DECL(acntsa) #endif -#if CFG_TEST(CONFIG_SPEAKUP_APOLLO) +#ifdef CONFIG_SPEAKUP_APOLLO SYNTH_DECL(apollo) #endif -#if CFG_TEST(CONFIG_SPEAKUP_AUDPTR) +#ifdef CONFIG_SPEAKUP_AUDPTR SYNTH_DECL(audptr) #endif -#if CFG_TEST(CONFIG_SPEAKUP_BNS) +#ifdef CONFIG_SPEAKUP_BNS SYNTH_DECL(bns) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DECEXT) +#ifdef CONFIG_SPEAKUP_DECEXT SYNTH_DECL(decext) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DECTLK) +#ifdef CONFIG_SPEAKUP_DECTLK SYNTH_DECL(dectlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DTLK) +#ifdef CONFIG_SPEAKUP_DTLK SYNTH_DECL(dtlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_KEYPC) +#ifdef CONFIG_SPEAKUP_KEYPC SYNTH_DECL(keypc) #endif -#if CFG_TEST(CONFIG_SPEAKUP_LTLK) +#ifdef CONFIG_SPEAKUP_LTLK SYNTH_DECL(ltlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_SFTSYN) +#ifdef CONFIG_SPEAKUP_SFTSYN SYNTH_DECL(sftsyn) #endif -#if CFG_TEST(CONFIG_SPEAKUP_SPKOUT) +#ifdef CONFIG_SPEAKUP_SPKOUT SYNTH_DECL(spkout) #endif -#if CFG_TEST(CONFIG_SPEAKUP_TXPRT) +#ifdef CONFIG_SPEAKUP_TXPRT SYNTH_DECL(txprt) #endif #undef SYNTH_DECL -#undef CFG_TEST +#undef
Changes to kernel.org website
I think the following should be changed on the kernel.org web site? In "New to Linux?" Section Note, however, that most distributions are very large, so unless you have a _very_fast_Internet_link_ you may want to save yourself some hassle and purchase a CD-ROM with a distribution; such CD-ROMs are available from a number of vendors. I don't think that "very fast internet link is a good way to describe what is meant? Maybe we should tell them how large the distrubution are (650mb and more) or instead we could say say that we recommend above a certain bandwidth. The confusion is as follows: I have a good cable connection (~5mb/s) but I wouldn't consider this "very fast" because I know of much faster connections. Would this scare me away from downloading Linux or even using it at all? Probably. Just thought it's best to be clear. Nick Sillik [EMAIL PROTECTED] - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Changes to kernel.org website
I think the following should be changed on the kernel.org web site? In New to Linux? Section Note, however, that most distributions are very large, so unless you have a _very_fast_Internet_link_ you may want to save yourself some hassle and purchase a CD-ROM with a distribution; such CD-ROMs are available from a number of vendors. I don't think that very fast internet link is a good way to describe what is meant? Maybe we should tell them how large the distrubution are (650mb and more) or instead we could say say that we recommend above a certain bandwidth. The confusion is as follows: I have a good cable connection (~5mb/s) but I wouldn't consider this very fast because I know of much faster connections. Would this scare me away from downloading Linux or even using it at all? Probably. Just thought it's best to be clear. Nick Sillik [EMAIL PROTECTED] - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: About Linux Device Drivers
Alejandro Cabrera wrote: Hi I'm new in the list and I'm interested in lkm, I have the Linux Device Drivers 2ed. And I use the 2.6.8-2 kernel, and the modules that I create I don't test in my workstation. Exist any way to run the examples exposed in this book over my kernel or I need the LDD 3ed thx for your patient Alejandro - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ The second edition of Linux Device Drivers is specific to 2.4.x (and possibly 2.2.x) kernels. The third edition will work with the 2.6 kernel. Luckily it is also released under Creative Commons. Take a look at the PDFs here: http://lwn.net/Kernel/LDD3/ Enjoy! Nick Sillik [EMAIL PROTECTED] - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: About Linux Device Drivers
Alejandro Cabrera wrote: Hi I'm new in the list and I'm interested in lkm, I have the Linux Device Drivers 2ed. And I use the 2.6.8-2 kernel, and the modules that I create I don't test in my workstation. Exist any way to run the examples exposed in this book over my kernel or I need the LDD 3ed thx for your patient Alejandro - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ The second edition of Linux Device Drivers is specific to 2.4.x (and possibly 2.2.x) kernels. The third edition will work with the 2.6 kernel. Luckily it is also released under Creative Commons. Take a look at the PDFs here: http://lwn.net/Kernel/LDD3/ Enjoy! Nick Sillik [EMAIL PROTECTED] - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: **SPAM** [PATCH 3/3] usb gadget driver for MQ11xx graphics chip
Michael Krufky wrote: [EMAIL PROTECTED] wrote: The email subject. "Re: **SPAM** [PATCH 3/3] usb gadget driver for MQ11xx graphics chip" ... Was that an accident, or did my email server take over my headers? (i'm not running any spam filering software or anything) If this happened on your end, you might want to re-send that one... Some email clients automatically filter messages containing "**SPAM**" in subject line. Nope, isn't on your end. I'm seeing them too. I thought my mailserver had gone off its rocker. I'm glad to know that others are seeing this. Nick Sillik [EMAIL PROTECTED] - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: **SPAM** [PATCH 3/3] usb gadget driver for MQ11xx graphics chip
Michael Krufky wrote: [EMAIL PROTECTED] wrote: The email subject. Re: **SPAM** [PATCH 3/3] usb gadget driver for MQ11xx graphics chip ... Was that an accident, or did my email server take over my headers? (i'm not running any spam filering software or anything) If this happened on your end, you might want to re-send that one... Some email clients automatically filter messages containing **SPAM** in subject line. Nope, isn't on your end. I'm seeing them too. I thought my mailserver had gone off its rocker. I'm glad to know that others are seeing this. Nick Sillik [EMAIL PROTECTED] - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[Patch 2.6.13-rc3-mm3]fs/reiser4/plugin/item/static_stat.c fix -Wundef errors in two files
This fixes -Wundef errors in:
fs/reiser4/plugin/item/static_stat.c
Nick Sillik
[EMAIL PROTECTED]
Signed-off-by: Nick Sillik <[EMAIL PROTECTED]>
diff -urN a/fs/reiser4/plugin/item/static_stat.c
b/fs/reiser4/plugin/item/static_stat.c
--- a/fs/reiser4/plugin/item/static_stat.c 2005-07-28 17:36:09.0
-0400
+++ b/fs/reiser4/plugin/item/static_stat.c 2005-07-28 17:39:43.0
-0400
@@ -36,7 +36,7 @@
assert("nikita-617", *length >= 0);
}
-#if REISER4_DEBUG_OUTPUT
+#ifdef REISER4_DEBUG_OUTPUT
/* ->print() method of static sd item. Prints human readable information about
sd at @coord */
reiser4_internal void
@@ -415,7 +415,7 @@
return 0;
}
-#if REISER4_DEBUG_OUTPUT
+#ifdef REISER4_DEBUG_OUTPUT
static void
print_lw_sd(const char *prefix, char **area /* position in stat-data */ ,
int *len /* remaining length */ )
@@ -505,7 +505,7 @@
return 0;
}
-#if REISER4_DEBUG_OUTPUT
+#ifdef REISER4_DEBUG_OUTPUT
static void
print_unix_sd(const char *prefix, char **area /* position in stat-data */ ,
int *len /* remaining length */ )
@@ -569,7 +569,7 @@
return 0;
}
-#if REISER4_DEBUG_OUTPUT
+#ifdef REISER4_DEBUG_OUTPUT
static void
print_large_times_sd(const char *prefix, char **area /* position in stat-data
*/,
int *len /* remaining length */ )
@@ -674,7 +674,7 @@
return result;
}
-#if REISER4_DEBUG_OUTPUT
+#ifdef REISER4_DEBUG_OUTPUT
static void
print_symlink_sd(const char *prefix, char **area /* position in stat-data */ ,
int *len /* remaining length */ )
@@ -1049,7 +1049,7 @@
return result;
}
-#if REISER4_DEBUG_OUTPUT
+#ifdef REISER4_DEBUG_OUTPUT
static void
print_crypto_sd(const char *prefix, char **area /* position in stat-data */ ,
int *len /* remaining length */ )
@@ -1082,7 +1082,7 @@
.absent = NULL,
.save_len = save_len_lw_sd,
.save = save_lw_sd,
-#if REISER4_DEBUG_OUTPUT
+#ifdef REISER4_DEBUG_OUTPUT
.print = print_lw_sd,
#endif
.alignment = 8
@@ -1100,7 +1100,7 @@
.absent = absent_unix_sd,
.save_len = save_len_unix_sd,
.save = save_unix_sd,
-#if REISER4_DEBUG_OUTPUT
+#ifdef REISER4_DEBUG_OUTPUT
.print = print_unix_sd,
#endif
.alignment = 8
@@ -1118,7 +1118,7 @@
.absent = NULL,
.save_len = save_len_large_times_sd,
.save = save_large_times_sd,
-#if REISER4_DEBUG_OUTPUT
+#ifdef REISER4_DEBUG_OUTPUT
.print = print_large_times_sd,
#endif
.alignment = 8
@@ -1137,7 +1137,7 @@
.absent = NULL,
.save_len = save_len_symlink_sd,
.save = save_symlink_sd,
-#if REISER4_DEBUG_OUTPUT
+#ifdef REISER4_DEBUG_OUTPUT
.print = print_symlink_sd,
#endif
.alignment = 8
@@ -1155,7 +1155,7 @@
.absent = absent_plugin_sd,
.save_len = save_len_plugin_sd,
.save = save_plugin_sd,
-#if REISER4_DEBUG_OUTPUT
+#ifdef REISER4_DEBUG_OUTPUT
.print = NULL,
#endif
.alignment = 8
@@ -1173,7 +1173,7 @@
.absent = NULL,
.save_len = save_len_flags_sd,
.save = save_flags_sd,
-#if REISER4_DEBUG_OUTPUT
+#ifdef REISER4_DEBUG_OUTPUT
.print = NULL,
#endif
.alignment = 8
@@ -1191,7 +1191,7 @@
.absent = NULL,
.save_len = save_len_flags_sd,
.save = save_flags_sd,
-#if REISER4_DEBUG_OUTPUT
+#ifdef REISER4_DEBUG_OUTPUT
.print = NULL,
#endif
.alignment = 8
@@ -1210,7 +1210,7 @@
/* return IO_ERROR if smthng is wrong */
.save_len = save_len_crypto_sd,
.save = save_crypto_sd,
-#if REISER4_DEBUG_OUTPUT
+#ifdef REISER4_DEBUG_OUTPUT
.print = print_crypto_sd,
#endif
.alignment = 8
Re: 2.6.13-rc3-mm3
Andrew Morton wrote: Michael Thonke <[EMAIL PROTECTED]> wrote: Hello Andrew, I have some questions :-) Reiser4: why there are undefined functions implemented that currently not in use? This messages appeared first time in 2.6.13-rc3-mm2. Any why it complains even CONFIG_REISER4_DEBUG is not set? That's due to the code using `#if CONFIG_xx' instead of `#ifdef'. I previously posted a patch that got rid of one of these, find it attached again below. Signed-off-by: Nick Sillik <[EMAIL PROTECTED]> diff -urN a/fs/reiser4/plugin/node/node40.h b/fs/reiser4/plugin/node/node40.h --- a/fs/reiser4/plugin/node/node40.h 2005-07-27 18:14:04.0 -0400 +++ b/fs/reiser4/plugin/node/node40.h 2005-07-27 18:14:53.0 -0400 @@ -80,7 +80,7 @@ int check_node40(const znode * node, __u32 flags, const char **error); int parse_node40(znode * node); int init_node40(znode * node); -#if GUESS_EXISTS +#ifdef GUESS_EXISTS int guess_node40(const znode * node); #endif void change_item_size_node40(coord_t * coord, int by);
Re: 2.6.13-rc3-mm3
Andrew Morton wrote: Michael Thonke [EMAIL PROTECTED] wrote: Hello Andrew, I have some questions :-) Reiser4: why there are undefined functions implemented that currently not in use? This messages appeared first time in 2.6.13-rc3-mm2. Any why it complains even CONFIG_REISER4_DEBUG is not set? That's due to the code using `#if CONFIG_xx' instead of `#ifdef'. I previously posted a patch that got rid of one of these, find it attached again below. Signed-off-by: Nick Sillik [EMAIL PROTECTED] diff -urN a/fs/reiser4/plugin/node/node40.h b/fs/reiser4/plugin/node/node40.h --- a/fs/reiser4/plugin/node/node40.h 2005-07-27 18:14:04.0 -0400 +++ b/fs/reiser4/plugin/node/node40.h 2005-07-27 18:14:53.0 -0400 @@ -80,7 +80,7 @@ int check_node40(const znode * node, __u32 flags, const char **error); int parse_node40(znode * node); int init_node40(znode * node); -#if GUESS_EXISTS +#ifdef GUESS_EXISTS int guess_node40(const znode * node); #endif void change_item_size_node40(coord_t * coord, int by);
[Patch 2.6.13-rc3-mm3]fs/reiser4/plugin/item/static_stat.c fix -Wundef errors in two files
This fixes -Wundef errors in: fs/reiser4/plugin/item/static_stat.c Nick Sillik [EMAIL PROTECTED] Signed-off-by: Nick Sillik [EMAIL PROTECTED] diff -urN a/fs/reiser4/plugin/item/static_stat.c b/fs/reiser4/plugin/item/static_stat.c --- a/fs/reiser4/plugin/item/static_stat.c 2005-07-28 17:36:09.0 -0400 +++ b/fs/reiser4/plugin/item/static_stat.c 2005-07-28 17:39:43.0 -0400 @@ -36,7 +36,7 @@ assert(nikita-617, *length = 0); } -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT /* -print() method of static sd item. Prints human readable information about sd at @coord */ reiser4_internal void @@ -415,7 +415,7 @@ return 0; } -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT static void print_lw_sd(const char *prefix, char **area /* position in stat-data */ , int *len /* remaining length */ ) @@ -505,7 +505,7 @@ return 0; } -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT static void print_unix_sd(const char *prefix, char **area /* position in stat-data */ , int *len /* remaining length */ ) @@ -569,7 +569,7 @@ return 0; } -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT static void print_large_times_sd(const char *prefix, char **area /* position in stat-data */, int *len /* remaining length */ ) @@ -674,7 +674,7 @@ return result; } -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT static void print_symlink_sd(const char *prefix, char **area /* position in stat-data */ , int *len /* remaining length */ ) @@ -1049,7 +1049,7 @@ return result; } -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT static void print_crypto_sd(const char *prefix, char **area /* position in stat-data */ , int *len /* remaining length */ ) @@ -1082,7 +1082,7 @@ .absent = NULL, .save_len = save_len_lw_sd, .save = save_lw_sd, -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT .print = print_lw_sd, #endif .alignment = 8 @@ -1100,7 +1100,7 @@ .absent = absent_unix_sd, .save_len = save_len_unix_sd, .save = save_unix_sd, -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT .print = print_unix_sd, #endif .alignment = 8 @@ -1118,7 +1118,7 @@ .absent = NULL, .save_len = save_len_large_times_sd, .save = save_large_times_sd, -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT .print = print_large_times_sd, #endif .alignment = 8 @@ -1137,7 +1137,7 @@ .absent = NULL, .save_len = save_len_symlink_sd, .save = save_symlink_sd, -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT .print = print_symlink_sd, #endif .alignment = 8 @@ -1155,7 +1155,7 @@ .absent = absent_plugin_sd, .save_len = save_len_plugin_sd, .save = save_plugin_sd, -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT .print = NULL, #endif .alignment = 8 @@ -1173,7 +1173,7 @@ .absent = NULL, .save_len = save_len_flags_sd, .save = save_flags_sd, -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT .print = NULL, #endif .alignment = 8 @@ -1191,7 +1191,7 @@ .absent = NULL, .save_len = save_len_flags_sd, .save = save_flags_sd, -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT .print = NULL, #endif .alignment = 8 @@ -1210,7 +1210,7 @@ /* return IO_ERROR if smthng is wrong */ .save_len = save_len_crypto_sd, .save = save_crypto_sd, -#if REISER4_DEBUG_OUTPUT +#ifdef REISER4_DEBUG_OUTPUT .print = print_crypto_sd, #endif .alignment = 8
net/ipv4/netfilter/ip_conntrack_core.c fix -Wundef error
This fixes a single -Wundef error in the file net/ipv4/netfilter/ip_conntrack_core.c , Please Apply Nick Sillik [EMAIL PROTECTED] diff -urN a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c --- a/net/ipv4/netfilter/ip_conntrack_core.c2005-07-27 16:40:16.0 -0400 +++ b/net/ipv4/netfilter/ip_conntrack_core.c2005-07-27 16:41:00.0 -0400 @@ -723,7 +723,7 @@ /* Welcome, Mr. Bond. We've been expecting you... */ __set_bit(IPS_EXPECTED_BIT, >status); conntrack->master = exp->master; -#if CONFIG_IP_NF_CONNTRACK_MARK +#ifdef CONFIG_IP_NF_CONNTRACK_MARK conntrack->mark = exp->master->mark; #endif nf_conntrack_get(>master->ct_general);
[PATCH 2.6.13-rc3-mm2] fs/reiser4/plugin/node/node40.h fix warning with -Wundef
Fixes another -Wundef warning in ReiserFS code. Nick Sillik [EMAIL PROTECTED] Signed-off-by: Nick Sillik <[EMAIL PROTECTED]> diff -urN a/fs/reiser4/plugin/node/node40.h b/fs/reiser4/plugin/node/node40.h --- a/fs/reiser4/plugin/node/node40.h 2005-07-27 18:14:04.0 -0400 +++ b/fs/reiser4/plugin/node/node40.h 2005-07-27 18:14:53.0 -0400 @@ -80,7 +80,7 @@ int check_node40(const znode * node, __u32 flags, const char **error); int parse_node40(znode * node); int init_node40(znode * node); -#if GUESS_EXISTS +#ifdef GUESS_EXISTS int guess_node40(const znode * node); #endif void change_item_size_node40(coord_t * coord, int by);
Re: [PATCH 2.6.13-rc3-mm2]net/ipv4/netfilter/ip_conntrack_core.c fix -Wundef error
Apologies Signed-off-by: Nick Sillik <[EMAIL PROTECTED]> David S. Miller wrote: From: Nick Sillik <[EMAIL PROTECTED]> Date: Wed, 27 Jul 2005 16:49:59 -0400 Sorry for the resend and previously bad subject line. This fixes a single -Wundef error in the file net/ipv4/netfilter/ip_conntrack_core.c , Please supply a proper Signed-off-by: line with your patch. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff -urN a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c --- a/net/ipv4/netfilter/ip_conntrack_core.c2005-07-27 16:40:16.0 -0400 +++ b/net/ipv4/netfilter/ip_conntrack_core.c2005-07-27 16:41:00.0 -0400 @@ -723,7 +723,7 @@ /* Welcome, Mr. Bond. We've been expecting you... */ __set_bit(IPS_EXPECTED_BIT, >status); conntrack->master = exp->master; -#if CONFIG_IP_NF_CONNTRACK_MARK +#ifdef CONFIG_IP_NF_CONNTRACK_MARK conntrack->mark = exp->master->mark; #endif nf_conntrack_get(>master->ct_general);
Re: drivers/char/speakup/synthlist.h fix -Wundef errors
Nick Sillik wrote: This patch should fix a slew of -Wundef errors in the synthlist.h file used by the speakup driver. Nick Sillik [EMAIL PROTECTED] Or maybe we could just eliminate the CFG_TEST from the file all together This patch follows that avenue. diff -urN a/drivers/char/speakup/synthlist.h b/drivers/char/speakup/synthlist.h --- a/drivers/char/speakup/synthlist.h 2005-07-27 16:10:04.0 -0400 +++ b/drivers/char/speakup/synthlist.h 2005-07-27 16:24:02.0 -0400 @@ -7,46 +7,45 @@ /* declare extern built in synths */ #define SYNTH_DECL(who) extern struct spk_synth synth_##who; #define PASS2 -#define CFG_TEST(name) (name) #endif -#if CFG_TEST(CONFIG_SPEAKUP_ACNTPC) +#ifdef CONFIG_SPEAKUP_ACNTPC SYNTH_DECL(acntpc) #endif -#if CFG_TEST(CONFIG_SPEAKUP_ACNTSA) +#ifdef CONFIG_SPEAKUP_ACNTSA SYNTH_DECL(acntsa) #endif -#if CFG_TEST(CONFIG_SPEAKUP_APOLLO) +#ifdef CONFIG_SPEAKUP_APOLLO SYNTH_DECL(apollo) #endif -#if CFG_TEST(CONFIG_SPEAKUP_AUDPTR) +#ifdef CONFIG_SPEAKUP_AUDPTR SYNTH_DECL(audptr) #endif -#if CFG_TEST(CONFIG_SPEAKUP_BNS) +#ifdef CONFIG_SPEAKUP_BNS SYNTH_DECL(bns) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DECEXT) +#ifdef CONFIG_SPEAKUP_DECEXT SYNTH_DECL(decext) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DECTLK) +#ifdef CONFIG_SPEAKUP_DECTLK SYNTH_DECL(dectlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DTLK) +#ifdef CONFIG_SPEAKUP_DTLK SYNTH_DECL(dtlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_KEYPC) +#ifdef CONFIG_SPEAKUP_KEYPC SYNTH_DECL(keypc) #endif -#if CFG_TEST(CONFIG_SPEAKUP_LTLK) +#ifdef CONFIG_SPEAKUP_LTLK SYNTH_DECL(ltlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_SFTSYN) +#ifdef CONFIG_SPEAKUP_SFTSYN SYNTH_DECL(sftsyn) #endif -#if CFG_TEST(CONFIG_SPEAKUP_SPKOUT) +#ifdef CONFIG_SPEAKUP_SPKOUT SYNTH_DECL(spkout) #endif -#if CFG_TEST(CONFIG_SPEAKUP_TXPRT) +#ifdef CONFIG_SPEAKUP_TXPRT SYNTH_DECL(txprt) #endif
[PATCH 2.6.13-rc3-mm2]net/ipv4/netfilter/ip_conntrack_core.c fix -Wundef error
Sorry for the resend and previously bad subject line. This fixes a single -Wundef error in the file net/ipv4/netfilter/ip_conntrack_core.c , Please Apply Nick Sillik [EMAIL PROTECTED] diff -urN a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c --- a/net/ipv4/netfilter/ip_conntrack_core.c2005-07-27 16:40:16.0 -0400 +++ b/net/ipv4/netfilter/ip_conntrack_core.c2005-07-27 16:41:00.0 -0400 @@ -723,7 +723,7 @@ /* Welcome, Mr. Bond. We've been expecting you... */ __set_bit(IPS_EXPECTED_BIT, >status); conntrack->master = exp->master; -#if CONFIG_IP_NF_CONNTRACK_MARK +#ifdef CONFIG_IP_NF_CONNTRACK_MARK conntrack->mark = exp->master->mark; #endif nf_conntrack_get(>master->ct_general);
drivers/char/speakup/synthlist.h fix -Wundef errors
This patch should fix a slew of -Wundef errors in the synthlist.h file used by the speakup driver. Nick Sillik [EMAIL PROTECTED] diff -urN a/drivers/char/speakup/synthlist.h b/drivers/char/speakup/synthlist.h --- a/drivers/char/speakup/synthlist.h 2005-07-27 16:10:04.0 -0400 +++ b/drivers/char/speakup/synthlist.h 2005-07-27 16:12:23.0 -0400 @@ -10,43 +10,43 @@ #define CFG_TEST(name) (name) #endif -#if CFG_TEST(CONFIG_SPEAKUP_ACNTPC) +#ifdef CFG_TEST(CONFIG_SPEAKUP_ACNTPC) SYNTH_DECL(acntpc) #endif -#if CFG_TEST(CONFIG_SPEAKUP_ACNTSA) +#ifdef CFG_TEST(CONFIG_SPEAKUP_ACNTSA) SYNTH_DECL(acntsa) #endif -#if CFG_TEST(CONFIG_SPEAKUP_APOLLO) +#ifdef CFG_TEST(CONFIG_SPEAKUP_APOLLO) SYNTH_DECL(apollo) #endif -#if CFG_TEST(CONFIG_SPEAKUP_AUDPTR) +#ifdef CFG_TEST(CONFIG_SPEAKUP_AUDPTR) SYNTH_DECL(audptr) #endif -#if CFG_TEST(CONFIG_SPEAKUP_BNS) +#ifdef CFG_TEST(CONFIG_SPEAKUP_BNS) SYNTH_DECL(bns) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DECEXT) +#ifdef CFG_TEST(CONFIG_SPEAKUP_DECEXT) SYNTH_DECL(decext) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DECTLK) +#ifdef CFG_TEST(CONFIG_SPEAKUP_DECTLK) SYNTH_DECL(dectlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DTLK) +#ifdef CFG_TEST(CONFIG_SPEAKUP_DTLK) SYNTH_DECL(dtlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_KEYPC) +#ifdef CFG_TEST(CONFIG_SPEAKUP_KEYPC) SYNTH_DECL(keypc) #endif -#if CFG_TEST(CONFIG_SPEAKUP_LTLK) +#ifdef CFG_TEST(CONFIG_SPEAKUP_LTLK) SYNTH_DECL(ltlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_SFTSYN) +#ifdef CFG_TEST(CONFIG_SPEAKUP_SFTSYN) SYNTH_DECL(sftsyn) #endif -#if CFG_TEST(CONFIG_SPEAKUP_SPKOUT) +#ifdef CFG_TEST(CONFIG_SPEAKUP_SPKOUT) SYNTH_DECL(spkout) #endif -#if CFG_TEST(CONFIG_SPEAKUP_TXPRT) +#ifdef CFG_TEST(CONFIG_SPEAKUP_TXPRT) SYNTH_DECL(txprt) #endif
drivers/char/speakup/synthlist.h fix -Wundef errors
This patch should fix a slew of -Wundef errors in the synthlist.h file used by the speakup driver. Nick Sillik [EMAIL PROTECTED] diff -urN a/drivers/char/speakup/synthlist.h b/drivers/char/speakup/synthlist.h --- a/drivers/char/speakup/synthlist.h 2005-07-27 16:10:04.0 -0400 +++ b/drivers/char/speakup/synthlist.h 2005-07-27 16:12:23.0 -0400 @@ -10,43 +10,43 @@ #define CFG_TEST(name) (name) #endif -#if CFG_TEST(CONFIG_SPEAKUP_ACNTPC) +#ifdef CFG_TEST(CONFIG_SPEAKUP_ACNTPC) SYNTH_DECL(acntpc) #endif -#if CFG_TEST(CONFIG_SPEAKUP_ACNTSA) +#ifdef CFG_TEST(CONFIG_SPEAKUP_ACNTSA) SYNTH_DECL(acntsa) #endif -#if CFG_TEST(CONFIG_SPEAKUP_APOLLO) +#ifdef CFG_TEST(CONFIG_SPEAKUP_APOLLO) SYNTH_DECL(apollo) #endif -#if CFG_TEST(CONFIG_SPEAKUP_AUDPTR) +#ifdef CFG_TEST(CONFIG_SPEAKUP_AUDPTR) SYNTH_DECL(audptr) #endif -#if CFG_TEST(CONFIG_SPEAKUP_BNS) +#ifdef CFG_TEST(CONFIG_SPEAKUP_BNS) SYNTH_DECL(bns) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DECEXT) +#ifdef CFG_TEST(CONFIG_SPEAKUP_DECEXT) SYNTH_DECL(decext) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DECTLK) +#ifdef CFG_TEST(CONFIG_SPEAKUP_DECTLK) SYNTH_DECL(dectlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DTLK) +#ifdef CFG_TEST(CONFIG_SPEAKUP_DTLK) SYNTH_DECL(dtlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_KEYPC) +#ifdef CFG_TEST(CONFIG_SPEAKUP_KEYPC) SYNTH_DECL(keypc) #endif -#if CFG_TEST(CONFIG_SPEAKUP_LTLK) +#ifdef CFG_TEST(CONFIG_SPEAKUP_LTLK) SYNTH_DECL(ltlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_SFTSYN) +#ifdef CFG_TEST(CONFIG_SPEAKUP_SFTSYN) SYNTH_DECL(sftsyn) #endif -#if CFG_TEST(CONFIG_SPEAKUP_SPKOUT) +#ifdef CFG_TEST(CONFIG_SPEAKUP_SPKOUT) SYNTH_DECL(spkout) #endif -#if CFG_TEST(CONFIG_SPEAKUP_TXPRT) +#ifdef CFG_TEST(CONFIG_SPEAKUP_TXPRT) SYNTH_DECL(txprt) #endif
[PATCH 2.6.13-rc3-mm2]net/ipv4/netfilter/ip_conntrack_core.c fix -Wundef error
Sorry for the resend and previously bad subject line. This fixes a single -Wundef error in the file net/ipv4/netfilter/ip_conntrack_core.c , Please Apply Nick Sillik [EMAIL PROTECTED] diff -urN a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c --- a/net/ipv4/netfilter/ip_conntrack_core.c2005-07-27 16:40:16.0 -0400 +++ b/net/ipv4/netfilter/ip_conntrack_core.c2005-07-27 16:41:00.0 -0400 @@ -723,7 +723,7 @@ /* Welcome, Mr. Bond. We've been expecting you... */ __set_bit(IPS_EXPECTED_BIT, conntrack-status); conntrack-master = exp-master; -#if CONFIG_IP_NF_CONNTRACK_MARK +#ifdef CONFIG_IP_NF_CONNTRACK_MARK conntrack-mark = exp-master-mark; #endif nf_conntrack_get(conntrack-master-ct_general);
Re: drivers/char/speakup/synthlist.h fix -Wundef errors
Nick Sillik wrote: This patch should fix a slew of -Wundef errors in the synthlist.h file used by the speakup driver. Nick Sillik [EMAIL PROTECTED] Or maybe we could just eliminate the CFG_TEST from the file all together This patch follows that avenue. diff -urN a/drivers/char/speakup/synthlist.h b/drivers/char/speakup/synthlist.h --- a/drivers/char/speakup/synthlist.h 2005-07-27 16:10:04.0 -0400 +++ b/drivers/char/speakup/synthlist.h 2005-07-27 16:24:02.0 -0400 @@ -7,46 +7,45 @@ /* declare extern built in synths */ #define SYNTH_DECL(who) extern struct spk_synth synth_##who; #define PASS2 -#define CFG_TEST(name) (name) #endif -#if CFG_TEST(CONFIG_SPEAKUP_ACNTPC) +#ifdef CONFIG_SPEAKUP_ACNTPC SYNTH_DECL(acntpc) #endif -#if CFG_TEST(CONFIG_SPEAKUP_ACNTSA) +#ifdef CONFIG_SPEAKUP_ACNTSA SYNTH_DECL(acntsa) #endif -#if CFG_TEST(CONFIG_SPEAKUP_APOLLO) +#ifdef CONFIG_SPEAKUP_APOLLO SYNTH_DECL(apollo) #endif -#if CFG_TEST(CONFIG_SPEAKUP_AUDPTR) +#ifdef CONFIG_SPEAKUP_AUDPTR SYNTH_DECL(audptr) #endif -#if CFG_TEST(CONFIG_SPEAKUP_BNS) +#ifdef CONFIG_SPEAKUP_BNS SYNTH_DECL(bns) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DECEXT) +#ifdef CONFIG_SPEAKUP_DECEXT SYNTH_DECL(decext) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DECTLK) +#ifdef CONFIG_SPEAKUP_DECTLK SYNTH_DECL(dectlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_DTLK) +#ifdef CONFIG_SPEAKUP_DTLK SYNTH_DECL(dtlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_KEYPC) +#ifdef CONFIG_SPEAKUP_KEYPC SYNTH_DECL(keypc) #endif -#if CFG_TEST(CONFIG_SPEAKUP_LTLK) +#ifdef CONFIG_SPEAKUP_LTLK SYNTH_DECL(ltlk) #endif -#if CFG_TEST(CONFIG_SPEAKUP_SFTSYN) +#ifdef CONFIG_SPEAKUP_SFTSYN SYNTH_DECL(sftsyn) #endif -#if CFG_TEST(CONFIG_SPEAKUP_SPKOUT) +#ifdef CONFIG_SPEAKUP_SPKOUT SYNTH_DECL(spkout) #endif -#if CFG_TEST(CONFIG_SPEAKUP_TXPRT) +#ifdef CONFIG_SPEAKUP_TXPRT SYNTH_DECL(txprt) #endif
Re: [PATCH 2.6.13-rc3-mm2]net/ipv4/netfilter/ip_conntrack_core.c fix -Wundef error
Apologies Signed-off-by: Nick Sillik [EMAIL PROTECTED] David S. Miller wrote: From: Nick Sillik [EMAIL PROTECTED] Date: Wed, 27 Jul 2005 16:49:59 -0400 Sorry for the resend and previously bad subject line. This fixes a single -Wundef error in the file net/ipv4/netfilter/ip_conntrack_core.c , Please supply a proper Signed-off-by: line with your patch. - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff -urN a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c --- a/net/ipv4/netfilter/ip_conntrack_core.c2005-07-27 16:40:16.0 -0400 +++ b/net/ipv4/netfilter/ip_conntrack_core.c2005-07-27 16:41:00.0 -0400 @@ -723,7 +723,7 @@ /* Welcome, Mr. Bond. We've been expecting you... */ __set_bit(IPS_EXPECTED_BIT, conntrack-status); conntrack-master = exp-master; -#if CONFIG_IP_NF_CONNTRACK_MARK +#ifdef CONFIG_IP_NF_CONNTRACK_MARK conntrack-mark = exp-master-mark; #endif nf_conntrack_get(conntrack-master-ct_general);
[PATCH 2.6.13-rc3-mm2] fs/reiser4/plugin/node/node40.h fix warning with -Wundef
Fixes another -Wundef warning in ReiserFS code. Nick Sillik [EMAIL PROTECTED] Signed-off-by: Nick Sillik [EMAIL PROTECTED] diff -urN a/fs/reiser4/plugin/node/node40.h b/fs/reiser4/plugin/node/node40.h --- a/fs/reiser4/plugin/node/node40.h 2005-07-27 18:14:04.0 -0400 +++ b/fs/reiser4/plugin/node/node40.h 2005-07-27 18:14:53.0 -0400 @@ -80,7 +80,7 @@ int check_node40(const znode * node, __u32 flags, const char **error); int parse_node40(znode * node); int init_node40(znode * node); -#if GUESS_EXISTS +#ifdef GUESS_EXISTS int guess_node40(const znode * node); #endif void change_item_size_node40(coord_t * coord, int by);
net/ipv4/netfilter/ip_conntrack_core.c fix -Wundef error
This fixes a single -Wundef error in the file net/ipv4/netfilter/ip_conntrack_core.c , Please Apply Nick Sillik [EMAIL PROTECTED] diff -urN a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c --- a/net/ipv4/netfilter/ip_conntrack_core.c2005-07-27 16:40:16.0 -0400 +++ b/net/ipv4/netfilter/ip_conntrack_core.c2005-07-27 16:41:00.0 -0400 @@ -723,7 +723,7 @@ /* Welcome, Mr. Bond. We've been expecting you... */ __set_bit(IPS_EXPECTED_BIT, conntrack-status); conntrack-master = exp-master; -#if CONFIG_IP_NF_CONNTRACK_MARK +#ifdef CONFIG_IP_NF_CONNTRACK_MARK conntrack-mark = exp-master-mark; #endif nf_conntrack_get(conntrack-master-ct_general);
