blob: 08cf870169a84e3dfc49b2664168fcf4c445ad36 [file] [log] [blame]
Andrew Geissler32b11992021-03-31 13:37:05 -05001From 517f841ccac59b0579e706dd768d6c7b1a7e7552 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 12 Mar 2021 10:37:21 -0800
4Subject: [PATCH] Use asm/type.h for kernel types
5
6This ensures that right headers for types is included otherwise it can
7conflict for some platforms e.g. ppc64 where it includes the underlying
8files conditionally
9
10asm/types.h is
11
12if !defined(__SANE_USERSPACE_TYPES__) && defined(__powerpc64__) && !defined(__KERNEL__)
13 include <asm-generic/int-l64.h>
14else
15 include <asm-generic/int-ll64.h>
16endif
17
18Upstream-Status: Submitted [https://github.com/westerndigitalcorporation/ufs-utils/pull/29]
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
21 ufs.h | 1 -
22 ufs_cmds.h | 2 +-
23 ufs_ffu.c | 1 -
24 3 files changed, 1 insertion(+), 3 deletions(-)
25
26diff --git a/ufs.h b/ufs.h
27index dc51367..0321c54 100644
28--- a/ufs.h
29+++ b/ufs.h
30@@ -4,7 +4,6 @@
31
32 #ifndef UFS_H_
33 #define UFS_H_
34-#include <asm-generic/int-ll64.h>
35 #include "ioctl.h"
36 #include "scsi_bsg_util.h"
37
38diff --git a/ufs_cmds.h b/ufs_cmds.h
39index 1e7e24d..5c5b045 100644
40--- a/ufs_cmds.h
41+++ b/ufs_cmds.h
42@@ -5,7 +5,7 @@
43 #define UFS_CMNDS_H_
44
45 #include "options.h"
46-#include <asm-generic/int-ll64.h>
47+#include <asm/types.h>
48
49
50 enum field_width {
51diff --git a/ufs_ffu.c b/ufs_ffu.c
52index 2bcec44..99b479c 100644
53--- a/ufs_ffu.c
54+++ b/ufs_ffu.c
55@@ -12,7 +12,6 @@
56 #include <unistd.h>
57 #include <stdint.h>
58 #include <errno.h>
59-#include <asm-generic/int-ll64.h>
60
61 #include "ufs.h"
62 #include "ufs_cmds.h"
63--
642.30.2
65