diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
commit | da206c9e68cb93fcab43592d46276c02889c1250 (patch) | |
tree | 21264cc26fa0322d668b398808f10bd93558d25f /mm | |
parent | 916d15445f4ad2a9018e5451760734f36083be77 (diff) | |
parent | 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
typo fixes
Clean up 'inline is not at beginning' warnings for usb storage
Storage class should be first
i386: Trivial typo fixes
ixj: make ixj_set_tone_off() static
spelling fixes
fix paniced->panicked typos
Spelling fixes for Documentation/atomic_ops.txt
move acknowledgment for Mark Adler to CREDITS
remove the bouncing email address of David Campbell
Diffstat (limited to 'mm')
-rw-r--r-- | mm/page_alloc.c | 2 | ||||
-rw-r--r-- | mm/readahead.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 6c1174fcf52c..9f86191bb632 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -266,7 +266,7 @@ static inline void rmv_page_order(struct page *page) | |||
266 | * satisfies the following equation: | 266 | * satisfies the following equation: |
267 | * P = B & ~(1 << O) | 267 | * P = B & ~(1 << O) |
268 | * | 268 | * |
269 | * Assumption: *_mem_map is contigious at least up to MAX_ORDER | 269 | * Assumption: *_mem_map is contiguous at least up to MAX_ORDER |
270 | */ | 270 | */ |
271 | static inline struct page * | 271 | static inline struct page * |
272 | __page_find_buddy(struct page *page, unsigned long page_idx, unsigned int order) | 272 | __page_find_buddy(struct page *page, unsigned long page_idx, unsigned int order) |
diff --git a/mm/readahead.c b/mm/readahead.c index e39e416860d7..aa7ec424656a 100644 --- a/mm/readahead.c +++ b/mm/readahead.c | |||
@@ -390,8 +390,8 @@ int do_page_cache_readahead(struct address_space *mapping, struct file *filp, | |||
390 | * Read 'nr_to_read' pages starting at page 'offset'. If the flag 'block' | 390 | * Read 'nr_to_read' pages starting at page 'offset'. If the flag 'block' |
391 | * is set wait till the read completes. Otherwise attempt to read without | 391 | * is set wait till the read completes. Otherwise attempt to read without |
392 | * blocking. | 392 | * blocking. |
393 | * Returns 1 meaning 'success' if read is succesfull without switching off | 393 | * Returns 1 meaning 'success' if read is successful without switching off |
394 | * readhaead mode. Otherwise return failure. | 394 | * readahead mode. Otherwise return failure. |
395 | */ | 395 | */ |
396 | static int | 396 | static int |
397 | blockable_page_cache_readahead(struct address_space *mapping, struct file *filp, | 397 | blockable_page_cache_readahead(struct address_space *mapping, struct file *filp, |