]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agoacpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
Wen Congyang [Fri, 28 Sep 2012 00:18:49 +0000 (10:18 +1000)]
acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed

If acpi_memory_enable_device() fails, acpi_memory_enable_device() will
return a non-zero value, which means we fail to bind the memory device to
this driver.  So we should free memory device before
acpi_memory_device_add() returns.

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: Len Brown <lenb@kernel.org>
Cc: "Brown, Len" <len.brown@intel.com>
Cc: Yasuaki ISIMATU <isimatu.yasuaki@jp.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agoacpi_memhotplug.c: fix memory leak when memory device is unbound from the module...
Wen Congyang [Fri, 28 Sep 2012 00:18:48 +0000 (10:18 +1000)]
acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug

We allocate memory to store acpi_memory_info, so we should free it before
freeing mem_device.

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: Len Brown <lenb@kernel.org>
Cc: "Brown, Len" <len.brown@intel.com>
Cc: Yasuaki ISIMATU <isimatu.yasuaki@jp.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agocpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
Andrew Morton [Fri, 28 Sep 2012 00:18:48 +0000 (10:18 +1000)]
cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix

make acpi_unmap_lsapic __ref

Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agox86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
Wen Congyang [Fri, 28 Sep 2012 00:18:48 +0000 (10:18 +1000)]
x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved

When a cpu is hotplugged, we call acpi_map_cpu2node() in
_acpi_map_lsapic() to store the cpu's node.  But we don't clear the cpu's
node in acpi_unmap_lsapic() when this cpu is hotremoved.  If the node is
also hotremoved, We will get the following messages:

[ 1646.771485] kernel BUG at include/linux/gfp.h:329!
[ 1646.828729] invalid opcode: 0000 [#1] SMP
[ 1646.877872] Modules linked in: ebtable_nat ebtables ipt_MASQUERADE iptable_nat nf_nat xt_CHECKSUM iptable_mangle bridge stp llc sunrpc ipt_REJECT nf_conntrack_ipv4 nf_defrag_ipv4 iptable_filter ip_tables ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 xt_state nf_conntrack ip6table_filter ip6_tables binfmt_misc dm_mirror dm_region_hash dm_log dm_mod vhost_net macvtap macvlan tun uinput iTCO_wdt iTCO_vendor_support coretemp kvm_intel kvm crc32c_intel microcode pcspkr i2c_i801 i2c_core lpc_ich mfd_core ioatdma e1000e i7core_edac edac_core sg acpi_memhotplug igb dca sd_mod crc_t10dif megaraid_sas mptsas mptscsih mptbase scsi_transport_sas scsi_mod
[ 1647.588773] Pid: 3126, comm: init Not tainted 3.6.0-rc3-tangchen-hostbridge+ #13 FUJITSU-SV PRIMEQUEST 1800E/SB
[ 1647.711545] RIP: 0010:[<ffffffff811bc3fd>]  [<ffffffff811bc3fd>] allocate_slab+0x28d/0x300
[ 1647.810492] RSP: 0018:ffff88078a049cf8  EFLAGS: 00010246
[ 1647.874028] RAX: 0000000000000000 RBX: 0000000000000001 RCX: 0000000000000000
[ 1647.959339] RDX: 0000000000000001 RSI: 0000000000000001 RDI: 0000000000000246
[ 1648.044659] RBP: ffff88078a049d38 R08: 00000000000040d0 R09: 0000000000000001
[ 1648.129953] R10: 0000000000000000 R11: 0000000000000b5f R12: 00000000000052d0
[ 1648.215259] R13: ffff8807c1417300 R14: 0000000000030038 R15: 0000000000000003
[ 1648.300572] FS:  00007fa9b1b44700(0000) GS:ffff8807c3800000(0000) knlGS:0000000000000000
[ 1648.397272] CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
[ 1648.465985] CR2: 00007fa9b09acca0 CR3: 000000078b855000 CR4: 00000000000007e0
[ 1648.551265] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 1648.636565] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
[ 1648.721838] Process init (pid: 3126, threadinfo ffff88078a048000, task ffff8807bb6f2650)
[ 1648.818534] Stack:
[ 1648.842548]  ffff8807c39d7fa0 ffffffff000040d0 00000000000000bb 00000000000080d0
[ 1648.931469]  ffff8807c1417300 ffff8807c39d7fa0 ffff8807c1417300 0000000000000001
[ 1649.020410]  ffff88078a049d88 ffffffff811bc4a0 ffff8807c1410c80 0000000000000000
[ 1649.109464] Call Trace:
[ 1649.138713]  [<ffffffff811bc4a0>] new_slab+0x30/0x1b0
[ 1649.199075]  [<ffffffff811bc978>] __slab_alloc+0x358/0x4c0
[ 1649.264683]  [<ffffffff810b71c0>] ? alloc_fair_sched_group+0xd0/0x1b0
[ 1649.341695]  [<ffffffff811be7d4>] kmem_cache_alloc_node_trace+0xb4/0x1e0
[ 1649.421824]  [<ffffffff8109d188>] ? hrtimer_init+0x48/0x100
[ 1649.488414]  [<ffffffff810b71c0>] ? alloc_fair_sched_group+0xd0/0x1b0
[ 1649.565402]  [<ffffffff810b71c0>] alloc_fair_sched_group+0xd0/0x1b0
[ 1649.640297]  [<ffffffff810a8bce>] sched_create_group+0x3e/0x110
[ 1649.711040]  [<ffffffff810bdbcd>] sched_autogroup_create_attach+0x4d/0x180
[ 1649.793260]  [<ffffffff81089614>] sys_setsid+0xd4/0xf0
[ 1649.854694]  [<ffffffff8167a029>] system_call_fastpath+0x16/0x1b
[ 1649.926483] Code: 89 c4 e9 73 fe ff ff 31 c0 89 de 48 c7 c7 45 de 9e 81 44 89 45 c8 e8 22 05 4b 00 85 db 44 8b 45 c8 0f 89 4f ff ff ff 0f 0b eb fe <0f> 0b 90 eb fd 0f 0b eb fe 89 de 48 c7 c7 45 de 9e 81 31 c0 44
[ 1650.161454] RIP  [<ffffffff811bc3fd>] allocate_slab+0x28d/0x300
[ 1650.232348]  RSP <ffff88078a049cf8>
[ 1650.274029] ---[ end trace adf84c90f3fea3e5 ]---

