diff options
39 files changed, 116 insertions, 142 deletions
diff --git a/Documentation/RCU/whatisRCU.txt b/Documentation/RCU/whatisRCU.txt index 5ed85af88789..b4ea51ad3610 100644 --- a/Documentation/RCU/whatisRCU.txt +++ b/Documentation/RCU/whatisRCU.txt | |||
@@ -360,7 +360,7 @@ uses of RCU may be found in listRCU.txt, arrayRCU.txt, and NMI-RCU.txt. | |||
360 | struct foo *new_fp; | 360 | struct foo *new_fp; |
361 | struct foo *old_fp; | 361 | struct foo *old_fp; |
362 | 362 | ||
363 | new_fp = kmalloc(sizeof(*fp), GFP_KERNEL); | 363 | new_fp = kmalloc(sizeof(*new_fp), GFP_KERNEL); |
364 | spin_lock(&foo_mutex); | 364 | spin_lock(&foo_mutex); |
365 | old_fp = gbl_foo; | 365 | old_fp = gbl_foo; |
366 | *new_fp = *old_fp; | 366 | *new_fp = *old_fp; |
@@ -461,7 +461,7 @@ The foo_update_a() function might then be written as follows: | |||
461 | struct foo *new_fp; | 461 | struct foo *new_fp; |
462 | struct foo *old_fp; | 462 | struct foo *old_fp; |
463 | 463 | ||
464 | new_fp = kmalloc(sizeof(*fp), GFP_KERNEL); | 464 | new_fp = kmalloc(sizeof(*new_fp), GFP_KERNEL); |
465 | spin_lock(&foo_mutex); | 465 | spin_lock(&foo_mutex); |
466 | old_fp = gbl_foo; | 466 | old_fp = gbl_foo; |
467 | *new_fp = *old_fp; | 467 | *new_fp = *old_fp; |
diff --git a/Documentation/arm/Booting b/Documentation/arm/Booting index fad566bb02fc..76850295af8f 100644 --- a/Documentation/arm/Booting +++ b/Documentation/arm/Booting | |||
@@ -118,7 +118,7 @@ to store page tables. The recommended placement is 32KiB into RAM. | |||
118 | 118 | ||
119 | In either case, the following conditions must be met: | 119 | In either case, the following conditions must be met: |
120 | 120 | ||
121 | - Quiesce all DMA capable devicess so that memory does not get | 121 | - Quiesce all DMA capable devices so that memory does not get |
122 | corrupted by bogus network packets or disk data. This will save | 122 | corrupted by bogus network packets or disk data. This will save |
123 | you many hours of debug. | 123 | you many hours of debug. |
124 | 124 | ||
diff --git a/Documentation/arm/README b/Documentation/arm/README index 5ed6f3530b86..9b9c8226fdc4 100644 --- a/Documentation/arm/README +++ b/Documentation/arm/README | |||
@@ -89,7 +89,7 @@ Modules | |||
89 | Although modularisation is supported (and required for the FP emulator), | 89 | Although modularisation is supported (and required for the FP emulator), |
90 | each module on an ARM2/ARM250/ARM3 machine when is loaded will take | 90 | each module on an ARM2/ARM250/ARM3 machine when is loaded will take |
91 | memory up to the next 32k boundary due to the size of the pages. | 91 | memory up to the next 32k boundary due to the size of the pages. |
92 | Therefore, modularisation on these machines really worth it? | 92 | Therefore, is modularisation on these machines really worth it? |
93 | 93 | ||
94 | However, ARM6 and up machines allow modules to take multiples of 4k, and | 94 | However, ARM6 and up machines allow modules to take multiples of 4k, and |
95 | as such Acorn RiscPCs and other architectures using these processors can | 95 | as such Acorn RiscPCs and other architectures using these processors can |
diff --git a/Documentation/arm/Setup b/Documentation/arm/Setup index 0abd0720d7ed..0cb1e64bde80 100644 --- a/Documentation/arm/Setup +++ b/Documentation/arm/Setup | |||
@@ -58,7 +58,7 @@ below: | |||
58 | video_y | 58 | video_y |
59 | 59 | ||
60 | This describes the character position of cursor on VGA console, and | 60 | This describes the character position of cursor on VGA console, and |
61 | is otherwise unused. (should not used for other console types, and | 61 | is otherwise unused. (should not be used for other console types, and |
62 | should not be used for other purposes). | 62 | should not be used for other purposes). |
63 | 63 | ||
64 | memc_control_reg | 64 | memc_control_reg |
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 944cf109a6f5..99902ae6804e 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
@@ -121,7 +121,7 @@ Table 1-1: Process specific entries in /proc | |||
121 | .............................................................................. | 121 | .............................................................................. |
122 | File Content | 122 | File Content |
123 | cmdline Command line arguments | 123 | cmdline Command line arguments |
124 | cpu Current and last cpu in wich it was executed (2.4)(smp) | 124 | cpu Current and last cpu in which it was executed (2.4)(smp) |
125 | cwd Link to the current working directory | 125 | cwd Link to the current working directory |
126 | environ Values of environment variables | 126 | environ Values of environment variables |
127 | exe Link to the executable of this process | 127 | exe Link to the executable of this process |
@@ -309,13 +309,13 @@ is the same by default: | |||
309 | > cat /proc/irq/0/smp_affinity | 309 | > cat /proc/irq/0/smp_affinity |
310 | ffffffff | 310 | ffffffff |
311 | 311 | ||
312 | It's a bitmask, in wich you can specify wich CPUs can handle the IRQ, you can | 312 | It's a bitmask, in which you can specify which CPUs can handle the IRQ, you can |
313 | set it by doing: | 313 | set it by doing: |
314 | 314 | ||
315 | > echo 1 > /proc/irq/prof_cpu_mask | 315 | > echo 1 > /proc/irq/prof_cpu_mask |
316 | 316 | ||
317 | This means that only the first CPU will handle the IRQ, but you can also echo 5 | 317 | This means that only the first CPU will handle the IRQ, but you can also echo 5 |
318 | wich means that only the first and fourth CPU can handle the IRQ. | 318 | which means that only the first and fourth CPU can handle the IRQ. |
319 | 319 | ||
320 | The way IRQs are routed is handled by the IO-APIC, and it's Round Robin | 320 | The way IRQs are routed is handled by the IO-APIC, and it's Round Robin |
321 | between all the CPUs which are allowed to handle it. As usual the kernel has | 321 | between all the CPUs which are allowed to handle it. As usual the kernel has |
diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt index 8d4cf78258e4..4fc8e9874320 100644 --- a/Documentation/networking/packet_mmap.txt +++ b/Documentation/networking/packet_mmap.txt | |||
@@ -40,7 +40,7 @@ network interface card supports some sort of interrupt load mitigation or | |||
40 | + How to use CONFIG_PACKET_MMAP | 40 | + How to use CONFIG_PACKET_MMAP |
41 | -------------------------------------------------------------------------------- | 41 | -------------------------------------------------------------------------------- |
42 | 42 | ||
43 | From the user standpoint, you should use the higher level libpcap library, wich | 43 | From the user standpoint, you should use the higher level libpcap library, which |
44 | is a de facto standard, portable across nearly all operating systems | 44 | is a de facto standard, portable across nearly all operating systems |
45 | including Win32. | 45 | including Win32. |
46 | 46 | ||
@@ -217,8 +217,8 @@ called pg_vec, its size limits the number of blocks that can be allocated. | |||
217 | 217 | ||
218 | kmalloc allocates any number of bytes of phisically contiguous memory from | 218 | kmalloc allocates any number of bytes of phisically contiguous memory from |
219 | a pool of pre-determined sizes. This pool of memory is mantained by the slab | 219 | a pool of pre-determined sizes. This pool of memory is mantained by the slab |
220 | allocator wich is at the end the responsible for doing the allocation and | 220 | allocator which is at the end the responsible for doing the allocation and |
221 | hence wich imposes the maximum memory that kmalloc can allocate. | 221 | hence which imposes the maximum memory that kmalloc can allocate. |
222 | 222 | ||
223 | In a 2.4/2.6 kernel and the i386 architecture, the limit is 131072 bytes. The | 223 | In a 2.4/2.6 kernel and the i386 architecture, the limit is 131072 bytes. The |
224 | predetermined sizes that kmalloc uses can be checked in the "size-<bytes>" | 224 | predetermined sizes that kmalloc uses can be checked in the "size-<bytes>" |
@@ -254,7 +254,7 @@ and, the number of frames be | |||
254 | 254 | ||
255 | <block number> * <block size> / <frame size> | 255 | <block number> * <block size> / <frame size> |
256 | 256 | ||
257 | Suposse the following parameters, wich apply for 2.6 kernel and an | 257 | Suposse the following parameters, which apply for 2.6 kernel and an |
258 | i386 architecture: | 258 | i386 architecture: |
259 | 259 | ||
260 | <size-max> = 131072 bytes | 260 | <size-max> = 131072 bytes |
@@ -360,7 +360,7 @@ TP_STATUS_LOSING : indicates there were packet drops from last time | |||
360 | statistics where checked with getsockopt() and | 360 | statistics where checked with getsockopt() and |
361 | the PACKET_STATISTICS option. | 361 | the PACKET_STATISTICS option. |
362 | 362 | ||
363 | TP_STATUS_CSUMNOTREADY: currently it's used for outgoing IP packets wich | 363 | TP_STATUS_CSUMNOTREADY: currently it's used for outgoing IP packets which |
364 | it's checksum will be done in hardware. So while | 364 | it's checksum will be done in hardware. So while |
365 | reading the packet we should not try to check the | 365 | reading the packet we should not try to check the |
366 | checksum. | 366 | checksum. |
diff --git a/MAINTAINERS b/MAINTAINERS index fa92d0d3674b..4e8fbbc5566d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2025,12 +2025,6 @@ L: parisc-linux@parisc-linux.org | |||
2025 | W: http://www.parisc-linux.org/ | 2025 | W: http://www.parisc-linux.org/ |
2026 | S: Maintained | 2026 | S: Maintained |
2027 | 2027 | ||
2028 | PERSONALITY HANDLING | ||
2029 | P: Christoph Hellwig | ||
2030 | M: hch@infradead.org | ||
2031 | L: linux-abi-devel@lists.sourceforge.net | ||
2032 | S: Maintained | ||
2033 | |||
2034 | PCI ERROR RECOVERY | 2028 | PCI ERROR RECOVERY |
2035 | P: Linas Vepstas | 2029 | P: Linas Vepstas |
2036 | M: linas@austin.ibm.com | 2030 | M: linas@austin.ibm.com |
@@ -2081,6 +2075,12 @@ M: tsbogend@alpha.franken.de | |||
2081 | L: netdev@vger.kernel.org | 2075 | L: netdev@vger.kernel.org |
2082 | S: Maintained | 2076 | S: Maintained |
2083 | 2077 | ||
2078 | PERSONALITY HANDLING | ||
2079 | P: Christoph Hellwig | ||
2080 | M: hch@infradead.org | ||
2081 | L: linux-abi-devel@lists.sourceforge.net | ||
2082 | S: Maintained | ||
2083 | |||
2084 | PHRAM MTD DRIVER | 2084 | PHRAM MTD DRIVER |
2085 | P: Jörn Engel | 2085 | P: Jörn Engel |
2086 | M: joern@wh.fh-wedel.de | 2086 | M: joern@wh.fh-wedel.de |
diff --git a/block/elevator.c b/block/elevator.c index 5e558c4689a4..56c2ed06a9e2 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
@@ -728,8 +728,7 @@ void elv_unregister_queue(struct request_queue *q) | |||
728 | int elv_register(struct elevator_type *e) | 728 | int elv_register(struct elevator_type *e) |
729 | { | 729 | { |
730 | spin_lock_irq(&elv_list_lock); | 730 | spin_lock_irq(&elv_list_lock); |
731 | if (elevator_find(e->elevator_name)) | 731 | BUG_ON(elevator_find(e->elevator_name)); |
732 | BUG(); | ||
733 | list_add_tail(&e->list, &elv_list); | 732 | list_add_tail(&e->list, &elv_list); |
734 | spin_unlock_irq(&elv_list_lock); | 733 | spin_unlock_irq(&elv_list_lock); |
735 | 734 | ||
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 82710ae39228..5cb96300eb0f 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -256,7 +256,8 @@ config ACPI_CUSTOM_DSDT_FILE | |||
256 | depends on ACPI_CUSTOM_DSDT | 256 | depends on ACPI_CUSTOM_DSDT |
257 | default "" | 257 | default "" |
258 | help | 258 | help |
259 | Enter the full path name to the file wich includes the AmlCode declaration. | 259 | Enter the full path name to the file which includes the AmlCode |
260 | declaration. | ||
260 | 261 | ||
261 | config ACPI_BLACKLIST_YEAR | 262 | config ACPI_BLACKLIST_YEAR |
262 | int "Disable ACPI for systems before Jan 1st this year" if X86_32 | 263 | int "Disable ACPI for systems before Jan 1st this year" if X86_32 |
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 37b8cda3e8bc..9bdea2a5cf0e 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c | |||
@@ -228,8 +228,7 @@ static void *slice_dma_loaf(struct dma_loaf *loaf, size_t len, | |||
228 | void *cpu_end = loaf->cpu_free + len; | 228 | void *cpu_end = loaf->cpu_free + len; |
229 | void *cpu_addr = loaf->cpu_free; | 229 | void *cpu_addr = loaf->cpu_free; |
230 | 230 | ||
231 | if (cpu_end > loaf->cpu_base + loaf->length) | 231 | BUG_ON(cpu_end > loaf->cpu_base + loaf->length); |
232 | BUG(); | ||
233 | *dma_handle = loaf->dma_free; | 232 | *dma_handle = loaf->dma_free; |
234 | loaf->cpu_free = cpu_end; | 233 | loaf->cpu_free = cpu_end; |
235 | loaf->dma_free += len; | 234 | loaf->dma_free += len; |
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 1f2890989b56..71ec9e664383 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -2361,8 +2361,7 @@ queue: | |||
2361 | if (!creq) | 2361 | if (!creq) |
2362 | goto startio; | 2362 | goto startio; |
2363 | 2363 | ||
2364 | if (creq->nr_phys_segments > MAXSGENTRIES) | 2364 | BUG_ON(creq->nr_phys_segments > MAXSGENTRIES); |
2365 | BUG(); | ||
2366 | 2365 | ||
2367 | if (( c = cmd_alloc(h, 1)) == NULL) | 2366 | if (( c = cmd_alloc(h, 1)) == NULL) |
2368 | goto full; | 2367 | goto full; |
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c index 9e35de05d5c5..0e66e904bd8c 100644 --- a/drivers/block/cciss_scsi.c +++ b/drivers/block/cciss_scsi.c | |||
@@ -1316,7 +1316,7 @@ cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd | |||
1316 | 1316 | ||
1317 | cp->Request.Timeout = 0; | 1317 | cp->Request.Timeout = 0; |
1318 | memset(cp->Request.CDB, 0, sizeof(cp->Request.CDB)); | 1318 | memset(cp->Request.CDB, 0, sizeof(cp->Request.CDB)); |
1319 | if (cmd->cmd_len > sizeof(cp->Request.CDB)) BUG(); | 1319 | BUG_ON(cmd->cmd_len > sizeof(cp->Request.CDB)); |
1320 | cp->Request.CDBLen = cmd->cmd_len; | 1320 | cp->Request.CDBLen = cmd->cmd_len; |
1321 | memcpy(cp->Request.CDB, cmd->cmnd, cmd->cmd_len); | 1321 | memcpy(cp->Request.CDB, cmd->cmnd, cmd->cmd_len); |
1322 | cp->Request.Type.Type = TYPE_CMD; | 1322 | cp->Request.Type.Type = TYPE_CMD; |
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c index 862b9abac0ae..b6ea2f0c7276 100644 --- a/drivers/block/cpqarray.c +++ b/drivers/block/cpqarray.c | |||
@@ -906,8 +906,7 @@ queue_next: | |||
906 | if (!creq) | 906 | if (!creq) |
907 | goto startio; | 907 | goto startio; |
908 | 908 | ||
909 | if (creq->nr_phys_segments > SG_MAX) | 909 | BUG_ON(creq->nr_phys_segments > SG_MAX); |
910 | BUG(); | ||
911 | 910 | ||
912 | if ((c = cmd_alloc(h,1)) == NULL) | 911 | if ((c = cmd_alloc(h,1)) == NULL) |
913 | goto startio; | 912 | goto startio; |
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 090d154098bb..b2a11245fa95 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile | |||
@@ -45,56 +45,57 @@ obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o hvc_vio.o hvsi.o | |||
45 | obj-$(CONFIG_RAW_DRIVER) += raw.o | 45 | obj-$(CONFIG_RAW_DRIVER) += raw.o |
46 | obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o | 46 | obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o |
47 | obj-$(CONFIG_MMTIMER) += mmtimer.o | 47 | obj-$(CONFIG_MMTIMER) += mmtimer.o |
48 | obj-$(CONFIG_VIOCONS) += viocons.o | 48 | obj-$(CONFIG_VIOCONS) += viocons.o |
49 | obj-$(CONFIG_VIOTAPE) += viotape.o | 49 | obj-$(CONFIG_VIOTAPE) += viotape.o |
50 | obj-$(CONFIG_HVCS) += hvcs.o | 50 | obj-$(CONFIG_HVCS) += hvcs.o |
51 | obj-$(CONFIG_SGI_MBCS) += mbcs.o | 51 | obj-$(CONFIG_SGI_MBCS) += mbcs.o |
52 | 52 | ||
53 | obj-$(CONFIG_PRINTER) += lp.o | 53 | obj-$(CONFIG_PRINTER) += lp.o |
54 | obj-$(CONFIG_TIPAR) += tipar.o | 54 | obj-$(CONFIG_TIPAR) += tipar.o |
55 | 55 | ||
56 | obj-$(CONFIG_DTLK) += dtlk.o | 56 | obj-$(CONFIG_DTLK) += dtlk.o |
57 | obj-$(CONFIG_R3964) += n_r3964.o | 57 | obj-$(CONFIG_R3964) += n_r3964.o |
58 | obj-$(CONFIG_APPLICOM) += applicom.o | 58 | obj-$(CONFIG_APPLICOM) += applicom.o |
59 | obj-$(CONFIG_SONYPI) += sonypi.o | 59 | obj-$(CONFIG_SONYPI) += sonypi.o |
60 | obj-$(CONFIG_RTC) += rtc.o | 60 | obj-$(CONFIG_RTC) += rtc.o |
61 | obj-$(CONFIG_HPET) += hpet.o | 61 | obj-$(CONFIG_HPET) += hpet.o |
62 | obj-$(CONFIG_GEN_RTC) += genrtc.o | 62 | obj-$(CONFIG_GEN_RTC) += genrtc.o |
63 | obj-$(CONFIG_EFI_RTC) += efirtc.o | 63 | obj-$(CONFIG_EFI_RTC) += efirtc.o |
64 | obj-$(CONFIG_SGI_DS1286) += ds1286.o | 64 | obj-$(CONFIG_SGI_DS1286) += ds1286.o |
65 | obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o | 65 | obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o |
66 | obj-$(CONFIG_DS1302) += ds1302.o | 66 | obj-$(CONFIG_DS1302) += ds1302.o |
67 | obj-$(CONFIG_S3C2410_RTC) += s3c2410-rtc.o | 67 | obj-$(CONFIG_S3C2410_RTC) += s3c2410-rtc.o |
68 | obj-$(CONFIG_RTC_VR41XX) += vr41xx_rtc.o | 68 | obj-$(CONFIG_RTC_VR41XX) += vr41xx_rtc.o |
69 | ifeq ($(CONFIG_GENERIC_NVRAM),y) | 69 | ifeq ($(CONFIG_GENERIC_NVRAM),y) |
70 | obj-$(CONFIG_NVRAM) += generic_nvram.o | 70 | obj-$(CONFIG_NVRAM) += generic_nvram.o |
71 | else | 71 | else |
72 | obj-$(CONFIG_NVRAM) += nvram.o | 72 | obj-$(CONFIG_NVRAM) += nvram.o |
73 | endif | 73 | endif |
74 | obj-$(CONFIG_TOSHIBA) += toshiba.o | 74 | obj-$(CONFIG_TOSHIBA) += toshiba.o |
75 | obj-$(CONFIG_I8K) += i8k.o | 75 | obj-$(CONFIG_I8K) += i8k.o |
76 | obj-$(CONFIG_DS1620) += ds1620.o | 76 | obj-$(CONFIG_DS1620) += ds1620.o |
77 | obj-$(CONFIG_HW_RANDOM) += hw_random.o | 77 | obj-$(CONFIG_HW_RANDOM) += hw_random.o |
78 | obj-$(CONFIG_FTAPE) += ftape/ | 78 | obj-$(CONFIG_FTAPE) += ftape/ |
79 | obj-$(CONFIG_COBALT_LCD) += lcd.o | 79 | obj-$(CONFIG_COBALT_LCD) += lcd.o |
80 | obj-$(CONFIG_PPDEV) += ppdev.o | 80 | obj-$(CONFIG_PPDEV) += ppdev.o |
81 | obj-$(CONFIG_NWBUTTON) += nwbutton.o | 81 | obj-$(CONFIG_NWBUTTON) += nwbutton.o |
82 | obj-$(CONFIG_NWFLASH) += nwflash.o | 82 | obj-$(CONFIG_NWFLASH) += nwflash.o |
83 | obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o | 83 | obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o |
84 | obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o | 84 | obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o |
85 | obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o | 85 | obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o |
86 | obj-$(CONFIG_TANBAC_TB0219) += tb0219.o | 86 | obj-$(CONFIG_TANBAC_TB0219) += tb0219.o |
87 | obj-$(CONFIG_TELCLOCK) += tlclk.o | 87 | obj-$(CONFIG_TELCLOCK) += tlclk.o |
88 | 88 | ||
89 | obj-$(CONFIG_WATCHDOG) += watchdog/ | 89 | obj-$(CONFIG_WATCHDOG) += watchdog/ |
90 | obj-$(CONFIG_MWAVE) += mwave/ | 90 | obj-$(CONFIG_MWAVE) += mwave/ |
91 | obj-$(CONFIG_AGP) += agp/ | 91 | obj-$(CONFIG_AGP) += agp/ |
92 | obj-$(CONFIG_DRM) += drm/ | 92 | obj-$(CONFIG_DRM) += drm/ |
93 | obj-$(CONFIG_PCMCIA) += pcmcia/ | 93 | obj-$(CONFIG_PCMCIA) += pcmcia/ |
94 | obj-$(CONFIG_IPMI_HANDLER) += ipmi/ | 94 | obj-$(CONFIG_IPMI_HANDLER) += ipmi/ |
95 | 95 | ||
96 | obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o | 96 | obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o |
97 | obj-$(CONFIG_TCG_TPM) += tpm/ | 97 | obj-$(CONFIG_TCG_TPM) += tpm/ |
98 | |||
98 | # Files generated that shall be removed upon make clean | 99 | # Files generated that shall be removed upon make clean |
99 | clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c | 100 | clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c |
100 | 101 | ||
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c index 5704204964a3..ea499783fb12 100644 --- a/drivers/input/serio/hil_mlc.c +++ b/drivers/input/serio/hil_mlc.c | |||
@@ -556,7 +556,7 @@ static inline void hilse_setup_input(hil_mlc *mlc, struct hilse_node *node) { | |||
556 | do_gettimeofday(&(mlc->instart)); | 556 | do_gettimeofday(&(mlc->instart)); |
557 | mlc->icount = 15; | 557 | mlc->icount = 15; |
558 | memset(mlc->ipacket, 0, 16 * sizeof(hil_packet)); | 558 | memset(mlc->ipacket, 0, 16 * sizeof(hil_packet)); |
559 | if (down_trylock(&(mlc->isem))) BUG(); | 559 | BUG_ON(down_trylock(&(mlc->isem))); |
560 | 560 | ||
561 | return; | 561 | return; |
562 | } | 562 | } |
diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c index edf14a2aa3c8..743ac4077f35 100644 --- a/drivers/isdn/i4l/isdn_x25iface.c +++ b/drivers/isdn/i4l/isdn_x25iface.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * stuff needed to support the Linux X.25 PLP code on top of devices that | 8 | * stuff needed to support the Linux X.25 PLP code on top of devices that |
9 | * can provide a lab_b service using the concap_proto mechanism. | 9 | * can provide a lab_b service using the concap_proto mechanism. |
10 | * This module supports a network interface wich provides lapb_sematics | 10 | * This module supports a network interface which provides lapb_sematics |
11 | * -- as defined in Documentation/networking/x25-iface.txt -- to | 11 | * -- as defined in Documentation/networking/x25-iface.txt -- to |
12 | * the upper layer and assumes that the lower layer provides a reliable | 12 | * the upper layer and assumes that the lower layer provides a reliable |
13 | * data link service by means of the concap_device_ops callbacks. | 13 | * data link service by means of the concap_device_ops callbacks. |
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 670eb01a5a23..e1c18aa1d712 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
@@ -1309,7 +1309,7 @@ int bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sect | |||
1309 | case 1: | 1309 | case 1: |
1310 | *bmc = 2; | 1310 | *bmc = 2; |
1311 | } | 1311 | } |
1312 | if ((*bmc & COUNTER_MAX) == COUNTER_MAX) BUG(); | 1312 | BUG_ON((*bmc & COUNTER_MAX) == COUNTER_MAX); |
1313 | (*bmc)++; | 1313 | (*bmc)++; |
1314 | 1314 | ||
1315 | spin_unlock_irq(&bitmap->lock); | 1315 | spin_unlock_irq(&bitmap->lock); |
diff --git a/drivers/md/dm-hw-handler.c b/drivers/md/dm-hw-handler.c index 4cc0010e0156..baafaaba4d4b 100644 --- a/drivers/md/dm-hw-handler.c +++ b/drivers/md/dm-hw-handler.c | |||
@@ -83,8 +83,7 @@ void dm_put_hw_handler(struct hw_handler_type *hwht) | |||
83 | if (--hwhi->use == 0) | 83 | if (--hwhi->use == 0) |
84 | module_put(hwhi->hwht.module); | 84 | module_put(hwhi->hwht.module); |
85 | 85 | ||
86 | if (hwhi->use < 0) | 86 | BUG_ON(hwhi->use < 0); |
87 | BUG(); | ||
88 | 87 | ||
89 | out: | 88 | out: |
90 | up_read(&_hwh_lock); | 89 | up_read(&_hwh_lock); |
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index 5d47c5965c51..0821747e44cf 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c | |||
@@ -1724,9 +1724,7 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa, | |||
1724 | sba_dev->chip_resv.start = PCI_F_EXTEND | 0xfef00000UL; | 1724 | sba_dev->chip_resv.start = PCI_F_EXTEND | 0xfef00000UL; |
1725 | sba_dev->chip_resv.end = PCI_F_EXTEND | (0xff000000UL - 1) ; | 1725 | sba_dev->chip_resv.end = PCI_F_EXTEND | (0xff000000UL - 1) ; |
1726 | err = request_resource(&iomem_resource, &(sba_dev->chip_resv)); | 1726 | err = request_resource(&iomem_resource, &(sba_dev->chip_resv)); |
1727 | if (err < 0) { | 1727 | BUG_ON(err < 0); |
1728 | BUG(); | ||
1729 | } | ||
1730 | 1728 | ||
1731 | } else if (IS_PLUTO(sba_dev->iodc)) { | 1729 | } else if (IS_PLUTO(sba_dev->iodc)) { |
1732 | int err; | 1730 | int err; |
@@ -2185,8 +2183,7 @@ void sba_directed_lmmio(struct parisc_device *pci_hba, struct resource *r) | |||
2185 | int i; | 2183 | int i; |
2186 | int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1)); /* rope # */ | 2184 | int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1)); /* rope # */ |
2187 | 2185 | ||
2188 | if ((t!=HPHW_IOA) && (t!=HPHW_BCPORT)) | 2186 | BUG_ON((t!=HPHW_IOA) && (t!=HPHW_BCPORT)); |
2189 | BUG(); | ||
2190 | 2187 | ||
2191 | r->start = r->end = 0; | 2188 | r->start = r->end = 0; |
2192 | 2189 | ||
@@ -2228,8 +2225,7 @@ void sba_distributed_lmmio(struct parisc_device *pci_hba, struct resource *r ) | |||
2228 | int base, size; | 2225 | int base, size; |
2229 | int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1)); /* rope # */ | 2226 | int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1)); /* rope # */ |
2230 | 2227 | ||
2231 | if ((t!=HPHW_IOA) && (t!=HPHW_BCPORT)) | 2228 | BUG_ON((t!=HPHW_IOA) && (t!=HPHW_BCPORT)); |
2232 | BUG(); | ||
2233 | 2229 | ||
2234 | r->start = r->end = 0; | 2230 | r->start = r->end = 0; |
2235 | 2231 | ||
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c index ba971fecd0d8..ad6d3b28a3a6 100644 --- a/drivers/parisc/superio.c +++ b/drivers/parisc/superio.c | |||
@@ -157,8 +157,8 @@ superio_init(struct pci_dev *pcidev) | |||
157 | if (sio->suckyio_irq_enabled) | 157 | if (sio->suckyio_irq_enabled) |
158 | return; | 158 | return; |
159 | 159 | ||
160 | if (!pdev) BUG(); | 160 | BUG_ON(!pdev); |
161 | if (!sio->usb_pdev) BUG(); | 161 | BUG_ON(!sio->usb_pdev); |
162 | 162 | ||
163 | /* use the IRQ iosapic found for USB INT D... */ | 163 | /* use the IRQ iosapic found for USB INT D... */ |
164 | pdev->irq = sio->usb_pdev->irq; | 164 | pdev->irq = sio->usb_pdev->irq; |
@@ -474,8 +474,7 @@ superio_probe(struct pci_dev *dev, const struct pci_device_id *id) | |||
474 | dev->subsystem_vendor, dev->subsystem_device, | 474 | dev->subsystem_vendor, dev->subsystem_device, |
475 | dev->class); | 475 | dev->class); |
476 | 476 | ||
477 | if (!sio->suckyio_irq_enabled) | 477 | BUG_ON(!sio->suckyio_irq_enabled); /* Enabled by PCI_FIXUP_FINAL */ |
478 | BUG(); /* Enabled by PCI_FIXUP_FINAL */ | ||
479 | 478 | ||
480 | if (dev->device == PCI_DEVICE_ID_NS_87560_LIO) { /* Function 1 */ | 479 | if (dev->device == PCI_DEVICE_ID_NS_87560_LIO) { /* Function 1 */ |
481 | superio_parport_init(); | 480 | superio_parport_init(); |
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 7967916bda18..0a9f12c4e911 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c | |||
@@ -541,9 +541,8 @@ dasd_kmalloc_request(char *magic, int cplength, int datasize, | |||
541 | struct dasd_ccw_req *cqr; | 541 | struct dasd_ccw_req *cqr; |
542 | 542 | ||
543 | /* Sanity checks */ | 543 | /* Sanity checks */ |
544 | if ( magic == NULL || datasize > PAGE_SIZE || | 544 | BUG_ON( magic == NULL || datasize > PAGE_SIZE || |
545 | (cplength*sizeof(struct ccw1)) > PAGE_SIZE) | 545 | (cplength*sizeof(struct ccw1)) > PAGE_SIZE); |
546 | BUG(); | ||
547 | 546 | ||
548 | cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC); | 547 | cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC); |
549 | if (cqr == NULL) | 548 | if (cqr == NULL) |
@@ -583,9 +582,8 @@ dasd_smalloc_request(char *magic, int cplength, int datasize, | |||
583 | int size; | 582 | int size; |
584 | 583 | ||
585 | /* Sanity checks */ | 584 | /* Sanity checks */ |
586 | if ( magic == NULL || datasize > PAGE_SIZE || | 585 | BUG_ON( magic == NULL || datasize > PAGE_SIZE || |
587 | (cplength*sizeof(struct ccw1)) > PAGE_SIZE) | 586 | (cplength*sizeof(struct ccw1)) > PAGE_SIZE); |
588 | BUG(); | ||
589 | 587 | ||
590 | size = (sizeof(struct dasd_ccw_req) + 7L) & -8L; | 588 | size = (sizeof(struct dasd_ccw_req) + 7L) & -8L; |
591 | if (cplength > 0) | 589 | if (cplength > 0) |
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 928e6cf12dca..6459edc7f5c5 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c | |||
@@ -40,7 +40,7 @@ | |||
40 | * and so on). So the PSC1 is mapped to /dev/ttyPSC0, PSC2 to /dev/ttyPSC1 and | 40 | * and so on). So the PSC1 is mapped to /dev/ttyPSC0, PSC2 to /dev/ttyPSC1 and |
41 | * so on. But be warned, it's an ABSOLUTE REQUIREMENT ! This is needed mainly | 41 | * so on. But be warned, it's an ABSOLUTE REQUIREMENT ! This is needed mainly |
42 | * fpr the console code : without this 1:1 mapping, at early boot time, when we | 42 | * fpr the console code : without this 1:1 mapping, at early boot time, when we |
43 | * are parsing the kernel args console=ttyPSC?, we wouldn't know wich PSC it | 43 | * are parsing the kernel args console=ttyPSC?, we wouldn't know which PSC it |
44 | * will be mapped to. | 44 | * will be mapped to. |
45 | */ | 45 | */ |
46 | 46 | ||
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index a8455c9e79dd..495db5755df9 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
@@ -102,7 +102,7 @@ static struct usb_driver option_driver = { | |||
102 | .no_dynamic_id = 1, | 102 | .no_dynamic_id = 1, |
103 | }; | 103 | }; |
104 | 104 | ||
105 | /* The card has three separate interfaces, wich the serial driver | 105 | /* The card has three separate interfaces, which the serial driver |
106 | * recognizes separately, thus num_port=1. | 106 | * recognizes separately, thus num_port=1. |
107 | */ | 107 | */ |
108 | static struct usb_serial_driver option_3port_device = { | 108 | static struct usb_serial_driver option_3port_device = { |
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c index c029db4646f6..6577fdfdfc16 100644 --- a/drivers/video/bw2.c +++ b/drivers/video/bw2.c | |||
@@ -327,8 +327,7 @@ static void bw2_init_one(struct sbus_dev *sdev) | |||
327 | } else | 327 | } else |
328 | #else | 328 | #else |
329 | { | 329 | { |
330 | if (!sdev) | 330 | BUG_ON(!sdev); |
331 | BUG(); | ||
332 | all->par.physbase = sdev->reg_addrs[0].phys_addr; | 331 | all->par.physbase = sdev->reg_addrs[0].phys_addr; |
333 | resp = &sdev->resource[0]; | 332 | resp = &sdev->resource[0]; |
334 | sbusfb_fill_var(&all->info.var, (sdev ? sdev->prom_node : 0), 1); | 333 | sbusfb_fill_var(&all->info.var, (sdev ? sdev->prom_node : 0), 1); |
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c index 9c9b21d469a1..7633e41adda1 100644 --- a/drivers/video/ffb.c +++ b/drivers/video/ffb.c | |||
@@ -466,8 +466,7 @@ static void ffb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) | |||
466 | unsigned long flags; | 466 | unsigned long flags; |
467 | u32 fg; | 467 | u32 fg; |
468 | 468 | ||
469 | if (rect->rop != ROP_COPY && rect->rop != ROP_XOR) | 469 | BUG_ON(rect->rop != ROP_COPY && rect->rop != ROP_XOR); |
470 | BUG(); | ||
471 | 470 | ||
472 | fg = ((u32 *)info->pseudo_palette)[rect->color]; | 471 | fg = ((u32 *)info->pseudo_palette)[rect->color]; |
473 | 472 | ||
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c index 99921df35474..8c1a8b5135c6 100644 --- a/drivers/video/sstfb.c +++ b/drivers/video/sstfb.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | -TODO: at one time or another test that the mode is acceptable by the monitor | 33 | -TODO: at one time or another test that the mode is acceptable by the monitor |
34 | -ASK: Can I choose different ordering for the color bitfields (rgba argb ...) | 34 | -ASK: Can I choose different ordering for the color bitfields (rgba argb ...) |
35 | wich one should i use ? is there any preferred one ? It seems ARGB is | 35 | which one should i use ? is there any preferred one ? It seems ARGB is |
36 | the one ... | 36 | the one ... |
37 | -TODO: in set_var check the validity of timings (hsync vsync)... | 37 | -TODO: in set_var check the validity of timings (hsync vsync)... |
38 | -TODO: check and recheck the use of sst_wait_idle : we don't flush the fifo via | 38 | -TODO: check and recheck the use of sst_wait_idle : we don't flush the fifo via |
diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c index 591809cbbb97..2788b8ca9bb1 100644 --- a/drivers/w1/masters/matrox_w1.c +++ b/drivers/w1/masters/matrox_w1.c | |||
@@ -98,7 +98,7 @@ static void matrox_w1_write_ddc_bit(void *, u8); | |||
98 | * | 98 | * |
99 | * Using tristate pins, since i can't find any open-drain pin in whole motherboard. | 99 | * Using tristate pins, since i can't find any open-drain pin in whole motherboard. |
100 | * Unfortunately we can't connect to Intel's 82801xx IO controller | 100 | * Unfortunately we can't connect to Intel's 82801xx IO controller |
101 | * since we don't know motherboard schema, wich has pretty unused(may be not) GPIO. | 101 | * since we don't know motherboard schema, which has pretty unused(may be not) GPIO. |
102 | * | 102 | * |
103 | * I've heard that PIIX also has open drain pin. | 103 | * I've heard that PIIX also has open drain pin. |
104 | * | 104 | * |
diff --git a/fs/befs/datastream.c b/fs/befs/datastream.c index 785f6b2d5d10..b7d6b920f65f 100644 --- a/fs/befs/datastream.c +++ b/fs/befs/datastream.c | |||
@@ -118,7 +118,7 @@ befs_fblock2brun(struct super_block *sb, befs_data_stream * data, | |||
118 | * befs_read_lsmylink - read long symlink from datastream. | 118 | * befs_read_lsmylink - read long symlink from datastream. |
119 | * @sb: Filesystem superblock | 119 | * @sb: Filesystem superblock |
120 | * @ds: Datastrem to read from | 120 | * @ds: Datastrem to read from |
121 | * @buf: Buffer in wich to place long symlink data | 121 | * @buf: Buffer in which to place long symlink data |
122 | * @len: Length of the long symlink in bytes | 122 | * @len: Length of the long symlink in bytes |
123 | * | 123 | * |
124 | * Returns the number of bytes read | 124 | * Returns the number of bytes read |
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index 5b3076e8ee90..a2e48c999c24 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c | |||
@@ -572,8 +572,7 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, | |||
572 | csp -= sizeof(unsigned long); | 572 | csp -= sizeof(unsigned long); |
573 | __put_user(bprm->argc, (unsigned long *) csp); | 573 | __put_user(bprm->argc, (unsigned long *) csp); |
574 | 574 | ||
575 | if (csp != sp) | 575 | BUG_ON(csp != sp); |
576 | BUG(); | ||
577 | 576 | ||
578 | /* fill in the argv[] array */ | 577 | /* fill in the argv[] array */ |
579 | #ifdef CONFIG_MMU | 578 | #ifdef CONFIG_MMU |
diff --git a/fs/coda/cache.c b/fs/coda/cache.c index c607d923350a..5d0527133266 100644 --- a/fs/coda/cache.c +++ b/fs/coda/cache.c | |||
@@ -51,7 +51,7 @@ void coda_cache_clear_all(struct super_block *sb) | |||
51 | struct coda_sb_info *sbi; | 51 | struct coda_sb_info *sbi; |
52 | 52 | ||
53 | sbi = coda_sbp(sb); | 53 | sbi = coda_sbp(sb); |
54 | if (!sbi) BUG(); | 54 | BUG_ON(!sbi); |
55 | 55 | ||
56 | atomic_inc(&permission_epoch); | 56 | atomic_inc(&permission_epoch); |
57 | } | 57 | } |
diff --git a/fs/coda/cnode.c b/fs/coda/cnode.c index 23aeef5aa814..4c9fecbfa91f 100644 --- a/fs/coda/cnode.c +++ b/fs/coda/cnode.c | |||
@@ -120,8 +120,7 @@ void coda_replace_fid(struct inode *inode, struct CodaFid *oldfid, | |||
120 | 120 | ||
121 | cii = ITOC(inode); | 121 | cii = ITOC(inode); |
122 | 122 | ||
123 | if (!coda_fideq(&cii->c_fid, oldfid)) | 123 | BUG_ON(!coda_fideq(&cii->c_fid, oldfid)); |
124 | BUG(); | ||
125 | 124 | ||
126 | /* replace fid and rehash inode */ | 125 | /* replace fid and rehash inode */ |
127 | /* XXX we probably need to hold some lock here! */ | 126 | /* XXX we probably need to hold some lock here! */ |
diff --git a/fs/ufs/super.c b/fs/ufs/super.c index d257644a1aeb..db98a4c71e63 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c | |||
@@ -575,7 +575,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent) | |||
575 | if (!silent) | 575 | if (!silent) |
576 | printk("You didn't specify the type of your ufs filesystem\n\n" | 576 | printk("You didn't specify the type of your ufs filesystem\n\n" |
577 | "mount -t ufs -o ufstype=" | 577 | "mount -t ufs -o ufstype=" |
578 | "sun|sunx86|44bsd|ufs2|5xbsd|old|hp|nextstep|netxstep-cd|openstep ...\n\n" | 578 | "sun|sunx86|44bsd|ufs2|5xbsd|old|hp|nextstep|nextstep-cd|openstep ...\n\n" |
579 | ">>>WARNING<<< Wrong ufstype may corrupt your filesystem, " | 579 | ">>>WARNING<<< Wrong ufstype may corrupt your filesystem, " |
580 | "default is ufstype=old\n"); | 580 | "default is ufstype=old\n"); |
581 | ufs_set_opt (sbi->s_mount_opt, UFSTYPE_OLD); | 581 | ufs_set_opt (sbi->s_mount_opt, UFSTYPE_OLD); |
diff --git a/include/linux/timer.h b/include/linux/timer.h index 9b9877fd2505..ee5a09e806e8 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h | |||
@@ -69,13 +69,13 @@ extern unsigned long next_timer_interrupt(void); | |||
69 | * @timer: the timer to be added | 69 | * @timer: the timer to be added |
70 | * | 70 | * |
71 | * The kernel will do a ->function(->data) callback from the | 71 | * The kernel will do a ->function(->data) callback from the |
72 | * timer interrupt at the ->expired point in the future. The | 72 | * timer interrupt at the ->expires point in the future. The |
73 | * current time is 'jiffies'. | 73 | * current time is 'jiffies'. |
74 | * | 74 | * |
75 | * The timer's ->expired, ->function (and if the handler uses it, ->data) | 75 | * The timer's ->expires, ->function (and if the handler uses it, ->data) |
76 | * fields must be set prior calling this function. | 76 | * fields must be set prior calling this function. |
77 | * | 77 | * |
78 | * Timers with an ->expired field in the past will be executed in the next | 78 | * Timers with an ->expires field in the past will be executed in the next |
79 | * timer tick. | 79 | * timer tick. |
80 | */ | 80 | */ |
81 | static inline void add_timer(struct timer_list *timer) | 81 | static inline void add_timer(struct timer_list *timer) |
@@ -220,8 +220,7 @@ asmlinkage long sys_msgget (key_t key, int msgflg) | |||
220 | ret = -EEXIST; | 220 | ret = -EEXIST; |
221 | } else { | 221 | } else { |
222 | msq = msg_lock(id); | 222 | msq = msg_lock(id); |
223 | if(msq==NULL) | 223 | BUG_ON(msq==NULL); |
224 | BUG(); | ||
225 | if (ipcperms(&msq->q_perm, msgflg)) | 224 | if (ipcperms(&msq->q_perm, msgflg)) |
226 | ret = -EACCES; | 225 | ret = -EACCES; |
227 | else { | 226 | else { |
diff --git a/kernel/cpu.c b/kernel/cpu.c index e882c6babf41..8be22bd80933 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
@@ -223,8 +223,7 @@ int __devinit cpu_up(unsigned int cpu) | |||
223 | ret = __cpu_up(cpu); | 223 | ret = __cpu_up(cpu); |
224 | if (ret != 0) | 224 | if (ret != 0) |
225 | goto out_notify; | 225 | goto out_notify; |
226 | if (!cpu_online(cpu)) | 226 | BUG_ON(!cpu_online(cpu)); |
227 | BUG(); | ||
228 | 227 | ||
229 | /* Now call notifier in preparation. */ | 228 | /* Now call notifier in preparation. */ |
230 | notifier_call_chain(&cpu_chain, CPU_ONLINE, hcpu); | 229 | notifier_call_chain(&cpu_chain, CPU_ONLINE, hcpu); |
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 0af497b6b9a8..10625785eefd 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c | |||
@@ -296,8 +296,7 @@ map_single(struct device *hwdev, char *buffer, size_t size, int dir) | |||
296 | else | 296 | else |
297 | stride = 1; | 297 | stride = 1; |
298 | 298 | ||
299 | if (!nslots) | 299 | BUG_ON(!nslots); |
300 | BUG(); | ||
301 | 300 | ||
302 | /* | 301 | /* |
303 | * Find suitable number of IO TLB entries size that will fit this | 302 | * Find suitable number of IO TLB entries size that will fit this |
@@ -416,14 +415,14 @@ sync_single(struct device *hwdev, char *dma_addr, size_t size, | |||
416 | case SYNC_FOR_CPU: | 415 | case SYNC_FOR_CPU: |
417 | if (likely(dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)) | 416 | if (likely(dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)) |
418 | memcpy(buffer, dma_addr, size); | 417 | memcpy(buffer, dma_addr, size); |
419 | else if (dir != DMA_TO_DEVICE) | 418 | else |
420 | BUG(); | 419 | BUG_ON(dir != DMA_TO_DEVICE); |
421 | break; | 420 | break; |
422 | case SYNC_FOR_DEVICE: | 421 | case SYNC_FOR_DEVICE: |
423 | if (likely(dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL)) | 422 | if (likely(dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL)) |
424 | memcpy(dma_addr, buffer, size); | 423 | memcpy(dma_addr, buffer, size); |
425 | else if (dir != DMA_FROM_DEVICE) | 424 | else |
426 | BUG(); | 425 | BUG_ON(dir != DMA_FROM_DEVICE); |
427 | break; | 426 | break; |
428 | default: | 427 | default: |
429 | BUG(); | 428 | BUG(); |
@@ -529,8 +528,7 @@ swiotlb_map_single(struct device *hwdev, void *ptr, size_t size, int dir) | |||
529 | unsigned long dev_addr = virt_to_phys(ptr); | 528 | unsigned long dev_addr = virt_to_phys(ptr); |
530 | void *map; | 529 | void *map; |
531 | 530 | ||
532 | if (dir == DMA_NONE) | 531 | BUG_ON(dir == DMA_NONE); |
533 | BUG(); | ||
534 | /* | 532 | /* |
535 | * If the pointer passed in happens to be in the device's DMA window, | 533 | * If the pointer passed in happens to be in the device's DMA window, |
536 | * we can safely return the device addr and not worry about bounce | 534 | * we can safely return the device addr and not worry about bounce |
@@ -592,8 +590,7 @@ swiotlb_unmap_single(struct device *hwdev, dma_addr_t dev_addr, size_t size, | |||
592 | { | 590 | { |
593 | char *dma_addr = phys_to_virt(dev_addr); | 591 | char *dma_addr = phys_to_virt(dev_addr); |
594 | 592 | ||
595 | if (dir == DMA_NONE) | 593 | BUG_ON(dir == DMA_NONE); |
596 | BUG(); | ||
597 | if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end) | 594 | if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end) |
598 | unmap_single(hwdev, dma_addr, size, dir); | 595 | unmap_single(hwdev, dma_addr, size, dir); |
599 | else if (dir == DMA_FROM_DEVICE) | 596 | else if (dir == DMA_FROM_DEVICE) |
@@ -616,8 +613,7 @@ swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr, | |||
616 | { | 613 | { |
617 | char *dma_addr = phys_to_virt(dev_addr); | 614 | char *dma_addr = phys_to_virt(dev_addr); |
618 | 615 | ||
619 | if (dir == DMA_NONE) | 616 | BUG_ON(dir == DMA_NONE); |
620 | BUG(); | ||
621 | if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end) | 617 | if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end) |
622 | sync_single(hwdev, dma_addr, size, dir, target); | 618 | sync_single(hwdev, dma_addr, size, dir, target); |
623 | else if (dir == DMA_FROM_DEVICE) | 619 | else if (dir == DMA_FROM_DEVICE) |
@@ -648,8 +644,7 @@ swiotlb_sync_single_range(struct device *hwdev, dma_addr_t dev_addr, | |||
648 | { | 644 | { |
649 | char *dma_addr = phys_to_virt(dev_addr) + offset; | 645 | char *dma_addr = phys_to_virt(dev_addr) + offset; |
650 | 646 | ||
651 | if (dir == DMA_NONE) | 647 | BUG_ON(dir == DMA_NONE); |
652 | BUG(); | ||
653 | if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end) | 648 | if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end) |
654 | sync_single(hwdev, dma_addr, size, dir, target); | 649 | sync_single(hwdev, dma_addr, size, dir, target); |
655 | else if (dir == DMA_FROM_DEVICE) | 650 | else if (dir == DMA_FROM_DEVICE) |
@@ -696,8 +691,7 @@ swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg, int nelems, | |||
696 | unsigned long dev_addr; | 691 | unsigned long dev_addr; |
697 | int i; | 692 | int i; |
698 | 693 | ||
699 | if (dir == DMA_NONE) | 694 | BUG_ON(dir == DMA_NONE); |
700 | BUG(); | ||
701 | 695 | ||
702 | for (i = 0; i < nelems; i++, sg++) { | 696 | for (i = 0; i < nelems; i++, sg++) { |
703 | addr = SG_ENT_VIRT_ADDRESS(sg); | 697 | addr = SG_ENT_VIRT_ADDRESS(sg); |
@@ -730,8 +724,7 @@ swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nelems, | |||
730 | { | 724 | { |
731 | int i; | 725 | int i; |
732 | 726 | ||
733 | if (dir == DMA_NONE) | 727 | BUG_ON(dir == DMA_NONE); |
734 | BUG(); | ||
735 | 728 | ||
736 | for (i = 0; i < nelems; i++, sg++) | 729 | for (i = 0; i < nelems; i++, sg++) |
737 | if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg)) | 730 | if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg)) |
@@ -753,8 +746,7 @@ swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sg, | |||
753 | { | 746 | { |
754 | int i; | 747 | int i; |
755 | 748 | ||
756 | if (dir == DMA_NONE) | 749 | BUG_ON(dir == DMA_NONE); |
757 | BUG(); | ||
758 | 750 | ||
759 | for (i = 0; i < nelems; i++, sg++) | 751 | for (i = 0; i < nelems; i++, sg++) |
760 | if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg)) | 752 | if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg)) |
diff --git a/mm/msync.c b/mm/msync.c index 2672b8dc3d89..bc6c95376366 100644 --- a/mm/msync.c +++ b/mm/msync.c | |||
@@ -126,7 +126,7 @@ static unsigned long msync_page_range(struct vm_area_struct *vma, | |||
126 | * write out the dirty pages and wait on the writeout and check the result. | 126 | * write out the dirty pages and wait on the writeout and check the result. |
127 | * Or the application may run fadvise(FADV_DONTNEED) against the fd to start | 127 | * Or the application may run fadvise(FADV_DONTNEED) against the fd to start |
128 | * async writeout immediately. | 128 | * async writeout immediately. |
129 | * So my _not_ starting I/O in MS_ASYNC we provide complete flexibility to | 129 | * So by _not_ starting I/O in MS_ASYNC we provide complete flexibility to |
130 | * applications. | 130 | * applications. |
131 | */ | 131 | */ |
132 | static int msync_interval(struct vm_area_struct *vma, unsigned long addr, | 132 | static int msync_interval(struct vm_area_struct *vma, unsigned long addr, |
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index bf96a61d4b86..9a3ec20b0be2 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost | |||
@@ -4,7 +4,7 @@ | |||
4 | # | 4 | # |
5 | # Stage one of module building created the following: | 5 | # Stage one of module building created the following: |
6 | # a) The individual .o files used for the module | 6 | # a) The individual .o files used for the module |
7 | # b) A <module>.o file wich is the .o files above linked together | 7 | # b) A <module>.o file which is the .o files above linked together |
8 | # c) A <module>.mod file in $(MODVERDIR)/, listing the name of the | 8 | # c) A <module>.mod file in $(MODVERDIR)/, listing the name of the |
9 | # the preliminary <module>.o file, plus all .o files | 9 | # the preliminary <module>.o file, plus all .o files |
10 | 10 | ||
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 53a148b01b6b..8804f26ddb3a 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
@@ -611,8 +611,7 @@ static void snd_cs4231_advance_dma(struct cs4231_dma_control *dma_cont, | |||
611 | unsigned int period_size = snd_pcm_lib_period_bytes(substream); | 611 | unsigned int period_size = snd_pcm_lib_period_bytes(substream); |
612 | unsigned int offset = period_size * (*periods_sent); | 612 | unsigned int offset = period_size * (*periods_sent); |
613 | 613 | ||
614 | if (period_size >= (1 << 24)) | 614 | BUG_ON(period_size >= (1 << 24)); |
615 | BUG(); | ||
616 | 615 | ||
617 | if (dma_cont->request(dma_cont, runtime->dma_addr + offset, period_size)) | 616 | if (dma_cont->request(dma_cont, runtime->dma_addr + offset, period_size)) |
618 | return; | 617 | return; |
@@ -1079,8 +1078,7 @@ static int snd_cs4231_playback_prepare(struct snd_pcm_substream *substream) | |||
1079 | chip->image[CS4231_IFACE_CTRL] &= ~(CS4231_PLAYBACK_ENABLE | | 1078 | chip->image[CS4231_IFACE_CTRL] &= ~(CS4231_PLAYBACK_ENABLE | |
1080 | CS4231_PLAYBACK_PIO); | 1079 | CS4231_PLAYBACK_PIO); |
1081 | 1080 | ||
1082 | if (runtime->period_size > 0xffff + 1) | 1081 | BUG_ON(runtime->period_size > 0xffff + 1); |
1083 | BUG(); | ||
1084 | 1082 | ||
1085 | chip->p_periods_sent = 0; | 1083 | chip->p_periods_sent = 0; |
1086 | spin_unlock_irqrestore(&chip->lock, flags); | 1084 | spin_unlock_irqrestore(&chip->lock, flags); |