浏览代码

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
Linus Torvalds 16 年之前
父节点
当前提交
5de4c51d2a
共有 100 个文件被更改,包括 3 次插入3 次删除
  1. 0 0
      arch/frv/include/asm/Kbuild
  2. 0 0
      arch/frv/include/asm/atomic.h
  3. 0 0
      arch/frv/include/asm/auxvec.h
  4. 0 0
      arch/frv/include/asm/ax88796.h
  5. 0 0
      arch/frv/include/asm/bitops.h
  6. 0 0
      arch/frv/include/asm/bug.h
  7. 0 0
      arch/frv/include/asm/bugs.h
  8. 0 0
      arch/frv/include/asm/busctl-regs.h
  9. 0 0
      arch/frv/include/asm/byteorder.h
  10. 0 0
      arch/frv/include/asm/cache.h
  11. 0 0
      arch/frv/include/asm/cacheflush.h
  12. 0 0
      arch/frv/include/asm/checksum.h
  13. 0 0
      arch/frv/include/asm/cpu-irqs.h
  14. 0 0
      arch/frv/include/asm/cpumask.h
  15. 0 0
      arch/frv/include/asm/cputime.h
  16. 0 0
      arch/frv/include/asm/current.h
  17. 0 0
      arch/frv/include/asm/delay.h
  18. 0 0
      arch/frv/include/asm/device.h
  19. 0 0
      arch/frv/include/asm/div64.h
  20. 0 0
      arch/frv/include/asm/dm9000.h
  21. 0 0
      arch/frv/include/asm/dma-mapping.h
  22. 0 0
      arch/frv/include/asm/dma.h
  23. 0 0
      arch/frv/include/asm/elf.h
  24. 0 0
      arch/frv/include/asm/emergency-restart.h
  25. 0 0
      arch/frv/include/asm/errno.h
  26. 0 0
      arch/frv/include/asm/fb.h
  27. 0 0
      arch/frv/include/asm/fcntl.h
  28. 0 0
      arch/frv/include/asm/fpu.h
  29. 0 0
      arch/frv/include/asm/ftrace.h
  30. 0 0
      arch/frv/include/asm/futex.h
  31. 0 0
      arch/frv/include/asm/gdb-stub.h
  32. 0 0
      arch/frv/include/asm/gpio-regs.h
  33. 0 0
      arch/frv/include/asm/hardirq.h
  34. 0 0
      arch/frv/include/asm/highmem.h
  35. 0 0
      arch/frv/include/asm/hw_irq.h
  36. 0 0
      arch/frv/include/asm/init.h
  37. 0 0
      arch/frv/include/asm/io.h
  38. 0 0
      arch/frv/include/asm/ioctl.h
  39. 0 0
      arch/frv/include/asm/ioctls.h
  40. 0 0
      arch/frv/include/asm/ipcbuf.h
  41. 0 0
      arch/frv/include/asm/irc-regs.h
  42. 0 0
      arch/frv/include/asm/irq.h
  43. 0 0
      arch/frv/include/asm/irq_regs.h
  44. 0 0
      arch/frv/include/asm/kdebug.h
  45. 0 0
      arch/frv/include/asm/kmap_types.h
  46. 0 0
      arch/frv/include/asm/linkage.h
  47. 0 0
      arch/frv/include/asm/local.h
  48. 0 0
      arch/frv/include/asm/math-emu.h
  49. 0 0
      arch/frv/include/asm/mb-regs.h
  50. 0 0
      arch/frv/include/asm/mb86943a.h
  51. 0 0
      arch/frv/include/asm/mb93091-fpga-irqs.h
  52. 0 0
      arch/frv/include/asm/mb93093-fpga-irqs.h
  53. 0 0
      arch/frv/include/asm/mb93493-irqs.h
  54. 0 0
      arch/frv/include/asm/mb93493-regs.h
  55. 0 0
      arch/frv/include/asm/mc146818rtc.h
  56. 0 0
      arch/frv/include/asm/mem-layout.h
  57. 0 0
      arch/frv/include/asm/mman.h
  58. 0 0
      arch/frv/include/asm/mmu.h
  59. 0 0
      arch/frv/include/asm/mmu_context.h
  60. 0 0
      arch/frv/include/asm/module.h
  61. 0 0
      arch/frv/include/asm/msgbuf.h
  62. 0 0
      arch/frv/include/asm/mutex.h
  63. 0 0
      arch/frv/include/asm/page.h
  64. 0 0
      arch/frv/include/asm/param.h
  65. 0 0
      arch/frv/include/asm/pci.h
  66. 0 0
      arch/frv/include/asm/percpu.h
  67. 0 0
      arch/frv/include/asm/pgalloc.h
  68. 0 0
      arch/frv/include/asm/pgtable.h
  69. 0 0
      arch/frv/include/asm/poll.h
  70. 0 0
      arch/frv/include/asm/posix_types.h
  71. 0 0
      arch/frv/include/asm/processor.h
  72. 0 0
      arch/frv/include/asm/ptrace.h
  73. 0 0
      arch/frv/include/asm/registers.h
  74. 0 0
      arch/frv/include/asm/resource.h
  75. 0 0
      arch/frv/include/asm/scatterlist.h
  76. 0 0
      arch/frv/include/asm/sections.h
  77. 0 0
      arch/frv/include/asm/segment.h
  78. 0 0
      arch/frv/include/asm/sembuf.h
  79. 0 0
      arch/frv/include/asm/serial-regs.h
  80. 0 0
      arch/frv/include/asm/serial.h
  81. 0 0
      arch/frv/include/asm/setup.h
  82. 0 0
      arch/frv/include/asm/shmbuf.h
  83. 0 0
      arch/frv/include/asm/shmparam.h
  84. 0 0
      arch/frv/include/asm/sigcontext.h
  85. 0 0
      arch/frv/include/asm/siginfo.h
  86. 0 0
      arch/frv/include/asm/signal.h
  87. 0 0
      arch/frv/include/asm/smp.h
  88. 0 0
      arch/frv/include/asm/socket.h
  89. 0 0
      arch/frv/include/asm/sockios.h
  90. 0 0
      arch/frv/include/asm/spinlock.h
  91. 0 0
      arch/frv/include/asm/spr-regs.h
  92. 0 0
      arch/frv/include/asm/stat.h
  93. 0 0
      arch/frv/include/asm/statfs.h
  94. 0 0
      arch/frv/include/asm/string.h
  95. 0 0
      arch/frv/include/asm/suspend.h
  96. 0 0
      arch/frv/include/asm/swab.h
  97. 0 0
      arch/frv/include/asm/system.h
  98. 0 0
      arch/frv/include/asm/termbits.h
  99. 0 0
      arch/frv/include/asm/termios.h
  100. 3 3
      arch/frv/include/asm/thread_info.h