The reason is that: the cpu's node is not NUMA_NO_NODE, we will call
alloc_pages_exact_node() to alloc memory on the node, but the node is
offlined.

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agovfs: d_obtain_alias() needs to use "/" as default name.
NeilBrown [Fri, 28 Sep 2012 00:18:47 +0000 (10:18 +1000)]
vfs: d_obtain_alias() needs to use "/" as default name.

NFS appears to use d_obtain_alias() to create the root dentry rather than
d_make_root.  This can cause 'prepend_path()' to complain that the root
has a weird name if an NFS filesystem is lazily unmounted.  e.g.  if
"/mnt" is an NFS mount then

 { cd /mnt; umount -l /mnt ; ls -l /proc/self/cwd; }

will cause a WARN message like
   WARNING: at /home/git/linux/fs/dcache.c:2624 prepend_path+0x1d7/0x1e0()
   ...
   Root dentry has weird name <>

to appear in kernel logs.

So change d_obtain_alias() to use "/" rather than "" as the anonymous
name.

Signed-off-by: NeilBrown <neilb@suse.de>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agoselinux: fix sel_netnode_insert() suspicious rcu dereference
Dave Jones [Fri, 28 Sep 2012 00:18:47 +0000 (10:18 +1000)]
selinux: fix sel_netnode_insert() suspicious rcu dereference

===============================
[ INFO: suspicious RCU usage. ]
3.5.0-rc1+ #63 Not tainted
-------------------------------
security/selinux/netnode.c:178 suspicious rcu_dereference_check() usage!

other info that might help us debug this:

rcu_scheduler_active = 1, debug_locks = 0
1 lock held by trinity-child1/8750:
 #0:  (sel_netnode_lock){+.....}, at: [<ffffffff812d8f8a>] sel_netnode_sid+0x16a/0x3e0

