bitkeeper revision 1.1159.42.7 (4124e09e2XrfLrN-NqhB79T6-OQK4w)

Remove padding between foreign page mappings in the blkdev backend.
This also allows us to remove the forced max allocation order in the
buddy page allocator.

7 files changed, 2 insertions, 21 deletions

diff --git a/linux-2.4.26-xen-sparse/arch/xen/config.in b/linux-2.4.26-xen-sparse/arch/xen/config.in
index b77b979c11..3a89393de3 100644
--- a/linux-2.4.26-xen-sparse/arch/xen/config.in
+++ b/linux-2.4.26-xen-sparse/arch/xen/config.in
@@ -103,8 +103,6 @@ if [ "$CONFIG_HIGHMEM" = "y" ]; then
    bool 'HIGHMEM I/O support' CONFIG_HIGHIO
 fi
 
-define_int CONFIG_FORCE_MAX_ZONEORDER 12
-
 #bool 'Symmetric multi-processing support' CONFIG_SMP
 #if [ "$CONFIG_SMP" = "y" -a "$CONFIG_X86_CMPXCHG" = "y" ]; then
 #   define_bool CONFIG_HAVE_DEC_LOCK y
diff --git a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0 b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0
index 558c70d78c..0754c9b8c8 100644
--- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0
+++ b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0
@@ -50,7 +50,6 @@ CONFIG_X86_TSC=y
 CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_NOHIGHMEM=y
 # CONFIG_HIGHMEM4G is not set
-CONFIG_FORCE_MAX_ZONEORDER=12
 
 #
 # General setup
diff --git a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU
index 5a1d4803e3..8fad307cd1 100644
--- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU
+++ b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU
@@ -52,7 +52,6 @@ CONFIG_X86_TSC=y
 CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_NOHIGHMEM=y
 # CONFIG_HIGHMEM4G is not set
-CONFIG_FORCE_MAX_ZONEORDER=12
 
 #
 # General setup
diff --git a/linux-2.6.7-xen-sparse/arch/xen/Kconfig b/linux-2.6.7-xen-sparse/arch/xen/Kconfig
index 72733f2efc..dabb558f2e 100644
--- a/linux-2.6.7-xen-sparse/arch/xen/Kconfig
+++ b/linux-2.6.7-xen-sparse/arch/xen/Kconfig
@@ -44,12 +44,6 @@ config XEN_WRITABLE_PAGETABLES
 
 endmenu
 
-# Xen's block device backend driver needs 2^12 pages
-config FORCE_MAX_ZONEORDER
-        int
-        default "12" if XEN_PHYSDEV_ACCESS
-        default "11" if !XEN_PHYSDEV_ACCESS
-
 #config VT
 #	bool
 #	default y
diff --git a/linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig b/linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig
index 0a70e9bb26..ad6c744ebf 100644
--- a/linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig
+++ b/linux-2.6.7-xen-sparse/arch/xen/configs/xen0_defconfig
@@ -10,7 +10,6 @@ CONFIG_NO_IDLE_HZ=y
 #
 CONFIG_XEN_PRIVILEGED_GUEST=y
 CONFIG_XEN_PHYSDEV_ACCESS=y
-CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_X86=y
 # CONFIG_X86_64 is not set
 
diff --git a/linux-2.6.7-xen-sparse/arch/xen/configs/xenU_defconfig b/linux-2.6.7-xen-sparse/arch/xen/configs/xenU_defconfig
index fb55077199..a56fc3f7d4 100644
--- a/linux-2.6.7-xen-sparse/arch/xen/configs/xenU_defconfig
+++ b/linux-2.6.7-xen-sparse/arch/xen/configs/xenU_defconfig
@@ -10,7 +10,6 @@ CONFIG_NO_IDLE_HZ=y
 #
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
 # CONFIG_XEN_PHYSDEV_ACCESS is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_X86=y
 # CONFIG_X86_64 is not set
 
diff --git a/linux-2.6.7-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6.7-xen-sparse/drivers/xen/blkback/blkback.c
index 9dc64cc0c3..0af48d6e79 100644
--- a/linux-2.6.7-xen-sparse/drivers/xen/blkback/blkback.c
+++ b/linux-2.6.7-xen-sparse/drivers/xen/blkback/blkback.c
@@ -24,22 +24,15 @@
 #define MAX_PENDING_REQS 64
 #define BATCH_PER_DOMAIN 16
 
-/*
- * NB. We place a page of padding between each buffer page to avoid incorrect
- * merging of requests by the IDE and SCSI merging routines. Otherwise, two
- * adjacent buffers in a scatter-gather request would have adjacent page
- * numbers: since the merge routines don't realise that this is in *pseudophys*
- * space, not real space, they may collapse the s-g elements!
- */
 static unsigned long mmap_vstart;
 #define MMAP_PAGES_PER_REQUEST \
-    (2 * (BLKIF_MAX_SEGMENTS_PER_REQUEST + 1))
+    (BLKIF_MAX_SEGMENTS_PER_REQUEST + 1)
 #define MMAP_PAGES             \
     (MAX_PENDING_REQS * MMAP_PAGES_PER_REQUEST)
 #define MMAP_VADDR(_req,_seg)                        \
     (mmap_vstart +                                   \
      ((_req) * MMAP_PAGES_PER_REQUEST * PAGE_SIZE) + \
-     ((_seg) * 2 * PAGE_SIZE))
+     ((_seg) * PAGE_SIZE))
 
 /*
  * Each outstanding request that we've passed to the lower device layers has a