ia64/xen-unstable

changeset 5407:e2c063dd8eea

bitkeeper revision 1.1668.1.10 (42a8bceaXDRFCmwf1Omenu_lCITiag)

Oops, left new file out of Greg's sn patch
author djm@kirby.fc.hp.com
date Thu Jun 09 22:04:26 2005 +0000 (2005-06-09)
parents 92c494888b87
children a871bb5722c7
files .rootkeys xen/arch/ia64/patch/linux-2.6.11/sn_sal.h
line diff
     1.1 --- a/.rootkeys	Thu Jun 09 21:44:17 2005 +0000
     1.2 +++ b/.rootkeys	Thu Jun 09 22:04:26 2005 +0000
     1.3 @@ -1043,6 +1043,7 @@ 425ae516EWaNOBEnc1xnphTbRmNZsw xen/arch/
     1.4  428bb037KSxe7_UyqseK5bWhGe3KwA xen/arch/ia64/patch/linux-2.6.11/ptrace.h
     1.5  425ae516LecDyXlwh3NLBtHZKXmMcA xen/arch/ia64/patch/linux-2.6.11/series
     1.6  425ae516RFiPn2CGkpJ21LM-1lJcQg xen/arch/ia64/patch/linux-2.6.11/setup.c
     1.7 +42a8bcc8E6zmTKC5xgOcFLcnzbhVEw xen/arch/ia64/patch/linux-2.6.11/sn_sal.h
     1.8  425ae516p4ICTkjqNYEfYFxqULj4dw xen/arch/ia64/patch/linux-2.6.11/system.h
     1.9  425ae516juUB257qrwUdsL9AsswrqQ xen/arch/ia64/patch/linux-2.6.11/time.c
    1.10  425ae5167zQn7zYcgKtDUDX2v-e8mw xen/arch/ia64/patch/linux-2.6.11/tlb.c
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/xen/arch/ia64/patch/linux-2.6.11/sn_sal.h	Thu Jun 09 22:04:26 2005 +0000
     2.3 @@ -0,0 +1,33 @@
     2.4 +--- /data/lwork/attica1/edwardsg/linux-2.6.11/include/asm-ia64/sn/sn_sal.h	2005-03-02 01:38:33 -06:00
     2.5 ++++ include/asm-ia64/sn/sn_sal.h	2005-06-01 14:31:47 -05:00
     2.6 +@@ -123,6 +123,7 @@
     2.7 + #define SALRET_ERROR		(-3)
     2.8 +
     2.9 +
    2.10 ++#ifndef XEN
    2.11 + /**
    2.12 +  * sn_sal_rev_major - get the major SGI SAL revision number
    2.13 +  *
    2.14 +@@ -226,6 +227,7 @@ ia64_sn_get_klconfig_addr(nasid_t nasid)
    2.15 + 	}
    2.16 + 	return ret_stuff.v0 ? __va(ret_stuff.v0) : NULL;
    2.17 + }
    2.18 ++#endif /* !XEN */
    2.19 +
    2.20 + /*
    2.21 +  * Returns the next console character.
    2.22 +@@ -304,6 +306,7 @@ ia64_sn_console_putb(const char *buf, in
    2.23 + 	return (u64)0;
    2.24 + }
    2.25 +
    2.26 ++#ifndef XEN
    2.27 + /*
    2.28 +  * Print a platform error record
    2.29 +  */
    2.30 +@@ -987,5 +990,5 @@ ia64_sn_hwperf_op(nasid_t nasid, u64 opc
    2.31 + 		*v0 = (int) rv.v0;
    2.32 + 	return (int) rv.status;
    2.33 + }
    2.34 +-
    2.35 ++#endif /* !XEN */
    2.36 + #endif /* _ASM_IA64_SN_SN_SAL_H */