aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang YanQing <udknight@gmail.com>2011-12-07 23:00:27 -0500
committerJiri Kosina <jkosina@suse.cz>2011-12-09 09:22:07 -0500
commit819a693b5a503788a7af54a3d95c4857780a7230 (patch)
treeb91788288c6cc851baf0e460e59568e5fb5dbe52
parentbc28633eb4fa78cedadf863c87fb1e47dc18414f (diff)
typo fixes: aera -> area, exntension -> extension
One printk and one comment typo fix. Signed-off-by: Wang YanQing <udknight@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--arch/x86/pci/pcbios.c2
-rw-r--r--net/ipv4/netfilter/nf_nat_core.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
index db0e9a51e611..da8fe0535ff4 100644
--- a/arch/x86/pci/pcbios.c
+++ b/arch/x86/pci/pcbios.c
@@ -44,7 +44,7 @@ static inline void set_bios_x(void)
44 pcibios_enabled = 1; 44 pcibios_enabled = 1;
45 set_memory_x(PAGE_OFFSET + BIOS_BEGIN, (BIOS_END - BIOS_BEGIN) >> PAGE_SHIFT); 45 set_memory_x(PAGE_OFFSET + BIOS_BEGIN, (BIOS_END - BIOS_BEGIN) >> PAGE_SHIFT);
46 if (__supported_pte_mask & _PAGE_NX) 46 if (__supported_pte_mask & _PAGE_NX)
47 printk(KERN_INFO "PCI : PCI BIOS aera is rw and x. Use pci=nobios if you want it NX.\n"); 47 printk(KERN_INFO "PCI : PCI BIOS area is rw and x. Use pci=nobios if you want it NX.\n");
48} 48}
49 49
50/* 50/*
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c
index 447bc5cfdc6c..072bb5330315 100644
--- a/net/ipv4/netfilter/nf_nat_core.c
+++ b/net/ipv4/netfilter/nf_nat_core.c
@@ -318,7 +318,7 @@ nf_nat_setup_info(struct nf_conn *ct,
318 srchash = hash_by_src(net, nf_ct_zone(ct), 318 srchash = hash_by_src(net, nf_ct_zone(ct),
319 &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple); 319 &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple);
320 spin_lock_bh(&nf_nat_lock); 320 spin_lock_bh(&nf_nat_lock);
321 /* nf_conntrack_alter_reply might re-allocate exntension aera */ 321 /* nf_conntrack_alter_reply might re-allocate extension area */
322 nat = nfct_nat(ct); 322 nat = nfct_nat(ct);
323 nat->ct = ct; 323 nat->ct = ct;
324 hlist_add_head_rcu(&nat->bysource, 324 hlist_add_head_rcu(&nat->bysource,