66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Date: Fri, 5 Oct 2018 15:43:06 +0300
|
|
Subject: [PATCH] stm class: Use memcat_p()
|
|
|
|
Instead of a local copy, use the memcat_p() helper to merge policy
|
|
node attributes.
|
|
|
|
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Tested-by: Mathieu Poirier <mathieu.poirier@linaro.org>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/hwtracing/stm/policy.c | 29 +----------------------------
|
|
1 file changed, 1 insertion(+), 28 deletions(-)
|
|
|
|
diff --git a/drivers/hwtracing/stm/policy.c b/drivers/hwtracing/stm/policy.c
|
|
index 5e51bed0787b..0910ec807187 100644
|
|
--- a/drivers/hwtracing/stm/policy.c
|
|
+++ b/drivers/hwtracing/stm/policy.c
|
|
@@ -202,33 +202,6 @@ static struct configfs_attribute *stp_policy_node_attrs[] = {
|
|
static const struct config_item_type stp_policy_type;
|
|
static const struct config_item_type stp_policy_node_type;
|
|
|
|
-/* lifted from arch/x86/events/core.c */
|
|
-static struct configfs_attribute **merge_attr(struct configfs_attribute **a, struct configfs_attribute **b)
|
|
-{
|
|
- struct configfs_attribute **new;
|
|
- int j, i;
|
|
-
|
|
- for (j = 0; a[j]; j++)
|
|
- ;
|
|
- for (i = 0; b[i]; i++)
|
|
- j++;
|
|
- j++;
|
|
-
|
|
- new = kmalloc_array(j, sizeof(struct configfs_attribute *),
|
|
- GFP_KERNEL);
|
|
- if (!new)
|
|
- return NULL;
|
|
-
|
|
- j = 0;
|
|
- for (i = 0; a[i]; i++)
|
|
- new[j++] = a[i];
|
|
- for (i = 0; b[i]; i++)
|
|
- new[j++] = b[i];
|
|
- new[j] = NULL;
|
|
-
|
|
- return new;
|
|
-}
|
|
-
|
|
const struct config_item_type *
|
|
get_policy_node_type(struct configfs_attribute **attrs)
|
|
{
|
|
@@ -240,7 +213,7 @@ get_policy_node_type(struct configfs_attribute **attrs)
|
|
if (!type)
|
|
return NULL;
|
|
|
|
- merged = merge_attr(stp_policy_node_attrs, attrs);
|
|
+ merged = memcat_p(stp_policy_node_attrs, attrs);
|
|
if (!merged) {
|
|
kfree(type);
|
|
return NULL;
|
|
--
|
|
https://clearlinux.org
|
|
|