summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2005-04-03Linux 2.6.12-rc2HEADv2.6.12-rc2origin/masterorigin/HEADmasterLinus Torvalds
2005-04-03[PATCH] x86_64: Fix segment constraintsAndi Kleen
Use a register target for segment register saving Pointed out by H.J.Lu
2005-04-03[PATCH] missing gameport dependenciesAlexander Viro
several pci-only drivers marked as dependent on PCI. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
2005-04-03[PATCH] missing include in lanai.cAlexander Viro
dma-mapping.h needs to be included there; on i386 it works by accident since there dma-mapping.h is indirectly brought in elsewhere. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
2005-04-03[PATCH] cpuset.c __user annotationsAlexander Viro
Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
2005-04-03[PATCH] usblcd portability fixAlexander Viro
usblcd.c passes address of size_t variable to function that expects int *. That breaks on 64bit big-endian, obviously. Fixed, along with the usb-skeleton.c - that's where the bug had been copied from. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
2005-04-03[PATCH] jsm fixesAlexander Viro
a) jsm depends on PCI. Kconfig fixed. b) spin_lock_irqsave() et.al. expect unsigned long, not u64. c) pointer arithmetics works just fine without casts to u64, thank you very much. d) iomem annotations added. e) jsm_get_mstat() lost bits - among other things it did if (mstat & UART_MSR_DSR) result |= TIOCM_DSR; and ended with return result; since TIOCM_DSR is 256 on e.g. i386, declaring result as unsigned char was a bad idea (function itself returns int). Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
2005-04-03[PATCH] generic_serial.c portability fixAlexander Viro
gs_wait_tx_flushed() should have its second argument (timeout) unsigned long, not int. One of the callers passes it MAX_SCHEDULE_TIMEOUT and function itself compares argument with that value. Since that's LONG_MAX, we get breakage on all 64bit platforms. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
2005-04-03[PATCH] non-portable include in codaAlexander Viro
fs/coda/upcall.c includes both asm/signal.h and linux/signal.h. For one thing, the former is included by the latter; for another, on some platforms it actually relies on the stuff included earlier in linux/signal.h (but not in upcall.c). Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] Fix Oops in MXB driver (v4l2 subsystem)Michael Hunold
This fixes a NULL pointer dereference Oops in my "Multimedia eXtension Board" driver. The tda9840 i2c driver dereferences the argument pointer, but the MXB driver is supplying a NULL pointer for one of the commands. The patch makes this one command behave like the others, ie. it expects an int argument. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03Merge bk://kernel.bkbits.net/davem/sparc-2.6Linus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-04-03Merge bk://kernel.bkbits.net/davem/net-2.6Linus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-04-03[PATCH] kfree() NULL pointer cleanups - no need to check - fs/ext3/Jesper Juhl
kfree() handles NULL pointers fine - checking is redundant. Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] ext3: move goal logical block into block allocation info structureMingming Cao
Moved i_next_alloc_block and i_next_goal_block out from ext3_inod_info, and put it together with the reservation structure into the ext3_block_alloc_info structure, and dynamically allocate that structure whenever need to allocation a block. This is also apply for noreservation mount. Also cleanup ext3_find_goal() code. Signed-off-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] ext3: reservation info cleanup: remove rsv_seqlockMingming Cao
Since now the ei->truncate_sem is guarding the concurrent allocation and the deallocation, there is no need to use the the rsv_seqlock lock in the ext3_reserve_window_node, which was there to protect using/allocating reservation window race between two threads allocating blocks at the same time. Signed-off-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] ext3: dynamic allocation of block reservation infoMingming Cao
Right now the ext3 reservation structure(ext3_reserve_window_node) is part of the ext3 inode itself. This part of information is only needed for files that need allocate blocks on disk. So, the attached patches reduce the ext3 inode size by dynamically allocating the block allocation/reservation info structure(called struct ext3_block_alloc_info) when it is needed(i.e. only for files who need to allocate blocks) The reservation structure is being allocated and linked to the ext3 inode at ext3_get_block_handle(), and being freed and unlinked at the iput_final->ext3_clear_inode(). The ei->truncate_sem which is currently used to protect concurrent ext3_get_block() and ext3_truncate is used to protect reservation structure allocation and deallocation. Signed-off-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] ppc64: Fix boot memory corruptionBenjamin Herrenschmidt
Nathan's patch "make OF node fixup code usable at runtim" is introducing a snaky bug. We do 2 passes over this code, one to measure how much memory will be needed so we can allocate a single block, and one to do the actual fixup. However, the new code does some result-checking of prom_alloc() which breaks this mecanism, as the first pass always starts at "0", thus we fail to measure the additional size properly and allocate a block smaller than what we'll actually use for the fixup. This cause us to override whatever sits there, with variable results depending on the memory layout of the machine (but typically crashes). This patch fixes it by starting the "measure" pass with an initial size set to 16 and not 0. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] ppc64: add definition for PAGE_AGPBenjamin Herrenschmidt
This fix DRM build on ppc64 (even if DRM here is not yet functional, you'll need the bleeding edge r300 stuff) by properly defining PAGE_AGP for the ppc64 architecture. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] ppc64: Export re{serv,leas}e_pmc_hardware() for oprofilePaul Mackerras
CONFIG_OPROFILE=m doesn't work on ppc64 if these aren't exported... Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] ppc32: clean up arch/ppc/syslib/prom_init.cPaul Mackerras
The call_prom routine in arch/ppc/syslib/prom_init.c, which does a client call to Open Firmware, returns a void *, and we use void * for instance handles and package handles that are returned from and used in OF calls. This is a bad idea - we can't ever dereference those things, and we end up with a lot of casts because arguments to and return values from OF calls are sometimes handles and sometimes numbers. This patch cleans things up by using u32 as the type for OF handles. The return type of call_prom becomes int because the return value from an OF call is often an int status code. The number of casts in prom_init.c is reduced substantially by this patch. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] ppc32: add syscall6 definitionPaul Mackerras
Since we have some syscalls with 6 arguments, it's useful to have a definition of _syscall6 in asm-ppc/unistd.h. This patch adds a suitable definition. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] ppc32: eliminate gcc warning in xmon.cPaul Mackerras
This patch shuts up some more incorrect gcc warnings. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] ppc32: eliminate gcc warning in prom.cPaul Mackerras
This patch shuts up a couple of gcc "variable may be used uninitialized" warnings. The warnings are invalid - the code is such that the variables are in fact initialized before being used - but gcc isn't smart enough to see that. This patch eliminates the warnings. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] ppc32: use correct sysrq functionPaul Mackerras
We were using an internal sysrq function instead of the exported public interface for registering a sysrq key in arch/ppc/xmon/start.c. This patch fixes it (and eliminates a compiler warning). Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] ppc32: rename head_e500.S to head_fsl_booke.SKumar Gala
Renamed head_e500.S to head_fsl_booke.S since the file is applicable to other PowerPC Book-E implementations from Freescale, not just the e500. Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] BDI: Improve nommu mmap supportDavid Howells
The attached patch improves nommu mmap support; particularly in terms on supporting private mappings. It does this by examining the device capability mask now in the backing_dev_info structure. Private mappings will now be backed by the underlying device directly if possible, where "possible" is constrained by the protection mask parameter and the device capabilities mask. I've also split the do_mmap_pgoff() function contents into a number of auxilliary functions to make it easier to understand. The documentation is also updated; including the addition of a warning about permitting direct mapping of flash chips and the problems of XIP vs write. Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03[PATCH] x86: fix subarch breakage in intel_cacheinfo.cJames Bottomley
Not all x86 subarchitectures have support for hyperthreading, so every piece you add for it has to be predicated on checks for CONFIG_X86_HT. The patch corrects this hyperthreading leakage problem in intel_cacheinfo.c Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-03Merge davem@sunset.davemloft.net:/home/davem/src/BK/sparc-2.6David S. Miller
into kernel.bkbits.net:/home/davem/sparc-2.6
2005-04-03Merge bk://linux-sam.bkbits.net/kconfigLinus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-04-04kconfig: complete cpufreq Kconfig cleanupRoman Zippel
This completes the Kconfig cleanup for all other archs. CPU_FREQ_TABLE was moved to drivers/cpufreq/Kconfig and is selected as needed. Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2005-04-03Merge bk://bart.bkbits.net/ide-2.6Linus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-04-03Merge bk://bk.arm.linux.org.uk/linux-2.6-serialLinus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-04-03Merge bk://bk.arm.linux.org.uk/linux-2.6-rmkLinus Torvalds
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-04-03[ARM] Fix u32 vs. pm_message_t in armpavel@cz.rmk.(none)
Patch from Pavel Machek This fixes u32 vs. pm_message_t confusion in arm. I was not able to even compile it, but it should not cause any problems. Please apply,
2005-04-03[SPARC]: iomem annotations in SOC driverAlexander Viro
* struct soc_cq split into two variants differing only in annotations - ones we use for requests have ->pool pointing to normal memory, ones for responses have it pointing to iomem. * all instances of soc_cq were either always of request or always of response variety; replaced with soc_cq_rsp and soc_cq_req resp. * the rest consists of trivial adding __iomem where needed - the only tricky bit had been soc_cq annotations. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-04-03[CRYPTO]: Update MAINTAINERS entry mailing list.Herbert Xu
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-04-03[NET]: Missing proto_list_lock initialization.James Bottomley
The new protocol registration locking uses a rwlock to limit access to the protocol list. Unfortunately, the initialisation: static rwlock_t proto_list_lock; Only works to initialise the lock as unlocked on platforms whose unlock signal is all zeros. On other platforms, they think it's already locked and hang forever. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-04-02[ide] fix via82cxxx resume failureBartlomiej Zolnierkiewicz
With David Woodhouse <dwmw2@infradead.org>. On resume from sleep, via_set_speed() doesn't reinstate the correct mode, because it thinks the drive is already configured correctly. Also kill redundant printk, ide_config_drive_speed() warns about errors. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2005-04-02[ide] kill ide-defaultBartlomiej Zolnierkiewicz
* add ide_drives list to list devices without a driver * add __ide_add_setting() and use it for adding no auto remove entries * kill ide-default pseudo-driver Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2005-04-02[ide] get driver from rq->rq_disk->private_dataBartlomiej Zolnierkiewicz
* add ide_driver_t * to device drivers objects * set it to point at driver's ide_driver_t * store address of this entry in disk->private_data * fix ide_{cd,disk,floppy,tape,scsi}_g accordingly * use rq->rq_disk->private_data instead of drive->driver to obtain driver (this allows us to kill ide-default) ide_dma_intr() OOPS fixed by Tejun Heo <htejun@gmail.com>. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2005-04-02[ide] kill ide_drive_t->diskBartlomiej Zolnierkiewicz
* move ->disk from ide_drive_t to driver specific objects * make drivers allocate struct gendisk and setup rq->rq_disk (there is no need to do this for REQ_DRIVE_TASKFILE requests) * add ide_init_disk() helper and kill alloc_disks() in ide-probe.c * kill no longer needed ide_open() and ide_fops[] in ide.c ide_init_disk() fixed by Andrew Morton <akpm@osdl.org>. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2005-04-02[ide] add ide_{un}register_region()Bartlomiej Zolnierkiewicz
Add ide_{un}register_region() and fix ide-{tape,scsi}.c to register block device number ranges. In ata_probe() only probe for modules. Behavior is unchanged because: * if driver is already loaded and attached to drive ata_probe() is not called et all * if driver is loaded by ata_probe() it will register new number range for a drive and this range will be found by kobj_lookup() If this is not clear please read http://lwn.net/Articles/25711/ and see drivers/base/map.c. This patch makes it possible to move drive->disk allocation from ide-probe.c to device drivers. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2005-04-02[ide] destroy_proc_ide_device() cleanupBartlomiej Zolnierkiewicz
When this function is called device is already unbinded from a driver so there are no driver /proc entries to remove. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2005-04-02[ide] drive->dsc_overlap fixBartlomiej Zolnierkiewicz
drive->dsc_overlap is supported only by ide-{cd,tape} drivers. Add missing clearing of ->dsc_overlap to ide_{cd,tape}_release() and move ->dsc_overlap setup from ide_register_subdriver() to ide_cdrom_setup() (ide-tape enables it unconditionally). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2005-04-02[ide] drive->nice1 fixBartlomiej Zolnierkiewicz
It is drive's property independent of the driver being used so move drive->nice1 setup from ide_register_subdriver() to probe_hwif() in ide-probe.c. As a result changing a driver which controls the drive no longer affects this flag. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2005-04-02[ARM PATCH] 2638/1: RX3715 - allow fclk as clock sourceBen Dooks
Patch from Ben Dooks Since the RX3715 inits with fclk as the clock source, and to allow the system to generate the baud-rates for bluetooth control, this patch configures the platform data for "fclk" as a clock source Signed-off-by: Ben Dooks Signed-off-by: Russell King
2005-04-02[ARM PATCH] 2637/1: Combine code for Sharp SL series parameter areaRichard Purdie
Patch from Richard Purdie The Sharp SL series bootloader puts a parameter structure into memory with important LCD parameters in it (amongst other things). The structure is common to collie, corgi, poodle, tosa and other models. This patch combines all the existing code into one place and simplifies access to the data. Signed-off-by: Richard Purdie Signed-off-by: Russell King
2005-04-01Merge davem@cheetah.davemloft.net:/home/davem/src/BK/sparc-2.6David S. Miller
into kernel.bkbits.net:/home/davem/sparc-2.6
2005-04-01Merge davem@sunset.davemloft.net:/home/davem/src/BK/sparc-2.6David S. Miller
into kernel.bkbits.net:/home/davem/sparc-2.6
2005-04-01[SPARC64]: Make sure per-cpu area address creates legal TSB value.David S. Miller
Older UltraSPARC chips only have a 43-bit sign extended TSB register. So we have to make sure the address we end up with will produce a valid value within that range. Signed-off-by: David S. Miller <davem@davemloft.net>