[RESEND] admin-guide/cputopology.rst: Remove non-existed cpu-hotplug.txt

Since kernel commit ff58fa7f556c ("Documentation: Update CPU hotplug and move it to core-api"),
cpu_hotplug.txt has been removed. We should update it in here.

Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
 Documentation/admin-guide/cputopology.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/admin-guide/cputopology.rst b/Documentation/admin-guide/cputopology.rst
index b90dafcc8237..cc28b1a16371 100644
--- a/Documentation/admin-guide/cputopology.rst
+++ b/Documentation/admin-guide/cputopology.rst

@@ -135,9 +135,9 @@ source for the output is in brackets ("[]").
 		[NR_CPUS-1]
 
     offline:	CPUs that are not online because they have been
-		HOTPLUGGED off (see cpu-hotplug.txt) or exceed the limit
-		of CPUs allowed by the kernel configuration (kernel_max
-		above). [~cpu_online_mask + cpus >= NR_CPUS]
+		HOTPLUGGED off or exceed the limit of CPUs allowed by the
+		kernel configuration (kernel_max above).
+		[~cpu_online_mask + cpus >= NR_CPUS]
 
     online:	CPUs that are online and being scheduled [cpu_online_mask]
 

@@ -173,5 +173,5 @@ online.)::
        possible: 0-127
         present: 0-3
 
-See cpu-hotplug.txt for the possible_cpus=NUM kernel start parameter
-as well as more information on the various cpumasks.
+See Documentation/core-api/cpu_hotplug.rst for the possible_cpus=NUM
+kernel start parameter as well as more information on the various cpumasks.

-- 
2.23.0

Yang Xu [off-list ref] writes:

Is there a reason why you took out the reference to cpu-hotplug.txt
entirely rather than switching it to the rst file?

Thanks,

jon

on 2021/7/13 0:16, Jonathan Corbet wrote:

Yang Xu[off-list ref]  writes:

quoted

Since kernel commit ff58fa7f556c ("Documentation: Update CPU hotplug and move it to core-api"),
cpu_hotplug.txt has been removed. We should update it in here.

Signed-off-by: Yang Xu<xuyang2018.jy@fujitsu.com>
---
  Documentation/admin-guide/cputopology.rst | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/admin-guide/cputopology.rst b/Documentation/admin-guide/cputopology.rst
index b90dafcc8237..cc28b1a16371 100644
--- a/Documentation/admin-guide/cputopology.rst
+++ b/Documentation/admin-guide/cputopology.rst

@@ -135,9 +135,9 @@ source for the output is in brackets ("[]").
  		[NR_CPUS-1]

      offline:	CPUs that are not online because they have been
-		HOTPLUGGED off (see cpu-hotplug.txt) or exceed the limit
-		of CPUs allowed by the kernel configuration (kernel_max
-		above). [~cpu_online_mask + cpus>= NR_CPUS]
+		HOTPLUGGED off or exceed the limit of CPUs allowed by the
+		kernel configuration (kernel_max above).
+		[~cpu_online_mask + cpus>= NR_CPUS]

Is there a reason why you took out the reference to cpu-hotplug.txt
entirely rather than switching it to the rst file?

Because rst file doesn't have HOTPLUGGED off information and
ABI/testing/sysfs-devices-system-cpu file for offline  also doesn't have
cpu-hotplug.txt or rst file.

So I think removing it is better.

Best Regards
Yang Xu

Thanks,

jon

"xuyang2018.jy@fujitsu.com" [off-list ref] writes:

quoted

Is there a reason why you took out the reference to cpu-hotplug.txt
entirely rather than switching it to the rst file?

Because rst file doesn't have HOTPLUGGED off information and
ABI/testing/sysfs-devices-system-cpu file for offline  also doesn't have
cpu-hotplug.txt or rst file.

So I think removing it is better.

OK, I've gone ahead and applied it.

Thanks,

jon