diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-12-07 04:57:19 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-07 04:57:19 -0500 |
| commit | 8d1413b28033c49c7f1a4d320e815d7a5531acee (patch) | |
| tree | b37281abef014cd60803b81c100388d7a475d49e /include/linux/elf.h | |
| parent | ed25ffa16434724f5ed825aa48734c7f3aefa203 (diff) | |
| parent | 620034c84d1d939717bdfbe02c51a3fee43541c3 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_main.c
Diffstat (limited to 'include/linux/elf.h')
| -rw-r--r-- | include/linux/elf.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/elf.h b/include/linux/elf.h index b70d1d2c8d28..743d5c8e6d36 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h | |||
| @@ -368,5 +368,12 @@ extern Elf64_Dyn _DYNAMIC []; | |||
| 368 | 368 | ||
| 369 | #endif | 369 | #endif |
| 370 | 370 | ||
| 371 | #ifndef ARCH_HAVE_EXTRA_ELF_NOTES | ||
| 372 | static inline int arch_notes_size(void) { return 0; } | ||
| 373 | static inline void arch_write_notes(struct file *file) { } | ||
| 374 | |||
| 375 | #define ELF_CORE_EXTRA_NOTES_SIZE arch_notes_size() | ||
| 376 | #define ELF_CORE_WRITE_EXTRA_NOTES arch_write_notes(file) | ||
| 377 | #endif /* ARCH_HAVE_EXTRA_ELF_NOTES */ | ||
| 371 | 378 | ||
| 372 | #endif /* _LINUX_ELF_H */ | 379 | #endif /* _LINUX_ELF_H */ |