]> git.kernelconcepts.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Mon, 22 Oct 2012 03:03:36 +0000 (14:03 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'

11 years agoMerge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Mon, 22 Oct 2012 02:57:00 +0000 (13:57 +1100)]
Merge remote-tracking branch 'tmem/linux-next'

11 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Mon, 22 Oct 2012 02:55:21 +0000 (13:55 +1100)]
Merge remote-tracking branch 'staging/staging-next'

11 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 22 Oct 2012 02:53:23 +0000 (13:53 +1100)]
Merge remote-tracking branch 'regmap/for-next'

11 years agoMerge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Mon, 22 Oct 2012 02:51:31 +0000 (13:51 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'

11 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Mon, 22 Oct 2012 02:49:54 +0000 (13:49 +1100)]
Merge remote-tracking branch 'workqueues/for-next'

11 years agoMerge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Mon, 22 Oct 2012 02:43:26 +0000 (13:43 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'

11 years agoMerge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Mon, 22 Oct 2012 02:41:40 +0000 (13:41 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

11 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Mon, 22 Oct 2012 02:39:59 +0000 (13:39 +1100)]
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h

11 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Mon, 22 Oct 2012 02:32:18 +0000 (13:32 +1100)]
Merge remote-tracking branch 'tip/auto-latest'

11 years agoMerge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Mon, 22 Oct 2012 02:30:43 +0000 (13:30 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'

11 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 22 Oct 2012 02:28:55 +0000 (13:28 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'

11 years agoMerge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Mon, 22 Oct 2012 02:27:10 +0000 (13:27 +1100)]
Merge remote-tracking branch 'edac/linux_next'

11 years agoMerge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Mon, 22 Oct 2012 02:25:31 +0000 (13:25 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'

Conflicts:
kernel/audit_tree.c

11 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Mon, 22 Oct 2012 02:23:21 +0000 (13:23 +1100)]
Merge remote-tracking branch 'trivial/for-next'

11 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Mon, 22 Oct 2012 02:21:40 +0000 (13:21 +1100)]
Merge remote-tracking branch 'osd/linux-next'

11 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 22 Oct 2012 02:19:41 +0000 (13:19 +1100)]
Merge remote-tracking branch 'watchdog/master'

11 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Mon, 22 Oct 2012 02:19:35 +0000 (13:19 +1100)]
Merge remote-tracking branch 'selinux/master'

11 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Mon, 22 Oct 2012 02:11:20 +0000 (13:11 +1100)]
Merge remote-tracking branch 'security/next'

Conflicts:
fs/cifs/cifsacl.c
net/dns_resolver/dns_key.c
security/keys/keyctl.c
security/keys/keyring.c
security/keys/process_keys.c

11 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 22 Oct 2012 01:49:59 +0000 (12:49 +1100)]
Merge remote-tracking branch 'regulator/for-next'

11 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 22 Oct 2012 01:47:43 +0000 (12:47 +1100)]
Merge remote-tracking branch 'md/for-next'

11 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 22 Oct 2012 01:45:40 +0000 (12:45 +1100)]
Merge remote-tracking branch 'slab/for-next'

11 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 22 Oct 2012 01:45:31 +0000 (12:45 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

11 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 22 Oct 2012 01:43:36 +0000 (12:43 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

11 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 22 Oct 2012 01:41:21 +0000 (12:41 +1100)]
Merge remote-tracking branch 'block/for-next'

Conflicts:
init/Kconfig

11 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 22 Oct 2012 01:36:02 +0000 (12:36 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

11 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 22 Oct 2012 01:34:02 +0000 (12:34 +1100)]
Merge remote-tracking branch 'input/next'

11 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Mon, 22 Oct 2012 01:32:08 +0000 (12:32 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'

11 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Mon, 22 Oct 2012 01:24:34 +0000 (12:24 +1100)]
Merge remote-tracking branch 'modules/modules-next'

Conflicts:
kernel/module.c

11 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 22 Oct 2012 00:55:19 +0000 (11:55 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

11 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 22 Oct 2012 00:53:30 +0000 (11:53 +1100)]
Merge remote-tracking branch 'sound/for-next'

11 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 22 Oct 2012 00:51:52 +0000 (11:51 +1100)]
Merge remote-tracking branch 'crypto/master'

