]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Michel Lespinasse [Wed, 19 Jun 2013 00:05:22 +0000 (10:05 +1000)]
x86: fix trigger_all_cpu_backtrace() implementation
Fix the x86 implementation of trigger_all_cpu_backtrace(), which was
previously (accidentally, as far as I can tell) disabled to always return
false as on architectures that do not implement this function.
trigger_all_cpu_backtrace(), as defined in include/linux/nmi.h, should
call arch_trigger_all_cpu_backtrace() if available, or return false if the
underlying arch doesn't implement this function.
x86 did provide a suitable arch_trigger_all_cpu_backtrace()
implementation, but it wasn't actually being used because it was declared
in asm/nmi.h, which linux/nmi.h doesn't include. Also, linux/nmi.h
couldn't easily be fixed by including asm/nmi.h, because that file is not
available on all architectures.
I am proposing to fix this by moving the x86 definition of
arch_trigger_all_cpu_backtrace() to asm/irq.h.
Tested: echo l > /proc/sysrq-trigger
Before the change, this uses a fallback implementation which shows
backtraces on active CPUs (using smp_call_function_interrupt()).
After the change, this shows NMI backtraces on all CPUs.
Signed-off-by: Michel Lespinasse <walken@google.com>
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>
Libo Chen [Wed, 19 Jun 2013 00:05:21 +0000 (10:05 +1000)]
drivers/platform/x86/intel_ips.c: convert to module_pci_driver
Signed-off-by: Libo Chen <libo.chen@huawei.com>
Cc: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrew Morton [Wed, 19 Jun 2013 00:05:21 +0000 (10:05 +1000)]
include/linux/smp.h:on_each_cpu(): switch back to a macro
f21afc25f9ed4 ("smp.h: Use local_irq_{save,restore}() in !SMP version of
on_each_cpu()") converted on_each_cpu() to a C function. This required
inclusion of irqflags.h, which broke ia64 and mn10300 (at least) due to
header ordering hell.
Switch on_each_cpu() back to a macro to fix this.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: David Daney <david.daney@cavium.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
James Hogan [Wed, 19 Jun 2013 00:05:20 +0000 (10:05 +1000)]
metag: fix mm/hugetlb.c build breakage
Commit
106c992a5ebef ("mm/hugetlb: add more arch-defined huge_pte
functions") merged in v3.10-rc1.
The above commit added an include of <asm-generic/hugetlb.h> to each
architecture's <asm/hugetlb.h> (except s390). Unfortunately metag was
missed which resulted in build errors when hugetlbfs is enabled (see
below). Add the include for metag too to fix the build errors.
mm/hugetlb.c In function 'make_huge_pte':
mm/hugetlb.c +2250 : error: implicit declaration of function 'huge_pte_mkwrite'
mm/hugetlb.c +2250 : error: implicit declaration of function 'huge_pte_mkdirty'
mm/hugetlb.c +2250 : error: implicit declaration of function 'mk_huge_pte'
mm/hugetlb.c +2251 : error: incompatible types in assignment
mm/hugetlb.c +2254 : error: incompatible type for argument 1 of 'huge_pte_wrprotect'
mm/hugetlb.c In function 'set_huge_ptep_writable':
mm/hugetlb.c +2268 : error: incompatible types in assignment
mm/hugetlb.c In function '__unmap_hugepage_range':
mm/hugetlb.c +2383 : error: implicit declaration of function 'huge_pte_clear'
mm/hugetlb.c +2407 : error: implicit declaration of function 'huge_pte_dirty'
mm/hugetlb.c In function 'hugetlb_fault':
mm/hugetlb.c +2860 : error: implicit declaration of function 'huge_pte_write'
mm/hugetlb.c +2895 : error: incompatible types in assignment
mm/hugetlb.c In function 'hugetlb_change_protection':
mm/hugetlb.c +3047 : error: implicit declaration of function 'huge_pte_modify'
mm/hugetlb.c +3047 : error: incompatible type for argument 1 of 'pte_mkhuge'
make[1]: *** [mm/hugetlb.o] Error 1
make: *** [mm/hugetlb.o] Error 2
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrew Morton [Wed, 19 Jun 2013 00:05:20 +0000 (10:05 +1000)]
fput-task_work_add-can-fail-if-the-caller-has-passed-exit_task_work-fix
add comment
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrey Vagin <avagin@openvz.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Wed, 19 Jun 2013 07:08:01 +0000 (17:08 +1000)]
fix up for fw_load_abort API change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Stephen Rothwell [Wed, 19 Jun 2013 06:53:49 +0000 (16:53 +1000)]
Merge remote-tracking branch 'arm64-hugepages/for-next/hugepages'
Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/pgtable-hwdef.h
arch/arm64/include/asm/pgtable.h
Stephen Rothwell [Wed, 19 Jun 2013 06:52:07 +0000 (16:52 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Wed, 19 Jun 2013 06:50:24 +0000 (16:50 +1000)]
Merge remote-tracking branch 'clk/clk-next'
Conflicts:
drivers/clk/tegra/clk-tegra114.c
Stephen Rothwell [Wed, 19 Jun 2013 06:48:37 +0000 (16:48 +1000)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 06:46:56 +0000 (16:46 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 06:45:11 +0000 (16:45 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Conflicts:
drivers/usb/Kconfig
Stephen Rothwell [Wed, 19 Jun 2013 06:26:19 +0000 (16:26 +1000)]
Merge remote-tracking branch 'renesas/next'
Conflicts:
arch/arm/mach-shmobile/board-bockw.c
arch/arm/mach-shmobile/clock-r8a7778.c
arch/arm/mach-shmobile/include/mach/r8a7778.h
include/linux/serial_sci.h
include/uapi/linux/serial_core.h
Stephen Rothwell [Wed, 19 Jun 2013 06:26:06 +0000 (16:26 +1000)]
Merge remote-tracking branch 'mvebu/for-next'
Conflicts:
arch/arm/boot/dts/kirkwood-6281.dtsi
Stephen Rothwell [Wed, 19 Jun 2013 06:24:11 +0000 (16:24 +1000)]
Merge remote-tracking branch 'msm/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 06:22:26 +0000 (16:22 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'
Conflicts:
arch/arm/Kconfig.debug
arch/arm/mach-mxs/mach-mxs.c
Stephen Rothwell [Wed, 19 Jun 2013 06:10:18 +0000 (16:10 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Wed, 19 Jun 2013 06:08:02 +0000 (16:08 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/mach-shmobile/clock-r8a7740.c
arch/arm/mach-shmobile/clock-r8a7778.c
drivers/tty/serial/xilinx_uartps.c
drivers/usb/phy/phy-rcar-usb.c
Stephen Rothwell [Wed, 19 Jun 2013 06:06:11 +0000 (16:06 +1000)]
Merge remote-tracking branch 'mailbox/dbx500-prcmu-mailbox'
Stephen Rothwell [Wed, 19 Jun 2013 06:04:31 +0000 (16:04 +1000)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 06:02:50 +0000 (16:02 +1000)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Wed, 19 Jun 2013 05:55:24 +0000 (15:55 +1000)]
Merge remote-tracking branch 'irqdomain/irqdomain/next'
Conflicts:
kernel/irq/irqdomain.c
Stephen Rothwell [Wed, 19 Jun 2013 05:47:19 +0000 (15:47 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Conflicts:
drivers/net/ethernet/ti/davinci_mdio.c
Stephen Rothwell [Wed, 19 Jun 2013 05:44:41 +0000 (15:44 +1000)]
Merge remote-tracking branch 'bcon/master'
Conflicts:
drivers/block/Kconfig
Stephen Rothwell [Wed, 19 Jun 2013 05:36:03 +0000 (15:36 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 19 Jun 2013 05:33:56 +0000 (15:33 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt
drivers/staging/serqt_usb2/serqt_usb2.c
drivers/staging/silicom/bpctl_mod.c
drivers/thermal/ti-soc-thermal/ti-thermal-common.c
Stephen Rothwell [Wed, 19 Jun 2013 05:31:44 +0000 (15:31 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Wed, 19 Jun 2013 05:29:40 +0000 (15:29 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Wed, 19 Jun 2013 05:26:01 +0000 (15:26 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
drivers/base/cpu.c
drivers/base/firmware_class.c
drivers/base/memory.c
include/linux/platform_device.h
Stephen Rothwell [Wed, 19 Jun 2013 05:11:16 +0000 (15:11 +1000)]
Stephen Rothwell [Wed, 19 Jun 2013 05:04:22 +0000 (15:04 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:56:00 +0000 (14:56 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:51:28 +0000 (14:51 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:49:51 +0000 (14:49 +1000)]
Merge remote-tracking branch 'xen-arm/linux-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:42:50 +0000 (14:42 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:41:07 +0000 (14:41 +1000)]
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:39:28 +0000 (14:39 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/s390/include/asm/pgtable.h
Stephen Rothwell [Wed, 19 Jun 2013 04:31:09 +0000 (14:31 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Wed, 19 Jun 2013 04:29:11 +0000 (14:29 +1000)]
Merge remote-tracking branch 'spi-mb/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:26:24 +0000 (14:26 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Wed, 19 Jun 2013 04:24:47 +0000 (14:24 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:16:25 +0000 (14:16 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/networking/netlink_mmap.txt
Stephen Rothwell [Wed, 19 Jun 2013 04:14:36 +0000 (14:14 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 19 Jun 2013 04:14:30 +0000 (14:14 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 19 Jun 2013 04:10:07 +0000 (14:10 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Wed, 19 Jun 2013 04:08:26 +0000 (14:08 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:08:23 +0000 (14:08 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 04:06:44 +0000 (14:06 +1000)]
Merge remote-tracking branch 'fbdev/for-next'
Conflicts:
drivers/video/of_display_timing.c
Stephen Rothwell [Wed, 19 Jun 2013 04:05:06 +0000 (14:05 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Wed, 19 Jun 2013 04:03:28 +0000 (14:03 +1000)]
Merge remote-tracking branch 'mfd/master'
Stephen Rothwell [Wed, 19 Jun 2013 04:01:51 +0000 (14:01 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:53:57 +0000 (13:53 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:53:54 +0000 (13:53 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:52:15 +0000 (13:52 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:52:01 +0000 (13:52 +1000)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Wed, 19 Jun 2013 03:47:28 +0000 (13:47 +1000)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
include/linux/cgroup.h
Stephen Rothwell [Wed, 19 Jun 2013 03:17:04 +0000 (13:17 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:15:28 +0000 (13:15 +1000)]
Merge remote-tracking branch 'input-mt/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:13:50 +0000 (13:13 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 19 Jun 2013 03:12:11 +0000 (13:12 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:10:35 +0000 (13:10 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:08:56 +0000 (13:08 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:07:04 +0000 (13:07 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:05:28 +0000 (13:05 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 03:03:48 +0000 (13:03 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/i915/intel_sdvo.c
Stephen Rothwell [Wed, 19 Jun 2013 02:55:48 +0000 (12:55 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/intel_sdvo.c
Stephen Rothwell [Wed, 19 Jun 2013 02:54:11 +0000 (12:54 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 19 Jun 2013 02:52:34 +0000 (12:52 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 19 Jun 2013 02:50:54 +0000 (12:50 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Conflicts:
net/bluetooth/mgmt.c
Stephen Rothwell [Wed, 19 Jun 2013 02:48:41 +0000 (12:48 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 19 Jun 2013 02:44:33 +0000 (12:44 +1000)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Wed, 19 Jun 2013 02:36:46 +0000 (12:36 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/wireless/ath/ath9k/Kconfig
drivers/net/xen-netback/netback.c
net/batman-adv/bat_iv_ogm.c
Stephen Rothwell [Wed, 19 Jun 2013 02:35:08 +0000 (12:35 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 19 Jun 2013 02:33:23 +0000 (12:33 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:31:17 +0000 (12:31 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:29:40 +0000 (12:29 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Wed, 19 Jun 2013 02:28:03 +0000 (12:28 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:26:27 +0000 (12:26 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:24:49 +0000 (12:24 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Wed, 19 Jun 2013 02:24:44 +0000 (12:24 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/acpi/processor_driver.c
drivers/base/power/qos.c
Stephen Rothwell [Wed, 19 Jun 2013 02:23:04 +0000 (12:23 +1000)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Wed, 19 Jun 2013 02:14:52 +0000 (12:14 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:13:08 +0000 (12:13 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:11:27 +0000 (12:11 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:09:26 +0000 (12:09 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Wed, 19 Jun 2013 02:07:52 +0000 (12:07 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:06:15 +0000 (12:06 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:04:38 +0000 (12:04 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 02:00:48 +0000 (12:00 +1000)]
Merge remote-tracking branch 'pci/next'
Conflicts:
drivers/acpi/pci_root.c
drivers/pci/probe.c
include/linux/aer.h
Stephen Rothwell [Wed, 19 Jun 2013 01:59:05 +0000 (11:59 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 01:57:27 +0000 (11:57 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 19 Jun 2013 01:55:18 +0000 (11:55 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 19 Jun 2013 01:53:41 +0000 (11:53 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 19 Jun 2013 01:49:23 +0000 (11:49 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 19 Jun 2013 01:47:25 +0000 (11:47 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 19 Jun 2013 01:45:49 +0000 (11:45 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 19 Jun 2013 01:44:15 +0000 (11:44 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 19 Jun 2013 01:36:08 +0000 (11:36 +1000)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Wed, 19 Jun 2013 01:34:34 +0000 (11:34 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Wed, 19 Jun 2013 01:26:50 +0000 (11:26 +1000)]
Merge remote-tracking branch 'ext4/dev'