diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guide/index.rst index 8853c95ef0d4..f40c4b5a181b 100644 --- a/Documentation/admin-guide/index.rst +++ b/Documentation/admin-guide/index.rst @@ -38,6 +38,7 @@ problems and bugs in particular. ramoops dynamic-debug-howto init + perf/index This is the beginning of a section with information of interest to application developers. Documents covering various aspects of the kernel diff --git a/Documentation/perf/arm-ccn.rst b/Documentation/admin-guide/perf/arm-ccn.rst similarity index 100% rename from Documentation/perf/arm-ccn.rst rename to Documentation/admin-guide/perf/arm-ccn.rst diff --git a/Documentation/perf/arm_dsu_pmu.rst b/Documentation/admin-guide/perf/arm_dsu_pmu.rst similarity index 100% rename from Documentation/perf/arm_dsu_pmu.rst rename to Documentation/admin-guide/perf/arm_dsu_pmu.rst diff --git a/Documentation/perf/hisi-pmu.rst b/Documentation/admin-guide/perf/hisi-pmu.rst similarity index 100% rename from Documentation/perf/hisi-pmu.rst rename to Documentation/admin-guide/perf/hisi-pmu.rst diff --git a/Documentation/perf/index.rst b/Documentation/admin-guide/perf/index.rst similarity index 95% rename from Documentation/perf/index.rst rename to Documentation/admin-guide/perf/index.rst index 4bf848e27f26..9d445451ea18 100644 --- a/Documentation/perf/index.rst +++ b/Documentation/admin-guide/perf/index.rst @@ -1,5 +1,3 @@ -:orphan: - =========================== Performance monitor support =========================== diff --git a/Documentation/perf/qcom_l2_pmu.rst b/Documentation/admin-guide/perf/qcom_l2_pmu.rst similarity index 100% rename from Documentation/perf/qcom_l2_pmu.rst rename to Documentation/admin-guide/perf/qcom_l2_pmu.rst diff --git a/Documentation/perf/qcom_l3_pmu.rst b/Documentation/admin-guide/perf/qcom_l3_pmu.rst similarity index 100% rename from Documentation/perf/qcom_l3_pmu.rst rename to Documentation/admin-guide/perf/qcom_l3_pmu.rst diff --git a/Documentation/perf/thunderx2-pmu.rst b/Documentation/admin-guide/perf/thunderx2-pmu.rst similarity index 100% rename from Documentation/perf/thunderx2-pmu.rst rename to Documentation/admin-guide/perf/thunderx2-pmu.rst diff --git a/Documentation/perf/xgene-pmu.rst b/Documentation/admin-guide/perf/xgene-pmu.rst similarity index 100% rename from Documentation/perf/xgene-pmu.rst rename to Documentation/admin-guide/perf/xgene-pmu.rst diff --git a/MAINTAINERS b/MAINTAINERS index db96cd4a229b..b8ce346d5254 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1155,7 +1155,7 @@ APPLIED MICRO (APM) X-GENE SOC PMU M: Khuong Dinh S: Supported F: drivers/perf/xgene_pmu.c -F: Documentation/perf/xgene-pmu.rst +F: Documentation/admin-guide/perf/xgene-pmu.rst F: Documentation/devicetree/bindings/perf/apm-xgene-pmu.txt APTINA CAMERA SENSOR PLL @@ -7262,7 +7262,7 @@ M: Shaokun Zhang W: http://www.hisilicon.com S: Supported F: drivers/perf/hisilicon -F: Documentation/perf/hisi-pmu.rst +F: Documentation/admin-guide/perf/hisi-pmu.rst HISILICON ROCE DRIVER M: Lijun Ou diff --git a/drivers/perf/qcom_l3_pmu.c b/drivers/perf/qcom_l3_pmu.c index 90f88ce5192b..656e830798d9 100644 --- a/drivers/perf/qcom_l3_pmu.c +++ b/drivers/perf/qcom_l3_pmu.c @@ -8,7 +8,7 @@ * the slices. User space needs to aggregate to individual counts to provide * a global picture. * - * See Documentation/perf/qcom_l3_pmu.rst for more details. + * See Documentation/admin-guide/perf/qcom_l3_pmu.rst for more details. * * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. */