diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 00:16:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 00:16:30 -0500 |
commit | 1b2722752fe7bf21e76c87080add6d6c40af339f (patch) | |
tree | 2b98fb5d283c20a7d879bd8b3ed9d9ec67592f10 /arch/sparc/Kconfig | |
parent | 91838e2dab460ba589fb90db0fe1f504f5c04f12 (diff) | |
parent | 812cb83a56a908729c453a7db3fb2c262119bc9d (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
Pull sparc update from David Miller:
1) Implement support for up to 47-bit physical addresses on sparc64.
2) Support HAVE_CONTEXT_TRACKING on sparc64, from Kirill Tkhai.
3) Fix Simba bridge window calculations, from Kjetil Oftedal.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
sparc64: Implement HAVE_CONTEXT_TRACKING
sparc64: Add self-IPI support for smp_send_reschedule()
sparc: PCI: Fix incorrect address calculation of PCI Bridge windows on Simba-bridges
sparc64: Encode huge PMDs using PTE encoding.
sparc64: Move to 64-bit PGDs and PMDs.
sparc64: Move from 4MB to 8MB huge pages.
sparc64: Make PAGE_OFFSET variable.
sparc64: Fix inconsistent max-physical-address defines.
sparc64: Document the shift counts used to validate linear kernel addresses.
sparc64: Define PAGE_OFFSET in terms of physical address bits.
sparc64: Use PAGE_OFFSET instead of a magic constant.
sparc64: Clean up 64-bit mmap exclusion defines.
Diffstat (limited to 'arch/sparc/Kconfig')
-rw-r--r-- | arch/sparc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 8591b201d9cc..05fcfc634fcb 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -63,6 +63,7 @@ config SPARC64 | |||
63 | select HAVE_DYNAMIC_FTRACE | 63 | select HAVE_DYNAMIC_FTRACE |
64 | select HAVE_FTRACE_MCOUNT_RECORD | 64 | select HAVE_FTRACE_MCOUNT_RECORD |
65 | select HAVE_SYSCALL_TRACEPOINTS | 65 | select HAVE_SYSCALL_TRACEPOINTS |
66 | select HAVE_CONTEXT_TRACKING | ||
66 | select HAVE_DEBUG_KMEMLEAK | 67 | select HAVE_DEBUG_KMEMLEAK |
67 | select RTC_DRV_CMOS | 68 | select RTC_DRV_CMOS |
68 | select RTC_DRV_BQ4802 | 69 | select RTC_DRV_BQ4802 |