diff --git a/[refs] b/[refs]
index 7aa44a88a847..a8207187a9bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96e540492ab54423f3693958329e095878f1f12b
+refs/heads/master: baf5695dd1a49bb48a3daf08726d7f243f42e97e
diff --git a/trunk/include/asm-x86_64/pda.h b/trunk/include/asm-x86_64/pda.h
index e7773e0af865..c2aac96ac323 100644
--- a/trunk/include/asm-x86_64/pda.h
+++ b/trunk/include/asm-x86_64/pda.h
@@ -51,13 +51,13 @@ extern struct x8664_pda _proxy_pda;
 	typedef typeof(_proxy_pda.field) T__; \
        switch (sizeof(_proxy_pda.field)) { 		\
 case 2: \
-asm(op "w %1,%%gs:%P2" : "+m" (_proxy_pda.field) : \
+asm(op "w %1,%%gs:%c2" : "+m" (_proxy_pda.field) : \
 	"ri" ((T__)val),"i"(pda_offset(field))); break; \
 case 4: \
-asm(op "l %1,%%gs:%P2" : "+m" (_proxy_pda.field) : \
+asm(op "l %1,%%gs:%c2" : "+m" (_proxy_pda.field) : \
 	"ri" ((T__)val),"i"(pda_offset(field))); break; \
 case 8: \
-asm(op "q %1,%%gs:%P2": "+m" (_proxy_pda.field) : \
+asm(op "q %1,%%gs:%c2": "+m" (_proxy_pda.field) : \
 	 "ri" ((T__)val),"i"(pda_offset(field))); break; \
 default: __bad_pda_field(); 					\
        } \
@@ -67,13 +67,13 @@ default: __bad_pda_field(); 					\
        typeof(_proxy_pda.field) ret__; \
        switch (sizeof(_proxy_pda.field)) { 		\
 case 2: \
-asm(op "w %%gs:%P1,%0":"=r" (ret__):\
+asm(op "w %%gs:%c1,%0":"=r" (ret__):\
 	"i" (pda_offset(field)), "m" (_proxy_pda.field)); break;\
 case 4: \
-asm(op "l %%gs:%P1,%0":"=r" (ret__):\
+asm(op "l %%gs:%c1,%0":"=r" (ret__):\
 	"i" (pda_offset(field)), "m" (_proxy_pda.field)); break;\
 case 8: \
-asm(op "q %%gs:%P1,%0":"=r" (ret__):\
+asm(op "q %%gs:%c1,%0":"=r" (ret__):\
 	"i" (pda_offset(field)), "m" (_proxy_pda.field)); break;\
 default: __bad_pda_field(); 					\
        } \