diff -ur a/qemu/qemu-kvm.h b/qemu/qemu-kvm.h
--- a/qemu/qemu-kvm.h	2007-10-25 11:55:25.000000000 -0500
+++ b/qemu/qemu-kvm.h	2007-10-25 12:48:38.000000000 -0500
@@ -30,7 +30,6 @@
 
 #define ALIGN(x, y)  (((x)+(y)-1) & ~((y)-1))
 #define BITMAP_SIZE(m) (ALIGN(((m)>>TARGET_PAGE_BITS), HOST_LONG_BITS) / 8)
-#endif
 
 extern int kvm_tpr_log_enabled;
 void kvm_do_log_tpr(int write);
@@ -42,3 +41,4 @@
     if (kvm_tpr_log_enabled && addr == 0xfee00080)
 	kvm_do_log_tpr(write);
 }
+#endif