aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 19:47:22 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 19:47:22 -0500
commit9073e1a804c3096eda84ee7cbf11d1f174236c75 (patch)
tree2f1b488b606bc03f8c5ce133f9158196fef07cd2 /arch
parent4937e2a6f939a41bf811378e80d71f68aa0950c6 (diff)
parent2bb9936beac2eed0c1ed907f83694bc752e159d9 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina: "Usual earth-shaking, news-breaking, rocket science pile from trivial.git" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits) doc: usb: Fix typo in Documentation/usb/gadget_configs.txt doc: add missing files to timers/00-INDEX timekeeping: Fix some trivial typos in comments mm: Fix some trivial typos in comments irq: Fix some trivial typos in comments NUMA: fix typos in Kconfig help text mm: update 00-INDEX doc: Documentation/DMA-attributes.txt fix typo DRM: comment: `halve' -> `half' Docs: Kconfig: `devlopers' -> `developers' doc: typo on word accounting in kprobes.c in mutliple architectures treewide: fix "usefull" typo treewide: fix "distingush" typo mm/Kconfig: Grammar s/an/a/ kexec: Typo s/the/then/ Documentation/kvm: Update cpuid documentation for steal time and pv eoi treewide: Fix common typo in "identify" __page_to_pfn: Fix typo in comment Correct some typos for word frequency clk: fixed-factor: Fix a trivial typo ...
Diffstat (limited to 'arch')
-rw-r--r--arch/arc/kernel/kprobes.c2
-rw-r--r--arch/arm/mach-sti/Kconfig4
-rw-r--r--arch/ia64/kernel/kprobes.c2
-rw-r--r--arch/m32r/include/asm/mmu_context.h2
-rw-r--r--arch/mips/include/asm/octeon/cvmx-pip.h4
-rw-r--r--arch/mn10300/include/asm/mmu_context.h2
-rw-r--r--arch/powerpc/kernel/kprobes.c2
-rw-r--r--arch/powerpc/platforms/pseries/nvram.c2
-rw-r--r--arch/s390/kernel/kprobes.c2
-rw-r--r--arch/sh/include/asm/mmu_context.h2
-rw-r--r--arch/sparc/kernel/kprobes.c2
-rw-r--r--arch/x86/kernel/cpu/amd.c2
-rw-r--r--arch/x86/kernel/cpu/intel_cacheinfo.c2
-rw-r--r--arch/x86/kernel/cpu/scattered.c2
14 files changed, 16 insertions, 16 deletions
diff --git a/arch/arc/kernel/kprobes.c b/arch/arc/kernel/kprobes.c
index eb1c2ee5eaf0..42b05046fad9 100644
--- a/arch/arc/kernel/kprobes.c
+++ b/arch/arc/kernel/kprobes.c
@@ -327,7 +327,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, unsigned long trapnr)
327 */ 327 */
328 328
329 /* We increment the nmissed count for accounting, 329 /* We increment the nmissed count for accounting,
330 * we can also use npre/npostfault count for accouting 330 * we can also use npre/npostfault count for accounting
331 * these specific fault cases. 331 * these specific fault cases.
332 */ 332 */
333 kprobes_inc_nmissed_count(cur); 333 kprobes_inc_nmissed_count(cur);
diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
index 835833e3c4f8..a67f83fd3f78 100644
--- a/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@ -30,7 +30,7 @@ config SOC_STIH415
30 default y 30 default y
31 help 31 help
32 This enables support for STMicroelectronics Digital Consumer 32 This enables support for STMicroelectronics Digital Consumer
33 Electronics family StiH415 parts, primarily targetted at set-top-box 33 Electronics family StiH415 parts, primarily targeted at set-top-box
34 and other digital audio/video applications using Flattned Device 34 and other digital audio/video applications using Flattned Device
35 Trees. 35 Trees.
36 36
@@ -39,7 +39,7 @@ config SOC_STIH416
39 default y 39 default y
40 help 40 help
41 This enables support for STMicroelectronics Digital Consumer 41 This enables support for STMicroelectronics Digital Consumer
42 Electronics family StiH416 parts, primarily targetted at set-top-box 42 Electronics family StiH416 parts, primarily targeted at set-top-box
43 and other digital audio/video applications using Flattened Device 43 and other digital audio/video applications using Flattened Device
44 Trees. 44 Trees.
45 45
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index f8280a766a78..074fde49c9e6 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -947,7 +947,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
947 case KPROBE_HIT_SSDONE: 947 case KPROBE_HIT_SSDONE:
948 /* 948 /*
949 * We increment the nmissed count for accounting, 949 * We increment the nmissed count for accounting,
950 * we can also use npre/npostfault count for accouting 950 * we can also use npre/npostfault count for accounting
951 * these specific fault cases. 951 * these specific fault cases.
952 */ 952 */
953 kprobes_inc_nmissed_count(cur); 953 kprobes_inc_nmissed_count(cur);
diff --git a/arch/m32r/include/asm/mmu_context.h b/arch/m32r/include/asm/mmu_context.h
index a979a4198168..9fc78fc44445 100644
--- a/arch/m32r/include/asm/mmu_context.h
+++ b/arch/m32r/include/asm/mmu_context.h
@@ -45,7 +45,7 @@ static inline void get_new_mmu_context(struct mm_struct *mm)
45 Flush all TLB and start new cycle. */ 45 Flush all TLB and start new cycle. */
46 local_flush_tlb_all(); 46 local_flush_tlb_all();
47 /* Fix version if needed. 47 /* Fix version if needed.
48 Note that we avoid version #0 to distingush NO_CONTEXT. */ 48 Note that we avoid version #0 to distinguish NO_CONTEXT. */
49 if (!mc) 49 if (!mc)
50 mmu_context_cache = mc = MMU_CONTEXT_FIRST_VERSION; 50 mmu_context_cache = mc = MMU_CONTEXT_FIRST_VERSION;
51 } 51 }
diff --git a/arch/mips/include/asm/octeon/cvmx-pip.h b/arch/mips/include/asm/octeon/cvmx-pip.h
index a76fe5a57a9f..df69bfd2b006 100644
--- a/arch/mips/include/asm/octeon/cvmx-pip.h
+++ b/arch/mips/include/asm/octeon/cvmx-pip.h
@@ -192,13 +192,13 @@ typedef struct {
192 /* Number of packets processed by PIP */ 192 /* Number of packets processed by PIP */
193 uint32_t packets; 193 uint32_t packets;
194 /* 194 /*
195 * Number of indentified L2 multicast packets. Does not 195 * Number of identified L2 multicast packets. Does not
196 * include broadcast packets. Only includes packets whose 196 * include broadcast packets. Only includes packets whose
197 * parse mode is SKIP_TO_L2 197 * parse mode is SKIP_TO_L2
198 */ 198 */
199 uint32_t multicast_packets; 199 uint32_t multicast_packets;
200 /* 200 /*
201 * Number of indentified L2 broadcast packets. Does not 201 * Number of identified L2 broadcast packets. Does not
202 * include multicast packets. Only includes packets whose 202 * include multicast packets. Only includes packets whose
203 * parse mode is SKIP_TO_L2 203 * parse mode is SKIP_TO_L2
204 */ 204 */
diff --git a/arch/mn10300/include/asm/mmu_context.h b/arch/mn10300/include/asm/mmu_context.h
index c67c2b5365a6..75dbe696f830 100644
--- a/arch/mn10300/include/asm/mmu_context.h
+++ b/arch/mn10300/include/asm/mmu_context.h
@@ -71,7 +71,7 @@ static inline unsigned long allocate_mmu_context(struct mm_struct *mm)
71 local_flush_tlb_all(); 71 local_flush_tlb_all();
72 72
73 /* fix the TLB version if needed (we avoid version #0 so as to 73 /* fix the TLB version if needed (we avoid version #0 so as to
74 * distingush MMU_NO_CONTEXT) */ 74 * distinguish MMU_NO_CONTEXT) */
75 if (!mc) 75 if (!mc)
76 *pmc = mc = MMU_CONTEXT_FIRST_VERSION; 76 *pmc = mc = MMU_CONTEXT_FIRST_VERSION;
77 } 77 }
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 2156ea90eb54..90fab64d911d 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -429,7 +429,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
429 case KPROBE_HIT_SSDONE: 429 case KPROBE_HIT_SSDONE:
430 /* 430 /*
431 * We increment the nmissed count for accounting, 431 * We increment the nmissed count for accounting,
432 * we can also use npre/npostfault count for accouting 432 * we can also use npre/npostfault count for accounting
433 * these specific fault cases. 433 * these specific fault cases.
434 */ 434 */
435 kprobes_inc_nmissed_count(cur); 435 kprobes_inc_nmissed_count(cur);
diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c
index 057fc894be51..7bfaf58d4664 100644
--- a/arch/powerpc/platforms/pseries/nvram.c
+++ b/arch/powerpc/platforms/pseries/nvram.c
@@ -31,7 +31,7 @@
31#define NVRW_CNT 0x20 31#define NVRW_CNT 0x20
32 32
33/* 33/*
34 * Set oops header version to distingush between old and new format header. 34 * Set oops header version to distinguish between old and new format header.
35 * lnx,oops-log partition max size is 4000, header version > 4000 will 35 * lnx,oops-log partition max size is 4000, header version > 4000 will
36 * help in identifying new header. 36 * help in identifying new header.
37 */ 37 */
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 59a9c35c4598..bc71a7b95af5 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -680,7 +680,7 @@ static int __kprobes kprobe_trap_handler(struct pt_regs *regs, int trapnr)
680 case KPROBE_HIT_SSDONE: 680 case KPROBE_HIT_SSDONE:
681 /* 681 /*
682 * We increment the nmissed count for accounting, 682 * We increment the nmissed count for accounting,
683 * we can also use npre/npostfault count for accouting 683 * we can also use npre/npostfault count for accounting
684 * these specific fault cases. 684 * these specific fault cases.
685 */ 685 */
686 kprobes_inc_nmissed_count(p); 686 kprobes_inc_nmissed_count(p);
diff --git a/arch/sh/include/asm/mmu_context.h b/arch/sh/include/asm/mmu_context.h
index 21c5088788da..b9d9489a5012 100644
--- a/arch/sh/include/asm/mmu_context.h
+++ b/arch/sh/include/asm/mmu_context.h
@@ -81,7 +81,7 @@ static inline void get_mmu_context(struct mm_struct *mm, unsigned int cpu)
81 81
82 /* 82 /*
83 * Fix version; Note that we avoid version #0 83 * Fix version; Note that we avoid version #0
84 * to distingush NO_CONTEXT. 84 * to distinguish NO_CONTEXT.
85 */ 85 */
86 if (!asid) 86 if (!asid)
87 asid = MMU_CONTEXT_FIRST_VERSION; 87 asid = MMU_CONTEXT_FIRST_VERSION;
diff --git a/arch/sparc/kernel/kprobes.c b/arch/sparc/kernel/kprobes.c
index 5a09fd315e5f..1b0973503197 100644
--- a/arch/sparc/kernel/kprobes.c
+++ b/arch/sparc/kernel/kprobes.c
@@ -350,7 +350,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
350 case KPROBE_HIT_SSDONE: 350 case KPROBE_HIT_SSDONE:
351 /* 351 /*
352 * We increment the nmissed count for accounting, 352 * We increment the nmissed count for accounting,
353 * we can also use npre/npostfault count for accouting 353 * we can also use npre/npostfault count for accounting
354 * these specific fault cases. 354 * these specific fault cases.
355 */ 355 */
356 kprobes_inc_nmissed_count(cur); 356 kprobes_inc_nmissed_count(cur);
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 3daece79a142..bca023bdd6b2 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -339,7 +339,7 @@ static void amd_get_topology(struct cpuinfo_x86 *c)
339#endif 339#endif
340 340
341/* 341/*
342 * On a AMD dual core setup the lower bits of the APIC id distingush the cores. 342 * On a AMD dual core setup the lower bits of the APIC id distinguish the cores.
343 * Assumes number of cores is a power of two. 343 * Assumes number of cores is a power of two.
344 */ 344 */
345static void amd_detect_cmp(struct cpuinfo_x86 *c) 345static void amd_detect_cmp(struct cpuinfo_x86 *c)
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 1414c90feaba..0641113e2965 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Routines to indentify caches on Intel CPU. 2 * Routines to identify caches on Intel CPU.
3 * 3 *
4 * Changes: 4 * Changes:
5 * Venkatesh Pallipadi : Adding cache identification through cpuid(4) 5 * Venkatesh Pallipadi : Adding cache identification through cpuid(4)
diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c
index f2cc63e9cf08..b6f794aa1693 100644
--- a/arch/x86/kernel/cpu/scattered.c
+++ b/arch/x86/kernel/cpu/scattered.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Routines to indentify additional cpu features that are scattered in 2 * Routines to identify additional cpu features that are scattered in
3 * cpuid space. 3 * cpuid space.
4 */ 4 */
5#include <linux/cpu.h> 5#include <linux/cpu.h>