+ 0 - 0
include/asm-frv/Kbuild → arch/frv/include/asm/Kbuild


+ 0 - 0
include/asm-frv/atomic.h → arch/frv/include/asm/atomic.h


+ 0 - 0
include/asm-frv/auxvec.h → arch/frv/include/asm/auxvec.h


+ 0 - 0
include/asm-frv/ax88796.h → arch/frv/include/asm/ax88796.h


+ 0 - 0
include/asm-frv/bitops.h → arch/frv/include/asm/bitops.h


+ 0 - 0
include/asm-frv/bug.h → arch/frv/include/asm/bug.h


+ 0 - 0
include/asm-frv/bugs.h → arch/frv/include/asm/bugs.h


+ 0 - 0
include/asm-frv/busctl-regs.h → arch/frv/include/asm/busctl-regs.h


+ 0 - 0
include/asm-frv/byteorder.h → arch/frv/include/asm/byteorder.h


+ 0 - 0
include/asm-frv/cache.h → arch/frv/include/asm/cache.h


+ 0 - 0
include/asm-frv/cacheflush.h → arch/frv/include/asm/cacheflush.h


+ 0 - 0
include/asm-frv/checksum.h → arch/frv/include/asm/checksum.h


+ 0 - 0
include/asm-frv/cpu-irqs.h → arch/frv/include/asm/cpu-irqs.h


+ 0 - 0
include/asm-frv/cpumask.h → arch/frv/include/asm/cpumask.h


+ 0 - 0
include/asm-frv/cputime.h → arch/frv/include/asm/cputime.h


+ 0 - 0
include/asm-frv/current.h → arch/frv/include/asm/current.h


+ 0 - 0
include/asm-frv/delay.h → arch/frv/include/asm/delay.h


