git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
include
/
asm-sparc64
/
io.h
diff --git
a/include/asm-sparc64/io.h
b/include/asm-sparc64/io.h
index
da716a2
..
94a8a70
100644
(file)
--- a/
include/asm-sparc64/io.h
+++ b/
include/asm-sparc64/io.h
@@
-19,8
+19,8
@@
extern unsigned long bus_to_virt_not_defined_use_pci_map(volatile void *addr);
#define bus_to_virt bus_to_virt_not_defined_use_pci_map
/* BIO layer definitions. */
#define bus_to_virt bus_to_virt_not_defined_use_pci_map
/* BIO layer definitions. */
-extern unsigned long
phys_base,
kern_base, kern_size;
-#define page_to_phys(page) (
(((page) - mem_map) << PAGE_SHIFT)+phys_base
)
+extern unsigned long kern_base, kern_size;
+#define page_to_phys(page) (
page_to_pfn(page) << PAGE_SHIFT
)
#define BIO_VMERGE_BOUNDARY 8192
/* Different PCI controllers we support have their PCI MEM space
#define BIO_VMERGE_BOUNDARY 8192
/* Different PCI controllers we support have their PCI MEM space