diff options
author | Greg Ungerer <gerg@snapgear.com> | 2006-06-25 20:33:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 20:43:34 -0400 |
commit | bb28632c0d651f26dddf99afb7d7703e8e0ce293 (patch) | |
tree | 8278adb86195db0bb1615c349ae84566692f6122 | |
parent | 6f57622a32e6bdc0a585c8be6f25bb8e75a3ff9e (diff) |
[PATCH] m68knommu: check DEBUG defined arch code
Don't rely on DEBUG having a value, check for it being defined.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/m68knommu/kernel/signal.c | 4 | ||||
-rw-r--r-- | arch/m68knommu/kernel/traps.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68knommu/kernel/signal.c b/arch/m68knommu/kernel/signal.c index 8e2c5a88efa7..437f8c6c14a0 100644 --- a/arch/m68knommu/kernel/signal.c +++ b/arch/m68knommu/kernel/signal.c | |||
@@ -608,7 +608,7 @@ adjust_stack: | |||
608 | if (regs->stkadj) { | 608 | if (regs->stkadj) { |
609 | struct pt_regs *tregs = | 609 | struct pt_regs *tregs = |
610 | (struct pt_regs *)((ulong)regs + regs->stkadj); | 610 | (struct pt_regs *)((ulong)regs + regs->stkadj); |
611 | #if DEBUG | 611 | #if defined(DEBUG) |
612 | printk(KERN_DEBUG "Performing stackadjust=%04x\n", regs->stkadj); | 612 | printk(KERN_DEBUG "Performing stackadjust=%04x\n", regs->stkadj); |
613 | #endif | 613 | #endif |
614 | /* This must be copied with decreasing addresses to | 614 | /* This must be copied with decreasing addresses to |
@@ -678,7 +678,7 @@ adjust_stack: | |||
678 | if (regs->stkadj) { | 678 | if (regs->stkadj) { |
679 | struct pt_regs *tregs = | 679 | struct pt_regs *tregs = |
680 | (struct pt_regs *)((ulong)regs + regs->stkadj); | 680 | (struct pt_regs *)((ulong)regs + regs->stkadj); |
681 | #if DEBUG | 681 | #if defined(DEBUG) |
682 | printk(KERN_DEBUG "Performing stackadjust=%04x\n", regs->stkadj); | 682 | printk(KERN_DEBUG "Performing stackadjust=%04x\n", regs->stkadj); |
683 | #endif | 683 | #endif |
684 | /* This must be copied with decreasing addresses to | 684 | /* This must be copied with decreasing addresses to |
diff --git a/arch/m68knommu/kernel/traps.c b/arch/m68knommu/kernel/traps.c index 5bc068462864..44ff74e643b1 100644 --- a/arch/m68knommu/kernel/traps.c +++ b/arch/m68knommu/kernel/traps.c | |||
@@ -93,12 +93,12 @@ asmlinkage void buserr_c(struct frame *fp) | |||
93 | if (user_mode(&fp->ptregs)) | 93 | if (user_mode(&fp->ptregs)) |
94 | current->thread.esp0 = (unsigned long) fp; | 94 | current->thread.esp0 = (unsigned long) fp; |
95 | 95 | ||
96 | #if DEBUG | 96 | #if defined(DEBUG) |
97 | printk (KERN_DEBUG "*** Bus Error *** Format is %x\n", fp->ptregs.format); | 97 | printk (KERN_DEBUG "*** Bus Error *** Format is %x\n", fp->ptregs.format); |
98 | #endif | 98 | #endif |
99 | 99 | ||
100 | die_if_kernel("bad frame format",&fp->ptregs,0); | 100 | die_if_kernel("bad frame format",&fp->ptregs,0); |
101 | #if DEBUG | 101 | #if defined(DEBUG) |
102 | printk(KERN_DEBUG "Unknown SIGSEGV - 4\n"); | 102 | printk(KERN_DEBUG "Unknown SIGSEGV - 4\n"); |
103 | #endif | 103 | #endif |
104 | force_sig(SIGSEGV, current); | 104 | force_sig(SIGSEGV, current); |