* [PATCHv3 00/16] set_memory_* functions header refactor
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
This is v3 of the series to decouple set_memory_* from cacheflush.h. This
version contains a few minor alphabetical order fixes and some fixes caught
by the 0day bot. Several places unfortunately need an #ifdef around the
header for arches without the set_memory_* functions.
Andrew, it might be best to wait a few days to let the 0day bot churn on this
series.
Thanks,
Laura
Laura Abbott (16):
treewide: Move set_memory_* functions away from cacheflush.h
arm: Use set_memory.h header
arm64: Use set_memory.h header
s390: Use set_memory.h header
x86: Use set_memory.h header
agp: Use set_memory.h header
drm: Use set_memory.h header
intel_th: Use set_memory.h header
watchdog: hpwdt: Use set_memory.h header
bpf: Use set_memory.h header
module: Use set_memory.h header
PM / hibernate: Use set_memory.h header
ALSA: Use set_memory.h header
misc: sram: Use set_memory.h header
video: vermilion: Use set_memory.h header
treewide: Decouple cacheflush.h and set_memory.h
arch/arm/include/asm/cacheflush.h | 20 -------
arch/arm/include/asm/set_memory.h | 32 ++++++++++++
arch/arm/kernel/ftrace.c | 1 +
arch/arm/kernel/machine_kexec.c | 1 +
arch/arm/mm/pageattr.c | 1 +
arch/arm/net/bpf_jit_32.c | 1 +
arch/arm64/include/asm/Kbuild | 1 +
arch/arm64/include/asm/cacheflush.h | 5 --
arch/arm64/mm/pageattr.c | 1 +
arch/arm64/net/bpf_jit_comp.c | 1 +
arch/s390/include/asm/Kbuild | 1 +
arch/s390/include/asm/cacheflush.h | 34 ------------
arch/s390/include/asm/set_memory.h | 31 +++++++++++
arch/s390/kernel/ftrace.c | 1 +
arch/s390/kernel/kprobes.c | 2 +-
arch/s390/kernel/machine_kexec.c | 1 +
arch/s390/mm/init.c | 1 +
arch/s390/mm/pageattr.c | 1 +
arch/s390/mm/vmem.c | 1 +
arch/s390/net/bpf_jit_comp.c | 1 +
arch/x86/include/asm/cacheflush.h | 85 ------------------------------
arch/x86/include/asm/set_memory.h | 87 +++++++++++++++++++++++++++++++
arch/x86/kernel/amd_gart_64.c | 2 +-
arch/x86/kernel/cpu/amd.c | 2 +-
arch/x86/kernel/cpu/bugs.c | 2 +-
arch/x86/kernel/ftrace.c | 2 +-
arch/x86/kernel/machine_kexec_32.c | 2 +-
arch/x86/kernel/machine_kexec_64.c | 1 +
arch/x86/mm/init.c | 2 +-
arch/x86/mm/init_32.c | 2 +-
arch/x86/mm/init_64.c | 2 +-
arch/x86/mm/ioremap.c | 2 +-
arch/x86/mm/pageattr.c | 1 +
arch/x86/net/bpf_jit_comp.c | 1 +
arch/x86/pci/pcbios.c | 2 +-
arch/x86/platform/efi/efi.c | 2 +-
arch/x86/realmode/init.c | 2 +-
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 +
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 ++
drivers/gpu/drm/gma500/gtt.c | 1 +
drivers/gpu/drm/gma500/psb_drv.c | 1 +
drivers/gpu/drm/radeon/radeon_gart.c | 3 ++
drivers/gpu/drm/ttm/ttm_page_alloc.c | 3 ++
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 3 ++
drivers/gpu/drm/ttm/ttm_tt.c | 3 ++
drivers/hwtracing/intel_th/msu.c | 4 +-
drivers/misc/sram-exec.c | 3 +-
drivers/video/fbdev/vermilion/vermilion.c | 2 +-
drivers/watchdog/hpwdt.c | 2 +-
include/asm-generic/set_memory.h | 12 +++++
include/linux/filter.h | 4 +-
kernel/module.c | 3 ++
kernel/power/snapshot.c | 3 ++
sound/pci/hda/hda_intel.c | 2 +-
sound/pci/intel8x0.c | 4 +-
sound/x86/intel_hdmi_audio.c | 2 +-
61 files changed, 237 insertions(+), 166 deletions(-)
create mode 100644 arch/arm/include/asm/set_memory.h
delete mode 100644 arch/s390/include/asm/cacheflush.h
create mode 100644 arch/s390/include/asm/set_memory.h
create mode 100644 arch/x86/include/asm/set_memory.h
create mode 100644 drivers/char/agp/generic.
create mode 100644 include/asm-generic/set_memory.h
--
2.7.4
^ permalink raw reply [flat|nested] 62+ messages in thread
* [PATCHv3 00/16] set_memory_* functions header refactor
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Russell King, Catalin Marinas, Will Deacon, Martin Schwidefsky,
Heiko Carstens, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Kees Cook, Mark Rutland, Arnd Bergmann, David Airlie,
Alexander Shishkin, Wim Van Sebroeck, Guenter Roeck,
linux-watchdog, David S. Miller, Daniel Borkmann, Jessica Yu,
Takashi Iwai, Andrew Morton, Bartlomiej Zolnierkiewicz
Cc: linux-arch, linux-s390, linux-fbdev, x86, linux-kernel,
Laura Abbott, linux-arm-kernel
Hi,
This is v3 of the series to decouple set_memory_* from cacheflush.h. This
version contains a few minor alphabetical order fixes and some fixes caught
by the 0day bot. Several places unfortunately need an #ifdef around the
header for arches without the set_memory_* functions.
Andrew, it might be best to wait a few days to let the 0day bot churn on this
series.
Thanks,
Laura
Laura Abbott (16):
treewide: Move set_memory_* functions away from cacheflush.h
arm: Use set_memory.h header
arm64: Use set_memory.h header
s390: Use set_memory.h header
x86: Use set_memory.h header
agp: Use set_memory.h header
drm: Use set_memory.h header
intel_th: Use set_memory.h header
watchdog: hpwdt: Use set_memory.h header
bpf: Use set_memory.h header
module: Use set_memory.h header
PM / hibernate: Use set_memory.h header
ALSA: Use set_memory.h header
misc: sram: Use set_memory.h header
video: vermilion: Use set_memory.h header
treewide: Decouple cacheflush.h and set_memory.h
arch/arm/include/asm/cacheflush.h | 20 -------
arch/arm/include/asm/set_memory.h | 32 ++++++++++++
arch/arm/kernel/ftrace.c | 1 +
arch/arm/kernel/machine_kexec.c | 1 +
arch/arm/mm/pageattr.c | 1 +
arch/arm/net/bpf_jit_32.c | 1 +
arch/arm64/include/asm/Kbuild | 1 +
arch/arm64/include/asm/cacheflush.h | 5 --
arch/arm64/mm/pageattr.c | 1 +
arch/arm64/net/bpf_jit_comp.c | 1 +
arch/s390/include/asm/Kbuild | 1 +
arch/s390/include/asm/cacheflush.h | 34 ------------
arch/s390/include/asm/set_memory.h | 31 +++++++++++
arch/s390/kernel/ftrace.c | 1 +
arch/s390/kernel/kprobes.c | 2 +-
arch/s390/kernel/machine_kexec.c | 1 +
arch/s390/mm/init.c | 1 +
arch/s390/mm/pageattr.c | 1 +
arch/s390/mm/vmem.c | 1 +
arch/s390/net/bpf_jit_comp.c | 1 +
arch/x86/include/asm/cacheflush.h | 85 ------------------------------
arch/x86/include/asm/set_memory.h | 87 +++++++++++++++++++++++++++++++
arch/x86/kernel/amd_gart_64.c | 2 +-
arch/x86/kernel/cpu/amd.c | 2 +-
arch/x86/kernel/cpu/bugs.c | 2 +-
arch/x86/kernel/ftrace.c | 2 +-
arch/x86/kernel/machine_kexec_32.c | 2 +-
arch/x86/kernel/machine_kexec_64.c | 1 +
arch/x86/mm/init.c | 2 +-
arch/x86/mm/init_32.c | 2 +-
arch/x86/mm/init_64.c | 2 +-
arch/x86/mm/ioremap.c | 2 +-
arch/x86/mm/pageattr.c | 1 +
arch/x86/net/bpf_jit_comp.c | 1 +
arch/x86/pci/pcbios.c | 2 +-
arch/x86/platform/efi/efi.c | 2 +-
arch/x86/realmode/init.c | 2 +-
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 +
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 ++
drivers/gpu/drm/gma500/gtt.c | 1 +
drivers/gpu/drm/gma500/psb_drv.c | 1 +
drivers/gpu/drm/radeon/radeon_gart.c | 3 ++
drivers/gpu/drm/ttm/ttm_page_alloc.c | 3 ++
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 3 ++
drivers/gpu/drm/ttm/ttm_tt.c | 3 ++
drivers/hwtracing/intel_th/msu.c | 4 +-
drivers/misc/sram-exec.c | 3 +-
drivers/video/fbdev/vermilion/vermilion.c | 2 +-
drivers/watchdog/hpwdt.c | 2 +-
include/asm-generic/set_memory.h | 12 +++++
include/linux/filter.h | 4 +-
kernel/module.c | 3 ++
kernel/power/snapshot.c | 3 ++
sound/pci/hda/hda_intel.c | 2 +-
sound/pci/intel8x0.c | 4 +-
sound/x86/intel_hdmi_audio.c | 2 +-
61 files changed, 237 insertions(+), 166 deletions(-)
create mode 100644 arch/arm/include/asm/set_memory.h
delete mode 100644 arch/s390/include/asm/cacheflush.h
create mode 100644 arch/s390/include/asm/set_memory.h
create mode 100644 arch/x86/include/asm/set_memory.h
create mode 100644 drivers/char/agp/generic.
create mode 100644 include/asm-generic/set_memory.h
--
2.7.4
^ permalink raw reply [flat|nested] 62+ messages in thread
* [PATCHv3 00/16] set_memory_* functions header refactor
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Russell King, Catalin Marinas, Will Deacon, Martin Schwidefsky,
Heiko Carstens, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Kees Cook, Mark Rutland, Arnd Bergmann, David Airlie,
Alexander Shishkin, Wim Van Sebroeck, Guenter Roeck,
linux-watchdog, David S. Miller, Daniel Borkmann, Jessica Yu,
Takashi Iwai, Andrew Morton, Bartlomiej Zolnierkiewicz
Cc: linux-arch, linux-s390, linux-fbdev, x86, linux-kernel,
Laura Abbott, linux-arm-kernel
Hi,
This is v3 of the series to decouple set_memory_* from cacheflush.h. This
version contains a few minor alphabetical order fixes and some fixes caught
by the 0day bot. Several places unfortunately need an #ifdef around the
header for arches without the set_memory_* functions.
Andrew, it might be best to wait a few days to let the 0day bot churn on this
series.
Thanks,
Laura
Laura Abbott (16):
treewide: Move set_memory_* functions away from cacheflush.h
arm: Use set_memory.h header
arm64: Use set_memory.h header
s390: Use set_memory.h header
x86: Use set_memory.h header
agp: Use set_memory.h header
drm: Use set_memory.h header
intel_th: Use set_memory.h header
watchdog: hpwdt: Use set_memory.h header
bpf: Use set_memory.h header
module: Use set_memory.h header
PM / hibernate: Use set_memory.h header
ALSA: Use set_memory.h header
misc: sram: Use set_memory.h header
video: vermilion: Use set_memory.h header
treewide: Decouple cacheflush.h and set_memory.h
arch/arm/include/asm/cacheflush.h | 20 -------
arch/arm/include/asm/set_memory.h | 32 ++++++++++++
arch/arm/kernel/ftrace.c | 1 +
arch/arm/kernel/machine_kexec.c | 1 +
arch/arm/mm/pageattr.c | 1 +
arch/arm/net/bpf_jit_32.c | 1 +
arch/arm64/include/asm/Kbuild | 1 +
arch/arm64/include/asm/cacheflush.h | 5 --
arch/arm64/mm/pageattr.c | 1 +
arch/arm64/net/bpf_jit_comp.c | 1 +
arch/s390/include/asm/Kbuild | 1 +
arch/s390/include/asm/cacheflush.h | 34 ------------
arch/s390/include/asm/set_memory.h | 31 +++++++++++
arch/s390/kernel/ftrace.c | 1 +
arch/s390/kernel/kprobes.c | 2 +-
arch/s390/kernel/machine_kexec.c | 1 +
arch/s390/mm/init.c | 1 +
arch/s390/mm/pageattr.c | 1 +
arch/s390/mm/vmem.c | 1 +
arch/s390/net/bpf_jit_comp.c | 1 +
arch/x86/include/asm/cacheflush.h | 85 ------------------------------
arch/x86/include/asm/set_memory.h | 87 +++++++++++++++++++++++++++++++
arch/x86/kernel/amd_gart_64.c | 2 +-
arch/x86/kernel/cpu/amd.c | 2 +-
arch/x86/kernel/cpu/bugs.c | 2 +-
arch/x86/kernel/ftrace.c | 2 +-
arch/x86/kernel/machine_kexec_32.c | 2 +-
arch/x86/kernel/machine_kexec_64.c | 1 +
arch/x86/mm/init.c | 2 +-
arch/x86/mm/init_32.c | 2 +-
arch/x86/mm/init_64.c | 2 +-
arch/x86/mm/ioremap.c | 2 +-
arch/x86/mm/pageattr.c | 1 +
arch/x86/net/bpf_jit_comp.c | 1 +
arch/x86/pci/pcbios.c | 2 +-
arch/x86/platform/efi/efi.c | 2 +-
arch/x86/realmode/init.c | 2 +-
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 +
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 ++
drivers/gpu/drm/gma500/gtt.c | 1 +
drivers/gpu/drm/gma500/psb_drv.c | 1 +
drivers/gpu/drm/radeon/radeon_gart.c | 3 ++
drivers/gpu/drm/ttm/ttm_page_alloc.c | 3 ++
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 3 ++
drivers/gpu/drm/ttm/ttm_tt.c | 3 ++
drivers/hwtracing/intel_th/msu.c | 4 +-
drivers/misc/sram-exec.c | 3 +-
drivers/video/fbdev/vermilion/vermilion.c | 2 +-
drivers/watchdog/hpwdt.c | 2 +-
include/asm-generic/set_memory.h | 12 +++++
include/linux/filter.h | 4 +-
kernel/module.c | 3 ++
kernel/power/snapshot.c | 3 ++
sound/pci/hda/hda_intel.c | 2 +-
sound/pci/intel8x0.c | 4 +-
sound/x86/intel_hdmi_audio.c | 2 +-
61 files changed, 237 insertions(+), 166 deletions(-)
create mode 100644 arch/arm/include/asm/set_memory.h
delete mode 100644 arch/s390/include/asm/cacheflush.h
create mode 100644 arch/s390/include/asm/set_memory.h
create mode 100644 arch/x86/include/asm/set_memory.h
create mode 100644 drivers/char/agp/generic.
create mode 100644 include/asm-generic/set_memory.h
--
2.7.4
^ permalink raw reply [flat|nested] 62+ messages in thread
* [PATCHv3 01/16] treewide: Move set_memory_* functions away from cacheflush.h
2017-03-07 20:55 ` Laura Abbott
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Russell King, Catalin Marinas, Will Deacon, Martin Schwidefsky,
Heiko Carstens, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Kees Cook, Mark Rutland, Arnd Bergmann, David Airlie,
Alexander Shishkin, Wim Van Sebroeck, Guenter Roeck,
linux-watchdog, David S. Miller, Daniel Borkmann, Jessica Yu,
Takashi Iwai, Andrew Morton
Cc: Laura Abbott, x86, linux-arm-kernel, linux-kernel, linux-s390,
linux-arch
The set_memory_* APIs came out of a desire to have a better way to
change memory attributes. Many of these attributes were linked to cache
functionality so the prototypes were put in cacheflush.h. These days,
the APIs have grown and have a much wider use than just cache APIs. To
support this growth, split off set_memory_* and friends into a separate
header file to avoid growing cacheflush.h for APIs that have nothing to
do with caches.
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: No changes
---
arch/arm/include/asm/cacheflush.h | 21 +--------
arch/arm/include/asm/set_memory.h | 32 ++++++++++++++
arch/arm64/include/asm/Kbuild | 1 +
arch/arm64/include/asm/cacheflush.h | 6 +--
arch/s390/include/asm/cacheflush.h | 28 +-----------
arch/s390/include/asm/set_memory.h | 31 +++++++++++++
arch/x86/include/asm/cacheflush.h | 86 +-----------------------------------
arch/x86/include/asm/set_memory.h | 87 +++++++++++++++++++++++++++++++++++++
include/asm-generic/set_memory.h | 12 +++++
9 files changed, 167 insertions(+), 137 deletions(-)
create mode 100644 arch/arm/include/asm/set_memory.h
create mode 100644 arch/s390/include/asm/set_memory.h
create mode 100644 arch/x86/include/asm/set_memory.h
create mode 100644 include/asm-generic/set_memory.h
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
index 02454fa..1cb9d11 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@ -16,6 +16,7 @@
#include <asm/shmparam.h>
#include <asm/cachetype.h>
#include <asm/outercache.h>
+#include <asm/set_memory.h>
#define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT)
@@ -478,26 +479,6 @@ static inline void __sync_cache_range_r(volatile void *p, size_t size)
: : : "r0","r1","r2","r3","r4","r5","r6","r7", \
"r9","r10","lr","memory" )
-#ifdef CONFIG_MMU
-int set_memory_ro(unsigned long addr, int numpages);
-int set_memory_rw(unsigned long addr, int numpages);
-int set_memory_x(unsigned long addr, int numpages);
-int set_memory_nx(unsigned long addr, int numpages);
-#else
-static inline int set_memory_ro(unsigned long addr, int numpages) { return 0; }
-static inline int set_memory_rw(unsigned long addr, int numpages) { return 0; }
-static inline int set_memory_x(unsigned long addr, int numpages) { return 0; }
-static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }
-#endif
-
-#ifdef CONFIG_STRICT_KERNEL_RWX
-void set_kernel_text_rw(void);
-void set_kernel_text_ro(void);
-#else
-static inline void set_kernel_text_rw(void) { }
-static inline void set_kernel_text_ro(void) { }
-#endif
-
void flush_uprobe_xol_access(struct page *page, unsigned long uaddr,
void *kaddr, unsigned long len);
diff --git a/arch/arm/include/asm/set_memory.h b/arch/arm/include/asm/set_memory.h
new file mode 100644
index 0000000..5aa4315
--- /dev/null
+++ b/arch/arm/include/asm/set_memory.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 1999-2002 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _ASMARM_SET_MEMORY_H
+#define _ASMARM_SET_MEMORY_H
+
+#ifdef CONFIG_MMU
+int set_memory_ro(unsigned long addr, int numpages);
+int set_memory_rw(unsigned long addr, int numpages);
+int set_memory_x(unsigned long addr, int numpages);
+int set_memory_nx(unsigned long addr, int numpages);
+#else
+static inline int set_memory_ro(unsigned long addr, int numpages) { return 0; }
+static inline int set_memory_rw(unsigned long addr, int numpages) { return 0; }
+static inline int set_memory_x(unsigned long addr, int numpages) { return 0; }
+static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }
+#endif
+
+#ifdef CONFIG_STRICT_KERNEL_RWX
+void set_kernel_text_rw(void);
+void set_kernel_text_ro(void);
+#else
+static inline void set_kernel_text_rw(void) { }
+static inline void set_kernel_text_ro(void) { }
+#endif
+
+#endif
diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index a12f1af..a7a97a6 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -29,6 +29,7 @@ generic-y += rwsem.h
generic-y += segment.h
generic-y += sembuf.h
generic-y += serial.h
+generic-y += set_memory.h
generic-y += shmbuf.h
generic-y += simd.h
generic-y += sizes.h
diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h
index 5a2a6ee..7db6962 100644
--- a/arch/arm64/include/asm/cacheflush.h
+++ b/arch/arm64/include/asm/cacheflush.h
@@ -20,6 +20,7 @@
#define __ASM_CACHEFLUSH_H
#include <linux/mm.h>
+#include <asm/set_memory.h>
/*
* This flag is used to indicate that the page pointed to by a pte is clean
@@ -150,9 +151,4 @@ static inline void flush_cache_vunmap(unsigned long start, unsigned long end)
{
}
-int set_memory_ro(unsigned long addr, int numpages);
-int set_memory_rw(unsigned long addr, int numpages);
-int set_memory_x(unsigned long addr, int numpages);
-int set_memory_nx(unsigned long addr, int numpages);
-
#endif
diff --git a/arch/s390/include/asm/cacheflush.h b/arch/s390/include/asm/cacheflush.h
index 0499334..afe2965 100644
--- a/arch/s390/include/asm/cacheflush.h
+++ b/arch/s390/include/asm/cacheflush.h
@@ -3,32 +3,6 @@
/* Caches aren't brain-dead on the s390. */
#include <asm-generic/cacheflush.h>
-
-#define SET_MEMORY_RO 1UL
-#define SET_MEMORY_RW 2UL
-#define SET_MEMORY_NX 4UL
-#define SET_MEMORY_X 8UL
-
-int __set_memory(unsigned long addr, int numpages, unsigned long flags);
-
-static inline int set_memory_ro(unsigned long addr, int numpages)
-{
- return __set_memory(addr, numpages, SET_MEMORY_RO);
-}
-
-static inline int set_memory_rw(unsigned long addr, int numpages)
-{
- return __set_memory(addr, numpages, SET_MEMORY_RW);
-}
-
-static inline int set_memory_nx(unsigned long addr, int numpages)
-{
- return __set_memory(addr, numpages, SET_MEMORY_NX);
-}
-
-static inline int set_memory_x(unsigned long addr, int numpages)
-{
- return __set_memory(addr, numpages, SET_MEMORY_X);
-}
+#include <asm/set_memory.h>
#endif /* _S390_CACHEFLUSH_H */
diff --git a/arch/s390/include/asm/set_memory.h b/arch/s390/include/asm/set_memory.h
new file mode 100644
index 0000000..46a4db4
--- /dev/null
+++ b/arch/s390/include/asm/set_memory.h
@@ -0,0 +1,31 @@
+#ifndef _ASMS390_SET_MEMORY_H
+#define _ASMS390_SET_MEMORY_H
+
+#define SET_MEMORY_RO 1UL
+#define SET_MEMORY_RW 2UL
+#define SET_MEMORY_NX 4UL
+#define SET_MEMORY_X 8UL
+
+int __set_memory(unsigned long addr, int numpages, unsigned long flags);
+
+static inline int set_memory_ro(unsigned long addr, int numpages)
+{
+ return __set_memory(addr, numpages, SET_MEMORY_RO);
+}
+
+static inline int set_memory_rw(unsigned long addr, int numpages)
+{
+ return __set_memory(addr, numpages, SET_MEMORY_RW);
+}
+
+static inline int set_memory_nx(unsigned long addr, int numpages)
+{
+ return __set_memory(addr, numpages, SET_MEMORY_NX);
+}
+
+static inline int set_memory_x(unsigned long addr, int numpages)
+{
+ return __set_memory(addr, numpages, SET_MEMORY_X);
+}
+
+#endif
diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
index e7e1942..3d7db6f 100644
--- a/arch/x86/include/asm/cacheflush.h
+++ b/arch/x86/include/asm/cacheflush.h
@@ -4,94 +4,10 @@
/* Caches aren't brain-dead on the intel. */
#include <asm-generic/cacheflush.h>
#include <asm/special_insns.h>
-
-/*
- * The set_memory_* API can be used to change various attributes of a virtual
- * address range. The attributes include:
- * Cachability : UnCached, WriteCombining, WriteThrough, WriteBack
- * Executability : eXeutable, NoteXecutable
- * Read/Write : ReadOnly, ReadWrite
- * Presence : NotPresent
- *
- * Within a category, the attributes are mutually exclusive.
- *
- * The implementation of this API will take care of various aspects that
- * are associated with changing such attributes, such as:
- * - Flushing TLBs
- * - Flushing CPU caches
- * - Making sure aliases of the memory behind the mapping don't violate
- * coherency rules as defined by the CPU in the system.
- *
- * What this API does not do:
- * - Provide exclusion between various callers - including callers that
- * operation on other mappings of the same physical page
- * - Restore default attributes when a page is freed
- * - Guarantee that mappings other than the requested one are
- * in any state, other than that these do not violate rules for
- * the CPU you have. Do not depend on any effects on other mappings,
- * CPUs other than the one you have may have more relaxed rules.
- * The caller is required to take care of these.
- */
-
-int _set_memory_uc(unsigned long addr, int numpages);
-int _set_memory_wc(unsigned long addr, int numpages);
-int _set_memory_wt(unsigned long addr, int numpages);
-int _set_memory_wb(unsigned long addr, int numpages);
-int set_memory_uc(unsigned long addr, int numpages);
-int set_memory_wc(unsigned long addr, int numpages);
-int set_memory_wt(unsigned long addr, int numpages);
-int set_memory_wb(unsigned long addr, int numpages);
-int set_memory_x(unsigned long addr, int numpages);
-int set_memory_nx(unsigned long addr, int numpages);
-int set_memory_ro(unsigned long addr, int numpages);
-int set_memory_rw(unsigned long addr, int numpages);
-int set_memory_np(unsigned long addr, int numpages);
-int set_memory_4k(unsigned long addr, int numpages);
-
-int set_memory_array_uc(unsigned long *addr, int addrinarray);
-int set_memory_array_wc(unsigned long *addr, int addrinarray);
-int set_memory_array_wt(unsigned long *addr, int addrinarray);
-int set_memory_array_wb(unsigned long *addr, int addrinarray);
-
-int set_pages_array_uc(struct page **pages, int addrinarray);
-int set_pages_array_wc(struct page **pages, int addrinarray);
-int set_pages_array_wt(struct page **pages, int addrinarray);
-int set_pages_array_wb(struct page **pages, int addrinarray);
-
-/*
- * For legacy compatibility with the old APIs, a few functions
- * are provided that work on a "struct page".
- * These functions operate ONLY on the 1:1 kernel mapping of the
- * memory that the struct page represents, and internally just
- * call the set_memory_* function. See the description of the
- * set_memory_* function for more details on conventions.
- *
- * These APIs should be considered *deprecated* and are likely going to
- * be removed in the future.
- * The reason for this is the implicit operation on the 1:1 mapping only,
- * making this not a generally useful API.
- *
- * Specifically, many users of the old APIs had a virtual address,
- * called virt_to_page() or vmalloc_to_page() on that address to
- * get a struct page* that the old API required.
- * To convert these cases, use set_memory_*() on the original
- * virtual address, do not use these functions.
- */
-
-int set_pages_uc(struct page *page, int numpages);
-int set_pages_wb(struct page *page, int numpages);
-int set_pages_x(struct page *page, int numpages);
-int set_pages_nx(struct page *page, int numpages);
-int set_pages_ro(struct page *page, int numpages);
-int set_pages_rw(struct page *page, int numpages);
-
+#include <asm/set_memory.h>
void clflush_cache_range(void *addr, unsigned int size);
#define mmio_flush_range(addr, size) clflush_cache_range(addr, size)
-extern int kernel_set_to_readonly;
-void set_kernel_text_rw(void);
-void set_kernel_text_ro(void);
-
#endif /* _ASM_X86_CACHEFLUSH_H */
diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h
new file mode 100644
index 0000000..eaec6c3
--- /dev/null
+++ b/arch/x86/include/asm/set_memory.h
@@ -0,0 +1,87 @@
+#ifndef _ASM_X86_SET_MEMORY_H
+#define _ASM_X86_SET_MEMORY_H
+
+#include <asm/page.h>
+#include <asm-generic/set_memory.h>
+
+/*
+ * The set_memory_* API can be used to change various attributes of a virtual
+ * address range. The attributes include:
+ * Cachability : UnCached, WriteCombining, WriteThrough, WriteBack
+ * Executability : eXeutable, NoteXecutable
+ * Read/Write : ReadOnly, ReadWrite
+ * Presence : NotPresent
+ *
+ * Within a category, the attributes are mutually exclusive.
+ *
+ * The implementation of this API will take care of various aspects that
+ * are associated with changing such attributes, such as:
+ * - Flushing TLBs
+ * - Flushing CPU caches
+ * - Making sure aliases of the memory behind the mapping don't violate
+ * coherency rules as defined by the CPU in the system.
+ *
+ * What this API does not do:
+ * - Provide exclusion between various callers - including callers that
+ * operation on other mappings of the same physical page
+ * - Restore default attributes when a page is freed
+ * - Guarantee that mappings other than the requested one are
+ * in any state, other than that these do not violate rules for
+ * the CPU you have. Do not depend on any effects on other mappings,
+ * CPUs other than the one you have may have more relaxed rules.
+ * The caller is required to take care of these.
+ */
+
+int _set_memory_uc(unsigned long addr, int numpages);
+int _set_memory_wc(unsigned long addr, int numpages);
+int _set_memory_wt(unsigned long addr, int numpages);
+int _set_memory_wb(unsigned long addr, int numpages);
+int set_memory_uc(unsigned long addr, int numpages);
+int set_memory_wc(unsigned long addr, int numpages);
+int set_memory_wt(unsigned long addr, int numpages);
+int set_memory_wb(unsigned long addr, int numpages);
+int set_memory_np(unsigned long addr, int numpages);
+int set_memory_4k(unsigned long addr, int numpages);
+
+int set_memory_array_uc(unsigned long *addr, int addrinarray);
+int set_memory_array_wc(unsigned long *addr, int addrinarray);
+int set_memory_array_wt(unsigned long *addr, int addrinarray);
+int set_memory_array_wb(unsigned long *addr, int addrinarray);
+
+int set_pages_array_uc(struct page **pages, int addrinarray);
+int set_pages_array_wc(struct page **pages, int addrinarray);
+int set_pages_array_wt(struct page **pages, int addrinarray);
+int set_pages_array_wb(struct page **pages, int addrinarray);
+
+/*
+ * For legacy compatibility with the old APIs, a few functions
+ * are provided that work on a "struct page".
+ * These functions operate ONLY on the 1:1 kernel mapping of the
+ * memory that the struct page represents, and internally just
+ * call the set_memory_* function. See the description of the
+ * set_memory_* function for more details on conventions.
+ *
+ * These APIs should be considered *deprecated* and are likely going to
+ * be removed in the future.
+ * The reason for this is the implicit operation on the 1:1 mapping only,
+ * making this not a generally useful API.
+ *
+ * Specifically, many users of the old APIs had a virtual address,
+ * called virt_to_page() or vmalloc_to_page() on that address to
+ * get a struct page* that the old API required.
+ * To convert these cases, use set_memory_*() on the original
+ * virtual address, do not use these functions.
+ */
+
+int set_pages_uc(struct page *page, int numpages);
+int set_pages_wb(struct page *page, int numpages);
+int set_pages_x(struct page *page, int numpages);
+int set_pages_nx(struct page *page, int numpages);
+int set_pages_ro(struct page *page, int numpages);
+int set_pages_rw(struct page *page, int numpages);
+
+extern int kernel_set_to_readonly;
+void set_kernel_text_rw(void);
+void set_kernel_text_ro(void);
+
+#endif /* _ASM_X86_SET_MEMORY_H */
diff --git a/include/asm-generic/set_memory.h b/include/asm-generic/set_memory.h
new file mode 100644
index 0000000..83e81f8
--- /dev/null
+++ b/include/asm-generic/set_memory.h
@@ -0,0 +1,12 @@
+#ifndef __ASM_SET_MEMORY_H
+#define __ASM_SET_MEMORY_H
+
+/*
+ * Functions to change memory attributes.
+ */
+int set_memory_ro(unsigned long addr, int numpages);
+int set_memory_rw(unsigned long addr, int numpages);
+int set_memory_x(unsigned long addr, int numpages);
+int set_memory_nx(unsigned long addr, int numpages);
+
+#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCHv3 01/16] treewide: Move set_memory_* functions away from cacheflush.h
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
The set_memory_* APIs came out of a desire to have a better way to
change memory attributes. Many of these attributes were linked to cache
functionality so the prototypes were put in cacheflush.h. These days,
the APIs have grown and have a much wider use than just cache APIs. To
support this growth, split off set_memory_* and friends into a separate
header file to avoid growing cacheflush.h for APIs that have nothing to
do with caches.
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: No changes
---
arch/arm/include/asm/cacheflush.h | 21 +--------
arch/arm/include/asm/set_memory.h | 32 ++++++++++++++
arch/arm64/include/asm/Kbuild | 1 +
arch/arm64/include/asm/cacheflush.h | 6 +--
arch/s390/include/asm/cacheflush.h | 28 +-----------
arch/s390/include/asm/set_memory.h | 31 +++++++++++++
arch/x86/include/asm/cacheflush.h | 86 +-----------------------------------
arch/x86/include/asm/set_memory.h | 87 +++++++++++++++++++++++++++++++++++++
include/asm-generic/set_memory.h | 12 +++++
9 files changed, 167 insertions(+), 137 deletions(-)
create mode 100644 arch/arm/include/asm/set_memory.h
create mode 100644 arch/s390/include/asm/set_memory.h
create mode 100644 arch/x86/include/asm/set_memory.h
create mode 100644 include/asm-generic/set_memory.h
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
index 02454fa..1cb9d11 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@ -16,6 +16,7 @@
#include <asm/shmparam.h>
#include <asm/cachetype.h>
#include <asm/outercache.h>
+#include <asm/set_memory.h>
#define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT)
@@ -478,26 +479,6 @@ static inline void __sync_cache_range_r(volatile void *p, size_t size)
: : : "r0","r1","r2","r3","r4","r5","r6","r7", \
"r9","r10","lr","memory" )
-#ifdef CONFIG_MMU
-int set_memory_ro(unsigned long addr, int numpages);
-int set_memory_rw(unsigned long addr, int numpages);
-int set_memory_x(unsigned long addr, int numpages);
-int set_memory_nx(unsigned long addr, int numpages);
-#else
-static inline int set_memory_ro(unsigned long addr, int numpages) { return 0; }
-static inline int set_memory_rw(unsigned long addr, int numpages) { return 0; }
-static inline int set_memory_x(unsigned long addr, int numpages) { return 0; }
-static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }
-#endif
-
-#ifdef CONFIG_STRICT_KERNEL_RWX
-void set_kernel_text_rw(void);
-void set_kernel_text_ro(void);
-#else
-static inline void set_kernel_text_rw(void) { }
-static inline void set_kernel_text_ro(void) { }
-#endif
-
void flush_uprobe_xol_access(struct page *page, unsigned long uaddr,
void *kaddr, unsigned long len);
diff --git a/arch/arm/include/asm/set_memory.h b/arch/arm/include/asm/set_memory.h
new file mode 100644
index 0000000..5aa4315
--- /dev/null
+++ b/arch/arm/include/asm/set_memory.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 1999-2002 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _ASMARM_SET_MEMORY_H
+#define _ASMARM_SET_MEMORY_H
+
+#ifdef CONFIG_MMU
+int set_memory_ro(unsigned long addr, int numpages);
+int set_memory_rw(unsigned long addr, int numpages);
+int set_memory_x(unsigned long addr, int numpages);
+int set_memory_nx(unsigned long addr, int numpages);
+#else
+static inline int set_memory_ro(unsigned long addr, int numpages) { return 0; }
+static inline int set_memory_rw(unsigned long addr, int numpages) { return 0; }
+static inline int set_memory_x(unsigned long addr, int numpages) { return 0; }
+static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }
+#endif
+
+#ifdef CONFIG_STRICT_KERNEL_RWX
+void set_kernel_text_rw(void);
+void set_kernel_text_ro(void);
+#else
+static inline void set_kernel_text_rw(void) { }
+static inline void set_kernel_text_ro(void) { }
+#endif
+
+#endif
diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index a12f1af..a7a97a6 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -29,6 +29,7 @@ generic-y += rwsem.h
generic-y += segment.h
generic-y += sembuf.h
generic-y += serial.h
+generic-y += set_memory.h
generic-y += shmbuf.h
generic-y += simd.h
generic-y += sizes.h
diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h
index 5a2a6ee..7db6962 100644
--- a/arch/arm64/include/asm/cacheflush.h
+++ b/arch/arm64/include/asm/cacheflush.h
@@ -20,6 +20,7 @@
#define __ASM_CACHEFLUSH_H
#include <linux/mm.h>
+#include <asm/set_memory.h>
/*
* This flag is used to indicate that the page pointed to by a pte is clean
@@ -150,9 +151,4 @@ static inline void flush_cache_vunmap(unsigned long start, unsigned long end)
{
}
-int set_memory_ro(unsigned long addr, int numpages);
-int set_memory_rw(unsigned long addr, int numpages);
-int set_memory_x(unsigned long addr, int numpages);
-int set_memory_nx(unsigned long addr, int numpages);
-
#endif
diff --git a/arch/s390/include/asm/cacheflush.h b/arch/s390/include/asm/cacheflush.h
index 0499334..afe2965 100644
--- a/arch/s390/include/asm/cacheflush.h
+++ b/arch/s390/include/asm/cacheflush.h
@@ -3,32 +3,6 @@
/* Caches aren't brain-dead on the s390. */
#include <asm-generic/cacheflush.h>
-
-#define SET_MEMORY_RO 1UL
-#define SET_MEMORY_RW 2UL
-#define SET_MEMORY_NX 4UL
-#define SET_MEMORY_X 8UL
-
-int __set_memory(unsigned long addr, int numpages, unsigned long flags);
-
-static inline int set_memory_ro(unsigned long addr, int numpages)
-{
- return __set_memory(addr, numpages, SET_MEMORY_RO);
-}
-
-static inline int set_memory_rw(unsigned long addr, int numpages)
-{
- return __set_memory(addr, numpages, SET_MEMORY_RW);
-}
-
-static inline int set_memory_nx(unsigned long addr, int numpages)
-{
- return __set_memory(addr, numpages, SET_MEMORY_NX);
-}
-
-static inline int set_memory_x(unsigned long addr, int numpages)
-{
- return __set_memory(addr, numpages, SET_MEMORY_X);
-}
+#include <asm/set_memory.h>
#endif /* _S390_CACHEFLUSH_H */
diff --git a/arch/s390/include/asm/set_memory.h b/arch/s390/include/asm/set_memory.h
new file mode 100644
index 0000000..46a4db4
--- /dev/null
+++ b/arch/s390/include/asm/set_memory.h
@@ -0,0 +1,31 @@
+#ifndef _ASMS390_SET_MEMORY_H
+#define _ASMS390_SET_MEMORY_H
+
+#define SET_MEMORY_RO 1UL
+#define SET_MEMORY_RW 2UL
+#define SET_MEMORY_NX 4UL
+#define SET_MEMORY_X 8UL
+
+int __set_memory(unsigned long addr, int numpages, unsigned long flags);
+
+static inline int set_memory_ro(unsigned long addr, int numpages)
+{
+ return __set_memory(addr, numpages, SET_MEMORY_RO);
+}
+
+static inline int set_memory_rw(unsigned long addr, int numpages)
+{
+ return __set_memory(addr, numpages, SET_MEMORY_RW);
+}
+
+static inline int set_memory_nx(unsigned long addr, int numpages)
+{
+ return __set_memory(addr, numpages, SET_MEMORY_NX);
+}
+
+static inline int set_memory_x(unsigned long addr, int numpages)
+{
+ return __set_memory(addr, numpages, SET_MEMORY_X);
+}
+
+#endif
diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
index e7e1942..3d7db6f 100644
--- a/arch/x86/include/asm/cacheflush.h
+++ b/arch/x86/include/asm/cacheflush.h
@@ -4,94 +4,10 @@
/* Caches aren't brain-dead on the intel. */
#include <asm-generic/cacheflush.h>
#include <asm/special_insns.h>
-
-/*
- * The set_memory_* API can be used to change various attributes of a virtual
- * address range. The attributes include:
- * Cachability : UnCached, WriteCombining, WriteThrough, WriteBack
- * Executability : eXeutable, NoteXecutable
- * Read/Write : ReadOnly, ReadWrite
- * Presence : NotPresent
- *
- * Within a category, the attributes are mutually exclusive.
- *
- * The implementation of this API will take care of various aspects that
- * are associated with changing such attributes, such as:
- * - Flushing TLBs
- * - Flushing CPU caches
- * - Making sure aliases of the memory behind the mapping don't violate
- * coherency rules as defined by the CPU in the system.
- *
- * What this API does not do:
- * - Provide exclusion between various callers - including callers that
- * operation on other mappings of the same physical page
- * - Restore default attributes when a page is freed
- * - Guarantee that mappings other than the requested one are
- * in any state, other than that these do not violate rules for
- * the CPU you have. Do not depend on any effects on other mappings,
- * CPUs other than the one you have may have more relaxed rules.
- * The caller is required to take care of these.
- */
-
-int _set_memory_uc(unsigned long addr, int numpages);
-int _set_memory_wc(unsigned long addr, int numpages);
-int _set_memory_wt(unsigned long addr, int numpages);
-int _set_memory_wb(unsigned long addr, int numpages);
-int set_memory_uc(unsigned long addr, int numpages);
-int set_memory_wc(unsigned long addr, int numpages);
-int set_memory_wt(unsigned long addr, int numpages);
-int set_memory_wb(unsigned long addr, int numpages);
-int set_memory_x(unsigned long addr, int numpages);
-int set_memory_nx(unsigned long addr, int numpages);
-int set_memory_ro(unsigned long addr, int numpages);
-int set_memory_rw(unsigned long addr, int numpages);
-int set_memory_np(unsigned long addr, int numpages);
-int set_memory_4k(unsigned long addr, int numpages);
-
-int set_memory_array_uc(unsigned long *addr, int addrinarray);
-int set_memory_array_wc(unsigned long *addr, int addrinarray);
-int set_memory_array_wt(unsigned long *addr, int addrinarray);
-int set_memory_array_wb(unsigned long *addr, int addrinarray);
-
-int set_pages_array_uc(struct page **pages, int addrinarray);
-int set_pages_array_wc(struct page **pages, int addrinarray);
-int set_pages_array_wt(struct page **pages, int addrinarray);
-int set_pages_array_wb(struct page **pages, int addrinarray);
-
-/*
- * For legacy compatibility with the old APIs, a few functions
- * are provided that work on a "struct page".
- * These functions operate ONLY on the 1:1 kernel mapping of the
- * memory that the struct page represents, and internally just
- * call the set_memory_* function. See the description of the
- * set_memory_* function for more details on conventions.
- *
- * These APIs should be considered *deprecated* and are likely going to
- * be removed in the future.
- * The reason for this is the implicit operation on the 1:1 mapping only,
- * making this not a generally useful API.
- *
- * Specifically, many users of the old APIs had a virtual address,
- * called virt_to_page() or vmalloc_to_page() on that address to
- * get a struct page* that the old API required.
- * To convert these cases, use set_memory_*() on the original
- * virtual address, do not use these functions.
- */
-
-int set_pages_uc(struct page *page, int numpages);
-int set_pages_wb(struct page *page, int numpages);
-int set_pages_x(struct page *page, int numpages);
-int set_pages_nx(struct page *page, int numpages);
-int set_pages_ro(struct page *page, int numpages);
-int set_pages_rw(struct page *page, int numpages);
-
+#include <asm/set_memory.h>
void clflush_cache_range(void *addr, unsigned int size);
#define mmio_flush_range(addr, size) clflush_cache_range(addr, size)
-extern int kernel_set_to_readonly;
-void set_kernel_text_rw(void);
-void set_kernel_text_ro(void);
-
#endif /* _ASM_X86_CACHEFLUSH_H */
diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h
new file mode 100644
index 0000000..eaec6c3
--- /dev/null
+++ b/arch/x86/include/asm/set_memory.h
@@ -0,0 +1,87 @@
+#ifndef _ASM_X86_SET_MEMORY_H
+#define _ASM_X86_SET_MEMORY_H
+
+#include <asm/page.h>
+#include <asm-generic/set_memory.h>
+
+/*
+ * The set_memory_* API can be used to change various attributes of a virtual
+ * address range. The attributes include:
+ * Cachability : UnCached, WriteCombining, WriteThrough, WriteBack
+ * Executability : eXeutable, NoteXecutable
+ * Read/Write : ReadOnly, ReadWrite
+ * Presence : NotPresent
+ *
+ * Within a category, the attributes are mutually exclusive.
+ *
+ * The implementation of this API will take care of various aspects that
+ * are associated with changing such attributes, such as:
+ * - Flushing TLBs
+ * - Flushing CPU caches
+ * - Making sure aliases of the memory behind the mapping don't violate
+ * coherency rules as defined by the CPU in the system.
+ *
+ * What this API does not do:
+ * - Provide exclusion between various callers - including callers that
+ * operation on other mappings of the same physical page
+ * - Restore default attributes when a page is freed
+ * - Guarantee that mappings other than the requested one are
+ * in any state, other than that these do not violate rules for
+ * the CPU you have. Do not depend on any effects on other mappings,
+ * CPUs other than the one you have may have more relaxed rules.
+ * The caller is required to take care of these.
+ */
+
+int _set_memory_uc(unsigned long addr, int numpages);
+int _set_memory_wc(unsigned long addr, int numpages);
+int _set_memory_wt(unsigned long addr, int numpages);
+int _set_memory_wb(unsigned long addr, int numpages);
+int set_memory_uc(unsigned long addr, int numpages);
+int set_memory_wc(unsigned long addr, int numpages);
+int set_memory_wt(unsigned long addr, int numpages);
+int set_memory_wb(unsigned long addr, int numpages);
+int set_memory_np(unsigned long addr, int numpages);
+int set_memory_4k(unsigned long addr, int numpages);
+
+int set_memory_array_uc(unsigned long *addr, int addrinarray);
+int set_memory_array_wc(unsigned long *addr, int addrinarray);
+int set_memory_array_wt(unsigned long *addr, int addrinarray);
+int set_memory_array_wb(unsigned long *addr, int addrinarray);
+
+int set_pages_array_uc(struct page **pages, int addrinarray);
+int set_pages_array_wc(struct page **pages, int addrinarray);
+int set_pages_array_wt(struct page **pages, int addrinarray);
+int set_pages_array_wb(struct page **pages, int addrinarray);
+
+/*
+ * For legacy compatibility with the old APIs, a few functions
+ * are provided that work on a "struct page".
+ * These functions operate ONLY on the 1:1 kernel mapping of the
+ * memory that the struct page represents, and internally just
+ * call the set_memory_* function. See the description of the
+ * set_memory_* function for more details on conventions.
+ *
+ * These APIs should be considered *deprecated* and are likely going to
+ * be removed in the future.
+ * The reason for this is the implicit operation on the 1:1 mapping only,
+ * making this not a generally useful API.
+ *
+ * Specifically, many users of the old APIs had a virtual address,
+ * called virt_to_page() or vmalloc_to_page() on that address to
+ * get a struct page* that the old API required.
+ * To convert these cases, use set_memory_*() on the original
+ * virtual address, do not use these functions.
+ */
+
+int set_pages_uc(struct page *page, int numpages);
+int set_pages_wb(struct page *page, int numpages);
+int set_pages_x(struct page *page, int numpages);
+int set_pages_nx(struct page *page, int numpages);
+int set_pages_ro(struct page *page, int numpages);
+int set_pages_rw(struct page *page, int numpages);
+
+extern int kernel_set_to_readonly;
+void set_kernel_text_rw(void);
+void set_kernel_text_ro(void);
+
+#endif /* _ASM_X86_SET_MEMORY_H */
diff --git a/include/asm-generic/set_memory.h b/include/asm-generic/set_memory.h
new file mode 100644
index 0000000..83e81f8
--- /dev/null
+++ b/include/asm-generic/set_memory.h
@@ -0,0 +1,12 @@
+#ifndef __ASM_SET_MEMORY_H
+#define __ASM_SET_MEMORY_H
+
+/*
+ * Functions to change memory attributes.
+ */
+int set_memory_ro(unsigned long addr, int numpages);
+int set_memory_rw(unsigned long addr, int numpages);
+int set_memory_x(unsigned long addr, int numpages);
+int set_memory_nx(unsigned long addr, int numpages);
+
+#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCHv3 01/16] treewide: Move set_memory_* functions away from cacheflush.h
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Russell King, Catalin Marinas, Will Deacon, Martin Schwidefsky,
Heiko Carstens, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Kees Cook, Mark Rutland, Arnd Bergmann, David Airlie,
Alexander Shishkin, Wim Van Sebroeck, Guenter Roeck,
linux-watchdog, David S. Miller, Daniel Borkmann, Jessica Yu,
Takashi Iwai, Andrew Morton
Cc: linux-arch, linux-s390, x86, linux-kernel, Laura Abbott,
linux-arm-kernel
The set_memory_* APIs came out of a desire to have a better way to
change memory attributes. Many of these attributes were linked to cache
functionality so the prototypes were put in cacheflush.h. These days,
the APIs have grown and have a much wider use than just cache APIs. To
support this growth, split off set_memory_* and friends into a separate
header file to avoid growing cacheflush.h for APIs that have nothing to
do with caches.
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: No changes
---
arch/arm/include/asm/cacheflush.h | 21 +--------
arch/arm/include/asm/set_memory.h | 32 ++++++++++++++
arch/arm64/include/asm/Kbuild | 1 +
arch/arm64/include/asm/cacheflush.h | 6 +--
arch/s390/include/asm/cacheflush.h | 28 +-----------
arch/s390/include/asm/set_memory.h | 31 +++++++++++++
arch/x86/include/asm/cacheflush.h | 86 +-----------------------------------
arch/x86/include/asm/set_memory.h | 87 +++++++++++++++++++++++++++++++++++++
include/asm-generic/set_memory.h | 12 +++++
9 files changed, 167 insertions(+), 137 deletions(-)
create mode 100644 arch/arm/include/asm/set_memory.h
create mode 100644 arch/s390/include/asm/set_memory.h
create mode 100644 arch/x86/include/asm/set_memory.h
create mode 100644 include/asm-generic/set_memory.h
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
index 02454fa..1cb9d11 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@ -16,6 +16,7 @@
#include <asm/shmparam.h>
#include <asm/cachetype.h>
#include <asm/outercache.h>
+#include <asm/set_memory.h>
#define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT)
@@ -478,26 +479,6 @@ static inline void __sync_cache_range_r(volatile void *p, size_t size)
: : : "r0","r1","r2","r3","r4","r5","r6","r7", \
"r9","r10","lr","memory" )
-#ifdef CONFIG_MMU
-int set_memory_ro(unsigned long addr, int numpages);
-int set_memory_rw(unsigned long addr, int numpages);
-int set_memory_x(unsigned long addr, int numpages);
-int set_memory_nx(unsigned long addr, int numpages);
-#else
-static inline int set_memory_ro(unsigned long addr, int numpages) { return 0; }
-static inline int set_memory_rw(unsigned long addr, int numpages) { return 0; }
-static inline int set_memory_x(unsigned long addr, int numpages) { return 0; }
-static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }
-#endif
-
-#ifdef CONFIG_STRICT_KERNEL_RWX
-void set_kernel_text_rw(void);
-void set_kernel_text_ro(void);
-#else
-static inline void set_kernel_text_rw(void) { }
-static inline void set_kernel_text_ro(void) { }
-#endif
-
void flush_uprobe_xol_access(struct page *page, unsigned long uaddr,
void *kaddr, unsigned long len);
diff --git a/arch/arm/include/asm/set_memory.h b/arch/arm/include/asm/set_memory.h
new file mode 100644
index 0000000..5aa4315
--- /dev/null
+++ b/arch/arm/include/asm/set_memory.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 1999-2002 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _ASMARM_SET_MEMORY_H
+#define _ASMARM_SET_MEMORY_H
+
+#ifdef CONFIG_MMU
+int set_memory_ro(unsigned long addr, int numpages);
+int set_memory_rw(unsigned long addr, int numpages);
+int set_memory_x(unsigned long addr, int numpages);
+int set_memory_nx(unsigned long addr, int numpages);
+#else
+static inline int set_memory_ro(unsigned long addr, int numpages) { return 0; }
+static inline int set_memory_rw(unsigned long addr, int numpages) { return 0; }
+static inline int set_memory_x(unsigned long addr, int numpages) { return 0; }
+static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }
+#endif
+
+#ifdef CONFIG_STRICT_KERNEL_RWX
+void set_kernel_text_rw(void);
+void set_kernel_text_ro(void);
+#else
+static inline void set_kernel_text_rw(void) { }
+static inline void set_kernel_text_ro(void) { }
+#endif
+
+#endif
diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index a12f1af..a7a97a6 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -29,6 +29,7 @@ generic-y += rwsem.h
generic-y += segment.h
generic-y += sembuf.h
generic-y += serial.h
+generic-y += set_memory.h
generic-y += shmbuf.h
generic-y += simd.h
generic-y += sizes.h
diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h
index 5a2a6ee..7db6962 100644
--- a/arch/arm64/include/asm/cacheflush.h
+++ b/arch/arm64/include/asm/cacheflush.h
@@ -20,6 +20,7 @@
#define __ASM_CACHEFLUSH_H
#include <linux/mm.h>
+#include <asm/set_memory.h>
/*
* This flag is used to indicate that the page pointed to by a pte is clean
@@ -150,9 +151,4 @@ static inline void flush_cache_vunmap(unsigned long start, unsigned long end)
{
}
-int set_memory_ro(unsigned long addr, int numpages);
-int set_memory_rw(unsigned long addr, int numpages);
-int set_memory_x(unsigned long addr, int numpages);
-int set_memory_nx(unsigned long addr, int numpages);
-
#endif
diff --git a/arch/s390/include/asm/cacheflush.h b/arch/s390/include/asm/cacheflush.h
index 0499334..afe2965 100644
--- a/arch/s390/include/asm/cacheflush.h
+++ b/arch/s390/include/asm/cacheflush.h
@@ -3,32 +3,6 @@
/* Caches aren't brain-dead on the s390. */
#include <asm-generic/cacheflush.h>
-
-#define SET_MEMORY_RO 1UL
-#define SET_MEMORY_RW 2UL
-#define SET_MEMORY_NX 4UL
-#define SET_MEMORY_X 8UL
-
-int __set_memory(unsigned long addr, int numpages, unsigned long flags);
-
-static inline int set_memory_ro(unsigned long addr, int numpages)
-{
- return __set_memory(addr, numpages, SET_MEMORY_RO);
-}
-
-static inline int set_memory_rw(unsigned long addr, int numpages)
-{
- return __set_memory(addr, numpages, SET_MEMORY_RW);
-}
-
-static inline int set_memory_nx(unsigned long addr, int numpages)
-{
- return __set_memory(addr, numpages, SET_MEMORY_NX);
-}
-
-static inline int set_memory_x(unsigned long addr, int numpages)
-{
- return __set_memory(addr, numpages, SET_MEMORY_X);
-}
+#include <asm/set_memory.h>
#endif /* _S390_CACHEFLUSH_H */
diff --git a/arch/s390/include/asm/set_memory.h b/arch/s390/include/asm/set_memory.h
new file mode 100644
index 0000000..46a4db4
--- /dev/null
+++ b/arch/s390/include/asm/set_memory.h
@@ -0,0 +1,31 @@
+#ifndef _ASMS390_SET_MEMORY_H
+#define _ASMS390_SET_MEMORY_H
+
+#define SET_MEMORY_RO 1UL
+#define SET_MEMORY_RW 2UL
+#define SET_MEMORY_NX 4UL
+#define SET_MEMORY_X 8UL
+
+int __set_memory(unsigned long addr, int numpages, unsigned long flags);
+
+static inline int set_memory_ro(unsigned long addr, int numpages)
+{
+ return __set_memory(addr, numpages, SET_MEMORY_RO);
+}
+
+static inline int set_memory_rw(unsigned long addr, int numpages)
+{
+ return __set_memory(addr, numpages, SET_MEMORY_RW);
+}
+
+static inline int set_memory_nx(unsigned long addr, int numpages)
+{
+ return __set_memory(addr, numpages, SET_MEMORY_NX);
+}
+
+static inline int set_memory_x(unsigned long addr, int numpages)
+{
+ return __set_memory(addr, numpages, SET_MEMORY_X);
+}
+
+#endif
diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
index e7e1942..3d7db6f 100644
--- a/arch/x86/include/asm/cacheflush.h
+++ b/arch/x86/include/asm/cacheflush.h
@@ -4,94 +4,10 @@
/* Caches aren't brain-dead on the intel. */
#include <asm-generic/cacheflush.h>
#include <asm/special_insns.h>
-
-/*
- * The set_memory_* API can be used to change various attributes of a virtual
- * address range. The attributes include:
- * Cachability : UnCached, WriteCombining, WriteThrough, WriteBack
- * Executability : eXeutable, NoteXecutable
- * Read/Write : ReadOnly, ReadWrite
- * Presence : NotPresent
- *
- * Within a category, the attributes are mutually exclusive.
- *
- * The implementation of this API will take care of various aspects that
- * are associated with changing such attributes, such as:
- * - Flushing TLBs
- * - Flushing CPU caches
- * - Making sure aliases of the memory behind the mapping don't violate
- * coherency rules as defined by the CPU in the system.
- *
- * What this API does not do:
- * - Provide exclusion between various callers - including callers that
- * operation on other mappings of the same physical page
- * - Restore default attributes when a page is freed
- * - Guarantee that mappings other than the requested one are
- * in any state, other than that these do not violate rules for
- * the CPU you have. Do not depend on any effects on other mappings,
- * CPUs other than the one you have may have more relaxed rules.
- * The caller is required to take care of these.
- */
-
-int _set_memory_uc(unsigned long addr, int numpages);
-int _set_memory_wc(unsigned long addr, int numpages);
-int _set_memory_wt(unsigned long addr, int numpages);
-int _set_memory_wb(unsigned long addr, int numpages);
-int set_memory_uc(unsigned long addr, int numpages);
-int set_memory_wc(unsigned long addr, int numpages);
-int set_memory_wt(unsigned long addr, int numpages);
-int set_memory_wb(unsigned long addr, int numpages);
-int set_memory_x(unsigned long addr, int numpages);
-int set_memory_nx(unsigned long addr, int numpages);
-int set_memory_ro(unsigned long addr, int numpages);
-int set_memory_rw(unsigned long addr, int numpages);
-int set_memory_np(unsigned long addr, int numpages);
-int set_memory_4k(unsigned long addr, int numpages);
-
-int set_memory_array_uc(unsigned long *addr, int addrinarray);
-int set_memory_array_wc(unsigned long *addr, int addrinarray);
-int set_memory_array_wt(unsigned long *addr, int addrinarray);
-int set_memory_array_wb(unsigned long *addr, int addrinarray);
-
-int set_pages_array_uc(struct page **pages, int addrinarray);
-int set_pages_array_wc(struct page **pages, int addrinarray);
-int set_pages_array_wt(struct page **pages, int addrinarray);
-int set_pages_array_wb(struct page **pages, int addrinarray);
-
-/*
- * For legacy compatibility with the old APIs, a few functions
- * are provided that work on a "struct page".
- * These functions operate ONLY on the 1:1 kernel mapping of the
- * memory that the struct page represents, and internally just
- * call the set_memory_* function. See the description of the
- * set_memory_* function for more details on conventions.
- *
- * These APIs should be considered *deprecated* and are likely going to
- * be removed in the future.
- * The reason for this is the implicit operation on the 1:1 mapping only,
- * making this not a generally useful API.
- *
- * Specifically, many users of the old APIs had a virtual address,
- * called virt_to_page() or vmalloc_to_page() on that address to
- * get a struct page* that the old API required.
- * To convert these cases, use set_memory_*() on the original
- * virtual address, do not use these functions.
- */
-
-int set_pages_uc(struct page *page, int numpages);
-int set_pages_wb(struct page *page, int numpages);
-int set_pages_x(struct page *page, int numpages);
-int set_pages_nx(struct page *page, int numpages);
-int set_pages_ro(struct page *page, int numpages);
-int set_pages_rw(struct page *page, int numpages);
-
+#include <asm/set_memory.h>
void clflush_cache_range(void *addr, unsigned int size);
#define mmio_flush_range(addr, size) clflush_cache_range(addr, size)
-extern int kernel_set_to_readonly;
-void set_kernel_text_rw(void);
-void set_kernel_text_ro(void);
-
#endif /* _ASM_X86_CACHEFLUSH_H */
diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h
new file mode 100644
index 0000000..eaec6c3
--- /dev/null
+++ b/arch/x86/include/asm/set_memory.h
@@ -0,0 +1,87 @@
+#ifndef _ASM_X86_SET_MEMORY_H
+#define _ASM_X86_SET_MEMORY_H
+
+#include <asm/page.h>
+#include <asm-generic/set_memory.h>
+
+/*
+ * The set_memory_* API can be used to change various attributes of a virtual
+ * address range. The attributes include:
+ * Cachability : UnCached, WriteCombining, WriteThrough, WriteBack
+ * Executability : eXeutable, NoteXecutable
+ * Read/Write : ReadOnly, ReadWrite
+ * Presence : NotPresent
+ *
+ * Within a category, the attributes are mutually exclusive.
+ *
+ * The implementation of this API will take care of various aspects that
+ * are associated with changing such attributes, such as:
+ * - Flushing TLBs
+ * - Flushing CPU caches
+ * - Making sure aliases of the memory behind the mapping don't violate
+ * coherency rules as defined by the CPU in the system.
+ *
+ * What this API does not do:
+ * - Provide exclusion between various callers - including callers that
+ * operation on other mappings of the same physical page
+ * - Restore default attributes when a page is freed
+ * - Guarantee that mappings other than the requested one are
+ * in any state, other than that these do not violate rules for
+ * the CPU you have. Do not depend on any effects on other mappings,
+ * CPUs other than the one you have may have more relaxed rules.
+ * The caller is required to take care of these.
+ */
+
+int _set_memory_uc(unsigned long addr, int numpages);
+int _set_memory_wc(unsigned long addr, int numpages);
+int _set_memory_wt(unsigned long addr, int numpages);
+int _set_memory_wb(unsigned long addr, int numpages);
+int set_memory_uc(unsigned long addr, int numpages);
+int set_memory_wc(unsigned long addr, int numpages);
+int set_memory_wt(unsigned long addr, int numpages);
+int set_memory_wb(unsigned long addr, int numpages);
+int set_memory_np(unsigned long addr, int numpages);
+int set_memory_4k(unsigned long addr, int numpages);
+
+int set_memory_array_uc(unsigned long *addr, int addrinarray);
+int set_memory_array_wc(unsigned long *addr, int addrinarray);
+int set_memory_array_wt(unsigned long *addr, int addrinarray);
+int set_memory_array_wb(unsigned long *addr, int addrinarray);
+
+int set_pages_array_uc(struct page **pages, int addrinarray);
+int set_pages_array_wc(struct page **pages, int addrinarray);
+int set_pages_array_wt(struct page **pages, int addrinarray);
+int set_pages_array_wb(struct page **pages, int addrinarray);
+
+/*
+ * For legacy compatibility with the old APIs, a few functions
+ * are provided that work on a "struct page".
+ * These functions operate ONLY on the 1:1 kernel mapping of the
+ * memory that the struct page represents, and internally just
+ * call the set_memory_* function. See the description of the
+ * set_memory_* function for more details on conventions.
+ *
+ * These APIs should be considered *deprecated* and are likely going to
+ * be removed in the future.
+ * The reason for this is the implicit operation on the 1:1 mapping only,
+ * making this not a generally useful API.
+ *
+ * Specifically, many users of the old APIs had a virtual address,
+ * called virt_to_page() or vmalloc_to_page() on that address to
+ * get a struct page* that the old API required.
+ * To convert these cases, use set_memory_*() on the original
+ * virtual address, do not use these functions.
+ */
+
+int set_pages_uc(struct page *page, int numpages);
+int set_pages_wb(struct page *page, int numpages);
+int set_pages_x(struct page *page, int numpages);
+int set_pages_nx(struct page *page, int numpages);
+int set_pages_ro(struct page *page, int numpages);
+int set_pages_rw(struct page *page, int numpages);
+
+extern int kernel_set_to_readonly;
+void set_kernel_text_rw(void);
+void set_kernel_text_ro(void);
+
+#endif /* _ASM_X86_SET_MEMORY_H */
diff --git a/include/asm-generic/set_memory.h b/include/asm-generic/set_memory.h
new file mode 100644
index 0000000..83e81f8
--- /dev/null
+++ b/include/asm-generic/set_memory.h
@@ -0,0 +1,12 @@
+#ifndef __ASM_SET_MEMORY_H
+#define __ASM_SET_MEMORY_H
+
+/*
+ * Functions to change memory attributes.
+ */
+int set_memory_ro(unsigned long addr, int numpages);
+int set_memory_rw(unsigned long addr, int numpages);
+int set_memory_x(unsigned long addr, int numpages);
+int set_memory_nx(unsigned long addr, int numpages);
+
+#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 02/16] arm: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Russell King
Cc: Laura Abbott, Catalin Marinas, Will Deacon, Martin Schwidefsky,
Heiko Carstens, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
x86, Kees Cook, Mark Rutland, Arnd Bergmann, linux-arm-kernel,
linux-kernel, linux-s390, linux-arch, David Airlie,
Alexander Shishkin, Wim Van Sebroeck, Guenter Roeck,
linux-watchdog, David S. Miller, Daniel Borkmann, Jessica Yu,
Takashi Iwai, Andrew Morton
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add one file, keep the cacheflush.h header in bpf
---
arch/arm/kernel/ftrace.c | 1 +
arch/arm/kernel/machine_kexec.c | 1 +
arch/arm/mm/pageattr.c | 1 +
arch/arm/net/bpf_jit_32.c | 1 +
4 files changed, 4 insertions(+)
diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
index 3f17594..dea3e96 100644
--- a/arch/arm/kernel/ftrace.c
+++ b/arch/arm/kernel/ftrace.c
@@ -21,6 +21,7 @@
#include <asm/opcodes.h>
#include <asm/ftrace.h>
#include <asm/insn.h>
+#include <asm/set_memory.h>
#ifdef CONFIG_THUMB2_KERNEL
#define NOP 0xf85deb04 /* pop.w {lr} */
diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c
index b18c1ea..1549588 100644
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
@@ -18,6 +18,7 @@
#include <asm/mach-types.h>
#include <asm/smp_plat.h>
#include <asm/system_misc.h>
+#include <asm/set_memory.h>
extern void relocate_new_kernel(void);
extern const unsigned int relocate_new_kernel_size;
diff --git a/arch/arm/mm/pageattr.c b/arch/arm/mm/pageattr.c
index 3b69f26..1403cb4 100644
--- a/arch/arm/mm/pageattr.c
+++ b/arch/arm/mm/pageattr.c
@@ -15,6 +15,7 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
+#include <asm/set_memory.h>
struct page_change_data {
pgprot_t set_mask;
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index 93d0b6d..d5b9fa1 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -18,6 +18,7 @@
#include <linux/if_vlan.h>
#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/hwcap.h>
#include <asm/opcodes.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCHv3 02/16] arm: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add one file, keep the cacheflush.h header in bpf
---
arch/arm/kernel/ftrace.c | 1 +
arch/arm/kernel/machine_kexec.c | 1 +
arch/arm/mm/pageattr.c | 1 +
arch/arm/net/bpf_jit_32.c | 1 +
4 files changed, 4 insertions(+)
diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
index 3f17594..dea3e96 100644
--- a/arch/arm/kernel/ftrace.c
+++ b/arch/arm/kernel/ftrace.c
@@ -21,6 +21,7 @@
#include <asm/opcodes.h>
#include <asm/ftrace.h>
#include <asm/insn.h>
+#include <asm/set_memory.h>
#ifdef CONFIG_THUMB2_KERNEL
#define NOP 0xf85deb04 /* pop.w {lr} */
diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c
index b18c1ea..1549588 100644
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
@@ -18,6 +18,7 @@
#include <asm/mach-types.h>
#include <asm/smp_plat.h>
#include <asm/system_misc.h>
+#include <asm/set_memory.h>
extern void relocate_new_kernel(void);
extern const unsigned int relocate_new_kernel_size;
diff --git a/arch/arm/mm/pageattr.c b/arch/arm/mm/pageattr.c
index 3b69f26..1403cb4 100644
--- a/arch/arm/mm/pageattr.c
+++ b/arch/arm/mm/pageattr.c
@@ -15,6 +15,7 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
+#include <asm/set_memory.h>
struct page_change_data {
pgprot_t set_mask;
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index 93d0b6d..d5b9fa1 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -18,6 +18,7 @@
#include <linux/if_vlan.h>
#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/hwcap.h>
#include <asm/opcodes.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCHv3 02/16] arm: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Russell King
Cc: Mark Rutland, David Airlie, Catalin Marinas, Heiko Carstens,
Takashi Iwai, Wim Van Sebroeck, H. Peter Anvin, linux-watchdog,
linux-arch, linux-s390, Jessica Yu, Daniel Borkmann, x86,
Alexander Shishkin, Ingo Molnar, Laura Abbott, Guenter Roeck,
Kees Cook, Arnd Bergmann, Will Deacon, Thomas Gleixner,
linux-arm-kernel, linux-kernel, Martin Schwidefsky,
Andrew Morton
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add one file, keep the cacheflush.h header in bpf
---
arch/arm/kernel/ftrace.c | 1 +
arch/arm/kernel/machine_kexec.c | 1 +
arch/arm/mm/pageattr.c | 1 +
arch/arm/net/bpf_jit_32.c | 1 +
4 files changed, 4 insertions(+)
diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
index 3f17594..dea3e96 100644
--- a/arch/arm/kernel/ftrace.c
+++ b/arch/arm/kernel/ftrace.c
@@ -21,6 +21,7 @@
#include <asm/opcodes.h>
#include <asm/ftrace.h>
#include <asm/insn.h>
+#include <asm/set_memory.h>
#ifdef CONFIG_THUMB2_KERNEL
#define NOP 0xf85deb04 /* pop.w {lr} */
diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c
index b18c1ea..1549588 100644
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
@@ -18,6 +18,7 @@
#include <asm/mach-types.h>
#include <asm/smp_plat.h>
#include <asm/system_misc.h>
+#include <asm/set_memory.h>
extern void relocate_new_kernel(void);
extern const unsigned int relocate_new_kernel_size;
diff --git a/arch/arm/mm/pageattr.c b/arch/arm/mm/pageattr.c
index 3b69f26..1403cb4 100644
--- a/arch/arm/mm/pageattr.c
+++ b/arch/arm/mm/pageattr.c
@@ -15,6 +15,7 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
+#include <asm/set_memory.h>
struct page_change_data {
pgprot_t set_mask;
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index 93d0b6d..d5b9fa1 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -18,6 +18,7 @@
#include <linux/if_vlan.h>
#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/hwcap.h>
#include <asm/opcodes.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 03/16] arm64: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon
Cc: Laura Abbott, Russell King, Martin Schwidefsky, Heiko Carstens,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86, Kees Cook,
Mark Rutland, Arnd Bergmann, linux-arm-kernel, linux-kernel,
linux-s390, linux-arch, David Airlie, Alexander Shishkin,
Wim Van Sebroeck, Guenter Roeck, linux-watchdog, David S. Miller,
Daniel Borkmann, Jessica Yu, Takashi Iwai, Andrew Morton
The set_memory_* functions have moved to set_memory.h. Use that header
explicitly.
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Alphabetical order
---
arch/arm64/mm/pageattr.c | 1 +
arch/arm64/net/bpf_jit_comp.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index 8def55e..26839f2 100644
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@ -17,6 +17,7 @@
#include <linux/vmalloc.h>
#include <asm/pgtable.h>
+#include <asm/set_memory.h>
#include <asm/tlbflush.h>
struct page_change_data {
diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
index a785554..efc1bf2 100644
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -27,6 +27,7 @@
#include <asm/byteorder.h>
#include <asm/cacheflush.h>
#include <asm/debug-monitors.h>
+#include <asm/set_memory.h>
#include "bpf_jit.h"
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCHv3 03/16] arm64: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
The set_memory_* functions have moved to set_memory.h. Use that header
explicitly.
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Alphabetical order
---
arch/arm64/mm/pageattr.c | 1 +
arch/arm64/net/bpf_jit_comp.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index 8def55e..26839f2 100644
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@ -17,6 +17,7 @@
#include <linux/vmalloc.h>
#include <asm/pgtable.h>
+#include <asm/set_memory.h>
#include <asm/tlbflush.h>
struct page_change_data {
diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
index a785554..efc1bf2 100644
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -27,6 +27,7 @@
#include <asm/byteorder.h>
#include <asm/cacheflush.h>
#include <asm/debug-monitors.h>
+#include <asm/set_memory.h>
#include "bpf_jit.h"
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCHv3 03/16] arm64: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon
Cc: Mark Rutland, David Airlie, Heiko Carstens, Takashi Iwai,
Wim Van Sebroeck, H. Peter Anvin, linux-watchdog, linux-arch,
linux-s390, Jessica Yu, Daniel Borkmann, x86, Russell King,
Alexander Shishkin, Ingo Molnar, Laura Abbott, Guenter Roeck,
Kees Cook, Arnd Bergmann, Thomas Gleixner, linux-arm-kernel,
linux-kernel, Martin Schwidefsky, Andrew Morton, David S. Miller
The set_memory_* functions have moved to set_memory.h. Use that header
explicitly.
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Alphabetical order
---
arch/arm64/mm/pageattr.c | 1 +
arch/arm64/net/bpf_jit_comp.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index 8def55e..26839f2 100644
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@ -17,6 +17,7 @@
#include <linux/vmalloc.h>
#include <asm/pgtable.h>
+#include <asm/set_memory.h>
#include <asm/tlbflush.h>
struct page_change_data {
diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
index a785554..efc1bf2 100644
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -27,6 +27,7 @@
#include <asm/byteorder.h>
#include <asm/cacheflush.h>
#include <asm/debug-monitors.h>
+#include <asm/set_memory.h>
#include "bpf_jit.h"
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 04/16] s390: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Martin Schwidefsky, Heiko Carstens
Cc: Laura Abbott, Russell King, Catalin Marinas, Will Deacon,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86, Kees Cook,
Mark Rutland, Arnd Bergmann, linux-arm-kernel, linux-kernel,
linux-s390, linux-arch, David Airlie, Alexander Shishkin,
Wim Van Sebroeck, Guenter Roeck, linux-watchdog, David S. Miller,
Daniel Borkmann, Jessica Yu, Takashi Iwai, Andrew Morton
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: No changes
---
arch/s390/kernel/ftrace.c | 1 +
arch/s390/kernel/kprobes.c | 2 +-
arch/s390/kernel/machine_kexec.c | 1 +
arch/s390/mm/init.c | 1 +
arch/s390/mm/pageattr.c | 1 +
arch/s390/mm/vmem.c | 1 +
arch/s390/net/bpf_jit_comp.c | 1 +
7 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
index 60a8a4e..27477f3 100644
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@ -17,6 +17,7 @@
#include <trace/syscall.h>
#include <asm/asm-offsets.h>
#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include "entry.h"
/*
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 76f9eda..3d6a997 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -31,7 +31,7 @@
#include <linux/slab.h>
#include <linux/hardirq.h>
#include <linux/ftrace.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/sections.h>
#include <linux/uaccess.h>
#include <asm/dis.h>
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index 3074c1d..ab506ef 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -26,6 +26,7 @@
#include <asm/asm-offsets.h>
#include <asm/cacheflush.h>
#include <asm/os_info.h>
+#include <asm/set_memory.h>
#include <asm/switch_to.h>
typedef void (*relocate_kernel_t)(kimage_entry_t *, unsigned long);
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index ee506671..ee6a1d3 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -39,6 +39,7 @@
#include <asm/sections.h>
#include <asm/ctl_reg.h>
#include <asm/sclp.h>
+#include <asm/set_memory.h>
pgd_t swapper_pg_dir[PTRS_PER_PGD] __section(.bss..swapper_pg_dir);
diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c
index fc5dc33..143cc9a 100644
--- a/arch/s390/mm/pageattr.c
+++ b/arch/s390/mm/pageattr.c
@@ -8,6 +8,7 @@
#include <asm/facility.h>
#include <asm/pgtable.h>
#include <asm/page.h>
+#include <asm/set_memory.h>
static inline unsigned long sske_frame(unsigned long addr, unsigned char skey)
{
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index 60d3899..c33c94b 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -17,6 +17,7 @@
#include <asm/setup.h>
#include <asm/tlbflush.h>
#include <asm/sections.h>
+#include <asm/set_memory.h>
static DEFINE_MUTEX(vmem_mutex);
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index 4ecf6d6..6e97a2e 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -24,6 +24,7 @@
#include <linux/bpf.h>
#include <asm/cacheflush.h>
#include <asm/dis.h>
+#include <asm/set_memory.h>
#include "bpf_jit.h"
int bpf_jit_enable __read_mostly;
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCHv3 04/16] s390: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: No changes
---
arch/s390/kernel/ftrace.c | 1 +
arch/s390/kernel/kprobes.c | 2 +-
arch/s390/kernel/machine_kexec.c | 1 +
arch/s390/mm/init.c | 1 +
arch/s390/mm/pageattr.c | 1 +
arch/s390/mm/vmem.c | 1 +
arch/s390/net/bpf_jit_comp.c | 1 +
7 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
index 60a8a4e..27477f3 100644
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@ -17,6 +17,7 @@
#include <trace/syscall.h>
#include <asm/asm-offsets.h>
#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include "entry.h"
/*
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 76f9eda..3d6a997 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -31,7 +31,7 @@
#include <linux/slab.h>
#include <linux/hardirq.h>
#include <linux/ftrace.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/sections.h>
#include <linux/uaccess.h>
#include <asm/dis.h>
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index 3074c1d..ab506ef 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -26,6 +26,7 @@
#include <asm/asm-offsets.h>
#include <asm/cacheflush.h>
#include <asm/os_info.h>
+#include <asm/set_memory.h>
#include <asm/switch_to.h>
typedef void (*relocate_kernel_t)(kimage_entry_t *, unsigned long);
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index ee506671..ee6a1d3 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -39,6 +39,7 @@
#include <asm/sections.h>
#include <asm/ctl_reg.h>
#include <asm/sclp.h>
+#include <asm/set_memory.h>
pgd_t swapper_pg_dir[PTRS_PER_PGD] __section(.bss..swapper_pg_dir);
diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c
index fc5dc33..143cc9a 100644
--- a/arch/s390/mm/pageattr.c
+++ b/arch/s390/mm/pageattr.c
@@ -8,6 +8,7 @@
#include <asm/facility.h>
#include <asm/pgtable.h>
#include <asm/page.h>
+#include <asm/set_memory.h>
static inline unsigned long sske_frame(unsigned long addr, unsigned char skey)
{
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index 60d3899..c33c94b 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -17,6 +17,7 @@
#include <asm/setup.h>
#include <asm/tlbflush.h>
#include <asm/sections.h>
+#include <asm/set_memory.h>
static DEFINE_MUTEX(vmem_mutex);
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index 4ecf6d6..6e97a2e 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -24,6 +24,7 @@
#include <linux/bpf.h>
#include <asm/cacheflush.h>
#include <asm/dis.h>
+#include <asm/set_memory.h>
#include "bpf_jit.h"
int bpf_jit_enable __read_mostly;
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCHv3 04/16] s390: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Martin Schwidefsky, Heiko Carstens
Cc: Mark Rutland, David Airlie, Catalin Marinas, Will Deacon,
Takashi Iwai, Wim Van Sebroeck, H. Peter Anvin, linux-watchdog,
linux-arch, linux-s390, Jessica Yu, Daniel Borkmann, x86,
Russell King, Alexander Shishkin, Ingo Molnar, Laura Abbott,
Guenter Roeck, Kees Cook, Arnd Bergmann, Thomas Gleixner,
linux-arm-kernel, linux-kernel, Andrew Morton, David S. Miller
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: No changes
---
arch/s390/kernel/ftrace.c | 1 +
arch/s390/kernel/kprobes.c | 2 +-
arch/s390/kernel/machine_kexec.c | 1 +
arch/s390/mm/init.c | 1 +
arch/s390/mm/pageattr.c | 1 +
arch/s390/mm/vmem.c | 1 +
arch/s390/net/bpf_jit_comp.c | 1 +
7 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
index 60a8a4e..27477f3 100644
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@ -17,6 +17,7 @@
#include <trace/syscall.h>
#include <asm/asm-offsets.h>
#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include "entry.h"
/*
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 76f9eda..3d6a997 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -31,7 +31,7 @@
#include <linux/slab.h>
#include <linux/hardirq.h>
#include <linux/ftrace.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/sections.h>
#include <linux/uaccess.h>
#include <asm/dis.h>
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index 3074c1d..ab506ef 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -26,6 +26,7 @@
#include <asm/asm-offsets.h>
#include <asm/cacheflush.h>
#include <asm/os_info.h>
+#include <asm/set_memory.h>
#include <asm/switch_to.h>
typedef void (*relocate_kernel_t)(kimage_entry_t *, unsigned long);
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index ee506671..ee6a1d3 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -39,6 +39,7 @@
#include <asm/sections.h>
#include <asm/ctl_reg.h>
#include <asm/sclp.h>
+#include <asm/set_memory.h>
pgd_t swapper_pg_dir[PTRS_PER_PGD] __section(.bss..swapper_pg_dir);
diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c
index fc5dc33..143cc9a 100644
--- a/arch/s390/mm/pageattr.c
+++ b/arch/s390/mm/pageattr.c
@@ -8,6 +8,7 @@
#include <asm/facility.h>
#include <asm/pgtable.h>
#include <asm/page.h>
+#include <asm/set_memory.h>
static inline unsigned long sske_frame(unsigned long addr, unsigned char skey)
{
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index 60d3899..c33c94b 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -17,6 +17,7 @@
#include <asm/setup.h>
#include <asm/tlbflush.h>
#include <asm/sections.h>
+#include <asm/set_memory.h>
static DEFINE_MUTEX(vmem_mutex);
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index 4ecf6d6..6e97a2e 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -24,6 +24,7 @@
#include <linux/bpf.h>
#include <asm/cacheflush.h>
#include <asm/dis.h>
+#include <asm/set_memory.h>
#include "bpf_jit.h"
int bpf_jit_enable __read_mostly;
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 05/16] x86: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Cc: Laura Abbott, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, x86, Kees Cook, Mark Rutland,
Arnd Bergmann, linux-arm-kernel, linux-kernel, linux-s390,
linux-arch, David Airlie, Alexander Shishkin, Wim Van Sebroeck,
Guenter Roeck, linux-watchdog, David S. Miller, Daniel Borkmann,
Jessica Yu, Takashi Iwai, Andrew Morton
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add missing headers
---
arch/x86/kernel/amd_gart_64.c | 2 +-
arch/x86/kernel/cpu/amd.c | 2 +-
arch/x86/kernel/cpu/bugs.c | 2 +-
arch/x86/kernel/ftrace.c | 2 +-
arch/x86/kernel/machine_kexec_32.c | 2 +-
arch/x86/kernel/machine_kexec_64.c | 1 +
arch/x86/mm/init.c | 2 +-
arch/x86/mm/init_32.c | 2 +-
arch/x86/mm/init_64.c | 2 +-
arch/x86/mm/ioremap.c | 2 +-
arch/x86/mm/pageattr.c | 1 +
arch/x86/net/bpf_jit_comp.c | 1 +
arch/x86/pci/pcbios.c | 2 +-
arch/x86/platform/efi/efi.c | 2 +-
arch/x86/realmode/init.c | 2 +-
15 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
index df083ef..815dd63 100644
--- a/arch/x86/kernel/amd_gart_64.c
+++ b/arch/x86/kernel/amd_gart_64.c
@@ -36,7 +36,7 @@
#include <asm/proto.h>
#include <asm/iommu.h>
#include <asm/gart.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/swiotlb.h>
#include <asm/dma.h>
#include <asm/amd_nb.h>
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 35a5d5d..326d40d 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -16,7 +16,7 @@
#ifdef CONFIG_X86_64
# include <asm/mmconfig.h>
-# include <asm/cacheflush.h>
+# include <asm/set_memory.h>
#endif
#include "cpu.h"
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index a44ef52..0af86d9 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -17,7 +17,7 @@
#include <asm/paravirt.h>
#include <asm/alternative.h>
#include <asm/pgtable.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
void __init check_bugs(void)
{
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 8639bb2..da9f2b0 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -24,7 +24,7 @@
#include <trace/syscall.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/kprobes.h>
#include <asm/ftrace.h>
#include <asm/nops.h>
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
index 469b23d..77d571b 100644
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
@@ -23,7 +23,7 @@
#include <asm/io_apic.h>
#include <asm/cpufeature.h>
#include <asm/desc.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/debugreg.h>
static void set_idt(void *newidt, __u16 limit)
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
index 307b1f4..8887311 100644
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c
@@ -27,6 +27,7 @@
#include <asm/debugreg.h>
#include <asm/kexec-bzimage64.h>
#include <asm/setup.h>
+#include <asm/set_memory.h>
#ifdef CONFIG_KEXEC_FILE
static struct kexec_file_ops *kexec_file_loaders[] = {
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 22af912..adbfb09 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -5,7 +5,7 @@
#include <linux/memblock.h>
#include <linux/bootmem.h> /* for max_low_pfn */
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/e820.h>
#include <asm/init.h>
#include <asm/page.h>
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 2b4b53e..928cfde 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -48,7 +48,7 @@
#include <asm/sections.h>
#include <asm/paravirt.h>
#include <asm/setup.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/page_types.h>
#include <asm/init.h>
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 15173d3..7eef172 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -50,7 +50,7 @@
#include <asm/sections.h>
#include <asm/kdebug.h>
#include <asm/numa.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/init.h>
#include <asm/uv/uv.h>
#include <asm/setup.h>
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 7aaa263..8ae010c 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -13,7 +13,7 @@
#include <linux/vmalloc.h>
#include <linux/mmiotrace.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/e820.h>
#include <asm/fixmap.h>
#include <asm/pgtable.h>
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 28d4213..bfcdd45 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -24,6 +24,7 @@
#include <asm/pgalloc.h>
#include <asm/proto.h>
#include <asm/pat.h>
+#include <asm/set_memory.h>
/*
* The current flushing context - we pass it instead of 5 arguments:
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 32322ce..a63e6af 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -12,6 +12,7 @@
#include <linux/filter.h>
#include <linux/if_vlan.h>
#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <linux/bpf.h>
int bpf_jit_enable __read_mostly;
diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
index 1d97cea..4d510a6 100644
--- a/arch/x86/pci/pcbios.c
+++ b/arch/x86/pci/pcbios.c
@@ -9,7 +9,7 @@
#include <linux/uaccess.h>
#include <asm/pci_x86.h>
#include <asm/pci-functions.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
/* BIOS32 signature: "_32_" */
#define BIOS32_SIGNATURE (('_' << 0) + ('3' << 8) + ('2' << 16) + ('_' << 24))
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 565dff3..6867d88 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -48,7 +48,7 @@
#include <asm/setup.h>
#include <asm/efi.h>
#include <asm/time.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/tlbflush.h>
#include <asm/x86_init.h>
#include <asm/uv/uv.h>
diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
index 5db706f1..a163a90 100644
--- a/arch/x86/realmode/init.c
+++ b/arch/x86/realmode/init.c
@@ -2,7 +2,7 @@
#include <linux/slab.h>
#include <linux/memblock.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/pgtable.h>
#include <asm/realmode.h>
#include <asm/tlbflush.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCHv3 05/16] x86: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add missing headers
---
arch/x86/kernel/amd_gart_64.c | 2 +-
arch/x86/kernel/cpu/amd.c | 2 +-
arch/x86/kernel/cpu/bugs.c | 2 +-
arch/x86/kernel/ftrace.c | 2 +-
arch/x86/kernel/machine_kexec_32.c | 2 +-
arch/x86/kernel/machine_kexec_64.c | 1 +
arch/x86/mm/init.c | 2 +-
arch/x86/mm/init_32.c | 2 +-
arch/x86/mm/init_64.c | 2 +-
arch/x86/mm/ioremap.c | 2 +-
arch/x86/mm/pageattr.c | 1 +
arch/x86/net/bpf_jit_comp.c | 1 +
arch/x86/pci/pcbios.c | 2 +-
arch/x86/platform/efi/efi.c | 2 +-
arch/x86/realmode/init.c | 2 +-
15 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
index df083ef..815dd63 100644
--- a/arch/x86/kernel/amd_gart_64.c
+++ b/arch/x86/kernel/amd_gart_64.c
@@ -36,7 +36,7 @@
#include <asm/proto.h>
#include <asm/iommu.h>
#include <asm/gart.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/swiotlb.h>
#include <asm/dma.h>
#include <asm/amd_nb.h>
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 35a5d5d..326d40d 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -16,7 +16,7 @@
#ifdef CONFIG_X86_64
# include <asm/mmconfig.h>
-# include <asm/cacheflush.h>
+# include <asm/set_memory.h>
#endif
#include "cpu.h"
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index a44ef52..0af86d9 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -17,7 +17,7 @@
#include <asm/paravirt.h>
#include <asm/alternative.h>
#include <asm/pgtable.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
void __init check_bugs(void)
{
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 8639bb2..da9f2b0 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -24,7 +24,7 @@
#include <trace/syscall.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/kprobes.h>
#include <asm/ftrace.h>
#include <asm/nops.h>
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
index 469b23d..77d571b 100644
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
@@ -23,7 +23,7 @@
#include <asm/io_apic.h>
#include <asm/cpufeature.h>
#include <asm/desc.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/debugreg.h>
static void set_idt(void *newidt, __u16 limit)
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
index 307b1f4..8887311 100644
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c
@@ -27,6 +27,7 @@
#include <asm/debugreg.h>
#include <asm/kexec-bzimage64.h>
#include <asm/setup.h>
+#include <asm/set_memory.h>
#ifdef CONFIG_KEXEC_FILE
static struct kexec_file_ops *kexec_file_loaders[] = {
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 22af912..adbfb09 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -5,7 +5,7 @@
#include <linux/memblock.h>
#include <linux/bootmem.h> /* for max_low_pfn */
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/e820.h>
#include <asm/init.h>
#include <asm/page.h>
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 2b4b53e..928cfde 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -48,7 +48,7 @@
#include <asm/sections.h>
#include <asm/paravirt.h>
#include <asm/setup.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/page_types.h>
#include <asm/init.h>
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 15173d3..7eef172 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -50,7 +50,7 @@
#include <asm/sections.h>
#include <asm/kdebug.h>
#include <asm/numa.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/init.h>
#include <asm/uv/uv.h>
#include <asm/setup.h>
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 7aaa263..8ae010c 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -13,7 +13,7 @@
#include <linux/vmalloc.h>
#include <linux/mmiotrace.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/e820.h>
#include <asm/fixmap.h>
#include <asm/pgtable.h>
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 28d4213..bfcdd45 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -24,6 +24,7 @@
#include <asm/pgalloc.h>
#include <asm/proto.h>
#include <asm/pat.h>
+#include <asm/set_memory.h>
/*
* The current flushing context - we pass it instead of 5 arguments:
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 32322ce..a63e6af 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -12,6 +12,7 @@
#include <linux/filter.h>
#include <linux/if_vlan.h>
#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <linux/bpf.h>
int bpf_jit_enable __read_mostly;
diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
index 1d97cea..4d510a6 100644
--- a/arch/x86/pci/pcbios.c
+++ b/arch/x86/pci/pcbios.c
@@ -9,7 +9,7 @@
#include <linux/uaccess.h>
#include <asm/pci_x86.h>
#include <asm/pci-functions.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
/* BIOS32 signature: "_32_" */
#define BIOS32_SIGNATURE (('_' << 0) + ('3' << 8) + ('2' << 16) + ('_' << 24))
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 565dff3..6867d88 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -48,7 +48,7 @@
#include <asm/setup.h>
#include <asm/efi.h>
#include <asm/time.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/tlbflush.h>
#include <asm/x86_init.h>
#include <asm/uv/uv.h>
diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
index 5db706f1..a163a90 100644
--- a/arch/x86/realmode/init.c
+++ b/arch/x86/realmode/init.c
@@ -2,7 +2,7 @@
#include <linux/slab.h>
#include <linux/memblock.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/pgtable.h>
#include <asm/realmode.h>
#include <asm/tlbflush.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCHv3 05/16] x86: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Cc: Mark Rutland, David Airlie, Catalin Marinas, Heiko Carstens,
Takashi Iwai, Wim Van Sebroeck, linux-watchdog, linux-arch,
linux-s390, Jessica Yu, Daniel Borkmann, x86, Russell King,
Alexander Shishkin, Laura Abbott, Guenter Roeck, Kees Cook,
Arnd Bergmann, Will Deacon, linux-arm-kernel, linux-kernel,
Martin Schwidefsky, Andrew Morton, David S. Miller
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add missing headers
---
arch/x86/kernel/amd_gart_64.c | 2 +-
arch/x86/kernel/cpu/amd.c | 2 +-
arch/x86/kernel/cpu/bugs.c | 2 +-
arch/x86/kernel/ftrace.c | 2 +-
arch/x86/kernel/machine_kexec_32.c | 2 +-
arch/x86/kernel/machine_kexec_64.c | 1 +
arch/x86/mm/init.c | 2 +-
arch/x86/mm/init_32.c | 2 +-
arch/x86/mm/init_64.c | 2 +-
arch/x86/mm/ioremap.c | 2 +-
arch/x86/mm/pageattr.c | 1 +
arch/x86/net/bpf_jit_comp.c | 1 +
arch/x86/pci/pcbios.c | 2 +-
arch/x86/platform/efi/efi.c | 2 +-
arch/x86/realmode/init.c | 2 +-
15 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
index df083ef..815dd63 100644
--- a/arch/x86/kernel/amd_gart_64.c
+++ b/arch/x86/kernel/amd_gart_64.c
@@ -36,7 +36,7 @@
#include <asm/proto.h>
#include <asm/iommu.h>
#include <asm/gart.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/swiotlb.h>
#include <asm/dma.h>
#include <asm/amd_nb.h>
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 35a5d5d..326d40d 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -16,7 +16,7 @@
#ifdef CONFIG_X86_64
# include <asm/mmconfig.h>
-# include <asm/cacheflush.h>
+# include <asm/set_memory.h>
#endif
#include "cpu.h"
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index a44ef52..0af86d9 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -17,7 +17,7 @@
#include <asm/paravirt.h>
#include <asm/alternative.h>
#include <asm/pgtable.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
void __init check_bugs(void)
{
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 8639bb2..da9f2b0 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -24,7 +24,7 @@
#include <trace/syscall.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/kprobes.h>
#include <asm/ftrace.h>
#include <asm/nops.h>
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
index 469b23d..77d571b 100644
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
@@ -23,7 +23,7 @@
#include <asm/io_apic.h>
#include <asm/cpufeature.h>
#include <asm/desc.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/debugreg.h>
static void set_idt(void *newidt, __u16 limit)
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
index 307b1f4..8887311 100644
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c
@@ -27,6 +27,7 @@
#include <asm/debugreg.h>
#include <asm/kexec-bzimage64.h>
#include <asm/setup.h>
+#include <asm/set_memory.h>
#ifdef CONFIG_KEXEC_FILE
static struct kexec_file_ops *kexec_file_loaders[] = {
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 22af912..adbfb09 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -5,7 +5,7 @@
#include <linux/memblock.h>
#include <linux/bootmem.h> /* for max_low_pfn */
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/e820.h>
#include <asm/init.h>
#include <asm/page.h>
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 2b4b53e..928cfde 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -48,7 +48,7 @@
#include <asm/sections.h>
#include <asm/paravirt.h>
#include <asm/setup.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/page_types.h>
#include <asm/init.h>
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 15173d3..7eef172 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -50,7 +50,7 @@
#include <asm/sections.h>
#include <asm/kdebug.h>
#include <asm/numa.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/init.h>
#include <asm/uv/uv.h>
#include <asm/setup.h>
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 7aaa263..8ae010c 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -13,7 +13,7 @@
#include <linux/vmalloc.h>
#include <linux/mmiotrace.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/e820.h>
#include <asm/fixmap.h>
#include <asm/pgtable.h>
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 28d4213..bfcdd45 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -24,6 +24,7 @@
#include <asm/pgalloc.h>
#include <asm/proto.h>
#include <asm/pat.h>
+#include <asm/set_memory.h>
/*
* The current flushing context - we pass it instead of 5 arguments:
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 32322ce..a63e6af 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -12,6 +12,7 @@
#include <linux/filter.h>
#include <linux/if_vlan.h>
#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <linux/bpf.h>
int bpf_jit_enable __read_mostly;
diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
index 1d97cea..4d510a6 100644
--- a/arch/x86/pci/pcbios.c
+++ b/arch/x86/pci/pcbios.c
@@ -9,7 +9,7 @@
#include <linux/uaccess.h>
#include <asm/pci_x86.h>
#include <asm/pci-functions.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
/* BIOS32 signature: "_32_" */
#define BIOS32_SIGNATURE (('_' << 0) + ('3' << 8) + ('2' << 16) + ('_' << 24))
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 565dff3..6867d88 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -48,7 +48,7 @@
#include <asm/setup.h>
#include <asm/efi.h>
#include <asm/time.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/tlbflush.h>
#include <asm/x86_init.h>
#include <asm/uv/uv.h>
diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
index 5db706f1..a163a90 100644
--- a/arch/x86/realmode/init.c
+++ b/arch/x86/realmode/init.c
@@ -2,7 +2,7 @@
#include <linux/slab.h>
#include <linux/memblock.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/pgtable.h>
#include <asm/realmode.h>
#include <asm/tlbflush.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 06/16] agp: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: David Airlie
Cc: Laura Abbott, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
Alexander Shishkin, Wim Van Sebroeck, Guenter Roeck,
linux-watchdog, David S. Miller, Daniel Borkmann, Jessica Yu,
Takashi Iwai, Andrew Morton
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
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 06/16] agp: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 06/16] agp: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: David Airlie
Cc: Mark Rutland, Alexander Shishkin, Catalin Marinas,
Heiko Carstens, Takashi Iwai, Wim Van Sebroeck, H. Peter Anvin,
linux-watchdog, linux-arch, linux-s390, Jessica Yu,
Daniel Borkmann, x86, Russell King, Ingo Molnar, Laura Abbott,
Guenter Roeck, Kees Cook, Arnd Bergmann, Will Deacon,
Thomas Gleixner, linux-arm-kernel, linux-kernel,
Martin Schwidefsky, Andrew Morton
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
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 07/16] drm: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: David Airlie
Cc: Laura Abbott, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
Alexander Shishkin, Wim Van Sebroeck, Guenter Roeck,
linux-watchdog, David S. Miller, Daniel Borkmann, Jessica Yu,
Takashi Iwai, Andrew Morton
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add some #ifdef CONFIG_X86
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 +++
drivers/gpu/drm/gma500/gtt.c | 1 +
drivers/gpu/drm/gma500/psb_drv.c | 1 +
drivers/gpu/drm/radeon/radeon_gart.c | 3 +++
drivers/gpu/drm/ttm/ttm_page_alloc.c | 3 +++
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 3 +++
drivers/gpu/drm/ttm/ttm_tt.c | 3 +++
7 files changed, 17 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
index 964d2a94..b135521 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@ -27,6 +27,9 @@
*/
#include <drm/drmP.h>
#include <drm/amdgpu_drm.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#include "amdgpu.h"
/*
diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c
index 3f4f424..3949b09 100644
--- a/drivers/gpu/drm/gma500/gtt.c
+++ b/drivers/gpu/drm/gma500/gtt.c
@@ -21,6 +21,7 @@
#include <drm/drmP.h>
#include <linux/shmem_fs.h>
+#include <asm/set_memory.h>
#include "psb_drv.h"
#include "blitter.h"
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index 5ee93ff..1f9b35a 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -35,6 +35,7 @@
#include <linux/pm_runtime.h>
#include <acpi/video.h>
#include <linux/module.h>
+#include <asm/set_memory.h>
static struct drm_driver driver;
static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index c4777c8..0b3ec35 100644
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -27,6 +27,9 @@
*/
#include <drm/drmP.h>
#include <drm/radeon_drm.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#include "radeon.h"
/*
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index a37de5d..eeddc1e 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -51,6 +51,9 @@
#if IS_ENABLED(CONFIG_AGP)
#include <asm/agp.h>
#endif
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
#define SMALL_ALLOCATION 16
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
index cec4b4b..90ddbdc 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
@@ -53,6 +53,9 @@
#if IS_ENABLED(CONFIG_AGP)
#include <asm/agp.h>
#endif
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
#define SMALL_ALLOCATION 4
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index aee3c00..5260179 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -44,6 +44,9 @@
#include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h>
#include <drm/ttm/ttm_page_alloc.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
/**
* Allocates storage for pointers to the pages that back the ttm.
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 07/16] drm: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add some #ifdef CONFIG_X86
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 +++
drivers/gpu/drm/gma500/gtt.c | 1 +
drivers/gpu/drm/gma500/psb_drv.c | 1 +
drivers/gpu/drm/radeon/radeon_gart.c | 3 +++
drivers/gpu/drm/ttm/ttm_page_alloc.c | 3 +++
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 3 +++
drivers/gpu/drm/ttm/ttm_tt.c | 3 +++
7 files changed, 17 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
index 964d2a94..b135521 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@ -27,6 +27,9 @@
*/
#include <drm/drmP.h>
#include <drm/amdgpu_drm.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#include "amdgpu.h"
/*
diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c
index 3f4f424..3949b09 100644
--- a/drivers/gpu/drm/gma500/gtt.c
+++ b/drivers/gpu/drm/gma500/gtt.c
@@ -21,6 +21,7 @@
#include <drm/drmP.h>
#include <linux/shmem_fs.h>
+#include <asm/set_memory.h>
#include "psb_drv.h"
#include "blitter.h"
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index 5ee93ff..1f9b35a 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -35,6 +35,7 @@
#include <linux/pm_runtime.h>
#include <acpi/video.h>
#include <linux/module.h>
+#include <asm/set_memory.h>
static struct drm_driver driver;
static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index c4777c8..0b3ec35 100644
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -27,6 +27,9 @@
*/
#include <drm/drmP.h>
#include <drm/radeon_drm.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#include "radeon.h"
/*
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index a37de5d..eeddc1e 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -51,6 +51,9 @@
#if IS_ENABLED(CONFIG_AGP)
#include <asm/agp.h>
#endif
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
#define SMALL_ALLOCATION 16
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
index cec4b4b..90ddbdc 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
@@ -53,6 +53,9 @@
#if IS_ENABLED(CONFIG_AGP)
#include <asm/agp.h>
#endif
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
#define SMALL_ALLOCATION 4
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index aee3c00..5260179 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -44,6 +44,9 @@
#include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h>
#include <drm/ttm/ttm_page_alloc.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
/**
* Allocates storage for pointers to the pages that back the ttm.
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 07/16] drm: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: David Airlie
Cc: Mark Rutland, Alexander Shishkin, Catalin Marinas,
Heiko Carstens, Takashi Iwai, Wim Van Sebroeck, H. Peter Anvin,
linux-watchdog, linux-arch, linux-s390, Jessica Yu,
Daniel Borkmann, x86, Russell King, Ingo Molnar, Laura Abbott,
Guenter Roeck, Kees Cook, Arnd Bergmann, Will Deacon,
Thomas Gleixner, linux-arm-kernel, linux-kernel,
Martin Schwidefsky, Andrew Morton
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add some #ifdef CONFIG_X86
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 +++
drivers/gpu/drm/gma500/gtt.c | 1 +
drivers/gpu/drm/gma500/psb_drv.c | 1 +
drivers/gpu/drm/radeon/radeon_gart.c | 3 +++
drivers/gpu/drm/ttm/ttm_page_alloc.c | 3 +++
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 3 +++
drivers/gpu/drm/ttm/ttm_tt.c | 3 +++
7 files changed, 17 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
index 964d2a94..b135521 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@ -27,6 +27,9 @@
*/
#include <drm/drmP.h>
#include <drm/amdgpu_drm.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#include "amdgpu.h"
/*
diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c
index 3f4f424..3949b09 100644
--- a/drivers/gpu/drm/gma500/gtt.c
+++ b/drivers/gpu/drm/gma500/gtt.c
@@ -21,6 +21,7 @@
#include <drm/drmP.h>
#include <linux/shmem_fs.h>
+#include <asm/set_memory.h>
#include "psb_drv.h"
#include "blitter.h"
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index 5ee93ff..1f9b35a 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -35,6 +35,7 @@
#include <linux/pm_runtime.h>
#include <acpi/video.h>
#include <linux/module.h>
+#include <asm/set_memory.h>
static struct drm_driver driver;
static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index c4777c8..0b3ec35 100644
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -27,6 +27,9 @@
*/
#include <drm/drmP.h>
#include <drm/radeon_drm.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#include "radeon.h"
/*
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index a37de5d..eeddc1e 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -51,6 +51,9 @@
#if IS_ENABLED(CONFIG_AGP)
#include <asm/agp.h>
#endif
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
#define SMALL_ALLOCATION 16
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
index cec4b4b..90ddbdc 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
@@ -53,6 +53,9 @@
#if IS_ENABLED(CONFIG_AGP)
#include <asm/agp.h>
#endif
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
#define SMALL_ALLOCATION 4
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index aee3c00..5260179 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -44,6 +44,9 @@
#include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h>
#include <drm/ttm/ttm_page_alloc.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
/**
* Allocates storage for pointers to the pages that back the ttm.
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 08/16] intel_th: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Alexander Shishkin
Cc: Laura Abbott, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
David Airlie, Wim Van Sebroeck, Guenter Roeck, linux-watchdog,
David S. Miller, Daniel Borkmann, Jessica Yu, Takashi Iwai,
Andrew Morton
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add #ifdef CONFIG_X86
---
drivers/hwtracing/intel_th/msu.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c
index e88afe1..dbbe31d 100644
--- a/drivers/hwtracing/intel_th/msu.c
+++ b/drivers/hwtracing/intel_th/msu.c
@@ -27,7 +27,9 @@
#include <linux/io.h>
#include <linux/dma-mapping.h>
-#include <asm/cacheflush.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#include "intel_th.h"
#include "msu.h"
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 08/16] intel_th: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add #ifdef CONFIG_X86
---
drivers/hwtracing/intel_th/msu.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c
index e88afe1..dbbe31d 100644
--- a/drivers/hwtracing/intel_th/msu.c
+++ b/drivers/hwtracing/intel_th/msu.c
@@ -27,7 +27,9 @@
#include <linux/io.h>
#include <linux/dma-mapping.h>
-#include <asm/cacheflush.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#include "intel_th.h"
#include "msu.h"
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 08/16] intel_th: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Alexander Shishkin
Cc: Mark Rutland, David Airlie, Catalin Marinas, Heiko Carstens,
Takashi Iwai, Wim Van Sebroeck, H. Peter Anvin, linux-watchdog,
linux-arch, linux-s390, Jessica Yu, Daniel Borkmann, x86,
Russell King, Ingo Molnar, Laura Abbott, Guenter Roeck,
Kees Cook, Arnd Bergmann, Will Deacon, Thomas Gleixner,
linux-arm-kernel, linux-kernel, Martin Schwidefsky,
Andrew Morton, David
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add #ifdef CONFIG_X86
---
drivers/hwtracing/intel_th/msu.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c
index e88afe1..dbbe31d 100644
--- a/drivers/hwtracing/intel_th/msu.c
+++ b/drivers/hwtracing/intel_th/msu.c
@@ -27,7 +27,9 @@
#include <linux/io.h>
#include <linux/dma-mapping.h>
-#include <asm/cacheflush.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
#include "intel_th.h"
#include "msu.h"
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 09/16] watchdog: hpwdt: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck
Cc: Laura Abbott, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
David Airlie, Alexander Shishkin, linux-watchdog,
David S. Miller, Daniel Borkmann, Jessica Yu, Takashi Iwai,
Andrew Morton
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: No changes
---
drivers/watchdog/hpwdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 70c7194..67fbe35 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -34,7 +34,7 @@
#include <linux/nmi.h>
#include <linux/kdebug.h>
#include <linux/notifier.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#endif /* CONFIG_HPWDT_NMI_DECODING */
#include <asm/nmi.h>
#include <asm/frame.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 09/16] watchdog: hpwdt: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: No changes
---
drivers/watchdog/hpwdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 70c7194..67fbe35 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -34,7 +34,7 @@
#include <linux/nmi.h>
#include <linux/kdebug.h>
#include <linux/notifier.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#endif /* CONFIG_HPWDT_NMI_DECODING */
#include <asm/nmi.h>
#include <asm/frame.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 09/16] watchdog: hpwdt: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck
Cc: Mark Rutland, David Airlie, Catalin Marinas, Heiko Carstens,
Takashi Iwai, H. Peter Anvin, linux-watchdog, linux-arch,
linux-s390, Jessica Yu, Daniel Borkmann, x86, Russell King,
Alexander Shishkin, Ingo Molnar, Laura Abbott, Kees Cook,
Arnd Bergmann, Will Deacon, Thomas Gleixner, linux-arm-kernel,
linux-kernel, Martin Schwidefsky, Andrew Morton, David S. Miller
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: No changes
---
drivers/watchdog/hpwdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 70c7194..67fbe35 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -34,7 +34,7 @@
#include <linux/nmi.h>
#include <linux/kdebug.h>
#include <linux/notifier.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#endif /* CONFIG_HPWDT_NMI_DECODING */
#include <asm/nmi.h>
#include <asm/frame.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 10/16] bpf: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: David S. Miller, Daniel Borkmann
Cc: Laura Abbott, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
David Airlie, Alexander Shishkin, Wim Van Sebroeck,
Guenter Roeck, linux-watchdog, Jessica Yu, Takashi Iwai,
Andrew Morton
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: #ifdef guard
---
include/linux/filter.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 0c167fd..8053c38 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -18,7 +18,9 @@
#include <net/sch_generic.h>
-#include <asm/cacheflush.h>
+#ifdef CONFIG_ARCH_HAS_SET_MEMORY
+#include <asm/set_memory.h>
+#endif
#include <uapi/linux/filter.h>
#include <uapi/linux/bpf.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 10/16] bpf: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: #ifdef guard
---
include/linux/filter.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 0c167fd..8053c38 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -18,7 +18,9 @@
#include <net/sch_generic.h>
-#include <asm/cacheflush.h>
+#ifdef CONFIG_ARCH_HAS_SET_MEMORY
+#include <asm/set_memory.h>
+#endif
#include <uapi/linux/filter.h>
#include <uapi/linux/bpf.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 10/16] bpf: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: David S. Miller, Daniel Borkmann
Cc: Mark Rutland, David Airlie, Catalin Marinas, Heiko Carstens,
Takashi Iwai, Wim Van Sebroeck, H. Peter Anvin, linux-watchdog,
linux-arch, linux-s390, Jessica Yu, x86, Russell King,
Alexander Shishkin, Ingo Molnar, Laura Abbott, Guenter Roeck,
Kees Cook, Arnd Bergmann, Will Deacon, Thomas Gleixner,
linux-arm-kernel, linux-kernel, Martin Schwidefsky,
Andrew Morton
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: #ifdef guard
---
include/linux/filter.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 0c167fd..8053c38 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -18,7 +18,9 @@
#include <net/sch_generic.h>
-#include <asm/cacheflush.h>
+#ifdef CONFIG_ARCH_HAS_SET_MEMORY
+#include <asm/set_memory.h>
+#endif
#include <uapi/linux/filter.h>
#include <uapi/linux/bpf.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 11/16] module: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Jessica Yu
Cc: Laura Abbott, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
David Airlie, Alexander Shishkin, Wim Van Sebroeck,
Guenter Roeck, linux-watchdog, David S. Miller, Daniel Borkmann,
Takashi Iwai, Andrew Morton
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Jessica Yu <jeyu@redhat.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: #ifdef protection
---
kernel/module.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kernel/module.c b/kernel/module.c
index 7eba6de..992a100 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -49,6 +49,9 @@
#include <linux/rculist.h>
#include <linux/uaccess.h>
#include <asm/cacheflush.h>
+#ifdef CONFIG_STRICT_MODULE_RWX
+#include <asm/set_memory.h>
+#endif
#include <asm/mmu_context.h>
#include <linux/license.h>
#include <asm/sections.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 11/16] module: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Jessica Yu <jeyu@redhat.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: #ifdef protection
---
kernel/module.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kernel/module.c b/kernel/module.c
index 7eba6de..992a100 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -49,6 +49,9 @@
#include <linux/rculist.h>
#include <linux/uaccess.h>
#include <asm/cacheflush.h>
+#ifdef CONFIG_STRICT_MODULE_RWX
+#include <asm/set_memory.h>
+#endif
#include <asm/mmu_context.h>
#include <linux/license.h>
#include <asm/sections.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 11/16] module: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Jessica Yu
Cc: Mark Rutland, David Airlie, Catalin Marinas, Heiko Carstens,
Takashi Iwai, Wim Van Sebroeck, H. Peter Anvin, linux-watchdog,
linux-arch, linux-s390, Daniel Borkmann, x86, Russell King,
Alexander Shishkin, Ingo Molnar, Laura Abbott, Guenter Roeck,
Kees Cook, Arnd Bergmann, Will Deacon, Thomas Gleixner,
linux-arm-kernel, linux-kernel, Martin Schwidefsky,
Andrew Morton
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Acked-by: Jessica Yu <jeyu@redhat.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: #ifdef protection
---
kernel/module.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kernel/module.c b/kernel/module.c
index 7eba6de..992a100 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -49,6 +49,9 @@
#include <linux/rculist.h>
#include <linux/uaccess.h>
#include <asm/cacheflush.h>
+#ifdef CONFIG_STRICT_MODULE_RWX
+#include <asm/set_memory.h>
+#endif
#include <asm/mmu_context.h>
#include <linux/license.h>
#include <asm/sections.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 12/16] PM / hibernate: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Andrew Morton
Cc: Laura Abbott, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
David Airlie, Alexander Shishkin, Wim Van Sebroeck,
Guenter Roeck, linux-watchdog, David S. Miller, Daniel Borkmann,
Jessica Yu, Takashi Iwai
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: #ifdef protection
---
kernel/power/snapshot.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index d79a38d..3b1e0f3 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -36,6 +36,9 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <asm/io.h>
+#ifdef CONFIG_STRICT_KERNEL_RWX
+#include <asm/set_memory.h>
+#endif
#include "power.h"
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 12/16] PM / hibernate: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: #ifdef protection
---
kernel/power/snapshot.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index d79a38d..3b1e0f3 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -36,6 +36,9 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <asm/io.h>
+#ifdef CONFIG_STRICT_KERNEL_RWX
+#include <asm/set_memory.h>
+#endif
#include "power.h"
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 12/16] PM / hibernate: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Andrew Morton
Cc: Mark Rutland, David Airlie, Catalin Marinas, Heiko Carstens,
Takashi Iwai, Wim Van Sebroeck, H. Peter Anvin, linux-watchdog,
linux-arch, linux-s390, Jessica Yu, Daniel Borkmann, x86,
Russell King, Alexander Shishkin, Ingo Molnar, Laura Abbott,
Guenter Roeck, Kees Cook, Arnd Bergmann, Will Deacon,
Thomas Gleixner, linux-arm-kernel, linux-kernel,
Martin Schwidefsky
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: #ifdef protection
---
kernel/power/snapshot.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index d79a38d..3b1e0f3 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -36,6 +36,9 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <asm/io.h>
+#ifdef CONFIG_STRICT_KERNEL_RWX
+#include <asm/set_memory.h>
+#endif
#include "power.h"
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 13/16] ALSA: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Takashi Iwai
Cc: Laura Abbott, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
David Airlie, Alexander Shishkin, Wim Van Sebroeck,
Guenter Roeck, linux-watchdog, David S. Miller, Daniel Borkmann,
Jessica Yu, Andrew Morton
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add a few other files caught by 0day bot
---
sound/pci/hda/hda_intel.c | 2 +-
sound/pci/intel8x0.c | 4 +++-
sound/x86/intel_hdmi_audio.c | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index c8256a8..64d6a34 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -53,7 +53,7 @@
#ifdef CONFIG_X86
/* for snoop control */
#include <asm/pgtable.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/cpufeature.h>
#endif
#include <sound/core.h>
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 9720a30..6d17b17 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -40,7 +40,9 @@
#include <sound/initval.h>
/* for 440MX workaround */
#include <asm/pgtable.h>
-#include <asm/cacheflush.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455");
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index c505b01..664b7fe 100644
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -30,7 +30,7 @@
#include <linux/pm_runtime.h>
#include <linux/dma-mapping.h>
#include <linux/delay.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <sound/core.h>
#include <sound/asoundef.h>
#include <sound/pcm.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCHv3 13/16] ALSA: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add a few other files caught by 0day bot
---
sound/pci/hda/hda_intel.c | 2 +-
sound/pci/intel8x0.c | 4 +++-
sound/x86/intel_hdmi_audio.c | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index c8256a8..64d6a34 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -53,7 +53,7 @@
#ifdef CONFIG_X86
/* for snoop control */
#include <asm/pgtable.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/cpufeature.h>
#endif
#include <sound/core.h>
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 9720a30..6d17b17 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -40,7 +40,9 @@
#include <sound/initval.h>
/* for 440MX workaround */
#include <asm/pgtable.h>
-#include <asm/cacheflush.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455");
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index c505b01..664b7fe 100644
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -30,7 +30,7 @@
#include <linux/pm_runtime.h>
#include <linux/dma-mapping.h>
#include <linux/delay.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <sound/core.h>
#include <sound/asoundef.h>
#include <sound/pcm.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* [PATCHv3 13/16] ALSA: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Takashi Iwai
Cc: Mark Rutland, David Airlie, Catalin Marinas, Heiko Carstens,
Wim Van Sebroeck, H. Peter Anvin, linux-watchdog, linux-arch,
linux-s390, Jessica Yu, Daniel Borkmann, x86, Russell King,
Alexander Shishkin, Ingo Molnar, Laura Abbott, Guenter Roeck,
Kees Cook, Arnd Bergmann, Will Deacon, Thomas Gleixner,
linux-arm-kernel, linux-kernel, Martin Schwidefsky,
Andrew Morton
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Add a few other files caught by 0day bot
---
sound/pci/hda/hda_intel.c | 2 +-
sound/pci/intel8x0.c | 4 +++-
sound/x86/intel_hdmi_audio.c | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index c8256a8..64d6a34 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -53,7 +53,7 @@
#ifdef CONFIG_X86
/* for snoop control */
#include <asm/pgtable.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/cpufeature.h>
#endif
#include <sound/core.h>
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 9720a30..6d17b17 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -40,7 +40,9 @@
#include <sound/initval.h>
/* for 440MX workaround */
#include <asm/pgtable.h>
-#include <asm/cacheflush.h>
+#ifdef CONFIG_X86
+#include <asm/set_memory.h>
+#endif
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455");
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index c505b01..664b7fe 100644
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -30,7 +30,7 @@
#include <linux/pm_runtime.h>
#include <linux/dma-mapping.h>
#include <linux/delay.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <sound/core.h>
#include <sound/asoundef.h>
#include <sound/pcm.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread* Re: [PATCHv3 13/16] ALSA: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
` (2 preceding siblings ...)
(?)
@ 2017-03-20 9:27 ` Takashi Iwai
-1 siblings, 0 replies; 62+ messages in thread
From: Takashi Iwai @ 2017-03-20 9:27 UTC (permalink / raw)
To: Laura Abbott
Cc: Catalin Marinas, Mark Rutland, Will Deacon, Russell King,
Arnd Bergmann, Kees Cook, David S. Miller, Heiko Carstens,
Martin Schwidefsky, Wim Van Sebroeck, Daniel Borkmann, x86,
Thomas Gleixner, Andrew Morton, David Airlie, Alexander Shishkin,
linux-arm-kernel, Jessica Yu, Ingo Molnar, Guenter Roeck,
linux-arch, linux-kernel, linux-s390, linux-watchdog,
H. Peter Anvin
On Tue, 07 Mar 2017 21:55:30 +0100,
Laura Abbott wrote:
>
> set_memory_* functions have moved to set_memory.h. Switch to this
> explicitly.
>
> Signed-off-by: Laura Abbott <labbott@redhat.com>
> ---
> v3: Add a few other files caught by 0day bot
I hoped we could get rid of the ifdef, but other than that, feel free
to take my ack for the sound part:
Acked-by: Takashi Iwai <tiwai@suse.de>
thanks,
Takashi
> ---
> sound/pci/hda/hda_intel.c | 2 +-
> sound/pci/intel8x0.c | 4 +++-
> sound/x86/intel_hdmi_audio.c | 2 +-
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index c8256a8..64d6a34 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -53,7 +53,7 @@
> #ifdef CONFIG_X86
> /* for snoop control */
> #include <asm/pgtable.h>
> -#include <asm/cacheflush.h>
> +#include <asm/set_memory.h>
> #include <asm/cpufeature.h>
> #endif
> #include <sound/core.h>
> diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
> index 9720a30..6d17b17 100644
> --- a/sound/pci/intel8x0.c
> +++ b/sound/pci/intel8x0.c
> @@ -40,7 +40,9 @@
> #include <sound/initval.h>
> /* for 440MX workaround */
> #include <asm/pgtable.h>
> -#include <asm/cacheflush.h>
> +#ifdef CONFIG_X86
> +#include <asm/set_memory.h>
> +#endif
>
> MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
> MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455");
> diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
> index c505b01..664b7fe 100644
> --- a/sound/x86/intel_hdmi_audio.c
> +++ b/sound/x86/intel_hdmi_audio.c
> @@ -30,7 +30,7 @@
> #include <linux/pm_runtime.h>
> #include <linux/dma-mapping.h>
> #include <linux/delay.h>
> -#include <asm/cacheflush.h>
> +#include <asm/set_memory.h>
> #include <sound/core.h>
> #include <sound/asoundef.h>
> #include <sound/pcm.h>
> --
> 2.7.4
>
>
^ permalink raw reply [flat|nested] 62+ messages in thread* [PATCHv3 13/16] ALSA: Use set_memory.h header
@ 2017-03-20 9:27 ` Takashi Iwai
0 siblings, 0 replies; 62+ messages in thread
From: Takashi Iwai @ 2017-03-20 9:27 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 07 Mar 2017 21:55:30 +0100,
Laura Abbott wrote:
>
> set_memory_* functions have moved to set_memory.h. Switch to this
> explicitly.
>
> Signed-off-by: Laura Abbott <labbott@redhat.com>
> ---
> v3: Add a few other files caught by 0day bot
I hoped we could get rid of the ifdef, but other than that, feel free
to take my ack for the sound part:
Acked-by: Takashi Iwai <tiwai@suse.de>
thanks,
Takashi
> ---
> sound/pci/hda/hda_intel.c | 2 +-
> sound/pci/intel8x0.c | 4 +++-
> sound/x86/intel_hdmi_audio.c | 2 +-
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index c8256a8..64d6a34 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -53,7 +53,7 @@
> #ifdef CONFIG_X86
> /* for snoop control */
> #include <asm/pgtable.h>
> -#include <asm/cacheflush.h>
> +#include <asm/set_memory.h>
> #include <asm/cpufeature.h>
> #endif
> #include <sound/core.h>
> diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
> index 9720a30..6d17b17 100644
> --- a/sound/pci/intel8x0.c
> +++ b/sound/pci/intel8x0.c
> @@ -40,7 +40,9 @@
> #include <sound/initval.h>
> /* for 440MX workaround */
> #include <asm/pgtable.h>
> -#include <asm/cacheflush.h>
> +#ifdef CONFIG_X86
> +#include <asm/set_memory.h>
> +#endif
>
> MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
> MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455");
> diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
> index c505b01..664b7fe 100644
> --- a/sound/x86/intel_hdmi_audio.c
> +++ b/sound/x86/intel_hdmi_audio.c
> @@ -30,7 +30,7 @@
> #include <linux/pm_runtime.h>
> #include <linux/dma-mapping.h>
> #include <linux/delay.h>
> -#include <asm/cacheflush.h>
> +#include <asm/set_memory.h>
> #include <sound/core.h>
> #include <sound/asoundef.h>
> #include <sound/pcm.h>
> --
> 2.7.4
>
>
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [PATCHv3 13/16] ALSA: Use set_memory.h header
@ 2017-03-20 9:27 ` Takashi Iwai
0 siblings, 0 replies; 62+ messages in thread
From: Takashi Iwai @ 2017-03-20 9:27 UTC (permalink / raw)
To: Laura Abbott
Cc: Catalin Marinas, Mark Rutland, Will Deacon, Russell King,
Arnd Bergmann, Kees Cook, David S. Miller, Heiko Carstens,
Martin Schwidefsky, Wim Van Sebroeck, Daniel Borkmann, x86,
Thomas Gleixner, Andrew Morton, David Airlie, Alexander Shishkin,
linux-arm-kernel, Jessica Yu, Ingo Molnar, Guenter Roeck,
linux-arch, linux-kernel, linux-s390, linux-watchdog,
H. Peter Anvin
On Tue, 07 Mar 2017 21:55:30 +0100,
Laura Abbott wrote:
>
> set_memory_* functions have moved to set_memory.h. Switch to this
> explicitly.
>
> Signed-off-by: Laura Abbott <labbott@redhat.com>
> ---
> v3: Add a few other files caught by 0day bot
I hoped we could get rid of the ifdef, but other than that, feel free
to take my ack for the sound part:
Acked-by: Takashi Iwai <tiwai@suse.de>
thanks,
Takashi
> ---
> sound/pci/hda/hda_intel.c | 2 +-
> sound/pci/intel8x0.c | 4 +++-
> sound/x86/intel_hdmi_audio.c | 2 +-
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index c8256a8..64d6a34 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -53,7 +53,7 @@
> #ifdef CONFIG_X86
> /* for snoop control */
> #include <asm/pgtable.h>
> -#include <asm/cacheflush.h>
> +#include <asm/set_memory.h>
> #include <asm/cpufeature.h>
> #endif
> #include <sound/core.h>
> diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
> index 9720a30..6d17b17 100644
> --- a/sound/pci/intel8x0.c
> +++ b/sound/pci/intel8x0.c
> @@ -40,7 +40,9 @@
> #include <sound/initval.h>
> /* for 440MX workaround */
> #include <asm/pgtable.h>
> -#include <asm/cacheflush.h>
> +#ifdef CONFIG_X86
> +#include <asm/set_memory.h>
> +#endif
>
> MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
> MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455");
> diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
> index c505b01..664b7fe 100644
> --- a/sound/x86/intel_hdmi_audio.c
> +++ b/sound/x86/intel_hdmi_audio.c
> @@ -30,7 +30,7 @@
> #include <linux/pm_runtime.h>
> #include <linux/dma-mapping.h>
> #include <linux/delay.h>
> -#include <asm/cacheflush.h>
> +#include <asm/set_memory.h>
> #include <sound/core.h>
> #include <sound/asoundef.h>
> #include <sound/pcm.h>
> --
> 2.7.4
>
>
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [PATCHv3 13/16] ALSA: Use set_memory.h header
@ 2017-03-20 9:27 ` Takashi Iwai
0 siblings, 0 replies; 62+ messages in thread
From: Takashi Iwai @ 2017-03-20 9:27 UTC (permalink / raw)
To: Laura Abbott
Cc: Mark Rutland, David Airlie, Catalin Marinas, Will Deacon,
Wim Van Sebroeck, H. Peter Anvin, linux-watchdog, linux-arch,
linux-s390, Jessica Yu, Daniel Borkmann, x86, Russell King,
Alexander Shishkin, Ingo Molnar, Guenter Roeck, Kees Cook,
Arnd Bergmann, Heiko Carstens, Thomas Gleixner, linux-arm-kernel,
linux-kernel, Martin Schwidefsky, Andrew Morton, David S. Miller
On Tue, 07 Mar 2017 21:55:30 +0100,
Laura Abbott wrote:
>
> set_memory_* functions have moved to set_memory.h. Switch to this
> explicitly.
>
> Signed-off-by: Laura Abbott <labbott@redhat.com>
> ---
> v3: Add a few other files caught by 0day bot
I hoped we could get rid of the ifdef, but other than that, feel free
to take my ack for the sound part:
Acked-by: Takashi Iwai <tiwai@suse.de>
thanks,
Takashi
> ---
> sound/pci/hda/hda_intel.c | 2 +-
> sound/pci/intel8x0.c | 4 +++-
> sound/x86/intel_hdmi_audio.c | 2 +-
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index c8256a8..64d6a34 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -53,7 +53,7 @@
> #ifdef CONFIG_X86
> /* for snoop control */
> #include <asm/pgtable.h>
> -#include <asm/cacheflush.h>
> +#include <asm/set_memory.h>
> #include <asm/cpufeature.h>
> #endif
> #include <sound/core.h>
> diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
> index 9720a30..6d17b17 100644
> --- a/sound/pci/intel8x0.c
> +++ b/sound/pci/intel8x0.c
> @@ -40,7 +40,9 @@
> #include <sound/initval.h>
> /* for 440MX workaround */
> #include <asm/pgtable.h>
> -#include <asm/cacheflush.h>
> +#ifdef CONFIG_X86
> +#include <asm/set_memory.h>
> +#endif
>
> MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
> MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455");
> diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
> index c505b01..664b7fe 100644
> --- a/sound/x86/intel_hdmi_audio.c
> +++ b/sound/x86/intel_hdmi_audio.c
> @@ -30,7 +30,7 @@
> #include <linux/pm_runtime.h>
> #include <linux/dma-mapping.h>
> #include <linux/delay.h>
> -#include <asm/cacheflush.h>
> +#include <asm/set_memory.h>
> #include <sound/core.h>
> #include <sound/asoundef.h>
> #include <sound/pcm.h>
> --
> 2.7.4
>
>
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [PATCHv3 13/16] ALSA: Use set_memory.h header
@ 2017-03-20 9:27 ` Takashi Iwai
0 siblings, 0 replies; 62+ messages in thread
From: Takashi Iwai @ 2017-03-20 9:27 UTC (permalink / raw)
To: Laura Abbott
Cc: Mark Rutland, David Airlie, Catalin Marinas, Will Deacon,
Wim Van Sebroeck, H. Peter Anvin, linux-watchdog, linux-arch,
linux-s390, Jessica Yu, Daniel Borkmann, x86, Russell King,
Alexander Shishkin, Ingo Molnar, Guenter Roeck, Kees Cook,
Arnd Bergmann, Heiko Carstens, Thomas Gleixner, linux-arm-kernel,
linux-kernel, Martin Schwidefsky, Andrew Morton
On Tue, 07 Mar 2017 21:55:30 +0100,
Laura Abbott wrote:
>
> set_memory_* functions have moved to set_memory.h. Switch to this
> explicitly.
>
> Signed-off-by: Laura Abbott <labbott@redhat.com>
> ---
> v3: Add a few other files caught by 0day bot
I hoped we could get rid of the ifdef, but other than that, feel free
to take my ack for the sound part:
Acked-by: Takashi Iwai <tiwai@suse.de>
thanks,
Takashi
> ---
> sound/pci/hda/hda_intel.c | 2 +-
> sound/pci/intel8x0.c | 4 +++-
> sound/x86/intel_hdmi_audio.c | 2 +-
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index c8256a8..64d6a34 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -53,7 +53,7 @@
> #ifdef CONFIG_X86
> /* for snoop control */
> #include <asm/pgtable.h>
> -#include <asm/cacheflush.h>
> +#include <asm/set_memory.h>
> #include <asm/cpufeature.h>
> #endif
> #include <sound/core.h>
> diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
> index 9720a30..6d17b17 100644
> --- a/sound/pci/intel8x0.c
> +++ b/sound/pci/intel8x0.c
> @@ -40,7 +40,9 @@
> #include <sound/initval.h>
> /* for 440MX workaround */
> #include <asm/pgtable.h>
> -#include <asm/cacheflush.h>
> +#ifdef CONFIG_X86
> +#include <asm/set_memory.h>
> +#endif
>
> MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
> MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455");
> diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
> index c505b01..664b7fe 100644
> --- a/sound/x86/intel_hdmi_audio.c
> +++ b/sound/x86/intel_hdmi_audio.c
> @@ -30,7 +30,7 @@
> #include <linux/pm_runtime.h>
> #include <linux/dma-mapping.h>
> #include <linux/delay.h>
> -#include <asm/cacheflush.h>
> +#include <asm/set_memory.h>
> #include <sound/core.h>
> #include <sound/asoundef.h>
> #include <sound/pcm.h>
> --
> 2.7.4
>
>
^ permalink raw reply [flat|nested] 62+ messages in thread
* [PATCHv3 14/16] misc: sram: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Andrew Morton
Cc: Laura Abbott, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
David Airlie, Alexander Shishkin, Wim Van Sebroeck,
Guenter Roeck, linux-watchdog, David S. Miller, Daniel Borkmann,
Jessica Yu, Takashi Iwai
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
V3: New file which was not caught in the first pass.
---
drivers/misc/sram-exec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/sram-exec.c b/drivers/misc/sram-exec.c
index ac52241..3d528a1 100644
--- a/drivers/misc/sram-exec.c
+++ b/drivers/misc/sram-exec.c
@@ -16,9 +16,10 @@
#include <linux/device.h>
#include <linux/genalloc.h>
+#include <linux/mm.h>
#include <linux/sram.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include "sram.h"
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 14/16] misc: sram: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
V3: New file which was not caught in the first pass.
---
drivers/misc/sram-exec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/sram-exec.c b/drivers/misc/sram-exec.c
index ac52241..3d528a1 100644
--- a/drivers/misc/sram-exec.c
+++ b/drivers/misc/sram-exec.c
@@ -16,9 +16,10 @@
#include <linux/device.h>
#include <linux/genalloc.h>
+#include <linux/mm.h>
#include <linux/sram.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include "sram.h"
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 14/16] misc: sram: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Andrew Morton
Cc: Mark Rutland, David Airlie, Catalin Marinas, Heiko Carstens,
Takashi Iwai, Wim Van Sebroeck, H. Peter Anvin, linux-watchdog,
linux-arch, linux-s390, Jessica Yu, Daniel Borkmann, x86,
Russell King, Alexander Shishkin, Ingo Molnar, Laura Abbott,
Guenter Roeck, Kees Cook, Arnd Bergmann, Will Deacon,
Thomas Gleixner, linux-arm-kernel, linux-kernel,
Martin Schwidefsky
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
V3: New file which was not caught in the first pass.
---
drivers/misc/sram-exec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/sram-exec.c b/drivers/misc/sram-exec.c
index ac52241..3d528a1 100644
--- a/drivers/misc/sram-exec.c
+++ b/drivers/misc/sram-exec.c
@@ -16,9 +16,10 @@
#include <linux/device.h>
#include <linux/genalloc.h>
+#include <linux/mm.h>
#include <linux/sram.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include "sram.h"
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 15/16] video: vermilion: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
(?)
@ 2017-03-07 20:55 ` Laura Abbott
-1 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Andrew Morton, Bartlomiej Zolnierkiewicz
Cc: Laura Abbott, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
David Airlie, Alexander Shishkin, Wim Van Sebroeck,
Guenter Roeck, linux-watchdog, David S. Miller, Daniel Borkmann,
Jessica Yu, Takashi Iwai, linux-fbdev
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: New files not caught in the first pass
---
drivers/video/fbdev/vermilion/vermilion.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/vermilion/vermilion.c b/drivers/video/fbdev/vermilion/vermilion.c
index 1c1e95a..ce4c4729 100644
--- a/drivers/video/fbdev/vermilion/vermilion.c
+++ b/drivers/video/fbdev/vermilion/vermilion.c
@@ -37,7 +37,7 @@
#include <linux/mm.h>
#include <linux/fb.h>
#include <linux/pci.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/tlbflush.h>
#include <linux/mmzone.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 15/16] video: vermilion: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: New files not caught in the first pass
---
drivers/video/fbdev/vermilion/vermilion.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/vermilion/vermilion.c b/drivers/video/fbdev/vermilion/vermilion.c
index 1c1e95a..ce4c4729 100644
--- a/drivers/video/fbdev/vermilion/vermilion.c
+++ b/drivers/video/fbdev/vermilion/vermilion.c
@@ -37,7 +37,7 @@
#include <linux/mm.h>
#include <linux/fb.h>
#include <linux/pci.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/tlbflush.h>
#include <linux/mmzone.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 15/16] video: vermilion: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Andrew Morton, Bartlomiej Zolnierkiewicz
Cc: Laura Abbott, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
David Airlie, Alexander Shishkin, Wim Van Sebroeck,
Guenter Roeck
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: New files not caught in the first pass
---
drivers/video/fbdev/vermilion/vermilion.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/vermilion/vermilion.c b/drivers/video/fbdev/vermilion/vermilion.c
index 1c1e95a..ce4c4729 100644
--- a/drivers/video/fbdev/vermilion/vermilion.c
+++ b/drivers/video/fbdev/vermilion/vermilion.c
@@ -37,7 +37,7 @@
#include <linux/mm.h>
#include <linux/fb.h>
#include <linux/pci.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/tlbflush.h>
#include <linux/mmzone.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 15/16] video: vermilion: Use set_memory.h header
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Andrew Morton, Bartlomiej Zolnierkiewicz
Cc: Laura Abbott, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
David Airlie, Alexander Shishkin, Wim Van Sebroeck,
Guenter Roeck
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: New files not caught in the first pass
---
drivers/video/fbdev/vermilion/vermilion.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/vermilion/vermilion.c b/drivers/video/fbdev/vermilion/vermilion.c
index 1c1e95a..ce4c4729 100644
--- a/drivers/video/fbdev/vermilion/vermilion.c
+++ b/drivers/video/fbdev/vermilion/vermilion.c
@@ -37,7 +37,7 @@
#include <linux/mm.h>
#include <linux/fb.h>
#include <linux/pci.h>
-#include <asm/cacheflush.h>
+#include <asm/set_memory.h>
#include <asm/tlbflush.h>
#include <linux/mmzone.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* Re: [PATCHv3 15/16] video: vermilion: Use set_memory.h header
2017-03-07 20:55 ` Laura Abbott
(?)
(?)
@ 2017-03-20 17:20 ` Bartlomiej Zolnierkiewicz
-1 siblings, 0 replies; 62+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2017-03-20 17:20 UTC (permalink / raw)
To: Laura Abbott
Cc: Andrew Morton, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
David Airlie, Alexander Shishkin, Wim Van Sebroeck,
Guenter Roeck, linux-watchdog, David S. Miller, Daniel Borkmann,
Jessica Yu, Takashi Iwai, linux-fbdev
On Tuesday, March 07, 2017 12:55:32 PM Laura Abbott wrote:
>
> set_memory_* functions have moved to set_memory.h. Switch to this
> explicitly.
>
> Signed-off-by: Laura Abbott <labbott@redhat.com>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
^ permalink raw reply [flat|nested] 62+ messages in thread
* [PATCHv3 15/16] video: vermilion: Use set_memory.h header
@ 2017-03-20 17:20 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 62+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2017-03-20 17:20 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday, March 07, 2017 12:55:32 PM Laura Abbott wrote:
>
> set_memory_* functions have moved to set_memory.h. Switch to this
> explicitly.
>
> Signed-off-by: Laura Abbott <labbott@redhat.com>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [PATCHv3 15/16] video: vermilion: Use set_memory.h header
@ 2017-03-20 17:20 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 62+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2017-03-20 17:20 UTC (permalink / raw)
To: Laura Abbott
Cc: Andrew Morton, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
David Airlie, Alexander Shishkin, Wim Van Sebroeck,
Guenter Roeck
On Tuesday, March 07, 2017 12:55:32 PM Laura Abbott wrote:
>
> set_memory_* functions have moved to set_memory.h. Switch to this
> explicitly.
>
> Signed-off-by: Laura Abbott <labbott@redhat.com>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [PATCHv3 15/16] video: vermilion: Use set_memory.h header
@ 2017-03-20 17:20 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 62+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2017-03-20 17:20 UTC (permalink / raw)
To: Laura Abbott
Cc: Andrew Morton, Russell King, Catalin Marinas, Will Deacon,
Martin Schwidefsky, Heiko Carstens, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, x86, Kees Cook, Mark Rutland, Arnd Bergmann,
linux-arm-kernel, linux-kernel, linux-s390, linux-arch,
David Airlie, Alexander Shishkin, Wim Van Sebroeck,
Guenter Roeck
On Tuesday, March 07, 2017 12:55:32 PM Laura Abbott wrote:
>
> set_memory_* functions have moved to set_memory.h. Switch to this
> explicitly.
>
> Signed-off-by: Laura Abbott <labbott@redhat.com>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Best regards,
^ permalink raw reply [flat|nested] 62+ messages in thread
* [PATCHv3 16/16] treewide: Decouple cacheflush.h and set_memory.h
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Russell King, Catalin Marinas, Will Deacon, Martin Schwidefsky,
Heiko Carstens, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Kees Cook, Mark Rutland, Arnd Bergmann, David Airlie,
Alexander Shishkin, Wim Van Sebroeck, Guenter Roeck,
linux-watchdog, David S. Miller, Daniel Borkmann, Jessica Yu,
Takashi Iwai, Andrew Morton
Cc: Laura Abbott, x86, linux-arm-kernel, linux-kernel, linux-s390,
linux-arch
Now that all call sites, completely decouple cacheflush.h and
set_memory.h
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: No changes
---
arch/arm/include/asm/cacheflush.h | 1 -
arch/arm64/include/asm/cacheflush.h | 1 -
arch/s390/include/asm/Kbuild | 1 +
arch/s390/include/asm/cacheflush.h | 8 --------
arch/x86/include/asm/cacheflush.h | 1 -
5 files changed, 1 insertion(+), 11 deletions(-)
delete mode 100644 arch/s390/include/asm/cacheflush.h
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
index 1cb9d11..d69bebf 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@ -16,7 +16,6 @@
#include <asm/shmparam.h>
#include <asm/cachetype.h>
#include <asm/outercache.h>
-#include <asm/set_memory.h>
#define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT)
diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h
index 7db6962..5812469 100644
--- a/arch/arm64/include/asm/cacheflush.h
+++ b/arch/arm64/include/asm/cacheflush.h
@@ -20,7 +20,6 @@
#define __ASM_CACHEFLUSH_H
#include <linux/mm.h>
-#include <asm/set_memory.h>
/*
* This flag is used to indicate that the page pointed to by a pte is clean
diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild
index 8aea32f..c0a7057 100644
--- a/arch/s390/include/asm/Kbuild
+++ b/arch/s390/include/asm/Kbuild
@@ -1,4 +1,5 @@
generic-y += asm-offsets.h
+generic-y += cacheflush.h
generic-y += clkdev.h
generic-y += dma-contiguous.h
generic-y += export.h
diff --git a/arch/s390/include/asm/cacheflush.h b/arch/s390/include/asm/cacheflush.h
deleted file mode 100644
index afe2965..0000000
--- a/arch/s390/include/asm/cacheflush.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _S390_CACHEFLUSH_H
-#define _S390_CACHEFLUSH_H
-
-/* Caches aren't brain-dead on the s390. */
-#include <asm-generic/cacheflush.h>
-#include <asm/set_memory.h>
-
-#endif /* _S390_CACHEFLUSH_H */
diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
index 3d7db6f..8b4140f 100644
--- a/arch/x86/include/asm/cacheflush.h
+++ b/arch/x86/include/asm/cacheflush.h
@@ -4,7 +4,6 @@
/* Caches aren't brain-dead on the intel. */
#include <asm-generic/cacheflush.h>
#include <asm/special_insns.h>
-#include <asm/set_memory.h>
void clflush_cache_range(void *addr, unsigned int size);
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 16/16] treewide: Decouple cacheflush.h and set_memory.h
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: linux-arm-kernel
Now that all call sites, completely decouple cacheflush.h and
set_memory.h
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: No changes
---
arch/arm/include/asm/cacheflush.h | 1 -
arch/arm64/include/asm/cacheflush.h | 1 -
arch/s390/include/asm/Kbuild | 1 +
arch/s390/include/asm/cacheflush.h | 8 --------
arch/x86/include/asm/cacheflush.h | 1 -
5 files changed, 1 insertion(+), 11 deletions(-)
delete mode 100644 arch/s390/include/asm/cacheflush.h
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
index 1cb9d11..d69bebf 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@ -16,7 +16,6 @@
#include <asm/shmparam.h>
#include <asm/cachetype.h>
#include <asm/outercache.h>
-#include <asm/set_memory.h>
#define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT)
diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h
index 7db6962..5812469 100644
--- a/arch/arm64/include/asm/cacheflush.h
+++ b/arch/arm64/include/asm/cacheflush.h
@@ -20,7 +20,6 @@
#define __ASM_CACHEFLUSH_H
#include <linux/mm.h>
-#include <asm/set_memory.h>
/*
* This flag is used to indicate that the page pointed to by a pte is clean
diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild
index 8aea32f..c0a7057 100644
--- a/arch/s390/include/asm/Kbuild
+++ b/arch/s390/include/asm/Kbuild
@@ -1,4 +1,5 @@
generic-y += asm-offsets.h
+generic-y += cacheflush.h
generic-y += clkdev.h
generic-y += dma-contiguous.h
generic-y += export.h
diff --git a/arch/s390/include/asm/cacheflush.h b/arch/s390/include/asm/cacheflush.h
deleted file mode 100644
index afe2965..0000000
--- a/arch/s390/include/asm/cacheflush.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _S390_CACHEFLUSH_H
-#define _S390_CACHEFLUSH_H
-
-/* Caches aren't brain-dead on the s390. */
-#include <asm-generic/cacheflush.h>
-#include <asm/set_memory.h>
-
-#endif /* _S390_CACHEFLUSH_H */
diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
index 3d7db6f..8b4140f 100644
--- a/arch/x86/include/asm/cacheflush.h
+++ b/arch/x86/include/asm/cacheflush.h
@@ -4,7 +4,6 @@
/* Caches aren't brain-dead on the intel. */
#include <asm-generic/cacheflush.h>
#include <asm/special_insns.h>
-#include <asm/set_memory.h>
void clflush_cache_range(void *addr, unsigned int size);
--
2.7.4
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [PATCHv3 16/16] treewide: Decouple cacheflush.h and set_memory.h
@ 2017-03-07 20:55 ` Laura Abbott
0 siblings, 0 replies; 62+ messages in thread
From: Laura Abbott @ 2017-03-07 20:55 UTC (permalink / raw)
To: Russell King, Catalin Marinas, Will Deacon, Martin Schwidefsky,
Heiko Carstens, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Kees Cook, Mark Rutland, Arnd Bergmann, David Airlie,
Alexander Shishkin, Wim Van Sebroeck, Guenter Roeck,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA, David S. Miller,
Daniel Borkmann, Jessica Yu, Takashi Iwai, Andrew
Cc: Laura Abbott, x86-DgEjT+Ai2ygdnm+yROfE0A,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-arch-u79uwXL29TY76Z2rM5mHXA
Now that all call sites, completely decouple cacheflush.h and
set_memory.h
Acked-by: Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org>
Acked-by: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>
Signed-off-by: Laura Abbott <labbott-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
v3: No changes
---
arch/arm/include/asm/cacheflush.h | 1 -
arch/arm64/include/asm/cacheflush.h | 1 -
arch/s390/include/asm/Kbuild | 1 +
arch/s390/include/asm/cacheflush.h | 8 --------
arch/x86/include/asm/cacheflush.h | 1 -
5 files changed, 1 insertion(+), 11 deletions(-)
delete mode 100644 arch/s390/include/asm/cacheflush.h
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
index 1cb9d11..d69bebf 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@ -16,7 +16,6 @@
#include <asm/shmparam.h>
#include <asm/cachetype.h>
#include <asm/outercache.h>
-#include <asm/set_memory.h>
#define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT)
diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h
index 7db6962..5812469 100644
--- a/arch/arm64/include/asm/cacheflush.h
+++ b/arch/arm64/include/asm/cacheflush.h
@@ -20,7 +20,6 @@
#define __ASM_CACHEFLUSH_H
#include <linux/mm.h>
-#include <asm/set_memory.h>
/*
* This flag is used to indicate that the page pointed to by a pte is clean
diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild
index 8aea32f..c0a7057 100644
--- a/arch/s390/include/asm/Kbuild
+++ b/arch/s390/include/asm/Kbuild
@@ -1,4 +1,5 @@
generic-y += asm-offsets.h
+generic-y += cacheflush.h
generic-y += clkdev.h
generic-y += dma-contiguous.h
generic-y += export.h
diff --git a/arch/s390/include/asm/cacheflush.h b/arch/s390/include/asm/cacheflush.h
deleted file mode 100644
index afe2965..0000000
--- a/arch/s390/include/asm/cacheflush.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _S390_CACHEFLUSH_H
-#define _S390_CACHEFLUSH_H
-
-/* Caches aren't brain-dead on the s390. */
-#include <asm-generic/cacheflush.h>
-#include <asm/set_memory.h>
-
-#endif /* _S390_CACHEFLUSH_H */
diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
index 3d7db6f..8b4140f 100644
--- a/arch/x86/include/asm/cacheflush.h
+++ b/arch/x86/include/asm/cacheflush.h
@@ -4,7 +4,6 @@
/* Caches aren't brain-dead on the intel. */
#include <asm-generic/cacheflush.h>
#include <asm/special_insns.h>
-#include <asm/set_memory.h>
void clflush_cache_range(void *addr, unsigned int size);
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 62+ messages in thread