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

Commit ded6e842 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARC fixes from Vineet Gupta:

 - fix PAE40 crash [Yuriy]

 - disable IO-Coherency by default

 - use a different inline asm constraint for Zero Overhead loops

* tag 'arc-4.9-final' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: mm: PAE40: Fix crash at munmap
  ARC: mm: IOC: Don't enable IOC by default
  ARC: Don't use "+l" inline asm constraint
parents faaae2a5 6a8b2ca7

arch/arc/include/asm/delay.h

+5 −4
Original line number Diff line number Diff line
@@ -22,10 +22,11 @@ 
static inline void __delay(unsigned long loops)

{

	__asm__ __volatile__(

	"	mov lp_count, %0	\n"

	"	lp  1f			\n"

	"	nop			\n"

	"1:				\n"

	: "+l"(loops));

	: : "r"(loops));

}



extern void __bad_udelay(void);

arch/arc/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static inline void pmd_set(pmd_t *pmdp, pte_t *ptep) 


#define pte_page(pte)		pfn_to_page(pte_pfn(pte))

#define mk_pte(page, prot)	pfn_pte(page_to_pfn(page), prot)

#define pfn_pte(pfn, prot)	__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))

#define pfn_pte(pfn, prot)	__pte(__pfn_to_phys(pfn) | pgprot_val(prot))



/* Don't use virt_to_pfn for macros below: could cause truncations for PAE40*/

#define pte_pfn(pte)		(pte_val(pte) >> PAGE_SHIFT)

arch/arc/mm/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


static int l2_line_sz;

static int ioc_exists;

int slc_enable = 1, ioc_enable = 1;

int slc_enable = 1, ioc_enable = 0;

unsigned long perip_base = ARC_UNCACHED_ADDR_SPACE; /* legacy value for boot */

unsigned long perip_end = 0xFFFFFFFF; /* legacy value */