Merge branch 'linus' into x86/uv

[karo-tx-linux.git] / drivers / misc / sgi-xp / xp.h

diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
index ed1722e50049ff2aea256edbb574bb9969cb3bda..7b4cbd5e03e99a3e4297dc6d4b6de219d30f7389 100644 (file)
--- a/drivers/misc/sgi-xp/xp.h
+++ b/drivers/misc/sgi-xp/xp.h
@@ -194,9 +194,10 @@ enum xp_retval {
        xpGruSendMqError,       /* 59: gru send message queue related error */
 
        xpBadChannelNumber,     /* 60: invalid channel number */
-       xpBadMsgType,           /* 60: invalid message type */
+       xpBadMsgType,           /* 61: invalid message type */
+       xpBiosError,            /* 62: BIOS error */
 
-       xpUnknownReason         /* 61: unknown reason - must be last in enum */
+       xpUnknownReason         /* 63: unknown reason - must be last in enum */
 };
 
 /*
@@ -345,6 +346,8 @@ extern unsigned long (*xp_pa) (void *);
 extern enum xp_retval (*xp_remote_memcpy) (unsigned long, const unsigned long,
                       size_t);
 extern int (*xp_cpu_to_nasid) (int);
+extern enum xp_retval (*xp_expand_memprotect) (unsigned long, unsigned long);
+extern enum xp_retval (*xp_restrict_memprotect) (unsigned long, unsigned long);
 
 extern u64 xp_nofault_PIOR_target;
 extern int xp_nofault_PIOR(void *);