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

Commit 2430cdd0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARC fixes from Vineet Gupta:
 "These are couple of weeks old already, but I just couldn't get them to
  you earlier.

   - couple of fixes for recently added perf code
   - build time extable sort"

* tag 'arc-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: [perf] Fix a few thinkos
  ARC: Add guard macro to uapi/asm/unistd.h
  ARC: extable: Enable sorting at build time
parents 93e1585e da990a4f

arch/arc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


config ARC

	def_bool y

	select BUILDTIME_EXTABLE_SORT

	select CLONE_BACKWARDS

	# ARC Busybox based initramfs absolutely relies on DEVTMPFS for /dev

	select DEVTMPFS if !INITRAMFS_SOURCE=""

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

+5 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ 


/******** no-legacy-syscalls-ABI *******/



#ifndef _UAPI_ASM_ARC_UNISTD_H

#define _UAPI_ASM_ARC_UNISTD_H



#define __ARCH_WANT_SYS_EXECVE

#define __ARCH_WANT_SYS_CLONE

#define __ARCH_WANT_SYS_VFORK
@@ -32,3 +35,5 @@ __SYSCALL(__NR_arc_gettls, sys_arc_gettls) 
/* Generic syscall (fs/filesystems.c - lost in asm-generic/unistd.h */

#define __NR_sysfs		(__NR_arch_specific_syscall + 3)

__SYSCALL(__NR_sysfs, sys_sysfs)



#endif

arch/arc/kernel/perf_event.c

+2 −2
Original line number Diff line number Diff line
@@ -79,9 +79,9 @@ static int arc_pmu_cache_event(u64 config) 
	cache_result	= (config >> 16) & 0xff;

	if (cache_type >= PERF_COUNT_HW_CACHE_MAX)

		return -EINVAL;

	if (cache_type >= PERF_COUNT_HW_CACHE_OP_MAX)

	if (cache_op >= PERF_COUNT_HW_CACHE_OP_MAX)

		return -EINVAL;

	if (cache_type >= PERF_COUNT_HW_CACHE_RESULT_MAX)

	if (cache_result >= PERF_COUNT_HW_CACHE_RESULT_MAX)

		return -EINVAL;



	ret = arc_pmu_cache_map[cache_type][cache_op][cache_result];

scripts/sortextable.c

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ 
#include <tools/be_byteshift.h>

#include <tools/le_byteshift.h>



#ifndef EM_ARCOMPACT

#define EM_ARCOMPACT	93

#endif



#ifndef EM_AARCH64

#define EM_AARCH64	183

#endif
@@ -268,6 +272,7 @@ do_file(char const *const fname) 
	case EM_S390:

		custom_sort = sort_relative_table;

		break;

	case EM_ARCOMPACT:

	case EM_ARM:

	case EM_AARCH64:

	case EM_MIPS: