Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+13
-2
+1
arch/arc/Kconfig
+1
arch/arc/Kconfig
+5
arch/arc/include/uapi/asm/unistd.h
+5
arch/arc/include/uapi/asm/unistd.h
···
8
8
9
9
/******** no-legacy-syscalls-ABI *******/
10
10
11
+
#ifndef _UAPI_ASM_ARC_UNISTD_H
12
+
#define _UAPI_ASM_ARC_UNISTD_H
13
+
11
14
#define __ARCH_WANT_SYS_EXECVE
12
15
#define __ARCH_WANT_SYS_CLONE
13
16
#define __ARCH_WANT_SYS_VFORK
···
35
32
/* Generic syscall (fs/filesystems.c - lost in asm-generic/unistd.h */
36
33
#define __NR_sysfs (__NR_arch_specific_syscall + 3)
37
34
__SYSCALL(__NR_sysfs, sys_sysfs)
35
+
36
+
#endif
+2
-2
arch/arc/kernel/perf_event.c
+2
-2
arch/arc/kernel/perf_event.c
···
79
79
cache_result = (config >> 16) & 0xff;
80
80
if (cache_type >= PERF_COUNT_HW_CACHE_MAX)
81
81
return -EINVAL;
82
-
if (cache_type >= PERF_COUNT_HW_CACHE_OP_MAX)
82
+
if (cache_op >= PERF_COUNT_HW_CACHE_OP_MAX)
83
83
return -EINVAL;
84
-
if (cache_type >= PERF_COUNT_HW_CACHE_RESULT_MAX)
84
+
if (cache_result >= PERF_COUNT_HW_CACHE_RESULT_MAX)
85
85
return -EINVAL;
86
86
87
87
ret = arc_pmu_cache_map[cache_type][cache_op][cache_result];
+5
scripts/sortextable.c
+5
scripts/sortextable.c
···
31
31
#include <tools/be_byteshift.h>
32
32
#include <tools/le_byteshift.h>
33
33
34
+
#ifndef EM_ARCOMPACT
35
+
#define EM_ARCOMPACT 93
36
+
#endif
37
+
34
38
#ifndef EM_AARCH64
35
39
#define EM_AARCH64 183
36
40
#endif
···
272
268
case EM_S390:
273
269
custom_sort = sort_relative_table;
274
270
break;
271
+
case EM_ARCOMPACT:
275
272
case EM_ARM:
276
273
case EM_AARCH64:
277
274
case EM_MIPS: