The patch titled
s390: move var declarations behind ifdef
has been added to the -mm tree. Its filename is
s390-move-var-declarations-behind-ifdef.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: s390: move var declarations behind ifdef
From: "Serge E. Hallyn" <serue@xxxxxxxxxx>
Two variables in drivers/s390/net/qeth_main.c:qeth_send_packet() are only
used if CONFIG_QETH_PERF_STATS. Move their definition under the same ifdef
to remove compiler warning.
Signed-off-by: Serge Hallyn <serue@xxxxxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/s390/net/qeth_main.c | 2 ++
1 files changed, 2 insertions(+)
diff -puN drivers/s390/net/qeth_main.c~s390-move-var-declarations-behind-ifdef drivers/s390/net/qeth_main.c
--- 25/drivers/s390/net/qeth_main.c~s390-move-var-declarations-behind-ifdef Mon Jun 19 14:56:09 2006
+++ 25-akpm/drivers/s390/net/qeth_main.c Mon Jun 19 14:56:09 2006
@@ -4416,8 +4416,10 @@ qeth_send_packet(struct qeth_card *card,
enum qeth_large_send_types large_send = QETH_LARGE_SEND_NO;
struct qeth_eddp_context *ctx = NULL;
int tx_bytes = skb->len;
+#ifdef CONFIG_QETH_PERF_STATS
unsigned short nr_frags = skb_shinfo(skb)->nr_frags;
unsigned short tso_size = skb_shinfo(skb)->tso_size;
+#endif
int rc;
QETH_DBF_TEXT(trace, 6, "sendpkt");
_
Patches currently in -mm which might be from serue@xxxxxxxxxx are
git-audit-master.patch
s390-move-var-declarations-behind-ifdef.patch
kthread-update-loopc-to-use-kthread.patch
kthread-update-loopc-to-use-kthread-fix.patch
kthread-convert-lock-to-use-kthread.patch
kthread-convert-smbiod.patch
kthread-convert-smbiod-tidy.patch
kthread-convert-s390machc-from-kernel_thread.patch
proc-sysctl-add-_proc_do_string-helper.patch
namespaces-add-nsproxy.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-incorporate-fs-namespace-into-nsproxy.patch
namespaces-utsname-introduce-temporary-helpers.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix.patch
namespaces-utsname-switch-to-using-uts-namespaces-cleanup.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-use-init_utsname-when-appropriate-cifs-update.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-implement-utsname-namespaces-export.patch
namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch
namespaces-utsname-implement-utsname-namespaces-remove-unused-exit_utsname.patch
namespaces-utsname-sysctl-hack.patch
namespaces-utsname-sysctl-hack-cleanup.patch
namespaces-utsname-sysctl-hack-cleanup-2.patch
namespaces-utsname-sysctl-hack-cleanup-2-fix.patch
namespaces-utsname-remove-system_utsname.patch
namespaces-utsname-implement-clone_newuts-flag.patch
uts-copy-nsproxy-only-when-needed.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
