commit d88c0922fa0e2c021a028b310a641126c6d4b7dc Author: Michel Lespinasse Date: Tue Nov 2 13:05:18 2010 -0700 Release page reference during page fault retry This slipped by when unifying the filemap and swap versions of lock_page_or_retry()... Signed-off-by: Michel Lespinasse Acked-by: Rik van Riel Signed-off-by: Linus Torvalds commit eb8abb927ae2fd1730e24ea94cd9527f3c086292 Author: Theodore Ts'o Date: Tue Nov 2 09:34:50 2010 -0400 ext4: Remove useless spinlock in ext4_getattr() Linus noted, and complained to me, that doing while lots of "git diff"'s of kernel sources, these spinlocks were responsible for 27% of the spinlock cost on his two-processor system as reported by perf. Git was doing lots of parallel stats, and this was putting a lot of pressure on ext4_getattr(). A spinlock to protect a single memory-to-memory copy is pointless, so remove it. Signed-off-by: "Theodore Ts'o" Signed-off-by: Linus Torvalds commit 7fe19da4ca38fc20cdbc7020fcf2eca8fc756410 Author: Arnd Bergmann Date: Thu Oct 28 16:12:33 2010 +0200 preempt: fix kernel build with !CONFIG_BKL The preempt count logic tries to take the BKL into account, which breaks when CONFIG_BKL is not set. Use the same preempt_count offset that we use without CONFIG_PREEMPT when CONFIG_BKL is disabled. Signed-off-by: Arnd Bergmann Reported-and-tested-by: Kirill A. Shutemov Signed-off-by: Linus Torvalds commit 020e773f6b2e797a13d23723773ed1b3ba2c35dc Author: Andy Whitcroft Date: Mon Nov 1 21:01:44 2010 +0000 kconfig: sym_expand_string_value: allow for string termination when reallocing When expanding a parameterised string we may run out of space, this triggers a realloc. When computing the new allocation size we do not allow for the terminating '\0'. Allow for this when calculating the new length. Signed-off-by: Andy Whitcroft Signed-off-by: Linus Torvalds commit e99d11d19977c74b18411cdb59cdebb788237a6e Author: Paul Mundt Date: Tue Nov 2 05:29:21 2010 +0900 fs: logfs: Fix up MTD=y build. Commit 7d945a3aa760 ("logfs get_sb, part 3") broke the logfs build when CONFIG_MTD is set due to a mangled logfs_get_sb_mtd() definition. Signed-off-by: Paul Mundt Signed-off-by: Linus Torvalds