Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d3bc3d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC updates from Vineet Gupta:
 "Things have been calm here - nothing much except for a few fixes"

* tag 'arc-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: mm: don't loose PTE_SPECIAL in pte_modify()
  ARC: dma: fix address translation in arc_dma_free
  ARC: typo fix in mm/ioremap.c
  ARC: fix linux-next build breakage
parents befff3bf 3925a16a

arch/arc/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 
#define ___DEF (_PAGE_PRESENT | _PAGE_CACHEABLE)



/* Set of bits not changed in pte_modify */

#define _PAGE_CHG_MASK	(PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)

#define _PAGE_CHG_MASK	(PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_SPECIAL)



/* More Abbrevaited helpers */

#define PAGE_U_NONE     __pgprot(___DEF)

arch/arc/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/module.h>

#include <linux/cpu.h>

#include <linux/of_fdt.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/cache.h>

#include <asm/sections.h>

arch/arc/mm/dma.c

+2 −1
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ static void *arc_dma_alloc(struct device *dev, size_t size, 
static void arc_dma_free(struct device *dev, size_t size, void *vaddr,

		dma_addr_t dma_handle, struct dma_attrs *attrs)

{

	struct page *page = virt_to_page(dma_handle);

	phys_addr_t paddr = plat_dma_to_phys(dev, dma_handle);

	struct page *page = virt_to_page(paddr);

	int is_non_coh = 1;



	is_non_coh = dma_get_attr(DMA_ATTR_NON_CONSISTENT, attrs) ||

arch/arc/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ EXPORT_SYMBOL(ioremap); 
/*

 * ioremap with access flags

 * Cache semantics wise it is same as ioremap - "forced" uncached.

 * However unline vanilla ioremap which bypasses ARC MMU for addresses in

 * However unlike vanilla ioremap which bypasses ARC MMU for addresses in

 * ARC hardware uncached region, this one still goes thru the MMU as caller

 * might need finer access control (R/W/X)

 */