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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
x86_64
/
mm
/
ioremap.c
diff --git
a/arch/x86_64/mm/ioremap.c
b/arch/x86_64/mm/ioremap.c
index
59bd4cc
..
8d1cb38
100644
(file)
--- a/
arch/x86_64/mm/ioremap.c
+++ b/
arch/x86_64/mm/ioremap.c
@@
-132,13
+132,13
@@
void * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flag
* Don't allow anybody to remap normal RAM that we're using..
*/
if (phys_addr < virt_to_phys(high_memory)) {
* Don't allow anybody to remap normal RAM that we're using..
*/
if (phys_addr < virt_to_phys(high_memory)) {
+#ifndef CONFIG_DISCONTIGMEM
char *t_addr, *t_end;
char *t_addr, *t_end;
+ struct page *page;
t_addr = __va(phys_addr);
t_end = t_addr + (size - 1);
t_addr = __va(phys_addr);
t_end = t_addr + (size - 1);
-#ifndef CONFIG_DISCONTIGMEM
- struct page *page;
for(page = virt_to_page(t_addr); page <= virt_to_page(t_end); page++)
if(!PageReserved(page))
return NULL;
for(page = virt_to_page(t_addr); page <= virt_to_page(t_end); page++)
if(!PageReserved(page))
return NULL;