Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-6
+5
-4
arch/arc/include/asm/delay.h
+5
-4
arch/arc/include/asm/delay.h
···
22
22
static inline void __delay(unsigned long loops)
23
23
{
24
24
__asm__ __volatile__(
25
-
" lp 1f \n"
26
-
" nop \n"
27
-
"1: \n"
28
-
: "+l"(loops));
25
+
" mov lp_count, %0 \n"
26
+
" lp 1f \n"
27
+
" nop \n"
28
+
"1: \n"
29
+
: : "r"(loops));
29
30
}
30
31
31
32
extern void __bad_udelay(void);
+1
-1
arch/arc/include/asm/pgtable.h
+1
-1
arch/arc/include/asm/pgtable.h
···
280
280
281
281
#define pte_page(pte) pfn_to_page(pte_pfn(pte))
282
282
#define mk_pte(page, prot) pfn_pte(page_to_pfn(page), prot)
283
-
#define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
283
+
#define pfn_pte(pfn, prot) __pte(__pfn_to_phys(pfn) | pgprot_val(prot))
284
284
285
285
/* Don't use virt_to_pfn for macros below: could cause truncations for PAE40*/
286
286
#define pte_pfn(pte) (pte_val(pte) >> PAGE_SHIFT)
+1
-1
arch/arc/mm/cache.c
+1
-1
arch/arc/mm/cache.c
···
23
23
24
24
static int l2_line_sz;
25
25
static int ioc_exists;
26
-
int slc_enable = 1, ioc_enable = 1;
26
+
int slc_enable = 1, ioc_enable = 0;
27
27
unsigned long perip_base = ARC_UNCACHED_ADDR_SPACE; /* legacy value for boot */
28
28
unsigned long perip_end = 0xFFFFFFFF; /* legacy value */
29
29