Merge branch 'linus' into x86/xen

Conflicts:
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/process_64.c
	arch/x86/xen/enlighten.c

1 files changed, 9 insertions, 0 deletions

diff --git a/include/net/netns/mib.h b/include/net/netns/mib.h
index 449147604642..10cb7c336de5 100644
--- a/include/net/netns/mib.h
+++ b/include/net/netns/mib.h
@@ -11,6 +11,15 @@ struct netns_mib {
         DEFINE_SNMP_STAT(struct udp_mib, udplite_statistics);
         DEFINE_SNMP_STAT(struct icmp_mib, icmp_statistics);
         DEFINE_SNMP_STAT(struct icmpmsg_mib, icmpmsg_statistics);
+
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        struct proc_dir_entry *proc_net_devsnmp6;
+        DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6);
+        DEFINE_SNMP_STAT(struct udp_mib, udplite_stats_in6);
+        DEFINE_SNMP_STAT(struct ipstats_mib, ipv6_statistics);
+        DEFINE_SNMP_STAT(struct icmpv6_mib, icmpv6_statistics);
+        DEFINE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics);
+#endif
 };
 
 #endif