12 years agotree-wide: fix typos "offest" -> "offset"
Uwe Kleine-König [Wed, 28 Oct 2009 19:11:03 +0000 (20:11 +0100)]
tree-wide: fix typos "offest" -> "offset"

This patch was generated by

git grep -E -i -l 'offest' | xargs -r perl -p -i -e 's/offest/offset/'

Signed-off-by: Uwe Kleine-König <>
Signed-off-by: Jiri Kosina <>
12 years agofix kerneldoc for set_irq_msi()
Liuweni [Mon, 2 Nov 2009 14:55:03 +0000 (15:55 +0100)]
fix kerneldoc for set_irq_msi()

Signed-off-by: Liuweni <>
Signed-off-by: Jiri Kosina <>
12 years agospidev: fix double "of of" in comment
Thadeu Lima de Souza Cascardo [Thu, 22 Oct 2009 19:34:29 +0000 (17:34 -0200)]
spidev: fix double "of of" in comment

Signed-off-by: Thadeu Lima de Souza Cascardo <>
Signed-off-by: Jiri Kosina <>
12 years agocomment typo fix: sybsystem -> subsystem
Jean Delvare [Tue, 20 Oct 2009 09:11:52 +0000 (11:11 +0200)]
comment typo fix: sybsystem -> subsystem

Signed-off-by: Jean Delvare <>
Signed-off-by: Jiri Kosina <>
12 years agoipc: fix unused variable warning
Felipe Contreras [Sun, 18 Oct 2009 22:54:29 +0000 (01:54 +0300)]
ipc: fix unused variable warning

Commit a0d092f introduced the following warning:
ipc/msg.c: In function ?msgctl_down?:
ipc/msg.c:415: warning: ?msqid64? may be used uninitialized in this function

The gcc warning in this case is actually bogus, as msqid64 is touched only
iff cmd == IPC_SET, and in such case, copy_msqid_from_user() initializes
it properly.

Signed-off-by: Felipe Contreras <>
Signed-off-by: Jiri Kosina <>
12 years agomm: fix comments for invalidate_inode_pages2()
Peng Tao [Mon, 19 Oct 2009 06:48:13 +0000 (14:48 +0800)]
mm: fix comments for invalidate_inode_pages2()

invalidate_inode_pages2() returns -EBUSY *NOT* -EIO if any pages could not be

Signed-off-by: Peng Tao <>
Signed-off-by: Jiri Kosina <>
12 years agosdio_uart: coding style fixes
Thadeu Lima de Souza Cascardo [Thu, 15 Oct 2009 19:44:00 +0000 (16:44 -0300)]
sdio_uart: coding style fixes

Signed-off-by: Thadeu Lima de Souza Cascardo <>
Signed-off-by: Jiri Kosina <>
12 years agotree-wide: fix some typos and punctuation in comments
Thadeu Lima de Souza Cascardo [Fri, 16 Oct 2009 13:20:49 +0000 (15:20 +0200)]
tree-wide: fix some typos and punctuation in comments

fix some typos and punctuation in comments

Signed-off-by: Thadeu Lima de Souza Cascardo <>
Signed-off-by: Jiri Kosina <>
12 years agoehci-hcd: Fix typo in an error message
Ozan Çağlayan [Tue, 13 Oct 2009 05:37:09 +0000 (08:37 +0300)]
ehci-hcd: Fix typo in an error message

The correct word is handshake.

Signed-off-by: Ozan Çağlayan <>
Signed-off-by: Jiri Kosina <>
12 years agomove stk17ta8's probe function to .devinit.text
Uwe Kleine-König [Sat, 11 Jul 2009 20:53:05 +0000 (22:53 +0200)]
move stk17ta8's probe function to .devinit.text

A pointer to stk17ta8_rtc_probe is passed to the core via
platform_driver_register and so the function must not disappear when the
.init sections are discarded.  Otherwise (if also having HOTPLUG=y)
unbinding and binding a device to the driver via sysfs will result in an
oops as does a device being registered late.

An alternative to this patch is using platform_driver_probe instead of
platform_driver_register plus removing the pointer to the probe function
from the struct platform_driver.

Signed-off-by: Uwe Kleine-König <>
Cc: Anton Vorontsov <>
Cc: Alessandro Zummo <>
Cc: David Brownell <>
Cc: Paul Mundt <>
Cc: Andrew Morton <>
Cc: Hannes Eder <>
Cc: Jiri Kosina <>
Cc: David Brownell <>
Acked-by: Alessandro Zummo <>
Signed-off-by: Jiri Kosina <>
12 years agoatmel_lcdfb.c: fix printk() type mismatch
Claudio Scordino [Fri, 9 Oct 2009 10:20:21 +0000 (12:20 +0200)]
atmel_lcdfb.c: fix printk() type mismatch

This patch fixes a type mismatch when calling dev_info() in the
atmel_lcdfb.c driver.

Signed-off-by: Claudio Scordino <>
Signed-off-by: Nicolas Ferre <>
Signed-off-by: Jiri Kosina <>
12 years agomedia/video: add __init/__exit macros to various drivers
Peter Huewe [Tue, 29 Sep 2009 00:19:00 +0000 (02:19 +0200)]
media/video: add __init/__exit macros to various drivers

Trivial patch which adds the __init/__exit macros to the module_init/
module_exit functions of the following drivers in media video:

Signed-off-by: Peter Huewe <>
Acked-by: Andy Walls <>
Acked-by: Laurent Pinchart <>
Acked-by: Muralidharan Karicheri <>
Acked-By: Steven Toth <>
Signed-off-by: Jiri Kosina <>
12 years agoqnx4fs: add missing KERN_xxx to printk() calls
Anders Larsen [Sat, 26 Sep 2009 18:15:09 +0000 (20:15 +0200)]
qnx4fs: add missing KERN_xxx to printk() calls

fixed printk calls to consistently specify a KERN_xxx level.

Signed-off-by: Anders Larsen <>
Signed-off-by: Jiri Kosina <>
12 years agoataflop: remove buggy/commented-out IRQ disable from do_fd_request()
Jiri Kosina [Fri, 9 Oct 2009 09:49:10 +0000 (11:49 +0200)]
ataflop: remove buggy/commented-out IRQ disable from do_fd_request()

There is a nice gem in drivers/block/ataflop.c::do_fd_request()

      void do_fd_request(struct request_queue * q)
              unsigned long flags;

              DPRINT(("do_fd_request for pid %d\n",current->pid));
              while( fdc_busy ) sleep_on( &fdc_wait );
              fdc_busy = 1;
              stdma_lock(floppy_irq, NULL);

              atari_disable_irq( IRQ_MFP_FDC );
              local_save_flags(flags);        /* The request function is called with ints
              local_irq_disable();             * disabled... so must save the IPL for later */
              atari_enable_irq( IRQ_MFP_FDC );

If you look at the code long enough, you will notioce that the
local_irq_disable() call is actually commented out. This has been
introduced back in 2002 in [1], but as you can see, the same bug has been
there even before, with the sti() call being commented out in the very
same way :)

