diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 10:48:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 10:48:34 -0700 |
| commit | 8a72f3820c4d14b27ad5336aed00063a7a7f1bef (patch) | |
| tree | c6806e79915ce5c04a7f2574208c4b2f179dd7b2 /arch/tile/Kconfig | |
| parent | bf5d770bd234a1e66322dd79c4ae5b397cd2b9c1 (diff) | |
| parent | 9fc1894c9883439245b225d16100d6a55b25373a (diff) | |
| download | linux-stable-8a72f3820c4d14b27ad5336aed00063a7a7f1bef.tar.gz linux-stable-8a72f3820c4d14b27ad5336aed00063a7a7f1bef.tar.bz2 linux-stable-8a72f3820c4d14b27ad5336aed00063a7a7f1bef.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile arch changes from Chris Metcalf:
"These are some minor new feature work and other changes that didn't
merit getting pushed up after the 3.9 merge window closed.
There should be a lot more activity in the 3.11 merge window"
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: Fix syscall return value passed to tracepoint
tile: comment assumption about __insn_mtspr for <asm/irqflags.h>
tile: ns2cycles should use __raw_get_cpu_var
arch: remove KCORE_ELF again [tile]
tile: remove two outdated Kconfig entries
tile: support atomic64_dec_if_positive()
tile: support TIF_SYSCALL_TRACEPOINT; select HAVE_SYSCALL_TRACEPOINTS
tile: Add definition of NR_syscalls
tile: move declaration of sys_call_table to <asm/syscall.h>
arch/tile: Enable HAVE_ARCH_TRACEHOOK
arch/tile: Call tracehook_report_syscall_{entry,exit} in syscall trace
Diffstat (limited to 'arch/tile/Kconfig')
| -rw-r--r-- | arch/tile/Kconfig | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig index 0e5343902363..5b6a40dd5556 100644 --- a/arch/tile/Kconfig +++ b/arch/tile/Kconfig @@ -22,6 +22,9 @@ config TILE select ARCH_HAVE_NMI_SAFE_CMPXCHG select GENERIC_CLOCKEVENTS select MODULES_USE_ELF_RELA + select HAVE_ARCH_TRACEHOOK + select HAVE_SYSCALL_TRACEPOINTS + select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE # FIXME: investigate whether we need/want these options. # select HAVE_IOREMAP_PROT @@ -40,9 +43,6 @@ config MMU config GENERIC_CSUM def_bool y -config SEMAPHORE_SLEEPERS - def_bool y - config HAVE_ARCH_ALLOC_REMAP def_bool y @@ -67,12 +67,6 @@ config HUGETLB_SUPER_PAGES config RWSEM_GENERIC_SPINLOCK def_bool y -# We have a very flat architecture from a migration point of view, -# so save boot time by presetting this (particularly useful on tile-sim). -config DEFAULT_MIGRATION_COST - int - default "10000000" - # We only support gcc 4.4 and above, so this should work. config ARCH_SUPPORTS_OPTIMIZED_INLINING def_bool y @@ -413,11 +407,6 @@ endmenu menu "Executable file formats" -# only elf supported -config KCORE_ELF - def_bool y - depends on PROC_FS - source "fs/Kconfig.binfmt" endmenu |