diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /fs/binfmt_elf.c | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'fs/binfmt_elf.c')
| -rw-r--r-- | fs/binfmt_elf.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index f42e64210ee5..672a3b90bc55 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
| @@ -1185,8 +1185,6 @@ static int maydump(struct vm_area_struct *vma) | |||
| 1185 | return 1; | 1185 | return 1; |
| 1186 | } | 1186 | } |
| 1187 | 1187 | ||
| 1188 | #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) | ||
| 1189 | |||
| 1190 | /* An ELF note in memory */ | 1188 | /* An ELF note in memory */ |
| 1191 | struct memelfnote | 1189 | struct memelfnote |
| 1192 | { | 1190 | { |