Merge branch 'for-linus' of git://github.com/NewDreamNetwork/ceph-client

[firefly-linux-kernel-4.4.55.git] / include / linux / atm.h

diff --git a/include/linux/atm.h b/include/linux/atm.h
index c791ddd969390578093843af29821e42ce0f460a..d3b292174aeb0821f8d63c3e6317a1f4d5e8b3d4 100644 (file)
--- a/include/linux/atm.h
+++ b/include/linux/atm.h
@@ -231,10 +231,21 @@ static __inline__ int atmpvc_addr_in_use(struct sockaddr_atmpvc addr)
  */
 
 struct atmif_sioc {
-    int number;
-    int length;
-    void __user *arg;
+       int number;
+       int length;
+       void __user *arg;
 };
 
+#ifdef __KERNEL__
+#ifdef CONFIG_COMPAT
+#include <linux/compat.h>
+struct compat_atmif_sioc {
+       int number;
+       int length;
+       compat_uptr_t arg;
+};
+#endif
+#endif
+
 typedef unsigned short atm_backend_t;
 #endif