tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

asm-generic: don't include <linux/mm.h> in cacheflush.h

This seems to lead to some crazy include loops when using
asm-generic/cacheflush.h on more architectures, so leave it to the arch
header for now.

[hch@lst.de: fix warning]
Link: http://lkml.kernel.org/r/20200520173520.GA11199@lst.de

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Will Deacon <will@kernel.org>
Cc: Nick Piggin <npiggin@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Keith Busch <keith.busch@intel.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Link: http://lkml.kernel.org/r/20200515143646.3857579-7-hch@lst.de
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Christoph Hellwig and committed by
Linus Torvalds e0cf615d 92a73bd2

+7 -5
+2
arch/um/include/asm/tlb.h
··· 2 2 #ifndef __UM_TLB_H 3 3 #define __UM_TLB_H 4 4 5 + #include <linux/mm.h> 6 + 5 7 #include <asm/tlbflush.h> 6 8 #include <asm-generic/cacheflush.h> 7 9 #include <asm-generic/tlb.h>
+2
arch/x86/include/asm/cacheflush.h
··· 2 2 #ifndef _ASM_X86_CACHEFLUSH_H 3 3 #define _ASM_X86_CACHEFLUSH_H 4 4 5 + #include <linux/mm.h> 6 + 5 7 /* Caches aren't brain-dead on the intel. */ 6 8 #include <asm-generic/cacheflush.h> 7 9 #include <asm/special_insns.h>
+1 -1
drivers/media/platform/omap3isp/ispvideo.c
··· 10 10 * Sakari Ailus <sakari.ailus@iki.fi> 11 11 */ 12 12 13 - #include <asm/cacheflush.h> 14 13 #include <linux/clk.h> 15 14 #include <linux/mm.h> 16 15 #include <linux/module.h> ··· 18 19 #include <linux/sched.h> 19 20 #include <linux/slab.h> 20 21 #include <linux/vmalloc.h> 22 + #include <asm/cacheflush.h> 21 23 22 24 #include <media/v4l2-dev.h> 23 25 #include <media/v4l2-ioctl.h>
+2 -1
drivers/nvdimm/pmem.c
··· 7 7 * Copyright (c) 2015, Boaz Harrosh <boaz@plexistor.com>. 8 8 */ 9 9 10 - #include <asm/cacheflush.h> 11 10 #include <linux/blkdev.h> 12 11 #include <linux/hdreg.h> 13 12 #include <linux/init.h> ··· 24 25 #include <linux/dax.h> 25 26 #include <linux/nd.h> 26 27 #include <linux/backing-dev.h> 28 + #include <linux/mm.h> 29 + #include <asm/cacheflush.h> 27 30 #include "pmem.h" 28 31 #include "pfn.h" 29 32 #include "nd.h"
-3
include/asm-generic/cacheflush.h
··· 2 2 #ifndef _ASM_GENERIC_CACHEFLUSH_H 3 3 #define _ASM_GENERIC_CACHEFLUSH_H 4 4 5 - /* Keep includes the same across arches. */ 6 - #include <linux/mm.h> 7 - 8 5 #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0 9 6 10 7 /*