Skip to content

Commit a36498d

Browse files
Al Viroarndb
authored andcommitted
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 <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent fb56007 commit a36498d

File tree

3 files changed

+0
-25
lines changed

3 files changed

+0
-25
lines changed

arch/mips/include/asm/vga.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ static inline void scr_memsetw(u16 *s, u16 v, unsigned int count)
4747
memset16(s, cpu_to_le16(v), count / 2);
4848
}
4949

50-
#define scr_memcpyw(d, s, c) memcpy(d, s, c)
51-
#define scr_memmovew(d, s, c) memmove(d, s, c)
52-
#define VT_BUF_HAVE_MEMCPYW
53-
#define VT_BUF_HAVE_MEMMOVEW
5450
#define VT_BUF_HAVE_MEMSETW
5551

5652
#endif /* _ASM_VGA_H */

arch/powerpc/include/asm/vga.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ static inline void scr_memsetw(u16 *s, u16 v, unsigned int n)
4040
memset16(s, cpu_to_le16(v), n / 2);
4141
}
4242

43-
#define VT_BUF_HAVE_MEMCPYW
44-
#define VT_BUF_HAVE_MEMMOVEW
45-
#define scr_memcpyw memcpy
46-
#define scr_memmovew memmove
47-
4843
#endif /* !CONFIG_VGA_CONSOLE && !CONFIG_MDA_CONSOLE */
4944

5045
#ifdef __powerpc64__

arch/sparc/include/asm/vga.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
#define VT_BUF_HAVE_RW
1616
#define VT_BUF_HAVE_MEMSETW
17-
#define VT_BUF_HAVE_MEMCPYW
18-
#define VT_BUF_HAVE_MEMMOVEW
1917

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

44-
static inline void scr_memcpyw(u16 *d, u16 *s, unsigned int n)
45-
{
46-
BUG_ON((long) d >= 0);
47-
48-
memcpy(d, s, n);
49-
}
50-
51-
static inline void scr_memmovew(u16 *d, u16 *s, unsigned int n)
52-
{
53-
BUG_ON((long) d >= 0);
54-
55-
memmove(d, s, n);
56-
}
57-
5842
#define VGA_MAP_MEM(x,s) (x)
5943

6044
#endif

0 commit comments

Comments
 (0)