linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Laura Abbott <labbott@redhat.com>
To: David Airlie <airlied@linux.ie>
Cc: Mark Rutland <mark.rutland@arm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Heiko Carstens <heiko.carstens@de.ibm.com>,
	Takashi Iwai <tiwai@suse.com>, Wim Van Sebroeck <wim@iguana.be>,
	"H. Peter Anvin" <hpa@zytor.com>,
	linux-watchdog@vger.kernel.org, linux-arch@vger.kernel.org,
	linux-s390@vger.kernel.org, Jessica Yu <jeyu@redhat.com>,
	Daniel Borkmann <daniel@iogearbox.net>,
	x86@kernel.org, Russell King <linux@armlinux.org.uk>,
	Ingo Molnar <mingo@redhat.com>, Laura Abbott <labbott@redhat.com>,
	Guenter Roeck <linux@roeck-us.net>,
	Kees Cook <keescook@chromium.org>, Arnd Bergmann <arnd@arndb.de>,
	Will Deacon <will.deacon@arm.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Martin Schwidefsky <schwidefsky@de.ibm.com>,
	Andrew Morton <akpm@linux-foundatio>
Subject: [PATCHv3 06/16] agp: Use set_memory.h header
Date: Tue,  7 Mar 2017 12:55:23 -0800	[thread overview]
Message-ID: <1488920133-27229-7-git-send-email-labbott@redhat.com> (raw)
In-Reply-To: <1488920133-27229-1-git-send-email-labbott@redhat.com>


set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.

Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Added some #ifdef CONFIG_X86
---
 drivers/char/agp/amd-k7-agp.c | 1 +
 drivers/char/agp/ati-agp.c    | 1 +
 drivers/char/agp/generic.     | 0
 drivers/char/agp/generic.c    | 4 +++-
 drivers/char/agp/intel-gtt.c  | 1 +
 drivers/char/agp/sworks-agp.c | 1 +
 6 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 drivers/char/agp/generic.

diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index 3661a51..5fbd333 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -9,6 +9,7 @@
 #include <linux/page-flags.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <asm/set_memory.h>
 #include "agp.h"
 
 #define AMD_MMBASE_BAR	1
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 75a9786..0b5ec7a 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -10,6 +10,7 @@
 #include <linux/slab.h>
 #include <linux/agp_backend.h>
 #include <asm/agp.h>
+#include <asm/set_memory.h>
 #include "agp.h"
 
 #define ATI_GART_MMBASE_BAR	1
diff --git a/drivers/char/agp/generic. b/drivers/char/agp/generic.
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index f002fa5..6ca092f 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -39,7 +39,9 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <asm/io.h>
-#include <asm/cacheflush.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
 #include <asm/pgtable.h>
 #include "agp.h"
 
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 9702c78f..9776f28 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -25,6 +25,7 @@
 #include "agp.h"
 #include "intel-agp.h"
 #include <drm/intel-gtt.h>
