Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb28632c authored Jun 26, 2006 by Greg Ungerer Committed by Linus Torvalds Jun 25, 2006

[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>

parent 6f57622a

arch/m68knommu/kernel/signal.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -608,7 +608,7 @@ static void setup_frame (int sig, struct k_sigaction *ka,
	if (regs->stkadj) {		if (regs->stkadj) {
	struct pt_regs *tregs =		struct pt_regs *tregs =
	(struct pt_regs *)((ulong)regs + regs->stkadj);		(struct pt_regs *)((ulong)regs + regs->stkadj);
	#if DEBUG		#if defined(DEBUG)
	printk(KERN_DEBUG "Performing stackadjust=%04x\n", regs->stkadj);		printk(KERN_DEBUG "Performing stackadjust=%04x\n", regs->stkadj);
	#endif		#endif
	/* This must be copied with decreasing addresses to		/* This must be copied with decreasing addresses to
	@@ -678,7 +678,7 @@ static void setup_rt_frame (int sig, struct k_sigaction ka, siginfo_t info,
	if (regs->stkadj) {		if (regs->stkadj) {
	struct pt_regs *tregs =		struct pt_regs *tregs =
	(struct pt_regs *)((ulong)regs + regs->stkadj);		(struct pt_regs *)((ulong)regs + regs->stkadj);
	#if DEBUG		#if defined(DEBUG)
	printk(KERN_DEBUG "Performing stackadjust=%04x\n", regs->stkadj);		printk(KERN_DEBUG "Performing stackadjust=%04x\n", regs->stkadj);
	#endif		#endif
	/* This must be copied with decreasing addresses to		/* This must be copied with decreasing addresses to

arch/m68knommu/kernel/traps.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -93,12 +93,12 @@ asmlinkage void buserr_c(struct frame *fp)
	if (user_mode(&fp->ptregs))		if (user_mode(&fp->ptregs))
	current->thread.esp0 = (unsigned long) fp;		current->thread.esp0 = (unsigned long) fp;

	#if DEBUG		#if defined(DEBUG)
	printk (KERN_DEBUG "* Bus Error * Format is %x\n", fp->ptregs.format);		printk (KERN_DEBUG "* Bus Error * Format is %x\n", fp->ptregs.format);
	#endif		#endif

	die_if_kernel("bad frame format",&fp->ptregs,0);		die_if_kernel("bad frame format",&fp->ptregs,0);
	#if DEBUG		#if defined(DEBUG)
	printk(KERN_DEBUG "Unknown SIGSEGV - 4\n");		printk(KERN_DEBUG "Unknown SIGSEGV - 4\n");
	#endif		#endif
	force_sig(SIGSEGV, current);		force_sig(SIGSEGV, current);