Commit 29afc4e9 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 1d9c5d79 edb0ec07
...@@ -231,7 +231,7 @@ number. Number zero (/dev/usbmon0) is special and means "all buses". ...@@ -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. 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 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. keyboard traffic.
The following ioctl calls are available, with MON_IOC_MAGIC 0x92: The following ioctl calls are available, with MON_IOC_MAGIC 0x92:
......
...@@ -85,7 +85,7 @@ lock the page to ensure serial behavior. ...@@ -85,7 +85,7 @@ lock the page to ensure serial behavior.
CLEANCACHE PERFORMANCE METRICS CLEANCACHE PERFORMANCE METRICS
If properly configured, monitoring of cleancache is done via debugfs in 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: can be measured (across all filesystems) with:
succ_gets - number of gets that were successful succ_gets - number of gets that were successful
......
/* /*
* 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 * Copyright (C) 2007 ARM Limited
* *
...@@ -979,7 +979,7 @@ static int __init l2x0_cache_size_of_parse(const struct device_node *np, ...@@ -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 */ /* All these l2 caches have the same line = block size actually */
if (!line_size) { if (!line_size) {
if (block_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; line_size = block_size;
} else { } else {
/* Fall back to known size */ /* Fall back to known size */
......
...@@ -429,14 +429,6 @@ static void init_software_driven_irq(void) ...@@ -429,14 +429,6 @@ static void init_software_driven_irq(void)
bfin_sec_enable_ssi(37); 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) void handle_sec_sfi_fault(uint32_t gstat)
{ {
......
...@@ -608,7 +608,7 @@ void __init init_mem_mapping(void) ...@@ -608,7 +608,7 @@ void __init init_mem_mapping(void)
* *
* *
* On x86, access has to be given to the first megabyte of ram because that area * 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 * 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. * mmio resources as well as potential bios/acpi data regions.
*/ */
......
...@@ -1298,7 +1298,7 @@ ahd_flush_qoutfifo(struct ahd_softc *ahd) ...@@ -1298,7 +1298,7 @@ ahd_flush_qoutfifo(struct ahd_softc *ahd)
/* /*
* Wait for any inprogress DMA to complete and clear DMA state * 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) { while (((ccscbctl = ahd_inb(ahd, CCSCBCTL)) & (CCARREN|CCSCBEN)) != 0) {
......
...@@ -4223,7 +4223,7 @@ static ssize_t pmcraid_show_adapter_id( ...@@ -4223,7 +4223,7 @@ static ssize_t pmcraid_show_adapter_id(
static struct device_attribute pmcraid_adapter_id_attr = { static struct device_attribute pmcraid_adapter_id_attr = {
.attr = { .attr = {
.name = "adapter_id", .name = "adapter_id",
.mode = S_IRUGO | S_IWUSR, .mode = S_IRUGO,
}, },
.show = pmcraid_show_adapter_id, .show = pmcraid_show_adapter_id,
}; };
......
...@@ -361,6 +361,7 @@ static int synth_probe(struct spk_synth *synth) ...@@ -361,6 +361,7 @@ static int synth_probe(struct spk_synth *synth)
port_val &= 0xfbff; port_val &= 0xfbff;
if (port_val != 0x107f) { if (port_val != 0x107f) {
pr_info("DoubleTalk PC: not found\n"); pr_info("DoubleTalk PC: not found\n");
if (synth_lpc)
synth_release_region(synth_lpc, SYNTH_IO_EXTENT); synth_release_region(synth_lpc, SYNTH_IO_EXTENT);
return -ENODEV; return -ENODEV;
} }
......
...@@ -134,7 +134,7 @@ struct fat_boot_sector { ...@@ -134,7 +134,7 @@ struct fat_boot_sector {
__u8 vol_id[4]; /* volume ID */ __u8 vol_id[4]; /* volume ID */
__u8 vol_label[11]; /* volume label */ __u8 vol_label[11]; /* volume label */
__u8 fs_type[8]; /* file system type */ __u8 fs_type[8]; /* file system type */
/* other fiealds are not added here */ /* other fields are not added here */
} fat16; } fat16;
struct { struct {
...@@ -157,7 +157,7 @@ struct fat_boot_sector { ...@@ -157,7 +157,7 @@ struct fat_boot_sector {
__u8 vol_id[4]; /* volume ID */ __u8 vol_id[4]; /* volume ID */
__u8 vol_label[11]; /* volume label */ __u8 vol_label[11]; /* volume label */
__u8 fs_type[8]; /* file system type */ __u8 fs_type[8]; /* file system type */
/* other fiealds are not added here */ /* other fields are not added here */
} fat32; } fat32;
}; };
}; };
......
...@@ -2512,7 +2512,7 @@ static int kexec_apply_relocations(struct kimage *image) ...@@ -2512,7 +2512,7 @@ static int kexec_apply_relocations(struct kimage *image)
continue; continue;
/* /*
* Respective archicture needs to provide support for applying * Respective architecture needs to provide support for applying
* relocations of type SHT_RELA/SHT_REL. * relocations of type SHT_RELA/SHT_REL.
*/ */
if (sechdrs[i].sh_type == SHT_RELA) if (sechdrs[i].sh_type == SHT_RELA)
......
...@@ -636,7 +636,7 @@ config DEBUG_STACKOVERFLOW ...@@ -636,7 +636,7 @@ config DEBUG_STACKOVERFLOW
depends on DEBUG_KERNEL && HAVE_DEBUG_STACKOVERFLOW depends on DEBUG_KERNEL && HAVE_DEBUG_STACKOVERFLOW
---help--- ---help---
Say Y here if you want to check for overflows of kernel, IRQ 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 option will show detailed messages if free stack space drops
below a certain limit. below a certain limit.
......
...@@ -641,7 +641,7 @@ static __init int ddebug_setup_query(char *str) ...@@ -641,7 +641,7 @@ static __init int ddebug_setup_query(char *str)
__setup("ddebug_query=", ddebug_setup_query); __setup("ddebug_query=", ddebug_setup_query);
/* /*
* File_ops->write method for <debugfs>/dynamic_debug/conrol. Gathers the * File_ops->write method for <debugfs>/dynamic_debug/control. Gathers the
* command text from userspace, parses and executes it. * command text from userspace, parses and executes it.
*/ */
#define USER_BUF_PAGE 4096 #define USER_BUF_PAGE 4096
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
static struct cleancache_ops *cleancache_ops __read_mostly; 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 * properly configured. These are for information only so are not protected
* against increment races. * against increment races.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment