--- a/fix-earlyprintk-build.patch Wed Mar 04 00:04:26 2009 -0800
+++ b/fix-earlyprintk-build.patch Wed Mar 04 00:04:41 2009 -0800
@@ -1,3 +1,28 @@
+Subject: fix compile error
+From: Jeremy Fitzhardinge <[email protected]>
+
+Fix compile problem:
+
+ CC arch/x86/kernel/early_printk.o
+In file included from /home/jeremy/hg/xen/paravirt/linux/arch/x86/kernel/early_printk.c:17:
+/home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h: In function 'pmd_page':
+/home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:516: error: implicit declaration of function '__pfn_to_section'
+/home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:516: warning: initialization makes pointer from integer without a cast
+/home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:516: error: implicit declaration of function '__section_mem_map_addr'
+/home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:516: warning: return makes pointer from integer without a cast
+/home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h: In function 'pud_page':
+/home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:586: warning: initialization makes pointer from integer without a cast
+/home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:586: warning: return makes pointer from integer without a cast
+/home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h: In function 'pgd_page':
+/home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:625: warning: initialization makes pointer from integer without a cast
+/home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:625: warning: return makes pointer from integer without a cast
+
+This is a cycling dependency between asm/pgtable.h and linux/mmzone.h
+when using CONFIG_SPARSEMEM. Rather than hacking up the headers some
+more, remove asm/pgtable.h, since early_printk.c doesn't actually need
+it.
+
+Signed-off-by: Jeremy Fitzhardinge <[email protected]>
---
arch/x86/kernel/early_printk.c | 1 -
1 file changed, 1 deletion(-)
--- a/mm-rearrange-exit_mmap.patch Wed Mar 04 00:04:26 2009 -0800
+++ b/mm-rearrange-exit_mmap.patch Wed Mar 04 00:04:41 2009 -0800
@@ -1,4 +1,5 @@ Subject: mm: rearrange exit_mmap() to un
Subject: mm: rearrange exit_mmap() to unlock before arch_exit_mmap
+From: Jeremy Fitzhardinge <[email protected]>
exit_mmap() needs to unlock any locked vmas before calling
arch_exit_mmap, as the latter may switch the current mm to init_mm,
--- a/series Wed Mar 04 00:04:26 2009 -0800
+++ b/series Wed Mar 04 00:04:41 2009 -0800
@@ -1,18 +1,27 @@ ARP-notify-option.patch
+#
+# git: mainline
+#
ARP-notify-option.patch
mm-rearrange-exit_mmap.patch
+xen-blkfront-use-sg.patch
+#
+# git: tip/master
#
x86/x86.patch
+#
+# git: jsgf/tip/fixups
Fix-xen_flush_tlb_others.patch
#
-#xen-move-xen_mmu_ops-fix.patch
-#
-#x86-fix-__supported_pte_mask.patch
+# git: jsgf/x86/unify-kmemcheck
+#
+x86-make-_PAGE_HIDDEN-conditional.patch
+x86-unify-pte_hidden.patch
+#
+# git: jsgf/x86/unify
#
x86-unify-pte_none.patch
x86-unify-pte_same.patch
x86-unify-pte_present.patch
-x86-make-_PAGE_HIDDEN-conditional.patch
-x86-unify-pte_hidden.patch
x86-unify-pud_present.patch
x86-unify-pgd_present.patch
x86-unify-pmd_present.patch
@@ -45,57 +54,41 @@ x86-make-pgd-pud-pmd_none-consistent.pat
x86-make-pgd-pud-pmd_none-consistent.patch
fix-earlyprintk-build.patch
#
-#x86-unify-io.h-IO_SPACE_LIMIT.patch
x86-unify-io.h-virt-phys.patch
x86-unify-io.h-ioremap-proto.patch
#
-#x86-reinstate-load_percpu_gs.patch
-#xen-setup-percpu-base.patch
-#x86-fix-32bit-calleesave-return.patch
-#xen-unify-direct-ops.patch
-#xen-64-use-direct-ops.patch
+# git: jsgf/xen/core
#
xen-dom0-short-circuit-domain-predicates.patch
-xen-define-BIOVEC_PHYS_MERGEABLE.patch
-xen-blkfront-use-sg.patch
+xen-multicall-debug-print-caller.patch
+xen-multicall-warning.patch
+xen-multicall-fix-callbacks.patch
+#
+# git: jsgf/x86/unify-irq
#
x86-add-handle_irq.patch
x86-unify-irq-do_IRQ.patch
+#
+# git: jsgf/xen/irq
+#
xen-set-irq_chip-disable.patch
xen-use-own-interrupt-path.patch
xen-consolidate-irq-info.patch
xen-remove-irq-bindcount.patch
xen-fix-softirq.patch
#
-#xen-move-xen_mmu_ops.patch
-#
-#paravirt-ident.patch
-#x86-entry-fix-load_gs_index-clobber.patch
-#x86-paravirt-selective-reg-save-rest.patch
-#paravirt-regsaver-thunks.patch
-#paravirt-PVOP_CALL-callee-save.patch
-#x86-callee-pteval.patch
-#x86-callee-pteval-fix.patch
-#x86-callee-pteval-fix2.patch
-#x86-vmi-fix-callee.patch
-#
-#xen-balloon-target-units.patch
-#
-#xen-alloc-irq-desc.patch
+# git: jsgf/xen/fs
+#
+xen-xenfs-capabilities.patch
+xen-add-proc-xen-xsd_{kva,port}-to-xenfs.patch
+#
+# git: acpi/hackmap
#
x86-__acpi_map_table-use-early_ioremap.patch
x86-acpi-always-map.patch
acpi-clear-__acpi_map_table-mapping.patch
#
-#
-# >> UNPOSTED for AKPM
-xen-xenfs-capabilities.patch
-xen-add-proc-xen-xsd_{kva,port}-to-xenfs.patch
-# <<
-#
-x86-fix-apic_ops-uses.patch
-#xen-cleanup-hypervisor_h.patch
-#
+# git: xen/dom0/core
#
xen-dom0-Make-hvc_xen-console-work-for-dom0.patch
xen-dom0-Initialize-xenbus-for-dom0.patch
@@ -107,29 +100,22 @@ xen-dom0-ioremap.patch
xen-dom0-ioremap.patch
xen-dom0-hook-page_is_ram.patch
xen-dom0-use-host-memory-map.patch
-#
-#
-#hotplug-add-resource.patch
-#hotplug-reduce-i386-pae-section-size.patch
-#
-#hotplug-memory-refactor-online_pages.patch
-#xen-balloon-remove-balloon_lock.patch
-#xen-balloon-atomic-scrubber.patch
-#xen-balloon-hotadd.patch
-#hotplug-memory-section-ops.patchx
-#xen-balloon-section_ops.patch
-#
-#Xen-Fix-warning-when-hot-unplugging-virtual-block-devices.patch
-#
-#
-#
-xen-irq-info-initialise-cpu.patch
XENMEM_machphys_mapping.patch
you-cant-trust-initial-pt-l3.patch
+#
+# git: xen/dev-evtchn
#
xen-add-irq_from_evtchn.patch
xen-add-dev-xen-evtchn-driver.patch
xen-export-ioctl-headers-to-userspace.patch
+#
+############
+#
+xen-define-BIOVEC_PHYS_MERGEABLE.patch
+#
+#
+xen-irq-info-initialise-cpu.patch
+#
#
Xen-Rename-the-balloon-lock.patch
Xen-Don-t-disable-the-I-O-space.patch
@@ -143,6 +129,7 @@ xen-swiotlb-alloc.patch
xen-swiotlb-alloc.patch
xen-swiotlb-smaller-contiguous-allocations.patch
#
+x86-fix-apic_ops-uses.patch
x86-parse-xen-lapic.patch
x86-unstatic-mp_find_apic.patch
x86-add-find_ioapic_pin.patch
@@ -173,9 +160,6 @@ xen-add-privcmd.patch
#xen-debug-privcmd.patch
#
#
-xen-multicall-debug-print-caller.patch
-xen-multicall-warning.patch
-xen-multicall-fix-callbacks.patch
#
xen-privcmd-mmap.patch
#
--- a/x86-make-_PAGE_HIDDEN-conditional.patch Wed Mar 04 00:04:26 2009 -0800
+++ b/x86-make-_PAGE_HIDDEN-conditional.patch Wed Mar 04 00:04:41 2009 -0800
@@ -1,4 +1,5 @@ Subject: x86: make _PAGE_HIDDEN conditio
Subject: x86: make _PAGE_HIDDEN conditional
+From: Jeremy Fitzhardinge <[email protected]>
Only _PAGE_HIDDEN when CONFIG_KMEMCHECK is defined, otherwise set it
to 0. Allows later cleanups.
--- a/x86-unify-io.h-ioremap-proto.patch Wed Mar 04 00:04:26 2009 -0800
+++ b/x86-unify-io.h-ioremap-proto.patch Wed Mar 04 00:04:41 2009 -0800
@@ -1,4 +1,5 @@ Subject: x86: asm/io.h: unify ioremap pr
Subject: x86: asm/io.h: unify ioremap prototypes
+From: Jeremy Fitzhardinge <[email protected]>
Impact: unify identical code
--- a/x86-unify-io.h-virt-phys.patch Wed Mar 04 00:04:26 2009 -0800
+++ b/x86-unify-io.h-virt-phys.patch Wed Mar 04 00:04:41 2009 -0800
@@ -1,4 +1,5 @@ Subject: x86: asm/io.h: unify virt_to_ph
Subject: x86: asm/io.h: unify virt_to_phys/phys_to_virt
+From: Jeremy Fitzhardinge <[email protected]>
Impact: unify identical code
--- a/x86-unify-pte_hidden.patch Wed Mar 04 00:04:26 2009 -0800
+++ b/x86-unify-pte_hidden.patch Wed Mar 04 00:04:41 2009 -0800
@@ -1,4 +1,5 @@ Subject: x86: unify pte_hidden
Subject: x86: unify pte_hidden
+From: Jeremy Fitzhardinge <[email protected]>
Impact: cleanup
@@ -14,9 +15,9 @@ Signed-off-by: Jeremy Fitzhardinge <jere
===================================================================
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
-@@ -478,6 +478,11 @@
- return pte_flags(a) & (_PAGE_PRESENT | _PAGE_PROTNONE);
+@@ -462,6 +462,11 @@
}
+ #endif /* CONFIG_PARAVIRT */
+static inline int pte_hidden(pte_t pte)
+{
@@ -29,9 +30,9 @@ Signed-off-by: Jeremy Fitzhardinge <jere
===================================================================
--- a/arch/x86/include/asm/pgtable_32.h
+++ b/arch/x86/include/asm/pgtable_32.h
-@@ -85,12 +85,6 @@
- /* The boot page tables (all created as a single array) */
- extern unsigned long pg0[];
+@@ -87,12 +87,6 @@
+
+ #define pte_present(x) ((x).pte_low & (_PAGE_PRESENT | _PAGE_PROTNONE))
-#ifdef CONFIG_KMEMCHECK
-#define pte_hidden(x) ((x).pte_low & (_PAGE_HIDDEN))
@@ -45,9 +46,9 @@ Signed-off-by: Jeremy Fitzhardinge <jere
===================================================================
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
-@@ -168,12 +168,6 @@
- return (pmd_val(pmd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE;
- }
+@@ -173,12 +173,6 @@
+ #define pte_none(x) (!pte_val((x)))
+ #define pte_present(x) (pte_val((x)) & (_PAGE_PRESENT | _PAGE_PROTNONE))
-#ifdef CONFIG_KMEMCHECK
-#define pte_hidden(x) (pte_val((x)) & (_PAGE_HIDDEN))
--- a/x86-unify-pte_present.patch Wed Mar 04 00:04:26 2009 -0800
+++ b/x86-unify-pte_present.patch Wed Mar 04 00:04:41 2009 -0800
@@ -14,7 +14,7 @@ Signed-off-by: Jeremy Fitzhardinge <jere
===================================================================
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
-@@ -468,6 +468,11 @@
+@@ -478,6 +478,11 @@
return a.pte == b.pte;
}
@@ -35,9 +35,9 @@ Signed-off-by: Jeremy Fitzhardinge <jere
-#define pte_present(x) ((x).pte_low & (_PAGE_PRESENT | _PAGE_PROTNONE))
-
- #ifdef CONFIG_KMEMCHECK
- #define pte_hidden(x) ((x).pte_low & (_PAGE_HIDDEN))
- #else
+ /* To avoid harmful races, pmd_none(x) should check only the lower when PAE */
+ #define pmd_none(x) (!(unsigned long)pmd_val((x)))
+ #define pmd_present(x) (pmd_val((x)) & _PAGE_PRESENT)
===================================================================
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -47,6 +47,6 @@ Signed-off-by: Jeremy Fitzhardinge <jere
-#define pte_present(x) (pte_val((x)) & (_PAGE_PRESENT | _PAGE_PROTNONE))
-
- #ifdef CONFIG_KMEMCHECK
- #define pte_hidden(x) (pte_val((x)) & (_PAGE_HIDDEN))
- #else
+ #define pages_to_mb(x) ((x) >> (20 - PAGE_SHIFT)) /* FIXME: is this right? */
+
+ /*
--- a/xen-dom0-short-circuit-domain-predicates.patch Wed Mar 04 00:04:26 2009 -0800
+++ b/xen-dom0-short-circuit-domain-predicates.patch Wed Mar 04 00:04:41 2009 -0800
@@ -1,4 +1,5 @@ Subject: xen: short-circuit tests for do
Subject: xen: short-circuit tests for dom0
+From: Jeremy Fitzhardinge <[email protected]>
When testing for a dom0/initial/privileged domain, make sure the
predicate evaluates to a compile-time 0 if CONFIG_XEN_DOM0 isn't
--- a/xen-multicall-debug-print-caller.patch Wed Mar 04 00:04:26 2009 -0800
+++ b/xen-multicall-debug-print-caller.patch Wed Mar 04 00:04:41 2009 -0800
@@ -1,6 +1,9 @@ xen: record and display initiator of eac
-xen: record and display initiator of each multicall when debugging
+Subject: xen: record and display initiator of each multicall when debugging
+From: Ian Campbell <[email protected]>
+
+Store the caller for each multicall so we can report it on failure.
+
Signed-off-by: Ian Campbell <[email protected]>
-
---
arch/x86/xen/multicalls.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
--- a/xen-multicall-fix-callbacks.patch Wed Mar 04 00:04:26 2009 -0800
+++ b/xen-multicall-fix-callbacks.patch Wed Mar 04 00:04:41 2009 -0800
@@ -1,4 +1,5 @@ Subject: xen: do multicall callbacks wit
Subject: xen: do multicall callbacks with interrupts disabled
+From: Jeremy Fitzhardinge <[email protected]>
We can't call the callbacks after enabling interrupts, as we may get a
nested multicall call, which would cause a great deal of havok.
--- a/xen-multicall-warning.patch Wed Mar 04 00:04:26 2009 -0800
+++ b/xen-multicall-warning.patch Wed Mar 04 00:04:41 2009 -0800
@@ -1,4 +1,5 @@ Subject: xen: degrade BUG to WARN when m
Subject: xen: degrade BUG to WARN when multicall fails
+From: Jeremy Fitzhardinge <[email protected]>
If one of the components of a multicall fails, WARN rather than BUG,
to help with debugging.
