Commit 30c05e5c authored by Andrew Morton's avatar Andrew Morton Committed by James Toy

Revert 2.6.31's temporary "/proc/kcore: work around a BUG()" to make way

for the permanent fix for that bug.

Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Nick Craig-Wood <nick@craig-wood.com>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: <kbowa@tuxedu.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 22bd581f
......@@ -361,13 +361,7 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
/* don't dump ioremap'd stuff! (TA) */
if (m->flags & VM_IOREMAP)
continue;
/*
* we may access memory holes, then use
* ex_table. checking return value just for
* avoid warnings.
*/
vmsize = __copy_from_user_inatomic(
elf_buf + (vmstart - start),
memcpy(elf_buf + (vmstart - start),
(char *)vmstart, vmsize);
}
read_unlock(&vmlist_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment