Index: kernel/generic/include/arch.h
===================================================================
--- kernel/generic/include/arch.h	(revision 36df41093d27358efd761887622e3076ed51cd14)
+++ kernel/generic/include/arch.h	(revision 234f47eefe7305abda1b54d47bba98ad0353446d)
@@ -89,9 +89,11 @@
 extern arch_ops_t *arch_ops;
 
-#define ARCH_OP(op) \
+#define ARCH_STRUCT_OP(s, op) \
 	do { \
-		if (arch_ops->op) \
-			arch_ops->op(); \
+		if ((s)->op) \
+			(s)->op(); \
 	} while (0)
+
+#define ARCH_OP(op)	ARCH_STRUCT_OP(arch_ops, op)
 
 extern void the_initialize(the_t *);