forked from mirrors/linux
		
	 bfff83c482
			
		
	
	
		bfff83c482
		
	
	
	
	
		
			
			Fix build errors on ARCH=alpha when CONFIG_MDA_CONSOLE=m.
This allows the ARCH macros to be the only ones defined.
In file included from ../drivers/video/console/mdacon.c:37:
../arch/alpha/include/asm/vga.h:17:40: error: expected identifier or '(' before 'volatile'
   17 | static inline void scr_writew(u16 val, volatile u16 *addr)
      |                                        ^~~~~~~~
../include/linux/vt_buffer.h:24:34: note: in definition of macro 'scr_writew'
   24 | #define scr_writew(val, addr) (*(addr) = (val))
      |                                  ^~~~
../include/linux/vt_buffer.h:24:40: error: expected ')' before '=' token
   24 | #define scr_writew(val, addr) (*(addr) = (val))
      |                                        ^
../arch/alpha/include/asm/vga.h:17:20: note: in expansion of macro 'scr_writew'
   17 | static inline void scr_writew(u16 val, volatile u16 *addr)
      |                    ^~~~~~~~~~
../arch/alpha/include/asm/vga.h:25:29: error: expected identifier or '(' before 'volatile'
   25 | static inline u16 scr_readw(volatile const u16 *addr)
      |                             ^~~~~~~~
Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jirislaby@kernel.org>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-fbdev@vger.kernel.org
Signed-off-by: Helge Deller <deller@gmx.de>
		
	
			
		
			
				
	
	
		
			73 lines
		
	
	
	
		
			1.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			73 lines
		
	
	
	
		
			1.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* SPDX-License-Identifier: GPL-2.0 */
 | |
| /*
 | |
|  *	include/linux/vt_buffer.h -- Access to VT screen buffer
 | |
|  *
 | |
|  *	(c) 1998 Martin Mares <mj@ucw.cz>
 | |
|  *
 | |
|  *	This is a set of macros and functions which are used in the
 | |
|  *	console driver and related code to access the screen buffer.
 | |
|  *	In most cases the console works with simple in-memory buffer,
 | |
|  *	but when handling hardware text mode consoles, we store
 | |
|  *	the foreground console directly in video memory.
 | |
|  */
 | |
| 
 | |
| #ifndef _LINUX_VT_BUFFER_H_
 | |
| #define _LINUX_VT_BUFFER_H_
 | |
| 
 | |
| #include <linux/string.h>
 | |
| 
 | |
| #if IS_ENABLED(CONFIG_VGA_CONSOLE) || IS_ENABLED(CONFIG_MDA_CONSOLE)
 | |
| #include <asm/vga.h>
 | |
| #endif
 | |
| 
 | |
| #ifndef VT_BUF_HAVE_RW
 | |
| #define scr_writew(val, addr) (*(addr) = (val))
 | |
| #define scr_readw(addr) (*(addr))
 | |
| #endif
 | |
| 
 | |
| #ifndef VT_BUF_HAVE_MEMSETW
 | |
| static inline void scr_memsetw(u16 *s, u16 c, unsigned int count)
 | |
| {
 | |
| #ifdef VT_BUF_HAVE_RW
 | |
| 	count /= 2;
 | |
| 	while (count--)
 | |
| 		scr_writew(c, s++);
 | |
| #else
 | |
| 	memset16(s, c, count / 2);
 | |
| #endif
 | |
| }
 | |
| #endif
 | |
| 
 | |
| #ifndef VT_BUF_HAVE_MEMCPYW
 | |
| static inline void scr_memcpyw(u16 *d, const u16 *s, unsigned int count)
 | |
| {
 | |
| #ifdef VT_BUF_HAVE_RW
 | |
| 	count /= 2;
 | |
| 	while (count--)
 | |
| 		scr_writew(scr_readw(s++), d++);
 | |
| #else
 | |
| 	memcpy(d, s, count);
 | |
| #endif
 | |
| }
 | |
| #endif
 | |
| 
 | |
| #ifndef VT_BUF_HAVE_MEMMOVEW
 | |
| static inline void scr_memmovew(u16 *d, const u16 *s, unsigned int count)
 | |
| {
 | |
| #ifdef VT_BUF_HAVE_RW
 | |
| 	if (d < s)
 | |
| 		scr_memcpyw(d, s, count);
 | |
| 	else {
 | |
| 		count /= 2;
 | |
| 		d += count;
 | |
| 		s += count;
 | |
| 		while (count--)
 | |
| 			scr_writew(scr_readw(--s), --d);
 | |
| 	}
 | |
| #else
 | |
| 	memmove(d, s, count);
 | |
| #endif
 | |
| }
 | |
| #endif
 | |
| 
 | |
| #endif
 |