commits November 2009

commits@lists.open-mesh.org

1 participants
989 discussions

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

09 Nov '09

The following commit has been merged in the linux branch: commit 422b42fa79fa2825dc7b272ee8d52aa4bac37113 Merge: 1b7607030df6908901250b5d7de03ba74cca7d67 0ea4ed8e948c30f88c824c973ee4b9529015fe65 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Thu Oct 22 08:26:15 2009 +0900 Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: Prevent kvm_init from corrupting debugfs structures KVM: MMU: fix pointer cast KVM: use proper hrtimer function to retrieve expiration time -- batman-adv

1 0

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

09 Nov '09

The following commit has been merged in the linux branch: commit 1b7607030df6908901250b5d7de03ba74cca7d67 Merge: 04bf7539c08d64184736cdc5e4ad617eda77eb0f c1cc65caa19bb8a1b2e371000ef2719581db1691 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Thu Oct 22 08:25:36 2009 +0900 Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: dm snapshot: allow chunk size to be less than page size dm snapshot: use unsigned integer chunk size dm snapshot: lock snapshot while supplying status dm exception store: fix failed set_chunk_size error path dm snapshot: require non zero chunk size by end of ctr dm: dec_pending needs locking to save error value dm: add missing del_gendisk to alloc_dev error path dm log: userspace fix incorrect luid cast in userspace_ctr dm snapshot: free exception store on init failure dm snapshot: sort by chunk size to fix race -- batman-adv

1 0

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

09 Nov '09

The following commit has been merged in the linux branch: commit 04bf7539c08d64184736cdc5e4ad617eda77eb0f Author: Rafael J. Wysocki <rjw(a)sisk.pl> Date: Tue Oct 20 06:45:02 2009 +0200 PM: Make warning in suspend_test_finish() less likely to happen Increase TEST_SUSPEND_SECONDS to 10 so the warning in suspend_test_finish() doesn't annoy the users of slower systems so much. Also, make the warning print the suspend-resume cycle time, so that we know why the warning actually triggered. Patch prepared during the hacking session at the Kernel Summit in Tokyo. Signed-off-by: Rafael J. Wysocki <rjw(a)sisk.pl> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> diff --git a/kernel/power/suspend_test.c b/kernel/power/suspend_test.c index 17d8bb1..25596e4 100644 --- a/kernel/power/suspend_test.c +++ b/kernel/power/suspend_test.c @@ -19,7 +19,7 @@ * The time it takes is system-specific though, so when we test this * during system bootup we allow a LOT of time. */ -#define TEST_SUSPEND_SECONDS 5 +#define TEST_SUSPEND_SECONDS 10 static unsigned long suspend_test_start_time; @@ -49,7 +49,8 @@ void suspend_test_finish(const char *label) * has some performance issues. The stack dump of a WARN_ON * is more likely to get the right attention than a printk... */ - WARN(msec > (TEST_SUSPEND_SECONDS * 1000), "Component: %s\n", label); + WARN(msec > (TEST_SUSPEND_SECONDS * 1000), + "Component: %s, time: %u\n", label, msec); } /* -- batman-adv

1 0

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

09 Nov '09

The following commit has been merged in the linux branch: commit af2bd9d534ca9f1ffdeb0780fb8508e71ed55803 Author: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> Date: Wed Oct 21 09:46:59 2009 +0200 mmc: at91_mci: Don't include asm/mach/mmc.h This fixes a compile bug introduced in 6ef297f (ARM: 5720/1: Move MMCI header to amba include dir) That commit moved arch/arm/include/asm/mach/mmc.h to include/linux/amba/mmci.h. Just removing the include was enough. Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> Acked-by: Linus Walleij <linus.walleij(a)stericsson.com> Acked-by: Nicolas Ferre <nicolas.ferre(a)atmel.com> Acked-by: Bill Gatliff <bgat(a)billgatliff.com> Cc: Catalin Marinas <catalin.marinas(a)arm.com> Cc: Russell King <rmk+kernel(a)arm.linux.org.uk> Cc: Pierre Ossman <drzeus(a)drzeus.cx> Cc: linux-arm-kernel(a)lists.infradead.org Cc: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index e556d42..63924e0 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c @@ -72,7 +72,6 @@ #include <asm/irq.h> #include <asm/gpio.h> -#include <asm/mach/mmc.h> #include <mach/board.h> #include <mach/cpu.h> #include <mach/at91_mci.h> -- batman-adv

