Merge pull request torvalds#263 from liuyuan10/fixcb

liuyuan10 · web-flow · commit 379f26591739 · 2016-11-15T16:21:37.000-08:00
lkl: Fix tls_alloc failure in nt-host
diff --git a/tools/lkl/lib/nt-host.c b/tools/lkl/lib/nt-host.c
@@ -133,9 +133,9 @@ static struct lkl_tls_key *tls_alloc(void (*destructor)(void *))
 	ret->key = FlsAlloc((PFLS_CALLBACK_FUNCTION)destructor);
 	if (ret->key == TLS_OUT_OF_INDEXES) {
 		free(ret);
-		return -1;
+		return NULL;
 	}
-	return 0;
+	return ret;
 }
 
 static void tls_free(struct lkl_tls_key *key)

Original file line number	Diff line number	Diff line change
`@@ -133,9 +133,9 @@ static struct lkl_tls_key tls_alloc(void (destructor)(void *))`
`133`	`133`	`ret->key = FlsAlloc((PFLS_CALLBACK_FUNCTION)destructor);`
`134`	`134`	`if (ret->key == TLS_OUT_OF_INDEXES) {`
`135`	`135`	`free(ret);`
`136`		`- return -1;`
	`136`	`+ return NULL;`
`137`	`137`	`}`
`138`		`- return 0;`
	`138`	`+ return ret;`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`static void tls_free(struct lkl_tls_key *key)`