From 57b50ee61f54d036259e8fb785385f0518ffbf4d Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Tue, 6 Dec 2011 19:09:15 +0100 Subject: [PATCH] --- yaml --- r: 277322 b: refs/heads/master c: cc991b83b3eb11b253dd932932fa0bfd09c7564a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/.mailmap | 2 + trunk/Documentation/kernel-parameters.txt | 3 + .../sound/alsa/HD-Audio-Models.txt | 1 + trunk/Kbuild | 2 +- trunk/MAINTAINERS | 10 +- trunk/arch/Kconfig | 4 + trunk/arch/arm/boot/dts/tegra-ventana.dts | 3 +- trunk/arch/arm/kernel/perf_event.c | 6 +- trunk/arch/arm/mach-at91/at91cap9_devices.c | 7 +- trunk/arch/arm/mach-at91/at91rm9200_devices.c | 5 +- .../arch/arm/mach-at91/at91sam9260_devices.c | 5 +- .../arch/arm/mach-at91/at91sam9261_devices.c | 5 +- .../arch/arm/mach-at91/at91sam9263_devices.c | 5 +- .../arch/arm/mach-at91/at91sam9g45_devices.c | 7 +- trunk/arch/arm/mach-at91/at91sam9rl_devices.c | 7 +- trunk/arch/arm/mach-at91/board-yl-9200.c | 2 +- .../arch/arm/mach-at91/include/mach/vmalloc.h | 2 + trunk/arch/arm/mach-imx/Makefile.boot | 34 +- trunk/arch/arm/mach-imx/clock-imx6q.c | 17 +- trunk/arch/arm/mach-msm/Makefile | 2 + trunk/arch/arm/mach-msm/board-msm7x30.c | 4 +- trunk/arch/arm/mach-msm/board-msm8960.c | 4 +- trunk/arch/arm/mach-msm/board-msm8x60.c | 4 +- trunk/arch/arm/mach-msm/scm.c | 3 + trunk/arch/arm/mach-mx5/clock-mx51-mx53.c | 6 +- trunk/arch/arm/mach-mxs/mach-mx28evk.c | 4 +- .../mach-picoxcell/include/mach/debug-macro.S | 2 +- trunk/arch/arm/mach-shmobile/Makefile | 2 +- trunk/arch/arm/mach-shmobile/board-ag5evm.c | 16 +- trunk/arch/arm/mach-shmobile/board-ap4evb.c | 2 +- trunk/arch/arm/mach-shmobile/board-kota2.c | 7 + trunk/arch/arm/mach-shmobile/clock-sh7372.c | 8 +- trunk/arch/arm/mach-shmobile/cpuidle.c | 52 +- .../arm/mach-shmobile/include/mach/common.h | 4 +- .../arm/mach-shmobile/include/mach/sh73a0.h | 8 + trunk/arch/arm/mach-shmobile/pfc-sh7367.c | 122 +--- trunk/arch/arm/mach-shmobile/pfc-sh7372.c | 262 ++++---- trunk/arch/arm/mach-shmobile/pfc-sh7377.c | 159 ++--- trunk/arch/arm/mach-shmobile/pfc-sh73a0.c | 193 +++--- trunk/arch/arm/mach-shmobile/pm-sh7372.c | 14 +- trunk/arch/arm/mach-tegra/board-dt.c | 13 +- .../arm/mach-tegra/board-harmony-pinmux.c | 6 +- .../arch/arm/mach-tegra/board-paz00-pinmux.c | 6 +- .../arm/mach-tegra/board-seaboard-pinmux.c | 6 +- .../arm/mach-tegra/board-trimslice-pinmux.c | 5 +- trunk/arch/arm/plat-mxc/Kconfig | 4 +- trunk/arch/arm/plat-mxc/avic.c | 1 + trunk/arch/arm/plat-mxc/gic.c | 11 +- .../arm/plat-mxc/include/mach/entry-macro.S | 3 - trunk/arch/arm/plat-mxc/tzic.c | 1 + trunk/arch/m68k/Kconfig | 4 +- trunk/arch/m68k/Kconfig.bus | 9 + trunk/arch/m68k/Kconfig.devices | 31 + trunk/arch/m68k/amiga/amiints.c | 168 ++--- trunk/arch/m68k/amiga/cia.c | 39 +- trunk/arch/m68k/apollo/dn_ints.c | 35 +- trunk/arch/m68k/atari/ataints.c | 274 +------- trunk/arch/m68k/bvme6000/config.c | 2 +- trunk/arch/m68k/hp300/time.c | 2 +- trunk/arch/m68k/include/asm/hardirq.h | 5 + trunk/arch/m68k/include/asm/irq.h | 69 +- trunk/arch/m68k/include/asm/macintosh.h | 2 + trunk/arch/m68k/include/asm/q40ints.h | 3 - trunk/arch/m68k/kernel/Makefile | 9 +- trunk/arch/m68k/kernel/entry_mm.S | 7 +- trunk/arch/m68k/kernel/ints.c | 323 +--------- trunk/arch/m68k/mac/baboon.c | 21 +- trunk/arch/m68k/mac/iop.c | 10 +- trunk/arch/m68k/mac/macints.c | 24 +- trunk/arch/m68k/mac/oss.c | 54 +- trunk/arch/m68k/mac/psc.c | 49 +- trunk/arch/m68k/mac/via.c | 74 +-- trunk/arch/m68k/mvme147/config.c | 5 +- trunk/arch/m68k/mvme16x/config.c | 2 +- trunk/arch/m68k/q40/q40ints.c | 60 +- trunk/arch/m68k/sun3/sun3ints.c | 46 +- trunk/arch/mips/Makefile | 4 +- trunk/arch/mips/kernel/perf_event_mipsxx.c | 8 +- trunk/arch/powerpc/boot/dts/charon.dts | 236 +++++++ .../powerpc/configs/52xx/tqm5200_defconfig | 20 +- trunk/arch/powerpc/configs/ppc64_defconfig | 4 + trunk/arch/powerpc/configs/pseries_defconfig | 4 + trunk/arch/powerpc/include/asm/floppy.h | 4 +- trunk/arch/powerpc/include/asm/lv1call.h | 2 +- trunk/arch/powerpc/include/asm/xics.h | 4 +- trunk/arch/powerpc/kernel/exceptions-64s.S | 6 +- trunk/arch/powerpc/kernel/smp.c | 2 +- trunk/arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +- trunk/arch/powerpc/mm/mem.c | 30 + trunk/arch/powerpc/mm/numa.c | 24 +- .../powerpc/platforms/52xx/mpc5200_simple.c | 1 + trunk/arch/powerpc/platforms/cell/beat.c | 2 +- .../powerpc/platforms/cell/celleb_scc_pciex.c | 2 +- trunk/arch/powerpc/platforms/cell/iommu.c | 3 +- trunk/arch/powerpc/platforms/cell/pmu.c | 2 +- trunk/arch/powerpc/platforms/cell/spu_base.c | 9 +- trunk/arch/powerpc/platforms/powermac/pic.c | 1 - trunk/arch/powerpc/platforms/powermac/smp.c | 4 +- .../arch/powerpc/platforms/ps3/device-init.c | 2 +- trunk/arch/powerpc/platforms/ps3/repository.c | 32 +- trunk/arch/powerpc/sysdev/mpic.c | 2 - trunk/arch/powerpc/sysdev/ppc4xx_soc.c | 2 +- trunk/arch/powerpc/sysdev/xics/xics-common.c | 5 +- trunk/arch/sh/include/asm/page.h | 5 + trunk/arch/sh/include/asm/unistd_32.h | 4 +- trunk/arch/sh/include/asm/unistd_64.h | 4 +- trunk/arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 16 +- trunk/arch/sh/kernel/syscalls_32.S | 2 + trunk/arch/sh/kernel/syscalls_64.S | 2 + trunk/arch/x86/kernel/cpu/perf_event.c | 253 ++++++-- trunk/arch/x86/kernel/cpu/perf_event.h | 30 +- trunk/arch/x86/kernel/cpu/perf_event_amd.c | 2 +- .../arch/x86/kernel/cpu/perf_event_amd_ibs.c | 29 +- trunk/arch/x86/kernel/cpu/perf_event_intel.c | 8 + .../arch/x86/kernel/cpu/perf_event_intel_ds.c | 6 +- trunk/arch/x86/kernel/cpu/perf_event_p4.c | 2 +- trunk/arch/x86/lib/inat.c | 9 +- trunk/arch/x86/lib/insn.c | 4 +- trunk/arch/x86/lib/x86-opcode-map.txt | 606 ++++++++++-------- trunk/arch/x86/oprofile/Makefile | 3 +- trunk/arch/x86/oprofile/init.c | 25 +- trunk/arch/x86/oprofile/nmi_int.c | 27 +- trunk/arch/x86/oprofile/nmi_timer_int.c | 50 -- trunk/arch/x86/platform/ce4100/ce4100.c | 2 +- trunk/arch/x86/platform/mrst/mrst.c | 1 + trunk/arch/x86/platform/mrst/vrtc.c | 4 +- trunk/arch/x86/tools/Makefile | 3 +- trunk/arch/x86/tools/gen-insn-attr-x86.awk | 21 +- trunk/arch/x86/tools/insn_sanity.c | 16 +- trunk/crypto/ablkcipher.c | 14 + trunk/crypto/aead.c | 14 + trunk/crypto/ahash.c | 7 + trunk/crypto/blkcipher.c | 7 + trunk/crypto/crypto_user.c | 3 - trunk/crypto/pcompress.c | 7 + trunk/crypto/rng.c | 7 + trunk/crypto/shash.c | 7 + trunk/drivers/acpi/processor_idle.c | 29 - trunk/drivers/ata/ahci.c | 3 + trunk/drivers/ata/ahci_platform.c | 4 +- trunk/drivers/ata/libata-eh.c | 12 +- trunk/drivers/ata/libata-pmp.c | 7 +- trunk/drivers/ata/libata-scsi.c | 4 + trunk/drivers/ata/pata_of_platform.c | 2 +- trunk/drivers/ata/sata_sis.c | 2 +- trunk/drivers/char/agp/intel-gtt.c | 7 +- trunk/drivers/cpufreq/db8500-cpufreq.c | 6 +- trunk/drivers/gpu/drm/Kconfig | 2 +- trunk/drivers/gpu/drm/drm_crtc.c | 4 +- trunk/drivers/gpu/drm/drm_crtc_helper.c | 13 + trunk/drivers/gpu/drm/drm_debugfs.c | 12 +- trunk/drivers/gpu/drm/drm_drv.c | 2 +- trunk/drivers/gpu/drm/drm_irq.c | 22 +- trunk/drivers/gpu/drm/i915/i915_debugfs.c | 5 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 22 +- trunk/drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- .../drivers/gpu/drm/nouveau/nouveau_channel.c | 1 + .../gpu/drm/nouveau/nouveau_connector.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c | 11 +- trunk/drivers/gpu/drm/nouveau/nouveau_fence.c | 2 - trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_perf.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 13 +- trunk/drivers/gpu/drm/nouveau/nv40_pm.c | 20 +- trunk/drivers/gpu/drm/nouveau/nv50_graph.c | 4 +- trunk/drivers/gpu/drm/nouveau/nv50_grctx.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_vram.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_graph.c | 41 +- trunk/drivers/gpu/drm/nouveau/nvc0_grctx.c | 31 +- trunk/drivers/gpu/drm/nouveau/nvc0_vram.c | 16 +- trunk/drivers/gpu/drm/radeon/atombios_crtc.c | 6 - trunk/drivers/gpu/drm/radeon/atombios_dp.c | 2 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 53 +- trunk/drivers/gpu/drm/radeon/r600.c | 118 +--- trunk/drivers/gpu/drm/radeon/radeon.h | 50 +- trunk/drivers/gpu/drm/radeon/radeon_asic.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_asic.h | 1 + .../drivers/gpu/drm/radeon/radeon_atombios.c | 118 ++-- .../drivers/gpu/drm/radeon/radeon_benchmark.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_combios.c | 27 +- trunk/drivers/gpu/drm/radeon/radeon_cs.c | 14 +- trunk/drivers/gpu/drm/radeon/radeon_device.c | 16 +- .../gpu/drm/radeon/radeon_legacy_crtc.c | 6 - trunk/drivers/gpu/drm/radeon/radeon_pm.c | 18 + trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 14 +- trunk/drivers/ide/ide-cd.c | 1 - trunk/drivers/ide/ide-floppy.c | 1 - trunk/drivers/ide/ide-tape.c | 1 - trunk/drivers/macintosh/via-macii.c | 2 +- trunk/drivers/macintosh/via-maciisi.c | 4 +- .../drivers/media/dvb/dvb-usb/mxl111sf-i2c.c | 3 +- .../drivers/media/dvb/dvb-usb/mxl111sf-phy.c | 7 +- .../drivers/media/video/s5p-mfc/s5p_mfc_dec.c | 4 +- .../drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 4 +- trunk/drivers/media/video/uvc/uvc_ctrl.c | 6 +- trunk/drivers/media/video/v4l2-ctrls.c | 5 +- trunk/drivers/media/video/v4l2-event.c | 10 +- trunk/drivers/media/video/videobuf2-core.c | 6 +- trunk/drivers/mmc/host/sdhci-esdhc-imx.c | 8 + trunk/drivers/oprofile/nmi_timer_int.c | 173 +++++ trunk/drivers/oprofile/oprof.c | 21 +- trunk/drivers/oprofile/oprof.h | 9 + trunk/drivers/oprofile/timer_int.c | 29 +- trunk/drivers/ps3/ps3-vuart.c | 2 +- trunk/drivers/ps3/ps3stor_lib.c | 2 +- trunk/drivers/rtc/rtc-mrst.c | 19 +- trunk/drivers/sh/Makefile | 8 + trunk/drivers/sh/clk/core.c | 107 +--- .../mach-shmobile => drivers/sh}/pm_runtime.c | 4 +- trunk/drivers/spi/spi-atmel.c | 5 +- trunk/drivers/tty/serial/sh-sci.c | 19 + trunk/drivers/virtio/virtio_pci.c | 11 +- trunk/fs/btrfs/btrfs_inode.h | 4 +- trunk/fs/btrfs/delayed-inode.c | 58 +- trunk/fs/btrfs/disk-io.c | 42 +- trunk/fs/btrfs/extent-tree.c | 50 +- trunk/fs/btrfs/free-space-cache.c | 17 +- trunk/fs/btrfs/inode-map.c | 28 +- trunk/fs/btrfs/inode.c | 84 ++- trunk/fs/btrfs/relocation.c | 2 + trunk/fs/btrfs/scrub.c | 64 +- trunk/fs/btrfs/super.c | 49 +- trunk/fs/btrfs/transaction.c | 4 +- trunk/fs/btrfs/volumes.c | 5 +- trunk/fs/proc/base.c | 146 ++--- trunk/fs/xfs/xfs_aops.c | 2 +- trunk/fs/xfs/xfs_buf_item.c | 2 +- trunk/fs/xfs/xfs_dquot_item.c | 6 +- trunk/fs/xfs/xfs_extfree_item.c | 4 +- trunk/fs/xfs/xfs_inode_item.c | 2 +- trunk/fs/xfs/xfs_log.c | 2 +- trunk/fs/xfs/xfs_log.h | 2 +- trunk/fs/xfs/xfs_trans.h | 6 +- trunk/fs/xfs/xfs_vnodeops.c | 14 +- trunk/include/drm/drmP.h | 4 +- trunk/include/drm/exynos_drm.h | 2 + trunk/include/linux/bitops.h | 10 +- trunk/include/linux/jump_label.h | 24 + trunk/include/linux/mfd/wm8994/registers.h | 15 + trunk/include/linux/pci_ids.h | 2 + trunk/include/linux/perf_event.h | 8 +- trunk/include/linux/serial_sci.h | 1 + trunk/include/linux/sh_clk.h | 4 +- trunk/include/linux/sh_pfc.h | 76 +++ trunk/kernel/events/core.c | 169 +++-- trunk/kernel/events/internal.h | 3 + trunk/kernel/events/ring_buffer.c | 3 + trunk/kernel/jump_label.c | 35 +- trunk/kernel/trace/trace_events_filter.c | 6 +- trunk/sound/core/vmaster.c | 18 +- trunk/sound/pci/hda/hda_codec.c | 64 +- trunk/sound/pci/hda/hda_codec.h | 1 + trunk/sound/pci/hda/hda_local.h | 16 +- trunk/sound/pci/hda/patch_conexant.c | 1 - trunk/sound/pci/hda/patch_realtek.c | 13 +- trunk/sound/pci/hda/patch_sigmatel.c | 11 + trunk/sound/pci/intel8x0.c | 58 +- trunk/sound/ppc/snd_ps3.c | 2 +- trunk/sound/soc/codecs/wm8994.c | 43 +- trunk/sound/usb/mixer.c | 110 ++-- trunk/sound/usb/quirks.c | 7 +- .../perf/Documentation/perf-annotate.txt | 2 +- .../tools/perf/Documentation/perf-report.txt | 4 +- .../tools/perf/Documentation/perf-script.txt | 7 +- trunk/tools/perf/Documentation/perf-test.txt | 8 +- trunk/tools/perf/Makefile | 1 + trunk/tools/perf/builtin-annotate.c | 133 ++-- trunk/tools/perf/builtin-diff.c | 21 +- trunk/tools/perf/builtin-inject.c | 118 ++-- trunk/tools/perf/builtin-kmem.c | 14 +- trunk/tools/perf/builtin-lock.c | 10 +- trunk/tools/perf/builtin-probe.c | 1 - trunk/tools/perf/builtin-record.c | 585 +++++++---------- trunk/tools/perf/builtin-report.c | 225 ++++--- trunk/tools/perf/builtin-sched.c | 198 +++--- trunk/tools/perf/builtin-script.c | 50 +- trunk/tools/perf/builtin-stat.c | 43 +- trunk/tools/perf/builtin-test.c | 418 +++++++++++- trunk/tools/perf/builtin-timechart.c | 34 +- trunk/tools/perf/builtin-top.c | 557 ++++++++-------- trunk/tools/perf/perf.c | 33 +- trunk/tools/perf/perf.h | 23 + trunk/tools/perf/util/annotate.c | 6 +- trunk/tools/perf/util/annotate.h | 5 +- trunk/tools/perf/util/build-id.c | 26 +- trunk/tools/perf/util/build-id.h | 2 +- trunk/tools/perf/util/callchain.h | 3 + trunk/tools/perf/util/cgroup.c | 15 +- trunk/tools/perf/util/debugfs.c | 35 +- trunk/tools/perf/util/debugfs.h | 31 +- trunk/tools/perf/util/event.c | 243 ++++--- trunk/tools/perf/util/event.h | 65 +- trunk/tools/perf/util/evlist.c | 293 ++++++++- trunk/tools/perf/util/evlist.h | 43 +- trunk/tools/perf/util/evsel.c | 80 +++ trunk/tools/perf/util/evsel.h | 8 + trunk/tools/perf/util/header.c | 75 +-- trunk/tools/perf/util/header.h | 45 +- trunk/tools/perf/util/hist.c | 10 - trunk/tools/perf/util/hist.h | 5 +- trunk/tools/perf/util/map.c | 4 + trunk/tools/perf/util/map.h | 19 + trunk/tools/perf/util/parse-events.c | 28 +- trunk/tools/perf/util/parse-events.h | 1 - trunk/tools/perf/util/probe-finder.h | 1 - .../util/scripting-engines/trace-event-perl.c | 4 +- .../scripting-engines/trace-event-python.c | 4 +- trunk/tools/perf/util/session.c | 330 ++++++---- trunk/tools/perf/util/session.h | 62 +- trunk/tools/perf/util/setup.py | 3 +- trunk/tools/perf/util/symbol.h | 1 + trunk/tools/perf/util/thread.c | 6 +- trunk/tools/perf/util/thread.h | 14 +- trunk/tools/perf/util/tool.h | 50 ++ trunk/tools/perf/util/top.h | 20 +- trunk/tools/perf/util/trace-event-info.c | 28 +- trunk/tools/perf/util/trace-event-scripting.c | 2 +- trunk/tools/perf/util/trace-event.h | 8 +- trunk/tools/perf/util/ui/browsers/annotate.c | 16 +- trunk/tools/perf/util/ui/browsers/hists.c | 2 +- trunk/tools/perf/util/ui/progress.c | 3 + 323 files changed, 6068 insertions(+), 4548 deletions(-) create mode 100644 trunk/arch/powerpc/boot/dts/charon.dts delete mode 100644 trunk/arch/x86/oprofile/nmi_timer_int.c create mode 100644 trunk/drivers/oprofile/nmi_timer_int.c rename trunk/{arch/arm/mach-shmobile => drivers/sh}/pm_runtime.c (94%) create mode 100644 trunk/tools/perf/util/tool.h diff --git a/[refs] b/[refs] index ba1897e999b8..839401634a9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39eaf7ef884dcc44f7ff1bac803ca2a1dcf43544 +refs/heads/master: cc991b83b3eb11b253dd932932fa0bfd09c7564a diff --git a/trunk/.mailmap b/trunk/.mailmap index a4806f0de852..9b0d0267a3c3 100644 --- a/trunk/.mailmap +++ b/trunk/.mailmap @@ -68,6 +68,7 @@ Juha Yrjola Kay Sievers Kenneth W Chen Koushik +Kuninori Morimoto Leonid I Ananiev Linas Vepstas Mark Brown @@ -111,3 +112,4 @@ Uwe Kleine-König Uwe Kleine-König Valdis Kletnieks Takashi YOSHII +Yusuke Goda diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index a0c5c5f4fce6..fd5c913c33c1 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -1885,6 +1885,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. arch_perfmon: [X86] Force use of architectural perfmon on Intel CPUs instead of the CPU specific event set. + timer: [X86] Force use of architectural NMI + timer mode (see also oprofile.timer + for generic hr timer mode) oops=panic Always panic on oopses. Default is to just kill the process, but there is a small probability of diff --git a/trunk/Documentation/sound/alsa/HD-Audio-Models.txt b/trunk/Documentation/sound/alsa/HD-Audio-Models.txt index 4f3443230d89..edad99abec21 100644 --- a/trunk/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/trunk/Documentation/sound/alsa/HD-Audio-Models.txt @@ -349,6 +349,7 @@ STAC92HD83* ref Reference board mic-ref Reference board with power management for ports dell-s14 Dell laptop + dell-vostro-3500 Dell Vostro 3500 laptop hp HP laptops with (inverted) mute-LED hp-dv7-4000 HP dv-7 4000 auto BIOS setup (default) diff --git a/trunk/Kbuild b/trunk/Kbuild index 4caab4f6cba7..b8b708ad6dc3 100644 --- a/trunk/Kbuild +++ b/trunk/Kbuild @@ -92,7 +92,7 @@ always += missing-syscalls targets += missing-syscalls quiet_cmd_syscalls = CALL $< - cmd_syscalls = $(CONFIG_SHELL) $< $(CC) $(c_flags) + cmd_syscalls = $(CONFIG_SHELL) $< $(CC) $(c_flags) $(missing_syscalls_flags) missing-syscalls: scripts/checksyscalls.sh $(offsets-file) FORCE $(call cmd,syscalls) diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4808256446f2..071a99674347 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1106,6 +1106,7 @@ F: drivers/media/video/s5p-fimc/ ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT M: Kyungmin Park M: Kamil Debski +M: Jeongtae Park L: linux-arm-kernel@lists.infradead.org L: linux-media@vger.kernel.org S: Maintained @@ -2342,6 +2343,13 @@ S: Supported F: drivers/gpu/drm/i915 F: include/drm/i915* +DRM DRIVERS FOR EXYNOS +M: Inki Dae +L: dri-devel@lists.freedesktop.org +S: Supported +F: drivers/gpu/drm/exynos +F: include/drm/exynos* + DSCC4 DRIVER M: Francois Romieu L: netdev@vger.kernel.org @@ -6122,7 +6130,7 @@ F: sound/ SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) M: Liam Girdwood M: Mark Brown -T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git L: alsa-devel@alsa-project.org (moderated for non-subscribers) W: http://alsa-project.org/main/index.php/ASoC S: Supported diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig index 4b0669cbb3b0..2505740b81d2 100644 --- a/trunk/arch/Kconfig +++ b/trunk/arch/Kconfig @@ -30,6 +30,10 @@ config OPROFILE_EVENT_MULTIPLEX config HAVE_OPROFILE bool +config OPROFILE_NMI_TIMER + def_bool y + depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI + config KPROBES bool "Kprobes" depends on MODULES diff --git a/trunk/arch/arm/boot/dts/tegra-ventana.dts b/trunk/arch/arm/boot/dts/tegra-ventana.dts index 9b29a623aaf1..3f9abd6b6964 100644 --- a/trunk/arch/arm/boot/dts/tegra-ventana.dts +++ b/trunk/arch/arm/boot/dts/tegra-ventana.dts @@ -22,11 +22,10 @@ sdhci@c8000400 { cd-gpios = <&gpio 69 0>; /* gpio PI5 */ wp-gpios = <&gpio 57 0>; /* gpio PH1 */ - power-gpios = <&gpio 155 0>; /* gpio PT3 */ + power-gpios = <&gpio 70 0>; /* gpio PI6 */ }; sdhci@c8000600 { - power-gpios = <&gpio 70 0>; /* gpio PI6 */ support-8bit; }; }; diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c index 24e2347be6b1..ff17b17b668e 100644 --- a/trunk/arch/arm/kernel/perf_event.c +++ b/trunk/arch/arm/kernel/perf_event.c @@ -347,15 +347,15 @@ validate_group(struct perf_event *event) memset(&fake_pmu, 0, sizeof(fake_pmu)); if (!validate_event(&fake_pmu, leader)) - return -ENOSPC; + return -EINVAL; list_for_each_entry(sibling, &leader->sibling_list, group_entry) { if (!validate_event(&fake_pmu, sibling)) - return -ENOSPC; + return -EINVAL; } if (!validate_event(&fake_pmu, event)) - return -ENOSPC; + return -EINVAL; return 0; } diff --git a/trunk/arch/arm/mach-at91/at91cap9_devices.c b/trunk/arch/arm/mach-at91/at91cap9_devices.c index a4401d6b5b07..adad70db70eb 100644 --- a/trunk/arch/arm/mach-at91/at91cap9_devices.c +++ b/trunk/arch/arm/mach-at91/at91cap9_devices.c @@ -98,7 +98,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} * USB HS Device (Gadget) * -------------------------------------------------------------------- */ -#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE) +#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE) static struct resource usba_udc_resources[] = { [0] = { @@ -1021,8 +1021,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -1035,7 +1035,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/trunk/arch/arm/mach-at91/at91rm9200_devices.c b/trunk/arch/arm/mach-at91/at91rm9200_devices.c index 01d8bbd1468b..66591fa53e05 100644 --- a/trunk/arch/arm/mach-at91/at91rm9200_devices.c +++ b/trunk/arch/arm/mach-at91/at91rm9200_devices.c @@ -877,8 +877,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -891,7 +891,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/trunk/arch/arm/mach-at91/at91sam9260_devices.c b/trunk/arch/arm/mach-at91/at91sam9260_devices.c index 24b6f8c0440d..25e3464fb07f 100644 --- a/trunk/arch/arm/mach-at91/at91sam9260_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9260_devices.c @@ -837,8 +837,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -851,7 +851,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/trunk/arch/arm/mach-at91/at91sam9261_devices.c b/trunk/arch/arm/mach-at91/at91sam9261_devices.c index 3b70b3897d95..ae78f4d03b73 100644 --- a/trunk/arch/arm/mach-at91/at91sam9261_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9261_devices.c @@ -816,8 +816,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -830,7 +830,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/trunk/arch/arm/mach-at91/at91sam9263_devices.c b/trunk/arch/arm/mach-at91/at91sam9263_devices.c index 3faa1fde9ad9..ad017eb1f8df 100644 --- a/trunk/arch/arm/mach-at91/at91sam9263_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9263_devices.c @@ -1196,8 +1196,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -1210,7 +1210,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/trunk/arch/arm/mach-at91/at91sam9g45_devices.c b/trunk/arch/arm/mach-at91/at91sam9g45_devices.c index 000b5e1da965..09a16d6bd5cd 100644 --- a/trunk/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9g45_devices.c @@ -197,7 +197,7 @@ void __init at91_add_device_usbh_ehci(struct at91_usbh_data *data) {} * USB HS Device (Gadget) * -------------------------------------------------------------------- */ -#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE) +#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE) static struct resource usba_udc_resources[] = { [0] = { .start = AT91SAM9G45_UDPHS_FIFO, @@ -1332,8 +1332,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -1346,7 +1346,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/trunk/arch/arm/mach-at91/at91sam9rl_devices.c b/trunk/arch/arm/mach-at91/at91sam9rl_devices.c index 305a851b5bff..628eb566d60c 100644 --- a/trunk/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9rl_devices.c @@ -75,7 +75,7 @@ void __init at91_add_device_hdmac(void) {} * USB HS Device (Gadget) * -------------------------------------------------------------------- */ -#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE) +#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE) static struct resource usba_udc_resources[] = { [0] = { @@ -908,8 +908,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -922,7 +922,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/trunk/arch/arm/mach-at91/board-yl-9200.c b/trunk/arch/arm/mach-at91/board-yl-9200.c index 649b052231f5..12a3f955162b 100644 --- a/trunk/arch/arm/mach-at91/board-yl-9200.c +++ b/trunk/arch/arm/mach-at91/board-yl-9200.c @@ -384,7 +384,7 @@ static struct spi_board_info yl9200_spi_devices[] = { #include