+ 0 - 0
include/asm-frv/device.h → arch/frv/include/asm/device.h


+ 0 - 0
include/asm-frv/div64.h → arch/frv/include/asm/div64.h


+ 0 - 0
include/asm-frv/dm9000.h → arch/frv/include/asm/dm9000.h


+ 0 - 0
include/asm-frv/dma-mapping.h → arch/frv/include/asm/dma-mapping.h


+ 0 - 0
include/asm-frv/dma.h → arch/frv/include/asm/dma.h


+ 0 - 0
include/asm-frv/elf.h → arch/frv/include/asm/elf.h


+ 0 - 0
include/asm-frv/emergency-restart.h → arch/frv/include/asm/emergency-restart.h


+ 0 - 0
include/asm-frv/errno.h → arch/frv/include/asm/errno.h


+ 0 - 0
include/asm-frv/fb.h → arch/frv/include/asm/fb.h


+ 0 - 0
include/asm-frv/fcntl.h → arch/frv/include/asm/fcntl.h


+ 0 - 0
include/asm-frv/fpu.h → arch/frv/include/asm/fpu.h


+ 0 - 0
include/asm-frv/ftrace.h → arch/frv/include/asm/ftrace.h


+ 0 - 0
include/asm-frv/futex.h → arch/frv/include/asm/futex.h


+ 0 - 0
include/asm-frv/gdb-stub.h → arch/frv/include/asm/gdb-stub.h


+ 0 - 0
include/asm-frv/gpio-regs.h → arch/frv/include/asm/gpio-regs.h


+ 0 - 0
include/asm-frv/hardirq.h → arch/frv/include/asm/hardirq.h


+ 0 - 0
include/asm-frv/highmem.h → arch/frv/include/asm/highmem.h


+ 0 - 0
include/asm-frv/hw_irq.h → arch/frv/include/asm/hw_irq.h


+ 0 - 0
include/asm-frv/init.h → arch/frv/include/asm/init.h


+ 0 - 0
include/asm-frv/io.h → arch/frv/include/asm/io.h


+ 0 - 0
include/asm-frv/ioctl.h → arch/frv/include/asm/ioctl.h


+ 0 - 0
include/asm-frv/ioctls.h → arch/frv/include/asm/ioctls.h


+ 0 - 0
include/asm-frv/ipcbuf.h → arch/frv/include/asm/ipcbuf.h


+ 0 - 0
include/asm-frv/irc-regs.h → arch/frv/include/asm/irc-regs.h


+ 0 - 0
include/asm-frv/irq.h → arch/frv/include/asm/irq.h


+ 0 - 0
include/asm-frv/irq_regs.h → arch/frv/include/asm/irq_regs.h


+ 0 - 0
include/asm-frv/kdebug.h → arch/frv/include/asm/kdebug.h


+ 0 - 0
include/asm-frv/kmap_types.h → arch/frv/include/asm/kmap_types.h


+ 0 - 0
include/asm-frv/linkage.h → arch/frv/include/asm/linkage.h


+ 0 - 0
include/asm-frv/local.h → arch/frv/include/asm/local.h


+ 0 - 0
include/asm-frv/math-emu.h → arch/frv/include/asm/math-emu.h


+ 0 - 0
include/asm-frv/mb-regs.h → arch/frv/include/asm/mb-regs.h


+ 0 - 0
include/asm-frv/mb86943a.h → arch/frv/include/asm/mb86943a.h


+ 0 - 0
include/asm-frv/mb93091-fpga-irqs.h → arch/frv/include/asm/mb93091-fpga-irqs.h


+ 0 - 0
include/asm-frv/mb93093-fpga-irqs.h → arch/frv/include/asm/mb93093-fpga-irqs.h


+ 0 - 0
include/asm-frv/mb93493-irqs.h → arch/frv/include/asm/mb93493-irqs.h


+ 0 - 0
include/asm-frv/mb93493-regs.h → arch/frv/include/asm/mb93493-regs.h


+ 0 - 0
include/asm-frv/mc146818rtc.h → arch/frv/include/asm/mc146818rtc.h


+ 0 - 0
include/asm-frv/mem-layout.h → arch/frv/include/asm/mem-layout.h


+ 0 - 0
include/asm-frv/mman.h → arch/frv/include/asm/mman.h


+ 0 - 0
include/asm-frv/mmu.h → arch/frv/include/asm/mmu.h


