diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-11 09:19:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-11 09:19:02 -0700 |
| commit | 835a1c092432b3293ba6c4dec45ee6869c6f61fd (patch) | |
| tree | a48582e4e4de3a8924b700c5ccaae78cd299cd73 | |
| parent | d3570a5a7b8d0604fa012129f92637dc1534f62c (diff) | |
| parent | 9609e74093abd9f61fb1d20a8915a8ea87c77d5a (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (49 commits)
MIPS: RB532: provide GPIO_BUILTIN_NR and irq_to_gpio/gpio_to_irq
MIPS: Move ptrace prototypes to ptrace.h
MIPS: Ptrace support for HARDWARE_WATCHPOINTS
MIPS: Scheduler support for HARDWARE_WATCHPOINTS.
MIPS: Watch exception handling for HARDWARE_WATCHPOINTS.
MIPS: Probe watch registers and report configuration.
MIPS: Add HARDWARE_WATCHPOINTS definitions and support code.
MIPS: Add HARDWARE_WATCHPOINTS configure option.
MIPS: Replace use of <asm-generic/uaccess.h> with native implementations.
MIPS: TXx9: Add TX4939 ATA support (v2)
MIPS: Rewrite spinlocks to ticket locks.
MIPS: IP checksums: Optimize adjust of sum on buffers of odd alignment.
MIPS: IP checksums: Remove unncessary .set pseudos
MIPS: IP checksums: Remove unncessary folding of sum to 16 bit.
MIPS: Move headfiles to new location below arch/mips/include
MIPS: Alchemy: rename directory
MIPS: Optimize get_user and put_user for 64-bit
MIPS: TXx9: Implement prom_free_prom_memory
MIPS: TXx9: Add RBTX4939 board support
MIPS: TXx9: Add TX4939 SoC support
...
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 | ||||
| -rw-r--r-- | arch/mips/Kconfig | 16 | ||||
| -rw-r--r-- | arch/mips/Makefile | 122 | ||||
| -rw-r--r-- | arch/mips/alchemy/Kconfig (renamed from arch/mips/au1000/Kconfig) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/Makefile (renamed from arch/mips/au1000/common/Makefile) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/au1xxx_irqmap.c (renamed from arch/mips/au1000/common/au1xxx_irqmap.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/clocks.c (renamed from arch/mips/au1000/common/clocks.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/cputable.c (renamed from arch/mips/au1000/common/cputable.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/dbdma.c (renamed from arch/mips/au1000/common/dbdma.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/dma.c (renamed from arch/mips/au1000/common/dma.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/gpio.c (renamed from arch/mips/au1000/common/gpio.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/irq.c (renamed from arch/mips/au1000/common/irq.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/pci.c (renamed from arch/mips/au1000/common/pci.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/platform.c (renamed from arch/mips/au1000/common/platform.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/power.c (renamed from arch/mips/au1000/common/power.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/prom.c (renamed from arch/mips/au1000/common/prom.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/puts.c (renamed from arch/mips/au1000/common/puts.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/reset.c (renamed from arch/mips/au1000/common/reset.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/setup.c (renamed from arch/mips/au1000/common/setup.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/sleeper.S (renamed from arch/mips/au1000/common/sleeper.S) | 10 | ||||
| -rw-r--r-- | arch/mips/alchemy/common/time.c (renamed from arch/mips/au1000/common/time.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/db1x00/Makefile (renamed from arch/mips/au1000/db1x00/Makefile) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/db1x00/board_setup.c (renamed from arch/mips/au1000/db1x00/board_setup.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/db1x00/init.c (renamed from arch/mips/au1000/db1x00/init.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/db1x00/irqmap.c (renamed from arch/mips/au1000/db1x00/irqmap.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/mtx-1/Makefile (renamed from arch/mips/au1000/mtx-1/Makefile) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/mtx-1/board_setup.c (renamed from arch/mips/au1000/mtx-1/board_setup.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/mtx-1/init.c (renamed from arch/mips/au1000/mtx-1/init.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/mtx-1/irqmap.c (renamed from arch/mips/au1000/mtx-1/irqmap.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/mtx-1/platform.c (renamed from arch/mips/au1000/mtx-1/platform.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1000/Makefile (renamed from arch/mips/au1000/pb1000/Makefile) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1000/board_setup.c (renamed from arch/mips/au1000/pb1000/board_setup.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1000/init.c (renamed from arch/mips/au1000/pb1000/init.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1000/irqmap.c (renamed from arch/mips/au1000/pb1000/irqmap.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1100/Makefile (renamed from arch/mips/au1000/pb1100/Makefile) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1100/board_setup.c (renamed from arch/mips/au1000/pb1100/board_setup.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1100/init.c (renamed from arch/mips/au1000/pb1100/init.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1100/irqmap.c (renamed from arch/mips/au1000/pb1100/irqmap.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1200/Makefile (renamed from arch/mips/au1000/pb1200/Makefile) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1200/board_setup.c (renamed from arch/mips/au1000/pb1200/board_setup.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1200/init.c (renamed from arch/mips/au1000/pb1200/init.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1200/irqmap.c (renamed from arch/mips/au1000/pb1200/irqmap.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1200/platform.c (renamed from arch/mips/au1000/pb1200/platform.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1500/Makefile (renamed from arch/mips/au1000/pb1500/Makefile) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1500/board_setup.c (renamed from arch/mips/au1000/pb1500/board_setup.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1500/init.c (renamed from arch/mips/au1000/pb1500/init.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1500/irqmap.c (renamed from arch/mips/au1000/pb1500/irqmap.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1550/Makefile (renamed from arch/mips/au1000/pb1550/Makefile) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1550/board_setup.c (renamed from arch/mips/au1000/pb1550/board_setup.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1550/init.c (renamed from arch/mips/au1000/pb1550/init.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/pb1550/irqmap.c (renamed from arch/mips/au1000/pb1550/irqmap.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/xxs1500/Makefile (renamed from arch/mips/au1000/xxs1500/Makefile) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/xxs1500/board_setup.c (renamed from arch/mips/au1000/xxs1500/board_setup.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/xxs1500/init.c (renamed from arch/mips/au1000/xxs1500/init.c) | 0 | ||||
| -rw-r--r-- | arch/mips/alchemy/xxs1500/irqmap.c (renamed from arch/mips/au1000/xxs1500/irqmap.c) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/Kbuild (renamed from include/asm-mips/Kbuild) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/a.out.h (renamed from include/asm-mips/a.out.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/abi.h (renamed from include/asm-mips/abi.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/addrspace.h (renamed from include/asm-mips/addrspace.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/asm.h (renamed from include/asm-mips/asm.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/asmmacro-32.h (renamed from include/asm-mips/asmmacro-32.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/asmmacro-64.h (renamed from include/asm-mips/asmmacro-64.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/asmmacro.h (renamed from include/asm-mips/asmmacro.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/atomic.h (renamed from include/asm-mips/atomic.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/auxvec.h (renamed from include/asm-mips/auxvec.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/barrier.h (renamed from include/asm-mips/barrier.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/bcache.h (renamed from include/asm-mips/bcache.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/bitops.h (renamed from include/asm-mips/bitops.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/bootinfo.h (renamed from include/asm-mips/bootinfo.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/branch.h (renamed from include/asm-mips/branch.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/break.h (renamed from include/asm-mips/break.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/bug.h (renamed from include/asm-mips/bug.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/bugs.h (renamed from include/asm-mips/bugs.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/byteorder.h (renamed from include/asm-mips/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/cache.h (renamed from include/asm-mips/cache.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/cachectl.h (renamed from include/asm-mips/cachectl.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/cacheflush.h (renamed from include/asm-mips/cacheflush.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/cacheops.h (renamed from include/asm-mips/cacheops.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/checksum.h (renamed from include/asm-mips/checksum.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/cmp.h (renamed from include/asm-mips/cmp.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/cmpxchg.h (renamed from include/asm-mips/cmpxchg.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/compat-signal.h (renamed from include/asm-mips/compat-signal.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/compat.h (renamed from include/asm-mips/compat.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/compiler.h (renamed from include/asm-mips/compiler.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/cpu-features.h (renamed from include/asm-mips/cpu-features.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/cpu-info.h (renamed from include/asm-mips/cpu-info.h) | 6 | ||||
| -rw-r--r-- | arch/mips/include/asm/cpu.h (renamed from include/asm-mips/cpu.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/cputime.h (renamed from include/asm-mips/cputime.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/current.h (renamed from include/asm-mips/current.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/debug.h (renamed from include/asm-mips/debug.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/ecc.h (renamed from include/asm-mips/dec/ecc.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/interrupts.h (renamed from include/asm-mips/dec/interrupts.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/ioasic.h (renamed from include/asm-mips/dec/ioasic.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/ioasic_addrs.h (renamed from include/asm-mips/dec/ioasic_addrs.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/ioasic_ints.h (renamed from include/asm-mips/dec/ioasic_ints.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/kn01.h (renamed from include/asm-mips/dec/kn01.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/kn02.h (renamed from include/asm-mips/dec/kn02.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/kn02ba.h (renamed from include/asm-mips/dec/kn02ba.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/kn02ca.h (renamed from include/asm-mips/dec/kn02ca.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/kn02xa.h (renamed from include/asm-mips/dec/kn02xa.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/kn03.h (renamed from include/asm-mips/dec/kn03.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/kn05.h (renamed from include/asm-mips/dec/kn05.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/kn230.h (renamed from include/asm-mips/dec/kn230.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/machtype.h (renamed from include/asm-mips/dec/machtype.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/prom.h (renamed from include/asm-mips/dec/prom.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dec/system.h (renamed from include/asm-mips/dec/system.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/delay.h (renamed from include/asm-mips/delay.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/device.h (renamed from include/asm-mips/device.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/div64.h (renamed from include/asm-mips/div64.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dma-mapping.h (renamed from include/asm-mips/dma-mapping.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dma.h (renamed from include/asm-mips/dma.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/ds1286.h (renamed from include/asm-mips/ds1286.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/ds1287.h (renamed from include/asm-mips/ds1287.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/dsp.h (renamed from include/asm-mips/dsp.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/edac.h (renamed from include/asm-mips/edac.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/elf.h (renamed from include/asm-mips/elf.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/emergency-restart.h (renamed from include/asm-mips/emergency-restart.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/emma2rh/emma2rh.h (renamed from include/asm-mips/emma2rh/emma2rh.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/emma2rh/markeins.h (renamed from include/asm-mips/emma2rh/markeins.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/errno.h (renamed from include/asm-mips/errno.h) | 0 | ||||
| -rw-r--r-- | arch/mips/include/asm/fb.h (renamed from include/asm-mips/fb.h) | 0 | ||||
| -rw-r--r-- | arch/mips/i |