diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 17:23:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 17:23:31 -0800 |
| commit | 6de71484cf9561edb45224f659a9db38b6056d5e (patch) | |
| tree | 588fe6f7c98147b805085503c863d371e2fa497e | |
| parent | 1dff81f20cd55ffa5a8ee984da70ce0b99d29606 (diff) | |
| parent | e3c6d4ee545e427b55882d97d3b663c6411645fe (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (98 commits)
sparc: move select of ARCH_SUPPORTS_MSI
sparc: drop SUN_IO
sparc: unify sections.h
sparc: use .data.init_task section for init_thread_union
sparc: fix array overrun check in of_device_64.c
sparc: unify module.c
sparc64: prepare module_64.c for unification
sparc64: use bit neutral Elf symbols
sparc: unify module.h
sparc: introduce CONFIG_BITS
sparc: fix hardirq.h removal fallout
sparc64: do not export pus_fs_struct
sparc: use sparc64 version of scatterlist.h
sparc: Commonize memcmp assembler.
sparc: Unify strlen assembler.
sparc: Add asm/asm.h
sparc: Kill memcmp_32.S code which has been ifdef'd out for centuries.
sparc: replace for_each_cpu_mask_nr with for_each_cpu
sparc: fix sparse warnings in irq_32.c
sparc: add include guards to kernel.h
...
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | arch/sparc/Kconfig | 525 | ||||
| -rw-r--r-- | arch/sparc/Kconfig.debug | 26 | ||||
| -rw-r--r-- | arch/sparc/Makefile | 97 | ||||
| -rw-r--r-- | arch/sparc/boot/.gitignore (renamed from arch/sparc64/boot/.gitignore) | 4 | ||||
| -rw-r--r-- | arch/sparc/boot/Makefile | 38 | ||||
| -rw-r--r-- | arch/sparc/boot/piggyback_32.c (renamed from arch/sparc/boot/piggyback.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/boot/piggyback_64.c (renamed from arch/sparc64/boot/piggyback.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/configs/sparc32_defconfig (renamed from arch/sparc/defconfig) | 0 | ||||
| -rw-r--r-- | arch/sparc/configs/sparc64_defconfig (renamed from arch/sparc64/defconfig) | 0 | ||||
| -rw-r--r-- | arch/sparc/include/asm/Kbuild | 2 | ||||
| -rw-r--r-- | arch/sparc/include/asm/asm.h | 40 | ||||
| -rw-r--r-- | arch/sparc/include/asm/atomic_64.h | 7 | ||||
| -rw-r--r-- | arch/sparc/include/asm/bitops_64.h | 5 | ||||
| -rw-r--r-- | arch/sparc/include/asm/hypervisor.h | 24 | ||||
| -rw-r--r-- | arch/sparc/include/asm/irq_32.h | 1 | ||||
| -rw-r--r-- | arch/sparc/include/asm/irq_64.h | 3 | ||||
| -rw-r--r-- | arch/sparc/include/asm/irqflags_64.h | 6 | ||||
| -rw-r--r-- | arch/sparc/include/asm/module.h | 32 | ||||
| -rw-r--r-- | arch/sparc/include/asm/module_32.h | 7 | ||||
| -rw-r--r-- | arch/sparc/include/asm/module_64.h | 7 | ||||
| -rw-r--r-- | arch/sparc/include/asm/openprom_32.h | 6 | ||||
| -rw-r--r-- | arch/sparc/include/asm/oplib_32.h | 8 | ||||
| -rw-r--r-- | arch/sparc/include/asm/pil.h | 9 | ||||
| -rw-r--r-- | arch/sparc/include/asm/scatterlist.h | 33 | ||||
| -rw-r--r-- | arch/sparc/include/asm/scatterlist_32.h | 26 | ||||
| -rw-r--r-- | arch/sparc/include/asm/scatterlist_64.h | 27 | ||||
| -rw-r--r-- | arch/sparc/include/asm/sections.h | 16 | ||||
| -rw-r--r-- | arch/sparc/include/asm/sections_32.h | 6 | ||||
| -rw-r--r-- | arch/sparc/include/asm/sections_64.h | 9 | ||||
| -rw-r--r-- | arch/sparc/include/asm/spinlock_64.h | 31 | ||||
| -rw-r--r-- | arch/sparc/include/asm/spitfire.h | 4 | ||||
| -rw-r--r-- | arch/sparc/include/asm/system_32.h | 5 | ||||
| -rw-r--r-- | arch/sparc/include/asm/system_64.h | 46 | ||||
| -rw-r--r-- | arch/sparc/include/asm/tsb.h | 6 | ||||
| -rw-r--r-- | arch/sparc/include/asm/ttable.h | 15 | ||||
| -rw-r--r-- | arch/sparc/include/asm/unistd.h | 446 | ||||
| -rw-r--r-- | arch/sparc/include/asm/unistd_32.h | 385 | ||||
| -rw-r--r-- | arch/sparc/include/asm/unistd_64.h | 380 | ||||
| -rw-r--r-- | arch/sparc/kernel/.gitignore | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/Makefile | 117 | ||||
| -rw-r--r-- | arch/sparc/kernel/asm-offsets.c | 19 | ||||
| -rw-r--r-- | arch/sparc/kernel/audit.c (renamed from arch/sparc64/kernel/audit.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/auxio_32.c (renamed from arch/sparc/kernel/auxio.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/auxio_64.c (renamed from arch/sparc64/kernel/auxio.c) | 70 | ||||
| -rw-r--r-- | arch/sparc/kernel/central.c (renamed from arch/sparc64/kernel/central.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/cherrs.S (renamed from arch/sparc64/kernel/cherrs.S) | 10 | ||||
| -rw-r--r-- | arch/sparc/kernel/chmc.c (renamed from arch/sparc64/kernel/chmc.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/compat_audit.c (renamed from arch/sparc64/kernel/compat_audit.c) | 3 | ||||
| -rw-r--r-- | arch/sparc/kernel/cpu.c | 413 | ||||
| -rw-r--r-- | arch/sparc/kernel/devices.c | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/ds.c (renamed from arch/sparc64/kernel/ds.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/dtlb_miss.S (renamed from arch/sparc64/kernel/dtlb_miss.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/dtlb_prot.S (renamed from arch/sparc64/kernel/dtlb_prot.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/ebus.c (renamed from arch/sparc64/kernel/ebus.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/entry.h (renamed from arch/sparc64/kernel/entry.h) | 40 | ||||
| -rw-r--r-- | arch/sparc/kernel/etrap_32.S (renamed from arch/sparc/kernel/etrap.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/etrap_64.S (renamed from arch/sparc64/kernel/etrap.S) | 6 | ||||
| -rw-r--r-- | arch/sparc/kernel/fpu_traps.S (renamed from arch/sparc64/kernel/fpu_traps.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/ftrace.c (renamed from arch/sparc64/kernel/ftrace.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/getsetcc.S (renamed from arch/sparc64/kernel/getsetcc.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/head_32.S (renamed from arch/sparc/kernel/head.S) | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/head_64.S (renamed from arch/sparc64/kernel/head.S) | 8 | ||||
| -rw-r--r-- | arch/sparc/kernel/helpers.S (renamed from arch/sparc64/kernel/helpers.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/hvapi.c (renamed from arch/sparc64/kernel/hvapi.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/hvcalls.S (renamed from arch/sparc64/kernel/hvcalls.S) | 32 | ||||
| -rw-r--r-- | arch/sparc/kernel/hvtramp.S (renamed from arch/sparc64/kernel/hvtramp.S) | 5 | ||||
| -rw-r--r-- | arch/sparc/kernel/idprom.c | 67 | ||||
| -rw-r--r-- | arch/sparc/kernel/init_task.c | 3 | ||||
| -rw-r--r-- | arch/sparc/kernel/iommu.c (renamed from arch/sparc64/kernel/iommu.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/iommu_common.h (renamed from arch/sparc64/kernel/iommu_common.h) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/ioport.c | 4 | ||||
| -rw-r--r-- | arch/sparc/kernel/irq_32.c (renamed from arch/sparc/kernel/irq.c) | 7 | ||||
| -rw-r--r-- | arch/sparc/kernel/irq_64.c (renamed from arch/sparc64/kernel/irq.c) | 63 | ||||
| -rw-r--r-- | arch/sparc/kernel/itlb_miss.S (renamed from arch/sparc64/kernel/itlb_miss.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/ivec.S (renamed from arch/sparc64/kernel/ivec.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/kernel.h | 31 | ||||
| -rw-r--r-- | arch/sparc/kernel/kgdb_32.c (renamed from arch/sparc/kernel/kgdb.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/kgdb_64.c (renamed from arch/sparc64/kernel/kgdb.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/kprobes.c (renamed from arch/sparc64/kernel/kprobes.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/kstack.h (renamed from arch/sparc64/kernel/kstack.h) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/ktlb.S (renamed from arch/sparc64/kernel/ktlb.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/ldc.c (renamed from arch/sparc64/kernel/ldc.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/mdesc.c (renamed from arch/sparc64/kernel/mdesc.c) | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/misctrap.S (renamed from arch/sparc64/kernel/misctrap.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/module.c | 140 | ||||
| -rw-r--r-- | arch/sparc/kernel/muldiv.c | 5 | ||||
| -rw-r--r-- | arch/sparc/kernel/of_device_32.c (renamed from arch/sparc/kernel/of_device.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/of_device_64.c (renamed from arch/sparc64/kernel/of_device.c) | 18 | ||||
| -rw-r--r-- | arch/sparc/kernel/pci.c (renamed from arch/sparc64/kernel/pci.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/pci_common.c (renamed from arch/sparc64/kernel/pci_common.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/pci_fire.c (renamed from arch/sparc64/kernel/pci_fire.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/pci_impl.h (renamed from arch/sparc64/kernel/pci_impl.h) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/pci_msi.c (renamed from arch/sparc64/kernel/pci_msi.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/pci_psycho.c (renamed from arch/sparc64/kernel/pci_psycho.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/pci_sabre.c (renamed from arch/sparc64/kernel/pci_sabre.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/pci_schizo.c (renamed from arch/sparc64/kernel/pci_schizo.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/pci_sun4v.c (renamed from arch/sparc64/kernel/pci_sun4v.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/pci_sun4v.h (renamed from arch/sparc64/kernel/pci_sun4v.h) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/pci_sun4v_asm.S (renamed from arch/sparc64/kernel/pci_sun4v_asm.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/pcic.c | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/pmc.c | 18 | ||||
| -rw-r--r-- | arch/sparc/kernel/power.c (renamed from arch/sparc64/kernel/power.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/process_32.c (renamed from arch/sparc/kernel/process.c) | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/process_64.c (renamed from arch/sparc64/kernel/process.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/prom.h | 29 | ||||
| -rw-r--r-- | arch/sparc/kernel/prom_32.c (renamed from arch/sparc/kernel/prom.c) | 287 | ||||
| -rw-r--r-- | arch/sparc/kernel/prom_64.c | 571 | ||||
| -rw-r--r-- | arch/sparc/kernel/prom_common.c | 326 | ||||
| -rw-r--r-- | arch/sparc/kernel/prom_irqtrans.c (renamed from arch/sparc64/kernel/prom.c) | 854 | ||||
| -rw-r--r-- | arch/sparc/kernel/psycho_common.c (renamed from arch/sparc64/kernel/psycho_common.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/psycho_common.h (renamed from arch/sparc64/kernel/psycho_common.h) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/ptrace_32.c (renamed from arch/sparc/kernel/ptrace.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/ptrace_64.c (renamed from arch/sparc64/kernel/ptrace.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/reboot.c (renamed from arch/sparc64/kernel/reboot.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/rtrap_32.S (renamed from arch/sparc/kernel/rtrap.S) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/rtrap_64.S (renamed from arch/sparc64/kernel/rtrap.S) | 20 | ||||
| -rw-r--r-- | arch/sparc/kernel/sbus.c (renamed from arch/sparc64/kernel/sbus.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/setup_32.c (renamed from arch/sparc/kernel/setup.c) | 9 | ||||
| -rw-r--r-- | arch/sparc/kernel/setup_64.c (renamed from arch/sparc64/kernel/setup.c) | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/signal32.c (renamed from arch/sparc64/kernel/signal32.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/signal_32.c (renamed from arch/sparc/kernel/signal.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/signal_64.c (renamed from arch/sparc64/kernel/signal.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/smp_32.c (renamed from arch/sparc/kernel/smp.c) | 0 | ||||
| -rw-r--r-- | arch/sparc/kernel/smp_64.c (renamed from arch/sparc64/kernel/smp.c) | 17 | ||||
| -rw-r--r-- | arch/sparc/kernel/sparc_ksyms_32.c (renamed from arch/sparc/kernel/sparc_ksyms.c) | 4 | ||||
| -rw-r--r-- | arch/sparc/kernel/sparc_ksyms_64.c (renamed from arch/sparc64/kernel/sparc64_ksyms.c) | 11 | ||||
| -rw-r--r-- | arch/sparc/kernel/spiterrs.S (renamed from arch/sparc64/kernel/spiterrs.S) | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/sstate.c (renamed from arch/sparc64/kernel/sstate.c) | 0 |