aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Collapse)AuthorAge
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6Linus Torvalds2008-07-17
|\ | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6: pcmcia: ide-cs: Remove outdated comment pcmcia: fix cisinfo_t removal pcmcia: fix return value in cm4000_cs.c
| * pcmcia: fix return value in cm4000_cs.cDominik Brodowski2008-07-15
| | | | | | | | | | | | should be -EINVAL, not EINVAL. Found by Peter Stuge. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
* | APM emulation: Notify about all suspend events, not just APM invoked ones (v2)Johannes Berg2008-07-16
| | | | | | | | | | | | | | | | | | | | | | | | This revamps the apm-emulation code to get suspend notifications regardless of what way pm_suspend() was invoked, whether via the apm ioctl or via /sys/power/state. Also do some code cleanup and add comments while at it. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Andi Kleen <ak@linux.intel.com>
* | Merge commit 'origin/master'Benjamin Herrenschmidt2008-07-15
|\ \ | | | | | | | | | | | | | | | | | | | | | Manual merge of: arch/powerpc/Kconfig arch/powerpc/kernel/stacktrace.c arch/powerpc/mm/slice.c arch/ppc/kernel/smp.c
| * \ Merge branch 'generic-ipi' into generic-ipi-for-linusIngo Molnar2008-07-15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/powerpc/Kconfig arch/s390/kernel/time.c arch/x86/kernel/apic_32.c arch/x86/kernel/cpu/perfctr-watchdog.c arch/x86/kernel/i8259_64.c arch/x86/kernel/ldt.c arch/x86/kernel/nmi_64.c arch/x86/kernel/smpboot.c arch/x86/xen/smp.c include/asm-x86/hw_irq_32.h include/asm-x86/hw_irq_64.h include/asm-x86/mach-default/irq_vectors.h include/asm-x86/mach-voyager/irq_vectors.h include/asm-x86/smp.h kernel/Makefile Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * | fix: "smp_call_function: get rid of the unused nonatomic/retry argument"Ingo Molnar2008-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/char/sysrq.c: In function 'sysrq_showregs_othercpus': drivers/char/sysrq.c:218: error: too many arguments to function 'smp_call_function' Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * | on_each_cpu(): kill unused 'retry' parameterJens Axboe2008-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not even passed on to smp_call_function() anymore, since that was removed. So kill it. Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | | Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6Linus Torvalds2008-07-14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits) firmware: convert sb16_csp driver to use firmware loader exclusively dsp56k: use request_firmware edgeport-ti: use request_firmware() edgeport: use request_firmware() vicam: use request_firmware() dabusb: use request_firmware() cpia2: use request_firmware() ip2: use request_firmware() firmware: convert Ambassador ATM driver to request_firmware() whiteheat: use request_firmware() ti_usb_3410_5052: use request_firmware() emi62: use request_firmware() emi26: use request_firmware() keyspan_pda: use request_firmware() keyspan: use request_firmware() ttusb-budget: use request_firmware() kaweth: use request_firmware() smctr: use request_firmware() firmware: convert ymfpci driver to use firmware loader exclusively firmware: convert maestro3 driver to use firmware loader exclusively ... Fix up trivial conflicts with BKL removal in drivers/char/dsp56k.c and drivers/char/ip2/ip2main.c manually.
| | * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gitDavid Woodhouse2008-07-14
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sound/pci/Kconfig
| | | * | | dsp56k: use request_firmwareJaswinder Singh2008-07-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jaswinder Singh <jaswinder@infradead.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| | | * | | ip2: use request_firmware()David Woodhouse2008-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Converted with help from Jaswinder Singh Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Alan Cox <alan@redhat.com>
| | | * | | Fix a const assignment in moxa_load_fw()David Howells2008-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an assignment of a const pointer to a non-const pointer in moxa_load_fw(). Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| | | * | | cyclades: treat firmware data as constDavid Woodhouse2008-07-10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
* | | | | | Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-buildBenjamin Herrenschmidt2008-07-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual fixup of: arch/powerpc/Kconfig
| * | | | | Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6Linus Torvalds2008-07-14
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'bkl-removal' of git://git.lwn.net/linux-2.6: (146 commits) IB/umad: BKL is not needed for ib_umad_open() IB/uverbs: BKL is not needed for ib_uverbs_open() bf561-coreb: BKL unneeded for open() Call fasync() functions without the BKL snd/PCM: fasync BKL pushdown ipmi: fasync BKL pushdown ecryptfs: fasync BKL pushdown Bluetooth VHCI: fasync BKL pushdown tty_io: fasync BKL pushdown tun: fasync BKL pushdown i2o: fasync BKL pushdown mpt: fasync BKL pushdown Remove BKL from remote_llseek v2 Make FAT users happier by not deadlocking x86-mce: BKL pushdown vmwatchdog: BKL pushdown vmcp: BKL pushdown via-pmu: BKL pushdown uml-random: BKL pushdown uml-mmapper: BKL pushdown ...
| | * | | | Merge commit 'v2.6.26' into bkl-removalJonathan Corbet2008-07-14
| | |\ \ \ \
| | * | | | | ipmi: fasync BKL pushdownJonathan Corbet2008-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver really needs it to avoid races against open() Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | tty_io: fasync BKL pushdownJonathan Corbet2008-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | tpm-tpm: BKL pushdownArnd Bergmann2008-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | sonypi: BKL pushdownArnd Bergmann2008-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | rtc: BKL pushdownArnd Bergmann2008-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | nvram: BKL pushdownArnd Bergmann2008-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | mwave-mwavedd: BKL pushdownArnd Bergmann2008-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | lcd: BKL pushdownArnd Bergmann2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | ipmi-watchdog: BKL pushdownArnd Bergmann2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | ip27-rtc: BKL pushdownArnd Bergmann2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | hw-random: BKL pushdownArnd Bergmann2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | hpet: BKL pushdownArnd Bergmann2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | genrtc: BKL pushdownArnd Bergmann2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | efirtc: BKL pushdownArnd Bergmann2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | ds1620: BKL pushdownArnd Bergmann2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | ds1286: BKL pushdownArnd Bergmann2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | briq_panel: BKL pushdownArnd Bergmann2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | apm-emulation: BKL pushdownArnd Bergmann2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | agp-frontend: BKL pushdownArnd Bergmann2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | bkl-removal viotape fixupStephen Rothwell2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | Add a bunch of cycle_kernel_lock() callsJonathan Corbet2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of the open() functions which don't need the BKL on their face may still depend on its acquisition to serialize opens against driver initialization. So make those functions acquire then release the BKL to be on the safe side. Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | dsp56k: BKL pushdownJonathan Corbet2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put explicit lock_kernel calls into dsp56k_open(). [Stupid missing label error fixed] Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | raw: BKL pushdownJonathan Corbet2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put explicit lock_kernel() calls into raw_open(), even though the existing locking looks adequate. Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | tlckl: BKL pushdownJonathan Corbet2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put explicit lock_kernel calls into tlclk_open() Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | xilinx icap: BKL pushdownJonathan Corbet2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit lock_kernel() calls to hwicap_open() even though the existing locking looks adequate. Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | vcs: BKL pushdownJonathan Corbet2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit BKL to vcs_open(). Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | Add "no BKL needed" comments to several driversJonathan Corbet2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This documents the fact that somebody looked at the relevant open() functions and concluded that, due to their trivial nature, no locking was needed. Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | tty: cdev lock_kernel() pushdownJonathan Corbet2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Parts of the serial code actually BUG() if we don't do this.
| | * | | | | snsc: cdev lock_kernel() pushdownJonathan Corbet2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | drm: cdev lock_kernel() pushdownJonathan Corbet2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | lp: cdev lock_kernel() pushdownJonathan Corbet2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | mbcs: cdev lock_kernel() pushdownJonathan Corbet2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver would appear to have no internal locking at all. Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | viotape: cdev lock_kernel pushdown ()Jonathan Corbet2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| | * | | | | misc: cdev lock_kernel() pushdownJonathan Corbet2008-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | misc_open() looks fine, but who knows what all of the misc drivers are doing in their open() functions? Signed-off-by: Jonathan Corbet <corbet@lwn.net>
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-05 19:10:29 -0500