diff --git a/TODO b/TODO
index 652000ee2..b730fd591 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,9 @@
+* Post 3.5:
+- Check if PaulMcK has fixed CONFIG_RCU_FAST_NO_HZ
+
 Config TODOs:
 * review & disable a bunch of the I2C, RTC, DVB, SOUND options.
 
-
 Spec file TODOs:
 
 * modules-extra: Do a few more things to make it a bit more robust.
diff --git a/config-generic b/config-generic
index d6d04e544..9d6be3c27 100644
--- a/config-generic
+++ b/config-generic
@@ -4296,6 +4296,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
 CONFIG_STRIP_ASM_SYMS=y
 
 # CONFIG_RCU_FANOUT_EXACT is not set
+# FIXME: Revisit FAST_NO_HZ after 3.5
 # CONFIG_RCU_FAST_NO_HZ is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TORTURE_TEST is not set