From patchwork Thu Jul 28 15:53:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 1016412 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6SFt8j5020688 for ; Thu, 28 Jul 2011 15:55:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755076Ab1G1Pyh (ORCPT ); Thu, 28 Jul 2011 11:54:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64589 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755737Ab1G1Pye (ORCPT ); Thu, 28 Jul 2011 11:54:34 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p6SFs0T4032210 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 28 Jul 2011 11:54:00 -0400 Received: from warthog.procyon.org.uk ([10.3.112.8]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p6SFrufx031678; Thu, 28 Jul 2011 11:53:57 -0400 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells Subject: [PATCH 29/40] UAPI: Fix linux/ncp.h [ver #3] To: torvalds@osdl.org Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, David Howells Date: Thu, 28 Jul 2011 16:53:55 +0100 Message-ID: <20110728155355.16618.61095.stgit@warthog.procyon.org.uk> In-Reply-To: <20110728154920.16618.89358.stgit@warthog.procyon.org.uk> References: <20110728154920.16618.89358.stgit@warthog.procyon.org.uk> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 28 Jul 2011 15:55:08 +0000 (UTC) Fix linux/coda.h to retain the #ifdef __KERNEL__ in struct nw_info_struct in the userspace struct rather than splitting that member out into a separate header. This is done by placing a marker to manually control the splitter script. Signed-off-by: David Howells --- include/linux/ncp.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/ncp.h b/include/linux/ncp.h index 99f0ade..4717262 100644 --- a/include/linux/ncp.h +++ b/include/linux/ncp.h @@ -155,7 +155,7 @@ struct nw_info_struct { __u8 nameLen; __u8 entryName[256]; /* libncp may depend on there being nothing after entryName */ -#ifdef __KERNEL__ +#ifdef __KERNEL__ // DISINTEGRATE: RETAIN struct nw_nfs_info nfs; #endif } __attribute__((packed));