+ 0 - 0
include/asm-frv/mmu_context.h → arch/frv/include/asm/mmu_context.h


+ 0 - 0
include/asm-frv/module.h → arch/frv/include/asm/module.h


+ 0 - 0
include/asm-frv/msgbuf.h → arch/frv/include/asm/msgbuf.h


+ 0 - 0
include/asm-frv/mutex.h → arch/frv/include/asm/mutex.h


+ 0 - 0
include/asm-frv/page.h → arch/frv/include/asm/page.h


+ 0 - 0
include/asm-frv/param.h → arch/frv/include/asm/param.h


+ 0 - 0
include/asm-frv/pci.h → arch/frv/include/asm/pci.h


+ 0 - 0
include/asm-frv/percpu.h → arch/frv/include/asm/percpu.h


+ 0 - 0
include/asm-frv/pgalloc.h → arch/frv/include/asm/pgalloc.h


+ 0 - 0
include/asm-frv/pgtable.h → arch/frv/include/asm/pgtable.h


+ 0 - 0
include/asm-frv/poll.h → arch/frv/include/asm/poll.h


+ 0 - 0
include/asm-frv/posix_types.h → arch/frv/include/asm/posix_types.h


+ 0 - 0
include/asm-frv/processor.h → arch/frv/include/asm/processor.h


+ 0 - 0
include/asm-frv/ptrace.h → arch/frv/include/asm/ptrace.h


+ 0 - 0
include/asm-frv/registers.h → arch/frv/include/asm/registers.h


+ 0 - 0
include/asm-frv/resource.h → arch/frv/include/asm/resource.h


+ 0 - 0
include/asm-frv/scatterlist.h → arch/frv/include/asm/scatterlist.h


+ 0 - 0
include/asm-frv/sections.h → arch/frv/include/asm/sections.h


+ 0 - 0
include/asm-frv/segment.h → arch/frv/include/asm/segment.h


+ 0 - 0
include/asm-frv/sembuf.h → arch/frv/include/asm/sembuf.h


+ 0 - 0
include/asm-frv/serial-regs.h → arch/frv/include/asm/serial-regs.h


+ 0 - 0
include/asm-frv/serial.h → arch/frv/include/asm/serial.h


+ 0 - 0
include/asm-frv/setup.h → arch/frv/include/asm/setup.h


+ 0 - 0
include/asm-frv/shmbuf.h → arch/frv/include/asm/shmbuf.h


+ 0 - 0
include/asm-frv/shmparam.h → arch/frv/include/asm/shmparam.h


+ 0 - 0
include/asm-frv/sigcontext.h → arch/frv/include/asm/sigcontext.h


+ 0 - 0
include/asm-frv/siginfo.h → arch/frv/include/asm/siginfo.h


+ 0 - 0
include/asm-frv/signal.h → arch/frv/include/asm/signal.h


+ 0 - 0
include/asm-frv/smp.h → arch/frv/include/asm/smp.h


+ 0 - 0
include/asm-frv/socket.h → arch/frv/include/asm/socket.h


+ 0 - 0
include/asm-frv/sockios.h → arch/frv/include/asm/sockios.h


+ 0 - 0
include/asm-frv/spinlock.h → arch/frv/include/asm/spinlock.h


+ 0 - 0
include/asm-frv/spr-regs.h → arch/frv/include/asm/spr-regs.h


+ 0 - 0
include/asm-frv/stat.h → arch/frv/include/asm/stat.h


+ 0 - 0
include/asm-frv/statfs.h → arch/frv/include/asm/statfs.h


+ 0 - 0
include/asm-frv/string.h → arch/frv/include/asm/string.h


+ 0 - 0
include/asm-frv/suspend.h → arch/frv/include/asm/suspend.h


+ 0 - 0
include/asm-frv/swab.h → arch/frv/include/asm/swab.h


+ 0 - 0
include/asm-frv/system.h → arch/frv/include/asm/system.h


+ 0 - 0
include/asm-frv/termbits.h → arch/frv/include/asm/termbits.h


+ 0 - 0
include/asm-frv/termios.h → arch/frv/include/asm/termios.h


+ 3 - 3
include/asm-frv/thread_info.h → arch/frv/include/asm/thread_info.h

@@ -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];

部分文件因为文件数量过多而无法显示