11 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 22 Oct 2012 00:50:14 +0000 (11:50 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

11 years agoMerge remote-tracking branch 'mtd/master'
Stephen Rothwell [Mon, 22 Oct 2012 00:48:34 +0000 (11:48 +1100)]
Merge remote-tracking branch 'mtd/master'

11 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Mon, 22 Oct 2012 00:46:30 +0000 (11:46 +1100)]
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
net/mac80211/mlme.c

11 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Mon, 22 Oct 2012 00:03:54 +0000 (11:03 +1100)]
Merge remote-tracking branch 'net-next/master'

11 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Mon, 22 Oct 2012 00:01:51 +0000 (11:01 +1100)]
Merge remote-tracking branch 'thermal/next'

11 years agoMerge remote-tracking branch 'cpuidle/cpuidle-next'
Stephen Rothwell [Mon, 22 Oct 2012 00:01:43 +0000 (11:01 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h

11 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 22 Oct 2012 00:01:15 +0000 (11:01 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

11 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Mon, 22 Oct 2012 00:01:12 +0000 (11:01 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

11 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:59:44 +0000 (10:59 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

11 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Sun, 21 Oct 2012 23:58:12 +0000 (10:58 +1100)]
Merge branch 'quilt/i2c'

11 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:56:36 +0000 (10:56 +1100)]
Merge remote-tracking branch 'hid/for-next'

11 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:55:06 +0000 (10:55 +1100)]
Merge remote-tracking branch 'vfs/for-next'

11 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:53:31 +0000 (10:53 +1100)]
Merge remote-tracking branch 'xfs/for-next'

11 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:51:58 +0000 (10:51 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

11 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:51:51 +0000 (10:51 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

11 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:50:02 +0000 (10:50 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

11 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:48:29 +0000 (10:48 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

11 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Sun, 21 Oct 2012 23:46:53 +0000 (10:46 +1100)]
Merge remote-tracking branch 'logfs/master'

11 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:45:26 +0000 (10:45 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'

11 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Sun, 21 Oct 2012 23:43:50 +0000 (10:43 +1100)]
Merge remote-tracking branch 'gfs2/master'

11 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:42:10 +0000 (10:42 +1100)]
Merge remote-tracking branch 'fuse/for-next'

11 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:40:38 +0000 (10:40 +1100)]
Merge remote-tracking branch 'cifs/for-next'

11 years agoMerge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Sun, 21 Oct 2012 23:40:35 +0000 (10:40 +1100)]
Merge remote-tracking branch 'xtensa/for_next'

Conflicts:
arch/xtensa/include/uapi/asm/unistd.h

11 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Sun, 21 Oct 2012 23:19:46 +0000 (10:19 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

11 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Sun, 21 Oct 2012 23:18:14 +0000 (10:18 +1100)]
Merge remote-tracking branch 's390/features'

11 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Sun, 21 Oct 2012 23:16:40 +0000 (10:16 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'

11 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:16:37 +0000 (10:16 +1100)]
Merge remote-tracking branch 'parisc/for-next'

11 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:15:04 +0000 (10:15 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

11 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Sun, 21 Oct 2012 23:13:32 +0000 (10:13 +1100)]
Merge remote-tracking branch 'microblaze/next'

11 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:12:04 +0000 (10:12 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/include/asm/termios.h
arch/m68k/include/uapi/asm/auxvec.h
arch/m68k/include/uapi/asm/msgbuf.h
arch/m68k/include/uapi/asm/sembuf.h
arch/m68k/include/uapi/asm/shmbuf.h
arch/m68k/include/uapi/asm/socket.h
arch/m68k/include/uapi/asm/sockios.h
arch/m68k/include/uapi/asm/termbits.h

11 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:09:08 +0000 (10:09 +1100)]
Merge remote-tracking branch 'cris/for-next'

11 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Sun, 21 Oct 2012 23:07:34 +0000 (10:07 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'

11 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Sun, 21 Oct 2012 23:06:00 +0000 (10:06 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

11 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Sun, 21 Oct 2012 23:04:31 +0000 (10:04 +1100)]
Merge remote-tracking branch 'arm/for-next'

11 years agoMerge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Sun, 21 Oct 2012 23:02:27 +0000 (10:02 +1100)]
Merge remote-tracking branch 'spi-current/spi/merge'

11 years agoMerge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Sun, 21 Oct 2012 23:02:15 +0000 (10:02 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'

11 years agoMerge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Sun, 21 Oct 2012 23:02:01 +0000 (10:02 +1100)]
Merge remote-tracking branch 'staging.current/staging-linus'

11 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Sun, 21 Oct 2012 23:01:59 +0000 (10:01 +1100)]
Merge remote-tracking branch 'wireless/master'