I am not familiar with the code myself at all, but I guess that the whole
stuff can just be removed. Why do we need save_flags/restore_flags at all,
without actually disabling the local IRQs afterwards? The
redo_fd_request() doesn't seem to do anything that would mess with flags


That does look odd. The comment is correct that the function is entered
with interrupts disabled (and the queue lock held). So I'd say your
patch looks fine, the whole save/restore business looks meaningless.

Signed-off-by: Jiri Kosina <>
Acked-by: Jens Axboe <>
Acked-by: Michael Schmitz <>
12 years agoCRIS: remove code that has been commented out for many years
Jiri Kosina [Fri, 9 Oct 2009 09:55:18 +0000 (11:55 +0200)]
CRIS: remove code that has been commented out for many years

Remove the dump_tlb_all() function that has been commented out for
many years.

Signed-off-by: Jiri Kosina <>
Acked-by: Jesper Nilsson <>
12 years agoCIRS: turn local_save_flags() + local_irq_disable()into local_irq_save()
Jiri Kosina [Fri, 9 Oct 2009 09:26:14 +0000 (11:26 +0200)]
CIRS: turn local_save_flags() + local_irq_disable()into local_irq_save()

This is a followup to my patches that fixed this all over the tree quite some
time ago. This one went unnoticed for some reason.

TLB handling for CRIS contains local_irq_disable() after local_save_flags().
Turn this into local_irq_save().

Signed-off-by: Jiri Kosina <>
Acked-by: Jesper Nilsson <>
12 years agotree-wide: fix typos "aquire" -> "acquire", "cumsumed" -> "consumed"
Uwe Kleine-König [Wed, 7 Oct 2009 13:21:09 +0000 (15:21 +0200)]
tree-wide: fix typos "aquire" -> "acquire", "cumsumed" -> "consumed"

This patch was generated by

git grep -E -i -l '[Aa]quire' | xargs -r perl -p -i -e 's/([Aa])quire/$1cquire/'

and the cumsumed was found by checking the diff for aquire.

Signed-off-by: Uwe Kleine-König <>
Signed-off-by: Jiri Kosina <>
12 years agodocs: Describe the 'C' taint flag in oops-tracing.txt
Nick Bowler [Tue, 6 Oct 2009 14:12:22 +0000 (10:12 -0400)]
docs: Describe the 'C' taint flag in oops-tracing.txt

If some of the flags are documented there, they all should be.

Signed-off-by: Nick Bowler <>
Acked-by: Randy Dunlap <>
Signed-off-by: Jiri Kosina <>
12 years agotree-wide: fix typos "selct" + "slect" -> "select"
Uwe Kleine-König [Tue, 6 Oct 2009 10:42:51 +0000 (12:42 +0200)]
tree-wide: fix typos "selct" + "slect" -> "select"

This patch was generated by

git grep -E -i -l 's(le|el)ct' | xargs -r perl -p -i -e 's/([Ss])(le|el)ct/$1elect/

with only skipping net/netfilter/xt_SECMARK.c and
include/linux/netfilter/xt_SECMARK.h which have a struct member called

Signed-off-by: Uwe Kleine-König <>
Signed-off-by: Jiri Kosina <>
12 years agoKconfig: Remove useless and sometimes wrong comments
Michael Roth [Sun, 4 Oct 2009 16:14:29 +0000 (18:14 +0200)]
Kconfig: Remove useless and sometimes wrong comments

Additionally, some excessive newlines removed.

Signed-off-by: Michael Roth <>
Signed-off-by: Jiri Kosina <>
12 years agodocs: fix core_pipe_limit info
Randy Dunlap [Mon, 5 Oct 2009 02:23:13 +0000 (19:23 -0700)]
docs: fix core_pipe_limit info

Fix typos in core_pipe_limit info.

Signed-off-by: Randy Dunlap <>
Cc: Neil Horman <>
Signed-off-by: Jiri Kosina <>
12 years agopata_cs5535: fix comment header typo
Otavio Salvador [Tue, 29 Sep 2009 17:18:19 +0000 (14:18 -0300)]
pata_cs5535: fix comment header typo

Signed-off-by: Otavio Salvador <>
Signed-off-by: Jiri Kosina <>
12 years agoadd __init/__exit macros to omap video drivers
Peter Huewe [Tue, 29 Sep 2009 01:18:06 +0000 (03:18 +0200)]
add __init/__exit macros to omap video drivers

Trivial patch which adds the __init/__exit macros to the module_init/
module_exit functions of the following drivers in media/omap:

Signed-off-by: Peter Huewe <>
Acked-by: Imre Deak <>
Signed-off-by: Jiri Kosina <>
12 years agotree-wide: fix a very frequent spelling mistake
Dirk Hohndel [Tue, 29 Sep 2009 01:43:57 +0000 (21:43 -0400)]
tree-wide: fix a very frequent spelling mistake

something-bility is spelled as something-blity
so a grep for 'blit' would find these lines

this is so trivial that I didn't split it by subsystem / copy
additional maintainers - all changes are to comments
The only purpose is to get fewer false positives when grepping
around the kernel sources.

Signed-off-by: Dirk Hohndel <>
Signed-off-by: Jiri Kosina <>
12 years agofix my email address.
Andrew Sharp [Wed, 23 Sep 2009 23:03:20 +0000 (16:03 -0700)]
fix my email address.

Signed-off-by: Andrew Sharp <>
Signed-off-by: Jiri Kosina <>
12 years agofix URL in hpet.txt
Amerigo Wang [Wed, 23 Sep 2009 10:03:53 +0000 (06:03 -0400)]
fix URL in hpet.txt

That URL is out of date. Update it.

Cc: Thomas Gleixner <>
Cc: Randy Dunlap <>
Cc: Matt LaPlante <>
Cc: Jiri Kosina <>
Signed-off-by: WANG Cong <>
Acked-by: Matt LaPlante <>
Signed-off-by: Jiri Kosina <>
12 years agoMerge branch 'kvm-updates/2.6.32' of git://
Linus Torvalds [Thu, 5 Nov 2009 21:24:15 +0000 (13:24 -0800)]
Merge branch 'kvm-updates/2.6.32' of git://git./virt/kvm/kvm

* 'kvm-updates/2.6.32' of git://
  KVM: get_tss_base_addr() should return a gpa_t
  KVM: x86: Catch potential overrun in MCE setup

