diff options
| author | djm@kirby.fc.hp.com <djm@kirby.fc.hp.com> | 2005-06-09 22:04:26 +0000 |
|---|---|---|
| committer | djm@kirby.fc.hp.com <djm@kirby.fc.hp.com> | 2005-06-09 22:04:26 +0000 |
| commit | 6f882270c75214b3608277aba2b6414bdd766262 (patch) | |
| tree | f643a4199c3ce6726ff3185a9373a3c0fcbef500 | |
| parent | 3c178b4c826aa5be03d3a4d2b9b21d64cab5d667 (diff) | |
| download | xen-6f882270c75214b3608277aba2b6414bdd766262.tar.gz xen-6f882270c75214b3608277aba2b6414bdd766262.tar.bz2 xen-6f882270c75214b3608277aba2b6414bdd766262.zip | |
bitkeeper revision 1.1668.1.10 (42a8bceaXDRFCmwf1Omenu_lCITiag)
Oops, left new file out of Greg's sn patch
| -rw-r--r-- | .rootkeys | 1 | ||||
| -rw-r--r-- | xen/arch/ia64/patch/linux-2.6.11/sn_sal.h | 33 |
2 files changed, 34 insertions, 0 deletions
@@ -1043,6 +1043,7 @@ 428bb037KSxe7_UyqseK5bWhGe3KwA xen/arch/ia64/patch/linux-2.6.11/ptrace.h 425ae516LecDyXlwh3NLBtHZKXmMcA xen/arch/ia64/patch/linux-2.6.11/series 425ae516RFiPn2CGkpJ21LM-1lJcQg xen/arch/ia64/patch/linux-2.6.11/setup.c +42a8bcc8E6zmTKC5xgOcFLcnzbhVEw xen/arch/ia64/patch/linux-2.6.11/sn_sal.h 425ae516p4ICTkjqNYEfYFxqULj4dw xen/arch/ia64/patch/linux-2.6.11/system.h 425ae516juUB257qrwUdsL9AsswrqQ xen/arch/ia64/patch/linux-2.6.11/time.c 425ae5167zQn7zYcgKtDUDX2v-e8mw xen/arch/ia64/patch/linux-2.6.11/tlb.c diff --git a/xen/arch/ia64/patch/linux-2.6.11/sn_sal.h b/xen/arch/ia64/patch/linux-2.6.11/sn_sal.h new file mode 100644 index 0000000000..b38c1300f1 --- /dev/null +++ b/xen/arch/ia64/patch/linux-2.6.11/sn_sal.h @@ -0,0 +1,33 @@ +--- /data/lwork/attica1/edwardsg/linux-2.6.11/include/asm-ia64/sn/sn_sal.h 2005-03-02 01:38:33 -06:00 ++++ include/asm-ia64/sn/sn_sal.h 2005-06-01 14:31:47 -05:00 +@@ -123,6 +123,7 @@ + #define SALRET_ERROR (-3) + + ++#ifndef XEN + /** + * sn_sal_rev_major - get the major SGI SAL revision number + * +@@ -226,6 +227,7 @@ ia64_sn_get_klconfig_addr(nasid_t nasid) + } + return ret_stuff.v0 ? __va(ret_stuff.v0) : NULL; + } ++#endif /* !XEN */ + + /* + * Returns the next console character. +@@ -304,6 +306,7 @@ ia64_sn_console_putb(const char *buf, in + return (u64)0; + } + ++#ifndef XEN + /* + * Print a platform error record + */ +@@ -987,5 +990,5 @@ ia64_sn_hwperf_op(nasid_t nasid, u64 opc + *v0 = (int) rv.v0; + return (int) rv.status; + } +- ++#endif /* !XEN */ + #endif /* _ASM_IA64_SN_SN_SAL_H */ |