diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 14:40:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 14:40:58 -0400 |
commit | 80cc38b16389849a6e06441ace4530f6b2497c3c (patch) | |
tree | 1dabc02b0a1faa6b640de20e38aa31bb5d0c443f /mm | |
parent | 3366dd9fa887ebbda4872e9554f853eaeda764be (diff) | |
parent | 83a35e360433b58791bc9c4e288cace466d62e3a (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"The usual stuff from trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
treewide: relase -> release
Documentation/cgroups/memory.txt: fix stat file documentation
sysctl/net.txt: delete reference to obsolete 2.4.x kernel
spinlock_api_smp.h: fix preprocessor comments
treewide: Fix typo in printk
doc: device tree: clarify stuff in usage-model.txt.
open firmware: "/aliasas" -> "/aliases"
md: bcache: Fixed a typo with the word 'arithmetic'
irq/generic-chip: fix a few kernel-doc entries
frv: Convert use of typedef ctl_table to struct ctl_table
sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
doc: clk: Fix incorrect wording
Documentation/arm/IXP4xx fix a typo
Documentation/networking/ieee802154 fix a typo
Documentation/DocBook/media/v4l fix a typo
Documentation/video4linux/si476x.txt fix a typo
Documentation/virtual/kvm/api.txt fix a typo
Documentation/early-userspace/README fix a typo
Documentation/video4linux/soc-camera.txt fix a typo
lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment
...
Diffstat (limited to 'mm')
-rw-r--r-- | mm/mmu_notifier.c | 2 | ||||
-rw-r--r-- | mm/sparse.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c index 6725ff183374..93e6089cb456 100644 --- a/mm/mmu_notifier.c +++ b/mm/mmu_notifier.c | |||
@@ -315,7 +315,7 @@ void mmu_notifier_unregister(struct mmu_notifier *mn, struct mm_struct *mm) | |||
315 | 315 | ||
316 | /* | 316 | /* |
317 | * Wait for any running method to finish, of course including | 317 | * Wait for any running method to finish, of course including |
318 | * ->release if it was run by mmu_notifier_relase instead of us. | 318 | * ->release if it was run by mmu_notifier_release instead of us. |
319 | */ | 319 | */ |
320 | synchronize_srcu(&srcu); | 320 | synchronize_srcu(&srcu); |
321 | 321 | ||
diff --git a/mm/sparse.c b/mm/sparse.c index 3194ec414728..b38400f0fb8d 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
@@ -79,7 +79,6 @@ static int __meminit sparse_index_init(unsigned long section_nr, int nid) | |||
79 | { | 79 | { |
80 | unsigned long root = SECTION_NR_TO_ROOT(section_nr); | 80 | unsigned long root = SECTION_NR_TO_ROOT(section_nr); |
81 | struct mem_section *section; | 81 | struct mem_section *section; |
82 | int ret = 0; | ||
83 | 82 | ||
84 | if (mem_section[root]) | 83 | if (mem_section[root]) |
85 | return -EEXIST; | 84 | return -EEXIST; |
@@ -90,7 +89,7 @@ static int __meminit sparse_index_init(unsigned long section_nr, int nid) | |||
90 | 89 | ||
91 | mem_section[root] = section; | 90 | mem_section[root] = section; |
92 | 91 | ||
93 | return ret; | 92 | return 0; |
94 | } | 93 | } |
95 | #else /* !SPARSEMEM_EXTREME */ | 94 | #else /* !SPARSEMEM_EXTREME */ |
96 | static inline int sparse_index_init(unsigned long section_nr, int nid) | 95 | static inline int sparse_index_init(unsigned long section_nr, int nid) |