diff options
52 files changed, 72 insertions, 90 deletions
diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu index 6943133afcb8..9c978dcae07d 100644 --- a/Documentation/ABI/testing/sysfs-devices-system-cpu +++ b/Documentation/ABI/testing/sysfs-devices-system-cpu | |||
@@ -67,20 +67,6 @@ Description: Discover NUMA node a CPU belongs to | |||
67 | /sys/devices/system/cpu/cpu42/node2 -> ../../node/node2 | 67 | /sys/devices/system/cpu/cpu42/node2 -> ../../node/node2 |
68 | 68 | ||
69 | 69 | ||
70 | What: /sys/devices/system/cpu/cpu#/node | ||
71 | Date: October 2009 | ||
72 | Contact: Linux memory management mailing list <linux-mm@kvack.org> | ||
73 | Description: Discover NUMA node a CPU belongs to | ||
74 | |||
75 | When CONFIG_NUMA is enabled, a symbolic link that points | ||
76 | to the corresponding NUMA node directory. | ||
77 | |||
78 | For example, the following symlink is created for cpu42 | ||
79 | in NUMA node 2: | ||
80 | |||
81 | /sys/devices/system/cpu/cpu42/node2 -> ../../node/node2 | ||
82 | |||
83 | |||
84 | What: /sys/devices/system/cpu/cpu#/topology/core_id | 70 | What: /sys/devices/system/cpu/cpu#/topology/core_id |
85 | /sys/devices/system/cpu/cpu#/topology/core_siblings | 71 | /sys/devices/system/cpu/cpu#/topology/core_siblings |
86 | /sys/devices/system/cpu/cpu#/topology/core_siblings_list | 72 | /sys/devices/system/cpu/cpu#/topology/core_siblings_list |
diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt index de38429beb71..e015a83c3996 100644 --- a/Documentation/x86/x86_64/boot-options.txt +++ b/Documentation/x86/x86_64/boot-options.txt | |||
@@ -112,10 +112,6 @@ Timing | |||
112 | This can be used to work around timing problems on multiprocessor systems | 112 | This can be used to work around timing problems on multiprocessor systems |
113 | with not properly synchronized CPUs. | 113 | with not properly synchronized CPUs. |
114 | 114 | ||
115 | report_lost_ticks | ||
116 | Report when timer interrupts are lost because some code turned off | ||
117 | interrupts for too long. | ||
118 | |||
119 | nohpet | 115 | nohpet |
120 | Don't use the HPET timer. | 116 | Don't use the HPET timer. |
121 | 117 | ||
diff --git a/arch/h8300/README b/arch/h8300/README index 637f5a02f311..efa805fda19b 100644 --- a/arch/h8300/README +++ b/arch/h8300/README | |||
@@ -11,7 +11,7 @@ H8/300H and H8S | |||
11 | 2.AE 3068/AE 3069 | 11 | 2.AE 3068/AE 3069 |
12 | more information | 12 | more information |
13 | MICROTRONIQUE <http://www.microtronique.com/> | 13 | MICROTRONIQUE <http://www.microtronique.com/> |
14 | Akizuki Denshi Tsusho Ltd. <http://www.akizuki.ne.jp> (Japanese Only) | 14 | Akizuki Denshi Tsusho Ltd. <http://akizukidenshi.com/> (Japanese Only) |
15 | 15 | ||
16 | 3.H8MAX | 16 | 3.H8MAX |
17 | see http://ip-sol.jp/h8max/ (Japanese Only) | 17 | see http://ip-sol.jp/h8max/ (Japanese Only) |
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c index 116dea17acf5..dfdfe8bdc9c5 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c | |||
@@ -175,7 +175,7 @@ int cvmx_helper_dump_packet(cvmx_wqe_t *work) | |||
175 | * Packets will begin slowly dropping when there are less than | 175 | * Packets will begin slowly dropping when there are less than |
176 | * this many packet buffers free in FPA 0. | 176 | * this many packet buffers free in FPA 0. |
177 | * @drop_thresh: | 177 | * @drop_thresh: |
178 | * All incomming packets will be dropped when there are less | 178 | * All incoming packets will be dropped when there are less |
179 | * than this many free packet buffers in FPA 0. | 179 | * than this many free packet buffers in FPA 0. |
180 | * Returns Zero on success. Negative on failure | 180 | * Returns Zero on success. Negative on failure |
181 | */ | 181 | */ |
@@ -210,7 +210,7 @@ int cvmx_helper_setup_red_queue(int queue, int pass_thresh, int drop_thresh) | |||
210 | * Packets will begin slowly dropping when there are less than | 210 | * Packets will begin slowly dropping when there are less than |
211 | * this many packet buffers free in FPA 0. | 211 | * this many packet buffers free in FPA 0. |
212 | * @drop_thresh: | 212 | * @drop_thresh: |
213 | * All incomming packets will be dropped when there are less | 213 | * All incoming packets will be dropped when there are less |
214 | * than this many free packet buffers in FPA 0. | 214 | * than this many free packet buffers in FPA 0. |
215 | * Returns Zero on success. Negative on failure | 215 | * Returns Zero on success. Negative on failure |
216 | */ | 216 | */ |
diff --git a/arch/mips/include/asm/octeon/cvmx-helper-util.h b/arch/mips/include/asm/octeon/cvmx-helper-util.h index 6a6e52fc22c1..01c8ddd84ff8 100644 --- a/arch/mips/include/asm/octeon/cvmx-helper-util.h +++ b/arch/mips/include/asm/octeon/cvmx-helper-util.h | |||
@@ -60,7 +60,7 @@ extern int cvmx_helper_dump_packet(cvmx_wqe_t *work); | |||
60 | * Packets will begin slowly dropping when there are less than | 60 | * Packets will begin slowly dropping when there are less than |
61 | * this many packet buffers free in FPA 0. | 61 | * this many packet buffers free in FPA 0. |
62 | * @drop_thresh: | 62 | * @drop_thresh: |
63 | * All incomming packets will be dropped when there are less | 63 | * All incoming packets will be dropped when there are less |
64 | * than this many free packet buffers in FPA 0. | 64 | * than this many free packet buffers in FPA 0. |
65 | * Returns Zero on success. Negative on failure | 65 | * Returns Zero on success. Negative on failure |
66 | */ | 66 | */ |
@@ -74,7 +74,7 @@ extern int cvmx_helper_setup_red_queue(int queue, int pass_thresh, | |||
74 | * Packets will begin slowly dropping when there are less than | 74 | * Packets will begin slowly dropping when there are less than |
75 | * this many packet buffers free in FPA 0. | 75 | * this many packet buffers free in FPA 0. |
76 | * @drop_thresh: | 76 | * @drop_thresh: |
77 | * All incomming packets will be dropped when there are less | 77 | * All incoming packets will be dropped when there are less |
78 | * than this many free packet buffers in FPA 0. | 78 | * than this many free packet buffers in FPA 0. |
79 | * Returns Zero on success. Negative on failure | 79 | * Returns Zero on success. Negative on failure |
80 | */ | 80 | */ |
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c index 7328b8d74129..e346edf7f157 100644 --- a/arch/powerpc/platforms/85xx/p1022_ds.c +++ b/arch/powerpc/platforms/85xx/p1022_ds.c | |||
@@ -215,13 +215,13 @@ static void p1022ds_set_monitor_port(enum fsl_diu_monitor_port port) | |||
215 | /* Map the global utilities registers. */ | 215 | /* Map the global utilities registers. */ |
216 | guts_node = of_find_compatible_node(NULL, NULL, "fsl,p1022-guts"); | 216 | guts_node = of_find_compatible_node(NULL, NULL, "fsl,p1022-guts"); |
217 | if (!guts_node) { | 217 | if (!guts_node) { |
218 | pr_err("p1022ds: missing global utilties device node\n"); | 218 | pr_err("p1022ds: missing global utilities device node\n"); |
219 | return; | 219 | return; |
220 | } | 220 | } |
221 | 221 | ||
222 | guts = of_iomap(guts_node, 0); | 222 | guts = of_iomap(guts_node, 0); |
223 | if (!guts) { | 223 | if (!guts) { |
224 | pr_err("p1022ds: could not map global utilties device\n"); | 224 | pr_err("p1022ds: could not map global utilities device\n"); |
225 | goto exit; | 225 | goto exit; |
226 | } | 226 | } |
227 | 227 | ||
@@ -416,14 +416,14 @@ void p1022ds_set_pixel_clock(unsigned int pixclock) | |||
416 | /* Map the global utilities registers. */ | 416 | /* Map the global utilities registers. */ |
417 | guts_np = of_find_compatible_node(NULL, NULL, "fsl,p1022-guts"); | 417 | guts_np = of_find_compatible_node(NULL, NULL, "fsl,p1022-guts"); |
418 | if (!guts_np) { | 418 | if (!guts_np) { |
419 | pr_err("p1022ds: missing global utilties device node\n"); | 419 | pr_err("p1022ds: missing global utilities device node\n"); |
420 | return; | 420 | return; |
421 | } | 421 | } |
422 | 422 | ||
423 | guts = of_iomap(guts_np, 0); | 423 | guts = of_iomap(guts_np, 0); |
424 | of_node_put(guts_np); | 424 | of_node_put(guts_np); |
425 | if (!guts) { | 425 | if (!guts) { |
426 | pr_err("p1022ds: could not map global utilties device\n"); | 426 | pr_err("p1022ds: could not map global utilities device\n"); |
427 | return; | 427 | return; |
428 | } | 428 | } |
429 | 429 | ||
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c index 04d9d317f741..d479d68fbb2b 100644 --- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c +++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c | |||
@@ -236,14 +236,14 @@ void mpc8610hpcd_set_pixel_clock(unsigned int pixclock) | |||
236 | /* Map the global utilities registers. */ | 236 | /* Map the global utilities registers. */ |
237 | guts_np = of_find_compatible_node(NULL, NULL, "fsl,mpc8610-guts"); | 237 | guts_np = of_find_compatible_node(NULL, NULL, "fsl,mpc8610-guts"); |
238 | if (!guts_np) { | 238 | if (!guts_np) { |
239 | pr_err("mpc8610hpcd: missing global utilties device node\n"); | 239 | pr_err("mpc8610hpcd: missing global utilities device node\n"); |
240 | return; | 240 | return; |
241 | } | 241 | } |
242 | 242 | ||
243 | guts = of_iomap(guts_np, 0); | 243 | guts = of_iomap(guts_np, 0); |
244 | of_node_put(guts_np); | 244 | of_node_put(guts_np); |
245 | if (!guts) { | 245 | if (!guts) { |
246 | pr_err("mpc8610hpcd: could not map global utilties device\n"); | 246 | pr_err("mpc8610hpcd: could not map global utilities device\n"); |
247 | return; | 247 | return; |
248 | } | 248 | } |
249 | 249 | ||
diff --git a/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/arch/x86/kernel/cpu/perf_event_amd_ibs.c index 6336bcbd0618..5f0581e713c2 100644 --- a/arch/x86/kernel/cpu/perf_event_amd_ibs.c +++ b/arch/x86/kernel/cpu/perf_event_amd_ibs.c | |||
@@ -528,7 +528,7 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs) | |||
528 | if (!test_bit(IBS_STARTED, pcpu->state)) { | 528 | if (!test_bit(IBS_STARTED, pcpu->state)) { |
529 | /* | 529 | /* |
530 | * Catch spurious interrupts after stopping IBS: After | 530 | * Catch spurious interrupts after stopping IBS: After |
531 | * disabling IBS there could be still incomming NMIs | 531 | * disabling IBS there could be still incoming NMIs |
532 | * with samples that even have the valid bit cleared. | 532 | * with samples that even have the valid bit cleared. |
533 | * Mark all this NMIs as handled. | 533 | * Mark all this NMIs as handled. |
534 | */ | 534 | */ |
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 5aab1acabf1c..68f172948a31 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig | |||
@@ -22,7 +22,7 @@ config XTENSA | |||
22 | configurable and extensible. The Linux port to the Xtensa | 22 | configurable and extensible. The Linux port to the Xtensa |
23 | architecture supports all processor configurations and extensions, | 23 | architecture supports all processor configurations and extensions, |
24 | with reasonable minimum requirements. The Xtensa Linux project has | 24 | with reasonable minimum requirements. The Xtensa Linux project has |
25 | a home page at <http://xtensa.sourceforge.net/>. | 25 | a home page at <http://www.linux-xtensa.org/>. |
26 | 26 | ||
27 | config RWSEM_XCHGADD_ALGORITHM | 27 | config RWSEM_XCHGADD_ALGORITHM |
28 | def_bool y | 28 | def_bool y |
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index 33c9a44a9678..a8a41e07a221 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c | |||
@@ -349,7 +349,7 @@ static int ath3k_load_syscfg(struct usb_device *udev) | |||
349 | 349 | ||
350 | ret = ath3k_get_state(udev, &fw_state); | 350 | ret = ath3k_get_state(udev, &fw_state); |
351 | if (ret < 0) { | 351 | if (ret < 0) { |
352 | BT_ERR("Can't get state to change to load configration err"); | 352 | BT_ERR("Can't get state to change to load configuration err"); |
353 | return -EBUSY; | 353 | return -EBUSY; |
354 | } | 354 | } |
355 | 355 | ||
diff --git a/drivers/devfreq/exynos4_bus.c b/drivers/devfreq/exynos4_bus.c index 46d94e9e95b5..3f37f3b3f268 100644 --- a/drivers/devfreq/exynos4_bus.c +++ b/drivers/devfreq/exynos4_bus.c | |||
@@ -658,7 +658,7 @@ static int exynos4_bus_target(struct device *dev, unsigned long *_freq, | |||
658 | if (old_freq == freq) | 658 | if (old_freq == freq) |
659 | return 0; | 659 | return 0; |
660 | 660 | ||
661 | dev_dbg(dev, "targetting %lukHz %luuV\n", freq, new_oppinfo.volt); | 661 | dev_dbg(dev, "targeting %lukHz %luuV\n", freq, new_oppinfo.volt); |
662 | 662 | ||
663 | mutex_lock(&data->lock); | 663 | mutex_lock(&data->lock); |
664 | 664 | ||
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 6ce6e07c38c1..45912e6e0ac2 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
@@ -329,7 +329,7 @@ module_param_named(quirks, param_quirks, int, 0644); | |||
329 | MODULE_PARM_DESC(quirks, "Chip quirks (default = 0" | 329 | MODULE_PARM_DESC(quirks, "Chip quirks (default = 0" |
330 | ", nonatomic cycle timer = " __stringify(QUIRK_CYCLE_TIMER) | 330 | ", nonatomic cycle timer = " __stringify(QUIRK_CYCLE_TIMER) |
331 | ", reset packet generation = " __stringify(QUIRK_RESET_PACKET) | 331 | ", reset packet generation = " __stringify(QUIRK_RESET_PACKET) |
332 | ", AR/selfID endianess = " __stringify(QUIRK_BE_HEADERS) | 332 | ", AR/selfID endianness = " __stringify(QUIRK_BE_HEADERS) |
333 | ", no 1394a enhancements = " __stringify(QUIRK_NO_1394A) | 333 | ", no 1394a enhancements = " __stringify(QUIRK_NO_1394A) |
334 | ", disable MSI = " __stringify(QUIRK_NO_MSI) | 334 | ", disable MSI = " __stringify(QUIRK_NO_MSI) |
335 | ", TI SLLZ059 erratum = " __stringify(QUIRK_TI_SLLZ059) | 335 | ", TI SLLZ059 erratum = " __stringify(QUIRK_TI_SLLZ059) |
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 7944d301518a..6fa0fc057d9f 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
@@ -1458,7 +1458,7 @@ static const char *swizzle_string(unsigned swizzle) | |||
1458 | case I915_BIT_6_SWIZZLE_9_10_17: | 1458 | case I915_BIT_6_SWIZZLE_9_10_17: |
1459 | return "bit9/bit10/bit17"; | 1459 | return "bit9/bit10/bit17"; |
1460 | case I915_BIT_6_SWIZZLE_UNKNOWN: | 1460 | case I915_BIT_6_SWIZZLE_UNKNOWN: |
1461 | return "unkown"; | 1461 | return "unknown"; |
1462 | } | 1462 | } |
1463 | 1463 | ||
1464 | return "bug"; | 1464 | return "bug"; |
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index e7d6a13ec6a6..eae0c7e468cf 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -320,7 +320,7 @@ config HID_LOGITECH_DJ | |||
320 | Say Y if you want support for Logitech Unifying receivers and devices. | 320 | Say Y if you want support for Logitech Unifying receivers and devices. |
321 | Unifying receivers are capable of pairing up to 6 Logitech compliant | 321 | Unifying receivers are capable of pairing up to 6 Logitech compliant |
322 | devices to the same receiver. Without this driver it will be handled by | 322 | devices to the same receiver. Without this driver it will be handled by |
323 | generic USB_HID driver and all incomming events will be multiplexed | 323 | generic USB_HID driver and all incoming events will be multiplexed |
324 | into a single mouse and a single keyboard device. | 324 | into a single mouse and a single keyboard device. |
325 | 325 | ||
326 | config LOGITECH_FF | 326 | config LOGITECH_FF |
diff --git a/drivers/isdn/hardware/eicon/divacapi.h b/drivers/isdn/hardware/eicon/divacapi.h index 3942efbbfb58..a315a2914d70 100644 --- a/drivers/isdn/hardware/eicon/divacapi.h +++ b/drivers/isdn/hardware/eicon/divacapi.h | |||
@@ -422,11 +422,11 @@ struct _DIVA_CAPI_ADAPTER { | |||
422 | #define LAPD 6 /* lapd (Q.921) */ | 422 | #define LAPD 6 /* lapd (Q.921) */ |
423 | #define X25_L2 7 /* x.25 layer-2 */ | 423 | #define X25_L2 7 /* x.25 layer-2 */ |
424 | #define V120_L2 8 /* V.120 layer-2 protocol */ | 424 | #define V120_L2 8 /* V.120 layer-2 protocol */ |
425 | #define V42_IN 9 /* V.42 layer-2 protocol, incomming */ | 425 | #define V42_IN 9 /* V.42 layer-2 protocol, incoming */ |
426 | #define V42 10 /* V.42 layer-2 protocol */ | 426 | #define V42 10 /* V.42 layer-2 protocol */ |
427 | #define MDM_ATP 11 /* AT Parser built in the L2 */ | 427 | #define MDM_ATP 11 /* AT Parser built in the L2 */ |
428 | #define X75_V42BIS 12 /* ISO7776 (X.75 SLP) modified to support V.42 bis compression */ | 428 | #define X75_V42BIS 12 /* ISO7776 (X.75 SLP) modified to support V.42 bis compression */ |
429 | #define RTPL2_IN 13 /* RTP layer-2 protocol, incomming */ | 429 | #define RTPL2_IN 13 /* RTP layer-2 protocol, incoming */ |
430 | #define RTPL2 14 /* RTP layer-2 protocol */ | 430 | #define RTPL2 14 /* RTP layer-2 protocol */ |
431 | #define V120_V42BIS 15 /* V.120 layer-2 protocol supporting V.42 bis compression */ | 431 | #define V120_V42BIS 15 /* V.120 layer-2 protocol supporting V.42 bis compression */ |
432 | 432 | ||
@@ -1125,7 +1125,7 @@ extern word li_total_channels; | |||
1125 | | Direction | word | Enable compression/decompression for | | 1125 | | Direction | word | Enable compression/decompression for | |
1126 | | | | 0: All direction | | 1126 | | | | 0: All direction | |
1127 | | | | 1: disable outgoing data | | 1127 | | | | 1: disable outgoing data | |
1128 | | | | 2: disable incomming data | | 1128 | | | | 2: disable incoming data | |
1129 | | | | 3: disable both direction (default) | | 1129 | | | | 3: disable both direction (default) | |
1130 | +---------------------+------+-----------------------------------------+ | 1130 | +---------------------+------+-----------------------------------------+ |
1131 | | Number of code | word | Parameter P1 of V.42bis in accordance | | 1131 | | Number of code | word | Parameter P1 of V.42bis in accordance | |
diff --git a/drivers/isdn/hardware/eicon/pc.h b/drivers/isdn/hardware/eicon/pc.h index 889dc984bbca..329c0c26abfb 100644 --- a/drivers/isdn/hardware/eicon/pc.h +++ b/drivers/isdn/hardware/eicon/pc.h | |||
@@ -419,11 +419,11 @@ struct dual | |||
419 | #define LAPD 6 /* lapd (Q.921) */ | 419 | #define LAPD 6 /* lapd (Q.921) */ |
420 | #define X25_L2 7 /* x.25 layer-2 */ | 420 | #define X25_L2 7 /* x.25 layer-2 */ |
421 | #define V120_L2 8 /* V.120 layer-2 protocol */ | 421 | #define V120_L2 8 /* V.120 layer-2 protocol */ |
422 | #define V42_IN 9 /* V.42 layer-2 protocol, incomming */ | 422 | #define V42_IN 9 /* V.42 layer-2 protocol, incoming */ |
423 | #define V42 10 /* V.42 layer-2 protocol */ | 423 | #define V42 10 /* V.42 layer-2 protocol */ |
424 | #define MDM_ATP 11 /* AT Parser built in the L2 */ | 424 | #define MDM_ATP 11 /* AT Parser built in the L2 */ |
425 | #define X75_V42BIS 12 /* x.75 with V.42bis */ | 425 | #define X75_V42BIS 12 /* x.75 with V.42bis */ |
426 | #define RTPL2_IN 13 /* RTP layer-2 protocol, incomming */ | 426 | #define RTPL2_IN 13 /* RTP layer-2 protocol, incoming */ |
427 | #define RTPL2 14 /* RTP layer-2 protocol */ | 427 | #define RTPL2 14 /* RTP layer-2 protocol */ |
428 | #define V120_V42BIS 15 /* V.120 asynchronous mode supporting V.42bis compression */ | 428 | #define V120_V42BIS 15 /* V.120 asynchronous mode supporting V.42bis compression */ |
429 | #define LISTENER 27 /* Layer 2 to listen line */ | 429 | #define LISTENER 27 /* Layer 2 to listen line */ |
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index f8e405c383a0..2c0d2c2bf946 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c | |||
@@ -689,7 +689,7 @@ l1oip_socket_thread(void *data) | |||
689 | hc->sin_remote.sin_addr.s_addr = htonl(hc->remoteip); | 689 | hc->sin_remote.sin_addr.s_addr = htonl(hc->remoteip); |
690 | hc->sin_remote.sin_port = htons((unsigned short)hc->remoteport); | 690 | hc->sin_remote.sin_port = htons((unsigned short)hc->remoteport); |
691 | 691 | ||
692 | /* bind to incomming port */ | 692 | /* bind to incoming port */ |
693 | if (socket->ops->bind(socket, (struct sockaddr *)&hc->sin_local, | 693 | if (socket->ops->bind(socket, (struct sockaddr *)&hc->sin_local, |
694 | sizeof(hc->sin_local))) { | 694 | sizeof(hc->sin_local))) { |
695 | printk(KERN_ERR "%s: Failed to bind socket to port %d.\n", | 695 | printk(KERN_ERR "%s: Failed to bind socket to port %d.\n", |
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c index 8bda2c908aba..5cc55f333f84 100644 --- a/drivers/media/platform/soc_camera/mx2_camera.c +++ b/drivers/media/platform/soc_camera/mx2_camera.c | |||
@@ -345,7 +345,7 @@ static struct mx2_fmt_cfg mx27_emma_prp_table[] = { | |||
345 | /* | 345 | /* |
346 | * This is a generic configuration which is valid for most | 346 | * This is a generic configuration which is valid for most |
347 | * prp input-output format combinations. | 347 | * prp input-output format combinations. |
348 | * We set the incomming and outgoing pixelformat to a | 348 | * We set the incoming and outgoing pixelformat to a |
349 | * 16 Bit wide format and adjust the bytesperline | 349 | * 16 Bit wide format and adjust the bytesperline |
350 | * accordingly. With this configuration the inputdata | 350 | * accordingly. With this configuration the inputdata |
351 | * will not be changed by the emma and could be any type | 351 | * will not be changed by the emma and could be any type |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 5523da3afcdc..c9ec54730d1d 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |||
@@ -8689,7 +8689,7 @@ static void bnx2x_set_234_gates(struct bnx2x *bp, bool close) | |||
8689 | (!close) ? (val | HC_CONFIG_0_REG_BLOCK_DISABLE_0) : | 8689 | (!close) ? (val | HC_CONFIG_0_REG_BLOCK_DISABLE_0) : |
8690 | (val & ~(u32)HC_CONFIG_0_REG_BLOCK_DISABLE_0)); | 8690 | (val & ~(u32)HC_CONFIG_0_REG_BLOCK_DISABLE_0)); |
8691 | } else { | 8691 | } else { |
8692 | /* Prevent incomming interrupts in IGU */ | 8692 | /* Prevent incoming interrupts in IGU */ |
8693 | val = REG_RD(bp, IGU_REG_BLOCK_CONFIGURATION); | 8693 | val = REG_RD(bp, IGU_REG_BLOCK_CONFIGURATION); |
8694 | 8694 | ||
8695 | REG_WR(bp, IGU_REG_BLOCK_CONFIGURATION, | 8695 | REG_WR(bp, IGU_REG_BLOCK_CONFIGURATION, |
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c index 3a2b8c65642d..8611c89f034d 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c | |||
@@ -64,7 +64,7 @@ static const char mlx4_en_version[] = | |||
64 | 64 | ||
65 | /* Enable RSS UDP traffic */ | 65 | /* Enable RSS UDP traffic */ |
66 | MLX4_EN_PARM_INT(udp_rss, 1, | 66 | MLX4_EN_PARM_INT(udp_rss, 1, |
67 | "Enable RSS for incomming UDP traffic or disabled (0)"); | 67 | "Enable RSS for incoming UDP traffic or disabled (0)"); |
68 | 68 | ||
69 | /* Priority pausing */ | 69 | /* Priority pausing */ |
70 | MLX4_EN_PARM_INT(pfctx, 0, "Priority based Flow Control policy on TX[7:0]." | 70 | MLX4_EN_PARM_INT(pfctx, 0, "Priority based Flow Control policy on TX[7:0]." |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index d833f5927891..b30af2b1cd28 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |||
@@ -916,7 +916,7 @@ static int qlcnic_check_npar_opertional(struct qlcnic_adapter *adapter) | |||
916 | } | 916 | } |
917 | if (!npar_opt_timeo) { | 917 | if (!npar_opt_timeo) { |
918 | dev_err(&adapter->pdev->dev, | 918 | dev_err(&adapter->pdev->dev, |
919 | "Waiting for NPAR state to opertional timeout\n"); | 919 | "Waiting for NPAR state to operational timeout\n"); |
920 | return -EIO; | 920 | return -EIO; |
921 | } | 921 | } |
922 | return 0; | 922 | return 0; |
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index 84872043b5c6..9cea451a6081 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
@@ -993,7 +993,7 @@ static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud) | |||
993 | /* Enable Interuupt */ | 993 | /* Enable Interuupt */ |
994 | self->ier = IER_EOM; // benjamin 2000/11/20 07:24PM | 994 | self->ier = IER_EOM; // benjamin 2000/11/20 07:24PM |
995 | 995 | ||
996 | /* Be ready for incomming frames */ | 996 | /* Be ready for incoming frames */ |
997 | ali_ircc_dma_receive(self); // benajmin 2000/11/8 07:46PM not complete | 997 | ali_ircc_dma_receive(self); // benajmin 2000/11/8 07:46PM not complete |
998 | } | 998 | } |
999 | /* Go to SIR Speed */ | 999 | /* Go to SIR Speed */ |
diff --git a/drivers/of/address.c b/drivers/of/address.c index 0125524c08c4..04da786c84d2 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c | |||
@@ -429,7 +429,7 @@ static u64 __of_translate_address(struct device_node *dev, | |||
429 | goto bail; | 429 | goto bail; |
430 | bus = of_match_bus(parent); | 430 | bus = of_match_bus(parent); |
431 | 431 | ||
432 | /* Cound address cells & copy address locally */ | 432 | /* Count address cells & copy address locally */ |
433 | bus->count_cells(dev, &na, &ns); | 433 | bus->count_cells(dev, &na, &ns); |
434 | if (!OF_CHECK_COUNTS(na, ns)) { | 434 | if (!OF_CHECK_COUNTS(na, ns)) { |
435 | printk(KERN_ERR "prom_parse: Bad cell count for %s\n", | 435 | printk(KERN_ERR "prom_parse: Bad cell count for %s\n", |
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index b80891b43816..e0a6514ab46c 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c | |||
@@ -436,6 +436,7 @@ EXPORT_SYMBOL(of_platform_bus_probe); | |||
436 | * of_platform_populate() - Populate platform_devices from device tree data | 436 | * of_platform_populate() - Populate platform_devices from device tree data |
437 | * @root: parent of the first level to probe or NULL for the root of the tree | 437 | * @root: parent of the first level to probe or NULL for the root of the tree |
438 | * @matches: match table, NULL to use the default | 438 | * @matches: match table, NULL to use the default |
439 | * @lookup: auxdata table for matching id and platform_data with device nodes | ||
439 | * @parent: parent to hook devices from, NULL for toplevel | 440 | * @parent: parent to hook devices from, NULL for toplevel |
440 | * | 441 | * |
441 | * Similar to of_platform_bus_probe(), this function walks the device tree | 442 | * Similar to of_platform_bus_probe(), this function walks the device tree |
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index 430a9ac56091..065704c605d5 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c | |||
@@ -369,12 +369,12 @@ static int do_validate_mem(struct pcmcia_socket *s, | |||
369 | } | 369 | } |
370 | } | 370 | } |
371 | 371 | ||
372 | free_region(res2); | ||
373 | free_region(res1); | ||
374 | |||
375 | dev_dbg(&s->dev, "cs: memory probe 0x%06lx-0x%06lx: %p %p %u %u %u", | 372 | dev_dbg(&s->dev, "cs: memory probe 0x%06lx-0x%06lx: %p %p %u %u %u", |
376 | base, base+size-1, res1, res2, ret, info1, info2); | 373 | base, base+size-1, res1, res2, ret, info1, info2); |
377 | 374 | ||
375 | free_region(res2); | ||
376 | free_region(res1); | ||
377 | |||
378 | if ((ret) || (info1 != info2) || (info1 == 0)) | 378 | if ((ret) || (info1 != info2) || (info1 == 0)) |
379 | return -EINVAL; | 379 | return -EINVAL; |
380 | 380 | ||
diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index f1e323924f12..d85446021ddb 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c | |||
@@ -839,7 +839,7 @@ static void rpmsg_recv_done(struct virtqueue *rvq) | |||
839 | /* farewell, ept, we don't need you anymore */ | 839 | /* farewell, ept, we don't need you anymore */ |
840 | kref_put(&ept->refcount, __ept_release); | 840 | kref_put(&ept->refcount, __ept_release); |
841 | } else | 841 | } else |
842 | dev_warn(dev, "msg received with no recepient\n"); | 842 | dev_warn(dev, "msg received with no recipient\n"); |
843 | 843 | ||
844 | /* publish the real size of the buffer */ | 844 | /* publish the real size of the buffer */ |
845 | sg_init_one(&sg, msg, RPMSG_BUF_SIZE); | 845 | sg_init_one(&sg, msg, RPMSG_BUF_SIZE); |
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 142f632e2a2e..65e764cb33af 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -883,7 +883,7 @@ config SCSI_IBMVSCSI | |||
883 | This is the IBM POWER Virtual SCSI Client | 883 | This is the IBM POWER Virtual SCSI Client |
884 | 884 | ||
885 | To compile this driver as a module, choose M here: the | 885 | To compile this driver as a module, choose M here: the |
886 | module will be called ibmvscsic. | 886 | module will be called ibmvscsi. |
887 | 887 | ||
888 | config SCSI_IBMVSCSIS | 888 | config SCSI_IBMVSCSIS |
889 | tristate "IBM Virtual SCSI Server support" | 889 | tristate "IBM Virtual SCSI Server support" |
diff --git a/drivers/staging/android/binder.h b/drivers/staging/android/binder.h index 2f7d195d8b15..629372f89658 100644 --- a/drivers/staging/android/binder.h +++ b/drivers/staging/android/binder.h | |||
@@ -224,7 +224,7 @@ enum BinderDriverReturnProtocol { | |||
224 | BR_SPAWN_LOOPER = _IO('r', 13), | 224 | BR_SPAWN_LOOPER = _IO('r', 13), |
225 | /* | 225 | /* |
226 | * No parameters. The driver has determined that a process has no | 226 | * No parameters. The driver has determined that a process has no |
227 | * threads waiting to service incomming transactions. When a process | 227 | * threads waiting to service incoming transactions. When a process |
228 | * receives this command, it must spawn a new service thread and | 228 | * receives this command, it must spawn a new service thread and |
229 | * register it via bcENTER_LOOPER. | 229 | * register it via bcENTER_LOOPER. |
230 | */ | 230 | */ |
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index ef32dc1bbc80..1335283412e2 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c | |||
@@ -72,7 +72,7 @@ int pow_receive_group = 15; | |||
72 | module_param(pow_receive_group, int, 0444); | 72 | module_param(pow_receive_group, int, 0444); |
73 | MODULE_PARM_DESC(pow_receive_group, "\n" | 73 | MODULE_PARM_DESC(pow_receive_group, "\n" |
74 | "\tPOW group to receive packets from. All ethernet hardware\n" | 74 | "\tPOW group to receive packets from. All ethernet hardware\n" |
75 | "\twill be configured to send incomming packets to this POW\n" | 75 | "\twill be configured to send incoming packets to this POW\n" |
76 | "\tgroup. Also any other software can submit packets to this\n" | 76 | "\tgroup. Also any other software can submit packets to this\n" |
77 | "\tgroup for the kernel to process."); | 77 | "\tgroup for the kernel to process."); |
78 | 78 | ||
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c index 2e8d06f198ae..6917a9e938e7 100644 --- a/drivers/target/sbp/sbp_target.c +++ b/drivers/target/sbp/sbp_target.c | |||
@@ -1719,7 +1719,7 @@ static struct se_node_acl *sbp_alloc_fabric_acl(struct se_portal_group *se_tpg) | |||
1719 | 1719 | ||
1720 | nacl = kzalloc(sizeof(struct sbp_nacl), GFP_KERNEL); | 1720 | nacl = kzalloc(sizeof(struct sbp_nacl), GFP_KERNEL); |
1721 | if (!nacl) { | 1721 | if (!nacl) { |
1722 | pr_err("Unable to alocate struct sbp_nacl\n"); | 1722 | pr_err("Unable to allocate struct sbp_nacl\n"); |
1723 | return NULL; | 1723 | return NULL; |
1724 | } | 1724 | } |
1725 | 1725 | ||
diff --git a/drivers/tty/ipwireless/hardware.c b/drivers/tty/ipwireless/hardware.c index b4ba0670dc54..97a511f4185d 100644 --- a/drivers/tty/ipwireless/hardware.c +++ b/drivers/tty/ipwireless/hardware.c | |||
@@ -646,7 +646,7 @@ static void queue_received_packet(struct ipw_hardware *hw, | |||
646 | (*assem) = pool_allocate(hw, *assem, length); | 646 | (*assem) = pool_allocate(hw, *assem, length); |
647 | if (!(*assem)) { | 647 | if (!(*assem)) { |
648 | printk(KERN_ERR IPWIRELESS_PCCARD_NAME | 648 | printk(KERN_ERR IPWIRELESS_PCCARD_NAME |
649 | ": no memory for incomming data packet, dropped!\n"); | 649 | ": no memory for incoming data packet, dropped!\n"); |
650 | return; | 650 | return; |
651 | } | 651 | } |
652 | (*assem)->protocol = protocol; | 652 | (*assem)->protocol = protocol; |
@@ -670,7 +670,7 @@ static void queue_received_packet(struct ipw_hardware *hw, | |||
670 | packet = pool_allocate(hw, NULL, length); | 670 | packet = pool_allocate(hw, NULL, length); |
671 | if (!packet) { | 671 | if (!packet) { |
672 | printk(KERN_ERR IPWIRELESS_PCCARD_NAME | 672 | printk(KERN_ERR IPWIRELESS_PCCARD_NAME |
673 | ": no memory for incomming ctrl packet, dropped!\n"); | 673 | ": no memory for incoming ctrl packet, dropped!\n"); |
674 | return; | 674 | return; |
675 | } | 675 | } |
676 | packet->protocol = protocol; | 676 | packet->protocol = protocol; |
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index a8b8adc05070..c61ebb630561 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -6524,7 +6524,7 @@ reada: | |||
6524 | } | 6524 | } |
6525 | 6525 | ||
6526 | /* | 6526 | /* |
6527 | * hepler to process tree block while walking down the tree. | 6527 | * helper to process tree block while walking down the tree. |
6528 | * | 6528 | * |
6529 | * when wc->stage == UPDATE_BACKREF, this function updates | 6529 | * when wc->stage == UPDATE_BACKREF, this function updates |
6530 | * back refs for pointers in the block. | 6530 | * back refs for pointers in the block. |
@@ -6599,7 +6599,7 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans, | |||
6599 | } | 6599 | } |
6600 | 6600 | ||
6601 | /* | 6601 | /* |
6602 | * hepler to process tree block pointer. | 6602 | * helper to process tree block pointer. |
6603 | * | 6603 | * |
6604 | * when wc->stage == DROP_REFERENCE, this function checks | 6604 | * when wc->stage == DROP_REFERENCE, this function checks |
6605 | * reference count of the block pointed to. if the block | 6605 | * reference count of the block pointed to. if the block |
@@ -6737,7 +6737,7 @@ skip: | |||
6737 | } | 6737 | } |
6738 | 6738 | ||
6739 | /* | 6739 | /* |
6740 | * hepler to process tree block while walking up the tree. | 6740 | * helper to process tree block while walking up the tree. |
6741 | * | 6741 | * |
6742 | * when wc->stage == DROP_REFERENCE, this function drops | 6742 | * when wc->stage == DROP_REFERENCE, this function drops |
6743 | * reference count on the block. | 6743 | * reference count on the block. |
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 300e09ac3659..17c306bf177a 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c | |||
@@ -3472,7 +3472,7 @@ out: | |||
3472 | } | 3472 | } |
3473 | 3473 | ||
3474 | /* | 3474 | /* |
3475 | * hepler to find all tree blocks that reference a given data extent | 3475 | * helper to find all tree blocks that reference a given data extent |
3476 | */ | 3476 | */ |
3477 | static noinline_for_stack | 3477 | static noinline_for_stack |
3478 | int add_data_references(struct reloc_control *rc, | 3478 | int add_data_references(struct reloc_control *rc, |
@@ -3566,7 +3566,7 @@ int add_data_references(struct reloc_control *rc, | |||
3566 | } | 3566 | } |
3567 | 3567 | ||
3568 | /* | 3568 | /* |
3569 | * hepler to find next unprocessed extent | 3569 | * helper to find next unprocessed extent |
3570 | */ | 3570 | */ |
3571 | static noinline_for_stack | 3571 | static noinline_for_stack |
3572 | int find_next_extent(struct btrfs_trans_handle *trans, | 3572 | int find_next_extent(struct btrfs_trans_handle *trans, |
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index f15494699f3b..fbe408204628 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c | |||
@@ -112,7 +112,6 @@ loop: | |||
112 | * to redo the trans_no_join checks above | 112 | * to redo the trans_no_join checks above |
113 | */ | 113 | */ |
114 | kmem_cache_free(btrfs_transaction_cachep, cur_trans); | 114 | kmem_cache_free(btrfs_transaction_cachep, cur_trans); |
115 | cur_trans = fs_info->running_transaction; | ||
116 | goto loop; | 115 | goto loop; |
117 | } else if (fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR) { | 116 | } else if (fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR) { |
118 | spin_unlock(&fs_info->trans_lock); | 117 | spin_unlock(&fs_info->trans_lock); |
diff --git a/fs/cifs/link.c b/fs/cifs/link.c index 51dc2fb6e854..9f6c4c45d21e 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c | |||
@@ -76,7 +76,7 @@ symlink_hash(unsigned int link_len, const char *link_str, u8 *md5_hash) | |||
76 | } | 76 | } |
77 | rc = crypto_shash_update(&sdescmd5->shash, link_str, link_len); | 77 | rc = crypto_shash_update(&sdescmd5->shash, link_str, link_len); |
78 | if (rc) { | 78 | if (rc) { |
79 | cERROR(1, "%s: Could not update iwth link_str", __func__); | 79 | cERROR(1, "%s: Could not update with link_str", __func__); |
80 | goto symlink_hash_err; | 80 | goto symlink_hash_err; |
81 | } | 81 | } |
82 | rc = crypto_shash_final(&sdescmd5->shash, md5_hash); | 82 | rc = crypto_shash_final(&sdescmd5->shash, md5_hash); |
diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c index 5dc06c837105..9edeeb0ea97e 100644 --- a/fs/hpfs/inode.c +++ b/fs/hpfs/inode.c | |||
@@ -147,7 +147,7 @@ static void hpfs_write_inode_ea(struct inode *i, struct fnode *fnode) | |||
147 | /*if (le32_to_cpu(fnode->acl_size_l) || le16_to_cpu(fnode->acl_size_s)) { | 147 | /*if (le32_to_cpu(fnode->acl_size_l) || le16_to_cpu(fnode->acl_size_s)) { |
148 | Some unknown structures like ACL may be in fnode, | 148 | Some unknown structures like ACL may be in fnode, |
149 | we'd better not overwrite them | 149 | we'd better not overwrite them |
150 | hpfs_error(i->i_sb, "fnode %08x has some unknown HPFS386 stuctures", i->i_ino); | 150 | hpfs_error(i->i_sb, "fnode %08x has some unknown HPFS386 structures", i->i_ino); |
151 | } else*/ if (hpfs_sb(i->i_sb)->sb_eas >= 2) { | 151 | } else*/ if (hpfs_sb(i->i_sb)->sb_eas >= 2) { |
152 | __le32 ea; | 152 | __le32 ea; |
153 | if (!uid_eq(i->i_uid, hpfs_sb(i->i_sb)->sb_uid) || hpfs_inode->i_ea_uid) { | 153 | if (!uid_eq(i->i_uid, hpfs_sb(i->i_sb)->sb_uid) || hpfs_inode->i_ea_uid) { |
diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 1a543be09c79..060ba638becb 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c | |||
@@ -154,7 +154,7 @@ static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf) | |||
154 | /* | 154 | /* |
155 | * If we really return the number of allocated & free inodes, some | 155 | * If we really return the number of allocated & free inodes, some |
156 | * applications will fail because they won't see enough free inodes. | 156 | * applications will fail because they won't see enough free inodes. |
157 | * We'll try to calculate some guess as to how may inodes we can | 157 | * We'll try to calculate some guess as to how many inodes we can |
158 | * really allocate | 158 | * really allocate |
159 | * | 159 | * |
160 | * buf->f_files = atomic_read(&imap->im_numinos); | 160 | * buf->f_files = atomic_read(&imap->im_numinos); |
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index 1bfe8802cc1e..a1d83c58b296 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c | |||
@@ -870,7 +870,7 @@ int o2net_register_handler(u32 msg_type, u32 key, u32 max_len, | |||
870 | /* we've had some trouble with handlers seemingly vanishing. */ | 870 | /* we've had some trouble with handlers seemingly vanishing. */ |
871 | mlog_bug_on_msg(o2net_handler_tree_lookup(msg_type, key, &p, | 871 | mlog_bug_on_msg(o2net_handler_tree_lookup(msg_type, key, &p, |
872 | &parent) == NULL, | 872 | &parent) == NULL, |
873 | "couldn't find handler we *just* registerd " | 873 | "couldn't find handler we *just* registered " |
874 | "for type %u key %08x\n", msg_type, key); | 874 | "for type %u key %08x\n", msg_type, key); |
875 | } | 875 | } |
876 | write_unlock(&o2net_handler_lock); | 876 | write_unlock(&o2net_handler_lock); |
diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c index b6addf560483..57199a52a351 100644 --- a/fs/qnx6/inode.c +++ b/fs/qnx6/inode.c | |||
@@ -285,7 +285,7 @@ static struct buffer_head *qnx6_check_first_superblock(struct super_block *s, | |||
285 | if (fs32_to_cpu(sbi, sb->sb_magic) == QNX6_SUPER_MAGIC) { | 285 | if (fs32_to_cpu(sbi, sb->sb_magic) == QNX6_SUPER_MAGIC) { |
286 | /* we got a big endian fs */ | 286 | /* we got a big endian fs */ |
287 | QNX6DEBUG((KERN_INFO "qnx6: fs got different" | 287 | QNX6DEBUG((KERN_INFO "qnx6: fs got different" |
288 | " endianess.\n")); | 288 | " endianness.\n")); |
289 | return bh; | 289 | return bh; |
290 | } else | 290 | } else |
291 | sbi->s_bytesex = BYTESEX_LE; | 291 | sbi->s_bytesex = BYTESEX_LE; |
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index bd2e52ccc4f2..3d754a394e92 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h | |||
@@ -53,7 +53,7 @@ struct dma_buf_attachment; | |||
53 | * @begin_cpu_access: [optional] called before cpu access to invalidate cpu | 53 | * @begin_cpu_access: [optional] called before cpu access to invalidate cpu |
54 | * caches and allocate backing storage (if not yet done) | 54 | * caches and allocate backing storage (if not yet done) |
55 | * respectively pin the objet into memory. | 55 | * respectively pin the objet into memory. |
56 | * @end_cpu_access: [optional] called after cpu access to flush cashes. | 56 | * @end_cpu_access: [optional] called after cpu access to flush caches. |
57 | * @kmap_atomic: maps a page from the buffer into kernel address | 57 | * @kmap_atomic: maps a page from the buffer into kernel address |
58 | * space, users may not block until the subsequent unmap call. | 58 | * space, users may not block until the subsequent unmap call. |
59 | * This callback must not sleep. | 59 | * This callback must not sleep. |
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h index 591f78631f13..f74109144d3f 100644 --- a/include/net/irda/irlmp.h +++ b/include/net/irda/irlmp.h | |||
@@ -278,7 +278,7 @@ static inline int irlmp_lap_tx_queue_full(struct lsap_cb *self) | |||
278 | } | 278 | } |
279 | 279 | ||
280 | /* After doing a irlmp_dup(), this get one of the two socket back into | 280 | /* After doing a irlmp_dup(), this get one of the two socket back into |
281 | * a state where it's waiting incomming connections. | 281 | * a state where it's waiting incoming connections. |
282 | * Note : this can be used *only* if the socket is not yet connected | 282 | * Note : this can be used *only* if the socket is not yet connected |
283 | * (i.e. NO irlmp_connect_response() done on this socket). | 283 | * (i.e. NO irlmp_connect_response() done on this socket). |
284 | * - Jean II */ | 284 | * - Jean II */ |
diff --git a/include/net/irda/irttp.h b/include/net/irda/irttp.h index af4b87721d13..98682d4bae8f 100644 --- a/include/net/irda/irttp.h +++ b/include/net/irda/irttp.h | |||
@@ -185,7 +185,7 @@ static inline __u32 irttp_get_max_seg_size(struct tsap_cb *self) | |||
185 | } | 185 | } |
186 | 186 | ||
187 | /* After doing a irttp_dup(), this get one of the two socket back into | 187 | /* After doing a irttp_dup(), this get one of the two socket back into |
188 | * a state where it's waiting incomming connections. | 188 | * a state where it's waiting incoming connections. |
189 | * Note : this can be used *only* if the socket is not yet connected | 189 | * Note : this can be used *only* if the socket is not yet connected |
190 | * (i.e. NO irttp_connect_response() done on this socket). | 190 | * (i.e. NO irttp_connect_response() done on this socket). |
191 | * - Jean II */ | 191 | * - Jean II */ |
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 0f78e34220c9..6a2d0387475c 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -1921,7 +1921,7 @@ int hci_recv_frame(struct sk_buff *skb) | |||
1921 | return -ENXIO; | 1921 | return -ENXIO; |
1922 | } | 1922 | } |
1923 | 1923 | ||
1924 | /* Incomming skb */ | 1924 | /* Incoming skb */ |
1925 | bt_cb(skb)->incoming = 1; | 1925 | bt_cb(skb)->incoming = 1; |
1926 | 1926 | ||
1927 | /* Time stamp */ | 1927 | /* Time stamp */ |
diff --git a/net/caif/cfcnfg.c b/net/caif/cfcnfg.c index ba9cfd47778a..f1dbddb95a6c 100644 --- a/net/caif/cfcnfg.c +++ b/net/caif/cfcnfg.c | |||
@@ -402,7 +402,7 @@ cfcnfg_linkup_rsp(struct cflayer *layer, u8 channel_id, enum cfctrl_srv serv, | |||
402 | 402 | ||
403 | phyinfo = cfcnfg_get_phyinfo_rcu(cnfg, phyid); | 403 | phyinfo = cfcnfg_get_phyinfo_rcu(cnfg, phyid); |
404 | if (phyinfo == NULL) { | 404 | if (phyinfo == NULL) { |
405 | pr_err("ERROR: Link Layer Device dissapeared" | 405 | pr_err("ERROR: Link Layer Device disappeared" |
406 | "while connecting\n"); | 406 | "while connecting\n"); |
407 | goto unlock; | 407 | goto unlock; |
408 | } | 408 | } |
diff --git a/net/irda/timer.c b/net/irda/timer.c index 1d552b3946fc..0c4c115a5cab 100644 --- a/net/irda/timer.c +++ b/net/irda/timer.c | |||
@@ -57,7 +57,7 @@ void irlap_start_query_timer(struct irlap_cb *self, int S, int s) | |||
57 | * Basically, we multiply the number of remaining slots by our | 57 | * Basically, we multiply the number of remaining slots by our |
58 | * slot time, plus add some extra time to properly receive the last | 58 | * slot time, plus add some extra time to properly receive the last |
59 | * discovery packet (which is longer due to extra discovery info), | 59 | * discovery packet (which is longer due to extra discovery info), |
60 | * to avoid messing with for incomming connections requests and | 60 | * to avoid messing with for incoming connections requests and |
61 | * to accommodate devices that perform discovery slower than us. | 61 | * to accommodate devices that perform discovery slower than us. |
62 | * Jean II */ | 62 | * Jean II */ |
63 | timeout = ((sysctl_slot_timeout * HZ / 1000) * (S - s) | 63 | timeout = ((sysctl_slot_timeout * HZ / 1000) * (S - s) |
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index e1c5fc2be6b8..04df5301df04 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c | |||
@@ -1201,7 +1201,7 @@ nodata: | |||
1201 | * specifically, max(asoc->pathmtu, SCTP_DEFAULT_MAXSEGMENT) | 1201 | * specifically, max(asoc->pathmtu, SCTP_DEFAULT_MAXSEGMENT) |
1202 | * This is a helper function to allocate an error chunk for | 1202 | * This is a helper function to allocate an error chunk for |
1203 | * for those invalid parameter codes in which we may not want | 1203 | * for those invalid parameter codes in which we may not want |
1204 | * to report all the errors, if the incomming chunk is large | 1204 | * to report all the errors, if the incoming chunk is large |
1205 | */ | 1205 | */ |
1206 | static inline struct sctp_chunk *sctp_make_op_error_fixed( | 1206 | static inline struct sctp_chunk *sctp_make_op_error_fixed( |
1207 | const struct sctp_association *asoc, | 1207 | const struct sctp_association *asoc, |
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index cb1f50cf12e3..7f6425e24ce3 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c | |||
@@ -409,7 +409,7 @@ static void traps(void) | |||
409 | int *p = (int *)test; | 409 | int *p = (int *)test; |
410 | 410 | ||
411 | if (*p != INT_CONF) { | 411 | if (*p != INT_CONF) { |
412 | fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", | 412 | fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianness? %#x\n", |
413 | *p); | 413 | *p); |
414 | exit(2); | 414 | exit(2); |
415 | } | 415 | } |
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 6c12ac206ee9..a153b168129b 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c | |||
@@ -2147,7 +2147,7 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) | |||
2147 | status = ab8500_codec_set_dai_clock_gate(codec, fmt); | 2147 | status = ab8500_codec_set_dai_clock_gate(codec, fmt); |
2148 | if (status) { | 2148 | if (status) { |
2149 | dev_err(dai->codec->dev, | 2149 | dev_err(dai->codec->dev, |
2150 | "%s: ERRROR: Failed to set clock gate (%d).\n", | 2150 | "%s: ERROR: Failed to set clock gate (%d).\n", |
2151 | __func__, status); | 2151 | __func__, status); |
2152 | return status; | 2152 | return status; |
2153 | } | 2153 | } |
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index ea58b73e86b2..b47c252ef901 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c | |||
@@ -113,15 +113,15 @@ SOC_ENUM("Equaliser Function", wm8974_enum[3]), | |||
113 | SOC_ENUM("EQ1 Cut Off", wm8974_enum[4]), | 113 | SOC_ENUM("EQ1 Cut Off", wm8974_enum[4]), |
114 | SOC_SINGLE_TLV("EQ1 Volume", WM8974_EQ1, 0, 24, 1, eq_tlv), | 114 | SOC_SINGLE_TLV("EQ1 Volume", WM8974_EQ1, 0, 24, 1, eq_tlv), |
115 | 115 | ||
116 | SOC_ENUM("Equaliser EQ2 Bandwith", wm8974_enum[5]), | 116 | SOC_ENUM("Equaliser EQ2 Bandwidth", wm8974_enum[5]), |
117 | SOC_ENUM("EQ2 Cut Off", wm8974_enum[6]), | 117 | SOC_ENUM("EQ2 Cut Off", wm8974_enum[6]), |
118 | SOC_SINGLE_TLV("EQ2 Volume", WM8974_EQ2, 0, 24, 1, eq_tlv), | 118 | SOC_SINGLE_TLV("EQ2 Volume", WM8974_EQ2, 0, 24, 1, eq_tlv), |
119 | 119 | ||
120 | SOC_ENUM("Equaliser EQ3 Bandwith", wm8974_enum[7]), | 120 | SOC_ENUM("Equaliser EQ3 Bandwidth", wm8974_enum[7]), |
121 | SOC_ENUM("EQ3 Cut Off", wm8974_enum[8]), | 121 | SOC_ENUM("EQ3 Cut Off", wm8974_enum[8]), |
122 | SOC_SINGLE_TLV("EQ3 Volume", WM8974_EQ3, 0, 24, 1, eq_tlv), | 122 | SOC_SINGLE_TLV("EQ3 Volume", WM8974_EQ3, 0, 24, 1, eq_tlv), |
123 | 123 | ||
124 | SOC_ENUM("Equaliser EQ4 Bandwith", wm8974_enum[9]), | 124 | SOC_ENUM("Equaliser EQ4 Bandwidth", wm8974_enum[9]), |
125 | SOC_ENUM("EQ4 Cut Off", wm8974_enum[10]), | 125 | SOC_ENUM("EQ4 Cut Off", wm8974_enum[10]), |
126 | SOC_SINGLE_TLV("EQ4 Volume", WM8974_EQ4, 0, 24, 1, eq_tlv), | 126 | SOC_SINGLE_TLV("EQ4 Volume", WM8974_EQ4, 0, 24, 1, eq_tlv), |
127 | 127 | ||
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index f347af3a67c2..029f31c8e703 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c | |||
@@ -166,15 +166,15 @@ static const struct snd_kcontrol_new wm8978_snd_controls[] = { | |||
166 | SOC_ENUM("EQ1 Cut Off", eq1), | 166 | SOC_ENUM("EQ1 Cut Off", eq1), |
167 | SOC_SINGLE_TLV("EQ1 Volume", WM8978_EQ1, 0, 24, 1, eq_tlv), | 167 | SOC_SINGLE_TLV("EQ1 Volume", WM8978_EQ1, 0, 24, 1, eq_tlv), |
168 | 168 | ||
169 | SOC_ENUM("Equaliser EQ2 Bandwith", eq2bw), | 169 | SOC_ENUM("Equaliser EQ2 Bandwidth", eq2bw), |
170 | SOC_ENUM("EQ2 Cut Off", eq2), | 170 | SOC_ENUM("EQ2 Cut Off", eq2), |
171 | SOC_SINGLE_TLV("EQ2 Volume", WM8978_EQ2, 0, 24, 1, eq_tlv), | 171 | SOC_SINGLE_TLV("EQ2 Volume", WM8978_EQ2, 0, 24, 1, eq_tlv), |
172 | 172 | ||
173 | SOC_ENUM("Equaliser EQ3 Bandwith", eq3bw), | 173 | SOC_ENUM("Equaliser EQ3 Bandwidth", eq3bw), |
174 | SOC_ENUM("EQ3 Cut Off", eq3), | 174 | SOC_ENUM("EQ3 Cut Off", eq3), |
175 | SOC_SINGLE_TLV("EQ3 Volume", WM8978_EQ3, 0, 24, 1, eq_tlv), | 175 | SOC_SINGLE_TLV("EQ3 Volume", WM8978_EQ3, 0, 24, 1, eq_tlv), |
176 | 176 | ||
177 | SOC_ENUM("Equaliser EQ4 Bandwith", eq4bw), | 177 | SOC_ENUM("Equaliser EQ4 Bandwidth", eq4bw), |
178 | SOC_ENUM("EQ4 Cut Off", eq4), | 178 | SOC_ENUM("EQ4 Cut Off", eq4), |
179 | SOC_SINGLE_TLV("EQ4 Volume", WM8978_EQ4, 0, 24, 1, eq_tlv), | 179 | SOC_SINGLE_TLV("EQ4 Volume", WM8978_EQ4, 0, 24, 1, eq_tlv), |
180 | 180 | ||
diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c index 9fe1e041da49..0867870ffdfc 100644 --- a/sound/soc/codecs/wm8983.c +++ b/sound/soc/codecs/wm8983.c | |||
@@ -353,13 +353,13 @@ static const struct snd_kcontrol_new wm8983_snd_controls[] = { | |||
353 | SOC_ENUM_EXT("Equalizer Function", eqmode, eqmode_get, eqmode_put), | 353 | SOC_ENUM_EXT("Equalizer Function", eqmode, eqmode_get, eqmode_put), |
354 | SOC_ENUM("EQ1 Cutoff", eq1_cutoff), | 354 | SOC_ENUM("EQ1 Cutoff", eq1_cutoff), |
355 | SOC_SINGLE_TLV("EQ1 Volume", WM8983_EQ1_LOW_SHELF, 0, 24, 1, eq_tlv), | 355 | SOC_SINGLE_TLV("EQ1 Volume", WM8983_EQ1_LOW_SHELF, 0, 24, 1, eq_tlv), |
356 | SOC_ENUM("EQ2 Bandwith", eq2_bw), | 356 | SOC_ENUM("EQ2 Bandwidth", eq2_bw), |
357 | SOC_ENUM("EQ2 Cutoff", eq2_cutoff), | 357 | SOC_ENUM("EQ2 Cutoff", eq2_cutoff), |
358 | SOC_SINGLE_TLV("EQ2 Volume", WM8983_EQ2_PEAK_1, 0, 24, 1, eq_tlv), | 358 | SOC_SINGLE_TLV("EQ2 Volume", WM8983_EQ2_PEAK_1, 0, 24, 1, eq_tlv), |
359 | SOC_ENUM("EQ3 Bandwith", eq3_bw), | 359 | SOC_ENUM("EQ3 Bandwidth", eq3_bw), |
360 | SOC_ENUM("EQ3 Cutoff", eq3_cutoff), | 360 | SOC_ENUM("EQ3 Cutoff", eq3_cutoff), |
361 | SOC_SINGLE_TLV("EQ3 Volume", WM8983_EQ3_PEAK_2, 0, 24, 1, eq_tlv), | 361 | SOC_SINGLE_TLV("EQ3 Volume", WM8983_EQ3_PEAK_2, 0, 24, 1, eq_tlv), |
362 | SOC_ENUM("EQ4 Bandwith", eq4_bw), | 362 | SOC_ENUM("EQ4 Bandwidth", eq4_bw), |
363 | SOC_ENUM("EQ4 Cutoff", eq4_cutoff), | 363 | SOC_ENUM("EQ4 Cutoff", eq4_cutoff), |
364 | SOC_SINGLE_TLV("EQ4 Volume", WM8983_EQ4_PEAK_3, 0, 24, 1, eq_tlv), | 364 | SOC_SINGLE_TLV("EQ4 Volume", WM8983_EQ4_PEAK_3, 0, 24, 1, eq_tlv), |
365 | SOC_ENUM("EQ5 Cutoff", eq5_cutoff), | 365 | SOC_ENUM("EQ5 Cutoff", eq5_cutoff), |
diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index ab3782657ac8..7d6b9f23cfe0 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c | |||
@@ -371,13 +371,13 @@ static const struct snd_kcontrol_new wm8985_snd_controls[] = { | |||
371 | SOC_ENUM_EXT("Equalizer Function", eqmode, eqmode_get, eqmode_put), | 371 | SOC_ENUM_EXT("Equalizer Function", eqmode, eqmode_get, eqmode_put), |
372 | SOC_ENUM("EQ1 Cutoff", eq1_cutoff), | 372 | SOC_ENUM("EQ1 Cutoff", eq1_cutoff), |
373 | SOC_SINGLE_TLV("EQ1 Volume", WM8985_EQ1_LOW_SHELF, 0, 24, 1, eq_tlv), | 373 | SOC_SINGLE_TLV("EQ1 Volume", WM8985_EQ1_LOW_SHELF, 0, 24, 1, eq_tlv), |
374 | SOC_ENUM("EQ2 Bandwith", eq2_bw), | 374 | SOC_ENUM("EQ2 Bandwidth", eq2_bw), |
375 | SOC_ENUM("EQ2 Cutoff", eq2_cutoff), | 375 | SOC_ENUM("EQ2 Cutoff", eq2_cutoff), |
376 | SOC_SINGLE_TLV("EQ2 Volume", WM8985_EQ2_PEAK_1, 0, 24, 1, eq_tlv), | 376 | SOC_SINGLE_TLV("EQ2 Volume", WM8985_EQ2_PEAK_1, 0, 24, 1, eq_tlv), |
377 | SOC_ENUM("EQ3 Bandwith", eq3_bw), | 377 | SOC_ENUM("EQ3 Bandwidth", eq3_bw), |
378 | SOC_ENUM("EQ3 Cutoff", eq3_cutoff), | 378 | SOC_ENUM("EQ3 Cutoff", eq3_cutoff), |
379 | SOC_SINGLE_TLV("EQ3 Volume", WM8985_EQ3_PEAK_2, 0, 24, 1, eq_tlv), | 379 | SOC_SINGLE_TLV("EQ3 Volume", WM8985_EQ3_PEAK_2, 0, 24, 1, eq_tlv), |
380 | SOC_ENUM("EQ4 Bandwith", eq4_bw), | 380 | SOC_ENUM("EQ4 Bandwidth", eq4_bw), |
381 | SOC_ENUM("EQ4 Cutoff", eq4_cutoff), | 381 | SOC_ENUM("EQ4 Cutoff", eq4_cutoff), |
382 | SOC_SINGLE_TLV("EQ4 Volume", WM8985_EQ4_PEAK_3, 0, 24, 1, eq_tlv), | 382 | SOC_SINGLE_TLV("EQ4 Volume", WM8985_EQ4_PEAK_3, 0, 24, 1, eq_tlv), |
383 | SOC_ENUM("EQ5 Cutoff", eq5_cutoff), | 383 | SOC_ENUM("EQ5 Cutoff", eq5_cutoff), |