aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2005-04-03Linux 2.6.12-rc2HEADv2.6.12-rc2masterLinus Torvalds1-1/+1
2005-04-03[PATCH] x86_64: Fix segment constraintsAndi Kleen1-2/+2
Use a register target for segment register saving Pointed out by H.J.Lu
2005-04-03[PATCH] missing gameport dependenciesAlexander Viro1-0/+4
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 Viro1-0/+1
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 Viro1-4/+4
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 Viro2-6/+8
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 Viro4-14/+10
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 Viro1-1/+1
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 Viro1-1/+0
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 Hunold2-4/+7
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 Torvalds120-1479/+1848
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-04-03Merge bk://kernel.bkbits.net/davem/net-2.6Linus Torvalds5-20/+37
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-04-03[PATCH] kfree() NULL pointer cleanups - no need to check - fs/ext3/Jesper Juhl2-12/+6
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 Cao7-67/+91
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 Cao4-27/+17
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 Cao7-25/+68
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 Herrenschmidt1-1/+12
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 Herrenschmidt1-0/+3
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 Mackerras1-0/+3
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 Mackerras2-78/+54
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 Mackerras1-2/+13
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 Mackerras1-4/+4
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 Mackerras1-1/+1
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 Mackerras1-3/+1
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 Gala3-3/+3
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 Howells3-216/+384
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 Bottomley1-0/+2
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. Miller2-13/+22
into kernel.bkbits.net:/home/davem/sparc-2.6
2005-04-03Merge bk://linux-sam.bkbits.net/kconfigLinus Torvalds5-47/+18
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-04-04kconfig: complete cpufreq Kconfig cleanupRoman Zippel4-45/+16
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 Torvalds16-275/+338
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-04-03Merge bk://bk.arm.linux.org.uk/linux-2.6-serialLinus Torvalds3-149/+31
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-04-03Merge bk://bk.arm.linux.org.uk/linux-2.6-rmkLinus Torvalds27-139/+149
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-04-03[ARM] Fix u32 vs. pm_message_t in armpavel@cz.rmk.(none)14-15/+15
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 Viro2-13/+22
* 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 Xu1-1/+1
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 Bottomley1-1/+1
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 Zolnierkiewicz1-5/+2
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 Zolnierkiewicz4-110/+37
* 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 Zolnierkiewicz10-25/+91
* 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 Zolnierkiewicz10-108/+143
* 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 Zolnierkiewicz4-17/+54
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 Zolnierkiewicz1-3/+0
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 Zolnierkiewicz3-5/+5
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 Zolnierkiewicz2-4/+8
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 Dooks1-0/+16
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 Purdie12-124/+118
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. Miller0-0/+0
into kernel.bkbits.net:/home/davem/sparc-2.6
2005-04-01Merge davem@sunset.davemloft.net:/home/davem/src/BK/sparc-2.6David S. Miller0-0/+0
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. Miller1-3/+15
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>
2005-04-01Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6Linus Torvalds40-445/+648
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-04-01Merge bk://kernel.bkbits.net/davem/sparc-2.6Linus Torvalds33-208/+519
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-04-01PCI: revert dumb SGI patch for resource freeing.Greg Kroah-Hartman2-2/+1
Cset exclude: gregkh@suse.de|ChangeSet|20050317183046|30063 The patch doesn't do anything, and I'm not going to be trusting any more SGI pci hotplug patches for a long time... Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-04-01Merge davem@sunset:src/BK/sparc-2.6David S. Miller33-208/+519
into cheetah.davemloft.net:/home/davem/src/BK/sparc-2.6
2005-03-31Merge bk://kernel.bkbits.net/tgraf/net-2.6-tcf_extsDavid S. Miller3-18/+35
into sunset.davemloft.net:/home/davem/src/BK/net-2.6
2005-04-02Merge tgraf@kernel.bkbits.net:/home/tgraf/net-2.6-tcf_extsThomas Graf3-18/+35
into suug.ch:/home/tgr/dev/linux/net-2.6-tcf_exts
2005-04-01[NET]: Improve gnet_stats_* dumping logic to be less error proneThomas Graf1-13/+24
The recent additions to make gnet_stats_* useable for action statistics dumping in two steps introcuded a few error prone assumptions which can easly be forgotten. This patch fixes this up by simplifying the process of adding new fields to struct gnet_dump or adding additional backward compatibility TLVs. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-04-01[NET]: Allow dumping of application specific statistics if no primary TLV is ↵Thomas Graf2-5/+9
used Although this case is hypothetical at the moment, more advanced actions are likely to need this in the future. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-04-01[PKT_SCHED]: Properly return when no backward compatibility action ↵Thomas Graf1-0/+2
statistics are to be dumped Fixes a stupid bug introcuded in my "Fix action statistics dumping in compatibility mode" patch, no clue why it actually worked without this fix. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31Merge davem@nuts:/disk1/BK/sparc-2.6David S. Miller7-39/+78
into sunset.davemloft.net:/home/davem/src/BK/sparc-2.6
2005-03-31[SPARC64]: Store per-cpu pointer in IMMU TSB register.David S. Miller7-39/+78
This trick requires that we PAGE_SIZE align the per-cpu areas, but that is fine. Also, reduce the __per_cpu_offsets[] array into just two values, a base and a shift. Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31Merge proper selinux i_sock fix.Linus Torvalds1-18/+3
2005-03-31Merge sunset.davemloft.net:/home/davem/src/BK/sparcwork-2.6David S. Miller386-3561/+8590
into sunset.davemloft.net:/home/davem/src/BK/sparc-2.6
2005-03-31[PATCH] SELINUX: Fix i_sock reference.Trond Myklebust1-1/+1
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-31mergeGreg Kroah-Hartman41-446/+650
2005-03-31[SELINUX]: Fix for removal of i_sockStephen D. Smalley1-18/+3
This patch against -bk eliminates the use of i_sock by SELinux as it appears to have been removed recently, breaking the build of SELinux in -bk. Simply replacing the i_sock test with an S_ISSOCK test would be unsafe in the SELinux code, as the latter will also return true for the inodes of socket files in the filesystem, not just the actual socket objects IIUC. Hence this patch reworks the SELinux code to avoid the need to apply such a test in the first place, part of which was obsoleted anyway by earlier changes to SELinux. Please apply. Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: James Morris <jmorris@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31[PATCH] I2C: Fix a common race condition in hardware monitoringJean Delvare29-151/+499
Grant Coady noticed that most hardware monitoring drivers are exposed to a race condition when one writes to the sysfs files they create. While the read calls properly request a lock on the internal data, write calls manipulate the internal data without proper locking. This big patch fixes that by adding locking wherever needed. Affected drivers: adm1021, adm1025, asb100, ds1621, fscher, fscpos, gl518sm, gl520sm, it87, lm63, lm75, lm77, lm78, lm80, lm83, lm87, lm90, lm92, max1619, pc87360, pcf8591, sis5595, smsc47m1, via686a, w83627hf and w83781d The adm1026, adm1031 and lm85 were already locking on write calls, but held the lock for code that did not require it, so they have been modified too. The smsc47b397 and w83l785ts drivers were not affected, because they are read-only. The patch should apply just fine on top of your stack, provided that you applied all previous patches in order (in particular, there is one lm87 indentation patch which is needed). Signed-off-by: Grant Coady <gcoady@gmail.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-31[PATCH] I2C: Move functionality handling from i2c-core to i2c.hJean Delvare2-21/+8
So far, the functionality handling of i2c adapters was done in i2c-core by two exported functions: i2c_get_functionality and i2c_check_functionality. I found that both functions could be reduced to one line each, and propose that we turn them into inline function in the i2c.h header file, much like other i2c helper functions (e.g. i2c_get_clientdata, i2c_set_clientdata and i2c_clientname). The conversion of i2c_get_functionality suppresses a legacy check which shouldn't be needed anymore. Only one driver (s3c2410) was still relying on it, and was fixed some days ago. The conversion lets us get rid of two exports. Not only i2c-core gets smaller (by 458 bytes), but the client drivers using these functions get smaller too (typically by 48 bytes). And of course the new way is likely to be faster too, even if it wasn't my primary objective. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-31[PATCH] I2C: pcf8574 doesn't need a lockJean Delvare1-18/+9
While investigating the i2c chips drivers that were not properly locking, we found that the pcf8574 driver does the exact contrary. It uses a lock where it's not needed. While we were there, we did some additional cleanups to the driver: 1* Merge pcf8574_update_client() in show_read(), as it was the only user and the function became trivial once the locking was removed. 2* Add a validity check on values provided by user-space. Aurelien Jarno tested the modified code for confirmation and it worked just fine. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-31Merge bk://kernel.bkbits.net/davem/net-2.6Linus Torvalds124-906/+3542
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-03-31Merge bk://linux-acpi.bkbits.net/to-linusLinus Torvalds62-527/+1304
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-03-31Merge davem@sunset.davemloft.net:/home/davem/src/BK/sparc-2.6David S. Miller205-2156/+4180
into kernel.bkbits.net:/home/davem/sparc-2.6
2005-03-31[NBD]: Fix i_sock reference.David S. Miller1-1/+1
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31[NETFILTER]: ipt_hashlimit: Remove custom msecs_to_jiffies() macroTobias Klauser1-6/+4
Replace the MS2JIFFIES() macro with the msecs_to_jiffies() function provided in jiffies.h. The current macro is incorrect because HZ can have different values on different architectures. Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31[NETFILTER]: ipt_hashlimit: Fix bug introduced by hlist changes.jix@bugmachine.ca1-3/+3
Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31[ISDN]: Fix off-by-one errors in isdn_ppp.cAdrian Bunk1-5/+5
This patch fixes several off by one errors found by the Coverity checker (ippp_table has ISDN_MAX_CHANNELS elements). Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31[IPSEC]: Make IPCOMP more resilient.Herbert Xu2-29/+11
Since the IPCOMP header is left off when the payload is incompressible or too small, we can also do the same thing when we encounter an error during compression. In other words, we can let outbound IPCOMP always succeed. In the cases where it would currently fail we simply skip the IPCOMP transform. This makes IPCOMP slightly more resilient when memory is low and simplifies the code quite a bit. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: James Morris <jmorris@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31[NET]: Remove i_sockMatthew Wilcox5-9/+5
Remove i_sock from struct inode. Also remove some checks for SOCKET_I() returning NULL -- it can never return NULL for a valid inode. Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31[XFRM]: Simplify xfrm_policy_kill().Herbert Xu1-8/+9
So here is a patch to simplify xfrm_policy_kill() by moving the GC linking after the write_unlock_bh(). Actually, as the code stands, xfrm_policy_kill() should/will never be called twice on the same policy. So we can add a warning to catch that. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31[SPARC]: Implement pte_read() more cleanly.Tom 'spot' Callaway3-23/+12
Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31[IPSEC]: Check if SPI exists before creating acquire state.Patrick McHardy1-7/+25
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31[IPSEC]: Check SPI in xfrm_state_find()Patrick McHardy1-1/+2
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31[IPSEC]: Move xfrm_flush_bundles into xfrm_state GCHerbert Xu1-2/+11
Fixes ABBA deadlock noticed by Patrick McHardy. The locking in xfrm_state/xfrm_policy has always struck me as being an overkill. A lot of the locks should be replaced by rules that ensure the validity of most operations while a ref count is held. Now I have an excuse to do just that :) For 2.6.12 let's go for a simpler fix that breaks the dead lock. __xfrm_state_delete does not need to flush the bundles immediately. In fact, it is more efficient if we delay the flush to the GC worker since the flush is not dependent on any particular xfrm state. By delaying it we can do one single flush even when you're deleteing the entire xfrm state list. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31Merge bk://kernel.bkbits.net/acme/net-2.6David S. Miller42-345/+725
into sunset.davemloft.net:/home/davem/src/BK/net-2.6
2005-03-31[BONDING]: Do not drop non-VLAN trafficJay Vosburgh1-12/+3
Change the bonding driver to not drop non-VLAN traffic when a VLAN is configured above it. Originally fixed by Olaf Kirch <okir@suse.de>; I changed his patch slightly to update comments. Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31[PKT_SCHED]: Fix deadlock in sch_api.cCatalin Boie1-7/+34
While qdisc_create() is holding the rtnl_sem, it may try to load modules which in turn may try to register devices (teql is one such case), and it will then hang trying to retake the rtnl_sem. Signed-off-by: Catalin(ux aka Dino) BOIE <catab@umbrella.ro> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31[PKT_SCHED]: netem: Account for packets in delayed queue in qlenStephen Hemminger1-24/+25
Netem has a private queue for delayed packets, and currently, packets in this queue are not accounted for in the qdisc qlen statistics. This is a problem if netem is used inside another qdisc doing rate control that peeks at the qlen. This patch changes the statistics to include the packets held but not ready to send. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31[NETLINK]: More complete fix for race.Herbert Xu1-3/+3
Unfortunately my patch only closed half the race. There is still a chunk of code between netlink_dump_start and netlink_dump that runs outside the cb lock which isn't protected by an sk reference. Here is a better patch which protects the entire netlink_dump function with a sk reference. The other call to netlink_dump by recvmsg is safe as the open file descriptor already holds a reference. As such the final sock_put in netlink_dump can be turned into a __sock_put since there is at least one reference held by the caller. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-31Merge http://lia64.bkbits.net/linux-ia64-release-2.6.12Linus Torvalds15-134/+218
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-03-31Merge intel.com:/data/home/aegl/BK/work/1Tony Luck8-105/+174
into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.12
2005-03-31Merge intel.com:/data/home/aegl/BK/work/0Tony Luck2-26/+28
into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.12
2005-03-31[IA64] CONFIG_NUMA requires CONFIG_ACPI_NUMAAndrew Morton1-0/+1
arch/ia64/kernel/smpboot.c:511:17: #error Fixme: Dunno how to build CPU-to-node map. Seems that CONFIG_NUMA requires CONFIG_ACPI_NUMA. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
2005-03-31[IA64] Andrew's fixes for warnings on ia64 buildAndrew Morton1-2/+2
drivers/pci/msi.c: In function `msi_set_mask_bit': drivers/pci/msi.c:70: warning: cast from pointer to integer of different size drivers/pci/msi.c: In function `msi_capability_init': drivers/pci/msi.c:558: warning: cast to pointer from integer of different size Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
2005-03-31[IA64] Initialize ar.k7 to empty_zero_page early on.David Mosberger1-0/+9
Without this initialization, early TLB misses to any user-regions will cause the TLB miss handlers to go down in flames. Normally, no such early TLB misses occur, but aggressive use of lfetch.fault can trigger it easily (e.g., when using lfetch.fault for the prefetch()/prefetchw() macros we get an early miss for address 0 due to a prefetch in find_pid()). Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
2005-03-31[IA64] fix for unwind problem through dispatch_illegal_op_faultBob Montgomery1-0/+3
Here is the patch worked out with David Mosberger to fix the unwind info for dispatch_illegal_op_fault in ivt.S. Before adding this patch, an illegal op in the kernel would not show a complete stack trace in the oops message. Add PT_REGS_UNWIND_INFO to dispatch_illegal_op_fault to allow stack unwind to continue through that stack level when kernel code commits an illegal operation. Signed-off-by: Bob Montgomery <bob.montgomery@hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
2005-03-30Merge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6Linus Torvalds46-244/+2019
into ppc970.osdl.org:/home/torvalds/v2.6/linux
2005-03-30Merge intel.com:/data/home/aegl/BK/LinusTony Luck1-1/+1
into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.12
2005-03-30[SPARC64]: Put per-cpu area base into register g5.David S. Miller14-36/+124
FINALLY, we can put the per-cpu base into register g5 on SMP. There are many simplifications and improvements now, but this is the base implementation. Thanks to Rusty and the IA64 folks for urging that I pursue this kind of scheme instead of locking stuff into the TLB at some fixed virtual address. Signed-off-by: David S. Miller <davem@davemloft.net>
2005-03-30[PATCH] i2c: i2c-mv64xxx - set adapter owner and class fieldsMark A. Greer1-0/+2
This patch adds the correct values for the 'owner' and 'class' fields of the adapter structure in the mv64xxx i2c bus driver. The missing class field caused some i2c chip drivers to refuse to attempt a probe on the mv64xxx i2c bus. Signed-off-by: Chris Elston <chris.elston@radstone.co.uk> Signed-off-by: Mark A. Greer <mgreer@mvista.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Drop useless w83781d RT featuregrant_nospam@dodo.com.au1-100/+0
This patch removes useless RT feature from w83781d driver. Patch applies after the recent "I2C: Fix a common race condition in hardware monitoring" series. Signed-off-by: Grant Coady <gcoady@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Fix indentation of lm87 driverJean Delvare1-10/+10
This trivial patch fixes indentation in the lm87 driver. I need this 'cause I'll soon post patches affecting these portions of code, and I'd like these patches to be easily readable. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Fix broken force parameter handlingJean Delvare1-1/+1
I just noticed a nasty bug in the way the "force" parameter is handled for non-sensors i2c chip drivers. The "force" parameter supposedy is a list of adapter, address *pairs* where supported chips are unquestionably assumed to be. However, after handling one pair, the i2c core code searches for the next one *three* values later, not two. So with the current code, the second and third pairs wouldn't be properly handled. The fourth one would be, and so on. As a side note, this questions the need of an array parameter handling up to 24 of such pairs, when obviously nobody ever required more than one for the past 6 years. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] i2c: add adt7461 chip support to lm90 driver's Kconfig entryJean Delvare1-0/+3
Hi Greg, James, all, > > > Attached is another version of my adt7461 patch, for inclusion in > > > the 2.6 tree. Reviewed by Jean. > > May we have an additional patch to Kconfig for this one? Here it finally comes. This simple patch adds a mention to the ADT7461 chip in Kconfig, now that the lm90 driver supports it. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: i2c-s3c2410 functionality and fixesJean Delvare1-2/+13
This patch does the following updates to the i2c-s3c2410 bus driver: * Properly report the i2c functionality by adding to the `.functionality` field of the adapter * Change the dev_err() call on no-ack to an dev_dbg() to make it less noisy when the bus is being probed by i2cdetect, etc. * Add I2C_M_REV_DIR_ADDR to fully implement the I2C_FUNC_PROTOCOLO_MANGLING. * Ensure that the adapter owner field is set to THIS_MODULE Please apply, thanks. (Once this is applied, all i2c bus drivers will be properly reporting their functionality so I'll be able to go on with the i2c functionality core cleanups.) Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Fix race condition in it87 driverJean Delvare1-1/+1
I noticed a race condition in the it87, affecting the IT8712F chip only. The VRM value is currently initialized *after* creating the vrm and vid sysfs files. This leaves a theorical room for reading from these files and get an invalid value. It's not critical, but let's still fix it. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Delete useless instruction in it87Jean Delvare1-3/+0
The IT8705F doesn't support VID, so it's quite pointless to give a value to it (and an arbitrary one at that). I think that this instruction was there for compatibility reasons some times ago, but the reasons went away while the instruction was left in place. We can safely delete it now. Thanks to Rudolf Marek for testing the patch (you never know). Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: lsb in emc6d102 and adm1027Rafael Ávila de Espíndola1-23/+77
The attached patches add support for reading the lsb from the emc6d102 and change how they are read from the adm1027. The lm85_update_device function decodes the LSBs to temp_ext and in_ext. This strategy was suggested by Philip Pokorny. The patch also changes some macros to use the SCALE macro. I think that they become more readable this way. Signed-off-by: Rafael Ávila de Espíndola <rafael.espindola@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: lost arbitration detection for PCF8584Eric Brower1-3/+41
[PATCH] lost arbitration detection for PCF8584 algo driver Patch against a slightly-dated linux-2.6 BK tree This patch provides lost arbitration detection for the PCF8584 I2C algorithm driver. The PCF8584 LAB bit is set whenever lost arbitration is detected, so we check the bit in the wait_for_pin function and if LAB is detected we return -EINTR. The -EINTR value bubbles-up all the way to the master_xfer API call so callers may detect this condition explicitly. LAB could be checked more often, at the expense of code readability/maintainability. Signed-off-by: Eric Brower <ebrower@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: busses documentation update 2 of 2Rudolf Marek21-10/+915
Patch contains promised documentation update for i2c bus drivers. I would like to thank Jean Delvare and Aurelien Jarno for their comments. Signed-off-by: Rudolf Marek <r.marek@sh.cvut.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: busses documentation update 1 of 2Rudolf Marek1-0/+0
This patch just moves i2c-parport file to busses directory. Patch for other busses documentation will follow. Signed-off-by: Rudolf Marek <r.marek@sh.cvut.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Fix Vaio EEPROM detectionJean Delvare1-1/+2
This fixes a bug in the eeprom driver, which made all EEPROMs at location 0x57 be erroneously treated as Vaio EEPROMs. I have to say I'm quite ashamed that I introduced the bug in the first place, as this was a really stupid one. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Recognize new revision of the ADT7463 chipJean Delvare1-1/+3
This simple patch to the lm85 driver adds recognition of a new revision of the ADT7463 chip. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Avoid repeated resets of i2c-viaproJean Delvare1-8/+9
It was reported that the i2c-viapro SMBus driver sometimes has trouble on recent systems (VT8237 south bridge). The "Host Status" register has at least one additional bit used when compared with older south bridges of this family. The driver currently considers this additional bit as an error condition when it's set, causing repeated bus resets and sometimes read failures. This patch makes the driver ignore the bits of the "Host Status" register for which no definition is known. I wish I had a datasheet for the VIA VT8237, so that I could check what the additional bit is supposed to mean, but I don't. If someone has a datasheet or good contacts at VIA, please let me know. The patch was reported to fix the problem on a system with the VT8237, and was also tested not to break the driver on older VIA south bridges, so it seems to be safe. Thanks to Aurelien Jarno for the tests. Additionally, the patch makes the post-transaction bus reset slightly more efficient by sparing a few unneeded I/O operations. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Kill outdated defines in i2c.hJean Delvare1-10/+3
Some defines in i2c.h (I2C_CLIENT_MODPARM and friends) are now useless. They should have been removed when the i2c client parameters were converted from MODULE_PARAM to module_parm_array, but where not. This patch removes them now. Additionally, it moves the definition of I2C_CLIENT_MAX_OPTS next to where it is used rather than 220 lines before, which is preferable IMHO. As a side note, I think that there is a bug in the way these options are handled. The i2c code looks for I2C_CLIENT_END as a list terminator, but if the maximum number of parameters are actually provided, no terminator will be left. It's rather unlikely to happen because nobody will probably ever provide that many parameters, but this should probably be fixed. I'll address this issue later, since I plan to completely rewrite the way these parameters are handled anyway. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Fix some i2c algorithm initializationJean Delvare3-20/+10
While searching for i2c_algorithm declarations missing their .functionality member, I found three of them which were not properly initialized. i2c-algo-ite and i2c_sibyte_algo do not use the C99 initialization syntax, and i2c-ibm_iic.c explicitely initializes NULL members. Following patch puts some order in there. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Fix breakage in m41t00 i2c rtc driverMark A. Greer1-1/+0
Remove setting of deleted i2c_client structure member. The latest include/linux/i2c.h:i2c_client structure no longer has an 'id' member. This patch removes the setting of that no longer existing member. Signed-off-by: Mark A. Greer <mgreer@mvista.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Clean up of i2c-elektor.c buildFrank Beesley1-1/+1
This patch changes the flags variable type from long to unsigned long in one function. This removes a couple of warnings from the compile messages for elektor i2c bus driver. Signed-off-by: Frank Beesley <frank.beesley@aeroflex.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] i2c: add adt7461 chip support to lm90 driverJames Chapman1-3/+41
i2c: add adt7461 chip support The Analog Devices ADT7461 temperature sensor chip is compatible with the lm90 device provided its extended temperature range is not enabled. The chip will be ignored if the boot firmware enables extended temperature range. Also, since the adt7461 treats temp values <0 as 0 and >127 as 127, the driver prevents temperature values outside the supported range from being set. Signed-off-by: James Chapman <jchapman@katalix.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] i2c: new driver for ds1337 RTCJames Chapman3-0/+414
Signed-off-by: James Chapman <jchapman@katalix.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: group Intel on I2C Hardware Bus supportgrant_nospam@dodo.com.au1-19/+19
From an end-user perspective it is easy to miss the third Intel PIIX entry on the menuconfig "I2C Hardware Bus support" screen. Also the Intel 801 menu item does not mention ICH. This trivial patch groups three Intel entries together, adds ICH to menu item, and ICH5/ICH5R to the help section. Includes suggestions from Jean Delvare. Signed-off-by: Grant Coady <gcoady@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Skip broken detection step in it87Jean Delvare1-3/+2
One of the detection steps in the it87 chip driver was reported to be broken for some revisions of the IT8712F chip [1] [2]. This detection step is a legacy from the lm78 driver and the documentation available for the IT8705F and IT8712F chips does not mention it at all. For this reason, I propose to skip this detection step for Super-I/O chips. Super-I/O chips have already been identified when we reach this step, so it is redundant (additionally do being broken). This closes bug #4335. [1] http://bugzilla.kernel.org/show_bug.cgi?id=4335 [2] http://archives.andrew.net.au/lm-sensors/msg29962.html Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Make master_xfer debug messages more usefulJean Delvare1-1/+7
While working on the recent saa7110 mess, I found that the debug message displayed when calling master_xfer wasn't as useful as it could be. Here is a patch improving this. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Kill unused struct members in w83627hf driverJean Delvare1-5/+0
I just noticed that the pwmenable struct members in the w83627hf driver are not used anywhere (and quite rightly so, as PWM cannot be disabled in these chips as far as I know). Let's just get rid of them and save some bytes of memory. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Fix adm1021 alarms maskJean Delvare1-1/+1
This patch fixes an incorrect bitmasking on the status register in the adm1021 driver, which was causing high alarm on remote temperature to be hidden. This bug was found and reported by Jayakrishnan: http://bugzilla.kernel.org/show_bug.cgi?id=4285 Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: Cleanup adm1021 unused definesJean Delvare1-12/+0
While working on the adm1021 driver, I found that this driver has a number of unused (and useless) defines we could get rid of. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] I2C: New lm92 chip driverJean Delvare3-0/+435
This is a new i2c chip driver named lm92. It supports the National Semiconductor LM92 and Maxim MAX6635 chips. This time I did not port the driver from the lm_sensors project but instead rewrote it. The reason is that the original driver has a different structure from the other i2c chip drivers, which would have made maintenance harder. I don't have a compatible chip myself but could test my code thanks to Mark Hoffman's i2c-stub fake bus driver. Later on, James Chapman tested it on a real chip, successfully. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] i2c/i2c-elektor: remove interruptible_sleep_on_timeout() usageDomen Puncer1-3/+4
Replace deprecated interruptible_sleep_on_timeout() with direct wait-queue usage. Patch is compile-tested. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] i2c/i2c-ite: remove interruptible_sleep_on_timeout() usageDomen Puncer1-2/+5
Replace deprecated interruptible_sleep_on_timeout() with direct wait-queue usage. Patch is compile-tested, sort of; the driver does not build in vanilla kernel either, but I don't seem to add any warnings.. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-03-30[PATCH] Fix incorrect bluetooth socket zappingDavid Woodhouse1-1/+1
On Tue, 2005-03-15 at 22:50 +0000, Linux Kernel Mailing List wrote: > - parent->sk_zapped = 1; > + sock_set_flag(sk, SOCK_ZAPPED); Er, no. That zapped the wrong socket. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30Merge bk://kernel.bkbits.net/tgraf/net-2.6-trunkDavid S. Miller3-37/+2
into sunset.davemloft.net:/home/davem/src/BK/net-2.6
2005-03-31Cset exclude: tgraf@suug.ch|ChangeSet|20050316221421|24742Thomas Graf3-37/+2
2005-03-30[PATCH] nfsd4: fix indentation in nfsd4_openNeil Brown1-12/+12
OK, so it's trivial, but these misaligned comments have been bugging me forever.... Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nfsd4: fix open returns for other claim typesNeil Brown1-11/+21
Switch on OPEN claim type instead of if-else. add remaining OPEN claim types. Return nfserr_notsupp instead of nfserr_inval for valid claim types. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nfsd4: remove trailing whitespace from nfs4proc.cNeil Brown1-5/+5
Trivial whitespace Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nfsd4: rename release_delegationNeil Brown1-10/+6
Release_delegation is responsible for removing the delegation's connection with the v4 state and with the lease subsystem. The word "unhash" seems closer than "release" as a description of this.... Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nfsd4: acl error fixNeil Brown3-3/+12
When a client sends an ACL that is a legal NFSv4 ACL, but that we don't support (because we can't represent it using a POSIX ACL), the correct error to return is NFS4ERR_ATTRNOTSUPP. (rfc3530, section 5.11.1: "If the server recieves a request to set an ACE that it cannot store, it MUST reject the request with NFS4ERR_ATTRNOTSUPP. If the server receives a request to set an ACE that it can store but cannot enforce, the server SHOULD reject the request with NFS4ERR_ATTRNOTSUPP"). Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nfsd4: acl don't set named attrsNeil Brown1-3/+4
We were expecting {read,write}_named_attributes to be set in sync with the read and write bits. But we don't actually support named attributes, and when we eventually do, it's unlikely that we'll want to use these ACL mode bits to control access to them. So let's just stop supporting these two bits. This also updates our mapping to the latest ietf draft. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nfsd4: don't set WRITE_OWNER in either allow or deny bitsNeil Brown1-1/+4
WRITE_OWNER should be neither allowed nor denied. This improves interoperability with Solaris clients and represents our permissions more accurately. It breaks compatibility with clients using the old version of the NFSv4<->POSIX mapping. I believe the only code that did that was older versions of experimental client-side code available only from our website, so I prefer not to introduce a hack just to continue support the old mapping. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nfsd4_remove_unused_acl_functionNeil Brown1-27/+0
We're translating v4 ACL's to POSIX ACL's and relying on the filesystem to check those, so there's no need for a NFSv4 ACL-checking algorithm. Some day we'd like to find a way to implement the full v4 ACL protocol on the server side, but for now this is dead code. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nfsd4: fix failure to truncate on some opensNeil Brown1-14/+15
An OPEN upgrade on a file already open for WRITE will not upgrade the OPEN, but can still truncate the file. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nfsd4: factor out common open_truncate codeNeil Brown1-23/+23
Factor out a bit of common code. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nfsd4: allow read on open for writeNeil Brown1-1/+2
The rfc recommends allowing read using stateid's from opens that only requested write access, as clients may in some cases be unable to write without doing reads. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nfsd4: fix use after put() in cb_recallNeil Brown1-1/+1
nfs4_put_delegation() did a dprintk using a pointer that it had just called a put() on. This could cause a dereference of a pointer to freed memory in some situations. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nfsd4: remove unneeded stateowner argumentsNeil Brown1-5/+6
Remove the unneeded stateowner argument from nfs4_check_open() and init_stateid. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nfsd4: fix share conflict testsNeil Brown1-5/+3
In nfs4_check_open(): Move 'is_open_owner' check to be first. Remove continue so as to call test_share on OPENs with a previously seen open_owner as per rfc3530. Signed-off-by: Andy Adamson <andros@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] svcrpc: auth_domain documentationNeil Brown1-6/+8
The use of auth_domains is somewhat confusing, in part because they were originally intended to be used in a more general way than they currently are. Update the documentation a little with an eye towards how it's currently used. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] doc: where to find LDD3Jonathan Corbet2-1/+13
Here's an only mildly self-serving patch so that interested people can find the free version of LDD3. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] Fix atyfb build on ppcBenjamin Herrenschmidt1-2/+2
This patch fixes a build problem with atyfb on ppc. It uses the stuff in macmodes.c, but doesn't trigger the build of it. So if no other driver using macmodes is built, the link will fail. Signed-off-by: David Woodhouse <dwmw2@infradead.org> 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-03-30[PATCH] radeonfb: Preserve TMDS settingBenjamin Herrenschmidt1-2/+1
radeonfb tends to override TMDS_TRANSMITTER_CNTL completely, which appears to be incorrect with some recent flat panels. This patch changes this so that we only tweak the bits we want in there and preserve the BIOS value for the rest. Along with the i2c fix, that patch fixes operations on the latest Apple cinema displays. 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-03-30[PATCH] radeonfb: Fix mode setting on CRT monitorsBenjamin Herrenschmidt1-12/+10
Current radeonfb is a bit "anal" about accepting CRT modes, it basically only accepts modes that have the exact resolution, which tends to break with fbcon on console switches as it provides "approximate" modes. This patch fixes it by having the driver chose the closest possible mode instead of looking for an exact match. 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-03-30[PATCH] Fix matroxfb on big-endian hardwarePetr Vandrovec2-5/+13
There was too much/too few byteswapping done by driver and hardware in matroxfb on big endian hardware. Change fixes mirrored/split/corrupted letters seen on screen when using accelerated matroxfb mode. Patch was tested on Mips (by Peter) and x86-64 (by Petr). Signed-off-by: Peter 'p2' De Schrijver <p2@mind.be> Signed-off-by: Petr Vandrovec <vandrove@vc.cvut.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] remove redundant NULL checks before kfree() in drivers/video/Jesper Juhl12-47/+27
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-03-30[PATCH] neofb: Set hwaccel flags properlyAntonino Daplas1-3/+13
Not all neomagic chipsets are capable of hardware acceleration. Set the hwaccel flags only for chipsets that can do so. From: Antonino Daplas <adaplas@pol.net> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] neofb: mmio fixesAntonino Daplas1-1/+21
Changes in neo_map_mmio to make neofb working on NM2070, NM2090, NM2093. From: Marek Marczykowski <marmarek@staszic.waw.pl> Signed-off-by: Marek Marczykowski <marmarek@staszic.waw.pl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] fbcon: Do not set palette if console is not visibleAntonino Daplas1-0/+3
A long standing bug in fbcon where switching/opening a vt will also set the palette even if the vt is in the background. This results in color corruption in the foreground vt. From: Antonino Daplas <adaplas@pol.net> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] fbcon: Call set_par per fb_info once during initAntonino Daplas2-4/+15
Currently, fbcon will unconditionally do set_par's on all info's mapped to each console. This results in repetetive hardware initialization when one is enough. Fix this by skipping all fbdev's that already underwent initialization. From: Antonino Daplas <adaplas@pol.net> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] fbcon: Save var rotate field in struct displayAntonino Daplas2-0/+3
Add the rotate field among parameters saved in struct display (per console structure). Some out-of-tree drivers are possibly using this field. From: Antonino Daplas <adaplas@pol.net> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] s1d13xxxfb: Add support for Epson S1D13806 FBThibaut Varene4-0/+951
Add support for Epson S1D13806 framebuffer device. The driver is intended to be easily used with other S1D13xxx devices, hopefully by splitting the header file and changing a few defines. Since I haven't got the hardware to test that, though, I can only assert that it works with S1D13806. This driver has been succesfully tested on ARM embedded boards and reported working on SH architecture as well. Since this is my first framebuffer driver, I would welcome any suggestion/comment about it :) This driver has been built on top of some preliminary ARM specific work by Ben Dooks, and adapted from existing code (as stated in the header of s1d13xxxfb.c). Signed-off-by: Thibaut VARENE <varenet@parisc-linux.org> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] tridentfb: Clean up printk()'sAntonino Daplas2-2/+2
This patch adds KERN_ constants to all of the printk()'s that need them in drivers/video/tridentfb.c Signed-off-by: James Nelson <james4765@gmail.com> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] sisfb: Trivial cleanupsAntonino Daplas1-2/+2
sis_main.c vfree() checking cleanups. convert from pci_module_init to pci_register_driver (from:http://kerneljanitors.org/TODO). Signed-off by: James Lamanna <jlamanna@gmail.com> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] fbdev: Convert drivers to pci_register_driverAntonino Daplas18-18/+18
convert from pci_module_init to pci_register_driver (from:http://kerneljanitors.org/TODO). Signed-off-by: Christophe Lucas <c.lucas@ifrance.com> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] fbdev: Kconfig fix for macmodes and PPCAntonino Daplas3-7/+27
Fix link error for PPC-based drivers that also use functions in macmodes.c. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] atyfb: Add boot/module option to override composite syncAntonino Daplas1-0/+13
Some SPARC-based displays need the composite sync set to high. Since none of the entries in the default db has the composite sync set to high, using fb_find_mode() will produce a blank display. Signed-off-by: Antonino Daplas <adaplas@pol.net> Acked-by: Alexander Kern <alex.kern@gmx.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] Excessive atyfb debug messagesAlexander Kern1-2/+2
Debug is no longer needed by default. Driver is pretty stable. Signed-off-by: Alexander Kern <alex.kern@gmx.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] fbdev: Cleanups in drivers/video part 2Antonino Daplas8-56/+29
This patch contains cleanups under drivers/video/ including: - make some needlessly global code static - the following was needlessly EXPORT_SYMBOL'ed: - fbcon.c: fb_con - fbmon.c: get_EDID_from_firmware (completely unused) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Benoit Boissinot <benoit.boissinot@ens-lyon.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] pm2fb: X and VT switching crash fixAntonino Daplas1-1/+1
From: Jim Hague This is a bug in pm2fb.c exposed by recent changes to fbcon. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nvidiafb: Delete i2c bus on driver unloadAntonino Daplas4-4/+7
The driver nvidiafb fails to delete the i2c bus on load failure or unload. Fix From: Antonino Daplas <adaplas@pol.net> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nvidiafb: Process boot options earlierAntonino Daplas1-2/+2
A few options, such as noscale, are processed after hardware has been configured which render them useless. This manifest as failure of DVI displays to scale. Process them earlier. From: Antonino Daplas <adaplas@pol.net> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nvidiafb: Kconfig help text update for config FB_NVIDIAAntonino Daplas1-2/+1
Tiny trivial patch to fix up the help text for config FB_NVIDIA. Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nvidiafb: fix section referencesRandy Dunlap1-11/+11
Fix section usage in nvidiafb driver. Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nvidiafb: Maximize blit buffer capacityAntonino Daplas2-5/+18
Currently, nvidiafb blit expands a rectangle a scanline at a time. This is very inefficient because the graphics pipeline is not maximized. It may also crash if the scanline is > 4096 (should not happen with fbcon though). Instead of blitting a scanline at a time, attempt to fill up buffer to maximum capacity. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] fbcon: Stop framebuffer operations before hardware is properly ↵Antonino Daplas6-33/+22
initialized Accessing the hardware before it is properly initialized can lead to crashes or screen corruption. This happens when switching to X then back to console. When console comes back from X, the device is in an undefined state. During this window, accessing the hardware is disallowed. A new field in fbcon_par is added (graphics), which will be set to nonzero just before initialization of the framebuffer and when coming back from KD_GRAPHICS, then unset when an fb_set_var/fb_set_par is done. While this field is set, no accesses to the hardware is done. The consequence of this change is, hopefully, more robust switching between KD_GRAPHICS<-> KD_TEXT. An added benefit coming from this change is that the MODESWITCHLATE hack is not needed anymore and thus removed. This hack is used by savagefb, rivafb and nvidiafb. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] fbdev: mvidia licensing clarificationAntonino Daplas5-7/+86
Mark said that the nVidia licensing is MIT-style, so it should be okay. I'm including a patch that adds a small licensing comment on the pertinent files and also adds the license notice in nv_accel.c, just to be on the safe side. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] radeonfb: DDC i2c fixBenjamin Herrenschmidt1-0/+6
The radeonfb code for DDC probing (like it's X.org counterpart) uses to leave the DDC clock & data lines asserted after the probing is complete. This causes problems with some Apple monitors like the new Cinema HD 23", who will turn themselves off when that happens. This fixes it. 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-03-30[PATCH] radeonfb: Implement proper workarounds for PLL accessesBenjamin Herrenschmidt5-156/+114
After discussion with ATIs, it seems that the workarounds they initially gave me were not completely correct. This patch implements the proper ones, which includes sleeping in PLL accesses, and thus requires the previous patch to make sure we do not call unblank at interrupt time (unless oops_in_progress is set, in which case I use an mdelay). It also removes obsolete code that used to disable some power management features in the accel init code. 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-03-30[PATCH] ppc32: move powermac backlight stuff to a workqueueBenjamin Herrenschmidt1-18/+62
The powermac has a kernel-based driver for controlling the backlight from the keyboard that used to call into some fbdev's from interrupt contexts. This patch moves it to a workqueue (and additionally makes sure the console semaphore is taken and held). I hope I'll replace this by the new backlight framework in a future kernel version, but for now, this will fix the immediate issues with radeon. 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-03-30[PATCH] vt: don't call unblank at irq timeBenjamin Herrenschmidt3-9/+29
This patch removes the call to unblank() from printk, and avoids calling unblank at irq() time _unless_ oops_in_progress is 1. I also export oops_in_progress() so drivers who care like radeonfb can test it and know what to do. I audited call sites of unblank_screen(), console_unblank(), etc... and I _hope_ I got them all, the patch includes a small patch to the s390 bust_spinlocks code that sets oops_in_progress back to 0 _after_ unblanking for example. I added a few might_sleep() to help us catch possible remaining callers. I'll soon write a document explaining fbdev locking. The current situation after this patch is that: - All callbacks have console_semaphore held (fbdev's are fully serialised). - Everything is called in schedule'able context, except the cfb_* rendering operations and cursor operations, with the special case of unblank who can be called at any time when "oops_in_progress" is true. A driver that needs to sleep in it's unblank implementation is welcome to test that variable and use a fallback path (or just do nothing if it's not simple). 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-03-30[PATCH] zr36050 typo fixRonald Bultje1-1/+1
Fix a typo. It doesn't cause anything bad (at least not on my computer according to some tests), but who knows, maybe it fixes some obscure unfixeable bug for some people. Signed-off-by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] sched: fix schedstats warningNick Piggin1-1/+1
Quiet a warning when compiling without CONFIG_SMP Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] iput() can sleepRobert Love1-3/+4
iput() can sleep. Document it. Signed-off-by: Robert Love <rml@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] Kprobes: Allow/deny probes on int3/breakpoint instruction?Prasanna S. Panchamukhi4-6/+47
Kprobes did an improper exit when a probe is inserted on an int3 instruction. In case of normal execution of int3/breakpoint instruction, it oops!. Probe on an int3 instruction was not handled properly by the kprobes, it generated faults after oops! doing an improper exit with holding the lock. This fix employes a bit different method to handle probe on an int3/breakpoint instruction. On execution of an int3/breakpoint instruction (placed by kprobe), kprobes_handler() is called which sets it for single stepping in-line(it does not matter whether we single step out-of-line/inline since the single stepping instruction is same). Now it single steps on int3/breakpoint instruction here, entering kprobes_handler() once again. Kprobes now check's the status that it is single stepping and avoids the recursion. It runs down through the trap handler and oops messages is seen on the console since it executed int3/breakpoint instruction. Here the kprobes single stepping handler never gets called. Is this behaviour acceptable ? Or should we avoid putting probes on an int3 /breakpoint instruction ? How should it handle such situations? Below is the patch to allow probes on an int3/breakpoint instruction. This patch fixes the above problem by doing a proper exit while avoiding recursion. Signed-off-by: Prasanna S Panchamukhi <prasanna@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] kprobe_handler should check pre_handler functionAnanth N. Mavinakayanahalli4-11/+8
The kprobe_handler() code currently does not check if a pre_handler is registered for the kprobe under process. This leads to a NULL pointer dereference in cases when a module does not define a pre_handler. The patch corrects the issue by explicitly checking that the pre_handler is not NULL before it is invoked. Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] paport oops fixRussell King1-3/+5
It appears that the parport driver claims on-board superio devices without actually doing anything. When the driver is removed, we try to dereference non-existent driver data to unregister the ports. Since we didn't register anything, it's safe to ignore these devices in the remove function. Signed-off-by: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] nommu.c build error fixYoshinori Sato1-1/+6
- Argument addition of security_file_mmap. - Because in_gate_area_no_task undefined with CONFIG_KALLSYM=y, add it. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] kernel/rcupdate.c: make the exports EXPORT_SYMBOL_GPLAdrian Bunk1-3/+3
Due to the patent situation at least in the USA, the exports of kernel/rcupdate.c should be EXPORT_SYMBOL_GPL. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] Kill stupid warning when compiling riocmd.cRolf Eike Beer1-50/+17
My gcc complains about RIOCommandRup(), this is because this one has no forward declaration and uses old style parameter declaration. This patch changes all function headers in riocmd.c to use their parameter types in function header directly. Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] make Documentation/oops-tracing.txt relevant to 2.6Lee Revell1-17/+15
Here is a patch to finally bring oops-tracing.txt into the 2.6 era. Signed-Off-By: Lee Revell <rlrevell@joe-job.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] SX cli() conversionPatrick vd Lageweg2-21/+41
This patch converts all save_flags/restore_flags to the new spin_lock_irqsave/spin_unlock_irqrestore calls, as well as some other 2.6.X cleanups. This allows the "sx" driver to become SMP safe. Signed-off-by: Patrick vd Lageweg <patrick@bitwizard.nl> Signed-off-by: Rogier Wolff <R.E.Wolff@BitWizard.nl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] consolidate asm/ipc.hStephen Rothwell22-533/+49
All the asm*/ipc.h files are basically the same (for things that are used) so I have consolidated them all into asm-generic/ipc.h Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-By: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] cx24110 Conexant Frontend updateUwe Bugla1-0/+28
With Peter Hettkamp <peter.hettkamp@t-online.de> I transformed Peter's attempt into a kernel-compatible patch. The dvb frontend cx24110 is given back a send burst function which is needed by the dvbstream-engine of MPlayer 1.0pre6a, for example. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] make sysrq-F call oom_kill()christian@leber.de2-2/+23
Ky box (2.6.9-final) was yesterday completly stalled (mouse movable and stupid loadmeter was still working) after starting mutt and was swapping for half an hour until I sent SIGTERM to all processes. I suspect it was a 2 GB big galeon process that was the problem. I think sysrq needs a key to call oom_kill manually. From: Coywolf Qi Hunt <coywolf@sosdg.org> Move it into a workqueue to avoid taking VM locks from IRQ context. Signed-off-by: Coywolf Qi Hunt <coywolf@lovecn.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] uml: Fix the console stutteringRob Landley2-5/+2
I spent far too much of the weekend tracking this sucker down through the guts of the tty code. The problem turns out to be that drivers/char/n_tty.c has a write_chan that does buffering and retransmitting data, and arch/um/drivers/chan_kern.c ALSO has a write_chan that buffers and retransmits data, and the first calls the second but the second doesn't always return correct status information for the -EAGAIN case. When they get confused, both of them try to buffer and retransmit data, hence the stuttering. The first fix is that if chan_kern's write_chan gets an -EAGAIN, it should NOT gratuitously change that to a 0 before returning. I don't know why that code is in there, but deleting those two lines makes 90% the stuttering go away. But not quite all of it. The second half of the fix is arch/um/drivers/line.c has a buffer_data() function that adds data to the buffer, tries to flush the buffer out to disk, gets -EAGAIN, and then returns -EAGAIN even though it successfully buffered all the data it was sent. So the upper layer resubmits the last chunk of data it sent when the console unblocks, even though the lower layer buffered it and sent it on by that point. With this patch, I can't get the UML console to stutter anymore by suspending the process it's writing to. (Add tee to the mix and you can still make it hang by suspending its xterm for a second or two, but I think that tee is hanging, not UML. Hangs with RHEL4 tee, but not busybox tee...) Signed-off-by: Rob Landley <rob@landley.net> Acked-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] uml: correct error messagePaolo \'Blaisorblade\' Giarrusso1-1/+1
With "Anthony Brock" <Anthony_Brock@ous.edu> Replace the message with a more meaningful one. Noted by Anthony Brock. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] uml: fix hostfs special perm handlingPaolo \'Blaisorblade\' Giarrusso1-7/+13
When opening devices nodes on hostfs, it does not make sense to call access(), since we are not going to open the file on the host. If the device node is owned by root, the root user in UML should succeed in opening it, even if UML won't be able to open the file. As reported by Rob Landley, UML currently does not follow this, so here's a fix. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> CC: Rob Landley <rob@landley.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] uml: fixes a build failure with CONFIG_MODE_SKAS disabledPaolo \'Blaisorblade\' Giarrusso2-11/+11
This fixes a build failure (and also some warnings) when CONFIG_MODE_SKAS is disabled. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] uml: quick fix syscall tablePaolo \'Blaisorblade\' Giarrusso4-23/+16
*) Uml 2.6.11 does not compile with gcc 2.95.4 because some entries are duplicated, and that GCC does not accept this (unlike gcc 3). Plus various other bugs in the syscall table definitions: *) 223 is a syscall hole (i.e. ni_syscall) only on i386, on x86_64 it's a valid syscall (thus a duplicated one). *) __NR_vserver must be only once with sys_ni_syscall, and not multiple times with different values! *) syscalls duplicated in SUBARCHs and in common files (thus assigning twice to the same array entry and causing the GCC 2.95.4 failure mentioned above): sys_utimes, which is common, and sys_fadvise64_64, sys_statfs64, sys_fstatfs64, which exist only on i386. *) syscalls duplicated in each SUBARCH, to put in common files: sys_remap_file_pages, sys_utimes, sys_fadvise64 *) 285 is a syscall hole (i.e. ni_syscall) only on i386, on x86_64 the range does not arrive to that point. *) on x86_64, the macro name is __NR_kexec_load and not __NR_sys_kexec_load. Use the correct name in either case. Note: as you can see, part of the syscall table definition in UML is arch-independent (with everywhere defined syscalls), and part is arch-dependant. This has created confusion (some syscalls are listed in both places, some in the wrong one, some are wrong on one arch or another). Also, as add-ons: *) uses __va_copy instead of va_copy since some old versions of gcc (2.95.4 for instance) don't accept va_copy. *) some whitespace cleanups in the syscall table (if you don't like them, feel free to remove them). Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] uml: gprof depends on !TTPaolo \'Blaisorblade\' Giarrusso1-1/+1
CONFIG_GPROF depends on the fact that TT mode is disabled. I just verified this, and this dependency already exists in UML/2.4. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] uml: fix sigio spinlockPaolo \'Blaisorblade\' Giarrusso1-17/+12
I just saw a "take twice spinlock" deadlock with the Spinlock debugging enabled on this lock, and static code analysis revealed this is the culprit: update_thread can take (in an error path) the sigio_lock, which is already held by all its callers (it's a static function, so it's easy to verify). Added some comments to mark where this function needs the lock, in case someone wants to reduce the locking here. Also clean an exitcall to mark the thread as killed (won't hurt, and could be useful if things go wrong). As a bonus, some CodingStyle cleanups. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] m32r: build fix for CONFIG_DISCONTIGMEMHirokazu Takata2-8/+24
This patch fixes build error for CONFIG_DISCONTIGMEM. * arch/m32r/mm/discontig.c: Fix build error for CONFIG_DISCONTIGMEM. * arch/m32r/kernel/setup.c: ditto. * arch/m32r/mm/discontig.c: - Add topology_init. - Cosmetics: change indentation of comments. Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-03-30[PATCH] m32r: Fix spinlock.h for CONFIG_DEBUG_SPINLOCKHirokazu Takata1-4/+2
This patch is for fixing a build error of asm-m32r/spinlock.h for CONFIG_DEBUG_SPINLOCK. Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>