This removes the agpgart assumption that memory is contiguous.
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.661 -> 1.662
# drivers/char/agp/agpgart_be.c 1.35 -> 1.36
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/13 [email protected] 1.662
# Fix max AGP memory for machines with discontiguous memory.
# --------------------------------------------
#
diff -Nru a/drivers/char/agp/agpgart_be.c b/drivers/char/agp/agpgart_be.c
--- a/drivers/char/agp/agpgart_be.c Fri Sep 13 16:50:25 2002
+++ b/drivers/char/agp/agpgart_be.c Fri Sep 13 16:50:25 2002
@@ -4517,7 +4497,7 @@
{
long memory, index, result;
- memory = virt_to_phys(high_memory) >> 20;
+ memory = (num_physpages << PAGE_SHIFT) >> 20;
index = 1;
while ((memory > maxes_table[index].mem) &&