diff options
-rw-r--r-- | arch/m32r/include/asm/mmu_context.h | 2 | ||||
-rw-r--r-- | arch/mn10300/include/asm/mmu_context.h | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/nvram.c | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/mmu_context.h | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/amd.c | 2 | ||||
-rw-r--r-- | drivers/input/serio/i8042.c | 2 | ||||
-rw-r--r-- | drivers/md/raid5.h | 2 |
7 files changed, 7 insertions, 7 deletions
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/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/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c index d276cd3edd8f..10630eac68ec 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/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/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 903a264af981..3538a1b0aeac 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 | */ |
345 | static void amd_detect_cmp(struct cpuinfo_x86 *c) | 345 | static void amd_detect_cmp(struct cpuinfo_x86 *c) |
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 78e4de42efaa..957e387c1cbf 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c | |||
@@ -1031,7 +1031,7 @@ static void i8042_controller_reset(bool force_reset) | |||
1031 | /* | 1031 | /* |
1032 | * i8042_panic_blink() will turn the keyboard LEDs on or off and is called | 1032 | * i8042_panic_blink() will turn the keyboard LEDs on or off and is called |
1033 | * when kernel panics. Flashing LEDs is useful for users running X who may | 1033 | * when kernel panics. Flashing LEDs is useful for users running X who may |
1034 | * not see the console and will help distingushing panics from "real" | 1034 | * not see the console and will help distinguishing panics from "real" |
1035 | * lockups. | 1035 | * lockups. |
1036 | * | 1036 | * |
1037 | * Note that DELAY has a limit of 10ms so we will not get stuck here | 1037 | * Note that DELAY has a limit of 10ms so we will not get stuck here |
diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h index 70c49329ca9a..5c9797c7bbe0 100644 --- a/drivers/md/raid5.h +++ b/drivers/md/raid5.h | |||
@@ -49,7 +49,7 @@ | |||
49 | * can't distinguish between a clean block that has been generated | 49 | * can't distinguish between a clean block that has been generated |
50 | * from parity calculations, and a clean block that has been | 50 | * from parity calculations, and a clean block that has been |
51 | * successfully written to the spare ( or to parity when resyncing). | 51 | * successfully written to the spare ( or to parity when resyncing). |
52 | * To distingush these states we have a stripe bit STRIPE_INSYNC that | 52 | * To distinguish these states we have a stripe bit STRIPE_INSYNC that |
53 | * is set whenever a write is scheduled to the spare, or to the parity | 53 | * is set whenever a write is scheduled to the spare, or to the parity |
54 | * disc if there is no spare. A sync request clears this bit, and | 54 | * disc if there is no spare. A sync request clears this bit, and |
55 | * when we find it set with no buffers locked, we know the sync is | 55 | * when we find it set with no buffers locked, we know the sync is |