Index: generic/include/mm/asid.h
===================================================================
--- generic/include/mm/asid.h	(revision 578aebf7028f32bc437d7feed5f4da40cf5d4575)
+++ generic/include/mm/asid.h	(revision 2c49fbbe94d5783a6ef513db167c10a5899f7d07)
@@ -49,5 +49,4 @@
 #ifndef __ASM__
 
-
 #define ASIDS_ALLOCABLE	((ASID_MAX+1)-ASID_START)
 
@@ -55,6 +54,11 @@
 extern link_t as_with_asid_head;
 
-extern asid_t asid_get(void);        /*This is in collision with ia32 macro*/
+#ifndef asid_get
+extern asid_t asid_get(void);
+#endif /* !def asid_get */
+
+#ifndef asid_put
 extern void asid_put(asid_t asid);
+#endif /* !def asid_put */
 
 #ifndef asid_install