leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 4.13-rc7 into char-misc-next

Browse Source 
We want the binder fix in here as well for testing and merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2017-08-28 10:19:01 +02:00
parent 4f9adc8f91 cc4a41fe55
commit 9749c37275
407 changed files with 2975 additions and 1440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/lib/bpf/libbpf.c
View File

@@ -879,7 +879,8 @@ bpf_object__create_maps(struct bpf_object *obj)
size_t j;
int err = *pfd;
pr_warning("failed to create map: %s\n",
pr_warning("failed to create map (name: '%s'): %s\n",
obj->maps[i].name,
strerror(errno));
for (j = 0; j < i; j++)
zclose(obj->maps[j].fd);

26
tools/objtool/arch/x86/decode.c
View File

@@ -271,7 +271,7 @@ int arch_decode_instruction(struct elf *elf, struct section *sec,
case 0x8d:
if (rex == 0x48 && modrm == 0x65) {
/* lea -disp(%rbp), %rsp */
/* lea disp(%rbp), %rsp */
*type = INSN_STACK;
op->src.type = OP_SRC_ADD;
op->src.reg = CFI_BP;
@@ -281,6 +281,30 @@ int arch_decode_instruction(struct elf *elf, struct section *sec,
break;
}
if (rex == 0x48 && (modrm == 0xa4 || modrm == 0x64) &&
sib == 0x24) {
/* lea disp(%rsp), %rsp */
*type = INSN_STACK;
op->src.type = OP_SRC_ADD;
op->src.reg = CFI_SP;
op->src.offset = insn.displacement.value;
op->dest.type = OP_DEST_REG;
op->dest.reg = CFI_SP;
break;
}
if (rex == 0x48 && modrm == 0x2c && sib == 0x24) {
/* lea (%rsp), %rbp */
*type = INSN_STACK;
op->src.type = OP_SRC_REG;
op->src.reg = CFI_SP;
op->dest.type = OP_DEST_REG;
op->dest.reg = CFI_BP;
break;
}
if (rex == 0x4c && modrm == 0x54 && sib == 0x24 &&
insn.displacement.value == 8) {

2
tools/testing/selftests/futex/Makefile
View File

@@ -14,7 +14,7 @@ all:
done
override define RUN_TESTS
@if [ `dirname $(OUTPUT)` = $(PWD) ]; then ./run.sh; fi
$(OUTPUT)/run.sh
endef
override define INSTALL_RULE

4
tools/testing/selftests/kmod/kmod.sh Normal file → Executable file
View File

@@ -473,8 +473,8 @@ usage()
echo " all Runs all tests (default)"
echo " -t Run test ID the number amount of times is recommended"
echo " -w Watch test ID run until it runs into an error"
echo " -c Run test ID once"
echo " -s Run test ID x test-count number of times"
echo " -s Run test ID once"
echo " -c Run test ID x test-count number of times"
echo " -l List all test ID list"
echo " -h|--help Help"
echo

4
tools/testing/selftests/ntb/ntb_test.sh
View File

@@ -333,6 +333,10 @@ function ntb_tool_tests()
link_test $LOCAL_TOOL $REMOTE_TOOL
link_test $REMOTE_TOOL $LOCAL_TOOL
#Ensure the link is up on both sides before continuing
write_file Y $LOCAL_TOOL/link_event
write_file Y $REMOTE_TOOL/link_event
for PEER_TRANS in $(ls $LOCAL_TOOL/peer_trans*); do
PT=$(basename $PEER_TRANS)
write_file $MW_SIZE $LOCAL_TOOL/$PT

0
tools/testing/selftests/sysctl/sysctl.sh Normal file → Executable file
View File

7
tools/testing/selftests/timers/freq-step.c
View File

@@ -229,10 +229,9 @@ static void init_test(void)
printf("CLOCK_MONOTONIC_RAW+CLOCK_MONOTONIC precision: %.0f ns\t\t",
1e9 * precision);
if (precision > MAX_PRECISION) {
printf("[SKIP]\n");
ksft_exit_skip();
}
if (precision > MAX_PRECISION)
ksft_exit_skip("precision: %.0f ns > MAX_PRECISION: %.0f ns\n",
1e9 * precision, 1e9 * MAX_PRECISION);
printf("[OK]\n");
srand(ts.tv_sec ^ ts.tv_nsec);