History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree changes from Jiri Kosina: "Patches from trivial.git that keep the world turning around. Mostly documentation and comment fixes, and a two corner-case code fixes from Alan Cox" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: kexec, Kconfig: spell "architecture" properly mm: fix cleancache debugfs directory path blackfin: mach-common: ints-priority: remove unused function doubletalk: probe failure causes OOPS ARM: cache-l2x0.c: Make it clear that cache-l2x0 handles L310 cache controller msdos_fs.h: fix 'fields' in comment scsi: aic7xxx: fix comment ARM: l2c: fix comment ibmraid: fix writeable attribute with no store method dynamic_debug: fix comment doc: usbmon: fix spelling s/unpriviledged/unprivileged/ x86: init_mem_mapping(): use capital BIOS in comment

Linus Torvalds committed 11 years ago

Commit 29afc4e2 parents 1d9c5d7 edb0ec013 files · +17 −24Browse files

Unified · Split

13 files
  1. Documentation/usb/usbmon.txt +1 −1
  2. Documentation/vm/cleancache.txt +1 −1
  3. arch/arm/mm/cache-l2x0.c +2 −2
  4. arch/blackfin/mach-common/ints-priority.c +0 −8
  5. arch/x86/mm/init.c +1 −1
  6. drivers/scsi/aic7xxx/aic79xx_core.c +1 −1
  7. drivers/scsi/pmcraid.c +1 −1
  8. drivers/staging/speakup/speakup_dtlk.c +4 −3
  9. include/uapi/linux/msdos_fs.h +2 −2
  10. kernel/kexec.c +1 −1
  11. lib/Kconfig.debug +1 −1
  12. lib/dynamic_debug.c +1 −1
  13. mm/cleancache.c +1 −1
Documentation/usb/usbmon.txt+1−1
@@ -231,7 +231,7 @@ number. Number zero (/dev/usbmon0) is special and means "all buses". · 230 unmodified lines
231Note that specific naming policy is set by your Linux distribution.231Note that specific naming policy is set by your Linux distribution.
232 232
233If you create /dev/usbmon0 by hand, make sure that it is owned by root233If you create /dev/usbmon0 by hand, make sure that it is owned by root
234and has mode 0600. Otherwise, unpriviledged users will be able to snoop234and has mode 0600. Otherwise, unprivileged users will be able to snoop
235keyboard traffic.235keyboard traffic.
236 236
237The following ioctl calls are available, with MON_IOC_MAGIC 0x92:237The following ioctl calls are available, with MON_IOC_MAGIC 0x92:
Documentation/vm/cleancache.txt+1−1
@@ -85,7 +85,7 @@ lock the page to ensure serial behavior. · 84 unmodified lines
85CLEANCACHE PERFORMANCE METRICS85CLEANCACHE PERFORMANCE METRICS
86 86
87If properly configured, monitoring of cleancache is done via debugfs in87If properly configured, monitoring of cleancache is done via debugfs in
88the /sys/kernel/debug/mm/cleancache directory. The effectiveness of cleancache88the /sys/kernel/debug/cleancache directory. The effectiveness of cleancache
89can be measured (across all filesystems) with:89can be measured (across all filesystems) with:
90 90
91succ_gets - number of gets that were successful91succ_gets - number of gets that were successful
arch/arm/mm/cache-l2x0.c+2−2
@@ -1,5 +1,5 @@
1/*1/*
2 * arch/arm/mm/cache-l2x0.c - L210/L220 cache controller support2 * arch/arm/mm/cache-l2x0.c - L210/L220/L310 cache controller support
3 *3 *
4 * Copyright (C) 2007 ARM Limited4 * Copyright (C) 2007 ARM Limited
5 *5 *
@@ -979,7 +979,7 @@ static int __init l2x0_cache_size_of_parse(const struct device_node *np, · 973 unmodified lines
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 */
arch/blackfin/mach-common/ints-priority.c+0−8
@@ -429,14 +429,6 @@ static void init_software_driven_irq(void) · 428 unmodified lines
429 bfin_sec_enable_ssi(37);429 bfin_sec_enable_ssi(37);
430}430}
431 431
432void 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
440void handle_sec_sfi_fault(uint32_t gstat)432void handle_sec_sfi_fault(uint32_t gstat)
441{433{
442 434
arch/x86/mm/init.c+1−1
@@ -608,7 +608,7 @@ void __init init_mem_mapping(void) · 607 unmodified lines
608 *608 *
609 *609 *
610 * On x86, access has to be given to the first megabyte of ram because that area610 * 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 PCI612 * 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 */
drivers/scsi/aic7xxx/aic79xx_core.c+1−1
@@ -1298,7 +1298,7 @@ rescan_fifos: · 1297 unmodified lines
1298 1298
1299 /*1299 /*
1300 * Wait for any inprogress DMA to complete and clear DMA state1300 * 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
drivers/scsi/pmcraid.c+1−1
@@ -4223,7 +4223,7 @@ static ssize_t pmcraid_show_adapter_id( · 4222 unmodified lines
4223static struct device_attribute pmcraid_adapter_id_attr = {4223static 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};
drivers/staging/speakup/speakup_dtlk.c+4−3
@@ -325,7 +325,7 @@ static struct synth_settings *synth_interrogate(struct spk_synth *synth) · 324 unmodified lines
325 325
326static int synth_probe(struct spk_synth *synth)326static 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) · 29 unmodified lines
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) · 1 unmodified line
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}
include/uapi/linux/msdos_fs.h+2−2
@@ -134,7 +134,7 @@ struct fat_boot_sector { · 133 unmodified lines
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 { · 16 unmodified lines
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};
kernel/kexec.c+1−1
@@ -2512,7 +2512,7 @@ static int kexec_apply_relocations(struct kimage *image) · 2511 unmodified lines
2512 continue;2512 continue;
2513 2513
2514 /*2514 /*
2515 * Respective archicture needs to provide support for applying2515 * 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)
lib/Kconfig.debug+1−1
@@ -636,7 +636,7 @@ config DEBUG_STACKOVERFLOW · 635 unmodified lines
636 depends on DEBUG_KERNEL && HAVE_DEBUG_STACKOVERFLOW636 depends on DEBUG_KERNEL && HAVE_DEBUG_STACKOVERFLOW
637 ---help---637 ---help---
638 Say Y here if you want to check for overflows of kernel, IRQ638 Say Y here if you want to check for overflows of kernel, IRQ
639 and exception stacks (if your archicture uses them). This639 and exception stacks (if your architecture uses them). This
640 option will show detailed messages if free stack space drops640 option will show detailed messages if free stack space drops
641 below a certain limit.641 below a certain limit.
642 642
lib/dynamic_debug.c+1−1
@@ -641,7 +641,7 @@ static __init int ddebug_setup_query(char *str) · 640 unmodified lines
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 the644 * 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 4096647#define USER_BUF_PAGE 4096
mm/cleancache.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
25static struct cleancache_ops *cleancache_ops __read_mostly;25static struct cleancache_ops *cleancache_ops __read_mostly;
26 26
27/*27/*
28 * Counters available via /sys/kernel/debug/frontswap (if debugfs is28 * Counters available via /sys/kernel/debug/cleancache (if debugfs is
29 * properly configured. These are for information only so are not protected29 * properly configured. These are for information only so are not protected
30 * against increment races.30 * against increment races.
31 */31 */