diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 13:25:05 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 13:25:05 -0700 |
commit | fb3b80614438f8b73b3879a19350439d6aa402da (patch) | |
tree | 8397dc4dd85b3ecc8d3cb3f56d143843a6346b8c /include/linux | |
parent | 7f268a2ba7c884a239713696238dd4207a57dd9a (diff) | |
parent | 3a61ec387c9092dfc91a5959145d36835a72fc4c (diff) | |
download | linux-3.10-fb3b80614438f8b73b3879a19350439d6aa402da.tar.gz linux-3.10-fb3b80614438f8b73b3879a19350439d6aa402da.tar.bz2 linux-3.10-fb3b80614438f8b73b3879a19350439d6aa402da.zip |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, AMD IOMMU: include amd_iommu_last_bdf in device initialization
x86: fix IBM Summit based systems' phys_cpu_present_map on 32-bit kernels
x86, RDC321x: remove gpio.h complications
x86, RDC321x: add to mach-default
crashdump: fix undefined reference to `elfcorehdr_addr'
flag parameters: fix compile error of sys_epoll_create1
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/crash_dump.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h index 6cd39a927e1..025e4f57510 100644 --- a/include/linux/crash_dump.h +++ b/include/linux/crash_dump.h @@ -8,7 +8,13 @@ #include <linux/proc_fs.h> #define ELFCORE_ADDR_MAX (-1ULL) + +#ifdef CONFIG_PROC_VMCORE extern unsigned long long elfcorehdr_addr; +#else +static const unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX; +#endif + extern ssize_t copy_oldmem_page(unsigned long, char *, size_t, unsigned long, int); extern const struct file_operations proc_vmcore_operations; |