diff options
100 files changed, 128 insertions, 190 deletions
diff --git a/Documentation/ABI/removed/o2cb b/Documentation/ABI/removed/o2cb index 7f5daa465093..20c91adca6d4 100644 --- a/Documentation/ABI/removed/o2cb +++ b/Documentation/ABI/removed/o2cb | |||
@@ -1,6 +1,6 @@ | |||
1 | What: /sys/o2cb symlink | 1 | What: /sys/o2cb symlink |
2 | Date: May 2011 | 2 | Date: May 2011 |
3 | KernelVersion: 2.6.40 | 3 | KernelVersion: 3.0 |
4 | Contact: ocfs2-devel@oss.oracle.com | 4 | Contact: ocfs2-devel@oss.oracle.com |
5 | Description: This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is | 5 | Description: This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is |
6 | removed when new versions of ocfs2-tools which know to look | 6 | removed when new versions of ocfs2-tools which know to look |
diff --git a/Documentation/ABI/testing/sysfs-bus-bcma b/Documentation/ABI/testing/sysfs-bus-bcma index 06b62badddd1..721b4aea3020 100644 --- a/Documentation/ABI/testing/sysfs-bus-bcma +++ b/Documentation/ABI/testing/sysfs-bus-bcma | |||
@@ -1,6 +1,6 @@ | |||
1 | What: /sys/bus/bcma/devices/.../manuf | 1 | What: /sys/bus/bcma/devices/.../manuf |
2 | Date: May 2011 | 2 | Date: May 2011 |
3 | KernelVersion: 2.6.40 | 3 | KernelVersion: 3.0 |
4 | Contact: Rafał Miłecki <zajec5@gmail.com> | 4 | Contact: Rafał Miłecki <zajec5@gmail.com> |
5 | Description: | 5 | Description: |
6 | Each BCMA core has it's manufacturer id. See | 6 | Each BCMA core has it's manufacturer id. See |
@@ -8,7 +8,7 @@ Description: | |||
8 | 8 | ||
9 | What: /sys/bus/bcma/devices/.../id | 9 | What: /sys/bus/bcma/devices/.../id |
10 | Date: May 2011 | 10 | Date: May 2011 |
11 | KernelVersion: 2.6.40 | 11 | KernelVersion: 3.0 |
12 | Contact: Rafał Miłecki <zajec5@gmail.com> | 12 | Contact: Rafał Miłecki <zajec5@gmail.com> |
13 | Description: | 13 | Description: |
14 | There are a few types of BCMA cores, they can be identified by | 14 | There are a few types of BCMA cores, they can be identified by |
@@ -16,7 +16,7 @@ Description: | |||
16 | 16 | ||
17 | What: /sys/bus/bcma/devices/.../rev | 17 | What: /sys/bus/bcma/devices/.../rev |
18 | Date: May 2011 | 18 | Date: May 2011 |
19 | KernelVersion: 2.6.40 | 19 | KernelVersion: 3.0 |
20 | Contact: Rafał Miłecki <zajec5@gmail.com> | 20 | Contact: Rafał Miłecki <zajec5@gmail.com> |
21 | Description: | 21 | Description: |
22 | BCMA cores of the same type can still slightly differ depending | 22 | BCMA cores of the same type can still slightly differ depending |
@@ -24,7 +24,7 @@ Description: | |||
24 | 24 | ||
25 | What: /sys/bus/bcma/devices/.../class | 25 | What: /sys/bus/bcma/devices/.../class |
26 | Date: May 2011 | 26 | Date: May 2011 |
27 | KernelVersion: 2.6.40 | 27 | KernelVersion: 3.0 |
28 | Contact: Rafał Miłecki <zajec5@gmail.com> | 28 | Contact: Rafał Miłecki <zajec5@gmail.com> |
29 | Description: | 29 | Description: |
30 | Each BCMA core is identified by few fields, including class it | 30 | Each BCMA core is identified by few fields, including class it |
diff --git a/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870 b/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870 index aa11dbdd794b..4a9c545bda4b 100644 --- a/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870 +++ b/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870 | |||
@@ -4,8 +4,8 @@ What: /sys/class/backlight/<backlight>/l2_bright_max | |||
4 | What: /sys/class/backlight/<backlight>/l3_office_max | 4 | What: /sys/class/backlight/<backlight>/l3_office_max |
5 | What: /sys/class/backlight/<backlight>/l4_indoor_max | 5 | What: /sys/class/backlight/<backlight>/l4_indoor_max |
6 | What: /sys/class/backlight/<backlight>/l5_dark_max | 6 | What: /sys/class/backlight/<backlight>/l5_dark_max |
7 | Date: Mai 2011 | 7 | Date: May 2011 |
8 | KernelVersion: 2.6.40 | 8 | KernelVersion: 3.0 |
9 | Contact: device-drivers-devel@blackfin.uclinux.org | 9 | Contact: device-drivers-devel@blackfin.uclinux.org |
10 | Description: | 10 | Description: |
11 | Control the maximum brightness for <ambient light zone> | 11 | Control the maximum brightness for <ambient light zone> |
@@ -18,8 +18,8 @@ What: /sys/class/backlight/<backlight>/l2_bright_dim | |||
18 | What: /sys/class/backlight/<backlight>/l3_office_dim | 18 | What: /sys/class/backlight/<backlight>/l3_office_dim |
19 | What: /sys/class/backlight/<backlight>/l4_indoor_dim | 19 | What: /sys/class/backlight/<backlight>/l4_indoor_dim |
20 | What: /sys/class/backlight/<backlight>/l5_dark_dim | 20 | What: /sys/class/backlight/<backlight>/l5_dark_dim |
21 | Date: Mai 2011 | 21 | Date: May 2011 |
22 | KernelVersion: 2.6.40 | 22 | KernelVersion: 3.0 |
23 | Contact: device-drivers-devel@blackfin.uclinux.org | 23 | Contact: device-drivers-devel@blackfin.uclinux.org |
24 | Description: | 24 | Description: |
25 | Control the dim brightness for <ambient light zone> | 25 | Control the dim brightness for <ambient light zone> |
@@ -29,8 +29,8 @@ Description: | |||
29 | this <ambient light zone>. | 29 | this <ambient light zone>. |
30 | 30 | ||
31 | What: /sys/class/backlight/<backlight>/ambient_light_level | 31 | What: /sys/class/backlight/<backlight>/ambient_light_level |
32 | Date: Mai 2011 | 32 | Date: May 2011 |
33 | KernelVersion: 2.6.40 | 33 | KernelVersion: 3.0 |
34 | Contact: device-drivers-devel@blackfin.uclinux.org | 34 | Contact: device-drivers-devel@blackfin.uclinux.org |
35 | Description: | 35 | Description: |
36 | Get conversion value of the light sensor. | 36 | Get conversion value of the light sensor. |
@@ -39,8 +39,8 @@ Description: | |||
39 | 8000 (max ambient brightness) | 39 | 8000 (max ambient brightness) |
40 | 40 | ||
41 | What: /sys/class/backlight/<backlight>/ambient_light_zone | 41 | What: /sys/class/backlight/<backlight>/ambient_light_zone |
42 | Date: Mai 2011 | 42 | Date: May 2011 |
43 | KernelVersion: 2.6.40 | 43 | KernelVersion: 3.0 |
44 | Contact: device-drivers-devel@blackfin.uclinux.org | 44 | Contact: device-drivers-devel@blackfin.uclinux.org |
45 | Description: | 45 | Description: |
46 | Get/Set current ambient light zone. Reading returns | 46 | Get/Set current ambient light zone. Reading returns |
diff --git a/Documentation/cpu-freq/governors.txt b/Documentation/cpu-freq/governors.txt index e74d0a2eb1cf..d221781dabaa 100644 --- a/Documentation/cpu-freq/governors.txt +++ b/Documentation/cpu-freq/governors.txt | |||
@@ -132,7 +132,7 @@ The sampling rate is limited by the HW transition latency: | |||
132 | transition_latency * 100 | 132 | transition_latency * 100 |
133 | Or by kernel restrictions: | 133 | Or by kernel restrictions: |
134 | If CONFIG_NO_HZ is set, the limit is 10ms fixed. | 134 | If CONFIG_NO_HZ is set, the limit is 10ms fixed. |
135 | If CONFIG_NO_HZ is not set or no_hz=off boot parameter is used, the | 135 | If CONFIG_NO_HZ is not set or nohz=off boot parameter is used, the |
136 | limits depend on the CONFIG_HZ option: | 136 | limits depend on the CONFIG_HZ option: |
137 | HZ=1000: min=20000us (20ms) | 137 | HZ=1000: min=20000us (20ms) |
138 | HZ=250: min=80000us (80ms) | 138 | HZ=250: min=80000us (80ms) |
diff --git a/arch/arm/mach-bcmring/irq.c b/arch/arm/mach-bcmring/irq.c index c48feaf4e8e9..437fa683bcb2 100644 --- a/arch/arm/mach-bcmring/irq.c +++ b/arch/arm/mach-bcmring/irq.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/stddef.h> | 20 | #include <linux/stddef.h> |
21 | #include <linux/list.h> | 21 | #include <linux/list.h> |
22 | #include <linux/timer.h> | 22 | #include <linux/timer.h> |
23 | #include <linux/version.h> | ||
24 | #include <linux/io.h> | 23 | #include <linux/io.h> |
25 | 24 | ||
26 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
diff --git a/arch/arm/mach-bcmring/timer.c b/arch/arm/mach-bcmring/timer.c index 2d415d2a8e68..af9c3d7e2a0c 100644 --- a/arch/arm/mach-bcmring/timer.c +++ b/arch/arm/mach-bcmring/timer.c | |||
@@ -12,7 +12,6 @@ | |||
12 | * consent. | 12 | * consent. |
13 | *****************************************************************************/ | 13 | *****************************************************************************/ |
14 | 14 | ||
15 | #include <linux/version.h> | ||
16 | #include <linux/types.h> | 15 | #include <linux/types.h> |
17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
18 | #include <csp/tmrHw.h> | 17 | #include <csp/tmrHw.h> |
diff --git a/arch/arm/mach-nuc93x/time.c b/arch/arm/mach-nuc93x/time.c index 2f90f9dc6e30..f9807c029ec5 100644 --- a/arch/arm/mach-nuc93x/time.c +++ b/arch/arm/mach-nuc93x/time.c | |||
@@ -82,7 +82,7 @@ static void nuc93x_timer_setup(void) | |||
82 | timer0_load = (rate / TICKS_PER_SEC); | 82 | timer0_load = (rate / TICKS_PER_SEC); |
83 | __raw_writel(timer0_load, REG_TICR0); | 83 | __raw_writel(timer0_load, REG_TICR0); |
84 | 84 | ||
85 | val |= (PERIOD | COUNTEN | INTEN | PRESCALE);; | 85 | val |= (PERIOD | COUNTEN | INTEN | PRESCALE); |
86 | __raw_writel(val, REG_TCSR0); | 86 | __raw_writel(val, REG_TCSR0); |
87 | 87 | ||
88 | } | 88 | } |
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c index 34c01a7de810..f49804f181d4 100644 --- a/arch/arm/mach-omap2/smartreflex.c +++ b/arch/arm/mach-omap2/smartreflex.c | |||
@@ -247,7 +247,7 @@ static void sr_stop_vddautocomp(struct omap_sr *sr) | |||
247 | * driver register and sr device intializtion API's. Only one call | 247 | * driver register and sr device intializtion API's. Only one call |
248 | * will ultimately succeed. | 248 | * will ultimately succeed. |
249 | * | 249 | * |
250 | * Currently this function registers interrrupt handler for a particular SR | 250 | * Currently this function registers interrupt handler for a particular SR |
251 | * if smartreflex class driver is already registered and has | 251 | * if smartreflex class driver is already registered and has |
252 | * requested for interrupts and the SR interrupt line in present. | 252 | * requested for interrupts and the SR interrupt line in present. |
253 | */ | 253 | */ |
diff --git a/arch/arm/mach-w90x900/cpu.c b/arch/arm/mach-w90x900/cpu.c index 83c56324a472..0a235e502330 100644 --- a/arch/arm/mach-w90x900/cpu.c +++ b/arch/arm/mach-w90x900/cpu.c | |||
@@ -60,7 +60,7 @@ static DEFINE_CLK(emc, 7); | |||
60 | static DEFINE_SUBCLK(rmii, 2); | 60 | static DEFINE_SUBCLK(rmii, 2); |
61 | static DEFINE_CLK(usbd, 8); | 61 | static DEFINE_CLK(usbd, 8); |
62 | static DEFINE_CLK(usbh, 9); | 62 | static DEFINE_CLK(usbh, 9); |
63 | static DEFINE_CLK(g2d, 10);; | 63 | static DEFINE_CLK(g2d, 10); |
64 | static DEFINE_CLK(pwm, 18); | 64 | static DEFINE_CLK(pwm, 18); |
65 | static DEFINE_CLK(ps2, 24); | 65 | static DEFINE_CLK(ps2, 24); |
66 | static DEFINE_CLK(kpi, 25); | 66 | static DEFINE_CLK(kpi, 25); |
diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c index 613070e9ddbe..f1eebcae9bf0 100644 --- a/arch/powerpc/platforms/embedded6xx/storcenter.c +++ b/arch/powerpc/platforms/embedded6xx/storcenter.c | |||
@@ -77,7 +77,7 @@ static void __init storcenter_setup_arch(void) | |||
77 | } | 77 | } |
78 | 78 | ||
79 | /* | 79 | /* |
80 | * Interrupt setup and service. Interrrupts on the turbostation come | 80 | * Interrupt setup and service. Interrupts on the turbostation come |
81 | * from the four PCI slots plus onboard 8241 devices: I2C, DUART. | 81 | * from the four PCI slots plus onboard 8241 devices: I2C, DUART. |
82 | */ | 82 | */ |
83 | static void __init storcenter_init_IRQ(void) | 83 | static void __init storcenter_init_IRQ(void) |
diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c index 6023c6dc1fb7..74c8f5e76ce4 100644 --- a/arch/s390/hypfs/hypfs_diag.c +++ b/arch/s390/hypfs/hypfs_diag.c | |||
@@ -562,10 +562,9 @@ static int dbfs_d204_create(void **data, void **data_free_ptr, size_t *size) | |||
562 | void *base; | 562 | void *base; |
563 | 563 | ||
564 | buf_size = PAGE_SIZE * (diag204_buf_pages + 1) + sizeof(d204->hdr); | 564 | buf_size = PAGE_SIZE * (diag204_buf_pages + 1) + sizeof(d204->hdr); |
565 | base = vmalloc(buf_size); | 565 | base = vzalloc(buf_size); |
566 | if (!base) | 566 | if (!base) |
567 | return -ENOMEM; | 567 | return -ENOMEM; |
568 | memset(base, 0, buf_size); | ||
569 | d204 = page_align_ptr(base + sizeof(d204->hdr)) - sizeof(d204->hdr); | 568 | d204 = page_align_ptr(base + sizeof(d204->hdr)) - sizeof(d204->hdr); |
570 | rc = diag204_do_store(d204->buf, diag204_buf_pages); | 569 | rc = diag204_do_store(d204->buf, diag204_buf_pages); |
571 | if (rc) { | 570 | if (rc) { |
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 7a3b65107a27..2196c703c5e2 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
@@ -262,7 +262,7 @@ EXPORT_SYMBOL_GPL(start_thread); | |||
262 | 262 | ||
263 | 263 | ||
264 | /* | 264 | /* |
265 | * switch_to(x,yn) should switch tasks from x to y. | 265 | * switch_to(x,y) should switch tasks from x to y. |
266 | * | 266 | * |
267 | * We fsave/fwait so that an exception goes off at the right time | 267 | * We fsave/fwait so that an exception goes off at the right time |
268 | * (as a call from the fsave or fwait in effect) rather than to | 268 | * (as a call from the fsave or fwait in effect) rather than to |
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c index 67421f38a215..de54b9b278a7 100644 --- a/arch/x86/mm/mmio-mod.c +++ b/arch/x86/mm/mmio-mod.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include <linux/uaccess.h> | 30 | #include <linux/uaccess.h> |
31 | #include <linux/io.h> | 31 | #include <linux/io.h> |
32 | #include <linux/version.h> | ||
33 | #include <linux/kallsyms.h> | 32 | #include <linux/kallsyms.h> |
34 | #include <asm/pgtable.h> | 33 | #include <asm/pgtable.h> |
35 | #include <linux/mmiotrace.h> | 34 | #include <linux/mmiotrace.h> |
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index db06f34419cf..1c052127548c 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c | |||
@@ -3416,27 +3416,28 @@ init_card(struct atm_dev *dev) | |||
3416 | 3416 | ||
3417 | size = sizeof(struct vc_map *) * card->tct_size; | 3417 | size = sizeof(struct vc_map *) * card->tct_size; |
3418 | IPRINTK("%s: allocate %d byte for VC map.\n", card->name, size); | 3418 | IPRINTK("%s: allocate %d byte for VC map.\n", card->name, size); |
3419 | if (NULL == (card->vcs = vmalloc(size))) { | 3419 | card->vcs = vzalloc(size); |
3420 | if (!card->vcs) { | ||
3420 | printk("%s: memory allocation failure.\n", card->name); | 3421 | printk("%s: memory allocation failure.\n", card->name); |
3421 | deinit_card(card); | 3422 | deinit_card(card); |
3422 | return -1; | 3423 | return -1; |
3423 | } | 3424 | } |
3424 | memset(card->vcs, 0, size); | ||
3425 | 3425 | ||
3426 | size = sizeof(struct vc_map *) * card->scd_size; | 3426 | size = sizeof(struct vc_map *) * card->scd_size; |
3427 | IPRINTK("%s: allocate %d byte for SCD to VC mapping.\n", | 3427 | IPRINTK("%s: allocate %d byte for SCD to VC mapping.\n", |
3428 | card->name, size); | 3428 | card->name, size); |
3429 | if (NULL == (card->scd2vc = vmalloc(size))) { | 3429 | card->scd2vc = vzalloc(size); |
3430 | if (!card->scd2vc) { | ||
3430 | printk("%s: memory allocation failure.\n", card->name); | 3431 | printk("%s: memory allocation failure.\n", card->name); |
3431 | deinit_card(card); | 3432 | deinit_card(card); |
3432 | return -1; | 3433 | return -1; |
3433 | } | 3434 | } |
3434 | memset(card->scd2vc, 0, size); | ||
3435 | 3435 | ||
3436 | size = sizeof(struct tst_info) * (card->tst_size - 2); | 3436 | size = sizeof(struct tst_info) * (card->tst_size - 2); |
3437 | IPRINTK("%s: allocate %d byte for TST to VC mapping.\n", | 3437 | IPRINTK("%s: allocate %d byte for TST to VC mapping.\n", |
3438 | card->name, size); | 3438 | card->name, size); |
3439 | if (NULL == (card->soft_tst = vmalloc(size))) { | 3439 | card->soft_tst = vmalloc(size); |
3440 | if (!card->soft_tst) { | ||
3440 | printk("%s: memory allocation failure.\n", card->name); | 3441 | printk("%s: memory allocation failure.\n", card->name); |
3441 | deinit_card(card); | 3442 | deinit_card(card); |
3442 | return -1; | 3443 | return -1; |
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c index e828c5487493..f5569699f31c 100644 --- a/drivers/atm/lanai.c +++ b/drivers/atm/lanai.c | |||
@@ -1457,10 +1457,9 @@ static int __devinit vcc_table_allocate(struct lanai_dev *lanai) | |||
1457 | return (lanai->vccs == NULL) ? -ENOMEM : 0; | 1457 | return (lanai->vccs == NULL) ? -ENOMEM : 0; |
1458 | #else | 1458 | #else |
1459 | int bytes = (lanai->num_vci) * sizeof(struct lanai_vcc *); | 1459 | int bytes = (lanai->num_vci) * sizeof(struct lanai_vcc *); |
1460 | lanai->vccs = (struct lanai_vcc **) vmalloc(bytes); | 1460 | lanai->vccs = vzalloc(bytes); |
1461 | if (unlikely(lanai->vccs == NULL)) | 1461 | if (unlikely(lanai->vccs == NULL)) |
1462 | return -ENOMEM; | 1462 | return -ENOMEM; |
1463 | memset(lanai->vccs, 0, bytes); | ||
1464 | return 0; | 1463 | return 0; |
1465 | #endif | 1464 | #endif |
1466 | } | 1465 | } |
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c index 7b976296b564..912f585a760f 100644 --- a/drivers/block/drbd/drbd_bitmap.c +++ b/drivers/block/drbd/drbd_bitmap.c | |||
@@ -378,15 +378,14 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want) | |||
378 | * thread. As we have no disk yet, we are not in the IO path, | 378 | * thread. As we have no disk yet, we are not in the IO path, |
379 | * not even the IO path of the peer. */ | 379 | * not even the IO path of the peer. */ |
380 | bytes = sizeof(struct page *)*want; | 380 | bytes = sizeof(struct page *)*want; |
381 | new_pages = kmalloc(bytes, GFP_KERNEL); | 381 | new_pages = kzalloc(bytes, GFP_KERNEL); |
382 | if (!new_pages) { | 382 | if (!new_pages) { |
383 | new_pages = vmalloc(bytes); | 383 | new_pages = vzalloc(bytes); |
384 | if (!new_pages) | 384 | if (!new_pages) |
385 | return NULL; | 385 | return NULL; |
386 | vmalloced = 1; | 386 | vmalloced = 1; |
387 | } | 387 | } |
388 | 388 | ||
389 | memset(new_pages, 0, bytes); | ||
390 | if (want >= have) { | 389 | if (want >= have) { |
391 | for (i = 0; i < have; i++) | 390 | for (i = 0; i < have; i++) |
392 | new_pages[i] = old_pages[i]; | 391 | new_pages[i] = old_pages[i]; |
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index ef2ceed3be4b..1706d60b8c99 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h | |||
@@ -28,7 +28,6 @@ | |||
28 | 28 | ||
29 | #include <linux/compiler.h> | 29 | #include <linux/compiler.h> |
30 | #include <linux/types.h> | 30 | #include <linux/types.h> |
31 | #include <linux/version.h> | ||
32 | #include <linux/list.h> | 31 | #include <linux/list.h> |
33 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
34 | #include <linux/bitops.h> | 33 | #include <linux/bitops.h> |
@@ -928,7 +927,7 @@ struct drbd_md { | |||
928 | #define NL_INT64(pn,pr,member) __u64 member; | 927 | #define NL_INT64(pn,pr,member) __u64 member; |
929 | #define NL_BIT(pn,pr,member) unsigned member:1; | 928 | #define NL_BIT(pn,pr,member) unsigned member:1; |
930 | #define NL_STRING(pn,pr,member,len) unsigned char member[len]; int member ## _len; | 929 | #define NL_STRING(pn,pr,member,len) unsigned char member[len]; int member ## _len; |
931 | #include "linux/drbd_nl.h" | 930 | #include <linux/drbd_nl.h> |
932 | 931 | ||
933 | struct drbd_backing_dev { | 932 | struct drbd_backing_dev { |
934 | struct block_device *backing_bdev; | 933 | struct block_device *backing_bdev; |
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 0feab261e295..af2a25049bce 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c | |||
@@ -94,7 +94,7 @@ static int name ## _from_tags(struct drbd_conf *mdev, \ | |||
94 | arg->member ## _len = dlen; \ | 94 | arg->member ## _len = dlen; \ |
95 | memcpy(arg->member, tags, min_t(size_t, dlen, len)); \ | 95 | memcpy(arg->member, tags, min_t(size_t, dlen, len)); \ |
96 | break; | 96 | break; |
97 | #include "linux/drbd_nl.h" | 97 | #include <linux/drbd_nl.h> |
98 | 98 | ||
99 | /* Generate the struct to tag_list functions */ | 99 | /* Generate the struct to tag_list functions */ |
100 | #define NL_PACKET(name, number, fields) \ | 100 | #define NL_PACKET(name, number, fields) \ |
@@ -129,7 +129,7 @@ name ## _to_tags(struct drbd_conf *mdev, \ | |||
129 | put_unaligned(arg->member ## _len, tags++); \ | 129 | put_unaligned(arg->member ## _len, tags++); \ |
130 | memcpy(tags, arg->member, arg->member ## _len); \ | 130 | memcpy(tags, arg->member, arg->member ## _len); \ |
131 | tags = (unsigned short *)((char *)tags + arg->member ## _len); | 131 | tags = (unsigned short *)((char *)tags + arg->member ## _len); |
132 | #include "linux/drbd_nl.h" | 132 | #include <linux/drbd_nl.h> |
133 | 133 | ||
134 | void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name); | 134 | void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name); |
135 | void drbd_nl_send_reply(struct cn_msg *, int); | 135 | void drbd_nl_send_reply(struct cn_msg *, int); |
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 15f65b5f3fc7..fe3c3249cec4 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
@@ -192,7 +192,7 @@ static ssize_t rbd_snap_add(struct device *dev, | |||
192 | const char *buf, | 192 | const char *buf, |
193 | size_t count); | 193 | size_t count); |
194 | static void __rbd_remove_snap_dev(struct rbd_device *rbd_dev, | 194 | static void __rbd_remove_snap_dev(struct rbd_device *rbd_dev, |
195 | struct rbd_snap *snap);; | 195 | struct rbd_snap *snap); |
196 | 196 | ||
197 | 197 | ||
198 | static struct rbd_device *dev_to_rbd(struct device *dev) | 198 | static struct rbd_device *dev_to_rbd(struct device *dev) |
diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h index 9e40b283a468..0d04c7fb7cee 100644 --- a/drivers/block/xen-blkback/common.h +++ b/drivers/block/xen-blkback/common.h | |||
@@ -27,7 +27,6 @@ | |||
27 | #ifndef __XEN_BLKIF__BACKEND__COMMON_H__ | 27 | #ifndef __XEN_BLKIF__BACKEND__COMMON_H__ |
28 | #define __XEN_BLKIF__BACKEND__COMMON_H__ | 28 | #define __XEN_BLKIF__BACKEND__COMMON_H__ |
29 | 29 | ||
30 | #include <linux/version.h> | ||
31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
32 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
33 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c index f27d0d0816d3..4b71647782d0 100644 --- a/drivers/char/agp/backend.c +++ b/drivers/char/agp/backend.c | |||
@@ -171,7 +171,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) | |||
171 | } | 171 | } |
172 | got_gatt = 1; | 172 | got_gatt = 1; |
173 | 173 | ||
174 | bridge->key_list = vmalloc(PAGE_SIZE * 4); | 174 | bridge->key_list = vzalloc(PAGE_SIZE * 4); |
175 | if (bridge->key_list == NULL) { | 175 | if (bridge->key_list == NULL) { |
176 | dev_err(&bridge->dev->dev, | 176 | dev_err(&bridge->dev->dev, |
177 | "can't allocate memory for key lists\n"); | 177 | "can't allocate memory for key lists\n"); |
@@ -181,7 +181,6 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) | |||
181 | got_keylist = 1; | 181 | got_keylist = 1; |
182 | 182 | ||
183 | /* FIXME vmalloc'd memory not guaranteed contiguous */ | 183 | /* FIXME vmalloc'd memory not guaranteed contiguous */ |
184 | memset(bridge->key_list, 0, PAGE_SIZE * 4); | ||
185 | 184 | ||
186 | if (bridge->driver->configure()) { | 185 | if (bridge->driver->configure()) { |
187 | dev_err(&bridge->dev->dev, "error configuring host chipset\n"); | 186 | dev_err(&bridge->dev->dev, "error configuring host chipset\n"); |
diff --git a/drivers/char/raw.c b/drivers/char/raw.c index b33e8ea314ed..b6de2c047145 100644 --- a/drivers/char/raw.c +++ b/drivers/char/raw.c | |||
@@ -324,13 +324,12 @@ static int __init raw_init(void) | |||
324 | max_raw_minors = MAX_RAW_MINORS; | 324 | max_raw_minors = MAX_RAW_MINORS; |
325 | } | 325 | } |
326 | 326 | ||
327 | raw_devices = vmalloc(sizeof(struct raw_device_data) * max_raw_minors); | 327 | raw_devices = vzalloc(sizeof(struct raw_device_data) * max_raw_minors); |
328 | if (!raw_devices) { | 328 | if (!raw_devices) { |
329 | printk(KERN_ERR "Not enough memory for raw device structures\n"); | 329 | printk(KERN_ERR "Not enough memory for raw device structures\n"); |
330 | ret = -ENOMEM; | 330 | ret = -ENOMEM; |
331 | goto error; | 331 | goto error; |
332 | } | 332 | } |
333 | memset(raw_devices, 0, sizeof(struct raw_device_data) * max_raw_minors); | ||
334 | 333 | ||
335 | ret = register_chrdev_region(dev, max_raw_minors, "raw"); | 334 | ret = register_chrdev_region(dev, max_raw_minors, "raw"); |
336 | if (ret) | 335 | if (ret) |
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index dfa8b3062fda..ccd124ab7ca7 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c | |||
@@ -80,6 +80,7 @@ | |||
80 | #include <linux/bcd.h> | 80 | #include <linux/bcd.h> |
81 | #include <linux/delay.h> | 81 | #include <linux/delay.h> |
82 | #include <linux/uaccess.h> | 82 | #include <linux/uaccess.h> |
83 | #include <linux/ratelimit.h> | ||
83 | 84 | ||
84 | #include <asm/current.h> | 85 | #include <asm/current.h> |
85 | #include <asm/system.h> | 86 | #include <asm/system.h> |
@@ -1195,10 +1196,8 @@ static void rtc_dropped_irq(unsigned long data) | |||
1195 | 1196 | ||
1196 | spin_unlock_irq(&rtc_lock); | 1197 | spin_unlock_irq(&rtc_lock); |
1197 | 1198 | ||
1198 | if (printk_ratelimit()) { | 1199 | printk_ratelimited(KERN_WARNING "rtc: lost some interrupts at %ldHz.\n", |
1199 | printk(KERN_WARNING "rtc: lost some interrupts at %ldHz.\n", | 1200 | freq); |
1200 | freq); | ||
1201 | } | ||
1202 | 1201 | ||
1203 | /* Now we have new data */ | 1202 | /* Now we have new data */ |
1204 | wake_up_interruptible(&rtc_wait); | 1203 | wake_up_interruptible(&rtc_wait); |
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 891360edecdd..629b3ec698e2 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c | |||
@@ -725,7 +725,7 @@ static int __init cpufreq_gov_dbs_init(void) | |||
725 | dbs_tuners_ins.down_differential = | 725 | dbs_tuners_ins.down_differential = |
726 | MICRO_FREQUENCY_DOWN_DIFFERENTIAL; | 726 | MICRO_FREQUENCY_DOWN_DIFFERENTIAL; |
727 | /* | 727 | /* |
728 | * In no_hz/micro accounting case we set the minimum frequency | 728 | * In nohz/micro accounting case we set the minimum frequency |
729 | * not depending on HZ, but fixed (very low). The deferred | 729 | * not depending on HZ, but fixed (very low). The deferred |
730 | * timer might skip some samples if idle/sleeping as needed. | 730 | * timer might skip some samples if idle/sleeping as needed. |
731 | */ | 731 | */ |
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c index 7fd4e3e5ad5f..3475a09f946b 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c | |||
@@ -48,7 +48,7 @@ static void radeon_fence_write(struct radeon_device *rdev, u32 seq) | |||
48 | scratch_index = R600_WB_EVENT_OFFSET + rdev->fence_drv.scratch_reg - rdev->scratch.reg_base; | 48 | scratch_index = R600_WB_EVENT_OFFSET + rdev->fence_drv.scratch_reg - rdev->scratch.reg_base; |
49 | else | 49 | else |
50 | scratch_index = RADEON_WB_SCRATCH_OFFSET + rdev->fence_drv.scratch_reg - rdev->scratch.reg_base; | 50 | scratch_index = RADEON_WB_SCRATCH_OFFSET + rdev->fence_drv.scratch_reg - rdev->scratch.reg_base; |
51 | rdev->wb.wb[scratch_index/4] = cpu_to_le32(seq);; | 51 | rdev->wb.wb[scratch_index/4] = cpu_to_le32(seq); |
52 | } else | 52 | } else |
53 | WREG32(rdev->fence_drv.scratch_reg, seq); | 53 | WREG32(rdev->fence_drv.scratch_reg, seq); |
54 | } | 54 | } |
diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c index b7a51c43b185..1b42b50b5992 100644 --- a/drivers/i2c/busses/i2c-designware.c +++ b/drivers/i2c/busses/i2c-designware.c | |||
@@ -390,7 +390,7 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) | |||
390 | int tx_limit, rx_limit; | 390 | int tx_limit, rx_limit; |
391 | u32 addr = msgs[dev->msg_write_idx].addr; | 391 | u32 addr = msgs[dev->msg_write_idx].addr; |
392 | u32 buf_len = dev->tx_buf_len; | 392 | u32 buf_len = dev->tx_buf_len; |
393 | u8 *buf = dev->tx_buf;; | 393 | u8 *buf = dev->tx_buf; |
394 | 394 | ||
395 | intr_mask = DW_IC_INTR_DEFAULT_MASK; | 395 | intr_mask = DW_IC_INTR_DEFAULT_MASK; |
396 | 396 | ||
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 6ed82add6ffa..6ddb795e31c5 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c | |||
@@ -2308,11 +2308,11 @@ static int __init isdn_init(void) | |||
2308 | int i; | 2308 | int i; |
2309 | char tmprev[50]; | 2309 | char tmprev[50]; |
2310 | 2310 | ||
2311 | if (!(dev = vmalloc(sizeof(isdn_dev)))) { | 2311 | dev = vzalloc(sizeof(isdn_dev)); |
2312 | if (!dev) { | ||
2312 | printk(KERN_WARNING "isdn: Could not allocate device-struct.\n"); | 2313 | printk(KERN_WARNING "isdn: Could not allocate device-struct.\n"); |
2313 | return -EIO; | 2314 | return -EIO; |
2314 | } | 2315 | } |
2315 | memset((char *) dev, 0, sizeof(isdn_dev)); | ||
2316 | init_timer(&dev->timer); | 2316 | init_timer(&dev->timer); |
2317 | dev->timer.function = isdn_timer_funct; | 2317 | dev->timer.function = isdn_timer_funct; |
2318 | spin_lock_init(&dev->lock); | 2318 | spin_lock_init(&dev->lock); |
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c index 2877291a9ed8..0c41553ce684 100644 --- a/drivers/isdn/mISDN/dsp_core.c +++ b/drivers/isdn/mISDN/dsp_core.c | |||
@@ -1052,12 +1052,11 @@ dspcreate(struct channel_req *crq) | |||
1052 | if (crq->protocol != ISDN_P_B_L2DSP | 1052 | if (crq->protocol != ISDN_P_B_L2DSP |
1053 | && crq->protocol != ISDN_P_B_L2DSPHDLC) | 1053 | && crq->protocol != ISDN_P_B_L2DSPHDLC) |
1054 | return -EPROTONOSUPPORT; | 1054 | return -EPROTONOSUPPORT; |
1055 | ndsp = vmalloc(sizeof(struct dsp)); | 1055 | ndsp = vzalloc(sizeof(struct dsp)); |
1056 | if (!ndsp) { | 1056 | if (!ndsp) { |
1057 | printk(KERN_ERR "%s: vmalloc struct dsp failed\n", __func__); | 1057 | printk(KERN_ERR "%s: vmalloc struct dsp failed\n", __func__); |
1058 | return -ENOMEM; | 1058 | return -ENOMEM; |
1059 | } | 1059 | } |
1060 | memset(ndsp, 0, sizeof(struct dsp)); | ||
1061 | if (dsp_debug & DEBUG_DSP_CTRL) | 1060 | if (dsp_debug & DEBUG_DSP_CTRL) |
1062 | printk(KERN_DEBUG "%s: creating new dsp instance\n", __func__); | 1061 | printk(KERN_DEBUG "%s: creating new dsp instance\n", __func__); |
1063 | 1062 | ||
diff --git a/drivers/isdn/mISDN/l1oip_codec.c b/drivers/isdn/mISDN/l1oip_codec.c index bbfd1b863ed3..5a89972624d8 100644 --- a/drivers/isdn/mISDN/l1oip_codec.c +++ b/drivers/isdn/mISDN/l1oip_codec.c | |||
@@ -330,14 +330,12 @@ l1oip_4bit_alloc(int ulaw) | |||
330 | return 0; | 330 | return 0; |
331 | 331 | ||
332 | /* alloc conversion tables */ | 332 | /* alloc conversion tables */ |
333 | table_com = vmalloc(65536); | 333 | table_com = vzalloc(65536); |
334 | table_dec = vmalloc(512); | 334 | table_dec = vzalloc(512); |
335 | if (!table_com || !table_dec) { | 335 | if (!table_com || !table_dec) { |
336 | l1oip_4bit_free(); | 336 | l1oip_4bit_free(); |
337 | return -ENOMEM; | 337 | return -ENOMEM; |
338 | } | 338 | } |
339 | memset(table_com, 0, 65536); | ||
340 | memset(table_dec, 0, 512); | ||
341 | /* generate compression table */ | 339 | /* generate compression table */ |
342 | i1 = 0; | 340 | i1 = 0; |
343 | while (i1 < 256) { | 341 | while (i1 < 256) { |
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c index 8c0e19276970..ec1d52f38904 100644 --- a/drivers/media/radio/wl128x/fmdrv_v4l2.c +++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c | |||
@@ -402,7 +402,7 @@ static int fm_v4l2_vidioc_s_hw_freq_seek(struct file *file, void *priv, | |||
402 | static int fm_v4l2_vidioc_g_modulator(struct file *file, void *priv, | 402 | static int fm_v4l2_vidioc_g_modulator(struct file *file, void *priv, |
403 | struct v4l2_modulator *mod) | 403 | struct v4l2_modulator *mod) |
404 | { | 404 | { |
405 | struct fmdev *fmdev = video_drvdata(file);; | 405 | struct fmdev *fmdev = video_drvdata(file); |
406 | 406 | ||
407 | if (mod->index != 0) | 407 | if (mod->index != 0) |
408 | return -EINVAL; | 408 | return -EINVAL; |
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c index c827a6097d02..8d0baeceaaa3 100644 --- a/drivers/net/arm/ks8695net.c +++ b/drivers/net/arm/ks8695net.c | |||
@@ -414,7 +414,7 @@ ks8695_tx_irq(int irq, void *dev_id) | |||
414 | * Interrupt Status Register (Offset 0xF208) | 414 | * Interrupt Status Register (Offset 0xF208) |
415 | * Bit29: WAN MAC Receive Status | 415 | * Bit29: WAN MAC Receive Status |
416 | * Bit16: LAN MAC Receive Status | 416 | * Bit16: LAN MAC Receive Status |
417 | * So, this Rx interrrupt enable/status bit number is equal | 417 | * So, this Rx interrupt enable/status bit number is equal |
418 | * as Rx IRQ number. | 418 | * as Rx IRQ number. |
419 | */ | 419 | */ |
420 | static inline u32 ks8695_get_rx_enable_bit(struct ks8695_priv *ksp) | 420 | static inline u32 ks8695_get_rx_enable_bit(struct ks8695_priv *ksp) |
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 97e6954304ea..9f3e5306ef79 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
@@ -858,7 +858,7 @@ static s32 atl1_init_hw(struct atl1_hw *hw) | |||
858 | atl1_init_flash_opcode(hw); | 858 | atl1_init_flash_opcode(hw); |
859 | 859 | ||
860 | if (!hw->phy_configured) { | 860 | if (!hw->phy_configured) { |
861 | /* enable GPHY LinkChange Interrrupt */ | 861 | /* enable GPHY LinkChange Interrupt */ |
862 | ret_val = atl1_write_phy_reg(hw, 18, 0xC00); | 862 | ret_val = atl1_write_phy_reg(hw, 18, 0xC00); |
863 | if (ret_val) | 863 | if (ret_val) |
864 | return ret_val; | 864 | return ret_val; |
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index fc50d4267df8..99d31a7d6aaa 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h | |||
@@ -5617,7 +5617,7 @@ struct l2_fhdr { | |||
5617 | #define BNX2_TXP_CPU_STATE_FIO_ABORT_HALTED (1L<<8) | 5617 | #define BNX2_TXP_CPU_STATE_FIO_ABORT_HALTED (1L<<8) |
5618 | #define BNX2_TXP_CPU_STATE_SOFT_HALTED (1L<<10) | 5618 | #define BNX2_TXP_CPU_STATE_SOFT_HALTED (1L<<10) |
5619 | #define BNX2_TXP_CPU_STATE_SPAD_UNDERFLOW (1L<<11) | 5619 | #define BNX2_TXP_CPU_STATE_SPAD_UNDERFLOW (1L<<11) |
5620 | #define BNX2_TXP_CPU_STATE_INTERRRUPT (1L<<12) | 5620 | #define BNX2_TXP_CPU_STATE_INTERRUPT (1L<<12) |
5621 | #define BNX2_TXP_CPU_STATE_DATA_ACCESS_STALL (1L<<14) | 5621 | #define BNX2_TXP_CPU_STATE_DATA_ACCESS_STALL (1L<<14) |
5622 | #define BNX2_TXP_CPU_STATE_INST_FETCH_STALL (1L<<15) | 5622 | #define BNX2_TXP_CPU_STATE_INST_FETCH_STALL (1L<<15) |
5623 | #define BNX2_TXP_CPU_STATE_BLOCKED_READ (1L<<31) | 5623 | #define BNX2_TXP_CPU_STATE_BLOCKED_READ (1L<<31) |
@@ -5712,7 +5712,7 @@ struct l2_fhdr { | |||
5712 | #define BNX2_TPAT_CPU_STATE_FIO_ABORT_HALTED (1L<<8) | 5712 | #define BNX2_TPAT_CPU_STATE_FIO_ABORT_HALTED (1L<<8) |
5713 | #define BNX2_TPAT_CPU_STATE_SOFT_HALTED (1L<<10) | 5713 | #define BNX2_TPAT_CPU_STATE_SOFT_HALTED (1L<<10) |
5714 | #define BNX2_TPAT_CPU_STATE_SPAD_UNDERFLOW (1L<<11) | 5714 | #define BNX2_TPAT_CPU_STATE_SPAD_UNDERFLOW (1L<<11) |
5715 | #define BNX2_TPAT_CPU_STATE_INTERRRUPT (1L<<12) | 5715 | #define BNX2_TPAT_CPU_STATE_INTERRUPT (1L<<12) |
5716 | #define BNX2_TPAT_CPU_STATE_DATA_ACCESS_STALL (1L<<14) | 5716 | #define BNX2_TPAT_CPU_STATE_DATA_ACCESS_STALL (1L<<14) |
5717 | #define BNX2_TPAT_CPU_STATE_INST_FETCH_STALL (1L<<15) | 5717 | #define BNX2_TPAT_CPU_STATE_INST_FETCH_STALL (1L<<15) |
5718 | #define BNX2_TPAT_CPU_STATE_BLOCKED_READ (1L<<31) | 5718 | #define BNX2_TPAT_CPU_STATE_BLOCKED_READ (1L<<31) |
@@ -5807,7 +5807,7 @@ struct l2_fhdr { | |||
5807 | #define BNX2_RXP_CPU_STATE_FIO_ABORT_HALTED (1L<<8) | 5807 | #define BNX2_RXP_CPU_STATE_FIO_ABORT_HALTED (1L<<8) |
5808 | #define BNX2_RXP_CPU_STATE_SOFT_HALTED (1L<<10) | 5808 | #define BNX2_RXP_CPU_STATE_SOFT_HALTED (1L<<10) |
5809 | #define BNX2_RXP_CPU_STATE_SPAD_UNDERFLOW (1L<<11) | 5809 | #define BNX2_RXP_CPU_STATE_SPAD_UNDERFLOW (1L<<11) |
5810 | #define BNX2_RXP_CPU_STATE_INTERRRUPT (1L<<12) | 5810 | #define BNX2_RXP_CPU_STATE_INTERRUPT (1L<<12) |
5811 | #define BNX2_RXP_CPU_STATE_DATA_ACCESS_STALL (1L<<14) | 5811 | #define BNX2_RXP_CPU_STATE_DATA_ACCESS_STALL (1L<<14) |
5812 | #define BNX2_RXP_CPU_STATE_INST_FETCH_STALL (1L<<15) | 5812 | #define BNX2_RXP_CPU_STATE_INST_FETCH_STALL (1L<<15) |
5813 | #define BNX2_RXP_CPU_STATE_BLOCKED_READ (1L<<31) | 5813 | #define BNX2_RXP_CPU_STATE_BLOCKED_READ (1L<<31) |
@@ -5953,7 +5953,7 @@ struct l2_fhdr { | |||
5953 | #define BNX2_COM_CPU_STATE_FIO_ABORT_HALTED (1L<<8) | 5953 | #define BNX2_COM_CPU_STATE_FIO_ABORT_HALTED (1L<<8) |
5954 | #define BNX2_COM_CPU_STATE_SOFT_HALTED (1L<<10) | 5954 | #define BNX2_COM_CPU_STATE_SOFT_HALTED (1L<<10) |
5955 | #define BNX2_COM_CPU_STATE_SPAD_UNDERFLOW (1L<<11) | 5955 | #define BNX2_COM_CPU_STATE_SPAD_UNDERFLOW (1L<<11) |
5956 | #define BNX2_COM_CPU_STATE_INTERRRUPT (1L<<12) | 5956 | #define BNX2_COM_CPU_STATE_INTERRUPT (1L<<12) |
5957 | #define BNX2_COM_CPU_STATE_DATA_ACCESS_STALL (1L<<14) | 5957 | #define BNX2_COM_CPU_STATE_DATA_ACCESS_STALL (1L<<14) |
5958 | #define BNX2_COM_CPU_STATE_INST_FETCH_STALL (1L<<15) | 5958 | #define BNX2_COM_CPU_STATE_INST_FETCH_STALL (1L<<15) |
5959 | #define BNX2_COM_CPU_STATE_BLOCKED_READ (1L<<31) | 5959 | #define BNX2_COM_CPU_STATE_BLOCKED_READ (1L<<31) |
@@ -6119,7 +6119,7 @@ struct l2_fhdr { | |||
6119 | #define BNX2_CP_CPU_STATE_FIO_ABORT_HALTED (1L<<8) | 6119 | #define BNX2_CP_CPU_STATE_FIO_ABORT_HALTED (1L<<8) |
6120 | #define BNX2_CP_CPU_STATE_SOFT_HALTED (1L<<10) | 6120 | #define BNX2_CP_CPU_STATE_SOFT_HALTED (1L<<10) |
6121 | #define BNX2_CP_CPU_STATE_SPAD_UNDERFLOW (1L<<11) | 6121 | #define BNX2_CP_CPU_STATE_SPAD_UNDERFLOW (1L<<11) |
6122 | #define BNX2_CP_CPU_STATE_INTERRRUPT (1L<<12) | 6122 | #define BNX2_CP_CPU_STATE_INTERRUPT (1L<<12) |
6123 | #define BNX2_CP_CPU_STATE_DATA_ACCESS_STALL (1L<<14) | 6123 | #define BNX2_CP_CPU_STATE_DATA_ACCESS_STALL (1L<<14) |
6124 | #define BNX2_CP_CPU_STATE_INST_FETCH_STALL (1L<<15) | 6124 | #define BNX2_CP_CPU_STATE_INST_FETCH_STALL (1L<<15) |
6125 | #define BNX2_CP_CPU_STATE_BLOCKED_READ (1L<<31) | 6125 | #define BNX2_CP_CPU_STATE_BLOCKED_READ (1L<<31) |
@@ -6291,7 +6291,7 @@ struct l2_fhdr { | |||
6291 | #define BNX2_MCP_CPU_STATE_FIO_ABORT_HALTED (1L<<8) | 6291 | #define BNX2_MCP_CPU_STATE_FIO_ABORT_HALTED (1L<<8) |
6292 | #define BNX2_MCP_CPU_STATE_SOFT_HALTED (1L<<10) | 6292 | #define BNX2_MCP_CPU_STATE_SOFT_HALTED (1L<<10) |
6293 | #define BNX2_MCP_CPU_STATE_SPAD_UNDERFLOW (1L<<11) | 6293 | #define BNX2_MCP_CPU_STATE_SPAD_UNDERFLOW (1L<<11) |
6294 | #define BNX2_MCP_CPU_STATE_INTERRRUPT (1L<<12) | 6294 | #define BNX2_MCP_CPU_STATE_INTERRUPT (1L<<12) |
6295 | #define BNX2_MCP_CPU_STATE_DATA_ACCESS_STALL (1L<<14) | 6295 | #define BNX2_MCP_CPU_STATE_DATA_ACCESS_STALL (1L<<14) |
6296 | #define BNX2_MCP_CPU_STATE_INST_FETCH_STALL (1L<<15) | 6296 | #define BNX2_MCP_CPU_STATE_INST_FETCH_STALL (1L<<15) |
6297 | #define BNX2_MCP_CPU_STATE_BLOCKED_READ (1L<<31) | 6297 | #define BNX2_MCP_CPU_STATE_BLOCKED_READ (1L<<31) |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 57339da76326..d7f879dfb1c9 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -2057,7 +2057,7 @@ static void sky2_hw_down(struct sky2_port *sky2) | |||
2057 | 2057 | ||
2058 | sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET); | 2058 | sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET); |
2059 | 2059 | ||
2060 | /* Force any delayed status interrrupt and NAPI */ | 2060 | /* Force any delayed status interrupt and NAPI */ |
2061 | sky2_write32(hw, STAT_LEV_TIMER_CNT, 0); | 2061 | sky2_write32(hw, STAT_LEV_TIMER_CNT, 0); |
2062 | sky2_write32(hw, STAT_TX_TIMER_CNT, 0); | 2062 | sky2_write32(hw, STAT_TX_TIMER_CNT, 0); |
2063 | sky2_write32(hw, STAT_ISR_TIMER_CNT, 0); | 2063 | sky2_write32(hw, STAT_ISR_TIMER_CNT, 0); |
diff --git a/drivers/net/wireless/ipw2x00/libipw_tx.c b/drivers/net/wireless/ipw2x00/libipw_tx.c index 01c88a71abe1..e8c039879b05 100644 --- a/drivers/net/wireless/ipw2x00/libipw_tx.c +++ b/drivers/net/wireless/ipw2x00/libipw_tx.c | |||
@@ -395,7 +395,7 @@ netdev_tx_t libipw_xmit(struct sk_buff *skb, struct net_device *dev) | |||
395 | (CFG_LIBIPW_COMPUTE_FCS | CFG_LIBIPW_RESERVE_FCS)) | 395 | (CFG_LIBIPW_COMPUTE_FCS | CFG_LIBIPW_RESERVE_FCS)) |
396 | bytes_per_frag -= LIBIPW_FCS_LEN; | 396 | bytes_per_frag -= LIBIPW_FCS_LEN; |
397 | 397 | ||
398 | /* Each fragment may need to have room for encryptiong | 398 | /* Each fragment may need to have room for encryption |
399 | * pre/postfix */ | 399 | * pre/postfix */ |
400 | if (host_encrypt) | 400 | if (host_encrypt) |
401 | bytes_per_frag -= crypt->ops->extra_mpdu_prefix_len + | 401 | bytes_per_frag -= crypt->ops->extra_mpdu_prefix_len + |
diff --git a/drivers/net/wireless/libertas_tf/deb_defs.h b/drivers/net/wireless/libertas_tf/deb_defs.h index ae753962d8b5..4bd3dc5adf7c 100644 --- a/drivers/net/wireless/libertas_tf/deb_defs.h +++ b/drivers/net/wireless/libertas_tf/deb_defs.h | |||
@@ -3,7 +3,7 @@ | |||
3 | * global variable declaration. | 3 | * global variable declaration. |
4 | */ | 4 | */ |
5 | #ifndef _LBS_DEB_DEFS_H_ | 5 | #ifndef _LBS_DEB_DEFS_H_ |
6 | #define _LBS_DEB_EFS_H_ | 6 | #define _LBS_DEB_DEFS_H_ |
7 | 7 | ||
8 | #ifndef DRV_NAME | 8 | #ifndef DRV_NAME |
9 | #define DRV_NAME "libertas_tf" | 9 | #define DRV_NAME "libertas_tf" |
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index 56f12358389d..f8648b7288d5 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c | |||
@@ -488,7 +488,7 @@ static void _rtl_pci_tx_chk_waitq(struct ieee80211_hw *hw) | |||
488 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); | 488 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); |
489 | struct sk_buff *skb = NULL; | 489 | struct sk_buff *skb = NULL; |
490 | struct ieee80211_tx_info *info = NULL; | 490 | struct ieee80211_tx_info *info = NULL; |
491 | int tid; /* should be int */ | 491 | int tid; |
492 | 492 | ||
493 | if (!rtlpriv->rtlhal.earlymode_enable) | 493 | if (!rtlpriv->rtlhal.earlymode_enable) |
494 | return; | 494 | return; |
@@ -1538,7 +1538,7 @@ static int rtl_pci_start(struct ieee80211_hw *hw) | |||
1538 | 1538 | ||
1539 | rtl_init_rx_config(hw); | 1539 | rtl_init_rx_config(hw); |
1540 | 1540 | ||
1541 | /*should after adapter start and interrupt enable. */ | 1541 | /*should be after adapter start and interrupt enable. */ |
1542 | set_hal_start(rtlhal); | 1542 | set_hal_start(rtlhal); |
1543 | 1543 | ||
1544 | RT_CLEAR_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC); | 1544 | RT_CLEAR_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC); |
@@ -1559,7 +1559,7 @@ static void rtl_pci_stop(struct ieee80211_hw *hw) | |||
1559 | u8 RFInProgressTimeOut = 0; | 1559 | u8 RFInProgressTimeOut = 0; |
1560 | 1560 | ||
1561 | /* | 1561 | /* |
1562 | *should before disable interrrupt&adapter | 1562 | *should be before disable interrupt&adapter |
1563 | *and will do it immediately. | 1563 | *and will do it immediately. |
1564 | */ | 1564 | */ |
1565 | set_hal_stop(rtlhal); | 1565 | set_hal_stop(rtlhal); |
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c index 76058a5166ed..08c66035dd19 100644 --- a/drivers/s390/cio/blacklist.c +++ b/drivers/s390/cio/blacklist.c | |||
@@ -335,10 +335,9 @@ cio_ignore_write(struct file *file, const char __user *user_buf, | |||
335 | return -EINVAL; | 335 | return -EINVAL; |
336 | if (user_len > 65536) | 336 | if (user_len > 65536) |
337 | user_len = 65536; | 337 | user_len = 65536; |
338 | buf = vmalloc (user_len + 1); /* maybe better use the stack? */ | 338 | buf = vzalloc(user_len + 1); /* maybe better use the stack? */ |
339 | if (buf == NULL) | 339 | if (buf == NULL) |
340 | return -ENOMEM; | 340 | return -ENOMEM; |
341 | memset(buf, 0, user_len + 1); | ||
342 | 341 | ||
343 | if (strncpy_from_user (buf, user_buf, user_len) < 0) { | 342 | if (strncpy_from_user (buf, user_buf, user_len) < 0) { |
344 | rc = -EFAULT; | 343 | rc = -EFAULT; |
diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c index c20494660603..957595a7a45c 100644 --- a/drivers/scsi/aacraid/src.c +++ b/drivers/scsi/aacraid/src.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <linux/slab.h> | 37 | #include <linux/slab.h> |
38 | #include <linux/blkdev.h> | 38 | #include <linux/blkdev.h> |
39 | #include <linux/delay.h> | 39 | #include <linux/delay.h> |
40 | #include <linux/version.h> | ||
41 | #include <linux/completion.h> | 40 | #include <linux/completion.h> |
42 | #include <linux/time.h> | 41 | #include <linux/time.h> |
43 | #include <linux/interrupt.h> | 42 | #include <linux/interrupt.h> |
diff --git a/drivers/scsi/aic94xx/aic94xx_dump.c b/drivers/scsi/aic94xx/aic94xx_dump.c index 67eeba3bdb06..a16a77c8b9cf 100644 --- a/drivers/scsi/aic94xx/aic94xx_dump.c +++ b/drivers/scsi/aic94xx/aic94xx_dump.c | |||
@@ -29,7 +29,7 @@ | |||
29 | * | 29 | * |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include "linux/pci.h" | 32 | #include <linux/pci.h> |
33 | #include "aic94xx.h" | 33 | #include "aic94xx.h" |
34 | #include "aic94xx_reg.h" | 34 | #include "aic94xx_reg.h" |
35 | #include "aic94xx_reg_def.h" | 35 | #include "aic94xx_reg_def.h" |
diff --git a/drivers/scsi/bfa/bfad_drv.h b/drivers/scsi/bfa/bfad_drv.h index bda999ad9f52..5e19a5f820ec 100644 --- a/drivers/scsi/bfa/bfad_drv.h +++ b/drivers/scsi/bfa/bfad_drv.h | |||
@@ -27,7 +27,6 @@ | |||
27 | #define __BFAD_DRV_H__ | 27 | #define __BFAD_DRV_H__ |
28 | 28 | ||
29 | #include <linux/types.h> | 29 | #include <linux/types.h> |
30 | #include <linux/version.h> | ||
31 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
32 | #include <linux/dma-mapping.h> | 31 | #include <linux/dma-mapping.h> |
33 | #include <linux/idr.h> | 32 | #include <linux/idr.h> |
diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c index bd22041e2789..f4aa6375339b 100644 --- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | |||
@@ -14,7 +14,6 @@ | |||
14 | 14 | ||
15 | #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__ | 15 | #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__ |
16 | 16 | ||
17 | #include <linux/version.h> | ||
18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
19 | #include <linux/moduleparam.h> | 18 | #include <linux/moduleparam.h> |
20 | #include <scsi/scsi_host.h> | 19 | #include <scsi/scsi_host.h> |
diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c index ae13c4993aa3..31c79bde6976 100644 --- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | |||
@@ -13,7 +13,6 @@ | |||
13 | 13 | ||
14 | #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__ | 14 | #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__ |
15 | 15 | ||
16 | #include <linux/version.h> | ||
17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
18 | #include <linux/moduleparam.h> | 17 | #include <linux/moduleparam.h> |
19 | #include <scsi/scsi_host.h> | 18 | #include <scsi/scsi_host.h> |
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 5d0e9a24ae94..34c8d82b7423 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c | |||
@@ -18,7 +18,6 @@ | |||
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/version.h> | ||
22 | #include <linux/spinlock.h> | 21 | #include <linux/spinlock.h> |
23 | #include <linux/netdevice.h> | 22 | #include <linux/netdevice.h> |
24 | #include <linux/etherdevice.h> | 23 | #include <linux/etherdevice.h> |
diff --git a/drivers/scsi/isci/phy.c b/drivers/scsi/isci/phy.c index 430fc8ff014a..09e61134037f 100644 --- a/drivers/scsi/isci/phy.c +++ b/drivers/scsi/isci/phy.c | |||
@@ -708,7 +708,7 @@ enum sci_status sci_phy_event_handler(struct isci_phy *iphy, u32 event_code) | |||
708 | __func__, | 708 | __func__, |
709 | event_code); | 709 | event_code); |
710 | 710 | ||
711 | return SCI_FAILURE;; | 711 | return SCI_FAILURE; |
712 | } | 712 | } |
713 | return SCI_SUCCESS; | 713 | return SCI_SUCCESS; |
714 | case SCI_PHY_SUB_AWAIT_SATA_SPEED_EN: | 714 | case SCI_PHY_SUB_AWAIT_SATA_SPEED_EN: |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index 83035bd1c489..6825772cfd6a 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c | |||
@@ -42,7 +42,6 @@ | |||
42 | * USA. | 42 | * USA. |
43 | */ | 43 | */ |
44 | 44 | ||
45 | #include <linux/version.h> | ||
46 | #include <linux/kernel.h> | 45 | #include <linux/kernel.h> |
47 | #include <linux/module.h> | 46 | #include <linux/module.h> |
48 | #include <linux/errno.h> | 47 | #include <linux/errno.h> |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_config.c b/drivers/scsi/mpt2sas/mpt2sas_config.c index 6861244249a3..2b1101076cfe 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_config.c +++ b/drivers/scsi/mpt2sas/mpt2sas_config.c | |||
@@ -41,7 +41,6 @@ | |||
41 | * USA. | 41 | * USA. |
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include <linux/version.h> | ||
45 | #include <linux/module.h> | 44 | #include <linux/module.h> |
46 | #include <linux/kernel.h> | 45 | #include <linux/kernel.h> |
47 | #include <linux/init.h> | 46 | #include <linux/init.h> |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c index 38ed0260959d..246d5fbc6e5a 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c +++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c | |||
@@ -42,7 +42,6 @@ | |||
42 | * USA. | 42 | * USA. |
43 | */ | 43 | */ |
44 | 44 | ||
45 | #include <linux/version.h> | ||
46 | #include <linux/kernel.h> | 45 | #include <linux/kernel.h> |
47 | #include <linux/module.h> | 46 | #include <linux/module.h> |
48 | #include <linux/errno.h> | 47 | #include <linux/errno.h> |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c index 6abd2fcc43e2..5202de3f3d3f 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c | |||
@@ -41,7 +41,6 @@ | |||
41 | * USA. | 41 | * USA. |
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include <linux/version.h> | ||
45 | #include <linux/module.h> | 44 | #include <linux/module.h> |
46 | #include <linux/kernel.h> | 45 | #include <linux/kernel.h> |
47 | #include <linux/init.h> | 46 | #include <linux/init.h> |
diff --git a/drivers/scsi/mvsas/mv_sas.h b/drivers/scsi/mvsas/mv_sas.h index 44d7885a4a1d..44b474513223 100644 --- a/drivers/scsi/mvsas/mv_sas.h +++ b/drivers/scsi/mvsas/mv_sas.h | |||
@@ -43,7 +43,6 @@ | |||
43 | #include <scsi/scsi.h> | 43 | #include <scsi/scsi.h> |
44 | #include <scsi/scsi_tcq.h> | 44 | #include <scsi/scsi_tcq.h> |
45 | #include <scsi/sas_ata.h> | 45 | #include <scsi/sas_ata.h> |
46 | #include <linux/version.h> | ||
47 | #include "mv_defs.h" | 46 | #include "mv_defs.h" |
48 | 47 | ||
49 | #define DRV_NAME "mvsas" | 48 | #define DRV_NAME "mvsas" |
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index d079f9a3c6b3..b86db84d6f32 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <linux/module.h> | 39 | #include <linux/module.h> |
40 | #include <linux/moduleparam.h> | 40 | #include <linux/moduleparam.h> |
41 | #include <linux/hdreg.h> | 41 | #include <linux/hdreg.h> |
42 | #include <linux/version.h> | ||
43 | #include <linux/io.h> | 42 | #include <linux/io.h> |
44 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
45 | #include <asm/irq.h> | 44 | #include <asm/irq.h> |
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h index f920baf3ff24..ca496c7474e3 100644 --- a/drivers/scsi/pmcraid.h +++ b/drivers/scsi/pmcraid.h | |||
@@ -24,7 +24,6 @@ | |||
24 | #ifndef _PMCRAID_H | 24 | #ifndef _PMCRAID_H |
25 | #define _PMCRAID_H | 25 | #define _PMCRAID_H |
26 | 26 | ||
27 | #include <linux/version.h> | ||
28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
29 | #include <linux/completion.h> | 28 | #include <linux/completion.h> |
30 | #include <linux/list.h> | 29 | #include <linux/list.h> |
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 909ed9ed24c0..441a1c5b8974 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
@@ -50,6 +50,7 @@ static int sg_version_num = 30534; /* 2 digits for each component */ | |||
50 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
51 | #include <linux/blktrace_api.h> | 51 | #include <linux/blktrace_api.h> |
52 | #include <linux/mutex.h> | 52 | #include <linux/mutex.h> |
53 | #include <linux/ratelimit.h> | ||
53 | 54 | ||
54 | #include "scsi.h" | 55 | #include "scsi.h" |
55 | #include <scsi/scsi_dbg.h> | 56 | #include <scsi/scsi_dbg.h> |
@@ -626,14 +627,15 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos) | |||
626 | */ | 627 | */ |
627 | if (hp->dxfer_direction == SG_DXFER_TO_FROM_DEV) { | 628 | if (hp->dxfer_direction == SG_DXFER_TO_FROM_DEV) { |
628 | static char cmd[TASK_COMM_LEN]; | 629 | static char cmd[TASK_COMM_LEN]; |
629 | if (strcmp(current->comm, cmd) && printk_ratelimit()) { | 630 | if (strcmp(current->comm, cmd)) { |
630 | printk(KERN_WARNING | 631 | printk_ratelimited(KERN_WARNING |
631 | "sg_write: data in/out %d/%d bytes for SCSI command 0x%x--" | 632 | "sg_write: data in/out %d/%d bytes " |
632 | "guessing data in;\n " | 633 | "for SCSI command 0x%x-- guessing " |
633 | "program %s not setting count and/or reply_len properly\n", | 634 | "data in;\n program %s not setting " |
634 | old_hdr.reply_len - (int)SZ_SG_HEADER, | 635 | "count and/or reply_len properly\n", |
635 | input_size, (unsigned int) cmnd[0], | 636 | old_hdr.reply_len - (int)SZ_SG_HEADER, |
636 | current->comm); | 637 | input_size, (unsigned int) cmnd[0], |
638 | current->comm); | ||
637 | strcpy(cmd, current->comm); | 639 | strcpy(cmd, current->comm); |
638 | } | 640 | } |
639 | } | 641 | } |
diff --git a/drivers/staging/iio/addac/adt7316-i2c.c b/drivers/staging/iio/addac/adt7316-i2c.c index 52d1ea349635..1c86cf11ab94 100644 --- a/drivers/staging/iio/addac/adt7316-i2c.c +++ b/drivers/staging/iio/addac/adt7316-i2c.c | |||
@@ -109,7 +109,7 @@ static int __devinit adt7316_i2c_probe(struct i2c_client *client, | |||
109 | 109 | ||
110 | static int __devexit adt7316_i2c_remove(struct i2c_client *client) | 110 | static int __devexit adt7316_i2c_remove(struct i2c_client *client) |
111 | { | 111 | { |
112 | return adt7316_remove(&client->dev);; | 112 | return adt7316_remove(&client->dev); |
113 | } | 113 | } |
114 | 114 | ||
115 | static const struct i2c_device_id adt7316_i2c_id[] = { | 115 | static const struct i2c_device_id adt7316_i2c_id[] = { |
diff --git a/drivers/staging/iio/dds/ad9832.c b/drivers/staging/iio/dds/ad9832.c index e3e61a469bb8..6f0efe6580e7 100644 --- a/drivers/staging/iio/dds/ad9832.c +++ b/drivers/staging/iio/dds/ad9832.c | |||
@@ -52,7 +52,7 @@ static int ad9832_write_frequency(struct ad9832_state *st, | |||
52 | ((addr - 3) << ADD_SHIFT) | | 52 | ((addr - 3) << ADD_SHIFT) | |
53 | ((regval >> 0) & 0xFF)); | 53 | ((regval >> 0) & 0xFF)); |
54 | 54 | ||
55 | return spi_sync(st->spi, &st->freq_msg);; | 55 | return spi_sync(st->spi, &st->freq_msg); |
56 | } | 56 | } |
57 | 57 | ||
58 | static int ad9832_write_phase(struct ad9832_state *st, | 58 | static int ad9832_write_phase(struct ad9832_state *st, |
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c index 98c98a3a0250..007c6c298b8b 100644 --- a/drivers/target/target_core_alua.c +++ b/drivers/target/target_core_alua.c | |||
@@ -24,7 +24,6 @@ | |||
24 | * | 24 | * |
25 | ******************************************************************************/ | 25 | ******************************************************************************/ |
26 | 26 | ||
27 | #include <linux/version.h> | ||
28 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
29 | #include <linux/spinlock.h> | 28 | #include <linux/spinlock.h> |
30 | #include <linux/configfs.h> | 29 | #include <linux/configfs.h> |
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c index b2575d8568cc..f37e2b9cbbd7 100644 --- a/drivers/target/target_core_configfs.c +++ b/drivers/target/target_core_configfs.c | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
25 | #include <linux/moduleparam.h> | 25 | #include <linux/moduleparam.h> |
26 | #include <linux/version.h> | ||
27 | #include <generated/utsrelease.h> | 26 | #include <generated/utsrelease.h> |
28 | #include <linux/utsname.h> | 27 | #include <linux/utsname.h> |
29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c index 55bbe0847a6d..09b6f8729f91 100644 --- a/drivers/target/target_core_fabric_configfs.c +++ b/drivers/target/target_core_fabric_configfs.c | |||
@@ -22,7 +22,6 @@ | |||
22 | 22 | ||
23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
24 | #include <linux/moduleparam.h> | 24 | #include <linux/moduleparam.h> |
25 | #include <linux/version.h> | ||
26 | #include <generated/utsrelease.h> | 25 | #include <generated/utsrelease.h> |
27 | #include <linux/utsname.h> | 26 | #include <linux/utsname.h> |
28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c index bc1b33639b8d..99c9db003394 100644 --- a/drivers/target/target_core_file.c +++ b/drivers/target/target_core_file.c | |||
@@ -26,7 +26,6 @@ | |||
26 | * | 26 | * |
27 | ******************************************************************************/ | 27 | ******************************************************************************/ |
28 | 28 | ||
29 | #include <linux/version.h> | ||
30 | #include <linux/string.h> | 29 | #include <linux/string.h> |
31 | #include <linux/parser.h> | 30 | #include <linux/parser.h> |
32 | #include <linux/timer.h> | 31 | #include <linux/timer.h> |
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c index 7e1234105442..7f0cc53b4581 100644 --- a/drivers/target/target_core_iblock.c +++ b/drivers/target/target_core_iblock.c | |||
@@ -27,7 +27,6 @@ | |||
27 | * | 27 | * |
28 | ******************************************************************************/ | 28 | ******************************************************************************/ |
29 | 29 | ||
30 | #include <linux/version.h> | ||
31 | #include <linux/string.h> | 30 | #include <linux/string.h> |
32 | #include <linux/parser.h> | 31 | #include <linux/parser.h> |
33 | #include <linux/timer.h> | 32 | #include <linux/timer.h> |
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c index 7fd3a161f7cc..0c4f783f924c 100644 --- a/drivers/target/target_core_pr.c +++ b/drivers/target/target_core_pr.c | |||
@@ -25,7 +25,6 @@ | |||
25 | * | 25 | * |
26 | ******************************************************************************/ | 26 | ******************************************************************************/ |
27 | 27 | ||
28 | #include <linux/version.h> | ||
29 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
30 | #include <linux/spinlock.h> | 29 | #include <linux/spinlock.h> |
31 | #include <linux/list.h> | 30 | #include <linux/list.h> |
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index 2b7b0da9146d..77d725886410 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c | |||
@@ -26,7 +26,6 @@ | |||
26 | * | 26 | * |
27 | ******************************************************************************/ | 27 | ******************************************************************************/ |
28 | 28 | ||
29 | #include <linux/version.h> | ||
30 | #include <linux/string.h> | 29 | #include <linux/string.h> |
31 | #include <linux/parser.h> | 30 | #include <linux/parser.h> |
32 | #include <linux/timer.h> | 31 | #include <linux/timer.h> |
diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c index e567e129c697..1ab69f32e664 100644 --- a/drivers/target/target_core_rd.c +++ b/drivers/target/target_core_rd.c | |||
@@ -27,7 +27,6 @@ | |||
27 | * | 27 | * |
28 | ******************************************************************************/ | 28 | ******************************************************************************/ |
29 | 29 | ||
30 | #include <linux/version.h> | ||
31 | #include <linux/string.h> | 30 | #include <linux/string.h> |
32 | #include <linux/parser.h> | 31 | #include <linux/parser.h> |
33 | #include <linux/timer.h> | 32 | #include <linux/timer.h> |
diff --git a/drivers/target/target_core_stat.c b/drivers/target/target_core_stat.c index a8d6e1dee938..874152aed94a 100644 --- a/drivers/target/target_core_stat.c +++ b/drivers/target/target_core_stat.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
33 | #include <linux/timer.h> | 33 | #include <linux/timer.h> |
34 | #include <linux/string.h> | 34 | #include <linux/string.h> |
35 | #include <linux/version.h> | ||
36 | #include <generated/utsrelease.h> | 35 | #include <generated/utsrelease.h> |
37 | #include <linux/utsname.h> | 36 | #include <linux/utsname.h> |
38 | #include <linux/proc_fs.h> | 37 | #include <linux/proc_fs.h> |
diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c index 27d4925e51c3..662473c54043 100644 --- a/drivers/target/target_core_tmr.c +++ b/drivers/target/target_core_tmr.c | |||
@@ -24,7 +24,6 @@ | |||
24 | * | 24 | * |
25 | ******************************************************************************/ | 25 | ******************************************************************************/ |
26 | 26 | ||
27 | #include <linux/version.h> | ||
28 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
29 | #include <linux/spinlock.h> | 28 | #include <linux/spinlock.h> |
30 | #include <linux/list.h> | 29 | #include <linux/list.h> |
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 8d0c58ea6316..0304e765158e 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c | |||
@@ -26,7 +26,6 @@ | |||
26 | * | 26 | * |
27 | ******************************************************************************/ | 27 | ******************************************************************************/ |
28 | 28 | ||
29 | #include <linux/version.h> | ||
30 | #include <linux/net.h> | 29 | #include <linux/net.h> |
31 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
32 | #include <linux/string.h> | 31 | #include <linux/string.h> |
diff --git a/drivers/target/target_core_ua.c b/drivers/target/target_core_ua.c index 31e3c652527e..50a480db7a66 100644 --- a/drivers/target/target_core_ua.c +++ b/drivers/target/target_core_ua.c | |||
@@ -24,7 +24,6 @@ | |||
24 | * | 24 | * |
25 | ******************************************************************************/ | 25 | ******************************************************************************/ |
26 | 26 | ||
27 | #include <linux/version.h> | ||
28 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
29 | #include <linux/spinlock.h> | 28 | #include <linux/spinlock.h> |
30 | #include <scsi/scsi.h> | 29 | #include <scsi/scsi.h> |
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c index 5654dc22f7ae..3633f6968f85 100644 --- a/drivers/target/tcm_fc/tfc_cmd.c +++ b/drivers/target/tcm_fc/tfc_cmd.c | |||
@@ -19,7 +19,6 @@ | |||
19 | 19 | ||
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/moduleparam.h> | 21 | #include <linux/moduleparam.h> |
22 | #include <linux/version.h> | ||
23 | #include <generated/utsrelease.h> | 22 | #include <generated/utsrelease.h> |
24 | #include <linux/utsname.h> | 23 | #include <linux/utsname.h> |
25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c index b15879d43e22..ea30e3fe4024 100644 --- a/drivers/target/tcm_fc/tfc_conf.c +++ b/drivers/target/tcm_fc/tfc_conf.c | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
25 | #include <linux/moduleparam.h> | 25 | #include <linux/moduleparam.h> |
26 | #include <linux/version.h> | ||
27 | #include <generated/utsrelease.h> | 26 | #include <generated/utsrelease.h> |
28 | #include <linux/utsname.h> | 27 | #include <linux/utsname.h> |
29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c index c37f4cd96452..ea0e7afe7492 100644 --- a/drivers/target/tcm_fc/tfc_io.c +++ b/drivers/target/tcm_fc/tfc_io.c | |||
@@ -28,7 +28,6 @@ | |||
28 | 28 | ||
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/moduleparam.h> | 30 | #include <linux/moduleparam.h> |
31 | #include <linux/version.h> | ||
32 | #include <generated/utsrelease.h> | 31 | #include <generated/utsrelease.h> |
33 | #include <linux/utsname.h> | 32 | #include <linux/utsname.h> |
34 | #include <linux/init.h> | 33 | #include <linux/init.h> |
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c index dbb5eaeee399..326921385aff 100644 --- a/drivers/target/tcm_fc/tfc_sess.c +++ b/drivers/target/tcm_fc/tfc_sess.c | |||
@@ -19,7 +19,6 @@ | |||
19 | 19 | ||
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/moduleparam.h> | 21 | #include <linux/moduleparam.h> |
22 | #include <linux/version.h> | ||
23 | #include <generated/utsrelease.h> | 22 | #include <generated/utsrelease.h> |
24 | #include <linux/utsname.h> | 23 | #include <linux/utsname.h> |
25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c index 23bc743f2a22..492c14d63e99 100644 --- a/drivers/tty/serial/mrst_max3110.c +++ b/drivers/tty/serial/mrst_max3110.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * 1 word. If SPI master controller doesn't support sclk frequency change, | 23 | * 1 word. If SPI master controller doesn't support sclk frequency change, |
24 | * then the char need be sent out one by one with some delay | 24 | * then the char need be sent out one by one with some delay |
25 | * | 25 | * |
26 | * 2. Currently only RX available interrrupt is used, no need for waiting TXE | 26 | * 2. Currently only RX available interrupt is used, no need for waiting TXE |
27 | * interrupt for a low speed UART device | 27 | * interrupt for a low speed UART device |
28 | */ | 28 | */ |
29 | 29 | ||
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c index a06e2c27b435..ff4d40d77c30 100644 --- a/drivers/usb/gadget/langwell_udc.c +++ b/drivers/usb/gadget/langwell_udc.c | |||
@@ -2969,7 +2969,7 @@ static irqreturn_t langwell_irq(int irq, void *_dev) | |||
2969 | handle_port_change(dev); | 2969 | handle_port_change(dev); |
2970 | } | 2970 | } |
2971 | 2971 | ||
2972 | /* suspend interrrupt */ | 2972 | /* suspend interrupt */ |
2973 | if (irq_sts & STS_SLI) { | 2973 | if (irq_sts & STS_SLI) { |
2974 | dev_vdbg(&dev->pdev->dev, "suspend interrupt\n"); | 2974 | dev_vdbg(&dev->pdev->dev, "suspend interrupt\n"); |
2975 | handle_bus_suspend(dev); | 2975 | handle_bus_suspend(dev); |
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c index ce1ac2bcb314..0b3b8d0462db 100644 --- a/drivers/usb/gadget/mv_udc_core.c +++ b/drivers/usb/gadget/mv_udc_core.c | |||
@@ -335,7 +335,7 @@ static int queue_dtd(struct mv_ep *ep, struct mv_req *req) | |||
335 | } else { | 335 | } else { |
336 | /* Write dQH next pointer and terminate bit to 0 */ | 336 | /* Write dQH next pointer and terminate bit to 0 */ |
337 | dqh->next_dtd_ptr = req->head->td_dma | 337 | dqh->next_dtd_ptr = req->head->td_dma |
338 | & EP_QUEUE_HEAD_NEXT_POINTER_MASK;; | 338 | & EP_QUEUE_HEAD_NEXT_POINTER_MASK; |
339 | dqh->size_ioc_int_sts = 0; | 339 | dqh->size_ioc_int_sts = 0; |
340 | 340 | ||
341 | /* Ensure that updates to the QH will occur before priming. */ | 341 | /* Ensure that updates to the QH will occur before priming. */ |
@@ -376,7 +376,7 @@ static int queue_dtd(struct mv_ep *ep, struct mv_req *req) | |||
376 | } | 376 | } |
377 | } | 377 | } |
378 | done: | 378 | done: |
379 | return retval;; | 379 | return retval; |
380 | } | 380 | } |
381 | 381 | ||
382 | static struct mv_dtd *build_dtd(struct mv_req *req, unsigned *length, | 382 | static struct mv_dtd *build_dtd(struct mv_req *req, unsigned *length, |
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index 3dd40b4e675c..a218a4de5dc9 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c | |||
@@ -2481,7 +2481,7 @@ static void handle_stat1_irqs (struct net2280 *dev, u32 stat) | |||
2481 | mask = (1 << HIGH_SPEED) | (1 << FULL_SPEED); | 2481 | mask = (1 << HIGH_SPEED) | (1 << FULL_SPEED); |
2482 | 2482 | ||
2483 | /* VBUS disconnect is indicated by VBUS_PIN and VBUS_INTERRUPT set. | 2483 | /* VBUS disconnect is indicated by VBUS_PIN and VBUS_INTERRUPT set. |
2484 | * Root Port Reset is indicated by ROOT_PORT_RESET_INTERRRUPT set and | 2484 | * Root Port Reset is indicated by ROOT_PORT_RESET_INTERRUPT set and |
2485 | * both HIGH_SPEED and FULL_SPEED clear (as ROOT_PORT_RESET_INTERRUPT | 2485 | * both HIGH_SPEED and FULL_SPEED clear (as ROOT_PORT_RESET_INTERRUPT |
2486 | * only indicates a change in the reset state). | 2486 | * only indicates a change in the reset state). |
2487 | */ | 2487 | */ |
diff --git a/drivers/usb/gadget/uvc.h b/drivers/usb/gadget/uvc.h index 5b7919460fd2..81971fbc7ea5 100644 --- a/drivers/usb/gadget/uvc.h +++ b/drivers/usb/gadget/uvc.h | |||
@@ -56,6 +56,7 @@ struct uvc_event | |||
56 | #include <linux/usb.h> /* For usb_endpoint_* */ | 56 | #include <linux/usb.h> /* For usb_endpoint_* */ |
57 | #include <linux/usb/gadget.h> | 57 | #include <linux/usb/gadget.h> |
58 | #include <linux/videodev2.h> | 58 | #include <linux/videodev2.h> |
59 | #include <linux/version.h> | ||
59 | #include <media/v4l2-fh.h> | 60 | #include <media/v4l2-fh.h> |
60 | 61 | ||
61 | #include "uvc_queue.h" | 62 | #include "uvc_queue.h" |
diff --git a/drivers/usb/gadget/uvc_v4l2.c b/drivers/usb/gadget/uvc_v4l2.c index 52f8f9e513af..cfb58384394d 100644 --- a/drivers/usb/gadget/uvc_v4l2.c +++ b/drivers/usb/gadget/uvc_v4l2.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
17 | #include <linux/list.h> | 17 | #include <linux/list.h> |
18 | #include <linux/mutex.h> | 18 | #include <linux/mutex.h> |
19 | #include <linux/version.h> | ||
20 | #include <linux/videodev2.h> | 19 | #include <linux/videodev2.h> |
21 | #include <linux/vmalloc.h> | 20 | #include <linux/vmalloc.h> |
22 | #include <linux/wait.h> | 21 | #include <linux/wait.h> |
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index e81820370d6f..fe8d14cac436 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c | |||
@@ -704,7 +704,7 @@ static void rxstate(struct musb *musb, struct musb_request *req) | |||
704 | * most these gadgets, end of is signified either by a short packet, | 704 | * most these gadgets, end of is signified either by a short packet, |
705 | * or filling the last byte of the buffer. (Sending extra data in | 705 | * or filling the last byte of the buffer. (Sending extra data in |
706 | * that last pckate should trigger an overflow fault.) But in mode 1, | 706 | * that last pckate should trigger an overflow fault.) But in mode 1, |
707 | * we don't get DMA completion interrrupt for short packets. | 707 | * we don't get DMA completion interrupt for short packets. |
708 | * | 708 | * |
709 | * Theoretically, we could enable DMAReq irq (MUSB_RXCSR_DMAMODE = 1), | 709 | * Theoretically, we could enable DMAReq irq (MUSB_RXCSR_DMAMODE = 1), |
710 | * to get endpoint interrupt on every DMA req, but that didn't seem | 710 | * to get endpoint interrupt on every DMA req, but that didn't seem |
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index 40abedbc5943..3524a105d042 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
@@ -2006,7 +2006,6 @@ static int mos7720_ioctl(struct tty_struct *tty, | |||
2006 | dbg("%s (%d) TIOCSERGETLSR", __func__, port->number); | 2006 | dbg("%s (%d) TIOCSERGETLSR", __func__, port->number); |
2007 | return get_lsr_info(tty, mos7720_port, | 2007 | return get_lsr_info(tty, mos7720_port, |
2008 | (unsigned int __user *)arg); | 2008 | (unsigned int __user *)arg); |
2009 | return 0; | ||
2010 | 2009 | ||
2011 | /* FIXME: These should be using the mode methods */ | 2010 | /* FIXME: These should be using the mode methods */ |
2012 | case TIOCMBIS: | 2011 | case TIOCMBIS: |
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 7b50aa122752..c72abd524983 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c | |||
@@ -2263,7 +2263,6 @@ static int mos7840_ioctl(struct tty_struct *tty, | |||
2263 | case TIOCSERGETLSR: | 2263 | case TIOCSERGETLSR: |
2264 | dbg("%s (%d) TIOCSERGETLSR", __func__, port->number); | 2264 | dbg("%s (%d) TIOCSERGETLSR", __func__, port->number); |
2265 | return mos7840_get_lsr_info(tty, argp); | 2265 | return mos7840_get_lsr_info(tty, argp); |
2266 | return 0; | ||
2267 | 2266 | ||
2268 | case TIOCGSERIAL: | 2267 | case TIOCGSERIAL: |
2269 | dbg("%s (%d) TIOCGSERIAL", __func__, port->number); | 2268 | dbg("%s (%d) TIOCGSERIAL", __func__, port->number); |
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c index 34adc4b42ceb..6fd13068481b 100644 --- a/drivers/usb/storage/realtek_cr.c +++ b/drivers/usb/storage/realtek_cr.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/kthread.h> | 25 | #include <linux/kthread.h> |
26 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
28 | #include <linux/version.h> | ||
29 | 28 | ||
30 | #include <scsi/scsi.h> | 29 | #include <scsi/scsi.h> |
31 | #include <scsi/scsi_cmnd.h> | 30 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/uwb/uwb-internal.h b/drivers/uwb/uwb-internal.h index 157485c862c0..a7494bf10081 100644 --- a/drivers/uwb/uwb-internal.h +++ b/drivers/uwb/uwb-internal.h | |||
@@ -28,7 +28,6 @@ | |||
28 | #ifndef __UWB_INTERNAL_H__ | 28 | #ifndef __UWB_INTERNAL_H__ |
29 | #define __UWB_INTERNAL_H__ | 29 | #define __UWB_INTERNAL_H__ |
30 | 30 | ||
31 | #include <linux/version.h> | ||
32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
33 | #include <linux/device.h> | 32 | #include <linux/device.h> |
34 | #include <linux/uwb.h> | 33 | #include <linux/uwb.h> |
diff --git a/fs/coda/coda_linux.h b/fs/coda/coda_linux.h index 44e17e9c21ae..cc0ea9fe5ecf 100644 --- a/fs/coda/coda_linux.h +++ b/fs/coda/coda_linux.h | |||
@@ -59,12 +59,11 @@ void coda_sysctl_clean(void); | |||
59 | 59 | ||
60 | #define CODA_ALLOC(ptr, cast, size) do { \ | 60 | #define CODA_ALLOC(ptr, cast, size) do { \ |
61 | if (size < PAGE_SIZE) \ | 61 | if (size < PAGE_SIZE) \ |
62 | ptr = kmalloc((unsigned long) size, GFP_KERNEL); \ | 62 | ptr = kzalloc((unsigned long) size, GFP_KERNEL); \ |
63 | else \ | 63 | else \ |
64 | ptr = (cast)vmalloc((unsigned long) size); \ | 64 | ptr = (cast)vzalloc((unsigned long) size); \ |
65 | if (!ptr) \ | 65 | if (!ptr) \ |
66 | printk("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__); \ | 66 | printk("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__); \ |
67 | else memset( ptr, 0, size ); \ | ||
68 | } while (0) | 67 | } while (0) |
69 | 68 | ||
70 | 69 | ||
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index fe047d966dc5..9026fc91fe3b 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c | |||
@@ -700,7 +700,7 @@ static const struct file_operations eventpoll_fops = { | |||
700 | .llseek = noop_llseek, | 700 | .llseek = noop_llseek, |
701 | }; | 701 | }; |
702 | 702 | ||
703 | /* Fast test to see if the file is an evenpoll file */ | 703 | /* Fast test to see if the file is an eventpoll file */ |
704 | static inline int is_file_epoll(struct file *f) | 704 | static inline int is_file_epoll(struct file *f) |
705 | { | 705 | { |
706 | return f->f_op == &eventpoll_fops; | 706 | return f->f_op == &eventpoll_fops; |
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index a159ba5a35e7..eb711060a6f2 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
@@ -291,14 +291,13 @@ int reiserfs_allocate_list_bitmaps(struct super_block *sb, | |||
291 | for (i = 0; i < JOURNAL_NUM_BITMAPS; i++) { | 291 | for (i = 0; i < JOURNAL_NUM_BITMAPS; i++) { |
292 | jb = jb_array + i; | 292 | jb = jb_array + i; |
293 | jb->journal_list = NULL; | 293 | jb->journal_list = NULL; |
294 | jb->bitmaps = vmalloc(mem); | 294 | jb->bitmaps = vzalloc(mem); |
295 | if (!jb->bitmaps) { | 295 | if (!jb->bitmaps) { |
296 | reiserfs_warning(sb, "clm-2000", "unable to " | 296 | reiserfs_warning(sb, "clm-2000", "unable to " |
297 | "allocate bitmaps for journal lists"); | 297 | "allocate bitmaps for journal lists"); |
298 | failed = 1; | 298 | failed = 1; |
299 | break; | 299 | break; |
300 | } | 300 | } |
301 | memset(jb->bitmaps, 0, mem); | ||
302 | } | 301 | } |
303 | if (failed) { | 302 | if (failed) { |
304 | free_list_bitmaps(sb, jb_array); | 303 | free_list_bitmaps(sb, jb_array); |
@@ -353,11 +352,10 @@ static struct reiserfs_journal_cnode *allocate_cnodes(int num_cnodes) | |||
353 | if (num_cnodes <= 0) { | 352 | if (num_cnodes <= 0) { |
354 | return NULL; | 353 | return NULL; |
355 | } | 354 | } |
356 | head = vmalloc(num_cnodes * sizeof(struct reiserfs_journal_cnode)); | 355 | head = vzalloc(num_cnodes * sizeof(struct reiserfs_journal_cnode)); |
357 | if (!head) { | 356 | if (!head) { |
358 | return NULL; | 357 | return NULL; |
359 | } | 358 | } |
360 | memset(head, 0, num_cnodes * sizeof(struct reiserfs_journal_cnode)); | ||
361 | head[0].prev = NULL; | 359 | head[0].prev = NULL; |
362 | head[0].next = head + 1; | 360 | head[0].next = head + 1; |
363 | for (i = 1; i < num_cnodes; i++) { | 361 | for (i = 1; i < num_cnodes; i++) { |
@@ -2685,14 +2683,13 @@ int journal_init(struct super_block *sb, const char *j_dev_name, | |||
2685 | * dependency inversion warnings. | 2683 | * dependency inversion warnings. |
2686 | */ | 2684 | */ |
2687 | reiserfs_write_unlock(sb); | 2685 | reiserfs_write_unlock(sb); |
2688 | journal = SB_JOURNAL(sb) = vmalloc(sizeof(struct reiserfs_journal)); | 2686 | journal = SB_JOURNAL(sb) = vzalloc(sizeof(struct reiserfs_journal)); |
2689 | if (!journal) { | 2687 | if (!journal) { |
2690 | reiserfs_warning(sb, "journal-1256", | 2688 | reiserfs_warning(sb, "journal-1256", |
2691 | "unable to get memory for journal structure"); | 2689 | "unable to get memory for journal structure"); |
2692 | reiserfs_write_lock(sb); | 2690 | reiserfs_write_lock(sb); |
2693 | return 1; | 2691 | return 1; |
2694 | } | 2692 | } |
2695 | memset(journal, 0, sizeof(struct reiserfs_journal)); | ||
2696 | INIT_LIST_HEAD(&journal->j_bitmap_nodes); | 2693 | INIT_LIST_HEAD(&journal->j_bitmap_nodes); |
2697 | INIT_LIST_HEAD(&journal->j_prealloc_list); | 2694 | INIT_LIST_HEAD(&journal->j_prealloc_list); |
2698 | INIT_LIST_HEAD(&journal->j_working_list); | 2695 | INIT_LIST_HEAD(&journal->j_working_list); |
diff --git a/fs/reiserfs/resize.c b/fs/reiserfs/resize.c index b6b9b1fe33b0..7483279b482d 100644 --- a/fs/reiserfs/resize.c +++ b/fs/reiserfs/resize.c | |||
@@ -111,15 +111,13 @@ int reiserfs_resize(struct super_block *s, unsigned long block_count_new) | |||
111 | /* allocate additional bitmap blocks, reallocate array of bitmap | 111 | /* allocate additional bitmap blocks, reallocate array of bitmap |
112 | * block pointers */ | 112 | * block pointers */ |
113 | bitmap = | 113 | bitmap = |
114 | vmalloc(sizeof(struct reiserfs_bitmap_info) * bmap_nr_new); | 114 | vzalloc(sizeof(struct reiserfs_bitmap_info) * bmap_nr_new); |
115 | if (!bitmap) { | 115 | if (!bitmap) { |
116 | /* Journal bitmaps are still supersized, but the memory isn't | 116 | /* Journal bitmaps are still supersized, but the memory isn't |
117 | * leaked, so I guess it's ok */ | 117 | * leaked, so I guess it's ok */ |
118 | printk("reiserfs_resize: unable to allocate memory.\n"); | 118 | printk("reiserfs_resize: unable to allocate memory.\n"); |
119 | return -ENOMEM; | 119 | return -ENOMEM; |
120 | } | 120 | } |
121 | memset(bitmap, 0, | ||
122 | sizeof(struct reiserfs_bitmap_info) * bmap_nr_new); | ||
123 | for (i = 0; i < bmap_nr; i++) | 121 | for (i = 0; i < bmap_nr; i++) |
124 | bitmap[i] = old_bitmap[i]; | 122 | bitmap[i] = old_bitmap[i]; |
125 | 123 | ||
diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h index f7c8f7a9ea6d..292eff198030 100644 --- a/fs/xfs/kmem.h +++ b/fs/xfs/kmem.h | |||
@@ -61,12 +61,7 @@ extern void kmem_free(const void *); | |||
61 | 61 | ||
62 | static inline void *kmem_zalloc_large(size_t size) | 62 | static inline void *kmem_zalloc_large(size_t size) |
63 | { | 63 | { |
64 | void *ptr; | 64 | return vzalloc(size); |
65 | |||
66 | ptr = vmalloc(size); | ||
67 | if (ptr) | ||
68 | memset(ptr, 0, size); | ||
69 | return ptr; | ||
70 | } | 65 | } |
71 | static inline void kmem_free_large(void *ptr) | 66 | static inline void kmem_free_large(void *ptr) |
72 | { | 67 | { |
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index d7adf151d335..ca768ae729b4 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h | |||
@@ -6,7 +6,6 @@ | |||
6 | #include <linux/net.h> | 6 | #include <linux/net.h> |
7 | #include <linux/radix-tree.h> | 7 | #include <linux/radix-tree.h> |
8 | #include <linux/uio.h> | 8 | #include <linux/uio.h> |
9 | #include <linux/version.h> | ||
10 | #include <linux/workqueue.h> | 9 | #include <linux/workqueue.h> |
11 | 10 | ||
12 | #include "types.h" | 11 | #include "types.h" |
diff --git a/include/linux/drbd_tag_magic.h b/include/linux/drbd_tag_magic.h index 069543190516..81f52f2c5724 100644 --- a/include/linux/drbd_tag_magic.h +++ b/include/linux/drbd_tag_magic.h | |||
@@ -28,7 +28,7 @@ enum packet_types { | |||
28 | #define NL_STRING(pn, pr, member, len) \ | 28 | #define NL_STRING(pn, pr, member, len) \ |
29 | unsigned char member[len]; int member ## _len; \ | 29 | unsigned char member[len]; int member ## _len; \ |
30 | int tag_and_len ## member; | 30 | int tag_and_len ## member; |
31 | #include "linux/drbd_nl.h" | 31 | #include <linux/drbd_nl.h> |
32 | 32 | ||
33 | /* declare tag-list-sizes */ | 33 | /* declare tag-list-sizes */ |
34 | static const int tag_list_sizes[] = { | 34 | static const int tag_list_sizes[] = { |
diff --git a/include/media/pwc-ioctl.h b/include/media/pwc-ioctl.h index 0f19779c4634..1ed1e616fe33 100644 --- a/include/media/pwc-ioctl.h +++ b/include/media/pwc-ioctl.h | |||
@@ -53,7 +53,6 @@ | |||
53 | */ | 53 | */ |
54 | 54 | ||
55 | #include <linux/types.h> | 55 | #include <linux/types.h> |
56 | #include <linux/version.h> | ||
57 | 56 | ||
58 | /* Enumeration of image sizes */ | 57 | /* Enumeration of image sizes */ |
59 | #define PSZ_SQCIF 0x00 | 58 | #define PSZ_SQCIF 0x00 |
diff --git a/kernel/async.c b/kernel/async.c index d5fe7af0de2e..4c2843c0043e 100644 --- a/kernel/async.c +++ b/kernel/async.c | |||
@@ -120,7 +120,7 @@ static void async_run_entry_fn(struct work_struct *work) | |||
120 | struct async_entry *entry = | 120 | struct async_entry *entry = |
121 | container_of(work, struct async_entry, work); | 121 | container_of(work, struct async_entry, work); |
122 | unsigned long flags; | 122 | unsigned long flags; |
123 | ktime_t calltime, delta, rettime; | 123 | ktime_t uninitialized_var(calltime), delta, rettime; |
124 | 124 | ||
125 | /* 1) move self to the running queue */ | 125 | /* 1) move self to the running queue */ |
126 | spin_lock_irqsave(&async_lock, flags); | 126 | spin_lock_irqsave(&async_lock, flags); |
@@ -269,7 +269,7 @@ EXPORT_SYMBOL_GPL(async_synchronize_full_domain); | |||
269 | void async_synchronize_cookie_domain(async_cookie_t cookie, | 269 | void async_synchronize_cookie_domain(async_cookie_t cookie, |
270 | struct list_head *running) | 270 | struct list_head *running) |
271 | { | 271 | { |
272 | ktime_t starttime, delta, endtime; | 272 | ktime_t uninitialized_var(starttime), delta, endtime; |
273 | 273 | ||
274 | if (initcall_debug && system_state == SYSTEM_BOOTING) { | 274 | if (initcall_debug && system_state == SYSTEM_BOOTING) { |
275 | printk(KERN_DEBUG "async_waiting @ %i\n", task_pid_nr(current)); | 275 | printk(KERN_DEBUG "async_waiting @ %i\n", task_pid_nr(current)); |
diff --git a/kernel/futex.c b/kernel/futex.c index 11cbe052b2e8..1511dff0cfd6 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -854,7 +854,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this) | |||
854 | { | 854 | { |
855 | struct task_struct *new_owner; | 855 | struct task_struct *new_owner; |
856 | struct futex_pi_state *pi_state = this->pi_state; | 856 | struct futex_pi_state *pi_state = this->pi_state; |
857 | u32 curval, newval; | 857 | u32 uninitialized_var(curval), newval; |
858 | 858 | ||
859 | if (!pi_state) | 859 | if (!pi_state) |
860 | return -EINVAL; | 860 | return -EINVAL; |
@@ -916,7 +916,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this) | |||
916 | 916 | ||
917 | static int unlock_futex_pi(u32 __user *uaddr, u32 uval) | 917 | static int unlock_futex_pi(u32 __user *uaddr, u32 uval) |
918 | { | 918 | { |
919 | u32 oldval; | 919 | u32 uninitialized_var(oldval); |
920 | 920 | ||
921 | /* | 921 | /* |
922 | * There is no waiter, so we unlock the futex. The owner died | 922 | * There is no waiter, so we unlock the futex. The owner died |
@@ -1576,7 +1576,7 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q, | |||
1576 | u32 newtid = task_pid_vnr(newowner) | FUTEX_WAITERS; | 1576 | u32 newtid = task_pid_vnr(newowner) | FUTEX_WAITERS; |
1577 | struct futex_pi_state *pi_state = q->pi_state; | 1577 | struct futex_pi_state *pi_state = q->pi_state; |
1578 | struct task_struct *oldowner = pi_state->owner; | 1578 | struct task_struct *oldowner = pi_state->owner; |
1579 | u32 uval, curval, newval; | 1579 | u32 uval, uninitialized_var(curval), newval; |
1580 | int ret; | 1580 | int ret; |
1581 | 1581 | ||
1582 | /* Owner died? */ | 1582 | /* Owner died? */ |
@@ -1793,7 +1793,7 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q, | |||
1793 | * | 1793 | * |
1794 | * Returns: | 1794 | * Returns: |
1795 | * 0 - uaddr contains val and hb has been locked | 1795 | * 0 - uaddr contains val and hb has been locked |
1796 | * <1 - -EFAULT or -EWOULDBLOCK (uaddr does not contain val) and hb is unlcoked | 1796 | * <1 - -EFAULT or -EWOULDBLOCK (uaddr does not contain val) and hb is unlocked |
1797 | */ | 1797 | */ |
1798 | static int futex_wait_setup(u32 __user *uaddr, u32 val, unsigned int flags, | 1798 | static int futex_wait_setup(u32 __user *uaddr, u32 val, unsigned int flags, |
1799 | struct futex_q *q, struct futex_hash_bucket **hb) | 1799 | struct futex_q *q, struct futex_hash_bucket **hb) |
@@ -2481,7 +2481,7 @@ err_unlock: | |||
2481 | */ | 2481 | */ |
2482 | int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi) | 2482 | int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi) |
2483 | { | 2483 | { |
2484 | u32 uval, nval, mval; | 2484 | u32 uval, uninitialized_var(nval), mval; |
2485 | 2485 | ||
2486 | retry: | 2486 | retry: |
2487 | if (get_user(uval, uaddr)) | 2487 | if (get_user(uval, uaddr)) |
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index c0cb9c4bc46d..d0324986a3b0 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -117,31 +117,31 @@ config DEBUG_SECTION_MISMATCH | |||
117 | help | 117 | help |
118 | The section mismatch analysis checks if there are illegal | 118 | The section mismatch analysis checks if there are illegal |
119 | references from one section to another section. | 119 | references from one section to another section. |
120 | Linux will during link or during runtime drop some sections | 120 | During linktime or runtime, some sections are dropped; |
121 | and any use of code/data previously in these sections will | 121 | any use of code/data previously in these sections would |
122 | most likely result in an oops. | 122 | most likely result in an oops. |
123 | In the code functions and variables are annotated with | 123 | In the code, functions and variables are annotated with |
124 | __init, __devinit etc. (see full list in include/linux/init.h) | 124 | __init, __devinit, etc. (see the full list in include/linux/init.h), |
125 | which results in the code/data being placed in specific sections. | 125 | which results in the code/data being placed in specific sections. |
126 | The section mismatch analysis is always done after a full | 126 | The section mismatch analysis is always performed after a full |
127 | kernel build but enabling this option will in addition | 127 | kernel build, and enabling this option causes the following |
128 | do the following: | 128 | additional steps to occur: |
129 | - Add the option -fno-inline-functions-called-once to gcc | 129 | - Add the option -fno-inline-functions-called-once to gcc commands. |
130 | When inlining a function annotated __init in a non-init | 130 | When inlining a function annotated with __init in a non-init |
131 | function we would lose the section information and thus | 131 | function, we would lose the section information and thus |
132 | the analysis would not catch the illegal reference. | 132 | the analysis would not catch the illegal reference. |
133 | This option tells gcc to inline less but will also | 133 | This option tells gcc to inline less (but it does result in |
134 | result in a larger kernel. | 134 | a larger kernel). |
135 | - Run the section mismatch analysis for each module/built-in.o | 135 | - Run the section mismatch analysis for each module/built-in.o file. |
136 | When we run the section mismatch analysis on vmlinux.o we | 136 | When we run the section mismatch analysis on vmlinux.o, we |
137 | lose valueble information about where the mismatch was | 137 | lose valueble information about where the mismatch was |
138 | introduced. | 138 | introduced. |
139 | Running the analysis for each module/built-in.o file | 139 | Running the analysis for each module/built-in.o file |
140 | will tell where the mismatch happens much closer to the | 140 | tells where the mismatch happens much closer to the |
141 | source. The drawback is that we will report the same | 141 | source. The drawback is that the same mismatch is |
142 | mismatch at least twice. | 142 | reported at least twice. |
143 | - Enable verbose reporting from modpost to help solving | 143 | - Enable verbose reporting from modpost in order to help resolve |
144 | the section mismatches reported. | 144 | the section mismatches that are reported. |
145 | 145 | ||
146 | config DEBUG_KERNEL | 146 | config DEBUG_KERNEL |
147 | bool "Kernel debugging" | 147 | bool "Kernel debugging" |
@@ -835,7 +835,7 @@ config DEBUG_CREDENTIALS | |||
835 | 835 | ||
836 | # | 836 | # |
837 | # Select this config option from the architecture Kconfig, if it | 837 | # Select this config option from the architecture Kconfig, if it |
838 | # it is preferred to always offer frame pointers as a config | 838 | # is preferred to always offer frame pointers as a config |
839 | # option on the architecture (regardless of KERNEL_DEBUG): | 839 | # option on the architecture (regardless of KERNEL_DEBUG): |
840 | # | 840 | # |
841 | config ARCH_WANT_FRAME_POINTERS | 841 | config ARCH_WANT_FRAME_POINTERS |
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 75ca78f3a8c9..79fc20b65e74 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
15 | #include <linux/moduleparam.h> | 15 | #include <linux/moduleparam.h> |
16 | #include <linux/kallsyms.h> | 16 | #include <linux/kallsyms.h> |
17 | #include <linux/version.h> | ||
18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
19 | #include <linux/mutex.h> | 18 | #include <linux/mutex.h> |
20 | #include <linux/proc_fs.h> | 19 | #include <linux/proc_fs.h> |
@@ -860,7 +860,7 @@ EXPORT_SYMBOL(ida_get_new_above); | |||
860 | * and go back to the idr_pre_get() call. If the idr is full, it will | 860 | * and go back to the idr_pre_get() call. If the idr is full, it will |
861 | * return %-ENOSPC. | 861 | * return %-ENOSPC. |
862 | * | 862 | * |
863 | * @id returns a value in the range %0 ... %0x7fffffff. | 863 | * @p_id returns a value in the range %0 ... %0x7fffffff. |
864 | */ | 864 | */ |
865 | int ida_get_new(struct ida *ida, int *p_id) | 865 | int ida_get_new(struct ida *ida, int *p_id) |
866 | { | 866 | { |
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c index 39d216d535ea..6bdc67dbbc28 100644 --- a/mm/page_cgroup.c +++ b/mm/page_cgroup.c | |||
@@ -513,11 +513,10 @@ int swap_cgroup_swapon(int type, unsigned long max_pages) | |||
513 | length = DIV_ROUND_UP(max_pages, SC_PER_PAGE); | 513 | length = DIV_ROUND_UP(max_pages, SC_PER_PAGE); |
514 | array_size = length * sizeof(void *); | 514 | array_size = length * sizeof(void *); |
515 | 515 | ||
516 | array = vmalloc(array_size); | 516 | array = vzalloc(array_size); |
517 | if (!array) | 517 | if (!array) |
518 | goto nomem; | 518 | goto nomem; |
519 | 519 | ||
520 | memset(array, 0, array_size); | ||
521 | ctrl = &swap_cgroup_ctrl[type]; | 520 | ctrl = &swap_cgroup_ctrl[type]; |
522 | mutex_lock(&swap_cgroup_mutex); | 521 | mutex_lock(&swap_cgroup_mutex); |
523 | ctrl->length = length; | 522 | ctrl->length = length; |
diff --git a/mm/vmscan.c b/mm/vmscan.c index b55699cd9067..9fdfce7ba403 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -1416,7 +1416,7 @@ static inline bool should_reclaim_stall(unsigned long nr_taken, | |||
1416 | if (sc->reclaim_mode & RECLAIM_MODE_SINGLE) | 1416 | if (sc->reclaim_mode & RECLAIM_MODE_SINGLE) |
1417 | return false; | 1417 | return false; |
1418 | 1418 | ||
1419 | /* If we have relaimed everything on the isolated list, no stall */ | 1419 | /* If we have reclaimed everything on the isolated list, no stall */ |
1420 | if (nr_freed == nr_taken) | 1420 | if (nr_freed == nr_taken) |
1421 | return false; | 1421 | return false; |
1422 | 1422 | ||
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index b0869fe3633b..71441b934ffd 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c | |||
@@ -776,12 +776,11 @@ static int xt_jumpstack_alloc(struct xt_table_info *i) | |||
776 | 776 | ||
777 | size = sizeof(void **) * nr_cpu_ids; | 777 | size = sizeof(void **) * nr_cpu_ids; |
778 | if (size > PAGE_SIZE) | 778 | if (size > PAGE_SIZE) |
779 | i->jumpstack = vmalloc(size); | 779 | i->jumpstack = vzalloc(size); |
780 | else | 780 | else |
781 | i->jumpstack = kmalloc(size, GFP_KERNEL); | 781 | i->jumpstack = kzalloc(size, GFP_KERNEL); |
782 | if (i->jumpstack == NULL) | 782 | if (i->jumpstack == NULL) |
783 | return -ENOMEM; | 783 | return -ENOMEM; |
784 | memset(i->jumpstack, 0, size); | ||
785 | 784 | ||
786 | i->stacksize *= xt_jumpstack_multiplier; | 785 | i->stacksize *= xt_jumpstack_multiplier; |
787 | size = sizeof(void *) * i->stacksize; | 786 | size = sizeof(void *) * i->stacksize; |
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index cd67026be2d5..51c868923f64 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c | |||
@@ -375,23 +375,21 @@ static int rds_ib_setup_qp(struct rds_connection *conn) | |||
375 | goto out; | 375 | goto out; |
376 | } | 376 | } |
377 | 377 | ||
378 | ic->i_sends = vmalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work), | 378 | ic->i_sends = vzalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work), |
379 | ibdev_to_node(dev)); | 379 | ibdev_to_node(dev)); |
380 | if (!ic->i_sends) { | 380 | if (!ic->i_sends) { |
381 | ret = -ENOMEM; | 381 | ret = -ENOMEM; |
382 | rdsdebug("send allocation failed\n"); | 382 | rdsdebug("send allocation failed\n"); |
383 | goto out; | 383 | goto out; |
384 | } | 384 | } |
385 | memset(ic->i_sends, 0, ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work)); | ||
386 | 385 | ||
387 | ic->i_recvs = vmalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work), | 386 | ic->i_recvs = vzalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work), |
388 | ibdev_to_node(dev)); | 387 | ibdev_to_node(dev)); |
389 | if (!ic->i_recvs) { | 388 | if (!ic->i_recvs) { |
390 | ret = -ENOMEM; | 389 | ret = -ENOMEM; |
391 | rdsdebug("recv allocation failed\n"); | 390 | rdsdebug("recv allocation failed\n"); |
392 | goto out; | 391 | goto out; |
393 | } | 392 | } |
394 | memset(ic->i_recvs, 0, ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work)); | ||
395 | 393 | ||
396 | rds_ib_recv_init_ack(ic); | 394 | rds_ib_recv_init_ack(ic); |
397 | 395 | ||
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 3dfc47134e51..0b3e35c9ef08 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl | |||
@@ -2932,11 +2932,11 @@ sub process { | |||
2932 | } | 2932 | } |
2933 | } | 2933 | } |
2934 | if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) { | 2934 | if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) { |
2935 | my $herectx = $here . "\n";; | 2935 | my $herectx = $here . "\n"; |
2936 | my $cnt = statement_rawlines($block); | 2936 | my $cnt = statement_rawlines($block); |
2937 | 2937 | ||
2938 | for (my $n = 0; $n < $cnt; $n++) { | 2938 | for (my $n = 0; $n < $cnt; $n++) { |
2939 | $herectx .= raw_line($linenr, $n) . "\n";; | 2939 | $herectx .= raw_line($linenr, $n) . "\n"; |
2940 | } | 2940 | } |
2941 | 2941 | ||
2942 | WARN("BRACES", | 2942 | WARN("BRACES", |