diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 14:38:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 14:40:31 -0700 |
| commit | e3d2f927f788adcdabc42f8a1616f6cc56c53bbe (patch) | |
| tree | ff051e33cff49e23f4c4ef84360f22cf7a1998c9 | |
| parent | a9b6148d25f15ddfe9d7a7f3e526fdb64e7cf7da (diff) | |
| parent | 81e192d6ce303b6792aa38ff35f41a1a7357f23a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: convert to generic compat_sys_ptrace
parisc: add rtc platform driver
parisc: initialize unwinder much earlier
parisc: add new syscalls
parisc: hijack jump to start_kernel
parisc: add pdc_coproc_cfg_unlocked and set_firmware_width_unlocked
parisc: move include/asm-parisc to arch/parisc/include/asm
parisc: move pdc_result to real2.S
parisc: unify CCIO_COLLECT_STATS implementation
parisc: add arch/parisc/kernel/.gitignore
parisc: ropes.h - fix <asm-parisc/*> -> <asm/*>
parisc: parisc-agp - fix <asm-parisc/*> -> <asm/*>
Resolve remove/rename conflict: include/asm-parisc/a.out.h is no longer
relevant.
| -rw-r--r-- | arch/parisc/Kconfig | 2 | ||||
| -rw-r--r-- | arch/parisc/include/asm/Kbuild (renamed from include/asm-parisc/Kbuild) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/agp.h (renamed from include/asm-parisc/agp.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/asmregs.h (renamed from include/asm-parisc/asmregs.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/assembly.h (renamed from include/asm-parisc/assembly.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/atomic.h (renamed from include/asm-parisc/atomic.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/auxvec.h (renamed from include/asm-parisc/auxvec.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/bitops.h (renamed from include/asm-parisc/bitops.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/bug.h (renamed from include/asm-parisc/bug.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/bugs.h (renamed from include/asm-parisc/bugs.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/byteorder.h (renamed from include/asm-parisc/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/cache.h (renamed from include/asm-parisc/cache.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/cacheflush.h (renamed from include/asm-parisc/cacheflush.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/checksum.h (renamed from include/asm-parisc/checksum.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/compat.h (renamed from include/asm-parisc/compat.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/compat_rt_sigframe.h (renamed from include/asm-parisc/compat_rt_sigframe.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/compat_signal.h (renamed from include/asm-parisc/compat_signal.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/compat_ucontext.h (renamed from include/asm-parisc/compat_ucontext.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/cputime.h (renamed from include/asm-parisc/cputime.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/current.h (renamed from include/asm-parisc/current.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/delay.h (renamed from include/asm-parisc/delay.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/device.h (renamed from include/asm-parisc/device.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/div64.h (renamed from include/asm-parisc/div64.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/dma-mapping.h (renamed from include/asm-parisc/dma-mapping.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/dma.h (renamed from include/asm-parisc/dma.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/eisa_bus.h (renamed from include/asm-parisc/eisa_bus.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/eisa_eeprom.h (renamed from include/asm-parisc/eisa_eeprom.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/elf.h (renamed from include/asm-parisc/elf.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/emergency-restart.h (renamed from include/asm-parisc/emergency-restart.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/errno.h (renamed from include/asm-parisc/errno.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/fb.h (renamed from include/asm-parisc/fb.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/fcntl.h (renamed from include/asm-parisc/fcntl.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/fixmap.h (renamed from include/asm-parisc/fixmap.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/floppy.h (renamed from include/asm-parisc/floppy.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/futex.h (renamed from include/asm-parisc/futex.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/grfioctl.h (renamed from include/asm-parisc/grfioctl.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/hardirq.h (renamed from include/asm-parisc/hardirq.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/hardware.h (renamed from include/asm-parisc/hardware.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/hw_irq.h (renamed from include/asm-parisc/hw_irq.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/ide.h (renamed from include/asm-parisc/ide.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/io.h (renamed from include/asm-parisc/io.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/ioctl.h (renamed from include/asm-parisc/ioctl.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/ioctls.h (renamed from include/asm-parisc/ioctls.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/ipcbuf.h (renamed from include/asm-parisc/ipcbuf.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/irq.h (renamed from include/asm-parisc/irq.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/irq_regs.h (renamed from include/asm-parisc/irq_regs.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/kdebug.h (renamed from include/asm-parisc/kdebug.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/kmap_types.h (renamed from include/asm-parisc/kmap_types.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/led.h (renamed from include/asm-parisc/led.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/linkage.h (renamed from include/asm-parisc/linkage.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/local.h (renamed from include/asm-parisc/local.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/machdep.h (renamed from include/asm-parisc/machdep.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/mc146818rtc.h (renamed from include/asm-parisc/mc146818rtc.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/mckinley.h (renamed from include/asm-parisc/mckinley.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/mman.h (renamed from include/asm-parisc/mman.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/mmu.h (renamed from include/asm-parisc/mmu.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/mmu_context.h (renamed from include/asm-parisc/mmu_context.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/mmzone.h (renamed from include/asm-parisc/mmzone.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/module.h (renamed from include/asm-parisc/module.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/msgbuf.h (renamed from include/asm-parisc/msgbuf.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/mutex.h (renamed from include/asm-parisc/mutex.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/page.h (renamed from include/asm-parisc/page.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/param.h (renamed from include/asm-parisc/param.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/parisc-device.h (renamed from include/asm-parisc/parisc-device.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/parport.h (renamed from include/asm-parisc/parport.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/pci.h (renamed from include/asm-parisc/pci.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/pdc.h (renamed from include/asm-parisc/pdc.h) | 5 | ||||
| -rw-r--r-- | arch/parisc/include/asm/pdc_chassis.h (renamed from include/asm-parisc/pdc_chassis.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/pdcpat.h (renamed from include/asm-parisc/pdcpat.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/percpu.h (renamed from include/asm-parisc/percpu.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/perf.h (renamed from include/asm-parisc/perf.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/pgalloc.h (renamed from include/asm-parisc/pgalloc.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/pgtable.h (renamed from include/asm-parisc/pgtable.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/poll.h (renamed from include/asm-parisc/poll.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/posix_types.h (renamed from include/asm-parisc/posix_types.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/prefetch.h (renamed from include/asm-parisc/prefetch.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/processor.h (renamed from include/asm-parisc/processor.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/psw.h (renamed from include/asm-parisc/psw.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/ptrace.h (renamed from include/asm-parisc/ptrace.h) | 10 | ||||
| -rw-r--r-- | arch/parisc/include/asm/real.h (renamed from include/asm-parisc/real.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/resource.h (renamed from include/asm-parisc/resource.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/ropes.h (renamed from include/asm-parisc/ropes.h) | 2 | ||||
| -rw-r--r-- | arch/parisc/include/asm/rt_sigframe.h (renamed from include/asm-parisc/rt_sigframe.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/rtc.h (renamed from include/asm-parisc/rtc.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/runway.h (renamed from include/asm-parisc/runway.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/scatterlist.h (renamed from include/asm-parisc/scatterlist.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/sections.h (renamed from include/asm-parisc/sections.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/segment.h (renamed from include/asm-parisc/segment.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/sembuf.h (renamed from include/asm-parisc/sembuf.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/serial.h (renamed from include/asm-parisc/serial.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/setup.h (renamed from include/asm-parisc/setup.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/shmbuf.h (renamed from include/asm-parisc/shmbuf.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/shmparam.h (renamed from include/asm-parisc/shmparam.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/sigcontext.h (renamed from include/asm-parisc/sigcontext.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/siginfo.h (renamed from include/asm-parisc/siginfo.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/signal.h (renamed from include/asm-parisc/signal.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/smp.h (renamed from include/asm-parisc/smp.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/socket.h (renamed from include/asm-parisc/socket.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/sockios.h (renamed from include/asm-parisc/sockios.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/spinlock.h (renamed from include/asm-parisc/spinlock.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/spinlock_types.h (renamed from include/asm-parisc/spinlock_types.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/stat.h (renamed from include/asm-parisc/stat.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/statfs.h (renamed from include/asm-parisc/statfs.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/string.h (renamed from include/asm-parisc/string.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/superio.h (renamed from include/asm-parisc/superio.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/system.h (renamed from include/asm-parisc/system.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/termbits.h (renamed from include/asm-parisc/termbits.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/termios.h (renamed from include/asm-parisc/termios.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/thread_info.h (renamed from include/asm-parisc/thread_info.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/timex.h (renamed from include/asm-parisc/timex.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/tlb.h (renamed from include/asm-parisc/tlb.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/tlbflush.h (renamed from include/asm-parisc/tlbflush.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/topology.h (renamed from include/asm-parisc/topology.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/traps.h (renamed from include/asm-parisc/traps.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/types.h (renamed from include/asm-parisc/types.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/uaccess.h (renamed from include/asm-parisc/uaccess.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/ucontext.h (renamed from include/asm-parisc/ucontext.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/unaligned.h (renamed from include/asm-parisc/unaligned.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/unistd.h (renamed from include/asm-parisc/unistd.h) | 10 | ||||
| -rw-r--r-- | arch/parisc/include/asm/unwind.h (renamed from include/asm-parisc/unwind.h) | 2 | ||||
| -rw-r--r-- | arch/parisc/include/asm/user.h (renamed from include/asm-parisc/user.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/vga.h (renamed from include/asm-parisc/vga.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/include/asm/xor.h (renamed from include/asm-parisc/xor.h) | 0 | ||||
| -rw-r--r-- | arch/parisc/kernel/.gitignore</ |