| Message ID | 20230802092856.819328-1-lizhijian@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | acpi,mm: fix typo sibiling -> sibling | expand |
On Wed, Aug 2, 2023 at 11:30 AM Li Zhijian <lizhijian@cn.fujitsu.com> wrote: > > First found this typo as reviewing memory tier code. Fix it by sed like: > $ sed -i 's/sibiling/sibling/g' $(git grep -l sibiling) > > so the acpi one will be corrected as well. > > Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> Please post the ACPI and mm changes as separate patches. Thanks! > --- > drivers/acpi/acpi_pad.c | 2 +- > include/linux/memory-tiers.h | 2 +- > mm/memory-tiers.c | 10 +++++----- > 3 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c > index 7a453c5ff303..7f073ca64f0e 100644 > --- a/drivers/acpi/acpi_pad.c > +++ b/drivers/acpi/acpi_pad.c > @@ -100,7 +100,7 @@ static void round_robin_cpu(unsigned int tsk_index) > for_each_cpu(cpu, pad_busy_cpus) > cpumask_or(tmp, tmp, topology_sibling_cpumask(cpu)); > cpumask_andnot(tmp, cpu_online_mask, tmp); > - /* avoid HT sibilings if possible */ > + /* avoid HT siblings if possible */ > if (cpumask_empty(tmp)) > cpumask_andnot(tmp, cpu_online_mask, pad_busy_cpus); > if (cpumask_empty(tmp)) { > diff --git a/include/linux/memory-tiers.h b/include/linux/memory-tiers.h > index fc9647b1b4f9..1e6c8ddcaa92 100644 > --- a/include/linux/memory-tiers.h > +++ b/include/linux/memory-tiers.h > @@ -22,7 +22,7 @@ > struct memory_tier; > struct memory_dev_type { > /* list of memory types that are part of same tier as this type */ > - struct list_head tier_sibiling; > + struct list_head tier_sibling; > /* abstract distance for this specific memory type */ > int adistance; > /* Nodes of same abstract distance */ > diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c > index a516e303e304..56c22470c96d 100644 > --- a/mm/memory-tiers.c > +++ b/mm/memory-tiers.c > @@ -115,7 +115,7 @@ static __always_inline nodemask_t get_memtier_nodemask(struct memory_tier *memti > nodemask_t nodes = NODE_MASK_NONE; > struct memory_dev_type *memtype; > > - list_for_each_entry(memtype, &memtier->memory_types, tier_sibiling) > + list_for_each_entry(memtype, &memtier->memory_types, tier_sibling) > nodes_or(nodes, nodes, memtype->nodes); > > return nodes; > @@ -174,7 +174,7 @@ static struct memory_tier *find_create_memory_tier(struct memory_dev_type *memty > * If the memtype is already part of a memory tier, > * just return that. > */ > - if (!list_empty(&memtype->tier_sibiling)) { > + if (!list_empty(&memtype->tier_sibling)) { > list_for_each_entry(memtier, &memory_tiers, list) { > if (adistance == memtier->adistance_start) > return memtier; > @@ -218,7 +218,7 @@ static struct memory_tier *find_create_memory_tier(struct memory_dev_type *memty > memtier = new_memtier; > > link_memtype: > - list_add(&memtype->tier_sibiling, &memtier->memory_types); > + list_add(&memtype->tier_sibling, &memtier->memory_types); > return memtier; > } > > @@ -527,7 +527,7 @@ static bool clear_node_memory_tier(int node) > memtype = node_memory_types[node].memtype; > node_clear(node, memtype->nodes); > if (nodes_empty(memtype->nodes)) { > - list_del_init(&memtype->tier_sibiling); > + list_del_init(&memtype->tier_sibling); > if (list_empty(&memtier->memory_types)) > destroy_memory_tier(memtier); > } > @@ -553,7 +553,7 @@ struct memory_dev_type *alloc_memory_type(int adistance) > return ERR_PTR(-ENOMEM); > > memtype->adistance = adistance; > - INIT_LIST_HEAD(&memtype->tier_sibiling); > + INIT_LIST_HEAD(&memtype->tier_sibling); > memtype->nodes = NODE_MASK_NONE; > kref_init(&memtype->kref); > return memtype; > -- > 2.31.1 >
Rafael, > On Wed, Aug 2, 2023 at 11:30 AM Li Zhijian <lizhijian@cn.fujitsu.com> wrote: > > > First found this typo as reviewing memory tier code. Fix it by sed > like: > $ sed -i 's/sibiling/sibling/g' $(git grep -l sibiling) > > so > the acpi one will be corrected as well. > > Signed-off-by: Li Zhijian > <lizhijian@cn.fujitsu.com> > Please post the ACPI and mm changes as separate patches. So sorry for the late reply, I haven't noticed my wrong email in this patch until my colleague tell me it appear in the mm-unstable[1] with this mistake. Do I need to send another version as you suggested. [1] https://kernel.googlesource.com/pub/scm/linux/kernel/git/akpm/mm/+/d2f2698ede41980640e884d6f8d9aa2efa4263af Thanks Zhijian > Thanks!
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c index 7a453c5ff303..7f073ca64f0e 100644 --- a/drivers/acpi/acpi_pad.c +++ b/drivers/acpi/acpi_pad.c @@ -100,7 +100,7 @@ static void round_robin_cpu(unsigned int tsk_index) for_each_cpu(cpu, pad_busy_cpus) cpumask_or(tmp, tmp, topology_sibling_cpumask(cpu)); cpumask_andnot(tmp, cpu_online_mask, tmp); - /* avoid HT sibilings if possible */ + /* avoid HT siblings if possible */ if (cpumask_empty(tmp)) cpumask_andnot(tmp, cpu_online_mask, pad_busy_cpus); if (cpumask_empty(tmp)) { diff --git a/include/linux/memory-tiers.h b/include/linux/memory-tiers.h index fc9647b1b4f9..1e6c8ddcaa92 100644 --- a/include/linux/memory-tiers.h +++ b/include/linux/memory-tiers.h @@ -22,7 +22,7 @@ struct memory_tier; struct memory_dev_type { /* list of memory types that are part of same tier as this type */ - struct list_head tier_sibiling; + struct list_head tier_sibling; /* abstract distance for this specific memory type */ int adistance; /* Nodes of same abstract distance */ diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c index a516e303e304..56c22470c96d 100644 --- a/mm/memory-tiers.c +++ b/mm/memory-tiers.c @@ -115,7 +115,7 @@ static __always_inline nodemask_t get_memtier_nodemask(struct memory_tier *memti nodemask_t nodes = NODE_MASK_NONE; struct memory_dev_type *memtype; - list_for_each_entry(memtype, &memtier->memory_types, tier_sibiling) + list_for_each_entry(memtype, &memtier->memory_types, tier_sibling) nodes_or(nodes, nodes, memtype->nodes); return nodes; @@ -174,7 +174,7 @@ static struct memory_tier *find_create_memory_tier(struct memory_dev_type *memty * If the memtype is already part of a memory tier, * just return that. */ - if (!list_empty(&memtype->tier_sibiling)) { + if (!list_empty(&memtype->tier_sibling)) { list_for_each_entry(memtier, &memory_tiers, list) { if (adistance == memtier->adistance_start) return memtier; @@ -218,7 +218,7 @@ static struct memory_tier *find_create_memory_tier(struct memory_dev_type *memty memtier = new_memtier; link_memtype: - list_add(&memtype->tier_sibiling, &memtier->memory_types); + list_add(&memtype->tier_sibling, &memtier->memory_types); return memtier; } @@ -527,7 +527,7 @@ static bool clear_node_memory_tier(int node) memtype = node_memory_types[node].memtype; node_clear(node, memtype->nodes); if (nodes_empty(memtype->nodes)) { - list_del_init(&memtype->tier_sibiling); + list_del_init(&memtype->tier_sibling); if (list_empty(&memtier->memory_types)) destroy_memory_tier(memtier); } @@ -553,7 +553,7 @@ struct memory_dev_type *alloc_memory_type(int adistance) return ERR_PTR(-ENOMEM); memtype->adistance = adistance; - INIT_LIST_HEAD(&memtype->tier_sibiling); + INIT_LIST_HEAD(&memtype->tier_sibling); memtype->nodes = NODE_MASK_NONE; kref_init(&memtype->kref); return memtype;
First found this typo as reviewing memory tier code. Fix it by sed like: $ sed -i 's/sibiling/sibling/g' $(git grep -l sibiling) so the acpi one will be corrected as well. Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> --- drivers/acpi/acpi_pad.c | 2 +- include/linux/memory-tiers.h | 2 +- mm/memory-tiers.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-)