+#include <asm/set_memory.h>
 
 /*
  * If we have Intel graphics, we're not going to have anything other than
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index 9b163b4..03be4ac 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -9,6 +9,7 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/agp_backend.h>
+#include <asm/set_memory.h>
 #include "agp.h"
 
 #define SVWRKS_COMMAND		0x04
-- 
2.7.4

WARNING: multiple messages have this Message-ID (diff)
From: Laura Abbott <labbott@redhat.com>
To: David Airlie <airlied@linux.ie>
Cc: Laura Abbott <labbott@redhat.com>,
	Russell King <linux@armlinux.org.uk>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Martin Schwidefsky <schwidefsky@de.ibm.com>,
	Heiko Carstens <heiko.carstens@de.ibm.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
	x86@kernel.org, Kees Cook <keescook@chromium.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org,
	linux-arch@vger.kernel.org,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Wim Van Sebroeck <wim@iguana.be>,
	Guenter Roeck <linux@roeck-us.net>,
	linux-watchdog@vger.kernel.org,
	"David S. Miller" <davem@davemloft.net>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Jessica Yu <jeyu@redhat.com>, Takashi Iwai <tiwai@suse.com>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCHv3 06/16] agp: Use set_memory.h header
Date: Tue,  7 Mar 2017 12:55:23 -0800	[thread overview]
Message-ID: <1488920133-27229-7-git-send-email-labbott@redhat.com> (raw)
Message-ID: <20170307205523.FtZTWde-H9oX5WD3Y9CoAYr_0bWrvu4rdg11mdnZ8eA@z> (raw)
In-Reply-To: <1488920133-27229-1-git-send-email-labbott@redhat.com>


set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.

Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Added some #ifdef CONFIG_X86
---
 drivers/char/agp/amd-k7-agp.c | 1 +
 drivers/char/agp/ati-agp.c    | 1 +
 drivers/char/agp/generic.     | 0
 drivers/char/agp/generic.c    | 4 +++-
 drivers/char/agp/intel-gtt.c  | 1 +
 drivers/char/agp/sworks-agp.c | 1 +
 6 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 drivers/char/agp/generic.

diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index 3661a51..5fbd333 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -9,6 +9,7 @@
 #include <linux/page-flags.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <asm/set_memory.h>
 #include "agp.h"
 
 #define AMD_MMBASE_BAR	1
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 75a9786..0b5ec7a 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -10,6 +10,7 @@
 #include <linux/slab.h>
 #include <linux/agp_backend.h>
 #include <asm/agp.h>
+#include <asm/set_memory.h>
 #include "agp.h"
 
 #define ATI_GART_MMBASE_BAR	1
diff --git a/drivers/char/agp/generic. b/drivers/char/agp/generic.
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index f002fa5..6ca092f 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -39,7 +39,9 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <asm/io.h>
-#include <asm/cacheflush.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
 #include <asm/pgtable.h>
 #include "agp.h"
 
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 9702c78f..9776f28 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -25,6 +25,7 @@
 #include "agp.h"
 #include "intel-agp.h"
 #include <drm/intel-gtt.h>
+#include <asm/set_memory.h>
 
 /*
  * If we have Intel graphics, we're not going to have anything other than
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index 9b163b4..03be4ac 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -9,6 +9,7 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/agp_backend.h>
+#include <asm/set_memory.h>
 #include "agp.h"
 
 #define SVWRKS_COMMAND		0x04
-- 
2.7.4

  parent reply	other threads:[~2017-03-07 20:55 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-07 20:55 [PATCHv3 00/16] set_memory_* functions header refactor Laura Abbott
2017-03-07 20:55 ` Laura Abbott
2017-03-07 20:55 ` [PATCHv3 01/16] treewide: Move set_memory_* functions away from cacheflush.h Laura Abbott
2017-03-07 20:55   ` Laura Abbott
2017-03-07 20:55 ` [PATCHv3 02/16] arm: Use set_memory.h header Laura Abbott
2017-03-07 20:55   ` Laura Abbott
2017-03-07 20:55 ` [PATCHv3 03/16] arm64: " Laura Abbott
2017-03-07 20:55   ` Laura Abbott
2017-03-07 20:55 ` [PATCHv3 04/16] s390: " Laura Abbott
2017-03-07 20:55   ` Laura Abbott
2017-03-07 20:55 ` [PATCHv3 05/16] x86: " Laura Abbott
2017-03-07 20:55   ` Laura Abbott
2017-03-07 20:55 ` Laura Abbott [this message]
2017-03-07 20:55   ` [PATCHv3 06/16] agp: " Laura Abbott
2017-03-07 20:55 ` [PATCHv3 07/16] drm: " Laura Abbott
2017-03-07 20:55   ` Laura Abbott
2017-03-07 20:55 ` [PATCHv3 08/16] intel_th: " Laura Abbott
2017-03-07 20:55   ` Laura Abbott
2017-03-07 20:55 ` [PATCHv3 09/16] watchdog: hpwdt: " Laura Abbott
2017-03-07 20:55   ` Laura Abbott
2017-03-07 20:55 ` [PATCHv3 10/16] bpf: " Laura Abbott
2017-03-07 20:55   ` Laura Abbott
2017-03-07 20:55 ` [PATCHv3 11/16] module: " Laura Abbott
2017-03-07 20:55   ` Laura Abbott
2017-03-07 20:55 ` [PATCHv3 12/16] PM / hibernate: " Laura Abbott
2017-03-07 20:55   ` Laura Abbott
2017-03-07 20:55 ` [PATCHv3 13/16] ALSA: " Laura Abbott
2017-03-07 20:55   ` Laura Abbott
2017-03-20  9:27   ` Takashi Iwai
2017-03-20  9:27     ` Takashi Iwai
2017-03-07 20:55 ` [PATCHv3 14/16] misc: sram: " Laura Abbott
2017-03-07 20:55   ` Laura Abbott
2017-03-07 20:55 ` [PATCHv3 15/16] video: vermilion: " Laura Abbott
2017-03-07 20:55   ` Laura Abbott
2017-03-20 17:20   ` Bartlomiej Zolnierkiewicz
2017-03-20 17:20     ` Bartlomiej Zolnierkiewicz
     [not found] ` <1488920133-27229-1-git-send-email-labbott-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-03-07 20:55   ` [PATCHv3 16/16] treewide: Decouple cacheflush.h and set_memory.h Laura Abbott
2017-03-07 20:55     ` Laura Abbott

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=1488920133-27229-7-git-send-email-labbott@redhat.com \
    --to=labbott@redhat.com \
    --cc=airlied@linux.ie \
    --cc=akpm@linux-foundatio \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=arnd@arndb.de \
    --cc=catalin.marinas@arm.com \
    --cc=daniel@iogearbox.net \
    --cc=heiko.carstens@de.ibm.com \
    --cc=hpa@zytor.com \
    --cc=jeyu@redhat.com \
    --cc=keescook@chromium.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=linux@roeck-us.net \
    --cc=mark.rutland@arm.com \
    --cc=mingo@redhat.com \
    --cc=schwidefsky@de.ibm.com \
    --cc=tglx@linutronix.de \
    --cc=tiwai@suse.com \
    --cc=will.deacon@arm.com \
    --cc=wim@iguana.be \
    --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).