diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 11:59:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 11:59:22 -0400 |
| commit | bbc4fd12a635492ad9d12bb418124fa2d5f0d734 (patch) | |
| tree | fe245d350db180d499a9e9d6dc84bbb308f33dc2 /lib/Kconfig.debug | |
| parent | 673b864fd76a29031aa0b4b08fc80886d527b3b7 (diff) | |
| parent | 2d5973cb5ac5d04662f86e19a06a4c52fa4c4ae3 (diff) | |
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (49 commits)
microblaze: Add KGDB support
microblaze: Support brki rX, 0x18 for user application debugging
microblaze: Remove nop after MSRCLR/SET, MTS, MFS instructions
microblaze: Simplify syscall rutine
microblaze: Move PT_MODE saving to delay slot
microblaze: Fix _interrupt function
microblaze: Fix _user_exception function
microblaze: Put together addik instructions
microblaze: Use delay slot in syscall macros
microblaze: Save kernel mode in delay slot
microblaze: Do not mix register saving and mode setting
microblaze: Move SAVE_STATE upward
microblaze: entry.S: Macro optimization
microblaze: Optimize hw exception rutine
microblaze: Implement clear_ums macro and fix SAVE_STATE macro
microblaze: Remove additional setup for kernel_mode
microblaze: Optimize SAVE_STATE macro
microblaze: Remove additional loading
microblaze: Completely remove working with R11 register
microblaze: Do not setup BIP in _debug_exception
...
Diffstat (limited to 'lib/Kconfig.debug')
| -rw-r--r-- | lib/Kconfig.debug | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index dfdc0347b05d..154ff43aaa81 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -528,7 +528,7 @@ config LOCKDEP | |||
| 528 | bool | 528 | bool |
| 529 | depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT | 529 | depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT |
| 530 | select STACKTRACE | 530 | select STACKTRACE |
| 531 | select FRAME_POINTER if !MIPS && !PPC && !ARM_UNWIND && !S390 | 531 | select FRAME_POINTER if !MIPS && !PPC && !ARM_UNWIND && !S390 && !MICROBLAZE |
| 532 | select KALLSYMS | 532 | select KALLSYMS |
| 533 | select KALLSYMS_ALL | 533 | select KALLSYMS_ALL |
| 534 | 534 | ||
| @@ -958,13 +958,13 @@ config FAULT_INJECTION_STACKTRACE_FILTER | |||
| 958 | depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT | 958 | depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT |
| 959 | depends on !X86_64 | 959 | depends on !X86_64 |
| 960 | select STACKTRACE | 960 | select STACKTRACE |
| 961 | select FRAME_POINTER if !PPC && !S390 | 961 | select FRAME_POINTER if !PPC && !S390 && !MICROBLAZE |
| 962 | help | 962 | help |
| 963 | Provide stacktrace filter for fault-injection capabilities | 963 | Provide stacktrace filter for fault-injection capabilities |
| 964 | 964 | ||
| 965 | config LATENCYTOP | 965 | config LATENCYTOP |
| 966 | bool "Latency measuring infrastructure" | 966 | bool "Latency measuring infrastructure" |
| 967 | select FRAME_POINTER if !MIPS && !PPC && !S390 | 967 | select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE |
| 968 | select KALLSYMS | 968 | select KALLSYMS |
| 969 | select KALLSYMS_ALL | 969 | select KALLSYMS_ALL |
| 970 | select STACKTRACE | 970 | select STACKTRACE |