[GIT PULL] MN10300: Move arch headers to arch dir

[GIT PULL] MN10300: Move arch headers to arch dir

[David Howells]

Move the arch header files from include/asm-mn10300/ to various places in the
arch headers.  The general headers end up in arch/mn10300/include/asm/ whilst
the processor- and unit-specific header directories end up in the appropriate
implementation directories.

This permits the symlinks include/asm/proc and include/asm/unit to be
dispensed with.  This does, however, require that #include <asm/proc/xxx.h> be
converted to #include <proc/xxx.h> and similarly for asm/unit -> unit.

The following changes since commit 62b8e680e61d3f48f2a12ee248ca03ea8f376926:
  David Howells (1):
        MN10300: Kill MN10300's own profiling Kconfig

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300.git master

David Howells (2):
      Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.
      Separate out the proc- and unit-specific header directories from the general

 arch/mn10300/Makefile                              |   40 +------------------
 .../mn10300/include/asm}/Kbuild                    |    0
 .../mn10300/include/asm}/atomic.h                  |    0
 .../mn10300/include/asm}/auxvec.h                  |    0
 .../mn10300/include/asm}/bitops.h                  |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/bug.h |    0
 .../mn10300/include/asm}/bugs.h                    |    0
 .../mn10300/include/asm}/busctl-regs.h             |    0
 .../mn10300/include/asm}/byteorder.h               |    0
 .../mn10300/include/asm}/cache.h                   |    2 +-
 .../mn10300/include/asm}/cacheflush.h              |    0
 .../mn10300/include/asm}/checksum.h                |    0
 .../mn10300/include/asm}/cpu-regs.h                |    0
 .../mn10300/include/asm}/cputime.h                 |    0
 .../mn10300/include/asm}/current.h                 |    0
 .../mn10300/include/asm}/delay.h                   |    0
 .../mn10300/include/asm}/device.h                  |    0
 .../mn10300/include/asm}/div64.h                   |    0
 .../mn10300/include/asm}/dma-mapping.h             |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/dma.h |    0
 .../mn10300/include/asm}/dmactl-regs.h             |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/elf.h |    0
 .../mn10300/include/asm}/emergency-restart.h       |    0
 .../mn10300/include/asm}/errno.h                   |    0
 .../mn10300/include/asm}/exceptions.h              |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/fb.h  |    0
 .../mn10300/include/asm}/fcntl.h                   |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/fpu.h |    0
 .../mn10300/include/asm}/frame.inc                 |    0
 .../mn10300/include/asm}/ftrace.h                  |    0
 .../mn10300/include/asm}/futex.h                   |    0
 .../mn10300/include/asm}/gdb-stub.h                |    0
 .../mn10300/include/asm}/hardirq.h                 |    0
 .../mn10300/include/asm}/highmem.h                 |    0
 .../mn10300/include/asm}/hw_irq.h                  |    0
 .../mn10300/include/asm}/intctl-regs.h             |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/io.h  |    0
 .../mn10300/include/asm}/ioctl.h                   |    0
 .../mn10300/include/asm}/ioctls.h                  |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/ipc.h |    0
 .../mn10300/include/asm}/ipcbuf.h                  |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/irq.h |    2 +-
 .../mn10300/include/asm}/irq_regs.h                |    0
 .../mn10300/include/asm}/kdebug.h                  |    0
 .../mn10300/include/asm}/kmap_types.h              |    0
 .../mn10300/include/asm}/kprobes.h                 |    0
 .../mn10300/include/asm}/linkage.h                 |    0
 .../mn10300/include/asm}/local.h                   |    0
 .../mn10300/include/asm}/mc146818rtc.h             |    0
 .../mn10300/include/asm}/mman.h                    |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/mmu.h |    0
 .../mn10300/include/asm}/mmu_context.h             |    0
 .../mn10300/include/asm}/module.h                  |    0
 .../mn10300/include/asm}/msgbuf.h                  |    0
 .../mn10300/include/asm}/mutex.h                   |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/nmi.h |    0
 .../mn10300/include/asm}/page.h                    |    0
 .../mn10300/include/asm}/page_offset.h             |    0
 .../mn10300/include/asm}/param.h                   |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/pci.h |    0
 .../mn10300/include/asm}/percpu.h                  |    0
 .../mn10300/include/asm}/pgalloc.h                 |    0
 .../mn10300/include/asm}/pgtable.h                 |    0
 .../mn10300/include/asm}/pio-regs.h                |    0
 .../mn10300/include/asm}/poll.h                    |    0
 .../mn10300/include/asm}/posix_types.h             |    0
 .../mn10300/include/asm}/processor.h               |    0
 .../mn10300/include/asm}/ptrace.h                  |    0
 .../mn10300/include/asm}/reset-regs.h              |    0
 .../mn10300/include/asm}/resource.h                |    0
 .../mn10300/include/asm}/rtc-regs.h                |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/rtc.h |    0
 .../mn10300/include/asm}/scatterlist.h             |    0
 .../mn10300/include/asm}/sections.h                |    0
 .../mn10300/include/asm}/sembuf.h                  |    0
 .../mn10300/include/asm}/serial-regs.h             |    0
 .../mn10300/include/asm}/serial.h                  |    2 +-
 .../mn10300/include/asm}/setup.h                   |    0
 .../mn10300/include/asm}/shmbuf.h                  |    0
 .../mn10300/include/asm}/shmparam.h                |    0
 .../mn10300/include/asm}/sigcontext.h              |    0
 .../mn10300/include/asm}/siginfo.h                 |    0
 .../mn10300/include/asm}/signal.h                  |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/smp.h |    0
 .../mn10300/include/asm}/socket.h                  |    0
 .../mn10300/include/asm}/sockios.h                 |    0
 .../mn10300/include/asm}/spinlock.h                |    0
 .../mn10300/include/asm}/stat.h                    |    0
 .../mn10300/include/asm}/statfs.h                  |    0
 .../mn10300/include/asm}/string.h                  |    0
 .../mn10300/include/asm}/swab.h                    |    0
 .../mn10300/include/asm}/system.h                  |    0
 .../mn10300/include/asm}/termbits.h                |    0
 .../mn10300/include/asm}/termios.h                 |    0
 .../mn10300/include/asm}/thread_info.h             |    0
 .../mn10300/include/asm}/timer-regs.h              |    0
 .../mn10300/include/asm}/timex.h                   |    2 +-
 .../asm-mn10300 => arch/mn10300/include/asm}/tlb.h |    0
 .../mn10300/include/asm}/tlbflush.h                |    0
 .../mn10300/include/asm}/topology.h                |    0
 .../mn10300/include/asm}/types.h                   |    0
 .../mn10300/include/asm}/uaccess.h                 |    0
 .../mn10300/include/asm}/ucontext.h                |    0
 .../mn10300/include/asm}/unaligned.h               |    0
 .../mn10300/include/asm}/unistd.h                  |    0
 .../mn10300/include/asm}/user.h                    |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/vga.h |    0
 .../asm-mn10300 => arch/mn10300/include/asm}/xor.h |    0
 arch/mn10300/kernel/entry.S                        |    2 +-
 arch/mn10300/kernel/gdb-io-serial-low.S            |    2 +-
 arch/mn10300/kernel/gdb-io-serial.c                |    2 +-
 arch/mn10300/kernel/gdb-io-ttysm-low.S             |    2 +-
 arch/mn10300/kernel/gdb-io-ttysm.c                 |    2 +-
 arch/mn10300/kernel/gdb-stub.c                     |    4 +-
 arch/mn10300/kernel/head.S                         |    2 +-
 arch/mn10300/kernel/mn10300-serial-low.S           |    4 +-
 arch/mn10300/kernel/mn10300-serial.c               |    2 +-
 arch/mn10300/kernel/mn10300-watchdog.c             |    2 +-
 arch/mn10300/kernel/setup.c                        |    2 +-
 arch/mn10300/kernel/traps.c                        |    2 +-
 .../mn10300/proc-mn103e010/include/proc}/cache.h   |    0
 .../mn10300/proc-mn103e010/include/proc}/clock.h   |    2 +-
 .../mn10300/proc-mn103e010/include/proc}/irq.h     |    0
 .../mn10300/proc-mn103e010/include/proc}/proc.h    |    0
 .../mn10300/unit-asb2303/include/unit}/clock.h     |    0
 .../mn10300/unit-asb2303/include/unit}/leds.h      |    0
 .../mn10300/unit-asb2303/include/unit}/serial.h    |    2 +-
 .../mn10300/unit-asb2303/include/unit}/smc91111.h  |    0
 .../mn10300/unit-asb2303/include/unit}/timex.h     |    2 +-
 arch/mn10300/unit-asb2303/leds.c                   |    2 +-
 arch/mn10300/unit-asb2303/smc91111.c               |    2 +-
 .../mn10300/unit-asb2305/include/unit}/clock.h     |    0
 .../mn10300/unit-asb2305/include/unit}/leds.h      |    0
 .../mn10300/unit-asb2305/include/unit}/serial.h    |    2 +-
 .../mn10300/unit-asb2305/include/unit}/timex.h     |    2 +-
 arch/mn10300/unit-asb2305/leds.c                   |    2 +-
 arch/mn10300/unit-asb2305/unit-init.c              |    2 +-
 drivers/net/smc91x.h                               |    2 +-
 138 files changed, 31 insertions(+), 65 deletions(-)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/Kbuild (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/atomic.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/auxvec.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/bitops.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/bug.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/bugs.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/busctl-regs.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/byteorder.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/cache.h (98%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/cacheflush.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/checksum.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/cpu-regs.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/cputime.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/current.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/delay.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/device.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/div64.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/dma-mapping.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/dma.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/dmactl-regs.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/elf.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/emergency-restart.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/errno.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/exceptions.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/fb.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/fcntl.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/fpu.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/frame.inc (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/ftrace.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/futex.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/gdb-stub.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/hardirq.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/highmem.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/hw_irq.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/intctl-regs.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/io.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/ioctl.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/ioctls.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/ipc.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/ipcbuf.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/irq.h (97%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/irq_regs.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/kdebug.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/kmap_types.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/kprobes.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/linkage.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/local.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/mc146818rtc.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/mman.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/mmu.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/mmu_context.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/module.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/msgbuf.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/mutex.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/nmi.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/page.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/page_offset.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/param.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/pci.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/percpu.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/pgalloc.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/pgtable.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/pio-regs.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/poll.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/posix_types.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/processor.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/ptrace.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/reset-regs.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/resource.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/rtc-regs.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/rtc.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/scatterlist.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/sections.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/sembuf.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/serial-regs.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/serial.h (97%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/setup.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/shmbuf.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/shmparam.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/sigcontext.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/siginfo.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/signal.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/smp.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/socket.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/sockios.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/spinlock.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/stat.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/statfs.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/string.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/swab.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/system.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/termbits.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/termios.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/thread_info.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/timer-regs.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/timex.h (96%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/tlb.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/tlbflush.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/topology.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/types.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/uaccess.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/ucontext.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/unaligned.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/unistd.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/user.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/vga.h (100%)
 rename {include/asm-mn10300 => arch/mn10300/include/asm}/xor.h (100%)
 rename {include/asm-mn10300/proc-mn103e010 => arch/mn10300/proc-mn103e010/include/proc}/cache.h (100%)
 rename {include/asm-mn10300/proc-mn103e010 => arch/mn10300/proc-mn103e010/include/proc}/clock.h (94%)
 rename {include/asm-mn10300/proc-mn103e010 => arch/mn10300/proc-mn103e010/include/proc}/irq.h (100%)
 rename {include/asm-mn10300/proc-mn103e010 => arch/mn10300/proc-mn103e010/include/proc}/proc.h (100%)
 rename {include/asm-mn10300/unit-asb2303 => arch/mn10300/unit-asb2303/include/unit}/clock.h (100%)
 rename {include/asm-mn10300/unit-asb2303 => arch/mn10300/unit-asb2303/include/unit}/leds.h (100%)
 rename {include/asm-mn10300/unit-asb2303 => arch/mn10300/unit-asb2303/include/unit}/serial.h (99%)
 rename {include/asm-mn10300/unit-asb2303 => arch/mn10300/unit-asb2303/include/unit}/smc91111.h (100%)
 rename {include/asm-mn10300/unit-asb2303 => arch/mn10300/unit-asb2303/include/unit}/timex.h (98%)
 rename {include/asm-mn10300/unit-asb2305 => arch/mn10300/unit-asb2305/include/unit}/clock.h (100%)
 rename {include/asm-mn10300/unit-asb2305 => arch/mn10300/unit-asb2305/include/unit}/leds.h (100%)
 rename {include/asm-mn10300/unit-asb2305 => arch/mn10300/unit-asb2305/include/unit}/serial.h (99%)
 rename {include/asm-mn10300/unit-asb2305 => arch/mn10300/unit-asb2305/include/unit}/timex.h (98%)

Re: [GIT PULL] MN10300: Move arch headers to arch dir

[Sam Ravnborg]

On Fri, Apr 10, 2009 at 02:42:15PM +0100, David Howells wrote:
> 
> Move the arch header files from include/asm-mn10300/ to various places in the
> arch headers.  The general headers end up in arch/mn10300/include/asm/ whilst
> the processor- and unit-specific header directories end up in the appropriate
> implementation directories.
> 
> This permits the symlinks include/asm/proc and include/asm/unit to be
> dispensed with.  This does, however, require that #include <asm/proc/xxx.h> be
> converted to #include <proc/xxx.h> and similarly for asm/unit -> unit.
> 
> The following changes since commit 62b8e680e61d3f48f2a12ee248ca03ea8f376926:
>   David Howells (1):
>         MN10300: Kill MN10300's own profiling Kconfig
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300.git master
> 
> David Howells (2):
>       Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.
>       Separate out the proc- and unit-specific header directories from the general

.gitignore is left in include/asm-mn10300.

As the content of that file is obsoleted by your last patch it can safely be deleted.
Linus - can I ask you to do so?

	Sam

[GIT PULL] MN10300: Remove obsolete include/asm-mn10300/.gitignore

[David Howells]

The following changes since commit d848223808c5d21e1b3cea090047e34722c6254b:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../dhowells/linux-2.6-mn10300

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300.git master

David Howells (1):
      MN10300: Remove obsolete .gitignore from include/asm-mn10300

 include/asm-mn10300/.gitignore |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
 delete mode 100644 include/asm-mn10300/.gitignore

Re: [GIT PULL] MN10300: Move arch headers to arch dir

[Jike Song]

On Sat, Apr 11, 2009 at 3:25 AM, Sam Ravnborg <sam@ravnborg.org> wrote:
>
> .gitignore is left in include/asm-mn10300.
>
> As the content of that file is obsoleted by your last patch it can safely be deleted.
> Linus - can I ask you to do so?
>
>        Sam

off topic: there is also a .gitignore left in include/asm-arm.


-- 
Thanks,
Jike

Re: [GIT PULL] MN10300: Move arch headers to arch dir

[Sam Ravnborg]

On Sat, Apr 11, 2009 at 11:42:01AM +0800, Jike Song wrote:
> On Sat, Apr 11, 2009 at 3:25 AM, Sam Ravnborg <sam@ravnborg.org> wrote:
> >
> > .gitignore is left in include/asm-mn10300.
> >
> > As the content of that file is obsoleted by your last patch it can safely be deleted.
> > Linus - can I ask you to do so?
> >
> >        Sam
> 
> off topic: there is also a .gitignore left in include/asm-arm.
But its there for a reason.
Arm generates mach-types.h and it should be ignored.

include/asm-arm is no longer a sensible place for these files,
but for now I have no better place for them so they will
stay there for a while.

	Sam

Re: [GIT PULL] MN10300: Move arch headers to arch dir

[Al Viro]

On Sat, Apr 11, 2009 at 07:45:16AM +0200, Sam Ravnborg wrote:
> On Sat, Apr 11, 2009 at 11:42:01AM +0800, Jike Song wrote:
> > On Sat, Apr 11, 2009 at 3:25 AM, Sam Ravnborg <sam@ravnborg.org> wrote:
> > >
> > > .gitignore is left in include/asm-mn10300.
> > >
> > > As the content of that file is obsoleted by your last patch it can safely be deleted.
> > > Linus - can I ask you to do so?
> > >
> > >        Sam
> > 
> > off topic: there is also a .gitignore left in include/asm-arm.
> But its there for a reason.
> Arm generates mach-types.h and it should be ignored.
> 
> include/asm-arm is no longer a sensible place for these files,
> but for now I have no better place for them so they will
> stay there for a while.

How about a single directory for *all* generated headers?  Only linux/version.h
has many places including it and even that can be dealt with for a moment with
linux/version.h consisting of #include <gen/version.h>.  The rest doesn't
need anything like that even for transition period - too few includes to care.

Re: [GIT PULL] MN10300: Move arch headers to arch dir

[Sam Ravnborg]

On Sat, Apr 11, 2009 at 07:43:00AM +0100, Al Viro wrote:
> On Sat, Apr 11, 2009 at 07:45:16AM +0200, Sam Ravnborg wrote:
> > On Sat, Apr 11, 2009 at 11:42:01AM +0800, Jike Song wrote:
> > > On Sat, Apr 11, 2009 at 3:25 AM, Sam Ravnborg <sam@ravnborg.org> wrote:
> > > >
> > > > .gitignore is left in include/asm-mn10300.
> > > >
> > > > As the content of that file is obsoleted by your last patch it can safely be deleted.
> > > > Linus - can I ask you to do so?
> > > >
> > > >        Sam
> > > 
> > > off topic: there is also a .gitignore left in include/asm-arm.
> > But its there for a reason.
> > Arm generates mach-types.h and it should be ignored.
> > 
> > include/asm-arm is no longer a sensible place for these files,
> > but for now I have no better place for them so they will
> > stay there for a while.
> 
> How about a single directory for *all* generated headers?  Only linux/version.h
> has many places including it and even that can be dealt with for a moment with
> linux/version.h consisting of #include <gen/version.h>.  The rest doesn't
> need anything like that even for transition period - too few includes to care.

So you suggest: include/gen/

asm-offsets.h, mach-types.h and version.h is the ones with the highest count.

And version.h is an exported header which we cannot move in our exported
set of headers. Fortunately I have just checked in a patch so we can specify
an alternative destination when exporting so this should deal with version.h.

asm-offsets.h and mach-types.h require a small helper file as you suggest,
otherwise it would be a _huge_ patch.

We can later migrate more generated files to this location.
(autoconf.h, config/* etc).

	Sam

Re: [GIT PULL] MN10300: Move arch headers to arch dir

[Al Viro]

On Sat, Apr 11, 2009 at 09:55:49AM +0200, Sam Ravnborg wrote:
> > How about a single directory for *all* generated headers?  Only linux/version.h
> > has many places including it and even that can be dealt with for a moment with
> > linux/version.h consisting of #include <gen/version.h>.  The rest doesn't
> > need anything like that even for transition period - too few includes to care.
> 
> So you suggest: include/gen/

Yes.

> asm-offsets.h, mach-types.h and version.h is the ones with the highest count.
> And version.h is an exported header which we cannot move in our exported
> set of headers. Fortunately I have just checked in a patch so we can specify
> an alternative destination when exporting so this should deal with version.h.
> 
> asm-offsets.h and mach-types.h require a small helper file as you suggest,
> otherwise it would be a _huge_ patch.

OK...  I suspect that many asm-offsets.h users might end up killable, but
removal and replacement are not too different wrt patch size.

> We can later migrate more generated files to this location.
> (autoconf.h, config/* etc).

autoconf.h is *trivial* to move.  What we have is

Makefile:                   -include include/linux/autoconf.h
Makefile:       $(Q)test -e include/linux/autoconf.h -a -e $@ || (              \
Makefile:       echo "         include/linux/autoconf.h or $@ are missing.";    \
Makefile:                  include/linux/autoconf.h include/linux/version.h      \
arch/cris/arch-v32/kernel/head.S:#include <linux/autoconf.h>
arch/cris/kernel/asm-offsets.c:#include <linux/autoconf.h>
arch/cris/kernel/vmlinux.lds.S:#include <linux/autoconf.h>
arch/ia64/kvm/asm-offsets.c:#include <linux/autoconf.h>
drivers/accessibility/braille/braille_console.c:#include <linux/autoconf.h>
drivers/hid/hid-lg.h:#include <linux/autoconf.h>
drivers/platform/x86/compal-laptop.c:#include <linux/autoconf.h>
include/linux/mmdebug.h:#include <linux/autoconf.h>
scripts/basic/fixdep.c:         if (strrcmp(s, "include/linux/autoconf.h") &&
scripts/kconfig/confdata.c:             name = "include/linux/autoconf.h";
scripts/mkcompile_h:if [ -r $TARGET -a ! -O include/linux/autoconf.h ]; then

and direct includes should be removed anyway - we already have -include in
flags.  So it's 8 removals in one patch and 7 replacements in another (a
bit more, since there are comments to update).  bounds.h is even easier:

.gitignore:include/linux/bounds.h
Kbuild:bounds-file := include/linux/bounds.h
Makefile:                  include/linux/bounds.h include/asm*/asm-offsets.h     \
include/linux/mmzone.h:#include <linux/bounds.h>
include/linux/page-flags.h:#include <linux/bounds.h>

utsrelease.h is a bit heavier - 19 instances.  compile.h - 6 instances.
ia64 nr-irqs.h - 4 instances.  

I'm not sure about include/config, actually - it's also not that much, but
it might be better to merge separately.

Note, BTW, that include/gen kills include/asm and include2/ (on O= builds),
leaving us only with $(objtree)/source symlink and a couple of nonsense ones
(arch/{i386,x86_64}/boot/bzImage -> ../../x86/boot/bzImage; do we still need
them, anyway?)  IIRC, you wanted to get rid of symlinks...

Re: [GIT PULL] MN10300: Move arch headers to arch dir

[Sam Ravnborg]

On Sat, Apr 11, 2009 at 04:39:33PM +0100, Al Viro wrote:
> On Sat, Apr 11, 2009 at 09:55:49AM +0200, Sam Ravnborg wrote:
> > > How about a single directory for *all* generated headers?  Only linux/version.h
> > > has many places including it and even that can be dealt with for a moment with
> > > linux/version.h consisting of #include <gen/version.h>.  The rest doesn't
> > > need anything like that even for transition period - too few includes to care.
> > 
> > So you suggest: include/gen/
> 
> Yes.

I will work on a patch and cc: you on it when it is mainline ready.
It looks trivial.

I need to get my resurrected build box working first though so it
will take a few days/weeks before I am on it.

	Sam