]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Geert Uytterhoeven [Tue, 14 Aug 2012 03:22:26 +0000 (13:22 +1000)]
mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it
It seems the current (gcc 4.6.3) no longer provides this so make it
conditional.
As reported by Tony before, the mn10300 architecture cross-compiles with
gcc-4.6.3 if -mmem-funcs is not added to KBUILD_CFLAGS.
Reported-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Shérab [Tue, 14 Aug 2012 03:22:26 +0000 (13:22 +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>
Wen Congyang [Tue, 14 Aug 2012 03:22:25 +0000 (13:22 +1000)]
acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
If the memory device is hotplugged before the driver is loaded, the user
cannot see this device under the directory /sys/bus/acpi/devices/, and the
user cannot bind it by hand after the driver is loaded. This patch
introduces a new feature to bind such device when the driver is being
loaded.
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>
Wen Congyang [Tue, 14 Aug 2012 03:22:25 +0000 (13:22 +1000)]
acpi_memhotplug.c: bind the memory device when the driver is being loaded
We had introduced acpi_hotmem_initialized to avoid strange add_memory fail
message. But the memory device may not be used by the kernel, and the
device should be bound when the driver is being loaded. Remove
acpi_hotmem_initialized to allow that the device can be bound when the
driver is being loaded.
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>
Wen Congyang [Tue, 14 Aug 2012 03:22:25 +0000 (13:22 +1000)]
acpi_memhotplug.c: don't allow to eject the memory device if it is being used
We eject the memory device even if it is in use. It is very dangerous,
and it will cause the kernel to panic.
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>
Wen Congyang [Tue, 14 Aug 2012 03:22:24 +0000 (13:22 +1000)]
acpi_memhotplug.c: remove memory info from list before freeing it
We free info, but we forget to remove it from the list. It will cause
unexpected problems when we access the list next time.
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>
Wen Congyang [Tue, 14 Aug 2012 03:22:24 +0000 (13:22 +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>
Wen Congyang [Tue, 14 Aug 2012 03:22:24 +0000 (13:22 +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>
Stephen Rothwell [Fri, 24 Aug 2012 06:34:00 +0000 (16:34 +1000)]
Merge branch 'signal/from-sfr'
Conflicts:
arch/alpha/kernel/process.c
arch/arm/include/asm/thread_info.h
arch/powerpc/kernel/entry_64.S
arch/x86/kernel/signal.c
Stephen Rothwell [Fri, 24 Aug 2012 06:29:09 +0000 (16:29 +1000)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 06:27:32 +0000 (16:27 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 06:26:00 +0000 (16:26 +1000)]
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
Stephen Rothwell [Fri, 24 Aug 2012 06:24:22 +0000 (16:24 +1000)]
Merge remote-tracking branch 'kvmtool/master'
Stephen Rothwell [Fri, 24 Aug 2012 06:22:48 +0000 (16:22 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 06:21:13 +0000 (16:21 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 06:19:33 +0000 (16:19 +1000)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Fri, 24 Aug 2012 06:19:30 +0000 (16:19 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Fri, 24 Aug 2012 06:14:58 +0000 (16:14 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
drivers/mtd/nand/Kconfig
Stephen Rothwell [Fri, 24 Aug 2012 06:13:20 +0000 (16:13 +1000)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 06:13:06 +0000 (16:13 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Fri, 24 Aug 2012 06:11:23 +0000 (16:11 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 06:09:36 +0000 (16:09 +1000)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Fri, 24 Aug 2012 06:08:02 +0000 (16:08 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Conflicts:
drivers/misc/mei/interrupt.c
Stephen Rothwell [Fri, 24 Aug 2012 06:06:10 +0000 (16:06 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Fri, 24 Aug 2012 06:04:27 +0000 (16:04 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Fri, 24 Aug 2012 06:02:06 +0000 (16:02 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Fri, 24 Aug 2012 05:55:04 +0000 (15:55 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Fri, 24 Aug 2012 05:53:09 +0000 (15:53 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 05:51:23 +0000 (15:51 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 05:49:45 +0000 (15:49 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Fri, 24 Aug 2012 05:42:37 +0000 (15:42 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Conflicts:
drivers/hid/hid-picolcd.c
Stephen Rothwell [Fri, 24 Aug 2012 05:25:25 +0000 (15:25 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Fri, 24 Aug 2012 05:23:46 +0000 (15:23 +1000)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Fri, 24 Aug 2012 05:05:16 +0000 (15:05 +1000)]
Merge commit 'refs/next/
20120822 /kvm'
Conflicts:
arch/s390/include/asm/processor.h
Stephen Rothwell [Fri, 24 Aug 2012 04:57:14 +0000 (14:57 +1000)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Fri, 24 Aug 2012 04:50:03 +0000 (14:50 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Conflicts:
arch/Kconfig
arch/x86/Kconfig
include/linux/sched.h
kernel/rcutree.h
kernel/rcutree_plugin.h
Stephen Rothwell [Fri, 24 Aug 2012 04:42:43 +0000 (14:42 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/Kconfig
Stephen Rothwell [Fri, 24 Aug 2012 04:41:06 +0000 (14:41 +1000)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:39:07 +0000 (14:39 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:39:00 +0000 (14:39 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Fri, 24 Aug 2012 04:38:46 +0000 (14:38 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Fri, 24 Aug 2012 04:37:11 +0000 (14:37 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Fri, 24 Aug 2012 04:29:59 +0000 (14:29 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:23:48 +0000 (14:23 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:22:12 +0000 (14:22 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:20:33 +0000 (14:20 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 24 Aug 2012 04:18:54 +0000 (14:18 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 24 Aug 2012 04:18:48 +0000 (14:18 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Fri, 24 Aug 2012 04:16:43 +0000 (14:16 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 24 Aug 2012 04:15:05 +0000 (14:15 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:13:23 +0000 (14:13 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:11:46 +0000 (14:11 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 24 Aug 2012 04:10:13 +0000 (14:10 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:08:34 +0000 (14:08 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:06:57 +0000 (14:06 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:05:22 +0000 (14:05 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:03:49 +0000 (14:03 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 24 Aug 2012 04:02:06 +0000 (14:02 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Fri, 24 Aug 2012 03:59:41 +0000 (13:59 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 03:59:39 +0000 (13:59 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 03:58:00 +0000 (13:58 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 24 Aug 2012 03:52:35 +0000 (13:52 +1000)]
Merge branch 'quilt/rr'
Conflicts:
arch/alpha/Kconfig
arch/mips/kernel/module.c
arch/s390/Kconfig
arch/xtensa/Kconfig
Stephen Rothwell [Fri, 24 Aug 2012 03:50:54 +0000 (13:50 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 03:49:14 +0000 (13:49 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 03:46:18 +0000 (13:46 +1000)]
Merge commit 'refs/next/
20120823 /drm'
Stephen Rothwell [Fri, 24 Aug 2012 01:56:16 +0000 (11:56 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:54:43 +0000 (11:54 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:53:05 +0000 (11:53 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:51:31 +0000 (11:51 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:49:37 +0000 (11:49 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:42:30 +0000 (11:42 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:40:54 +0000 (11:40 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 24 Aug 2012 01:39:13 +0000 (11:39 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 01:37:31 +0000 (11:37 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Conflicts:
drivers/ata/libata-core.c
Stephen Rothwell [Fri, 24 Aug 2012 01:35:53 +0000 (11:35 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Fri, 24 Aug 2012 01:34:09 +0000 (11:34 +1000)]
Merge commit 'refs/next/
20120823 /ubi'
Stephen Rothwell [Fri, 24 Aug 2012 01:09:58 +0000 (11:09 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 24 Aug 2012 01:09:51 +0000 (11:09 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
Stephen Rothwell [Fri, 24 Aug 2012 01:08:14 +0000 (11:08 +1000)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:06:38 +0000 (11:06 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Fri, 24 Aug 2012 01:05:03 +0000 (11:05 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 01:04:52 +0000 (11:04 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 01:02:53 +0000 (11:02 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 24 Aug 2012 01:01:24 +0000 (11:01 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 24 Aug 2012 01:00:00 +0000 (11:00 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Fri, 24 Aug 2012 00:58:34 +0000 (10:58 +1000)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:57:09 +0000 (10:57 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Fri, 24 Aug 2012 00:55:40 +0000 (10:55 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:51:20 +0000 (10:51 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:49:47 +0000 (10:49 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:48:20 +0000 (10:48 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:46:45 +0000 (10:46 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:45:18 +0000 (10:45 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:43:45 +0000 (10:43 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 24 Aug 2012 00:42:18 +0000 (10:42 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 24 Aug 2012 00:40:47 +0000 (10:40 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 24 Aug 2012 00:39:19 +0000 (10:39 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Fri, 24 Aug 2012 00:37:52 +0000 (10:37 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 24 Aug 2012 00:36:29 +0000 (10:36 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Fri, 24 Aug 2012 00:35:05 +0000 (10:35 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'