Re: [PATCH 00/13] UAPI header file split
From: David Howells <dhowells@redhat.com>
Date: 2012-07-25 17:33:10
Also in:
lkml
Subsystem:
coda file system, netfilter, sparc + ultrasparc (sparc/sparc64), the rest · Maintainers:
Jan Harkes, Pablo Neira Ayuso, Florian Westphal, "David S. Miller", Andreas Larsson, Linus Torvalds
Michael Kerrisk [off-list ref] wrote:
quoted
quoted
4. DISINTEGRATE MARKERS LEFT OVER (?) Some of the DISINTEGRATE markers that you create during the scripting process are left in the final uapi files. Was this intentional?Ummm... no, there shouldn't be any. Certainly the marker has worked (the __KERNEL__ guard got retained), but I'm not sure why it didn't get removed. Probably my understanding of the black magic required to make perl do what I want is lacking.So, a manual fix may be in order?
Okay... Dealt with that in the script. The following command: git diff uapi-post-split-20120724 shows the attached. David ---
diff --git a/arch/sparc/include/uapi/asm/termbits.h b/arch/sparc/include/uapi/asm/termbits.h
index a023152..dd91642 100644
--- a/arch/sparc/include/uapi/asm/termbits.h
+++ b/arch/sparc/include/uapi/asm/termbits.h@@ -29,7 +29,7 @@ struct termios { tcflag_t c_cflag; /* control mode flags */ tcflag_t c_lflag; /* local mode flags */ cc_t c_line; /* line discipline */ -#ifndef __KERNEL__ // DISINTEGRATE: RETAIN +#ifndef __KERNEL__ cc_t c_cc[NCCS]; /* control characters */ #else cc_t c_cc[NCCS+2]; /* kernel needs 2 more to hold vmin/vtime */
diff --git a/include/uapi/linux/acct.h b/include/uapi/linux/acct.h
index 14aeac7..11b6ca3 100644
--- a/include/uapi/linux/acct.h
+++ b/include/uapi/linux/acct.h@@ -81,7 +81,7 @@ struct acct_v3 __u32 ac_pid; /* Process ID */ __u32 ac_ppid; /* Parent Process ID */ __u32 ac_btime; /* Process Creation Time */ -#ifdef __KERNEL__ // DISINTEGRATE: RETAIN +#ifdef __KERNEL__ __u32 ac_etime; /* Elapsed Time */ #else float ac_etime; /* Elapsed Time */
diff --git a/include/uapi/linux/coda.h b/include/uapi/linux/coda.h
index 67b01dc..8826a31 100644
--- a/include/uapi/linux/coda.h
+++ b/include/uapi/linux/coda.h@@ -615,7 +615,7 @@ struct coda_open_by_fd_out { struct coda_out_hdr oh; int fd; -#ifdef __KERNEL__ // DISINTEGRATE: RETAIN +#ifdef __KERNEL__ struct file *fh; /* not passed from userspace but used in-kernel only */ #endif };
diff --git a/include/uapi/linux/ncp.h b/include/uapi/linux/ncp.h
index 4717262..99f0ade 100644
--- a/include/uapi/linux/ncp.h
+++ b/include/uapi/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__ // DISINTEGRATE: RETAIN +#ifdef __KERNEL__ struct nw_nfs_info nfs; #endif } __attribute__((packed));
diff --git a/include/uapi/linux/netfilter/xt_policy.h b/include/uapi/linux/netfilter/xt_policy.h
index 573da52..be8ead0 100644
--- a/include/uapi/linux/netfilter/xt_policy.h
+++ b/include/uapi/linux/netfilter/xt_policy.h@@ -35,7 +35,7 @@ union xt_policy_addr { struct xt_policy_elem { union { -#ifdef __KERNEL__ // DISINTEGRATE: RETAIN +#ifdef __KERNEL__ struct { union nf_inet_addr saddr; union nf_inet_addr smask;