mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 04:38:03 +00:00
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: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
fb56007c9b
commit
a36498d22c
@ -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 */
|
||||
|
@ -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__
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user