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

Commit 020f9e16 authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds
Browse files

m68knommu: fix reset register address casting 



Fix types used for reset register address setup.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 906a2621

include/asm-m68knommu/system.h

+2 −2
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ cmpxchg(volatile int *p, int old, int new) 
({						\

	unsigned char volatile *reset;		\

	asm("move.w	#0x2700, %sr");		\

	reset = ((volatile unsigned short *)(MCF_IPSBAR + 0x110000));	\

	reset = ((volatile unsigned char *)(MCF_IPSBAR + 0x110000));	\

	while(1)				\

	*reset |= (0x01 << 7);\

})
@@ -318,7 +318,7 @@ cmpxchg(volatile int *p, int old, int new) 
({					\

	unsigned char volatile *reset;	\

	asm("move.w     #0x2700, %sr");	\

	reset = ((volatile unsigned short *)(MCF_IPSBAR + 0xA0000));	\

	reset = ((volatile unsigned char *)(MCF_IPSBAR + 0xA0000));	\

	while(1)			\

		*reset |= 0x80;		\

})