* [PATCH 00/25] asm-generic: Convert all to use Kbuild file
@ 2012-10-13 2:26 Steven Rostedt
2012-10-13 2:26 ` [PATCH 01/25] alpha: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
` (26 more replies)
0 siblings, 27 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton
Recently I suggested to someone that was adding a new asm file that
currently only contained an x86 change to add a header in all archs
that was just a wrapper to point to the asm-generic version. I suggested
this because that's the way we use to do it and just to refresh my
memory, I looked at div64.h in a few archs and saw that was the case.
After having the change done and just after finishing testing it, I was
notified that the "proper" way of doing this is to add it to the
arch/*/include/asm/Kbuild
file, as 'generic-y += foo.h' and it will reference the asm-generic
file automatically. Well it would have been nice if I knew this before
and wasn't confused by seeing the incorrect method.
Thus, out of frustration, I went and cleaned up all the archs to have
them use the Kbuild method and deleted the empty files. I spent
a bit of time to make sure the only thing the file did was include
the generic header and not add anything else. So if it only included
the generic header and sometimes added the wrapper #ifndef _HEADER_H
notations, I deleted the file and added it to Kbuild.
What I would really like to do is get rid of the adding of these
files all together (from even the Kbuild file), and just have
by default, if the file does not exist in arch/*/include/asm/ but does
in include/asm-generic/ then use the generic version. Why don't we
do that now? I can look into doing this when I have more time.
I tested these changes by cross compiling the defconfig for everything
but:
c6x, hexagon, microblaze, score, unicore
because cross compilers for these archs are not available to me.
Note, I first did the change against 3.6 but found that there's
some isses with the check header but is fixed by David Howells changes
in the current merge window. But it seems that the current merge
window caused:
frv, openrisc, ia64 and xtensa
not to compile correctly (before adding these patches). I tested
anyway, just to see if they added more errors.
h8300 I have yet to get to compile (never ever compiled for me).
But everything else has been crossed compiled by a defconfig and
seems to work.
Kudos to m68k and sh, those two were fully up-to-date with
the new Kbuild method.
Honorable mention goes to:
blackfin, c6x, hexagon, openrisc, tile, um and unicore2
for being almost totally up to the new method, but it seems that
kvm_para.h was added the old way.
Please feel free to pluck these patches into your architecture and
run them to make sure that they boot as well (I only had the compiler
and not the box... Also I only tested with defconfig, I may have
broken other configs).
One note, the best thing about these changes is:
390 files changed, 369 insertions(+), 1378 deletions(-)
-- Steve
Steven Rostedt (25):
alpha: Use Kbuild infrastructure to handle asm-generic headers
arm: Use Kbuild infrastructure to handle asm-generic headers
avr32: Use Kbuild infrastructure to handle asm-generic headers
blackfin: Use Kbuild infrastructure for kvm_para.h
c6x: Use Kbuild infrastructure for kvm_para.h
cris: Use Kbuild infrastructure to handle asm-generic headers
frv: Use Kbuild infrastructure to handle asm-generic headers
h8300: Use Kbuild infrastructure to handle asm-generic headers
hexagon: Use Kbuild infrastructure for kvm_para.h
ia64: Use Kbuild infrastructure to handle asm-generic headers
m32r: Use Kbuild infrastructure to handle asm-generic headers
microblaze: Use Kbuild infrastructure to handle asm-generic headers
mips: Use Kbuild infrastructure to handle asm-generic headers
mn10300: Use Kbuild infrastructure to handle asm-generic headers
openrisc: Use Kbuild infrastructure for kvm_para.h
parisc: Use Kbuild infrastructure to handle asm-generic headers
powerpc: Use Kbuild infrastructure to handle asm-generic headers
s390: Use Kbuild infrastructure to handle asm-generic headers
score: Use Kbuild infrastructure to handle asm-generic headers
sparc: Use Kbuild infrastructure to handle asm-generic headers
tile: Use Kbuild infrastructure for kvm_para.h
um: Use Kbuild infrastructure for kvm_para.h
unicore32: Use Kbuild infrastructure for kvm_para.h
x86: Use Kbuild infrastructure to handle asm-generic headers
xtensa: Use Kbuild infrastructure to handle asm-generic headers
----
arch/alpha/include/asm/Kbuild | 12 ++++++
arch/alpha/include/asm/cputime.h | 6 ---
arch/alpha/include/asm/device.h | 7 ----
arch/alpha/include/asm/div64.h | 1 -
arch/alpha/include/asm/emergency-restart.h | 6 ---
arch/alpha/include/asm/ipcbuf.h | 1 -
arch/alpha/include/asm/irq_regs.h | 1 -
arch/alpha/include/asm/kdebug.h | 1 -
arch/alpha/include/asm/kvm_para.h | 1 -
arch/alpha/include/asm/local64.h | 1 -
arch/alpha/include/asm/poll.h | 1 -
arch/alpha/include/asm/scatterlist.h | 6 ---
arch/alpha/include/asm/sections.h | 7 ----
arch/arm/include/asm/Kbuild | 2 +
arch/arm/include/asm/kvm_para.h | 1 -
arch/avr32/include/asm/Kbuild | 27 +++++++++++++
arch/avr32/include/asm/bitsperlong.h | 1 -
arch/avr32/include/asm/cputime.h | 6 ---
arch/avr32/include/asm/delay.h | 1 -
arch/avr32/include/asm/device.h | 7 ----
arch/avr32/include/asm/div64.h | 6 ---
arch/avr32/include/asm/emergency-restart.h | 6 ---
arch/avr32/include/asm/errno.h | 6 ---
arch/avr32/include/asm/fcntl.h | 6 ---
arch/avr32/include/asm/futex.h | 6 ---
arch/avr32/include/asm/ioctl.h | 6 ---
arch/avr32/include/asm/ioctls.h | 6 ---
arch/avr32/include/asm/ipcbuf.h | 1 -
arch/avr32/include/asm/irq_regs.h | 1 -
arch/avr32/include/asm/kvm_para.h | 1 -
arch/avr32/include/asm/local.h | 6 ---
arch/avr32/include/asm/local64.h | 1 -
arch/avr32/include/asm/mman.h | 1 -
arch/avr32/include/asm/percpu.h | 6 ---
arch/avr32/include/asm/poll.h | 1 -
arch/avr32/include/asm/resource.h | 6 ---
arch/avr32/include/asm/scatterlist.h | 6 ---
arch/avr32/include/asm/sections.h | 6 ---
arch/avr32/include/asm/siginfo.h | 6 ---
arch/avr32/include/asm/statfs.h | 6 ---
arch/avr32/include/asm/topology.h | 6 ---
arch/avr32/include/asm/xor.h | 6 ---
arch/blackfin/include/asm/Kbuild | 1 +
arch/blackfin/include/asm/kvm_para.h | 1 -
arch/c6x/include/asm/Kbuild | 1 +
arch/c6x/include/asm/kvm_para.h | 1 -
arch/cris/include/asm/Kbuild | 24 ++++++++++++
arch/cris/include/asm/bitsperlong.h | 1 -
arch/cris/include/asm/cputime.h | 6 ---
arch/cris/include/asm/device.h | 7 ----
arch/cris/include/asm/div64.h | 1 -
arch/cris/include/asm/emergency-restart.h | 6 ---
arch/cris/include/asm/errno.h | 6 ---
arch/cris/include/asm/fcntl.h | 1 -
arch/cris/include/asm/futex.h | 6 ---
arch/cris/include/asm/ioctl.h | 1 -
arch/cris/include/asm/ipcbuf.h | 1 -
arch/cris/include/asm/irq_regs.h | 1 -
arch/cris/include/asm/kdebug.h | 1 -
arch/cris/include/asm/kmap_types.h | 10 -----
arch/cris/include/asm/local.h | 1 -
arch/cris/include/asm/local64.h | 1 -
arch/cris/include/asm/mman.h | 1 -
arch/cris/include/asm/percpu.h | 6 ---
arch/cris/include/asm/poll.h | 1 -
arch/cris/include/asm/resource.h | 6 ---
arch/cris/include/asm/scatterlist.h | 6 ---
arch/cris/include/asm/sections.h | 7 ----
arch/cris/include/asm/siginfo.h | 6 ---
arch/cris/include/asm/statfs.h | 6 ---
arch/cris/include/asm/topology.h | 6 ---
arch/frv/include/asm/Kbuild | 19 ++++++++++
arch/frv/include/asm/bitsperlong.h | 1 -
arch/frv/include/asm/cputime.h | 6 ---
arch/frv/include/asm/device.h | 7 ----
arch/frv/include/asm/div64.h | 1 -
arch/frv/include/asm/emergency-restart.h | 6 ---
arch/frv/include/asm/errno.h | 7 ----
arch/frv/include/asm/fcntl.h | 1 -
arch/frv/include/asm/ioctl.h | 1 -
arch/frv/include/asm/ipcbuf.h | 1 -
arch/frv/include/asm/kdebug.h | 1 -
arch/frv/include/asm/kvm_para.h | 1 -
arch/frv/include/asm/local.h | 6 ---
arch/frv/include/asm/local64.h | 1 -
arch/frv/include/asm/mman.h | 1 -
arch/frv/include/asm/percpu.h | 6 ---
arch/frv/include/asm/resource.h | 7 ----
arch/frv/include/asm/scatterlist.h | 6 ---
arch/frv/include/asm/statfs.h | 7 ----
arch/frv/include/asm/xor.h | 1 -
arch/h8300/include/asm/Kbuild | 23 ++++++++++++
arch/h8300/include/asm/bitsperlong.h | 1 -
arch/h8300/include/asm/cputime.h | 6 ---
arch/h8300/include/asm/device.h | 7 ----
arch/h8300/include/asm/div64.h | 1 -
arch/h8300/include/asm/emergency-restart.h | 6 ---
arch/h8300/include/asm/errno.h | 6 ---
arch/h8300/include/asm/futex.h | 6 ---
arch/h8300/include/asm/ioctl.h | 1 -
arch/h8300/include/asm/ipcbuf.h | 1 -
arch/h8300/include/asm/irq_regs.h | 1 -
arch/h8300/include/asm/kdebug.h | 1 -
arch/h8300/include/asm/kmap_types.h | 6 ---
arch/h8300/include/asm/kvm_para.h | 1 -
arch/h8300/include/asm/local.h | 6 ---
arch/h8300/include/asm/local64.h | 1 -
arch/h8300/include/asm/mman.h | 1 -
arch/h8300/include/asm/percpu.h | 6 ---
arch/h8300/include/asm/resource.h | 6 ---
arch/h8300/include/asm/scatterlist.h | 6 ---
arch/h8300/include/asm/sections.h | 6 ---
arch/h8300/include/asm/siginfo.h | 6 ---
arch/h8300/include/asm/statfs.h | 6 ---
arch/h8300/include/asm/topology.h | 6 ---
arch/hexagon/include/asm/Kbuild | 1 +
arch/hexagon/include/asm/kvm_para.h | 1 -
arch/ia64/include/asm/Kbuild | 10 +++++
arch/ia64/include/asm/div64.h | 1 -
arch/ia64/include/asm/emergency-restart.h | 6 ---
arch/ia64/include/asm/errno.h | 1 -
arch/ia64/include/asm/ioctl.h | 1 -
arch/ia64/include/asm/ioctls.h | 6 ---
arch/ia64/include/asm/ipcbuf.h | 1 -
arch/ia64/include/asm/irq_regs.h | 1 -
arch/ia64/include/asm/local.h | 1 -
arch/ia64/include/asm/local64.h | 1 -
arch/ia64/include/asm/poll.h | 1 -
arch/m32r/include/asm/Kbuild | 28 ++++++++++++++
arch/m32r/include/asm/bitsperlong.h | 1 -
arch/m32r/include/asm/bug.h | 4 --
arch/m32r/include/asm/cputime.h | 6 ---
arch/m32r/include/asm/delay.h | 1 -
arch/m32r/include/asm/device.h | 7 ----
arch/m32r/include/asm/div64.h | 1 -
arch/m32r/include/asm/emergency-restart.h | 6 ---
arch/m32r/include/asm/errno.h | 6 ---
arch/m32r/include/asm/fcntl.h | 1 -
arch/m32r/include/asm/futex.h | 6 ---
arch/m32r/include/asm/ioctl.h | 1 -
arch/m32r/include/asm/ioctls.h | 6 ---
arch/m32r/include/asm/ipcbuf.h | 1 -
arch/m32r/include/asm/irq_regs.h | 1 -
arch/m32r/include/asm/kdebug.h | 1 -
arch/m32r/include/asm/local64.h | 1 -
arch/m32r/include/asm/mman.h | 1 -
arch/m32r/include/asm/param.h | 7 ----
arch/m32r/include/asm/pci.h | 6 ---
arch/m32r/include/asm/percpu.h | 6 ---
arch/m32r/include/asm/poll.h | 1 -
arch/m32r/include/asm/resource.h | 6 ---
arch/m32r/include/asm/scatterlist.h | 6 ---
arch/m32r/include/asm/sections.h | 7 ----
arch/m32r/include/asm/siginfo.h | 6 ---
arch/m32r/include/asm/statfs.h | 6 ---
arch/m32r/include/asm/topology.h | 6 ---
arch/m32r/include/asm/xor.h | 6 ---
arch/microblaze/include/asm/Kbuild | 46 +++++++++++++++++++++++
arch/microblaze/include/asm/bitops.h | 1 -
arch/microblaze/include/asm/bitsperlong.h | 1 -
arch/microblaze/include/asm/bug.h | 1 -
arch/microblaze/include/asm/bugs.h | 1 -
arch/microblaze/include/asm/cputime.h | 1 -
arch/microblaze/include/asm/div64.h | 1 -
arch/microblaze/include/asm/emergency-restart.h | 1 -
arch/microblaze/include/asm/errno.h | 1 -
arch/microblaze/include/asm/fb.h | 1 -
arch/microblaze/include/asm/fcntl.h | 1 -
arch/microblaze/include/asm/hardirq.h | 1 -
arch/microblaze/include/asm/ioctl.h | 1 -
arch/microblaze/include/asm/ioctls.h | 1 -
arch/microblaze/include/asm/ipcbuf.h | 1 -
arch/microblaze/include/asm/irq_regs.h | 1 -
arch/microblaze/include/asm/kdebug.h | 1 -
arch/microblaze/include/asm/kmap_types.h | 6 ---
arch/microblaze/include/asm/kvm_para.h | 1 -
arch/microblaze/include/asm/local.h | 1 -
arch/microblaze/include/asm/local64.h | 1 -
arch/microblaze/include/asm/mman.h | 1 -
arch/microblaze/include/asm/msgbuf.h | 1 -
arch/microblaze/include/asm/param.h | 1 -
arch/microblaze/include/asm/parport.h | 1 -
arch/microblaze/include/asm/percpu.h | 1 -
arch/microblaze/include/asm/poll.h | 1 -
arch/microblaze/include/asm/resource.h | 1 -
arch/microblaze/include/asm/scatterlist.h | 1 -
arch/microblaze/include/asm/sembuf.h | 1 -
arch/microblaze/include/asm/serial.h | 1 -
arch/microblaze/include/asm/shmbuf.h | 1 -
arch/microblaze/include/asm/shmparam.h | 1 -
arch/microblaze/include/asm/siginfo.h | 1 -
arch/microblaze/include/asm/signal.h | 1 -
arch/microblaze/include/asm/socket.h | 1 -
arch/microblaze/include/asm/sockios.h | 1 -
arch/microblaze/include/asm/stat.h | 1 -
arch/microblaze/include/asm/statfs.h | 1 -
arch/microblaze/include/asm/swab.h | 1 -
arch/microblaze/include/asm/termbits.h | 1 -
arch/microblaze/include/asm/termios.h | 1 -
arch/microblaze/include/asm/topology.h | 1 -
arch/microblaze/include/asm/types.h | 1 -
arch/microblaze/include/asm/ucontext.h | 1 -
arch/microblaze/include/asm/vga.h | 1 -
arch/microblaze/include/asm/xor.h | 1 -
arch/mips/include/asm/Kbuild | 14 +++++++
arch/mips/include/asm/cputime.h | 6 ---
arch/mips/include/asm/current.h | 1 -
arch/mips/include/asm/emergency-restart.h | 6 ---
arch/mips/include/asm/ipcbuf.h | 1 -
arch/mips/include/asm/kvm_para.h | 1 -
arch/mips/include/asm/local64.h | 1 -
arch/mips/include/asm/parport.h | 1 -
arch/mips/include/asm/percpu.h | 6 ---
arch/mips/include/asm/scatterlist.h | 6 ---
arch/mips/include/asm/sections.h | 6 ---
arch/mips/include/asm/serial.h | 1 -
arch/mips/include/asm/ucontext.h | 1 -
arch/mips/include/asm/xor.h | 1 -
arch/mn10300/include/asm/Kbuild | 23 ++++++++++++
arch/mn10300/include/asm/bitsperlong.h | 1 -
arch/mn10300/include/asm/cputime.h | 1 -
arch/mn10300/include/asm/device.h | 1 -
arch/mn10300/include/asm/emergency-restart.h | 1 -
arch/mn10300/include/asm/errno.h | 1 -
arch/mn10300/include/asm/fcntl.h | 1 -
arch/mn10300/include/asm/futex.h | 1 -
arch/mn10300/include/asm/ioctl.h | 1 -
arch/mn10300/include/asm/ioctls.h | 6 ---
arch/mn10300/include/asm/ipcbuf.h | 1 -
arch/mn10300/include/asm/kmap_types.h | 6 ---
arch/mn10300/include/asm/kvm_para.h | 1 -
arch/mn10300/include/asm/local.h | 1 -
arch/mn10300/include/asm/local64.h | 1 -
arch/mn10300/include/asm/percpu.h | 1 -
arch/mn10300/include/asm/poll.h | 1 -
arch/mn10300/include/asm/resource.h | 1 -
arch/mn10300/include/asm/scatterlist.h | 16 --------
arch/mn10300/include/asm/sections.h | 1 -
arch/mn10300/include/asm/siginfo.h | 1 -
arch/mn10300/include/asm/statfs.h | 1 -
arch/mn10300/include/asm/topology.h | 1 -
arch/mn10300/include/asm/xor.h | 1 -
arch/openrisc/include/asm/Kbuild | 1 +
arch/openrisc/include/asm/kvm_para.h | 1 -
arch/parisc/include/asm/Kbuild | 18 ++++++++-
arch/parisc/include/asm/compat_signal.h | 2 -
arch/parisc/include/asm/cputime.h | 6 ---
arch/parisc/include/asm/device.h | 7 ----
arch/parisc/include/asm/div64.h | 1 -
arch/parisc/include/asm/emergency-restart.h | 6 ---
arch/parisc/include/asm/hardirq.h | 11 ------
arch/parisc/include/asm/irq_regs.h | 1 -
arch/parisc/include/asm/kdebug.h | 1 -
arch/parisc/include/asm/kvm_para.h | 1 -
arch/parisc/include/asm/local.h | 1 -
arch/parisc/include/asm/local64.h | 1 -
arch/parisc/include/asm/param.h | 1 -
arch/parisc/include/asm/percpu.h | 7 ----
arch/parisc/include/asm/poll.h | 1 -
arch/parisc/include/asm/topology.h | 6 ---
arch/parisc/include/asm/xor.h | 1 -
arch/powerpc/include/asm/Kbuild | 9 +++++
arch/powerpc/include/asm/div64.h | 1 -
arch/powerpc/include/asm/emergency-restart.h | 1 -
arch/powerpc/include/asm/irq_regs.h | 2 -
arch/powerpc/include/asm/local64.h | 1 -
arch/powerpc/include/asm/param.h | 1 -
arch/powerpc/include/asm/poll.h | 1 -
arch/powerpc/include/asm/resource.h | 1 -
arch/powerpc/include/asm/statfs.h | 6 ---
arch/powerpc/include/asm/xor.h | 1 -
arch/s390/include/asm/Kbuild | 17 ++++++++-
arch/s390/include/asm/device.h | 7 ----
arch/s390/include/asm/div64.h | 1 -
arch/s390/include/asm/emergency-restart.h | 6 ---
arch/s390/include/asm/irq_regs.h | 1 -
arch/s390/include/asm/kmap_types.h | 6 ---
arch/s390/include/asm/local.h | 1 -
arch/s390/include/asm/local64.h | 1 -
arch/s390/include/asm/xor.h | 1 -
arch/s390/include/uapi/asm/errno.h | 11 ------
arch/s390/include/uapi/asm/fcntl.h | 1 -
arch/s390/include/uapi/asm/ioctl.h | 1 -
arch/s390/include/uapi/asm/param.h | 6 ---
arch/s390/include/uapi/asm/poll.h | 1 -
arch/s390/include/uapi/asm/resource.h | 13 -------
arch/s390/include/uapi/asm/sockios.h | 6 ---
arch/s390/include/uapi/asm/termbits.h | 6 ---
arch/score/include/asm/Kbuild | 44 ++++++++++++++++++++++
arch/score/include/asm/bitsperlong.h | 6 ---
arch/score/include/asm/bugs.h | 6 ---
arch/score/include/asm/cputime.h | 6 ---
arch/score/include/asm/current.h | 6 ---
arch/score/include/asm/device.h | 6 ---
arch/score/include/asm/div64.h | 6 ---
arch/score/include/asm/emergency-restart.h | 6 ---
arch/score/include/asm/errno.h | 6 ---
arch/score/include/asm/fcntl.h | 6 ---
arch/score/include/asm/futex.h | 6 ---
arch/score/include/asm/hardirq.h | 6 ---
arch/score/include/asm/ioctl.h | 6 ---
arch/score/include/asm/ioctls.h | 6 ---
arch/score/include/asm/ipcbuf.h | 6 ---
arch/score/include/asm/kdebug.h | 6 ---
arch/score/include/asm/kmap_types.h | 6 ---
arch/score/include/asm/kvm_para.h | 1 -
arch/score/include/asm/local.h | 6 ---
arch/score/include/asm/local64.h | 1 -
arch/score/include/asm/mman.h | 6 ---
arch/score/include/asm/msgbuf.h | 6 ---
arch/score/include/asm/param.h | 6 ---
arch/score/include/asm/percpu.h | 6 ---
arch/score/include/asm/poll.h | 6 ---
arch/score/include/asm/posix_types.h | 6 ---
arch/score/include/asm/resource.h | 6 ---
arch/score/include/asm/scatterlist.h | 6 ---
arch/score/include/asm/sections.h | 6 ---
arch/score/include/asm/sembuf.h | 6 ---
arch/score/include/asm/shmbuf.h | 6 ---
arch/score/include/asm/shmparam.h | 6 ---
arch/score/include/asm/siginfo.h | 6 ---
arch/score/include/asm/signal.h | 6 ---
arch/score/include/asm/socket.h | 6 ---
arch/score/include/asm/sockios.h | 6 ---
arch/score/include/asm/stat.h | 6 ---
arch/score/include/asm/statfs.h | 6 ---
arch/score/include/asm/swab.h | 6 ---
arch/score/include/asm/termbits.h | 6 ---
arch/score/include/asm/termios.h | 6 ---
arch/score/include/asm/topology.h | 6 ---
arch/score/include/asm/types.h | 6 ---
arch/score/include/asm/ucontext.h | 1 -
arch/score/include/asm/unaligned.h | 6 ---
arch/sparc/include/asm/Kbuild | 5 +++
arch/sparc/include/asm/cputime.h | 6 ---
arch/sparc/include/asm/emergency-restart.h | 6 ---
arch/sparc/include/asm/kmap_types.h | 10 -----
arch/sparc/include/uapi/asm/kvm_para.h | 1 -
arch/sparc/include/uapi/asm/statfs.h | 6 ---
arch/tile/include/asm/Kbuild | 1 +
arch/tile/include/asm/kvm_para.h | 1 -
arch/um/include/asm/Kbuild | 2 +-
arch/um/include/asm/kvm_para.h | 1 -
arch/unicore32/include/asm/Kbuild | 1 +
arch/unicore32/include/asm/kvm_para.h | 1 -
arch/x86/include/asm/Kbuild | 18 +++++++++
arch/x86/include/asm/cputime.h | 1 -
arch/x86/include/asm/errno.h | 1 -
arch/x86/include/asm/fcntl.h | 1 -
arch/x86/include/asm/ioctl.h | 1 -
arch/x86/include/asm/ioctls.h | 1 -
arch/x86/include/asm/ipcbuf.h | 1 -
arch/x86/include/asm/local64.h | 1 -
arch/x86/include/asm/msgbuf.h | 1 -
arch/x86/include/asm/param.h | 1 -
arch/x86/include/asm/poll.h | 1 -
arch/x86/include/asm/resource.h | 1 -
arch/x86/include/asm/rtc.h | 1 -
arch/x86/include/asm/shmbuf.h | 1 -
arch/x86/include/asm/socket.h | 1 -
arch/x86/include/asm/sockios.h | 1 -
arch/x86/include/asm/termbits.h | 1 -
arch/x86/include/asm/termios.h | 1 -
arch/x86/include/asm/types.h | 6 ---
arch/xtensa/include/asm/Kbuild | 25 ++++++++++++
arch/xtensa/include/asm/bitsperlong.h | 1 -
arch/xtensa/include/asm/bug.h | 18 ---------
arch/xtensa/include/asm/cputime.h | 6 ---
arch/xtensa/include/asm/device.h | 7 ----
arch/xtensa/include/asm/div64.h | 16 --------
arch/xtensa/include/asm/emergency-restart.h | 6 ---
arch/xtensa/include/asm/errno.h | 16 --------
arch/xtensa/include/asm/fcntl.h | 1 -
arch/xtensa/include/asm/futex.h | 1 -
arch/xtensa/include/asm/hardirq.h | 16 --------
arch/xtensa/include/asm/ioctl.h | 1 -
arch/xtensa/include/asm/irq_regs.h | 1 -
arch/xtensa/include/asm/kdebug.h | 1 -
arch/xtensa/include/asm/kmap_types.h | 6 ---
arch/xtensa/include/asm/kvm_para.h | 1 -
arch/xtensa/include/asm/local.h | 16 --------
arch/xtensa/include/asm/local64.h | 1 -
arch/xtensa/include/asm/percpu.h | 16 --------
arch/xtensa/include/asm/resource.h | 16 --------
arch/xtensa/include/asm/scatterlist.h | 16 --------
arch/xtensa/include/asm/sections.h | 16 --------
arch/xtensa/include/asm/siginfo.h | 16 --------
arch/xtensa/include/asm/statfs.h | 17 ---------
arch/xtensa/include/asm/topology.h | 16 --------
arch/xtensa/include/asm/xor.h | 16 --------
390 files changed, 369 insertions(+), 1378 deletions(-)
^ permalink raw reply [flat|nested] 51+ messages in thread
* [PATCH 01/25] alpha: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 02/25] arm: " Steven Rostedt
` (25 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch
Cc: Andrew Morton, Richard Henderson, Ivan Kokshaysky, Matt Turner
[-- Attachment #1: 0001-alpha-Use-Kbuild-infrastructure-to-handle-asm-generi.patch --]
[-- Type: text/plain, Size: 5879 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: linux-alpha@vger.kernel.org
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/alpha/include/asm/Kbuild | 12 ++++++++++++
arch/alpha/include/asm/cputime.h | 6 ------
arch/alpha/include/asm/device.h | 7 -------
arch/alpha/include/asm/div64.h | 1 -
arch/alpha/include/asm/emergency-restart.h | 6 ------
arch/alpha/include/asm/ipcbuf.h | 1 -
arch/alpha/include/asm/irq_regs.h | 1 -
arch/alpha/include/asm/kdebug.h | 1 -
arch/alpha/include/asm/kvm_para.h | 1 -
arch/alpha/include/asm/local64.h | 1 -
arch/alpha/include/asm/poll.h | 1 -
arch/alpha/include/asm/scatterlist.h | 6 ------
arch/alpha/include/asm/sections.h | 7 -------
13 files changed, 12 insertions(+), 39 deletions(-)
delete mode 100644 arch/alpha/include/asm/cputime.h
delete mode 100644 arch/alpha/include/asm/device.h
delete mode 100644 arch/alpha/include/asm/div64.h
delete mode 100644 arch/alpha/include/asm/emergency-restart.h
delete mode 100644 arch/alpha/include/asm/ipcbuf.h
delete mode 100644 arch/alpha/include/asm/irq_regs.h
delete mode 100644 arch/alpha/include/asm/kdebug.h
delete mode 100644 arch/alpha/include/asm/kvm_para.h
delete mode 100644 arch/alpha/include/asm/local64.h
delete mode 100644 arch/alpha/include/asm/poll.h
delete mode 100644 arch/alpha/include/asm/scatterlist.h
delete mode 100644 arch/alpha/include/asm/sections.h
diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
index 64ffc9e..2bd12d6 100644
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
@@ -10,4 +10,16 @@ header-y += pal.h
header-y += reg.h
header-y += regdef.h
header-y += sysinfo.h
+generic-y += cputime.h
generic-y += exec.h
+generic-y += device.h
+generic-y += div64.h
+generic-y += emergency-restart.h
+generic-y += ipcbuf.h
+generic-y += irq_regs.h
+generic-y += kdebug.h
+generic-y += kvm_para.h
+generic-y += local64.h
+generic-y += poll.h
+generic-y += scatterlist.h
+generic-y += sections.h
diff --git a/arch/alpha/include/asm/cputime.h b/arch/alpha/include/asm/cputime.h
deleted file mode 100644
index 19577fd..0000000
--- a/arch/alpha/include/asm/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ALPHA_CPUTIME_H
-#define __ALPHA_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __ALPHA_CPUTIME_H */
diff --git a/arch/alpha/include/asm/device.h b/arch/alpha/include/asm/device.h
deleted file mode 100644
index d8f9872..0000000
--- a/arch/alpha/include/asm/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/arch/alpha/include/asm/div64.h b/arch/alpha/include/asm/div64.h
deleted file mode 100644
index 6cd978c..0000000
--- a/arch/alpha/include/asm/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/arch/alpha/include/asm/emergency-restart.h b/arch/alpha/include/asm/emergency-restart.h
deleted file mode 100644
index 108d8c4..0000000
--- a/arch/alpha/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/arch/alpha/include/asm/ipcbuf.h b/arch/alpha/include/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51..0000000
--- a/arch/alpha/include/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
diff --git a/arch/alpha/include/asm/irq_regs.h b/arch/alpha/include/asm/irq_regs.h
deleted file mode 100644
index 3dd9c0b..0000000
--- a/arch/alpha/include/asm/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
diff --git a/arch/alpha/include/asm/kdebug.h b/arch/alpha/include/asm/kdebug.h
deleted file mode 100644
index 6ece1b0..0000000
--- a/arch/alpha/include/asm/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
diff --git a/arch/alpha/include/asm/kvm_para.h b/arch/alpha/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/alpha/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/alpha/include/asm/local64.h b/arch/alpha/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/alpha/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/alpha/include/asm/poll.h b/arch/alpha/include/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/alpha/include/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/alpha/include/asm/scatterlist.h b/arch/alpha/include/asm/scatterlist.h
deleted file mode 100644
index 017d747..0000000
--- a/arch/alpha/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ALPHA_SCATTERLIST_H
-#define _ALPHA_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* !(_ALPHA_SCATTERLIST_H) */
diff --git a/arch/alpha/include/asm/sections.h b/arch/alpha/include/asm/sections.h
deleted file mode 100644
index 43b40ed..0000000
--- a/arch/alpha/include/asm/sections.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ALPHA_SECTIONS_H
-#define _ALPHA_SECTIONS_H
-
-/* nothing to see, move along */
-#include <asm-generic/sections.h>
-
-#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 02/25] arm: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
2012-10-13 2:26 ` [PATCH 01/25] alpha: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 03/25] avr32: " Steven Rostedt
` (24 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Russell King
[-- Attachment #1: 0002-arm-Use-Kbuild-infrastructure-to-handle-asm-generic-.patch --]
[-- Type: text/plain, Size: 1715 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/arm/include/asm/Kbuild | 2 ++
arch/arm/include/asm/kvm_para.h | 1 -
arch/avr32/include/asm/ipcbuf.h | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
delete mode 100644 arch/arm/include/asm/kvm_para.h
delete mode 100644 arch/avr32/include/asm/ipcbuf.h
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index 8a7196c..ad80160 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -13,6 +13,7 @@ generic-y += ioctl.h
generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += kdebug.h
+generic-y += kvm_para.h
generic-y += local.h
generic-y += local64.h
generic-y += msgbuf.h
@@ -35,3 +36,4 @@ generic-y += termios.h
generic-y += timex.h
generic-y += types.h
generic-y += unaligned.h
+generic-y += ipcbuf.h
diff --git a/arch/arm/include/asm/kvm_para.h b/arch/arm/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/arm/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/avr32/include/asm/ipcbuf.h b/arch/avr32/include/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51..0000000
--- a/arch/avr32/include/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 03/25] avr32: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
2012-10-13 2:26 ` [PATCH 01/25] alpha: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
2012-10-13 2:26 ` [PATCH 02/25] arm: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2013-09-01 20:55 ` Hans-Christian Egtvedt
2012-10-13 2:26 ` [PATCH 04/25] blackfin: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
` (23 subsequent siblings)
26 siblings, 1 reply; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch
Cc: Andrew Morton, Haavard Skinnemoen, Hans-Christian Egtvedt
[-- Attachment #1: 0003-avr32-Use-Kbuild-infrastructure-to-handle-asm-generi.patch --]
[-- Type: text/plain, Size: 12087 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/avr32/include/asm/Kbuild | 27 +++++++++++++++++++++++++++
arch/avr32/include/asm/bitsperlong.h | 1 -
arch/avr32/include/asm/cputime.h | 6 ------
arch/avr32/include/asm/delay.h | 1 -
arch/avr32/include/asm/device.h | 7 -------
arch/avr32/include/asm/div64.h | 6 ------
arch/avr32/include/asm/emergency-restart.h | 6 ------
arch/avr32/include/asm/errno.h | 6 ------
arch/avr32/include/asm/fcntl.h | 6 ------
arch/avr32/include/asm/futex.h | 6 ------
arch/avr32/include/asm/ioctl.h | 6 ------
arch/avr32/include/asm/ioctls.h | 6 ------
arch/avr32/include/asm/irq_regs.h | 1 -
arch/avr32/include/asm/kvm_para.h | 1 -
arch/avr32/include/asm/local.h | 6 ------
arch/avr32/include/asm/local64.h | 1 -
arch/avr32/include/asm/mman.h | 1 -
arch/avr32/include/asm/percpu.h | 6 ------
arch/avr32/include/asm/poll.h | 1 -
arch/avr32/include/asm/resource.h | 6 ------
arch/avr32/include/asm/scatterlist.h | 6 ------
arch/avr32/include/asm/sections.h | 6 ------
arch/avr32/include/asm/siginfo.h | 6 ------
arch/avr32/include/asm/statfs.h | 6 ------
arch/avr32/include/asm/topology.h | 6 ------
arch/avr32/include/asm/xor.h | 6 ------
arch/cris/include/asm/ipcbuf.h | 1 -
27 files changed, 27 insertions(+), 117 deletions(-)
delete mode 100644 arch/avr32/include/asm/bitsperlong.h
delete mode 100644 arch/avr32/include/asm/cputime.h
delete mode 100644 arch/avr32/include/asm/delay.h
delete mode 100644 arch/avr32/include/asm/device.h
delete mode 100644 arch/avr32/include/asm/div64.h
delete mode 100644 arch/avr32/include/asm/emergency-restart.h
delete mode 100644 arch/avr32/include/asm/errno.h
delete mode 100644 arch/avr32/include/asm/fcntl.h
delete mode 100644 arch/avr32/include/asm/futex.h
delete mode 100644 arch/avr32/include/asm/ioctl.h
delete mode 100644 arch/avr32/include/asm/ioctls.h
delete mode 100644 arch/avr32/include/asm/irq_regs.h
delete mode 100644 arch/avr32/include/asm/kvm_para.h
delete mode 100644 arch/avr32/include/asm/local.h
delete mode 100644 arch/avr32/include/asm/local64.h
delete mode 100644 arch/avr32/include/asm/mman.h
delete mode 100644 arch/avr32/include/asm/percpu.h
delete mode 100644 arch/avr32/include/asm/poll.h
delete mode 100644 arch/avr32/include/asm/resource.h
delete mode 100644 arch/avr32/include/asm/scatterlist.h
delete mode 100644 arch/avr32/include/asm/sections.h
delete mode 100644 arch/avr32/include/asm/siginfo.h
delete mode 100644 arch/avr32/include/asm/statfs.h
delete mode 100644 arch/avr32/include/asm/topology.h
delete mode 100644 arch/avr32/include/asm/xor.h
delete mode 100644 arch/cris/include/asm/ipcbuf.h
diff --git a/arch/avr32/include/asm/Kbuild b/arch/avr32/include/asm/Kbuild
index be0433e..40573ee 100644
--- a/arch/avr32/include/asm/Kbuild
+++ b/arch/avr32/include/asm/Kbuild
@@ -4,3 +4,30 @@ generic-y += clkdev.h
generic-y += exec.h
header-y += cachectl.h
+
+generic-y += bitsperlong.h
+generic-y += cputime.h
+generic-y += delay.h
+generic-y += device.h
+generic-y += div64.h
+generic-y += emergency-restart.h
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += futex.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipcbuf.h
+generic-y += irq_regs.h
+generic-y += kvm_para.h
+generic-y += local64.h
+generic-y += local.h
+generic-y += mman.h
+generic-y += percpu.h
+generic-y += poll.h
+generic-y += resource.h
+generic-y += scatterlist.h
+generic-y += sections.h
+generic-y += siginfo.h
+generic-y += statfs.h
+generic-y += topology.h
+generic-y += xor.h
diff --git a/arch/avr32/include/asm/bitsperlong.h b/arch/avr32/include/asm/bitsperlong.h
deleted file mode 100644
index 6dc0bb0..0000000
--- a/arch/avr32/include/asm/bitsperlong.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/bitsperlong.h>
diff --git a/arch/avr32/include/asm/cputime.h b/arch/avr32/include/asm/cputime.h
deleted file mode 100644
index e87e0f8..0000000
--- a/arch/avr32/include/asm/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_CPUTIME_H
-#define __ASM_AVR32_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __ASM_AVR32_CPUTIME_H */
diff --git a/arch/avr32/include/asm/delay.h b/arch/avr32/include/asm/delay.h
deleted file mode 100644
index 9670e12..0000000
--- a/arch/avr32/include/asm/delay.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/delay.h>
diff --git a/arch/avr32/include/asm/device.h b/arch/avr32/include/asm/device.h
deleted file mode 100644
index d8f9872..0000000
--- a/arch/avr32/include/asm/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/arch/avr32/include/asm/div64.h b/arch/avr32/include/asm/div64.h
deleted file mode 100644
index d7ddd4f..0000000
--- a/arch/avr32/include/asm/div64.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_DIV64_H
-#define __ASM_AVR32_DIV64_H
-
-#include <asm-generic/div64.h>
-
-#endif /* __ASM_AVR32_DIV64_H */
diff --git a/arch/avr32/include/asm/emergency-restart.h b/arch/avr32/include/asm/emergency-restart.h
deleted file mode 100644
index 3e7e014..0000000
--- a/arch/avr32/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_EMERGENCY_RESTART_H
-#define __ASM_AVR32_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* __ASM_AVR32_EMERGENCY_RESTART_H */
diff --git a/arch/avr32/include/asm/errno.h b/arch/avr32/include/asm/errno.h
deleted file mode 100644
index 558a724..0000000
--- a/arch/avr32/include/asm/errno.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_ERRNO_H
-#define __ASM_AVR32_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif /* __ASM_AVR32_ERRNO_H */
diff --git a/arch/avr32/include/asm/fcntl.h b/arch/avr32/include/asm/fcntl.h
deleted file mode 100644
index 14c0c44..0000000
--- a/arch/avr32/include/asm/fcntl.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_FCNTL_H
-#define __ASM_AVR32_FCNTL_H
-
-#include <asm-generic/fcntl.h>
-
-#endif /* __ASM_AVR32_FCNTL_H */
diff --git a/arch/avr32/include/asm/futex.h b/arch/avr32/include/asm/futex.h
deleted file mode 100644
index 10419f1..0000000
--- a/arch/avr32/include/asm/futex.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_FUTEX_H
-#define __ASM_AVR32_FUTEX_H
-
-#include <asm-generic/futex.h>
-
-#endif /* __ASM_AVR32_FUTEX_H */
diff --git a/arch/avr32/include/asm/ioctl.h b/arch/avr32/include/asm/ioctl.h
deleted file mode 100644
index c8472c1..0000000
--- a/arch/avr32/include/asm/ioctl.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_IOCTL_H
-#define __ASM_AVR32_IOCTL_H
-
-#include <asm-generic/ioctl.h>
-
-#endif /* __ASM_AVR32_IOCTL_H */
diff --git a/arch/avr32/include/asm/ioctls.h b/arch/avr32/include/asm/ioctls.h
deleted file mode 100644
index 909cf66..0000000
--- a/arch/avr32/include/asm/ioctls.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_IOCTLS_H
-#define __ASM_AVR32_IOCTLS_H
-
-#include <asm-generic/ioctls.h>
-
-#endif /* __ASM_AVR32_IOCTLS_H */
diff --git a/arch/avr32/include/asm/irq_regs.h b/arch/avr32/include/asm/irq_regs.h
deleted file mode 100644
index 3dd9c0b..0000000
--- a/arch/avr32/include/asm/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
diff --git a/arch/avr32/include/asm/kvm_para.h b/arch/avr32/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/avr32/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/avr32/include/asm/local.h b/arch/avr32/include/asm/local.h
deleted file mode 100644
index 1c16196..0000000
--- a/arch/avr32/include/asm/local.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_LOCAL_H
-#define __ASM_AVR32_LOCAL_H
-
-#include <asm-generic/local.h>
-
-#endif /* __ASM_AVR32_LOCAL_H */
diff --git a/arch/avr32/include/asm/local64.h b/arch/avr32/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/avr32/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/avr32/include/asm/mman.h b/arch/avr32/include/asm/mman.h
deleted file mode 100644
index 8eebf89..0000000
--- a/arch/avr32/include/asm/mman.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/mman.h>
diff --git a/arch/avr32/include/asm/percpu.h b/arch/avr32/include/asm/percpu.h
deleted file mode 100644
index 69227b4..0000000
--- a/arch/avr32/include/asm/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_PERCPU_H
-#define __ASM_AVR32_PERCPU_H
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ASM_AVR32_PERCPU_H */
diff --git a/arch/avr32/include/asm/poll.h b/arch/avr32/include/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/avr32/include/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/avr32/include/asm/resource.h b/arch/avr32/include/asm/resource.h
deleted file mode 100644
index c6dd101..0000000
--- a/arch/avr32/include/asm/resource.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_RESOURCE_H
-#define __ASM_AVR32_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif /* __ASM_AVR32_RESOURCE_H */
diff --git a/arch/avr32/include/asm/scatterlist.h b/arch/avr32/include/asm/scatterlist.h
deleted file mode 100644
index a5902d9..0000000
--- a/arch/avr32/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_SCATTERLIST_H
-#define __ASM_AVR32_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* __ASM_AVR32_SCATTERLIST_H */
diff --git a/arch/avr32/include/asm/sections.h b/arch/avr32/include/asm/sections.h
deleted file mode 100644
index aa14252..0000000
--- a/arch/avr32/include/asm/sections.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_SECTIONS_H
-#define __ASM_AVR32_SECTIONS_H
-
-#include <asm-generic/sections.h>
-
-#endif /* __ASM_AVR32_SECTIONS_H */
diff --git a/arch/avr32/include/asm/siginfo.h b/arch/avr32/include/asm/siginfo.h
deleted file mode 100644
index 5ee93f4..0000000
--- a/arch/avr32/include/asm/siginfo.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _AVR32_SIGINFO_H
-#define _AVR32_SIGINFO_H
-
-#include <asm-generic/siginfo.h>
-
-#endif
diff --git a/arch/avr32/include/asm/statfs.h b/arch/avr32/include/asm/statfs.h
deleted file mode 100644
index 2961bd1..0000000
--- a/arch/avr32/include/asm/statfs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_STATFS_H
-#define __ASM_AVR32_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif /* __ASM_AVR32_STATFS_H */
diff --git a/arch/avr32/include/asm/topology.h b/arch/avr32/include/asm/topology.h
deleted file mode 100644
index 5b766cb..0000000
--- a/arch/avr32/include/asm/topology.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_AVR32_TOPOLOGY_H
-#define __ASM_AVR32_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* __ASM_AVR32_TOPOLOGY_H */
diff --git a/arch/avr32/include/asm/xor.h b/arch/avr32/include/asm/xor.h
deleted file mode 100644
index 99c87aa..0000000
--- a/arch/avr32/include/asm/xor.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_XOR_H
-#define _ASM_XOR_H
-
-#include <asm-generic/xor.h>
-
-#endif
diff --git a/arch/cris/include/asm/ipcbuf.h b/arch/cris/include/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51..0000000
--- a/arch/cris/include/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 04/25] blackfin: Use Kbuild infrastructure for kvm_para.h
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (2 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 03/25] avr32: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 4:12 ` Mike Frysinger
2012-10-13 2:26 ` [PATCH 05/25] c6x: " Steven Rostedt
` (22 subsequent siblings)
26 siblings, 1 reply; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Mike Frysinger
[-- Attachment #1: 0004-blackfin-Use-Kbuild-infrastructure-for-kvm_para.h.patch --]
[-- Type: text/plain, Size: 1167 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
All the headers but kvm_para.h use the Kbuild infrastructure to
get to the asm-generic headers.
Cc: linux-kbuild@vger.kernel.org
Cc: uclinux-dist-devel@blackfin.uclinux.org
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/blackfin/include/asm/Kbuild | 1 +
arch/blackfin/include/asm/kvm_para.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 arch/blackfin/include/asm/kvm_para.h
diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild
index 5a0625a..731b81a 100644
--- a/arch/blackfin/include/asm/Kbuild
+++ b/arch/blackfin/include/asm/Kbuild
@@ -17,6 +17,7 @@ generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += kdebug.h
generic-y += kmap_types.h
+generic-y += kvm_para.h
generic-y += local64.h
generic-y += local.h
generic-y += mman.h
diff --git a/arch/blackfin/include/asm/kvm_para.h b/arch/blackfin/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/blackfin/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 05/25] c6x: Use Kbuild infrastructure for kvm_para.h
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (3 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 04/25] blackfin: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 06/25] cris: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
` (21 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Mark Salter, Aurelien Jacquiot
[-- Attachment #1: 0005-c6x-Use-Kbuild-infrastructure-for-kvm_para.h.patch --]
[-- Type: text/plain, Size: 1149 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
All the headers but kvm_para.h use the Kbuild infrastructure to
get to the asm-generic headers.
Cc: linux-kbuild@vger.kernel.org
Cc: linux-c6x-dev@linux-c6x.org
Cc: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/c6x/include/asm/Kbuild | 1 +
arch/c6x/include/asm/kvm_para.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 arch/c6x/include/asm/kvm_para.h
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index 4e4e98d..77d2617 100644
--- a/arch/c6x/include/asm/Kbuild
+++ b/arch/c6x/include/asm/Kbuild
@@ -24,6 +24,7 @@ generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += kdebug.h
generic-y += kmap_types.h
+generic-y += kvm_para.h
generic-y += local.h
generic-y += mman.h
generic-y += mmu_context.h
diff --git a/arch/c6x/include/asm/kvm_para.h b/arch/c6x/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/c6x/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 06/25] cris: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (4 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 05/25] c6x: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 07/25] frv: " Steven Rostedt
` (20 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Mikael Starvik, Jesper Nilsson
[-- Attachment #1: 0006-cris-Use-Kbuild-infrastructure-to-handle-asm-generic.patch --]
[-- Type: text/plain, Size: 10718 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: linux-cris-kernel@axis.com
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/cris/include/asm/Kbuild | 24 ++++++++++++++++++++++++
arch/cris/include/asm/bitsperlong.h | 1 -
arch/cris/include/asm/cputime.h | 6 ------
arch/cris/include/asm/device.h | 7 -------
arch/cris/include/asm/div64.h | 1 -
arch/cris/include/asm/emergency-restart.h | 6 ------
arch/cris/include/asm/errno.h | 6 ------
arch/cris/include/asm/fcntl.h | 1 -
arch/cris/include/asm/futex.h | 6 ------
arch/cris/include/asm/ioctl.h | 1 -
arch/cris/include/asm/irq_regs.h | 1 -
arch/cris/include/asm/kdebug.h | 1 -
arch/cris/include/asm/kmap_types.h | 10 ----------
arch/cris/include/asm/local.h | 1 -
arch/cris/include/asm/local64.h | 1 -
arch/cris/include/asm/mman.h | 1 -
arch/cris/include/asm/percpu.h | 6 ------
arch/cris/include/asm/poll.h | 1 -
arch/cris/include/asm/resource.h | 6 ------
arch/cris/include/asm/scatterlist.h | 6 ------
arch/cris/include/asm/sections.h | 7 -------
arch/cris/include/asm/siginfo.h | 6 ------
arch/cris/include/asm/statfs.h | 6 ------
arch/cris/include/asm/topology.h | 6 ------
arch/frv/include/asm/ipcbuf.h | 1 -
25 files changed, 24 insertions(+), 95 deletions(-)
delete mode 100644 arch/cris/include/asm/bitsperlong.h
delete mode 100644 arch/cris/include/asm/cputime.h
delete mode 100644 arch/cris/include/asm/device.h
delete mode 100644 arch/cris/include/asm/div64.h
delete mode 100644 arch/cris/include/asm/emergency-restart.h
delete mode 100644 arch/cris/include/asm/errno.h
delete mode 100644 arch/cris/include/asm/fcntl.h
delete mode 100644 arch/cris/include/asm/futex.h
delete mode 100644 arch/cris/include/asm/ioctl.h
delete mode 100644 arch/cris/include/asm/irq_regs.h
delete mode 100644 arch/cris/include/asm/kdebug.h
delete mode 100644 arch/cris/include/asm/kmap_types.h
delete mode 100644 arch/cris/include/asm/local.h
delete mode 100644 arch/cris/include/asm/local64.h
delete mode 100644 arch/cris/include/asm/mman.h
delete mode 100644 arch/cris/include/asm/percpu.h
delete mode 100644 arch/cris/include/asm/poll.h
delete mode 100644 arch/cris/include/asm/resource.h
delete mode 100644 arch/cris/include/asm/scatterlist.h
delete mode 100644 arch/cris/include/asm/sections.h
delete mode 100644 arch/cris/include/asm/siginfo.h
delete mode 100644 arch/cris/include/asm/statfs.h
delete mode 100644 arch/cris/include/asm/topology.h
delete mode 100644 arch/frv/include/asm/ipcbuf.h
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index ff1bf7f..502409a 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -8,5 +8,29 @@ header-y += etraxgpio.h
header-y += rs485.h
header-y += sync_serial.h
+generic-y += bitsperlong.h
generic-y += clkdev.h
+generic-y += cputime.h
+generic-y += device.h
+generic-y += div64.h
+generic-y += emergency-restart.h
+generic-y += errno.h
generic-y += exec.h
+generic-y += fcntl.h
+generic-y += futex.h
+generic-y += ioctl.h
+generic-y += ipcbuf.h
+generic-y += irq_regs.h
+generic-y += kdebug.h
+generic-y += kmap_types.h
+generic-y += local64.h
+generic-y += local.h
+generic-y += mman.h
+generic-y += percpu.h
+generic-y += poll.h
+generic-y += resource.h
+generic-y += scatterlist.h
+generic-y += sections.h
+generic-y += siginfo.h
+generic-y += statfs.h
+generic-y += topology.h
diff --git a/arch/cris/include/asm/bitsperlong.h b/arch/cris/include/asm/bitsperlong.h
deleted file mode 100644
index 6dc0bb0..0000000
--- a/arch/cris/include/asm/bitsperlong.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/bitsperlong.h>
diff --git a/arch/cris/include/asm/cputime.h b/arch/cris/include/asm/cputime.h
deleted file mode 100644
index 4446a65..0000000
--- a/arch/cris/include/asm/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __CRIS_CPUTIME_H
-#define __CRIS_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __CRIS_CPUTIME_H */
diff --git a/arch/cris/include/asm/device.h b/arch/cris/include/asm/device.h
deleted file mode 100644
index d8f9872..0000000
--- a/arch/cris/include/asm/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/arch/cris/include/asm/div64.h b/arch/cris/include/asm/div64.h
deleted file mode 100644
index 6cd978c..0000000
--- a/arch/cris/include/asm/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/arch/cris/include/asm/emergency-restart.h b/arch/cris/include/asm/emergency-restart.h
deleted file mode 100644
index 108d8c4..0000000
--- a/arch/cris/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/arch/cris/include/asm/errno.h b/arch/cris/include/asm/errno.h
deleted file mode 100644
index 2bf5eb5..0000000
--- a/arch/cris/include/asm/errno.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _CRIS_ERRNO_H
-#define _CRIS_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif
diff --git a/arch/cris/include/asm/fcntl.h b/arch/cris/include/asm/fcntl.h
deleted file mode 100644
index 46ab12d..0000000
--- a/arch/cris/include/asm/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/arch/cris/include/asm/futex.h b/arch/cris/include/asm/futex.h
deleted file mode 100644
index 6a332a9..0000000
--- a/arch/cris/include/asm/futex.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_FUTEX_H
-#define _ASM_FUTEX_H
-
-#include <asm-generic/futex.h>
-
-#endif
diff --git a/arch/cris/include/asm/ioctl.h b/arch/cris/include/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/arch/cris/include/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/arch/cris/include/asm/irq_regs.h b/arch/cris/include/asm/irq_regs.h
deleted file mode 100644
index 3dd9c0b..0000000
--- a/arch/cris/include/asm/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
diff --git a/arch/cris/include/asm/kdebug.h b/arch/cris/include/asm/kdebug.h
deleted file mode 100644
index 6ece1b0..0000000
--- a/arch/cris/include/asm/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
diff --git a/arch/cris/include/asm/kmap_types.h b/arch/cris/include/asm/kmap_types.h
deleted file mode 100644
index d2d643c..0000000
--- a/arch/cris/include/asm/kmap_types.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-/* Dummy header just to define km_type. None of this
- * is actually used on cris.
- */
-
-#include <asm-generic/kmap_types.h>
-
-#endif
diff --git a/arch/cris/include/asm/local.h b/arch/cris/include/asm/local.h
deleted file mode 100644
index c11c530..0000000
--- a/arch/cris/include/asm/local.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local.h>
diff --git a/arch/cris/include/asm/local64.h b/arch/cris/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/cris/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/cris/include/asm/mman.h b/arch/cris/include/asm/mman.h
deleted file mode 100644
index 8eebf89..0000000
--- a/arch/cris/include/asm/mman.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/mman.h>
diff --git a/arch/cris/include/asm/percpu.h b/arch/cris/include/asm/percpu.h
deleted file mode 100644
index 6db9b43..0000000
--- a/arch/cris/include/asm/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _CRIS_PERCPU_H
-#define _CRIS_PERCPU_H
-
-#include <asm-generic/percpu.h>
-
-#endif /* _CRIS_PERCPU_H */
diff --git a/arch/cris/include/asm/poll.h b/arch/cris/include/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/cris/include/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/cris/include/asm/resource.h b/arch/cris/include/asm/resource.h
deleted file mode 100644
index b5d2944..0000000
--- a/arch/cris/include/asm/resource.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _CRIS_RESOURCE_H
-#define _CRIS_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif
diff --git a/arch/cris/include/asm/scatterlist.h b/arch/cris/include/asm/scatterlist.h
deleted file mode 100644
index f11f8f4..0000000
--- a/arch/cris/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_CRIS_SCATTERLIST_H
-#define __ASM_CRIS_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* !(__ASM_CRIS_SCATTERLIST_H) */
diff --git a/arch/cris/include/asm/sections.h b/arch/cris/include/asm/sections.h
deleted file mode 100644
index 2c998ce..0000000
--- a/arch/cris/include/asm/sections.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _CRIS_SECTIONS_H
-#define _CRIS_SECTIONS_H
-
-/* nothing to see, move along */
-#include <asm-generic/sections.h>
-
-#endif
diff --git a/arch/cris/include/asm/siginfo.h b/arch/cris/include/asm/siginfo.h
deleted file mode 100644
index c1cd6d1..0000000
--- a/arch/cris/include/asm/siginfo.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _CRIS_SIGINFO_H
-#define _CRIS_SIGINFO_H
-
-#include <asm-generic/siginfo.h>
-
-#endif
diff --git a/arch/cris/include/asm/statfs.h b/arch/cris/include/asm/statfs.h
deleted file mode 100644
index fdaf921..0000000
--- a/arch/cris/include/asm/statfs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _CRIS_STATFS_H
-#define _CRIS_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif
diff --git a/arch/cris/include/asm/topology.h b/arch/cris/include/asm/topology.h
deleted file mode 100644
index 2ac613d..0000000
--- a/arch/cris/include/asm/topology.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_CRIS_TOPOLOGY_H
-#define _ASM_CRIS_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_CRIS_TOPOLOGY_H */
diff --git a/arch/frv/include/asm/ipcbuf.h b/arch/frv/include/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51..0000000
--- a/arch/frv/include/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 07/25] frv: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (5 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 06/25] cris: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 08/25] h8300: " Steven Rostedt
` (19 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, David Howells
[-- Attachment #1: 0007-frv-Use-Kbuild-infrastructure-to-handle-asm-generic-.patch --]
[-- Type: text/plain, Size: 8372 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/frv/include/asm/Kbuild | 19 +++++++++++++++++++
arch/frv/include/asm/bitsperlong.h | 1 -
arch/frv/include/asm/cputime.h | 6 ------
arch/frv/include/asm/device.h | 7 -------
arch/frv/include/asm/div64.h | 1 -
arch/frv/include/asm/emergency-restart.h | 6 ------
arch/frv/include/asm/errno.h | 7 -------
arch/frv/include/asm/fcntl.h | 1 -
arch/frv/include/asm/ioctl.h | 1 -
arch/frv/include/asm/kdebug.h | 1 -
arch/frv/include/asm/kvm_para.h | 1 -
arch/frv/include/asm/local.h | 6 ------
arch/frv/include/asm/local64.h | 1 -
arch/frv/include/asm/mman.h | 1 -
arch/frv/include/asm/percpu.h | 6 ------
arch/frv/include/asm/resource.h | 7 -------
arch/frv/include/asm/scatterlist.h | 6 ------
arch/frv/include/asm/statfs.h | 7 -------
arch/frv/include/asm/xor.h | 1 -
arch/h8300/include/asm/ipcbuf.h | 1 -
20 files changed, 19 insertions(+), 68 deletions(-)
delete mode 100644 arch/frv/include/asm/bitsperlong.h
delete mode 100644 arch/frv/include/asm/cputime.h
delete mode 100644 arch/frv/include/asm/device.h
delete mode 100644 arch/frv/include/asm/div64.h
delete mode 100644 arch/frv/include/asm/emergency-restart.h
delete mode 100644 arch/frv/include/asm/errno.h
delete mode 100644 arch/frv/include/asm/fcntl.h
delete mode 100644 arch/frv/include/asm/ioctl.h
delete mode 100644 arch/frv/include/asm/kdebug.h
delete mode 100644 arch/frv/include/asm/kvm_para.h
delete mode 100644 arch/frv/include/asm/local.h
delete mode 100644 arch/frv/include/asm/local64.h
delete mode 100644 arch/frv/include/asm/mman.h
delete mode 100644 arch/frv/include/asm/percpu.h
delete mode 100644 arch/frv/include/asm/resource.h
delete mode 100644 arch/frv/include/asm/scatterlist.h
delete mode 100644 arch/frv/include/asm/statfs.h
delete mode 100644 arch/frv/include/asm/xor.h
delete mode 100644 arch/h8300/include/asm/ipcbuf.h
diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild
index 251bd71..1e46bc5 100644
--- a/arch/frv/include/asm/Kbuild
+++ b/arch/frv/include/asm/Kbuild
@@ -2,5 +2,24 @@ include include/asm-generic/Kbuild.asm
header-y += registers.h
header-y += termios.h
+generic-y += bitsperlong.h
generic-y += clkdev.h
+generic-y += cputime.h
+generic-y += device.h
+generic-y += div64.h
+generic-y += emergency-restart.h
+generic-y += errno.h
generic-y += exec.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += ipcbuf.h
+generic-y += kdebug.h
+generic-y += kvm_para.h
+generic-y += local64.h
+generic-y += local.h
+generic-y += mman.h
+generic-y += percpu.h
+generic-y += resource.h
+generic-y += scatterlist.h
+generic-y += statfs.h
+generic-y += xor.h
diff --git a/arch/frv/include/asm/bitsperlong.h b/arch/frv/include/asm/bitsperlong.h
deleted file mode 100644
index 6dc0bb0..0000000
--- a/arch/frv/include/asm/bitsperlong.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/bitsperlong.h>
diff --git a/arch/frv/include/asm/cputime.h b/arch/frv/include/asm/cputime.h
deleted file mode 100644
index f6c373a..0000000
--- a/arch/frv/include/asm/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_CPUTIME_H
-#define _ASM_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* _ASM_CPUTIME_H */
diff --git a/arch/frv/include/asm/device.h b/arch/frv/include/asm/device.h
deleted file mode 100644
index d8f9872..0000000
--- a/arch/frv/include/asm/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/arch/frv/include/asm/div64.h b/arch/frv/include/asm/div64.h
deleted file mode 100644
index 6cd978c..0000000
--- a/arch/frv/include/asm/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/arch/frv/include/asm/emergency-restart.h b/arch/frv/include/asm/emergency-restart.h
deleted file mode 100644
index 108d8c4..0000000
--- a/arch/frv/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/arch/frv/include/asm/errno.h b/arch/frv/include/asm/errno.h
deleted file mode 100644
index d010795..0000000
--- a/arch/frv/include/asm/errno.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_ERRNO_H
-#define _ASM_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif /* _ASM_ERRNO_H */
-
diff --git a/arch/frv/include/asm/fcntl.h b/arch/frv/include/asm/fcntl.h
deleted file mode 100644
index 46ab12d..0000000
--- a/arch/frv/include/asm/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/arch/frv/include/asm/ioctl.h b/arch/frv/include/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/arch/frv/include/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/arch/frv/include/asm/kdebug.h b/arch/frv/include/asm/kdebug.h
deleted file mode 100644
index 6ece1b0..0000000
--- a/arch/frv/include/asm/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
diff --git a/arch/frv/include/asm/kvm_para.h b/arch/frv/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/frv/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/frv/include/asm/local.h b/arch/frv/include/asm/local.h
deleted file mode 100644
index c27bdf0..0000000
--- a/arch/frv/include/asm/local.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_LOCAL_H
-#define _ASM_LOCAL_H
-
-#include <asm-generic/local.h>
-
-#endif /* _ASM_LOCAL_H */
diff --git a/arch/frv/include/asm/local64.h b/arch/frv/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/frv/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/frv/include/asm/mman.h b/arch/frv/include/asm/mman.h
deleted file mode 100644
index 8eebf89..0000000
--- a/arch/frv/include/asm/mman.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/mman.h>
diff --git a/arch/frv/include/asm/percpu.h b/arch/frv/include/asm/percpu.h
deleted file mode 100644
index 2cad3f8..0000000
--- a/arch/frv/include/asm/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_PERCPU_H
-#define __ASM_PERCPU_H
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ASM_PERCPU_H */
diff --git a/arch/frv/include/asm/resource.h b/arch/frv/include/asm/resource.h
deleted file mode 100644
index 5fc6054..0000000
--- a/arch/frv/include/asm/resource.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_RESOURCE_H
-#define _ASM_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif /* _ASM_RESOURCE_H */
-
diff --git a/arch/frv/include/asm/scatterlist.h b/arch/frv/include/asm/scatterlist.h
deleted file mode 100644
index 0e5eb30..0000000
--- a/arch/frv/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCATTERLIST_H
-#define _ASM_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* !_ASM_SCATTERLIST_H */
diff --git a/arch/frv/include/asm/statfs.h b/arch/frv/include/asm/statfs.h
deleted file mode 100644
index 741f586..0000000
--- a/arch/frv/include/asm/statfs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_STATFS_H
-#define _ASM_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif /* _ASM_STATFS_H */
-
diff --git a/arch/frv/include/asm/xor.h b/arch/frv/include/asm/xor.h
deleted file mode 100644
index c82eb12..0000000
--- a/arch/frv/include/asm/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/xor.h>
diff --git a/arch/h8300/include/asm/ipcbuf.h b/arch/h8300/include/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51..0000000
--- a/arch/h8300/include/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 08/25] h8300: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (6 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 07/25] frv: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 09/25] hexagon: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
` (18 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Yoshinori Sato
[-- Attachment #1: 0008-h8300-Use-Kbuild-infrastructure-to-handle-asm-generi.patch --]
[-- Type: text/plain, Size: 10462 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/h8300/include/asm/Kbuild | 23 +++++++++++++++++++++++
arch/h8300/include/asm/bitsperlong.h | 1 -
arch/h8300/include/asm/cputime.h | 6 ------
arch/h8300/include/asm/device.h | 7 -------
arch/h8300/include/asm/div64.h | 1 -
arch/h8300/include/asm/emergency-restart.h | 6 ------
arch/h8300/include/asm/errno.h | 6 ------
arch/h8300/include/asm/futex.h | 6 ------
arch/h8300/include/asm/ioctl.h | 1 -
arch/h8300/include/asm/irq_regs.h | 1 -
arch/h8300/include/asm/kdebug.h | 1 -
arch/h8300/include/asm/kmap_types.h | 6 ------
arch/h8300/include/asm/kvm_para.h | 1 -
arch/h8300/include/asm/local.h | 6 ------
arch/h8300/include/asm/local64.h | 1 -
arch/h8300/include/asm/mman.h | 1 -
arch/h8300/include/asm/percpu.h | 6 ------
arch/h8300/include/asm/resource.h | 6 ------
arch/h8300/include/asm/scatterlist.h | 6 ------
arch/h8300/include/asm/sections.h | 6 ------
arch/h8300/include/asm/siginfo.h | 6 ------
arch/h8300/include/asm/statfs.h | 6 ------
arch/h8300/include/asm/topology.h | 6 ------
arch/ia64/include/asm/ipcbuf.h | 1 -
24 files changed, 23 insertions(+), 94 deletions(-)
delete mode 100644 arch/h8300/include/asm/bitsperlong.h
delete mode 100644 arch/h8300/include/asm/cputime.h
delete mode 100644 arch/h8300/include/asm/device.h
delete mode 100644 arch/h8300/include/asm/div64.h
delete mode 100644 arch/h8300/include/asm/emergency-restart.h
delete mode 100644 arch/h8300/include/asm/errno.h
delete mode 100644 arch/h8300/include/asm/futex.h
delete mode 100644 arch/h8300/include/asm/ioctl.h
delete mode 100644 arch/h8300/include/asm/irq_regs.h
delete mode 100644 arch/h8300/include/asm/kdebug.h
delete mode 100644 arch/h8300/include/asm/kmap_types.h
delete mode 100644 arch/h8300/include/asm/kvm_para.h
delete mode 100644 arch/h8300/include/asm/local.h
delete mode 100644 arch/h8300/include/asm/local64.h
delete mode 100644 arch/h8300/include/asm/mman.h
delete mode 100644 arch/h8300/include/asm/percpu.h
delete mode 100644 arch/h8300/include/asm/resource.h
delete mode 100644 arch/h8300/include/asm/scatterlist.h
delete mode 100644 arch/h8300/include/asm/sections.h
delete mode 100644 arch/h8300/include/asm/siginfo.h
delete mode 100644 arch/h8300/include/asm/statfs.h
delete mode 100644 arch/h8300/include/asm/topology.h
delete mode 100644 arch/ia64/include/asm/ipcbuf.h
diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild
index fccd81e..aa6696e 100644
--- a/arch/h8300/include/asm/Kbuild
+++ b/arch/h8300/include/asm/Kbuild
@@ -1,4 +1,27 @@
include include/asm-generic/Kbuild.asm
+generic-y += bitsperlong.h
+generic-y += cputime.h
generic-y += clkdev.h
+generic-y += device.h
+generic-y += div64.h
+generic-y += emergency-restart.h
+generic-y += errno.h
generic-y += exec.h
+generic-y += futex.h
+generic-y += ioctl.h
+generic-y += ipcbuf.h
+generic-y += irq_regs.h
+generic-y += kdebug.h
+generic-y += kmap_types.h
+generic-y += kvm_para.h
+generic-y += local64.h
+generic-y += local.h
+generic-y += mman.h
+generic-y += percpu.h
+generic-y += resource.h
+generic-y += scatterlist.h
+generic-y += sections.h
+generic-y += siginfo.h
+generic-y += statfs.h
+generic-y += topology.h
diff --git a/arch/h8300/include/asm/bitsperlong.h b/arch/h8300/include/asm/bitsperlong.h
deleted file mode 100644
index 6dc0bb0..0000000
--- a/arch/h8300/include/asm/bitsperlong.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/bitsperlong.h>
diff --git a/arch/h8300/include/asm/cputime.h b/arch/h8300/include/asm/cputime.h
deleted file mode 100644
index 092e187..0000000
--- a/arch/h8300/include/asm/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __H8300_CPUTIME_H
-#define __H8300_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __H8300_CPUTIME_H */
diff --git a/arch/h8300/include/asm/device.h b/arch/h8300/include/asm/device.h
deleted file mode 100644
index d8f9872..0000000
--- a/arch/h8300/include/asm/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/arch/h8300/include/asm/div64.h b/arch/h8300/include/asm/div64.h
deleted file mode 100644
index 6cd978c..0000000
--- a/arch/h8300/include/asm/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/arch/h8300/include/asm/emergency-restart.h b/arch/h8300/include/asm/emergency-restart.h
deleted file mode 100644
index 108d8c4..0000000
--- a/arch/h8300/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/arch/h8300/include/asm/errno.h b/arch/h8300/include/asm/errno.h
deleted file mode 100644
index 0c2f564..0000000
--- a/arch/h8300/include/asm/errno.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _H8300_ERRNO_H
-#define _H8300_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif /* _H8300_ERRNO_H */
diff --git a/arch/h8300/include/asm/futex.h b/arch/h8300/include/asm/futex.h
deleted file mode 100644
index 6a332a9..0000000
--- a/arch/h8300/include/asm/futex.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_FUTEX_H
-#define _ASM_FUTEX_H
-
-#include <asm-generic/futex.h>
-
-#endif
diff --git a/arch/h8300/include/asm/ioctl.h b/arch/h8300/include/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/arch/h8300/include/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/arch/h8300/include/asm/irq_regs.h b/arch/h8300/include/asm/irq_regs.h
deleted file mode 100644
index 3dd9c0b..0000000
--- a/arch/h8300/include/asm/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
diff --git a/arch/h8300/include/asm/kdebug.h b/arch/h8300/include/asm/kdebug.h
deleted file mode 100644
index 6ece1b0..0000000
--- a/arch/h8300/include/asm/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
diff --git a/arch/h8300/include/asm/kmap_types.h b/arch/h8300/include/asm/kmap_types.h
deleted file mode 100644
index be12a71..0000000
--- a/arch/h8300/include/asm/kmap_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_H8300_KMAP_TYPES_H
-#define _ASM_H8300_KMAP_TYPES_H
-
-#include <asm-generic/kmap_types.h>
-
-#endif
diff --git a/arch/h8300/include/asm/kvm_para.h b/arch/h8300/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/h8300/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/h8300/include/asm/local.h b/arch/h8300/include/asm/local.h
deleted file mode 100644
index fdd4efe..0000000
--- a/arch/h8300/include/asm/local.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _H8300_LOCAL_H_
-#define _H8300_LOCAL_H_
-
-#include <asm-generic/local.h>
-
-#endif
diff --git a/arch/h8300/include/asm/local64.h b/arch/h8300/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/h8300/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/h8300/include/asm/mman.h b/arch/h8300/include/asm/mman.h
deleted file mode 100644
index 8eebf89..0000000
--- a/arch/h8300/include/asm/mman.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/mman.h>
diff --git a/arch/h8300/include/asm/percpu.h b/arch/h8300/include/asm/percpu.h
deleted file mode 100644
index 72c03e3..0000000
--- a/arch/h8300/include/asm/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ARCH_H8300_PERCPU__
-#define __ARCH_H8300_PERCPU__
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ARCH_H8300_PERCPU__ */
diff --git a/arch/h8300/include/asm/resource.h b/arch/h8300/include/asm/resource.h
deleted file mode 100644
index 46c5f43..0000000
--- a/arch/h8300/include/asm/resource.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _H8300_RESOURCE_H
-#define _H8300_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif /* _H8300_RESOURCE_H */
diff --git a/arch/h8300/include/asm/scatterlist.h b/arch/h8300/include/asm/scatterlist.h
deleted file mode 100644
index 82130ed..0000000
--- a/arch/h8300/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _H8300_SCATTERLIST_H
-#define _H8300_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* !(_H8300_SCATTERLIST_H) */
diff --git a/arch/h8300/include/asm/sections.h b/arch/h8300/include/asm/sections.h
deleted file mode 100644
index a81743e..0000000
--- a/arch/h8300/include/asm/sections.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _H8300_SECTIONS_H_
-#define _H8300_SECTIONS_H_
-
-#include <asm-generic/sections.h>
-
-#endif
diff --git a/arch/h8300/include/asm/siginfo.h b/arch/h8300/include/asm/siginfo.h
deleted file mode 100644
index bc8fbea..0000000
--- a/arch/h8300/include/asm/siginfo.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _H8300_SIGINFO_H
-#define _H8300_SIGINFO_H
-
-#include <asm-generic/siginfo.h>
-
-#endif
diff --git a/arch/h8300/include/asm/statfs.h b/arch/h8300/include/asm/statfs.h
deleted file mode 100644
index b96efa7..0000000
--- a/arch/h8300/include/asm/statfs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _H8300_STATFS_H
-#define _H8300_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif /* _H8300_STATFS_H */
diff --git a/arch/h8300/include/asm/topology.h b/arch/h8300/include/asm/topology.h
deleted file mode 100644
index fdc1219..0000000
--- a/arch/h8300/include/asm/topology.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_H8300_TOPOLOGY_H
-#define _ASM_H8300_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_H8300_TOPOLOGY_H */
diff --git a/arch/ia64/include/asm/ipcbuf.h b/arch/ia64/include/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51..0000000
--- a/arch/ia64/include/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 09/25] hexagon: Use Kbuild infrastructure for kvm_para.h
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (7 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 08/25] h8300: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 10/25] ia64: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
` (17 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Richard Kuo
[-- Attachment #1: 0009-hexagon-Use-Kbuild-infrastructure-for-kvm_para.h.patch --]
[-- Type: text/plain, Size: 1148 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
All the headers but kvm_para.h use the Kbuild infrastructure to
get to the asm-generic headers.
Cc: linux-kbuild@vger.kernel.org
Cc: linux-hexagon@vger.kernel.org
Cc: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/hexagon/include/asm/Kbuild | 1 +
arch/hexagon/include/asm/kvm_para.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 arch/hexagon/include/asm/kvm_para.h
diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild
index 3364b696..616544f 100644
--- a/arch/hexagon/include/asm/Kbuild
+++ b/arch/hexagon/include/asm/Kbuild
@@ -26,6 +26,7 @@ generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += kdebug.h
generic-y += kmap_types.h
+generic-y += kvm_para.h
generic-y += local64.h
generic-y += local.h
generic-y += local.h
diff --git a/arch/hexagon/include/asm/kvm_para.h b/arch/hexagon/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/hexagon/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 10/25] ia64: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (8 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 09/25] hexagon: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 11/25] m32r: " Steven Rostedt
` (16 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Tony Luck, Fenghua Yu
[-- Attachment #1: 0010-ia64-Use-Kbuild-infrastructure-to-handle-asm-generic.patch --]
[-- Type: text/plain, Size: 4665 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: linux-ia64@vger.kernel.org
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/ia64/include/asm/Kbuild | 10 ++++++++++
arch/ia64/include/asm/div64.h | 1 -
arch/ia64/include/asm/emergency-restart.h | 6 ------
arch/ia64/include/asm/errno.h | 1 -
arch/ia64/include/asm/ioctl.h | 1 -
arch/ia64/include/asm/ioctls.h | 6 ------
arch/ia64/include/asm/irq_regs.h | 1 -
arch/ia64/include/asm/local.h | 1 -
arch/ia64/include/asm/local64.h | 1 -
arch/ia64/include/asm/poll.h | 1 -
arch/m32r/include/asm/ipcbuf.h | 1 -
11 files changed, 10 insertions(+), 20 deletions(-)
delete mode 100644 arch/ia64/include/asm/div64.h
delete mode 100644 arch/ia64/include/asm/emergency-restart.h
delete mode 100644 arch/ia64/include/asm/errno.h
delete mode 100644 arch/ia64/include/asm/ioctl.h
delete mode 100644 arch/ia64/include/asm/ioctls.h
delete mode 100644 arch/ia64/include/asm/irq_regs.h
delete mode 100644 arch/ia64/include/asm/local.h
delete mode 100644 arch/ia64/include/asm/local64.h
delete mode 100644 arch/ia64/include/asm/poll.h
delete mode 100644 arch/m32r/include/asm/ipcbuf.h
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild
index 562f593..379f35d 100644
--- a/arch/ia64/include/asm/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
@@ -14,4 +14,14 @@ header-y += rse.h
header-y += ucontext.h
header-y += ustack.h
generic-y += clkdev.h
+generic-y += div64.h
+generic-y += emergency-restart.h
+generic-y += errno.h
generic-y += exec.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipcbuf.h
+generic-y += irq_regs.h
+generic-y += local64.h
+generic-y += local.h
+generic-y += poll.h
diff --git a/arch/ia64/include/asm/div64.h b/arch/ia64/include/asm/div64.h
deleted file mode 100644
index 6cd978c..0000000
--- a/arch/ia64/include/asm/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/arch/ia64/include/asm/emergency-restart.h b/arch/ia64/include/asm/emergency-restart.h
deleted file mode 100644
index 108d8c4..0000000
--- a/arch/ia64/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/arch/ia64/include/asm/errno.h b/arch/ia64/include/asm/errno.h
deleted file mode 100644
index 4c82b50..0000000
--- a/arch/ia64/include/asm/errno.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/errno.h>
diff --git a/arch/ia64/include/asm/ioctl.h b/arch/ia64/include/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/arch/ia64/include/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/arch/ia64/include/asm/ioctls.h b/arch/ia64/include/asm/ioctls.h
deleted file mode 100644
index f3aab55..0000000
--- a/arch/ia64/include/asm/ioctls.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_IA64_IOCTLS_H
-#define _ASM_IA64_IOCTLS_H
-
-#include <asm-generic/ioctls.h>
-
-#endif /* _ASM_IA64_IOCTLS_H */
diff --git a/arch/ia64/include/asm/irq_regs.h b/arch/ia64/include/asm/irq_regs.h
deleted file mode 100644
index 3dd9c0b..0000000
--- a/arch/ia64/include/asm/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
diff --git a/arch/ia64/include/asm/local.h b/arch/ia64/include/asm/local.h
deleted file mode 100644
index c11c530..0000000
--- a/arch/ia64/include/asm/local.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local.h>
diff --git a/arch/ia64/include/asm/local64.h b/arch/ia64/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/ia64/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/ia64/include/asm/poll.h b/arch/ia64/include/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/ia64/include/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/m32r/include/asm/ipcbuf.h b/arch/m32r/include/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51..0000000
--- a/arch/m32r/include/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 11/25] m32r: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (9 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 10/25] ia64: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 12/25] microblaze: " Steven Rostedt
` (15 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Hirokazu Takata
[-- Attachment #1: 0011-m32r-Use-Kbuild-infrastructure-to-handle-asm-generic.patch --]
[-- Type: text/plain, Size: 12432 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: linux-m32r@ml.linux-m32r.org
Cc: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/m32r/include/asm/Kbuild | 28 ++++++++++++++++++++++++++++
arch/m32r/include/asm/bitsperlong.h | 1 -
arch/m32r/include/asm/bug.h | 4 ----
arch/m32r/include/asm/cputime.h | 6 ------
arch/m32r/include/asm/delay.h | 1 -
arch/m32r/include/asm/device.h | 7 -------
arch/m32r/include/asm/div64.h | 1 -
arch/m32r/include/asm/emergency-restart.h | 6 ------
arch/m32r/include/asm/errno.h | 6 ------
arch/m32r/include/asm/fcntl.h | 1 -
arch/m32r/include/asm/futex.h | 6 ------
arch/m32r/include/asm/ioctl.h | 1 -
arch/m32r/include/asm/ioctls.h | 6 ------
arch/m32r/include/asm/irq_regs.h | 1 -
arch/m32r/include/asm/kdebug.h | 1 -
arch/m32r/include/asm/local64.h | 1 -
arch/m32r/include/asm/mman.h | 1 -
arch/m32r/include/asm/param.h | 7 -------
arch/m32r/include/asm/pci.h | 6 ------
arch/m32r/include/asm/percpu.h | 6 ------
arch/m32r/include/asm/poll.h | 1 -
arch/m32r/include/asm/resource.h | 6 ------
arch/m32r/include/asm/scatterlist.h | 6 ------
arch/m32r/include/asm/sections.h | 7 -------
arch/m32r/include/asm/siginfo.h | 6 ------
arch/m32r/include/asm/statfs.h | 6 ------
arch/m32r/include/asm/topology.h | 6 ------
arch/m32r/include/asm/xor.h | 6 ------
arch/microblaze/include/asm/ipcbuf.h | 1 -
29 files changed, 28 insertions(+), 114 deletions(-)
delete mode 100644 arch/m32r/include/asm/bitsperlong.h
delete mode 100644 arch/m32r/include/asm/bug.h
delete mode 100644 arch/m32r/include/asm/cputime.h
delete mode 100644 arch/m32r/include/asm/delay.h
delete mode 100644 arch/m32r/include/asm/device.h
delete mode 100644 arch/m32r/include/asm/div64.h
delete mode 100644 arch/m32r/include/asm/emergency-restart.h
delete mode 100644 arch/m32r/include/asm/errno.h
delete mode 100644 arch/m32r/include/asm/fcntl.h
delete mode 100644 arch/m32r/include/asm/futex.h
delete mode 100644 arch/m32r/include/asm/ioctl.h
delete mode 100644 arch/m32r/include/asm/ioctls.h
delete mode 100644 arch/m32r/include/asm/irq_regs.h
delete mode 100644 arch/m32r/include/asm/kdebug.h
delete mode 100644 arch/m32r/include/asm/local64.h
delete mode 100644 arch/m32r/include/asm/mman.h
delete mode 100644 arch/m32r/include/asm/param.h
delete mode 100644 arch/m32r/include/asm/pci.h
delete mode 100644 arch/m32r/include/asm/percpu.h
delete mode 100644 arch/m32r/include/asm/poll.h
delete mode 100644 arch/m32r/include/asm/resource.h
delete mode 100644 arch/m32r/include/asm/scatterlist.h
delete mode 100644 arch/m32r/include/asm/sections.h
delete mode 100644 arch/m32r/include/asm/siginfo.h
delete mode 100644 arch/m32r/include/asm/statfs.h
delete mode 100644 arch/m32r/include/asm/topology.h
delete mode 100644 arch/m32r/include/asm/xor.h
delete mode 100644 arch/microblaze/include/asm/ipcbuf.h
diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild
index fccd81e..2cde298 100644
--- a/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@ -1,4 +1,32 @@
include include/asm-generic/Kbuild.asm
+generic-y += bitsperlong.h
+generic-y += bug.h
+generic-y += cputime.h
generic-y += clkdev.h
+generic-y += delay.h
+generic-y += device.h
+generic-y += div64.h
+generic-y += emergency-restart.h
+generic-y += errno.h
generic-y += exec.h
+generic-y += fcntl.h
+generic-y += futex.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipcbuf.h
+generic-y += irq_regs.h
+generic-y += kdebug.h
+generic-y += local64.h
+generic-y += mman.h
+generic-y += param.h
+generic-y += pci.h
+generic-y += percpu.h
+generic-y += poll.h
+generic-y += resource.h
+generic-y += scatterlist.h
+generic-y += sections.h
+generic-y += siginfo.h
+generic-y += statfs.h
+generic-y += topology.h
+generic-y += xor.h
diff --git a/arch/m32r/include/asm/bitsperlong.h b/arch/m32r/include/asm/bitsperlong.h
deleted file mode 100644
index 6dc0bb0..0000000
--- a/arch/m32r/include/asm/bitsperlong.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/bitsperlong.h>
diff --git a/arch/m32r/include/asm/bug.h b/arch/m32r/include/asm/bug.h
deleted file mode 100644
index 4cc0462..0000000
--- a/arch/m32r/include/asm/bug.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _M32R_BUG_H
-#define _M32R_BUG_H
-#include <asm-generic/bug.h>
-#endif
diff --git a/arch/m32r/include/asm/cputime.h b/arch/m32r/include/asm/cputime.h
deleted file mode 100644
index 0a47550..0000000
--- a/arch/m32r/include/asm/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __M32R_CPUTIME_H
-#define __M32R_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __M32R_CPUTIME_H */
diff --git a/arch/m32r/include/asm/delay.h b/arch/m32r/include/asm/delay.h
deleted file mode 100644
index 9670e12..0000000
--- a/arch/m32r/include/asm/delay.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/delay.h>
diff --git a/arch/m32r/include/asm/device.h b/arch/m32r/include/asm/device.h
deleted file mode 100644
index d8f9872..0000000
--- a/arch/m32r/include/asm/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/arch/m32r/include/asm/div64.h b/arch/m32r/include/asm/div64.h
deleted file mode 100644
index 6cd978c..0000000
--- a/arch/m32r/include/asm/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/arch/m32r/include/asm/emergency-restart.h b/arch/m32r/include/asm/emergency-restart.h
deleted file mode 100644
index 108d8c4..0000000
--- a/arch/m32r/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/arch/m32r/include/asm/errno.h b/arch/m32r/include/asm/errno.h
deleted file mode 100644
index 7771492..0000000
--- a/arch/m32r/include/asm/errno.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M32R_ERRNO_H
-#define _ASM_M32R_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif /* _ASM_M32R_ERRNO_H */
diff --git a/arch/m32r/include/asm/fcntl.h b/arch/m32r/include/asm/fcntl.h
deleted file mode 100644
index 46ab12d..0000000
--- a/arch/m32r/include/asm/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/arch/m32r/include/asm/futex.h b/arch/m32r/include/asm/futex.h
deleted file mode 100644
index 6a332a9..0000000
--- a/arch/m32r/include/asm/futex.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_FUTEX_H
-#define _ASM_FUTEX_H
-
-#include <asm-generic/futex.h>
-
-#endif
diff --git a/arch/m32r/include/asm/ioctl.h b/arch/m32r/include/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/arch/m32r/include/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/arch/m32r/include/asm/ioctls.h b/arch/m32r/include/asm/ioctls.h
deleted file mode 100644
index 349bf87..0000000
--- a/arch/m32r/include/asm/ioctls.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ARCH_M32R_IOCTLS_H__
-#define __ARCH_M32R_IOCTLS_H__
-
-#include <asm-generic/ioctls.h>
-
-#endif /* __ARCH_M32R_IOCTLS_H__ */
diff --git a/arch/m32r/include/asm/irq_regs.h b/arch/m32r/include/asm/irq_regs.h
deleted file mode 100644
index 3dd9c0b..0000000
--- a/arch/m32r/include/asm/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
diff --git a/arch/m32r/include/asm/kdebug.h b/arch/m32r/include/asm/kdebug.h
deleted file mode 100644
index 6ece1b0..0000000
--- a/arch/m32r/include/asm/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
diff --git a/arch/m32r/include/asm/local64.h b/arch/m32r/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/m32r/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/m32r/include/asm/mman.h b/arch/m32r/include/asm/mman.h
deleted file mode 100644
index 8eebf89..0000000
--- a/arch/m32r/include/asm/mman.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/mman.h>
diff --git a/arch/m32r/include/asm/param.h b/arch/m32r/include/asm/param.h
deleted file mode 100644
index fa207bd..0000000
--- a/arch/m32r/include/asm/param.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_M32R_PARAM_H
-#define _ASM_M32R_PARAM_H
-
-#include <asm-generic/param.h>
-
-#endif /* _ASM_M32R_PARAM_H */
-
diff --git a/arch/m32r/include/asm/pci.h b/arch/m32r/include/asm/pci.h
deleted file mode 100644
index 07d3834..0000000
--- a/arch/m32r/include/asm/pci.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M32R_PCI_H
-#define _ASM_M32R_PCI_H
-
-#include <asm-generic/pci.h>
-
-#endif /* _ASM_M32R_PCI_H */
diff --git a/arch/m32r/include/asm/percpu.h b/arch/m32r/include/asm/percpu.h
deleted file mode 100644
index e316930..0000000
--- a/arch/m32r/include/asm/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ARCH_M32R_PERCPU__
-#define __ARCH_M32R_PERCPU__
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ARCH_M32R_PERCPU__ */
diff --git a/arch/m32r/include/asm/poll.h b/arch/m32r/include/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/m32r/include/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/m32r/include/asm/resource.h b/arch/m32r/include/asm/resource.h
deleted file mode 100644
index b1ce766..0000000
--- a/arch/m32r/include/asm/resource.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M32R_RESOURCE_H
-#define _ASM_M32R_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif /* _ASM_M32R_RESOURCE_H */
diff --git a/arch/m32r/include/asm/scatterlist.h b/arch/m32r/include/asm/scatterlist.h
deleted file mode 100644
index 7370b8b..0000000
--- a/arch/m32r/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M32R_SCATTERLIST_H
-#define _ASM_M32R_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* _ASM_M32R_SCATTERLIST_H */
diff --git a/arch/m32r/include/asm/sections.h b/arch/m32r/include/asm/sections.h
deleted file mode 100644
index 5e5d21c..0000000
--- a/arch/m32r/include/asm/sections.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _M32R_SECTIONS_H
-#define _M32R_SECTIONS_H
-
-/* nothing to see, move along */
-#include <asm-generic/sections.h>
-
-#endif /* _M32R_SECTIONS_H */
diff --git a/arch/m32r/include/asm/siginfo.h b/arch/m32r/include/asm/siginfo.h
deleted file mode 100644
index 7d9cd9e..0000000
--- a/arch/m32r/include/asm/siginfo.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _M32R_SIGINFO_H
-#define _M32R_SIGINFO_H
-
-#include <asm-generic/siginfo.h>
-
-#endif /* _M32R_SIGINFO_H */
diff --git a/arch/m32r/include/asm/statfs.h b/arch/m32r/include/asm/statfs.h
deleted file mode 100644
index 6eb4c60..0000000
--- a/arch/m32r/include/asm/statfs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M32R_STATFS_H
-#define _ASM_M32R_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif /* _ASM_M32R_STATFS_H */
diff --git a/arch/m32r/include/asm/topology.h b/arch/m32r/include/asm/topology.h
deleted file mode 100644
index d607eb3..0000000
--- a/arch/m32r/include/asm/topology.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M32R_TOPOLOGY_H
-#define _ASM_M32R_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_M32R_TOPOLOGY_H */
diff --git a/arch/m32r/include/asm/xor.h b/arch/m32r/include/asm/xor.h
deleted file mode 100644
index 6d52525..0000000
--- a/arch/m32r/include/asm/xor.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M32R_XOR_H
-#define _ASM_M32R_XOR_H
-
-#include <asm-generic/xor.h>
-
-#endif /* _ASM_M32R_XOR_H */
diff --git a/arch/microblaze/include/asm/ipcbuf.h b/arch/microblaze/include/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51..0000000
--- a/arch/microblaze/include/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 12/25] microblaze: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (10 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 11/25] m32r: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 13/25] mips: " Steven Rostedt
` (14 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Michal Simek
[-- Attachment #1: 0012-microblaze-Use-Kbuild-infrastructure-to-handle-asm-g.patch --]
[-- Type: text/plain, Size: 18550 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: microblaze-uclinux@itee.uq.edu.au
Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/microblaze/include/asm/Kbuild | 46 +++++++++++++++++++++++
arch/microblaze/include/asm/bitops.h | 1 -
arch/microblaze/include/asm/bitsperlong.h | 1 -
arch/microblaze/include/asm/bug.h | 1 -
arch/microblaze/include/asm/bugs.h | 1 -
arch/microblaze/include/asm/cputime.h | 1 -
arch/microblaze/include/asm/div64.h | 1 -
arch/microblaze/include/asm/emergency-restart.h | 1 -
arch/microblaze/include/asm/errno.h | 1 -
arch/microblaze/include/asm/fb.h | 1 -
arch/microblaze/include/asm/fcntl.h | 1 -
arch/microblaze/include/asm/hardirq.h | 1 -
arch/microblaze/include/asm/ioctl.h | 1 -
arch/microblaze/include/asm/ioctls.h | 1 -
arch/microblaze/include/asm/irq_regs.h | 1 -
arch/microblaze/include/asm/kdebug.h | 1 -
arch/microblaze/include/asm/kmap_types.h | 6 ---
arch/microblaze/include/asm/kvm_para.h | 1 -
arch/microblaze/include/asm/local.h | 1 -
arch/microblaze/include/asm/local64.h | 1 -
arch/microblaze/include/asm/mman.h | 1 -
arch/microblaze/include/asm/msgbuf.h | 1 -
arch/microblaze/include/asm/param.h | 1 -
arch/microblaze/include/asm/parport.h | 1 -
arch/microblaze/include/asm/percpu.h | 1 -
arch/microblaze/include/asm/poll.h | 1 -
arch/microblaze/include/asm/resource.h | 1 -
arch/microblaze/include/asm/scatterlist.h | 1 -
arch/microblaze/include/asm/sembuf.h | 1 -
arch/microblaze/include/asm/serial.h | 1 -
arch/microblaze/include/asm/shmbuf.h | 1 -
arch/microblaze/include/asm/shmparam.h | 1 -
arch/microblaze/include/asm/siginfo.h | 1 -
arch/microblaze/include/asm/signal.h | 1 -
arch/microblaze/include/asm/socket.h | 1 -
arch/microblaze/include/asm/sockios.h | 1 -
arch/microblaze/include/asm/stat.h | 1 -
arch/microblaze/include/asm/statfs.h | 1 -
arch/microblaze/include/asm/swab.h | 1 -
arch/microblaze/include/asm/termbits.h | 1 -
arch/microblaze/include/asm/termios.h | 1 -
arch/microblaze/include/asm/topology.h | 1 -
arch/microblaze/include/asm/types.h | 1 -
arch/microblaze/include/asm/ucontext.h | 1 -
arch/microblaze/include/asm/vga.h | 1 -
arch/microblaze/include/asm/xor.h | 1 -
arch/mips/include/asm/ipcbuf.h | 1 -
47 files changed, 46 insertions(+), 51 deletions(-)
delete mode 100644 arch/microblaze/include/asm/bitops.h
delete mode 100644 arch/microblaze/include/asm/bitsperlong.h
delete mode 100644 arch/microblaze/include/asm/bug.h
delete mode 100644 arch/microblaze/include/asm/bugs.h
delete mode 100644 arch/microblaze/include/asm/cputime.h
delete mode 100644 arch/microblaze/include/asm/div64.h
delete mode 100644 arch/microblaze/include/asm/emergency-restart.h
delete mode 100644 arch/microblaze/include/asm/errno.h
delete mode 100644 arch/microblaze/include/asm/fb.h
delete mode 100644 arch/microblaze/include/asm/fcntl.h
delete mode 100644 arch/microblaze/include/asm/hardirq.h
delete mode 100644 arch/microblaze/include/asm/ioctl.h
delete mode 100644 arch/microblaze/include/asm/ioctls.h
delete mode 100644 arch/microblaze/include/asm/irq_regs.h
delete mode 100644 arch/microblaze/include/asm/kdebug.h
delete mode 100644 arch/microblaze/include/asm/kmap_types.h
delete mode 100644 arch/microblaze/include/asm/kvm_para.h
delete mode 100644 arch/microblaze/include/asm/local.h
delete mode 100644 arch/microblaze/include/asm/local64.h
delete mode 100644 arch/microblaze/include/asm/mman.h
delete mode 100644 arch/microblaze/include/asm/msgbuf.h
delete mode 100644 arch/microblaze/include/asm/param.h
delete mode 100644 arch/microblaze/include/asm/parport.h
delete mode 100644 arch/microblaze/include/asm/percpu.h
delete mode 100644 arch/microblaze/include/asm/poll.h
delete mode 100644 arch/microblaze/include/asm/resource.h
delete mode 100644 arch/microblaze/include/asm/scatterlist.h
delete mode 100644 arch/microblaze/include/asm/sembuf.h
delete mode 100644 arch/microblaze/include/asm/serial.h
delete mode 100644 arch/microblaze/include/asm/shmbuf.h
delete mode 100644 arch/microblaze/include/asm/shmparam.h
delete mode 100644 arch/microblaze/include/asm/siginfo.h
delete mode 100644 arch/microblaze/include/asm/signal.h
delete mode 100644 arch/microblaze/include/asm/socket.h
delete mode 100644 arch/microblaze/include/asm/sockios.h
delete mode 100644 arch/microblaze/include/asm/stat.h
delete mode 100644 arch/microblaze/include/asm/statfs.h
delete mode 100644 arch/microblaze/include/asm/swab.h
delete mode 100644 arch/microblaze/include/asm/termbits.h
delete mode 100644 arch/microblaze/include/asm/termios.h
delete mode 100644 arch/microblaze/include/asm/topology.h
delete mode 100644 arch/microblaze/include/asm/types.h
delete mode 100644 arch/microblaze/include/asm/ucontext.h
delete mode 100644 arch/microblaze/include/asm/vga.h
delete mode 100644 arch/microblaze/include/asm/xor.h
delete mode 100644 arch/mips/include/asm/ipcbuf.h
diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild
index 8653072..2f656c8 100644
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@ -1,5 +1,51 @@
include include/asm-generic/Kbuild.asm
header-y += elf.h
+generic-y += bitops.h
+generic-y += bitsperlong.h
+generic-y += bug.h
+generic-y += bugs.h
+generic-y += cputime.h
generic-y += clkdev.h
+generic-y += div64.h
+generic-y += emergency-restart.h
+generic-y += errno.h
generic-y += exec.h
+generic-y += fb.h
+generic-y += fcntl.h
+generic-y += hardirq.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipcbuf.h
+generic-y += irq_regs.h
+generic-y += kdebug.h
+generic-y += kmap_types.h
+generic-y += kvm_para.h
+generic-y += local64.h
+generic-y += local.h
+generic-y += mman.h
+generic-y += msgbuf.h
+generic-y += param.h
+generic-y += parport.h
+generic-y += percpu.h
+generic-y += poll.h
+generic-y += resource.h
+generic-y += scatterlist.h
+generic-y += sembuf.h
+generic-y += serial.h
+generic-y += shmbuf.h
+generic-y += shmparam.h
+generic-y += siginfo.h
+generic-y += signal.h
+generic-y += socket.h
+generic-y += sockios.h
+generic-y += statfs.h
+generic-y += stat.h
+generic-y += swab.h
+generic-y += termbits.h
+generic-y += termios.h
+generic-y += topology.h
+generic-y += types.h
+generic-y += ucontext.h
+generic-y += vga.h
+generic-y += xor.h
diff --git a/arch/microblaze/include/asm/bitops.h b/arch/microblaze/include/asm/bitops.h
deleted file mode 100644
index a72468f..0000000
--- a/arch/microblaze/include/asm/bitops.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/bitops.h>
diff --git a/arch/microblaze/include/asm/bitsperlong.h b/arch/microblaze/include/asm/bitsperlong.h
deleted file mode 100644
index 6dc0bb0..0000000
--- a/arch/microblaze/include/asm/bitsperlong.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/bitsperlong.h>
diff --git a/arch/microblaze/include/asm/bug.h b/arch/microblaze/include/asm/bug.h
deleted file mode 100644
index b12fd89..0000000
--- a/arch/microblaze/include/asm/bug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/bug.h>
diff --git a/arch/microblaze/include/asm/bugs.h b/arch/microblaze/include/asm/bugs.h
deleted file mode 100644
index 61791e1..0000000
--- a/arch/microblaze/include/asm/bugs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/bugs.h>
diff --git a/arch/microblaze/include/asm/cputime.h b/arch/microblaze/include/asm/cputime.h
deleted file mode 100644
index 6d68ad7..0000000
--- a/arch/microblaze/include/asm/cputime.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/cputime.h>
diff --git a/arch/microblaze/include/asm/div64.h b/arch/microblaze/include/asm/div64.h
deleted file mode 100644
index 6cd978c..0000000
--- a/arch/microblaze/include/asm/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/arch/microblaze/include/asm/emergency-restart.h b/arch/microblaze/include/asm/emergency-restart.h
deleted file mode 100644
index 3711bd9..0000000
--- a/arch/microblaze/include/asm/emergency-restart.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/emergency-restart.h>
diff --git a/arch/microblaze/include/asm/errno.h b/arch/microblaze/include/asm/errno.h
deleted file mode 100644
index 4c82b50..0000000
--- a/arch/microblaze/include/asm/errno.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/errno.h>
diff --git a/arch/microblaze/include/asm/fb.h b/arch/microblaze/include/asm/fb.h
deleted file mode 100644
index 3a4988e..0000000
--- a/arch/microblaze/include/asm/fb.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fb.h>
diff --git a/arch/microblaze/include/asm/fcntl.h b/arch/microblaze/include/asm/fcntl.h
deleted file mode 100644
index 46ab12d..0000000
--- a/arch/microblaze/include/asm/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/arch/microblaze/include/asm/hardirq.h b/arch/microblaze/include/asm/hardirq.h
deleted file mode 100644
index fb3c05a..0000000
--- a/arch/microblaze/include/asm/hardirq.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/hardirq.h>
diff --git a/arch/microblaze/include/asm/ioctl.h b/arch/microblaze/include/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/arch/microblaze/include/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/arch/microblaze/include/asm/ioctls.h b/arch/microblaze/include/asm/ioctls.h
deleted file mode 100644
index ec34c76..0000000
--- a/arch/microblaze/include/asm/ioctls.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctls.h>
diff --git a/arch/microblaze/include/asm/irq_regs.h b/arch/microblaze/include/asm/irq_regs.h
deleted file mode 100644
index 3dd9c0b..0000000
--- a/arch/microblaze/include/asm/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
diff --git a/arch/microblaze/include/asm/kdebug.h b/arch/microblaze/include/asm/kdebug.h
deleted file mode 100644
index 6ece1b0..0000000
--- a/arch/microblaze/include/asm/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
diff --git a/arch/microblaze/include/asm/kmap_types.h b/arch/microblaze/include/asm/kmap_types.h
deleted file mode 100644
index 2597525..0000000
--- a/arch/microblaze/include/asm/kmap_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_MICROBLAZE_KMAP_TYPES_H
-#define _ASM_MICROBLAZE_KMAP_TYPES_H
-
-#include <asm-generic/kmap_types.h>
-
-#endif /* _ASM_MICROBLAZE_KMAP_TYPES_H */
diff --git a/arch/microblaze/include/asm/kvm_para.h b/arch/microblaze/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/microblaze/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/microblaze/include/asm/local.h b/arch/microblaze/include/asm/local.h
deleted file mode 100644
index c11c530..0000000
--- a/arch/microblaze/include/asm/local.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local.h>
diff --git a/arch/microblaze/include/asm/local64.h b/arch/microblaze/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/microblaze/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/microblaze/include/asm/mman.h b/arch/microblaze/include/asm/mman.h
deleted file mode 100644
index 8eebf89..0000000
--- a/arch/microblaze/include/asm/mman.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/mman.h>
diff --git a/arch/microblaze/include/asm/msgbuf.h b/arch/microblaze/include/asm/msgbuf.h
deleted file mode 100644
index 809134c..0000000
--- a/arch/microblaze/include/asm/msgbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/msgbuf.h>
diff --git a/arch/microblaze/include/asm/param.h b/arch/microblaze/include/asm/param.h
deleted file mode 100644
index 965d454..0000000
--- a/arch/microblaze/include/asm/param.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/param.h>
diff --git a/arch/microblaze/include/asm/parport.h b/arch/microblaze/include/asm/parport.h
deleted file mode 100644
index cf252af..0000000
--- a/arch/microblaze/include/asm/parport.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/parport.h>
diff --git a/arch/microblaze/include/asm/percpu.h b/arch/microblaze/include/asm/percpu.h
deleted file mode 100644
index 06a959d..0000000
--- a/arch/microblaze/include/asm/percpu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/percpu.h>
diff --git a/arch/microblaze/include/asm/poll.h b/arch/microblaze/include/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/microblaze/include/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/microblaze/include/asm/resource.h b/arch/microblaze/include/asm/resource.h
deleted file mode 100644
index 04bc4db..0000000
--- a/arch/microblaze/include/asm/resource.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/resource.h>
diff --git a/arch/microblaze/include/asm/scatterlist.h b/arch/microblaze/include/asm/scatterlist.h
deleted file mode 100644
index 35d786f..0000000
--- a/arch/microblaze/include/asm/scatterlist.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/scatterlist.h>
diff --git a/arch/microblaze/include/asm/sembuf.h b/arch/microblaze/include/asm/sembuf.h
deleted file mode 100644
index 7673b83..0000000
--- a/arch/microblaze/include/asm/sembuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/sembuf.h>
diff --git a/arch/microblaze/include/asm/serial.h b/arch/microblaze/include/asm/serial.h
deleted file mode 100644
index a0cb0ca..0000000
--- a/arch/microblaze/include/asm/serial.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/serial.h>
diff --git a/arch/microblaze/include/asm/shmbuf.h b/arch/microblaze/include/asm/shmbuf.h
deleted file mode 100644
index 83c05fc..0000000
--- a/arch/microblaze/include/asm/shmbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/shmbuf.h>
diff --git a/arch/microblaze/include/asm/shmparam.h b/arch/microblaze/include/asm/shmparam.h
deleted file mode 100644
index 93f30de..0000000
--- a/arch/microblaze/include/asm/shmparam.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/shmparam.h>
diff --git a/arch/microblaze/include/asm/siginfo.h b/arch/microblaze/include/asm/siginfo.h
deleted file mode 100644
index 0815d29..0000000
--- a/arch/microblaze/include/asm/siginfo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/siginfo.h>
diff --git a/arch/microblaze/include/asm/signal.h b/arch/microblaze/include/asm/signal.h
deleted file mode 100644
index 7b1573c..0000000
--- a/arch/microblaze/include/asm/signal.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/signal.h>
diff --git a/arch/microblaze/include/asm/socket.h b/arch/microblaze/include/asm/socket.h
deleted file mode 100644
index 6b71384..0000000
--- a/arch/microblaze/include/asm/socket.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/socket.h>
diff --git a/arch/microblaze/include/asm/sockios.h b/arch/microblaze/include/asm/sockios.h
deleted file mode 100644
index def6d47..0000000
--- a/arch/microblaze/include/asm/sockios.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/sockios.h>
diff --git a/arch/microblaze/include/asm/stat.h b/arch/microblaze/include/asm/stat.h
deleted file mode 100644
index 3dc90fa..0000000
--- a/arch/microblaze/include/asm/stat.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/stat.h>
diff --git a/arch/microblaze/include/asm/statfs.h b/arch/microblaze/include/asm/statfs.h
deleted file mode 100644
index 0b91fe1..0000000
--- a/arch/microblaze/include/asm/statfs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/statfs.h>
diff --git a/arch/microblaze/include/asm/swab.h b/arch/microblaze/include/asm/swab.h
deleted file mode 100644
index 7847e56..0000000
--- a/arch/microblaze/include/asm/swab.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/swab.h>
diff --git a/arch/microblaze/include/asm/termbits.h b/arch/microblaze/include/asm/termbits.h
deleted file mode 100644
index 3935b10..0000000
--- a/arch/microblaze/include/asm/termbits.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/termbits.h>
diff --git a/arch/microblaze/include/asm/termios.h b/arch/microblaze/include/asm/termios.h
deleted file mode 100644
index 280d78a..0000000
--- a/arch/microblaze/include/asm/termios.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/termios.h>
diff --git a/arch/microblaze/include/asm/topology.h b/arch/microblaze/include/asm/topology.h
deleted file mode 100644
index 5428f33..0000000
--- a/arch/microblaze/include/asm/topology.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/topology.h>
diff --git a/arch/microblaze/include/asm/types.h b/arch/microblaze/include/asm/types.h
deleted file mode 100644
index b9e79bc..0000000
--- a/arch/microblaze/include/asm/types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/types.h>
diff --git a/arch/microblaze/include/asm/ucontext.h b/arch/microblaze/include/asm/ucontext.h
deleted file mode 100644
index 9bc07b9..0000000
--- a/arch/microblaze/include/asm/ucontext.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ucontext.h>
diff --git a/arch/microblaze/include/asm/vga.h b/arch/microblaze/include/asm/vga.h
deleted file mode 100644
index 89d82fd..0000000
--- a/arch/microblaze/include/asm/vga.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/vga.h>
diff --git a/arch/microblaze/include/asm/xor.h b/arch/microblaze/include/asm/xor.h
deleted file mode 100644
index c82eb12..0000000
--- a/arch/microblaze/include/asm/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/xor.h>
diff --git a/arch/mips/include/asm/ipcbuf.h b/arch/mips/include/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51..0000000
--- a/arch/mips/include/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 13/25] mips: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (11 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 12/25] microblaze: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2013-09-02 8:55 ` James Hogan
2012-10-13 2:26 ` [PATCH 14/25] mn10300: " Steven Rostedt
` (13 subsequent siblings)
26 siblings, 1 reply; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Ralf Baechle
[-- Attachment #1: 0013-mips-Use-Kbuild-infrastructure-to-handle-asm-generic.patch --]
[-- Type: text/plain, Size: 6059 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/mips/include/asm/Kbuild | 14 ++++++++++++++
arch/mips/include/asm/cputime.h | 6 ------
arch/mips/include/asm/current.h | 1 -
arch/mips/include/asm/emergency-restart.h | 6 ------
arch/mips/include/asm/kvm_para.h | 1 -
arch/mips/include/asm/local64.h | 1 -
arch/mips/include/asm/parport.h | 1 -
arch/mips/include/asm/percpu.h | 6 ------
arch/mips/include/asm/scatterlist.h | 6 ------
arch/mips/include/asm/sections.h | 6 ------
arch/mips/include/asm/serial.h | 1 -
arch/mips/include/asm/ucontext.h | 1 -
arch/mips/include/asm/xor.h | 1 -
arch/mn10300/include/asm/ipcbuf.h | 1 -
14 files changed, 14 insertions(+), 38 deletions(-)
delete mode 100644 arch/mips/include/asm/cputime.h
delete mode 100644 arch/mips/include/asm/current.h
delete mode 100644 arch/mips/include/asm/emergency-restart.h
delete mode 100644 arch/mips/include/asm/kvm_para.h
delete mode 100644 arch/mips/include/asm/local64.h
delete mode 100644 arch/mips/include/asm/parport.h
delete mode 100644 arch/mips/include/asm/percpu.h
delete mode 100644 arch/mips/include/asm/scatterlist.h
delete mode 100644 arch/mips/include/asm/sections.h
delete mode 100644 arch/mips/include/asm/serial.h
delete mode 100644 arch/mips/include/asm/ucontext.h
delete mode 100644 arch/mips/include/asm/xor.h
delete mode 100644 arch/mn10300/include/asm/ipcbuf.h
diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild
index f53f9ca..b5a6509 100644
--- a/arch/mips/include/asm/Kbuild
+++ b/arch/mips/include/asm/Kbuild
@@ -3,3 +3,17 @@ include include/asm-generic/Kbuild.asm
header-y += cachectl.h
header-y += sgidefs.h
header-y += sysmips.h
+
+generic-y += cputime.h
+generic-y += current.h
+generic-y += emergency-restart.h
+generic-y += ipcbuf.h
+generic-y += kvm_para.h
+generic-y += local64.h
+generic-y += parport.h
+generic-y += percpu.h
+generic-y += scatterlist.h
+generic-y += sections.h
+generic-y += serial.h
+generic-y += ucontext.h
+generic-y += xor.h
diff --git a/arch/mips/include/asm/cputime.h b/arch/mips/include/asm/cputime.h
deleted file mode 100644
index c00eacb..0000000
--- a/arch/mips/include/asm/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __MIPS_CPUTIME_H
-#define __MIPS_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __MIPS_CPUTIME_H */
diff --git a/arch/mips/include/asm/current.h b/arch/mips/include/asm/current.h
deleted file mode 100644
index 4c51401..0000000
--- a/arch/mips/include/asm/current.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/current.h>
diff --git a/arch/mips/include/asm/emergency-restart.h b/arch/mips/include/asm/emergency-restart.h
deleted file mode 100644
index 108d8c4..0000000
--- a/arch/mips/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/arch/mips/include/asm/kvm_para.h b/arch/mips/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/mips/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/mips/include/asm/local64.h b/arch/mips/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/mips/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/mips/include/asm/parport.h b/arch/mips/include/asm/parport.h
deleted file mode 100644
index cf252af..0000000
--- a/arch/mips/include/asm/parport.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/parport.h>
diff --git a/arch/mips/include/asm/percpu.h b/arch/mips/include/asm/percpu.h
deleted file mode 100644
index 844e763..0000000
--- a/arch/mips/include/asm/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_PERCPU_H
-#define __ASM_PERCPU_H
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ASM_PERCPU_H */
diff --git a/arch/mips/include/asm/scatterlist.h b/arch/mips/include/asm/scatterlist.h
deleted file mode 100644
index 7ee0e64..0000000
--- a/arch/mips/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SCATTERLIST_H
-#define __ASM_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* __ASM_SCATTERLIST_H */
diff --git a/arch/mips/include/asm/sections.h b/arch/mips/include/asm/sections.h
deleted file mode 100644
index b7e3726..0000000
--- a/arch/mips/include/asm/sections.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SECTIONS_H
-#define _ASM_SECTIONS_H
-
-#include <asm-generic/sections.h>
-
-#endif /* _ASM_SECTIONS_H */
diff --git a/arch/mips/include/asm/serial.h b/arch/mips/include/asm/serial.h
deleted file mode 100644
index a0cb0ca..0000000
--- a/arch/mips/include/asm/serial.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/serial.h>
diff --git a/arch/mips/include/asm/ucontext.h b/arch/mips/include/asm/ucontext.h
deleted file mode 100644
index 9bc07b9..0000000
--- a/arch/mips/include/asm/ucontext.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ucontext.h>
diff --git a/arch/mips/include/asm/xor.h b/arch/mips/include/asm/xor.h
deleted file mode 100644
index c82eb12..0000000
--- a/arch/mips/include/asm/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/xor.h>
diff --git a/arch/mn10300/include/asm/ipcbuf.h b/arch/mn10300/include/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51..0000000
--- a/arch/mn10300/include/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 14/25] mn10300: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (12 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 13/25] mips: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 15/25] openrisc: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
` (12 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, David Howells, Koichi Yasutake
[-- Attachment #1: 0014-mn10300-Use-Kbuild-infrastructure-to-handle-asm-gene.patch --]
[-- Type: text/plain, Size: 10166 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: linux-am33-list@redhat.com
Cc: David Howells <dhowells@redhat.com>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/mn10300/include/asm/Kbuild | 23 +++++++++++++++++++++++
arch/mn10300/include/asm/bitsperlong.h | 1 -
arch/mn10300/include/asm/cputime.h | 1 -
arch/mn10300/include/asm/device.h | 1 -
arch/mn10300/include/asm/emergency-restart.h | 1 -
arch/mn10300/include/asm/errno.h | 1 -
arch/mn10300/include/asm/fcntl.h | 1 -
arch/mn10300/include/asm/futex.h | 1 -
arch/mn10300/include/asm/ioctl.h | 1 -
arch/mn10300/include/asm/ioctls.h | 6 ------
arch/mn10300/include/asm/kmap_types.h | 6 ------
arch/mn10300/include/asm/kvm_para.h | 1 -
arch/mn10300/include/asm/local.h | 1 -
arch/mn10300/include/asm/local64.h | 1 -
arch/mn10300/include/asm/percpu.h | 1 -
arch/mn10300/include/asm/poll.h | 1 -
arch/mn10300/include/asm/resource.h | 1 -
arch/mn10300/include/asm/scatterlist.h | 16 ----------------
arch/mn10300/include/asm/sections.h | 1 -
arch/mn10300/include/asm/siginfo.h | 1 -
arch/mn10300/include/asm/statfs.h | 1 -
arch/mn10300/include/asm/topology.h | 1 -
arch/mn10300/include/asm/xor.h | 1 -
arch/x86/include/asm/ipcbuf.h | 1 -
24 files changed, 23 insertions(+), 48 deletions(-)
delete mode 100644 arch/mn10300/include/asm/bitsperlong.h
delete mode 100644 arch/mn10300/include/asm/cputime.h
delete mode 100644 arch/mn10300/include/asm/device.h
delete mode 100644 arch/mn10300/include/asm/emergency-restart.h
delete mode 100644 arch/mn10300/include/asm/errno.h
delete mode 100644 arch/mn10300/include/asm/fcntl.h
delete mode 100644 arch/mn10300/include/asm/futex.h
delete mode 100644 arch/mn10300/include/asm/ioctl.h
delete mode 100644 arch/mn10300/include/asm/ioctls.h
delete mode 100644 arch/mn10300/include/asm/kmap_types.h
delete mode 100644 arch/mn10300/include/asm/kvm_para.h
delete mode 100644 arch/mn10300/include/asm/local.h
delete mode 100644 arch/mn10300/include/asm/local64.h
delete mode 100644 arch/mn10300/include/asm/percpu.h
delete mode 100644 arch/mn10300/include/asm/poll.h
delete mode 100644 arch/mn10300/include/asm/resource.h
delete mode 100644 arch/mn10300/include/asm/scatterlist.h
delete mode 100644 arch/mn10300/include/asm/sections.h
delete mode 100644 arch/mn10300/include/asm/siginfo.h
delete mode 100644 arch/mn10300/include/asm/statfs.h
delete mode 100644 arch/mn10300/include/asm/topology.h
delete mode 100644 arch/mn10300/include/asm/xor.h
delete mode 100644 arch/x86/include/asm/ipcbuf.h
diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild
index fccd81e..df065d7 100644
--- a/arch/mn10300/include/asm/Kbuild
+++ b/arch/mn10300/include/asm/Kbuild
@@ -1,4 +1,27 @@
include include/asm-generic/Kbuild.asm
+generic-y += bitsperlong.h
+generic-y += cputime.h
generic-y += clkdev.h
+generic-y += device.h
+generic-y += emergency-restart.h
+generic-y += errno.h
generic-y += exec.h
+generic-y += fcntl.h
+generic-y += futex.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipcbuf.h
+generic-y += kmap_types.h
+generic-y += kvm_para.h
+generic-y += local64.h
+generic-y += local.h
+generic-y += percpu.h
+generic-y += poll.h
+generic-y += resource.h
+generic-y += scatterlist.h
+generic-y += sections.h
+generic-y += siginfo.h
+generic-y += statfs.h
+generic-y += topology.h
+generic-y += xor.h
diff --git a/arch/mn10300/include/asm/bitsperlong.h b/arch/mn10300/include/asm/bitsperlong.h
deleted file mode 100644
index 6dc0bb0..0000000
--- a/arch/mn10300/include/asm/bitsperlong.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/bitsperlong.h>
diff --git a/arch/mn10300/include/asm/cputime.h b/arch/mn10300/include/asm/cputime.h
deleted file mode 100644
index 6d68ad7..0000000
--- a/arch/mn10300/include/asm/cputime.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/cputime.h>
diff --git a/arch/mn10300/include/asm/device.h b/arch/mn10300/include/asm/device.h
deleted file mode 100644
index f0a4c25..0000000
--- a/arch/mn10300/include/asm/device.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/device.h>
diff --git a/arch/mn10300/include/asm/emergency-restart.h b/arch/mn10300/include/asm/emergency-restart.h
deleted file mode 100644
index 3711bd9..0000000
--- a/arch/mn10300/include/asm/emergency-restart.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/emergency-restart.h>
diff --git a/arch/mn10300/include/asm/errno.h b/arch/mn10300/include/asm/errno.h
deleted file mode 100644
index 4c82b50..0000000
--- a/arch/mn10300/include/asm/errno.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/errno.h>
diff --git a/arch/mn10300/include/asm/fcntl.h b/arch/mn10300/include/asm/fcntl.h
deleted file mode 100644
index 46ab12d..0000000
--- a/arch/mn10300/include/asm/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/arch/mn10300/include/asm/futex.h b/arch/mn10300/include/asm/futex.h
deleted file mode 100644
index 0b74582..0000000
--- a/arch/mn10300/include/asm/futex.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/futex.h>
diff --git a/arch/mn10300/include/asm/ioctl.h b/arch/mn10300/include/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/arch/mn10300/include/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/arch/mn10300/include/asm/ioctls.h b/arch/mn10300/include/asm/ioctls.h
deleted file mode 100644
index 0212f4b..0000000
--- a/arch/mn10300/include/asm/ioctls.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_IOCTLS_H
-#define _ASM_IOCTLS_H
-
-#include <asm-generic/ioctls.h>
-
-#endif /* _ASM_IOCTLS_H */
diff --git a/arch/mn10300/include/asm/kmap_types.h b/arch/mn10300/include/asm/kmap_types.h
deleted file mode 100644
index 76d093b..0000000
--- a/arch/mn10300/include/asm/kmap_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-#include <asm-generic/kmap_types.h>
-
-#endif /* _ASM_KMAP_TYPES_H */
diff --git a/arch/mn10300/include/asm/kvm_para.h b/arch/mn10300/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/mn10300/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/mn10300/include/asm/local.h b/arch/mn10300/include/asm/local.h
deleted file mode 100644
index c11c530..0000000
--- a/arch/mn10300/include/asm/local.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local.h>
diff --git a/arch/mn10300/include/asm/local64.h b/arch/mn10300/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/mn10300/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/mn10300/include/asm/percpu.h b/arch/mn10300/include/asm/percpu.h
deleted file mode 100644
index 06a959d..0000000
--- a/arch/mn10300/include/asm/percpu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/percpu.h>
diff --git a/arch/mn10300/include/asm/poll.h b/arch/mn10300/include/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/mn10300/include/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/mn10300/include/asm/resource.h b/arch/mn10300/include/asm/resource.h
deleted file mode 100644
index 04bc4db..0000000
--- a/arch/mn10300/include/asm/resource.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/resource.h>
diff --git a/arch/mn10300/include/asm/scatterlist.h b/arch/mn10300/include/asm/scatterlist.h
deleted file mode 100644
index 7baa400..0000000
--- a/arch/mn10300/include/asm/scatterlist.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MN10300 Scatterlist definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_SCATTERLIST_H
-#define _ASM_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* _ASM_SCATTERLIST_H */
diff --git a/arch/mn10300/include/asm/sections.h b/arch/mn10300/include/asm/sections.h
deleted file mode 100644
index 2b8c516..0000000
--- a/arch/mn10300/include/asm/sections.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/sections.h>
diff --git a/arch/mn10300/include/asm/siginfo.h b/arch/mn10300/include/asm/siginfo.h
deleted file mode 100644
index 0815d29..0000000
--- a/arch/mn10300/include/asm/siginfo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/siginfo.h>
diff --git a/arch/mn10300/include/asm/statfs.h b/arch/mn10300/include/asm/statfs.h
deleted file mode 100644
index 0b91fe1..0000000
--- a/arch/mn10300/include/asm/statfs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/statfs.h>
diff --git a/arch/mn10300/include/asm/topology.h b/arch/mn10300/include/asm/topology.h
deleted file mode 100644
index 5428f33..0000000
--- a/arch/mn10300/include/asm/topology.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/topology.h>
diff --git a/arch/mn10300/include/asm/xor.h b/arch/mn10300/include/asm/xor.h
deleted file mode 100644
index c82eb12..0000000
--- a/arch/mn10300/include/asm/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/xor.h>
diff --git a/arch/x86/include/asm/ipcbuf.h b/arch/x86/include/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51..0000000
--- a/arch/x86/include/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 15/25] openrisc: Use Kbuild infrastructure for kvm_para.h
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (13 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 14/25] mn10300: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 6:32 ` Jonas Bonn
2012-10-13 2:26 ` [PATCH 16/25] parisc: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
` (11 subsequent siblings)
26 siblings, 1 reply; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Jonas Bonn
[-- Attachment #1: 0015-openrisc-Use-Kbuild-infrastructure-for-kvm_para.h.patch --]
[-- Type: text/plain, Size: 1148 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
All the headers but kvm_para.h use the Kbuild infrastructure to
get to the asm-generic headers.
Cc: linux-kbuild@vger.kernel.org
Cc: linux@lists.openrisc.net
Cc: Jonas Bonn <jonas@southpole.se>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/openrisc/include/asm/Kbuild | 1 +
arch/openrisc/include/asm/kvm_para.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 arch/openrisc/include/asm/kvm_para.h
diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild
index 7140b6b..d715037 100644
--- a/arch/openrisc/include/asm/Kbuild
+++ b/arch/openrisc/include/asm/Kbuild
@@ -34,6 +34,7 @@ generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += kdebug.h
generic-y += kmap_types.h
+generic-y += kvm_para.h
generic-y += local.h
generic-y += mman.h
generic-y += module.h
diff --git a/arch/openrisc/include/asm/kvm_para.h b/arch/openrisc/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/openrisc/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 16/25] parisc: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (14 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 15/25] openrisc: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 12:36 ` James Bottomley
2012-10-13 2:26 ` [PATCH 17/25] powerpc: " Steven Rostedt
` (10 subsequent siblings)
26 siblings, 1 reply; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch
Cc: Andrew Morton, James E.J. Bottomley, Helge Deller
[-- Attachment #1: 0016-parisc-Use-Kbuild-infrastructure-to-handle-asm-gener.patch --]
[-- Type: text/plain, Size: 7602 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: linux-parisc@vger.kernel.org
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/parisc/include/asm/Kbuild | 18 +++++++++++++++++-
arch/parisc/include/asm/compat_signal.h | 2 --
arch/parisc/include/asm/cputime.h | 6 ------
arch/parisc/include/asm/device.h | 7 -------
arch/parisc/include/asm/div64.h | 1 -
arch/parisc/include/asm/emergency-restart.h | 6 ------
arch/parisc/include/asm/hardirq.h | 11 -----------
arch/parisc/include/asm/irq_regs.h | 1 -
arch/parisc/include/asm/kdebug.h | 1 -
arch/parisc/include/asm/kvm_para.h | 1 -
arch/parisc/include/asm/local.h | 1 -
arch/parisc/include/asm/local64.h | 1 -
arch/parisc/include/asm/param.h | 1 -
arch/parisc/include/asm/percpu.h | 7 -------
arch/parisc/include/asm/poll.h | 1 -
arch/parisc/include/asm/topology.h | 6 ------
arch/parisc/include/asm/xor.h | 1 -
17 files changed, 17 insertions(+), 55 deletions(-)
delete mode 100644 arch/parisc/include/asm/compat_signal.h
delete mode 100644 arch/parisc/include/asm/cputime.h
delete mode 100644 arch/parisc/include/asm/device.h
delete mode 100644 arch/parisc/include/asm/div64.h
delete mode 100644 arch/parisc/include/asm/emergency-restart.h
delete mode 100644 arch/parisc/include/asm/hardirq.h
delete mode 100644 arch/parisc/include/asm/irq_regs.h
delete mode 100644 arch/parisc/include/asm/kdebug.h
delete mode 100644 arch/parisc/include/asm/kvm_para.h
delete mode 100644 arch/parisc/include/asm/local.h
delete mode 100644 arch/parisc/include/asm/local64.h
delete mode 100644 arch/parisc/include/asm/param.h
delete mode 100644 arch/parisc/include/asm/percpu.h
delete mode 100644 arch/parisc/include/asm/poll.h
delete mode 100644 arch/parisc/include/asm/topology.h
delete mode 100644 arch/parisc/include/asm/xor.h
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
index 458371a..6ee772d 100644
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@ -1,6 +1,22 @@
include include/asm-generic/Kbuild.asm
header-y += pdc.h
+generic-y += compat_signal.h
+generic-y += cputime.h
generic-y += clkdev.h
-generic-y += word-at-a-time.h
+generic-y += device.h
+generic-y += div64.h
+generic-y += emergency-restart.h
generic-y += exec.h
+generic-y += hardirq.h
+generic-y += irq_regs.h
+generic-y += kdebug.h
+generic-y += kvm_para.h
+generic-y += local64.h
+generic-y += local.h
+generic-y += param.h
+generic-y += percpu.h
+generic-y += poll.h
+generic-y += topology.h
+generic-y += word-at-a-time.h
+generic-y += xor.h
diff --git a/arch/parisc/include/asm/compat_signal.h b/arch/parisc/include/asm/compat_signal.h
deleted file mode 100644
index 6ad02c3..0000000
--- a/arch/parisc/include/asm/compat_signal.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Use generic */
-#include <asm-generic/compat_signal.h>
diff --git a/arch/parisc/include/asm/cputime.h b/arch/parisc/include/asm/cputime.h
deleted file mode 100644
index dcdf2fb..0000000
--- a/arch/parisc/include/asm/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __PARISC_CPUTIME_H
-#define __PARISC_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __PARISC_CPUTIME_H */
diff --git a/arch/parisc/include/asm/device.h b/arch/parisc/include/asm/device.h
deleted file mode 100644
index d8f9872..0000000
--- a/arch/parisc/include/asm/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/arch/parisc/include/asm/div64.h b/arch/parisc/include/asm/div64.h
deleted file mode 100644
index 6cd978c..0000000
--- a/arch/parisc/include/asm/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/arch/parisc/include/asm/emergency-restart.h b/arch/parisc/include/asm/emergency-restart.h
deleted file mode 100644
index 108d8c4..0000000
--- a/arch/parisc/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/arch/parisc/include/asm/hardirq.h b/arch/parisc/include/asm/hardirq.h
deleted file mode 100644
index 0d68184..0000000
--- a/arch/parisc/include/asm/hardirq.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* hardirq.h: PA-RISC hard IRQ support.
- *
- * Copyright (C) 2001 Matthew Wilcox <matthew@wil.cx>
- */
-
-#ifndef _PARISC_HARDIRQ_H
-#define _PARISC_HARDIRQ_H
-
-#include <asm-generic/hardirq.h>
-
-#endif /* _PARISC_HARDIRQ_H */
diff --git a/arch/parisc/include/asm/irq_regs.h b/arch/parisc/include/asm/irq_regs.h
deleted file mode 100644
index 3dd9c0b..0000000
--- a/arch/parisc/include/asm/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
diff --git a/arch/parisc/include/asm/kdebug.h b/arch/parisc/include/asm/kdebug.h
deleted file mode 100644
index 6ece1b0..0000000
--- a/arch/parisc/include/asm/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
diff --git a/arch/parisc/include/asm/kvm_para.h b/arch/parisc/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/parisc/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/parisc/include/asm/local.h b/arch/parisc/include/asm/local.h
deleted file mode 100644
index c11c530..0000000
--- a/arch/parisc/include/asm/local.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local.h>
diff --git a/arch/parisc/include/asm/local64.h b/arch/parisc/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/parisc/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/parisc/include/asm/param.h b/arch/parisc/include/asm/param.h
deleted file mode 100644
index 965d454..0000000
--- a/arch/parisc/include/asm/param.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/param.h>
diff --git a/arch/parisc/include/asm/percpu.h b/arch/parisc/include/asm/percpu.h
deleted file mode 100644
index a0dcd19..0000000
--- a/arch/parisc/include/asm/percpu.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _PARISC_PERCPU_H
-#define _PARISC_PERCPU_H
-
-#include <asm-generic/percpu.h>
-
-#endif
-
diff --git a/arch/parisc/include/asm/poll.h b/arch/parisc/include/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/parisc/include/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/parisc/include/asm/topology.h b/arch/parisc/include/asm/topology.h
deleted file mode 100644
index d8133eb..0000000
--- a/arch/parisc/include/asm/topology.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_PARISC_TOPOLOGY_H
-#define _ASM_PARISC_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_PARISC_TOPOLOGY_H */
diff --git a/arch/parisc/include/asm/xor.h b/arch/parisc/include/asm/xor.h
deleted file mode 100644
index c82eb12..0000000
--- a/arch/parisc/include/asm/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/xor.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 17/25] powerpc: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (15 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 16/25] parisc: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 18/25] s390: " Steven Rostedt
` (9 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch
Cc: Andrew Morton, Benjamin Herrenschmidt, Paul Mackerras
[-- Attachment #1: 0017-powerpc-Use-Kbuild-infrastructure-to-handle-asm-gene.patch --]
[-- Type: text/plain, Size: 4343 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/powerpc/include/asm/Kbuild | 9 +++++++++
arch/powerpc/include/asm/div64.h | 1 -
arch/powerpc/include/asm/emergency-restart.h | 1 -
arch/powerpc/include/asm/irq_regs.h | 2 --
arch/powerpc/include/asm/local64.h | 1 -
arch/powerpc/include/asm/param.h | 1 -
arch/powerpc/include/asm/poll.h | 1 -
arch/powerpc/include/asm/resource.h | 1 -
arch/powerpc/include/asm/statfs.h | 6 ------
arch/powerpc/include/asm/xor.h | 1 -
10 files changed, 9 insertions(+), 15 deletions(-)
delete mode 100644 arch/powerpc/include/asm/div64.h
delete mode 100644 arch/powerpc/include/asm/emergency-restart.h
delete mode 100644 arch/powerpc/include/asm/irq_regs.h
delete mode 100644 arch/powerpc/include/asm/local64.h
delete mode 100644 arch/powerpc/include/asm/param.h
delete mode 100644 arch/powerpc/include/asm/poll.h
delete mode 100644 arch/powerpc/include/asm/resource.h
delete mode 100644 arch/powerpc/include/asm/statfs.h
delete mode 100644 arch/powerpc/include/asm/xor.h
diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild
index ace53db..8ae0511 100644
--- a/arch/powerpc/include/asm/Kbuild
+++ b/arch/powerpc/include/asm/Kbuild
@@ -36,4 +36,13 @@ header-y += ucontext.h
header-y += unistd.h
generic-y += clkdev.h
+generic-y += div64.h
+generic-y += emergency-restart.h
+generic-y += irq_regs.h
+generic-y += local64.h
+generic-y += param.h
+generic-y += poll.h
+generic-y += resource.h
generic-y += rwsem.h
+generic-y += statfs.h
+generic-y += xor.h
diff --git a/arch/powerpc/include/asm/div64.h b/arch/powerpc/include/asm/div64.h
deleted file mode 100644
index 6cd978c..0000000
--- a/arch/powerpc/include/asm/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/arch/powerpc/include/asm/emergency-restart.h b/arch/powerpc/include/asm/emergency-restart.h
deleted file mode 100644
index 3711bd9..0000000
--- a/arch/powerpc/include/asm/emergency-restart.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/emergency-restart.h>
diff --git a/arch/powerpc/include/asm/irq_regs.h b/arch/powerpc/include/asm/irq_regs.h
deleted file mode 100644
index ba94b51..0000000
--- a/arch/powerpc/include/asm/irq_regs.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <asm-generic/irq_regs.h>
-
diff --git a/arch/powerpc/include/asm/local64.h b/arch/powerpc/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/powerpc/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/powerpc/include/asm/param.h b/arch/powerpc/include/asm/param.h
deleted file mode 100644
index 965d454..0000000
--- a/arch/powerpc/include/asm/param.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/param.h>
diff --git a/arch/powerpc/include/asm/poll.h b/arch/powerpc/include/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/powerpc/include/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/powerpc/include/asm/resource.h b/arch/powerpc/include/asm/resource.h
deleted file mode 100644
index 04bc4db..0000000
--- a/arch/powerpc/include/asm/resource.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/resource.h>
diff --git a/arch/powerpc/include/asm/statfs.h b/arch/powerpc/include/asm/statfs.h
deleted file mode 100644
index 5244834..0000000
--- a/arch/powerpc/include/asm/statfs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_POWERPC_STATFS_H
-#define _ASM_POWERPC_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif
diff --git a/arch/powerpc/include/asm/xor.h b/arch/powerpc/include/asm/xor.h
deleted file mode 100644
index c82eb12..0000000
--- a/arch/powerpc/include/asm/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/xor.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 18/25] s390: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (16 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 17/25] powerpc: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 19/25] score: " Steven Rostedt
` (8 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch
Cc: Andrew Morton, Martin Schwidefsky, Heiko Carstens
[-- Attachment #1: 0018-s390-Use-Kbuild-infrastructure-to-handle-asm-generic.patch --]
[-- Type: text/plain, Size: 7513 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linux390@de.ibm.com
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/s390/include/asm/Kbuild | 17 ++++++++++++++++-
arch/s390/include/asm/device.h | 7 -------
arch/s390/include/asm/div64.h | 1 -
arch/s390/include/asm/emergency-restart.h | 6 ------
arch/s390/include/asm/irq_regs.h | 1 -
arch/s390/include/asm/kmap_types.h | 6 ------
arch/s390/include/asm/local.h | 1 -
arch/s390/include/asm/local64.h | 1 -
arch/s390/include/asm/xor.h | 1 -
arch/s390/include/uapi/asm/errno.h | 11 -----------
arch/s390/include/uapi/asm/fcntl.h | 1 -
arch/s390/include/uapi/asm/ioctl.h | 1 -
arch/s390/include/uapi/asm/param.h | 6 ------
arch/s390/include/uapi/asm/poll.h | 1 -
arch/s390/include/uapi/asm/resource.h | 13 -------------
arch/s390/include/uapi/asm/sockios.h | 6 ------
arch/s390/include/uapi/asm/termbits.h | 6 ------
17 files changed, 16 insertions(+), 70 deletions(-)
delete mode 100644 arch/s390/include/asm/device.h
delete mode 100644 arch/s390/include/asm/div64.h
delete mode 100644 arch/s390/include/asm/emergency-restart.h
delete mode 100644 arch/s390/include/asm/irq_regs.h
delete mode 100644 arch/s390/include/asm/kmap_types.h
delete mode 100644 arch/s390/include/asm/local.h
delete mode 100644 arch/s390/include/asm/local64.h
delete mode 100644 arch/s390/include/asm/xor.h
delete mode 100644 arch/s390/include/uapi/asm/errno.h
delete mode 100644 arch/s390/include/uapi/asm/fcntl.h
delete mode 100644 arch/s390/include/uapi/asm/ioctl.h
delete mode 100644 arch/s390/include/uapi/asm/param.h
delete mode 100644 arch/s390/include/uapi/asm/poll.h
delete mode 100644 arch/s390/include/uapi/asm/resource.h
delete mode 100644 arch/s390/include/uapi/asm/sockios.h
delete mode 100644 arch/s390/include/uapi/asm/termbits.h
diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild
index 0633dc6..2e52285 100644
--- a/arch/s390/include/asm/Kbuild
+++ b/arch/s390/include/asm/Kbuild
@@ -1,3 +1,18 @@
-
generic-y += clkdev.h
+generic-y += device.h
+generic-y += div64.h
+generic-y += emergency-restart.h
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += irq_regs.h
+generic-y += kmap_types.h
+generic-y += local64.h
+generic-y += local.h
+generic-y += param.h
+generic-y += poll.h
+generic-y += resource.h
+generic-y += sockios.h
+generic-y += termbits.h
+generic-y += xor.h
diff --git a/arch/s390/include/asm/device.h b/arch/s390/include/asm/device.h
deleted file mode 100644
index d8f9872..0000000
--- a/arch/s390/include/asm/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/arch/s390/include/asm/div64.h b/arch/s390/include/asm/div64.h
deleted file mode 100644
index 6cd978c..0000000
--- a/arch/s390/include/asm/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/arch/s390/include/asm/emergency-restart.h b/arch/s390/include/asm/emergency-restart.h
deleted file mode 100644
index 108d8c4..0000000
--- a/arch/s390/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/arch/s390/include/asm/irq_regs.h b/arch/s390/include/asm/irq_regs.h
deleted file mode 100644
index 3dd9c0b..0000000
--- a/arch/s390/include/asm/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
diff --git a/arch/s390/include/asm/kmap_types.h b/arch/s390/include/asm/kmap_types.h
deleted file mode 100644
index 0a88622..0000000
--- a/arch/s390/include/asm/kmap_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-#include <asm-generic/kmap_types.h>
-
-#endif
diff --git a/arch/s390/include/asm/local.h b/arch/s390/include/asm/local.h
deleted file mode 100644
index c11c530..0000000
--- a/arch/s390/include/asm/local.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local.h>
diff --git a/arch/s390/include/asm/local64.h b/arch/s390/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/s390/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/s390/include/asm/xor.h b/arch/s390/include/asm/xor.h
deleted file mode 100644
index c82eb12..0000000
--- a/arch/s390/include/asm/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/xor.h>
diff --git a/arch/s390/include/uapi/asm/errno.h b/arch/s390/include/uapi/asm/errno.h
deleted file mode 100644
index 395e97d..0000000
--- a/arch/s390/include/uapi/asm/errno.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * S390 version
- *
- */
-
-#ifndef _S390_ERRNO_H
-#define _S390_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif
diff --git a/arch/s390/include/uapi/asm/fcntl.h b/arch/s390/include/uapi/asm/fcntl.h
deleted file mode 100644
index 46ab12d..0000000
--- a/arch/s390/include/uapi/asm/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/arch/s390/include/uapi/asm/ioctl.h b/arch/s390/include/uapi/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/arch/s390/include/uapi/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/arch/s390/include/uapi/asm/param.h b/arch/s390/include/uapi/asm/param.h
deleted file mode 100644
index c616821..0000000
--- a/arch/s390/include/uapi/asm/param.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASMS390_PARAM_H
-#define _ASMS390_PARAM_H
-
-#include <asm-generic/param.h>
-
-#endif /* _ASMS390_PARAM_H */
diff --git a/arch/s390/include/uapi/asm/poll.h b/arch/s390/include/uapi/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/s390/include/uapi/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/s390/include/uapi/asm/resource.h b/arch/s390/include/uapi/asm/resource.h
deleted file mode 100644
index ec23d1c..0000000
--- a/arch/s390/include/uapi/asm/resource.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * S390 version
- *
- * Derived from "include/asm-i386/resources.h"
- */
-
-#ifndef _S390_RESOURCE_H
-#define _S390_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif
-
diff --git a/arch/s390/include/uapi/asm/sockios.h b/arch/s390/include/uapi/asm/sockios.h
deleted file mode 100644
index 6f60eee..0000000
--- a/arch/s390/include/uapi/asm/sockios.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_S390_SOCKIOS_H
-#define _ASM_S390_SOCKIOS_H
-
-#include <asm-generic/sockios.h>
-
-#endif
diff --git a/arch/s390/include/uapi/asm/termbits.h b/arch/s390/include/uapi/asm/termbits.h
deleted file mode 100644
index 71bf6ac..0000000
--- a/arch/s390/include/uapi/asm/termbits.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_S390_TERMBITS_H
-#define _ASM_S390_TERMBITS_H
-
-#include <asm-generic/termbits.h>
-
-#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 19/25] score: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (17 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 18/25] s390: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 20/25] sparc: " Steven Rostedt
` (7 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Chen Liqin, Lennox Wu
[-- Attachment #1: 0019-score-Use-Kbuild-infrastructure-to-handle-asm-generi.patch --]
[-- Type: text/plain, Size: 20902 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/score/include/asm/Kbuild | 44 ++++++++++++++++++++++++++++
arch/score/include/asm/bitsperlong.h | 6 ----
arch/score/include/asm/bugs.h | 6 ----
arch/score/include/asm/cputime.h | 6 ----
arch/score/include/asm/current.h | 6 ----
arch/score/include/asm/device.h | 6 ----
arch/score/include/asm/div64.h | 6 ----
arch/score/include/asm/emergency-restart.h | 6 ----
arch/score/include/asm/errno.h | 6 ----
arch/score/include/asm/fcntl.h | 6 ----
arch/score/include/asm/futex.h | 6 ----
arch/score/include/asm/hardirq.h | 6 ----
arch/score/include/asm/ioctl.h | 6 ----
arch/score/include/asm/ioctls.h | 6 ----
arch/score/include/asm/ipcbuf.h | 6 ----
arch/score/include/asm/kdebug.h | 6 ----
arch/score/include/asm/kmap_types.h | 6 ----
arch/score/include/asm/kvm_para.h | 1 -
arch/score/include/asm/local.h | 6 ----
arch/score/include/asm/local64.h | 1 -
arch/score/include/asm/mman.h | 6 ----
arch/score/include/asm/msgbuf.h | 6 ----
arch/score/include/asm/param.h | 6 ----
arch/score/include/asm/percpu.h | 6 ----
arch/score/include/asm/poll.h | 6 ----
arch/score/include/asm/posix_types.h | 6 ----
arch/score/include/asm/resource.h | 6 ----
arch/score/include/asm/scatterlist.h | 6 ----
arch/score/include/asm/sections.h | 6 ----
arch/score/include/asm/sembuf.h | 6 ----
arch/score/include/asm/shmbuf.h | 6 ----
arch/score/include/asm/shmparam.h | 6 ----
arch/score/include/asm/siginfo.h | 6 ----
arch/score/include/asm/signal.h | 6 ----
arch/score/include/asm/socket.h | 6 ----
arch/score/include/asm/sockios.h | 6 ----
arch/score/include/asm/stat.h | 6 ----
arch/score/include/asm/statfs.h | 6 ----
arch/score/include/asm/swab.h | 6 ----
arch/score/include/asm/termbits.h | 6 ----
arch/score/include/asm/termios.h | 6 ----
arch/score/include/asm/topology.h | 6 ----
arch/score/include/asm/types.h | 6 ----
arch/score/include/asm/ucontext.h | 1 -
arch/score/include/asm/unaligned.h | 6 ----
45 files changed, 44 insertions(+), 249 deletions(-)
delete mode 100644 arch/score/include/asm/bitsperlong.h
delete mode 100644 arch/score/include/asm/bugs.h
delete mode 100644 arch/score/include/asm/cputime.h
delete mode 100644 arch/score/include/asm/current.h
delete mode 100644 arch/score/include/asm/device.h
delete mode 100644 arch/score/include/asm/div64.h
delete mode 100644 arch/score/include/asm/emergency-restart.h
delete mode 100644 arch/score/include/asm/errno.h
delete mode 100644 arch/score/include/asm/fcntl.h
delete mode 100644 arch/score/include/asm/futex.h
delete mode 100644 arch/score/include/asm/hardirq.h
delete mode 100644 arch/score/include/asm/ioctl.h
delete mode 100644 arch/score/include/asm/ioctls.h
delete mode 100644 arch/score/include/asm/ipcbuf.h
delete mode 100644 arch/score/include/asm/kdebug.h
delete mode 100644 arch/score/include/asm/kmap_types.h
delete mode 100644 arch/score/include/asm/kvm_para.h
delete mode 100644 arch/score/include/asm/local.h
delete mode 100644 arch/score/include/asm/local64.h
delete mode 100644 arch/score/include/asm/mman.h
delete mode 100644 arch/score/include/asm/msgbuf.h
delete mode 100644 arch/score/include/asm/param.h
delete mode 100644 arch/score/include/asm/percpu.h
delete mode 100644 arch/score/include/asm/poll.h
delete mode 100644 arch/score/include/asm/posix_types.h
delete mode 100644 arch/score/include/asm/resource.h
delete mode 100644 arch/score/include/asm/scatterlist.h
delete mode 100644 arch/score/include/asm/sections.h
delete mode 100644 arch/score/include/asm/sembuf.h
delete mode 100644 arch/score/include/asm/shmbuf.h
delete mode 100644 arch/score/include/asm/shmparam.h
delete mode 100644 arch/score/include/asm/siginfo.h
delete mode 100644 arch/score/include/asm/signal.h
delete mode 100644 arch/score/include/asm/socket.h
delete mode 100644 arch/score/include/asm/sockios.h
delete mode 100644 arch/score/include/asm/stat.h
delete mode 100644 arch/score/include/asm/statfs.h
delete mode 100644 arch/score/include/asm/swab.h
delete mode 100644 arch/score/include/asm/termbits.h
delete mode 100644 arch/score/include/asm/termios.h
delete mode 100644 arch/score/include/asm/topology.h
delete mode 100644 arch/score/include/asm/types.h
delete mode 100644 arch/score/include/asm/ucontext.h
delete mode 100644 arch/score/include/asm/unaligned.h
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index ec697ae..05f0172 100644
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@ -2,4 +2,48 @@ include include/asm-generic/Kbuild.asm
header-y +=
+generic-y += bitsperlong.h
+generic-y += bugs.h
+generic-y += cputime.h
+generic-y += current.h
generic-y += clkdev.h
+generic-y += device.h
+generic-y += div64.h
+generic-y += emergency-restart.h
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += futex.h
+generic-y += hardirq.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipcbuf.h
+generic-y += kdebug.h
+generic-y += kmap_types.h
+generic-y += kvm_para.h
+generic-y += local64.h
+generic-y += local.h
+generic-y += mman.h
+generic-y += msgbuf.h
+generic-y += param.h
+generic-y += percpu.h
+generic-y += poll.h
+generic-y += posix_types.h
+generic-y += resource.h
+generic-y += scatterlist.h
+generic-y += sections.h
+generic-y += sembuf.h
+generic-y += shmbuf.h
+generic-y += shmparam.h
+generic-y += siginfo.h
+generic-y += signal.h
+generic-y += socket.h
+generic-y += sockios.h
+generic-y += statfs.h
+generic-y += stat.h
+generic-y += swab.h
+generic-y += termbits.h
+generic-y += termios.h
+generic-y += topology.h
+generic-y += types.h
+generic-y += ucontext.h
+generic-y += unaligned.h
diff --git a/arch/score/include/asm/bitsperlong.h b/arch/score/include/asm/bitsperlong.h
deleted file mode 100644
index 86ff337..0000000
--- a/arch/score/include/asm/bitsperlong.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_BITSPERLONG_H
-#define _ASM_SCORE_BITSPERLONG_H
-
-#include <asm-generic/bitsperlong.h>
-
-#endif /* _ASM_SCORE_BITSPERLONG_H */
diff --git a/arch/score/include/asm/bugs.h b/arch/score/include/asm/bugs.h
deleted file mode 100644
index a062e10..0000000
--- a/arch/score/include/asm/bugs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_BUGS_H
-#define _ASM_SCORE_BUGS_H
-
-#include <asm-generic/bugs.h>
-
-#endif /* _ASM_SCORE_BUGS_H */
diff --git a/arch/score/include/asm/cputime.h b/arch/score/include/asm/cputime.h
deleted file mode 100644
index 1fced99..0000000
--- a/arch/score/include/asm/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_CPUTIME_H
-#define _ASM_SCORE_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* _ASM_SCORE_CPUTIME_H */
diff --git a/arch/score/include/asm/current.h b/arch/score/include/asm/current.h
deleted file mode 100644
index 16eae9c..0000000
--- a/arch/score/include/asm/current.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_CURRENT_H
-#define _ASM_SCORE_CURRENT_H
-
-#include <asm-generic/current.h>
-
-#endif /* _ASM_SCORE_CURRENT_H */
diff --git a/arch/score/include/asm/device.h b/arch/score/include/asm/device.h
deleted file mode 100644
index 2dc7cc5..0000000
--- a/arch/score/include/asm/device.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_DEVICE_H
-#define _ASM_SCORE_DEVICE_H
-
-#include <asm-generic/device.h>
-
-#endif /* _ASM_SCORE_DEVICE_H */
diff --git a/arch/score/include/asm/div64.h b/arch/score/include/asm/div64.h
deleted file mode 100644
index 75fae19..0000000
--- a/arch/score/include/asm/div64.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_DIV64_H
-#define _ASM_SCORE_DIV64_H
-
-#include <asm-generic/div64.h>
-
-#endif /* _ASM_SCORE_DIV64_H */
diff --git a/arch/score/include/asm/emergency-restart.h b/arch/score/include/asm/emergency-restart.h
deleted file mode 100644
index ca31e98..0000000
--- a/arch/score/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_EMERGENCY_RESTART_H
-#define _ASM_SCORE_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_SCORE_EMERGENCY_RESTART_H */
diff --git a/arch/score/include/asm/errno.h b/arch/score/include/asm/errno.h
deleted file mode 100644
index 29ff39d..0000000
--- a/arch/score/include/asm/errno.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_ERRNO_H
-#define _ASM_SCORE_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif /* _ASM_SCORE_ERRNO_H */
diff --git a/arch/score/include/asm/fcntl.h b/arch/score/include/asm/fcntl.h
deleted file mode 100644
index 03968a3..0000000
--- a/arch/score/include/asm/fcntl.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_FCNTL_H
-#define _ASM_SCORE_FCNTL_H
-
-#include <asm-generic/fcntl.h>
-
-#endif /* _ASM_SCORE_FCNTL_H */
diff --git a/arch/score/include/asm/futex.h b/arch/score/include/asm/futex.h
deleted file mode 100644
index 1dca242..0000000
--- a/arch/score/include/asm/futex.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_FUTEX_H
-#define _ASM_SCORE_FUTEX_H
-
-#include <asm-generic/futex.h>
-
-#endif /* _ASM_SCORE_FUTEX_H */
diff --git a/arch/score/include/asm/hardirq.h b/arch/score/include/asm/hardirq.h
deleted file mode 100644
index dc932c5..0000000
--- a/arch/score/include/asm/hardirq.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_HARDIRQ_H
-#define _ASM_SCORE_HARDIRQ_H
-
-#include <asm-generic/hardirq.h>
-
-#endif /* _ASM_SCORE_HARDIRQ_H */
diff --git a/arch/score/include/asm/ioctl.h b/arch/score/include/asm/ioctl.h
deleted file mode 100644
index a351d21..0000000
--- a/arch/score/include/asm/ioctl.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_IOCTL_H
-#define _ASM_SCORE_IOCTL_H
-
-#include <asm-generic/ioctl.h>
-
-#endif /* _ASM_SCORE_IOCTL_H */
diff --git a/arch/score/include/asm/ioctls.h b/arch/score/include/asm/ioctls.h
deleted file mode 100644
index ed01d2b..0000000
--- a/arch/score/include/asm/ioctls.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_IOCTLS_H
-#define _ASM_SCORE_IOCTLS_H
-
-#include <asm-generic/ioctls.h>
-
-#endif /* _ASM_SCORE_IOCTLS_H */
diff --git a/arch/score/include/asm/ipcbuf.h b/arch/score/include/asm/ipcbuf.h
deleted file mode 100644
index e082cef..0000000
--- a/arch/score/include/asm/ipcbuf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_IPCBUF_H
-#define _ASM_SCORE_IPCBUF_H
-
-#include <asm-generic/ipcbuf.h>
-
-#endif /* _ASM_SCORE_IPCBUF_H */
diff --git a/arch/score/include/asm/kdebug.h b/arch/score/include/asm/kdebug.h
deleted file mode 100644
index a666e51..0000000
--- a/arch/score/include/asm/kdebug.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_KDEBUG_H
-#define _ASM_SCORE_KDEBUG_H
-
-#include <asm-generic/kdebug.h>
-
-#endif /* _ASM_SCORE_KDEBUG_H */
diff --git a/arch/score/include/asm/kmap_types.h b/arch/score/include/asm/kmap_types.h
deleted file mode 100644
index 6c46eb5..0000000
--- a/arch/score/include/asm/kmap_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_KMAP_TYPES_H
-#define _ASM_SCORE_KMAP_TYPES_H
-
-#include <asm-generic/kmap_types.h>
-
-#endif /* _ASM_SCORE_KMAP_TYPES_H */
diff --git a/arch/score/include/asm/kvm_para.h b/arch/score/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/score/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/score/include/asm/local.h b/arch/score/include/asm/local.h
deleted file mode 100644
index 7e02f13..0000000
--- a/arch/score/include/asm/local.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_LOCAL_H
-#define _ASM_SCORE_LOCAL_H
-
-#include <asm-generic/local.h>
-
-#endif /* _ASM_SCORE_LOCAL_H */
diff --git a/arch/score/include/asm/local64.h b/arch/score/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/score/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/score/include/asm/mman.h b/arch/score/include/asm/mman.h
deleted file mode 100644
index 84d85dd..0000000
--- a/arch/score/include/asm/mman.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_MMAN_H
-#define _ASM_SCORE_MMAN_H
-
-#include <asm-generic/mman.h>
-
-#endif /* _ASM_SCORE_MMAN_H */
diff --git a/arch/score/include/asm/msgbuf.h b/arch/score/include/asm/msgbuf.h
deleted file mode 100644
index 7506721..0000000
--- a/arch/score/include/asm/msgbuf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_MSGBUF_H
-#define _ASM_SCORE_MSGBUF_H
-
-#include <asm-generic/msgbuf.h>
-
-#endif /* _ASM_SCORE_MSGBUF_H */
diff --git a/arch/score/include/asm/param.h b/arch/score/include/asm/param.h
deleted file mode 100644
index 916b869..0000000
--- a/arch/score/include/asm/param.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_PARAM_H
-#define _ASM_SCORE_PARAM_H
-
-#include <asm-generic/param.h>
-
-#endif /* _ASM_SCORE_PARAM_H */
diff --git a/arch/score/include/asm/percpu.h b/arch/score/include/asm/percpu.h
deleted file mode 100644
index e7bd4e0..0000000
--- a/arch/score/include/asm/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_PERCPU_H
-#define _ASM_SCORE_PERCPU_H
-
-#include <asm-generic/percpu.h>
-
-#endif /* _ASM_SCORE_PERCPU_H */
diff --git a/arch/score/include/asm/poll.h b/arch/score/include/asm/poll.h
deleted file mode 100644
index 18532db..0000000
--- a/arch/score/include/asm/poll.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_POLL_H
-#define _ASM_SCORE_POLL_H
-
-#include <asm-generic/poll.h>
-
-#endif /* _ASM_SCORE_POLL_H */
diff --git a/arch/score/include/asm/posix_types.h b/arch/score/include/asm/posix_types.h
deleted file mode 100644
index b88acf8..0000000
--- a/arch/score/include/asm/posix_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_POSIX_TYPES_H
-#define _ASM_SCORE_POSIX_TYPES_H
-
-#include <asm-generic/posix_types.h>
-
-#endif /* _ASM_SCORE_POSIX_TYPES_H */
diff --git a/arch/score/include/asm/resource.h b/arch/score/include/asm/resource.h
deleted file mode 100644
index 9ce22bc..0000000
--- a/arch/score/include/asm/resource.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_RESOURCE_H
-#define _ASM_SCORE_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif /* _ASM_SCORE_RESOURCE_H */
diff --git a/arch/score/include/asm/scatterlist.h b/arch/score/include/asm/scatterlist.h
deleted file mode 100644
index 9f533b8..0000000
--- a/arch/score/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_SCATTERLIST_H
-#define _ASM_SCORE_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* _ASM_SCORE_SCATTERLIST_H */
diff --git a/arch/score/include/asm/sections.h b/arch/score/include/asm/sections.h
deleted file mode 100644
index 9441d23..0000000
--- a/arch/score/include/asm/sections.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_SECTIONS_H
-#define _ASM_SCORE_SECTIONS_H
-
-#include <asm-generic/sections.h>
-
-#endif /* _ASM_SCORE_SECTIONS_H */
diff --git a/arch/score/include/asm/sembuf.h b/arch/score/include/asm/sembuf.h
deleted file mode 100644
index dae5e83..0000000
--- a/arch/score/include/asm/sembuf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_SEMBUF_H
-#define _ASM_SCORE_SEMBUF_H
-
-#include <asm-generic/sembuf.h>
-
-#endif /* _ASM_SCORE_SEMBUF_H */
diff --git a/arch/score/include/asm/shmbuf.h b/arch/score/include/asm/shmbuf.h
deleted file mode 100644
index c85b242..0000000
--- a/arch/score/include/asm/shmbuf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_SHMBUF_H
-#define _ASM_SCORE_SHMBUF_H
-
-#include <asm-generic/shmbuf.h>
-
-#endif /* _ASM_SCORE_SHMBUF_H */
diff --git a/arch/score/include/asm/shmparam.h b/arch/score/include/asm/shmparam.h
deleted file mode 100644
index 1d60813..0000000
--- a/arch/score/include/asm/shmparam.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_SHMPARAM_H
-#define _ASM_SCORE_SHMPARAM_H
-
-#include <asm-generic/shmparam.h>
-
-#endif /* _ASM_SCORE_SHMPARAM_H */
diff --git a/arch/score/include/asm/siginfo.h b/arch/score/include/asm/siginfo.h
deleted file mode 100644
index 87ca356..0000000
--- a/arch/score/include/asm/siginfo.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_SIGINFO_H
-#define _ASM_SCORE_SIGINFO_H
-
-#include <asm-generic/siginfo.h>
-
-#endif /* _ASM_SCORE_SIGINFO_H */
diff --git a/arch/score/include/asm/signal.h b/arch/score/include/asm/signal.h
deleted file mode 100644
index 2605bc0..0000000
--- a/arch/score/include/asm/signal.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_SIGNAL_H
-#define _ASM_SCORE_SIGNAL_H
-
-#include <asm-generic/signal.h>
-
-#endif /* _ASM_SCORE_SIGNAL_H */
diff --git a/arch/score/include/asm/socket.h b/arch/score/include/asm/socket.h
deleted file mode 100644
index 612a70e..0000000
--- a/arch/score/include/asm/socket.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_SOCKET_H
-#define _ASM_SCORE_SOCKET_H
-
-#include <asm-generic/socket.h>
-
-#endif /* _ASM_SCORE_SOCKET_H */
diff --git a/arch/score/include/asm/sockios.h b/arch/score/include/asm/sockios.h
deleted file mode 100644
index ba825648..0000000
--- a/arch/score/include/asm/sockios.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_SOCKIOS_H
-#define _ASM_SCORE_SOCKIOS_H
-
-#include <asm-generic/sockios.h>
-
-#endif /* _ASM_SCORE_SOCKIOS_H */
diff --git a/arch/score/include/asm/stat.h b/arch/score/include/asm/stat.h
deleted file mode 100644
index 5037055..0000000
--- a/arch/score/include/asm/stat.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_STAT_H
-#define _ASM_SCORE_STAT_H
-
-#include <asm-generic/stat.h>
-
-#endif /* _ASM_SCORE_STAT_H */
diff --git a/arch/score/include/asm/statfs.h b/arch/score/include/asm/statfs.h
deleted file mode 100644
index 36e4100..0000000
--- a/arch/score/include/asm/statfs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_STATFS_H
-#define _ASM_SCORE_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif /* _ASM_SCORE_STATFS_H */
diff --git a/arch/score/include/asm/swab.h b/arch/score/include/asm/swab.h
deleted file mode 100644
index fadc3cc..0000000
--- a/arch/score/include/asm/swab.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_SWAB_H
-#define _ASM_SCORE_SWAB_H
-
-#include <asm-generic/swab.h>
-
-#endif /* _ASM_SCORE_SWAB_H */
diff --git a/arch/score/include/asm/termbits.h b/arch/score/include/asm/termbits.h
deleted file mode 100644
index 9a95c14..0000000
--- a/arch/score/include/asm/termbits.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_TERMBITS_H
-#define _ASM_SCORE_TERMBITS_H
-
-#include <asm-generic/termbits.h>
-
-#endif /* _ASM_SCORE_TERMBITS_H */
diff --git a/arch/score/include/asm/termios.h b/arch/score/include/asm/termios.h
deleted file mode 100644
index 40984e8..0000000
--- a/arch/score/include/asm/termios.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_TERMIOS_H
-#define _ASM_SCORE_TERMIOS_H
-
-#include <asm-generic/termios.h>
-
-#endif /* _ASM_SCORE_TERMIOS_H */
diff --git a/arch/score/include/asm/topology.h b/arch/score/include/asm/topology.h
deleted file mode 100644
index 425fba3..0000000
--- a/arch/score/include/asm/topology.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_TOPOLOGY_H
-#define _ASM_SCORE_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_SCORE_TOPOLOGY_H */
diff --git a/arch/score/include/asm/types.h b/arch/score/include/asm/types.h
deleted file mode 100644
index 2140032..0000000
--- a/arch/score/include/asm/types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_TYPES_H
-#define _ASM_SCORE_TYPES_H
-
-#include <asm-generic/types.h>
-
-#endif /* _ASM_SCORE_TYPES_H */
diff --git a/arch/score/include/asm/ucontext.h b/arch/score/include/asm/ucontext.h
deleted file mode 100644
index 9bc07b9..0000000
--- a/arch/score/include/asm/ucontext.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ucontext.h>
diff --git a/arch/score/include/asm/unaligned.h b/arch/score/include/asm/unaligned.h
deleted file mode 100644
index 2fc06de..0000000
--- a/arch/score/include/asm/unaligned.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_UNALIGNED_H
-#define _ASM_SCORE_UNALIGNED_H
-
-#include <asm-generic/unaligned.h>
-
-#endif /* _ASM_SCORE_UNALIGNED_H */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 20/25] sparc: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (18 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 19/25] score: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 3:19 ` David Miller
2012-10-13 2:26 ` [PATCH 21/25] tile: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
` (6 subsequent siblings)
26 siblings, 1 reply; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, David S. Miller
[-- Attachment #1: 0020-sparc-Use-Kbuild-infrastructure-to-handle-asm-generi.patch --]
[-- Type: text/plain, Size: 3369 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: sparclinux@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/sparc/include/asm/Kbuild | 5 +++++
arch/sparc/include/asm/cputime.h | 6 ------
arch/sparc/include/asm/emergency-restart.h | 6 ------
arch/sparc/include/asm/kmap_types.h | 10 ----------
arch/sparc/include/uapi/asm/kvm_para.h | 1 -
arch/sparc/include/uapi/asm/statfs.h | 6 ------
6 files changed, 5 insertions(+), 29 deletions(-)
delete mode 100644 arch/sparc/include/asm/cputime.h
delete mode 100644 arch/sparc/include/asm/emergency-restart.h
delete mode 100644 arch/sparc/include/asm/kmap_types.h
delete mode 100644 arch/sparc/include/uapi/asm/kvm_para.h
delete mode 100644 arch/sparc/include/uapi/asm/statfs.h
diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild
index 10d54e5..22a0d45 100644
--- a/arch/sparc/include/asm/Kbuild
+++ b/arch/sparc/include/asm/Kbuild
@@ -1,10 +1,15 @@
# User exported sparc header files
+generic-y += cputime.h
generic-y += clkdev.h
+generic-y += emergency-restart.h
generic-y += div64.h
generic-y += exec.h
generic-y += local64.h
generic-y += irq_regs.h
+generic-y += kmap_types.h
+generic-y += kvm_para.h
generic-y += local.h
+generic-y += statfs.h
generic-y += word-at-a-time.h
diff --git a/arch/sparc/include/asm/cputime.h b/arch/sparc/include/asm/cputime.h
deleted file mode 100644
index 1a642b8..0000000
--- a/arch/sparc/include/asm/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __SPARC_CPUTIME_H
-#define __SPARC_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __SPARC_CPUTIME_H */
diff --git a/arch/sparc/include/asm/emergency-restart.h b/arch/sparc/include/asm/emergency-restart.h
deleted file mode 100644
index 108d8c4..0000000
--- a/arch/sparc/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/arch/sparc/include/asm/kmap_types.h b/arch/sparc/include/asm/kmap_types.h
deleted file mode 100644
index aad2174..0000000
--- a/arch/sparc/include/asm/kmap_types.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-/* Dummy header just to define km_type. None of this
- * is actually used on sparc. -DaveM
- */
-
-#include <asm-generic/kmap_types.h>
-
-#endif
diff --git a/arch/sparc/include/uapi/asm/kvm_para.h b/arch/sparc/include/uapi/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/sparc/include/uapi/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/sparc/include/uapi/asm/statfs.h b/arch/sparc/include/uapi/asm/statfs.h
deleted file mode 100644
index 55e607a..0000000
--- a/arch/sparc/include/uapi/asm/statfs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef ___ASM_SPARC_STATFS_H
-#define ___ASM_SPARC_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 21/25] tile: Use Kbuild infrastructure for kvm_para.h
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (19 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 20/25] sparc: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-14 17:11 ` Chris Metcalf
2012-10-13 2:26 ` [PATCH 22/25] um: " Steven Rostedt
` (5 subsequent siblings)
26 siblings, 1 reply; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Chris Metcalf
[-- Attachment #1: 0021-tile-Use-Kbuild-infrastructure-for-kvm_para.h.patch --]
[-- Type: text/plain, Size: 1080 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
All the headers but kvm_para.h use the Kbuild infrastructure to
get to the asm-generic headers.
Cc: linux-kbuild@vger.kernel.org
Cc: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/tile/include/asm/Kbuild | 1 +
arch/tile/include/asm/kvm_para.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 arch/tile/include/asm/kvm_para.h
diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild
index 5cd98fa..0296734 100644
--- a/arch/tile/include/asm/Kbuild
+++ b/arch/tile/include/asm/Kbuild
@@ -21,6 +21,7 @@ generic-y += ioctls.h
generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += kdebug.h
+generic-y += kvm_para.h
generic-y += local.h
generic-y += msgbuf.h
generic-y += mutex.h
diff --git a/arch/tile/include/asm/kvm_para.h b/arch/tile/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/tile/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 22/25] um: Use Kbuild infrastructure for kvm_para.h
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (20 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 21/25] tile: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-14 10:57 ` richard -rw- weinberger
2012-10-13 2:26 ` [PATCH 23/25] unicore32: " Steven Rostedt
` (4 subsequent siblings)
26 siblings, 1 reply; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Jeff Dike, Richard Weinberger
[-- Attachment #1: 0022-um-Use-Kbuild-infrastructure-for-kvm_para.h.patch --]
[-- Type: text/plain, Size: 1307 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
All the headers but kvm_para.h use the Kbuild infrastructure to
get to the asm-generic headers.
(also had to add ipcbuf.h)
Cc: linux-kbuild@vger.kernel.org
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/um/include/asm/Kbuild | 2 +-
arch/um/include/asm/kvm_para.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
delete mode 100644 arch/um/include/asm/kvm_para.h
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
index 0f6e7b3..ad316e7 100644
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@ -1,4 +1,4 @@
generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h
generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h
generic-y += ftrace.h pci.h io.h param.h delay.h mutex.h current.h exec.h
-generic-y += switch_to.h clkdev.h
+generic-y += switch_to.h clkdev.h kvm_para.h ipcbuf.h
diff --git a/arch/um/include/asm/kvm_para.h b/arch/um/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/um/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 23/25] unicore32: Use Kbuild infrastructure for kvm_para.h
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (21 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 22/25] um: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 12:27 ` guanxuetao
2012-10-13 2:26 ` [PATCH 24/25] x86: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
` (3 subsequent siblings)
26 siblings, 1 reply; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Guan Xuetao
[-- Attachment #1: 0023-unicore32-Use-Kbuild-infrastructure-for-kvm_para.h.patch --]
[-- Type: text/plain, Size: 1131 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
All the headers but kvm_para.h use the Kbuild infrastructure to
get to the asm-generic headers.
Cc: linux-kbuild@vger.kernel.org
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/unicore32/include/asm/Kbuild | 1 +
arch/unicore32/include/asm/kvm_para.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 arch/unicore32/include/asm/kvm_para.h
diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild
index c910c98..15b47f2 100644
--- a/arch/unicore32/include/asm/Kbuild
+++ b/arch/unicore32/include/asm/Kbuild
@@ -24,6 +24,7 @@ generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += kdebug.h
generic-y += kmap_types.h
+generic-y += kvm_para.h
generic-y += local.h
generic-y += mman.h
generic-y += module.h
diff --git a/arch/unicore32/include/asm/kvm_para.h b/arch/unicore32/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/unicore32/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 24/25] x86: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (22 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 23/25] unicore32: " Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 25/25] xtensa: " Steven Rostedt
` (2 subsequent siblings)
26 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch
Cc: Andrew Morton, H. Peter Anvin, Thomas Gleixner, Ingo Molnar
[-- Attachment #1: 0024-x86-Use-Kbuild-infrastructure-to-handle-asm-generic-.patch --]
[-- Type: text/plain, Size: 6722 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: x86@kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/x86/include/asm/Kbuild | 18 ++++++++++++++++++
arch/x86/include/asm/cputime.h | 1 -
arch/x86/include/asm/errno.h | 1 -
arch/x86/include/asm/fcntl.h | 1 -
arch/x86/include/asm/ioctl.h | 1 -
arch/x86/include/asm/ioctls.h | 1 -
arch/x86/include/asm/local64.h | 1 -
arch/x86/include/asm/msgbuf.h | 1 -
arch/x86/include/asm/param.h | 1 -
arch/x86/include/asm/poll.h | 1 -
arch/x86/include/asm/resource.h | 1 -
arch/x86/include/asm/rtc.h | 1 -
arch/x86/include/asm/shmbuf.h | 1 -
arch/x86/include/asm/socket.h | 1 -
arch/x86/include/asm/sockios.h | 1 -
arch/x86/include/asm/termbits.h | 1 -
arch/x86/include/asm/termios.h | 1 -
arch/x86/include/asm/types.h | 6 ------
18 files changed, 18 insertions(+), 22 deletions(-)
delete mode 100644 arch/x86/include/asm/cputime.h
delete mode 100644 arch/x86/include/asm/errno.h
delete mode 100644 arch/x86/include/asm/fcntl.h
delete mode 100644 arch/x86/include/asm/ioctl.h
delete mode 100644 arch/x86/include/asm/ioctls.h
delete mode 100644 arch/x86/include/asm/local64.h
delete mode 100644 arch/x86/include/asm/msgbuf.h
delete mode 100644 arch/x86/include/asm/param.h
delete mode 100644 arch/x86/include/asm/poll.h
delete mode 100644 arch/x86/include/asm/resource.h
delete mode 100644 arch/x86/include/asm/rtc.h
delete mode 100644 arch/x86/include/asm/shmbuf.h
delete mode 100644 arch/x86/include/asm/socket.h
delete mode 100644 arch/x86/include/asm/sockios.h
delete mode 100644 arch/x86/include/asm/termbits.h
delete mode 100644 arch/x86/include/asm/termios.h
delete mode 100644 arch/x86/include/asm/types.h
diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild
index 66e5f0e..eb28799 100644
--- a/arch/x86/include/asm/Kbuild
+++ b/arch/x86/include/asm/Kbuild
@@ -27,4 +27,22 @@ genhdr-y += unistd_32.h
genhdr-y += unistd_64.h
genhdr-y += unistd_x32.h
+generic-y += cputime.h
generic-y += clkdev.h
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipcbuf.h
+generic-y += local64.h
+generic-y += msgbuf.h
+generic-y += param.h
+generic-y += poll.h
+generic-y += resource.h
+generic-y += rtc.h
+generic-y += shmbuf.h
+generic-y += socket.h
+generic-y += sockios.h
+generic-y += termbits.h
+generic-y += termios.h
+generic-y += types.h
diff --git a/arch/x86/include/asm/cputime.h b/arch/x86/include/asm/cputime.h
deleted file mode 100644
index 6d68ad7..0000000
--- a/arch/x86/include/asm/cputime.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/cputime.h>
diff --git a/arch/x86/include/asm/errno.h b/arch/x86/include/asm/errno.h
deleted file mode 100644
index 4c82b50..0000000
--- a/arch/x86/include/asm/errno.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/errno.h>
diff --git a/arch/x86/include/asm/fcntl.h b/arch/x86/include/asm/fcntl.h
deleted file mode 100644
index 46ab12d..0000000
--- a/arch/x86/include/asm/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/arch/x86/include/asm/ioctl.h b/arch/x86/include/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/arch/x86/include/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/arch/x86/include/asm/ioctls.h b/arch/x86/include/asm/ioctls.h
deleted file mode 100644
index ec34c76..0000000
--- a/arch/x86/include/asm/ioctls.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctls.h>
diff --git a/arch/x86/include/asm/local64.h b/arch/x86/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/x86/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/x86/include/asm/msgbuf.h b/arch/x86/include/asm/msgbuf.h
deleted file mode 100644
index 809134c..0000000
--- a/arch/x86/include/asm/msgbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/msgbuf.h>
diff --git a/arch/x86/include/asm/param.h b/arch/x86/include/asm/param.h
deleted file mode 100644
index 965d454..0000000
--- a/arch/x86/include/asm/param.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/param.h>
diff --git a/arch/x86/include/asm/poll.h b/arch/x86/include/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/x86/include/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/x86/include/asm/resource.h b/arch/x86/include/asm/resource.h
deleted file mode 100644
index 04bc4db..0000000
--- a/arch/x86/include/asm/resource.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/resource.h>
diff --git a/arch/x86/include/asm/rtc.h b/arch/x86/include/asm/rtc.h
deleted file mode 100644
index f71c3b0..0000000
--- a/arch/x86/include/asm/rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/rtc.h>
diff --git a/arch/x86/include/asm/shmbuf.h b/arch/x86/include/asm/shmbuf.h
deleted file mode 100644
index 83c05fc..0000000
--- a/arch/x86/include/asm/shmbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/shmbuf.h>
diff --git a/arch/x86/include/asm/socket.h b/arch/x86/include/asm/socket.h
deleted file mode 100644
index 6b71384..0000000
--- a/arch/x86/include/asm/socket.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/socket.h>
diff --git a/arch/x86/include/asm/sockios.h b/arch/x86/include/asm/sockios.h
deleted file mode 100644
index def6d47..0000000
--- a/arch/x86/include/asm/sockios.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/sockios.h>
diff --git a/arch/x86/include/asm/termbits.h b/arch/x86/include/asm/termbits.h
deleted file mode 100644
index 3935b10..0000000
--- a/arch/x86/include/asm/termbits.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/termbits.h>
diff --git a/arch/x86/include/asm/termios.h b/arch/x86/include/asm/termios.h
deleted file mode 100644
index 280d78a..0000000
--- a/arch/x86/include/asm/termios.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/termios.h>
diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h
deleted file mode 100644
index 8e8c23f..0000000
--- a/arch/x86/include/asm/types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_X86_TYPES_H
-#define _ASM_X86_TYPES_H
-
-#include <asm-generic/types.h>
-
-#endif /* _ASM_X86_TYPES_H */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 25/25] xtensa: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (23 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 24/25] x86: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
@ 2012-10-13 2:26 ` Steven Rostedt
2012-10-16 5:14 ` Max Filippov
2012-10-13 9:09 ` [PATCH 00/25] asm-generic: Convert all to use Kbuild file Arnd Bergmann
2012-10-13 10:17 ` Catalin Marinas
26 siblings, 1 reply; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 2:26 UTC (permalink / raw)
To: linux-kernel, linux-arch; +Cc: Andrew Morton, Chris Zankel, Max Filippov
[-- Attachment #1: 0025-xtensa-Use-Kbuild-infrastructure-to-handle-asm-gener.patch --]
[-- Type: text/plain, Size: 15418 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Use Kbuild infrastructure to handle the asm-generic headers
and remove the wrapper headers that call them.
This only affects headers that do nothing but include the generic
equivalent. It does not touch any header that does a little more.
Cc: linux-kbuild@vger.kernel.org
Cc: linux-xtensa@linux-xtensa.org
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/xtensa/include/asm/Kbuild | 25 +++++++++++++++++++++++++
arch/xtensa/include/asm/bitsperlong.h | 1 -
arch/xtensa/include/asm/bug.h | 18 ------------------
arch/xtensa/include/asm/cputime.h | 6 ------
arch/xtensa/include/asm/device.h | 7 -------
arch/xtensa/include/asm/div64.h | 16 ----------------
arch/xtensa/include/asm/emergency-restart.h | 6 ------
arch/xtensa/include/asm/errno.h | 16 ----------------
arch/xtensa/include/asm/fcntl.h | 1 -
arch/xtensa/include/asm/futex.h | 1 -
arch/xtensa/include/asm/hardirq.h | 16 ----------------
arch/xtensa/include/asm/ioctl.h | 1 -
arch/xtensa/include/asm/irq_regs.h | 1 -
arch/xtensa/include/asm/kdebug.h | 1 -
arch/xtensa/include/asm/kmap_types.h | 6 ------
arch/xtensa/include/asm/kvm_para.h | 1 -
arch/xtensa/include/asm/local.h | 16 ----------------
arch/xtensa/include/asm/local64.h | 1 -
arch/xtensa/include/asm/percpu.h | 16 ----------------
arch/xtensa/include/asm/resource.h | 16 ----------------
arch/xtensa/include/asm/scatterlist.h | 16 ----------------
arch/xtensa/include/asm/sections.h | 16 ----------------
arch/xtensa/include/asm/siginfo.h | 16 ----------------
arch/xtensa/include/asm/statfs.h | 17 -----------------
arch/xtensa/include/asm/topology.h | 16 ----------------
arch/xtensa/include/asm/xor.h | 16 ----------------
26 files changed, 25 insertions(+), 244 deletions(-)
delete mode 100644 arch/xtensa/include/asm/bitsperlong.h
delete mode 100644 arch/xtensa/include/asm/bug.h
delete mode 100644 arch/xtensa/include/asm/cputime.h
delete mode 100644 arch/xtensa/include/asm/device.h
delete mode 100644 arch/xtensa/include/asm/div64.h
delete mode 100644 arch/xtensa/include/asm/emergency-restart.h
delete mode 100644 arch/xtensa/include/asm/errno.h
delete mode 100644 arch/xtensa/include/asm/fcntl.h
delete mode 100644 arch/xtensa/include/asm/futex.h
delete mode 100644 arch/xtensa/include/asm/hardirq.h
delete mode 100644 arch/xtensa/include/asm/ioctl.h
delete mode 100644 arch/xtensa/include/asm/irq_regs.h
delete mode 100644 arch/xtensa/include/asm/kdebug.h
delete mode 100644 arch/xtensa/include/asm/kmap_types.h
delete mode 100644 arch/xtensa/include/asm/kvm_para.h
delete mode 100644 arch/xtensa/include/asm/local.h
delete mode 100644 arch/xtensa/include/asm/local64.h
delete mode 100644 arch/xtensa/include/asm/percpu.h
delete mode 100644 arch/xtensa/include/asm/resource.h
delete mode 100644 arch/xtensa/include/asm/scatterlist.h
delete mode 100644 arch/xtensa/include/asm/sections.h
delete mode 100644 arch/xtensa/include/asm/siginfo.h
delete mode 100644 arch/xtensa/include/asm/statfs.h
delete mode 100644 arch/xtensa/include/asm/topology.h
delete mode 100644 arch/xtensa/include/asm/xor.h
diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild
index fccd81e..db2e96a 100644
--- a/arch/xtensa/include/asm/Kbuild
+++ b/arch/xtensa/include/asm/Kbuild
@@ -1,4 +1,29 @@
include include/asm-generic/Kbuild.asm
+generic-y += bitsperlong.h
+generic-y += bug.h
+generic-y += cputime.h
generic-y += clkdev.h
+generic-y += device.h
+generic-y += div64.h
+generic-y += emergency-restart.h
+generic-y += errno.h
generic-y += exec.h
+generic-y += fcntl.h
+generic-y += futex.h
+generic-y += hardirq.h
+generic-y += ioctl.h
+generic-y += irq_regs.h
+generic-y += kdebug.h
+generic-y += kmap_types.h
+generic-y += kvm_para.h
+generic-y += local64.h
+generic-y += local.h
+generic-y += percpu.h
+generic-y += resource.h
+generic-y += scatterlist.h
+generic-y += sections.h
+generic-y += siginfo.h
+generic-y += statfs.h
+generic-y += topology.h
+generic-y += xor.h
diff --git a/arch/xtensa/include/asm/bitsperlong.h b/arch/xtensa/include/asm/bitsperlong.h
deleted file mode 100644
index 6dc0bb0..0000000
--- a/arch/xtensa/include/asm/bitsperlong.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/bitsperlong.h>
diff --git a/arch/xtensa/include/asm/bug.h b/arch/xtensa/include/asm/bug.h
deleted file mode 100644
index 3e52d72..0000000
--- a/arch/xtensa/include/asm/bug.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * include/asm-xtensa/bug.h
- *
- * Macros to cause a 'bug' message.
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_BUG_H
-#define _XTENSA_BUG_H
-
-#include <asm-generic/bug.h>
-
-#endif /* _XTENSA_BUG_H */
diff --git a/arch/xtensa/include/asm/cputime.h b/arch/xtensa/include/asm/cputime.h
deleted file mode 100644
index a7fb864..0000000
--- a/arch/xtensa/include/asm/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _XTENSA_CPUTIME_H
-#define _XTENSA_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* _XTENSA_CPUTIME_H */
diff --git a/arch/xtensa/include/asm/device.h b/arch/xtensa/include/asm/device.h
deleted file mode 100644
index d8f9872..0000000
--- a/arch/xtensa/include/asm/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/arch/xtensa/include/asm/div64.h b/arch/xtensa/include/asm/div64.h
deleted file mode 100644
index f35678c..0000000
--- a/arch/xtensa/include/asm/div64.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * include/asm-xtensa/div64.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2001 - 2007 Tensilica Inc.
- */
-
-#ifndef _XTENSA_DIV64_H
-#define _XTENSA_DIV64_H
-
-#include <asm-generic/div64.h>
-
-#endif /* _XTENSA_DIV64_H */
diff --git a/arch/xtensa/include/asm/emergency-restart.h b/arch/xtensa/include/asm/emergency-restart.h
deleted file mode 100644
index 108d8c4..0000000
--- a/arch/xtensa/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/arch/xtensa/include/asm/errno.h b/arch/xtensa/include/asm/errno.h
deleted file mode 100644
index a0f3b96..0000000
--- a/arch/xtensa/include/asm/errno.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * include/asm-xtensa/errno.h
- *
- * This file is subject to the terms and conditions of the GNU General
- * Public License. See the file "COPYING" in the main directory of
- * this archive for more details.
- *
- * Copyright (C) 2002 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_ERRNO_H
-#define _XTENSA_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif /* _XTENSA_ERRNO_H */
diff --git a/arch/xtensa/include/asm/fcntl.h b/arch/xtensa/include/asm/fcntl.h
deleted file mode 100644
index 46ab12d..0000000
--- a/arch/xtensa/include/asm/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/arch/xtensa/include/asm/futex.h b/arch/xtensa/include/asm/futex.h
deleted file mode 100644
index 0b74582..0000000
--- a/arch/xtensa/include/asm/futex.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/futex.h>
diff --git a/arch/xtensa/include/asm/hardirq.h b/arch/xtensa/include/asm/hardirq.h
deleted file mode 100644
index 91695a1..0000000
--- a/arch/xtensa/include/asm/hardirq.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * include/asm-xtensa/hardirq.h
- *
- * This file is subject to the terms and conditions of the GNU General
- * Public License. See the file "COPYING" in the main directory of
- * this archive for more details.
- *
- * Copyright (C) 2002 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_HARDIRQ_H
-#define _XTENSA_HARDIRQ_H
-
-#include <asm-generic/hardirq.h>
-
-#endif /* _XTENSA_HARDIRQ_H */
diff --git a/arch/xtensa/include/asm/ioctl.h b/arch/xtensa/include/asm/ioctl.h
deleted file mode 100644
index b279fe0..0000000
--- a/arch/xtensa/include/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/arch/xtensa/include/asm/irq_regs.h b/arch/xtensa/include/asm/irq_regs.h
deleted file mode 100644
index 3dd9c0b..0000000
--- a/arch/xtensa/include/asm/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
diff --git a/arch/xtensa/include/asm/kdebug.h b/arch/xtensa/include/asm/kdebug.h
deleted file mode 100644
index 6ece1b0..0000000
--- a/arch/xtensa/include/asm/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
diff --git a/arch/xtensa/include/asm/kmap_types.h b/arch/xtensa/include/asm/kmap_types.h
deleted file mode 100644
index 11c687e..0000000
--- a/arch/xtensa/include/asm/kmap_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _XTENSA_KMAP_TYPES_H
-#define _XTENSA_KMAP_TYPES_H
-
-#include <asm-generic/kmap_types.h>
-
-#endif /* _XTENSA_KMAP_TYPES_H */
diff --git a/arch/xtensa/include/asm/kvm_para.h b/arch/xtensa/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/xtensa/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/xtensa/include/asm/local.h b/arch/xtensa/include/asm/local.h
deleted file mode 100644
index 48723e5..0000000
--- a/arch/xtensa/include/asm/local.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * include/asm-xtensa/local.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_LOCAL_H
-#define _XTENSA_LOCAL_H
-
-#include <asm-generic/local.h>
-
-#endif /* _XTENSA_LOCAL_H */
diff --git a/arch/xtensa/include/asm/local64.h b/arch/xtensa/include/asm/local64.h
deleted file mode 100644
index 36c93b5..0000000
--- a/arch/xtensa/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/xtensa/include/asm/percpu.h b/arch/xtensa/include/asm/percpu.h
deleted file mode 100644
index 6d2bc2a..0000000
--- a/arch/xtensa/include/asm/percpu.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * linux/include/asm-xtensa/percpu.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_PERCPU__
-#define _XTENSA_PERCPU__
-
-#include <asm-generic/percpu.h>
-
-#endif /* _XTENSA_PERCPU__ */
diff --git a/arch/xtensa/include/asm/resource.h b/arch/xtensa/include/asm/resource.h
deleted file mode 100644
index 17b5ab3..0000000
--- a/arch/xtensa/include/asm/resource.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * include/asm-xtensa/resource.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_RESOURCE_H
-#define _XTENSA_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif /* _XTENSA_RESOURCE_H */
diff --git a/arch/xtensa/include/asm/scatterlist.h b/arch/xtensa/include/asm/scatterlist.h
deleted file mode 100644
index a0421a6..0000000
--- a/arch/xtensa/include/asm/scatterlist.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * include/asm-xtensa/scatterlist.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_SCATTERLIST_H
-#define _XTENSA_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* _XTENSA_SCATTERLIST_H */
diff --git a/arch/xtensa/include/asm/sections.h b/arch/xtensa/include/asm/sections.h
deleted file mode 100644
index 40b5191..0000000
--- a/arch/xtensa/include/asm/sections.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * include/asm-xtensa/sections.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_SECTIONS_H
-#define _XTENSA_SECTIONS_H
-
-#include <asm-generic/sections.h>
-
-#endif /* _XTENSA_SECTIONS_H */
diff --git a/arch/xtensa/include/asm/siginfo.h b/arch/xtensa/include/asm/siginfo.h
deleted file mode 100644
index 6916248..0000000
--- a/arch/xtensa/include/asm/siginfo.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * include/asm-xtensa/siginfo.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_SIGINFO_H
-#define _XTENSA_SIGINFO_H
-
-#include <asm-generic/siginfo.h>
-
-#endif /* _XTENSA_SIGINFO_H */
diff --git a/arch/xtensa/include/asm/statfs.h b/arch/xtensa/include/asm/statfs.h
deleted file mode 100644
index 9c3d1a2..0000000
--- a/arch/xtensa/include/asm/statfs.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * include/asm-xtensa/statfs.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_STATFS_H
-#define _XTENSA_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif /* _XTENSA_STATFS_H */
-
diff --git a/arch/xtensa/include/asm/topology.h b/arch/xtensa/include/asm/topology.h
deleted file mode 100644
index 7309e38..0000000
--- a/arch/xtensa/include/asm/topology.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * include/asm-xtensa/topology.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_TOPOLOGY_H
-#define _XTENSA_TOPOLOGY_H
-
-#include <asm-generic/topology.h>
-
-#endif /* _XTENSA_TOPOLOGY_H */
diff --git a/arch/xtensa/include/asm/xor.h b/arch/xtensa/include/asm/xor.h
deleted file mode 100644
index e7b1f08..0000000
--- a/arch/xtensa/include/asm/xor.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * include/asm-xtensa/xor.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_XOR_H
-#define _XTENSA_XOR_H
-
-#include <asm-generic/xor.h>
-
-#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* Re: [PATCH 20/25] sparc: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 ` [PATCH 20/25] sparc: " Steven Rostedt
@ 2012-10-13 3:19 ` David Miller
2012-10-13 13:54 ` Steven Rostedt
0 siblings, 1 reply; 51+ messages in thread
From: David Miller @ 2012-10-13 3:19 UTC (permalink / raw)
To: rostedt; +Cc: linux-kernel, linux-arch, akpm
From: Steven Rostedt <rostedt@goodmis.org>
Date: Fri, 12 Oct 2012 22:26:52 -0400
> From: Steven Rostedt <srostedt@redhat.com>
>
> Use Kbuild infrastructure to handle the asm-generic headers
> and remove the wrapper headers that call them.
>
> This only affects headers that do nothing but include the generic
> equivalent. It does not touch any header that does a little more.
>
> Cc: linux-kbuild@vger.kernel.org
> Cc: sparclinux@vger.kernel.org
> Cc: "David S. Miller" <davem@davemloft.net>
> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 04/25] blackfin: Use Kbuild infrastructure for kvm_para.h
2012-10-13 2:26 ` [PATCH 04/25] blackfin: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
@ 2012-10-13 4:12 ` Mike Frysinger
2012-10-13 13:54 ` Steven Rostedt
0 siblings, 1 reply; 51+ messages in thread
From: Mike Frysinger @ 2012-10-13 4:12 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-kernel, linux-arch, Andrew Morton
[-- Attachment #1: Type: Text/Plain, Size: 265 bytes --]
On Friday 12 October 2012 22:26:36 Steven Rostedt wrote:
> From: Steven Rostedt <srostedt@redhat.com>
>
> All the headers but kvm_para.h use the Kbuild infrastructure to
> get to the asm-generic headers.
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 15/25] openrisc: Use Kbuild infrastructure for kvm_para.h
2012-10-13 2:26 ` [PATCH 15/25] openrisc: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
@ 2012-10-13 6:32 ` Jonas Bonn
2012-10-13 13:55 ` Steven Rostedt
0 siblings, 1 reply; 51+ messages in thread
From: Jonas Bonn @ 2012-10-13 6:32 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-kernel, linux-arch, Andrew Morton
On 13 October 2012 04:26, Steven Rostedt <rostedt@goodmis.org> wrote:
> From: Steven Rostedt <srostedt@redhat.com>
>
> All the headers but kvm_para.h use the Kbuild infrastructure to
> get to the asm-generic headers.
>
> Cc: linux-kbuild@vger.kernel.org
> Cc: linux@lists.openrisc.net
> Cc: Jonas Bonn <jonas@southpole.se>
> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Jonas Bonn <jonas@southpole.se>
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 00/25] asm-generic: Convert all to use Kbuild file
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (24 preceding siblings ...)
2012-10-13 2:26 ` [PATCH 25/25] xtensa: " Steven Rostedt
@ 2012-10-13 9:09 ` Arnd Bergmann
2012-10-13 14:24 ` Steven Rostedt
2012-10-13 10:17 ` Catalin Marinas
26 siblings, 1 reply; 51+ messages in thread
From: Arnd Bergmann @ 2012-10-13 9:09 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-kernel, linux-arch, Andrew Morton
On Friday 12 October 2012 22:26:32 Steven Rostedt wrote:
>
> Please feel free to pluck these patches into your architecture and
> run them to make sure that they boot as well (I only had the compiler
> and not the box... Also I only tested with defconfig, I may have
> broken other configs).
>
> One note, the best thing about these changes is:
>
> 390 files changed, 369 insertions(+), 1378 deletions(-)
Thanks a lot for doing this! I had initially converted a bunch of
architectures to use the asm-generic files this way, but gave up
after some of them turned out to be too much work to get in.
Note that while you are addressing all the obvious candidates that
have only a single #include statement in them, there is room to take
this further because a lot of the other header files in architectures
are still identical to their asm-generic counterparts (aside from
whitespace and comments). I would recommend to arch maintainers that
have not already done so to go through all the headers and replace
the identical ones with generated headers that include the asm-generic
version.
Arnd
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 00/25] asm-generic: Convert all to use Kbuild file
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
` (25 preceding siblings ...)
2012-10-13 9:09 ` [PATCH 00/25] asm-generic: Convert all to use Kbuild file Arnd Bergmann
@ 2012-10-13 10:17 ` Catalin Marinas
2012-10-13 14:20 ` Steven Rostedt
26 siblings, 1 reply; 51+ messages in thread
From: Catalin Marinas @ 2012-10-13 10:17 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-kernel, linux-arch, Andrew Morton
Hi Steven,
On 13 October 2012 03:26, Steven Rostedt <rostedt@goodmis.org> wrote:
> Recently I suggested to someone that was adding a new asm file that
> currently only contained an x86 change to add a header in all archs
> that was just a wrapper to point to the asm-generic version. I suggested
> this because that's the way we use to do it and just to refresh my
> memory, I looked at div64.h in a few archs and saw that was the case.
>
> After having the change done and just after finishing testing it, I was
> notified that the "proper" way of doing this is to add it to the
>
> arch/*/include/asm/Kbuild
>
> file, as 'generic-y += foo.h' and it will reference the asm-generic
> file automatically. Well it would have been nice if I knew this before
> and wasn't confused by seeing the incorrect method.
Since you are cleaning this up already, could you please merge these
patches into your series:
https://lkml.org/lkml/2012/10/11/291
The first patch adds support for generic-y in the new
arch/*/include/uapi/asm/Kbuild file, followed by few patches to
convert three architectures. There will probably be more to convert
after -rc1.
Thanks.
--
Catalin
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 23/25] unicore32: Use Kbuild infrastructure for kvm_para.h
2012-10-13 2:26 ` [PATCH 23/25] unicore32: " Steven Rostedt
@ 2012-10-13 12:27 ` guanxuetao
2012-10-13 14:03 ` Steven Rostedt
0 siblings, 1 reply; 51+ messages in thread
From: guanxuetao @ 2012-10-13 12:27 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-kernel, linux-arch, Andrew Morton, Guan Xuetao
> From: Steven Rostedt <srostedt@redhat.com>
>
> All the headers but kvm_para.h use the Kbuild infrastructure to
> get to the asm-generic headers.
I merged the uapi patch for unicore32.
In that patch, kvm_para.h was moved to
arch/unicore32/include/uapi/asm/kvm_para.h.
Anyway, I'd like to apply this patch based on uapi modification.
Thanks & Regards,
Guan Xuetao
>
> Cc: linux-kbuild@vger.kernel.org
> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
> ---
> arch/unicore32/include/asm/Kbuild | 1 +
> arch/unicore32/include/asm/kvm_para.h | 1 -
> 2 files changed, 1 insertion(+), 1 deletion(-)
> delete mode 100644 arch/unicore32/include/asm/kvm_para.h
>
> diff --git a/arch/unicore32/include/asm/Kbuild
> b/arch/unicore32/include/asm/Kbuild
> index c910c98..15b47f2 100644
> --- a/arch/unicore32/include/asm/Kbuild
> +++ b/arch/unicore32/include/asm/Kbuild
> @@ -24,6 +24,7 @@ generic-y += ipcbuf.h
> generic-y += irq_regs.h
> generic-y += kdebug.h
> generic-y += kmap_types.h
> +generic-y += kvm_para.h
> generic-y += local.h
> generic-y += mman.h
> generic-y += module.h
> diff --git a/arch/unicore32/include/asm/kvm_para.h
> b/arch/unicore32/include/asm/kvm_para.h
> deleted file mode 100644
> index 14fab8f..0000000
> --- a/arch/unicore32/include/asm/kvm_para.h
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <asm-generic/kvm_para.h>
> --
> 1.7.10.4
>
>
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 16/25] parisc: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 ` [PATCH 16/25] parisc: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
@ 2012-10-13 12:36 ` James Bottomley
2012-10-13 14:17 ` Steven Rostedt
0 siblings, 1 reply; 51+ messages in thread
From: James Bottomley @ 2012-10-13 12:36 UTC (permalink / raw)
To: Steven Rostedt
Cc: linux-kernel, linux-arch, Andrew Morton, James E.J. Bottomley,
Helge Deller
On Fri, 2012-10-12 at 22:26 -0400, Steven Rostedt wrote:
> plain text document attachment
> (0016-parisc-Use-Kbuild-infrastructure-to-handle-asm-gener.patch)
> From: Steven Rostedt <srostedt@redhat.com>
>
> Use Kbuild infrastructure to handle the asm-generic headers
> and remove the wrapper headers that call them.
>
> This only affects headers that do nothing but include the generic
> equivalent. It does not touch any header that does a little more.
>
> Cc: linux-kbuild@vger.kernel.org
> Cc: linux-parisc@vger.kernel.org
> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
> Cc: Helge Deller <deller@gmx.de>
> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Actually, we're already evaluating a patch like this:
http://marc.info/?l=linux-kernel&m=134883983019018
When I compare the two, I notice you missed a few (segment.h, vga.h,
hw_irq.h, mutex.h), so you probably want to adjust your scripts.
James
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 20/25] sparc: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 3:19 ` David Miller
@ 2012-10-13 13:54 ` Steven Rostedt
2012-10-13 21:54 ` David Miller
0 siblings, 1 reply; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 13:54 UTC (permalink / raw)
To: David Miller; +Cc: linux-kernel, linux-arch, akpm
On Fri, 2012-10-12 at 23:19 -0400, David Miller wrote:
> From: Steven Rostedt <rostedt@goodmis.org>
> Date: Fri, 12 Oct 2012 22:26:52 -0400
>
> > From: Steven Rostedt <srostedt@redhat.com>
> >
> > Use Kbuild infrastructure to handle the asm-generic headers
> > and remove the wrapper headers that call them.
> >
> > This only affects headers that do nothing but include the generic
> > equivalent. It does not touch any header that does a little more.
> >
> > Cc: linux-kbuild@vger.kernel.org
> > Cc: sparclinux@vger.kernel.org
> > Cc: "David S. Miller" <davem@davemloft.net>
> > Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
>
> Acked-by: David S. Miller <davem@davemloft.net>
David,
Would you like to take this patch? It's not dependent on any of the
other patches. Otherwise I'll probably ask Andrew to pull it into his
tree. Or I can just set up a branch and have it go into linux-next for
the next merge window.
-- Steve
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 04/25] blackfin: Use Kbuild infrastructure for kvm_para.h
2012-10-13 4:12 ` Mike Frysinger
@ 2012-10-13 13:54 ` Steven Rostedt
2012-10-13 14:53 ` Bob Liu
0 siblings, 1 reply; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 13:54 UTC (permalink / raw)
To: Mike Frysinger; +Cc: linux-kernel, linux-arch, Andrew Morton
On Sat, 2012-10-13 at 00:12 -0400, Mike Frysinger wrote:
> On Friday 12 October 2012 22:26:36 Steven Rostedt wrote:
> > From: Steven Rostedt <srostedt@redhat.com>
> >
> > All the headers but kvm_para.h use the Kbuild infrastructure to
> > get to the asm-generic headers.
>
> Acked-by: Mike Frysinger <vapier@gentoo.org>
> -mike
Thanks Mike,
Would you want to pull this patch into your tree? It's not dependent on
any of the other patches.
-- Steve
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 15/25] openrisc: Use Kbuild infrastructure for kvm_para.h
2012-10-13 6:32 ` Jonas Bonn
@ 2012-10-13 13:55 ` Steven Rostedt
2012-10-14 10:36 ` Jonas Bonn
0 siblings, 1 reply; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 13:55 UTC (permalink / raw)
To: Jonas Bonn; +Cc: linux-kernel, linux-arch, Andrew Morton
On Sat, 2012-10-13 at 08:32 +0200, Jonas Bonn wrote:
> On 13 October 2012 04:26, Steven Rostedt <rostedt@goodmis.org> wrote:
> > From: Steven Rostedt <srostedt@redhat.com>
> >
> > All the headers but kvm_para.h use the Kbuild infrastructure to
> > get to the asm-generic headers.
> >
> > Cc: linux-kbuild@vger.kernel.org
> > Cc: linux@lists.openrisc.net
> > Cc: Jonas Bonn <jonas@southpole.se>
> > Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
>
> Acked-by: Jonas Bonn <jonas@southpole.se>
Thanks Jonas,
Would you like to pull this into your tree? It's not dependent on any of
the other patches. Or I can take care of it too.
-- Steve
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 23/25] unicore32: Use Kbuild infrastructure for kvm_para.h
2012-10-13 12:27 ` guanxuetao
@ 2012-10-13 14:03 ` Steven Rostedt
0 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 14:03 UTC (permalink / raw)
To: guanxuetao; +Cc: linux-kernel, linux-arch, Andrew Morton, Guan Xuetao
On Sat, 2012-10-13 at 20:27 +0800, guanxuetao@mprc.pku.edu.cn wrote:
> > From: Steven Rostedt <srostedt@redhat.com>
> >
> > All the headers but kvm_para.h use the Kbuild infrastructure to
> > get to the asm-generic headers.
>
> I merged the uapi patch for unicore32.
> In that patch, kvm_para.h was moved to
> arch/unicore32/include/uapi/asm/kvm_para.h.
> Anyway, I'd like to apply this patch based on uapi modification.
>
Sure, do whatever you want ;-)
-- Steve
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 16/25] parisc: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 12:36 ` James Bottomley
@ 2012-10-13 14:17 ` Steven Rostedt
0 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 14:17 UTC (permalink / raw)
To: James Bottomley
Cc: linux-kernel, linux-arch, Andrew Morton, James E.J. Bottomley,
Helge Deller
On Sat, 2012-10-13 at 13:36 +0100, James Bottomley wrote:
> On Fri, 2012-10-12 at 22:26 -0400, Steven Rostedt wrote:
> > plain text document attachment
> > (0016-parisc-Use-Kbuild-infrastructure-to-handle-asm-gener.patch)
> > From: Steven Rostedt <srostedt@redhat.com>
> >
> > Use Kbuild infrastructure to handle the asm-generic headers
> > and remove the wrapper headers that call them.
> >
> > This only affects headers that do nothing but include the generic
> > equivalent. It does not touch any header that does a little more.
> >
> > Cc: linux-kbuild@vger.kernel.org
> > Cc: linux-parisc@vger.kernel.org
> > Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
> > Cc: Helge Deller <deller@gmx.de>
> > Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
>
> Actually, we're already evaluating a patch like this:
>
> http://marc.info/?l=linux-kernel&m=134883983019018
>
> When I compare the two, I notice you missed a few (segment.h, vga.h,
> hw_irq.h, mutex.h), so you probably want to adjust your scripts.
>
Scripts? Naw I did this by hand:
cd arch/parisc/include/asm
vim `grep -l asm-generic *.h`
And in another terminal added the changes needed to Kbuild. I did this
by hand because it would have taken me the same time to verify scripts
to do it. By doing it by hand, I was less likely to add something that I
shouldn't have.
As Arnd mentioned, I didn't do a compare to check if what is in the
header is identical to the asm-generic version. That was going to be
"take 2". As this was just removing the simple cases of either:
foo.h:
#include <asm-generic/foo.h>
or
foo.h:
#ifndef _ASM_PARISC_FOO_H
#define _ASM_PARISC_FOO_H
#include <asm-generic/foo.h>
#endif
As for the ones I missed:
mutex.h has:
#include <asm-generic/mutex-dec.h>
which did not match mutex.h, so I ignored it. It would be removed in
"take 2" because it's identical to asm-generic/mutex.h.
segment.h:
#ifndef __PARISC_SEGMENT_H
#define __PARISC_SEGMENT_H
/* Only here because we have some old header files that expect it.. */
#endif
It missed the 'grep -l asm-generic' part.
vga.h and hw_irq.h are also empty (no asm-generic added). segment.h and
hw_irq.h are also empty in asm-generic, so they could be removed in take
2 as well. vga.h has some defines, but probably wouldn't affect parisc.
I don't care if you take this patch or not. As long as the old method of
adding a stub file to include asm-generic/foo.h is removed. This patch
set was caused by my frustration of looking at how to add a new
asm-generic file and coming up with the wrong implementation, and I want
to make sure that this doesn't happen again with another developer.
-- Steve
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 00/25] asm-generic: Convert all to use Kbuild file
2012-10-13 10:17 ` Catalin Marinas
@ 2012-10-13 14:20 ` Steven Rostedt
0 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 14:20 UTC (permalink / raw)
To: Catalin Marinas; +Cc: linux-kernel, linux-arch, Andrew Morton
On Sat, 2012-10-13 at 11:17 +0100, Catalin Marinas wrote:
> Hi Steven,
>
> On 13 October 2012 03:26, Steven Rostedt <rostedt@goodmis.org> wrote:
> > Recently I suggested to someone that was adding a new asm file that
> > currently only contained an x86 change to add a header in all archs
> > that was just a wrapper to point to the asm-generic version. I suggested
> > this because that's the way we use to do it and just to refresh my
> > memory, I looked at div64.h in a few archs and saw that was the case.
> >
> > After having the change done and just after finishing testing it, I was
> > notified that the "proper" way of doing this is to add it to the
> >
> > arch/*/include/asm/Kbuild
> >
> > file, as 'generic-y += foo.h' and it will reference the asm-generic
> > file automatically. Well it would have been nice if I knew this before
> > and wasn't confused by seeing the incorrect method.
>
> Since you are cleaning this up already, could you please merge these
> patches into your series:
>
> https://lkml.org/lkml/2012/10/11/291
>
> The first patch adds support for generic-y in the new
> arch/*/include/uapi/asm/Kbuild file, followed by few patches to
> convert three architectures. There will probably be more to convert
> after -rc1.
If the maintainers don't, I'll be happy to take them in too. I can set
up a separate branch for this. I'll see what I can do next week,
although I'll be traveling for the RTLWS.
-- Steve
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 00/25] asm-generic: Convert all to use Kbuild file
2012-10-13 9:09 ` [PATCH 00/25] asm-generic: Convert all to use Kbuild file Arnd Bergmann
@ 2012-10-13 14:24 ` Steven Rostedt
0 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 14:24 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-kernel, linux-arch, Andrew Morton, Andy Whitcroft
On Sat, 2012-10-13 at 09:09 +0000, Arnd Bergmann wrote:
> Note that while you are addressing all the obvious candidates that
> have only a single #include statement in them, there is room to take
> this further because a lot of the other header files in architectures
> are still identical to their asm-generic counterparts (aside from
> whitespace and comments). I would recommend to arch maintainers that
> have not already done so to go through all the headers and replace
> the identical ones with generated headers that include the asm-generic
> version.
I was thinking of doing this as a "take 2", after this set got in.
I'm not sure if it's already there or not, but perhaps checkpatch could
add a way to see if a new file is created in arch/*/include/asm/* that
only adds an include of asm-generic (ignoring the #ifndef _FOO_H
wrappers), and tell the user to use the generic-y += in Kbuild method.
-- Steve
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 04/25] blackfin: Use Kbuild infrastructure for kvm_para.h
2012-10-13 13:54 ` Steven Rostedt
@ 2012-10-13 14:53 ` Bob Liu
0 siblings, 0 replies; 51+ messages in thread
From: Bob Liu @ 2012-10-13 14:53 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Mike Frysinger, linux-kernel, linux-arch, Andrew Morton
Hi Steven,
On Sat, Oct 13, 2012 at 9:54 PM, Steven Rostedt <rostedt@goodmis.org> wrote:
> On Sat, 2012-10-13 at 00:12 -0400, Mike Frysinger wrote:
>> On Friday 12 October 2012 22:26:36 Steven Rostedt wrote:
>> > From: Steven Rostedt <srostedt@redhat.com>
>> >
>> > All the headers but kvm_para.h use the Kbuild infrastructure to
>> > get to the asm-generic headers.
>>
>> Acked-by: Mike Frysinger <vapier@gentoo.org>
>> -mike
>
> Thanks Mike,
>
> Would you want to pull this patch into your tree? It's not dependent on
> any of the other patches.
>
I'll apply this patch to blackfin git tree on Monday.
Thanks,
--Bob
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 20/25] sparc: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 13:54 ` Steven Rostedt
@ 2012-10-13 21:54 ` David Miller
2012-10-13 22:00 ` Steven Rostedt
0 siblings, 1 reply; 51+ messages in thread
From: David Miller @ 2012-10-13 21:54 UTC (permalink / raw)
To: rostedt; +Cc: linux-kernel, linux-arch, akpm
From: Steven Rostedt <rostedt@goodmis.org>
Date: Sat, 13 Oct 2012 09:54:00 -0400
> On Fri, 2012-10-12 at 23:19 -0400, David Miller wrote:
>> From: Steven Rostedt <rostedt@goodmis.org>
>> Date: Fri, 12 Oct 2012 22:26:52 -0400
>>
>> > From: Steven Rostedt <srostedt@redhat.com>
>> >
>> > Use Kbuild infrastructure to handle the asm-generic headers
>> > and remove the wrapper headers that call them.
>> >
>> > This only affects headers that do nothing but include the generic
>> > equivalent. It does not touch any header that does a little more.
>> >
>> > Cc: linux-kbuild@vger.kernel.org
>> > Cc: sparclinux@vger.kernel.org
>> > Cc: "David S. Miller" <davem@davemloft.net>
>> > Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
>>
>> Acked-by: David S. Miller <davem@davemloft.net>
>
> David,
>
> Would you like to take this patch? It's not dependent on any of the
> other patches. Otherwise I'll probably ask Andrew to pull it into his
> tree. Or I can just set up a branch and have it go into linux-next for
> the next merge window.
I really would like to take less rather than take more.
This whole UAPI, Kbuild, etc. stuff is just bogging subsystem
maintainers down. This kind of stuff should just go via the person
who does all the work and knows how it all ties together and knows
what dependencies, if any, exist in the series.
So please merge this yourself, thanks.
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 20/25] sparc: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 21:54 ` David Miller
@ 2012-10-13 22:00 ` Steven Rostedt
0 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2012-10-13 22:00 UTC (permalink / raw)
To: David Miller; +Cc: linux-kernel, linux-arch, akpm
On Sat, 2012-10-13 at 17:54 -0400, David Miller wrote:
> I really would like to take less rather than take more.
>
> This whole UAPI, Kbuild, etc. stuff is just bogging subsystem
> maintainers down. This kind of stuff should just go via the person
> who does all the work and knows how it all ties together and knows
> what dependencies, if any, exist in the series.
>
> So please merge this yourself, thanks.
OK, will do.
-- Steve
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 15/25] openrisc: Use Kbuild infrastructure for kvm_para.h
2012-10-13 13:55 ` Steven Rostedt
@ 2012-10-14 10:36 ` Jonas Bonn
0 siblings, 0 replies; 51+ messages in thread
From: Jonas Bonn @ 2012-10-14 10:36 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-kernel, linux-arch, Andrew Morton
On 13 October 2012 15:55, Steven Rostedt <rostedt@goodmis.org> wrote:
> On Sat, 2012-10-13 at 08:32 +0200, Jonas Bonn wrote:
>> On 13 October 2012 04:26, Steven Rostedt <rostedt@goodmis.org> wrote:
>> > Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
>>
>> Acked-by: Jonas Bonn <jonas@southpole.se>
>
> Thanks Jonas,
>
> Would you like to pull this into your tree? It's not dependent on any of
> the other patches. Or I can take care of it too.
>
Sure, I'll take this via the openrisc tree.
Thanks,
Jonas
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 22/25] um: Use Kbuild infrastructure for kvm_para.h
2012-10-13 2:26 ` [PATCH 22/25] um: " Steven Rostedt
@ 2012-10-14 10:57 ` richard -rw- weinberger
0 siblings, 0 replies; 51+ messages in thread
From: richard -rw- weinberger @ 2012-10-14 10:57 UTC (permalink / raw)
To: Steven Rostedt
Cc: linux-kernel, linux-arch, Andrew Morton, Jeff Dike, Richard Weinberger
On Sat, Oct 13, 2012 at 4:26 AM, Steven Rostedt <rostedt@goodmis.org> wrote:
> From: Steven Rostedt <srostedt@redhat.com>
>
> All the headers but kvm_para.h use the Kbuild infrastructure to
> get to the asm-generic headers.
>
> (also had to add ipcbuf.h)
>
> Cc: linux-kbuild@vger.kernel.org
> Cc: user-mode-linux-devel@lists.sourceforge.net
> Cc: Jeff Dike <jdike@addtoit.com>
> Cc: Richard Weinberger <richard@nod.at>
> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Richard Weinberger <richard@nod.at>
--
Thanks,
//richard
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 21/25] tile: Use Kbuild infrastructure for kvm_para.h
2012-10-13 2:26 ` [PATCH 21/25] tile: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
@ 2012-10-14 17:11 ` Chris Metcalf
0 siblings, 0 replies; 51+ messages in thread
From: Chris Metcalf @ 2012-10-14 17:11 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-kernel, linux-arch, Andrew Morton
On 10/12/2012 10:26 PM, Steven Rostedt wrote:
> From: Steven Rostedt <srostedt@redhat.com>
>
> All the headers but kvm_para.h use the Kbuild infrastructure to
> get to the asm-generic headers.
>
> Cc: linux-kbuild@vger.kernel.org
> Cc: Chris Metcalf <cmetcalf@tilera.com>
> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
> ---
> arch/tile/include/asm/Kbuild | 1 +
> arch/tile/include/asm/kvm_para.h | 1 -
> 2 files changed, 1 insertion(+), 1 deletion(-)
> delete mode 100644 arch/tile/include/asm/kvm_para.h
Acked-by: Chris Metcalf <cmetcalf@tilera.com>
--
Chris Metcalf, Tilera Corp.
http://www.tilera.com
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 25/25] xtensa: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 ` [PATCH 25/25] xtensa: " Steven Rostedt
@ 2012-10-16 5:14 ` Max Filippov
0 siblings, 0 replies; 51+ messages in thread
From: Max Filippov @ 2012-10-16 5:14 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-kernel, linux-arch, Andrew Morton, Chris Zankel
On Sat, Oct 13, 2012 at 6:26 AM, Steven Rostedt <rostedt@goodmis.org> wrote:
> From: Steven Rostedt <srostedt@redhat.com>
>
> Use Kbuild infrastructure to handle the asm-generic headers
> and remove the wrapper headers that call them.
>
> This only affects headers that do nothing but include the generic
> equivalent. It does not touch any header that does a little more.
>
> Cc: linux-kbuild@vger.kernel.org
> Cc: linux-xtensa@linux-xtensa.org
> Cc: Chris Zankel <chris@zankel.net>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Thanks, rebased on top of UAPI changes and applied to
the xtensa_next tree.
--
-- Max
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 03/25] avr32: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 ` [PATCH 03/25] avr32: " Steven Rostedt
@ 2013-09-01 20:55 ` Hans-Christian Egtvedt
2013-09-04 15:44 ` Steven Rostedt
0 siblings, 1 reply; 51+ messages in thread
From: Hans-Christian Egtvedt @ 2013-09-01 20:55 UTC (permalink / raw)
To: Steven Rostedt
Cc: linux-kernel, linux-arch, Andrew Morton, Haavard Skinnemoen
Around Fri 12 Oct 2012 22:26:35 -0400 or thereabout, Steven Rostedt wrote:
Hello Steven,
> Use Kbuild infrastructure to handle the asm-generic headers
> and remove the wrapper headers that call them.
>
> This only affects headers that do nothing but include the generic
> equivalent. It does not touch any header that does a little more.
Thank you for cleaning. A bit old this patch (yikes, almost a year), but I
cleaned it up a bit, and added it to my for-linus branch.
> Cc: linux-kbuild@vger.kernel.org
> Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
> Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
> ---
> arch/avr32/include/asm/Kbuild | 27 +++++++++++++++++++++++++++
> arch/avr32/include/asm/bitsperlong.h | 1 -
> arch/avr32/include/asm/cputime.h | 6 ------
> arch/avr32/include/asm/delay.h | 1 -
> arch/avr32/include/asm/device.h | 7 -------
> arch/avr32/include/asm/div64.h | 6 ------
> arch/avr32/include/asm/emergency-restart.h | 6 ------
> arch/avr32/include/asm/errno.h | 6 ------
> arch/avr32/include/asm/fcntl.h | 6 ------
> arch/avr32/include/asm/futex.h | 6 ------
> arch/avr32/include/asm/ioctl.h | 6 ------
> arch/avr32/include/asm/ioctls.h | 6 ------
> arch/avr32/include/asm/irq_regs.h | 1 -
> arch/avr32/include/asm/kvm_para.h | 1 -
> arch/avr32/include/asm/local.h | 6 ------
> arch/avr32/include/asm/local64.h | 1 -
> arch/avr32/include/asm/mman.h | 1 -
> arch/avr32/include/asm/percpu.h | 6 ------
> arch/avr32/include/asm/poll.h | 1 -
> arch/avr32/include/asm/resource.h | 6 ------
> arch/avr32/include/asm/scatterlist.h | 6 ------
> arch/avr32/include/asm/sections.h | 6 ------
> arch/avr32/include/asm/siginfo.h | 6 ------
> arch/avr32/include/asm/statfs.h | 6 ------
> arch/avr32/include/asm/topology.h | 6 ------
> arch/avr32/include/asm/xor.h | 6 ------
> arch/cris/include/asm/ipcbuf.h | 1 -
> 27 files changed, 27 insertions(+), 117 deletions(-)
> delete mode 100644 arch/avr32/include/asm/bitsperlong.h
> delete mode 100644 arch/avr32/include/asm/cputime.h
> delete mode 100644 arch/avr32/include/asm/delay.h
> delete mode 100644 arch/avr32/include/asm/device.h
> delete mode 100644 arch/avr32/include/asm/div64.h
> delete mode 100644 arch/avr32/include/asm/emergency-restart.h
> delete mode 100644 arch/avr32/include/asm/errno.h
> delete mode 100644 arch/avr32/include/asm/fcntl.h
> delete mode 100644 arch/avr32/include/asm/futex.h
> delete mode 100644 arch/avr32/include/asm/ioctl.h
> delete mode 100644 arch/avr32/include/asm/ioctls.h
> delete mode 100644 arch/avr32/include/asm/irq_regs.h
> delete mode 100644 arch/avr32/include/asm/kvm_para.h
> delete mode 100644 arch/avr32/include/asm/local.h
> delete mode 100644 arch/avr32/include/asm/local64.h
> delete mode 100644 arch/avr32/include/asm/mman.h
> delete mode 100644 arch/avr32/include/asm/percpu.h
> delete mode 100644 arch/avr32/include/asm/poll.h
> delete mode 100644 arch/avr32/include/asm/resource.h
> delete mode 100644 arch/avr32/include/asm/scatterlist.h
> delete mode 100644 arch/avr32/include/asm/sections.h
> delete mode 100644 arch/avr32/include/asm/siginfo.h
> delete mode 100644 arch/avr32/include/asm/statfs.h
> delete mode 100644 arch/avr32/include/asm/topology.h
> delete mode 100644 arch/avr32/include/asm/xor.h
> delete mode 100644 arch/cris/include/asm/ipcbuf.h
>
> diff --git a/arch/avr32/include/asm/Kbuild b/arch/avr32/include/asm/Kbuild
> index be0433e..40573ee 100644
> --- a/arch/avr32/include/asm/Kbuild
> +++ b/arch/avr32/include/asm/Kbuild
> @@ -4,3 +4,30 @@ generic-y += clkdev.h
> generic-y += exec.h
>
> header-y += cachectl.h
> +
> +generic-y += bitsperlong.h
> +generic-y += cputime.h
> +generic-y += delay.h
> +generic-y += device.h
> +generic-y += div64.h
> +generic-y += emergency-restart.h
> +generic-y += errno.h
> +generic-y += fcntl.h
> +generic-y += futex.h
> +generic-y += ioctl.h
> +generic-y += ioctls.h
> +generic-y += ipcbuf.h
> +generic-y += irq_regs.h
> +generic-y += kvm_para.h
> +generic-y += local64.h
> +generic-y += local.h
> +generic-y += mman.h
> +generic-y += percpu.h
> +generic-y += poll.h
> +generic-y += resource.h
> +generic-y += scatterlist.h
> +generic-y += sections.h
> +generic-y += siginfo.h
> +generic-y += statfs.h
> +generic-y += topology.h
> +generic-y += xor.h
> diff --git a/arch/avr32/include/asm/bitsperlong.h b/arch/avr32/include/asm/bitsperlong.h
> deleted file mode 100644
> index 6dc0bb0..0000000
> --- a/arch/avr32/include/asm/bitsperlong.h
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <asm-generic/bitsperlong.h>
> diff --git a/arch/avr32/include/asm/cputime.h b/arch/avr32/include/asm/cputime.h
> deleted file mode 100644
> index e87e0f8..0000000
> --- a/arch/avr32/include/asm/cputime.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_CPUTIME_H
> -#define __ASM_AVR32_CPUTIME_H
> -
> -#include <asm-generic/cputime.h>
> -
> -#endif /* __ASM_AVR32_CPUTIME_H */
> diff --git a/arch/avr32/include/asm/delay.h b/arch/avr32/include/asm/delay.h
> deleted file mode 100644
> index 9670e12..0000000
> --- a/arch/avr32/include/asm/delay.h
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <asm-generic/delay.h>
> diff --git a/arch/avr32/include/asm/device.h b/arch/avr32/include/asm/device.h
> deleted file mode 100644
> index d8f9872..0000000
> --- a/arch/avr32/include/asm/device.h
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -/*
> - * Arch specific extensions to struct device
> - *
> - * This file is released under the GPLv2
> - */
> -#include <asm-generic/device.h>
> -
> diff --git a/arch/avr32/include/asm/div64.h b/arch/avr32/include/asm/div64.h
> deleted file mode 100644
> index d7ddd4f..0000000
> --- a/arch/avr32/include/asm/div64.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_DIV64_H
> -#define __ASM_AVR32_DIV64_H
> -
> -#include <asm-generic/div64.h>
> -
> -#endif /* __ASM_AVR32_DIV64_H */
> diff --git a/arch/avr32/include/asm/emergency-restart.h b/arch/avr32/include/asm/emergency-restart.h
> deleted file mode 100644
> index 3e7e014..0000000
> --- a/arch/avr32/include/asm/emergency-restart.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_EMERGENCY_RESTART_H
> -#define __ASM_AVR32_EMERGENCY_RESTART_H
> -
> -#include <asm-generic/emergency-restart.h>
> -
> -#endif /* __ASM_AVR32_EMERGENCY_RESTART_H */
> diff --git a/arch/avr32/include/asm/errno.h b/arch/avr32/include/asm/errno.h
> deleted file mode 100644
> index 558a724..0000000
> --- a/arch/avr32/include/asm/errno.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_ERRNO_H
> -#define __ASM_AVR32_ERRNO_H
> -
> -#include <asm-generic/errno.h>
> -
> -#endif /* __ASM_AVR32_ERRNO_H */
> diff --git a/arch/avr32/include/asm/fcntl.h b/arch/avr32/include/asm/fcntl.h
> deleted file mode 100644
> index 14c0c44..0000000
> --- a/arch/avr32/include/asm/fcntl.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_FCNTL_H
> -#define __ASM_AVR32_FCNTL_H
> -
> -#include <asm-generic/fcntl.h>
> -
> -#endif /* __ASM_AVR32_FCNTL_H */
> diff --git a/arch/avr32/include/asm/futex.h b/arch/avr32/include/asm/futex.h
> deleted file mode 100644
> index 10419f1..0000000
> --- a/arch/avr32/include/asm/futex.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_FUTEX_H
> -#define __ASM_AVR32_FUTEX_H
> -
> -#include <asm-generic/futex.h>
> -
> -#endif /* __ASM_AVR32_FUTEX_H */
> diff --git a/arch/avr32/include/asm/ioctl.h b/arch/avr32/include/asm/ioctl.h
> deleted file mode 100644
> index c8472c1..0000000
> --- a/arch/avr32/include/asm/ioctl.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_IOCTL_H
> -#define __ASM_AVR32_IOCTL_H
> -
> -#include <asm-generic/ioctl.h>
> -
> -#endif /* __ASM_AVR32_IOCTL_H */
> diff --git a/arch/avr32/include/asm/ioctls.h b/arch/avr32/include/asm/ioctls.h
> deleted file mode 100644
> index 909cf66..0000000
> --- a/arch/avr32/include/asm/ioctls.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_IOCTLS_H
> -#define __ASM_AVR32_IOCTLS_H
> -
> -#include <asm-generic/ioctls.h>
> -
> -#endif /* __ASM_AVR32_IOCTLS_H */
> diff --git a/arch/avr32/include/asm/irq_regs.h b/arch/avr32/include/asm/irq_regs.h
> deleted file mode 100644
> index 3dd9c0b..0000000
> --- a/arch/avr32/include/asm/irq_regs.h
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <asm-generic/irq_regs.h>
> diff --git a/arch/avr32/include/asm/kvm_para.h b/arch/avr32/include/asm/kvm_para.h
> deleted file mode 100644
> index 14fab8f..0000000
> --- a/arch/avr32/include/asm/kvm_para.h
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <asm-generic/kvm_para.h>
> diff --git a/arch/avr32/include/asm/local.h b/arch/avr32/include/asm/local.h
> deleted file mode 100644
> index 1c16196..0000000
> --- a/arch/avr32/include/asm/local.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_LOCAL_H
> -#define __ASM_AVR32_LOCAL_H
> -
> -#include <asm-generic/local.h>
> -
> -#endif /* __ASM_AVR32_LOCAL_H */
> diff --git a/arch/avr32/include/asm/local64.h b/arch/avr32/include/asm/local64.h
> deleted file mode 100644
> index 36c93b5..0000000
> --- a/arch/avr32/include/asm/local64.h
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <asm-generic/local64.h>
> diff --git a/arch/avr32/include/asm/mman.h b/arch/avr32/include/asm/mman.h
> deleted file mode 100644
> index 8eebf89..0000000
> --- a/arch/avr32/include/asm/mman.h
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <asm-generic/mman.h>
> diff --git a/arch/avr32/include/asm/percpu.h b/arch/avr32/include/asm/percpu.h
> deleted file mode 100644
> index 69227b4..0000000
> --- a/arch/avr32/include/asm/percpu.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_PERCPU_H
> -#define __ASM_AVR32_PERCPU_H
> -
> -#include <asm-generic/percpu.h>
> -
> -#endif /* __ASM_AVR32_PERCPU_H */
> diff --git a/arch/avr32/include/asm/poll.h b/arch/avr32/include/asm/poll.h
> deleted file mode 100644
> index c98509d..0000000
> --- a/arch/avr32/include/asm/poll.h
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <asm-generic/poll.h>
> diff --git a/arch/avr32/include/asm/resource.h b/arch/avr32/include/asm/resource.h
> deleted file mode 100644
> index c6dd101..0000000
> --- a/arch/avr32/include/asm/resource.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_RESOURCE_H
> -#define __ASM_AVR32_RESOURCE_H
> -
> -#include <asm-generic/resource.h>
> -
> -#endif /* __ASM_AVR32_RESOURCE_H */
> diff --git a/arch/avr32/include/asm/scatterlist.h b/arch/avr32/include/asm/scatterlist.h
> deleted file mode 100644
> index a5902d9..0000000
> --- a/arch/avr32/include/asm/scatterlist.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_SCATTERLIST_H
> -#define __ASM_AVR32_SCATTERLIST_H
> -
> -#include <asm-generic/scatterlist.h>
> -
> -#endif /* __ASM_AVR32_SCATTERLIST_H */
> diff --git a/arch/avr32/include/asm/sections.h b/arch/avr32/include/asm/sections.h
> deleted file mode 100644
> index aa14252..0000000
> --- a/arch/avr32/include/asm/sections.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_SECTIONS_H
> -#define __ASM_AVR32_SECTIONS_H
> -
> -#include <asm-generic/sections.h>
> -
> -#endif /* __ASM_AVR32_SECTIONS_H */
> diff --git a/arch/avr32/include/asm/siginfo.h b/arch/avr32/include/asm/siginfo.h
> deleted file mode 100644
> index 5ee93f4..0000000
> --- a/arch/avr32/include/asm/siginfo.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef _AVR32_SIGINFO_H
> -#define _AVR32_SIGINFO_H
> -
> -#include <asm-generic/siginfo.h>
> -
> -#endif
> diff --git a/arch/avr32/include/asm/statfs.h b/arch/avr32/include/asm/statfs.h
> deleted file mode 100644
> index 2961bd1..0000000
> --- a/arch/avr32/include/asm/statfs.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_STATFS_H
> -#define __ASM_AVR32_STATFS_H
> -
> -#include <asm-generic/statfs.h>
> -
> -#endif /* __ASM_AVR32_STATFS_H */
> diff --git a/arch/avr32/include/asm/topology.h b/arch/avr32/include/asm/topology.h
> deleted file mode 100644
> index 5b766cb..0000000
> --- a/arch/avr32/include/asm/topology.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef __ASM_AVR32_TOPOLOGY_H
> -#define __ASM_AVR32_TOPOLOGY_H
> -
> -#include <asm-generic/topology.h>
> -
> -#endif /* __ASM_AVR32_TOPOLOGY_H */
> diff --git a/arch/avr32/include/asm/xor.h b/arch/avr32/include/asm/xor.h
> deleted file mode 100644
> index 99c87aa..0000000
> --- a/arch/avr32/include/asm/xor.h
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#ifndef _ASM_XOR_H
> -#define _ASM_XOR_H
> -
> -#include <asm-generic/xor.h>
> -
> -#endif
> diff --git a/arch/cris/include/asm/ipcbuf.h b/arch/cris/include/asm/ipcbuf.h
> deleted file mode 100644
> index 84c7e51..0000000
> --- a/arch/cris/include/asm/ipcbuf.h
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <asm-generic/ipcbuf.h>
--
mvh
Hans-Christian Egtvedt
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 13/25] mips: Use Kbuild infrastructure to handle asm-generic headers
2012-10-13 2:26 ` [PATCH 13/25] mips: " Steven Rostedt
@ 2013-09-02 8:55 ` James Hogan
2013-09-04 15:43 ` Steven Rostedt
0 siblings, 1 reply; 51+ messages in thread
From: James Hogan @ 2013-09-02 8:55 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-kernel, linux-arch, Andrew Morton, Ralf Baechle
On 13/10/12 03:26, Steven Rostedt wrote:
> From: Steven Rostedt <srostedt@redhat.com>
>
> Use Kbuild infrastructure to handle the asm-generic headers
> and remove the wrapper headers that call them.
>
> This only affects headers that do nothing but include the generic
> equivalent. It does not touch any header that does a little more.
Hi Steven,
Please see "MIPS: use generic-y where possible" already queued in -next.
cad3b624853b6f34f19693b9812df0d473a6fd40
https://patchwork.linux-mips.org/patch/5581/
Also note, as I said in the commit message:
> We can't do the same for uapi/asm/kvm_para.h because it's presence is
> explicitly checked in include/uapi/linux/Kbuild to decide whether to add
> kvm_para.h to header-y.
so I guess that may need fixing first before half of these patches can
be accepted.
Cheers
James
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 13/25] mips: Use Kbuild infrastructure to handle asm-generic headers
2013-09-02 8:55 ` James Hogan
@ 2013-09-04 15:43 ` Steven Rostedt
0 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2013-09-04 15:43 UTC (permalink / raw)
To: James Hogan; +Cc: linux-kernel, linux-arch, Andrew Morton, Ralf Baechle
On Mon, 2 Sep 2013 09:55:57 +0100
James Hogan <james.hogan@imgtec.com> wrote:
> On 13/10/12 03:26, Steven Rostedt wrote:
> Also note, as I said in the commit message:
> > We can't do the same for uapi/asm/kvm_para.h because it's presence is
> > explicitly checked in include/uapi/linux/Kbuild to decide whether to add
> > kvm_para.h to header-y.
>
> so I guess that may need fixing first before half of these patches can
> be accepted.
>
Sure.
Thanks,
-- Steve
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 03/25] avr32: Use Kbuild infrastructure to handle asm-generic headers
2013-09-01 20:55 ` Hans-Christian Egtvedt
@ 2013-09-04 15:44 ` Steven Rostedt
0 siblings, 0 replies; 51+ messages in thread
From: Steven Rostedt @ 2013-09-04 15:44 UTC (permalink / raw)
To: Hans-Christian Egtvedt
Cc: linux-kernel, linux-arch, Andrew Morton, Haavard Skinnemoen
On Sun, 1 Sep 2013 22:55:51 +0200
Hans-Christian Egtvedt <egtvedt@samfundet.no> wrote:
> Around Fri 12 Oct 2012 22:26:35 -0400 or thereabout, Steven Rostedt wrote:
>
> Hello Steven,
>
> > Use Kbuild infrastructure to handle the asm-generic headers
> > and remove the wrapper headers that call them.
> >
> > This only affects headers that do nothing but include the generic
> > equivalent. It does not touch any header that does a little more.
>
> Thank you for cleaning. A bit old this patch (yikes, almost a year), but I
> cleaned it up a bit, and added it to my for-linus branch.
>
Thanks,
-- Steve
^ permalink raw reply [flat|nested] 51+ messages in thread
end of thread, other threads:[~2013-09-04 15:44 UTC | newest]
Thread overview: 51+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-13 2:26 [PATCH 00/25] asm-generic: Convert all to use Kbuild file Steven Rostedt
2012-10-13 2:26 ` [PATCH 01/25] alpha: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
2012-10-13 2:26 ` [PATCH 02/25] arm: " Steven Rostedt
2012-10-13 2:26 ` [PATCH 03/25] avr32: " Steven Rostedt
2013-09-01 20:55 ` Hans-Christian Egtvedt
2013-09-04 15:44 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 04/25] blackfin: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
2012-10-13 4:12 ` Mike Frysinger
2012-10-13 13:54 ` Steven Rostedt
2012-10-13 14:53 ` Bob Liu
2012-10-13 2:26 ` [PATCH 05/25] c6x: " Steven Rostedt
2012-10-13 2:26 ` [PATCH 06/25] cris: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
2012-10-13 2:26 ` [PATCH 07/25] frv: " Steven Rostedt
2012-10-13 2:26 ` [PATCH 08/25] h8300: " Steven Rostedt
2012-10-13 2:26 ` [PATCH 09/25] hexagon: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
2012-10-13 2:26 ` [PATCH 10/25] ia64: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
2012-10-13 2:26 ` [PATCH 11/25] m32r: " Steven Rostedt
2012-10-13 2:26 ` [PATCH 12/25] microblaze: " Steven Rostedt
2012-10-13 2:26 ` [PATCH 13/25] mips: " Steven Rostedt
2013-09-02 8:55 ` James Hogan
2013-09-04 15:43 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 14/25] mn10300: " Steven Rostedt
2012-10-13 2:26 ` [PATCH 15/25] openrisc: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
2012-10-13 6:32 ` Jonas Bonn
2012-10-13 13:55 ` Steven Rostedt
2012-10-14 10:36 ` Jonas Bonn
2012-10-13 2:26 ` [PATCH 16/25] parisc: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
2012-10-13 12:36 ` James Bottomley
2012-10-13 14:17 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 17/25] powerpc: " Steven Rostedt
2012-10-13 2:26 ` [PATCH 18/25] s390: " Steven Rostedt
2012-10-13 2:26 ` [PATCH 19/25] score: " Steven Rostedt
2012-10-13 2:26 ` [PATCH 20/25] sparc: " Steven Rostedt
2012-10-13 3:19 ` David Miller
2012-10-13 13:54 ` Steven Rostedt
2012-10-13 21:54 ` David Miller
2012-10-13 22:00 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 21/25] tile: Use Kbuild infrastructure for kvm_para.h Steven Rostedt
2012-10-14 17:11 ` Chris Metcalf
2012-10-13 2:26 ` [PATCH 22/25] um: " Steven Rostedt
2012-10-14 10:57 ` richard -rw- weinberger
2012-10-13 2:26 ` [PATCH 23/25] unicore32: " Steven Rostedt
2012-10-13 12:27 ` guanxuetao
2012-10-13 14:03 ` Steven Rostedt
2012-10-13 2:26 ` [PATCH 24/25] x86: Use Kbuild infrastructure to handle asm-generic headers Steven Rostedt
2012-10-13 2:26 ` [PATCH 25/25] xtensa: " Steven Rostedt
2012-10-16 5:14 ` Max Filippov
2012-10-13 9:09 ` [PATCH 00/25] asm-generic: Convert all to use Kbuild file Arnd Bergmann
2012-10-13 14:24 ` Steven Rostedt
2012-10-13 10:17 ` Catalin Marinas
2012-10-13 14:20 ` Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).