git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
char
/
agp
/
backend.c
diff --git
a/drivers/char/agp/backend.c
b/drivers/char/agp/backend.c
index
ad87753
..
a56ca08
100644
(file)
--- a/
drivers/char/agp/backend.c
+++ b/
drivers/char/agp/backend.c
@@
-114,9
+114,9
@@
static int agp_find_max(void)
long memory, index, result;
#if PAGE_SHIFT < 20
long memory, index, result;
#if PAGE_SHIFT < 20
- memory =
num_phys
pages >> (20 - PAGE_SHIFT);
+ memory =
totalram_
pages >> (20 - PAGE_SHIFT);
#else
#else
- memory =
num_phys
pages << (PAGE_SHIFT - 20);
+ memory =
totalram_
pages << (PAGE_SHIFT - 20);
#endif
index = 1;
#endif
index = 1;