diff options
| -rw-r--r-- | Documentation/memory-barriers.txt | 2 | ||||
| -rw-r--r-- | arch/i386/mm/fault.c | 2 | ||||
| -rw-r--r-- | arch/m32r/mm/fault.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/powermac/cpufreq_32.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/pseries/eeh_driver.c | 2 | ||||
| -rw-r--r-- | arch/x86_64/mm/fault.c | 2 | ||||
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_intr.c | 2 | ||||
| -rw-r--r-- | drivers/message/fusion/mptbase.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ipw2100.c | 2 | ||||
| -rw-r--r-- | drivers/serial/pxa.c | 2 | ||||
| -rw-r--r-- | include/asm-arm/thread_info.h | 2 | ||||
| -rw-r--r-- | include/asm-ia64/sn/tioca_provider.h | 2 | ||||
| -rw-r--r-- | kernel/cpuset.c | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt index cf0d5416a4c3..28d1bc3edb1c 100644 --- a/Documentation/memory-barriers.txt +++ b/Documentation/memory-barriers.txt | |||
| @@ -602,7 +602,7 @@ Consider the following sequence of events: | |||
| 602 | 602 | ||
| 603 | This sequence of events is committed to the memory coherence system in an order | 603 | This sequence of events is committed to the memory coherence system in an order |
| 604 | that the rest of the system might perceive as the unordered set of { STORE A, | 604 | that the rest of the system might perceive as the unordered set of { STORE A, |
| 605 | STORE B, STORE C } all occuring before the unordered set of { STORE D, STORE E | 605 | STORE B, STORE C } all occurring before the unordered set of { STORE D, STORE E |
| 606 | }: | 606 | }: |
| 607 | 607 | ||
| 608 | +-------+ : : | 608 | +-------+ : : |
diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c index 6ee7faaf2c1b..f7279468323a 100644 --- a/arch/i386/mm/fault.c +++ b/arch/i386/mm/fault.c | |||
| @@ -389,7 +389,7 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs, | |||
| 389 | /* When running in the kernel we expect faults to occur only to | 389 | /* When running in the kernel we expect faults to occur only to |
| 390 | * addresses in user space. All other faults represent errors in the | 390 | * addresses in user space. All other faults represent errors in the |
| 391 | * kernel and should generate an OOPS. Unfortunatly, in the case of an | 391 | * kernel and should generate an OOPS. Unfortunatly, in the case of an |
| 392 | * erroneous fault occuring in a code path which already holds mmap_sem | 392 | * erroneous fault occurring in a code path which already holds mmap_sem |
| 393 | * we will deadlock attempting to validate the fault against the | 393 | * we will deadlock attempting to validate the fault against the |
| 394 | * address space. Luckily the kernel only validly references user | 394 | * address space. Luckily the kernel only validly references user |
| 395 | * space from well defined areas of code, which are listed in the | 395 | * space from well defined areas of code, which are listed in the |
diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c index bf7fb58ef02c..9ea5118e3c1c 100644 --- a/arch/m32r/mm/fault.c +++ b/arch/m32r/mm/fault.c | |||
| @@ -148,7 +148,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code, | |||
| 148 | /* When running in the kernel we expect faults to occur only to | 148 | /* When running in the kernel we expect faults to occur only to |
| 149 | * addresses in user space. All other faults represent errors in the | 149 | * addresses in user space. All other faults represent errors in the |
| 150 | * kernel and should generate an OOPS. Unfortunatly, in the case of an | 150 | * kernel and should generate an OOPS. Unfortunatly, in the case of an |
| 151 | * erroneous fault occuring in a code path which already holds mmap_sem | 151 | * erroneous fault occurring in a code path which already holds mmap_sem |
| 152 | * we will deadlock attempting to validate the fault against the | 152 | * we will deadlock attempting to validate the fault against the |
| 153 | * address space. Luckily the kernel only validly references user | 153 | * address space. Luckily the kernel only validly references user |
| 154 | * space from well defined areas of code, which are listed in the | 154 | * space from well defined areas of code, which are listed in the |
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c index 7adb3845c3e9..889ce9ce3a4d 100644 --- a/arch/powerpc/platforms/powermac/cpufreq_32.c +++ b/arch/powerpc/platforms/powermac/cpufreq_32.c | |||
| @@ -268,7 +268,7 @@ static int pmu_set_cpu_speed(int low_speed) | |||
| 268 | 268 | ||
| 269 | /* Make sure the decrementer won't interrupt us */ | 269 | /* Make sure the decrementer won't interrupt us */ |
| 270 | asm volatile("mtdec %0" : : "r" (0x7fffffff)); | 270 | asm volatile("mtdec %0" : : "r" (0x7fffffff)); |
| 271 | /* Make sure any pending DEC interrupt occuring while we did | 271 | /* Make sure any pending DEC interrupt occurring while we did |
| 272 | * the above didn't re-enable the DEC */ | 272 | * the above didn't re-enable the DEC */ |
| 273 | mb(); | 273 | mb(); |
| 274 | asm volatile("mtdec %0" : : "r" (0x7fffffff)); | 274 | asm volatile("mtdec %0" : : "r" (0x7fffffff)); |
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c index 0ec9a5445b95..aaad2c0afcbf 100644 --- a/arch/powerpc/platforms/pseries/eeh_driver.c +++ b/arch/powerpc/platforms/pseries/eeh_driver.c | |||
| @@ -175,7 +175,7 @@ static void eeh_report_failure(struct pci_dev *dev, void *userdata) | |||
| 175 | * | 175 | * |
| 176 | * pSeries systems will isolate a PCI slot if the PCI-Host | 176 | * pSeries systems will isolate a PCI slot if the PCI-Host |
| 177 | * bridge detects address or data parity errors, DMA's | 177 | * bridge detects address or data parity errors, DMA's |
| 178 | * occuring to wild addresses (which usually happen due to | 178 | * occurring to wild addresses (which usually happen due to |
| 179 | * bugs in device drivers or in PCI adapter firmware). | 179 | * bugs in device drivers or in PCI adapter firmware). |
| 180 | * Slot isolations also occur if #SERR, #PERR or other misc | 180 | * Slot isolations also occur if #SERR, #PERR or other misc |
| 181 | * PCI-related errors are detected. | 181 | * PCI-related errors are detected. |
diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c index 08dc696f54ee..7578e951f296 100644 --- a/arch/x86_64/mm/fault.c +++ b/arch/x86_64/mm/fault.c | |||
| @@ -418,7 +418,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, | |||
| 418 | /* When running in the kernel we expect faults to occur only to | 418 | /* When running in the kernel we expect faults to occur only to |
| 419 | * addresses in user space. All other faults represent errors in the | 419 | * addresses in user space. All other faults represent errors in the |
| 420 | * kernel and should generate an OOPS. Unfortunatly, in the case of an | 420 | * kernel and should generate an OOPS. Unfortunatly, in the case of an |
| 421 | * erroneous fault occuring in a code path which already holds mmap_sem | 421 | * erroneous fault occurring in a code path which already holds mmap_sem |
| 422 | * we will deadlock attempting to validate the fault against the | 422 | * we will deadlock attempting to validate the fault against the |
| 423 | * address space. Luckily the kernel only validly references user | 423 | * address space. Luckily the kernel only validly references user |
| 424 | * space from well defined areas of code, which are listed in the | 424 | * space from well defined areas of code, which are listed in the |
diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c index 3e72a1fe3d73..5e31d0de849b 100644 --- a/drivers/infiniband/hw/ipath/ipath_intr.c +++ b/drivers/infiniband/hw/ipath/ipath_intr.c | |||
| @@ -397,7 +397,7 @@ static void handle_errors(struct ipath_devdata *dd, ipath_err_t errs) | |||
| 397 | if ((dd->ipath_maskederrs & ~dd->ipath_ignorederrs) & | 397 | if ((dd->ipath_maskederrs & ~dd->ipath_ignorederrs) & |
| 398 | ~(INFINIPATH_E_RRCVEGRFULL | INFINIPATH_E_RRCVHDRFULL)) | 398 | ~(INFINIPATH_E_RRCVEGRFULL | INFINIPATH_E_RRCVHDRFULL)) |
| 399 | ipath_dev_err(dd, "Disabling error(s) %llx because " | 399 | ipath_dev_err(dd, "Disabling error(s) %llx because " |
| 400 | "occuring too frequently (%s)\n", | 400 | "occurring too frequently (%s)\n", |
| 401 | (unsigned long long) | 401 | (unsigned long long) |
| 402 | (dd->ipath_maskederrs & | 402 | (dd->ipath_maskederrs & |
| 403 | ~dd->ipath_ignorederrs), msg); | 403 | ~dd->ipath_ignorederrs), msg); |
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 12dd8d493ee2..cf404d294641 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
| @@ -5592,7 +5592,7 @@ mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag) | |||
| 5592 | 5592 | ||
| 5593 | /* The SCSI driver needs to adjust timeouts on all current | 5593 | /* The SCSI driver needs to adjust timeouts on all current |
| 5594 | * commands prior to the diagnostic reset being issued. | 5594 | * commands prior to the diagnostic reset being issued. |
| 5595 | * Prevents timeouts occuring during a diagnostic reset...very bad. | 5595 | * Prevents timeouts occurring during a diagnostic reset...very bad. |
| 5596 | * For all other protocol drivers, this is a no-op. | 5596 | * For all other protocol drivers, this is a no-op. |
| 5597 | */ | 5597 | */ |
| 5598 | { | 5598 | { |
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index 94aeb23a7729..f5025539df21 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c | |||
| @@ -5358,7 +5358,7 @@ static int ipw2100_set_key(struct ipw2100_priv *priv, | |||
| 5358 | idx, keylen, len); | 5358 | idx, keylen, len); |
| 5359 | 5359 | ||
| 5360 | /* NOTE: We don't check cached values in case the firmware was reset | 5360 | /* NOTE: We don't check cached values in case the firmware was reset |
| 5361 | * or some other problem is occuring. If the user is setting the key, | 5361 | * or some other problem is occurring. If the user is setting the key, |
| 5362 | * then we push the change */ | 5362 | * then we push the change */ |
| 5363 | 5363 | ||
| 5364 | wep_key->idx = idx; | 5364 | wep_key->idx = idx; |
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index 0fa0ccc9ed27..bf85b5782ac5 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
| @@ -390,7 +390,7 @@ static int serial_pxa_startup(struct uart_port *port) | |||
| 390 | 390 | ||
| 391 | /* | 391 | /* |
| 392 | * Finally, enable interrupts. Note: Modem status interrupts | 392 | * Finally, enable interrupts. Note: Modem status interrupts |
| 393 | * are set via set_termios(), which will be occuring imminently | 393 | * are set via set_termios(), which will be occurring imminently |
| 394 | * anyway, so we don't enable them here. | 394 | * anyway, so we don't enable them here. |
| 395 | */ | 395 | */ |
| 396 | up->ier = UART_IER_RLSI | UART_IER_RDI | UART_IER_RTOIE | UART_IER_UUE; | 396 | up->ier = UART_IER_RLSI | UART_IER_RDI | UART_IER_RTOIE | UART_IER_UUE; |
diff --git a/include/asm-arm/thread_info.h b/include/asm-arm/thread_info.h index c46b5c84275f..8a7554f03984 100644 --- a/include/asm-arm/thread_info.h +++ b/include/asm-arm/thread_info.h | |||
| @@ -116,7 +116,7 @@ extern void iwmmxt_task_release(struct thread_info *); | |||
| 116 | 116 | ||
| 117 | /* | 117 | /* |
| 118 | * We use bit 30 of the preempt_count to indicate that kernel | 118 | * We use bit 30 of the preempt_count to indicate that kernel |
| 119 | * preemption is occuring. See include/asm-arm/hardirq.h. | 119 | * preemption is occurring. See include/asm-arm/hardirq.h. |
| 120 | */ | 120 | */ |
| 121 | #define PREEMPT_ACTIVE 0x40000000 | 121 | #define PREEMPT_ACTIVE 0x40000000 |
| 122 | 122 | ||
diff --git a/include/asm-ia64/sn/tioca_provider.h b/include/asm-ia64/sn/tioca_provider.h index ab7fe2463468..65cdd73c2a57 100644 --- a/include/asm-ia64/sn/tioca_provider.h +++ b/include/asm-ia64/sn/tioca_provider.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #define PV908234 (1 << 1) | 27 | #define PV908234 (1 << 1) |
| 28 | /* CA:AGPDMA write request data mismatch with ABC1CL merge */ | 28 | /* CA:AGPDMA write request data mismatch with ABC1CL merge */ |
| 29 | #define PV895469 (1 << 1) | 29 | #define PV895469 (1 << 1) |
| 30 | /* TIO:CA TLB invalidate of written GART entries possibly not occuring in CA*/ | 30 | /* TIO:CA TLB invalidate of written GART entries possibly not occurring in CA*/ |
| 31 | #define PV910244 (1 << 1) | 31 | #define PV910244 (1 << 1) |
| 32 | 32 | ||
| 33 | struct tioca_dmamap{ | 33 | struct tioca_dmamap{ |
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 1535af3a912d..ee8c6dfd9254 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
| @@ -1064,7 +1064,7 @@ static int update_flag(cpuset_flagbits_t bit, struct cpuset *cs, char *buf) | |||
| 1064 | } | 1064 | } |
| 1065 | 1065 | ||
| 1066 | /* | 1066 | /* |
| 1067 | * Frequency meter - How fast is some event occuring? | 1067 | * Frequency meter - How fast is some event occurring? |
| 1068 | * | 1068 | * |
| 1069 | * These routines manage a digitally filtered, constant time based, | 1069 | * These routines manage a digitally filtered, constant time based, |
| 1070 | * event frequency meter. There are four routines: | 1070 | * event frequency meter. There are four routines: |
