bitkeeper revision 1.1159.258.48 (4230f9e1A3LEMmDHzcYXsKwP-EpzRg)

Fix fallout from Update to Linux 2.6.11.
Signed-off-by: Christian Limpach <chris@xensource.com>

diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/pgtable-2level.h b/linux-2.4.29-xen-sparse/include/asm-xen/pgtable-2level.h
index 9ddd30bf73dcb42a52e693dd54bd02cab753cdfe..750ebfeae0360870b5155d8bcbac655725ec2e90 100644 (file)
--- a/linux-2.4.29-xen-sparse/include/asm-xen/pgtable-2level.h
+++ b/linux-2.4.29-xen-sparse/include/asm-xen/pgtable-2level.h
@@ -36,7 +36,7 @@ static inline int pgd_present(pgd_t pgd)      { return 1; }
 
 #define set_pte(pteptr, pteval) queue_l1_entry_update(pteptr, (pteval).pte_low)
 #define set_pte_atomic(pteptr, pteval) queue_l1_entry_update(pteptr, (pteval).pte_low)
-#define set_pmd(pmdptr, pmdval) queue_l2_entry_update((pmdptr), (pmdval).pmd)
+#define set_pmd(pmdptr, pmdval) queue_l2_entry_update((pmdptr), (pmdval))
 #define set_pgd(pgdptr, pgdval) ((void)0)
 
 #define pgd_page(pgd) \

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c
index f93554394d8334e6bbb86473df02c84676fd9148..8cb2c649594c518ae822a4d47e99a818c2aa1e13 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/pci-dma.c
@@ -17,6 +17,8 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 #define pte_offset_kernel pte_offset
+#define pud_t pgd_t
+#define pud_offset(d, va) d
 #endif
 
 struct dma_coherent_mem {

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c
index 6b19a2030a274b15c306b02d6deda4505f786e70..022831606a46c915b4babb786c6f37fa2975a8fb 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c
@@ -49,8 +49,12 @@ static spinlock_t update_lock = SPIN_LOCK_UNLOCKED;
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 #define QUEUE_SIZE 2048
 #define pte_offset_kernel pte_offset
+#define pmd_val_ma(v) (v).pmd;
+#define pud_t pgd_t
+#define pud_offset(d, va) d
 #else
 #define QUEUE_SIZE 128
+#define pmd_val_ma(v) (v).pud.pgd.pgd;
 #endif
 
 static mmu_update_t update_queue[QUEUE_SIZE];
@@ -125,7 +129,7 @@ void queue_l2_entry_update(pmd_t *ptr, pmd_t val)
     unsigned long flags;
     spin_lock_irqsave(&update_lock, flags);
     update_queue[idx].ptr = virt_to_machine(ptr);
-    update_queue[idx].val = val.pud.pgd.pgd; /* XXX pmd_val_ma */
+    update_queue[idx].val = pmd_val_ma(val);
     increment_index();
     spin_unlock_irqrestore(&update_lock, flags);
 }
@@ -242,7 +246,7 @@ void xen_l2_entry_update(pmd_t *ptr, pmd_t val)
     unsigned long flags;
     spin_lock_irqsave(&update_lock, flags);
     update_queue[idx].ptr = virt_to_machine(ptr);
-    update_queue[idx].val = val.pud.pgd.pgd; /* XXX pmd_val_ma */
+    update_queue[idx].val = pmd_val_ma(val);
     increment_index_and_flush();
     spin_unlock_irqrestore(&update_lock, flags);
 }

diff --git a/linux-2.6.11-xen-sparse/drivers/xen/balloon/balloon.c b/linux-2.6.11-xen-sparse/drivers/xen/balloon/balloon.c
index 6909fabaa7978820f85b14e6f510c4e74a192dc4..ff82cd2f0a32fa9affcb2c73acca15eb8bfce291 100644 (file)
--- a/linux-2.6.11-xen-sparse/drivers/xen/balloon/balloon.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/balloon/balloon.c
@@ -91,6 +91,10 @@ static struct timer_list balloon_timer;
 #define LIST_TO_PAGE(l) ( list_entry(l, struct page, list) )
 #define UNLIST_PAGE(p)  ( list_del(&p->list) )
 #define pte_offset_kernel pte_offset
+#define pud_t pgd_t
+#define pud_offset(d, va) d
+#define pud_none(d) 0
+#define pud_bad(d) 0
 #define subsys_initcall(_fn) __initcall(_fn)
 #define pfn_to_page(_pfn) (mem_map + (_pfn))
 #endif

diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
index 9882429a96c5c193a8c3c713ec3b53513aa56125..2d5a88a56d4defe8641b29c07b751efe70ac7f8e 100644 (file)
--- a/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
@@ -30,6 +30,7 @@
 #ifndef __HYPERVISOR_H__
 #define __HYPERVISOR_H__
 
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/version.h>
@@ -38,7 +39,9 @@
 #include <asm-xen/xen-public/io/domain_controller.h>
 #include <asm/ptrace.h>
 #include <asm/page.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #include <asm-generic/pgtable-nopmd.h>
+#endif
 
 /* arch/xen/i386/kernel/setup.c */
 union xen_start_info_union