David S. Miller
3db6857c91
Merge tag 'disintegrate-isdn-20121009' of git://git.infradead.org/users/dhowells/linux-headers
...
UAPI Disintegration 2012-10-09
Signed-off-by: David S. Miller <davem@davemloft.net >
2012-10-09 13:16:33 -04:00
David Howells
72503791ed
UAPI: (Scripted) Disintegrate include/xen
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:49:15 +01:00
David Howells
674e95ca44
UAPI: (Scripted) Disintegrate include/sound
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:49:13 +01:00
David Howells
4a8e43feea
UAPI: (Scripted) Disintegrate include/mtd
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:49:09 +01:00
David Howells
1e256b340d
UAPI: (Scripted) Disintegrate include/linux/wimax
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:49:08 +01:00
David Howells
5e1ddb4817
UAPI: (Scripted) Disintegrate include/linux/usb
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:49:07 +01:00
David Howells
b6bf56c6be
UAPI: (Scripted) Disintegrate include/linux/tc_ematch
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:49:06 +01:00
David Howells
611128eb39
UAPI: (Scripted) Disintegrate include/linux/tc_act
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:49:05 +01:00
David Howells
e3dd9a52cb
UAPI: (Scripted) Disintegrate include/linux/sunrpc
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:49:04 +01:00
David Howells
7939d3c2a6
UAPI: (Scripted) Disintegrate include/linux/spi
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:49:03 +01:00
David Howells
fc5a40a230
UAPI: (Scripted) Disintegrate include/linux/raid
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:49:02 +01:00
David Howells
616d1ca5d7
UAPI: (Scripted) Disintegrate include/linux/nfsd
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:49:02 +01:00
David Howells
ff1e1756c9
UAPI: (Scripted) Disintegrate include/linux/netfilter_ipv6
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:49:01 +01:00
David Howells
17c075923d
UAPI: (Scripted) Disintegrate include/linux/netfilter_ipv4
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:48:59 +01:00
David Howells
55c5cd3cc1
UAPI: (Scripted) Disintegrate include/linux/netfilter_bridge
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:48:58 +01:00
David Howells
8922082ae6
UAPI: (Scripted) Disintegrate include/linux/netfilter_arp
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:48:56 +01:00
David Howells
a82014149b
UAPI: (Scripted) Disintegrate include/linux/netfilter/ipset
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:48:55 +01:00
David Howells
94d0ec58e6
UAPI: (Scripted) Disintegrate include/linux/netfilter
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:48:54 +01:00
David Howells
1855f1b107
UAPI: (Scripted) Disintegrate include/linux/isdn
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:48:45 +01:00
David Howells
5217c12944
UAPI: (Scripted) Disintegrate include/linux/hsi
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:48:44 +01:00
David Howells
27a3aadcdc
UAPI: (Scripted) Disintegrate include/linux/caif
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-09 09:48:40 +01:00
Linus Torvalds
50e0d10232
Merge tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
...
Pull asm-generic updates from Arnd Bergmann:
"This has three changes for asm-generic that did not really fit into
any other branch as normal asm-generic changes do. One is a fix for a
build warning, the other two are more interesting:
* A patch from Mark Brown to allow using the common clock
infrastructure on all architectures, so we can use the clock API in
architecture independent device drivers.
* The UAPI split patches from David Howells for the asm-generic
files. There are other architecture specific series that are going
through the arch maintainer tree and that depend on this one.
There may be a few small merge conflicts between Mark's patch and the
following arch header file split patches. In each case the solution
will be to keep the new "generic-y += clkdev.h" line, even if it ends
up being the only line in the Kbuild file."
* tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
UAPI: (Scripted) Disintegrate include/asm-generic
asm-generic: Add default clkdev.h
asm-generic: xor: mark static functions as __maybe_unused
2012-10-09 15:58:38 +09:00
David Howells
718dcedd7e
UAPI: (Scripted) Disintegrate include/drm
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-04 18:21:50 +01:00
David Howells
8a1ab3155c
UAPI: (Scripted) Disintegrate include/asm-generic
...
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-04 18:20:15 +01:00
David Howells
10b63956fc
UAPI: Plumb the UAPI Kbuilds into the user header installation and checking
...
Plumb the UAPI Kbuilds into the user header installation and checking system.
As the headers are split the entries will be transferred across from the old
Kbuild files to the UAPI Kbuild files.
The changes made in this commit are:
(1) Exported generated files (of which there are currently four) are moved to
uapi/ directories under the appropriate generated/ directory, thus we
get:
include/generated/uapi/linux/version.h
arch/x86/include/generated/uapi/asm/unistd_32.h
arch/x86/include/generated/uapi/asm/unistd_64.h
arch/x86/include/generated/uapi/asm/unistd_x32.h
These paths were added to the build as -I flags in a previous patch.
(2) scripts/Makefile.headersinst is now given the UAPI path to install from
rather than the old path.
It then determines the old path from that and includes that Kbuild also
if it exists, thus permitting the headers to exist in either directory
during the changeover.
I also renamed the "install" variable to "installdir" as it refers to a
directory not the install program.
(3) scripts/headers_install.pl is altered to take a list of source file paths
instead of just their names so that the makefile can tell it exactly
where to find each file.
For the moment, files can be obtained from one of four places for each
output directory:
.../include/uapi/foo/
.../include/generated/uapi/foo/
.../include/foo/
.../include/generated/foo/
The non-UAPI paths will be dropped later.
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-02 18:01:57 +01:00