On Thu, Mar 01, 2012 at 12:15:57PM -0800, Andrew Morton wrote: > On Thu, 1 Mar 2012 20:22:59 +0100 > Daniel Vetter <daniel.vetter@xxxxxxxx> wrote: > > > drm/i915 wants to read/write more than one page in its fastpath > > and hence needs to prefault more than PAGE_SIZE bytes. > > > > Add new functions in filemap.h to make that possible. > > > > Also kill a copy&pasted spurious space in both functions while at it. > > > > > > ... > > > > +/* Multipage variants of the above prefault helpers, useful if more than > > + * PAGE_SIZE of date needs to be prefaulted. These are separate from the above > > + * functions (which only handle up to PAGE_SIZE) to avoid clobbering the > > + * filemap.c hotpaths. */ > > Like this please: > > /* > * Multipage variants of the above prefault helpers, useful if more than > * PAGE_SIZE of date needs to be prefaulted. These are separate from the above > * functions (which only handle up to PAGE_SIZE) to avoid clobbering the > * filemap.c hotpaths. > */ > > and s/date/data/ ... > Please merge it via the DRI tree. Ok, I've queued this up 3.5 (it missed the 3.4 merge because a few of the drm/i915 patches from that series haven't been reviewed in time) with the comment fixed up and your Acked-by on the commit message. I hope the later is ok, otherwise please yell. Thanks for reviewing this. -Daniel -- Daniel Vetter Mail: daniel@xxxxxxxx Mobile: +41 (0)79 365 57 48 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>