Skip to content

Commit 9073e1a

Browse files
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina: "Usual earth-shaking, news-breaking, rocket science pile from trivial.git" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits) doc: usb: Fix typo in Documentation/usb/gadget_configs.txt doc: add missing files to timers/00-INDEX timekeeping: Fix some trivial typos in comments mm: Fix some trivial typos in comments irq: Fix some trivial typos in comments NUMA: fix typos in Kconfig help text mm: update 00-INDEX doc: Documentation/DMA-attributes.txt fix typo DRM: comment: `halve' -> `half' Docs: Kconfig: `devlopers' -> `developers' doc: typo on word accounting in kprobes.c in mutliple architectures treewide: fix "usefull" typo treewide: fix "distingush" typo mm/Kconfig: Grammar s/an/a/ kexec: Typo s/the/then/ Documentation/kvm: Update cpuid documentation for steal time and pv eoi treewide: Fix common typo in "identify" __page_to_pfn: Fix typo in comment Correct some typos for word frequency clk: fixed-factor: Fix a trivial typo ...
2 parents 4937e2a + 2bb9936 commit 9073e1a

File tree

89 files changed

+109
-138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+109
-138
lines changed

Documentation/DMA-attributes.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ all pending DMA writes to complete, and thus provides a mechanism to
1313
strictly order DMA from a device across all intervening busses and
1414
bridges. This barrier is not specific to a particular type of
1515
interconnect, it applies to the system as a whole, and so its
16-
implementation must account for the idiosyncracies of the system all
16+
implementation must account for the idiosyncrasies of the system all
1717
the way from the DMA device to memory.
1818

1919
As an example of a situation where DMA_ATTR_WRITE_BARRIER would be
@@ -60,7 +60,7 @@ such mapping is non-trivial task and consumes very limited resources
6060
Buffers allocated with this attribute can be only passed to user space
6161
by calling dma_mmap_attrs(). By using this API, you are guaranteeing
6262
that you won't dereference the pointer returned by dma_alloc_attr(). You
63-
can threat it as a cookie that must be passed to dma_mmap_attrs() and
63+
can treat it as a cookie that must be passed to dma_mmap_attrs() and
6464
dma_free_attrs(). Make sure that both of these also get this attribute
6565
set on each call.
6666

@@ -82,7 +82,7 @@ to 'device' domain, what synchronizes CPU caches for the given region
8282
(usually it means that the cache has been flushed or invalidated
8383
depending on the dma direction). However, next calls to
8484
dma_map_{single,page,sg}() for other devices will perform exactly the
85-
same sychronization operation on the CPU cache. CPU cache sychronization
85+
same synchronization operation on the CPU cache. CPU cache synchronization
8686
might be a time consuming operation, especially if the buffers are
8787
large, so it is highly recommended to avoid it if possible.
8888
DMA_ATTR_SKIP_CPU_SYNC allows platform code to skip synchronization of

Documentation/timers/00-INDEX

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,9 @@ hpet_example.c
88
- sample hpet timer test program
99
hrtimers.txt
1010
- subsystem for high-resolution kernel timers
11+
NO_HZ.txt
12+
- Summary of the different methods for the scheduler clock-interrupts management.
13+
timers-howto.txt
14+
- how to insert delays in the kernel the right (tm) way.
1115
timer_stats.txt
1216
- timer usage statistics

Documentation/usb/gadget_configfs.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Linux provides a number of functions for gadgets to use.
2626
Creating a gadget means deciding what configurations there will be
2727
and which functions each configuration will provide.
2828

29-
Configfs (please see Documentation/filesystems/configfs/*) lends itslef nicely
29+
Configfs (please see Documentation/filesystems/configfs/*) lends itself nicely
3030
for the purpose of telling the kernel about the above mentioned decision.
3131
This document is about how to do it.
3232

@@ -99,7 +99,7 @@ directories must be created:
9999
$ mkdir configs/<name>.<number>
100100

101101
where <name> can be any string which is legal in a filesystem and the
102-
<numebr> is the configuration's number, e.g.:
102+
<number> is the configuration's number, e.g.:
103103

104104
$ mkdir configs/c.1
105105

@@ -327,7 +327,7 @@ from the buffer to the cs), but it is up to the implementer of the
327327
two functions to decide what they actually do.
328328

329329
typedef struct configured_structure cs;
330-
typedef struc specific_attribute sa;
330+
typedef struct specific_attribute sa;
331331

332332
sa
333333
+----------------------------------+

Documentation/vm/00-INDEX

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ active_mm.txt
44
- An explanation from Linus about tsk->active_mm vs tsk->mm.
55
balance
66
- various information on memory balancing.
7-
hugepage-mmap.c
8-
- Example app using huge page memory with the mmap system call.
9-
hugepage-shm.c
10-
- Example app using huge page memory with Sys V shared memory system calls.
7+
cleancache.txt
8+
- Intro to cleancache and page-granularity victim cache.
9+
frontswap.txt
10+
- Outline frontswap, part of the transcendent memory frontend.
11+
highmem.txt
12+
- Outline of highmem and common issues.
1113
hugetlbpage.txt
1214
- a brief summary of hugetlbpage support in the Linux kernel.
1315
hwpoison.txt
@@ -16,21 +18,23 @@ ksm.txt
1618
- how to use the Kernel Samepage Merging feature.
1719
locking
1820
- info on how locking and synchronization is done in the Linux vm code.
19-
map_hugetlb.c
20-
- an example program that uses the MAP_HUGETLB mmap flag.
2121
numa
2222
- information about NUMA specific code in the Linux vm.
2323
numa_memory_policy.txt
2424
- documentation of concepts and APIs of the 2.6 memory policy support.
2525
overcommit-accounting
2626
- description of the Linux kernels overcommit handling modes.
27-
page-types.c
28-
- Tool for querying page flags
2927
page_migration
3028
- description of page migration in NUMA systems.
3129
pagemap.txt
3230
- pagemap, from the userspace perspective
3331
slub.txt
3432
- a short users guide for SLUB.
33+
soft-dirty.txt
34+
- short explanation for soft-dirty PTEs
35+
transhuge.txt
36+
- Transparent Hugepage Support, alternative way of using hugepages.
3537
unevictable-lru.txt
3638
- Unevictable LRU infrastructure
39+
zswap.txt
40+
- Intro to compressed cache for swap pages

arch/arc/kernel/kprobes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, unsigned long trapnr)
327327
*/
328328

329329
/* We increment the nmissed count for accounting,
330-
* we can also use npre/npostfault count for accouting
330+
* we can also use npre/npostfault count for accounting
331331
* these specific fault cases.
332332
*/
333333
kprobes_inc_nmissed_count(cur);

arch/arm/mach-sti/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ config SOC_STIH415
3030
default y
3131
help
3232
This enables support for STMicroelectronics Digital Consumer
33-
Electronics family StiH415 parts, primarily targetted at set-top-box
33+
Electronics family StiH415 parts, primarily targeted at set-top-box
3434
and other digital audio/video applications using Flattned Device
3535
Trees.
3636

@@ -39,7 +39,7 @@ config SOC_STIH416
3939
default y
4040
help
4141
This enables support for STMicroelectronics Digital Consumer
42-
Electronics family StiH416 parts, primarily targetted at set-top-box
42+
Electronics family StiH416 parts, primarily targeted at set-top-box
4343
and other digital audio/video applications using Flattened Device
4444
Trees.
4545

arch/ia64/kernel/kprobes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
947947
case KPROBE_HIT_SSDONE:
948948
/*
949949
* We increment the nmissed count for accounting,
950-
* we can also use npre/npostfault count for accouting
950+
* we can also use npre/npostfault count for accounting
951951
* these specific fault cases.
952952
*/
953953
kprobes_inc_nmissed_count(cur);

arch/m32r/include/asm/mmu_context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static inline void get_new_mmu_context(struct mm_struct *mm)
4545
Flush all TLB and start new cycle. */
4646
local_flush_tlb_all();
4747
/* Fix version if needed.
48-
Note that we avoid version #0 to distingush NO_CONTEXT. */
48+
Note that we avoid version #0 to distinguish NO_CONTEXT. */
4949
if (!mc)
5050
mmu_context_cache = mc = MMU_CONTEXT_FIRST_VERSION;
5151
}

arch/mips/include/asm/octeon/cvmx-pip.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,13 @@ typedef struct {
192192
/* Number of packets processed by PIP */
193193
uint32_t packets;
194194
/*
195-
* Number of indentified L2 multicast packets. Does not
195+
* Number of identified L2 multicast packets. Does not
196196
* include broadcast packets. Only includes packets whose
197197
* parse mode is SKIP_TO_L2
198198
*/
199199
uint32_t multicast_packets;
200200
/*
201-
* Number of indentified L2 broadcast packets. Does not
201+
* Number of identified L2 broadcast packets. Does not
202202
* include multicast packets. Only includes packets whose
203203
* parse mode is SKIP_TO_L2
204204
*/

arch/mn10300/include/asm/mmu_context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ static inline unsigned long allocate_mmu_context(struct mm_struct *mm)
7171
local_flush_tlb_all();
7272

7373
/* fix the TLB version if needed (we avoid version #0 so as to
74-
* distingush MMU_NO_CONTEXT) */
74+
* distinguish MMU_NO_CONTEXT) */
7575
if (!mc)
7676
*pmc = mc = MMU_CONTEXT_FIRST_VERSION;
7777
}

arch/powerpc/kernel/kprobes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
429429
case KPROBE_HIT_SSDONE:
430430
/*
431431
* We increment the nmissed count for accounting,
432-
* we can also use npre/npostfault count for accouting
432+
* we can also use npre/npostfault count for accounting
433433
* these specific fault cases.
434434
*/
435435
kprobes_inc_nmissed_count(cur);

arch/powerpc/platforms/pseries/nvram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#define NVRW_CNT 0x20
3232

3333
/*
34-
* Set oops header version to distingush between old and new format header.
34+
* Set oops header version to distinguish between old and new format header.
3535
* lnx,oops-log partition max size is 4000, header version > 4000 will
3636
* help in identifying new header.
3737
*/

arch/s390/kernel/kprobes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ static int __kprobes kprobe_trap_handler(struct pt_regs *regs, int trapnr)
680680
case KPROBE_HIT_SSDONE:
681681
/*
682682
* We increment the nmissed count for accounting,
683-
* we can also use npre/npostfault count for accouting
683+
* we can also use npre/npostfault count for accounting
684684
* these specific fault cases.
685685
*/
686686
kprobes_inc_nmissed_count(p);

arch/sh/include/asm/mmu_context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static inline void get_mmu_context(struct mm_struct *mm, unsigned int cpu)
8181

8282
/*
8383
* Fix version; Note that we avoid version #0
84-
* to distingush NO_CONTEXT.
84+
* to distinguish NO_CONTEXT.
8585
*/
8686
if (!asid)
8787
asid = MMU_CONTEXT_FIRST_VERSION;

arch/sparc/kernel/kprobes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
350350
case KPROBE_HIT_SSDONE:
351351
/*
352352
* We increment the nmissed count for accounting,
353-
* we can also use npre/npostfault count for accouting
353+
* we can also use npre/npostfault count for accounting
354354
* these specific fault cases.
355355
*/
356356
kprobes_inc_nmissed_count(cur);

arch/x86/kernel/cpu/amd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ static void amd_get_topology(struct cpuinfo_x86 *c)
339339
#endif
340340

341341
/*
342-
* On a AMD dual core setup the lower bits of the APIC id distingush the cores.
342+
* On a AMD dual core setup the lower bits of the APIC id distinguish the cores.
343343
* Assumes number of cores is a power of two.
344344
*/
345345
static void amd_detect_cmp(struct cpuinfo_x86 *c)

arch/x86/kernel/cpu/intel_cacheinfo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Routines to indentify caches on Intel CPU.
2+
* Routines to identify caches on Intel CPU.
33
*
44
* Changes:
55
* Venkatesh Pallipadi : Adding cache identification through cpuid(4)

arch/x86/kernel/cpu/scattered.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Routines to indentify additional cpu features that are scattered in
2+
* Routines to identify additional cpu features that are scattered in
33
* cpuid space.
44
*/
55
#include <linux/cpu.h>

drivers/acpi/acpica/utobject.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ u8 acpi_ut_valid_internal_object(void *object)
356356
default:
357357

358358
ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
359-
"%p is not not an ACPI operand obj [%s]\n",
359+
"%p is not an ACPI operand obj [%s]\n",
360360
object, acpi_ut_get_descriptor_name(object)));
361361
break;
362362
}

drivers/base/dma-contiguous.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct cma *dma_contiguous_default_area;
4949

5050
/*
5151
* Default global CMA area size can be defined in kernel's .config.
52-
* This is usefull mainly for distro maintainers to create a kernel
52+
* This is useful mainly for distro maintainers to create a kernel
5353
* that works correctly for most supported systems.
5454
* The size can be set in bytes or as a percentage of the total memory
5555
* in the system.

drivers/clk/clk-fixed-factor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void __init of_fixed_factor_clk_setup(struct device_node *node)
117117
}
118118

119119
if (of_property_read_u32(node, "clock-mult", &mult)) {
120-
pr_err("%s Fixed factor clock <%s> must have a clokc-mult property\n",
120+
pr_err("%s Fixed factor clock <%s> must have a clock-mult property\n",
121121
__func__, node->name);
122122
return;
123123
}

drivers/cpufreq/Kconfig.x86

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ config X86_AMD_FREQ_SENSITIVITY
129129
help
130130
This adds AMD-specific powersave bias function to the ondemand
131131
governor, which allows it to make more power-conscious frequency
132-
change decisions based on feedback from hardware (availble on AMD
132+
change decisions based on feedback from hardware (available on AMD
133133
Family 16h and above).
134134

135135
Hardware feedback tells software how "sensitive" to frequency changes

drivers/cpufreq/exynos-cpufreq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
6767
/*
6868
* The policy max have been changed so that we cannot get proper
6969
* old_index with cpufreq_frequency_table_target(). Thus, ignore
70-
* policy and get the index from the raw freqeuncy table.
70+
* policy and get the index from the raw frequency table.
7171
*/
7272
old_index = exynos_cpufreq_get_index(old_freq);
7373
if (old_index < 0) {

drivers/dma/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ config MMP_PDMA
313313
depends on (ARCH_MMP || ARCH_PXA)
314314
select DMA_ENGINE
315315
help
316-
Support the MMP PDMA engine for PXA and MMP platfrom.
316+
Support the MMP PDMA engine for PXA and MMP platform.
317317

318318
config DMA_JZ4740
319319
tristate "JZ4740 DMA support"

drivers/fmc/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ config FMC_CHARDEV
4646
This driver matches every mezzanine device and allows user
4747
space to read and write registers using a char device. It
4848
can be used to write user-space drivers, or just get
49-
aquainted with a mezzanine before writing its specific driver.
49+
acquainted with a mezzanine before writing its specific driver.
5050

5151
endif # FMC

drivers/gpu/drm/drm_irq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,8 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc)
455455
/* Dot clock in Hz: */
456456
dotclock = (u64) crtc->hwmode.clock * 1000;
457457

458-
/* Fields of interlaced scanout modes are only halve a frame duration.
459-
* Double the dotclock to get halve the frame-/line-/pixelduration.
458+
/* Fields of interlaced scanout modes are only half a frame duration.
459+
* Double the dotclock to get half the frame-/line-/pixelduration.
460460
*/
461461
if (crtc->hwmode.flags & DRM_MODE_FLAG_INTERLACE)
462462
dotclock *= 2;

drivers/infiniband/ulp/isert/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
config INFINIBAND_ISERT
2-
tristate "iSCSI Extentions for RDMA (iSER) target support"
2+
tristate "iSCSI Extensions for RDMA (iSER) target support"
33
depends on INET && INFINIBAND_ADDR_TRANS && TARGET_CORE && ISCSI_TARGET
44
---help---
5-
Support for iSCSI Extentions for RDMA (iSER) Target on Infiniband fabrics.
5+
Support for iSCSI Extensions for RDMA (iSER) Target on Infiniband fabrics.

drivers/input/serio/i8042.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ static void i8042_controller_reset(bool force_reset)
10361036
/*
10371037
* i8042_panic_blink() will turn the keyboard LEDs on or off and is called
10381038
* when kernel panics. Flashing LEDs is useful for users running X who may
1039-
* not see the console and will help distingushing panics from "real"
1039+
* not see the console and will help distinguishing panics from "real"
10401040
* lockups.
10411041
*
10421042
* Note that DELAY has a limit of 10ms so we will not get stuck here

drivers/md/raid5.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
* can't distinguish between a clean block that has been generated
5050
* from parity calculations, and a clean block that has been
5151
* successfully written to the spare ( or to parity when resyncing).
52-
* To distingush these states we have a stripe bit STRIPE_INSYNC that
52+
* To distinguish these states we have a stripe bit STRIPE_INSYNC that
5353
* is set whenever a write is scheduled to the spare, or to the parity
5454
* disc if there is no spare. A sync request clears this bit, and
5555
* when we find it set with no buffers locked, we know the sync is

drivers/media/i2c/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ config VIDEO_UPD64083
646646
To compile this driver as a module, choose M here: the
647647
module will be called upd64083.
648648

649-
comment "Miscelaneous helper chips"
649+
comment "Miscellaneous helper chips"
650650

651651
config VIDEO_THS7303
652652
tristate "THS7303/53 Video Amplifier"

drivers/media/i2c/adv7183.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static int adv7183_log_status(struct v4l2_subdev *sd)
178178
adv7183_read(sd, ADV7183_VS_FIELD_CTRL_1),
179179
adv7183_read(sd, ADV7183_VS_FIELD_CTRL_2),
180180
adv7183_read(sd, ADV7183_VS_FIELD_CTRL_3));
181-
v4l2_info(sd, "adv7183: Hsync positon control 1 2 and 3 = 0x%02x 0x%02x 0x%02x\n",
181+
v4l2_info(sd, "adv7183: Hsync position control 1 2 and 3 = 0x%02x 0x%02x 0x%02x\n",
182182
adv7183_read(sd, ADV7183_HS_POS_CTRL_1),
183183
adv7183_read(sd, ADV7183_HS_POS_CTRL_2),
184184
adv7183_read(sd, ADV7183_HS_POS_CTRL_3));

drivers/media/i2c/s5c73m3/s5c73m3-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1651,7 +1651,7 @@ static int s5c73m3_probe(struct i2c_client *client,
16511651
if (ret < 0)
16521652
goto out_err;
16531653

1654-
v4l2_info(sd, "%s: completed succesfully\n", __func__);
1654+
v4l2_info(sd, "%s: completed successfully\n", __func__);
16551655
return 0;
16561656

16571657
out_err:

drivers/media/rc/keymaps/rc-dib0700-nec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* TODO: This table is a real mess, as it merges RC codes from several
66
* devices into a big table. It also has both RC-5 and NEC codes inside.
77
* It should be broken into small tables, and the protocols should properly
8-
* be indentificated.
8+
* be identificated.
99
*
1010
* The table were imported from dib0700_devices.c.
1111
*

drivers/media/rc/keymaps/rc-dib0700-rc5.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* TODO: This table is a real mess, as it merges RC codes from several
66
* devices into a big table. It also has both RC-5 and NEC codes inside.
77
* It should be broken into small tables, and the protocols should properly
8-
* be indentificated.
8+
* be identificated.
99
*
1010
* The table were imported from dib0700_devices.c.
1111
*

0 commit comments

Comments
 (0)