Commit 1857a5b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC fixes from Vineet Gupta:
 "Some SMP changes, a ptrace request for NPTL debugging, bunch of build
  breakages/warnings"

* tag 'arc-fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: [SMP] Enable icache coherency
  ARC: [SMP] Fix IPI IRQ registration
  ARC: Implement ptrace(PTRACE_GET_THREAD_AREA)
  ARC: optimize kernel bss clearing in early boot code
  ARC: Fix build breakage for !CONFIG_ARC_DW2_UNWIND
  ARC: fix build warning in devtree
  ARC: remove checks for CONFIG_ARC_MMU_V4
parents 8dd68eb3 2328af0c

arch/arc/include/asm/cache.h

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ extern void read_decode_cache_bcr(void); 
#define ARC_REG_IC_IVIC		0x10

#define ARC_REG_IC_CTRL		0x11

#define ARC_REG_IC_IVIL		0x19

#if defined(CONFIG_ARC_MMU_V3) || defined (CONFIG_ARC_MMU_V4)

#if defined(CONFIG_ARC_MMU_V3)

#define ARC_REG_IC_PTAG		0x1E

#endif
@@ -74,7 +74,7 @@ extern void read_decode_cache_bcr(void); 
#define ARC_REG_DC_IVDL		0x4A

#define ARC_REG_DC_FLSH		0x4B

#define ARC_REG_DC_FLDL		0x4C

#if defined(CONFIG_ARC_MMU_V3) || defined (CONFIG_ARC_MMU_V4)

#if defined(CONFIG_ARC_MMU_V3)

#define ARC_REG_DC_PTAG		0x5C

#endif

arch/arc/include/uapi/asm/ptrace.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#ifndef _UAPI__ASM_ARC_PTRACE_H

#define _UAPI__ASM_ARC_PTRACE_H



#define PTRACE_GET_THREAD_AREA	25



#ifndef __ASSEMBLY__

/*

arch/arc/kernel/ctx_sw_asm.S

+1 −1
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ 
 *  -This is the more "natural" hand written assembler

 */



#include <linux/linkage.h>

#include <asm/entry.h>       /* For the SAVE_* macros */

#include <asm/asm-offsets.h>

#include <asm/linkage.h>



#define KSP_WORD_OFF 	((TASK_THREAD + THREAD_KSP) / 4)

arch/arc/kernel/devtree.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ const struct machine_desc * __init setup_machine_fdt(void *dt) 
{

	const struct machine_desc *mdesc;

	unsigned long dt_root;

	void *clk;

	const void *clk;

	int len;



	if (!early_init_dt_scan(dt))

arch/arc/kernel/head.S

+4 −3
Original line number Diff line number Diff line
@@ -77,10 +77,11 @@ stext: 
	; Clear BSS before updating any globals

	; XXX: use ZOL here

	mov	r5, __bss_start

	mov	r6, __bss_stop

1:

	sub	r6, __bss_stop, r5

	lsr.f	lp_count, r6, 2

	lpnz	1f

	st.ab   0, [r5, 4]

	brlt    r5, r6, 1b

1:



	; Uboot - kernel ABI

	;    r0 = [0] No uboot interaction, [1] cmdline in r2, [2] DTB in r2

CRA Git | Maintained and supported by SUSTech CRA and CCSE