stack backtrace:
Pid: 8750, comm: trinity-child1 Not tainted 3.5.0-rc1+ #63
Call Trace:
 [<ffffffff810cec2d>] lockdep_rcu_suspicious+0xfd/0x130
 [<ffffffff812d91d1>] sel_netnode_sid+0x3b1/0x3e0
 [<ffffffff812d8e20>] ? sel_netnode_find+0x1a0/0x1a0
 [<ffffffff812d24a6>] selinux_socket_bind+0xf6/0x2c0
 [<ffffffff810cd1dd>] ? trace_hardirqs_off+0xd/0x10
 [<ffffffff810cdb55>] ? lock_release_holdtime.part.9+0x15/0x1a0
 [<ffffffff81093841>] ? lock_hrtimer_base+0x31/0x60
 [<ffffffff812c9536>] security_socket_bind+0x16/0x20
 [<ffffffff815550ca>] sys_bind+0x7a/0x100
 [<ffffffff816c03d5>] ? sysret_check+0x22/0x5d
 [<ffffffff810d392d>] ? trace_hardirqs_on_caller+0x10d/0x1a0
 [<ffffffff8133b09e>] ? trace_hardirqs_on_thunk+0x3a/0x3f
 [<ffffffff816c03a9>] system_call_fastpath+0x16/0x1b

This patch below does what Paul McKenney suggested in the previous thread.

Signed-off-by: Dave Jones <davej@redhat.com>
Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Cc: Eric Paris <eparis@parisplace.org>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agoCRIS: Fix I/O macros
Corey Minyard [Fri, 28 Sep 2012 00:18:47 +0000 (10:18 +1000)]
CRIS: Fix I/O macros

The inb/outb macros for CRIS are broken from a number of points of view,
missing () around parameters and they have an unprotected if statement in
them.  This was breaking the compile of IPMI on CRIS and thus I was being
annoyed by build regressions, so I fixed them.

Plus I don't think they would have worked at all, since the data values
were missing "&" and the outsl had a "3" instead of a "4" for the size.
From what I can tell, this stuff is not used at all, so this can't be any
more broken than it was before, anyway.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <starvik@axis.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
11 years agoMerge remote-tracking branch 'signal/for-next'
Stephen Rothwell [Mon, 8 Oct 2012 02:45:44 +0000 (13:45 +1100)]
Merge remote-tracking branch 'signal/for-next'

Conflicts:
arch/alpha/Kconfig
arch/arm/Kconfig
arch/arm/include/asm/thread_info.h
arch/avr32/include/asm/Kbuild
arch/c6x/Kconfig
arch/cris/include/asm/Kbuild
arch/frv/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/ia64/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/m68k/Kconfig
arch/microblaze/include/asm/Kbuild
arch/mn10300/Kconfig
arch/mn10300/include/asm/Kbuild
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/um/kernel/exec.c
arch/x86/Kconfig
arch/x86/kernel/process_32.c
arch/x86/kernel/signal.c
arch/xtensa/include/asm/Kbuild
fs/exec.c

11 years agoMerge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Mon, 8 Oct 2012 02:16:08 +0000 (13:16 +1100)]
Merge remote-tracking branch 'userns/for-next'

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

11 years agoMerge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Mon, 8 Oct 2012 02:12:39 +0000 (13:12 +1100)]
Merge remote-tracking branch 'pwm/for-next'

11 years agoMerge remote-tracking branch 'kvmtool/master'
Stephen Rothwell [Mon, 8 Oct 2012 02:10:57 +0000 (13:10 +1100)]
Merge remote-tracking branch 'kvmtool/master'

11 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Mon, 8 Oct 2012 02:10:48 +0000 (13:10 +1100)]
Merge remote-tracking branch 'samsung/for-next'

Conflicts:
arch/arm/mach-exynos/clock-exynos5.c

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

Conflicts:
arch/arm/Kconfig

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

Conflicts:
arch/arm/mach-ixp4xx/common.c
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h

11 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Mon, 8 Oct 2012 02:06:48 +0000 (13:06 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

11 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Mon, 8 Oct 2012 02:05:08 +0000 (13:05 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

11 years agoMerge remote-tracking branch 'remoteproc/for-next'
Stephen Rothwell [Mon, 8 Oct 2012 02:03:18 +0000 (13:03 +1100)]
Merge remote-tracking branch 'remoteproc/for-next'

11 years agoMerge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Mon, 8 Oct 2012 02:03:10 +0000 (13:03 +1100)]
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/tun.c

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

11 years agoMerge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Mon, 8 Oct 2012 01:54:40 +0000 (12:54 +1100)]
Merge remote-tracking branch 'tmem/linux-next'

11 years agoMerge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Mon, 8 Oct 2012 01:52:28 +0000 (12:52 +1100)]
Merge remote-tracking branch 'leds/for-next'

