]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Srivatsa S. Bhat [Thu, 23 May 2013 00:36:51 +0000 (10:36 +1000)]
CPU hotplug: provide a generic helper to disable/enable CPU hotplug
There are instances in the kernel where we would like to disable CPU
hotplug (from sysfs) during some important operation. Today the freezer
code depends on this and the code to do it was kinda tailor-made for that.
Restructure the code and make it generic enough to be useful for
other usecases too.
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Robin Holt <holt@sgi.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Russ Anderson <rja@sgi.com>
Cc: Robin Holt <holt@sgi.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrew Morton [Thu, 23 May 2013 00:36:47 +0000 (10:36 +1000)]
shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size-fix
eliminate ugly 80-col tricks
Cc: Dave Jones <davej@redhat.com>
Cc: Davidlohr Bueso <davidlohr.bueso@hp.com>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Li Zefan <lizfan@huawei.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Mon, 27 May 2013 06:02:09 +0000 (16:02 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Mon, 27 May 2013 06:00:30 +0000 (16:00 +1000)]
Merge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Mon, 27 May 2013 05:58:48 +0000 (15:58 +1000)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Mon, 27 May 2013 05:57:10 +0000 (15:57 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Mon, 27 May 2013 05:55:32 +0000 (15:55 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Mon, 27 May 2013 05:53:55 +0000 (15:53 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Mon, 27 May 2013 05:52:17 +0000 (15:52 +1000)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Mon, 27 May 2013 05:50:11 +0000 (15:50 +1000)]
Merge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Mon, 27 May 2013 05:50:03 +0000 (15:50 +1000)]
Merge remote-tracking branch 'msm/for-next'
Stephen Rothwell [Mon, 27 May 2013 05:48:22 +0000 (15:48 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Mon, 27 May 2013 05:48:20 +0000 (15:48 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Mon, 27 May 2013 05:46:40 +0000 (15:46 +1000)]
Merge remote-tracking branch 'bcm2835/for-next'
Stephen Rothwell [Mon, 27 May 2013 05:45:02 +0000 (15:45 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Mon, 27 May 2013 05:43:24 +0000 (15:43 +1000)]
Merge remote-tracking branch 'mailbox/dbx500-prcmu-mailbox'
Stephen Rothwell [Mon, 27 May 2013 05:41:43 +0000 (15:41 +1000)]
Merge remote-tracking branch 'irqdomain/irqdomain/next'
Stephen Rothwell [Mon, 27 May 2013 05:40:01 +0000 (15:40 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Mon, 27 May 2013 05:37:45 +0000 (15:37 +1000)]
Merge remote-tracking branch 'bcon/master'
Conflicts:
drivers/block/Kconfig
Stephen Rothwell [Mon, 27 May 2013 05:36:05 +0000 (15:36 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Mon, 27 May 2013 05:34:22 +0000 (15:34 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/nvec/nvec_kbd.c
Stephen Rothwell [Mon, 27 May 2013 05:32:11 +0000 (15:32 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Mon, 27 May 2013 05:30:09 +0000 (15:30 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Mon, 27 May 2013 05:28:33 +0000 (15:28 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
drivers/base/cpu.c
Stephen Rothwell [Mon, 27 May 2013 05:26:56 +0000 (15:26 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Mon, 27 May 2013 05:25:12 +0000 (15:25 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 27 May 2013 05:16:52 +0000 (15:16 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Mon, 27 May 2013 05:16:40 +0000 (15:16 +1000)]
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
Stephen Rothwell [Mon, 27 May 2013 05:15:01 +0000 (15:15 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/s390/include/asm/pgtable.h
Stephen Rothwell [Mon, 27 May 2013 05:04:22 +0000 (15:04 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Mon, 27 May 2013 05:02:38 +0000 (15:02 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Mon, 27 May 2013 05:00:44 +0000 (15:00 +1000)]
Merge remote-tracking branch 'spi-mb/for-next'
Stephen Rothwell [Mon, 27 May 2013 04:58:45 +0000 (14:58 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 27 May 2013 04:58:39 +0000 (14:58 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Mon, 27 May 2013 04:54:19 +0000 (14:54 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Mon, 27 May 2013 04:52:43 +0000 (14:52 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 27 May 2013 04:51:06 +0000 (14:51 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Mon, 27 May 2013 04:49:25 +0000 (14:49 +1000)]
Merge remote-tracking branch 'mfd/master'
Conflicts:
drivers/mfd/intel_msic.c
Stephen Rothwell [Mon, 27 May 2013 04:39:56 +0000 (14:39 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 27 May 2013 04:39:51 +0000 (14:39 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 27 May 2013 04:38:13 +0000 (14:38 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 27 May 2013 04:37:59 +0000 (14:37 +1000)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Mon, 27 May 2013 04:33:30 +0000 (14:33 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 27 May 2013 04:29:03 +0000 (14:29 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 27 May 2013 04:29:00 +0000 (14:29 +1000)]
Merge remote-tracking branch 'input-mt/for-next'
Stephen Rothwell [Mon, 27 May 2013 04:27:24 +0000 (14:27 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 27 May 2013 04:25:46 +0000 (14:25 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Mon, 27 May 2013 04:24:12 +0000 (14:24 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Mon, 27 May 2013 04:22:33 +0000 (14:22 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 27 May 2013 04:20:46 +0000 (14:20 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 27 May 2013 04:19:08 +0000 (14:19 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Mon, 27 May 2013 04:17:31 +0000 (14:17 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 27 May 2013 04:15:55 +0000 (14:15 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 27 May 2013 04:14:16 +0000 (14:14 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 27 May 2013 04:12:29 +0000 (14:12 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Mon, 27 May 2013 04:08:27 +0000 (14:08 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Mon, 27 May 2013 04:06:52 +0000 (14:06 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 27 May 2013 04:05:07 +0000 (14:05 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Mon, 27 May 2013 04:03:30 +0000 (14:03 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Mon, 27 May 2013 04:01:52 +0000 (14:01 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Mon, 27 May 2013 04:01:48 +0000 (14:01 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/acpi/processor_driver.c
drivers/base/power/qos.c
Stephen Rothwell [Mon, 27 May 2013 04:00:08 +0000 (14:00 +1000)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Mon, 27 May 2013 03:51:57 +0000 (13:51 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Mon, 27 May 2013 03:51:47 +0000 (13:51 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Mon, 27 May 2013 03:50:05 +0000 (13:50 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Mon, 27 May 2013 03:48:26 +0000 (13:48 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 27 May 2013 03:46:26 +0000 (13:46 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Mon, 27 May 2013 03:44:51 +0000 (13:44 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 27 May 2013 03:43:11 +0000 (13:43 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 27 May 2013 03:41:37 +0000 (13:41 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Mon, 27 May 2013 03:40:00 +0000 (13:40 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Conflicts:
fs/xfs/xfs_attr_leaf.c
Stephen Rothwell [Mon, 27 May 2013 01:23:37 +0000 (11:23 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Mon, 27 May 2013 01:21:55 +0000 (11:21 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 27 May 2013 01:20:13 +0000 (11:20 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 27 May 2013 01:18:16 +0000 (11:18 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 27 May 2013 01:16:42 +0000 (11:16 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Mon, 27 May 2013 01:15:09 +0000 (11:15 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 27 May 2013 01:13:35 +0000 (11:13 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Mon, 27 May 2013 01:05:31 +0000 (11:05 +1000)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Mon, 27 May 2013 01:03:58 +0000 (11:03 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Mon, 27 May 2013 01:02:24 +0000 (11:02 +1000)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Mon, 27 May 2013 01:00:47 +0000 (11:00 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Mon, 27 May 2013 00:59:12 +0000 (10:59 +1000)]
Merge remote-tracking branch 'ceph/testing'
Stephen Rothwell [Mon, 27 May 2013 00:57:39 +0000 (10:57 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Mon, 27 May 2013 00:56:02 +0000 (10:56 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
Stephen Rothwell [Mon, 27 May 2013 00:54:27 +0000 (10:54 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 27 May 2013 00:52:53 +0000 (10:52 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Mon, 27 May 2013 00:51:18 +0000 (10:51 +1000)]
Merge remote-tracking branch 'parisc-hd/for-next'
Conflicts:
arch/parisc/include/asm/processor.h
arch/parisc/kernel/irq.c
Stephen Rothwell [Mon, 27 May 2013 00:36:35 +0000 (10:36 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 27 May 2013 00:35:03 +0000 (10:35 +1000)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Mon, 27 May 2013 00:33:30 +0000 (10:33 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Mon, 27 May 2013 00:31:53 +0000 (10:31 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Mon, 27 May 2013 00:30:18 +0000 (10:30 +1000)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Mon, 27 May 2013 00:30:16 +0000 (10:30 +1000)]
Merge remote-tracking branch 'xilinx/arm-next'
Conflicts:
arch/arm/mach-highbank/highbank.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-spear/spear13xx.c
arch/arm/mach-vexpress/v2m.c
arch/arm/mach-zynq/platsmp.c
drivers/clocksource/Makefile
drivers/clocksource/tegra20_timer.c
Stephen Rothwell [Mon, 27 May 2013 00:28:39 +0000 (10:28 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Mon, 27 May 2013 00:27:06 +0000 (10:27 +1000)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Mon, 27 May 2013 00:25:19 +0000 (10:25 +1000)]
Merge remote-tracking branch 'ide/master'
Stephen Rothwell [Mon, 27 May 2013 00:25:17 +0000 (10:25 +1000)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Mon, 27 May 2013 00:25:11 +0000 (10:25 +1000)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Mon, 27 May 2013 00:25:10 +0000 (10:25 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'