diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-02-15 13:49:04 +0000 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-02-15 13:49:04 +0000 |
| commit | 07c2f1f3b089a8ea6fd4fe5aec45060a6fc6676b (patch) | |
| tree | ae1fb5d3d6dd72169bd9ebf32e2bde9dc24561d5 /linux-2.6-xen-sparse | |
| parent | a190e7e3da8dd17be9e65f9b77c4a5e31f88b688 (diff) | |
| download | xen-07c2f1f3b089a8ea6fd4fe5aec45060a6fc6676b.tar.gz xen-07c2f1f3b089a8ea6fd4fe5aec45060a6fc6676b.tar.bz2 xen-07c2f1f3b089a8ea6fd4fe5aec45060a6fc6676b.zip | |
linux: avoid need to modify include/linux/pfn.h
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'linux-2.6-xen-sparse')
| -rw-r--r-- | linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c | 2 | ||||
| -rw-r--r-- | linux-2.6-xen-sparse/include/linux/pfn.h | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c b/linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c index 2d251cfb89..398db198b6 100644 --- a/linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c +++ b/linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c @@ -67,7 +67,7 @@ char * __init machine_specific_memory_setup(void) if ( rc == -ENOSYS ) { memmap.nr_entries = 1; map[0].addr = 0ULL; - map[0].size = PFN_PHYS(xen_start_info->nr_pages); + map[0].size = PFN_PHYS((unsigned long long)xen_start_info->nr_pages); /* 8MB slack (to balance backend allocations). */ map[0].size += 8ULL << 20; map[0].type = E820_RAM; diff --git a/linux-2.6-xen-sparse/include/linux/pfn.h b/linux-2.6-xen-sparse/include/linux/pfn.h deleted file mode 100644 index 87a4ab52b6..0000000000 --- a/linux-2.6-xen-sparse/include/linux/pfn.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _LINUX_PFN_H_ -#define _LINUX_PFN_H_ - -#define PFN_ALIGN(x) (((unsigned long long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK) -#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT) -#define PFN_DOWN(x) ((x) >> PAGE_SHIFT) -#define PFN_PHYS(x) ((unsigned long long)(x) << PAGE_SHIFT) - -#endif |