11 years agoMerge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Mon, 8 Oct 2012 01:50:33 +0000 (12:50 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'

11 years agoMerge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Mon, 8 Oct 2012 01:50:28 +0000 (12:50 +1100)]
Merge remote-tracking branch 'workqueues/for-next'

11 years agoMerge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Mon, 8 Oct 2012 01:48:34 +0000 (12:48 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'

11 years agoMerge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Mon, 8 Oct 2012 01:46:39 +0000 (12:46 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

11 years agoMerge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Mon, 8 Oct 2012 01:44:50 +0000 (12:44 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'

11 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Mon, 8 Oct 2012 01:37:01 +0000 (12:37 +1100)]
Merge remote-tracking branch 'tip/auto-latest'

11 years agoMerge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Mon, 8 Oct 2012 01:35:16 +0000 (12:35 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'

11 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 8 Oct 2012 01:35:03 +0000 (12:35 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'

Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c

11 years agoMerge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Mon, 8 Oct 2012 01:33:01 +0000 (12:33 +1100)]
Merge remote-tracking branch 'edac/linux_next'

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

Conflicts:
kernel/audit_tree.c

11 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Mon, 8 Oct 2012 01:28:57 +0000 (12:28 +1100)]
Merge remote-tracking branch 'osd/linux-next'

11 years agoMerge remote-tracking branch 'vfio/next'
Stephen Rothwell [Mon, 8 Oct 2012 01:27:14 +0000 (12:27 +1100)]
Merge remote-tracking branch 'vfio/next'

11 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 8 Oct 2012 01:25:29 +0000 (12:25 +1100)]
Merge remote-tracking branch 'watchdog/master'

11 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Mon, 8 Oct 2012 01:25:23 +0000 (12:25 +1100)]
Merge remote-tracking branch 'selinux/master'

11 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Mon, 8 Oct 2012 01:23:37 +0000 (12:23 +1100)]
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
drivers/video/omap/lcd_ams_delta.c
drivers/video/omap2/displays/panel-taal.c
drivers/video/omap2/dss/dispc.c

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

Conflicts:
arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/mach-real6410.c
drivers/video/epson1355fb.c
drivers/video/msm/mddi.c
drivers/video/msm/mdp.c
drivers/video/msm/mdp_hw.h

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

Conflicts:
drivers/md/raid0.c
fs/bio.c

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

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

Conflicts:
drivers/mmc/host/davinci_mmc.c
drivers/mmc/host/omap.c

11 years agoMerge branch 'quilt/device-mapper'
Stephen Rothwell [Mon, 8 Oct 2012 01:03:10 +0000 (12:03 +1100)]
Merge branch 'quilt/device-mapper'

Conflicts:
drivers/md/dm-thin.c
drivers/md/dm.c

11 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 8 Oct 2012 00:56:06 +0000 (11:56 +1100)]
Merge remote-tracking branch 'block/for-next'

Conflicts:
init/Kconfig

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

11 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 8 Oct 2012 00:54:08 +0000 (11:54 +1100)]
Merge remote-tracking branch 'input/next'

11 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Mon, 8 Oct 2012 00:48:40 +0000 (11:48 +1100)]
Merge remote-tracking branch 'modules/modules-next'

Conflicts:
Makefile
arch/Kconfig
arch/cris/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/x86/Kconfig
arch/x86/um/Kconfig
arch/xtensa/Kconfig
init/Kconfig

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

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

Conflicts:
arch/arm/mach-davinci/davinci.h
arch/arm/mach-davinci/dm355.c
arch/arm/mach-davinci/dm365.c
arch/arm/mach-davinci/include/mach/da8xx.h
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
sound/soc/omap/igep0020.c
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-pcm.c
sound/soc/omap/omap3beagle.c
sound/soc/omap/omap3evm.c
sound/soc/omap/overo.c

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

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

Conflicts:
MAINTAINERS
arch/arm/configs/bcmring_defconfig
arch/arm/mach-imx/clk-imx51-imx53.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/nand_bcm_umi.h
drivers/mtd/nand/orion_nand.c

11 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 8 Oct 2012 00:07:27 +0000 (11:07 +1100)]
Merge remote-tracking branch 'bluetooth/master'

11 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 8 Oct 2012 00:05:38 +0000 (11:05 +1100)]
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/mmp_tdma.c
drivers/mmc/host/davinci_mmc.c
drivers/spi/spi-davinci.c

