Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv

* 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
2009-04-10 07:47:13 -07:00 · 2009-04-10 07:47:13 -07:00 · 5de4c51d2a
--- a/arch/frv/include/asm/Kbuild
+++ b/arch/frv/include/asm/Kbuild
--- a/arch/frv/include/asm/atomic.h
+++ b/arch/frv/include/asm/atomic.h
--- a/arch/frv/include/asm/auxvec.h
+++ b/arch/frv/include/asm/auxvec.h
--- a/arch/frv/include/asm/ax88796.h
+++ b/arch/frv/include/asm/ax88796.h
--- a/arch/frv/include/asm/bitops.h
+++ b/arch/frv/include/asm/bitops.h
--- a/arch/frv/include/asm/bug.h
+++ b/arch/frv/include/asm/bug.h
--- a/arch/frv/include/asm/bugs.h
+++ b/arch/frv/include/asm/bugs.h
--- a/arch/frv/include/asm/busctl-regs.h
+++ b/arch/frv/include/asm/busctl-regs.h
--- a/arch/frv/include/asm/byteorder.h
+++ b/arch/frv/include/asm/byteorder.h
--- a/arch/frv/include/asm/cache.h
+++ b/arch/frv/include/asm/cache.h
--- a/arch/frv/include/asm/cacheflush.h
+++ b/arch/frv/include/asm/cacheflush.h
--- a/arch/frv/include/asm/checksum.h
+++ b/arch/frv/include/asm/checksum.h
--- a/arch/frv/include/asm/cpu-irqs.h
+++ b/arch/frv/include/asm/cpu-irqs.h
--- a/arch/frv/include/asm/cpumask.h
+++ b/arch/frv/include/asm/cpumask.h
--- a/arch/frv/include/asm/cputime.h
+++ b/arch/frv/include/asm/cputime.h
--- a/arch/frv/include/asm/current.h
+++ b/arch/frv/include/asm/current.h
--- a/arch/frv/include/asm/delay.h
+++ b/arch/frv/include/asm/delay.h
--- a/arch/frv/include/asm/device.h
+++ b/arch/frv/include/asm/device.h
--- a/arch/frv/include/asm/div64.h
+++ b/arch/frv/include/asm/div64.h
--- a/arch/frv/include/asm/dm9000.h
+++ b/arch/frv/include/asm/dm9000.h
--- a/arch/frv/include/asm/dma-mapping.h
+++ b/arch/frv/include/asm/dma-mapping.h
--- a/arch/frv/include/asm/dma.h
+++ b/arch/frv/include/asm/dma.h
--- a/arch/frv/include/asm/elf.h
+++ b/arch/frv/include/asm/elf.h
--- a/arch/frv/include/asm/emergency-restart.h
+++ b/arch/frv/include/asm/emergency-restart.h
--- a/arch/frv/include/asm/errno.h
+++ b/arch/frv/include/asm/errno.h
--- a/arch/frv/include/asm/fb.h
+++ b/arch/frv/include/asm/fb.h
--- a/arch/frv/include/asm/fcntl.h
+++ b/arch/frv/include/asm/fcntl.h
--- a/arch/frv/include/asm/fpu.h
+++ b/arch/frv/include/asm/fpu.h
--- a/arch/frv/include/asm/ftrace.h
+++ b/arch/frv/include/asm/ftrace.h
--- a/arch/frv/include/asm/futex.h
+++ b/arch/frv/include/asm/futex.h
--- a/arch/frv/include/asm/gdb-stub.h
+++ b/arch/frv/include/asm/gdb-stub.h
--- a/arch/frv/include/asm/gpio-regs.h
+++ b/arch/frv/include/asm/gpio-regs.h
--- a/arch/frv/include/asm/hardirq.h
+++ b/arch/frv/include/asm/hardirq.h
--- a/arch/frv/include/asm/highmem.h
+++ b/arch/frv/include/asm/highmem.h
--- a/arch/frv/include/asm/hw_irq.h
+++ b/arch/frv/include/asm/hw_irq.h
--- a/arch/frv/include/asm/init.h
+++ b/arch/frv/include/asm/init.h
--- a/arch/frv/include/asm/io.h
+++ b/arch/frv/include/asm/io.h
--- a/arch/frv/include/asm/ioctl.h
+++ b/arch/frv/include/asm/ioctl.h
--- a/arch/frv/include/asm/ioctls.h
+++ b/arch/frv/include/asm/ioctls.h
--- a/arch/frv/include/asm/ipcbuf.h
+++ b/arch/frv/include/asm/ipcbuf.h
--- a/arch/frv/include/asm/irc-regs.h
+++ b/arch/frv/include/asm/irc-regs.h
--- a/arch/frv/include/asm/irq.h
+++ b/arch/frv/include/asm/irq.h
--- a/arch/frv/include/asm/irq_regs.h
+++ b/arch/frv/include/asm/irq_regs.h
--- a/arch/frv/include/asm/kdebug.h
+++ b/arch/frv/include/asm/kdebug.h
--- a/arch/frv/include/asm/kmap_types.h
+++ b/arch/frv/include/asm/kmap_types.h
--- a/arch/frv/include/asm/linkage.h
+++ b/arch/frv/include/asm/linkage.h
--- a/arch/frv/include/asm/local.h
+++ b/arch/frv/include/asm/local.h
--- a/arch/frv/include/asm/math-emu.h
+++ b/arch/frv/include/asm/math-emu.h
--- a/arch/frv/include/asm/mb-regs.h
+++ b/arch/frv/include/asm/mb-regs.h
--- a/arch/frv/include/asm/mb86943a.h
+++ b/arch/frv/include/asm/mb86943a.h
--- a/arch/frv/include/asm/mb93091-fpga-irqs.h
+++ b/arch/frv/include/asm/mb93091-fpga-irqs.h
--- a/arch/frv/include/asm/mb93093-fpga-irqs.h
+++ b/arch/frv/include/asm/mb93093-fpga-irqs.h
--- a/arch/frv/include/asm/mb93493-irqs.h
+++ b/arch/frv/include/asm/mb93493-irqs.h
--- a/arch/frv/include/asm/mb93493-regs.h
+++ b/arch/frv/include/asm/mb93493-regs.h
--- a/arch/frv/include/asm/mc146818rtc.h
+++ b/arch/frv/include/asm/mc146818rtc.h
--- a/arch/frv/include/asm/mem-layout.h
+++ b/arch/frv/include/asm/mem-layout.h
--- a/arch/frv/include/asm/mman.h
+++ b/arch/frv/include/asm/mman.h
--- a/arch/frv/include/asm/mmu.h
+++ b/arch/frv/include/asm/mmu.h
--- a/arch/frv/include/asm/mmu_context.h
+++ b/arch/frv/include/asm/mmu_context.h
--- a/arch/frv/include/asm/module.h
+++ b/arch/frv/include/asm/module.h
--- a/arch/frv/include/asm/msgbuf.h
+++ b/arch/frv/include/asm/msgbuf.h
--- a/arch/frv/include/asm/mutex.h
+++ b/arch/frv/include/asm/mutex.h
--- a/arch/frv/include/asm/page.h
+++ b/arch/frv/include/asm/page.h
--- a/arch/frv/include/asm/param.h
+++ b/arch/frv/include/asm/param.h
--- a/arch/frv/include/asm/pci.h
+++ b/arch/frv/include/asm/pci.h
--- a/arch/frv/include/asm/percpu.h
+++ b/arch/frv/include/asm/percpu.h
--- a/arch/frv/include/asm/pgalloc.h
+++ b/arch/frv/include/asm/pgalloc.h
--- a/arch/frv/include/asm/pgtable.h
+++ b/arch/frv/include/asm/pgtable.h
--- a/arch/frv/include/asm/poll.h
+++ b/arch/frv/include/asm/poll.h
--- a/arch/frv/include/asm/posix_types.h
+++ b/arch/frv/include/asm/posix_types.h
--- a/arch/frv/include/asm/processor.h
+++ b/arch/frv/include/asm/processor.h
--- a/arch/frv/include/asm/ptrace.h
+++ b/arch/frv/include/asm/ptrace.h
--- a/arch/frv/include/asm/registers.h
+++ b/arch/frv/include/asm/registers.h
--- a/arch/frv/include/asm/resource.h
+++ b/arch/frv/include/asm/resource.h
--- a/arch/frv/include/asm/scatterlist.h
+++ b/arch/frv/include/asm/scatterlist.h
--- a/arch/frv/include/asm/sections.h
+++ b/arch/frv/include/asm/sections.h
--- a/arch/frv/include/asm/segment.h
+++ b/arch/frv/include/asm/segment.h
--- a/arch/frv/include/asm/sembuf.h
+++ b/arch/frv/include/asm/sembuf.h
--- a/arch/frv/include/asm/serial-regs.h
+++ b/arch/frv/include/asm/serial-regs.h
--- a/arch/frv/include/asm/serial.h
+++ b/arch/frv/include/asm/serial.h
--- a/arch/frv/include/asm/setup.h
+++ b/arch/frv/include/asm/setup.h
--- a/arch/frv/include/asm/shmbuf.h
+++ b/arch/frv/include/asm/shmbuf.h
--- a/arch/frv/include/asm/shmparam.h
+++ b/arch/frv/include/asm/shmparam.h
--- a/arch/frv/include/asm/sigcontext.h
+++ b/arch/frv/include/asm/sigcontext.h
--- a/arch/frv/include/asm/siginfo.h
+++ b/arch/frv/include/asm/siginfo.h
--- a/arch/frv/include/asm/signal.h
+++ b/arch/frv/include/asm/signal.h
--- a/arch/frv/include/asm/smp.h
+++ b/arch/frv/include/asm/smp.h
--- a/arch/frv/include/asm/socket.h
+++ b/arch/frv/include/asm/socket.h
--- a/arch/frv/include/asm/sockios.h
+++ b/arch/frv/include/asm/sockios.h
--- a/arch/frv/include/asm/spinlock.h
+++ b/arch/frv/include/asm/spinlock.h
--- a/arch/frv/include/asm/spr-regs.h
+++ b/arch/frv/include/asm/spr-regs.h
--- a/arch/frv/include/asm/stat.h
+++ b/arch/frv/include/asm/stat.h
--- a/arch/frv/include/asm/statfs.h
+++ b/arch/frv/include/asm/statfs.h
--- a/arch/frv/include/asm/string.h
+++ b/arch/frv/include/asm/string.h
--- a/arch/frv/include/asm/suspend.h
+++ b/arch/frv/include/asm/suspend.h
--- a/arch/frv/include/asm/swab.h
+++ b/arch/frv/include/asm/swab.h
--- a/arch/frv/include/asm/system.h
+++ b/arch/frv/include/asm/system.h
--- a/arch/frv/include/asm/termbits.h
+++ b/arch/frv/include/asm/termbits.h
--- a/arch/frv/include/asm/termios.h
+++ b/arch/frv/include/asm/termios.h
--- a/arch/frv/include/asm/thread_info.h
+++ b/arch/frv/include/asm/thread_info.h
@ -38,8 +38,8 @@ 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;

--- a/Показать больше
+++ b/Показать больше