commits November 2009

commits@lists.open-mesh.org

1 participants
989 discussions

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit a0738a688d1105cbf8d71868a1e020c6cdf42d4c Merge: 89ccf465abe6b20d804a63ae20307970c441369d a3ccf63ee643ef243cbf8918da8b3f9238f10029 Author: Ingo Molnar <mingo(a)elte.hu> Date: Thu Oct 15 08:07:26 2009 +0200 Merge branch 'linus' into x86/urgent Merge reason: pull in latest, to be able to revert a patch there. Signed-off-by: Ingo Molnar <mingo(a)elte.hu> diff --combined arch/x86/kernel/irq.c index 86fb2c8,74656d1..04bbd52 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@@ -63,10 -63,10 +63,10 @@@ static int show_other_interrupts(struc for_each_online_cpu(j) seq_printf(p, "%10u ", irq_stats(j)->irq_spurious_count); seq_printf(p, " Spurious interrupts\n"); - seq_printf(p, "%*s: ", prec, "CNT"); + seq_printf(p, "%*s: ", prec, "PMI"); for_each_online_cpu(j) seq_printf(p, "%10u ", irq_stats(j)->apic_perf_irqs); - seq_printf(p, " Performance counter interrupts\n"); + seq_printf(p, " Performance monitoring interrupts\n"); seq_printf(p, "%*s: ", prec, "PND"); for_each_online_cpu(j) seq_printf(p, "%10u ", irq_stats(j)->apic_pending_irqs); @@@ -244,7 -244,6 +244,6 @@@ unsigned int __irq_entry do_IRQ(struct __func__, smp_processor_id(), vector, irq); } - run_local_timers(); irq_exit(); set_irq_regs(old_regs); @@@ -269,7 -268,6 +268,6 @@@ void smp_generic_interrupt(struct pt_re if (generic_interrupt_extension) generic_interrupt_extension(); - run_local_timers(); irq_exit(); set_irq_regs(old_regs); -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit d59733c1e56784a99381799021c4f9698f3e6379 Merge: 4697fd6f6a6277b33093fc807786f16cabe30b31 2c907b72db4dd4e8af6dccb6e0ac122d78627b8d Author: Len Brown <len.brown(a)intel.com> Date: Thu Oct 15 00:47:13 2009 -0400 Merge branch 'misc' into release -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 4697fd6f6a6277b33093fc807786f16cabe30b31 Merge: fee807e8ffef7a0cdec3ff2d7156844c7d987d2f 3a1151e3f124fd1a2c54b8153f510f1a7c715369 Author: Len Brown <len.brown(a)intel.com> Date: Thu Oct 15 00:46:57 2009 -0400 Merge branch 'launchpad-333386' into release -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit fee807e8ffef7a0cdec3ff2d7156844c7d987d2f Merge: f63a904891de9da7828b3eb6c99c45a26ec5b475 b56ab33d68638e6aafdbfc694025e8354a628f49 Author: Len Brown <len.brown(a)intel.com> Date: Thu Oct 15 00:46:46 2009 -0400 Merge branch 'eeepc-laptop' into release -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit f63a904891de9da7828b3eb6c99c45a26ec5b475 Merge: a3ccf63ee643ef243cbf8918da8b3f9238f10029 497fb54f578efd2b479727bc88d5ef942c0a1e2d Author: Len Brown <len.brown(a)intel.com> Date: Thu Oct 15 00:45:37 2009 -0400 Merge branch 'bugzilla-14129' into release -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 8f7e524ce33ca81b663711404709396165da3cbd Author: Randy Dunlap <randy.dunlap(a)oracle.com> Date: Wed Oct 14 20:38:58 2009 -0700 vmxnet: fix 2 build problems vmxnet3 uses in_dev* interfaces so it should depend on INET. Also fix so that the driver builds when CONFIG_PCI_MSI is disabled. vmxnet3_drv.c:(.text+0x2a88cb): undefined reference to `in_dev_finish_destroy' drivers/net/vmxnet3/vmxnet3_drv.c:1335: error: 'struct vmxnet3_intr' has no member named 'msix_entries' drivers/net/vmxnet3/vmxnet3_drv.c:1384: error: 'struct vmxnet3_intr' has no member named 'msix_entries' drivers/net/vmxnet3/vmxnet3_drv.c:2137: error: 'struct vmxnet3_intr' has no member named 'msix_entries' drivers/net/vmxnet3/vmxnet3_drv.c:2138: error: 'struct vmxnet3_intr' has no member named 'msix_entries' Signed-off-by: Randy Dunlap <randy.dunlap(a)oracle.com> Signed-off-by: Bhavesh davda <bhavesh(a)vmware.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ce2eba1..e19ca4b 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -3235,7 +3235,7 @@ config VIRTIO_NET config VMXNET3 tristate "VMware VMXNET3 ethernet driver" - depends on PCI && X86 + depends on PCI && X86 && INET help This driver supports VMware's vmxnet3 virtual ethernet NIC. To compile this driver as a module, choose M here: the diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 44fb0c5..6a16f76 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c @@ -1314,9 +1314,11 @@ vmxnet3_netpoll(struct net_device *netdev) struct vmxnet3_adapter *adapter = netdev_priv(netdev); int irq; +#ifdef CONFIG_PCI_MSI if (adapter->intr.type == VMXNET3_IT_MSIX) irq = adapter->intr.msix_entries[0].vector; else +#endif irq = adapter->pdev->irq; disable_irq(irq); @@ -1330,12 +1332,15 @@ vmxnet3_request_irqs(struct vmxnet3_adapter *adapter) { int err; +#ifdef CONFIG_PCI_MSI if (adapter->intr.type == VMXNET3_IT_MSIX) { /* we only use 1 MSI-X vector */ err = request_irq(adapter->intr.msix_entries[0].vector, vmxnet3_intr, 0, adapter->netdev->name, adapter->netdev); - } else if (adapter->intr.type == VMXNET3_IT_MSI) { + } else +#endif + if (adapter->intr.type == VMXNET3_IT_MSI) { err = request_irq(adapter->pdev->irq, vmxnet3_intr, 0, adapter->netdev->name, adapter->netdev); } else { @@ -1376,6 +1381,7 @@ vmxnet3_free_irqs(struct vmxnet3_adapter *adapter) adapter->intr.num_intrs <= 0); switch (adapter->intr.type) { +#ifdef CONFIG_PCI_MSI case VMXNET3_IT_MSIX: { int i; @@ -1385,6 +1391,7 @@ vmxnet3_free_irqs(struct vmxnet3_adapter *adapter) adapter->netdev); break; } +#endif case VMXNET3_IT_MSI: free_irq(adapter->pdev->irq, adapter->netdev); break; @@ -2134,6 +2141,7 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter) if (adapter->intr.type == VMXNET3_IT_AUTO) { int err; +#ifdef CONFIG_PCI_MSI adapter->intr.msix_entries[0].entry = 0; err = pci_enable_msix(adapter->pdev, adapter->intr.msix_entries, VMXNET3_LINUX_MAX_MSIX_VECT); @@ -2142,6 +2150,7 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter) adapter->intr.type = VMXNET3_IT_MSIX; return; } +#endif err = pci_enable_msi(adapter->pdev); if (!err) { -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit b734dd5b5753c88c64bf56d4002d8ade7e88edec Merge: 0f6023d5997bf1b5eeae39de42a7e1e26dbe6a90 be10ab109099f8bd8dd365677a9fe641584c1b5b Author: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Date: Thu Oct 15 14:09:11 2009 +1100 Merge commit 'ftrace/ppc' into merge -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 15605236740c38b51d67faf060851bfdc5c6b5fc Merge: a93d4ed2052d19029802ce14bb6e4b2f212d0cad a7f20b2695eb6a00a5464089bacf75b8ed64725e Author: Tony Lindgren <tony(a)atomide.com> Date: Wed Oct 14 15:46:15 2009 -0700 Merge branch '2_6_32rc4_fixes' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 4b1fe7797270e866adc17fc603bddf8768bc187f Author: Andreas Schwab <schwab(a)linux-m68k.org> Date: Mon Sep 28 20:10:02 2009 +0200 tty: fix vt_compat_ioctl Call compat_unimap_ioctl, not do_unimap_ioctl. This was broken by commit e9216651. The compat_unimap_ioctl was originally called do_unimap_ioctl in fs/compat_ioctl.h which got moved to drivers/char/vt_ioctl.c. In that patch, the caller was not updated and consequently called the native handler. Signed-off-by: Andreas Schwab <schwab(a)linux-m68k.org> Acked-by: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c index 6b36ee5..ed86d3b 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c @@ -1532,7 +1532,7 @@ long vt_compat_ioctl(struct tty_struct *tty, struct file * file, case PIO_UNIMAP: case GIO_UNIMAP: - ret = do_unimap_ioctl(cmd, up, perm, vc); + ret = compat_unimap_ioctl(cmd, up, perm, vc); break; /* -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit a7f20b2695eb6a00a5464089bacf75b8ed64725e Author: Paul Walmsley <paul(a)pwsan.com> Date: Wed Oct 14 16:40:37 2009 -0600 OMAP2xxx clock: set up clockdomain pointer in struct clk clock24xx.c is missing a omap2_init_clk_clkdm() in its omap2_clk_init() function. Among other bad effects, this causes the OMAP hwmod layer to oops on boot. Thanks to Carlos Aguiar <carlos.aguiar(a)indt.org.br> and Stefano Panella <Stefano.Panella(a)csr.com> for reporting this bug. Thanks to Tony Lindgren <tony(a)atomide.com> for N800 booting advice. Signed-off-by: Paul Walmsley <paul(a)pwsan.com> Cc: Carlos Aguiar <carlos.aguiar(a)indt.org.br> Cc: Stefano Panella <Stefano.Panella(a)csr.com> Cc: Tony Lindgren <tony(a)atomide.com> diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index bc5d3ac..e2dbedd 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c @@ -769,6 +769,7 @@ int __init omap2_clk_init(void) if (c->cpu & cpu_mask) { clkdev_add(&c->lk); clk_register(c->lk.clk); + omap2_init_clk_clkdm(c->lk.clk); } /* Check the MPU rate set by bootloader */ -- batman-adv

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
99
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2009