diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /mm/internal.h | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'mm/internal.h')
| -rw-r--r-- | mm/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/internal.h b/mm/internal.h index 3438dd43a062..9d0ced8e505e 100644 --- a/mm/internal.h +++ b/mm/internal.h | |||
| @@ -162,7 +162,7 @@ static inline struct page *mem_map_offset(struct page *base, int offset) | |||
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | /* | 164 | /* |
| 165 | * Iterator over all subpages withing the maximally aligned gigantic | 165 | * Iterator over all subpages within the maximally aligned gigantic |
| 166 | * page 'base'. Handle any discontiguity in the mem_map. | 166 | * page 'base'. Handle any discontiguity in the mem_map. |
| 167 | */ | 167 | */ |
| 168 | static inline struct page *mem_map_next(struct page *iter, | 168 | static inline struct page *mem_map_next(struct page *iter, |