]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Matt Fleming [Thu, 12 Apr 2012 22:51:41 +0000 (08:51 +1000)]
avr32: use block_sigmask()
Use the new helper function introduced in commit
5e6292c0f28f ("signal:
add block_sigmask() for adding sigmask to current->blocked") which
centralises the code for updating current->blocked after successfully
delivering a signal and reduces the amount of duplicate code across
architectures.
In the past some architectures got this code wrong, so using this helper
function should stop that from happening again.
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Havard Skinnemoen <hskinnemoen@gmail.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Oleg Nesterov [Thu, 12 Apr 2012 22:51:40 +0000 (08:51 +1000)]
avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
It is wrong to change ->blocked directly, see
e6fa16ab . Change
handle_signal() and sys_rt_sigreturn() to use the right helper,
set_current_blocked().
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Acked-by: Havard Skinnemoen <hskinnemoen@gmail.com>
Reviewed-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Matt Fleming [Thu, 12 Apr 2012 22:51:40 +0000 (08:51 +1000)]
avr32: don't mask signals in the error path
The current handle_signal() implementation is broken - it will mask
signals if we fail to setup the signal stack frame, which isn't the
desired behaviour, we should only be masking signals if we succeed in
setting up the stack frame. It looks like this code was copied from the
old (broken) arm implementation but wasn't updated when the arm code was
fixed in commit
a6c61e9dfdd0 ("[ARM] 3168/1: Update ARM signal delivery
and masking").
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Acked-by: Havard Skinnemoen <hskinnemoen@gmail.com>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Vasiliy Kulikov [Thu, 12 Apr 2012 22:51:39 +0000 (08:51 +1000)]
arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Don't allow everybody to use a modem.
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Linus Walleij <linus.walleij@stericsson.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrew Morton [Thu, 12 Apr 2012 22:51:39 +0000 (08:51 +1000)]
drivers/xen/Kconfig: fix Kconfig layout
Fit it into 80 columns so that it is readable in menuconfig.
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrew Morton [Thu, 12 Apr 2012 22:51:38 +0000 (08:51 +1000)]
arch/x86/kernel/apic/io_apic.c: move io_apic_level_ack_pending() inside CONFIG_GENERIC_PENDING_IRQ
x86_64 allnoconfig:
arch/x86/kernel/apic/io_apic.c:382: warning: 'io_apic_level_ack_pending' defined but not used
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Richard Weinberger [Thu, 12 Apr 2012 22:51:38 +0000 (08:51 +1000)]
arch/x86/include/asm/spinlock.h: fix comment
This comment is no longer true. We support up to 2^16 CPUs because
__ticket_t is an u16 if NR_CPUS is larger than 256.
Signed-off-by: Richard Weinberger <richard@nod.at>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Yong Wang [Thu, 12 Apr 2012 22:51:37 +0000 (08:51 +1000)]
intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
So that the power button still wakes up the platform.
Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
Tested-by: Kangkai Yin <kangkai.yin@intel.com>
Tested-by: Yong Wang <yong.y.wang@intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Shérab [Thu, 12 Apr 2012 22:51:37 +0000 (08:51 +1000)]
arch/x86/platform/iris/iris.c: register a platform device and a platform driver
This makes the iris driver use the platform API, so it is properly exposed
in /sys.
[akpm@linux-foundation.org: remove commented-out code, add missing space to printk, clean up code layout]
Signed-off-by: Shérab <Sebastien.Hinderer@ens-lyon.org>
Cc: Len Brown <lenb@kernel.org>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Tao Guo [Thu, 12 Apr 2012 22:51:37 +0000 (08:51 +1000)]
umem: fix up unplugging
Fix a regression introduced by
7eaceaccab5f40 ("block: remove per-queue
plugging"). In that patch, Jens removed the whole mm_unplug_device()
function, which used to be the trigger to make umem start to work.
We need to implement unplugging to make umem start to work, or I/O
will never be triggered.
Signed-off-by: Tao Guo <Tao.Guo@emc.com>
Cc: Neil Brown <neilb@suse.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Peter Feuerer [Thu, 12 Apr 2012 22:51:36 +0000 (08:51 +1000)]
acerhdf: lowered default temp fanon/fanoff values
Due to new supported hardware, of which the actual temperature limits of
processor, harddisk and other components are unknown, it feels safer with
lower fanon / fanoff settings.
It won't change much for most people, already using acerhdf, as they use
their own fanon/fanoff variable settings when loading the module.
Furthermore seems like kernel and userspace tools have been improved to
work more efficient and netbooks don't get so hot anymore.
Signed-off-by: Peter Feuerer <peter@piie.net>
Acked-by: Borislav Petkov <petkovbb@gmail.com>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Peter Feuerer [Thu, 12 Apr 2012 22:51:36 +0000 (08:51 +1000)]
acerhdf: add support for new hardware
Add support for new hardware:
Acer Aspire LT-10Q/531/751/1810/1825,
Acer Travelmate 7730,
Packard Bell ENBFT/DOTVR46
Signed-off-by: Peter Feuerer <peter@piie.net>
Acked-by: Borislav Petkov <petkovbb@gmail.com>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Clay Carpenter [Thu, 12 Apr 2012 22:51:35 +0000 (08:51 +1000)]
acerhdf: add support for Aspire 1410 BIOS v1.3314
Add support for Aspire 1410 BIOS v1.3314. Fixes the following error:
acerhdf: unknown (unsupported) BIOS version Acer/Aspire 1410/v1.3314,
please report, aborting!
Signed-off-by: Clay Carpenter <claycarpenter@gmail.com>
Signed-off-by: Peter Feuerer <peter@piie.net>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Tue, 17 Apr 2012 03:45:29 +0000 (13:45 +1000)]
Merge remote-tracking branch 'cpuidle-cons/cpuidle_consol_pull'
Conflicts:
arch/arm/include/asm/cpuidle.h
arch/arm/mach-at91/cpuidle.c
arch/arm/mach-davinci/cpuidle.c
arch/arm/mach-shmobile/cpuidle.c
drivers/cpuidle/cpuidle.c
include/linux/cpuidle.h
Stephen Rothwell [Tue, 17 Apr 2012 03:35:44 +0000 (13:35 +1000)]
Merge remote-tracking branch 'dma-buf/for-next'
Conflicts:
include/linux/dma-buf.h
Stephen Rothwell [Tue, 17 Apr 2012 03:34:11 +0000 (13:34 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/mach-omap2/board-generic.c
Stephen Rothwell [Tue, 17 Apr 2012 03:20:20 +0000 (13:20 +1000)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Tue, 17 Apr 2012 03:18:47 +0000 (13:18 +1000)]
Merge remote-tracking branch 'modem-shm/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:17:19 +0000 (13:17 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:15:50 +0000 (13:15 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:13:21 +0000 (13:13 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:11:21 +0000 (13:11 +1000)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:09:46 +0000 (13:09 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:08:20 +0000 (13:08 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:06:50 +0000 (13:06 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:05:23 +0000 (13:05 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:05:17 +0000 (13:05 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:03:41 +0000 (13:03 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 03:02:09 +0000 (13:02 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Conflicts:
arch/x86/include/asm/io_apic.h
arch/x86/kernel/apic/io_apic.c
Stephen Rothwell [Tue, 17 Apr 2012 03:02:02 +0000 (13:02 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'
Conflicts:
arch/x86/include/asm/cmpxchg.h
Stephen Rothwell [Tue, 17 Apr 2012 02:54:53 +0000 (12:54 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Tue, 17 Apr 2012 02:47:59 +0000 (12:47 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Tue, 17 Apr 2012 02:46:30 +0000 (12:46 +1000)]
Merge remote-tracking branch 'spi/spi/next'
Stephen Rothwell [Tue, 17 Apr 2012 02:46:24 +0000 (12:46 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:44:49 +0000 (12:44 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:37:53 +0000 (12:37 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:35:00 +0000 (12:35 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Tue, 17 Apr 2012 02:28:35 +0000 (12:28 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
include/linux/filter.h
Stephen Rothwell [Tue, 17 Apr 2012 02:27:05 +0000 (12:27 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:25:34 +0000 (12:25 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:22:33 +0000 (12:22 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/intel_i2c.c
Stephen Rothwell [Tue, 17 Apr 2012 02:21:03 +0000 (12:21 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:19:36 +0000 (12:19 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:13:06 +0000 (12:13 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:11:37 +0000 (12:11 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 17 Apr 2012 02:10:03 +0000 (12:10 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Tue, 17 Apr 2012 02:06:03 +0000 (12:06 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
Documentation/feature-removal-schedule.txt
Stephen Rothwell [Tue, 17 Apr 2012 02:04:30 +0000 (12:04 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 17 Apr 2012 02:03:02 +0000 (12:03 +1000)]
Merge branch 'quilt/rr'
Conflicts:
arch/arm/kernel/kprobes.c
drivers/virtio/virtio_balloon.c
init/main.c
Stephen Rothwell [Tue, 17 Apr 2012 02:01:28 +0000 (12:01 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:59:46 +0000 (11:59 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:58:17 +0000 (11:58 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:56:54 +0000 (11:56 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:55:24 +0000 (11:55 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:53:28 +0000 (11:53 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
include/net/nfc/nfc.h
Stephen Rothwell [Tue, 17 Apr 2012 01:49:17 +0000 (11:49 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:47:52 +0000 (11:47 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 17 Apr 2012 01:46:13 +0000 (11:46 +1000)]
Merge remote-tracking branch 'isci/all'
Stephen Rothwell [Tue, 17 Apr 2012 01:44:28 +0000 (11:44 +1000)]
Merge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Tue, 17 Apr 2012 01:42:57 +0000 (11:42 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:42:35 +0000 (11:42 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:40:59 +0000 (11:40 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:40:50 +0000 (11:40 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:40:46 +0000 (11:40 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:37:06 +0000 (11:37 +1000)]
Merge commit 'refs/next/
20120410 /v4l-dvb'
Stephen Rothwell [Tue, 17 Apr 2012 01:31:55 +0000 (11:31 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:31:54 +0000 (11:31 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Tue, 17 Apr 2012 01:31:52 +0000 (11:31 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Conflicts:
drivers/i2c/busses/i2c-omap.c
Stephen Rothwell [Tue, 17 Apr 2012 01:30:29 +0000 (11:30 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Tue, 17 Apr 2012 01:29:05 +0000 (11:29 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:23:01 +0000 (11:23 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:21:42 +0000 (11:21 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:20:14 +0000 (11:20 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:18:52 +0000 (11:18 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:17:32 +0000 (11:17 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:16:09 +0000 (11:16 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:14:45 +0000 (11:14 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 01:13:21 +0000 (11:13 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 17 Apr 2012 01:11:58 +0000 (11:11 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Tue, 17 Apr 2012 01:10:36 +0000 (11:10 +1000)]
Merge remote-tracking branch 'ecryptfs/next'
Conflicts:
fs/ecryptfs/ecryptfs_kernel.h
Stephen Rothwell [Tue, 17 Apr 2012 01:09:11 +0000 (11:09 +1000)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:03:22 +0000 (11:03 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:02:01 +0000 (11:02 +1000)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Tue, 17 Apr 2012 01:00:45 +0000 (11:00 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Tue, 17 Apr 2012 00:59:27 +0000 (10:59 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 17 Apr 2012 00:58:09 +0000 (10:58 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Tue, 17 Apr 2012 00:58:08 +0000 (10:58 +1000)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 00:58:07 +0000 (10:58 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Tue, 17 Apr 2012 00:58:06 +0000 (10:58 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 17 Apr 2012 00:56:45 +0000 (10:56 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 00:55:25 +0000 (10:55 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 00:54:05 +0000 (10:54 +1000)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Tue, 17 Apr 2012 00:52:45 +0000 (10:52 +1000)]
Merge remote-tracking branch 'hexagon/linux-next'
Stephen Rothwell [Tue, 17 Apr 2012 00:51:25 +0000 (10:51 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 00:50:04 +0000 (10:50 +1000)]
Merge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Tue, 17 Apr 2012 00:38:11 +0000 (10:38 +1000)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Tue, 17 Apr 2012 00:38:07 +0000 (10:38 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Tue, 17 Apr 2012 00:38:06 +0000 (10:38 +1000)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Tue, 17 Apr 2012 00:38:05 +0000 (10:38 +1000)]
Merge remote-tracking branch 'net/master'
Theodore Ts'o [Mon, 16 Apr 2012 22:55:26 +0000 (18:55 -0400)]
ext4: fix handling of journalled quota options
Commit
26092bf5 broke handling of journalled quota mount options by
trying to parse argument of every mount option as a number. Fix this
by dealing with the quota options before we call match_int().
Thanks to Jan Kara for discovering this regression.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>