AgeCommit message (Collapse)AuthorLines
2005-11-19Linux v2.6.15-rc2v2.6.15-rc2Linus Torvalds-1/+1
2005-11-19Merge Torvalds-78/+36
2005-11-19Merge Torvalds-24/+27
2005-11-19Merge Torvalds-20/+15
Manual fixups to ARM ixp4xxx by hand.
2005-11-19Merge Torvalds-253/+57
2005-11-19[PATCH] ide: add missing __init tags to device driversBartlomiej Zolnierkiewicz-11/+5
Also remove bogus comments for idefloppy_init() and idetape_init(). Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-19[PATCH] ide: remove dead code from flagged_taskfile()Bartlomiej Zolnierkiewicz-11/+7
flagged_taskfile() is called from execute_drive_cmd() (the only user) only if args->tf_out_flags.all != 0. Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-19[PATCH] ide: remove dead DEBUG_TASKFILE codeBartlomiej Zolnierkiewicz-15/+0
Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-19[PATCH] ide: remove unused ide_action_t:ide_nextBartlomiej Zolnierkiewicz-7/+0
Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-19[PATCH] ide: remove duplicate documentation for ide_do_drive_cmd()Bartlomiej Zolnierkiewicz-25/+0
Remove duplicate documentation for ide_do_drive_cmd() from <linux/ide.h>, this function is already documented in ide-io.c. Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-19[PATCH] sis5513: enable ATA133 for the SiS965 southbridgeAurelien Jarno-0/+2
Signed-off-by: Aurelien Jarno <> Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-19[PATCH] via82cxxx: add VIA VT6410 IDE supportMathias Kretschmer-9/+22
From: Mathias Kretschmer <> Signed-off-by: Daniel Drake <> Acked-by: Alan Cox <> Signed-off-by: Andrew Morton <> Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-19[SERIAL] Remove unused variable in sa1100.cRussell King-1/+0
Since the spinlock was removed from sa1100_start_tx(), the "flags" variable becomes redundant. Remove it. Signed-off-by: Russell King <>
2005-11-19[SERIAL] Fix status reporting with PL011 serial driverRussell King-23/+27
The receiver status register reports latched error conditions, which must be cleared by writing to it. However, the data register reports unlatched conditions which are associated with the current character. Use the data register to interpret error status rather than the RSR. Signed-off-by: Russell King <>
2005-11-19powerpc: Fix bug in timebase synchronization on 32-bit SMP powermacPaul Mackerras-2/+4
We were using udelay in the loop on the primary cpu waiting for the secondary cpu to take the timebase value. Unfortunately now that udelay uses the timebase, and the timebase is stopped at this point, the udelay never terminated. This fixes it by not using udelay, and increases the number of loops before we time out to compensate. Signed-off-by: Paul Mackerras <>
2005-11-19[ARM] 3168/1: Update ARM signal delivery and maskingDaniel Jacobowitz-201/+14
Patch from Daniel Jacobowitz After delivering a signal (creating its stack frame) we must check for additional pending unblocked signals before returning to userspace. Otherwise signals may be delayed past the next syscall or reschedule. Once that was fixed it became obvious that the ARM signal mask manipulation was broken. It was a little bit broken before the recent SA_NODEFER changes, and then very broken after them. We must block the requested signals before starting the handler or the same signal can be delivered again before the handler even gets a chance to run. Signed-off-by: Daniel Jacobowitz <> Signed-off-by: Russell King <>
2005-11-19powerpc: Merge spinlock.hPaul Mackerras-22/+50
The result is mostly similar to the original ppc64 version but with some adaptations for 32-bit compilation. include/asm-ppc64 is now empty! Signed-off-by: Paul Mackerras <>
2005-11-19powerpc: move include/asm-ppc64/ptrace-common.h to arch/powerpc/kernelPaul Mackerras-2/+4
It's only used by arch/powerpc/kernel/ptrace{,32}.c. Signed-off-by: Paul Mackerras <>
2005-11-19powerpc: Merge pci.hPaul Mackerras-50/+83
This involves some minor changes: a few unused functions that the ppc32 pci.c provides are no longer declared here or exported; pcibios_assign_all_busses now just refers to the pci_assign_all_buses variable on both 32-bit and 64-bit; pcibios_scan_all_fns is now just 0 instead of a function that always returns 0 on 64-bit. Signed-off-by: Paul Mackerras <>
2005-11-19powerpc: Trivially merge several headers from asm-ppc64 to asm-powerpcPaul Mackerras-25/+49
For these, I have just done the lame-o merge where the file ends up looking like: #ifndef CONFIG_PPC64 #include <asm-ppc/foo.h> #else ... contents from asm-ppc64/foo.h #endif so nothing has changed, really, except that we reduce include/asm-ppc64 a bit more. Signed-off-by: Paul Mackerras <>
2005-11-19[PATCH] powerpc: Remove imalloc.hDavid Gibson-30/+26
asm-ppc64/imalloc.h is only included from files in arch/powerpc/mm. We already have a header for mm local definitions, arch/powerpc/mm/mmu_decl.h. Thus, this patch moves the contents of imalloc.h into mmu_decl.h. The only exception are the definitions of PHBS_IO_BASE, IMALLOC_BASE and IMALLOC_END. Those are moved into pgtable.h, next to similar definitions of VMALLOC_START and VMALLOC_SIZE. Built for multiplatform 32bit and 64bit (ARCH=powerpc). Signed-off-by: David Gibson <> Signed-off-by: Paul Mackerras <>
2005-11-19Merge branch 'mymerge' of ssh:// Mackerras-181/+110
2005-11-19[PATCH] powerpc: Fix setting MPIC priorityBenjamin Herrenschmidt-5/+8
Trying to set the priority would just disable the interrupt due to an incorrect mask used. We rarely use that call, in fact, I think only in the powermac code for the cmd-power key combo that triggers xmon. So it got unnoticed for a while. Signed-off-by: Benjamin Herrenschmidt <> Signed-off-by: Paul Mackerras <>
2005-11-18Merge Torvalds-341/+143
2005-11-18[COMPAT]: EXT3_IOC_SETVERSION is _IOW() not _IOR().David S. Miller-1/+1
Noticed by Helge Deller. Signed-off-by: David S. Miller <>
2005-11-18Merge branch 'for-linus' of ↵Linus Torvalds-26/+31
2005-11-18Merge branch 'parisc' of ↵Linus Torvalds-649/+245
2005-11-18IB/umad: make sure write()s have sufficient dataRoland Dreier-1/+1
Make sure that userspace passes in enough data when sending a MAD. We always copy at least sizeof (struct ib_user_mad) + IB_MGMT_RMPP_HDR bytes from userspace, so anything less is definitely invalid. Also, if the length is less than this limit, it's possible for the second copy_from_user() to get a negative length and trigger a BUG(). Signed-off-by: Roland Dreier <>
2005-11-18[PATCH] ide: fix ide_toggle_bounce() to not try to bounce if we have an IOMMUJames Bottomley-4/+4
The following patch fixes a crash caused by attempting to bounce buffer when an IDE CD-ROM is used on a machine with an IO-MMU. [At least, this patch fixes things so I can use my IDE CD-ROM behind an ns87415 on a HP PA-RISC workstation.] Signed-off-by: James Bottomley <> Signed-off-by: Kyle McMartin <> Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-18[PATCH] ide: make comment match realityRalf Baechle-1/+1
Signed-off-by: Ralf Baechle <> Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-18IB/mthca: Safer max_send_sge/max_recv_sge calculationMichael S. Tsirkin-4/+6
Calculation of QP capabilities still isn't exactly right in mthca: max_send_sge/max_recv_sge fields returned in create_qp can exceed the handware supported limits. Signed-off-by: Michael S. Tsirkin <> Signed-off-by: Roland Dreier <>
2005-11-18[PATCH] cs5520: fix return value of cs5520_init_one()Amit Gud-3/+2
From: Amit Gud <> Patch follows from the suggestions by AC and Felipe W Damasio for fixing the return codes from IDE drivers. [ bart: fix coding style while at it ] Signed-off-by: Amit Gud <> Signed-off-by: Domen Puncer <> Signed-off-by: Alexey Dobriyan <> Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-18[PATCH] siimage: docs urlsJeff Garzik-1/+7
Signed-off-by: Jeff Garzik <> Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-18[PATCH] aec62xxx: remove all dead (#if0'd) codeThibaut VARENE-47/+0
Signed-off-by: Thibaut VARENE <> Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-18Merge branch 'for-linus' of git:// Torvalds-23/+29
2005-11-18Merge branch 'master'Kyle McMartin-7078/+2047
2005-11-18[PATCH] pmac IDE: don't release empty interfacesThibaut VARENE-14/+0
From: Thibaut VARENE <> Cleaning up the hwif without knowing its previous state in pmac.c is a big and potentially dangerous job, and there seems to be no generic code interface that would provide either a way to properly release an hwif or to clean it up. Fixes OOPS for empty PMAC interface and add-on PCI controller. Acked-by: Benjamin Herrenschmidt <> Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-18[PATCH] alim15x3: use KERN_WARNINGAlexey Dobriyan-1/+1
Signed-off-by: Alexey Dobriyan <> Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-18[PARISC] Update CREDITS entriesKyle McMartin-2/+10
Update Randolph Chung's location, and add Thibaut Varene. Signed-off-by: Randolph Chung <> Signed-off-by: Thibaut Varene <> Signed-off-by: Kyle McMartin <>
2005-11-18[PARISC] Mark hisax and pcbit ISDN drivers as not for pariscMatthew Wilcox-7/+7
These drivers do not compile on big endian systems, and parisc is big endian. Also mark some as broken on m68k as well. Signed-off-by: Matthew Wilcox <> Signed-off-by: Kyle McMartin <>
2005-11-18[PATCH] alim15x3: replace pci_find_device() with pci_dev_present()Hanna Linder-1/+6
From: Hanna Linder <> The dev returned from pci_find_device() was not used so it can be replaced with pci_dev_present(). Compile tested. Signed-off-by: Hanna Linder <> Signed-off-by: Maximilian Attems <> Signed-off-by: Domen Puncer <> Signed-off-by: Alexey Dobriyan <> Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-18[PARISC] Mention PA-RISC in NS87415 helpMatthew Wilcox-1/+1
Mention PA-RISC in NS87415 help. PA-RISC [BCJ]xxx0 workstations come with NS87415 integrated for their CD-ROM drives. Signed-off-by: Matthew Wilcox <> Signed-off-by: Kyle McMartin <>
2005-11-18[PARISC] Make Serial MUX depend on a specific bus type.Matthew Wilcox-1/+1
Depend on GSC, not PARISC. Machines without GSC don't have a MUX. Signed-off-by: Matthew Wilcox <> Signed-off-by: Kyle McMartin <>
2005-11-18[PARISC] Fix compile warning caused by conflicting types of expand_upwards()Matthew Wilcox-1/+3
Fix compile warning caused by conflicting types of expand_upwards. IA64 requires it to not be static inline, as it's used outside mm/mmap.c Signed-off-by: Matthew Wilcox <> Signed-off-by: Kyle McMartin <>
2005-11-18[PATCH] ide: remove ide_driver_t.owner fieldLaurent Riffard-6/+8
The structure ide_driver_t have a .owner field which is a duplicate of .gendriver.owner field (.gen_driver is a struct device_driver). This patch removes ide_driver_t's owner field. Signed-off-by: Laurent Riffard <> Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-18[PATCH] via82cxxx IDE: support multiple controllersDaniel Drake-78/+117
Support multiple controllers in the via82cxxx IDE driver. Cable detection and ISA bridge finding have been moved into their own functions. Signed-off-by: Daniel Drake <> Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-18[PATCH] via82cxxx IDE: remove /proc/via entryDaniel Drake-188/+0
This entry adds needless complication to the driver as it requires the use of global variables to be passed into via_get_info(), making things quite ugly when we try and make this driver support multiple controllers simultaneously. This patch removes /proc/via for simplicity. On 10/13/05, Daniel Drake <> wrote: > Per Bart's suggestion, I've created a user-space app which shows identical > data (and doesn't even rely on the via82cxxx IDE driver). > > > > So, I think we should be clear to drop /proc/ide/via now. Signed-off-by: Daniel Drake <> Signed-off-by: Bartlomiej Zolnierkiewicz <>
2005-11-18[PATCH 3/3] cciss: add put_disk into cleanup routinesmikem-9/+24
Jeff Garzik pointed me to his code to see how to remove a disk from the system _properly_. Well, here it is... Every place we remove disks we are now testing before calling del_gendisk or blk_cleanup_queue and then call put_disk. Signed-off-by: Mike Miller <> Signed-off-by: Jens Axboe <>
2005-11-18[PATCH 2/3] cciss: bug fix for BIG_PASS_THRUJens Axboe-3/+4
Applications using CCISS_BIG_PASSTHRU complained that the data written was zeros. The problem is that the buffer is being cleared after the user copy, unless the user copy has failed... Correct that logic. Signed-off-by: Mike Miller <> Signed-off-by: Jens Axboe <>
2005-11-18[PATCH 1/3] cciss: bug fix for hpacuclimikem-1/+1
This patch fixes a bug that breaks hpacucli, a command line interface for the HP Array Config Utility. Without this fix the utility will not detect any controllers in the system. I thought I had already fixed this, but I guess not. Thanks to all who reported the issue. Please consider this this inclusion. Signed-off-by: Mike Miller <> Signed-off-by: Jens Axboe <>