summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of /home/trondmy/kernel/linux-2.6/Trond Myklebust2006-06-20711-18041/+41752
|\
| * Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2006-06-19249-4172/+9993
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (51 commits) [MIPS] Make timer interrupt frequency configurable from kconfig. [MIPS] Correct HAL2 Kconfig description [MIPS] Fix R4K cache macro names [MIPS] Add Missing R4K Cache Macros to IP27 & IP32 [MIPS] Support for the RM9000-based Basler eXcite smart camera platform. [MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board [MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors. [MIPS] SN: include asm/sn/types.h for nasid_t. [MIPS] Random fixes for sb1250 [MIPS] Fix bcm1480 compile [MIPS] Remove support for NEC DDB5476. [MIPS] Remove support for NEC DDB5074. [MIPS] Cleanup memory managment initialization. [MIPS] SN: Declare bridge_pci_ops. [MIPS] Remove unused function alloc_pci_controller. [MIPS] IP27: Extract pci_ops into separate file. [MIPS] IP27: Use symbolic constants instead of magic numbers. [MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig. [MIPS] IP27: Cleanup N/M mode configuration. [MIPS] IP27: Throw away old unused hacks. ...
| | * [MIPS] Make timer interrupt frequency configurable from kconfig.Atsushi Nemoto2006-06-1956-75/+511
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make HZ configurable. DECSTATION can select 128/256/1024 HZ, JAZZ can only select 100 HZ, others can select 100/128/250/256/1000/1024 HZ if not explicitly specified). Also remove all mach-xxx/param.h files and update all defconfigs according to current HZ value. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Correct HAL2 Kconfig descriptionKumba2006-06-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The current HAL2 Kconfig description indicates it is only used on SGI Indy systems, however all members of the Indigo2 Family have this sound card as well. Plus a minor grammatical fix is included. Signed-off-by: Joshua Kinard <kumba@gentoo.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Fix R4K cache macro namesKumba2006-06-194-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Several machines have the R4K cache macro name spelled incorrectly. Namely, they have cpu_has_4kcache defined instead of cpu_has_4k_cache. Signed-off-by: Joshua Kinard <kumba@gentoo.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Add Missing R4K Cache Macros to IP27 & IP32Kumba2006-06-192-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Keeping in accordance with other machines, IP27 and IP32 lack a few macros. IP27 lacks cpu_has_4kex & cpu_has_4k_cache macros while IP32 lacks just the cpu_has_4k_cache macro. Signed-off-by: Joshua Kinard <kumba@gentoo.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Support for the RM9000-based Basler eXcite smart camera platform.Ralf Baechle2006-06-1927-9/+3528
| | | | | | | | | | | | | | | Signed-off-by: Thomas Koeller <thomas.koeller@baslerweb.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins boarddmitry pervushin2006-06-1921-0/+3118
| | | | | | | | | | | | | | | Signed-off-by: dmitry pervushin <dpervushin@ru.mvista.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors.Thomas Bogendoerfer2006-06-197-19/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for RM200C machines with big endian firmware Added support for RM200-C40 (R5000 support) Signed-off-by: Florian Lohoff <flo@rfc822.org> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] SN: include asm/sn/types.h for nasid_t.Ralf Baechle2006-06-191-0/+1
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Random fixes for sb1250Thiemo Seufer2006-06-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Random improvements for sb1250: Silence compiler warnings, a bugfix for the profiling code, and a comment typo. Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Fix bcm1480 compileThiemo Seufer2006-06-191-0/+2
| | | | | | | | | | | | | | | | | | | | | Fix compilation for bcm1480, a hpt is only available on sb1250/bcm112x. Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Remove support for NEC DDB5476.Ralf Baechle2006-06-1963-2480/+2
| | | | | | | | | | | | | | | | | | As warned several times before. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Remove support for NEC DDB5074.Ralf Baechle2006-06-1963-1233/+3
| | | | | | | | | | | | | | | | | | As warned several times before. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Cleanup memory managment initialization.Ralf Baechle2006-06-1934-45/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Historically plat_mem_setup did the entire platform initialization. This was rather impractical because it meant plat_mem_setup had to get away without any kind of memory allocator. To keep old code from breaking plat_setup was just renamed to plat_setup and a second platform initialization hook for anything else was introduced. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] SN: Declare bridge_pci_ops.Ralf Baechle2006-06-191-0/+2
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Remove unused function alloc_pci_controller.Ralf Baechle2006-06-191-5/+0
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] IP27: Extract pci_ops into separate file.Ralf Baechle2006-06-193-292/+308
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] IP27: Use symbolic constants instead of magic numbers.Ralf Baechle2006-06-191-2/+1
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig.Yoichi Yuasa2006-06-191-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary items from vr41xx/Kconfig. SYS_HA_CPU_VR41XX has already been selected by MACH_VR41XX. Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] IP27: Cleanup N/M mode configuration.Ralf Baechle2006-06-192-7/+22
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] IP27: Throw away old unused hacks.Ralf Baechle2006-06-191-8/+1
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Drop 0 definition for kern_addr_validRalf Baechle2006-06-192-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kern_addr_valid is currently only being used in kmem_ptr_validate which is making some vague attempt at verfying the validity of an address. Only IA-64, PARISC and x86-64 actually make some actual effort to verify the validity of the pointer. Most architecture definitions of kern_addr_valid() just define it as 1; the Alpha and CONFIG_DISCONTIGMEM on i386 and MIPS even as 0; the 0-definition will result in kmem_ptr_validate always failing which in turn will cause d_validate to always fail. d_validate's only two users are smbfs and ncpfs, so the 0 definition ended breaking those ... Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Consolidate definitions of pfn_valid in one file.Ralf Baechle2006-06-192-8/+19
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] APM emu supportRodolfo Giometti2006-06-194-0/+698
| | | | | | | | | | | | | | | Signed-off-by: Rodolfo Giometti <giometti@linux.it> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] SN: Rename SGI_SN0_N_MODE -> SGI_SN_N_MODE.Ralf Baechle2006-06-196-9/+9
| | | | | | | | | | | | | | | | | | It's not SN0-specific. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] SN: Move FRU header one level up; it is not SN0-specific.Ralf Baechle2006-06-192-5/+5
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Cleanup ARCH_DISCONTIGMEM_ENABLE and NUMA configuration.Ralf Baechle2006-06-192-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | IP27 configuration isn't the only NUMA system - it just happens to be the currently only supported MIPS NUMA system. So move the necessary options back into the main MIPS Kconfig file. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] IP27: Remove #if 0'ed code.Ralf Baechle2006-06-193-57/+0
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] IP27: Nuke leftovers of _STANDALONERalf Baechle2006-06-192-95/+3
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] IP27: Remove leftovers of sable support.Ralf Baechle2006-06-194-22/+2
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] IP27: Nuke last leftovers from FRUTESTRalf Baechle2006-06-191-14/+0
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] IP27: Nuke last leftovers of CONFIG_SGI_IO.Ralf Baechle2006-06-193-83/+2
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] C99-ify struct resource initialization.Ralf Baechle2006-06-1918-150/+395
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Remove duplicate declarations from Alchemy code.Ralf Baechle2006-06-191-4/+0
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Cleanup __emt() a bit.Ralf Baechle2006-06-191-3/+1
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Remove unused definitions from addrspace.h.Yoichi Yuasa2006-06-191-35/+0
| | | | | | | | | | | | | | | Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] arch/mips/au1000/time.c cleanupSergei Shtylyov2006-06-191-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Mark au1xxx_timer_setup() __init, just because it is. Get rid of unneeded extern's (note that (*do_gettimeoffset)() is already declared by <asm/time.c>) and an unused variable. Kill some whitespace... Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Remove unused instances of prom_build_cpu_map.Ralf Baechle2006-06-192-40/+0
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Qemu system shutdown supportThiemo Seufer2006-06-194-1/+45
| | | | | | | | | | | | | | | Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Unify mips_fpu_soft_struct and mips_fpu_hard_structs.Atsushi Nemoto2006-06-1912-109/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | The struct mips_fpu_soft_struct and mips_fpu_hard_struct are completely same now and the kernel fpu emulator assumes that. This patch unifies them to mips_fpu_struct and get rid of mips_fpu_union. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Remove prototype for non-existing function.Ralf Baechle2006-06-191-1/+0
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Wind River 4KC PPMC Eval Board SupportMark.Zhan2006-06-1913-0/+1420
| | | | | | | | | | | | | | | | | | | | | Support for the GT-64120-based Wind River 4KC PPMC Evaluation board. Signed-off-by: Rongkai.Zhan <Rongkai.zhan@windriver.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Au1xxx: board specific irq code cleanupHerbert Valerio Riedel2006-06-1911-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | Convert sizeof/sizeof use to use of ARRAY_SIZE macro, and annotate irqmap structures as __initdata. Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] IP27: Fix collision with hardcoded interrupt number.Ralf Baechle2006-06-192-3/+60
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Fix futex_atomic_op_inuser.Atsushi Nemoto2006-06-191-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found that NPTL's pthread_cond_signal() does not work properly on kernels compiled by gcc 4.1.x. I suppose inline asm for __futex_atomic_op() was wrong. I suppose: 1. "=&r" constraint should be used for oldval. 2. Instead of "r" (uaddr), "=R" (*uaddr) for output and "R" (*uaddr) for input should be used. 3. "memory" should be added to the clobber list. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [PATCH] Fix BCM1480 doubled process accounting times.[MIPS] James E Wilson2006-06-191-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running a UP kernel on a bcm1480 board, I get nonsensical timing results, like this: release@unknown:~/tmp$ time ./a.out real 0m22.906s user 0m45.792s sys 0m0.010s According to my watch, this program took 23 seconds to run, so the real time clock is OK. It is process accounting that is broken. I tracked this down to a problem with the function bcm1480_timer_interrupt in the file sibyte/bcm1480/time.c. This function calls ll_timer_interrupt for cpu0, and ll_local_timer_interrupt for all cpus. However, both of these functions do process accounting. Thus processes running on cpu0 end up with doubled times. This is very obvious in a UP kernel where all processes run on cpu0. The correct way to do this is to only call ll_local_timer interrupt if this is not cpu0. This can be seen in the mips-board/generic/time.c file, and also in the sibyte/sb1250/time.c file, both of which handle this correctly. I fixed the bcm1480/time.c file by copying over the correct code from the sb1250/time.c file. With this fix, I now get sensible results. release@unknown:~/tmp$ time ./a.out real 0m22.903s user 0m22.894s sys 0m0.006s Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Mark PNX8550 support broken.Ralf Baechle2006-06-191-0/+2
| | | | | | | | | | | | | | | | | | Broken in too many way for me to fix it for 2.6.17. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] Fix optimization for size build.Ralf Baechle2006-06-196-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | It took a while longer than on other architectures but gcc has finally started to strike us as well ... This also fixes the damage by 6edfba1b33c701108717f4e036320fc39abe1912. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * [MIPS] IP22: Fix ISA driver builds if CONFIG_EISA is selected.Ralf Baechle2006-06-191-0/+4
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
OpenPOWER on IntegriCloud