From 801a55911432f582c8ab82c895d2821dc02b70e3 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Fri, 2 Jan 2015 06:11:16 +0100 Subject: x86: init_mem_mapping(): use capital BIOS in comment Use capital BIOS in comment. Its cleaner, and allows diference between BIOS and BIOs. Signed-off-by: Pavel Machek Signed-off-by: Jiri Kosina --- arch/x86/mm/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 66dba36f2343..452f9042e5b2 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -582,7 +582,7 @@ void __init init_mem_mapping(void) * * * On x86, access has to be given to the first megabyte of ram because that area - * contains bios code and data regions used by X and dosemu and similar apps. + * contains BIOS code and data regions used by X and dosemu and similar apps. * Access has to be given to non-kernel-ram areas as well, these contain the PCI * mmio resources as well as potential bios/acpi data regions. */ -- cgit From 9ed03783d37c0566673c790aa1ff3f1d02129514 Mon Sep 17 00:00:00 2001 From: Jeremiah Mahler Date: Sun, 21 Dec 2014 05:30:04 -0800 Subject: doc: usbmon: fix spelling s/unpriviledged/unprivileged/ Signed-off-by: Jeremiah Mahler Signed-off-by: Jiri Kosina --- Documentation/usb/usbmon.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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". Note that specific naming policy is set by your Linux distribution. If you create /dev/usbmon0 by hand, make sure that it is owned by root -and has mode 0600. Otherwise, unpriviledged users will be able to snoop +and has mode 0600. Otherwise, unprivileged users will be able to snoop keyboard traffic. The following ioctl calls are available, with MON_IOC_MAGIC 0x92: -- cgit From 231821d4c3fa72de8fd9981e608323529ac9ad70 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Mon, 15 Dec 2014 12:04:16 +0900 Subject: dynamic_debug: fix comment Signed-off-by: Masatake YAMATO Signed-off-by: Jiri Kosina --- lib/dynamic_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index dfba05521748..96bc6a4b61d1 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -641,7 +641,7 @@ static __init int ddebug_setup_query(char *str) __setup("ddebug_query=", ddebug_setup_query); /* - * File_ops->write method for /dynamic_debug/conrol. Gathers the + * File_ops->write method for /dynamic_debug/control. Gathers the * command text from userspace, parses and executes it. */ #define USER_BUF_PAGE 4096 -- cgit From 5a0ccb6b8ad3a769a69d09a0bbe6e55d96ebcb04 Mon Sep 17 00:00:00 2001 From: Alan Date: Tue, 20 Jan 2015 12:08:50 +0000 Subject: ibmraid: fix writeable attribute with no store method https://bugzilla.kernel.org/show_bug.cgi?id=81311 [ 0.603157] WARNING: at drivers/base/core.c:601 device_create_file+0x8d/0xa0() [ 0.603158] Attribute adapter_id: write permission without 'store' [ 0.603159] Modules linked in: i915(+) i2c_algo_bit drm_kms_helper drm mpt2sas(+) pmcraid(+) raid_class scsi_transport_sas i2c_core video Signed-off-by: Alan Cox Signed-off-by: Jiri Kosina --- drivers/scsi/pmcraid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index bcb64eb1387f..4d28072d6618 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c @@ -4292,7 +4292,7 @@ static ssize_t pmcraid_show_adapter_id( static struct device_attribute pmcraid_adapter_id_attr = { .attr = { .name = "adapter_id", - .mode = S_IRUGO | S_IWUSR, + .mode = S_IRUGO, }, .show = pmcraid_show_adapter_id, }; -- cgit From f2c22731cab367cae4f50aa16eca792023c3e8da Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Thu, 27 Nov 2014 12:05:43 +0100 Subject: ARM: l2c: fix comment Signed-off-by: Geert Uytterhoeven Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Jiri Kosina --- arch/arm/mm/cache-l2x0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 5e65ca8dea62..5216bfe7fd86 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -979,7 +979,7 @@ static int __init l2x0_cache_size_of_parse(const struct device_node *np, /* All these l2 caches have the same line = block size actually */ if (!line_size) { if (block_size) { - /* If linesize if not given, it is equal to blocksize */ + /* If linesize is not given, it is equal to blocksize */ line_size = block_size; } else { /* Fall back to known size */ -- cgit From a7870c0f26afa5c2c5054528975b9ca56b399309 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Thu, 27 Nov 2014 12:05:45 +0100 Subject: scsi: aic7xxx: fix comment Signed-off-by: Geert Uytterhoeven Cc: Hannes Reinecke Cc: linux-scsi@vger.kernel.org Signed-off-by: Jiri Kosina --- drivers/scsi/aic7xxx/aic79xx_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: /* * Wait for any inprogress DMA to complete and clear DMA state - * if this if for an SCB in the qinfifo. + * if this is for an SCB in the qinfifo. */ while (((ccscbctl = ahd_inb(ahd, CCSCBCTL)) & (CCARREN|CCSCBEN)) != 0) { -- cgit From 7d7d731d1f0f27d2e470d4bc6112aca5ff30476f Mon Sep 17 00:00:00 2001 From: Jeremiah Mahler Date: Fri, 5 Dec 2014 06:56:50 -0800 Subject: msdos_fs.h: fix 'fields' in comment Signed-off-by: Jeremiah Mahler Signed-off-by: Jiri Kosina --- include/uapi/linux/msdos_fs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 { __u8 vol_id[4]; /* volume ID */ __u8 vol_label[11]; /* volume label */ __u8 fs_type[8]; /* file system type */ - /* other fiealds are not added here */ + /* other fields are not added here */ } fat16; struct { @@ -157,7 +157,7 @@ struct fat_boot_sector { __u8 vol_id[4]; /* volume ID */ __u8 vol_label[11]; /* volume label */ __u8 fs_type[8]; /* file system type */ - /* other fiealds are not added here */ + /* other fields are not added here */ } fat32; }; }; -- cgit From b69a7806de1d4073aad2d9e5c9371a7341cf9eaa Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sat, 6 Dec 2014 19:07:28 +0100 Subject: ARM: cache-l2x0.c: Make it clear that cache-l2x0 handles L310 cache controller It is not clear from the filename, and comment at the begining adds to the confusion by not listing L310. Fix it. Signed-off-by: Pavel Machek Signed-off-by: Jiri Kosina --- arch/arm/mm/cache-l2x0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 5216bfe7fd86..c7fc009ad21c 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -1,5 +1,5 @@ /* - * arch/arm/mm/cache-l2x0.c - L210/L220 cache controller support + * arch/arm/mm/cache-l2x0.c - L210/L220/L310 cache controller support * * Copyright (C) 2007 ARM Limited * -- cgit From 7aa4d5c8ffed00ff751f1d8d492ae89d7f3f9736 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 15 Dec 2014 11:33:08 +0000 Subject: doubletalk: probe failure causes OOPS The code bothers to probe for the device, but on failing to find it proceeds to try and release a NULL resource, thereby ruining it's prior good behaviour Resolves-Bug: https://bugzilla.kernel.org/show_bug.cgi?id=88581 Signed-off-by: Alan Cox Signed-off-by: Jiri Kosina --- drivers/staging/speakup/speakup_dtlk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/staging/speakup/speakup_dtlk.c b/drivers/staging/speakup/speakup_dtlk.c index d7d515273896..ffd85e1a885b 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) static int synth_probe(struct spk_synth *synth) { - unsigned int port_val = 0; + unsigned int port_val = 0; int i = 0; struct synth_settings *sp; @@ -361,7 +361,8 @@ static int synth_probe(struct spk_synth *synth) port_val &= 0xfbff; if (port_val != 0x107f) { pr_info("DoubleTalk PC: not found\n"); - synth_release_region(synth_lpc, SYNTH_IO_EXTENT); + if (synth_lpc) + synth_release_region(synth_lpc, SYNTH_IO_EXTENT); return -ENODEV; } while (inw_p(synth_lpc) != 0x147f) @@ -369,7 +370,7 @@ static int synth_probe(struct spk_synth *synth) sp = synth_interrogate(synth); pr_info("%s: %03x-%03x, ROM ver %s, s/n %u, driver: %s\n", synth->long_name, synth_lpc, synth_lpc+SYNTH_IO_EXTENT - 1, - sp->rom_version, sp->serial_number, synth->version); + sp->rom_version, sp->serial_number, synth->version); synth->alive = 1; return 0; } -- cgit From 74f24257eec528495ac1761512954a3348febd82 Mon Sep 17 00:00:00 2001 From: Rickard Strandqvist Date: Sat, 3 Jan 2015 18:01:49 +0100 Subject: blackfin: mach-common: ints-priority: remove unused function Remove the function bfin_sec_resume() that is not used anywhere. This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist Signed-off-by: Jiri Kosina --- arch/blackfin/mach-common/ints-priority.c | 8 -------- 1 file changed, 8 deletions(-) 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) bfin_sec_enable_ssi(37); } -void bfin_sec_resume(void) -{ - bfin_write_SEC_SCI(0, SEC_CCTL, SEC_CCTL_RESET); - udelay(100); - bfin_write_SEC_GCTL(SEC_GCTL_EN); - bfin_write_SEC_SCI(0, SEC_CCTL, SEC_CCTL_EN | SEC_CCTL_NMI_EN); -} - void handle_sec_sfi_fault(uint32_t gstat) { -- cgit From 8fc8f4d57c8d146971e4d1456f8e93a22e1487c3 Mon Sep 17 00:00:00 2001 From: Marcin Jabrzyk Date: Wed, 7 Jan 2015 11:14:41 +0100 Subject: mm: fix cleancache debugfs directory path Minor fixes for cleancache about wrong debugfs paths in documentation and code comment. Signed-off-by: Marcin Jabrzyk Signed-off-by: Jiri Kosina --- Documentation/vm/cleancache.txt | 2 +- mm/cleancache.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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. CLEANCACHE PERFORMANCE METRICS If properly configured, monitoring of cleancache is done via debugfs in -the /sys/kernel/debug/mm/cleancache directory. The effectiveness of cleancache +the /sys/kernel/debug/cleancache directory. The effectiveness of cleancache can be measured (across all filesystems) with: succ_gets - number of gets that were successful 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 @@ static struct cleancache_ops *cleancache_ops __read_mostly; /* - * Counters available via /sys/kernel/debug/frontswap (if debugfs is + * Counters available via /sys/kernel/debug/cleancache (if debugfs is * properly configured. These are for information only so are not protected * against increment races. */ -- cgit From edb0ec0725bb9797ded0deaf172a6795e43795c8 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Sun, 25 Jan 2015 19:50:34 +0100 Subject: kexec, Kconfig: spell "architecture" properly Grepping for "archicture" showed it actually twice! Most unusual spelling error, very interesting. :) Signed-off-by: Borislav Petkov Signed-off-by: Jiri Kosina --- kernel/kexec.c | 2 +- lib/Kconfig.debug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/kexec.c b/kernel/kexec.c index 2abf9f6e9a61..b2ed6a3d99fb 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -2512,7 +2512,7 @@ static int kexec_apply_relocations(struct kimage *image) continue; /* - * Respective archicture needs to provide support for applying + * Respective architecture needs to provide support for applying * relocations of type SHT_RELA/SHT_REL. */ if (sechdrs[i].sh_type == SHT_RELA) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 4e35a5d767ed..cfe8ca6717c2 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -620,7 +620,7 @@ config DEBUG_STACKOVERFLOW depends on DEBUG_KERNEL && HAVE_DEBUG_STACKOVERFLOW ---help--- Say Y here if you want to check for overflows of kernel, IRQ - and exception stacks (if your archicture uses them). This + and exception stacks (if your architecture uses them). This option will show detailed messages if free stack space drops below a certain limit. -- cgit