From: Jiri Slaby <jslaby@suse.cz>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, Jiri Slaby <jslaby@suse.cz>,
Michal Simek <monstr@monstr.eu>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Chris Zankel <chris@zankel.net>,
Max Filippov <jcmvbkbc@gmail.com>,
x86@kernel.org, linux-xtensa@linux-xtensa.org
Subject: [PATCH -resend 5/6] m32r, microblaze, x86, xtensa: use generic vga.h
Date: Mon, 3 Oct 2016 11:07:35 +0200 [thread overview]
Message-ID: <20161003090736.19926-5-jslaby@suse.cz> (raw)
In-Reply-To: <20161003090736.19926-1-jslaby@suse.cz>
What these architectures declare is the same as what can be found in
asm-generic/vga.h. So use that header instead.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: x86@kernel.org
Cc: linux-xtensa@linux-xtensa.org
Acked-by (x86 part): Thomas Gleixner <tglx@linutronix.de>
---
arch/m32r/include/asm/Kbuild | 1 +
arch/m32r/include/asm/vga.h | 20 --------------------
arch/microblaze/include/asm/Kbuild | 1 +
arch/microblaze/include/asm/vga.h | 1 -
arch/x86/include/asm/Kbuild | 1 +
arch/x86/include/asm/vga.h | 20 --------------------
arch/xtensa/include/asm/Kbuild | 1 +
arch/xtensa/include/asm/vga.h | 19 -------------------
8 files changed, 4 insertions(+), 60 deletions(-)
delete mode 100644 arch/m32r/include/asm/vga.h
delete mode 100644 arch/microblaze/include/asm/vga.h
delete mode 100644 arch/x86/include/asm/vga.h
delete mode 100644 arch/xtensa/include/asm/vga.h
diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild
index 860e440611c9..dd07f8248656 100644
--- a/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@ -10,4 +10,5 @@ generic-y += module.h
generic-y += preempt.h
generic-y += sections.h
generic-y += trace_clock.h
+generic-y += vga.h
generic-y += word-at-a-time.h
diff --git a/arch/m32r/include/asm/vga.h b/arch/m32r/include/asm/vga.h
deleted file mode 100644
index a1b63061c06f..000000000000
--- a/arch/m32r/include/asm/vga.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _ASM_M32R_VGA_H
-#define _ASM_M32R_VGA_H
-
-/*
- * Access to VGA videoram
- *
- * (c) 1998 Martin Mares <mj@ucw.cz>
- */
-
-/*
- * On the PC, we can just recalculate addresses and then
- * access the videoram directly without any black magic.
- */
-
-#define VGA_MAP_MEM(x,s) (unsigned long)phys_to_virt(x)
-
-#define vga_readb(x) (*(x))
-#define vga_writeb(x,y) (*(y) = (x))
-
-#endif /* _ASM_M32R_VGA_H */
diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild
index b0ae88c9fed9..be768a03e90d 100644
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@ -10,4 +10,5 @@ generic-y += mm-arch-hooks.h
generic-y += preempt.h
generic-y += syscalls.h
generic-y += trace_clock.h
+generic-y += vga.h
generic-y += word-at-a-time.h
diff --git a/arch/microblaze/include/asm/vga.h b/arch/microblaze/include/asm/vga.h
deleted file mode 100644
index 89d82fd8fcf1..000000000000
--- a/arch/microblaze/include/asm/vga.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/vga.h>
diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild
index 2cfed174e3c9..4f80b24e7a70 100644
--- a/arch/x86/include/asm/Kbuild
+++ b/arch/x86/include/asm/Kbuild
@@ -16,3 +16,4 @@ generic-y += dma-contiguous.h
generic-y += early_ioremap.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
+generic-y += vga.h
diff --git a/arch/x86/include/asm/vga.h b/arch/x86/include/asm/vga.h
deleted file mode 100644
index c4b9dc2f67c5..000000000000
--- a/arch/x86/include/asm/vga.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Access to VGA videoram
- *
- * (c) 1998 Martin Mares <mj@ucw.cz>
- */
-
-#ifndef _ASM_X86_VGA_H
-#define _ASM_X86_VGA_H
-
-/*
- * On the PC, we can just recalculate addresses and then
- * access the videoram directly without any black magic.
- */
-
-#define VGA_MAP_MEM(x, s) (unsigned long)phys_to_virt(x)
-
-#define vga_readb(x) (*(x))
-#define vga_writeb(x, y) (*(y) = (x))
-
-#endif /* _ASM_X86_VGA_H */
diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild
index 28cf4c5d65ef..a0213f52c6cd 100644
--- a/arch/xtensa/include/asm/Kbuild
+++ b/arch/xtensa/include/asm/Kbuild
@@ -29,5 +29,6 @@ generic-y += statfs.h
generic-y += termios.h
generic-y += topology.h
generic-y += trace_clock.h
+generic-y += vga.h
generic-y += word-at-a-time.h
generic-y += xor.h
diff --git a/arch/xtensa/include/asm/vga.h b/arch/xtensa/include/asm/vga.h
deleted file mode 100644
index 1fd8cab3a297..000000000000
--- a/arch/xtensa/include/asm/vga.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * include/asm-xtensa/vga.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_VGA_H
-#define _XTENSA_VGA_H
-
-#define VGA_MAP_MEM(x,s) (unsigned long)phys_to_virt(x)
-
-#define vga_readb(x) (*(x))
-#define vga_writeb(x,y) (*(y) = (x))
-
-#endif
--
2.10.0
next prev parent reply other threads:[~2016-10-03 9:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-03 9:07 [PATCH -resend 1/6] mdacon: align code in mda_detect properly Jiri Slaby
2016-10-03 9:07 ` [PATCH -resend 2/6] mdacon: make mda_vram_base u16 * Jiri Slaby
2016-10-03 9:07 ` [PATCH -resend 3/6] mdacon: replace MDA_ADDR macro by inline function Jiri Slaby
2016-10-03 9:07 ` [PATCH -resend 4/6] mdacon: enable COMPILE_TEST build Jiri Slaby
2016-10-03 9:35 ` Geert Uytterhoeven
2016-10-04 7:09 ` Jiri Slaby
2016-10-03 9:07 ` Jiri Slaby [this message]
2016-10-03 17:09 ` [PATCH -resend 5/6] m32r, microblaze, x86, xtensa: use generic vga.h Max Filippov
2016-10-03 9:07 ` [PATCH -resend 6/6] frv, mn10300, s390, sh: remove empty vga.h Jiri Slaby
2016-10-03 9:10 ` Geert Uytterhoeven
2016-10-04 5:19 ` Martin Schwidefsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161003090736.19926-5-jslaby@suse.cz \
--to=jslaby@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=chris@zankel.net \
--cc=hpa@zytor.com \
--cc=jcmvbkbc@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=mingo@redhat.com \
--cc=monstr@monstr.eu \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox