Skip to contentSkip to conversation

mainline: Fix typo: change aera to area in "*.[ch]"

PATCH Superseded Wang YanQing 2 participants 3 messages Dec 8, 2011

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mainline: Fix typo: change aera to area in "*.[ch]"

The shell command below make this patch:
find . -name "*.[ch]" | xargs grep -l -w "aera" | xargs sed -i s/aera/area/g

---
 arch/x86/pci/pcbios.c            |    2 +-
 net/ipv4/netfilter/nf_nat_core.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/pci/pcbios.c +1 -1
index db0e9a5..da8fe05 100644
@@ -44,7 +44,7 @@ static inline void set_bios_x(void)
 	pcibios_enabled = 1;
 	set_memory_x(PAGE_OFFSET + BIOS_BEGIN, (BIOS_END - BIOS_BEGIN) >> PAGE_SHIFT);
 	if (__supported_pte_mask & _PAGE_NX)
-		printk(KERN_INFO "PCI : PCI BIOS aera is rw and x. Use pci=nobios if you want it NX.\n");
+		printk(KERN_INFO "PCI : PCI BIOS area is rw and x. Use pci=nobios if you want it NX.\n");
 }
 
 /*
net/ipv4/netfilter/nf_nat_core.c +1 -1
index 447bc5c..12a8b74 100644
@@ -318,7 +318,7 @@ nf_nat_setup_info(struct nf_conn *ct,
 		srchash = hash_by_src(net, nf_ct_zone(ct),
 				      &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple);
 		spin_lock_bh(&nf_nat_lock);
-		/* nf_conntrack_alter_reply might re-allocate exntension aera */
+		/* nf_conntrack_alter_reply might re-allocate exntension area */
 		nat = nfct_nat(ct);
 		nat->ct = ct;
 		hlist_add_head_rcu(&nat->bysource,
Signature · 1 line
1.7.3.4
#1 lore raw
Quoted 27 lines · Wang YanQing

The shell command below make this patch:
find . -name "*.[ch]" | xargs grep -l -w "aera" | xargs sed -i s/aera/area/g

---
 arch/x86/pci/pcbios.c            |    2 +-
 net/ipv4/netfilter/nf_nat_core.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/pci/pcbios.c +1 -1
index db0e9a5..da8fe05 100644
@@ -44,7 +44,7 @@ static inline void set_bios_x(void)
 	pcibios_enabled = 1;
 	set_memory_x(PAGE_OFFSET + BIOS_BEGIN, (BIOS_END - BIOS_BEGIN) >> PAGE_SHIFT);
 	if (__supported_pte_mask & _PAGE_NX)
-		printk(KERN_INFO "PCI : PCI BIOS aera is rw and x. Use pci=nobios if you want it NX.\n");
+		printk(KERN_INFO "PCI : PCI BIOS area is rw and x. Use pci=nobios if you want it NX.\n");
 }
 
 /*
net/ipv4/netfilter/nf_nat_core.c +0 -0
index 447bc5c..12a8b74 100644

net/ipv4/netfilter/nf_nat_core.c nf_nat_setup_info(struct nf_conn *ct, · line 321

Quoted 5 lines
net/ipv4/netfilter/nf_nat_core.c +1 -1
@@ -318,7 +318,7 @@ nf_nat_setup_info(struct nf_conn *ct,
 		srchash = hash_by_src(net, nf_ct_zone(ct),
 				      &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple);
 		spin_lock_bh(&nf_nat_lock);
-		/* nf_conntrack_alter_reply might re-allocate exntension aera */
+		/* nf_conntrack_alter_reply might re-allocate exntension area */

s/exntension/extension ?

Quoted 3 lines
net/ipv4/netfilter/nf_nat_core.c +0 -0
 		nat = nfct_nat(ct);
 		nat->ct = ct;
 		hlist_add_head_rcu(&nat->bysource,
Signature · 2 lines
Thanks
Dave
#2 lore raw
Quoted 1 line · Dave Young

s/exntension/extension ?

Yes, I will send the v2 patch!
Thanks