Index: arch/ia64/include/faddr.h
===================================================================
--- arch/ia64/include/faddr.h	(revision ab46edb8afe75b3b4e7e1e302267cdac31511463)
+++ arch/ia64/include/faddr.h	(revision 769e8c1c46576452d1690d06da44c11a132cfcb7)
@@ -44,30 +44,15 @@
 inline __address FADDR(void (* fptr)(void)) {
 	__address faddr;
-	
+
+	/*Deprecated assembler version*/
+	/*	
 	__asm__(
-		"nop 0;;"
-		"nop 0;;"
-		"nop 0;;"
-		"nop 0;;"
-		"nop 0;;"
-		"nop 0;;"
-		"nop 0;;"
-		"nop 0;;"
 		"ld8 %0 = [%1]\n\t"
-		"nop 0;;"
-		"nop 0;;"
-		"nop 0;;"
-		"nop 0;;"
-		"nop 0;;"
-		"nop 0;;"
-		"nop 0;;"
-		"nop 0;;"
-
 		: "=r" (faddr)
 		: "r" (fptr)
 	);
-	
+	*/
 
-	/*faddr = *((__address *)(fptr));;*/
+	faddr = *((__address *)(fptr));;
 	return faddr;
 }