Merge pull request torvalds#182 from liuyuan10/freeirq

Octavian Purdila · web-flow · commit 35df18a81191 · 2016-07-26T00:03:32.000+03:00
lkl: set syscall_thread_data_key to NULL instead of tls_free
diff --git a/arch/lkl/kernel/syscalls.c b/arch/lkl/kernel/syscalls.c
@@ -285,8 +285,8 @@ int lkl_stop_syscall_thread(void)
 		return -EINVAL;
 
 	ret = __lkl_stop_syscall_thread(data, true);
-	if (!ret && lkl_ops->tls_free)
-		lkl_ops->tls_free(syscall_thread_data_key);
+	if (!ret && lkl_ops->tls_set)
+		lkl_ops->tls_set(syscall_thread_data_key, NULL);
 	return ret;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -285,8 +285,8 @@ int lkl_stop_syscall_thread(void)`
`285`	`285`	`return -EINVAL;`
`286`	`286`
`287`	`287`	`ret = __lkl_stop_syscall_thread(data, true);`
`288`		`- if (!ret && lkl_ops->tls_free)`
`289`		`- lkl_ops->tls_free(syscall_thread_data_key);`
	`288`	`+ if (!ret && lkl_ops->tls_set)`
	`289`	`+ lkl_ops->tls_set(syscall_thread_data_key, NULL);`
`290`	`290`	`return ret;`
`291`	`291`	`}`
`292`	`292`