1 0

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

09 Nov '09

The following commit has been merged in the linux branch: commit ab4ed677f3fa41a5e1a6410721973558a96cf7a3 Merge: 4fe71dba2f2d550545580d409f432153c6454e59 f875295c4bfb39e96d136edd8ac80567e73536b4 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Thu Oct 22 08:17:15 2009 +0900 Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Kill off stray HAVE_FTRACE_SYSCALLS reference. sh: Remove BKL from landisk gio. sh: disabled cache handling fix. sh: Fix up single page flushing to use PAGE_SIZE. -- batman-adv

1 0

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

09 Nov '09

The following commit has been merged in the linux branch: commit 4fe71dba2f2d550545580d409f432153c6454e59 Merge: 4223a4a155f245d41c350ed9eba4fc32e965c4da 13b79b971564ddd0f14e706592472adc8199e912 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Thu Oct 22 08:16:01 2009 +0900 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: aesni-intel - Fix irq_fpu_usable usage crypto: padlock-sha - Fix stack alignment -- batman-adv

1 0

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

09 Nov '09

The following commit has been merged in the linux branch: commit ad3960243e55320d74195fb85c975e0a8cc4466c Author: Earl Chew <earl_chew(a)agilent.com> Date: Mon Oct 19 15:55:41 2009 -0700 fs: pipe.c null pointer dereference This patch fixes a null pointer exception in pipe_rdwr_open() which generates the stack trace: > Unable to handle kernel NULL pointer dereference at 0000000000000028 RIP: > [<ffffffff802899a5>] pipe_rdwr_open+0x35/0x70 > [<ffffffff8028125c>] __dentry_open+0x13c/0x230 > [<ffffffff8028143d>] do_filp_open+0x2d/0x40 > [<ffffffff802814aa>] do_sys_open+0x5a/0x100 > [<ffffffff8021faf3>] sysenter_do_call+0x1b/0x67 The failure mode is triggered by an attempt to open an anonymous pipe via /proc/pid/fd/* as exemplified by this script: ============================================================= while : ; do { echo y ; sleep 1 ; } | { while read ; do echo z$REPLY; done ; } & PID=$! OUT=$(ps -efl | grep 'sleep 1' | grep -v grep | { read PID REST ; echo $PID; } ) OUT="${OUT%% *}" DELAY=$((RANDOM * 1000 / 32768)) usleep $((DELAY * 1000 + RANDOM % 1000 )) echo n > /proc/$OUT/fd/1 # Trigger defect done ============================================================= Note that the failure window is quite small and I could only reliably reproduce the defect by inserting a small delay in pipe_rdwr_open(). For example: static int pipe_rdwr_open(struct inode *inode, struct file *filp) { msleep(100); mutex_lock(&inode->i_mutex); Although the defect was observed in pipe_rdwr_open(), I think it makes sense to replicate the change through all the pipe_*_open() functions. The core of the change is to verify that inode->i_pipe has not been released before attempting to manipulate it. If inode->i_pipe is no longer present, return ENOENT to indicate so. The comment about potentially using atomic_t for i_pipe->readers and i_pipe->writers has also been removed because it is no longer relevant in this context. The inode->i_mutex lock must be used so that inode->i_pipe can be dealt with correctly. Signed-off-by: Earl Chew <earl_chew(a)agilent.com> Cc: stable(a)kernel.org Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> diff --git a/fs/pipe.c b/fs/pipe.c index 52c4151..ae17d02 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -777,36 +777,55 @@ pipe_rdwr_release(struct inode *inode, struct file *filp) static int pipe_read_open(struct inode *inode, struct file *filp) { - /* We could have perhaps used atomic_t, but this and friends - below are the only places. So it doesn't seem worthwhile. */ + int ret = -ENOENT; + mutex_lock(&inode->i_mutex); - inode->i_pipe->readers++; + + if (inode->i_pipe) { + ret = 0; + inode->i_pipe->readers++; + } + mutex_unlock(&inode->i_mutex); - return 0; + return ret; } static int pipe_write_open(struct inode *inode, struct file *filp) { + int ret = -ENOENT; + mutex_lock(&inode->i_mutex); - inode->i_pipe->writers++; + + if (inode->i_pipe) { + ret = 0; + inode->i_pipe->writers++; + } + mutex_unlock(&inode->i_mutex); - return 0; + return ret; } static int pipe_rdwr_open(struct inode *inode, struct file *filp) { + int ret = -ENOENT; + mutex_lock(&inode->i_mutex); - if (filp->f_mode & FMODE_READ) - inode->i_pipe->readers++; - if (filp->f_mode & FMODE_WRITE) - inode->i_pipe->writers++; + + if (inode->i_pipe) { + ret = 0; + if (filp->f_mode & FMODE_READ) + inode->i_pipe->readers++; + if (filp->f_mode & FMODE_WRITE) + inode->i_pipe->writers++; + } + mutex_unlock(&inode->i_mutex); - return 0; + return ret; } /* -- batman-adv

1 0

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

09 Nov '09

The following commit has been merged in the linux branch: commit 4223a4a155f245d41c350ed9eba4fc32e965c4da Author: Yinghai Lu <yinghai(a)kernel.org> Date: Tue Oct 20 14:13:46 2009 +0900 nfs: Fix nfs_parse_mount_options() kfree() leak Fix a (small) memory leak in one of the error paths of the NFS mount options parsing code. Regression introduced in 2.6.30 by commit a67d18f (NFS: load the rpc/rdma transport module automatically). Reported-by: Yinghai Lu <yinghai(a)kernel.org> Reported-by: Pekka Enberg <penberg(a)cs.helsinki.fi> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> Signed-off-by: Trond Myklebust <Trond.Myklebust(a)netapp.com> Cc: stable(a)kernel.org Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> diff --git a/fs/nfs/super.c b/fs/nfs/super.c index a2c18ac..90be551 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1253,6 +1253,7 @@ static int nfs_parse_mount_options(char *raw, default: dfprintk(MOUNT, "NFS: unrecognized " "transport protocol\n"); + kfree(string); return 0; } break; -- batman-adv

1 0

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

09 Nov '09

The following commit has been merged in the linux branch: commit 0996391139f43d032335b5360db11da62a2cbb39 Author: Russell King <rmk+kernel(a)arm.linux.org.uk> Date: Wed Oct 21 13:20:32 2009 +0100 ARM: Fix lubbock defconfig build drivers/built-in.o: In function `pxa25x_udc_probe': drivers/usb/gadget/pxa25x_udc.c:2195: undefined reference to `otg_get_transceiver' drivers/usb/gadget/pxa25x_udc.c:2300: undefined reference to `otg_put_transceiver' pxa25x_udc.c unconditionally uses these two functions, so we need to ensure that the object providing them is also built. Signed-off-by: Russell King <rmk+kernel(a)arm.linux.org.uk> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 3335131..a18e3c5 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -223,6 +223,7 @@ config USB_OTG config USB_GADGET_PXA25X boolean "PXA 25x or IXP 4xx" depends on (ARCH_PXA && PXA25x) || ARCH_IXP4XX + select USB_OTG_UTILS help Intel's PXA 25x series XScale ARM-5TE processors include an integrated full speed USB 1.1 device controller. The -- batman-adv

1 0

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

09 Nov '09

The following commit has been merged in the linux branch: commit c768e67625688517c23f46b31a46e1f7d2de1c71 Author: Hartley Sweeten <hartleys(a)visionengravers.com> Date: Wed Oct 21 02:27:01 2009 +0100 ARM: 5769/1: CPU_ARM920T: remove dead Maverick EP9312 URL Remove the URL listed for Maverick EP9312 since it is not available and modify the help text appropriately. Signed-off-by: H Hartley Sweeten <hsweeten(a)visionengravers.com> Acked-by: Ryan Mallon <ryan(a)bluewatersys.com> Signed-off-by: Russell King <rmk+kernel(a)arm.linux.org.uk> diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index e993140..9264d81 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -122,10 +122,7 @@ config CPU_ARM920T select CPU_TLB_V4WBI if MMU help The ARM920T is licensed to be produced by numerous vendors, - and is used in the Maverick EP9312 and the Samsung S3C2410. - - More information on the Maverick EP9312 at - <http://linuxdevices.com/products/PD2382866068.html>. + and is used in the Cirrus EP93xx and the Samsung S3C2410. Say Y if you want support for the ARM920T processor. Otherwise, say N. -- batman-adv

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
99
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2009