diff options
89 files changed, 109 insertions, 138 deletions
diff --git a/Documentation/DMA-attributes.txt b/Documentation/DMA-attributes.txt index e59480db9ee0..cc2450d80310 100644 --- a/Documentation/DMA-attributes.txt +++ b/Documentation/DMA-attributes.txt | |||
@@ -13,7 +13,7 @@ all pending DMA writes to complete, and thus provides a mechanism to | |||
13 | strictly order DMA from a device across all intervening busses and | 13 | strictly order DMA from a device across all intervening busses and |
14 | bridges. This barrier is not specific to a particular type of | 14 | bridges. This barrier is not specific to a particular type of |
15 | interconnect, it applies to the system as a whole, and so its | 15 | interconnect, it applies to the system as a whole, and so its |
16 | implementation must account for the idiosyncracies of the system all | 16 | implementation must account for the idiosyncrasies of the system all |
17 | the way from the DMA device to memory. | 17 | the way from the DMA device to memory. |
18 | 18 | ||
19 | As an example of a situation where DMA_ATTR_WRITE_BARRIER would be | 19 | As an example of a situation where DMA_ATTR_WRITE_BARRIER would be |
@@ -60,7 +60,7 @@ such mapping is non-trivial task and consumes very limited resources | |||
60 | Buffers allocated with this attribute can be only passed to user space | 60 | Buffers allocated with this attribute can be only passed to user space |
61 | by calling dma_mmap_attrs(). By using this API, you are guaranteeing | 61 | by calling dma_mmap_attrs(). By using this API, you are guaranteeing |
62 | that you won't dereference the pointer returned by dma_alloc_attr(). You | 62 | that you won't dereference the pointer returned by dma_alloc_attr(). You |
63 | can threat it as a cookie that must be passed to dma_mmap_attrs() and | 63 | can treat it as a cookie that must be passed to dma_mmap_attrs() and |
64 | dma_free_attrs(). Make sure that both of these also get this attribute | 64 | dma_free_attrs(). Make sure that both of these also get this attribute |
65 | set on each call. | 65 | set on each call. |
66 | 66 | ||
@@ -82,7 +82,7 @@ to 'device' domain, what synchronizes CPU caches for the given region | |||
82 | (usually it means that the cache has been flushed or invalidated | 82 | (usually it means that the cache has been flushed or invalidated |
83 | depending on the dma direction). However, next calls to | 83 | depending on the dma direction). However, next calls to |
84 | dma_map_{single,page,sg}() for other devices will perform exactly the | 84 | dma_map_{single,page,sg}() for other devices will perform exactly the |
85 | same sychronization operation on the CPU cache. CPU cache sychronization | 85 | same synchronization operation on the CPU cache. CPU cache synchronization |
86 | might be a time consuming operation, especially if the buffers are | 86 | might be a time consuming operation, especially if the buffers are |
87 | large, so it is highly recommended to avoid it if possible. | 87 | large, so it is highly recommended to avoid it if possible. |
88 | DMA_ATTR_SKIP_CPU_SYNC allows platform code to skip synchronization of | 88 | DMA_ATTR_SKIP_CPU_SYNC allows platform code to skip synchronization of |
diff --git a/Documentation/timers/00-INDEX b/Documentation/timers/00-INDEX index a9248da5cdbc..ef2ccbf77fa2 100644 --- a/Documentation/timers/00-INDEX +++ b/Documentation/timers/00-INDEX | |||
@@ -8,5 +8,9 @@ hpet_example.c | |||
8 | - sample hpet timer test program | 8 | - sample hpet timer test program |
9 | hrtimers.txt | 9 | hrtimers.txt |
10 | - subsystem for high-resolution kernel timers | 10 | - subsystem for high-resolution kernel timers |
11 | NO_HZ.txt | ||
12 | - Summary of the different methods for the scheduler clock-interrupts management. | ||
13 | timers-howto.txt | ||
14 | - how to insert delays in the kernel the right (tm) way. | ||
11 | timer_stats.txt | 15 | timer_stats.txt |
12 | - timer usage statistics | 16 | - timer usage statistics |
diff --git a/Documentation/usb/gadget_configfs.txt b/Documentation/usb/gadget_configfs.txt index 8ec2a67c39b7..4cf53e406613 100644 --- a/Documentation/usb/gadget_configfs.txt +++ b/Documentation/usb/gadget_configfs.txt | |||
@@ -26,7 +26,7 @@ Linux provides a number of functions for gadgets to use. | |||
26 | Creating a gadget means deciding what configurations there will be | 26 | Creating a gadget means deciding what configurations there will be |
27 | and which functions each configuration will provide. | 27 | and which functions each configuration will provide. |
28 | 28 | ||
29 | Configfs (please see Documentation/filesystems/configfs/*) lends itslef nicely | 29 | Configfs (please see Documentation/filesystems/configfs/*) lends itself nicely |
30 | for the purpose of telling the kernel about the above mentioned decision. | 30 | for the purpose of telling the kernel about the above mentioned decision. |
31 | This document is about how to do it. | 31 | This document is about how to do it. |
32 | 32 | ||
@@ -99,7 +99,7 @@ directories must be created: | |||
99 | $ mkdir configs/<name>.<number> | 99 | $ mkdir configs/<name>.<number> |
100 | 100 | ||
101 | where <name> can be any string which is legal in a filesystem and the | 101 | where <name> can be any string which is legal in a filesystem and the |
102 | <numebr> is the configuration's number, e.g.: | 102 | <number> is the configuration's number, e.g.: |
103 | 103 | ||
104 | $ mkdir configs/c.1 | 104 | $ mkdir configs/c.1 |
105 | 105 | ||
@@ -327,7 +327,7 @@ from the buffer to the cs), but it is up to the implementer of the | |||
327 | two functions to decide what they actually do. | 327 | two functions to decide what they actually do. |
328 | 328 | ||
329 | typedef struct configured_structure cs; | 329 | typedef struct configured_structure cs; |
330 | typedef struc specific_attribute sa; | 330 | typedef struct specific_attribute sa; |
331 | 331 | ||
332 | sa | 332 | sa |
333 | +----------------------------------+ | 333 | +----------------------------------+ |
diff --git a/Documentation/vm/00-INDEX b/Documentation/vm/00-INDEX index 5481c8ba3412..a39d06680e1c 100644 --- a/Documentation/vm/00-INDEX +++ b/Documentation/vm/00-INDEX | |||
@@ -4,10 +4,12 @@ active_mm.txt | |||
4 | - An explanation from Linus about tsk->active_mm vs tsk->mm. | 4 | - An explanation from Linus about tsk->active_mm vs tsk->mm. |
5 | balance | 5 | balance |
6 | - various information on memory balancing. | 6 | - various information on memory balancing. |
7 | hugepage-mmap.c | 7 | cleancache.txt |
8 | - Example app using huge page memory with the mmap system call. | 8 | - Intro to cleancache and page-granularity victim cache. |
9 | hugepage-shm.c | 9 | frontswap.txt |
10 | - Example app using huge page memory with Sys V shared memory system calls. | 10 | - Outline frontswap, part of the transcendent memory frontend. |
11 | highmem.txt | ||
12 | - Outline of highmem and common issues. | ||
11 | hugetlbpage.txt | 13 | hugetlbpage.txt |
12 | - a brief summary of hugetlbpage support in the Linux kernel. | 14 | - a brief summary of hugetlbpage support in the Linux kernel. |
13 | hwpoison.txt | 15 | hwpoison.txt |
@@ -16,21 +18,23 @@ ksm.txt | |||
16 | - how to use the Kernel Samepage Merging feature. | 18 | - how to use the Kernel Samepage Merging feature. |
17 | locking | 19 | locking |
18 | - info on how locking and synchronization is done in the Linux vm code. | 20 | - info on how locking and synchronization is done in the Linux vm code. |
19 | map_hugetlb.c | ||
20 | - an example program that uses the MAP_HUGETLB mmap flag. | ||
21 | numa | 21 | numa |
22 | - information about NUMA specific code in the Linux vm. | 22 | - information about NUMA specific code in the Linux vm. |
23 | numa_memory_policy.txt | 23 | numa_memory_policy.txt |
24 | - documentation of concepts and APIs of the 2.6 memory policy support. | 24 | - documentation of concepts and APIs of the 2.6 memory policy support. |
25 | overcommit-accounting | 25 | overcommit-accounting |
26 | - description of the Linux kernels overcommit handling modes. | 26 | - description of the Linux kernels overcommit handling modes. |
27 | page-types.c | ||
28 | - Tool for querying page flags | ||
29 | page_migration | 27 | page_migration |
30 | - description of page migration in NUMA systems. | 28 | - description of page migration in NUMA systems. |
31 | pagemap.txt | 29 | pagemap.txt |
32 | - pagemap, from the userspace perspective | 30 | - pagemap, from the userspace perspective |
33 | slub.txt | 31 | slub.txt |
34 | - a short users guide for SLUB. | 32 | - a short users guide for SLUB. |
33 | soft-dirty.txt | ||
34 | - short explanation for soft-dirty PTEs | ||
35 | transhuge.txt | ||
36 | - Transparent Hugepage Support, alternative way of using hugepages. | ||
35 | unevictable-lru.txt | 37 | unevictable-lru.txt |
36 | - Unevictable LRU infrastructure | 38 | - Unevictable LRU infrastructure |
39 | zswap.txt | ||
40 | - Intro to compressed cache for swap pages | ||
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 | */ |
345 | static void amd_detect_cmp(struct cpuinfo_x86 *c) | 345 | static 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> |
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c index 13e045025c33..517af700399d 100644 --- a/drivers/acpi/acpica/utobject.c +++ b/drivers/acpi/acpica/utobject.c | |||
@@ -356,7 +356,7 @@ u8 acpi_ut_valid_internal_object(void *object) | |||
356 | default: | 356 | default: |
357 | 357 | ||
358 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, | 358 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, |
359 | "%p is not not an ACPI operand obj [%s]\n", | 359 | "%p is not an ACPI operand obj [%s]\n", |
360 | object, acpi_ut_get_descriptor_name(object))); | 360 | object, acpi_ut_get_descriptor_name(object))); |
361 | break; | 361 | break; |
362 | } | 362 | } |
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c index 99802d6f3c60..165c2c299e57 100644 --- a/drivers/base/dma-contiguous.c +++ b/drivers/base/dma-contiguous.c | |||
@@ -49,7 +49,7 @@ struct cma *dma_contiguous_default_area; | |||
49 | 49 | ||
50 | /* | 50 | /* |
51 | * Default global CMA area size can be defined in kernel's .config. | 51 | * Default global CMA area size can be defined in kernel's .config. |
52 | * This is usefull mainly for distro maintainers to create a kernel | 52 | * This is useful mainly for distro maintainers to create a kernel |
53 | * that works correctly for most supported systems. | 53 | * that works correctly for most supported systems. |
54 | * The size can be set in bytes or as a percentage of the total memory | 54 | * The size can be set in bytes or as a percentage of the total memory |
55 | * in the system. | 55 | * in the system. |
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c index 0e1d89b4321b..d9e3f671c2ea 100644 --- a/drivers/clk/clk-fixed-factor.c +++ b/drivers/clk/clk-fixed-factor.c | |||
@@ -117,7 +117,7 @@ void __init of_fixed_factor_clk_setup(struct device_node *node) | |||
117 | } | 117 | } |
118 | 118 | ||
119 | if (of_property_read_u32(node, "clock-mult", &mult)) { | 119 | if (of_property_read_u32(node, "clock-mult", &mult)) { |
120 | pr_err("%s Fixed factor clock <%s> must have a clokc-mult property\n", | 120 | pr_err("%s Fixed factor clock <%s> must have a clock-mult property\n", |
121 | __func__, node->name); | 121 | __func__, node->name); |
122 | return; | 122 | return; |
123 | } | 123 | } |
diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86 index 6897ad85b046..d369349eeaab 100644 --- a/drivers/cpufreq/Kconfig.x86 +++ b/drivers/cpufreq/Kconfig.x86 | |||
@@ -129,7 +129,7 @@ config X86_AMD_FREQ_SENSITIVITY | |||
129 | help | 129 | help |
130 | This adds AMD-specific powersave bias function to the ondemand | 130 | This adds AMD-specific powersave bias function to the ondemand |
131 | governor, which allows it to make more power-conscious frequency | 131 | governor, which allows it to make more power-conscious frequency |
132 | change decisions based on feedback from hardware (availble on AMD | 132 | change decisions based on feedback from hardware (available on AMD |
133 | Family 16h and above). | 133 | Family 16h and above). |
134 | 134 | ||
135 | Hardware feedback tells software how "sensitive" to frequency changes | 135 | Hardware feedback tells software how "sensitive" to frequency changes |
diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c index 7b6dc06b1bd4..f3c22874da75 100644 --- a/drivers/cpufreq/exynos-cpufreq.c +++ b/drivers/cpufreq/exynos-cpufreq.c | |||
@@ -67,7 +67,7 @@ static int exynos_cpufreq_scale(unsigned int target_freq) | |||
67 | /* | 67 | /* |
68 | * The policy max have been changed so that we cannot get proper | 68 | * The policy max have been changed so that we cannot get proper |
69 | * old_index with cpufreq_frequency_table_target(). Thus, ignore | 69 | * old_index with cpufreq_frequency_table_target(). Thus, ignore |
70 | * policy and get the index from the raw freqeuncy table. | 70 | * policy and get the index from the raw frequency table. |
71 | */ | 71 | */ |
72 | old_index = exynos_cpufreq_get_index(old_freq); | 72 | old_index = exynos_cpufreq_get_index(old_freq); |
73 | if (old_index < 0) { | 73 | if (old_index < 0) { |
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index c61a6eccf169..dd2874ec1927 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
@@ -313,7 +313,7 @@ config MMP_PDMA | |||
313 | depends on (ARCH_MMP || ARCH_PXA) | 313 | depends on (ARCH_MMP || ARCH_PXA) |
314 | select DMA_ENGINE | 314 | select DMA_ENGINE |
315 | help | 315 | help |
316 | Support the MMP PDMA engine for PXA and MMP platfrom. | 316 | Support the MMP PDMA engine for PXA and MMP platform. |
317 | 317 | ||
318 | config DMA_JZ4740 | 318 | config DMA_JZ4740 |
319 | tristate "JZ4740 DMA support" | 319 | tristate "JZ4740 DMA support" |
diff --git a/drivers/fmc/Kconfig b/drivers/fmc/Kconfig index c01cf45bc3d8..3a75f4256d08 100644 --- a/drivers/fmc/Kconfig +++ b/drivers/fmc/Kconfig | |||
@@ -46,6 +46,6 @@ config FMC_CHARDEV | |||
46 | This driver matches every mezzanine device and allows user | 46 | This driver matches every mezzanine device and allows user |
47 | space to read and write registers using a char device. It | 47 | space to read and write registers using a char device. It |
48 | can be used to write user-space drivers, or just get | 48 | can be used to write user-space drivers, or just get |
49 | aquainted with a mezzanine before writing its specific driver. | 49 | acquainted with a mezzanine before writing its specific driver. |
50 | 50 | ||
51 | endif # FMC | 51 | endif # FMC |
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index d80d95289e10..64c34d5876ff 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
@@ -455,8 +455,8 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc) | |||
455 | /* Dot clock in Hz: */ | 455 | /* Dot clock in Hz: */ |
456 | dotclock = (u64) crtc->hwmode.clock * 1000; | 456 | dotclock = (u64) crtc->hwmode.clock * 1000; |
457 | 457 | ||
458 | /* Fields of interlaced scanout modes are only halve a frame duration. | 458 | /* Fields of interlaced scanout modes are only half a frame duration. |
459 | * Double the dotclock to get halve the frame-/line-/pixelduration. | 459 | * Double the dotclock to get half the frame-/line-/pixelduration. |
460 | */ | 460 | */ |
461 | if (crtc->hwmode.flags & DRM_MODE_FLAG_INTERLACE) | 461 | if (crtc->hwmode.flags & DRM_MODE_FLAG_INTERLACE) |
462 | dotclock *= 2; | 462 | dotclock *= 2; |
diff --git a/drivers/infiniband/ulp/isert/Kconfig b/drivers/infiniband/ulp/isert/Kconfig index ce3fd32167dc..02f9759ebb1a 100644 --- a/drivers/infiniband/ulp/isert/Kconfig +++ b/drivers/infiniband/ulp/isert/Kconfig | |||
@@ -1,5 +1,5 @@ | |||
1 | config INFINIBAND_ISERT | 1 | config INFINIBAND_ISERT |
2 | tristate "iSCSI Extentions for RDMA (iSER) target support" | 2 | tristate "iSCSI Extensions for RDMA (iSER) target support" |
3 | depends on INET && INFINIBAND_ADDR_TRANS && TARGET_CORE && ISCSI_TARGET | 3 | depends on INET && INFINIBAND_ADDR_TRANS && TARGET_CORE && ISCSI_TARGET |
4 | ---help--- | 4 | ---help--- |
5 | Support for iSCSI Extentions for RDMA (iSER) Target on Infiniband fabrics. | 5 | Support for iSCSI Extensions for RDMA (iSER) Target on Infiniband fabrics. |
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 52c9ebf94729..020053fa5aaa 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c | |||
@@ -1036,7 +1036,7 @@ static void i8042_controller_reset(bool force_reset) | |||
1036 | /* | 1036 | /* |
1037 | * i8042_panic_blink() will turn the keyboard LEDs on or off and is called | 1037 | * i8042_panic_blink() will turn the keyboard LEDs on or off and is called |
1038 | * when kernel panics. Flashing LEDs is useful for users running X who may | 1038 | * when kernel panics. Flashing LEDs is useful for users running X who may |
1039 | * not see the console and will help distingushing panics from "real" | 1039 | * not see the console and will help distinguishing panics from "real" |
1040 | * lockups. | 1040 | * lockups. |
1041 | * | 1041 | * |
1042 | * Note that DELAY has a limit of 10ms so we will not get stuck here | 1042 | * 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 2113ffa82c7a..b42e6b462eda 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 |
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index d18be19c96cd..cbc9ee9bec2b 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig | |||
@@ -646,7 +646,7 @@ config VIDEO_UPD64083 | |||
646 | To compile this driver as a module, choose M here: the | 646 | To compile this driver as a module, choose M here: the |
647 | module will be called upd64083. | 647 | module will be called upd64083. |
648 | 648 | ||
649 | comment "Miscelaneous helper chips" | 649 | comment "Miscellaneous helper chips" |
650 | 650 | ||
651 | config VIDEO_THS7303 | 651 | config VIDEO_THS7303 |
652 | tristate "THS7303/53 Video Amplifier" | 652 | tristate "THS7303/53 Video Amplifier" |
diff --git a/drivers/media/i2c/adv7183.c b/drivers/media/i2c/adv7183.c index 6f738d8e3a8f..d45e0e3a781d 100644 --- a/drivers/media/i2c/adv7183.c +++ b/drivers/media/i2c/adv7183.c | |||
@@ -178,7 +178,7 @@ static int adv7183_log_status(struct v4l2_subdev *sd) | |||
178 | adv7183_read(sd, ADV7183_VS_FIELD_CTRL_1), | 178 | adv7183_read(sd, ADV7183_VS_FIELD_CTRL_1), |
179 | adv7183_read(sd, ADV7183_VS_FIELD_CTRL_2), | 179 | adv7183_read(sd, ADV7183_VS_FIELD_CTRL_2), |
180 | adv7183_read(sd, ADV7183_VS_FIELD_CTRL_3)); | 180 | adv7183_read(sd, ADV7183_VS_FIELD_CTRL_3)); |
181 | v4l2_info(sd, "adv7183: Hsync positon control 1 2 and 3 = 0x%02x 0x%02x 0x%02x\n", | 181 | v4l2_info(sd, "adv7183: Hsync position control 1 2 and 3 = 0x%02x 0x%02x 0x%02x\n", |
182 | adv7183_read(sd, ADV7183_HS_POS_CTRL_1), | 182 | adv7183_read(sd, ADV7183_HS_POS_CTRL_1), |
183 | adv7183_read(sd, ADV7183_HS_POS_CTRL_2), | 183 | adv7183_read(sd, ADV7183_HS_POS_CTRL_2), |
184 | adv7183_read(sd, ADV7183_HS_POS_CTRL_3)); | 184 | adv7183_read(sd, ADV7183_HS_POS_CTRL_3)); |
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c index b76ec0e7e685..31f40b342049 100644 --- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c +++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c | |||
@@ -1651,7 +1651,7 @@ static int s5c73m3_probe(struct i2c_client *client, | |||
1651 | if (ret < 0) | 1651 | if (ret < 0) |
1652 | goto out_err; | 1652 | goto out_err; |
1653 | 1653 | ||
1654 | v4l2_info(sd, "%s: completed succesfully\n", __func__); | 1654 | v4l2_info(sd, "%s: completed successfully\n", __func__); |
1655 | return 0; | 1655 | return 0; |
1656 | 1656 | ||
1657 | out_err: | 1657 | out_err: |
diff --git a/drivers/media/rc/keymaps/rc-dib0700-nec.c b/drivers/media/rc/keymaps/rc-dib0700-nec.c index 4d13a7f2e5c3..492a05ade7e1 100644 --- a/drivers/media/rc/keymaps/rc-dib0700-nec.c +++ b/drivers/media/rc/keymaps/rc-dib0700-nec.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * TODO: This table is a real mess, as it merges RC codes from several | 5 | * TODO: This table is a real mess, as it merges RC codes from several |
6 | * devices into a big table. It also has both RC-5 and NEC codes inside. | 6 | * devices into a big table. It also has both RC-5 and NEC codes inside. |
7 | * It should be broken into small tables, and the protocols should properly | 7 | * It should be broken into small tables, and the protocols should properly |
8 | * be indentificated. | 8 | * be identificated. |
9 | * | 9 | * |
10 | * The table were imported from dib0700_devices.c. | 10 | * The table were imported from dib0700_devices.c. |
11 | * | 11 | * |
diff --git a/drivers/media/rc/keymaps/rc-dib0700-rc5.c b/drivers/media/rc/keymaps/rc-dib0700-rc5.c index ba81d9697cfc..454ea596a7ee 100644 --- a/drivers/media/rc/keymaps/rc-dib0700-rc5.c +++ b/drivers/media/rc/keymaps/rc-dib0700-rc5.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * TODO: This table is a real mess, as it merges RC codes from several | 5 | * TODO: This table is a real mess, as it merges RC codes from several |
6 | * devices into a big table. It also has both RC-5 and NEC codes inside. | 6 | * devices into a big table. It also has both RC-5 and NEC codes inside. |
7 | * It should be broken into small tables, and the protocols should properly | 7 | * It should be broken into small tables, and the protocols should properly |
8 | * be indentificated. | 8 | * be identificated. |
9 | * | 9 | * |
10 | * The table were imported from dib0700_devices.c. | 10 | * The table were imported from dib0700_devices.c. |
11 | * | 11 | * |
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index b7c74a73d371..62a60caa5d1f 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig | |||
@@ -676,14 +676,14 @@ menu "STMicroelectronics STMPE Interface Drivers" | |||
676 | depends on MFD_STMPE | 676 | depends on MFD_STMPE |
677 | 677 | ||
678 | config STMPE_I2C | 678 | config STMPE_I2C |
679 | bool "STMicroelectronics STMPE I2C Inteface" | 679 | bool "STMicroelectronics STMPE I2C Interface" |
680 | depends on I2C=y | 680 | depends on I2C=y |
681 | default y | 681 | default y |
682 | help | 682 | help |
683 | This is used to enable I2C interface of STMPE | 683 | This is used to enable I2C interface of STMPE |
684 | 684 | ||
685 | config STMPE_SPI | 685 | config STMPE_SPI |
686 | bool "STMicroelectronics STMPE SPI Inteface" | 686 | bool "STMicroelectronics STMPE SPI Interface" |
687 | depends on SPI_MASTER | 687 | depends on SPI_MASTER |
688 | help | 688 | help |
689 | This is used to enable SPI interface of STMPE | 689 | This is used to enable SPI interface of STMPE |
diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c index bd1cb672034f..1b0265e85a06 100644 --- a/drivers/mtd/nand/docg4.c +++ b/drivers/mtd/nand/docg4.c | |||
@@ -491,7 +491,7 @@ static uint8_t docg4_read_byte(struct mtd_info *mtd) | |||
491 | return status; | 491 | return status; |
492 | } | 492 | } |
493 | 493 | ||
494 | dev_warn(doc->dev, "unexpectd call to read_byte()\n"); | 494 | dev_warn(doc->dev, "unexpected call to read_byte()\n"); |
495 | 495 | ||
496 | return 0; | 496 | return 0; |
497 | } | 497 | } |
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c index fda26679f7d5..194928214606 100644 --- a/drivers/net/ethernet/mellanox/mlx4/fw.c +++ b/drivers/net/ethernet/mellanox/mlx4/fw.c | |||
@@ -1774,7 +1774,7 @@ void mlx4_opreq_action(struct work_struct *work) | |||
1774 | MLX4_CMD_GET_OP_REQ, MLX4_CMD_TIME_CLASS_A, | 1774 | MLX4_CMD_GET_OP_REQ, MLX4_CMD_TIME_CLASS_A, |
1775 | MLX4_CMD_NATIVE); | 1775 | MLX4_CMD_NATIVE); |
1776 | if (err) { | 1776 | if (err) { |
1777 | mlx4_err(dev, "Failed to retreive required operation: %d\n", | 1777 | mlx4_err(dev, "Failed to retrieve required operation: %d\n", |
1778 | err); | 1778 | err); |
1779 | return; | 1779 | return; |
1780 | } | 1780 | } |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c index a01a6a74ee3a..b1cb0ffb15c7 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | |||
@@ -1730,7 +1730,7 @@ static void qlcnic_extend_lb_idc_cmpltn_wait(struct qlcnic_adapter *adapter, | |||
1730 | struct qlcnic_hardware_context *ahw = adapter->ahw; | 1730 | struct qlcnic_hardware_context *ahw = adapter->ahw; |
1731 | int temp; | 1731 | int temp; |
1732 | 1732 | ||
1733 | netdev_info(adapter->netdev, "Recieved loopback IDC time extend event for 0x%x seconds\n", | 1733 | netdev_info(adapter->netdev, "Received loopback IDC time extend event for 0x%x seconds\n", |
1734 | ahw->extend_lb_time); | 1734 | ahw->extend_lb_time); |
1735 | temp = ahw->extend_lb_time * 1000; | 1735 | temp = ahw->extend_lb_time * 1000; |
1736 | *max_wait_count += temp / QLC_83XX_LB_MSLEEP_COUNT; | 1736 | *max_wait_count += temp / QLC_83XX_LB_MSLEEP_COUNT; |
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index 7bbd318bc93e..befa45f809c3 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
@@ -627,7 +627,7 @@ static int ali_ircc_setup(chipio_t *info) | |||
627 | /* | 627 | /* |
628 | * Function ali_ircc_read_dongle_id (int index, info) | 628 | * Function ali_ircc_read_dongle_id (int index, info) |
629 | * | 629 | * |
630 | * Try to read dongle indentification. This procedure needs to be executed | 630 | * Try to read dongle identification. This procedure needs to be executed |
631 | * once after power-on/reset. It also needs to be used whenever you suspect | 631 | * once after power-on/reset. It also needs to be used whenever you suspect |
632 | * that the user may have plugged/unplugged the IrDA Dongle. | 632 | * that the user may have plugged/unplugged the IrDA Dongle. |
633 | */ | 633 | */ |
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index ceeb53737f86..66bc03bdb138 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
@@ -1035,7 +1035,7 @@ static int nsc_ircc_setup(chipio_t *info) | |||
1035 | /* | 1035 | /* |
1036 | * Function nsc_ircc_read_dongle_id (void) | 1036 | * Function nsc_ircc_read_dongle_id (void) |
1037 | * | 1037 | * |
1038 | * Try to read dongle indentification. This procedure needs to be executed | 1038 | * Try to read dongle identification. This procedure needs to be executed |
1039 | * once after power-on/reset. It also needs to be used whenever you suspect | 1039 | * once after power-on/reset. It also needs to be used whenever you suspect |
1040 | * that the user may have plugged/unplugged the IrDA Dongle. | 1040 | * that the user may have plugged/unplugged the IrDA Dongle. |
1041 | */ | 1041 | */ |
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index f8d59c7b9082..9e86a811086f 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c | |||
@@ -2363,7 +2363,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev, | |||
2363 | break; | 2363 | break; |
2364 | default: | 2364 | default: |
2365 | ret = -ENODEV; | 2365 | ret = -ENODEV; |
2366 | ath10k_err("Unkown device ID: %d\n", pci_dev->device); | 2366 | ath10k_err("Unknown device ID: %d\n", pci_dev->device); |
2367 | goto err_ar_pci; | 2367 | goto err_ar_pci; |
2368 | } | 2368 | } |
2369 | 2369 | ||
diff --git a/drivers/net/wireless/ath/ath5k/dma.c b/drivers/net/wireless/ath/ath5k/dma.c index ce86f158423b..ba200b24be64 100644 --- a/drivers/net/wireless/ath/ath5k/dma.c +++ b/drivers/net/wireless/ath/ath5k/dma.c | |||
@@ -661,7 +661,7 @@ ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask) | |||
661 | ah->ah_txq_isr_txok_all |= AR5K_REG_MS(sisr1, | 661 | ah->ah_txq_isr_txok_all |= AR5K_REG_MS(sisr1, |
662 | AR5K_SISR1_QCU_TXEOL); | 662 | AR5K_SISR1_QCU_TXEOL); |
663 | 663 | ||
664 | /* Currently this is not much usefull since we treat | 664 | /* Currently this is not much useful since we treat |
665 | * all queues the same way if we get a TXURN (update | 665 | * all queues the same way if we get a TXURN (update |
666 | * tx trigger level) but we might need it later on*/ | 666 | * tx trigger level) but we might need it later on*/ |
667 | if (pisr & AR5K_ISR_TXURN) | 667 | if (pisr & AR5K_ISR_TXURN) |
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index 23f8d1ce877d..a00132e31ec7 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c | |||
@@ -906,7 +906,7 @@ static int tps65910_set_ext_sleep_config(struct tps65910_reg *pmic, | |||
906 | } | 906 | } |
907 | ret = tps65910_reg_write(pmic->mfd, sr_reg_add, 0); | 907 | ret = tps65910_reg_write(pmic->mfd, sr_reg_add, 0); |
908 | if (ret < 0) { | 908 | if (ret < 0) { |
909 | dev_err(mfd->dev, "Error in settting sr register\n"); | 909 | dev_err(mfd->dev, "Error in setting sr register\n"); |
910 | return ret; | 910 | return ret; |
911 | } | 911 | } |
912 | } | 912 | } |
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c index 132a905b6bdb..0ca64484cfa3 100644 --- a/drivers/s390/scsi/zfcp_dbf.c +++ b/drivers/s390/scsi/zfcp_dbf.c | |||
@@ -344,7 +344,7 @@ void zfcp_dbf_san(char *tag, struct zfcp_dbf *dbf, void *data, u8 id, u16 len, | |||
344 | 344 | ||
345 | /** | 345 | /** |
346 | * zfcp_dbf_san_req - trace event for issued SAN request | 346 | * zfcp_dbf_san_req - trace event for issued SAN request |
347 | * @tag: indentifier for event | 347 | * @tag: identifier for event |
348 | * @fsf_req: request containing issued CT data | 348 | * @fsf_req: request containing issued CT data |
349 | * d_id: destination ID | 349 | * d_id: destination ID |
350 | */ | 350 | */ |
@@ -361,7 +361,7 @@ void zfcp_dbf_san_req(char *tag, struct zfcp_fsf_req *fsf, u32 d_id) | |||
361 | 361 | ||
362 | /** | 362 | /** |
363 | * zfcp_dbf_san_res - trace event for received SAN request | 363 | * zfcp_dbf_san_res - trace event for received SAN request |
364 | * @tag: indentifier for event | 364 | * @tag: identifier for event |
365 | * @fsf_req: request containing issued CT data | 365 | * @fsf_req: request containing issued CT data |
366 | */ | 366 | */ |
367 | void zfcp_dbf_san_res(char *tag, struct zfcp_fsf_req *fsf) | 367 | void zfcp_dbf_san_res(char *tag, struct zfcp_fsf_req *fsf) |
@@ -377,7 +377,7 @@ void zfcp_dbf_san_res(char *tag, struct zfcp_fsf_req *fsf) | |||
377 | 377 | ||
378 | /** | 378 | /** |
379 | * zfcp_dbf_san_in_els - trace event for incoming ELS | 379 | * zfcp_dbf_san_in_els - trace event for incoming ELS |
380 | * @tag: indentifier for event | 380 | * @tag: identifier for event |
381 | * @fsf_req: request containing issued CT data | 381 | * @fsf_req: request containing issued CT data |
382 | */ | 382 | */ |
383 | void zfcp_dbf_san_in_els(char *tag, struct zfcp_fsf_req *fsf) | 383 | void zfcp_dbf_san_in_els(char *tag, struct zfcp_fsf_req *fsf) |
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c index 33c52bc2c7b4..97fd450aff09 100644 --- a/drivers/scsi/arcmsr/arcmsr_hba.c +++ b/drivers/scsi/arcmsr/arcmsr_hba.c | |||
@@ -1035,7 +1035,6 @@ static void arcmsr_remove(struct pci_dev *pdev) | |||
1035 | pci_release_regions(pdev); | 1035 | pci_release_regions(pdev); |
1036 | scsi_host_put(host); | 1036 | scsi_host_put(host); |
1037 | pci_disable_device(pdev); | 1037 | pci_disable_device(pdev); |
1038 | pci_set_drvdata(pdev, NULL); | ||
1039 | } | 1038 | } |
1040 | 1039 | ||
1041 | static void arcmsr_shutdown(struct pci_dev *pdev) | 1040 | static void arcmsr_shutdown(struct pci_dev *pdev) |
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c index 15a629d8ed08..a795d81ef875 100644 --- a/drivers/scsi/atp870u.c +++ b/drivers/scsi/atp870u.c | |||
@@ -3144,8 +3144,6 @@ static void atp870u_remove (struct pci_dev *pdev) | |||
3144 | atp870u_free_tables(pshost); | 3144 | atp870u_free_tables(pshost); |
3145 | printk(KERN_INFO "scsi_host_put : %p\n",pshost); | 3145 | printk(KERN_INFO "scsi_host_put : %p\n",pshost); |
3146 | scsi_host_put(pshost); | 3146 | scsi_host_put(pshost); |
3147 | printk(KERN_INFO "pci_set_drvdata : %p\n",pdev); | ||
3148 | pci_set_drvdata(pdev, NULL); | ||
3149 | } | 3147 | } |
3150 | MODULE_LICENSE("GPL"); | 3148 | MODULE_LICENSE("GPL"); |
3151 | 3149 | ||
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index 7591fa4e28bb..fc80a325a1e6 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c | |||
@@ -804,7 +804,6 @@ bfad_pci_uninit(struct pci_dev *pdev, struct bfad_s *bfad) | |||
804 | /* Disable PCIE Advanced Error Recovery (AER) */ | 804 | /* Disable PCIE Advanced Error Recovery (AER) */ |
805 | pci_disable_pcie_error_reporting(pdev); | 805 | pci_disable_pcie_error_reporting(pdev); |
806 | pci_disable_device(pdev); | 806 | pci_disable_device(pdev); |
807 | pci_set_drvdata(pdev, NULL); | ||
808 | } | 807 | } |
809 | 808 | ||
810 | bfa_status_t | 809 | bfa_status_t |
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c index 5be718c241c4..e4cf23df4b4f 100644 --- a/drivers/scsi/bnx2i/bnx2i_hwi.c +++ b/drivers/scsi/bnx2i/bnx2i_hwi.c | |||
@@ -126,7 +126,7 @@ static void bnx2i_iscsi_license_error(struct bnx2i_hba *hba, u32 error_code) | |||
126 | 126 | ||
127 | /** | 127 | /** |
128 | * bnx2i_arm_cq_event_coalescing - arms CQ to enable EQ notification | 128 | * bnx2i_arm_cq_event_coalescing - arms CQ to enable EQ notification |
129 | * @ep: endpoint (transport indentifier) structure | 129 | * @ep: endpoint (transport identifier) structure |
130 | * @action: action, ARM or DISARM. For now only ARM_CQE is used | 130 | * @action: action, ARM or DISARM. For now only ARM_CQE is used |
131 | * | 131 | * |
132 | * Arm'ing CQ will enable chip to generate global EQ events inorder to interrupt | 132 | * Arm'ing CQ will enable chip to generate global EQ events inorder to interrupt |
@@ -756,7 +756,7 @@ void bnx2i_send_cmd_cleanup_req(struct bnx2i_hba *hba, struct bnx2i_cmd *cmd) | |||
756 | /** | 756 | /** |
757 | * bnx2i_send_conn_destroy - initiates iscsi connection teardown process | 757 | * bnx2i_send_conn_destroy - initiates iscsi connection teardown process |
758 | * @hba: adapter structure pointer | 758 | * @hba: adapter structure pointer |
759 | * @ep: endpoint (transport indentifier) structure | 759 | * @ep: endpoint (transport identifier) structure |
760 | * | 760 | * |
761 | * this routine prepares and posts CONN_OFLD_REQ1/2 KWQE to initiate | 761 | * this routine prepares and posts CONN_OFLD_REQ1/2 KWQE to initiate |
762 | * iscsi connection context clean-up process | 762 | * iscsi connection context clean-up process |
@@ -791,7 +791,7 @@ int bnx2i_send_conn_destroy(struct bnx2i_hba *hba, struct bnx2i_endpoint *ep) | |||
791 | /** | 791 | /** |
792 | * bnx2i_570x_send_conn_ofld_req - initiates iscsi conn context setup process | 792 | * bnx2i_570x_send_conn_ofld_req - initiates iscsi conn context setup process |
793 | * @hba: adapter structure pointer | 793 | * @hba: adapter structure pointer |
794 | * @ep: endpoint (transport indentifier) structure | 794 | * @ep: endpoint (transport identifier) structure |
795 | * | 795 | * |
796 | * 5706/5708/5709 specific - prepares and posts CONN_OFLD_REQ1/2 KWQE | 796 | * 5706/5708/5709 specific - prepares and posts CONN_OFLD_REQ1/2 KWQE |
797 | */ | 797 | */ |
@@ -851,7 +851,7 @@ static int bnx2i_570x_send_conn_ofld_req(struct bnx2i_hba *hba, | |||
851 | /** | 851 | /** |
852 | * bnx2i_5771x_send_conn_ofld_req - initiates iscsi connection context creation | 852 | * bnx2i_5771x_send_conn_ofld_req - initiates iscsi connection context creation |
853 | * @hba: adapter structure pointer | 853 | * @hba: adapter structure pointer |
854 | * @ep: endpoint (transport indentifier) structure | 854 | * @ep: endpoint (transport identifier) structure |
855 | * | 855 | * |
856 | * 57710 specific - prepares and posts CONN_OFLD_REQ1/2 KWQE | 856 | * 57710 specific - prepares and posts CONN_OFLD_REQ1/2 KWQE |
857 | */ | 857 | */ |
@@ -920,7 +920,7 @@ static int bnx2i_5771x_send_conn_ofld_req(struct bnx2i_hba *hba, | |||
920 | * bnx2i_send_conn_ofld_req - initiates iscsi connection context setup process | 920 | * bnx2i_send_conn_ofld_req - initiates iscsi connection context setup process |
921 | * | 921 | * |
922 | * @hba: adapter structure pointer | 922 | * @hba: adapter structure pointer |
923 | * @ep: endpoint (transport indentifier) structure | 923 | * @ep: endpoint (transport identifier) structure |
924 | * | 924 | * |
925 | * this routine prepares and posts CONN_OFLD_REQ1/2 KWQE | 925 | * this routine prepares and posts CONN_OFLD_REQ1/2 KWQE |
926 | */ | 926 | */ |
@@ -939,7 +939,7 @@ int bnx2i_send_conn_ofld_req(struct bnx2i_hba *hba, struct bnx2i_endpoint *ep) | |||
939 | 939 | ||
940 | /** | 940 | /** |
941 | * setup_qp_page_tables - iscsi QP page table setup function | 941 | * setup_qp_page_tables - iscsi QP page table setup function |
942 | * @ep: endpoint (transport indentifier) structure | 942 | * @ep: endpoint (transport identifier) structure |
943 | * | 943 | * |
944 | * Sets up page tables for SQ/RQ/CQ, 1G/sec (5706/5708/5709) devices requires | 944 | * Sets up page tables for SQ/RQ/CQ, 1G/sec (5706/5708/5709) devices requires |
945 | * 64-bit address in big endian format. Whereas 10G/sec (57710) requires | 945 | * 64-bit address in big endian format. Whereas 10G/sec (57710) requires |
@@ -1046,7 +1046,7 @@ static void setup_qp_page_tables(struct bnx2i_endpoint *ep) | |||
1046 | /** | 1046 | /** |
1047 | * bnx2i_alloc_qp_resc - allocates required resources for QP. | 1047 | * bnx2i_alloc_qp_resc - allocates required resources for QP. |
1048 | * @hba: adapter structure pointer | 1048 | * @hba: adapter structure pointer |
1049 | * @ep: endpoint (transport indentifier) structure | 1049 | * @ep: endpoint (transport identifier) structure |
1050 | * | 1050 | * |
1051 | * Allocate QP (transport layer for iSCSI connection) resources, DMA'able | 1051 | * Allocate QP (transport layer for iSCSI connection) resources, DMA'able |
1052 | * memory for SQ/RQ/CQ and page tables. EP structure elements such | 1052 | * memory for SQ/RQ/CQ and page tables. EP structure elements such |
@@ -1191,7 +1191,7 @@ mem_alloc_err: | |||
1191 | /** | 1191 | /** |
1192 | * bnx2i_free_qp_resc - free memory resources held by QP | 1192 | * bnx2i_free_qp_resc - free memory resources held by QP |
1193 | * @hba: adapter structure pointer | 1193 | * @hba: adapter structure pointer |
1194 | * @ep: endpoint (transport indentifier) structure | 1194 | * @ep: endpoint (transport identifier) structure |
1195 | * | 1195 | * |
1196 | * Free QP resources - SQ/RQ/CQ memory and page tables. | 1196 | * Free QP resources - SQ/RQ/CQ memory and page tables. |
1197 | */ | 1197 | */ |
diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c index fabeb88602ac..854dad7d5b03 100644 --- a/drivers/scsi/bnx2i/bnx2i_iscsi.c +++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c | |||
@@ -596,7 +596,7 @@ void bnx2i_drop_session(struct iscsi_cls_session *cls_session) | |||
596 | /** | 596 | /** |
597 | * bnx2i_ep_destroy_list_add - add an entry to EP destroy list | 597 | * bnx2i_ep_destroy_list_add - add an entry to EP destroy list |
598 | * @hba: pointer to adapter instance | 598 | * @hba: pointer to adapter instance |
599 | * @ep: pointer to endpoint (transport indentifier) structure | 599 | * @ep: pointer to endpoint (transport identifier) structure |
600 | * | 600 | * |
601 | * EP destroy queue manager | 601 | * EP destroy queue manager |
602 | */ | 602 | */ |
@@ -613,7 +613,7 @@ static int bnx2i_ep_destroy_list_add(struct bnx2i_hba *hba, | |||
613 | * bnx2i_ep_destroy_list_del - add an entry to EP destroy list | 613 | * bnx2i_ep_destroy_list_del - add an entry to EP destroy list |
614 | * | 614 | * |
615 | * @hba: pointer to adapter instance | 615 | * @hba: pointer to adapter instance |
616 | * @ep: pointer to endpoint (transport indentifier) structure | 616 | * @ep: pointer to endpoint (transport identifier) structure |
617 | * | 617 | * |
618 | * EP destroy queue manager | 618 | * EP destroy queue manager |
619 | */ | 619 | */ |
@@ -630,7 +630,7 @@ static int bnx2i_ep_destroy_list_del(struct bnx2i_hba *hba, | |||
630 | /** | 630 | /** |
631 | * bnx2i_ep_ofld_list_add - add an entry to ep offload pending list | 631 | * bnx2i_ep_ofld_list_add - add an entry to ep offload pending list |
632 | * @hba: pointer to adapter instance | 632 | * @hba: pointer to adapter instance |
633 | * @ep: pointer to endpoint (transport indentifier) structure | 633 | * @ep: pointer to endpoint (transport identifier) structure |
634 | * | 634 | * |
635 | * pending conn offload completion queue manager | 635 | * pending conn offload completion queue manager |
636 | */ | 636 | */ |
@@ -646,7 +646,7 @@ static int bnx2i_ep_ofld_list_add(struct bnx2i_hba *hba, | |||
646 | /** | 646 | /** |
647 | * bnx2i_ep_ofld_list_del - add an entry to ep offload pending list | 647 | * bnx2i_ep_ofld_list_del - add an entry to ep offload pending list |
648 | * @hba: pointer to adapter instance | 648 | * @hba: pointer to adapter instance |
649 | * @ep: pointer to endpoint (transport indentifier) structure | 649 | * @ep: pointer to endpoint (transport identifier) structure |
650 | * | 650 | * |
651 | * pending conn offload completion queue manager | 651 | * pending conn offload completion queue manager |
652 | */ | 652 | */ |
@@ -721,7 +721,7 @@ bnx2i_find_ep_in_destroy_list(struct bnx2i_hba *hba, u32 iscsi_cid) | |||
721 | /** | 721 | /** |
722 | * bnx2i_ep_active_list_add - add an entry to ep active list | 722 | * bnx2i_ep_active_list_add - add an entry to ep active list |
723 | * @hba: pointer to adapter instance | 723 | * @hba: pointer to adapter instance |
724 | * @ep: pointer to endpoint (transport indentifier) structure | 724 | * @ep: pointer to endpoint (transport identifier) structure |
725 | * | 725 | * |
726 | * current active conn queue manager | 726 | * current active conn queue manager |
727 | */ | 727 | */ |
@@ -737,7 +737,7 @@ static void bnx2i_ep_active_list_add(struct bnx2i_hba *hba, | |||
737 | /** | 737 | /** |
738 | * bnx2i_ep_active_list_del - deletes an entry to ep active list | 738 | * bnx2i_ep_active_list_del - deletes an entry to ep active list |
739 | * @hba: pointer to adapter instance | 739 | * @hba: pointer to adapter instance |
740 | * @ep: pointer to endpoint (transport indentifier) structure | 740 | * @ep: pointer to endpoint (transport identifier) structure |
741 | * | 741 | * |
742 | * current active conn queue manager | 742 | * current active conn queue manager |
743 | */ | 743 | */ |
@@ -1695,7 +1695,7 @@ no_nx2_route: | |||
1695 | /** | 1695 | /** |
1696 | * bnx2i_tear_down_conn - tear down iscsi/tcp connection and free resources | 1696 | * bnx2i_tear_down_conn - tear down iscsi/tcp connection and free resources |
1697 | * @hba: pointer to adapter instance | 1697 | * @hba: pointer to adapter instance |
1698 | * @ep: endpoint (transport indentifier) structure | 1698 | * @ep: endpoint (transport identifier) structure |
1699 | * | 1699 | * |
1700 | * destroys cm_sock structure and on chip iscsi context | 1700 | * destroys cm_sock structure and on chip iscsi context |
1701 | */ | 1701 | */ |
diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c index 00346fe939d5..1aafc331ee63 100644 --- a/drivers/scsi/csiostor/csio_init.c +++ b/drivers/scsi/csiostor/csio_init.c | |||
@@ -1010,7 +1010,6 @@ err_lnode_exit: | |||
1010 | csio_hw_stop(hw); | 1010 | csio_hw_stop(hw); |
1011 | spin_unlock_irq(&hw->lock); | 1011 | spin_unlock_irq(&hw->lock); |
1012 | csio_lnodes_unblock_request(hw); | 1012 | csio_lnodes_unblock_request(hw); |
1013 | pci_set_drvdata(hw->pdev, NULL); | ||
1014 | csio_lnodes_exit(hw, 0); | 1013 | csio_lnodes_exit(hw, 0); |
1015 | csio_hw_free(hw); | 1014 | csio_hw_free(hw); |
1016 | err_pci_exit: | 1015 | err_pci_exit: |
@@ -1044,7 +1043,6 @@ static void csio_remove_one(struct pci_dev *pdev) | |||
1044 | 1043 | ||
1045 | csio_lnodes_exit(hw, 0); | 1044 | csio_lnodes_exit(hw, 0); |
1046 | csio_hw_free(hw); | 1045 | csio_hw_free(hw); |
1047 | pci_set_drvdata(pdev, NULL); | ||
1048 | csio_pci_exit(pdev, &bars); | 1046 | csio_pci_exit(pdev, &bars); |
1049 | } | 1047 | } |
1050 | 1048 | ||
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index 42e8624a9b9a..83d9bf6fa6ca 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c | |||
@@ -4861,7 +4861,6 @@ static void dc395x_remove_one(struct pci_dev *dev) | |||
4861 | adapter_uninit(acb); | 4861 | adapter_uninit(acb); |
4862 | pci_disable_device(dev); | 4862 | pci_disable_device(dev); |
4863 | scsi_host_put(scsi_host); | 4863 | scsi_host_put(scsi_host); |
4864 | pci_set_drvdata(dev, NULL); | ||
4865 | } | 4864 | } |
4866 | 4865 | ||
4867 | 4866 | ||
diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c index be09b101b4a1..33e4ec2bfe73 100644 --- a/drivers/scsi/fnic/fnic_main.c +++ b/drivers/scsi/fnic/fnic_main.c | |||
@@ -1005,7 +1005,6 @@ static void fnic_remove(struct pci_dev *pdev) | |||
1005 | fnic_iounmap(fnic); | 1005 | fnic_iounmap(fnic); |
1006 | pci_release_regions(pdev); | 1006 | pci_release_regions(pdev); |
1007 | pci_disable_device(pdev); | 1007 | pci_disable_device(pdev); |
1008 | pci_set_drvdata(pdev, NULL); | ||
1009 | scsi_host_put(lp->host); | 1008 | scsi_host_put(lp->host); |
1010 | } | 1009 | } |
1011 | 1010 | ||
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index 6d55b4e7e792..ee4fa40a50b1 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c | |||
@@ -594,8 +594,6 @@ static void gdth_pci_remove_one(struct pci_dev *pdev) | |||
594 | { | 594 | { |
595 | gdth_ha_str *ha = pci_get_drvdata(pdev); | 595 | gdth_ha_str *ha = pci_get_drvdata(pdev); |
596 | 596 | ||
597 | pci_set_drvdata(pdev, NULL); | ||
598 | |||
599 | list_del(&ha->list); | 597 | list_del(&ha->list); |
600 | gdth_remove_one(ha); | 598 | gdth_remove_one(ha); |
601 | 599 | ||
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index fb5a89815150..22f6432eb475 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c | |||
@@ -5017,7 +5017,6 @@ static void hpsa_remove_one(struct pci_dev *pdev) | |||
5017 | kfree(h->hba_inquiry_data); | 5017 | kfree(h->hba_inquiry_data); |
5018 | pci_disable_device(pdev); | 5018 | pci_disable_device(pdev); |
5019 | pci_release_regions(pdev); | 5019 | pci_release_regions(pdev); |
5020 | pci_set_drvdata(pdev, NULL); | ||
5021 | kfree(h); | 5020 | kfree(h); |
5022 | } | 5021 | } |
5023 | 5022 | ||
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index ca6bf2af7ce8..68c94cc85c35 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c | |||
@@ -4581,8 +4581,6 @@ lpfc_disable_pci_dev(struct lpfc_hba *phba) | |||
4581 | /* Release PCI resource and disable PCI device */ | 4581 | /* Release PCI resource and disable PCI device */ |
4582 | pci_release_selected_regions(pdev, bars); | 4582 | pci_release_selected_regions(pdev, bars); |
4583 | pci_disable_device(pdev); | 4583 | pci_disable_device(pdev); |
4584 | /* Null out PCI private reference to driver */ | ||
4585 | pci_set_drvdata(pdev, NULL); | ||
4586 | 4584 | ||
4587 | return; | 4585 | return; |
4588 | } | 4586 | } |
@@ -9429,7 +9427,6 @@ lpfc_pci_remove_one_s3(struct pci_dev *pdev) | |||
9429 | /* Disable interrupt */ | 9427 | /* Disable interrupt */ |
9430 | lpfc_sli_disable_intr(phba); | 9428 | lpfc_sli_disable_intr(phba); |
9431 | 9429 | ||
9432 | pci_set_drvdata(pdev, NULL); | ||
9433 | scsi_host_put(shost); | 9430 | scsi_host_put(shost); |
9434 | 9431 | ||
9435 | /* | 9432 | /* |
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index 515c9629e9fe..d1a4b82836ea 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c | |||
@@ -534,7 +534,6 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
534 | return 0; | 534 | return 0; |
535 | 535 | ||
536 | out_cmm_unreg: | 536 | out_cmm_unreg: |
537 | pci_set_drvdata(pdev, NULL); | ||
538 | megaraid_cmm_unregister(adapter); | 537 | megaraid_cmm_unregister(adapter); |
539 | out_fini_mbox: | 538 | out_fini_mbox: |
540 | megaraid_fini_mbox(adapter); | 539 | megaraid_fini_mbox(adapter); |
@@ -594,11 +593,6 @@ megaraid_detach_one(struct pci_dev *pdev) | |||
594 | // detach from the IO sub-system | 593 | // detach from the IO sub-system |
595 | megaraid_io_detach(adapter); | 594 | megaraid_io_detach(adapter); |
596 | 595 | ||
597 | // reset the device state in the PCI structure. We check this | ||
598 | // condition when we enter here. If the device state is NULL, | ||
599 | // that would mean the device has already been removed | ||
600 | pci_set_drvdata(pdev, NULL); | ||
601 | |||
602 | // Unregister from common management module | 596 | // Unregister from common management module |
603 | // | 597 | // |
604 | // FIXME: this must return success or failure for conditions if there | 598 | // FIXME: this must return success or failure for conditions if there |
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 2cf9470dd11b..0a743a5d1647 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c | |||
@@ -4451,7 +4451,6 @@ retry_irq_register: | |||
4451 | megasas_mgmt_info.instance[megasas_mgmt_info.max_index] = NULL; | 4451 | megasas_mgmt_info.instance[megasas_mgmt_info.max_index] = NULL; |
4452 | megasas_mgmt_info.max_index--; | 4452 | megasas_mgmt_info.max_index--; |
4453 | 4453 | ||
4454 | pci_set_drvdata(pdev, NULL); | ||
4455 | instance->instancet->disable_intr(instance); | 4454 | instance->instancet->disable_intr(instance); |
4456 | if (instance->msix_vectors) | 4455 | if (instance->msix_vectors) |
4457 | for (i = 0 ; i < instance->msix_vectors; i++) | 4456 | for (i = 0 ; i < instance->msix_vectors; i++) |
@@ -4807,8 +4806,6 @@ static void megasas_detach_one(struct pci_dev *pdev) | |||
4807 | } | 4806 | } |
4808 | } | 4807 | } |
4809 | 4808 | ||
4810 | pci_set_drvdata(instance->pdev, NULL); | ||
4811 | |||
4812 | instance->instancet->disable_intr(instance); | 4809 | instance->instancet->disable_intr(instance); |
4813 | 4810 | ||
4814 | if (instance->msix_vectors) | 4811 | if (instance->msix_vectors) |
@@ -4850,8 +4847,6 @@ static void megasas_detach_one(struct pci_dev *pdev) | |||
4850 | instance->evt_detail, instance->evt_detail_h); | 4847 | instance->evt_detail, instance->evt_detail_h); |
4851 | scsi_host_put(host); | 4848 | scsi_host_put(host); |
4852 | 4849 | ||
4853 | pci_set_drvdata(pdev, NULL); | ||
4854 | |||
4855 | pci_disable_device(pdev); | 4850 | pci_disable_device(pdev); |
4856 | 4851 | ||
4857 | return; | 4852 | return; |
diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c index 7b7381d7671f..5ff978be249d 100644 --- a/drivers/scsi/mvsas/mv_init.c +++ b/drivers/scsi/mvsas/mv_init.c | |||
@@ -657,7 +657,6 @@ static void mvs_pci_remove(struct pci_dev *pdev) | |||
657 | tasklet_kill(&((struct mvs_prv_info *)sha->lldd_ha)->mv_tasklet); | 657 | tasklet_kill(&((struct mvs_prv_info *)sha->lldd_ha)->mv_tasklet); |
658 | #endif | 658 | #endif |
659 | 659 | ||
660 | pci_set_drvdata(pdev, NULL); | ||
661 | sas_unregister_ha(sha); | 660 | sas_unregister_ha(sha); |
662 | sas_remove_host(mvi->shost); | 661 | sas_remove_host(mvi->shost); |
663 | scsi_remove_host(mvi->shost); | 662 | scsi_remove_host(mvi->shost); |
diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c index 6b1b4e91e53f..6c1f223a8e1d 100644 --- a/drivers/scsi/mvsas/mv_sas.c +++ b/drivers/scsi/mvsas/mv_sas.c | |||
@@ -1411,7 +1411,7 @@ static int mvs_exec_internal_tmf_task(struct domain_device *dev, | |||
1411 | 1411 | ||
1412 | if (res) { | 1412 | if (res) { |
1413 | del_timer(&task->slow_task->timer); | 1413 | del_timer(&task->slow_task->timer); |
1414 | mv_printk("executing internel task failed:%d\n", res); | 1414 | mv_printk("executing internal task failed:%d\n", res); |
1415 | goto ex_err; | 1415 | goto ex_err; |
1416 | } | 1416 | } |
1417 | 1417 | ||
diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c index c3601b57a80c..edbee8dc62c9 100644 --- a/drivers/scsi/mvumi.c +++ b/drivers/scsi/mvumi.c | |||
@@ -2583,7 +2583,6 @@ static int mvumi_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
2583 | return 0; | 2583 | return 0; |
2584 | 2584 | ||
2585 | fail_io_attach: | 2585 | fail_io_attach: |
2586 | pci_set_drvdata(pdev, NULL); | ||
2587 | mhba->instancet->disable_intr(mhba); | 2586 | mhba->instancet->disable_intr(mhba); |
2588 | free_irq(mhba->pdev->irq, mhba); | 2587 | free_irq(mhba->pdev->irq, mhba); |
2589 | fail_init_irq: | 2588 | fail_init_irq: |
@@ -2618,7 +2617,6 @@ static void mvumi_detach_one(struct pci_dev *pdev) | |||
2618 | free_irq(mhba->pdev->irq, mhba); | 2617 | free_irq(mhba->pdev->irq, mhba); |
2619 | mvumi_release_fw(mhba); | 2618 | mvumi_release_fw(mhba); |
2620 | scsi_host_put(host); | 2619 | scsi_host_put(host); |
2621 | pci_set_drvdata(pdev, NULL); | ||
2622 | pci_disable_device(pdev); | 2620 | pci_disable_device(pdev); |
2623 | dev_dbg(&pdev->dev, "driver is removed!\n"); | 2621 | dev_dbg(&pdev->dev, "driver is removed!\n"); |
2624 | } | 2622 | } |
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c index 5982a587babc..7d014b11df62 100644 --- a/drivers/scsi/ncr53c8xx.c +++ b/drivers/scsi/ncr53c8xx.c | |||
@@ -1615,7 +1615,7 @@ struct ncb { | |||
1615 | spinlock_t smp_lock; /* Lock for SMP threading */ | 1615 | spinlock_t smp_lock; /* Lock for SMP threading */ |
1616 | 1616 | ||
1617 | /*---------------------------------------------------------------- | 1617 | /*---------------------------------------------------------------- |
1618 | ** Chip and controller indentification. | 1618 | ** Chip and controller identification. |
1619 | **---------------------------------------------------------------- | 1619 | **---------------------------------------------------------------- |
1620 | */ | 1620 | */ |
1621 | int unit; /* Unit number */ | 1621 | int unit; /* Unit number */ |
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index 662bf13c42f0..34f5f5ffef05 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c | |||
@@ -909,7 +909,6 @@ static void pm8001_pci_remove(struct pci_dev *pdev) | |||
909 | struct pm8001_hba_info *pm8001_ha; | 909 | struct pm8001_hba_info *pm8001_ha; |
910 | int i; | 910 | int i; |
911 | pm8001_ha = sha->lldd_ha; | 911 | pm8001_ha = sha->lldd_ha; |
912 | pci_set_drvdata(pdev, NULL); | ||
913 | sas_unregister_ha(sha); | 912 | sas_unregister_ha(sha); |
914 | sas_remove_host(pm8001_ha->shost); | 913 | sas_remove_host(pm8001_ha->shost); |
915 | list_del(&pm8001_ha->list); | 914 | list_del(&pm8001_ha->list); |
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 1eb7b0280a45..e43db7742047 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c | |||
@@ -6049,7 +6049,6 @@ out_release_regions: | |||
6049 | 6049 | ||
6050 | out_disable_device: | 6050 | out_disable_device: |
6051 | atomic_dec(&pmcraid_adapter_count); | 6051 | atomic_dec(&pmcraid_adapter_count); |
6052 | pci_set_drvdata(pdev, NULL); | ||
6053 | pci_disable_device(pdev); | 6052 | pci_disable_device(pdev); |
6054 | return -ENODEV; | 6053 | return -ENODEV; |
6055 | } | 6054 | } |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index bcd57f699ebb..52be35e0300c 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -3179,7 +3179,6 @@ qla2x00_remove_one(struct pci_dev *pdev) | |||
3179 | pci_disable_pcie_error_reporting(pdev); | 3179 | pci_disable_pcie_error_reporting(pdev); |
3180 | 3180 | ||
3181 | pci_disable_device(pdev); | 3181 | pci_disable_device(pdev); |
3182 | pci_set_drvdata(pdev, NULL); | ||
3183 | } | 3182 | } |
3184 | 3183 | ||
3185 | static void | 3184 | static void |
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 6dc3e99b7f9c..a28d5e624aab 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c | |||
@@ -7827,7 +7827,6 @@ static void qla4xxx_remove_adapter(struct pci_dev *pdev) | |||
7827 | 7827 | ||
7828 | pci_disable_pcie_error_reporting(pdev); | 7828 | pci_disable_pcie_error_reporting(pdev); |
7829 | pci_disable_device(pdev); | 7829 | pci_disable_device(pdev); |
7830 | pci_set_drvdata(pdev, NULL); | ||
7831 | } | 7830 | } |
7832 | 7831 | ||
7833 | /** | 7832 | /** |
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c index 325c31caa6e0..1aa4befcfbd0 100644 --- a/drivers/scsi/stex.c +++ b/drivers/scsi/stex.c | |||
@@ -1790,8 +1790,6 @@ static void stex_remove(struct pci_dev *pdev) | |||
1790 | 1790 | ||
1791 | scsi_remove_host(hba->host); | 1791 | scsi_remove_host(hba->host); |
1792 | 1792 | ||
1793 | pci_set_drvdata(pdev, NULL); | ||
1794 | |||
1795 | stex_hba_stop(hba); | 1793 | stex_hba_stop(hba); |
1796 | 1794 | ||
1797 | stex_hba_free(hba); | 1795 | stex_hba_free(hba); |
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.h b/drivers/scsi/sym53c8xx_2/sym_glue.h index b80bf709f104..805369521df8 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.h +++ b/drivers/scsi/sym53c8xx_2/sym_glue.h | |||
@@ -174,7 +174,7 @@ struct sym_slcb { | |||
174 | */ | 174 | */ |
175 | struct sym_shcb { | 175 | struct sym_shcb { |
176 | /* | 176 | /* |
177 | * Chip and controller indentification. | 177 | * Chip and controller identification. |
178 | */ | 178 | */ |
179 | int unit; | 179 | int unit; |
180 | char inst_name[16]; | 180 | char inst_name[16]; |
diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c index 11423615c2ea..b006cf789ba1 100644 --- a/drivers/scsi/tmscsim.c +++ b/drivers/scsi/tmscsim.c | |||
@@ -2553,7 +2553,6 @@ static void dc390_remove_one(struct pci_dev *dev) | |||
2553 | 2553 | ||
2554 | pci_disable_device(dev); | 2554 | pci_disable_device(dev); |
2555 | scsi_host_put(scsi_host); | 2555 | scsi_host_put(scsi_host); |
2556 | pci_set_drvdata(dev, NULL); | ||
2557 | } | 2556 | } |
2558 | 2557 | ||
2559 | static struct pci_device_id tmscsim_pci_tbl[] = { | 2558 | static struct pci_device_id tmscsim_pci_tbl[] = { |
diff --git a/drivers/scsi/ufs/ufshcd-pci.c b/drivers/scsi/ufs/ufshcd-pci.c index a823cf44e949..8b9531204c2b 100644 --- a/drivers/scsi/ufs/ufshcd-pci.c +++ b/drivers/scsi/ufs/ufshcd-pci.c | |||
@@ -132,7 +132,6 @@ static void ufshcd_pci_remove(struct pci_dev *pdev) | |||
132 | pm_runtime_forbid(&pdev->dev); | 132 | pm_runtime_forbid(&pdev->dev); |
133 | pm_runtime_get_noresume(&pdev->dev); | 133 | pm_runtime_get_noresume(&pdev->dev); |
134 | ufshcd_remove(hba); | 134 | ufshcd_remove(hba); |
135 | pci_set_drvdata(pdev, NULL); | ||
136 | } | 135 | } |
137 | 136 | ||
138 | /** | 137 | /** |
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c index 3bfaa66fa0d1..b9755ec0e812 100644 --- a/drivers/scsi/vmw_pvscsi.c +++ b/drivers/scsi/vmw_pvscsi.c | |||
@@ -1405,7 +1405,6 @@ out_release_resources: | |||
1405 | out_free_host: | 1405 | out_free_host: |
1406 | scsi_host_put(host); | 1406 | scsi_host_put(host); |
1407 | out_disable_device: | 1407 | out_disable_device: |
1408 | pci_set_drvdata(pdev, NULL); | ||
1409 | pci_disable_device(pdev); | 1408 | pci_disable_device(pdev); |
1410 | 1409 | ||
1411 | return error; | 1410 | return error; |
@@ -1445,7 +1444,6 @@ static void pvscsi_remove(struct pci_dev *pdev) | |||
1445 | 1444 | ||
1446 | scsi_host_put(host); | 1445 | scsi_host_put(host); |
1447 | 1446 | ||
1448 | pci_set_drvdata(pdev, NULL); | ||
1449 | pci_disable_device(pdev); | 1447 | pci_disable_device(pdev); |
1450 | } | 1448 | } |
1451 | 1449 | ||
diff --git a/drivers/staging/iio/adc/ad7606.h b/drivers/staging/iio/adc/ad7606.h index 9221a74efd18..93c7299e8353 100644 --- a/drivers/staging/iio/adc/ad7606.h +++ b/drivers/staging/iio/adc/ad7606.h | |||
@@ -42,7 +42,7 @@ struct ad7606_platform_data { | |||
42 | 42 | ||
43 | /** | 43 | /** |
44 | * struct ad7606_chip_info - chip specifc information | 44 | * struct ad7606_chip_info - chip specifc information |
45 | * @name: indentification string for chip | 45 | * @name: identification string for chip |
46 | * @int_vref_mv: the internal reference voltage | 46 | * @int_vref_mv: the internal reference voltage |
47 | * @channels: channel specification | 47 | * @channels: channel specification |
48 | * @num_channels: number of channels | 48 | * @num_channels: number of channels |
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig index db535b0aa172..fed7f68d025d 100644 --- a/drivers/usb/core/Kconfig +++ b/drivers/usb/core/Kconfig | |||
@@ -28,7 +28,7 @@ config USB_DEFAULT_PERSIST | |||
28 | bool "Enable USB persist by default" | 28 | bool "Enable USB persist by default" |
29 | default y | 29 | default y |
30 | help | 30 | help |
31 | Say N here if you don't want USB power session persistance | 31 | Say N here if you don't want USB power session persistence |
32 | enabled by default. If you say N it will make suspended USB | 32 | enabled by default. If you say N it will make suspended USB |
33 | devices that lose power get reenumerated as if they had been | 33 | devices that lose power get reenumerated as if they had been |
34 | unplugged, causing any mounted filesystems to be lost. The | 34 | unplugged, causing any mounted filesystems to be lost. The |
diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig index 398cbd517be2..f9d5094e1029 100644 --- a/fs/btrfs/Kconfig +++ b/fs/btrfs/Kconfig | |||
@@ -59,7 +59,8 @@ config BTRFS_FS_RUN_SANITY_TESTS | |||
59 | help | 59 | help |
60 | This will run some basic sanity tests on the free space cache | 60 | This will run some basic sanity tests on the free space cache |
61 | code to make sure it is acting as it should. These are mostly | 61 | code to make sure it is acting as it should. These are mostly |
62 | regression tests and are only really interesting to btrfs devlopers. | 62 | regression tests and are only really interesting to btrfs |
63 | developers. | ||
63 | 64 | ||
64 | If unsure, say N. | 65 | If unsure, say N. |
65 | 66 | ||
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h index aea9e45efce6..14909b0b9cae 100644 --- a/include/asm-generic/memory_model.h +++ b/include/asm-generic/memory_model.h | |||
@@ -53,7 +53,7 @@ | |||
53 | 53 | ||
54 | #elif defined(CONFIG_SPARSEMEM) | 54 | #elif defined(CONFIG_SPARSEMEM) |
55 | /* | 55 | /* |
56 | * Note: section's mem_map is encorded to reflect its start_pfn. | 56 | * Note: section's mem_map is encoded to reflect its start_pfn. |
57 | * section[i].section_mem_map == mem_map's address - start_pfn; | 57 | * section[i].section_mem_map == mem_map's address - start_pfn; |
58 | */ | 58 | */ |
59 | #define __page_to_pfn(pg) \ | 59 | #define __page_to_pfn(pg) \ |
diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h index 62d9303c2837..0ddb5c02ad8b 100644 --- a/include/linux/amba/serial.h +++ b/include/linux/amba/serial.h | |||
@@ -40,7 +40,7 @@ | |||
40 | #define UART010_LCRL 0x10 /* Line control register, low byte. */ | 40 | #define UART010_LCRL 0x10 /* Line control register, low byte. */ |
41 | #define UART010_CR 0x14 /* Control register. */ | 41 | #define UART010_CR 0x14 /* Control register. */ |
42 | #define UART01x_FR 0x18 /* Flag register (Read only). */ | 42 | #define UART01x_FR 0x18 /* Flag register (Read only). */ |
43 | #define UART010_IIR 0x1C /* Interrupt indentification register (Read). */ | 43 | #define UART010_IIR 0x1C /* Interrupt identification register (Read). */ |
44 | #define UART010_ICR 0x1C /* Interrupt clear register (Write). */ | 44 | #define UART010_ICR 0x1C /* Interrupt clear register (Write). */ |
45 | #define ST_UART011_LCRH_RX 0x1C /* Rx line control register. */ | 45 | #define ST_UART011_LCRH_RX 0x1C /* Rx line control register. */ |
46 | #define UART01x_ILPR 0x20 /* IrDA low power counter register. */ | 46 | #define UART01x_ILPR 0x20 /* IrDA low power counter register. */ |
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index 7a7cc74d7f27..d48dc00232a4 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h | |||
@@ -168,7 +168,7 @@ struct devfreq { | |||
168 | unsigned long max_freq; | 168 | unsigned long max_freq; |
169 | bool stop_polling; | 169 | bool stop_polling; |
170 | 170 | ||
171 | /* information for device freqeuncy transition */ | 171 | /* information for device frequency transition */ |
172 | unsigned int total_trans; | 172 | unsigned int total_trans; |
173 | unsigned int *trans_table; | 173 | unsigned int *trans_table; |
174 | unsigned long *time_in_state; | 174 | unsigned long *time_in_state; |
diff --git a/include/linux/mfd/si476x-core.h b/include/linux/mfd/si476x-core.h index ba89b94e4a56..674b45d5a757 100644 --- a/include/linux/mfd/si476x-core.h +++ b/include/linux/mfd/si476x-core.h | |||
@@ -316,7 +316,7 @@ enum si476x_smoothmetrics { | |||
316 | * response to 'FM_RD_STATUS' command | 316 | * response to 'FM_RD_STATUS' command |
317 | * @rdstpptyint: Traffic program flag(TP) and/or program type(PTY) | 317 | * @rdstpptyint: Traffic program flag(TP) and/or program type(PTY) |
318 | * code has changed. | 318 | * code has changed. |
319 | * @rdspiint: Program indentifiaction(PI) code has changed. | 319 | * @rdspiint: Program identification(PI) code has changed. |
320 | * @rdssyncint: RDS synchronization has changed. | 320 | * @rdssyncint: RDS synchronization has changed. |
321 | * @rdsfifoint: RDS was received and the RDS FIFO has at least | 321 | * @rdsfifoint: RDS was received and the RDS FIFO has at least |
322 | * 'FM_RDS_INTERRUPT_FIFO_COUNT' elements in it. | 322 | * 'FM_RDS_INTERRUPT_FIFO_COUNT' elements in it. |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 8b3de7cc2ffc..7f0ed423a360 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -1587,7 +1587,7 @@ static inline void *netdev_priv(const struct net_device *dev) | |||
1587 | #define SET_NETDEV_DEV(net, pdev) ((net)->dev.parent = (pdev)) | 1587 | #define SET_NETDEV_DEV(net, pdev) ((net)->dev.parent = (pdev)) |
1588 | 1588 | ||
1589 | /* Set the sysfs device type for the network logical device to allow | 1589 | /* Set the sysfs device type for the network logical device to allow |
1590 | * fin grained indentification of different network device types. For | 1590 | * fine-grained identification of different network device types. For |
1591 | * example Ethernet, Wirelss LAN, Bluetooth, WiMAX etc. | 1591 | * example Ethernet, Wirelss LAN, Bluetooth, WiMAX etc. |
1592 | */ | 1592 | */ |
1593 | #define SET_NETDEV_DEVTYPE(net, devtype) ((net)->dev.type = (devtype)) | 1593 | #define SET_NETDEV_DEVTYPE(net, devtype) ((net)->dev.type = (devtype)) |
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 51329905bfaa..c853b16de4ef 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h | |||
@@ -240,7 +240,7 @@ struct l2cap_conn_rsp { | |||
240 | #define L2CAP_PSM_RFCOMM 0x0003 | 240 | #define L2CAP_PSM_RFCOMM 0x0003 |
241 | #define L2CAP_PSM_3DSP 0x0021 | 241 | #define L2CAP_PSM_3DSP 0x0021 |
242 | 242 | ||
243 | /* channel indentifier */ | 243 | /* channel identifier */ |
244 | #define L2CAP_CID_SIGNALING 0x0001 | 244 | #define L2CAP_CID_SIGNALING 0x0001 |
245 | #define L2CAP_CID_CONN_LESS 0x0002 | 245 | #define L2CAP_CID_CONN_LESS 0x0002 |
246 | #define L2CAP_CID_A2MP 0x0003 | 246 | #define L2CAP_CID_A2MP 0x0003 |
diff --git a/init/Kconfig b/init/Kconfig index 5496f307988e..2d60611c0609 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -851,7 +851,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED | |||
851 | default y | 851 | default y |
852 | depends on NUMA_BALANCING | 852 | depends on NUMA_BALANCING |
853 | help | 853 | help |
854 | If set, autonumic NUMA balancing will be enabled if running on a NUMA | 854 | If set, automatic NUMA balancing will be enabled if running on a NUMA |
855 | machine. | 855 | machine. |
856 | 856 | ||
857 | config NUMA_BALANCING | 857 | config NUMA_BALANCING |
@@ -862,7 +862,7 @@ config NUMA_BALANCING | |||
862 | help | 862 | help |
863 | This option adds support for automatic NUMA aware memory/task placement. | 863 | This option adds support for automatic NUMA aware memory/task placement. |
864 | The mechanism is quite primitive and is based on migrating memory when | 864 | The mechanism is quite primitive and is based on migrating memory when |
865 | it is references to the node the task is running on. | 865 | it has references to the node the task is running on. |
866 | 866 | ||
867 | This system will be inactive on UMA systems. | 867 | This system will be inactive on UMA systems. |
868 | 868 | ||
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index a3bb14fbe5c6..dc04c166c54d 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c | |||
@@ -214,7 +214,7 @@ void irq_enable(struct irq_desc *desc) | |||
214 | } | 214 | } |
215 | 215 | ||
216 | /** | 216 | /** |
217 | * irq_disable - Mark interupt disabled | 217 | * irq_disable - Mark interrupt disabled |
218 | * @desc: irq descriptor which should be disabled | 218 | * @desc: irq descriptor which should be disabled |
219 | * | 219 | * |
220 | * If the chip does not implement the irq_disable callback, we | 220 | * If the chip does not implement the irq_disable callback, we |
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 3e59f951d42f..481a13c43b17 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -786,7 +786,7 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action) | |||
786 | } | 786 | } |
787 | 787 | ||
788 | /* | 788 | /* |
789 | * Interrupts explicitely requested as threaded interupts want to be | 789 | * Interrupts explicitly requested as threaded interrupts want to be |
790 | * preemtible - many of them need to sleep and wait for slow busses to | 790 | * preemtible - many of them need to sleep and wait for slow busses to |
791 | * complete. | 791 | * complete. |
792 | */ | 792 | */ |
diff --git a/kernel/kexec.c b/kernel/kexec.c index 2a74f307c5ec..490afc03627e 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
@@ -921,7 +921,7 @@ static int kimage_load_segment(struct kimage *image, | |||
921 | * reinitialize them. | 921 | * reinitialize them. |
922 | * | 922 | * |
923 | * - A machine specific part that includes the syscall number | 923 | * - A machine specific part that includes the syscall number |
924 | * and the copies the image to it's final destination. And | 924 | * and then copies the image to it's final destination. And |
925 | * jumps into the image at entry. | 925 | * jumps into the image at entry. |
926 | * | 926 | * |
927 | * kexec does not sync, or unmount filesystems so if you need | 927 | * kexec does not sync, or unmount filesystems so if you need |
diff --git a/mm/Kconfig b/mm/Kconfig index de31af256207..eb69f352401d 100644 --- a/mm/Kconfig +++ b/mm/Kconfig | |||
@@ -20,7 +20,7 @@ config FLATMEM_MANUAL | |||
20 | 20 | ||
21 | Some users of more advanced features like NUMA and | 21 | Some users of more advanced features like NUMA and |
22 | memory hotplug may have different options here. | 22 | memory hotplug may have different options here. |
23 | DISCONTIGMEM is an more mature, better tested system, | 23 | DISCONTIGMEM is a more mature, better tested system, |
24 | but is incompatible with memory hotplug and may suffer | 24 | but is incompatible with memory hotplug and may suffer |
25 | decreased performance over SPARSEMEM. If unsure between | 25 | decreased performance over SPARSEMEM. If unsure between |
26 | "Sparse Memory" and "Discontiguous Memory", choose | 26 | "Sparse Memory" and "Discontiguous Memory", choose |
@@ -955,7 +955,7 @@ static inline void slab_free_hook(struct kmem_cache *s, void *x) | |||
955 | kmemleak_free_recursive(x, s->flags); | 955 | kmemleak_free_recursive(x, s->flags); |
956 | 956 | ||
957 | /* | 957 | /* |
958 | * Trouble is that we may no longer disable interupts in the fast path | 958 | * Trouble is that we may no longer disable interrupts in the fast path |
959 | * So in order to make the debug calls that expect irqs to be | 959 | * So in order to make the debug calls that expect irqs to be |
960 | * disabled we need to disable interrupts temporarily. | 960 | * disabled we need to disable interrupts temporarily. |
961 | */ | 961 | */ |
diff --git a/net/can/af_can.c b/net/can/af_can.c index 3ab8dd2e1282..d249874a366d 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c | |||
@@ -420,7 +420,7 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask, | |||
420 | * @mask: CAN mask (see description) | 420 | * @mask: CAN mask (see description) |
421 | * @func: callback function on filter match | 421 | * @func: callback function on filter match |
422 | * @data: returned parameter for callback function | 422 | * @data: returned parameter for callback function |
423 | * @ident: string for calling module indentification | 423 | * @ident: string for calling module identification |
424 | * | 424 | * |
425 | * Description: | 425 | * Description: |
426 | * Invokes the callback function with the received sk_buff and the given | 426 | * Invokes the callback function with the received sk_buff and the given |
diff --git a/net/netfilter/xt_set.c b/net/netfilter/xt_set.c index e7c4e0e01ff5..80c2e2d603e0 100644 --- a/net/netfilter/xt_set.c +++ b/net/netfilter/xt_set.c | |||
@@ -84,7 +84,7 @@ set_match_v0_checkentry(const struct xt_mtchk_param *par) | |||
84 | index = ip_set_nfnl_get_byindex(par->net, info->match_set.index); | 84 | index = ip_set_nfnl_get_byindex(par->net, info->match_set.index); |
85 | 85 | ||
86 | if (index == IPSET_INVALID_ID) { | 86 | if (index == IPSET_INVALID_ID) { |
87 | pr_warning("Cannot find set indentified by id %u to match\n", | 87 | pr_warning("Cannot find set identified by id %u to match\n", |
88 | info->match_set.index); | 88 | info->match_set.index); |
89 | return -ENOENT; | 89 | return -ENOENT; |
90 | } | 90 | } |
@@ -134,7 +134,7 @@ set_match_v1_checkentry(const struct xt_mtchk_param *par) | |||
134 | index = ip_set_nfnl_get_byindex(par->net, info->match_set.index); | 134 | index = ip_set_nfnl_get_byindex(par->net, info->match_set.index); |
135 | 135 | ||
136 | if (index == IPSET_INVALID_ID) { | 136 | if (index == IPSET_INVALID_ID) { |
137 | pr_warning("Cannot find set indentified by id %u to match\n", | 137 | pr_warning("Cannot find set identified by id %u to match\n", |
138 | info->match_set.index); | 138 | info->match_set.index); |
139 | return -ENOENT; | 139 | return -ENOENT; |
140 | } | 140 | } |
diff --git a/net/vmw_vsock/Kconfig b/net/vmw_vsock/Kconfig index b5fa7e40cdcb..14810abedc2e 100644 --- a/net/vmw_vsock/Kconfig +++ b/net/vmw_vsock/Kconfig | |||
@@ -6,7 +6,7 @@ config VSOCKETS | |||
6 | tristate "Virtual Socket protocol" | 6 | tristate "Virtual Socket protocol" |
7 | help | 7 | help |
8 | Virtual Socket Protocol is a socket protocol similar to TCP/IP | 8 | Virtual Socket Protocol is a socket protocol similar to TCP/IP |
9 | allowing comunication between Virtual Machines and hypervisor | 9 | allowing communication between Virtual Machines and hypervisor |
10 | or host. | 10 | or host. |
11 | 11 | ||
12 | You should also select one or more hypervisor-specific transports | 12 | You should also select one or more hypervisor-specific transports |
diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c index f2e62e45f912..19e9f222d09c 100644 --- a/sound/soc/codecs/alc5632.c +++ b/sound/soc/codecs/alc5632.c | |||
@@ -614,7 +614,7 @@ struct _pll_div { | |||
614 | }; | 614 | }; |
615 | 615 | ||
616 | /* Note : pll code from original alc5632 driver. Not sure of how good it is */ | 616 | /* Note : pll code from original alc5632 driver. Not sure of how good it is */ |
617 | /* usefull only for master mode */ | 617 | /* useful only for master mode */ |
618 | static const struct _pll_div codec_master_pll_div[] = { | 618 | static const struct _pll_div codec_master_pll_div[] = { |
619 | 619 | ||
620 | { 2048000, 8192000, 0x0ea0}, | 620 | { 2048000, 8192000, 0x0ea0}, |