diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-02 14:09:50 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-02 14:09:50 -0500 |
| commit | a64d31baed104be25305e9c71585d3ea4ee9a418 (patch) | |
| tree | 470e3c59ef39f38bcd69f8fef7dba8f76afbec53 /arch/Kconfig | |
| parent | 1c39194878c09bd88ffc9c9d4c2f01c3397c7aed (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/trace/ring_buffer.c
Diffstat (limited to 'arch/Kconfig')
| -rw-r--r-- | arch/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 8977d99987cb..471e72dbaf8b 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
| @@ -79,8 +79,6 @@ config HAVE_KRETPROBES | |||
| 79 | # task_pt_regs() in asm/processor.h or asm/ptrace.h | 79 | # task_pt_regs() in asm/processor.h or asm/ptrace.h |
| 80 | # arch_has_single_step() if there is hardware single-step support | 80 | # arch_has_single_step() if there is hardware single-step support |
| 81 | # arch_has_block_step() if there is hardware block-step support | 81 | # arch_has_block_step() if there is hardware block-step support |
| 82 | # arch_ptrace() and not #define __ARCH_SYS_PTRACE | ||
| 83 | # compat_arch_ptrace() and #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
| 84 | # asm/syscall.h supplying asm-generic/syscall.h interface | 82 | # asm/syscall.h supplying asm-generic/syscall.h interface |
| 85 | # linux/regset.h user_regset interfaces | 83 | # linux/regset.h user_regset interfaces |
| 86 | # CORE_DUMP_USE_REGSET #define'd in linux/elf.h | 84 | # CORE_DUMP_USE_REGSET #define'd in linux/elf.h |