FRV: Use <asm-generic/pgtable.h> in NOMMU mode
Subsystems (10)
PATCH 1/2 FRV: Use <asm-generic/pgtable.h> in NOMMU mode
asm-frv/pgtable.h could just #include <asm-generic/pgtable.h> in NOMMU mode rather than #defining macros for lazy MMU and CPU stuff.
---
include/asm-frv/pgtable.h | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
include/asm-frv/pgtable.h +2 -4
@@ -71,10 +71,8 @@ static inline int pte_file(pte_t pte) { return 0; }#define swapper_pg_dir ((pgd_t *) NULL)#define pgtable_cache_init () do {} while (0) -#define arch_enter_lazy_mmu_mode () do {} while (0) -#define arch_leave_lazy_mmu_mode () do {} while (0) -#define arch_enter_lazy_cpu_mode () do {} while (0) -#define arch_leave_lazy_cpu_mode () do {} while (0) + +#include <asm-generic/pgtable.h> #else /* !CONFIG_MMU */ /*****************************************************************************/
PATCH 2/2 FRV: Move to arch/frv/include/asm/
Move arch headers from include/asm-frv/ to arch/frv/include/asm/.
---
arch/frv/include/asm/Kbuild | 5 arch/frv/include/asm/atomic.h | 198 +++++++++++ arch/frv/include/asm/auxvec.h | 4 arch/frv/include/asm/ax88796.h | 22 + arch/frv/include/asm/bitops.h | 412 +++++++++++++++++++++++ arch/frv/include/asm/bug.h | 53 +++ arch/frv/include/asm/bugs.h | 14 + arch/frv/include/asm/busctl-regs.h | 41 ++ arch/frv/include/asm/byteorder.h | 6 arch/frv/include/asm/cache.h | 23 + arch/frv/include/asm/cacheflush.h | 104 ++++++ arch/frv/include/asm/checksum.h | 180 ++++++++++ arch/frv/include/asm/cpu-irqs.h | 81 ++++ arch/frv/include/asm/cpumask.h | 6 arch/frv/include/asm/cputime.h | 6 arch/frv/include/asm/current.h | 30 ++ arch/frv/include/asm/delay.h | 50 +++ arch/frv/include/asm/device.h | 7 arch/frv/include/asm/div64.h | 1 arch/frv/include/asm/dm9000.h | 37 ++ arch/frv/include/asm/dma-mapping.h | 174 ++++++++++ arch/frv/include/asm/dma.h | 125 +++++++ arch/frv/include/asm/elf.h | 142 ++++++++ arch/frv/include/asm/emergency-restart.h | 6 arch/frv/include/asm/errno.h | 7 arch/frv/include/asm/fb.h | 12 + arch/frv/include/asm/fcntl.h | 1 arch/frv/include/asm/fpu.h | 11 + arch/frv/include/asm/ftrace.h | 1 arch/frv/include/asm/futex.h | 19 + arch/frv/include/asm/gdb-stub.h | 140 ++++++++ arch/frv/include/asm/gpio-regs.h | 116 ++++++ arch/frv/include/asm/hardirq.h | 35 ++ arch/frv/include/asm/highmem.h | 182 ++++++++++ arch/frv/include/asm/hw_irq.h | 16 + arch/frv/include/asm/init.h | 12 + arch/frv/include/asm/io.h | 392 +++++++++++++++++++++ arch/frv/include/asm/ioctl.h | 1 arch/frv/include/asm/ioctls.h | 86 +++++ arch/frv/include/asm/ipcbuf.h | 30 ++ arch/frv/include/asm/irc-regs.h | 53 +++ arch/frv/include/asm/irq.h | 30 ++ arch/frv/include/asm/irq_regs.h | 27 + arch/frv/include/asm/kdebug.h | 1 arch/frv/include/asm/kmap_types.h | 29 ++ arch/frv/include/asm/linkage.h | 7 arch/frv/include/asm/local.h | 6 arch/frv/include/asm/math-emu.h | 301 ++++++++++++++++ arch/frv/include/asm/mb-regs.h | 200 +++++++++++ arch/frv/include/asm/mb86943a.h | 42 ++ arch/frv/include/asm/mb93091-fpga-irqs.h | 42 ++ arch/frv/include/asm/mb93093-fpga-irqs.h | 29 ++ arch/frv/include/asm/mb93493-irqs.h | 50 +++ arch/frv/include/asm/mb93493-regs.h | 281 +++++++++++++++ arch/frv/include/asm/mc146818rtc.h | 16 + arch/frv/include/asm/mem-layout.h | 86 +++++ arch/frv/include/asm/mman.h | 18 + arch/frv/include/asm/mmu.h | 41 ++ arch/frv/include/asm/mmu_context.h | 50 +++ arch/frv/include/asm/module.h | 28 ++ arch/frv/include/asm/msgbuf.h | 32 ++ arch/frv/include/asm/mutex.h | 9 arch/frv/include/asm/page.h | 78 ++++ arch/frv/include/asm/param.h | 22 + arch/frv/include/asm/pci.h | 118 ++++++ arch/frv/include/asm/percpu.h | 6 arch/frv/include/asm/pgalloc.h | 69 ++++ arch/frv/include/asm/pgtable.h | 549 ++++++++++++++++++++++++++++++ arch/frv/include/asm/poll.h | 12 + arch/frv/include/asm/posix_types.h | 62 +++ arch/frv/include/asm/processor.h | 153 ++++++++ arch/frv/include/asm/ptrace.h | 83 +++++ arch/frv/include/asm/registers.h | 232 +++++++++++++ arch/frv/include/asm/resource.h | 7 arch/frv/include/asm/scatterlist.h | 46 +++ arch/frv/include/asm/sections.h | 46 +++ arch/frv/include/asm/segment.h | 45 ++ arch/frv/include/asm/sembuf.h | 26 + arch/frv/include/asm/serial-regs.h | 44 ++ arch/frv/include/asm/serial.h | 18 + arch/frv/include/asm/setup.h | 31 ++ arch/frv/include/asm/shmbuf.h | 43 ++ arch/frv/include/asm/shmparam.h | 7 arch/frv/include/asm/sigcontext.h | 26 + arch/frv/include/asm/siginfo.h | 12 + arch/frv/include/asm/signal.h | 161 +++++++++ arch/frv/include/asm/smp.h | 9 arch/frv/include/asm/socket.h | 61 +++ arch/frv/include/asm/sockios.h | 14 + arch/frv/include/asm/spinlock.h | 17 + arch/frv/include/asm/spr-regs.h | 416 +++++++++++++++++++++++ arch/frv/include/asm/stat.h | 100 +++++ arch/frv/include/asm/statfs.h | 7 arch/frv/include/asm/string.h | 51 +++ arch/frv/include/asm/suspend.h | 20 + arch/frv/include/asm/swab.h | 10 + arch/frv/include/asm/system.h | 301 ++++++++++++++++ arch/frv/include/asm/termbits.h | 202 +++++++++++ arch/frv/include/asm/termios.h | 58 +++ arch/frv/include/asm/thread_info.h | 144 ++++++++ arch/frv/include/asm/timer-regs.h | 106 ++++++ arch/frv/include/asm/timex.h | 20 + arch/frv/include/asm/tlb.h | 27 + arch/frv/include/asm/tlbflush.h | 73 ++++ arch/frv/include/asm/topology.h | 12 + arch/frv/include/asm/types.h | 40 ++ arch/frv/include/asm/uaccess.h | 321 ++++++++++++++++++ arch/frv/include/asm/ucontext.h | 12 + arch/frv/include/asm/unaligned.h | 22 + arch/frv/include/asm/unistd.h | 382 +++++++++++++++++++++ arch/frv/include/asm/user.h | 80 ++++ arch/frv/include/asm/vga.h | 17 + arch/frv/include/asm/virtconvert.h | 41 ++ arch/frv/include/asm/xor.h | 1 include/asm-frv/Kbuild | 5 include/asm-frv/atomic.h | 198 ----------- include/asm-frv/auxvec.h | 4 include/asm-frv/ax88796.h | 22 - include/asm-frv/bitops.h | 412 ----------------------- include/asm-frv/bug.h | 53 --- include/asm-frv/bugs.h | 14 - include/asm-frv/busctl-regs.h | 41 -- include/asm-frv/byteorder.h | 6 include/asm-frv/cache.h | 23 - include/asm-frv/cacheflush.h | 104 ------ include/asm-frv/checksum.h | 180 ---------- include/asm-frv/cpu-irqs.h | 81 ---- include/asm-frv/cpumask.h | 6 include/asm-frv/cputime.h | 6 include/asm-frv/current.h | 30 -- include/asm-frv/delay.h | 50 --- include/asm-frv/device.h | 7 include/asm-frv/div64.h | 1 include/asm-frv/dm9000.h | 37 -- include/asm-frv/dma-mapping.h | 174 ---------- include/asm-frv/dma.h | 125 ------- include/asm-frv/elf.h | 142 -------- include/asm-frv/emergency-restart.h | 6 include/asm-frv/errno.h | 7 include/asm-frv/fb.h | 12 - include/asm-frv/fcntl.h | 1 include/asm-frv/fpu.h | 11 - include/asm-frv/ftrace.h | 1 include/asm-frv/futex.h | 19 - include/asm-frv/gdb-stub.h | 140 -------- include/asm-frv/gpio-regs.h | 116 ------ include/asm-frv/hardirq.h | 35 -- include/asm-frv/highmem.h | 182 ---------- include/asm-frv/hw_irq.h | 16 - include/asm-frv/init.h | 12 - include/asm-frv/io.h | 392 --------------------- include/asm-frv/ioctl.h | 1 include/asm-frv/ioctls.h | 86 ----- include/asm-frv/ipcbuf.h | 30 -- include/asm-frv/irc-regs.h | 53 --- include/asm-frv/irq.h | 30 -- include/asm-frv/irq_regs.h | 27 - include/asm-frv/kdebug.h | 1 include/asm-frv/kmap_types.h | 29 -- include/asm-frv/linkage.h | 7 include/asm-frv/local.h | 6 include/asm-frv/math-emu.h | 301 ---------------- include/asm-frv/mb-regs.h | 200 ----------- include/asm-frv/mb86943a.h | 42 -- include/asm-frv/mb93091-fpga-irqs.h | 42 -- include/asm-frv/mb93093-fpga-irqs.h | 29 -- include/asm-frv/mb93493-irqs.h | 50 --- include/asm-frv/mb93493-regs.h | 281 --------------- include/asm-frv/mc146818rtc.h | 16 - include/asm-frv/mem-layout.h | 86 ----- include/asm-frv/mman.h | 18 - include/asm-frv/mmu.h | 41 -- include/asm-frv/mmu_context.h | 50 --- include/asm-frv/module.h | 28 -- include/asm-frv/msgbuf.h | 32 -- include/asm-frv/mutex.h | 9 include/asm-frv/page.h | 78 ---- include/asm-frv/param.h | 22 - include/asm-frv/pci.h | 118 ------ include/asm-frv/percpu.h | 6 include/asm-frv/pgalloc.h | 69 ---- include/asm-frv/pgtable.h | 549 ------------------------------ include/asm-frv/poll.h | 12 - include/asm-frv/posix_types.h | 62 --- include/asm-frv/processor.h | 153 -------- include/asm-frv/ptrace.h | 83 ----- include/asm-frv/registers.h | 232 ------------- include/asm-frv/resource.h | 7 include/asm-frv/scatterlist.h | 46 --- include/asm-frv/sections.h | 46 --- include/asm-frv/segment.h | 45 -- include/asm-frv/sembuf.h | 26 - include/asm-frv/serial-regs.h | 44 -- include/asm-frv/serial.h | 18 - include/asm-frv/setup.h | 31 -- include/asm-frv/shmbuf.h | 43 -- include/asm-frv/shmparam.h | 7 include/asm-frv/sigcontext.h | 26 - include/asm-frv/siginfo.h | 12 - include/asm-frv/signal.h | 161 --------- include/asm-frv/smp.h | 9 include/asm-frv/socket.h | 61 --- include/asm-frv/sockios.h | 14 - include/asm-frv/spinlock.h | 17 - include/asm-frv/spr-regs.h | 416 ----------------------- include/asm-frv/stat.h | 100 ----- include/asm-frv/statfs.h | 7 include/asm-frv/string.h | 51 --- include/asm-frv/suspend.h | 20 - include/asm-frv/swab.h | 10 - include/asm-frv/system.h | 301 ---------------- include/asm-frv/termbits.h | 202 ----------- include/asm-frv/termios.h | 58 --- include/asm-frv/thread_info.h | 144 -------- include/asm-frv/timer-regs.h | 106 ------ include/asm-frv/timex.h | 20 - include/asm-frv/tlb.h | 27 - include/asm-frv/tlbflush.h | 73 ---- include/asm-frv/topology.h | 12 - include/asm-frv/types.h | 40 -- include/asm-frv/uaccess.h | 321 ------------------ include/asm-frv/ucontext.h | 12 - include/asm-frv/unaligned.h | 22 - include/asm-frv/unistd.h | 382 --------------------- include/asm-frv/user.h | 80 ---- include/asm-frv/vga.h | 17 - include/asm-frv/virtconvert.h | 41 -- include/asm-frv/xor.h | 1 228 files changed, 8626 insertions(+), 8626 deletions(-) create mode 100644 arch/frv/include/asm/Kbuild create mode 100644 arch/frv/include/asm/atomic.h create mode 100644 arch/frv/include/asm/auxvec.h create mode 100644 arch/frv/include/asm/ax88796.h create mode 100644 arch/frv/include/asm/bitops.h create mode 100644 arch/frv/include/asm/bug.h create mode 100644 arch/frv/include/asm/bugs.h create mode 100644 arch/frv/include/asm/busctl-regs.h create mode 100644 arch/frv/include/asm/byteorder.h create mode 100644 arch/frv/include/asm/cache.h create mode 100644 arch/frv/include/asm/cacheflush.h create mode 100644 arch/frv/include/asm/checksum.h create mode 100644 arch/frv/include/asm/cpu-irqs.h create mode 100644 arch/frv/include/asm/cpumask.h create mode 100644 arch/frv/include/asm/cputime.h create mode 100644 arch/frv/include/asm/current.h create mode 100644 arch/frv/include/asm/delay.h create mode 100644 arch/frv/include/asm/device.h create mode 100644 arch/frv/include/asm/div64.h create mode 100644 arch/frv/include/asm/dm9000.h create mode 100644 arch/frv/include/asm/dma-mapping.h create mode 100644 arch/frv/include/asm/dma.h create mode 100644 arch/frv/include/asm/elf.h create mode 100644 arch/frv/include/asm/emergency-restart.h create mode 100644 arch/frv/include/asm/errno.h create mode 100644 arch/frv/include/asm/fb.h create mode 100644 arch/frv/include/asm/fcntl.h create mode 100644 arch/frv/include/asm/fpu.h create mode 100644 arch/frv/include/asm/ftrace.h create mode 100644 arch/frv/include/asm/futex.h create mode 100644 arch/frv/include/asm/gdb-stub.h create mode 100644 arch/frv/include/asm/gpio-regs.h create mode 100644 arch/frv/include/asm/hardirq.h create mode 100644 arch/frv/include/asm/highmem.h create mode 100644 arch/frv/include/asm/hw_irq.h create mode 100644 arch/frv/include/asm/init.h create mode 100644 arch/frv/include/asm/io.h create mode 100644 arch/frv/include/asm/ioctl.h create mode 100644 arch/frv/include/asm/ioctls.h create mode 100644 arch/frv/include/asm/ipcbuf.h create mode 100644 arch/frv/include/asm/irc-regs.h create mode 100644 arch/frv/include/asm/irq.h create mode 100644 arch/frv/include/asm/irq_regs.h create mode 100644 arch/frv/include/asm/kdebug.h create mode 100644 arch/frv/include/asm/kmap_types.h create mode 100644 arch/frv/include/asm/linkage.h create mode 100644 arch/frv/include/asm/local.h create mode 100644 arch/frv/include/asm/math-emu.h create mode 100644 arch/frv/include/asm/mb-regs.h create mode 100644 arch/frv/include/asm/mb86943a.h create mode 100644 arch/frv/include/asm/mb93091-fpga-irqs.h create mode 100644 arch/frv/include/asm/mb93093-fpga-irqs.h create mode 100644 arch/frv/include/asm/mb93493-irqs.h create mode 100644 arch/frv/include/asm/mb93493-regs.h create mode 100644 arch/frv/include/asm/mc146818rtc.h create mode 100644 arch/frv/include/asm/mem-layout.h create mode 100644 arch/frv/include/asm/mman.h create mode 100644 arch/frv/include/asm/mmu.h create mode 100644 arch/frv/include/asm/mmu_context.h create mode 100644 arch/frv/include/asm/module.h create mode 100644 arch/frv/include/asm/msgbuf.h create mode 100644 arch/frv/include/asm/mutex.h create mode 100644 arch/frv/include/asm/page.h create mode 100644 arch/frv/include/asm/param.h create mode 100644 arch/frv/include/asm/pci.h create mode 100644 arch/frv/include/asm/percpu.h create mode 100644 arch/frv/include/asm/pgalloc.h create mode 100644 arch/frv/include/asm/pgtable.h create mode 100644 arch/frv/include/asm/poll.h create mode 100644 arch/frv/include/asm/posix_types.h create mode 100644 arch/frv/include/asm/processor.h create mode 100644 arch/frv/include/asm/ptrace.h create mode 100644 arch/frv/include/asm/registers.h create mode 100644 arch/frv/include/asm/resource.h create mode 100644 arch/frv/include/asm/scatterlist.h create mode 100644 arch/frv/include/asm/sections.h create mode 100644 arch/frv/include/asm/segment.h create mode 100644 arch/frv/include/asm/sembuf.h create mode 100644 arch/frv/include/asm/serial-regs.h create mode 100644 arch/frv/include/asm/serial.h create mode 100644 arch/frv/include/asm/setup.h create mode 100644 arch/frv/include/asm/shmbuf.h create mode 100644 arch/frv/include/asm/shmparam.h create mode 100644 arch/frv/include/asm/sigcontext.h create mode 100644 arch/frv/include/asm/siginfo.h create mode 100644 arch/frv/include/asm/signal.h create mode 100644 arch/frv/include/asm/smp.h create mode 100644 arch/frv/include/asm/socket.h create mode 100644 arch/frv/include/asm/sockios.h create mode 100644 arch/frv/include/asm/spinlock.h create mode 100644 arch/frv/include/asm/spr-regs.h create mode 100644 arch/frv/include/asm/stat.h create mode 100644 arch/frv/include/asm/statfs.h create mode 100644 arch/frv/include/asm/string.h create mode 100644 arch/frv/include/asm/suspend.h create mode 100644 arch/frv/include/asm/swab.h create mode 100644 arch/frv/include/asm/system.h create mode 100644 arch/frv/include/asm/termbits.h create mode 100644 arch/frv/include/asm/termios.h create mode 100644 arch/frv/include/asm/thread_info.h create mode 100644 arch/frv/include/asm/timer-regs.h create mode 100644 arch/frv/include/asm/timex.h create mode 100644 arch/frv/include/asm/tlb.h create mode 100644 arch/frv/include/asm/tlbflush.h create mode 100644 arch/frv/include/asm/topology.h create mode 100644 arch/frv/include/asm/types.h create mode 100644 arch/frv/include/asm/uaccess.h create mode 100644 arch/frv/include/asm/ucontext.h create mode 100644 arch/frv/include/asm/unaligned.h create mode 100644 arch/frv/include/asm/unistd.h create mode 100644 arch/frv/include/asm/user.h create mode 100644 arch/frv/include/asm/vga.h create mode 100644 arch/frv/include/asm/virtconvert.h create mode 100644 arch/frv/include/asm/xor.h delete mode 100644 include/asm-frv/Kbuild delete mode 100644 include/asm-frv/atomic.h delete mode 100644 include/asm-frv/auxvec.h delete mode 100644 include/asm-frv/ax88796.h delete mode 100644 include/asm-frv/bitops.h delete mode 100644 include/asm-frv/bug.h delete mode 100644 include/asm-frv/bugs.h delete mode 100644 include/asm-frv/busctl-regs.h delete mode 100644 include/asm-frv/byteorder.h delete mode 100644 include/asm-frv/cache.h delete mode 100644 include/asm-frv/cacheflush.h delete mode 100644 include/asm-frv/checksum.h delete mode 100644 include/asm-frv/cpu-irqs.h delete mode 100644 include/asm-frv/cpumask.h delete mode 100644 include/asm-frv/cputime.h delete mode 100644 include/asm-frv/current.h delete mode 100644 include/asm-frv/delay.h delete mode 100644 include/asm-frv/device.h delete mode 100644 include/asm-frv/div64.h delete mode 100644 include/asm-frv/dm9000.h delete mode 100644 include/asm-frv/dma-mapping.h delete mode 100644 include/asm-frv/dma.h delete mode 100644 include/asm-frv/elf.h delete mode 100644 include/asm-frv/emergency-restart.h delete mode 100644 include/asm-frv/errno.h delete mode 100644 include/asm-frv/fb.h delete mode 100644 include/asm-frv/fcntl.h delete mode 100644 include/asm-frv/fpu.h delete mode 100644 include/asm-frv/ftrace.h delete mode 100644 include/asm-frv/futex.h delete mode 100644 include/asm-frv/gdb-stub.h delete mode 100644 include/asm-frv/gpio-regs.h delete mode 100644 include/asm-frv/hardirq.h delete mode 100644 include/asm-frv/highmem.h delete mode 100644 include/asm-frv/hw_irq.h delete mode 100644 include/asm-frv/init.h delete mode 100644 include/asm-frv/io.h delete mode 100644 include/asm-frv/ioctl.h delete mode 100644 include/asm-frv/ioctls.h delete mode 100644 include/asm-frv/ipcbuf.h delete mode 100644 include/asm-frv/irc-regs.h delete mode 100644 include/asm-frv/irq.h delete mode 100644 include/asm-frv/irq_regs.h delete mode 100644 include/asm-frv/kdebug.h delete mode 100644 include/asm-frv/kmap_types.h delete mode 100644 include/asm-frv/linkage.h delete mode 100644 include/asm-frv/local.h delete mode 100644 include/asm-frv/math-emu.h delete mode 100644 include/asm-frv/mb-regs.h delete mode 100644 include/asm-frv/mb86943a.h delete mode 100644 include/asm-frv/mb93091-fpga-irqs.h delete mode 100644 include/asm-frv/mb93093-fpga-irqs.h delete mode 100644 include/asm-frv/mb93493-irqs.h delete mode 100644 include/asm-frv/mb93493-regs.h delete mode 100644 include/asm-frv/mc146818rtc.h delete mode 100644 include/asm-frv/mem-layout.h delete mode 100644 include/asm-frv/mman.h delete mode 100644 include/asm-frv/mmu.h delete mode 100644 include/asm-frv/mmu_context.h delete mode 100644 include/asm-frv/module.h delete mode 100644 include/asm-frv/msgbuf.h delete mode 100644 include/asm-frv/mutex.h delete mode 100644 include/asm-frv/page.h delete mode 100644 include/asm-frv/param.h delete mode 100644 include/asm-frv/pci.h delete mode 100644 include/asm-frv/percpu.h delete mode 100644 include/asm-frv/pgalloc.h delete mode 100644 include/asm-frv/pgtable.h delete mode 100644 include/asm-frv/poll.h delete mode 100644 include/asm-frv/posix_types.h delete mode 100644 include/asm-frv/processor.h delete mode 100644 include/asm-frv/ptrace.h delete mode 100644 include/asm-frv/registers.h delete mode 100644 include/asm-frv/resource.h delete mode 100644 include/asm-frv/scatterlist.h delete mode 100644 include/asm-frv/sections.h delete mode 100644 include/asm-frv/segment.h delete mode 100644 include/asm-frv/sembuf.h delete mode 100644 include/asm-frv/serial-regs.h delete mode 100644 include/asm-frv/serial.h delete mode 100644 include/asm-frv/setup.h delete mode 100644 include/asm-frv/shmbuf.h delete mode 100644 include/asm-frv/shmparam.h delete mode 100644 include/asm-frv/sigcontext.h delete mode 100644 include/asm-frv/siginfo.h delete mode 100644 include/asm-frv/signal.h delete mode 100644 include/asm-frv/smp.h delete mode 100644 include/asm-frv/socket.h delete mode 100644 include/asm-frv/sockios.h delete mode 100644 include/asm-frv/spinlock.h delete mode 100644 include/asm-frv/spr-regs.h delete mode 100644 include/asm-frv/stat.h delete mode 100644 include/asm-frv/statfs.h delete mode 100644 include/asm-frv/string.h delete mode 100644 include/asm-frv/suspend.h delete mode 100644 include/asm-frv/swab.h delete mode 100644 include/asm-frv/system.h delete mode 100644 include/asm-frv/termbits.h delete mode 100644 include/asm-frv/termios.h delete mode 100644 include/asm-frv/thread_info.h delete mode 100644 include/asm-frv/timer-regs.h delete mode 100644 include/asm-frv/timex.h delete mode 100644 include/asm-frv/tlb.h delete mode 100644 include/asm-frv/tlbflush.h delete mode 100644 include/asm-frv/topology.h delete mode 100644 include/asm-frv/types.h delete mode 100644 include/asm-frv/uaccess.h delete mode 100644 include/asm-frv/ucontext.h delete mode 100644 include/asm-frv/unaligned.h delete mode 100644 include/asm-frv/unistd.h delete mode 100644 include/asm-frv/user.h delete mode 100644 include/asm-frv/vga.h delete mode 100644 include/asm-frv/virtconvert.h delete mode 100644 include/asm-frv/xor.h
arch/frv/include/asm/Kbuild new file +5 -0
@@ -0,0 +1,5 @@ +include include/asm-generic/Kbuild.asm + +header-y += registers.h + +unifdef-y += termios.h
arch/frv/include/asm/atomic.h new file +198 -0
198 lines not on this page · raw message
arch/frv/include/asm/auxvec.h new file +4 -0
@@ -0,0 +1,4 @@ +#ifndef __FRV_AUXVEC_H +#define __FRV_AUXVEC_H + +#endif
arch/frv/include/asm/ax88796.h new file +22 -0
@@ -0,0 +1,22 @@ +/* ax88796.h: access points to the driver for the AX88796 NE2000 clone +* +* Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. +* Written by David Howells ([email protected]) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +*/ + +#ifndef _ASM_AX88796_H +#define _ASM_AX88796_H + +#include <asm/mb-regs.h> + +#define AX88796_IOADDR (__region_CS1 + 0x200) +#define AX88796_IRQ IRQ_CPU_EXTERNAL7 +#define AX88796_FULL_DUPLEX 0/* force full duplex */ +#define AX88796_BUS_INFO "CS1#+0x200"/* bus info for ethtool */ + +#endif /* _ASM_AX88796_H */
arch/frv/include/asm/bitops.h new file +412 -0
412 lines not on this page · raw message
arch/frv/include/asm/bug.h new file +53 -0
53 lines not on this page · raw message
arch/frv/include/asm/bugs.h new file +14 -0
@@ -0,0 +1,14 @@ +/* bugs.h: arch bug checking entry +* +* Copyright (C) 2003 Red Hat, Inc. All Rights Reserved. +* Written by David Howells ([email protected]) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +*/ + +static inline void check_bugs (void ) +{ +}
arch/frv/include/asm/busctl-regs.h new file +41 -0
41 lines not on this page · raw message
arch/frv/include/asm/byteorder.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _ASM_BYTEORDER_H +#define _ASM_BYTEORDER_H + +#include <linux/byteorder/big_endian.h> + +#endif /* _ASM_BYTEORDER_H */
arch/frv/include/asm/cache.h new file +23 -0
@@ -0,0 +1,23 @@ +/* cache.h: FRV cache definitions +* +* Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. +* Written by David Howells ([email protected]) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +*/ + +#ifndef __ASM_CACHE_H +#define __ASM_CACHE_H + + +/* bytes per L1 cache line */ +#define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT) +#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) + +#define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES))) +#define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES))) + +#endif
arch/frv/include/asm/cacheflush.h new file +104 -0
104 lines not on this page · raw message
arch/frv/include/asm/checksum.h new file +180 -0
180 lines not on this page · raw message
arch/frv/include/asm/cpu-irqs.h new file +81 -0
81 lines not on this page · raw message
arch/frv/include/asm/cpumask.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _ASM_CPUMASK_H +#define _ASM_CPUMASK_H + +#include <asm-generic/cpumask.h> + +#endif /* _ASM_CPUMASK_H */
arch/frv/include/asm/cputime.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _ASM_CPUTIME_H +#define _ASM_CPUTIME_H + +#include <asm-generic/cputime.h> + +#endif /* _ASM_CPUTIME_H */
arch/frv/include/asm/current.h new file +30 -0
@@ -0,0 +1,30 @@ +/* current.h: FRV current task pointer +* +* Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. +* Written by David Howells ([email protected]) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +*/ + +#ifndef _ASM_CURRENT_H +#define _ASM_CURRENT_H + +#ifndef __ASSEMBLY__ + +/* +* dedicate GR29 to keeping the current task pointer +*/ +registerstruct task_struct *current asm("gr29" ); + +#define get_current () current + +#else + +#define CURRENT gr29 + +#endif + +#endif /* _ASM_CURRENT_H */
arch/frv/include/asm/delay.h new file +50 -0
50 lines not on this page · raw message
arch/frv/include/asm/device.h new file +7 -0
@@ -0,0 +1,7 @@ +/* +* Arch specific extensions to struct device +* +* This file is released under the GPLv2 +*/ +#include <asm-generic/device.h> +
arch/frv/include/asm/div64.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/div64.h>
arch/frv/include/asm/dm9000.h new file +37 -0
@@ -0,0 +1,37 @@ +/* dm9000.h: Davicom DM9000 adapter configuration +* +* Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. +* Written by David Howells ([email protected]) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +*/ + +#ifndef _ASM_DM9000_H +#define _ASM_DM9000_H + +#include <asm/mb-regs.h> + +#define DM9000_ARCH_IOBASE (__region_CS6 + 0x300) +#define DM9000_ARCH_IRQ IRQ_CPU_EXTERNAL3/* XIRQ #3 (shared with FPGA) */ +#undef DM9000_ARCH_IRQ_ACTLOW/* IRQ pin active high */ +#define DM9000_ARCH_BUS_INFO "CS6#+0x300"/* bus info for ethtool */ + +#undef __is_PCI_IO +#define __is_PCI_IO (addr) 0/* not PCI */ + +#undef inl +#define inl (addr) \ +({ \ + unsigned long __ioaddr = (unsigned long) addr; \ + uint32_t x = readl(__ioaddr); \ + ((x & 0xff) << 24) | ((x & 0xff00) << 8) | ((x >> 8) & 0xff00) | ((x >> 24) & 0xff); \ +}) + +#undef insl +#define insl (a,b,l) __insl(a,b,l,0)/* don't byte-swap */ + + +#endif /* _ASM_DM9000_H */
arch/frv/include/asm/dma-mapping.h new file +174 -0
174 lines not on this page · raw message
arch/frv/include/asm/dma.h new file +125 -0
125 lines not on this page · raw message
arch/frv/include/asm/elf.h new file +142 -0
142 lines not on this page · raw message
arch/frv/include/asm/emergency-restart.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _ASM_EMERGENCY_RESTART_H +#define _ASM_EMERGENCY_RESTART_H + +#include <asm-generic/emergency-restart.h> + +#endif /* _ASM_EMERGENCY_RESTART_H */
arch/frv/include/asm/errno.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifndef _ASM_ERRNO_H +#define _ASM_ERRNO_H + +#include <asm-generic/errno.h> + +#endif /* _ASM_ERRNO_H */ +
arch/frv/include/asm/fb.h new file +12 -0
@@ -0,0 +1,12 @@ +#ifndef _ASM_FB_H_ +#define _ASM_FB_H_ +#include <linux/fb.h> + +#define fb_pgprotect (...) do {} while (0) + +static inline int fb_is_primary_device (struct fb_info *info) +{ +return 0 ; +} + +#endif /* _ASM_FB_H_ */
arch/frv/include/asm/fcntl.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/fcntl.h>
arch/frv/include/asm/fpu.h new file +11 -0
@@ -0,0 +1,11 @@ +#ifndef __ASM_FPU_H +#define __ASM_FPU_H + + +/* +* MAX floating point unit state size (FSAVE/FRESTORE) +*/ + +#define kernel_fpu_end () do { asm volatile("bar":::"memory"); preempt_enable(); } while(0) + +#endif /* __ASM_FPU_H */
arch/frv/include/asm/ftrace.h new file +1 -0
@@ -0,0 +1 @@ +/* empty */
arch/frv/include/asm/futex.h new file +19 -0
@@ -0,0 +1,19 @@ +#ifndef _ASM_FUTEX_H +#define _ASM_FUTEX_H + +#ifdef __KERNEL__ + +#include <linux/futex.h> +#include <asm/errno.h> +#include <asm/uaccess.h> + +extern int futex_atomic_op_inuser (int encoded_op,int __user *uaddr); + +static inline int +futex_atomic_cmpxchg_inatomic (int __user *uaddr,int oldval,int newval) +{ +return -ENOSYS ; +} + +#endif +#endif
arch/frv/include/asm/gdb-stub.h new file +140 -0
140 lines not on this page · raw message
arch/frv/include/asm/gpio-regs.h new file +116 -0
116 lines not on this page · raw message
arch/frv/include/asm/hardirq.h new file +35 -0
@@ -0,0 +1,35 @@ +/* hardirq.h: FRV hardware IRQ management +* +* Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. +* Written by David Howells ([email protected]) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +*/ + +#ifndef __ASM_HARDIRQ_H +#define __ASM_HARDIRQ_H + +#include <linux/threads.h> +#include <linux/irq.h> + +typedef struct { +unsigned int __softirq_pending; +unsigned long idle_timestamp; +}____cacheline_aligned irq_cpustat_t ; + +#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ + +#ifdef CONFIG_SMP +#error SMP not available on FR-V +#endif /* CONFIG_SMP */ + +extern atomic_t irq_err_count; +static inline void ack_bad_irq (int irq) +{ +atomic_inc (&irq_err_count); +} + +#endif
arch/frv/include/asm/highmem.h new file +182 -0
182 lines not on this page · raw message
arch/frv/include/asm/hw_irq.h new file +16 -0
@@ -0,0 +1,16 @@ +/* hw_irq.h: FR-V specific h/w IRQ stuff +* +* Copyright (C) 2003 Red Hat, Inc. All Rights Reserved. +* Written by David Howells ([email protected]) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +*/ + +#ifndef _ASM_HW_IRQ_H +#define _ASM_HW_IRQ_H + + +#endif /* _ASM_HW_IRQ_H */
arch/frv/include/asm/init.h new file +12 -0
@@ -0,0 +1,12 @@ +#ifndef _ASM_INIT_H +#define _ASM_INIT_H + +#define __init __attribute__ ((__section__ (".text.init"))) +#define __initdata __attribute__ ((__section__ (".data.init"))) +/* For assembly routines */ +#define __INIT .section ".text.init",#alloc,#execinstr +#define __FINIT .previous +#define __INITDATA .section ".data.init",#alloc,#write + +#endif +
arch/frv/include/asm/io.h new file +392 -0
392 lines not on this page · raw message
arch/frv/include/asm/ioctl.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/ioctl.h>
arch/frv/include/asm/ioctls.h new file +86 -0
86 lines not on this page · raw message
arch/frv/include/asm/ipcbuf.h new file +30 -0
@@ -0,0 +1,30 @@ +#ifndef __ASM_IPCBUF_H__ +#define __ASM_IPCBUF_H__ + +/* +* The user_ipc_perm structure for FR-V architecture. +* Note extra padding because this structure is passed back and forth +* between kernel and user space. +* +* Pad space is left for: +* - 32-bit mode_t and seq +* - 2 miscellaneous 32-bit values +*/ + +struct ipc64_perm +{ +__kernel_key_t key; +__kernel_uid32_t uid; +__kernel_gid32_t gid; +__kernel_uid32_t cuid; +__kernel_gid32_t cgid; +__kernel_mode_t mode; +unsigned short __pad1; +unsigned short seq; +unsigned short __pad2; +unsigned long __unused1; +unsigned long __unused2; +}; + +#endif /* __ASM_IPCBUF_H__ */ +
arch/frv/include/asm/irc-regs.h new file +53 -0
53 lines not on this page · raw message
arch/frv/include/asm/irq.h new file +30 -0
@@ -0,0 +1,30 @@ +/* irq.h: FRV IRQ definitions +* +* Copyright (C) 2006 Red Hat, Inc. All Rights Reserved. +* Written by David Howells ([email protected]) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +*/ + +#ifndef _ASM_IRQ_H_ +#define _ASM_IRQ_H_ + +#define NR_IRQS 48 +#define IRQ_BASE_CPU (0 * 16) +#define IRQ_BASE_FPGA (1 * 16) +#define IRQ_BASE_MB93493 (2 * 16) + +/* probe returns a 32-bit IRQ mask:-/ */ +#define MIN_PROBE_IRQ (NR_IRQS - 32) + +#ifndef __ASSEMBLY__ +static inline int irq_canonicalize (int irq) +{ +return irq; +} +#endif + +#endif /* _ASM_IRQ_H_ */
arch/frv/include/asm/irq_regs.h new file +27 -0
@@ -0,0 +1,27 @@ +/* FRV per-CPU frame pointer holder +* +* Copyright (C) 2006 Red Hat, Inc. All Rights Reserved. +* Written by David Howells ([email protected]) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +*/ + +#ifndef _ASM_IRQ_REGS_H +#define _ASM_IRQ_REGS_H + +/* +* Per-cpu current frame pointer - the location of the last exception frame on +* the stack +* - on FRV, GR28 is dedicated to keeping a pointer to the current exception +* frame +*/ +#define ARCH_HAS_OWN_IRQ_REGS + +#ifndef __ASSEMBLY__ +#define get_irq_regs () (__frame) +#endif + +#endif /* _ASM_IRQ_REGS_H */
arch/frv/include/asm/kdebug.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/kdebug.h>
arch/frv/include/asm/kmap_types.h new file +29 -0
@@ -0,0 +1,29 @@ + +#ifndef _ASM_KMAP_TYPES_H +#define _ASM_KMAP_TYPES_H + +enum km_type { +/* arch specific kmaps - change the numbers attached to these at your peril */ + __KM_CACHE,/* cache flush page attachment point */ + __KM_PGD,/* current page directory */ + __KM_ITLB_PTD,/* current instruction TLB miss page table lookup */ + __KM_DTLB_PTD,/* current data TLB miss page table lookup */ + +/* general kmaps */ +KM_BOUNCE_READ , +KM_SKB_SUNRPC_DATA , +KM_SKB_DATA_SOFTIRQ , +KM_USER0 , +KM_USER1 , +KM_BIO_SRC_IRQ , +KM_BIO_DST_IRQ , +KM_PTE0 , +KM_PTE1 , +KM_IRQ0 , +KM_IRQ1 , +KM_SOFTIRQ0 , +KM_SOFTIRQ1 , +KM_TYPE_NR +}; + +#endif
arch/frv/include/asm/linkage.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifndef __ASM_LINKAGE_H +#define __ASM_LINKAGE_H + +#define __ALIGN .align 4 +#define __ALIGN_STR ".align 4" + +#endif
arch/frv/include/asm/local.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _ASM_LOCAL_H +#define _ASM_LOCAL_H + +#include <asm-generic/local.h> + +#endif /* _ASM_LOCAL_H */
arch/frv/include/asm/math-emu.h new file +301 -0
59 lines not on this page · raw message
arch/frv/include/asm/mb-regs.h new file +200 -0
200 lines not on this page · raw message
arch/frv/include/asm/mb86943a.h new file +42 -0
42 lines not on this page · raw message
arch/frv/include/asm/mb93091-fpga-irqs.h new file +42 -0
42 lines not on this page · raw message
arch/frv/include/asm/mb93093-fpga-irqs.h new file +29 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/mb93493-irqs.h new file +50 -0
50 lines not on this page · raw message
arch/frv/include/asm/mb93493-regs.h new file +281 -0
281 lines not on this page · raw message
arch/frv/include/asm/mc146818rtc.h new file +16 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/mem-layout.h new file +86 -0
86 lines not on this page · raw message
arch/frv/include/asm/mmu.h new file +41 -0
41 lines not on this page · raw message
arch/frv/include/asm/mmu_context.h new file +50 -0
50 lines not on this page · raw message
arch/frv/include/asm/module.h new file +28 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/msgbuf.h new file +32 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/page.h new file +78 -0
78 lines not on this page · raw message
arch/frv/include/asm/pci.h new file +118 -0
118 lines not on this page · raw message
arch/frv/include/asm/pgalloc.h new file +69 -0
69 lines not on this page · raw message
arch/frv/include/asm/pgtable.h new file +549 -0
549 lines not on this page · raw message
arch/frv/include/asm/posix_types.h new file +62 -0
62 lines not on this page · raw message
arch/frv/include/asm/processor.h new file +153 -0
153 lines not on this page · raw message
arch/frv/include/asm/ptrace.h new file +83 -0
83 lines not on this page · raw message
arch/frv/include/asm/registers.h new file +232 -0
232 lines not on this page · raw message
arch/frv/include/asm/resource.h new file +7 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/scatterlist.h new file +46 -0
46 lines not on this page · raw message
arch/frv/include/asm/sections.h new file +46 -0
46 lines not on this page · raw message
arch/frv/include/asm/segment.h new file +45 -0
45 lines not on this page · raw message
arch/frv/include/asm/sembuf.h new file +26 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/serial-regs.h new file +44 -0
44 lines not on this page · raw message
arch/frv/include/asm/serial.h new file +18 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/shmbuf.h new file +43 -0
43 lines not on this page · raw message
arch/frv/include/asm/shmparam.h new file +7 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/sigcontext.h new file +26 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/siginfo.h new file +12 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/signal.h new file +161 -0
161 lines not on this page · raw message
arch/frv/include/asm/socket.h new file +61 -0
61 lines not on this page · raw message
arch/frv/include/asm/sockios.h new file +14 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/spinlock.h new file +17 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/spr-regs.h new file +416 -0
416 lines not on this page · raw message
arch/frv/include/asm/stat.h new file +100 -0
100 lines not on this page · raw message
arch/frv/include/asm/string.h new file +51 -0
51 lines not on this page · raw message
arch/frv/include/asm/suspend.h new file +20 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/system.h new file +301 -0
301 lines not on this page · raw message
arch/frv/include/asm/termbits.h new file +202 -0
202 lines not on this page · raw message
arch/frv/include/asm/termios.h new file +58 -0
58 lines not on this page · raw message
arch/frv/include/asm/thread_info.h new file +144 -0
144 lines not on this page · raw message
arch/frv/include/asm/timer-regs.h new file +106 -0
106 lines not on this page · raw message
arch/frv/include/asm/tlbflush.h new file +73 -0
73 lines not on this page · raw message
arch/frv/include/asm/topology.h new file +12 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/uaccess.h new file +321 -0
321 lines not on this page · raw message
arch/frv/include/asm/ucontext.h new file +12 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/unaligned.h new file +22 -0
Lines of this file are not shown. View the raw message.
arch/frv/include/asm/unistd.h new file +382 -0
382 lines not on this page · raw message
arch/frv/include/asm/user.h new file +80 -0
80 lines not on this page · raw message
arch/frv/include/asm/virtconvert.h new file +41 -0
41 lines not on this page · raw message
include/asm-frv/atomic.h deleted +0 -198
198 lines not on this page · raw message
include/asm-frv/bitops.h deleted +0 -412
412 lines not on this page · raw message
include/asm-frv/bug.h deleted +0 -53
53 lines not on this page · raw message
include/asm-frv/busctl-regs.h deleted +0 -41
41 lines not on this page · raw message
include/asm-frv/cacheflush.h deleted +0 -104
104 lines not on this page · raw message
include/asm-frv/checksum.h deleted +0 -180
180 lines not on this page · raw message
include/asm-frv/cpu-irqs.h deleted +0 -81
81 lines not on this page · raw message
include/asm-frv/delay.h deleted +0 -50
50 lines not on this page · raw message
include/asm-frv/dma-mapping.h deleted +0 -174
174 lines not on this page · raw message
include/asm-frv/dma.h deleted +0 -125
125 lines not on this page · raw message
include/asm-frv/elf.h deleted +0 -142
142 lines not on this page · raw message
include/asm-frv/emergency-restart.h deleted +0 -6
Lines of this file are not shown. View the raw message.
include/asm-frv/gdb-stub.h deleted +0 -140
140 lines not on this page · raw message
include/asm-frv/gpio-regs.h deleted +0 -116
116 lines not on this page · raw message
include/asm-frv/highmem.h deleted +0 -182
182 lines not on this page · raw message
include/asm-frv/io.h deleted +0 -392
392 lines not on this page · raw message
include/asm-frv/ioctls.h deleted +0 -86
86 lines not on this page · raw message
include/asm-frv/irc-regs.h deleted +0 -53
53 lines not on this page · raw message
include/asm-frv/math-emu.h deleted +0 -301
301 lines not on this page · raw message
include/asm-frv/mb-regs.h deleted +0 -200
200 lines not on this page · raw message
include/asm-frv/mb86943a.h deleted +0 -42
42 lines not on this page · raw message
include/asm-frv/mb93091-fpga-irqs.h deleted +0 -42
42 lines not on this page · raw message
include/asm-frv/mb93093-fpga-irqs.h deleted +0 -29
Lines of this file are not shown. View the raw message.
include/asm-frv/mb93493-irqs.h deleted +0 -50
50 lines not on this page · raw message
include/asm-frv/mb93493-regs.h deleted +0 -281
281 lines not on this page · raw message
include/asm-frv/mem-layout.h deleted +0 -86
86 lines not on this page · raw message
include/asm-frv/mmu.h deleted +0 -41
41 lines not on this page · raw message
include/asm-frv/mmu_context.h deleted +0 -50
50 lines not on this page · raw message
include/asm-frv/page.h deleted +0 -78
78 lines not on this page · raw message
include/asm-frv/pci.h deleted +0 -118
118 lines not on this page · raw message
include/asm-frv/pgalloc.h deleted +0 -69
69 lines not on this page · raw message
include/asm-frv/pgtable.h deleted +0 -549
549 lines not on this page · raw message
include/asm-frv/posix_types.h deleted +0 -62
62 lines not on this page · raw message
include/asm-frv/processor.h deleted +0 -153
153 lines not on this page · raw message
include/asm-frv/ptrace.h deleted +0 -83
83 lines not on this page · raw message
include/asm-frv/registers.h deleted +0 -232
232 lines not on this page · raw message
include/asm-frv/scatterlist.h deleted +0 -46
46 lines not on this page · raw message
include/asm-frv/sections.h deleted +0 -46
46 lines not on this page · raw message
include/asm-frv/segment.h deleted +0 -45
45 lines not on this page · raw message
include/asm-frv/serial-regs.h deleted +0 -44
44 lines not on this page · raw message
include/asm-frv/shmbuf.h deleted +0 -43
43 lines not on this page · raw message
include/asm-frv/signal.h deleted +0 -161
161 lines not on this page · raw message
include/asm-frv/socket.h deleted +0 -61
61 lines not on this page · raw message
include/asm-frv/spr-regs.h deleted +0 -416
416 lines not on this page · raw message
include/asm-frv/stat.h deleted +0 -100
100 lines not on this page · raw message
include/asm-frv/string.h deleted +0 -51
51 lines not on this page · raw message
include/asm-frv/system.h deleted +0 -301
301 lines not on this page · raw message
include/asm-frv/termbits.h deleted +0 -202
202 lines not on this page · raw message
include/asm-frv/termios.h deleted +0 -58
58 lines not on this page · raw message
include/asm-frv/thread_info.h deleted +0 -144
144 lines not on this page · raw message
include/asm-frv/timer-regs.h deleted +0 -106
106 lines not on this page · raw message
include/asm-frv/tlbflush.h deleted +0 -73
73 lines not on this page · raw message
include/asm-frv/uaccess.h deleted +0 -321
321 lines not on this page · raw message
include/asm-frv/unistd.h deleted +0 -382
382 lines not on this page · raw message
include/asm-frv/user.h deleted +0 -80
80 lines not on this page · raw message
include/asm-frv/virtconvert.h deleted +0 -41
41 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Re: [PATCH 2/2] FRV: Move to arch/frv/include/asm/
Quoted 4 lines · David Howells
Move arch headers from
include/asm-frv/toarch/frv/include/asm/.Signed-off-by David Howells <[email protected]>
I'm not going to apply this one either. This one at least has the deletes, but Christ, look at that patch!
Please use "-M" when creating diffs for sending to me, so that the diffs are rename diffs, and so that you can _see_ that they are renames. No, it's not the git default, but that's because there are still too many crap SCM's out there, and too many people using "patch".
When the revolution comes, and the people who haven't converted to git get sent to the gulags, we'll make "-M" the default. In the meantime, please use it when sending patches for review and for me to apply. Otherwise you end up with a patch from hell, wastign everybodys bandwidth and sanity.
Here's what your patch _should_ have looked like. Notice how this patch is just 500+ lines and 26k, as opposed to nineteen _thousand_ lines and over half a megabyte? But more importantly, notice how now everybody can see from just your email that it really is just pure renames - you can actually _see_ what you're doing.
(And yes, I can apply your broken patch, and I can verify that it's a rename-only thing - it's how I generated the replacement patch, of course. But I want to teach people to look at their own patches before they send them, and ask themselves "Is this something Linus wants to see? Could I do it better? Does it match what I expected?")
Linus
---
From: David Howells <[email protected]>
Date: Thu Apr 9 17:33:00 2009 +0100
Subject: FRV: Move to arch/frv/include/asm/
Move arch headers from include/asm-frv/ to arch/frv/include/asm/.
---
{include/asm-frv => arch/frv/include/asm}/Kbuild | 0
{include/asm-frv => arch/frv/include/asm}/atomic.h | 0
{include/asm-frv => arch/frv/include/asm}/auxvec.h | 0
.../asm-frv => arch/frv/include/asm}/ax88796.h | 0
{include/asm-frv => arch/frv/include/asm}/bitops.h | 0
{include/asm-frv => arch/frv/include/asm}/bug.h | 0
{include/asm-frv => arch/frv/include/asm}/bugs.h | 0
.../asm-frv => arch/frv/include/asm}/busctl-regs.h | 0
.../asm-frv => arch/frv/include/asm}/byteorder.h | 0
{include/asm-frv => arch/frv/include/asm}/cache.h | 0
.../asm-frv => arch/frv/include/asm}/cacheflush.h | 0
.../asm-frv => arch/frv/include/asm}/checksum.h | 0
.../asm-frv => arch/frv/include/asm}/cpu-irqs.h | 0
.../asm-frv => arch/frv/include/asm}/cpumask.h | 0
.../asm-frv => arch/frv/include/asm}/cputime.h | 0
.../asm-frv => arch/frv/include/asm}/current.h | 0
{include/asm-frv => arch/frv/include/asm}/delay.h | 0
{include/asm-frv => arch/frv/include/asm}/device.h | 0
{include/asm-frv => arch/frv/include/asm}/div64.h | 0
{include/asm-frv => arch/frv/include/asm}/dm9000.h | 0
.../asm-frv => arch/frv/include/asm}/dma-mapping.h | 0
{include/asm-frv => arch/frv/include/asm}/dma.h | 0
{include/asm-frv => arch/frv/include/asm}/elf.h | 0
.../frv/include/asm}/emergency-restart.h | 0
{include/asm-frv => arch/frv/include/asm}/errno.h | 0
{include/asm-frv => arch/frv/include/asm}/fb.h | 0
{include/asm-frv => arch/frv/include/asm}/fcntl.h | 0
{include/asm-frv => arch/frv/include/asm}/fpu.h | 0
{include/asm-frv => arch/frv/include/asm}/ftrace.h | 0
{include/asm-frv => arch/frv/include/asm}/futex.h | 0
.../asm-frv => arch/frv/include/asm}/gdb-stub.h | 0
.../asm-frv => arch/frv/include/asm}/gpio-regs.h | 0
.../asm-frv => arch/frv/include/asm}/hardirq.h | 0
.../asm-frv => arch/frv/include/asm}/highmem.h | 0
{include/asm-frv => arch/frv/include/asm}/hw_irq.h | 0
{include/asm-frv => arch/frv/include/asm}/init.h | 0
{include/asm-frv => arch/frv/include/asm}/io.h | 0
{include/asm-frv => arch/frv/include/asm}/ioctl.h | 0
{include/asm-frv => arch/frv/include/asm}/ioctls.h | 0
{include/asm-frv => arch/frv/include/asm}/ipcbuf.h | 0
.../asm-frv => arch/frv/include/asm}/irc-regs.h | 0
{include/asm-frv => arch/frv/include/asm}/irq.h | 0
.../asm-frv => arch/frv/include/asm}/irq_regs.h | 0
{include/asm-frv => arch/frv/include/asm}/kdebug.h | 0
.../asm-frv => arch/frv/include/asm}/kmap_types.h | 0
.../asm-frv => arch/frv/include/asm}/linkage.h | 0
{include/asm-frv => arch/frv/include/asm}/local.h | 0
.../asm-frv => arch/frv/include/asm}/math-emu.h | 0
.../asm-frv => arch/frv/include/asm}/mb-regs.h | 0
.../asm-frv => arch/frv/include/asm}/mb86943a.h | 0
.../frv/include/asm}/mb93091-fpga-irqs.h | 0
.../frv/include/asm}/mb93093-fpga-irqs.h | 0
.../frv/include/asm}/mb93493-irqs.h | 0
.../frv/include/asm}/mb93493-regs.h | 0
.../asm-frv => arch/frv/include/asm}/mc146818rtc.h | 0
.../asm-frv => arch/frv/include/asm}/mem-layout.h | 0
{include/asm-frv => arch/frv/include/asm}/mman.h | 0
{include/asm-frv => arch/frv/include/asm}/mmu.h | 0
.../asm-frv => arch/frv/include/asm}/mmu_context.h | 0
{include/asm-frv => arch/frv/include/asm}/module.h | 0
{include/asm-frv => arch/frv/include/asm}/msgbuf.h | 0
{include/asm-frv => arch/frv/include/asm}/mutex.h | 0
{include/asm-frv => arch/frv/include/asm}/page.h | 0
{include/asm-frv => arch/frv/include/asm}/param.h | 0
{include/asm-frv => arch/frv/include/asm}/pci.h | 0
{include/asm-frv => arch/frv/include/asm}/percpu.h | 0
.../asm-frv => arch/frv/include/asm}/pgalloc.h | 0
.../asm-frv => arch/frv/include/asm}/pgtable.h | 0
{include/asm-frv => arch/frv/include/asm}/poll.h | 0
.../asm-frv => arch/frv/include/asm}/posix_types.h | 0
.../asm-frv => arch/frv/include/asm}/processor.h | 0
{include/asm-frv => arch/frv/include/asm}/ptrace.h | 0
.../asm-frv => arch/frv/include/asm}/registers.h | 0
.../asm-frv => arch/frv/include/asm}/resource.h | 0
.../asm-frv => arch/frv/include/asm}/scatterlist.h | 0
.../asm-frv => arch/frv/include/asm}/sections.h | 0
.../asm-frv => arch/frv/include/asm}/segment.h | 0
{include/asm-frv => arch/frv/include/asm}/sembuf.h | 0
.../asm-frv => arch/frv/include/asm}/serial-regs.h | 0
{include/asm-frv => arch/frv/include/asm}/serial.h | 0
{include/asm-frv => arch/frv/include/asm}/setup.h | 0
{include/asm-frv => arch/frv/include/asm}/shmbuf.h | 0
.../asm-frv => arch/frv/include/asm}/shmparam.h | 0
.../asm-frv => arch/frv/include/asm}/sigcontext.h | 0
.../asm-frv => arch/frv/include/asm}/siginfo.h | 0
{include/asm-frv => arch/frv/include/asm}/signal.h | 0
{include/asm-frv => arch/frv/include/asm}/smp.h | 0
{include/asm-frv => arch/frv/include/asm}/socket.h | 0
.../asm-frv => arch/frv/include/asm}/sockios.h | 0
.../asm-frv => arch/frv/include/asm}/spinlock.h | 0
.../asm-frv => arch/frv/include/asm}/spr-regs.h | 0
{include/asm-frv => arch/frv/include/asm}/stat.h | 0
{include/asm-frv => arch/frv/include/asm}/statfs.h | 0
{include/asm-frv => arch/frv/include/asm}/string.h | 0
.../asm-frv => arch/frv/include/asm}/suspend.h | 0
{include/asm-frv => arch/frv/include/asm}/swab.h | 0
{include/asm-frv => arch/frv/include/asm}/system.h | 0
.../asm-frv => arch/frv/include/asm}/termbits.h | 0
.../asm-frv => arch/frv/include/asm}/termios.h | 0
.../asm-frv => arch/frv/include/asm}/thread_info.h | 0
.../asm-frv => arch/frv/include/asm}/timer-regs.h | 0
{include/asm-frv => arch/frv/include/asm}/timex.h | 0
{include/asm-frv => arch/frv/include/asm}/tlb.h | 0
.../asm-frv => arch/frv/include/asm}/tlbflush.h | 0
.../asm-frv => arch/frv/include/asm}/topology.h | 0
{include/asm-frv => arch/frv/include/asm}/types.h | 0
.../asm-frv => arch/frv/include/asm}/uaccess.h | 0
.../asm-frv => arch/frv/include/asm}/ucontext.h | 0
.../asm-frv => arch/frv/include/asm}/unaligned.h | 0
{include/asm-frv => arch/frv/include/asm}/unistd.h | 0
{include/asm-frv => arch/frv/include/asm}/user.h | 0
{include/asm-frv => arch/frv/include/asm}/vga.h | 0
.../asm-frv => arch/frv/include/asm}/virtconvert.h | 0
{include/asm-frv => arch/frv/include/asm}/xor.h | 0
114 files changed, 0 insertions(+), 0 deletions(-)arch/frv/include/asm/Kbuild renamed from include/asm-frv/Kbuild +0 -0
arch/frv/include/asm/atomic.h renamed from include/asm-frv/atomic.h +0 -0
arch/frv/include/asm/auxvec.h renamed from include/asm-frv/auxvec.h +0 -0
arch/frv/include/asm/ax88796.h renamed from include/asm-frv/ax88796.h +0 -0
arch/frv/include/asm/bitops.h renamed from include/asm-frv/bitops.h +0 -0
arch/frv/include/asm/bug.h renamed from include/asm-frv/bug.h +0 -0
arch/frv/include/asm/bugs.h renamed from include/asm-frv/bugs.h +0 -0
arch/frv/include/asm/busctl-regs.h renamed from include/asm-frv/busctl-regs.h +0 -0
arch/frv/include/asm/byteorder.h renamed from include/asm-frv/byteorder.h +0 -0
arch/frv/include/asm/cache.h renamed from include/asm-frv/cache.h +0 -0
arch/frv/include/asm/cacheflush.h renamed from include/asm-frv/cacheflush.h +0 -0
arch/frv/include/asm/checksum.h renamed from include/asm-frv/checksum.h +0 -0
arch/frv/include/asm/cpu-irqs.h renamed from include/asm-frv/cpu-irqs.h +0 -0
arch/frv/include/asm/cpumask.h renamed from include/asm-frv/cpumask.h +0 -0
arch/frv/include/asm/cputime.h renamed from include/asm-frv/cputime.h +0 -0
arch/frv/include/asm/current.h renamed from include/asm-frv/current.h +0 -0
arch/frv/include/asm/delay.h renamed from include/asm-frv/delay.h +0 -0
arch/frv/include/asm/device.h renamed from include/asm-frv/device.h +0 -0
arch/frv/include/asm/div64.h renamed from include/asm-frv/div64.h +0 -0
arch/frv/include/asm/dm9000.h renamed from include/asm-frv/dm9000.h +0 -0
arch/frv/include/asm/dma-mapping.h renamed from include/asm-frv/dma-mapping.h +0 -0
arch/frv/include/asm/dma.h renamed from include/asm-frv/dma.h +0 -0
arch/frv/include/asm/elf.h renamed from include/asm-frv/elf.h +0 -0
arch/frv/include/asm/emergency-restart.h renamed from include/asm-frv/emergency-restart.h +0 -0
arch/frv/include/asm/errno.h renamed from include/asm-frv/errno.h +0 -0
arch/frv/include/asm/fb.h renamed from include/asm-frv/fb.h +0 -0
arch/frv/include/asm/fcntl.h renamed from include/asm-frv/fcntl.h +0 -0
arch/frv/include/asm/fpu.h renamed from include/asm-frv/fpu.h +0 -0
arch/frv/include/asm/ftrace.h renamed from include/asm-frv/ftrace.h +0 -0
arch/frv/include/asm/futex.h renamed from include/asm-frv/futex.h +0 -0
arch/frv/include/asm/gdb-stub.h renamed from include/asm-frv/gdb-stub.h +0 -0
arch/frv/include/asm/gpio-regs.h renamed from include/asm-frv/gpio-regs.h +0 -0
arch/frv/include/asm/hardirq.h renamed from include/asm-frv/hardirq.h +0 -0
arch/frv/include/asm/highmem.h renamed from include/asm-frv/highmem.h +0 -0
arch/frv/include/asm/hw_irq.h renamed from include/asm-frv/hw_irq.h +0 -0
arch/frv/include/asm/init.h renamed from include/asm-frv/init.h +0 -0
arch/frv/include/asm/io.h renamed from include/asm-frv/io.h +0 -0
arch/frv/include/asm/ioctl.h renamed from include/asm-frv/ioctl.h +0 -0
arch/frv/include/asm/ioctls.h renamed from include/asm-frv/ioctls.h +0 -0
arch/frv/include/asm/ipcbuf.h renamed from include/asm-frv/ipcbuf.h +0 -0
arch/frv/include/asm/irc-regs.h renamed from include/asm-frv/irc-regs.h +0 -0
arch/frv/include/asm/irq.h renamed from include/asm-frv/irq.h +0 -0
arch/frv/include/asm/irq_regs.h renamed from include/asm-frv/irq_regs.h +0 -0
arch/frv/include/asm/kdebug.h renamed from include/asm-frv/kdebug.h +0 -0
arch/frv/include/asm/kmap_types.h renamed from include/asm-frv/kmap_types.h +0 -0
arch/frv/include/asm/linkage.h renamed from include/asm-frv/linkage.h +0 -0
arch/frv/include/asm/local.h renamed from include/asm-frv/local.h +0 -0
arch/frv/include/asm/math-emu.h renamed from include/asm-frv/math-emu.h +0 -0
arch/frv/include/asm/mb-regs.h renamed from include/asm-frv/mb-regs.h +0 -0
arch/frv/include/asm/mb86943a.h renamed from include/asm-frv/mb86943a.h +0 -0
arch/frv/include/asm/mb93091-fpga-irqs.h renamed from include/asm-frv/mb93091-fpga-irqs.h +0 -0
arch/frv/include/asm/mb93093-fpga-irqs.h renamed from include/asm-frv/mb93093-fpga-irqs.h +0 -0
arch/frv/include/asm/mb93493-irqs.h renamed from include/asm-frv/mb93493-irqs.h +0 -0
arch/frv/include/asm/mb93493-regs.h renamed from include/asm-frv/mb93493-regs.h +0 -0
arch/frv/include/asm/mc146818rtc.h renamed from include/asm-frv/mc146818rtc.h +0 -0
arch/frv/include/asm/mem-layout.h renamed from include/asm-frv/mem-layout.h +0 -0
arch/frv/include/asm/mman.h renamed from include/asm-frv/mman.h +0 -0
arch/frv/include/asm/mmu.h renamed from include/asm-frv/mmu.h +0 -0
arch/frv/include/asm/mmu_context.h renamed from include/asm-frv/mmu_context.h +0 -0
arch/frv/include/asm/module.h renamed from include/asm-frv/module.h +0 -0
arch/frv/include/asm/msgbuf.h renamed from include/asm-frv/msgbuf.h +0 -0
arch/frv/include/asm/mutex.h renamed from include/asm-frv/mutex.h +0 -0
arch/frv/include/asm/page.h renamed from include/asm-frv/page.h +0 -0
arch/frv/include/asm/param.h renamed from include/asm-frv/param.h +0 -0
arch/frv/include/asm/pci.h renamed from include/asm-frv/pci.h +0 -0
arch/frv/include/asm/percpu.h renamed from include/asm-frv/percpu.h +0 -0
arch/frv/include/asm/pgalloc.h renamed from include/asm-frv/pgalloc.h +0 -0
arch/frv/include/asm/pgtable.h renamed from include/asm-frv/pgtable.h +0 -0
arch/frv/include/asm/poll.h renamed from include/asm-frv/poll.h +0 -0
arch/frv/include/asm/posix_types.h renamed from include/asm-frv/posix_types.h +0 -0
arch/frv/include/asm/processor.h renamed from include/asm-frv/processor.h +0 -0
arch/frv/include/asm/ptrace.h renamed from include/asm-frv/ptrace.h +0 -0
arch/frv/include/asm/registers.h renamed from include/asm-frv/registers.h +0 -0
arch/frv/include/asm/resource.h renamed from include/asm-frv/resource.h +0 -0
arch/frv/include/asm/scatterlist.h renamed from include/asm-frv/scatterlist.h +0 -0
arch/frv/include/asm/sections.h renamed from include/asm-frv/sections.h +0 -0
arch/frv/include/asm/segment.h renamed from include/asm-frv/segment.h +0 -0
arch/frv/include/asm/sembuf.h renamed from include/asm-frv/sembuf.h +0 -0
arch/frv/include/asm/serial-regs.h renamed from include/asm-frv/serial-regs.h +0 -0
arch/frv/include/asm/serial.h renamed from include/asm-frv/serial.h +0 -0
arch/frv/include/asm/setup.h renamed from include/asm-frv/setup.h +0 -0
arch/frv/include/asm/shmbuf.h renamed from include/asm-frv/shmbuf.h +0 -0
arch/frv/include/asm/shmparam.h renamed from include/asm-frv/shmparam.h +0 -0
arch/frv/include/asm/sigcontext.h renamed from include/asm-frv/sigcontext.h +0 -0
arch/frv/include/asm/siginfo.h renamed from include/asm-frv/siginfo.h +0 -0
arch/frv/include/asm/signal.h renamed from include/asm-frv/signal.h +0 -0
arch/frv/include/asm/smp.h renamed from include/asm-frv/smp.h +0 -0
arch/frv/include/asm/socket.h renamed from include/asm-frv/socket.h +0 -0
arch/frv/include/asm/sockios.h renamed from include/asm-frv/sockios.h +0 -0
arch/frv/include/asm/spinlock.h renamed from include/asm-frv/spinlock.h +0 -0
arch/frv/include/asm/spr-regs.h renamed from include/asm-frv/spr-regs.h +0 -0
arch/frv/include/asm/stat.h renamed from include/asm-frv/stat.h +0 -0
arch/frv/include/asm/statfs.h renamed from include/asm-frv/statfs.h +0 -0
arch/frv/include/asm/string.h renamed from include/asm-frv/string.h +0 -0
arch/frv/include/asm/suspend.h renamed from include/asm-frv/suspend.h +0 -0
arch/frv/include/asm/swab.h renamed from include/asm-frv/swab.h +0 -0
arch/frv/include/asm/system.h renamed from include/asm-frv/system.h +0 -0
arch/frv/include/asm/termbits.h renamed from include/asm-frv/termbits.h +0 -0
arch/frv/include/asm/termios.h renamed from include/asm-frv/termios.h +0 -0
arch/frv/include/asm/thread_info.h renamed from include/asm-frv/thread_info.h +0 -0
arch/frv/include/asm/timer-regs.h renamed from include/asm-frv/timer-regs.h +0 -0
arch/frv/include/asm/timex.h renamed from include/asm-frv/timex.h +0 -0
arch/frv/include/asm/tlb.h renamed from include/asm-frv/tlb.h +0 -0
arch/frv/include/asm/tlbflush.h renamed from include/asm-frv/tlbflush.h +0 -0
arch/frv/include/asm/topology.h renamed from include/asm-frv/topology.h +0 -0
arch/frv/include/asm/types.h renamed from include/asm-frv/types.h +0 -0
arch/frv/include/asm/uaccess.h renamed from include/asm-frv/uaccess.h +0 -0
arch/frv/include/asm/ucontext.h renamed from include/asm-frv/ucontext.h +0 -0
arch/frv/include/asm/unaligned.h renamed from include/asm-frv/unaligned.h +0 -0
arch/frv/include/asm/unistd.h renamed from include/asm-frv/unistd.h +0 -0
arch/frv/include/asm/user.h renamed from include/asm-frv/user.h +0 -0
arch/frv/include/asm/vga.h renamed from include/asm-frv/vga.h +0 -0
arch/frv/include/asm/virtconvert.h renamed from include/asm-frv/virtconvert.h +0 -0
arch/frv/include/asm/xor.h renamed from include/asm-frv/xor.h +0 -0
Re: [PATCH 2/2] FRV: Move to arch/frv/include/asm/
Quoted 3 lines · Linus Torvalds
When the revolution comes, and the people who haven't converted to git get sent to the gulags, we'll make "-M" the default.
Side note: in the meantime, if you know that you only work with the people who have already gone through the re-education program and will not need to be reported to the Office of non-Git Behavior Correction, you can add this to your ~/.gitconfig (or do it per-repository in .git/config if you work with lesser quality people on some of your stuff):
[diff] renames
(or even "renames=copy" to get not just rename, but also copy-detection done automatically - but that can be quite a bit more expensive, and the upsides aren't as huge. But sometimes the copy detection is really very interesting, because it has occasionally found some really interesting patterns when people create new files).
[ Final note: I know, I know, my own release patches are done without -M.
It's horrible, and I feel bad about it every time, but the thing is, I expect that people who actually want to download tar-balls and patches to update their kernel are in the stone age, so I do those without rename detection very much on purpose.
So in this case do as I say, not as I do. ]
Linus
Re: [PATCH 2/2] FRV: Move to arch/frv/include/asm/
In reply to Linus TorvaldsQuoted 8 lines · Linus Torvalds
Quoted 4 lines · David Howells
Move arch headers from
include/asm-frv/toarch/frv/include/asm/.Signed-off-by David Howells <[email protected]>
Quoted 7 lines
I'm not going to apply this one either. This one at least has the deletes, but Christ, look at that patch!
Please use "-M" when creating diffs for sending to me, so that the diffs are rename diffs, and so that you can _see_ that they are renames. No, it's not the git default, but that's because there are still too many crap SCM's out there, and too many people using "patch".
We can teach patch(1) to handle those - apparently agruen has resurrected development lately (git://git.savannah.gnu.org/patch.git), so it might be possible without usual latency problems...
patch(1) and git -M output (Re: [PATCH 2/2] FRV: Move to arch/frv/include/asm/)
Quoted 5 lines · Al Viro
We can teach patch(1) to handle those - apparently agruen has resurrected development lately (
git://git.savannah.gnu.org/patch.git), so it might be possible without usual latency problems...From the quick look it appears that src/pch.c::intuit_diff_type() is the
place where it could be done, with inname and outfile set according to rename from/rename to lines. Might need some flag to make the damn thing reset outfile when we are done with this one; hopefully, the next call of intuit_diff_type() wouldn't be too late for that, but that's just from a very cursory reading of the code.
Andreas, do you have anything of that kind queued? If not, I'll probably take a stab at that (handling git -M output, that is).
Re: patch(1) and git -M output (Re: [PATCH 2/2] FRV: Move to arch/frv/include/asm/)
Quoted 5 lines · On Thursday, 9 April 2009 20:28:03 Al Viro wrote:
Quoted 3 lines · Al Viro
We can teach patch(1) to handle those - apparently agruen has resurrected development lately (
git://git.savannah.gnu.org/patch.git), so it might be possible without usual latency problems...
Quoted 8 lines
From the quick look it appears that src/pch.c::intuit_diff_type() is the place where it could be done, with inname and outfile set according to rename from/rename to lines. Might need some flag to make the damn thing reset outfile when we are done with this one; hopefully, the next call of
intuit_diff_type()wouldn't be too late for that, but that's just from a very cursory reading of the code.Andreas, do you have anything of that kind queued?
I've flushed my queue over the last weeks; nothing significant is pending right now. At the moment I'm trying to stabilize patch for the next stable release, which is supposed to happen in about a month's time. Anything major would go into the release after that.
Quoted 1 line
If not, I'll probably take a stab at that (handling git -M output, that is).
Patches are welcome. (I hope you won't mind the GNU copyright assignment / disclaimer paperwork.)
Thanks,
Andreas
Re: patch(1) and git -M output (Re: [PATCH 2/2] FRV: Move to arch/frv/include/asm/)
Quoted 4 lines · Andreas Gruenbacher
Quoted 1 line
If not, I'll probably take a stab at that (handling git -M output, that is).
Patches are welcome. (I hope you won't mind the GNU copyright assignment / disclaimer paperwork.)
*gyah*
Hopefully, RH blanket one would cover it. I don't care about copyright assignment in this case (for all I care any patches from me to GNU code can be considered public domain), but I really loathe both paperwork in general and FSF as organization...
Re: [PATCH 2/2] FRV: Move to arch/frv/include/asm/
In reply to Al ViroQuoted 4 lines · Al Viro
We can teach patch(1) to handle those - apparently agruen has resurrected development lately (
git://git.savannah.gnu.org/patch.git), so it might be possible without usual latency problems...
I think a lot of SCM's parse diffs internally, so people are still going to have to live with legacy patches.
The reason for doing diff parsing internally is that it's much easier to handle the error cases, or even just see what files were modified successfully.
If you executee an external "patch" command, it's really quite nasty to parse the whole "what happened" stuff both for the "everything applied fine" _and_ for the "oops, the patch failed in the middle" case.
Doing diff parsing and application is also generally quite easy - at least compared to _generating_ them. In many ways it's easier to just handle the diff yourself than it is to try to parse the end result of running "patch" externally.
So I would not be at all surprised if many SCM's use an external "diff" to generate patches (that has none of the complexities of the error cases), but don't use an external "patch" to apply them.
Linus
Re: [PATCH 2/2] FRV: Move to arch/frv/include/asm/
Quoted 2 lines · Linus Torvalds
I think a lot of SCM's parse diffs internally, so people are still going to have to live with legacy patches.
Frankly, once distributed patch(1) understands those, it becomes a problem of other SCMs. And yes, I realize that they might want to do their internal magic for tracking renames. Tough - even without that they wouldn't be worse off than if they got a full "delete this file, create that file" kind of patch.
Re: [PATCH 2/2] FRV: Move to arch/frv/include/asm/
In reply to Linus TorvaldsQuoted 4 lines · Linus Torvalds
Please use "-M" when creating diffs for sending to me, so that the diffs are rename diffs, and so that you can _see_ that they are renames. No, it's not the git default, but that's because there are still too many crap SCM's out there, and too many people using "patch".
I should've used:
stg mail -diff-opts=-M
it would appear. I wonder if this should be the default.
Note that
git-diff -M HEAD^ HEAD
does not make output that looks like yours. It's missing the:
{include/asm-frv => arch/frv/include/asm}/Kbuild | 0
{include/asm-frv => arch/frv/include/asm}/atomic.h | 0
{include/asm-frv => arch/frv/include/asm}/auxvec.h | 0
.../asm-frv => arch/frv/include/asm}/ax88796.h | 0
{include/asm-frv => arch/frv/include/asm}/bitops.h | 0
{include/asm-frv => arch/frv/include/asm}/bug.h | 0
{include/asm-frv => arch/frv/include/asm}/bugs.h | 0
.../asm-frv => arch/frv/include/asm}/busctl-regs.h | 0
.../asm-frv => arch/frv/include/asm}/byteorder.h | 0
{include/asm-frv => arch/frv/include/asm}/cache.h | 0
...
114 files changed, 0 insertions(+), 0 deletions(-)bits. Though it does have:
diff --git a/include/asm-frv/Kbuild b/arch/frv/include/asm/Kbuild similarity index 100%
rename from include/asm-frv/Kbuild
rename to arch/frv/include/asm/Kbuild
and onwards.
How did you get the first bit?
David
Re: [PATCH 2/2] FRV: Move to arch/frv/include/asm/
Quoted 5 lines · David Howells
I should've used:
stg mail -diff-opts=-M
it would appear. I wonder if this should be the default.
Ahh. I've never used stg. It seems to have some bad defaults.
Also, depending on exactly what "stg" does, it is entirely possible that adding that
[diff] renames
to your .gitconfig won't help: those kinds of default configuration values are (very much on purpose) ignored for certain low-level git commands, exactly so that you can do reliable scripting without having to worry about some user-specific config files.
Quoted 8 lines
Note that
git-diff -M HEAD^ HEAD
does not make output that looks like yours. It's missing the:
{include/asm-frv => arch/frv/include/asm}/Kbuild | 0 {include/asm-frv => arch/frv/include/asm}/atomic.h | 0
Those come from "--summary", which summarizes file creation, deletion and movement. Almost always combined with "--stat", but apparently the "--stat" part is again in that "stg mail" script.
Linus
Re: [PATCH 2/2] FRV: Move to arch/frv/include/asm/
Quoted 25 lines · Linus Torvalds
Quoted 5 lines · David Howells
I should've used:
stg mail -diff-opts=-M
it would appear. I wonder if this should be the default.
Ahh. I've never used stg. It seems to have some bad defaults.
Also, depending on exactly what "stg" does, it is entirely possible that adding that
[diff] renamesto your .gitconfig won't help: those kinds of default configuration values are (very much on purpose) ignored for certain low-level git commands, exactly so that you can do reliable scripting without having to worry about some user-specific config files.
Quoted 4 lines
Note that
git-diff -M HEAD^ HEAD
Quoted 8 lines
Quoted 4 lines
does not make output that looks like yours. It's missing the:
{include/asm-frv => arch/frv/include/asm}/Kbuild | 0 {include/asm-frv => arch/frv/include/asm}/atomic.h | 0Those come from "--summary", which summarizes file creation, deletion and movement. Almost always combined with "--stat", but apparently the "--stat" part is again in that "stg mail" script.
David: Documentation/SubmittingPatches:/git diff/ =>
'Please use "git diff -M --stat --summary" to generate the diffstat:
the -M enables rename detection, and the summary enables a summary of new/deleted or renamed files.'
Signature · 1 line
~Randy
Re: [PATCH 2/2] FRV: Move to arch/frv/include/asm/
In reply to Linus TorvaldsQuoted 5 lines · Linus Torvalds
Ahh. I've never used stg. It seems to have some bad defaults.
Also, depending on exactly what "stg" does, it is entirely possible that adding that
Quoted 7 lines
[diff] renamesto your .gitconfig won't help: those kinds of default configuration values are (very much on purpose) ignored for certain low-level git commands, exactly so that you can do reliable scripting without having to worry about some user-specific config files.
That affects 'stg show' but not 'stg mail'.
It looks like 'stg mail' is generating the stats with git-apply on the results of a diff:
def diffstat(files = None, rev1 = 'HEAD', rev2 = None):
"""Return the diffstat between rev1 and rev2."""
return GRun('apply', '--stat', '--summary'
).raw_input(diff(files, rev1, rev2)).raw_output()which seems to mean that I can't reduce them from the:
arch/frv/include/asm/Kbuild | 5 arch/frv/include/asm/atomic.h | 198 +++++++++++ arch/frv/include/asm/auxvec.h | 4 arch/frv/include/asm/ax88796.h | 22 + arch/frv/include/asm/bitops.h | 412 +++++++++++++++++++++++ arch/frv/include/asm/bug.h | 53 +++ ... include/asm-frv/Kbuild | 5 include/asm-frv/atomic.h | 198 ----------- include/asm-frv/auxvec.h | 4 include/asm-frv/ax88796.h | 22 - include/asm-frv/bitops.h | 412 ----------------------- include/asm-frv/bug.h | 53 ---
...
to the:
{include/asm-frv => arch/frv/include/asm}/Kbuild | 0
{include/asm-frv => arch/frv/include/asm}/atomic.h | 0
{include/asm-frv => arch/frv/include/asm}/auxvec.h | 0
.../asm-frv => arch/frv/include/asm}/ax88796.h | 0
{include/asm-frv => arch/frv/include/asm}/bitops.h | 0
{include/asm-frv => arch/frv/include/asm}/bug.h | 0though it is using git-diff-tree to generate the rest of the patch, which I can affect with the diff options, it would appear.
Is there a way to get git-diff to produce just the stats and summary and not the body of the patch?
David
Re: [PATCH 2/2] FRV: Move to arch/frv/include/asm/
Quoted 3 lines · David Howells
Is there a way to get git-diff to produce just the stats and summary and not the body of the patch?
Sure. "git diff --stat --summary" should do it.
But it does look like stg is being silly, and using "git apply" to generate a diffstat, instead of just asking for it to begin with. I guess it goes back to some really old days (2005) when that "--stat" wasn't tied into the whole git diff logic.
Linus
Fix for StGIT
Hi Catalin,
I think StGIT needs something like the attached patch to get it to generate patches with renames in them correctly. This isn't quite right, since it doesn't pass the file list to git-diff-tree, but I can't work out how to make the python do it:-/
David
---
usr/lib/python2.5/site-packages/stgit/git.py renamed from usr/lib/python2.5/site-packages/stgit/git.py.old +2 -2
@@ -820,8 +820,8 @@ # usually invoke git.diff() form the calling functions def diffstat(files = None, rev1 = 'HEAD', rev2 = None): """Return the diffstat between rev1 and rev2.""" - return GRun('apply', '--stat', '--summary' - ).raw_input(diff(files, rev1, rev2)).raw_output() + return GRun('diff-tree', '-M', '--stat', '--summary', rev1, rev2 + ).raw_output() def files(rev1, rev2, diff_flags = []): """Return the files modified between rev1 and rev2