Merge branch 'android-3.0' into imx_3.0.15_android

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c

1 files changed, 5 insertions, 0 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index d9be9b9c3d0b..845c1d210ef1 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -891,6 +891,10 @@ out_no_task:
 	return ret;
 }
 
+#define mem_write NULL
+
+#ifndef mem_write
+/* This is a security hazard */
 static ssize_t mem_write(struct file * file, const char __user *buf,
 			 size_t count, loff_t *ppos)
 {
@@ -949,6 +953,7 @@ out_task:
 out_no_task:
 	return copied;
 }
+#endif
 
 loff_t mem_lseek(struct file *file, loff_t offset, int orig)
 {