features/cpulist_abbrev: Fix "last" usage

Adding support for "63" as an alias for "last", although working with
"63", broke support for "last".

Note: "last" and "63" cannot be used at the same time in an expression.

Fixes: f86788bac0c8aaa0903aa2ef3b98ec0327a56d5b

Change-Id: I865b7a9589e9aaf601a2c317201a4b3771db4cd2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

1 files changed, 13 insertions, 7 deletions

diff --git a/features/cpulist_abbrev/0001-cpumask-Add-63-alias-for-last-in-cpu-list.patch b/features/cpulist_abbrev/0001-cpumask-Add-63-alias-for-last-in-cpu-list.patch
index 3ba61df..f77e2fb 100644
--- a/features/cpulist_abbrev/0001-cpumask-Add-63-alias-for-last-in-cpu-list.patch
+++ b/features/cpulist_abbrev/0001-cpumask-Add-63-alias-for-last-in-cpu-list.patch
@@ -1,4 +1,4 @@
-From c52f05fb623b0e12c2c91aec6d02c7bd6f6cab0b Mon Sep 17 00:00:00 2001
+From eae01ebd0607f0ae29604508b27d177e0d01799b Mon Sep 17 00:00:00 2001
 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 Date: Tue, 6 Jul 2021 10:39:05 +0000
 Subject: [PATCH] cpumask: Add "63" alias for "last" in cpu list
@@ -20,6 +20,9 @@ Edge upgrade/downgrade via OSTree deployments and should be
 removed as soon as the proper mechanism for generating kernel args
 is in place.
 
+Note: "last" and "63" (as an alias for "last") cannot be used at
+the same time.
+
 Upstream-Status: Inappropiate [Enea specific]
 
 [1] https://github.com/torvalds/linux/commit/e22cdc3f
@@ -27,14 +30,14 @@ Upstream-Status: Inappropiate [Enea specific]
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- lib/cpumask.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
+ lib/cpumask.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/lib/cpumask.c b/lib/cpumask.c
-index e4b8a8c252c7..6739a93b4c8d 100644
+index e4b8a8c252c7..1357c10e5b67 100644
 --- a/lib/cpumask.c
 +++ b/lib/cpumask.c
-@@ -211,9 +211,18 @@ int __ref cpulist_parse(const char *buf, struct cpumask *dstp)
+@@ -211,9 +211,20 @@ int __ref cpulist_parse(const char *buf, struct cpumask *dstp)
         /*
          * bitmap_parselist has no concept of "last" CPU, so we have to
          * replace "last" with a real number in dest copy of the string.
@@ -48,8 +51,11 @@ index e4b8a8c252c7..6739a93b4c8d 100644
 +        * ENEA_end
          */
         sprintf(last_cpu, "%d", cpumask_last(cpu_present_mask));
-        cpulist_replace_token(cpulist, buf, "last", last_cpu);
-+       cpulist_replace_token(cpulist, buf, "63", last_cpu);
+-       cpulist_replace_token(cpulist, buf, "last", last_cpu);
++       if (cpumask_find_token(buf, "last"))
++               cpulist_replace_token(cpulist, buf, "last", last_cpu);
++       else
++               cpulist_replace_token(cpulist, buf, "63", last_cpu);
  
         r = bitmap_parselist(cpulist, cpumask_bits(dstp), nr_cpumask_bits);