Merge tag 'arm-soc/for-4.16/drivers-fixes' of https://github.com/Broadcom/stblinux...

[sfrench/cifs-2.6.git] / lib / ubsan.h

diff --git a/lib/ubsan.h b/lib/ubsan.h
index 88f23557edbe16d5a60d691591d4e1981437f7d7..f4d8d0bd4016f42d7c9c50b66d0250367e8dd555 100644 (file)
--- a/lib/ubsan.h
+++ b/lib/ubsan.h
@@ -37,15 +37,24 @@ struct type_mismatch_data {
        unsigned char type_check_kind;
 };
 
-struct nonnull_arg_data {
+struct type_mismatch_data_v1 {
        struct source_location location;
-       struct source_location attr_location;
-       int arg_index;
+       struct type_descriptor *type;
+       unsigned char log_alignment;
+       unsigned char type_check_kind;
+};
+
+struct type_mismatch_data_common {
+       struct source_location *location;
+       struct type_descriptor *type;
+       unsigned long alignment;
+       unsigned char type_check_kind;
 };
 
-struct nonnull_return_data {
+struct nonnull_arg_data {
        struct source_location location;
        struct source_location attr_location;
+       int arg_index;
 };
 
 struct vla_bound_data {