diff options
| -rw-r--r-- | Documentation/usb/usbmon.txt | 2 | ||||
| -rw-r--r-- | Documentation/vm/cleancache.txt | 2 | ||||
| -rw-r--r-- | arch/arm/mm/cache-l2x0.c | 4 | ||||
| -rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 8 | ||||
| -rw-r--r-- | arch/x86/mm/init.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_core.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/pmcraid.c | 2 | ||||
| -rw-r--r-- | drivers/staging/speakup/speakup_dtlk.c | 7 | ||||
| -rw-r--r-- | include/uapi/linux/msdos_fs.h | 4 | ||||
| -rw-r--r-- | kernel/kexec.c | 2 | ||||
| -rw-r--r-- | lib/Kconfig.debug | 2 | ||||
| -rw-r--r-- | lib/dynamic_debug.c | 2 | ||||
| -rw-r--r-- | mm/cleancache.c | 2 |
13 files changed, 17 insertions, 24 deletions
diff --git a/Documentation/usb/usbmon.txt b/Documentation/usb/usbmon.txt index c42bb9cd3b43..7587d84ebd16 100644 --- a/Documentation/usb/usbmon.txt +++ b/Documentation/usb/usbmon.txt | |||
| @@ -231,7 +231,7 @@ number. Number zero (/dev/usbmon0) is special and means "all buses". | |||
| 231 | Note that specific naming policy is set by your Linux distribution. | 231 | Note that specific naming policy is set by your Linux distribution. |
| 232 | 232 | ||
| 233 | If you create /dev/usbmon0 by hand, make sure that it is owned by root | 233 | If you create /dev/usbmon0 by hand, make sure that it is owned by root |
| 234 | and has mode 0600. Otherwise, unpriviledged users will be able to snoop | 234 | and has mode 0600. Otherwise, unprivileged users will be able to snoop |
| 235 | keyboard traffic. | 235 | keyboard traffic. |
| 236 | 236 | ||
| 237 | The following ioctl calls are available, with MON_IOC_MAGIC 0x92: | 237 | The following ioctl calls are available, with MON_IOC_MAGIC 0x92: |
diff --git a/Documentation/vm/cleancache.txt b/Documentation/vm/cleancache.txt index 142fbb0f325a..01d76282444e 100644 --- a/Documentation/vm/cleancache.txt +++ b/Documentation/vm/cleancache.txt | |||
| @@ -85,7 +85,7 @@ lock the page to ensure serial behavior. | |||
| 85 | CLEANCACHE PERFORMANCE METRICS | 85 | CLEANCACHE PERFORMANCE METRICS |
| 86 | 86 | ||
| 87 | If properly configured, monitoring of cleancache is done via debugfs in | 87 | If properly configured, monitoring of cleancache is done via debugfs in |
| 88 | the /sys/kernel/debug/mm/cleancache directory. The effectiveness of cleancache | 88 | the /sys/kernel/debug/cleancache directory. The effectiveness of cleancache |
| 89 | can be measured (across all filesystems) with: | 89 | can be measured (across all filesystems) with: |
| 90 | 90 | ||
| 91 | succ_gets - number of gets that were successful | 91 | succ_gets - number of gets that were successful |
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 5e65ca8dea62..c7fc009ad21c 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mm/cache-l2x0.c - L210/L220 cache controller support | 2 | * arch/arm/mm/cache-l2x0.c - L210/L220/L310 cache controller support |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2007 ARM Limited | 4 | * Copyright (C) 2007 ARM Limited |
| 5 | * | 5 | * |
| @@ -979,7 +979,7 @@ static int __init l2x0_cache_size_of_parse(const struct device_node *np, | |||
| 979 | /* All these l2 caches have the same line = block size actually */ | 979 | /* All these l2 caches have the same line = block size actually */ |
| 980 | if (!line_size) { | 980 | if (!line_size) { |
| 981 | if (block_size) { | 981 | if (block_size) { |
| 982 | /* If linesize if not given, it is equal to blocksize */ | 982 | /* If linesize is not given, it is equal to blocksize */ |
| 983 | line_size = block_size; | 983 | line_size = block_size; |
| 984 | } else { | 984 | } else { |
| 985 | /* Fall back to known size */ | 985 | /* Fall back to known size */ |
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index dd2af74aff80..7236bdfc71e6 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c | |||
| @@ -429,14 +429,6 @@ static void init_software_driven_irq(void) | |||
| 429 | bfin_sec_enable_ssi(37); | 429 | bfin_sec_enable_ssi(37); |
| 430 | } | 430 | } |
| 431 | 431 | ||
| 432 | void bfin_sec_resume(void) | ||
| 433 | { | ||
| 434 | bfin_write_SEC_SCI(0, SEC_CCTL, SEC_CCTL_RESET); | ||
| 435 | udelay(100); | ||
| 436 | bfin_write_SEC_GCTL(SEC_GCTL_EN); | ||
| 437 | bfin_write_SEC_SCI(0, SEC_CCTL, SEC_CCTL_EN | SEC_CCTL_NMI_EN); | ||
| 438 | } | ||
| 439 | |||
| 440 | void handle_sec_sfi_fault(uint32_t gstat) | 432 | void handle_sec_sfi_fault(uint32_t gstat) |
| 441 | { | 433 | { |
| 442 | 434 | ||
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 079c3b6a3ff1..649da47d3827 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c | |||
| @@ -608,7 +608,7 @@ void __init init_mem_mapping(void) | |||
| 608 | * | 608 | * |
| 609 | * | 609 | * |
| 610 | * On x86, access has to be given to the first megabyte of ram because that area | 610 | * On x86, access has to be given to the first megabyte of ram because that area |
| 611 | * contains bios code and data regions used by X and dosemu and similar apps. | 611 | * contains BIOS code and data regions used by X and dosemu and similar apps. |
| 612 | * Access has to be given to non-kernel-ram areas as well, these contain the PCI | 612 | * Access has to be given to non-kernel-ram areas as well, these contain the PCI |
| 613 | * mmio resources as well as potential bios/acpi data regions. | 613 | * mmio resources as well as potential bios/acpi data regions. |
| 614 | */ | 614 | */ |
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c index 0bcacf71aef8..97f2accd3dbb 100644 --- a/drivers/scsi/aic7xxx/aic79xx_core.c +++ b/drivers/scsi/aic7xxx/aic79xx_core.c | |||
| @@ -1298,7 +1298,7 @@ rescan_fifos: | |||
| 1298 | 1298 | ||
| 1299 | /* | 1299 | /* |
| 1300 | * Wait for any inprogress DMA to complete and clear DMA state | 1300 | * Wait for any inprogress DMA to complete and clear DMA state |
| 1301 | * if this if for an SCB in the qinfifo. | 1301 | * if this is for an SCB in the qinfifo. |
| 1302 | */ | 1302 | */ |
| 1303 | while (((ccscbctl = ahd_inb(ahd, CCSCBCTL)) & (CCARREN|CCSCBEN)) != 0) { | 1303 | while (((ccscbctl = ahd_inb(ahd, CCSCBCTL)) & (CCARREN|CCSCBEN)) != 0) { |
| 1304 | 1304 | ||
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 8c27b6a77ec4..85510086a36c 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c | |||
| @@ -4223,7 +4223,7 @@ static ssize_t pmcraid_show_adapter_id( | |||
| 4223 | static struct device_attribute pmcraid_adapter_id_attr = { | 4223 | static struct device_attribute pmcraid_adapter_id_attr = { |
| 4224 | .attr = { | 4224 | .attr = { |
| 4225 | .name = "adapter_id", | 4225 | .name = "adapter_id", |
| 4226 | .mode = S_IRUGO | S_IWUSR, | 4226 | .mode = S_IRUGO, |
| 4227 | }, | 4227 | }, |
| 4228 | .show = pmcraid_show_adapter_id, | 4228 | .show = pmcraid_show_adapter_id, |
| 4229 | }; | 4229 | }; |
diff --git a/drivers/staging/speakup/speakup_dtlk.c b/drivers/staging/speakup/speakup_dtlk.c index 4e059ea78d4c..89592c0b9151 100644 --- a/drivers/staging/speakup/speakup_dtlk.c +++ b/drivers/staging/speakup/speakup_dtlk.c | |||
| @@ -325,7 +325,7 @@ static struct synth_settings *synth_interrogate(struct spk_synth *synth) | |||
| 325 | 325 | ||
| 326 | static int synth_probe(struct spk_synth *synth) | 326 | static int synth_probe(struct spk_synth *synth) |
| 327 | { | 327 | { |
| 328 | unsigned int port_val = 0; | 328 | unsigned int port_val = 0; |
| 329 | int i = 0; | 329 | int i = 0; |
| 330 | struct synth_settings *sp; | 330 | struct synth_settings *sp; |
| 331 | 331 | ||
| @@ -361,7 +361,8 @@ static int synth_probe(struct spk_synth *synth) | |||
| 361 | port_val &= 0xfbff; | 361 | port_val &= 0xfbff; |
| 362 | if (port_val != 0x107f) { | 362 | if (port_val != 0x107f) { |
| 363 | pr_info("DoubleTalk PC: not found\n"); | 363 | pr_info("DoubleTalk PC: not found\n"); |
| 364 | synth_release_region(synth_lpc, SYNTH_IO_EXTENT); | 364 | if (synth_lpc) |
| 365 | synth_release_region(synth_lpc, SYNTH_IO_EXTENT); | ||
| 365 | return -ENODEV; | 366 | return -ENODEV; |
| 366 | } | 367 | } |
| 367 | while (inw_p(synth_lpc) != 0x147f) | 368 | while (inw_p(synth_lpc) != 0x147f) |
| @@ -369,7 +370,7 @@ static int synth_probe(struct spk_synth *synth) | |||
| 369 | sp = synth_interrogate(synth); | 370 | sp = synth_interrogate(synth); |
| 370 | pr_info("%s: %03x-%03x, ROM ver %s, s/n %u, driver: %s\n", | 371 | pr_info("%s: %03x-%03x, ROM ver %s, s/n %u, driver: %s\n", |
| 371 | synth->long_name, synth_lpc, synth_lpc+SYNTH_IO_EXTENT - 1, | 372 | synth->long_name, synth_lpc, synth_lpc+SYNTH_IO_EXTENT - 1, |
| 372 | sp->rom_version, sp->serial_number, synth->version); | 373 | sp->rom_version, sp->serial_number, synth->version); |
| 373 | synth->alive = 1; | 374 | synth->alive = 1; |
| 374 | return 0; | 375 | return 0; |
| 375 | } | 376 | } |
diff --git a/include/uapi/linux/msdos_fs.h b/include/uapi/linux/msdos_fs.h index e284ff919d6e..e956704f5fb1 100644 --- a/include/uapi/linux/msdos_fs.h +++ b/include/uapi/linux/msdos_fs.h | |||
| @@ -134,7 +134,7 @@ struct fat_boot_sector { | |||
| 134 | __u8 vol_id[4]; /* volume ID */ | 134 | __u8 vol_id[4]; /* volume ID */ |
| 135 | __u8 vol_label[11]; /* volume label */ | 135 | __u8 vol_label[11]; /* volume label */ |
| 136 | __u8 fs_type[8]; /* file system type */ | 136 | __u8 fs_type[8]; /* file system type */ |
| 137 | /* other fiealds are not added here */ | 137 | /* other fields are not added here */ |
| 138 | } fat16; | 138 | } fat16; |
| 139 | 139 | ||
| 140 | struct { | 140 | struct { |
| @@ -157,7 +157,7 @@ struct fat_boot_sector { | |||
| 157 | __u8 vol_id[4]; /* volume ID */ | 157 | __u8 vol_id[4]; /* volume ID */ |
| 158 | __u8 vol_label[11]; /* volume label */ | 158 | __u8 vol_label[11]; /* volume label */ |
| 159 | __u8 fs_type[8]; /* file system type */ | 159 | __u8 fs_type[8]; /* file system type */ |
| 160 | /* other fiealds are not added here */ | 160 | /* other fields are not added here */ |
| 161 | } fat32; | 161 | } fat32; |
| 162 | }; | 162 | }; |
| 163 | }; | 163 | }; |
diff --git a/kernel/kexec.c b/kernel/kexec.c index 9a8a01abbaed..c85277639b34 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
| @@ -2512,7 +2512,7 @@ static int kexec_apply_relocations(struct kimage *image) | |||
| 2512 | continue; | 2512 | continue; |
| 2513 | 2513 | ||
| 2514 | /* | 2514 | /* |
| 2515 | * Respective archicture needs to provide support for applying | 2515 | * Respective architecture needs to provide support for applying |
| 2516 | * relocations of type SHT_RELA/SHT_REL. | 2516 | * relocations of type SHT_RELA/SHT_REL. |
| 2517 | */ | 2517 | */ |
| 2518 | if (sechdrs[i].sh_type == SHT_RELA) | 2518 | if (sechdrs[i].sh_type == SHT_RELA) |
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index a2ca213c71ca..61689a86d7f8 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -636,7 +636,7 @@ config DEBUG_STACKOVERFLOW | |||
| 636 | depends on DEBUG_KERNEL && HAVE_DEBUG_STACKOVERFLOW | 636 | depends on DEBUG_KERNEL && HAVE_DEBUG_STACKOVERFLOW |
| 637 | ---help--- | 637 | ---help--- |
| 638 | Say Y here if you want to check for overflows of kernel, IRQ | 638 | Say Y here if you want to check for overflows of kernel, IRQ |
| 639 | and exception stacks (if your archicture uses them). This | 639 | and exception stacks (if your architecture uses them). This |
| 640 | option will show detailed messages if free stack space drops | 640 | option will show detailed messages if free stack space drops |
| 641 | below a certain limit. | 641 | below a certain limit. |
| 642 | 642 | ||
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 527799d44476..d8f3d3150603 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c | |||
| @@ -641,7 +641,7 @@ static __init int ddebug_setup_query(char *str) | |||
| 641 | __setup("ddebug_query=", ddebug_setup_query); | 641 | __setup("ddebug_query=", ddebug_setup_query); |
| 642 | 642 | ||
| 643 | /* | 643 | /* |
| 644 | * File_ops->write method for <debugfs>/dynamic_debug/conrol. Gathers the | 644 | * File_ops->write method for <debugfs>/dynamic_debug/control. Gathers the |
| 645 | * command text from userspace, parses and executes it. | 645 | * command text from userspace, parses and executes it. |
| 646 | */ | 646 | */ |
| 647 | #define USER_BUF_PAGE 4096 | 647 | #define USER_BUF_PAGE 4096 |
diff --git a/mm/cleancache.c b/mm/cleancache.c index d0eac4350403..053bcd8f12fb 100644 --- a/mm/cleancache.c +++ b/mm/cleancache.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | static struct cleancache_ops *cleancache_ops __read_mostly; | 25 | static struct cleancache_ops *cleancache_ops __read_mostly; |
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | * Counters available via /sys/kernel/debug/frontswap (if debugfs is | 28 | * Counters available via /sys/kernel/debug/cleancache (if debugfs is |
| 29 | * properly configured. These are for information only so are not protected | 29 | * properly configured. These are for information only so are not protected |
| 30 | * against increment races. | 30 | * against increment races. |
| 31 | */ | 31 | */ |
