Messages in this thread | | | Subject | Re: [PATCH] microblaze: remove asm-generic wrapper headers | From | Michal Simek <> | Date | Mon, 29 May 2017 11:56:30 +0200 |
| |
On 19.5.2017 13:45, Tobias Klauser wrote: > Some of microblaze's asm and uapi header are merely including their > asm-generic counterpart. Thus, the arch specific headers can be removed > and the asm-generic header can be used directly via generic-y. > > The headers removed from uapi don't need to be added to generic-y in the > uapi Kbuild in order to get exported, as they are already listed in > mandatory-y. > > Also order the generic-y list alphabetically. > > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> > --- > arch/microblaze/include/asm/Kbuild | 45 ++++++++++++++++++++++++- > arch/microblaze/include/asm/bitops.h | 1 - > arch/microblaze/include/asm/bug.h | 1 - > arch/microblaze/include/asm/bugs.h | 1 - > arch/microblaze/include/asm/div64.h | 1 - > arch/microblaze/include/asm/emergency-restart.h | 1 - > arch/microblaze/include/asm/fb.h | 1 - > arch/microblaze/include/asm/hardirq.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/linkage.h | 1 - > arch/microblaze/include/asm/local.h | 1 - > arch/microblaze/include/asm/local64.h | 1 - > arch/microblaze/include/asm/parport.h | 1 - > arch/microblaze/include/asm/percpu.h | 1 - > arch/microblaze/include/asm/serial.h | 1 - > arch/microblaze/include/asm/shmparam.h | 1 - > arch/microblaze/include/asm/topology.h | 1 - > arch/microblaze/include/asm/ucontext.h | 1 - > arch/microblaze/include/asm/vga.h | 1 - > arch/microblaze/include/asm/xor.h | 1 - > arch/microblaze/include/uapi/asm/bitsperlong.h | 1 - > arch/microblaze/include/uapi/asm/errno.h | 1 - > arch/microblaze/include/uapi/asm/fcntl.h | 1 - > arch/microblaze/include/uapi/asm/ioctl.h | 1 - > arch/microblaze/include/uapi/asm/ioctls.h | 1 - > arch/microblaze/include/uapi/asm/ipcbuf.h | 1 - > arch/microblaze/include/uapi/asm/kvm_para.h | 1 - > arch/microblaze/include/uapi/asm/mman.h | 1 - > arch/microblaze/include/uapi/asm/msgbuf.h | 1 - > arch/microblaze/include/uapi/asm/param.h | 1 - > arch/microblaze/include/uapi/asm/poll.h | 1 - > arch/microblaze/include/uapi/asm/resource.h | 1 - > arch/microblaze/include/uapi/asm/sembuf.h | 1 - > arch/microblaze/include/uapi/asm/shmbuf.h | 1 - > arch/microblaze/include/uapi/asm/siginfo.h | 1 - > arch/microblaze/include/uapi/asm/signal.h | 1 - > arch/microblaze/include/uapi/asm/socket.h | 1 - > arch/microblaze/include/uapi/asm/sockios.h | 1 - > arch/microblaze/include/uapi/asm/stat.h | 1 - > arch/microblaze/include/uapi/asm/statfs.h | 1 - > arch/microblaze/include/uapi/asm/swab.h | 1 - > arch/microblaze/include/uapi/asm/termbits.h | 1 - > arch/microblaze/include/uapi/asm/termios.h | 1 - > 45 files changed, 44 insertions(+), 50 deletions(-) > delete mode 100644 arch/microblaze/include/asm/bitops.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/div64.h > delete mode 100644 arch/microblaze/include/asm/emergency-restart.h > delete mode 100644 arch/microblaze/include/asm/fb.h > delete mode 100644 arch/microblaze/include/asm/hardirq.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/linkage.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/parport.h > delete mode 100644 arch/microblaze/include/asm/percpu.h > delete mode 100644 arch/microblaze/include/asm/serial.h > delete mode 100644 arch/microblaze/include/asm/shmparam.h > delete mode 100644 arch/microblaze/include/asm/topology.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/microblaze/include/uapi/asm/bitsperlong.h > delete mode 100644 arch/microblaze/include/uapi/asm/errno.h > delete mode 100644 arch/microblaze/include/uapi/asm/fcntl.h > delete mode 100644 arch/microblaze/include/uapi/asm/ioctl.h > delete mode 100644 arch/microblaze/include/uapi/asm/ioctls.h > delete mode 100644 arch/microblaze/include/uapi/asm/ipcbuf.h > delete mode 100644 arch/microblaze/include/uapi/asm/kvm_para.h > delete mode 100644 arch/microblaze/include/uapi/asm/mman.h > delete mode 100644 arch/microblaze/include/uapi/asm/msgbuf.h > delete mode 100644 arch/microblaze/include/uapi/asm/param.h > delete mode 100644 arch/microblaze/include/uapi/asm/poll.h > delete mode 100644 arch/microblaze/include/uapi/asm/resource.h > delete mode 100644 arch/microblaze/include/uapi/asm/sembuf.h > delete mode 100644 arch/microblaze/include/uapi/asm/shmbuf.h > delete mode 100644 arch/microblaze/include/uapi/asm/siginfo.h > delete mode 100644 arch/microblaze/include/uapi/asm/signal.h > delete mode 100644 arch/microblaze/include/uapi/asm/socket.h > delete mode 100644 arch/microblaze/include/uapi/asm/sockios.h > delete mode 100644 arch/microblaze/include/uapi/asm/stat.h > delete mode 100644 arch/microblaze/include/uapi/asm/statfs.h > delete mode 100644 arch/microblaze/include/uapi/asm/swab.h > delete mode 100644 arch/microblaze/include/uapi/asm/termbits.h > delete mode 100644 arch/microblaze/include/uapi/asm/termios.h > > diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild > index 56830ff65333..83a4ef3a2495 100644 > --- a/arch/microblaze/include/asm/Kbuild > +++ b/arch/microblaze/include/asm/Kbuild > @@ -1,14 +1,57 @@ > > generic-y += barrier.h > +generic-y += bitops.h > +generic-y += bitsperlong.h > +generic-y += bug.h > +generic-y += bugs.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 += extable.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 += irq_work.h > +generic-y += kdebug.h > +generic-y += kmap_types.h > +generic-y += kprobes.h > +generic-y += linkage.h > +generic-y += local.h > +generic-y += local64.h > generic-y += mcs_spinlock.h > generic-y += mm-arch-hooks.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 += preempt.h > +generic-y += resource.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 += stat.h > +generic-y += statfs.h > +generic-y += swab.h > generic-y += syscalls.h > +generic-y += termbits.h > +generic-y += termios.h > +generic-y += topology.h > generic-y += trace_clock.h > +generic-y += ucontext.h > +generic-y += vga.h > generic-y += word-at-a-time.h > -generic-y += kprobes.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 a72468f15c8b..000000000000 > --- a/arch/microblaze/include/asm/bitops.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/bitops.h> > diff --git a/arch/microblaze/include/asm/bug.h b/arch/microblaze/include/asm/bug.h > deleted file mode 100644 > index b12fd89e42e9..000000000000 > --- 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 61791e1ad9f5..000000000000 > --- a/arch/microblaze/include/asm/bugs.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/bugs.h> > diff --git a/arch/microblaze/include/asm/div64.h b/arch/microblaze/include/asm/div64.h > deleted file mode 100644 > index 6cd978cefb28..000000000000 > --- 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 3711bd9d50bd..000000000000 > --- 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/fb.h b/arch/microblaze/include/asm/fb.h > deleted file mode 100644 > index 3a4988e8df45..000000000000 > --- a/arch/microblaze/include/asm/fb.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/fb.h> > diff --git a/arch/microblaze/include/asm/hardirq.h b/arch/microblaze/include/asm/hardirq.h > deleted file mode 100644 > index fb3c05a0cbbf..000000000000 > --- a/arch/microblaze/include/asm/hardirq.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/hardirq.h> > diff --git a/arch/microblaze/include/asm/irq_regs.h b/arch/microblaze/include/asm/irq_regs.h > deleted file mode 100644 > index 3dd9c0b70270..000000000000 > --- 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 6ece1b037665..000000000000 > --- 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 25975252d83d..000000000000 > --- 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/linkage.h b/arch/microblaze/include/asm/linkage.h > deleted file mode 100644 > index 0540bbaad897..000000000000 > --- a/arch/microblaze/include/asm/linkage.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/linkage.h> > diff --git a/arch/microblaze/include/asm/local.h b/arch/microblaze/include/asm/local.h > deleted file mode 100644 > index c11c530f74d0..000000000000 > --- 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 36c93b5cc239..000000000000 > --- a/arch/microblaze/include/asm/local64.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/local64.h> > diff --git a/arch/microblaze/include/asm/parport.h b/arch/microblaze/include/asm/parport.h > deleted file mode 100644 > index cf252af64590..000000000000 > --- 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 06a959d67234..000000000000 > --- a/arch/microblaze/include/asm/percpu.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/percpu.h> > diff --git a/arch/microblaze/include/asm/serial.h b/arch/microblaze/include/asm/serial.h > deleted file mode 100644 > index a0cb0caff152..000000000000 > --- a/arch/microblaze/include/asm/serial.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/serial.h> > diff --git a/arch/microblaze/include/asm/shmparam.h b/arch/microblaze/include/asm/shmparam.h > deleted file mode 100644 > index 93f30deb95d0..000000000000 > --- a/arch/microblaze/include/asm/shmparam.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/shmparam.h> > diff --git a/arch/microblaze/include/asm/topology.h b/arch/microblaze/include/asm/topology.h > deleted file mode 100644 > index 5428f333a02c..000000000000 > --- a/arch/microblaze/include/asm/topology.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/topology.h> > diff --git a/arch/microblaze/include/asm/ucontext.h b/arch/microblaze/include/asm/ucontext.h > deleted file mode 100644 > index 9bc07b9f30fb..000000000000 > --- 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 89d82fd8fcf1..000000000000 > --- 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 c82eb12a5b18..000000000000 > --- a/arch/microblaze/include/asm/xor.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/xor.h> > diff --git a/arch/microblaze/include/uapi/asm/bitsperlong.h b/arch/microblaze/include/uapi/asm/bitsperlong.h > deleted file mode 100644 > index 6dc0bb0c13b2..000000000000 > --- a/arch/microblaze/include/uapi/asm/bitsperlong.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/bitsperlong.h> > diff --git a/arch/microblaze/include/uapi/asm/errno.h b/arch/microblaze/include/uapi/asm/errno.h > deleted file mode 100644 > index 4c82b503d92f..000000000000 > --- a/arch/microblaze/include/uapi/asm/errno.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/errno.h> > diff --git a/arch/microblaze/include/uapi/asm/fcntl.h b/arch/microblaze/include/uapi/asm/fcntl.h > deleted file mode 100644 > index 46ab12db5739..000000000000 > --- a/arch/microblaze/include/uapi/asm/fcntl.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/fcntl.h> > diff --git a/arch/microblaze/include/uapi/asm/ioctl.h b/arch/microblaze/include/uapi/asm/ioctl.h > deleted file mode 100644 > index b279fe06dfe5..000000000000 > --- a/arch/microblaze/include/uapi/asm/ioctl.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/ioctl.h> > diff --git a/arch/microblaze/include/uapi/asm/ioctls.h b/arch/microblaze/include/uapi/asm/ioctls.h > deleted file mode 100644 > index ec34c760665e..000000000000 > --- a/arch/microblaze/include/uapi/asm/ioctls.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/ioctls.h> > diff --git a/arch/microblaze/include/uapi/asm/ipcbuf.h b/arch/microblaze/include/uapi/asm/ipcbuf.h > deleted file mode 100644 > index 84c7e51cb6d0..000000000000 > --- a/arch/microblaze/include/uapi/asm/ipcbuf.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/ipcbuf.h> > diff --git a/arch/microblaze/include/uapi/asm/kvm_para.h b/arch/microblaze/include/uapi/asm/kvm_para.h > deleted file mode 100644 > index 14fab8f0b957..000000000000 > --- a/arch/microblaze/include/uapi/asm/kvm_para.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/kvm_para.h> > diff --git a/arch/microblaze/include/uapi/asm/mman.h b/arch/microblaze/include/uapi/asm/mman.h > deleted file mode 100644 > index 8eebf89f5ab1..000000000000 > --- a/arch/microblaze/include/uapi/asm/mman.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/mman.h> > diff --git a/arch/microblaze/include/uapi/asm/msgbuf.h b/arch/microblaze/include/uapi/asm/msgbuf.h > deleted file mode 100644 > index 809134c644a6..000000000000 > --- a/arch/microblaze/include/uapi/asm/msgbuf.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/msgbuf.h> > diff --git a/arch/microblaze/include/uapi/asm/param.h b/arch/microblaze/include/uapi/asm/param.h > deleted file mode 100644 > index 965d45427975..000000000000 > --- a/arch/microblaze/include/uapi/asm/param.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/param.h> > diff --git a/arch/microblaze/include/uapi/asm/poll.h b/arch/microblaze/include/uapi/asm/poll.h > deleted file mode 100644 > index c98509d3149e..000000000000 > --- a/arch/microblaze/include/uapi/asm/poll.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/poll.h> > diff --git a/arch/microblaze/include/uapi/asm/resource.h b/arch/microblaze/include/uapi/asm/resource.h > deleted file mode 100644 > index 04bc4db8921b..000000000000 > --- a/arch/microblaze/include/uapi/asm/resource.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/resource.h> > diff --git a/arch/microblaze/include/uapi/asm/sembuf.h b/arch/microblaze/include/uapi/asm/sembuf.h > deleted file mode 100644 > index 7673b83cfef7..000000000000 > --- a/arch/microblaze/include/uapi/asm/sembuf.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/sembuf.h> > diff --git a/arch/microblaze/include/uapi/asm/shmbuf.h b/arch/microblaze/include/uapi/asm/shmbuf.h > deleted file mode 100644 > index 83c05fc2de38..000000000000 > --- a/arch/microblaze/include/uapi/asm/shmbuf.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/shmbuf.h> > diff --git a/arch/microblaze/include/uapi/asm/siginfo.h b/arch/microblaze/include/uapi/asm/siginfo.h > deleted file mode 100644 > index 0815d29d82e5..000000000000 > --- a/arch/microblaze/include/uapi/asm/siginfo.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/siginfo.h> > diff --git a/arch/microblaze/include/uapi/asm/signal.h b/arch/microblaze/include/uapi/asm/signal.h > deleted file mode 100644 > index 7b1573ce19de..000000000000 > --- a/arch/microblaze/include/uapi/asm/signal.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/signal.h> > diff --git a/arch/microblaze/include/uapi/asm/socket.h b/arch/microblaze/include/uapi/asm/socket.h > deleted file mode 100644 > index 6b71384b9d8b..000000000000 > --- a/arch/microblaze/include/uapi/asm/socket.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/socket.h> > diff --git a/arch/microblaze/include/uapi/asm/sockios.h b/arch/microblaze/include/uapi/asm/sockios.h > deleted file mode 100644 > index def6d4746ee7..000000000000 > --- a/arch/microblaze/include/uapi/asm/sockios.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/sockios.h> > diff --git a/arch/microblaze/include/uapi/asm/stat.h b/arch/microblaze/include/uapi/asm/stat.h > deleted file mode 100644 > index 3dc90fa92c70..000000000000 > --- a/arch/microblaze/include/uapi/asm/stat.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/stat.h> > diff --git a/arch/microblaze/include/uapi/asm/statfs.h b/arch/microblaze/include/uapi/asm/statfs.h > deleted file mode 100644 > index 0b91fe198c20..000000000000 > --- a/arch/microblaze/include/uapi/asm/statfs.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/statfs.h> > diff --git a/arch/microblaze/include/uapi/asm/swab.h b/arch/microblaze/include/uapi/asm/swab.h > deleted file mode 100644 > index 7847e563ab66..000000000000 > --- a/arch/microblaze/include/uapi/asm/swab.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/swab.h> > diff --git a/arch/microblaze/include/uapi/asm/termbits.h b/arch/microblaze/include/uapi/asm/termbits.h > deleted file mode 100644 > index 3935b106de79..000000000000 > --- a/arch/microblaze/include/uapi/asm/termbits.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/termbits.h> > diff --git a/arch/microblaze/include/uapi/asm/termios.h b/arch/microblaze/include/uapi/asm/termios.h > deleted file mode 100644 > index 280d78a9d966..000000000000 > --- a/arch/microblaze/include/uapi/asm/termios.h > +++ /dev/null > @@ -1 +0,0 @@ > -#include <asm-generic/termios.h> >
Applied.
Thanks, Michal
-- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP SoCs
[unhandled content-type:application/pgp-signature] | |