diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/compat_binfmt_elf.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/compat_binfmt_elf.c')
| -rw-r--r-- | fs/compat_binfmt_elf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c index 0adced2f296f..112e45a17e99 100644 --- a/fs/compat_binfmt_elf.c +++ b/fs/compat_binfmt_elf.c | |||
| @@ -28,10 +28,12 @@ | |||
| 28 | 28 | ||
| 29 | #undef elfhdr | 29 | #undef elfhdr |
| 30 | #undef elf_phdr | 30 | #undef elf_phdr |
| 31 | #undef elf_shdr | ||
| 31 | #undef elf_note | 32 | #undef elf_note |
| 32 | #undef elf_addr_t | 33 | #undef elf_addr_t |
| 33 | #define elfhdr elf32_hdr | 34 | #define elfhdr elf32_hdr |
| 34 | #define elf_phdr elf32_phdr | 35 | #define elf_phdr elf32_phdr |
| 36 | #define elf_shdr elf32_shdr | ||
| 35 | #define elf_note elf32_note | 37 | #define elf_note elf32_note |
| 36 | #define elf_addr_t Elf32_Addr | 38 | #define elf_addr_t Elf32_Addr |
| 37 | 39 | ||