11 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Sun, 21 Oct 2012 23:01:58 +0000 (10:01 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

11 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Sun, 21 Oct 2012 23:01:57 +0000 (10:01 +1100)]
Merge remote-tracking branch 'net/master'

11 years agoMerge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Sun, 21 Oct 2012 23:01:56 +0000 (10:01 +1100)]
Merge remote-tracking branch 'm68k-current/for-linus'

11 years agoi2c-i801: Fix comment
Jean Delvare [Sun, 21 Oct 2012 22:53:21 +0000 (09:53 +1100)]
i2c-i801: Fix comment

Signed-off-by: Jean Delvare <khali@linux-fr.org>
11 years agoi2c-i801: Simplify dependency towards GPIOLIB
Jean Delvare [Sun, 21 Oct 2012 22:53:21 +0000 (09:53 +1100)]
i2c-i801: Simplify dependency towards GPIOLIB

Arbitrarily selecting GPIOLIB causes trouble on some architectures,
so don't do that. Instead, just make the optional multiplexing code
depend on CONFIG_I2C_MUX_GPIO instead of CONFIG_I2C_MUX for now. We
can revisit if the i2c-i801 driver ever supports other multiplexing
flavors.

Also make that optional code depend on DMI, as it won't do anything
without that.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Fengguang Wu <fengguang.wu@intel.com>
11 years agoi2c-i801: Add device tree support
Thierry Reding [Sun, 21 Oct 2012 22:53:20 +0000 (09:53 +1100)]
i2c-i801: Add device tree support

Add support for probing slave devices parsed from the device tree.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
11 years agoi2c-stub: Move to drivers/i2c
Jean Delvare [Sun, 21 Oct 2012 22:53:20 +0000 (09:53 +1100)]
i2c-stub: Move to drivers/i2c

Move the i2c-stub driver to drivers/i2c, to match the Kconfig entry.
This is less confusing that way.

I also fixed all checkpatch warnings and errors.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Peter Huewe <peterhuewe@gmx.de>
11 years agoMerge branch 'perf/urgent'
Ingo Molnar [Sun, 21 Oct 2012 17:54:20 +0000 (19:54 +0200)]
Merge branch 'perf/urgent'

11 years agoMerge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
Ingo Molnar [Sun, 21 Oct 2012 17:53:34 +0000 (19:53 +0200)]
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent

Pull ftrace ring-buffer resizing fix from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
11 years agoMerge branch 'core/urgent'
Ingo Molnar [Sun, 21 Oct 2012 17:03:52 +0000 (19:03 +0200)]
Merge branch 'core/urgent'

11 years agoDocumentation: Reflect the new location of the NMI watchdog info
Jean Delvare [Sun, 21 Oct 2012 10:05:51 +0000 (12:05 +0200)]
Documentation: Reflect the new location of the NMI watchdog info

Commit 9919cba7 ("watchdog: Update documentation") moved the
NMI watchdog documentation from nmi_watchdog.txt to
lockup-watchdogs.txt. Update the index file accordingly.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Cc: Don Zickus <dzickus@redhat.com>
Link: http://lkml.kernel.org/r/20121021120551.4656d99b@endymion.delvare
Signed-off-by: Ingo Molnar <mingo@kernel.org>
11 years agoMerge branch 'perf/urgent'
Ingo Molnar [Sun, 21 Oct 2012 16:19:35 +0000 (18:19 +0200)]
Merge branch 'perf/urgent'

11 years agoMerge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg...
Ingo Molnar [Sun, 21 Oct 2012 16:18:17 +0000 (18:18 +0200)]
Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc into perf/urgent

Pull various uprobes bugfixes from Oleg Nesterov - mostly race and
failure path fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
11 years agoMerge branch 'x86/urgent'
Ingo Molnar [Sun, 21 Oct 2012 16:17:42 +0000 (18:17 +0200)]
Merge branch 'x86/urgent'

