From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 3 Jul 2006 14:25:08 +0000 (-0400)
Subject: Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.19-rc1~32^2~160
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=0a1340c185734a57fbf4775927966ad4a1347b02

Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/linux/kernel.h
---

0a1340c185734a57fbf4775927966ad4a1347b02
diff --cc include/linux/kernel.h
index c217e99d5073,5c1ec1f84eab..c3958ea8d126
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@@ -29,7 -32,7 +32,8 @@@ extern const char linux_banner[]
  
  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
  #define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
 +#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
+ #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
  
  #define	KERN_EMERG	"<0>"	/* system is unusable			*/
  #define	KERN_ALERT	"<1>"	/* action must be taken immediately	*/
diff --cc mm/filemap.c
index a02a0b2c986b,d087fc3d3281..b9c91ab7f0f8
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@@ -1044,9 -1122,14 +1122,15 @@@ success
  	desc->arg.buf += size;
  	return size;
  }
 +EXPORT_SYMBOL_GPL(file_read_actor);
  
- /*
+ /**
+  * __generic_file_aio_read - generic filesystem read routine
+  * @iocb:	kernel I/O control block
+  * @iov:	io vector request
+  * @nr_segs:	number of segments in the iovec
+  * @ppos:	current file position
+  *
   * This is the "read()" routine for all filesystems
   * that can use the page cache directly.
   */