From: Khalid Aziz <khalid.aziz@oracle.com>
Date: Wed, 2 Mar 2016 20:03:53 +0000 (-0700)
Subject: sparc64: struct adi_caps should use __u64, not u64
X-Git-Tag: v4.1.12-92~74^2~30
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=04b6750492f8551a82a0336803922f736917639a;p=users%2Fjedix%2Flinux-maple.git

sparc64: struct adi_caps should use __u64, not u64

struct adi_caps uses u64 as the type for its field which is not
defined for include/uapi. Change it to __u64.

Orabug: 22713162

Signed-off-by: Khalid Aziz <khalid.aziz@oracle.com>
(cherry picked from commit 4b47a697322066fcd6cf0f4637dece26da3525fc)

Conflicts:
	include/uapi/linux/prctl.h

Signed-off-by: Allen Pais <allen.pais@oracle.com>
(cherry picked from commit 858864aea91eb7a1337cedd70a01ffb3fb5d898a)
(cherry picked from commit acf5580a66da8aae303a42af49de27d7500651cc)
---

diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h
index 31891d9535e2a..78d46c67b38cf 100644
--- a/include/uapi/linux/prctl.h
+++ b/include/uapi/linux/prctl.h
@@ -190,4 +190,20 @@ struct prctl_mm_map {
 # define PR_FP_MODE_FR		(1 << 0)	/* 64b FP registers */
 # define PR_FP_MODE_FRE		(1 << 1)	/* 32b compatibility */
 
+/* SPARC ADI operations, see Documentation/prctl/sparc_adi.txt for details */
+#define PR_GET_SPARC_ADICAPS	48
+#define PR_SET_SPARC_ADI	49
+# define PR_SET_SPARC_ADI_CLEAR	0
+# define PR_SET_SPARC_ADI_SET	1
+#define PR_ENABLE_SPARC_ADI	50
+#define PR_DISABLE_SPARC_ADI	51
+#define PR_GET_SPARC_ADI_STATUS	52
+
+/* Data structure returned by PR_GET_SPARC_ADICAPS */
+struct adi_caps {
+	__u64 blksz;
+	__u64 nbits;
+	__u64 ue_on_adi;
+};
+
 #endif /* _LINUX_PRCTL_H */