diff options
author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-04-20 11:28:57 +0800 |
---|---|---|
committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-04-20 11:28:57 +0800 |
commit | eb1da050c08bb961a1e45dd51f97821d3eeb2ae9 (patch) | |
tree | 543a339d5395485a5a2d99f91e42c817a147b461 /fs | |
parent | 8e3395a73276d41082c35e2af21d44dbd3d648ff (diff) | |
parent | 2914e50b00af66d52eac98fa58e4f4f159a2305b (diff) |
Merge branch 'android-3.0' into imx_3.0.15_android
Conflicts:
drivers/cpufreq/cpufreq_interactive.c
Diffstat (limited to 'fs')
-rw-r--r-- | fs/proc/base.c | 5 |
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) { |