Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv
Linus Torvalds [Fri, 10 Apr 2009 14:47:13 +0000 (07:47 -0700)]
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv:
  FRV: Move to arch/frv/include/asm/
  FRV: Fix indentation errors to keep git-am happy when moving arch header files

114 files changed:
arch/frv/include/asm/Kbuild [moved from include/asm-frv/Kbuild with 100% similarity]
arch/frv/include/asm/atomic.h [moved from include/asm-frv/atomic.h with 100% similarity]
arch/frv/include/asm/auxvec.h [moved from include/asm-frv/auxvec.h with 100% similarity]
arch/frv/include/asm/ax88796.h [moved from include/asm-frv/ax88796.h with 100% similarity]
arch/frv/include/asm/bitops.h [moved from include/asm-frv/bitops.h with 100% similarity]
arch/frv/include/asm/bug.h [moved from include/asm-frv/bug.h with 100% similarity]
arch/frv/include/asm/bugs.h [moved from include/asm-frv/bugs.h with 100% similarity]
arch/frv/include/asm/busctl-regs.h [moved from include/asm-frv/busctl-regs.h with 100% similarity]
arch/frv/include/asm/byteorder.h [moved from include/asm-frv/byteorder.h with 100% similarity]
arch/frv/include/asm/cache.h [moved from include/asm-frv/cache.h with 100% similarity]
arch/frv/include/asm/cacheflush.h [moved from include/asm-frv/cacheflush.h with 100% similarity]
arch/frv/include/asm/checksum.h [moved from include/asm-frv/checksum.h with 100% similarity]
arch/frv/include/asm/cpu-irqs.h [moved from include/asm-frv/cpu-irqs.h with 100% similarity]
arch/frv/include/asm/cpumask.h [moved from include/asm-frv/cpumask.h with 100% similarity]
arch/frv/include/asm/cputime.h [moved from include/asm-frv/cputime.h with 100% similarity]
arch/frv/include/asm/current.h [moved from include/asm-frv/current.h with 100% similarity]
arch/frv/include/asm/delay.h [moved from include/asm-frv/delay.h with 100% similarity]
arch/frv/include/asm/device.h [moved from include/asm-frv/device.h with 100% similarity]
arch/frv/include/asm/div64.h [moved from include/asm-frv/div64.h with 100% similarity]
arch/frv/include/asm/dm9000.h [moved from include/asm-frv/dm9000.h with 100% similarity]
arch/frv/include/asm/dma-mapping.h [moved from include/asm-frv/dma-mapping.h with 100% similarity]
arch/frv/include/asm/dma.h [moved from include/asm-frv/dma.h with 100% similarity]
arch/frv/include/asm/elf.h [moved from include/asm-frv/elf.h with 100% similarity]
arch/frv/include/asm/emergency-restart.h [moved from include/asm-frv/emergency-restart.h with 100% similarity]
arch/frv/include/asm/errno.h [moved from include/asm-frv/errno.h with 100% similarity]
arch/frv/include/asm/fb.h [moved from include/asm-frv/fb.h with 100% similarity]
arch/frv/include/asm/fcntl.h [moved from include/asm-frv/fcntl.h with 100% similarity]
arch/frv/include/asm/fpu.h [moved from include/asm-frv/fpu.h with 100% similarity]
arch/frv/include/asm/ftrace.h [moved from include/asm-frv/ftrace.h with 100% similarity]
arch/frv/include/asm/futex.h [moved from include/asm-frv/futex.h with 100% similarity]
arch/frv/include/asm/gdb-stub.h [moved from include/asm-frv/gdb-stub.h with 100% similarity]
arch/frv/include/asm/gpio-regs.h [moved from include/asm-frv/gpio-regs.h with 100% similarity]
arch/frv/include/asm/hardirq.h [moved from include/asm-frv/hardirq.h with 100% similarity]
arch/frv/include/asm/highmem.h [moved from include/asm-frv/highmem.h with 100% similarity]
arch/frv/include/asm/hw_irq.h [moved from include/asm-frv/hw_irq.h with 100% similarity]
arch/frv/include/asm/init.h [moved from include/asm-frv/init.h with 100% similarity]
arch/frv/include/asm/io.h [moved from include/asm-frv/io.h with 100% similarity]
arch/frv/include/asm/ioctl.h [moved from include/asm-frv/ioctl.h with 100% similarity]
arch/frv/include/asm/ioctls.h [moved from include/asm-frv/ioctls.h with 100% similarity]
arch/frv/include/asm/ipcbuf.h [moved from include/asm-frv/ipcbuf.h with 100% similarity]
arch/frv/include/asm/irc-regs.h [moved from include/asm-frv/irc-regs.h with 100% similarity]
arch/frv/include/asm/irq.h [moved from include/asm-frv/irq.h with 100% similarity]
arch/frv/include/asm/irq_regs.h [moved from include/asm-frv/irq_regs.h with 100% similarity]
arch/frv/include/asm/kdebug.h [moved from include/asm-frv/kdebug.h with 100% similarity]
arch/frv/include/asm/kmap_types.h [moved from include/asm-frv/kmap_types.h with 100% similarity]
arch/frv/include/asm/linkage.h [moved from include/asm-frv/linkage.h with 100% similarity]
arch/frv/include/asm/local.h [moved from include/asm-frv/local.h with 100% similarity]
arch/frv/include/asm/math-emu.h [moved from include/asm-frv/math-emu.h with 100% similarity]
arch/frv/include/asm/mb-regs.h [moved from include/asm-frv/mb-regs.h with 100% similarity]
arch/frv/include/asm/mb86943a.h [moved from include/asm-frv/mb86943a.h with 100% similarity]
arch/frv/include/asm/mb93091-fpga-irqs.h [moved from include/asm-frv/mb93091-fpga-irqs.h with 100% similarity]
arch/frv/include/asm/mb93093-fpga-irqs.h [moved from include/asm-frv/mb93093-fpga-irqs.h with 100% similarity]
arch/frv/include/asm/mb93493-irqs.h [moved from include/asm-frv/mb93493-irqs.h with 100% similarity]
arch/frv/include/asm/mb93493-regs.h [moved from include/asm-frv/mb93493-regs.h with 100% similarity]
arch/frv/include/asm/mc146818rtc.h [moved from include/asm-frv/mc146818rtc.h with 100% similarity]
arch/frv/include/asm/mem-layout.h [moved from include/asm-frv/mem-layout.h with 100% similarity]
arch/frv/include/asm/mman.h [moved from include/asm-frv/mman.h with 100% similarity]
arch/frv/include/asm/mmu.h [moved from include/asm-frv/mmu.h with 100% similarity]
arch/frv/include/asm/mmu_context.h [moved from include/asm-frv/mmu_context.h with 100% similarity]
arch/frv/include/asm/module.h [moved from include/asm-frv/module.h with 100% similarity]
arch/frv/include/asm/msgbuf.h [moved from include/asm-frv/msgbuf.h with 100% similarity]
arch/frv/include/asm/mutex.h [moved from include/asm-frv/mutex.h with 100% similarity]
arch/frv/include/asm/page.h [moved from include/asm-frv/page.h with 100% similarity]
arch/frv/include/asm/param.h [moved from include/asm-frv/param.h with 100% similarity]
arch/frv/include/asm/pci.h [moved from include/asm-frv/pci.h with 100% similarity]
arch/frv/include/asm/percpu.h [moved from include/asm-frv/percpu.h with 100% similarity]
arch/frv/include/asm/pgalloc.h [moved from include/asm-frv/pgalloc.h with 100% similarity]
arch/frv/include/asm/pgtable.h [moved from include/asm-frv/pgtable.h with 100% similarity]
arch/frv/include/asm/poll.h [moved from include/asm-frv/poll.h with 100% similarity]
arch/frv/include/asm/posix_types.h [moved from include/asm-frv/posix_types.h with 100% similarity]
arch/frv/include/asm/processor.h [moved from include/asm-frv/processor.h with 100% similarity]
arch/frv/include/asm/ptrace.h [moved from include/asm-frv/ptrace.h with 100% similarity]
arch/frv/include/asm/registers.h [moved from include/asm-frv/registers.h with 100% similarity]
arch/frv/include/asm/resource.h [moved from include/asm-frv/resource.h with 100% similarity]
arch/frv/include/asm/scatterlist.h [moved from include/asm-frv/scatterlist.h with 100% similarity]
arch/frv/include/asm/sections.h [moved from include/asm-frv/sections.h with 100% similarity]
arch/frv/include/asm/segment.h [moved from include/asm-frv/segment.h with 100% similarity]
arch/frv/include/asm/sembuf.h [moved from include/asm-frv/sembuf.h with 100% similarity]
arch/frv/include/asm/serial-regs.h [moved from include/asm-frv/serial-regs.h with 100% similarity]
arch/frv/include/asm/serial.h [moved from include/asm-frv/serial.h with 100% similarity]
arch/frv/include/asm/setup.h [moved from include/asm-frv/setup.h with 100% similarity]
arch/frv/include/asm/shmbuf.h [moved from include/asm-frv/shmbuf.h with 100% similarity]
arch/frv/include/asm/shmparam.h [moved from include/asm-frv/shmparam.h with 100% similarity]
arch/frv/include/asm/sigcontext.h [moved from include/asm-frv/sigcontext.h with 100% similarity]
arch/frv/include/asm/siginfo.h [moved from include/asm-frv/siginfo.h with 100% similarity]
arch/frv/include/asm/signal.h [moved from include/asm-frv/signal.h with 100% similarity]
arch/frv/include/asm/smp.h [moved from include/asm-frv/smp.h with 100% similarity]
arch/frv/include/asm/socket.h [moved from include/asm-frv/socket.h with 100% similarity]
arch/frv/include/asm/sockios.h [moved from include/asm-frv/sockios.h with 100% similarity]
arch/frv/include/asm/spinlock.h [moved from include/asm-frv/spinlock.h with 100% similarity]
arch/frv/include/asm/spr-regs.h [moved from include/asm-frv/spr-regs.h with 100% similarity]
arch/frv/include/asm/stat.h [moved from include/asm-frv/stat.h with 100% similarity]
arch/frv/include/asm/statfs.h [moved from include/asm-frv/statfs.h with 100% similarity]
arch/frv/include/asm/string.h [moved from include/asm-frv/string.h with 100% similarity]
arch/frv/include/asm/suspend.h [moved from include/asm-frv/suspend.h with 100% similarity]
arch/frv/include/asm/swab.h [moved from include/asm-frv/swab.h with 100% similarity]
arch/frv/include/asm/system.h [moved from include/asm-frv/system.h with 100% similarity]
arch/frv/include/asm/termbits.h [moved from include/asm-frv/termbits.h with 100% similarity]
arch/frv/include/asm/termios.h [moved from include/asm-frv/termios.h with 100% similarity]
arch/frv/include/asm/thread_info.h [moved from include/asm-frv/thread_info.h with 97% similarity]
arch/frv/include/asm/timer-regs.h [moved from include/asm-frv/timer-regs.h with 100% similarity]
arch/frv/include/asm/timex.h [moved from include/asm-frv/timex.h with 100% similarity]
arch/frv/include/asm/tlb.h [moved from include/asm-frv/tlb.h with 100% similarity]
arch/frv/include/asm/tlbflush.h [moved from include/asm-frv/tlbflush.h with 100% similarity]
arch/frv/include/asm/topology.h [moved from include/asm-frv/topology.h with 100% similarity]
arch/frv/include/asm/types.h [moved from include/asm-frv/types.h with 100% similarity]
arch/frv/include/asm/uaccess.h [moved from include/asm-frv/uaccess.h with 100% similarity]
arch/frv/include/asm/ucontext.h [moved from include/asm-frv/ucontext.h with 100% similarity]
arch/frv/include/asm/unaligned.h [moved from include/asm-frv/unaligned.h with 100% similarity]
arch/frv/include/asm/unistd.h [moved from include/asm-frv/unistd.h with 100% similarity]
arch/frv/include/asm/user.h [moved from include/asm-frv/user.h with 100% similarity]
arch/frv/include/asm/vga.h [moved from include/asm-frv/vga.h with 100% similarity]
arch/frv/include/asm/virtconvert.h [moved from include/asm-frv/virtconvert.h with 100% similarity]
arch/frv/include/asm/xor.h [moved from include/asm-frv/xor.h with 100% similarity]

similarity index 97%
rename from include/asm-frv/thread_info.h
rename to arch/frv/include/asm/thread_info.h
index b7ac6bf..bb53ab7 100644 (file)
@@ -38,9 +38,9 @@ struct thread_info {
        int                     preempt_count;  /* 0 => preemptable, <0 => BUG */
 
        mm_segment_t            addr_limit;     /* thread address space:
-                                                  0-0xBFFFFFFF for user-thead
-                                                  0-0xFFFFFFFF for kernel-thread
-                                               */
+                                                * 0-0xBFFFFFFF for user-thead
+                                                * 0-0xFFFFFFFF for kernel-thread
+                                                */
        struct restart_block    restart_block;
 
        __u8                    supervisor_stack[0];