diff --git a/[refs] b/[refs] index 831401e44207..34e89cde3395 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b791ccef21129f9c7e4ab8274d5d7a0ec0a2fb7c +refs/heads/master: ded23ac62776b4360d88e9b0330792d2c57fdfdf diff --git a/trunk/Documentation/cputopology.txt b/trunk/Documentation/cputopology.txt index ff280e2e1613..2b28e9ec4e3a 100644 --- a/trunk/Documentation/cputopology.txt +++ b/trunk/Documentation/cputopology.txt @@ -1,5 +1,5 @@ -Export cpu topology info by sysfs. Items (attributes) are similar +Export cpu topology info via sysfs. Items (attributes) are similar to /proc/cpuinfo. 1) /sys/devices/system/cpu/cpuX/topology/physical_package_id: @@ -12,7 +12,7 @@ represent the thread siblings to cpu X in the same core; represent the thread siblings to cpu X in the same physical package; To implement it in an architecture-neutral way, a new source file, -driver/base/topology.c, is to export the 5 attributes. +drivers/base/topology.c, is to export the 4 attributes. If one architecture wants to support this feature, it just needs to implement 4 defines, typically in file include/asm-XXX/topology.h.