diff --git a/[refs] b/[refs]
index cb7d43ead8f7..99e2480420d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17c5ca98833dc3d8f8dd4e85487da238c50cd8c9
+refs/heads/master: c01226c3145d173a0d38f9d5b4f229cc23d99ae2
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index d3cd23f30039..f4e3184fa054 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -659,6 +659,12 @@ extern int do_sysinfo(struct sysinfo *info);
 
 #endif /* __KERNEL__ */
 
+#ifndef __EXPORTED_HEADERS__
+#ifndef __KERNEL__
+#warning Attempt to use kernel headers from user space, see http://kernelnewbies.org/KernelHeaders
+#endif /* __KERNEL__ */
+#endif /* __EXPORTED_HEADERS__ */
+
 #define SI_LOAD_SHIFT	16
 struct sysinfo {
 	long uptime;			/* Seconds since boot */
diff --git a/trunk/scripts/headers_install.pl b/trunk/scripts/headers_install.pl
index c6ae4052ab43..b89ca2c58fdb 100644
--- a/trunk/scripts/headers_install.pl
+++ b/trunk/scripts/headers_install.pl
@@ -20,7 +20,7 @@
 
 my ($readdir, $installdir, $arch, @files) = @ARGV;
 
-my $unifdef = "scripts/unifdef -U__KERNEL__";
+my $unifdef = "scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__";
 
 foreach my $file (@files) {
 	local *INFILE;