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

Commit f94d1d3a authored by Mathieu Desnoyers's avatar Mathieu Desnoyers Committed by Linus Torvalds
Browse files

Fix m32r __xchg 



the #endif  /* CONFIG_SMP */ should cover the default condition, or it may cause
bad parameter to be silently missed.

To make it work correctly, we have to remove the ifdef CONFIG SMP surrounding
__xchg_called_with_bad_pointer declaration. Thanks to Adrian Bunk for detecting
this.

Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Cc: Adrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7b631c2d

include/asm-m32r/system.h

+1 −3
Original line number Diff line number Diff line
@@ -127,9 +127,7 @@ static inline void local_irq_disable(void) 
	((__typeof__(*(ptr)))__xchg_local((unsigned long)(x), (ptr),	\

			sizeof(*(ptr))))



#ifdef CONFIG_SMP

extern void  __xchg_called_with_bad_pointer(void);

#endif



#ifdef CONFIG_CHIP_M32700_TS1

#define DCACHE_CLEAR(reg0, reg1, addr)				\
@@ -189,9 +187,9 @@ __xchg(unsigned long x, volatile void *ptr, int size) 
#endif	/* CONFIG_CHIP_M32700_TS1 */

		);

		break;

#endif  /* CONFIG_SMP */

	default:

		__xchg_called_with_bad_pointer();

#endif  /* CONFIG_SMP */

	}



	local_irq_restore(flags);