Commit e0cf615d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 92a73bd2

arch/um/include/asm/tlb.h

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#ifndef __UM_TLB_H

#define __UM_TLB_H



#include <linux/mm.h>



#include <asm/tlbflush.h>

#include <asm-generic/cacheflush.h>

#include <asm-generic/tlb.h>

arch/x86/include/asm/cacheflush.h

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#ifndef _ASM_X86_CACHEFLUSH_H

#define _ASM_X86_CACHEFLUSH_H



#include <linux/mm.h>



/* Caches aren't brain-dead on the intel. */

#include <asm-generic/cacheflush.h>

#include <asm/special_insns.h>

drivers/media/platform/omap3isp/ispvideo.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 *	     Sakari Ailus <sakari.ailus@iki.fi>

 */



#include <asm/cacheflush.h>

#include <linux/clk.h>

#include <linux/mm.h>

#include <linux/module.h>
@@ -19,6 +18,7 @@ 
#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>

#include <asm/cacheflush.h>



#include <media/v4l2-dev.h>

#include <media/v4l2-ioctl.h>

drivers/nvdimm/pmem.c

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
 * Copyright (c) 2015, Boaz Harrosh <boaz@plexistor.com>.

 */



#include <asm/cacheflush.h>

#include <linux/blkdev.h>

#include <linux/hdreg.h>

#include <linux/init.h>
@@ -25,6 +24,8 @@ 
#include <linux/dax.h>

#include <linux/nd.h>

#include <linux/backing-dev.h>

#include <linux/mm.h>

#include <asm/cacheflush.h>

#include "pmem.h"

#include "pfn.h"

#include "nd.h"

include/asm-generic/cacheflush.h

+0 −3
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 
#ifndef _ASM_GENERIC_CACHEFLUSH_H

#define _ASM_GENERIC_CACHEFLUSH_H



/* Keep includes the same across arches.  */

#include <linux/mm.h>



#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE