D57004.id177845.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D57004.id177845.diff
View Options

	diff --git a/sys/compat/linuxkpi/common/include/asm/set_memory.h b/sys/compat/linuxkpi/common/include/asm/set_memory.h
	--- a/sys/compat/linuxkpi/common/include/asm/set_memory.h
	+++ b/sys/compat/linuxkpi/common/include/asm/set_memory.h
	@@ -29,6 +29,7 @@
	#ifndef _LINUXKPI_ASM_SET_MEMORY_H_
	#define _LINUXKPI_ASM_SET_MEMORY_H_

	+#include <linux/mm.h>
	#include <linux/page.h>

	static inline int
	@@ -65,32 +66,19 @@
	static inline int
	set_pages_uc(struct page *page, int numpages)
	{
	- KASSERT(numpages == 1, ("%s: numpages %d", __func__, numpages));
	-
	- pmap_page_set_memattr(page, VM_MEMATTR_UNCACHEABLE);
	- return (0);
	+ return (set_memory_uc((unsigned long)page_to_virt(page), numpages));
	}

	static inline int
	set_pages_wc(struct page *page, int numpages)
	{
	- KASSERT(numpages == 1, ("%s: numpages %d", __func__, numpages));
	-
	-#ifdef VM_MEMATTR_WRITE_COMBINING
	- pmap_page_set_memattr(page, VM_MEMATTR_WRITE_COMBINING);
	-#else
	- return (set_pages_uc(page, numpages));
	-#endif
	- return (0);
	+ return (set_memory_wc((unsigned long)page_to_virt(page), numpages));
	}

	static inline int
	set_pages_wb(struct page *page, int numpages)
	{
	- KASSERT(numpages == 1, ("%s: numpages %d", __func__, numpages));
	-
	- pmap_page_set_memattr(page, VM_MEMATTR_WRITE_BACK);
	- return (0);
	+ return (set_memory_wb((unsigned long)page_to_virt(page), numpages));
	}

	static inline int