11 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Mon, 8 Oct 2012 00:03:37 +0000 (11:03 +1100)]
Merge remote-tracking branch 'target-updates/for-next'

11 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Mon, 8 Oct 2012 00:03:34 +0000 (11:03 +1100)]
Merge remote-tracking branch 'scsi/for-next'

11 years agoMerge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Mon, 8 Oct 2012 00:01:48 +0000 (11:01 +1100)]
Merge remote-tracking branch 'ubi/linux-next'

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

Conflicts:
drivers/staging/omap-thermal/omap-thermal-common.c
drivers/thermal/thermal_sys.c

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

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

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

Conflicts:
include/acpi/acpixf.h

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

11 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Sun, 7 Oct 2012 23:40:20 +0000 (10:40 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

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

11 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Sun, 7 Oct 2012 23:37:10 +0000 (10:37 +1100)]
Merge branch 'quilt/jdelvare-hwmon'

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

Conflicts:
drivers/i2c/busses/i2c-omap.c

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

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

Conflicts:
drivers/hid/hid-multitouch.c

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

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

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

11 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Sun, 7 Oct 2012 23:28:14 +0000 (10:28 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

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

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

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

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

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

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

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

11 years agoMerge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Sun, 7 Oct 2012 23:14:23 +0000 (10:14 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'

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

Conflicts:
arch/mips/include/asm/octeon/octeon-model.h
drivers/net/ethernet/octeon/octeon_mgmt.c
drivers/pinctrl/Makefile

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

Conflicts:
arch/ia64/include/asm/Kbuild

11 years agoMerge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Sun, 7 Oct 2012 23:00:53 +0000 (10:00 +1100)]
Merge remote-tracking branch 'arm64/upstream'

Conflicts:
arch/arm64/include/asm/unistd32.h

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

Conflicts:
arch/arm/kernel/hw_breakpoint.c
arch/arm/mach-bcmring/arch.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-ux500/cpu-db8500.c

11 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Sun, 7 Oct 2012 22:56:48 +0000 (09:56 +1100)]
Merge remote-tracking branch 'arm/for-next'

Conflicts:
arch/arm/kernel/smp.c

11 years agoMerge remote-tracking branch 'asm-generic/master'
Stephen Rothwell [Sun, 7 Oct 2012 22:49:17 +0000 (09:49 +1100)]
Merge remote-tracking branch 'asm-generic/master'

11 years agoMerge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Sun, 7 Oct 2012 22:42:30 +0000 (09:42 +1100)]
Merge remote-tracking branch 'spi-current/spi/merge'

11 years agoMerge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Sun, 7 Oct 2012 22:42:15 +0000 (09:42 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'

11 years agoMerge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Sun, 7 Oct 2012 22:41:54 +0000 (09:41 +1100)]
Merge remote-tracking branch 'tty.current/tty-linus'

11 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Sun, 7 Oct 2012 22:41:49 +0000 (09:41 +1100)]
Merge remote-tracking branch 'wireless/master'

11 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Sun, 7 Oct 2012 22:41:44 +0000 (09:41 +1100)]
Merge remote-tracking branch 'net/master'

11 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Sun, 7 Oct 2012 22:41:41 +0000 (09:41 +1100)]
Merge remote-tracking branch 'sparc/master'

11 years agoMerge remote-tracking branch 'kbuild-current/rc-fixes'
Stephen Rothwell [Sun, 7 Oct 2012 22:41:32 +0000 (09:41 +1100)]
Merge remote-tracking branch 'kbuild-current/rc-fixes'

11 years agoi2c-piix4: Fix build failure
Daniel J Blueman [Sun, 7 Oct 2012 22:26:17 +0000 (09:26 +1100)]
i2c-piix4: Fix build failure

Fix build failure in Intel PIIX4 I2C driver.

Signed-off-by: Daniel J Blueman <daniel@quora.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: stable@vger.kernel.org [v3.6]
11 years agoi2c: Correct struct i2c_driver doc about detection
Vivien Didelot [Sun, 7 Oct 2012 22:26:17 +0000 (09:26 +1100)]
i2c: Correct struct i2c_driver doc about detection

s/address_data/address_list/ in addition to c3813d6.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
11 years agoi2c-i801: Let i2c-mux-gpio find the GPIO chip
Jean Delvare [Sun, 7 Oct 2012 22:26:16 +0000 (09:26 +1100)]
i2c-i801: Let i2c-mux-gpio find the GPIO chip

