diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-18 19:16:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-18 19:16:42 -0400 |
| commit | 8394edf3710b124793d46c51942a6392b7b569a0 (patch) | |
| tree | 00352d7ca7f7f62db956ccf4039a6ca1c4813b60 | |
| parent | 73f1f5dd3ee3ec6e20768d831d9759b0330fad0e (diff) | |
| parent | e6d9668e119af44ae5bcd5f1197174531458afe3 (diff) | |
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile tree bugfix from Chris Metcalf:
"This fixes a security vulnerability (and correctness bug) in tilegx"
* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tilegx: enable SYSCALL_WRAPPERS support
| -rw-r--r-- | arch/tile/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig index 96033e2d6845..74239dd77e06 100644 --- a/arch/tile/Kconfig +++ b/arch/tile/Kconfig | |||
| @@ -11,6 +11,7 @@ config TILE | |||
| 11 | select GENERIC_IRQ_PROBE | 11 | select GENERIC_IRQ_PROBE |
| 12 | select GENERIC_PENDING_IRQ if SMP | 12 | select GENERIC_PENDING_IRQ if SMP |
| 13 | select GENERIC_IRQ_SHOW | 13 | select GENERIC_IRQ_SHOW |
| 14 | select HAVE_SYSCALL_WRAPPERS if TILEGX | ||
| 14 | select SYS_HYPERVISOR | 15 | select SYS_HYPERVISOR |
| 15 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 16 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
| 16 | 17 | ||