diff options
| author | Matias Elo <matias.elo@nokia.com> | 2024-06-05 13:51:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-05 13:51:39 +0300 |
| commit | 616034b9c9c789923f7ebe7f1c6d014c4ce8a5d2 (patch) | |
| tree | dd1b579c93404d2d98b78944bbdf8313ec499bee /platform/linux-generic/arch/powerpc | |
| parent | 8063101c4fac56e16c5a2bb9843f2fd9c5acbfd7 (diff) | |
| parent | 87913e636da621d47a8d3bc91fbe131abc09c294 (diff) | |
Merge ODP v1.45.0.0HEADv1.45.0.0_DPDK_22.11master
Merge ODP linux-generic v1.45.0.0 into linux-dpdk.
Diffstat (limited to 'platform/linux-generic/arch/powerpc')
| -rw-r--r-- | platform/linux-generic/arch/powerpc/odp/api/abi/cpu.h | 8 | ||||
| -rw-r--r-- | platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c | 15 |
2 files changed, 8 insertions, 15 deletions
diff --git a/platform/linux-generic/arch/powerpc/odp/api/abi/cpu.h b/platform/linux-generic/arch/powerpc/odp/api/abi/cpu.h index ecf56e82e..dc128e1a8 100644 --- a/platform/linux-generic/arch/powerpc/odp/api/abi/cpu.h +++ b/platform/linux-generic/arch/powerpc/odp/api/abi/cpu.h @@ -1,8 +1,6 @@ -/* Copyright (c) 2017-2018, Linaro Limited - * Copyright (c) 2021, Nokia - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2017-2018 Linaro Limited + * Copyright (c) 2021 Nokia */ #ifndef ODP_API_ABI_CPU_H_ diff --git a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c index 2049cc42f..519ca62ed 100644 --- a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c @@ -1,11 +1,10 @@ -/* Copyright (c) 2016-2018, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2016-2018 Linaro Limited */ #include <odp_global_data.h> #include <odp_sysinfo_internal.h> +#include <odp_string_internal.h> #include <string.h> int _odp_cpuinfo_parser(FILE *file, system_info_t *sysinfo) @@ -39,13 +38,9 @@ int _odp_cpuinfo_parser(FILE *file, system_info_t *sysinfo) pos = strstr(str, "cpu"); if (pos) { - int len; - pos = strchr(str, ':'); - strncpy(sysinfo->model_str[id], pos + 2, - MODEL_STR_SIZE - 1); - len = strlen(sysinfo->model_str[id]); - sysinfo->model_str[id][len - 1] = 0; + _odp_strcpy(sysinfo->model_str[id], pos + 2, + MODEL_STR_SIZE); model = 1; count--; } |