diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 21:57:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 21:57:15 -0500 |
| commit | 29afc4e9a408f2304e09c6dd0dbcfbd2356d0faa (patch) | |
| tree | b4065a69fc2baa5f721b9e3ca05e3934e1ea6693 /Documentation | |
| parent | 1d9c5d79e6e4385aea6f69c23ba543717434ed70 (diff) | |
| parent | edb0ec0725bb9797ded0deaf172a6795e43795c8 (diff) | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/usb/usbmon.txt | 2 | ||||
| -rw-r--r-- | Documentation/vm/cleancache.txt | 2 |
2 files changed, 2 insertions, 2 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 |