From: "Serge E. Hallyn" <serue@us.ibm.com>

include/linux/integrity.h:integrity_measure() returns void,
but the non-integrity dummy version does 'return 0;'.

Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Cc: Mimi Zohar <zohar@us.ibm.com>
Cc: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/integrity.h |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -puN include/linux/integrity.h~integrity-service-api-and-dummy-provider-fix include/linux/integrity.h
--- a/include/linux/integrity.h~integrity-service-api-and-dummy-provider-fix
+++ a/include/linux/integrity.h
@@ -86,7 +86,7 @@ static inline int integrity_verify_data(
 static inline void integrity_measure(struct dentry *dentry,
 			const unsigned char *filename, int mask)
 {
-	return integrity_ops->measure(dentry, filename, mask);
+	integrity_ops->measure(dentry, filename, mask);
 }
 #else
 static inline int integrity_verify_metadata(struct dentry *dentry,
@@ -107,7 +107,6 @@ static inline int integrity_verify_data(
 static inline void integrity_measure(struct dentry *dentry,
 			const unsigned char *filename, int mask)
 {
-	return 0;
 }
 #endif
 #endif
_