git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
proc
/
kcore.c
diff --git
a/fs/proc/kcore.c
b/fs/proc/kcore.c
index
5c08a9c
..
150d9c5
100644
(file)
--- a/
fs/proc/kcore.c
+++ b/
fs/proc/kcore.c
@@
-9,7
+9,6
@@
* Safe accesses to vmalloc/direct-mapped discontiguous areas, Kanoj Sarcar <kanoj@sgi.com>
*/
* Safe accesses to vmalloc/direct-mapped discontiguous areas, Kanoj Sarcar <kanoj@sgi.com>
*/
-#include <linux/config.h>
#include <linux/mm.h>
#include <linux/proc_fs.h>
#include <linux/user.h>
#include <linux/mm.h>
#include <linux/proc_fs.h>
#include <linux/user.h>
@@
-43,8
+42,6
@@
const struct file_operations proc_kcore_operations = {
#define kc_offset_to_vaddr(o) ((o) + PAGE_OFFSET)
#endif
#define kc_offset_to_vaddr(o) ((o) + PAGE_OFFSET)
#endif
-#define roundup(x, y) ((((x)+((y)-1))/(y))*(y))
-
/* An ELF note in memory */
struct memelfnote
{
/* An ELF note in memory */
struct memelfnote
{
@@
-385,7
+382,7
@@
read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
*/
if (n) {
if (clear_user(buffer + tsz - n,
*/
if (n) {
if (clear_user(buffer + tsz - n,
-
tsz -
n))
+ n))
return -EFAULT;
}
} else {
return -EFAULT;
}
} else {