You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

43 lines
1.1 KiB

  1. From b5159062f079d451f23d7f2a0e7d9e2f84934f94 Mon Sep 17 00:00:00 2001
  2. From: Rosen Penev <rosenp@gmail.com>
  3. Date: Sat, 29 Jan 2022 17:09:56 -0800
  4. Subject: [PATCH] btrfs-progs: fix 64-bit mips and powerpc types
  5. The kernel uses 'unsigned long' for u64 specifically for ppc64 and
  6. mips64.
  7. Remove asm/types.h include as it will get included properly later.
  8. Fixe -Wformat warnings.
  9. Signed-off-by: Rosen Penev <rosenp@gmail.com>
  10. Signed-off-by: David Sterba <dsterba@suse.com>
  11. ---
  12. cmds/receive-dump.c | 1 -
  13. kerncompat.h | 5 +++++
  14. 2 files changed, 5 insertions(+), 1 deletion(-)
  15. --- a/cmds/receive-dump.c
  16. +++ b/cmds/receive-dump.c
  17. @@ -31,7 +31,6 @@
  18. #include <stdlib.h>
  19. #include <time.h>
  20. #include <ctype.h>
  21. -#include <asm/types.h>
  22. #include <uuid/uuid.h>
  23. #include "common/utils.h"
  24. #include "cmds/commands.h"
  25. --- a/kerncompat.h
  26. +++ b/kerncompat.h
  27. @@ -19,6 +19,11 @@
  28. #ifndef __KERNCOMPAT_H__
  29. #define __KERNCOMPAT_H__
  30. +#ifndef __SANE_USERSPACE_TYPES__
  31. +/* For PPC64 to get LL64 types */
  32. +#define __SANE_USERSPACE_TYPES__
  33. +#endif
  34. +
  35. #include <stdio.h>
  36. #include <stdlib.h>
  37. #include <errno.h>