summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master'Jeff Garzik2005-10-3011-41/+488
|\
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2005-10-296-31/+16
| |\
| | * [CRYPTO] Simplify one-member scatterlist expressionsHerbert Xu2005-10-301-2/+2
| | | | | | | | | | | | | | | | | | | | | This patch rewrites various occurences of &sg[0] where sg is an array of length one to simply sg. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| | * [PATCH] Use sg_set_buf/sg_init_one where applicableDavid Hardeman2005-10-306-30/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uses sg_set_buf/sg_init_one in some places where it was duplicated. Signed-off-by: David Hardeman <david@2gen.com> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: Greg KH <greg@kroah.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| * | [PATCH] memory hotplug: move section_mem_map alloc to sparse.cDave Hansen2005-10-292-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This basically keeps up from having to extern __kmalloc_section_memmap(). The vaddr_in_vmalloc_area() helper could go in a vmalloc header, but that header gets hard to work with, because it needs some arch-specific macros. Just stick it in here for now, instead of creating another header. Signed-off-by: Dave Hansen <haveblue@us.ibm.com> Signed-off-by: Lion Vollnhals <webmaster@schiggl.de> Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] memory hotplug: sysfs and add/remove functionsDave Hansen2005-10-293-0/+458
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds generic memory add/remove and supporting functions for memory hotplug into a new file as well as a memory hotplug kernel config option. Individual architecture patches will follow. For now, disable memory hotplug when swsusp is enabled. There's a lot of churn there right now. We'll fix it up properly once it calms down. Signed-off-by: Matt Tolentino <matthew.e.tolentino@intel.com> Signed-off-by: Dave Hansen <haveblue@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] core remove PageReservedNick Piggin2005-10-292-7/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove PageReserved() calls from core code by tightening VM_RESERVED handling in mm/ to cover PageReserved functionality. PageReserved special casing is removed from get_page and put_page. All setting and clearing of PageReserved is retained, and it is now flagged in the page_alloc checks to help ensure we don't introduce any refcount based freeing of Reserved pages. MAP_PRIVATE, PROT_WRITE of VM_RESERVED regions is tentatively being deprecated. We never completely handled it correctly anyway, and is be reintroduced in future if required (Hugh has a proof of concept). Once PageReserved() calls are removed from kernel/power/swsusp.c, and all arch/ and driver code, the Set and Clear calls, and the PG_reserved bit can be trivially removed. Last real user of PageReserved is swsusp, which uses PageReserved to determine whether a struct page points to valid memory or not. This still needs to be addressed (a generic page_is_ram() should work). A last caveat: the ZERO_PAGE is now refcounted and managed with rmap (and thus mapcounted and count towards shared rss). These writes to the struct page could cause excessive cacheline bouncing on big systems. There are a number of ways this could be addressed if it is an issue. Signed-off-by: Nick Piggin <npiggin@suse.de> Refcount bug fix for filemap_xip.c Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [libata] remove ata_chk_err(), ->check_err() hook.Jeff Garzik2005-10-294-67/+9
|/ | | | | We now depend on ->tf_read() to provide us with the contents of the Error shadow register.
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-10-291-19/+47
|\
| * [ARM] Fix Assabet reboot with SA1100 MTD map driverRussell King2005-10-291-0/+9
| | | | | | | | | | | | | | | | Unfortunately, some devices forgot to reset the flash on reboot. Arrange for the map driver to suspend & resume the flash to ensure that it is in a sane state before rebooting. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] Allow MTD device name to be passed via platform dataRussell King2005-10-291-3/+3
| | | | | | | | | | | | | | Allow SA1100 devices to pass the name of the flash device to the SA1100 map driver. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] Fix MTD device/partition destructionRussell King2005-10-291-2/+9
| | | | | | | | | | | | | | We should not delete MTD partitions when we registered a MTD device. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] Add support for init/exit methods in sa1100 MTD map driverRussell King2005-10-291-3/+15
| | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] Rename 'data' to 'plat' in sa1100 MTD map driverRussell King2005-10-291-11/+11
| | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2005-10-2926-895/+3335
|\ \
| * | Fix build error caused by missmatching duplicate declaration.Ralf Baechle2005-10-291-1/+0
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | Let it compile again after i2c algo id removal. Sort headers.Ladislav Michl2005-10-293-17/+14
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | Au1[12]00 mmc driver. Only tested on the Au1200 at this point thoughPete Popov2005-10-294-0/+1132
| | | | | | | | | | | | | | | | | | it should work on the Au1100 as well. Updated defconfig to include driver. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | Updated pcmcia driver with pb1200 and db1200 support.Pete Popov2005-10-293-4/+23
| | | | | | | | | | | | | | | | | | Updated db1200_defconfig so pcmcia is enabled by default. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | - moved platform structure to platform.cPete Popov2005-10-291-7/+1
| | | | | | | | | | | | | | | | | | | | | - fixed an iounmap warning - export fixup_xx, needed by the module Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | Cleaned up AMD Au1200 IDE driver:Pete Popov2005-10-293-1/+1281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - converted to platform bus - removed pci dependencies - removed virt_to_phys/phys_to_virt calls System now can root off of a disk. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> diff --git a/Documentation/mips/AU1xxx_IDE.README b/Documentation/mips/AU1xxx_IDE.README new file mode 100644
| * | Use physical addresses at the interface level, letting drivers remapMaciej W. Rozycki2005-10-292-57/+43
| | | | | | | | | | | | | | | | | | them as appropriate. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | Remove left-over unused bits.Maciej W. Rozycki2005-10-291-12/+0
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | Fix function types to ones appropriate for initcalls.Maciej W. Rozycki2005-10-291-3/+5
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | Deal with the bloody KSEG vs CKSEG horror...Maciej W. Rozycki2005-10-292-5/+4
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | dec_esp: Use physical addressesMaciej W. Rozycki2005-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | These should really be addresses obtained with ioremap() or some bus-specific backend, but for now... Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | Fix dependencies for DECstation framebuffers.Maciej W. Rozycki2005-10-291-4/+4
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | Au1100 FB driver uplift for 2.6.Pete Popov2005-10-293-777/+810
| | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Antonino Daplas <adaplas@pol.net>
| * | qtronix.c: Handle kmalloc failure.Ralf Baechle2005-10-291-0/+5
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | It helps to not use a _mem_ function for requesting I/O space.Thiemo Seufer2005-10-291-7/+13
| | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | Resurrect Cobalt support for 2.6.Ralf Baechle2005-10-292-3/+3
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* | | Merge branch 'upstream-linus' of ↵Linus Torvalds2005-10-298-167/+716
|\ \ \ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| * | | [PATCH] sata_sil24 iomem annotations and fixesAl Viro2005-10-291-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | trivial iomem annotations + missing memcpy_fromio() caught by those Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] libata-core cleanups (updated)Randy Dunlap2005-10-291-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libata-core cleanups: - use kzalloc() instead of kmalloc() + memset(); - use one exit path in ata_device_add(); Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [libata] ensure ->tf_read() hook reads Status and Error registersJeff Garzik2005-10-295-14/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want ->tf_read() to get a complete snapshot of all taskfile registers, without requiring the callers to manually call ata_chk_status() and ata_chk_err() themselves. This also fixes a minor bug in sata_vsc where the lower bits of the feature register were incorrectly placed in the HOB (high order bits) portion of struct ata_taskfile.
| * | | Merge branch 'master'Jeff Garzik2005-10-28354-6635/+8816
| |\ \ \
| * | | | [PATCH] libata: add support for Promise SATA 300 TX2plus PDC40775Ed Kear2005-10-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm using this card in a RAID1 with 2 new SATA drives with no problems. Card - SATA 300 TX2plus PDC40775 (3d73) Signed-off-by: Ed Kear <ed@kear.net> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | [libata sata_promise] add pci idJeff Garzik2005-10-281-0/+2
| | | | | | | | | | | | | | | | | | | | Contributed by Daniel Mueller @ Siemens AG.
| * | | | [libata scsi] MODE SELECT, strengthen mode senseDouglas Gilbert2005-10-281-41/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move default mode pages to the front of libata-scsi.c so various functions can access them - partial annotation of these pages, point out divergence from sat-r06 - replace various mode page magic numbers with defines - strengthen MODE SENSE command decoding: handle DBD bit in cdb, yield block descriptor (per sat-r06) and handle mode sub pages Signed-off-by: Douglas Gilbert <dougg@torque.net> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | [libata pdc_adma] minor fixes and cleanupsJeff Garzik2005-10-281-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes mostly from Mark Lord. - fix bugs in probe-time error handling - only complete qc if not NULL - check port-level polling flags
| * | | | Merge branch 'master'Jeff Garzik2005-10-28229-5263/+6943
| |\ \ \ \
| * \ \ \ \ Merge branch 'upstream'Jeff Garzik2005-10-2121-97/+316
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'upstream'Jeff Garzik2005-10-1869-586/+2283
| |\ \ \ \ \ \
| * | | | | | | [libata passthru] update ATAPI completion for new error handlingJeff Garzik2005-10-091-1/+6
| | | | | | | |
| * | | | | | | Merge branch 'upstream'Jeff Garzik2005-10-0910-563/+1751
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-10-0923-325/+213
| |\ \ \ \ \ \ \ \
| * | | | | | | | | [libata passthru] add (DRIVER_SENSE << 24) to all check-conditionsJeff Garzik2005-10-061-3/+3
| | | | | | | | | |
| * | | | | | | | | [libata passthru] fix leak on errorJeff Raubitschek2005-10-041-2/+4
| | | | | | | | | |
| * | | | | | | | | Merge /spare/repo/linux-2.6/Jeff Garzik2005-10-04124-862/+15272
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge /spare/repo/linux-2.6/Jeff Garzik2005-09-24226-3346/+10160
| |\ \ \ \ \ \ \ \ \ \
OpenPOWER on IntegriCloud