summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [MIPS] Create consistency in "system type" selection.Martin Michlmayr2006-06-011-43/+43
| | | | | | | | | | The "system type" Kconfig options on MIPS are not consistent. For some platforms, only the name is listed while other entries are prepended with "Support for". Remove this as it doesn't make sense when describing the "system type". Signed-off-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* [MIPS] Use generic DWARF_DEBUGAtsushi Nemoto2006-06-011-10/+3
| | | | | | | | | | | When debugging a kernel compiled by gcc 4.1 with gdb 6.4, gdb could not show filename, linenumber, etc. It seems fixed if I used generic DWARF_DEBUG macro. Although gcc 3.x seems work without this change, it would be better to use the generic macro unless there were something MIPS specific. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* [MIPS] Fix kgdb exception handler from user mode.Atsushi Nemoto2006-06-011-3/+5
| | | | | | | | Fix a calculation of saved vector address in trap_low. (damage done by lmo f4c72cc737561aab0d9c7f877abbc0a853f1c465) Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* [MIPS] Update struct sigcontext member namesDaniel Jacobowitz2006-06-013-34/+10
| | | | | | | | Rename the 64-bit sc_hi and sc_lo arrays to use the same names as the 32-bit struct sigcontext (sc_mdhi, sc_hi1, et cetera). Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* [MIPS] Update/fix futex assemblyRalf Baechle2006-06-011-25/+116
| | | | | | | | | o Implement futex_atomic_op_inuser() operation o Don't use the R10000-ll/sc bug workaround version for every processor. branch likely is deprecated and some historic ll/sc processors don't implement it. In any case it's slow. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* [MIPS] Remove support for sysmips(2) SETNAME and MIPS_RDNVRAM operations.Ralf Baechle2006-06-011-24/+0
| | | | | | | SETNAME only had a minor defect but probably never had a user and MIPS_RDNVRAM was unimplemented anyway. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* [MIPS] Fix detection and handling of the 74K processor.Chris Dearman2006-06-016-1/+14
| | | | | | | | Nothing exciting; Linux just didn't know it yet so this is most adding a value to a case statement. Signed-off-by: Chris Dearman <chris@mips.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* [MIPS] Add missing 34K processor IDsNigel Stephens2006-06-012-0/+2
| | | | | | The 34K is very much like a 24K on steroids. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* [MIPS] Fix marking buddy of pte global for MIPS32 w/36-bit physical addressSergei Shtylyov2006-06-011-39/+49
| | | | | | | | | | | | | | | | | | In case of CONFIG_64BIT_PHYS_ADDR, set_pte() and pte_clear() functions only set _PAGE_GLOBAL bit in the pte_low field of the buddy PTEs, forgetting to propagate ito to pte_high. Thus, the both pages might not really be made global for the CPU (since it AND's the G-bit of the odd / even PTEs together to decide whether they're global or not). Thus, if only a single page is allocated via vmalloc() or ioremap(), it's not really global for CPU (and it must be, since this is kernel mapping), and thus its ASID is compared against the current process' one -- so, we'll get into trouble sooner or later... Also, pte_none() will fail on global pages because _PAGE_GLOBAL bit is set in both pte_low and pte_high, and pte_val() will return u64 value consisting of those fields concateneted. Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* [MIPS] AU1xxx mips_timer_interrupt() fixesHerbert Valerio Riedel2006-06-012-0/+2
| | | | | | | | | | common/au1000/irq.c was missing a mips_timer_interrupt() prototype, whereas in common/au1000/time.c the actual mips_timer_interrupt() implementation was missing an irq_exit() invocation, causing a preempt_count() leak. Signed-off-by: Herbert Valerio Riedel <hvr@hvrlab.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* [MIPS] Fix typoRalf Baechle2006-06-011-1/+1
| | | | | | Found by Chris Dearman (chris@mips.com). Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* [PATCH] ARM: explicitly disable BTB on ixp2350Deepak Saxena2006-05-301-1/+2
| | | | | | | | | | | | We don't enable the BTB on the ixp2350 as that can cause weird crashes (erratum #42.) However, some bootloaders enable the BTB, which means that we have to disable the BTB explicitly. Found thanks to Tom Rini. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Revert "[PATCH] i386/x86_64: Force pci=noacpi on HP XW9300"Linus Torvalds2006-05-301-8/+0
| | | | | | | | | | | | | This reverts commit 5491d0f3e206beb95eeb506510d62a1dab462df1. As per Andi: "After some discussion with people who have the affected system it seems best to revert for 2.6.17. It broke a common BIOS workaround and PCI-X still doesn't work. Alternative is for people to change the BIOS which seems to be better right now." Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] x86_64: Don't do syscall exit tracing twiceAndi Kleen2006-05-301-6/+1
| | | | | | | | | | | int_ret_from_syscall already does syscall exit tracing, so no need to do it again in the caller. This caused problems for UML and some other special programs doing syscall interception. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] x86_64: Fix off by one in bad_addr checking in find_e820_areaRobert Hentosh2006-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Robert Hentosh <robert_hentosh@dell.com> Actually, we just stumbled on a different bug found in find_e820_area() in e820.c. The following code does not handle the edge condition correctly: while (bad_addr(&addr, size) && addr+size < ei->addr + ei->size) ; last = addr + size; if ( last > ei->addr + ei->size ) continue; The second statement in the while loop needs to be a <= b so that it is the logical negavite of the if (a > b) outside it. It needs to read: while (bad_addr(&addr, size) && addr+size <= ei->addr + ei->size) ; In the case that failed bad_addr was returning an address that is exactly size bellow the end of the e820 range. AK: Again together with the earlier avoid edma fix this fixes boot on a Dell PE6850/16GB Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] x86_64: Handle empty node zeroDaniel Yeisley2006-05-303-2/+8
| | | | | | | | | | | | | | | From: Daniel Yeisley <dan.yeisley@unisys.com> It is possible to boot a Unisys ES7000 with CPUs from multiple cells, and not also include the memory from those cells. This can create a scenario where node 0 has cpus, but no associated memory. The system will boot fine in a configuration where node 0 has memory, but nodes 2 and 3 do not. [AK: I rechecked the code and generic code seems to indeed handle that already. Dan's original patch had a change for mm/slab.c that seems to be already in now.] Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] x86_64: fix last_tsc calculation of PM timerJan Beulich2006-05-301-1/+1
| | | | | | | | | | | | | | | | | From: "Jan Beulich" <jbeulich@novell.com> The PM timer code updates vxtime.last_tsc, but this update was done incorrectly in two ways: - offset_delay being in microseconds requires multiplying with cpu_mhz rather than cpu_khz - the multiplication of offset_delay and cpu_khz (both being 32-bit values) on most current CPUs would overflow (observed value of the delay was approximately 4000us, yielding an overflow for frequencies starting a little above 1GHz) Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] i386: apic= command line option should always beJan Beulich2006-05-301-6/+10
| | | | | | | | | | | | From: "Jan Beulich" <jbeulich@novell.com> When using apic= on the kernel command line, this had no effect for machines matched by either the ACPI MADT or the MPS OEM table scan. However, when such option is specified, it should also take effect for this set of systems. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] x86_64: Fix no IOMMU warning in PCI-GART driverAndi Kleen2006-05-301-4/+2
| | | | | | | | Complaining about the IOMMU not compiled in doesn't make sense here because it is clearly compiled in. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] x86_64: Fix stack/mmap randomization for compat tasksAndi Kleen2006-05-302-3/+3
| | | | | | | | | | | | | | | | | ia32_setup_arg_pages would ignore the passed in random stack top and use its own static value. Now it uses the 8bit of randomness native i386 would use too. This indirectly fixes mmap randomization for 32bit processes too, which depends on the stack randomization. Should also give slightly better virtual cache colouring and possibly better performance with HyperThreading. Signed-off-by: Andi Kleen <ak@suse.de> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] cfq-iosched: fixup locking and ->queue_list list managementJens Axboe2006-05-301-12/+13
| | | | | | | | - Drop cic from the list when seen as dead. - Fixup the locking, just use a simple spinlock. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgartLinus Torvalds2006-05-304-1/+12
|\ | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] VIA PT880 Ultra support. [AGPGART] Fix Nforce3 suspend on amd64. [AGPGART] Enable SIS AGP driver on x86-64 for EM64T systems
| * [AGPGART] VIA PT880 Ultra support.Magnus Kessler2006-05-222-0/+8
| | | | | | | | | | | | | | | | | | | | | | This patch enables agpgart on a Via "PT880 Ultra" based motherboard (Asus P4V800D-X). The PCI ID of the PT880 Ultra is 0x0308 instead of 0x0258 of the PT880. The patched via-agp passes testgart. Signed-off-by: Magnus Kessler <Magnus.Kessler@gmx.net> Signed-off-by: Dave Jones <davej@redhat.com>
| * [AGPGART] Fix Nforce3 suspend on amd64.Dave Jones2006-05-211-0/+3
| | | | | | | | | | | | | | kernel.org bugzilla #6206 Based on patch from Serge Belyshev <belyshev@depni.sinp.msu.ru> Signed-off-by: Dave Jones <davej@redhat.com>
| * [AGPGART] Enable SIS AGP driver on x86-64 for EM64T systemsAndi Kleen2006-05-211-1/+1
| | | | | | | | | | | | | | | | | | Enable SIS AGP driver on x86-64 for EM64T systems Untested so far Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Dave Jones <davej@redhat.com>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds2006-05-306-20/+140
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [[CIFS] Pass truncate open flag through on file open in case setattr fails [CIFS] Fix typos in previous fix [CIFS] endian fix for new POSIX byte range lock support [CIFS] fix memory leak in cifs session info struct on reconnect [CIFS] ACPI suspend oops [CIFS] Do not limit the length of share names (was 100 for whole UNC name) [CIFS] Fix new POSIX Locking for setting lock_type correctly on unlock
| * | [[CIFS] Pass truncate open flag through on file open in case setattr failsSteve French2006-05-301-0/+2
| | | | | | | | | | | | | | | | | | | | | on set size to zero. Signed-off-by: Sebastian Voitzsch <sebastoam/vpotzscj@web.de> Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Fix typos in previous fixSteve French2006-05-302-5/+5
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] endian fix for new POSIX byte range lock supportSteve French2006-05-301-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] fix memory leak in cifs session info struct on reconnectSteve French2006-05-301-6/+82
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] ACPI suspend oopsSteve French2006-05-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wasn't able to reproduce a hard hang, but was able to get an oops if suspended the machine during a copy to the cifs mount. This led to some things hanging, including a "sync". Also got I/O errors when trying to access the mount afterwards (even when didn't see the oops), and had to unmount and remount in order to access the filesystem. This patch fixed the oops. Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Do not limit the length of share names (was 100 for whole UNC name)Steve French2006-05-302-4/+9
| | | | | | | | | | | | | | | | | | during mount. Especially important for some non-Western languages. Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Fix new POSIX Locking for setting lock_type correctly on unlockSteve French2006-05-305-7/+42
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-05-304-4/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NETFILTER]: PPTP helper: fix sstate/cstate typo [NETFILTER]: mark H.323 helper experimental [NETFILTER]: Fix small information leak in SO_ORIGINAL_DST (CVE-2006-1343)
| * | | [NETFILTER]: PPTP helper: fix sstate/cstate typoAlexey Dobriyan2006-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETFILTER]: mark H.323 helper experimentalPatrick McHardy2006-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETFILTER]: Fix small information leak in SO_ORIGINAL_DST (CVE-2006-1343)Marcel Holtmann2006-05-282-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that sockaddr_in.sin_zero is not zeroed during getsockopt(...SO_ORIGINAL_DST...) operation. This can lead to an information leak (CVE-2006-1343). Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Input: psmouse - DMI updates for lifebook protocolKenan Esau2006-05-291-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Added different lifebook-versions and the CF-18 to the corresponding dmi-table. Signed-off-by: Kenan Esau <kenan.esau@conan.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | Input: change from numbered to named switchesRichard Purdie2006-05-293-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | Remove the numbered SW_* entries from the input system and assign names to the existing users. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | Input: alps - fix old protocol decodingYotam Medini2006-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Correct touchpad left & right keys assignments for ALPS_OLDPROTO that were swapped. Old protocol is used on UMAX ActionBook-530T notebook. Signed-off-by: Yotam Medini <yotam.medini@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | Input: wistron - add support for AOpen Barebook 1559asmasc@theaterzentrum.at2006-05-291-0/+19
| | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | Input: psmouse - add detection of Logitech TrackMan Wheel trackballZbigniew Luszpinski2006-05-291-0/+6
| | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | Input: sidewinder - fix memory leakJesper Juhl2006-05-291-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In sw_connect we leak 'buf' and 'idbuf' when we do not leave via one of the fail* labels. This was spotted by the coverity checker. Patch is compile tested only due to lack of hardware. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | Input: add KEY_BATTERY keycodeMatthew Garrett2006-05-291-0/+2
|/ / | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Merge branch 'upstream-fixes' of ↵Linus Torvalds2006-05-281-0/+1
|\ \ | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] the latest consensus libata resume fix
| * | [PATCH] the latest consensus libata resume fixMark Lord2006-05-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Okay, just to sum things up. This forces libata to wait for up to 2 seconds for BUSY|DRQ to clear on resume before continuing. [jgarzik adds...] During testing we never saw DRQ asserted, but nonetheless (a) this works and (b) testing for DRQ won't hurt. Signed-off-by: Mark Lord <liml@rtr.ca> Acked-by: Jens Axboe <axboe@suse.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | ppc: Fix typo in TI_LOCAL_FLAGS definitionPaul Mackerras2006-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | A typo crept in with commit ea1e847cc202e805769c3c46ba5e5c53714068a1 which defined TI_LOCAL_FLAGS to be the offset of the `flags' field of struct thread_info, rather than the `local_flags' field. This fixes it. The typo was pointed out by Guennadi Liakhovetski. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | Merge branch 'merge' of ↵Linus Torvalds2006-05-277-26/+70
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] powerpc: fix RTC/NVRAM accesses on Maple [PATCH] ppc32 CPM_UART: various fixes for pq2 uart users [PATCH] powerpc: linuxppc64.org no more
| * | | [PATCH] powerpc: fix RTC/NVRAM accesses on MapleHollis Blanchard2006-05-261-3/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a firmware device tree bug, RTC and NVRAM accesses (including halt/reboot) on Maple have been broken since January, when an untested build fix went in. This code patches the device tree in Linux. Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com> Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc32 CPM_UART: various fixes for pq2 uart usersVitaly Bordug2006-05-265-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes various odd things that missed update together with cpm_uart platform_device move. Unified resources names, restructurisation, etc. Also, addressed issue with recent phys/virt translation rework. Being cache-coherent, CPM2's do alloc_bootmem() for the console stuff, and it was used to treat console buffer descriptor mapping 1:1 (as in CPM1 case), which is definitely wrong. Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
OpenPOWER on IntegriCloud