Now that i2c-mux-gpio is able to find the GPIO chip by itself, we can
delegate this task. The great thing here is that i2c-mux-gpio can
defer device probing until the gpio chip is available, so we no longer
depend on the module loading order.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
11 years agoi2c-mux-gpio: Update documentation
Jean Delvare [Sun, 7 Oct 2012 22:26:16 +0000 (09:26 +1100)]
i2c-mux-gpio: Update documentation

* Document the possibility to pass relative GPIO pin numbers.
* Document what platform device IDs to use, so that they do not
  collide.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Peter Korsgaard <peter.korsgaard@barco.com>
11 years agoi2c-mux-gpio: Add support for dynamically allocated GPIO pins
Jean Delvare [Sun, 7 Oct 2012 22:26:16 +0000 (09:26 +1100)]
i2c-mux-gpio: Add support for dynamically allocated GPIO pins

The code instantiating an i2c-mux-gpio platform device doesn't
necessarily know in advance the GPIO pin numbers it wants to use. If
pins are on a GPIO device which gets its base GPIO number assigned
dynamically at run-time, the values can't be hard-coded.

In that case, let the caller tell i2c-mux-gpio the name of the GPIO
chip and the (relative) GPIO pin numbers to use. At probe time, the
i2c-mux-gpio driver will look for the chip and apply the proper offset
to turn relative GPIO pin numbers to absolute GPIO pin numbers.

The same could be (and was so far) done on the caller's end, however
doing it in i2c-mux-gpio has two benefits:
* It avoids duplicating the code on every caller's side (about 30
  lines of code.)
* It allows for deferred probing for the muxed part of the I2C bus
  only. If finding the GPIO chip is the caller's responsibility, then
  deferred probing (if the GPIO chip isn't there yet) will not only
  affect the mux and the I2C bus segments behind it, but also the I2C
  bus trunk.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Peter Korsgaard <peter.korsgaard@barco.com>
11 years agoi2c-mux-gpio: Use devm_kzalloc instead of kzalloc
Maxime Ripard [Sun, 7 Oct 2012 22:26:15 +0000 (09:26 +1100)]
i2c-mux-gpio: Use devm_kzalloc instead of kzalloc

Use the devm_kzalloc managed function to stripdown the error and remove
code.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
11 years agoi2c-i801: Support SMBus multiplexing on Asus Z8 series
Jean Delvare [Sun, 7 Oct 2012 22:26:15 +0000 (09:26 +1100)]
i2c-i801: Support SMBus multiplexing on Asus Z8 series

Add support for SMBus multiplexing on Asus Z8 motherboard series. On
these boards, the memory slots are behind a GPIO-controlled I2C
multiplexer. Models with 6 or 12 memory slots have 2 segments behind
the multiplexer, while models with 18 memory slots have 3 such
segments.

On these boards, only the memory slots are behind the multiplexer,
so it is possible to keep the autodetection mechanism.

The code is generic enough so it could work on other boards as long as
the multiplexer is controlled by GPIO pins. For other forms of
multiplexing (for example using an I2C device) additional code will be
needed.

Thanks to Asus for providing a board to develop and test this feature,
as well as all the technical information required.

At the moment, the GPIO driver must be loaded before the i2c-i801
driver, but I hope to solve this soon, using deferred probing on
the i2c-mux-gpio side.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
11 years agoi2c-viapro: Add VIA VX900 device ID
Jean Delvare [Sun, 7 Oct 2012 22:26:15 +0000 (09:26 +1100)]
i2c-viapro: Add VIA VX900 device ID

The SMBus controller in the VIA VX900 appears to be compatible with
the VIA VX855, so just add the device ID.

This closes kernel bug #43096.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
11 years agoi2c-parport: i2c_parport_irq can be static
Jean Delvare [Sun, 7 Oct 2012 22:26:15 +0000 (09:26 +1100)]
i2c-parport: i2c_parport_irq can be static

i2c_parport_irq is only called internally so it can be static.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
11 years agoi2c-designware: i2c_dw_xfer_msg can be static
Jean Delvare [Sun, 7 Oct 2012 22:26:14 +0000 (09:26 +1100)]
i2c-designware: i2c_dw_xfer_msg can be static

i2c_dw_xfer_msg is only called internally so it can be static. It
original was, before the driver split. No idea why it was changed at
that time.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Dirk Brandewie <dirk.brandewie@gmail.com>