[kernel] r16448 - dists/sid/linux-2.6/debian/patches/features/all/xen
Ian Campbell
ijc-guest at alioth.debian.org
Fri Oct 15 15:31:41 UTC 2010
Author: ijc-guest
Date: Fri Oct 15 15:31:33 2010
New Revision: 16448
Log:
regenerate xen pvops patch against 2.6.24
no code change, removes by hand changes to patch
Modified:
dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch Fri Oct 15 15:31:15 2010 (r16447)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch Fri Oct 15 15:31:33 2010 (r16448)
@@ -6,17 +6,15 @@
To regenerate:
-$ git checkout -b debian-base v2.6.32.20
+$ git checkout -b debian-base v2.6.32.24
$ git pull git://xenbits.xensource.com/people/ianc/linux-2.6.git debian/squeeze/pvhvm
$ git checkout -b debian-pvops e73f4955a821f850f5b88c32d12a81714523a95f
$ git revert -m 1 bcf16b6b4f34fb40a7aaf637947c7d3bce0be671
-$ git merge v2.6.32.20
+$ git merge v2.6.32.24
$ git diff debian-base..debian-pvops
-[bwh: Fix context in drivers/xen/events.c]
-
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 9ec8558..3e30e60 100644
--- a/Documentation/kernel-parameters.txt
@@ -157,10 +155,10 @@
paging_init();
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index fbc161d..2f6d482 100644
+index cb5a57c..a3b7475 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -1880,6 +1880,10 @@ config PCI_OLPC
+@@ -1885,6 +1885,10 @@ config PCI_OLPC
def_bool y
depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY)
@@ -1572,7 +1570,7 @@
} else if ((!no_iommu && max_pfn > MAX_DMA32_PFN) ||
force_iommu ||
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index 9f9fded..784a600 100644
+index 0da6495..42d1fe2 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -63,7 +63,12 @@
@@ -1620,7 +1618,7 @@
if (sis_apic_bug)
writel(reg, &io_apic->index);
-@@ -3485,6 +3496,9 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
+@@ -3487,6 +3498,9 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
if (type == PCI_CAP_ID_MSI && nvec > 1)
return 1;
@@ -1630,7 +1628,7 @@
node = dev_to_node(&dev->dev);
irq_want = nr_irqs_gsi;
sub_handle = 0;
-@@ -3534,7 +3548,29 @@ error:
+@@ -3536,7 +3550,29 @@ error:
void arch_teardown_msi_irq(unsigned int irq)
{
@@ -1661,7 +1659,7 @@
}
#if defined (CONFIG_DMAR) || defined (CONFIG_INTR_REMAP)
-@@ -3850,7 +3886,14 @@ void __init probe_nr_irqs_gsi(void)
+@@ -3852,7 +3888,14 @@ void __init probe_nr_irqs_gsi(void)
printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi);
}
@@ -1676,7 +1674,7 @@
int __init arch_probe_nr_irqs(void)
{
int nr;
-@@ -3868,6 +3911,8 @@ int __init arch_probe_nr_irqs(void)
+@@ -3870,6 +3913,8 @@ int __init arch_probe_nr_irqs(void)
if (nr < nr_irqs)
nr_irqs = nr;
@@ -7269,7 +7267,7 @@
void xen_raw_printk(const char *fmt, ...)
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index a75ca63..bdc26b9 100644
+index 0e27d98..f5e2572 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -201,7 +201,7 @@ int drm_lastclose(struct drm_device * dev)
@@ -7822,10 +7820,10 @@
early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
dmar_tbl = NULL;
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
-index 2498602..fd89530 100644
+index ba83495..1506d4a 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
-@@ -3282,7 +3282,7 @@ int __init intel_iommu_init(void)
+@@ -3278,7 +3278,7 @@ int __init intel_iommu_init(void)
* Check the need for DMA-remapping initialization now.
* Above initialization will also be used by Interrupt-remapping.
*/
@@ -7834,7 +7832,7 @@
return -ENODEV;
iommu_init_mempool();
-@@ -3303,7 +3303,9 @@ int __init intel_iommu_init(void)
+@@ -3299,7 +3299,9 @@ int __init intel_iommu_init(void)
"PCI-DMA: Intel(R) Virtualization Technology for Directed I/O\n");
init_timer(&unmap_timer);
@@ -7872,7 +7870,7 @@
{
int pos;
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
-index f9cf317..a77a46f 100644
+index 0fb1d05..c7e8a69 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -19,6 +19,9 @@
@@ -7885,7 +7883,7 @@
#include "pci.h"
#include "msi.h"
-@@ -366,6 +369,20 @@ static void __pci_restore_msix_state(struct pci_dev *dev)
+@@ -391,6 +394,20 @@ static void __pci_restore_msix_state(struct pci_dev *dev)
void pci_restore_msi_state(struct pci_dev *dev)
{
@@ -15037,7 +15035,7 @@
#include <asm/xen/hypervisor.h>
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
-index 5d25cdf..b4a00bf 100644
+index 373905b..937bad7 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -16,7 +16,7 @@
@@ -15124,7 +15122,7 @@
static inline unsigned long *cpu_evtchn_mask(int cpu)
{
return cpu_evtchn_mask_p[cpu].bits;
-@@ -110,6 +126,7 @@ static inline unsigned long *cpu_evtchn_mask(int cpu)
+@@ -111,6 +127,7 @@ static inline unsigned long *cpu_evtchn_mask(int cpu)
static struct irq_chip xen_dynamic_chip;
static struct irq_chip xen_percpu_chip;
@@ -15132,7 +15130,7 @@
/* Constructor for packed IRQ information. */
static struct irq_info mk_unbound_info(void)
-@@ -139,7 +156,8 @@ static struct irq_info mk_pirq_info(unsigned short evtchn,
+@@ -140,7 +157,8 @@ static struct irq_info mk_pirq_info(unsigned short evtchn,
unsigned short gsi, unsigned short vector)
{
return (struct irq_info) { .type = IRQT_PIRQ, .evtchn = evtchn,
@@ -15142,7 +15140,7 @@
}
/*
-@@ -222,6 +240,15 @@ static unsigned int cpu_from_evtchn(unsigned int evtchn)
+@@ -223,6 +241,15 @@ static unsigned int cpu_from_evtchn(unsigned int evtchn)
return ret;
}
@@ -15158,7 +15156,7 @@
static inline unsigned long active_evtchns(unsigned int cpu,
struct shared_info *sh,
unsigned int idx)
-@@ -333,12 +360,29 @@ static void unmask_evtchn(int port)
+@@ -334,12 +361,29 @@ static void unmask_evtchn(int port)
put_cpu();
}
@@ -15189,7 +15187,7 @@
desc = irq_to_desc(irq);
/* only 0->15 have init'd desc; handle irq > 16 */
if (desc == NULL)
-@@ -351,18 +395,337 @@ static int find_unbound_irq(void)
+@@ -352,18 +396,337 @@ static int find_unbound_irq(void)
break;
}
@@ -15530,7 +15528,7 @@
int bind_evtchn_to_irq(unsigned int evtchn)
{
int irq;
-@@ -422,8 +785,23 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
+@@ -423,8 +786,23 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
return irq;
}
@@ -15555,7 +15553,7 @@
{
struct evtchn_bind_virq bind_virq;
int evtchn, irq;
-@@ -517,6 +895,29 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
+@@ -518,6 +896,29 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
}
EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler);
@@ -15585,7 +15583,7 @@
int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
irq_handler_t handler,
unsigned long irqflags, const char *devname, void *dev_id)
-@@ -659,9 +1060,13 @@ static void __xen_evtchn_do_upcall(struct pt_regs *regs)
+@@ -660,9 +1061,13 @@ static void __xen_evtchn_do_upcall(struct pt_regs *regs)
int bit_idx = __ffs(pending_bits);
int port = (word_idx * BITS_PER_LONG) + bit_idx;
int irq = evtchn_to_irq[port];
@@ -15601,7 +15599,7 @@
}
}
-@@ -691,7 +1096,8 @@ void xen_evtchn_do_upcall(struct pt_regs *regs)
+@@ -692,7 +1097,8 @@ void xen_evtchn_do_upcall(struct pt_regs *regs)
void xen_hvm_evtchn_do_upcall(void)
{
@@ -15611,7 +15609,7 @@
}
EXPORT_SYMBOL_GPL(xen_hvm_evtchn_do_upcall);
-@@ -885,7 +1291,7 @@ void xen_clear_irq_pending(int irq)
+@@ -886,7 +1292,7 @@ void xen_clear_irq_pending(int irq)
if (VALID_EVTCHN(evtchn))
clear_evtchn(evtchn);
}
@@ -15620,7 +15618,7 @@
void xen_set_irq_pending(int irq)
{
int evtchn = evtchn_from_irq(irq);
-@@ -905,9 +1311,9 @@ bool xen_test_irq_pending(int irq)
+@@ -906,9 +1312,9 @@ bool xen_test_irq_pending(int irq)
return ret;
}
@@ -15632,7 +15630,7 @@
{
evtchn_port_t evtchn = evtchn_from_irq(irq);
-@@ -915,13 +1321,33 @@ void xen_poll_irq(int irq)
+@@ -916,13 +1322,33 @@ void xen_poll_irq(int irq)
struct sched_poll poll;
poll.nr_ports = 1;
@@ -15667,8 +15665,8 @@
void xen_irq_resume(void)
{
-@@ -958,6 +1384,26 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
- .retrigger = retrigger_dynirq,
+@@ -969,6 +1395,26 @@ static struct irq_chip xen_percpu_chip __read_mostly = {
+ .ack = ack_dynirq,
};
+static struct irq_chip xen_pirq_chip __read_mostly = {
@@ -15694,7 +15692,7 @@
int xen_set_callback_via(uint64_t via)
{
struct xen_hvm_param a;
-@@ -968,7 +1414,21 @@ int xen_set_callback_via(uint64_t via)
+@@ -979,7 +1425,21 @@ int xen_set_callback_via(uint64_t via)
}
EXPORT_SYMBOL_GPL(xen_set_callback_via);
@@ -15717,7 +15715,7 @@
/* Vector callbacks are better than PCI interrupts to receive event
* channel notifications because we can receive vector callbacks on any
* vcpu and we don't need PCI support or APIC interactions. */
-@@ -987,14 +1447,9 @@ void xen_callback_vector(void)
+@@ -998,14 +1458,9 @@ void xen_callback_vector(void)
}
printk(KERN_INFO "Xen HVM callback vector for event delivery is "
"enabled\n");
@@ -15733,7 +15731,7 @@
void __init xen_init_IRQ(void)
{
-@@ -1002,7 +1457,12 @@ void __init xen_init_IRQ(void)
+@@ -1013,7 +1468,12 @@ void __init xen_init_IRQ(void)
cpu_evtchn_mask_p = kcalloc(nr_cpu_ids, sizeof(struct cpu_evtchn_s),
GFP_KERNEL);
@@ -15747,7 +15745,7 @@
init_evtchn_cpu_bindings();
-@@ -1015,5 +1475,6 @@ void __init xen_init_IRQ(void)
+@@ -1026,5 +1486,6 @@ void __init xen_init_IRQ(void)
native_init_IRQ();
} else {
irq_ctx_init(smp_processor_id());
@@ -28573,10 +28571,10 @@
+};
#endif /* _LINUX_IF_LINK_H */
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 24c3956..e8cf80f 100644
+index a8d25e4..1bc4927 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -105,6 +105,12 @@ extern unsigned int kobjsize(const void *objp);
+@@ -109,6 +109,12 @@ extern unsigned int kobjsize(const void *objp);
#define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
#define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
#define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
@@ -28589,7 +28587,7 @@
#ifndef VM_STACK_DEFAULT_FLAGS /* arch can override this */
#define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS
-@@ -195,6 +201,11 @@ struct vm_operations_struct {
+@@ -199,6 +205,11 @@ struct vm_operations_struct {
*/
int (*access)(struct vm_area_struct *vma, unsigned long addr,
void *buf, int len, int write);
@@ -32762,7 +32760,7 @@
{
int aligned;
diff --git a/mm/memory.c b/mm/memory.c
-index babb991..ae85b20 100644
+index 53c1da0..c8741df 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -553,6 +553,13 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr,
@@ -32866,10 +32864,10 @@
}
EXPORT_SYMBOL_GPL(apply_to_page_range);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 36992b6..bc1b6e9 100644
+index 902e5fc..101715c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -593,6 +593,13 @@ static void __free_pages_ok(struct page *page, unsigned int order)
+@@ -594,6 +594,13 @@ static void __free_pages_ok(struct page *page, unsigned int order)
if (bad)
return;
@@ -32883,7 +32881,7 @@
if (!PageHighMem(page)) {
debug_check_no_locks_freed(page_address(page),PAGE_SIZE<<order);
debug_check_no_obj_freed(page_address(page),
-@@ -1087,6 +1094,13 @@ static void free_hot_cold_page(struct page *page, int cold)
+@@ -1088,6 +1095,13 @@ static void free_hot_cold_page(struct page *page, int cold)
kmemcheck_free_shadow(page, 0);
More information about the Kernel-svn-changes
mailing list