From: geert@linux-m68k.org (Geert Uytterhoeven)
To: linux-snps-arc@lists.infradead.org
Subject: [PATCH 18/26] m68k: rename __iounmap and mark it static
Date: Mon, 19 Aug 2019 11:00:24 +0200 [thread overview]
Message-ID: <CAMuHMdWjAUMc_G1AUE_dgbrUn3qm4th+jiG3NJwperDVHdcoSw@mail.gmail.com> (raw)
In-Reply-To: <20190817073253.27819-19-hch@lst.de>
Hi Christoph,
On Sat, Aug 17, 2019@9:49 AM Christoph Hellwig <hch@lst.de> wrote:
> m68k uses __iounmap as the name for an internal helper that is only
> used for some CPU types. Mark it static and give it a better name.
>
> Signed-off-by: Christoph Hellwig <hch at lst.de>
Thanks for your patch!
> --- a/arch/m68k/mm/kmap.c
> +++ b/arch/m68k/mm/kmap.c
> @@ -52,6 +52,7 @@ static inline void free_io_area(void *addr)
>
> #define IO_SIZE (256*1024)
>
> +static void __free_io_area(void *addr, unsigned long size);
> static struct vm_struct *iolist;
>
> static struct vm_struct *get_io_area(unsigned long size)
> @@ -90,7 +91,7 @@ static inline void free_io_area(void *addr)
> if (tmp->addr == addr) {
> *p = tmp->next;
> /* remove gap added in get_io_area() */
> - __iounmap(tmp->addr, tmp->size - IO_SIZE);
> + __free_io_area(tmp->addr, tmp->size - IO_SIZE);
> kfree(tmp);
> return;
> }
> @@ -249,12 +250,13 @@ void iounmap(void __iomem *addr)
> }
> EXPORT_SYMBOL(iounmap);
>
> +#ifndef CPU_M68040_OR_M68060_ONLY
Cant you move this block up, to avoid adding more #ifdef cluttery?
The rest looks good to me.
> /*
> - * __iounmap unmaps nearly everything, so be careful
> + * __free_io_area unmaps nearly everything, so be careful
> * Currently it doesn't free pointer/page tables anymore but this
> * wasn't used anyway and might be added later.
> */
> -void __iounmap(void *addr, unsigned long size)
> +static void __free_io_area(void *addr, unsigned long size)
> {
> unsigned long virtaddr = (unsigned long)addr;
> pgd_t *pgd_dir;
> @@ -297,6 +299,7 @@ void __iounmap(void *addr, unsigned long size)
>
> flush_tlb_all();
> }
> +#endif /* CPU_M68040_OR_M68060_ONLY */
>
> /*
> * Set new cache mode for some kernel address space.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next prev parent reply other threads:[~2019-08-19 9:00 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-17 7:32 generic ioremap (and lots of cleanups) Christoph Hellwig
2019-08-17 7:32 ` [PATCH 01/26] mtd/maps/pxa2xx: use ioremap_cache insted of ioremap_cached Christoph Hellwig
2019-08-17 7:32 ` [PATCH 02/26] arm, unicore32: remove ioremap_cached Christoph Hellwig
2019-08-17 7:32 ` [PATCH 03/26] m68k, microblaze: remove ioremap_fullcache Christoph Hellwig
2019-08-19 8:50 ` Geert Uytterhoeven
2019-09-02 14:16 ` Michal Simek
2019-08-17 7:32 ` [PATCH 04/26] mips: remove ioremap_cachable Christoph Hellwig
2019-08-19 20:57 ` Paul Burton
2019-08-30 16:06 ` Christoph Hellwig
2019-09-03 8:57 ` Paul Burton
2019-08-17 7:32 ` [PATCH 05/26] openrisc: map as uncached in ioremap Christoph Hellwig
2019-08-23 13:55 ` Stafford Horne
2019-08-30 16:07 ` Christoph Hellwig
2019-08-30 21:45 ` Stafford Horne
2019-08-17 7:32 ` [PATCH 06/26] ia64: rename ioremap_nocache to ioremap_uc Christoph Hellwig
2019-08-17 16:00 ` Sergei Shtylyov
2019-08-17 7:32 ` [PATCH 07/26] hexagon: clean up ioremap Christoph Hellwig
2019-08-17 7:32 ` [PATCH 08/26] m68k: simplify ioremap_nocache Christoph Hellwig
2019-08-19 8:56 ` Geert Uytterhoeven
2019-08-19 9:18 ` Christoph Hellwig
2019-08-30 16:06 ` Christoph Hellwig
2019-09-02 7:53 ` Geert Uytterhoeven
2019-08-17 7:32 ` [PATCH 09/26] alpha: remove the unused __ioremap wrapper Christoph Hellwig
2019-08-17 7:32 ` [PATCH 10/26] nios2: remove __ioremap Christoph Hellwig
2019-08-17 7:32 ` [PATCH 11/26] parisc: " Christoph Hellwig
2019-08-17 7:32 ` [PATCH 12/26] x86: clean up ioremap Christoph Hellwig
2019-08-17 10:34 ` Ingo Molnar
2019-08-30 16:04 ` Christoph Hellwig
2019-08-17 7:32 ` [PATCH 13/26] xtensa: " Christoph Hellwig
2019-08-17 7:32 ` [PATCH 14/26] asm-generic: don't provide __ioremap Christoph Hellwig
2019-08-17 20:58 ` Paul Walmsley
2019-08-17 21:27 ` Paul Walmsley
2019-08-17 7:32 ` [PATCH 15/26] asm-generic: ioremap_uc should behave the same with and without MMU Christoph Hellwig
2019-08-17 21:07 ` Paul Walmsley
2019-08-17 7:32 ` [PATCH 16/26] asm-generic: don't provide ioremap for CONFIG_MMU Christoph Hellwig
2019-08-17 21:15 ` Paul Walmsley
2019-08-17 7:32 ` [PATCH 17/26] arch: rely on asm-generic/io.h for default ioremap_* definitions Christoph Hellwig
2019-08-17 21:13 ` Paul Walmsley
2019-08-17 7:32 ` [PATCH 18/26] m68k: rename __iounmap and mark it static Christoph Hellwig
2019-08-19 9:00 ` Geert Uytterhoeven [this message]
2019-08-17 7:32 ` [PATCH 19/26] arm64: remove __iounmap Christoph Hellwig
2019-08-19 7:36 ` Will Deacon
2019-08-30 16:05 ` Christoph Hellwig
2019-08-31 16:29 ` Will Deacon
2019-08-17 7:32 ` [PATCH 20/26] hexagon: " Christoph Hellwig
2019-08-17 7:32 ` [PATCH 21/26] nios2: " Christoph Hellwig
2019-08-17 7:32 ` [PATCH 22/26] sh: " Christoph Hellwig
2019-08-17 7:32 ` [PATCH 23/26] lib: provide a simple generic ioremap implementation Christoph Hellwig
2019-08-17 7:32 ` [PATCH 24/26] riscv: use the generic ioremap code Christoph Hellwig
2019-08-17 21:22 ` Paul Walmsley
2019-09-01 8:02 ` Christoph Hellwig
2019-08-17 7:32 ` [PATCH 25/26] csky: use generic ioremap Christoph Hellwig
2019-08-17 7:32 ` [PATCH 26/26] nds32: " Christoph Hellwig
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=CAMuHMdWjAUMc_G1AUE_dgbrUn3qm4th+jiG3NJwperDVHdcoSw@mail.gmail.com \
--to=geert@linux-m68k.org \
--cc=linux-snps-arc@lists.infradead.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).