Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / hvcall.h

diff --git a/include/asm-powerpc/hvcall.h b/include/asm-powerpc/hvcall.h
index da7af5a720e098adf14ad1ccf9b0817e9d429fde..38ca9ad6110d6640b37a1b0e06bd8ed50599abbc 100644 (file)
--- a/include/asm-powerpc/hvcall.h
+++ b/include/asm-powerpc/hvcall.h
@@ -6,7 +6,10 @@
 
 #define H_Success      0
 #define H_Busy         1       /* Hardware busy -- retry later */
+#define H_Closed       2       /* Resource closed */
 #define H_Constrained  4       /* Resource request constrained to max allowed */
+#define H_InProgress   14      /* Kind of like busy */
+#define H_Continue     18      /* Returned from H_Join on success */
 #define H_LongBusyStartRange   9900  /* Start of long busy range */
 #define H_LongBusyOrder1msec   9900  /* Long busy, hint that 1msec is a good time to retry */
 #define H_LongBusyOrder10msec  9901  /* Long busy, hint that 10msec is a good time to retry */
@@ -114,6 +117,8 @@
 #define H_REGISTER_VTERM       0x154
 #define H_FREE_VTERM           0x158
 #define H_POLL_PENDING         0x1D8
+#define H_JOIN                 0x298
+#define H_ENABLE_CRQ           0x2B0
 
 #ifndef __ASSEMBLY__