diff --git a/[refs] b/[refs]
index 5960f935696b..8ff8ebdd29e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e557a2509f9e1477c10295b74e29e4e93fa2392
+refs/heads/master: 4307184f2b9240d0443bdf944c7b9eac044fe67b
diff --git a/trunk/scripts/headers_install.pl b/trunk/scripts/headers_install.pl
index 7d2b4146e02f..c6ae4052ab43 100644
--- a/trunk/scripts/headers_install.pl
+++ b/trunk/scripts/headers_install.pl
@@ -36,6 +36,9 @@
 		$line =~ s/\s__attribute_const__\s/ /g;
 		$line =~ s/\s__attribute_const__$//g;
 		$line =~ s/^#include <linux\/compiler.h>//;
+		$line =~ s/(^|\s)(inline)\b/$1__$2__/g;
+		$line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
+		$line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g;
 		printf OUTFILE "%s", $line;
 	}
 	close OUTFILE;