11 years agoMerge tag 'numascale_mce_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras...
Ingo Molnar [Sun, 21 Oct 2012 16:16:39 +0000 (18:16 +0200)]
Merge tag 'numascale_mce_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/urgent

Pull a fix from Borislav Petkov:

 "Fix for a bug causing an OOPS on confederate systems from Numascale
  where northbridge descriptors are not unique, causing a lookup failure
  of the northbridge descriptor in the amd_nb.c code.

  A more general fix is in the works."

Signed-off-by: Ingo Molnar <mingo@kernel.org>
11 years agoMerge branch 'timers/core'
Ingo Molnar [Sun, 21 Oct 2012 16:15:11 +0000 (18:15 +0200)]
Merge branch 'timers/core'

11 years agoMerge branch 'nohz/core' of git://github.com/fweisbec/linux-dynticks into timers...
Ingo Molnar [Sun, 21 Oct 2012 16:14:02 +0000 (18:14 +0200)]
Merge branch 'nohz/core' of git://github.com/fweisbec/linux-dynticks into timers/core

Pull uncontroversial cleanup/refactoring nohz patches from Frederic Weisbecker.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
11 years agoMerge branch 'perf/urgent'
Ingo Molnar [Sun, 21 Oct 2012 16:12:56 +0000 (18:12 +0200)]
Merge branch 'perf/urgent'

11 years agoMerge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
Ingo Molnar [Sun, 21 Oct 2012 16:11:20 +0000 (18:11 +0200)]
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent

Pull event-wrapping Oprofile fix from Robert Richter.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
11 years agoMerge branch 'numa/core'
Ingo Molnar [Sun, 21 Oct 2012 14:35:10 +0000 (16:35 +0200)]
Merge branch 'numa/core'

11 years agonuma, mm: Remove paranoia checks from do_huge_pmd_numa_page()
Ingo Molnar [Sun, 21 Oct 2012 14:32:33 +0000 (16:32 +0200)]
numa, mm: Remove paranoia checks from do_huge_pmd_numa_page()

Remove a couple of debugging checks from do_huge_pmd_numa_page().

Cc: Rik van Riel <riel@redhat.com>
Cc: aarcange@redhat.com
Cc: a.p.zijlstra@chello.nl
Link: http://lkml.kernel.org/n/tip-nhyrhlt42RlghgatXyughvyi@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
11 years agonuma, mm: Rename the PROT_NONE fault handling functions to *_numa()
Rik van Riel [Thu, 18 Oct 2012 21:20:21 +0000 (17:20 -0400)]
numa, mm: Rename the PROT_NONE fault handling functions to *_numa()

Having the function name indicate what the function is used
for makes the code a little easier to read.  Furthermore,
the fault handling code largely consists of do_...._page
functions.

Rename the NUMA working set sampling fault handling functions
to _numa() names, to indicate what they are used for.

This separates the naming from the regular PROT_NONE namings.

