diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2009-07-07 15:54:54 +1000 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-12-06 11:18:23 +0100 |
| commit | f60a5572679ef8508b62bd82063b05ffbe838716 (patch) | |
| tree | 73f8b9d774df1e700b132f4283758515090d8435 /arch/m68k | |
| parent | f195e2bff3000b8bc251ee6f685e0f027eec6f25 (diff) | |
| download | linux-f60a5572679ef8508b62bd82063b05ffbe838716.tar.gz linux-f60a5572679ef8508b62bd82063b05ffbe838716.tar.bz2 linux-f60a5572679ef8508b62bd82063b05ffbe838716.zip | |
m68knommu: define arch_has_single_step() and friends
Towards adding CONFIG_UTRACE support for non-mmu m68k add
arch_has_single_step, and its support functions user_enable_single_step()
and user_disable_single_step().
[Geert] m68k conflict resolution from linux-next
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/ptrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h index 117adb1e4806..a6ab663bcc2e 100644 --- a/arch/m68k/include/asm/ptrace.h +++ b/arch/m68k/include/asm/ptrace.h @@ -90,11 +90,11 @@ extern void show_regs(struct pt_regs *); */ struct task_struct; -#ifdef CONFIG_MMU #define arch_has_single_step() (1) extern void user_enable_single_step(struct task_struct *); extern void user_disable_single_step(struct task_struct *); +#ifdef CONFIG_MMU #define arch_has_block_step() (1) extern void user_enable_block_step(struct task_struct *); #endif |