Commit a36498d2 authored by Al Viro's avatar Al Viro Committed by Arnd Bergmann
Browse files

asm/vga.h: don't bother with scr_mem{cpy,move}v() unless we need to 



... if they are identical to fallbacks, just leave them alone.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent fb56007c

arch/mips/include/asm/vga.h

+0 −4
Original line number Diff line number Diff line
@@ -47,10 +47,6 @@ static inline void scr_memsetw(u16 *s, u16 v, unsigned int count) 
	memset16(s, cpu_to_le16(v), count / 2);

}



#define scr_memcpyw(d, s, c) memcpy(d, s, c)

#define scr_memmovew(d, s, c) memmove(d, s, c)

#define VT_BUF_HAVE_MEMCPYW

#define VT_BUF_HAVE_MEMMOVEW

#define VT_BUF_HAVE_MEMSETW



#endif /* _ASM_VGA_H */

arch/powerpc/include/asm/vga.h

+0 −5
Original line number Diff line number Diff line
@@ -40,11 +40,6 @@ static inline void scr_memsetw(u16 *s, u16 v, unsigned int n) 
	memset16(s, cpu_to_le16(v), n / 2);

}



#define VT_BUF_HAVE_MEMCPYW

#define VT_BUF_HAVE_MEMMOVEW

#define scr_memcpyw	memcpy

#define scr_memmovew	memmove



#endif /* !CONFIG_VGA_CONSOLE && !CONFIG_MDA_CONSOLE */



#ifdef __powerpc64__

arch/sparc/include/asm/vga.h

+0 −16
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 


#define VT_BUF_HAVE_RW

#define VT_BUF_HAVE_MEMSETW

#define VT_BUF_HAVE_MEMCPYW

#define VT_BUF_HAVE_MEMMOVEW



#undef scr_writew

#undef scr_readw
@@ -41,20 +39,6 @@ static inline void scr_memsetw(u16 *p, u16 v, unsigned int n) 
	memset16(p, cpu_to_le16(v), n / 2);

}



static inline void scr_memcpyw(u16 *d, u16 *s, unsigned int n)

{

	BUG_ON((long) d >= 0);



	memcpy(d, s, n);

}



static inline void scr_memmovew(u16 *d, u16 *s, unsigned int n)

{

	BUG_ON((long) d >= 0);



	memmove(d, s, n);

}



#define VGA_MAP_MEM(x,s) (x)



#endif