Signed-off-by: Rik van Riel <riel@redhat.com>
Cc: aarcange@redhat.com
Cc: a.p.zijlstra@chello.nl
Link: http://lkml.kernel.org/r/20121018172021.0b1f6e3d@cuia.bos.redhat.com
[ Converted two more usage sites ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
11 years agonuma, mm: Fix 4K migration races
Ingo Molnar [Sat, 20 Oct 2012 21:06:00 +0000 (23:06 +0200)]
numa, mm: Fix 4K migration races

__unmap_and_move() can fail with -EAGAIN:

 - if we race with swapout picking up the page

 - if migrate_page_move_mapping() sees the
   page count changing unexpectedly

 - if two threads are trying to migrate the same page

There are other, more theoretical races as well, such as
the possibility of a pte being WSS mapped twice.

Fix them and clean up the code flow.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Link: http://lkml.kernel.org/n/tip-wdyptm0xGskzbyatienQeft3@git.kernel.org
11 years agosched, numa: Add NUMA_MIGRATION feature flag
Ingo Molnar [Sat, 20 Oct 2012 20:20:19 +0000 (22:20 +0200)]
sched, numa: Add NUMA_MIGRATION feature flag

After this patch, doing:

   # echo NO_NUMA_MIGRATION > /sys/kernel/debug/sched_features

Will turn off the NUMA placement logic/policy - but keeps the
working set sampling faults in place.

This allows the debugging of the WSS facility, by using it
but keeping vanilla, non-NUMA CPU and memory placement
policies.

Default enabled. Generates on extra code on !CONFIG_SCHED_DEBUG.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Link: http://lkml.kernel.org/n/tip-xjt7bqjlphxRfjXxasqm4cdv@git.kernel.org
11 years agox86, mm: Prevent gcc to re-read the pagetables
Andrea Arcangeli [Tue, 18 Sep 2012 00:14:51 +0000 (02:14 +0200)]
x86, mm: Prevent gcc to re-read the pagetables

GCC is very likely to read the pagetables just once and cache them in
the local stack or in a register, but it is can also decide to re-read
the pagetables. The problem is that the pagetable in those places can
change from under gcc.

In the page fault we only hold the ->mmap_sem for reading and both the
page fault and MADV_DONTNEED only take the ->mmap_sem for reading and we
don't hold any PT lock yet.

In get_user_pages_fast() the TLB shootdown code can clear the pagetables
before firing any TLB flush (the page can't be freed until the TLB
flushing IPI has been delivered but the pagetables will be cleared well
before sending any TLB flushing IPI).

With THP/hugetlbfs the pmd (and pud for hugetlbfs giga pages) can
change as well under gup_fast, it won't just be cleared for the same
reasons described above for the pte in the page fault case.

[ This patch was picked up from the AutoNUMA tree. ]

Originally-by: Andrea Arcangeli <aarcange@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
[ Ported to this tree, because we are modifying the page tables
  at a high rate here, so this problem is potentially more
  likely to show up in practice. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
11 years agomm: Check if PTE is already allocated during page fault
Mel Gorman [Wed, 12 Oct 2011 19:06:51 +0000 (21:06 +0200)]
mm: Check if PTE is already allocated during page fault

With transparent hugepage support, handle_mm_fault() has to be careful
that a normal PMD has been established before handling a PTE fault. To
achieve this, it used __pte_alloc() directly instead of pte_alloc_map
as pte_alloc_map is unsafe to run against a huge PMD. pte_offset_map()
is called once it is known the PMD is safe.

pte_alloc_map() is smart enough to check if a PTE is already present
before calling __pte_alloc but this check was lost. As a consequence,
PTEs may be allocated unnecessarily and the page table lock taken.
Thi useless PTE does get cleaned up but it's a performance hit which
is visible in page_test from aim9.

This patch simply re-adds the check normally done by pte_alloc_map to
check if the PTE needs to be allocated before taking the page table
lock. The effect is noticable in page_test from aim9.

 AIM9
                 2.6.38-vanilla 2.6.38-checkptenone
 creat-clo      446.10 ( 0.00%)   424.47 (-5.10%)
 page_test       38.10 ( 0.00%)    42.04 ( 9.37%)
 brk_test        52.45 ( 0.00%)    51.57 (-1.71%)
 exec_test      382.00 ( 0.00%)   456.90 (16.39%)
 fork_test       60.11 ( 0.00%)    67.79 (11.34%)
 MMTests Statistics: duration
 Total Elapsed Time (seconds)                611.90    612.22

(While this affects 2.6.38, it is a performance rather than a
functional bug and normally outside the rules -stable. While the big
performance differences are to a microbench, the difference in fork
and exec performance may be significant enough that -stable wants to
consider the patch)

Reported-by: Raz Ben Yehuda <raziebe@gmail.com>
Signed-off-by: Mel Gorman <mgorman@suse.de>
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Rik van Riel <riel@redhat.com>
[ Picked this up from the AutoNUMA tree to help
  it upstream and to allow apples-to-apples
  performance comparisons. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
11 years agonuma, mm: Fix NUMA hinting page faults from gup/gup_fast
Andrea Arcangeli [Fri, 5 Oct 2012 19:36:27 +0000 (21:36 +0200)]
numa, mm: Fix NUMA hinting page faults from gup/gup_fast

Introduce FOLL_NUMA to tell follow_page to check
pte/pmd_numa. get_user_pages must use FOLL_NUMA, and it's safe to do
so because it always invokes handle_mm_fault and retries the
follow_page later.

KVM secondary MMU page faults will trigger the NUMA hinting page
faults through gup_fast -> get_user_pages -> follow_page ->
handle_mm_fault.

Other follow_page callers like KSM should not use FOLL_NUMA, or they
would fail to get the pages if they use follow_page instead of
get_user_pages.

[ This patch was picked up from the AutoNUMA tree. ]

Originally-by: Andrea Arcangeli <aarcange@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
[ ported to this tree. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
11 years agosched, numa, mm: Implement constant, per task Working Set Sampling (WSS) rate
Peter Zijlstra [Sun, 14 Oct 2012 14:59:13 +0000 (16:59 +0200)]
sched, numa, mm: Implement constant, per task Working Set Sampling (WSS) rate

Previously, to probe the working set of a task, we'd use
a very simple and crude method: mark all of its address
space PROT_NONE.

That method has various (obvious) disadvantages:

 - it samples the working set at dissimilar rates,
   giving some tasks a sampling quality advantage
   over others.

 - creates performance problems for tasks with very
   large working sets

 - over-samples processes with large address spaces but
   which only very rarely execute

Improve that method by keeping a rotating offset into the
address space that marks the current position of the scan,
and advance it by a constant rate (in a CPU cycles execution
proportional manner). If the offset reaches the last mapped
address of the mm then it then it starts over at the first
address.

The per-task nature of the working set sampling functionality
in this tree allows such constant rate, per task,
execution-weight proportional sampling of the working set,
with an adaptive sampling interval/frequency that goes from
once per 100 msecs up to just once per 1.6 seconds.
The current sampling volume is 256 MB per interval.

As tasks mature and converge their working set, so does the
sampling rate slow down to just a trickle, 256 MB per 1.6
seconds of CPU time executed.

This, beyond being adaptive, also rate-limits rarely
executing systems and does not over-sample on overloaded
systems.

[ In AutoNUMA speak, this patch deals with the effective sampling
  rate of the 'hinting page fault'. AutoNUMA's scanning is
  currently rate-limited, but it is also fundamentally
  single-threaded, executing in the knuma_scand kernel thread,
  so the limit in AutoNUMA is global and does not scale up with
  the number of CPUs, nor does it scan tasks in an execution
  proportional manner.

  So the idea of rate-limiting the scanning was first implemented
  in the AutoNUMA tree via a global rate limit. This patch goes
  beyond that by implementing an execution rate proportional
  working set sampling rate that is not implemented via a single
  global scanning daemon. ]

Based-on-idea-by: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Link: http://lkml.kernel.org/n/tip-wt5b48o2226ec63784i58s3j@git.kernel.org
[ Wrote changelog and fixed bug. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
11 years agoALSA: sound/isa/opti9xx/miro.c: eliminate possible double free
Julia Lawall [Sun, 21 Oct 2012 10:52:03 +0000 (12:52 +0200)]
ALSA: sound/isa/opti9xx/miro.c: eliminate possible double free

snd_miro_probe is a static function that is only called twice in the file
that defines it.  At each call site, its argument is freed using
snd_card_free.  Thus, there is no need for snd_miro_probe to call
snd_card_free on its argument on any of its error exit paths.

Because snd_card_free both reads the fields of its argument and kfrees its
argments, the results of the second snd_card_free should be unpredictable.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r@
identifier f,free,a;
parameter list[n] ps;
type T;
expression e;
@@

f(ps,T a,...) {
  ... when any
      when != a = e
  if(...) { ... free(a); ... return ...; }
  ... when any
}

@@
identifier r.f,r.free;
expression x,a;
expression list[r.n] xs;
@@

* x = f(xs,a,...);
  if (...) { ... free(a); ... return ...; }
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11 years agoALSA: usb-audio: USB audio quirk for Roland VG-99 advanced mode
Pete Leigh [Sun, 21 Oct 2012 09:29:17 +0000 (10:29 +0100)]
ALSA: usb-audio: USB audio quirk for Roland VG-99 advanced mode

Without this quirk the VG-99 will work in standard mode (set under
USB on System menu page 2) giving 16 bits at 44.1 Khz audio in/out
but no midi, and is not recognised when set to advanced mode.

After applying this, I can also use the VG-99 in advanced mode: 24
24 bits audio in/out at 44.1 Khz, and midi in/out. Sysex is so far
untested.

In standard mode, the device appears with ID 0x00b3, so the
behaviour isn't affected by this quirk.

Thanks to Clemens Ladisch for simplifying and correcting my initial
attempt!

Signed-off-by: Pete Leigh <pete.leigh@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>