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

Commit 67e17c11 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull arc architecture fixes from Vineet Gupta:
 "This includes fix for a serious bug in DMA mapping API, make
  allyesconfig wreckage, removal of bogus email-list placeholder in
  MAINTAINERS, a typo in ptrace helper code and last remaining changes
  for syscall ABI v3 which we are finally starting to transition-to
  internally.

  The request is late than I intended to - but I was held up with
  debugging a timer link list corruption, for which a proposed fix to
  generic timer code was sent out to lkml/tglx earlier today."

* 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: Fix the typo in event identifier flags used by ptrace
  arc: fix dma_address assignment during dma_map_sg()
  ARC: Remove SET_PERSONALITY (tracks cross-arch change)
  ARC: ABIv3: fork/vfork wrappers not needed in "no-legacy-syscall" ABI
  ARC: ABIv3: Print the correct ABI ver
  ARC: make allyesconfig build breakages
  ARC: MAINTAINERS update for ARC
parents 09a9f1d2 367f3fcd

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -7706,9 +7706,10 @@ F: include/linux/swiotlb.h 


SYNOPSYS ARC ARCHITECTURE

M:	Vineet Gupta <vgupta@synopsys.com>

L:	linux-snps-arc@vger.kernel.org

S:	Supported

F:	arch/arc/

F:	Documentation/devicetree/bindings/arc/

F:	drivers/tty/serial/arc-uart.c



SYSV FILESYSTEM

M:	Christoph Hellwig <hch@infradead.org>

arch/arc/include/asm/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, 
	int i;



	for_each_sg(sg, s, nents, i)

		sg->dma_address = dma_map_page(dev, sg_page(s), s->offset,

		s->dma_address = dma_map_page(dev, sg_page(s), s->offset,

					       s->length, dir);



	return nents;

arch/arc/include/asm/elf.h

+0 −3
Original line number Diff line number Diff line
@@ -72,7 +72,4 @@ extern int elf_check_arch(const struct elf32_hdr *); 
 */

#define ELF_PLATFORM	(NULL)



#define SET_PERSONALITY(ex) \

	set_personality(PER_LINUX | (current->personality & (~PER_MASK)))



#endif

arch/arc/include/asm/entry.h

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ 
 *-------------------------------------------------------------*/

.macro SAVE_ALL_EXCEPTION   marker



	st      \marker, [sp, 8]

	st      \marker, [sp, 8]	/* orig_r8 */

	st      r0, [sp, 4]    /* orig_r0, needed only for sys calls */



	/* Restore r9 used to code the early prologue */

arch/arc/include/asm/kgdb.h

+2 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


#ifdef CONFIG_KGDB



#include <asm/user.h>

#include <asm/ptrace.h>



/* to ensure compatibility with Linux 2.6.35, we don't implement the get/set

 * register API yet */
@@ -53,9 +53,7 @@ enum arc700_linux_regnums { 
};



#else

static inline void kgdb_trap(struct pt_regs *regs, int param)

{

}

#define kgdb_trap(regs, param)

#endif



#endif	/* __ARC_KGDB_H__ */