diff options
| author | Alex Williamson <alex.williamson@hp.com> | 2007-04-09 13:40:25 -0600 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@hp.com> | 2007-04-09 13:40:25 -0600 |
| commit | b43b64a63d3647c069b583e4f47211e8fde82f1c (patch) | |
| tree | 073de416fd7aa12f0deb80b0cb763d3beec2a811 /unmodified_drivers | |
| parent | 6da461333694958d11ec529486307522633ce289 (diff) | |
| parent | 1bb4ad8e20a326bec0c845149980211d1f69869e (diff) | |
| download | xen-b43b64a63d3647c069b583e4f47211e8fde82f1c.tar.gz xen-b43b64a63d3647c069b583e4f47211e8fde82f1c.tar.bz2 xen-b43b64a63d3647c069b583e4f47211e8fde82f1c.zip | |
merge with xen-unstable.hg
Diffstat (limited to 'unmodified_drivers')
| -rw-r--r-- | unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h | 4 | ||||
| -rw-r--r-- | unmodified_drivers/linux-2.6/platform-pci/platform-pci.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h index f6a9371034..1f604a0e1a 100644 --- a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h +++ b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h @@ -96,6 +96,10 @@ extern char *kasprintf(gfp_t gfp, const char *fmt, ...) #define handle_sysrq(x,y,z) handle_sysrq(x,y) #endif +#if defined(_PAGE_PRESENT) && !defined(_PAGE_NX) +#define _PAGE_NX 0 +#endif + /* * This variable at present is referenced by netfront, but only in code that * is dead when running in hvm guests. To detect potential active uses of it diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c index 8e69557ac8..2451b7c6ce 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -1,6 +1,6 @@ /****************************************************************************** - * evtchn-pci.c - * xen event channel fake PCI device driver + * platform-pci.c + * Xen platform PCI device driver * Copyright (C) 2005, Intel Corporation. * * This program is free software; you can redistribute it and/or modify it |