summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2006-01-1098-190/+285
|\
| * MIPS: Malta: Change CPU default to R2.Ralf Baechle2006-01-101-5/+5
| | | | | | | | | | | | | | | | ... giving those with with R1 or older CPU cards more rope to missconfigure their kernels. But MIPS is only selling R2 CPUs since two or three years already. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: R2: Set 64BIT_PHYS_ADDR for R2 processor also.Ralf Baechle2006-01-101-1/+1
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: R2: Try to bulletproof instruction_hazard against miss-compilation.Ralf Baechle2006-01-101-5/+15
| | | | | | | | | | | | | | | | | | | | | | Gcc has a tradition of misscompiling the previous construct using the address of a label as argument to inline assembler. Gas otoh has the annoying difference between la and dla which are only usable for 32-bit rsp. 64-bit code, so can't be used without conditional compilation. The alterantive is switching the assembler to 64-bit code which happens to work right even for 32-bit code ... Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: R2: Fix local_irq_save()Maxime Bizon2006-01-101-0/+1
| | | | | | | | | | | | | | | | | | local_irq_restore uses di which saves the whole status content, not just the IE bit resulting in local_irq_restore() to fail. This only happens if both CONFIG_CPU_MIPSR2 and CONFIG_IRQ_CPU are enabled. Signed-off-by: Maxime Bizon <mbizon@freebox.fr> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Don't pass -finline-limit=100000.Ralf Baechle2006-01-101-1/+0
| | | | | | | | | | | | | | | | | | This was a stop gap meassure for gcc 3.3 and newer sometimes not inlining inline functions in the 2.4 days. Starting we pass the always_inline attribute, so -finline-limit is no longer necessary and it's been shown to problematic on Sparc. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Namespace pollution: dump_regs() -> elf_dump_regs()Al Viro2006-01-102-4/+4
| | | | | | | | | | | | | | | | | | dump_regs() is used by a bunch of drivers for their internal stuff; renamed mips instance (one that is seen in system-wide headers) to elf_dump_regs() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Remove unused CONFIG_CPU_HAS_LLDSCD.Ralf Baechle2006-01-1024-31/+0
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Au1550: Fix OHCI memory map sizeSergei Shtylyov2006-01-101-2/+5
| | | | | | | | | | | | | | | | | | | | USB OpenHCI host controller on Au1550 only decodes memory addresses from 0x14020000 to 0x1407FFFF according to the databook, which gives 0x60000 (on the prior Au1x00 chips the map size was 1MB). Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Acked-by: Jordan Crouse <jordan.crouse@amd.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * Update Yoichi Yuasa's email address.Ralf Baechle2006-01-1038-46/+46
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Oprofile: Add 5K, 20K and 25K support.Ralf Baechle2006-01-102-0/+15
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Oprofile: Print error message if the CPU happen to have no counters.Ralf Baechle2006-01-101-1/+3
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@ongar.mips.com>
| * MIPS: Oprofile: Fixup the loose ends in the plumbing.Ralf Baechle2006-01-104-7/+49
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Reorganize ISA constants strictly as bitmasks.Ralf Baechle2006-01-102-31/+31
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@ongar.mips.com>
| * MIPS: MIPS boards: Get rid of useless SMP/non-SMP casing.Ralf Baechle2006-01-101-13/+2
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Introduce machinery for testing for MIPSxxR1/2.Ralf Baechle2006-01-1011-9/+95
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Rename MIPS_CPU_ISA_M{32,64} -> MIPS_CPU_ISA_M{32,64}R1.Ralf Baechle2006-01-104-19/+16
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: MT: Fix 32-bit dependencies.Ralf Baechle2006-01-101-4/+4
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Get rid of atomic_lock.Ralf Baechle2006-01-101-22/+21
| | | | | | | | | | | | It was resulting in build errors for some configurations. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: FP: Remove silly trick to avoid warning.Ralf Baechle2006-01-104-8/+0
| | | | | | | | | | | | Just doesn't fool a modern compiler anymore. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: DSP: Put mask field into the right place.Ralf Baechle2006-01-101-1/+1
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: DSP: Put DSPcontrol register into the right place in the signal frame.Ralf Baechle2006-01-101-1/+1
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: DSP: Set all register masks to 0x3ff.Ralf Baechle2006-01-101-3/+3
| | | | | | | | | | | | | | 0x2ff was a typo and the value 0x1f of DSP_MASK was refering to an old version of the documentation. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: Fix mdelay(1) for 64bit kernel with HZ == 1000Atsushi Nemoto2006-01-101-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | mdelay(1) (i.e. udelay(1000)) does not work correctly due to overflow. 1000 * 0x004189374BC6A7f0 = 0x10000000000000180 (>= 2**64) 0x004189374BC6A7ef (0x004189374BC6A7f0 - 1) is OK and it is exactly same as catchall case (0x8000000000000000UL / (500000 / HZ)). Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: DSP: eleminate used_dsp.Ralf Baechle2006-01-103-13/+4
| | | | | | | | | | | | | | | | | | used_dsp was meant to be used like used_math - but since the FPU context is small and lazy context switching is a stupid idea on multiprocessors this idea only got halfway implemented and those bits are were now breaking ptrace. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * MIPS: DSP: Context switch the DSPcontrol register also.Ralf Baechle2006-01-101-0/+2
| | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* | Fix rpc shutdown event condition bugLinus Torvalds2006-01-101-1/+1
| | | | | | | | | | | | | | | | We want to wait for the cl_users to go down to zero, not for it to stay positive. Quoth Trond (who wasn't even the author, but acked the wrong version): "Argh! I need to increase my daily caffeine dosages." Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] rcu: fix hotplug-cpu ->donelist leakOleg Nesterov2006-01-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pointed out by Srivatsa Vaddagiri <vatsa@in.ibm.com>. rcu_do_batch() stops after processing maxbatch callbacks on ->donelist leaving rcu_tasklet in TASKLET_STATE_SCHED state. If CPU_DEAD event happens remaining ->donelist entries are lost, rcu_offline_cpu() kills this tasklet. With this patch ->donelist migrates along with ->curlist and ->nxtlist to the current cpu. Compile tested. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Acked-by: Paul E. McKenney <paulmck@us.ibm.com> Cc: Srivatsa Vaddagiri <vatsa@in.ibm.com> Cc: Dipankar Sarma <dipankar@in.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] rcu: join rcu_ctrlblk and rcu_stateOleg Nesterov2006-01-102-44/+42
| | | | | | | | | | | | | | | | | | | | | | This patch moves rcu_state into the rcu_ctrlblk. I think there are no reasons why we should have 2 different variables to control rcu state. Every user of rcu_state has also "rcu_ctrlblk *rcp" in the parameter list. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Acked-by: Paul E. McKenney <paulmck@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] ide-cd: clear random-write capability it not supportedAndrey Borzenkov2006-01-101-0/+2
| | | | | | | | | | | | | | | | | | Add CDC-RAM to capability mask. This prevents udev incorrectly reporting RAM capabilities for device. Signed-off-by: Andrey Borzenkov <arvidjaar@mail.ru> Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] dm: don't enable bouncing by defaultJens Axboe2006-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | DM doesn't need to bounce bio's on its own, but the block layer defaults to that in blk_queue_make_request(). The lower level drivers should bounce ios themselves, that is what they need to do if not layered below dm anyways. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] cdrom: kill "open failed" error messageJens Axboe2006-01-101-1/+1
| | | | | | | | | | | | | | | | This triggers all the time with the various polled event programs, change it to CD_OPEN so it's supressed by default. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] ide: preserve errors for failed requestsJens Axboe2006-01-101-5/+6
| | | | | | | | | | | | | | | | To preserve the ->errors values for requests that failed, use the normal completion path for that. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Work around ppc64 compiler bugAnton Blanchard2006-01-101-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the process of optimising our per cpu data code, I found a ppc64 compiler bug that has been around forever. Basically the current RELOC_HIDE can end up trashing r30. Details of the bug can be found at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25572 This bug is present in all compilers before 4.1. It is masked by the fact that our current per cpu data code is inefficient and causes other loads that end up marking r30 as used. A workaround identified by Alan Modra is to use the =r asm constraint instead of =g. Signed-off-by: Anton Blanchard <anton@samba.org> [ Verified that this makes no real difference on x86[-64] */ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/inputLinus Torvalds2006-01-109-136/+5
|\ \
| * | Input: ibmasm - fix input initialization error pathDmitry Torokhov2006-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Do not try to free device that has already been unregistered, input_unregister_device() frees it automatically. Spotted by Vernon Mauery <vernux@us.ibm.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: remove obsolete maple input driversPaul Mundt2006-01-105-123/+0
| | | | | | | | | | | | | | | | | | | | | | | | These haven't worked in some time, and we've dropped support for the bus from the SH tree until someone shows some interest in maintaining it. Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: prepare for f_ops constnessArjan van de Ven2006-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Avoid doing assignments to a live ->fops so it can be marked as 'const'. Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: wistron - do not crash if BIOS does not support interfaceMiloslav Trmac2006-01-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | offset can never be < 0 because it has type size_t. The driver currently oopses on insmod if BIOS does not support the interface, instead of refusing to load. Signed-off-by: Miloslav Trmac <mitr@volny.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: grip_mp - kill commented out codeDmitry Torokhov2006-01-101-9/+0
| | | | | | | | | | | | | | | | | | Kill leftovers of dynalloc conversion. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2006-01-102-1/+3
|\ \ \
| * | | [MUTEX]: linux/mutex-debug.h needs linux/linkage.hDavid S. Miller2006-01-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | For FASTCALL() define. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Fix sys_fstat64() entry in 64-bit syscall table.David S. Miller2006-01-091-1/+1
| | |/ | |/| | | | | | | | | | | | | Noticed by Jakub Jelinek. Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds2006-01-1022-436/+896
|\ \ \
| * | | [PATCH] powerpc: Some ppc compile fixes...David Woodhouse2006-01-103-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets most of the Fedora rawhide RPM building again, as long as I disable CHRP. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] powerpc: Extended PCI config spaceBenjamin Herrenschmidt2006-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds back the call to pci_cfg_space_size() when building the PCI tree from OF nodes that was commented out due to the function not being exported by the PCI code. It's now exported, so let's use it. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] powerpc: remove compat_sys_pciconfig_*Stephen Rothwell2006-01-102-27/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Matthew Wilcox wondered why we need these functions. We don't. Remove them and just use the "normal" versions. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | powerpc: Introduce a new config symbol to control 16550 early debug codePaul Mackerras2006-01-106-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous change by Kumar Gala in this area led to legacy_serial.c and udbg_16550.c being built as modules when CONFIG_SERIAL_8250=m. Fix this by introducing a new symbol, CONFIG_PPC_UDBG_16550, to control whether these files get built, and arrange for it to be selected for those platforms that need it. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] powerpc/pseries: dlpar-add crash on null pointer dereflinas2006-01-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a crash on null-pointer deref during dlpar slot addition. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org> (cherry picked from 1c87c0f84943fbbc91826967ff4fea1b059a526f commit)
| * | | powerpc: Fix up some compile errors in the PCI error recovery codePaul Mackerras2006-01-102-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <asm/systemcfg.h> is gone now, and the PCI error recovery constants in include/linux/pci.h changed their names in the process of getting accepted. Signed-off-by: Paul Mackerras <paulus@samba.org> (cherry picked from 5a2516156c591fc3d2059fbd93f97e15eb6010d6 commit)
OpenPOWER on IntegriCloud