diff options
| author | Thadeu Lima de Souza Cascardo <cascardo@debian.org> | 2020-03-02 04:48:06 -0300 |
|---|---|---|
| committer | Thadeu Lima de Souza Cascardo <cascardo@debian.org> | 2020-03-02 04:48:06 -0300 |
| commit | 5975a25c8789536fe91ff57d360f5f8cc6f47fd8 (patch) | |
| tree | 3fb59e62845f281b9887fb798cf8d9d15c913a34 /makedumpfile.h | |
| parent | 4e5c6d36a8f673c97b7c63bea39278c3fa7b40be (diff) | |
| parent | e7301654029330bbf49693002fa72223f9b3fb36 (diff) | |
Update to upstream 1.6.7
[git-debrebase anchor: new upstream 1.6.7, merge]
Diffstat (limited to 'makedumpfile.h')
| -rw-r--r-- | makedumpfile.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/makedumpfile.h b/makedumpfile.h index 24b2f69..68d9691 100644 --- a/makedumpfile.h +++ b/makedumpfile.h @@ -195,7 +195,7 @@ isAnon(unsigned long mapping) * 2. it has been verified that (1UL<<2) was never set, so it is * safe to mask that bit off even in old kernels. */ -#define SECTION_MAP_LAST_BIT (1UL<<3) +#define SECTION_MAP_LAST_BIT (1UL<<4) #define SECTION_MAP_MASK (~(SECTION_MAP_LAST_BIT-1)) #define NR_SECTION_ROOTS() divideup(num_section, SECTIONS_PER_ROOT()) #define SECTION_NR_TO_PFN(sec) ((sec) << PFN_SECTION_SHIFT()) @@ -495,7 +495,7 @@ do { \ #define KVER_MIN_SHIFT 16 #define KERNEL_VERSION(x,y,z) (((x) << KVER_MAJ_SHIFT) | ((y) << KVER_MIN_SHIFT) | (z)) #define OLDEST_VERSION KERNEL_VERSION(2, 6, 15) /* linux-2.6.15 */ -#define LATEST_VERSION KERNEL_VERSION(5, 1, 9) /* linux-5.1.9 */ +#define LATEST_VERSION KERNEL_VERSION(5, 4, 8) /* linux-5.4.8 */ /* * vmcoreinfo in /proc/vmcore @@ -542,7 +542,6 @@ do { \ #ifdef __aarch64__ unsigned long get_kvbase_arm64(void); #define KVBASE get_kvbase_arm64() -#define __START_KERNEL_map (0xffffffff80000000UL) #endif /* aarch64 */ @@ -965,6 +964,7 @@ typedef unsigned long pgd_t; static inline int stub_true() { return TRUE; } static inline int stub_true_ul(unsigned long x) { return TRUE; } static inline int stub_false() { return FALSE; } +unsigned long get_kaslr_offset_general(unsigned long vaddr); #define paddr_to_vaddr_general(X) ((X) + PAGE_OFFSET) #ifdef __aarch64__ @@ -974,7 +974,6 @@ unsigned long long vaddr_to_paddr_arm64(unsigned long vaddr); int get_versiondep_info_arm64(void); int get_xen_basic_info_arm64(void); int get_xen_info_arm64(void); -unsigned long get_kaslr_offset_arm64(unsigned long vaddr); #define paddr_to_vaddr_arm64(X) (((X) - info->phys_base) | PAGE_OFFSET) #define find_vmemmap() stub_false() @@ -983,7 +982,7 @@ unsigned long get_kaslr_offset_arm64(unsigned long vaddr); #define get_phys_base() get_phys_base_arm64() #define get_machdep_info() get_machdep_info_arm64() #define get_versiondep_info() get_versiondep_info_arm64() -#define get_kaslr_offset(X) get_kaslr_offset_arm64(X) +#define get_kaslr_offset(X) get_kaslr_offset_general(X) #define get_xen_basic_info_arch(X) get_xen_basic_info_arm64(X) #define get_xen_info_arch(X) get_xen_info_arm64(X) #define is_phys_addr(X) stub_true_ul(X) @@ -1076,7 +1075,7 @@ int is_iomem_phys_addr_s390x(unsigned long addr); #define get_phys_base() stub_true() #define get_machdep_info() get_machdep_info_s390x() #define get_versiondep_info() stub_true() -#define get_kaslr_offset(X) stub_false() +#define get_kaslr_offset(X) get_kaslr_offset_general(X) #define vaddr_to_paddr(X) vaddr_to_paddr_s390x(X) #define paddr_to_vaddr(X) paddr_to_vaddr_general(X) #define is_phys_addr(X) is_iomem_phys_addr_s390x(X) |