From patchwork Mon Dec 14 22:02:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 41153 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 511F1B6F0F for ; Tue, 15 Dec 2009 09:02:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932580AbZLNWCO (ORCPT ); Mon, 14 Dec 2009 17:02:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758495AbZLNWCN (ORCPT ); Mon, 14 Dec 2009 17:02:13 -0500 Received: from mail-px0-f174.google.com ([209.85.216.174]:44224 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758467AbZLNWCM (ORCPT ); Mon, 14 Dec 2009 17:02:12 -0500 Received: by pxi4 with SMTP id 4so2114426pxi.33 for ; Mon, 14 Dec 2009 14:02:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=M+FRd3T38Mny7NqMTv88VmMXWR6fQXt+wIUF8AT3xN8=; b=sDmClaoWRxLj9Ls2K6o/V0nRF0iBQUYjQphZ5OYz2NH0RttFIvbqnXmcKAjVBPkoj9 SJKa47mF5PsIdzGmWQf9aiDD0v5bi+mT0GIT4FV7a5kmZd7dOrcGtF5LsagoZBftdpC8 u3R8+RqobPSmiPb/UuzQkVkPw4jruPZoxInqI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=J2305g4OL8ZJCD7MQk9lvP25WkFygH4C90sQQXYFxw3FESwcdZ0jk1cC+uqYpGdFlP tUrz2gy72xOint0EnMiZL1VU4B0psRJwzaUX2OrTgrkyyb9NwfDARkd/3UW2WA/ysq7g /9dVvHEOGynLWLaD4l3UJAFBZLizkjN8gD1Eo= MIME-Version: 1.0 Received: by 10.142.60.8 with SMTP id i8mr3542970wfa.310.1260828131663; Mon, 14 Dec 2009 14:02:11 -0800 (PST) Date: Tue, 15 Dec 2009 09:02:11 +1100 Message-ID: Subject: [RESEND PATCH 1/3] X25: Move SYSCTL ifdefs into header From: andrew hendry To: netdev@vger.kernel.org, linux-kernel Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Moves the CONFIG_SYSCTL ifdefs in x25_init into header. Signed-off-by: Andrew Hendry Acked-by: "Eric W. Biederman" the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -uprN -X a/Documentation/dontdiff a/include/net/x25.h b/include/net/x25.h --- a/include/net/x25.h 2009-11-10 11:32:31.000000000 +1100 +++ b/include/net/x25.h 2009-11-25 09:05:21.000000000 +1100 @@ -287,8 +287,14 @@ extern unsigned long x25_display_timer(s extern void x25_check_rbuf(struct sock *); /* sysctl_net_x25.c */ +#ifdef CONFIG_SYSCTL extern void x25_register_sysctl(void); extern void x25_unregister_sysctl(void); +#else +static inline void x25_register_sysctl(void) {}; +static inline void x25_unregister_sysctl(void) {}; +#endif /* CONFIG_SYSCTL */ + struct x25_skb_cb { unsigned flags; }; diff -uprN -X a/Documentation/dontdiff a/net/x25/af_x25.c b/net/x25/af_x25.c --- a/net/x25/af_x25.c 2009-11-17 10:30:18.000000000 +1100 +++ b/net/x25/af_x25.c 2009-11-25 09:04:25.000000000 +1100 @@ -1667,9 +1667,7 @@ static int __init x25_init(void) printk(KERN_INFO "X.25 for Linux Version 0.2\n"); -#ifdef CONFIG_SYSCTL x25_register_sysctl(); -#endif x25_proc_init(); out: return rc; @@ -1682,9 +1680,7 @@ static void __exit x25_exit(void) x25_link_free(); x25_route_free(); -#ifdef CONFIG_SYSCTL x25_unregister_sysctl(); -#endif unregister_netdevice_notifier(&x25_dev_notifier); -- To unsubscribe from this list: send the line "unsubscribe netdev" in