* [merged] drm-use-set_memoryh-header.patch removed from -mm tree
@ 2017-05-09 18:03 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2017-05-09 18:03 UTC (permalink / raw)
To: labbott, mm-commits
The patch titled
Subject: drm: use set_memory.h header
has been removed from the -mm tree. Its filename was
drm-use-set_memoryh-header.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Laura Abbott <labbott@redhat.com>
Subject: drm: use set_memory.h header
set_memory_* functions have moved to set_memory.h. Switch to this
explicitly.
[akpm@linux-foundation.org: track drivers/gpu/drm/i915/i915_gem_gtt.c linux-next changes]
Link: http://lkml.kernel.org/r/1488920133-27229-8-git-send-email-labbott@redhat.com
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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/i915/i915_gem_gtt.c | 2 ++
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 +++
8 files changed, 19 insertions(+)
diff -puN drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c~drm-use-set_memoryh-header drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c~drm-use-set_memoryh-header
+++ a/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 -puN drivers/gpu/drm/gma500/gtt.c~drm-use-set_memoryh-header drivers/gpu/drm/gma500/gtt.c
--- a/drivers/gpu/drm/gma500/gtt.c~drm-use-set_memoryh-header
+++ a/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 -puN drivers/gpu/drm/gma500/psb_drv.c~drm-use-set_memoryh-header drivers/gpu/drm/gma500/psb_drv.c
--- a/drivers/gpu/drm/gma500/psb_drv.c~drm-use-set_memoryh-header
+++ a/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 -puN drivers/gpu/drm/i915/i915_gem_gtt.c~drm-use-set_memoryh-header drivers/gpu/drm/i915/i915_gem_gtt.c
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c~drm-use-set_memoryh-header
+++ a/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -31,6 +31,8 @@
#include <linux/seq_file.h>
#include <linux/stop_machine.h>
+#include <asm/set_memory.h>
+
#include <drm/drmP.h>
#include <drm/i915_drm.h>
diff -puN drivers/gpu/drm/radeon/radeon_gart.c~drm-use-set_memoryh-header drivers/gpu/drm/radeon/radeon_gart.c
--- a/drivers/gpu/drm/radeon/radeon_gart.c~drm-use-set_memoryh-header
+++ a/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 -puN drivers/gpu/drm/ttm/ttm_page_alloc.c~drm-use-set_memoryh-header drivers/gpu/drm/ttm/ttm_page_alloc.c
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c~drm-use-set_memoryh-header
+++ a/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 -puN drivers/gpu/drm/ttm/ttm_page_alloc_dma.c~drm-use-set_memoryh-header drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c~drm-use-set_memoryh-header
+++ a/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 -puN drivers/gpu/drm/ttm/ttm_tt.c~drm-use-set_memoryh-header drivers/gpu/drm/ttm/ttm_tt.c
--- a/drivers/gpu/drm/ttm/ttm_tt.c~drm-use-set_memoryh-header
+++ a/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.
_
Patches currently in -mm which might be from labbott@redhat.com are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-05-09 18:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-09 18:03 [merged] drm-use-set_memoryh-header.patch removed from -mm tree akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).