diff --git a/[refs] b/[refs]
index 1c8f13ffd1dc..988f7b02a6d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af22d9de45caf8b2a99f2b27a927169c029528b4
+refs/heads/master: 122733a189d687087364d6dc3ecc7c682554f6a0
diff --git a/trunk/include/linux/cpu_rmap.h b/trunk/include/linux/cpu_rmap.h
index 473771a528c0..ac3bbb5b9502 100644
--- a/trunk/include/linux/cpu_rmap.h
+++ b/trunk/include/linux/cpu_rmap.h
@@ -1,3 +1,6 @@
+#ifndef __LINUX_CPU_RMAP_H
+#define __LINUX_CPU_RMAP_H
+
 /*
  * cpu_rmap.c: CPU affinity reverse-map support
  * Copyright 2011 Solarflare Communications Inc.
@@ -71,3 +74,4 @@ extern void free_irq_cpu_rmap(struct cpu_rmap *rmap);
 extern int irq_cpu_rmap_add(struct cpu_rmap *rmap, int irq);
 
 #endif
+#endif /* __LINUX_CPU_RMAP_H */