From: Thomas Zimmermann <tzimmermann@suse.de>
To: arnd@arndb.de, daniel.vetter@ffwll.ch, deller@gmx.de,
javierm@redhat.com, gregkh@linuxfoundation.org
Cc: linux-arch@vger.kernel.org, linux-fbdev@vger.kernel.org,
dri-devel@lists.freedesktop.org,
linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org,
loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org,
linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org,
sparclinux@vger.kernel.org, x86@kernel.org,
Thomas Zimmermann <tzimmermann@suse.de>,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH v3 07/19] arch/m68k: Merge variants of fb_pgprotect() into single function
Date: Mon, 17 Apr 2023 14:56:39 +0200 [thread overview]
Message-ID: <20230417125651.25126-8-tzimmermann@suse.de> (raw)
In-Reply-To: <20230417125651.25126-1-tzimmermann@suse.de>
Merge all variants of fb_pgprotect() into a single function body.
There are two different cases for MMU systems. For non-MMU systems,
the function body will be empty. No functional changes, but this
will help with the switch to <asm-generic/fb.h>.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
arch/m68k/include/asm/fb.h | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/arch/m68k/include/asm/fb.h b/arch/m68k/include/asm/fb.h
index b86c6e2e26dd..4f96989922af 100644
--- a/arch/m68k/include/asm/fb.h
+++ b/arch/m68k/include/asm/fb.h
@@ -7,17 +7,13 @@
#include <asm/page.h>
#include <asm/setup.h>
-#ifdef CONFIG_MMU
-#ifdef CONFIG_SUN3
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
unsigned long off)
{
+#ifdef CONFIG_MMU
+#ifdef CONFIG_SUN3
pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE;
-}
#else
-static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
- unsigned long off)
-{
if (CPU_IS_020_OR_030)
pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030;
if (CPU_IS_040_OR_060) {
@@ -25,11 +21,9 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
/* Use no-cache mode, serialized */
pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE_S;
}
-}
#endif /* CONFIG_SUN3 */
-#else
-#define fb_pgprotect(...) do {} while (0)
#endif /* CONFIG_MMU */
+}
static inline int fb_is_primary_device(struct fb_info *info)
{
--
2.40.0
_______________________________________________
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
next prev parent reply other threads:[~2023-04-17 12:57 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-17 12:56 [PATCH v3 00/19] arch: Consolidate <asm/fb.h> Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 01/19] fbdev: Prepare generic architecture helpers Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 02/19] arch/arc: Implement <asm/fb.h> with generic helpers Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 03/19] arch/arm: " Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 04/19] arch/arm64: " Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 05/19] arch/ia64: " Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 06/19] arch/loongarch: " Thomas Zimmermann
2023-06-28 10:26 ` WANG Xuerui
2023-04-17 12:56 ` Thomas Zimmermann [this message]
2023-04-17 12:56 ` [PATCH v3 08/19] arch/m68k: " Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 09/19] arch/mips: " Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 10/19] video: Remove trailing whitespaces Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 11/19] video: Move HP PARISC STI core code to shared location Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 12/19] arch/parisc: Remove trailing whitespaces Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 13/19] arch/parisc: Implement fb_is_primary_device() under arch/parisc Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 14/19] arch/parisc: Implement <asm/fb.h> with generic helpers Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 15/19] arch/powerpc: " Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 16/19] arch/sh: " Thomas Zimmermann
2023-04-17 13:02 ` John Paul Adrian Glaubitz
2023-04-17 14:06 ` Thomas Zimmermann
2023-04-17 14:07 ` Thomas Zimmermann
2023-04-17 14:13 ` John Paul Adrian Glaubitz
2023-04-17 14:16 ` Thomas Zimmermann
2023-04-17 14:21 ` John Paul Adrian Glaubitz
2023-04-17 12:56 ` [PATCH v3 17/19] arch/sparc: Implement fb_is_primary_device() in source file Thomas Zimmermann
2023-06-24 1:55 ` [v3,17/19] " Guenter Roeck
2023-06-24 9:27 ` Arnd Bergmann
2023-06-24 13:26 ` Guenter Roeck
2023-06-24 14:21 ` Arnd Bergmann
2023-06-28 10:01 ` Arnd Bergmann
2023-04-17 12:56 ` [PATCH v3 18/19] arch/sparc: Implement <asm/fb.h> with generic helpers Thomas Zimmermann
2023-04-17 12:56 ` [PATCH v3 19/19] arch/x86: " Thomas Zimmermann
2023-04-17 14:12 ` [PATCH v3 00/19] arch: Consolidate <asm/fb.h> Arnd Bergmann
2023-04-18 7:44 ` Thomas Zimmermann
2023-04-19 17:22 ` Helge Deller
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=20230417125651.25126-8-tzimmermann@suse.de \
--to=tzimmermann@suse.de \
--cc=arnd@arndb.de \
--cc=daniel.vetter@ffwll.ch \
--cc=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=javierm@redhat.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=loongarch@lists.linux.dev \
--cc=sparclinux@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).