Revert "Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next"
This reverts commit031e610a6a
, reversing changes made to52d2d44eee
. The mm changes in there we premature and not fully ack or reviewed by core mm folks, I dropped the ball by merging them via this tree, so lets take em all back out. Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
@@ -2686,24 +2686,7 @@ typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
|
||||
extern int apply_to_page_range(struct mm_struct *mm, unsigned long address,
|
||||
unsigned long size, pte_fn_t fn, void *data);
|
||||
|
||||
struct pfn_range_apply;
|
||||
typedef int (*pter_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
|
||||
struct pfn_range_apply *closure);
|
||||
struct pfn_range_apply {
|
||||
struct mm_struct *mm;
|
||||
pter_fn_t ptefn;
|
||||
unsigned int alloc;
|
||||
};
|
||||
extern int apply_to_pfn_range(struct pfn_range_apply *closure,
|
||||
unsigned long address, unsigned long size);
|
||||
unsigned long apply_as_wrprotect(struct address_space *mapping,
|
||||
pgoff_t first_index, pgoff_t nr);
|
||||
unsigned long apply_as_clean(struct address_space *mapping,
|
||||
pgoff_t first_index, pgoff_t nr,
|
||||
pgoff_t bitmap_pgoff,
|
||||
unsigned long *bitmap,
|
||||
pgoff_t *start,
|
||||
pgoff_t *end);
|
||||
|
||||
#ifdef CONFIG_PAGE_POISONING
|
||||
extern bool page_poisoning_enabled(void);
|
||||
extern void kernel_poison_pages(struct page *page, int numpages, int enable);
|
||||
|
Reference in New Issue
Block a user