patch-vmcore-dmesg_vmcore-dmesg_c 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. --- kexec-tools-2.0.5.orig/vmcore-dmesg/vmcore-dmesg.c 2014-01-15 00:51:14.000000000 +0100
  2. +++ kexec-tools-2.0.5/vmcore-dmesg/vmcore-dmesg.c 2014-03-18 15:00:45.000000000 +0100
  3. @@ -26,14 +26,14 @@ static Elf64_Ehdr ehdr;
  4. static Elf64_Phdr *phdr;
  5. static char osrelease[4096];
  6. -static loff_t log_buf_vaddr;
  7. -static loff_t log_end_vaddr;
  8. -static loff_t log_buf_len_vaddr;
  9. -static loff_t logged_chars_vaddr;
  10. +static off_t log_buf_vaddr;
  11. +static off_t log_end_vaddr;
  12. +static off_t log_buf_len_vaddr;
  13. +static off_t logged_chars_vaddr;
  14. /* record format logs */
  15. -static loff_t log_first_idx_vaddr;
  16. -static loff_t log_next_idx_vaddr;
  17. +static off_t log_first_idx_vaddr;
  18. +static off_t log_next_idx_vaddr;
  19. /* struct log size */
  20. static uint64_t log_sz;
  21. @@ -266,7 +266,7 @@ static void scan_vmcoreinfo(char *start,
  22. const char *str;
  23. const char *name;
  24. size_t len;
  25. - loff_t *vaddr;
  26. + off_t *vaddr;
  27. } symbol[] = {
  28. SYMBOL(log_buf),
  29. SYMBOL(log_end),
  30. @@ -344,7 +344,7 @@ static void scan_vmcoreinfo(char *start,
  31. }
  32. }
  33. -static void scan_notes(int fd, loff_t start, loff_t lsize)
  34. +static void scan_notes(int fd, off_t start, off_t lsize)
  35. {
  36. char *buf, *last, *note, *next;
  37. size_t size;