diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-06 08:11:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-06 08:11:57 -0700 |
| commit | 18a1a7a1d862ae0794a0179473d08a414dd49234 (patch) | |
| tree | 013ffe8b7fbbe9169801d0be1a780ee9bf53c08e /arch/tile/kernel/Makefile | |
| parent | 04535d273ee3edacd9551b2512b4e939ba20277f (diff) | |
| parent | 5eb0bdf84433eb7b7ad4ba92a80aac57ad4b46ea (diff) | |
| download | linux-18a1a7a1d862ae0794a0179473d08a414dd49234.tar.gz linux-18a1a7a1d862ae0794a0179473d08a414dd49234.tar.bz2 linux-18a1a7a1d862ae0794a0179473d08a414dd49234.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile updates from Chris Metcalf:
"These fix a few stray build issues seen in linux-next, and also add
the minimal required support for perf to tilegx"
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: remove unused variable 'devcap'
tile: Fix vDSO compilation issue with allyesconfig
perf tools: Allow building for tile
tile/perf: Support perf_events on tilegx and tilepro
tile: Enable NMIs on return from handle_nmi() without errors
tile: Add support for handling PMC hardware
tile: don't use __get_cpu_var() with structure-typed arguments
tile: avoid overflow in ns2cycles
Diffstat (limited to 'arch/tile/kernel/Makefile')
| -rw-r--r-- | arch/tile/kernel/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/tile/kernel/Makefile b/arch/tile/kernel/Makefile index 27a2bf39dae8..21f77bf68c69 100644 --- a/arch/tile/kernel/Makefile +++ b/arch/tile/kernel/Makefile @@ -25,6 +25,8 @@ obj-$(CONFIG_PCI) += pci_gx.o else obj-$(CONFIG_PCI) += pci.o endif +obj-$(CONFIG_PERF_EVENTS) += perf_event.o +obj-$(CONFIG_USE_PMC) += pmc.o obj-$(CONFIG_TILE_USB) += usb.o obj-$(CONFIG_TILE_HVGLUE_TRACE) += hvglue_trace.o obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o mcount_64.o |