diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index f0eafc958210e40c433e6dae402caa8b1c949057..a447d7dd011ca1e3d3ecf7a014f383054d7a2be4 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -1010,7 +1010,11 @@ struct perf_sample_data {
 	struct perf_raw_record		*raw;
 	struct perf_branch_stack	*br_stack;
 	u64				period;
+#ifndef __GENKSYMS__
 	union perf_sample_weight	weight;
+#else
+	u64				weight;
+#endif
 	u64				txn;
 	union  perf_mem_data_src	data_src;
 
@@ -1040,8 +1044,10 @@ struct perf_sample_data {
 
 	u64				phys_addr;
 	u64				cgroup;
+#ifndef __GENKSYMS__
 	u64				data_page_size;
 	u64				code_page_size;
+#endif
 } ____cacheline_aligned;
 
 /* default value for data source */
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 7d292de51410cec1cd3784983939cd3408aa3913..dbcfaf519e70ad131f433721727f1215e875e20e 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -1146,16 +1146,24 @@ union perf_mem_data_src {
 			mem_lvl_num:4,	/* memory hierarchy level number */
 			mem_remote:1,   /* remote */
 			mem_snoopx:2,	/* snoop mode, ext */
+#ifndef __GENKSYMS__
 			mem_blk:3,	/* access blocked */
 			mem_rsvd:21;
+#else
+			mem_rsvd:24;
+#endif
 	};
 };
 #elif defined(__BIG_ENDIAN_BITFIELD)
 union perf_mem_data_src {
 	__u64 val;
 	struct {
+#ifndef __GENKSYMS__
 		__u64	mem_rsvd:21,
 			mem_blk:3,	/* access blocked */
+#else
+		__u64   mem_rsvd:24,
+#endif
 			mem_snoopx:2,	/* snoop mode, ext */
 			mem_remote:1,   /* remote */
 			mem_lvl_num:4,	/* memory hierarchy level number */