diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 12:05:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 12:05:33 -0400 |
| commit | 89c5a9461d02613c829cf9beffdc3d3c6c3df401 (patch) | |
| tree | e0c6ada024a32da3cd6bb4b4f0469d66e5df45c9 /lib | |
| parent | 833ae40b517a99e05fc4aea399e71f633f3348d2 (diff) | |
| parent | 07b9b65147d1d7cc03b9ff1e1f3b1c163ba4d067 (diff) | |
Merge tag 'arc-v3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC changes from Vineet Gupta:
- ARC MM changes:
- preparation for MMUv4 (accomodate new PTE bits, new cmds)
- Rework the ASID allocation algorithm to remove asid-mm reverse map
- Boilerplate code consolidation in Exception Handlers
- Disable FRAME_POINTER for ARC
- Unaligned Access Emulation for Big-Endian from Noam
- Bunch of fixes (udelay, missing accessors) from Mischa
* tag 'arc-v3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: fix new Section mismatches in build (post __cpuinit cleanup)
Kconfig.debug: Add FRAME_POINTER anti-dependency for ARC
ARC: Fix __udelay calculation
ARC: remove console_verbose() from setup_arch()
ARC: Add read*_relaxed to asm/io.h
ARC: Handle un-aligned user space access in BE.
ARC: [ASID] Track ASID allocation cycles/generations
ARC: [ASID] activate_mm() == switch_mm()
ARC: [ASID] get_new_mmu_context() to conditionally allocate new ASID
ARC: [ASID] Refactor the TLB paranoid debug code
ARC: [ASID] Remove legacy/unused debug code
ARC: No need to flush the TLB in early boot
ARC: MMUv4 preps/3 - Abstract out TLB Insert/Delete
ARC: MMUv4 preps/2 - Reshuffle PTE bits
ARC: MMUv4 preps/1 - Fold PTE K/U access flags
ARC: Code cosmetics (Nothing semantical)
ARC: Entry Handler tweaks: Optimize away redundant IRQ_DISABLE_SAVE
ARC: Exception Handlers Code consolidation
ARC: Add some .gitignore entries
Diffstat (limited to 'lib')
| -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 444e1c12fea9..652bea9054f0 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -908,7 +908,7 @@ config LOCKDEP | |||
| 908 | bool | 908 | bool |
| 909 | depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT | 909 | depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT |
| 910 | select STACKTRACE | 910 | select STACKTRACE |
| 911 | select FRAME_POINTER if !MIPS && !PPC && !ARM_UNWIND && !S390 && !MICROBLAZE | 911 | select FRAME_POINTER if !MIPS && !PPC && !ARM_UNWIND && !S390 && !MICROBLAZE && !ARC |
| 912 | select KALLSYMS | 912 | select KALLSYMS |
| 913 | select KALLSYMS_ALL | 913 | select KALLSYMS_ALL |
| 914 | 914 | ||
| @@ -1366,7 +1366,7 @@ config FAULT_INJECTION_STACKTRACE_FILTER | |||
| 1366 | depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT | 1366 | depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT |
| 1367 | depends on !X86_64 | 1367 | depends on !X86_64 |
| 1368 | select STACKTRACE | 1368 | select STACKTRACE |
| 1369 | select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND | 1369 | select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC |
| 1370 | help | 1370 | help |
| 1371 | Provide stacktrace filter for fault-injection capabilities | 1371 | Provide stacktrace filter for fault-injection capabilities |
| 1372 | 1372 | ||
| @@ -1376,7 +1376,7 @@ config LATENCYTOP | |||
| 1376 | depends on DEBUG_KERNEL | 1376 | depends on DEBUG_KERNEL |
| 1377 | depends on STACKTRACE_SUPPORT | 1377 | depends on STACKTRACE_SUPPORT |
| 1378 | depends on PROC_FS | 1378 | depends on PROC_FS |
| 1379 | select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND | 1379 | select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC |
| 1380 | select KALLSYMS | 1380 | select KALLSYMS |
| 1381 | select KALLSYMS_ALL | 1381 | select KALLSYMS_ALL |
| 1382 | select STACKTRACE | 1382 | select STACKTRACE |