diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-02-01 16:28:50 +0100 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-02-01 16:28:50 +0100 |
| commit | d8b61b1e9f8b719376779b41f29e01ca971c653d (patch) | |
| tree | 1a4cac162f47222b184dad65cf3e90d942d93197 /xen/include/asm-x86/mach-default | |
| parent | 01f7c3a66cc11ac92bffc302e30053b5491884dc (diff) | |
| download | xen-d8b61b1e9f8b719376779b41f29e01ca971c653d.tar.gz xen-d8b61b1e9f8b719376779b41f29e01ca971c653d.tar.bz2 xen-d8b61b1e9f8b719376779b41f29e01ca971c653d.zip | |
Rename physical-address-related variables and functions
to follow a new ocnsistent naming scheme.
gpfn is a guest pseudophys frame number.
gmfn is a machine frame number (from guest p.o.v.)
mfn is a real bona fide machine number.
pfn is an arbitrary frame number (used in general-purpose
'polymorphic' functions).
pfn_info now called page_info.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/include/asm-x86/mach-default')
| -rw-r--r-- | xen/include/asm-x86/mach-default/bios_ebda.h | 2 | ||||
| -rw-r--r-- | xen/include/asm-x86/mach-default/mach_wakecpu.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xen/include/asm-x86/mach-default/bios_ebda.h b/xen/include/asm-x86/mach-default/bios_ebda.h index 9cbd9a668a..42de6b2a5b 100644 --- a/xen/include/asm-x86/mach-default/bios_ebda.h +++ b/xen/include/asm-x86/mach-default/bios_ebda.h @@ -7,7 +7,7 @@ */ static inline unsigned int get_bios_ebda(void) { - unsigned int address = *(unsigned short *)phys_to_virt(0x40E); + unsigned int address = *(unsigned short *)maddr_to_virt(0x40E); address <<= 4; return address; /* 0 means none */ } diff --git a/xen/include/asm-x86/mach-default/mach_wakecpu.h b/xen/include/asm-x86/mach-default/mach_wakecpu.h index 673b85c9b2..b462f50ef9 100644 --- a/xen/include/asm-x86/mach-default/mach_wakecpu.h +++ b/xen/include/asm-x86/mach-default/mach_wakecpu.h @@ -8,8 +8,8 @@ #define WAKE_SECONDARY_VIA_INIT -#define TRAMPOLINE_LOW phys_to_virt(0x467) -#define TRAMPOLINE_HIGH phys_to_virt(0x469) +#define TRAMPOLINE_LOW maddr_to_virt(0x467) +#define TRAMPOLINE_HIGH maddr_to_virt(0x469) #define boot_cpu_apicid boot_cpu_physical_apicid |