12 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Thu, 5 Nov 2009 21:23:29 +0000 (13:23 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/mszeredi/fuse

* 'for-linus' of git://
  fuse: invalidate target of rename
  fuse: fix kunmap in fuse_ioctl_copy_user
  fuse: prevent fuse_put_request on invalid pointer

12 years agoMerge git://
Linus Torvalds [Thu, 5 Nov 2009 21:23:16 +0000 (13:23 -0800)]
Merge git://

* git://
  mtd/maps: gpio-addr-flash: depend on GPIO arch support
  mtd/maps: gpio-addr-flash: pull in linux/ headers rather than asm/
  mtd: nand: fix htmldocs warnings

12 years agoMerge branch 'merge' of git://
Linus Torvalds [Thu, 5 Nov 2009 21:22:49 +0000 (13:22 -0800)]
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* 'merge' of git://
  powerpc/kvm: Remove problematic BUILD_BUG_ON statement
  powerpc/pci: Fix regression in powerpc MSI-X
  powerpc: Avoid giving out RTC dates below EPOCH
  powerpc/mm: Remove debug context clamping from nohash code
  powerpc: Cleanup Kconfig selection of hugetlbfs support

12 years agox86: Make sure get_user_desc() doesn't sign extend.
Chris Lalancette [Thu, 5 Nov 2009 10:47:08 +0000 (11:47 +0100)]
x86: Make sure get_user_desc() doesn't sign extend.

The current implementation of get_user_desc() sign extends the return
value because of integer promotion rules.  For the most part, this
doesn't matter, because the top bit of base2 is usually 0.  If, however,
that bit is 1, then the entire value will be 0xffff...  which is
probably not what the caller intended.

This patch casts the entire thing to unsigned before returning, which
generates almost the same assembly as the current code but replaces the
final "cltq" (sign extend) with a "mov %eax %eax" (zero-extend).  This
fixes booting certain guests under KVM.

Signed-off-by: Chris Lalancette <>
Signed-off-by: Linus Torvalds <>
12 years agoMerge branch 'bugfix' of git://
Linus Torvalds [Thu, 5 Nov 2009 18:58:07 +0000 (10:58 -0800)]
Merge branch 'bugfix' of git://git./linux/kernel/git/jeremy/xen

* 'bugfix' of git://
  xen: mask extended topology info in cpuid
  xen/hvc: make sure console output is always emitted, with explicit polling

12 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Thu, 5 Nov 2009 18:57:39 +0000 (10:57 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://
  sysfs: Don't leak secdata when a sysfs_dirent is freed.

12 years agoMerge branch 'sched-fixes-for-linus' of git://
Linus Torvalds [Thu, 5 Nov 2009 18:56:47 +0000 (10:56 -0800)]
Merge branch 'sched-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://
  sched: Fix kthread_bind() by moving the body of kthread_bind() to sched.c
  sched: Disable SD_PREFER_LOCAL at node level
  sched: Fix boot crash by zalloc()ing most of the cpu masks
  sched: Strengthen buddies and mitigate buddy induced latencies

12 years agoMerge branch 'tracing-fixes-for-linus' of git://
Linus Torvalds [Thu, 5 Nov 2009 18:56:25 +0000 (10:56 -0800)]
Merge branch 'tracing-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://
  ftrace: Fix unmatched locking in ftrace_regex_write()
  ring-buffer: Synchronize resizing buffer with reader lock

12 years agoMerge branch 'x86-fixes-for-linus' of git://
Linus Torvalds [Thu, 5 Nov 2009 18:54:08 +0000 (10:54 -0800)]
Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://
  x86, fs: Fix x86 procfs stack information for threads on 64-bit
  x86: Add reboot quirk for 3 series Mac mini
  x86: Fix printk message typo in mtrr cleanup code
  dma-debug: Fix compile warning with PAE enabled
  x86/amd-iommu: Un__init function required on shutdown
  x86/amd-iommu: Workaround for erratum 63

12 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Thu, 5 Nov 2009 18:53:49 +0000 (10:53 -0800)]
Merge branch 'for-linus' of git://

* 'for-linus' of git://
  m32r: Should index be positive?
  m32r: bzip2/lzma kernel compression support
  m32r: add NOTES to to remove section
  arch/m32r: Use DIV_ROUND_CLOSEST

12 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Thu, 5 Nov 2009 18:53:24 +0000 (10:53 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/bp/bp

* 'for-linus' of git://
  amd64_edac: fix CECCs reporting
  amd64_edac: fix a wrong goto clause in amd64_edac.c

12 years agosgi-gru: decrapfiy options_write() function
Linus Torvalds [Thu, 5 Nov 2009 18:48:30 +0000 (10:48 -0800)]
sgi-gru: decrapfiy options_write() function

Not a single line of actual code in the function was really
fundamentally correct.

Problems ranged from lack of proper range checking, to removing the last
character written (which admittedly is usually '\n'), to not accepting
hex numbers even though the 'show' routine would show the data in that

This tries to do better.

Acked-by: Michael Buesch <>
Tested-and-acked-by: Jack Steiner <>
Cc: Jiri Kosina <>
Cc: Michael Gilbert <>
Signed-off-by: Linus Torvalds <>
12 years agopowerpc/kvm: Remove problematic BUILD_BUG_ON statement
Benjamin Herrenschmidt [Thu, 5 Nov 2009 06:10:34 +0000 (17:10 +1100)]
powerpc/kvm: Remove problematic BUILD_BUG_ON statement

Signed-off-by: Benjamin Herrenschmidt <>
12 years agopowerpc/pci: Fix regression in powerpc MSI-X
Andre Detsch [Wed, 4 Nov 2009 15:03:19 +0000 (13:03 -0200)]
powerpc/pci: Fix regression in powerpc MSI-X

Patch f598282f5145036312d90875d0ed5c14b49fd8a7 exposed a problem in
powerpc MSI-X functionality, making network interfaces such as ixgbe
and cxgb3 stop to work when MSI-X is enabled. RX interrupts were not
being generated.

The problem was caused because MSI irq was not being effectively
unmasked after device initialization.

Signed-off-by: Andre Detsch <>
Signed-off-by: Michael Ellerman <>
Signed-off-by: Benjamin Herrenschmidt <>
12 years agopowerpc: Avoid giving out RTC dates below EPOCH
Benjamin Herrenschmidt [Sun, 1 Nov 2009 19:11:03 +0000 (19:11 +0000)]
powerpc: Avoid giving out RTC dates below EPOCH

Doing so causes xtime to be negative which crashes the timekeeping
code in funny ways when doing suspend/resume

Signed-off-by: Benjamin Herrenschmidt <>
12 years agopowerpc/mm: Remove debug context clamping from nohash code
Benjamin Herrenschmidt [Wed, 4 Nov 2009 13:39:52 +0000 (13:39 +0000)]
powerpc/mm: Remove debug context clamping from nohash code

I inadvertently left that debug code enabled, causing the number of
contexts to be clamped to 31 which is going to slow things down on
4xx and just plain breaks 8xx

Signed-off-by: Benjamin Herrenschmidt <>
12 years agosysfs: Don't leak secdata when a sysfs_dirent is freed.
Eric W. Biederman [Wed, 4 Nov 2009 10:50:06 +0000 (02:50 -0800)]
sysfs: Don't leak secdata when a sysfs_dirent is freed.

While refreshing my sysfs patches I noticed a leak in the secdata
implementation.  We don't free the secdata when we free the
sysfs dirent.

This is a bug in 2.6.32-rc5 that we really should close.

Signed-off-by: Eric W. Biederman <>
Acked-by: Serge Hallyn <>
Signed-off-by: James Morris <>
12 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Wed, 4 Nov 2009 15:05:43 +0000 (07:05 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/anholt/drm-intel

* 'for-linus' of git://
  drm/i915: Ironlake suspend/resume support
  drm/i915: kill warning in intel_find_pll_g4x_dp
  drm/i915: update watermarks before enabling PLLs
  drm/i915: add FIFO watermark support for G4x
  drm/i915: quiet DP i2c init
  drm/i915: fix panel fitting filter coefficient select for Ironlake
  drm/i915: fix to setup display reference clock control on Ironlake
  drm/i915: Install a fence register for fbc on g4x
  drm/i915: save/restore BLC histogram control reg across suspend/resume
  drm/i915: Fix FDI M/N setting according with correct color depth
  drm/i915: disable powersave feature for Ironlake currently
  drm/i915: Fix render reclock availability detection.
  drm/i915: Save and restore the GM45 FBC regs on suspend and resume.
  drm/i915: Set the LVDS_BORDER when using LVDS scaling mode
  drm/i915: disable FBC for Pineview, fixing a boot hang.

12 years agoKVM: get_tss_base_addr() should return a gpa_t
Gleb Natapov [Sun, 25 Oct 2009 15:42:02 +0000 (17:42 +0200)]
KVM: get_tss_base_addr() should return a gpa_t

If TSS we are switching to resides in high memory task switch will fail
since address will be truncated. Windows2k3 does this sometimes when
running with more then 4G

Signed-off-by: Gleb Natapov <>
Signed-off-by: Avi Kivity <>
12 years agoKVM: x86: Catch potential overrun in MCE setup
Jan Kiszka [Fri, 23 Oct 2009 07:37:00 +0000 (09:37 +0200)]
KVM: x86: Catch potential overrun in MCE setup

We only allocate memory for 32 MCE banks (KVM_MAX_MCE_BANKS) but we
allow user space to fill up to 255 on setup (mcg_cap & 0xff), corrupting
kernel memory. Catch these overflows.

Signed-off-by: Jan Kiszka <>
Signed-off-by: Marcelo Tosatti <>
12 years agoamd64_edac: fix CECCs reporting
Borislav Petkov [Wed, 4 Nov 2009 13:04:06 +0000 (14:04 +0100)]
amd64_edac: fix CECCs reporting

Shift error type bits properly.

Signed-off-by: Borislav Petkov <>
12 years agoamd64_edac: fix a wrong goto clause in amd64_edac.c
Li Hong [Mon, 19 Oct 2009 08:33:29 +0000 (16:33 +0800)]
amd64_edac: fix a wrong goto clause in amd64_edac.c

In amd64_edac_init(void) in amd64_edac.c, cache_k8_northbridges() is
called before pci_register_driver. If it fails, should exit with err

Signed-off-by: Li Hong <>
Acked-by: Doug Thompson <>
Signed-off-by: Borislav Petkov <>
12 years agox86, fs: Fix x86 procfs stack information for threads on 64-bit
Stefani Seibold [Tue, 3 Nov 2009 09:22:40 +0000 (10:22 +0100)]
x86, fs: Fix x86 procfs stack information for threads on 64-bit

This patch fixes two issues in the procfs stack information on
x86-64 linux.

The 32 bit loader compat_do_execve did not store stack
start. (this was figured out by Alexey Dobriyan).

The stack information on a x64_64 kernel always shows 0 kbyte
stack usage, because of a missing implementation of the KSTK_ESP
macro which always returned -1.

The new implementation now returns the right value.

Signed-off-by: Stefani Seibold <>
Cc: Americo Wang <>
Cc: Alexey Dobriyan <>
Cc: Al Viro <>
Cc: Andrew Morton <>
LKML-Reference: <1257240160.4889.24.camel@wall-e>
Signed-off-by: Ingo Molnar <>
12 years agofuse: invalidate target of rename
Miklos Szeredi [Wed, 4 Nov 2009 09:24:52 +0000 (10:24 +0100)]
fuse: invalidate target of rename

Invalidate the target's attributes, which may have changed (such as
nlink, change time) so that they are refreshed on the next getattr().

Signed-off-by: Miklos Szeredi <>
12 years agofuse: fix kunmap in fuse_ioctl_copy_user
Jens Axboe [Tue, 3 Nov 2009 10:40:44 +0000 (11:40 +0100)]
fuse: fix kunmap in fuse_ioctl_copy_user

Looks like another victim of the confusing kmap() vs kmap_atomic() API

Reported-by: Todor Gyumyushev <>
Signed-off-by: Jens Axboe <>
Signed-off-by: Miklos Szeredi <>
Cc: Tejun Heo <>
12 years agofuse: prevent fuse_put_request on invalid pointer
Anand V. Avati [Thu, 22 Oct 2009 13:24:52 +0000 (06:24 -0700)]
fuse: prevent fuse_put_request on invalid pointer

fuse_direct_io() has a loop where requests are allocated in each
iteration. if allocation fails, the loop is broken out and follows
into an unconditional fuse_put_request() on that invalid pointer.

Signed-off-by: Anand V. Avati <>
Signed-off-by: Miklos Szeredi <>
12 years agoftrace: Fix unmatched locking in ftrace_regex_write()
Li Zefan [Tue, 3 Nov 2009 00:55:38 +0000 (08:55 +0800)]
ftrace: Fix unmatched locking in ftrace_regex_write()

When a command is passed to the set_ftrace_filter, then
the ftrace_regex_lock is still held going back to user space.

 # echo 'do_open : foo' > set_ftrace_filter
 (still holding ftrace_regex_lock when returning to user space!)

Signed-off-by: Li Zefan <>
LKML-Reference: <>
Signed-off-by: Steven Rostedt <>
12 years agoring-buffer: Synchronize resizing buffer with reader lock
Lai Jiangshan [Tue, 3 Nov 2009 11:42:45 +0000 (19:42 +0800)]
ring-buffer: Synchronize resizing buffer with reader lock

We got a sudden panic when we reduced the size of the

We can reproduce the panic by the following steps:

echo 1 > events/sched/enable
cat trace_pipe > /dev/null &

while ((1))
echo 12000 > buffer_size_kb
echo 512 > buffer_size_kb

(not more than 5 seconds, panic ...)

Reported-by: KOSAKI Motohiro <>
Signed-off-by: Lai Jiangshan <>
LKML-Reference: <>
Signed-off-by: Steven Rostedt <>
12 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Wed, 4 Nov 2009 02:16:21 +0000 (18:16 -0800)]
Merge branch 'for-linus' of git://

* 'for-linus' of git://
  cfq-iosched: limit coop preemption
  cfq-iosched: fix bad return value cfq_should_preempt()
  backing-dev: bdi sb prune should be in the unregister path, not destroy
  Fix bio_alloc() and bio_kmalloc() documentation
  bio_put(): add bio_clone() to the list of functions in the comment

12 years agoMerge branch 'upstream-linus' of git://
Linus Torvalds [Wed, 4 Nov 2009 02:15:18 +0000 (18:15 -0800)]
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://
  sata_via: Remove redundant device ID for VIA VT8261
  drivers/ata/libata: Move dereference after NULL test
  ahci: Enable SB600 64bit DMA on MSI K9A2 Platinum v2

12 years agom32r: Should index be positive?
Roel Kluin [Sun, 1 Nov 2009 14:33:06 +0000 (15:33 +0100)]
m32r: Should index be positive?

Index `ipi_num' is signed, test whether it is negative to
make sure we don't get a negative array element.

Signed-off-by: Roel Kluin <>
Signed-off-by: Hirokazu Takata <>
12 years agom32r: bzip2/lzma kernel compression support
Hirokazu Takata [Thu, 15 Oct 2009 00:21:56 +0000 (09:21 +0900)]
m32r: bzip2/lzma kernel compression support

- Support bzip2 and lzma kernel compression for m32r.
- Clean up arch/m32r/boot/compressed/misc.c.

Signed-off-by: Hirokazu Takata <>
12 years agom32r: add NOTES to to remove section
Hirokazu Takata [Sun, 4 Oct 2009 15:10:55 +0000 (00:10 +0900)]
m32r: add NOTES to to remove section

Building with --build-id option, section is added
to vmlinux.bin.  But some old buggy binutils creates a huge vmlinux.bin,
and a bootloader fails to boot its zImage as well.

This patch adds a NOTES macro to a linker script vmlinux.ld.S to put section into .note section.
Then, the .note section will be removed, because "-R .note" option is
specified in OBJCOPYFLAGS to make a vmlinux.bin binary.

Signed-off-by: Hirokazu Takata <>
12 years agoarch/m32r: Use DIV_ROUND_CLOSEST
Julia Lawall [Sun, 2 Aug 2009 08:47:27 +0000 (10:47 +0200)]
arch/m32r: Use DIV_ROUND_CLOSEST

The kernel.h macro DIV_ROUND_CLOSEST performs the computation (x + d/2)/d
but is perhaps more readable.

The semantic patch that makes this change is as follows:

// <smpl>

@depends on haskernel@
expression x,__divisor;

- (((x) + ((__divisor) / 2)) / (__divisor))
+ DIV_ROUND_CLOSEST(x,__divisor)
// </smpl>

Signed-off-by: Julia Lawall <>
Signed-off-by: Hirokazu Takata <>
12 years agoLinux 2.6.32-rc6
Linus Torvalds [Tue, 3 Nov 2009 19:37:49 +0000 (11:37 -0800)]
Linux 2.6.32-rc6

12 years agosata_via: Remove redundant device ID for VIA VT8261 [Mon, 2 Nov 2009 11:36:08 +0000 (19:36 +0800)]
sata_via: Remove redundant device ID for VIA VT8261

Just remove redundant device ID for VIA VT8261.
The device ID 0x9000 and 0x9040 are redundant (for VT8261).
The 0x9040 is reserved for other usage.

Signed-off-by: Joseph Chan <>
Signed-off-by: Jeff Garzik <>
12 years agodrivers/ata/libata: Move dereference after NULL test
Julia Lawall [Sat, 17 Oct 2009 06:41:47 +0000 (08:41 +0200)]
drivers/ata/libata: Move dereference after NULL test

In each case, if the NULL test on qc is needed, then the derefernce
should be after the NULL test.

A simplified version of the semantic match that detects this problem is as
follows (

// <smpl>
@match exists@
expression x, E;
identifier fld;

* x->fld
  ... when != \(x = E\|&x\)
* x == NULL
// </smpl>

Signed-off-by: Julia Lawall <>
Signed-off-by: Jeff Garzik <>
12 years agoahci: Enable SB600 64bit DMA on MSI K9A2 Platinum v2
Mark Nelson [Tue, 3 Nov 2009 09:06:48 +0000 (20:06 +1100)]
ahci: Enable SB600 64bit DMA on MSI K9A2 Platinum v2

Like the Asus M2A-VM, MSI's K9A2 Platinum (MS-7376) can also support 64bit
DMA. It is a new enough board that all the BIOS releases work correctly with
64bit DMA enabled.

Signed-off-by: Mark Nelson <>
Signed-off-by: Jeff Garzik <>
12 years agocfq-iosched: limit coop preemption
Shaohua Li [Tue, 3 Nov 2009 19:25:02 +0000 (20:25 +0100)]
cfq-iosched: limit coop preemption

CFQ has an optimization for cooperated applications. if several
io-context have close requests, they will get boost. But the
optimization get abused. Considering thread a, b, which work on one
file. a reads sectors s, s+2, s+4, ...; b reads sectors s+1, s+3, s
+5, ... Both a and b are sequential read, so they can open idle window.
a reads a sector s and goes to idle window and wakeup b. b reads sector
s+1, since in current implementation, cfq_should_preempt() thinks a and
b are cooperators, b will preempt a. b then reads sector s+1 and goes to
idle window and wakeup a. for the same reason, a will preempt b and
reads s+2. a and b will continue the circle. The circle will be very
long, and a and b will occupy whole disk queue. Other applications will
nearly have no chance to run.

Fix this limiting coop preempt until a queue is scheduled normally

Signed-off-by: Shaohua Li <>
Acked-by: Jeff Moyer <>
Signed-off-by: Jens Axboe <>
12 years agocfq-iosched: fix bad return value cfq_should_preempt()
Jens Axboe [Tue, 3 Nov 2009 19:21:35 +0000 (20:21 +0100)]
cfq-iosched: fix bad return value cfq_should_preempt()

Commit a6151c3a5c8e1ff5a28450bc8d6a99a2a0add0a7 inadvertently reversed
a preempt condition check, potentially causing a performance regression.
Make the meta check correct again.

Signed-off-by: Jens Axboe <>
12 years agobacking-dev: bdi sb prune should be in the unregister path, not destroy
Jens Axboe [Tue, 3 Nov 2009 19:18:44 +0000 (20:18 +0100)]
backing-dev: bdi sb prune should be in the unregister path, not destroy

Commit 592b09a42fc3ae6737a0f3ecf4fee42ecd0296f8 was different from
the tested path, in that it moved the bdi super_block prune from
unregister to destroy context. This doesn't fully fix the sync hang
bug on unexpected device removal, as need to prune the bdi cache
pointer before killing flusher thread.

Tested-by: Artur Skawina <>
Signed-off-by: Jens Axboe <>
12 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Tue, 3 Nov 2009 19:15:25 +0000 (11:15 -0800)]
Merge branch 'for-linus' of git://

* 'for-linus' of git://
  at91: at91sam9g45 family: identify several chip versions
  avr32: add two new at91 to cpu.h definition

12 years agoxen: mask extended topology info in cpuid
Jeremy Fitzhardinge [Thu, 22 Oct 2009 23:41:15 +0000 (16:41 -0700)]
xen: mask extended topology info in cpuid

A Xen guest never needs to know about extended topology, and knowing
would just confuse it.

This patch just zeros ebx in leaf 0xb which indicates no topology info,
preventing a crash under Xen on cpus which support this leaf.

Signed-off-by: Jeremy Fitzhardinge <>
Cc: Stable Kernel <>
12 years agoxen/hvc: make sure console output is always emitted, with explicit polling
Jeremy Fitzhardinge [Tue, 20 Oct 2009 06:28:21 +0000 (15:28 +0900)]
xen/hvc: make sure console output is always emitted, with explicit polling

We never want to rely on the hvc workqueue to emit output, because the
most interesting output is when the kernel is broken.  This will
improve oops/crash/console message for better debugging.

Instead, we force-poll until all output is emitted.

Signed-off-by: Jeremy Fitzhardinge <>
Cc: Stable Kernel <>
12 years agoat91: at91sam9g45 family: identify several chip versions
Nicolas Ferre [Mon, 21 Sep 2009 10:03:56 +0000 (12:03 +0200)]
at91: at91sam9g45 family: identify several chip versions

cpu_is_xxx() macros are identifying generic at91sam9g45 chip. This patch adds
the capacity to differentiate Engineering Samples and final lots through the
inclusion of  at91_cpu_fully_identify() and the related chip IDs with chip
version field preserved.

Signed-off-by: Nicolas Ferre <>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <>
Acked-by: Hans-Christian Egtvedt <>
12 years agoavr32: add two new at91 to cpu.h definition
Nicolas Ferre [Mon, 6 Jul 2009 10:15:12 +0000 (12:15 +0200)]
avr32: add two new at91 to cpu.h definition

Somme common drivers will need those at91 cpu_is_xxx() definitions. As
at91sam9g10 and at91sam9g45 are on the way to linus' tree, here is the patch
that adds those chips to cpu.h in AVR32 architecture.

Signed-off-by: Nicolas Ferre <>
Signed-off-by: Haavard Skinnemoen <>
12 years agoMerge branch 'upstream' of git://
Linus Torvalds [Tue, 3 Nov 2009 16:09:57 +0000 (08:09 -0800)]
Merge branch 'upstream' of git://

* 'upstream' of git:// (38 commits)
  MIPS: O32: Fix ppoll
  MIPS: Oprofile: Rename cpu_type from godson2 to loongson2
  MIPS: Alchemy: Fix hang with high-frequency edge interrupts
  MIPS: TXx9: Fix spi-baseclk value
  MIPS: bcm63xx: Set the correct BCM3302 CPU name
  MIPS: Loongson 2: Set cpu_has_dc_aliases and cpu_icache_snoops_remote_store
  MIPS: Avoid potential hazard on Context register
  MIPS: Octeon: Use lockless interrupt controller operations when possible.
  MIPS: Octeon: Use write_{un,}lock_irq{restore,save} to set irq affinity
  MIPS: Set S-cache linesize to 64-bytes for MTI's S-cache
  MIPS: SMTC: Avoid queing multiple reschedule IPIs
  MIPS: GCMP: Avoid accessing registers when they are not present
  MIPS: GIC: Random fixes and enhancements.
  MIPS: CMP: Fix memory barriers for correct operation of amon_cpu_start
  MIPS: Fix abs.[sd] and neg.[sd] emulation for NaN operands
  MIPS: SPRAM: Clean up support code a little
  MIPS: 1004K: Enable SPRAM support.
  MIPS: Malta: Enable PCI 2.1 compatibility in PIIX4
  MIPS: Kconfig: Fix duplicate default value for MIPS_L1_CACHE_SHIFT.
  MIPS: MTI: Fix accesses to device registers on MIPS boards

12 years agoMerge branch 'iommu/fixes' of git://
Ingo Molnar [Tue, 3 Nov 2009 15:54:14 +0000 (16:54 +0100)]
Merge branch 'iommu/fixes' of git://git./linux/kernel/git/joro/linux-2.6-iommu into x86/urgent

12 years agoMerge branch 'pm-fixes' of git://
Linus Torvalds [Tue, 3 Nov 2009 15:52:57 +0000 (07:52 -0800)]
Merge branch 'pm-fixes' of git://git./linux/kernel/git/rafael/suspend-2.6

* 'pm-fixes' of git://
  PM: Remove some debug messages producing too much noise
  PM: Fix warning on suspend errors
  PM / Hibernate: Add newline to load_image() fail path
  PM / Hibernate: Fix error handling in save_image()
  PM / Hibernate: Fix blkdev refleaks
  PM / yenta: Split resume into early and late parts (rev. 4)

12 years agoCorrect nr_processes() when CPUs have been unplugged
Ian Campbell [Tue, 3 Nov 2009 10:11:14 +0000 (10:11 +0000)]
Correct nr_processes() when CPUs have been unplugged

nr_processes() returns the sum of the per cpu counter process_counts for
all online CPUs. This counter is incremented for the current CPU on
fork() and decremented for the current CPU on exit(). Since a process
does not necessarily fork and exit on the same CPU the process_count for
an individual CPU can be either positive or negative and effectively has
no meaning in isolation.

Therefore calculating the sum of process_counts over only the online
CPUs omits the processes which were started or stopped on any CPU which
has since been unplugged. Only the sum of process_counts across all
possible CPUs has meaning.

The only caller of nr_processes() is proc_root_getattr() which
calculates the number of links to /proc as
        stat->nlink = proc_root.nlink + nr_processes();

You don't have to be all that unlucky for the nr_processes() to return a
negative value leading to a negative number of links (or rather, an
apparently enormous number of links). If this happens then you can get
failures where things like "ls /proc" start to fail because they got an
-EOVERFLOW from some stat() call.

Example with some debugging inserted to show what goes on:
        # ps haux|wc -l
        nr_processes: CPU0:     90
        nr_processes: CPU1:     1030
        nr_processes: CPU2:     -900
        nr_processes: CPU3:     -136
        nr_processes: TOTAL:    84
        proc_root_getattr. nlink 12 + nr_processes() 84 = 96
        # echo 0 >/sys/devices/system/cpu/cpu1/online
        # ps haux|wc -l
        nr_processes: CPU0:     85
        nr_processes: CPU2:     -901
        nr_processes: CPU3:     -137
        nr_processes: TOTAL:    -953
        proc_root_getattr. nlink 12 + nr_processes() -953 = -941
        # stat /proc/
        nr_processes: CPU0:     84
        nr_processes: CPU2:     -901
        nr_processes: CPU3:     -137
        nr_processes: TOTAL:    -954
        proc_root_getattr. nlink 12 + nr_processes() -954 = -942
          File: `/proc/'
          Size: 0               Blocks: 0          IO Block: 1024   directory
        Device: 3h/3d   Inode: 1           Links: 4294966354
        Access: (0555/dr-xr-xr-x)  Uid: (    0/    root)   Gid: (    0/    root)
        Access: 2009-11-03 09:06:55.000000000 +0000
        Modify: 2009-11-03 09:06:55.000000000 +0000
        Change: 2009-11-03 09:06:55.000000000 +0000

I'm not 100% convinced that the per_cpu regions remain valid for offline
CPUs, although my testing suggests that they do. If not then I think the
correct solution would be to aggregate the process_count for a given CPU
into a global base value in cpu_down().

This bug appears to pre-date the transition to git and it looks like it
may even have been present in linux-2.6.0-test7-bk3 since it looks like
the code Rusty patched in was already

Signed-off-by: Ian Campbell <>
Cc: Andrew Morton <>
Cc: Rusty Russell <>
Signed-off-by: Linus Torvalds <>
12 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Tue, 3 Nov 2009 15:46:17 +0000 (07:46 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

* 'for-linus' of git://
  Input: gpio-keys - use IRQF_SHARED
  Input: winbond-cir - select LEDS_TRIGGERS
  Input: i8042 - try to get stable CTR value when initializing
  Input: atkbd - add a quirk for OQO 01+ multimedia keys

12 years agoMerge branch 'fixes-s3c-2632-rc5' of git://
Linus Torvalds [Tue, 3 Nov 2009 15:46:05 +0000 (07:46 -0800)]
Merge branch 'fixes-s3c-2632-rc5' of git://

* 'fixes-s3c-2632-rc5' of git://
  ARM: S3C2410: Fix sparse warnings in arch/arm/mach-s3c2410/gpio.c
  ARM: S3C2440: mini2440: Fix spare warnings
  ARM: S3C24XX: Fix warnings in arch/arm/plat-s3c24xx/gpio.c
  ARM: S3C2440: mini2440: Fix missing CONFIG_S3C_DEV_USB_HOST
  ARM: S3C24XX: arch/arm/plat-s3c24xx: Move dereference after NULL test
  ARM: S3C: Fix adc function exports
  ARM: S3C2410: Fix link if CONFIG_S3C2410_IOTIMING is not set
  ARM: S3C24XX: Introduce S3C2442B CPU
  ARM: S3C24XX: Define a macro to avoid compilation error
  ARM: S3C: Add info for supporting circular DMA buffers
  ARM: S3C64XX: Set rate of crystal mux
  ARM: S3C64XX: Fix S3C64XX_CLKDIV0_ARM_MASK value

12 years agoMerge branch 'i2c-fixes' of git://
Linus Torvalds [Tue, 3 Nov 2009 15:45:50 +0000 (07:45 -0800)]
Merge branch 'i2c-fixes' of git://

* 'i2c-fixes' of git://
  i2c-mpc: Do not generate STOP after read.
  i2c: imx: disable clock when it's possible to save power.
  i2c: imx: only imx1 needs disable delay
  i2c: imx: check busy bit when START/STOP

12 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Tue, 3 Nov 2009 15:45:22 +0000 (07:45 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/ryusuke/nilfs2

* 'for-linus' of git://
  nilfs2: add zero-fill for new btree node buffers
  nilfs2: fix irregular checkpoint creation due to data flush
  nilfs2: fix dirty page accounting leak causing hang at write

12 years agoMerge git://
Linus Torvalds [Tue, 3 Nov 2009 15:44:01 +0000 (07:44 -0800)]
Merge git://git./linux/kernel/git/davem/net-2.6

* git:// (21 commits)
  mac80211: check interface is down before type change
  cfg80211: fix NULL ptr deref
  libertas if_usb: Fix crash on 64-bit machines
  mac80211: fix reason code output endianness
  mac80211: fix addba timer
  ath9k: fix misplaced semicolon on rate control
  b43: Fix DMA TX bounce buffer copying
  mac80211: fix BSS leak
  rt73usb.c : more ids
  ipw2200: fix oops on missing firmware
  gre: Fix dev_addr clobbering for gretap
  sky2: set carrier off in probe
  net: fix sk_forward_alloc corruption
  pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card
  r8169: Fix card drop incoming VLAN tagged MTU byte large jumbo frames
  ibmtr: possible Read buffer overflow?
  net: Fix RPF to work with policy routing
  net: fix kmemcheck annotations
  e1000e: rework disable K1 at 1000Mbps for 82577/82578
  e1000e: config PHY via software after resets

12 years agoMerge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes
Joerg Roedel [Tue, 3 Nov 2009 11:05:40 +0000 (12:05 +0100)]
Merge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes

12 years agoPM: Remove some debug messages producing too much noise
Pavel Machek [Wed, 28 Oct 2009 21:56:10 +0000 (22:56 +0100)]
PM: Remove some debug messages producing too much noise

pm_runtime_idle() is somewhat noisy. Remove debug prints.

Signed-off-by: Pavel Machek <>
Signed-off-by: Rafael J. Wysocki <>
12 years agoPM: Fix warning on suspend errors
Romit Dasgupta [Wed, 28 Oct 2009 21:56:02 +0000 (22:56 +0100)]
PM: Fix warning on suspend errors

Fixes the point where we need to complete the power transition when
device suspend fails, so that we don't print warnings about devices
added to the device hierarchy after a failing suspend.

[rjw: Modified changelog.]

Signed-off-by: Romit Dasgupta <>
Signed-off-by: Rafael J. Wysocki <>
12 years agoPM / Hibernate: Add newline to load_image() fail path
Jiri Slaby [Wed, 28 Oct 2009 21:55:42 +0000 (22:55 +0100)]
PM / Hibernate: Add newline to load_image() fail path

Finish a line by \n when load_image fails in the middle of loading.

Signed-off-by: Jiri Slaby <>
Acked-by: Pavel Machek <>
Signed-off-by: Rafael J. Wysocki <>
12 years agoPM / Hibernate: Fix error handling in save_image()
Jiri Slaby [Wed, 28 Oct 2009 21:55:33 +0000 (22:55 +0100)]
PM / Hibernate: Fix error handling in save_image()

There are too many retval variables in save_image(). Thus error return
value from snapshot_read_next() may be ignored and only part of the
snapshot (successfully) written.

Remove 'error' variable, invert the condition in the do-while loop
and convert the loop to use only 'ret' variable.

Switch the rest of the function to consider only 'ret'.

Also make sure we end printed line by \n if an error occurs.

Signed-off-by: Jiri Slaby <>
Acked-by: Pavel Machek <>
Signed-off-by: Rafael J. Wysocki <>
12 years agoPM / Hibernate: Fix blkdev refleaks
Jiri Slaby [Wed, 7 Oct 2009 20:37:35 +0000 (22:37 +0200)]
PM / Hibernate: Fix blkdev refleaks

While cruising through the swsusp code I found few blkdev reference
leaks of resume_bdev.

swsusp_read: remove blkdev_put altogether. Some fail paths do
             not do that.
swsusp_check: make sure we always put a reference on fail paths
software_resume: all fail paths between swsusp_check and swsusp_read
                 omit swsusp_close. Add it in those cases. And since
                 swsusp_read doesn't drop the reference anymore, do
                 it here unconditionally.

[rjw: Fixed a small coding style issue.]

Signed-off-by: Jiri Slaby <>
Signed-off-by: Rafael J. Wysocki <>
12 years agoPM / yenta: Split resume into early and late parts (rev. 4)
Rafael J. Wysocki [Tue, 3 Nov 2009 09:54:58 +0000 (10:54 +0100)]
PM / yenta: Split resume into early and late parts (rev. 4)

Commit 0c570cdeb8fdfcb354a3e9cd81bfc6a09c19de0c
(PM / yenta: Fix cardbus suspend/resume regression) caused resume to
fail on systems with two CardBus bridges.  While the exact nature
of the failure is not known at the moment, it can be worked around by
splitting the yenta resume into an early part, executed during the
early phase of resume, that will only resume the socket and power it
up if there was a card in it during suspend, and a late part,
executed during "regular" resume, that will carry out all of the
remaining yenta resume operations.

Fixes, which is a
listed regression from 2.6.31.

Signed-off-by: Rafael J. Wysocki <>
Acked-by: Dominik Brodowski <>
Reported-by: Stephen J. Gowdy <>
Tested-by: Jose Marino <>
12 years agosched: Fix kthread_bind() by moving the body of kthread_bind() to sched.c
Mike Galbraith [Thu, 29 Oct 2009 10:48:30 +0000 (11:48 +0100)]
sched: Fix kthread_bind() by moving the body of kthread_bind() to sched.c

Eric Paris reported that commit
f685ceacab07d3f6c236f04803e2f2f0dbcc5afb causes boot time
PREEMPT_DEBUG complaints.

 [    4.590699] BUG: using smp_processor_id() in preemptible [00000000] code: rmmod/1314
 [    4.593043] caller is task_hot+0x86/0xd0

Since kthread_bind() messes with scheduler internals, move the
body to sched.c, and lock the runqueue.

Reported-by: Eric Paris <>
Signed-off-by: Mike Galbraith <>
Tested-by: Eric Paris <>
Cc: Peter Zijlstra <>
LKML-Reference: <>
[ v2: fix !SMP build and clean up ]
Signed-off-by: Ingo Molnar <>
12 years agosched: Disable SD_PREFER_LOCAL at node level
Mike Galbraith [Mon, 2 Nov 2009 19:36:51 +0000 (20:36 +0100)]
sched: Disable SD_PREFER_LOCAL at node level

Yanmin Zhang reported that SD_PREFER_LOCAL induces an order of
magnitude increase in select_task_rq_fair() overhead while
running heavy wakeup benchmarks (tbench and vmark).

Since SD_BALANCE_WAKE is off at node level, turn SD_PREFER_LOCAL
off as well pending further investigation.

Reported-by: Zhang, Yanmin <>
Signed-off-by: Mike Galbraith <>
Cc: Peter Zijlstra <>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <>
12 years agoInput: gpio-keys - use IRQF_SHARED
Dmitry Eremin-Solenikov [Tue, 3 Nov 2009 06:04:18 +0000 (22:04 -0800)]
Input: gpio-keys - use IRQF_SHARED

There is nothing that disallows gpio-keys to share it's IRQ line
w/ other drivers. Make it use IRQF_SHARED in request_irq().

An example of other driver with which I'd like to share IRQ line
for GPIO buttons is ledtrig-gpio.

Signed-off-by: Dmitry Eremin-Solenikov <>
Signed-off-by: Dmitry Torokhov <>
12 years agoInput: winbond-cir - select LEDS_TRIGGERS
David Härdeman [Tue, 3 Nov 2009 05:57:41 +0000 (21:57 -0800)]
Input: winbond-cir - select LEDS_TRIGGERS

drivers/input/misc/winbond-cir.c depends on LEDS_TRIGGERS so
add an appropriate select to drivers/input/misc/Kconfig

Signed-off-by: David Härdeman <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Dmitry Torokhov <>
12 years agoInput: i8042 - try to get stable CTR value when initializing
Dmitry Torokhov [Tue, 3 Nov 2009 05:57:40 +0000 (21:57 -0800)]
Input: i8042 - try to get stable CTR value when initializing

If user presses keys while i8042 is being initialized there is a chance
that keyboard data will be mistaken for results of Read Control Register
command causing futher troubles. Work around this issue by reading CTR
several times and stop when we get matching results.

Reported-and-tested-by: Dave Young <>
Signed-off-by: Dmitry Torokhov <>
12 years agoMerge commit 'v2.6.32-rc5' into for-linus
Dmitry Torokhov [Tue, 3 Nov 2009 06:10:07 +0000 (22:10 -0800)]
Merge commit 'v2.6.32-rc5' into for-linus

12 years agonilfs2: add zero-fill for new btree node buffers
Ryusuke Konishi [Sun, 13 Sep 2009 16:20:35 +0000 (01:20 +0900)]
nilfs2: add zero-fill for new btree node buffers

Adds missing initialization of newly allocated b-tree node buffers.
This avoids garbage data to be mixed in b-tree node blocks.

Signed-off-by: Ryusuke Konishi <>
12 years agonilfs2: fix irregular checkpoint creation due to data flush
Ryusuke Konishi [Mon, 2 Nov 2009 06:08:13 +0000 (15:08 +0900)]
nilfs2: fix irregular checkpoint creation due to data flush

When nilfs flushes out dirty data to reduce memory pressure, creation
of checkpoints is wrongly postponed.  This bug causes irregular
checkpoint creation especially in small footprint systems.

To correct this issue, a timer for the checkpoint creation has to be
continued if a log writer does not create a checkpoint.

This will do the correction.

Signed-off-by: Ryusuke Konishi <>
12 years agonilfs2: fix dirty page accounting leak causing hang at write
Ryusuke Konishi [Mon, 2 Nov 2009 15:25:53 +0000 (00:25 +0900)]
nilfs2: fix dirty page accounting leak causing hang at write

Bruno Prémont and Dunphy, Bill noticed me that NILFS will certainly
hang on ARM-based targets.

I found this was caused by an underflow of dirty pages counter.  A
b-tree cache routine was marking page dirty without adjusting page
account information.

This fixes the dirty page accounting leak and resolves the hang on
arm-based targets.

Reported-by: Bruno Prémont <>
Reported-by: Dunphy, Bill <>
Signed-off-by: Ryusuke Konishi <>
Tested-by: Bruno Prémont <>
Cc: stable <>
12 years agoMerge branch 'master' of git://
David S. Miller [Tue, 3 Nov 2009 03:18:50 +0000 (19:18 -0800)]
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6

12 years agoi2c-mpc: Do not generate STOP after read.
Joakim Tjernlund [Tue, 13 Oct 2009 08:12:03 +0000 (10:12 +0200)]
i2c-mpc: Do not generate STOP after read.

The driver always ends a read with a STOP condition which
breaks subsequent I2C reads/writes in the same transaction as
these expect to do a repeated START(ReSTART).

This will also help I2C multimaster as the bus will not be released
after the first read, but when the whole transaction ends.

Signed-off-by: Joakim Tjernlund <>
Signed-off-by: Ben Dooks <>