gitstat verv0.5

Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux

Fri, 15 Jan 2010 22:53:24 +0000

Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux

* 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux:
  ARM: MINI2440: Fixup __initdata usage
  ARM: MINI2440: Fix crash on boot due to improper __initdata qualifier
  ARM: SMDK6410: Specify no GPIO for B_PWR_5V regulator
  ARM: S3C: NAND: Check the existence of nr_map before copying

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

Fri, 15 Jan 2010 22:52:44 +0000

Merge branch 'for-linus' of git://git./linux/kernel/git/bp/bp

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  amd64_edac: Ensure index stays within bounds in amd64_get_scrub_rate

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Fri, 15 Jan 2010 22:51:57 +0000

Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: sentelic - fix left/right horizontal scroll mapping
  Input: pmouse - move Sentelic probe down the list
  Input: add compat support for sysfs and /proc capabilities output
  Input: i8042 - add Dritek quirk for Acer Aspire 5610.
  Input: xbox - do not use GFP_KERNEL under spinlock
  Input: psmouse - fix Synaptics detection when protocol is disabled
  Input: bcm5974 - report ABS_MT events
  Input: davinci_keyscan - add device_enable method to platform data
  Input: evdev - be less aggressive about sending SIGIO notifies
  Input: atkbd - fix canceling event_work in disconnect
  Input: serio - fix potential deadlock when unbinding drivers
  Input: gf2k - fix &&/|| confusion in gf2k_connect()

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88 ...

Fri, 15 Jan 2010 22:51:39 +0000

Merge branch 'for-linus' of git://git./linux/kernel/git/mattst88/alpha-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
  alpha: cpumask_of_node() should handle -1 as a node
  alpha: add myself as a maintainer, and drop mention of 2.4

Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal ...

Fri, 15 Jan 2010 22:50:20 +0000

Merge branch 'sh/for-2.6.33' of git://git./linux/kernel/git/lethal/sh-2.6

* 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  serial: sh-sci: using correct fifo size for SCIF and SCIFA ports.
  sh: mach-ecovec24: Add motion sensor driver support.

inotify: only warn once for inotify problems

Fri, 15 Jan 2010 17:12:25 +0000

inotify: only warn once for inotify problems

inotify will WARN() if it finds that the idr and the fsnotify internals
somehow got out of sync.  It was only supposed to do this once but due
to this stupid bug it would warn every single time a problem was
detected.

Signed-off-by: Eric Paris 
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds

inotify: do not reuse watch descriptors

Fri, 15 Jan 2010 17:12:24 +0000

inotify: do not reuse watch descriptors

Since commit 7e790dd5fc937bc8d2400c30a05e32a9e9eef276 ("inotify: fix
error paths in inotify_update_watch") inotify changed the manor in which
it gave watch descriptors back to userspace.  Previous to this commit
inotify acted like the following:

  inotify_add_watch(X, Y, Z) = 1
  inotify_rm_watch(X, 1);
  inotify_add_watch(X, Y, Z) = 2

but after this patch inotify would return watch descriptors like so:

  inotify_add_watch(X, Y, Z) = 1
  inotify_rm_watch(X, 1);
  inotify_add_watch(X, Y, Z) = 1

which I saw as equivalent to opening an fd where

  open(file) = 1;
  close(1);
  open(file) = 1;

seemed perfectly reasonable.  The issue is that quite a bit of userspace
apparently relies on the behavior in which watch descriptors will not be
quickly reused.  KDE relies on it, I know some selinux packages rely on
it, and I have heard complaints from other random sources such as debian
bug 558981.

Although the man page implies what we do is ok, we broke userspace so
this patch almost reverts us to the old behavior.  It is still slightly
racey and I have patches that would fix that, but they are rather large
and this will fix it for all real world cases.  The race is as follows:

 - task1 creates a watch and blocks in idr_new_watch() before it updates
   the hint.
 - task2 creates a watch and updates the hint.
 - task1 updates the hint with it's older wd
 - task removes the watch created by task2
 - task adds a new watch and will reuse the wd originally given to task2

it requires moving some locking around the hint (last_wd) but this should
solve it for the real world and be -stable safe.

As a side effect this patch papers over a bug in the lib/idr code which
is causing a large number WARN's to pop on people's system and many
reports in kerneloops.org.  I'm working on the root cause of that idr
bug seperately but this should make inotify immune to that issue.

Signed-off-by: Eric Paris 
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds

amd64_edac: Ensure index stays within bounds in amd64_get_scrub_rate

Mon, 11 Jan 2010 19:58:21 +0000

amd64_edac: Ensure index stays within bounds in amd64_get_scrub_rate

Add a missing iterator variable thus fixing the conditional of the
for-loop in amd64_get_scrub_rate().

Signed-off-by: Roel Kluin 
Signed-off-by: Borislav Petkov

ARM: MINI2440: Fixup __initdata usage

Fri, 15 Jan 2010 08:04:42 +0000

ARM: MINI2440: Fixup __initdata usage

Remove some of the __initdata tags which are currently inappropriate for
platform_device and some of the platform data. These can be returned once
support for copying platform devices and data is added.

Signed-off-by: Ben Dooks

ARM: MINI2440: Fix crash on boot due to improper __initdata qualifier

Fri, 15 Jan 2010 07:56:05 +0000

ARM: MINI2440: Fix crash on boot due to improper __initdata qualifier

This patch fix mini2440 crash on boot due to improper __initdata
qualifier on mini2440_led1_pdata.

Signed-off-by: Uri Yosef 
Signed-off-by: Ben Dooks

ARM: SMDK6410: Specify no GPIO for B_PWR_5V regulator

Wed, 13 Jan 2010 13:57:04 +0000

ARM: SMDK6410: Specify no GPIO for B_PWR_5V regulator

Since the fixed voltage regulator grew support for GPIO based
enables and GPIO 0 is valid on some systems we need to specify
that there is no valid GPIO enable control.

Signed-off-by: Mark Brown 
Signed-off-by: Ben Dooks

serial: sh-sci: using correct fifo size for SCIF and SCIFA ports.

Thu, 14 Jan 2010 23:33:20 +0000

serial: sh-sci: using correct fifo size for SCIF and SCIFA ports.

The sh-sci driver used the wrong fifosize for PORT_SCIFA and PORT_SCIF
ports. If an incorrect size is used, the serial core will enforce an
early shutdown on the port, especially with baudrates < 9600.

Signed-off-by: Markus Pietrek 
Signed-off-by: Paul Mundt

sh: mach-ecovec24: Add motion sensor driver support.

Thu, 14 Jan 2010 23:25:00 +0000

sh: mach-ecovec24: Add motion sensor driver support.

This patch adds support for the lis3lv02d motion sensor connected via
i2c on the Ecovec board. Tested with evtest.

Signed-off-by: NISHIMOTO Hiroki 
Signed-off-by: Paul Mundt

alpha: cpumask_of_node() should handle -1 as a node

Thu, 14 Jan 2010 18:21:35 +0000

alpha: cpumask_of_node() should handle -1 as a node

CC: Richard Henderson 
CC: Ivan Kokshaysky 
Signed-off-by: Matt Turner 
CC: linux-alpha@vger.kernel.org
CC: Rusty Russell 
CC: Andrew Morton 
Signed-off-by: Anton Blanchard

alpha: add myself as a maintainer, and drop mention of 2.4

Thu, 14 Jan 2010 18:15:20 +0000

alpha: add myself as a maintainer, and drop mention of 2.4

CC: Richard Henderson 
CC: Ivan Kokshaysky 
CC: linux-alpha@vger.kernel.org
Signed-off-by: Matt Turner

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

Thu, 14 Jan 2010 16:37:53 +0000

Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] tape_char: add missing compat_ptr conversion
  [S390] zcrypt: add sanity check before copy_from_user()
  [S390] unwire sys_recvmmsg again
  [S390] con3215: remove empty ioctl function
  [S390] dasd: add proper compat pointer conversion for symmetrix ioctl
  [S390] mmap: add missing compat_ptr conversion to both mmap compat syscalls
  [S390] bug: implement arch specific __WARN macro
  [S390] Move __cpu_logical_map to smp.c
  [S390] tape_block: remove ioctl function
  [S390] smp: remove volatile type quilifier from __cpu_logical_map
  [S390] smp: setup smp_processor_id early
  [S390] use helpers for rlimits
  [S390] fs3270: add missing compat ptr conversion
  [S390] vmcp: add missing compat ptr conversion
  [S390] cio: add missing compat ptr conversion
  [S390] dasd: add missing compat ptr conversion
  [S390] remove superfluous TIF_USEDFPU bit
  [S390] duplicate SIGTRAP on signal delivery.
  [S390] clear TIF_SINGLE_STEP for new process.
  [S390] fix loading of PER control registers for utrace.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Thu, 14 Jan 2010 16:36:15 +0000

Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits)
  net: fix build erros with CONFIG_BUG=n, CONFIG_GENERIC_BUG=n
  ipv6: skb_dst() can be NULL in ipv6_hop_jumbo().
  tg3: Update copyright and driver version
  tg3: Disable 5717 serdes and B0 support
  tg3: Add reliable serdes detection for 5717 A0
  tg3: Fix std rx prod ring handling
  tg3: Fix std prod ring nicaddr for 5787 and 57765
  sfc: Fix conditions for MDIO self-test
  sfc: Fix polling for slow MCDI operations
  e1000e: workaround link issues on busy hub in half duplex on 82577/82578
  e1000e: MDIO slow mode should always be done for 82577
  ixgbe: update copyright dates
  ixgbe: Do not attempt to perform interrupts in netpoll when down
  cfg80211: fix refcount imbalance when wext is disabled
  mac80211: fix queue selection for data frames on monitor interfaces
  iwlwifi: silence buffer overflow warning
  iwlwifi: disable tx on beacon update notification
  iwlwifi: fix iwl_queue_used bug when read_ptr == write_ptr
  mac80211: fix endian error
  mac80211: add missing sanity checks for action frames
  ...

ARM: S3C: NAND: Check the existence of nr_map before copying

Thu, 14 Jan 2010 02:15:05 +0000

ARM: S3C: NAND: Check the existence of nr_map before copying

Since the structure field nr_map is optional, we need to check whether the
chip number map is provided to avoid unexpected NULL pointer exception.

Signed-off-by: Ramax Lo 
Signed-off-by: Ben Dooks

net: fix build erros with CONFIG_BUG=n, CONFIG_GENERIC_BUG=n

Thu, 14 Jan 2010 02:10:36 +0000

net: fix build erros with CONFIG_BUG=n, CONFIG_GENERIC_BUG=n

Fixed build errors introduced by commit 7ad6848c (ip: fix mc_loop
checks for tunnels with multicast outer addresses)

Signed-off-by: Octavian Purdila 
Signed-off-by: David S. Miller

ipv6: skb_dst() can be NULL in ipv6_hop_jumbo().

Thu, 14 Jan 2010 01:27:37 +0000

ipv6: skb_dst() can be NULL in ipv6_hop_jumbo().

This fixes CERT-FI FICORA #341748

Discovered by Olli Jarva and Tuomo Untinen from the CROSS
project at Codenomicon Ltd.

Just like in CVE-2007-4567, we can't rely upon skb_dst() being
non-NULL at this point.  We fixed that in commit
e76b2b2567b83448c2ee85a896433b96150c92e6 ("[IPV6]: Do no rely on
skb->dst before it is assigned.")

However commit 483a47d2fe794328d29950fe00ce26dd405d9437 ("ipv6: added
net argument to IP6_INC_STATS_BH") put a new version of the same bug
into this function.

Complicating analysis further, this bug can only trigger when network
namespaces are enabled in the build.  When namespaces are turned off,
the dev_net() does not evaluate it's argument, so the dereference
would not occur.

So, for a long time, namespaces couldn't be turned on unless SYSFS was
disabled.  Therefore, this code has largely been disabled except by
people turning it on explicitly for namespace development.

With help from Eugene Teo 

Signed-off-by: David S. Miller

tg3: Update copyright and driver version

Tue, 12 Jan 2010 10:11:40 +0000

tg3: Update copyright and driver version

This patch updates the copyright notice for 2010 and updates the version
number to 3.106.

Signed-off-by: Matt Carlson 
Reviewed-by: Michael Chan 
Signed-off-by: David S. Miller

tg3: Disable 5717 serdes and B0 support

Tue, 12 Jan 2010 10:11:39 +0000

tg3: Disable 5717 serdes and B0 support

The B0 revision of the 5717 will not get enough testing by the time
2.6.33 ships.  Since the kernel is already at RC3, serdes support
will require too many patches to fix.  For these reasons, this patch
disables 5717 serdes support and will refuse to attach to all 5717
devices that are later than an A0 revision.

Signed-off-by: Matt Carlson 
Reviewed-by: Michael Chan 
Signed-off-by: David S. Miller

tg3: Add reliable serdes detection for 5717 A0

Tue, 12 Jan 2010 10:11:38 +0000

tg3: Add reliable serdes detection for 5717 A0

The serdes status bit does not work as intended for the 5717 A0.
This patch implements an alternative detection scheme that will only be
valid for A0 revisions.

Signed-off-by: Matt Carlson 
Reviewed-by: Michael Chan 
Signed-off-by: David S. Miller

tg3: Fix std rx prod ring handling

Tue, 12 Jan 2010 10:11:37 +0000

tg3: Fix std rx prod ring handling

There are some tg3 devices that require the driver to post new rx
buffers in smaller increments.  Commit
4361935afe3abc3e5a93006b99197fac1fabbd50, "tg3: Consider
rx_std_prod_idx a hw mailbox" changed how the driver tracks the rx
producer ring updates, but it does not make any special considerations
for the above-mentioned devices.  For those devices, it is possible for
the driver to hit the special case path, which updates the hardware
mailbox register but skips updating the shadow software mailbox member.
If the special case path represents the final mailbox update for this
ISR iteration, the hardware and software mailbox values will be out of
sync.  Ultimately, this will cause the driver to use a stale mailbox
value on the next iteration, which will appear to the hardware as a
large rx buffer update.  Bad things ensue.

The fix is to update the software shadow mailbox member when the special
case path is taken.

Signed-off-by: Matt Carlson 
Reviewed-by: Michael Chan 
Reported-by: Dmitry Torokhov 
Signed-off-by: David S. Miller

tg3: Fix std prod ring nicaddr for 5787 and 57765

Tue, 12 Jan 2010 10:11:36 +0000

tg3: Fix std prod ring nicaddr for 5787 and 57765

Commit 87668d352aa8d135bd695a050f18bbfc7b50b506, titled "tg3: Don't
touch RCB nic addresses", tried to avoid assigning the nic address of
the standard producer ring.  Unfortunately, the default nic address is
not correct for the 5787, the 5755M, or the 57765.  This patch
reenables the old behavior and opts out of the assignment only
for the 5717.

Signed-off-by: Matt Carlson 
Reviewed-by: Michael Chan 
Tested-by: Chow Loong Jin 
Tested-by: Dmitry Torokhov 
Signed-off-by: David S. Miller

sfc: Fix conditions for MDIO self-test

Wed, 13 Jan 2010 10:59:13 +0000

sfc: Fix conditions for MDIO self-test

The MDIO self-test should not be run on boards without an MDIO PHY,
such as SFN5122F-R3 and later revisions.  It should also not try to
address a specific MMD in an MDIO clause 22 PHY.  Check the
mode_support field to decide which mode to use, if any.

Signed-off-by: Ben Hutchings 
Signed-off-by: David S. Miller

sfc: Fix polling for slow MCDI operations

Wed, 13 Jan 2010 04:34:25 +0000

sfc: Fix polling for slow MCDI operations

When the interface is down and we are using polled mode for MCDI
operations, we busy-wait for completion for approximately 1 jiffy
using udelay() and then back off to schedule().  But the completion
will not wake the task, since we are using polled mode!  We must use
schedule_timeout_uninterruptible() instead.

Signed-off-by: Ben Hutchings 
Signed-off-by: David S. Miller

e1000e: workaround link issues on busy hub in half duplex on 82577/82578

Wed, 13 Jan 2010 01:53:08 +0000

e1000e: workaround link issues on busy hub in half duplex on 82577/82578

This patch removes a delay in hardware after every received packet allowing
more time for transmitted packets to go out in between received packets in
half duplex.

Signed-off-by: Bruce Allan 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

e1000e: MDIO slow mode should always be done for 82577

Wed, 13 Jan 2010 01:52:49 +0000

e1000e: MDIO slow mode should always be done for 82577

A previous 82577 workaround that set the MDIO access speed to slow mode for
every PHY register read/write when the cable is unplugged should instead
set the access mode to always be slow before any PHY register access.
Since the mode bit gets cleared when the PHY is reset, set the mode after
every PHY reset.

Signed-off-by: Bruce Allan 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

ixgbe: update copyright dates

Wed, 13 Jan 2010 01:49:34 +0000

ixgbe: update copyright dates

Signed-off-by: Shannon Nelson 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

ixgbe: Do not attempt to perform interrupts in netpoll when down

Wed, 13 Jan 2010 01:49:13 +0000

ixgbe: Do not attempt to perform interrupts in netpoll when down

This patch resolves issues seen when running netconsole and rebooting via
reboot -f.  The issue was due to the fact that we were attempting to
perform interrupt actions when the q_vectors and rings had already been
freed via the ixgbe_shutdown routines.

Signed-off-by: Alexander Duyck 
Acked-by:  Mallikarjuna R Chilakala 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6

Thu, 14 Jan 2010 00:15:09 +0000

Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6

* 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6:
  xen: fix hang on suspend.

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied ...

Thu, 14 Jan 2010 00:13:57 +0000

Merge branch 'drm-linus' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: change drm set mode messages as DRM_DEBUG
  drm: fix crtc no modes printf + typo
  drm/radeon/kms: only evict to GTT if CP is ready
  drm/radeon/kms: Fix crash getting TV info with no BIOS.
  drm/radeon/kms/rv100: reject modes > 135 Mhz on DVI (v2)
  drm/radeon/kms/r6xx+: make irq handler less verbose
  drm/radeon/kms: fix up LVDS handling on macs (v2)

zlib: Fix build of powerpc boot wrapper

Wed, 13 Jan 2010 05:19:34 +0000

zlib: Fix build of powerpc boot wrapper

Commit ac4c2a3bbe5db5fc570b1d0ee1e474db7cb22585 broke the build
of all powerpc boot wrappers.

It attempts to add an include of autoconf.h but used the wrong
path for it. It also adds -D__KERNEL__ to our boot wrapper, both
things that we pretty much didn't do on purpose so far.

We want our boot wrapper to remain independent enough of the kernel
for various reasons, one of them being that you can "wrap" an existing
kernel at distro install time which allows to ship one kernel image
and a set of boot wrappers for different platforms, the wrappers
don't have to be built out of the same kernel build tree.

It's also incorrect to do what the patch does in our boot environment
since we may not have a proper alignment exception handler which means
we may not be able to fixup the few cases where an unaligned access will
need SW emulation (depends on the core variant, could be when crossing
page or segment boundaries for example).

This patch fixes it by putting the old code back in and using the
new "fancy" variant only when CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
is set, which happens not to be set on powerpc since we don't include
autoconf.h. It also reverts the changes to our boot wrapper Makefile.

This means that x86 should, afaik, keep the optimisations since its
boot wrapper does include autoconf.h and define __KERNEL__ (though I
doubt they make that much different outside of slow embedded processors).

Signed-off-by: Benjamin Herrenschmidt 
Signed-off-by: Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Thu, 14 Jan 2010 00:10:13 +0000

Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: wacom: Add BTN_TOOL_FINGER for pad button reporting
  HID: add device IDs for new model of Apple Wireless Keyboard
  HID: fix pad button definition in hid-wacom
  HID: Support 171 byte variant of Samsung USB IR receiver
  HID: blacklist ET&T TC5UH touchscreen controller

Merge branch 'for-33' of git://repo.or.cz/linux-kbuild

Thu, 14 Jan 2010 00:09:59 +0000

Merge branch 'for-33' of git://repo.or.cz/linux-kbuild

* 'for-33' of git://repo.or.cz/linux-kbuild:
  Makefile: do not override LC_CTYPE
  kbuild: really fix bzImage build with non-bash sh

vfs: Fix vmtruncate() regression

Wed, 13 Jan 2010 12:14:09 +0000

vfs: Fix vmtruncate() regression

If __block_prepare_write() was failed in block_write_begin(), the
allocated blocks can be outside of ->i_size.

But new truncate_pagecache() in vmtuncate() does nothing if new < old.
It means the above usage is not working anymore.

So, this patch fixes it by removing "new < old" check. It would need
more cleanup/change. But, now -rc and truncate working is in progress,
so, this tried to fix it minimum change.

Acked-by: Nick Piggin 
Signed-off-by: OGAWA Hirofumi 
Signed-off-by: Linus Torvalds

Merge branch 'fasync-helper'

Wed, 13 Jan 2010 21:42:49 +0000

Merge branch 'fasync-helper'

* fasync-helper:
  fasync: split 'fasync_helper()' into separate add/remove functions

[S390] tape_char: add missing compat_ptr conversion

Wed, 13 Jan 2010 19:44:44 +0000

[S390] tape_char: add missing compat_ptr conversion

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] zcrypt: add sanity check before copy_from_user()

Wed, 13 Jan 2010 19:44:43 +0000

[S390] zcrypt: add sanity check before copy_from_user()

It's not obvious that copy_from_user() is called with a sane length
parameter here. Even though it currently seems to be correct better
add a check to prevent stack corruption / exploits.

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] unwire sys_recvmmsg again

Wed, 13 Jan 2010 19:44:42 +0000

[S390] unwire sys_recvmmsg again

sys_recvmmsg is reachable via sys_socketcall. So unwire it again since
there is no point in having two entry points for it.
Also put it to the ignore list so we don't get reminded anymore in order
to wire it up.

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] con3215: remove empty ioctl function

Wed, 13 Jan 2010 19:44:41 +0000

[S390] con3215: remove empty ioctl function

...instead of adding a compat ioctl function which would do nothing
as well.

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] dasd: add proper compat pointer conversion for symmetrix ioctl

Wed, 13 Jan 2010 19:44:40 +0000

[S390] dasd: add proper compat pointer conversion for symmetrix ioctl

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] mmap: add missing compat_ptr conversion to both mmap compat syscalls

Wed, 13 Jan 2010 19:44:39 +0000

[S390] mmap: add missing compat_ptr conversion to both mmap compat syscalls

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] bug: implement arch specific __WARN macro

Wed, 13 Jan 2010 19:44:38 +0000

[S390] bug: implement arch specific __WARN macro

This one will trap, generates shorter code and emits better debug data
than the generic version.

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] Move __cpu_logical_map to smp.c

Wed, 13 Jan 2010 19:44:37 +0000

[S390] Move __cpu_logical_map to smp.c

Finally move it to the place where it belongs to and make get rid of
it for !CONFIG_SMP.

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] tape_block: remove ioctl function

Wed, 13 Jan 2010 19:44:36 +0000

[S390] tape_block: remove ioctl function

This is just a complicated construct which always returns -EINVAL.
Just remove it.

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] smp: remove volatile type quilifier from __cpu_logical_map

Wed, 13 Jan 2010 19:44:35 +0000

[S390] smp: remove volatile type quilifier from __cpu_logical_map

Remove pointless qualifier.

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] smp: setup smp_processor_id early

Wed, 13 Jan 2010 19:44:34 +0000

[S390] smp: setup smp_processor_id early

smp_processor_id() is supposed to work before setup_arch() gets called.
Before that smp_processor_id() may return just an arbitrary value that
is contained in the uninitialized boot lowcore.
So provide the arch function which will override the weak function in
init/main.c.

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] use helpers for rlimits

Wed, 13 Jan 2010 19:44:33 +0000

[S390] use helpers for rlimits

Make sure compiler won't do weird things with limits. E.g. fetching
them twice may return 2 different values after writable limits are
implemented.

I.e. either use rlimit helpers added in
3e10e716abf3c71bdb5d86b8f507f9e72236c9cd
or ACCESS_ONCE if not applicable.

Cc: Heiko Carstens 
Cc: linux390@de.ibm.com
Cc: linux-s390@vger.kernel.org
Signed-off-by: Jiri Slaby 
Signed-off-by: Martin Schwidefsky

[S390] fs3270: add missing compat ptr conversion

Wed, 13 Jan 2010 19:44:32 +0000

[S390] fs3270: add missing compat ptr conversion

Add missing compat ptr conversion including two additional
whitespace changes that aren't worth a separate patch.

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] vmcp: add missing compat ptr conversion

Wed, 13 Jan 2010 19:44:31 +0000

[S390] vmcp: add missing compat ptr conversion

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] cio: add missing compat ptr conversion

Wed, 13 Jan 2010 19:44:30 +0000

[S390] cio: add missing compat ptr conversion

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] dasd: add missing compat ptr conversion

Wed, 13 Jan 2010 19:44:29 +0000

[S390] dasd: add missing compat ptr conversion

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] remove superfluous TIF_USEDFPU bit

Wed, 13 Jan 2010 19:44:28 +0000

[S390] remove superfluous TIF_USEDFPU bit

The TIF_USEDFPU bit is always 0 for s390 and it is not tested anywhere.
Remove the bit. At the same time remove the calls to clear_used_math()
as well. The PF_USED_MATH bit is never set for s390 either.

Signed-off-by: Martin Schwidefsky

[S390] duplicate SIGTRAP on signal delivery.

Wed, 13 Jan 2010 19:44:27 +0000

[S390] duplicate SIGTRAP on signal delivery.

The code in do_signal sets the TIF_SINGLE_STEP bit and calls
tracehook_signal_handler after the signal frame has been set up.
This causes two SIGTRAP signals to be delivered to the tracer.
Stop setting the TIF_SINGLE_STEP bit in do_signal to get the
correct number of SIGTRAPs.

Signed-off-by: Martin Schwidefsky

[S390] clear TIF_SINGLE_STEP for new process.

Wed, 13 Jan 2010 19:44:26 +0000

[S390] clear TIF_SINGLE_STEP for new process.

Clear the TIF_SINGLE_STEP bit in copy_thread. The new process did not get
a PER event of its own. It is wrong deliver a SIGTRAP that was meant for
the parent process.

Signed-off-by: Martin Schwidefsky

[S390] fix loading of PER control registers for utrace.

Wed, 13 Jan 2010 19:44:25 +0000

[S390] fix loading of PER control registers for utrace.

If the current task enables / disables PER tracing for itself the
PER control registers need to be loaded in FixPerRegisters.

Signed-off-by: Martin Schwidefsky

Makefile: do not override LC_CTYPE

Fri, 8 Jan 2010 11:25:37 +0000

Makefile: do not override LC_CTYPE

Setting LC_CTYPE=C breaks localized messages in some setups. With only
LC_COLLATE=C and LC_NUMERIC=C, we get almost all we need, except for not
so defined character classes and tolower()/toupper(). The former is not
a big issue, because we can assume that e.g. [:alpha:] will always
include a-zA-Z and we only ever process ASCII input. The latter seems
only affect arch/sh/tools/gen-mach-types, which we can handle separately.

So after this patch the meaning of ranges like [a-z], the behavior of
sort and join, etc. should be the same everywhere and at the same time
gcc should be able to print localized waring and error messages.
LC_NUMERIC=C might not be necessary, but setting it doesn't hurt.

Reported-by: Simon Horman 
Reported-by: Sergei Trofimovich 
Acked-by: H. Peter Anvin 
Tested-by: Simon Horman 
Tested-by: Masami Hiramatsu 
Signed-off-by: Michal Marek

kbuild: really fix bzImage build with non-bash sh

Mon, 28 Dec 2009 19:38:27 +0000

kbuild: really fix bzImage build with non-bash sh

In an x86 build with CONFIG_KERNEL_LZMA enabled and dash as sh,
arch/x86/boot/compressed/vmlinux.bin.lzma ends with
'\xf0\x7d\x39\x00' (16 bytes) instead of the 4 bytes intended and
the resulting vmlinuz fails to boot.  This improves on the
previous behavior, in which the file contained the characters
'-ne ' as well, but not by much.

Previous commits replaced "echo -ne" first with "/bin/echo -ne",
then "printf" in the hope of improving portability, but none of
these commands is guaranteed to support hexadecimal escapes on
POSIX systems.  So use the shell to convert from hexadecimal to
octal.

With this change, an LZMA-compressed kernel built with dash as sh
boots correctly again.

Reported-by: Sebastian DalfuÃ 
Reported-by: Oliver Hartkopp 
Reported-by: Michael Guntsche 
Signed-off-by: Jonathan Nieder 
Cc: Michael Tokarev 
Cc: Alek Du 
Cc: Andrew Morton 
Signed-off-by: Michal Marek

HID: wacom: Add BTN_TOOL_FINGER for pad button reporting

Sat, 9 Jan 2010 14:20:03 +0000

HID: wacom: Add BTN_TOOL_FINGER for pad button reporting

Without this patch xf86-input-wacom driver wasn't able to properly recognise
pad button events. It was also causing some problems with button mapping.

Signed-off-by: Przemo Firszt 
Signed-off-by: Jiri Kosina

HID: add device IDs for new model of Apple Wireless Keyboard

Wed, 6 Jan 2010 13:49:57 +0000

HID: add device IDs for new model of Apple Wireless Keyboard

Added device IDs for the new model of the Apple Wireless Keyboard
(November 2009).

Signed-off-by: Christian Schuerer-Waldheim 
Signed-off-by: Jiri Kosina

HID: fix pad button definition in hid-wacom

Mon, 4 Jan 2010 11:32:00 +0000

HID: fix pad button definition in hid-wacom

This fix is required for xorg driver to recognise 2 pad buttons

Signed-off-by: Przemo Firszt 
Signed-off-by: Jiri Kosina

xen: fix hang on suspend.

Thu, 17 Dec 2009 13:57:09 +0000

xen: fix hang on suspend.

In 65f63384 "xen: improve error handling in do_suspend" I said:
    - xs_suspend()/xs_resume() and dpm_suspend_noirq()/dpm_resume_noirq() were not
      nested in the obvious way.
and changed the ordering of the calls as so:
    BEFORE		AFTER
    xs_suspend		dpm_suspend_noirq
    dpm_suspend_noirq	xs_suspend
    *SUSPEND*		*SUSPEND*
    dpm_resume_noirq	dpm_resume_noirq
    xs_resume		xs_resume
Clearly this is not an improvement and I was talking rubbish.

In particular the new ordering is susceptible to a hang if a xenstore write is
in progress at the point at which the suspend kicks in. When the suspend
process calls xs_suspend it tries to take the request_mutex but if a write is
in progress it could be looping in xenbus_xs.c:read_reply() waiting for
something to arrive on &xs_state.reply_list while holding the request_mutex
(taken in the caller of read_reply).

However if we have done dpm_suspend_noirq before xs_suspend then we won't get
any more xenstore interrupts and process_msg() will never be woken up to add
anything to the reply_list.

Fix this by calling xs_suspend before dpm_suspend_noirq. If dpm_suspend_noirq
fails then make sure we go through the xs_suspend_cancel() code path.

Signed-off-by: Ian Campbell 
Acked-by: Jeremy Fitzhardinge 
Cc: Stable Kernel

Input: sentelic - fix left/right horizontal scroll mapping

Wed, 13 Jan 2010 08:25:35 +0000

Input: sentelic - fix left/right horizontal scroll mapping

Signed-off-by: Tai-hwa Liang 
Signed-off-by: Dmitry Torokhov

Input: pmouse - move Sentelic probe down the list

Wed, 13 Jan 2010 08:16:27 +0000

Input: pmouse - move Sentelic probe down the list

Sentelic probes confuse IBM trackpoints so they stop responding to
TP_READ_ID command. See:

	http://bugzilla.kernel.org/show_bug.cgi?id=14970

Let's move FSP detection lower so it is probed after trackpoint and
others, just before we strat probing for Intellimouse Explorer.

Signed-off-by: Tai-hwa Liang 
Signed-off-by: Dmitry Torokhov

Merge remote branch 'korg/drm-radeon-next' into drm-linus

Wed, 13 Jan 2010 06:17:38 +0000

Merge remote branch 'korg/drm-radeon-next' into drm-linus

* korg/drm-radeon-next
  drm/radeon/kms: only evict to GTT if CP is ready
  drm/radeon/kms: Fix crash getting TV info with no BIOS.
  drm/radeon/kms/rv100: reject modes > 135 Mhz on DVI (v2)
  drm/radeon/kms/r6xx+: make irq handler less verbose
  drm/radeon/kms: fix up LVDS handling on macs (v2)

drm: change drm set mode messages as DRM_DEBUG

Wed, 13 Jan 2010 05:38:59 +0000

drm: change drm set mode messages as DRM_DEBUG

Following drm info repeat 207 times during one hour, it's quite annoying
[ 1266.286747] [drm] TV-19: set mode NTSC 480i 0

Change from DRM_INFO to DRM_DEBUG

Signed-off-by: Dave Young 
Signed-off-by: Dave Airlie

drm: fix crtc no modes printf + typo

Wed, 13 Jan 2010 06:15:11 +0000

drm: fix crtc no modes printf + typo

Toralf FÃ¶rster pointed out the typo, the fact I forget the if
statement is purely personal fail.

Signed-off-by: Dave Airlie

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel ...

Wed, 13 Jan 2010 05:33:49 +0000

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6

Linux 2.6.33-rc4

Wed, 13 Jan 2010 05:15:00 +0000

Linux 2.6.33-rc4

Merge git://git.infradead.org/battery-2.6

Wed, 13 Jan 2010 05:13:06 +0000

Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  pmu_battery: Fix battery full reporting

[SCSI] megaraid_sas: remove sysfs poll_mode_io world writeable permissions

Thu, 12 Nov 2009 18:31:54 +0000

[SCSI] megaraid_sas: remove sysfs poll_mode_io world writeable permissions

/sys/bus/pci/drivers/megaraid_sas/poll_mode_io defaults to being
world-writable, which seems bad (letting any user affect kernel driver
behavior).

This turns off group and user write permissions, so that on typical
production systems only root can write to it.

Signed-off-by: Bryn M. Reeves 
Signed-off-by: Linus Torvalds

Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

Wed, 13 Jan 2010 05:04:04 +0000

Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
  OMAP: DSS2: OMAPFB: fix crash when panel driver was not loaded
  OMAP: DSS2: Reject scaling settings when they cannot be supported
  OMAP: DSS2: Make check-delay-loops consistent
  OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem()
  video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c
  OMAP: DSS2: Fix compile warning
  MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry
  MAINTAINERS: change omapfb maintainer
  OMAP: OMAPFB: add dummy release function for omapdss
  OMAP: OMAPFB: fix clk_get for RFBI
  OMAP: DSS2: RFBI: convert to new kfifo API
  OMAP: DSS2: Fix crash when panel doesn't define enable_te()
  OMAP: DSS2: Collect interrupt statistics
  OMAP: DSS2: DSI: print debug DCS cmd in hex
  OMAP: DSS2: DSI: fix VC channels in send_short and send_null

lib: Introduce generic list_sort function

Tue, 12 Jan 2010 06:39:16 +0000

lib: Introduce generic list_sort function

There are two copies of list_sort() in the tree already, one in the DRM
code, another in ubifs.  Now XFS needs this as well.  Create a generic
list_sort() function from the ubifs version and convert existing users
to it so we don't end up with yet another copy in the tree.

Signed-off-by: Dave Chinner 
Acked-by: Dave Airlie 
Acked-by: Artem Bityutskiy 
Signed-off-by: Linus Torvalds

remove my email address from checkpatch.

Tue, 12 Jan 2010 21:59:52 +0000

remove my email address from checkpatch.

Maybe this will stop people emailing me about it.

Signed-off-by: Dave Jones 
Signed-off-by: Linus Torvalds

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi ...

Wed, 13 Jan 2010 04:56:20 +0000

Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: retry link resume if necessary
  ata_piix: enable 32bit PIO on SATA piix
  sata_promise: don't classify overruns as HSM errors

Merge master.kernel.org:/home/rmk/linux-2.6-arm

Wed, 13 Jan 2010 04:56:01 +0000

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: Ensure ARMv6/7 mm files are built using appropriate assembler options
  ARM: Fix wrong dmb
  ARM: 5874/1: serial21285: fix disable_irq-from-interrupt-handler deadlock
  ARM: 5873/1: ARM: Fix the reset logic for ARM RealView boards
  ARM: 5872/1: ARM: include needed linux/cpu.h in asm/cpu.h
  ARM: 5871/1: arch/arm: Fix build failure for lpd7a404_defconfig caused by missing includes
  ARM: 5870/1: arch/arm: Fix build failure for defconfigs without CONFIG_ISA_DMA_API set
  ARM: 5868/1: ARM: fix "BUG: using smp_processor_id() in preemptible code"
  ARM: 5867/1: Update U300 defconfig
  ARM: 5866/1: arm ptrace: use unsigned types for kernel pt_regs
  [ARM] pxa: fix strange characters in zaurus gpio .desc
  ARM: add missing recvmmsg syscall number
  [ARM] pxa: fix compiler warnings of unused variable 'id' in cpu_is_pxa9*()
  [ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *'
  [ARM] pxa: enable L2 if present in XSC3
  [ARM] pxa: do not enable L2 after MMU is enabled

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

Wed, 13 Jan 2010 04:55:31 +0000

Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (22 commits)
  MIPS: Ignore vmlinux.*
  MIPS: Move vmlinux.ecoff to arch/mips/boot
  MIPS: cpumask_of_node() should handle -1 as a node
  MIPS: Octeon: Use non-overflowing arithmetic in sched_clock
  MIPS: Malta, PowerTV: Remove unnecessary "Linux started"
  MIPS: BCM63xx: Remove duplicate CONFIG_CMDLINE.
  MIPS: AR7: Remove unused prom_getchar()
  MIPS: PowerTV: Remove extra r4k_clockevent_init() call
  MIPS: Cobalt use strlcat() for the command line arguments
  MIPS: Octeon: Add sched_clock() to csrc-octeon.c
  MIPS: TXx9: Cleanup builtin-cmdline processing
  MIPS: PowerTV: simplify prom_init_cmdline() and merge into prom_init()
  MIPS: PowerTV: Remove unused platform_die()
  MIPS: PowerTV: Remove mips_machine_halt()
  MIPS: PowerTV: Remove unused ptv_memsize
  MIPS: PowerTV: Remove unused prom_getcmdline()
  MIPS: AR7: Remove kgdb_enabled
  MIPS: Alchemy: Correct code taking the size of a pointer
  MIPS: BCM63xx: Fix whitespace damaged board_bcm963xx.c
  MIPS: VR41xx: Use strlcat() for the command line arguments
  ...

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

Wed, 13 Jan 2010 04:54:52 +0000

Merge branch 'for-linus' of git://git./linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Fix ALC861-VD capture source mixer
  ALSA: ac97: add AC97 STMicroelectronics' codecs
  ALSA: ac97: Add Dell Dimension 2400 to Headphone/Line Jack Sense blacklist
  ASoC: Fix WM8350 DSP mode B configuration
  sbawe: fix memory detection part 2
  sound: oss: off by one bug
  ALSA: usb-audio - Avoid Oops after disconnect
  ALSA: test off by one in setsamplerate()
  ALSA: atiixp: Specify codec for Foxconn RC4107MA-RS2

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Wed, 13 Jan 2010 04:53:29 +0000

Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)
  sky2: Fix oops in sky2_xmit_frame() after TX timeout
  Documentation/3c509: document ethtool support
  af_packet: Don't use skb after dev_queue_xmit()
  vxge: use pci_dma_mapping_error to test return value
  netfilter: ebtables: enforce CAP_NET_ADMIN
  e1000e: fix and commonize code for setting the receive address registers
  e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value
  e1000e: perform 10/100 adaptive IFS only on parts that support it
  e1000e: don't accumulate PHY statistics on PHY read failure
  e1000e: call pci_save_state() after pci_restore_state()
  netxen: update version to 4.0.72
  netxen: fix set mac addr
  netxen: fix smatch warning
  netxen: fix tx ring memory leak
  tcp: update the netstamp_needed counter when cloning sockets
  TI DaVinci EMAC: Handle emac module clock correctly.
  dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips
  ixgbe: Fix compiler warning about variable being used uninitialized
  netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()
  mv643xx_eth: don't include cache padding in rx desc buffer size
  ...

Fix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c

m68knommu: fix definitions of pa() and va()

Wed, 13 Jan 2010 00:42:05 +0000

m68knommu: fix definitions of __pa() and __va()

Fix compilation breakage of all m68knommu targets:

  CC      arch/m68knommu/kernel/asm-offsets.s
In file included from include/linux/sched.h:77,
                 from arch/m68knommu/kernel/asm-offsets.c:12:
include/linux/percpu.h: In function 'per_cpu_ptr_to_phys':
include/linux/percpu.h:161: error: implicit declaration of function 'virt_to_phy

This is broken in linux-2.6.33-rc3.

Change the definitions of __pa() and __va() to not use virt_to_phys()
and phys_to_virt(). Trivial 1:1 conversion required for the non-MMU case.

A side effect if this is that the m68knommu can now use asm/virtconvert.h
for the definition of virt_to_phys() and phys_to_virt().

Also cleaned up the definition of page_to_phys() when moving into
virtconvert.h.

Signed-off-by: Greg Ungerer 
Signed-off-by: Linus Torvalds

drm/radeon/kms: only evict to GTT if CP is ready

Tue, 12 Jan 2010 23:21:49 +0000

drm/radeon/kms: only evict to GTT if CP is ready

Testing GTT ready might be more correct but cp.ready
works fine and has been tested on irc by 2-3 ppl.

fixes bug k.org 15035 and fd.o 25733

Signed-off-by: Dave Airlie

drm/radeon/kms: Fix crash getting TV info with no BIOS.

Mon, 11 Jan 2010 07:58:38 +0000

drm/radeon/kms: Fix crash getting TV info with no BIOS.

Signed-off-by: Michel DÃ¤nzer 
Signed-off-by: Dave Airlie

drm/radeon/kms/rv100: reject modes > 135 Mhz on DVI (v2)

Mon, 11 Jan 2010 20:02:31 +0000

drm/radeon/kms/rv100: reject modes > 135 Mhz on DVI (v2)

Due to heat issues.  Fixes fdo bug 25992

v2: fix typo noticed by Maarten Maathuis

Signed-off-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm/radeon/kms/r6xx+: make irq handler less verbose

Tue, 12 Jan 2010 00:47:38 +0000

drm/radeon/kms/r6xx+: make irq handler less verbose

Unhandled vectors can be safely ignored, no need
to spam the kernel log by default.

Signed-off-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm/radeon/kms: fix up LVDS handling on macs (v2)

Tue, 12 Jan 2010 16:16:57 +0000

drm/radeon/kms: fix up LVDS handling on macs (v2)

Based on radeonfb code and recent ddx fix.

v2: minor formatting fix from Michel DÃ¤nzer

Signed-off-by: Alex Deucher 
Reviewed-by: Michel DÃ¤nzer 
Tested-by: Michel DÃ¤nzer 
Signed-off-by: Dave Airlie

libata: retry link resume if necessary

Mon, 11 Jan 2010 02:14:44 +0000

libata: retry link resume if necessary

Interestingly, when SIDPR is used in ata_piix, writes to DET in
SControl sometimes get ignored leading to detection failure.  Update
sata_link_resume() such that it reads back SControl after clearing DET
and retry if it's not clear.

Signed-off-by: Tejun Heo 
Reported-by: fengxiangjun 
Reported-by: Jim Faulkner 
Cc: stable@kernel.org
Signed-off-by: Jeff Garzik

ata_piix: enable 32bit PIO on SATA piix

Mon, 11 Jan 2010 08:03:11 +0000

ata_piix: enable 32bit PIO on SATA piix

Commit 871af1210f13966ab911ed2166e4ab2ce775b99d enabled 32bit PIO for
PATA piix but didn't for SATA.  There's no reason not to use 32bit PIO
on SATA piix.  Enable it.

Signed-off-by: Tejun Heo 
Cc: Alan Cox 
Signed-off-by: Jeff Garzik

sata_promise: don't classify overruns as HSM errors

Sat, 9 Jan 2010 22:32:06 +0000

sata_promise: don't classify overruns as HSM errors

When sata_promise encounters an overrun or underrun error it
translates that to a libata AC_ERR_HSM, causing a hard reset.
Since over/under-runs were thought to be rare and transient,
this action seemed reasonable.

Unfortunately it turns out that the controller throws overrun
errors when e.g. hal polls a CD or DVD writer containing blank
media, causing long sequences of hard resets and retries before
EH finally gives up.

This patch updates sata_promise to classify over/under-runs as
AC_ERR_OTHER instead. This allows libata EH and upper layers to
retry or fail the operation as they see fit without the disruption
caused by repeated hard resets.

This fixes a problem using a DVD-RAM drive with sata_promise,
reported by Thomas Schorpp. I also tested it on a DVD-RW drive.

Signed-off-by: Mikael Pettersson 
Tested-by: thomas schorpp 
Signed-off-by: Jeff Garzik

ARM: Ensure ARMv6/7 mm files are built using appropriate assembler options

Tue, 12 Jan 2010 19:02:05 +0000

ARM: Ensure ARMv6/7 mm files are built using appropriate assembler options

A kernel with both ARMv6 and ARMv7 selected results in build errors.
Fix this by specifying the proper architectures for these assembly
files.

Signed-off-by: Russell King

ARM: Fix wrong dmb

Tue, 12 Jan 2010 18:59:16 +0000

ARM: Fix wrong dmb

The __kuser_cmpxchg code uses an ARMv6 dmb instruction, rather than
one based upon the architecture being built for.  Switch to using
the macro provided for this purpose, which also eliminates the
need for an ifdef.

Acked-by: Nicolas Pitre 
Signed-off-by: Russell King

Input: add compat support for sysfs and /proc capabilities output

Mon, 11 Jan 2010 08:05:43 +0000

Input: add compat support for sysfs and /proc capabilities output

Input core displays capabilities bitmasks in form of one or more longs printed
in hex form and separated by spaces. Unfortunately it does not work well
for 32-bit applications running on 64-bit kernels since applications expect
that number is "worth" only 32 bits when kernel advances by 64 bits.

Fix that by ensuring that output produced for compat tasks uses 32-bit units.

Reported-and-tested-by: Michael Tokarev 
Signed-off-by: Dmitry Torokhov

MIPS: Ignore vmlinux.*

Fri, 18 Dec 2009 12:14:19 +0000

MIPS: Ignore vmlinux.*

Signed-off-by: Yoichi Yuasa 
Cc: linux-mips 
Patchwork: http://patchwork.linux-mips.org/patch/795/
Signed-off-by: Ralf Baechle

MIPS: Move vmlinux.ecoff to arch/mips/boot

Fri, 18 Dec 2009 12:13:17 +0000

MIPS: Move vmlinux.ecoff to arch/mips/boot

It moves to the same directory as the boot files in other formats.

Signed-off-by: Yoichi Yuasa 
Cc: linux-mips 
Patchwork: http://patchwork.linux-mips.org/patch/796/
Signed-off-by: Ralf Baechle

MIPS: cpumask_of_node() should handle -1 as a node

Wed, 6 Jan 2010 04:55:13 +0000

MIPS: cpumask_of_node() should handle -1 as a node

pcibus_to_node can return -1 if we cannot determine which node a pci bus
is on. If passed -1, cpumask_of_node will negatively index the lookup array
and pull in random data:

# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
00000000,00000003,00000000,00000000
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
64-65

Change cpumask_of_node to check for -1 and return cpu_all_mask in this
case:

# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
ffffffff,ffffffff,ffffffff,ffffffff
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
0-127

Signed-off-by: Anton Blanchard 
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: Rusty Russell 
Cc: Andrew Morton 
Patchwork: http://patchwork.linux-mips.org/patch/831/
Signed-off-by: Ralf Baechle

MIPS: Octeon: Use non-overflowing arithmetic in sched_clock

Fri, 8 Jan 2010 22:47:36 +0000

MIPS: Octeon: Use non-overflowing arithmetic in sched_clock

With typical mult and shift values, the calculation for Octeon's sched_clock
overflows when using 64-bit arithmetic.  Use 128-bit calculations instead.

Signed-off-by: David Daney 
To: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/849/
Signed-off-by: Ralf Baechle

MIPS: Malta, PowerTV: Remove unnecessary "Linux started"

Sun, 3 Jan 2010 05:47:34 +0000

MIPS: Malta, PowerTV: Remove unnecessary "Linux started"

Signed-off-by: Yoichi Yuasa 
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/813/
Signed-off-by: Ralf Baechle

MIPS: BCM63xx: Remove duplicate CONFIG_CMDLINE.

Sun, 3 Jan 2010 05:39:11 +0000

MIPS: BCM63xx: Remove duplicate CONFIG_CMDLINE.

Builtin cmdline is copied by arch_mem_init().

Signed-off-by: Yoichi Yuasa 
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/812/
Signed-off-by: Ralf Baechle

MIPS: AR7: Remove unused prom_getchar()

Sun, 3 Jan 2010 05:13:04 +0000

MIPS: AR7: Remove unused prom_getchar()

Signed-off-by: Yoichi Yuasa 
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/811/
Signed-off-by: Ralf Baechle

MIPS: PowerTV: Remove extra r4k_clockevent_init() call

Tue, 22 Dec 2009 01:43:42 +0000

MIPS: PowerTV: Remove extra r4k_clockevent_init() call

A call to r4k_clocksource_init() was added to plat_time_init(), but
when init_mips_clock_source() calls the same function, boot fails in
clockevents_register_device(). This patch removes the extraneous call.

Signed-off-by: David VomLehn 
Patchwork: http://patchwork.linux-mips.org/patch/803/
Signed-off-by: Ralf Baechle

MIPS: Cobalt use strlcat() for the command line arguments

Thu, 24 Dec 2009 08:06:34 +0000

MIPS: Cobalt use strlcat() for the command line arguments

Tested with CoLo v1.22

Signed-off-by: Yoichi Yuasa 
Patchwork: http://patchwork.linux-mips.org/patch/807/
Signed-off-by: Ralf Baechle

MIPS: Octeon: Add sched_clock() to csrc-octeon.c

Wed, 23 Dec 2009 21:18:54 +0000

MIPS: Octeon: Add sched_clock() to csrc-octeon.c

With the advent of function graph tracing on MIPS, Octeon needs a high
precision sched_clock() implementation.  Without it, most timing
numbers are reported as 0.000.

This new sched_clock just uses the 64-bit cycle counter appropriately
scaled.

Signed-off-by: David Daney 
Patchwork: http://patchwork.linux-mips.org/patch/805/
Signed-off-by: Ralf Baechle

MIPS: TXx9: Cleanup builtin-cmdline processing

Mon, 21 Dec 2009 15:48:57 +0000

MIPS: TXx9: Cleanup builtin-cmdline processing

Since commit 898d357b5262f9e26bc2418e01f8676e80d9867e (lmo) /
6acc7d485c24c00e111c61b2e6dff9180faebcae (kernel.org) ("Fix and enhance
built-in kernel command line") arcs_cmdline[] does not contain built-in
command line.  The commit introduce CONFIG_CMDLINE_BOOL and
CONFIG_CMDLINE_OVERRIDE to control built-in command line, and now we can
use them instead of platform-specific built-in command line processing.

Signed-off-by: Atsushi Nemoto 
Patchwork: http://patchwork.linux-mips.org/patch/802/
Signed-off-by: Ralf Baechle

MIPS: PowerTV: simplify prom_init_cmdline() and merge into prom_init()

Fri, 18 Dec 2009 12:38:37 +0000

MIPS: PowerTV: simplify prom_init_cmdline() and merge into prom_init()

Signed-off-by: Yoichi Yuasa 
Patchwork: http://patchwork.linux-mips.org/patch/801/
Reviewed-by: David VomLehn 
Signed-off-by: Ralf Baechle

MIPS: PowerTV: Remove unused platform_die()

Fri, 18 Dec 2009 12:36:32 +0000

MIPS: PowerTV: Remove unused platform_die()

Signed-off-by: Yoichi Yuasa 
Patchwork: http://patchwork.linux-mips.org/patch/800/
Reviewed-by: David VomLehn 
Signed-off-by: Ralf Baechle

MIPS: PowerTV: Remove mips_machine_halt()

Fri, 18 Dec 2009 12:33:46 +0000

MIPS: PowerTV: Remove mips_machine_halt()

mips_machine_halt() is same as mips_machine_restart().  Also delete the
registration of _machine_halt and pm_power_off because mips_machine_halt()
is the restart function.

Signed-off-by: Yoichi Yuasa 
Patchwork: http://patchwork.linux-mips.org/patch/798/
Reviewed-by: David VomLehn 
Signed-off-by: Ralf Baechle

MIPS: PowerTV: Remove unused ptv_memsize

Fri, 18 Dec 2009 12:30:18 +0000

MIPS: PowerTV: Remove unused ptv_memsize

Signed-off-by: Yoichi Yuasa 
Patchwork: http://patchwork.linux-mips.org/patch/799/
Reviewed-by: David VomLehn 
Signed-off-by: Ralf Baechle

MIPS: PowerTV: Remove unused prom_getcmdline()

Fri, 18 Dec 2009 12:29:17 +0000

MIPS: PowerTV: Remove unused prom_getcmdline()

Signed-off-by: Yoichi Yuasa 
Patchwork: http://patchwork.linux-mips.org/patch/797/
Reviewed-by: David VomLehn 
Signed-off-by: Ralf Baechle

MIPS: AR7: Remove kgdb_enabled

Fri, 18 Dec 2009 12:20:24 +0000

MIPS: AR7: Remove kgdb_enabled

An unused leftover from the old KGDB implementation.

Signed-off-by: Yoichi Yuasa 
Patchwork: http://patchwork.linux-mips.org/patch/794/
Signed-off-by: Ralf Baechle

MIPS: Alchemy: Correct code taking the size of a pointer

Sun, 13 Dec 2009 11:40:39 +0000

MIPS: Alchemy: Correct code taking the size of a pointer

sizeof(dp) is just the size of the pointer.  Change it to the size of the
referenced structure.

A simplified version of the semantic patch that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// 
@@
expression *x;
expression f;
type T;
@@

*f(...,(T)x,...)
// 

Signed-off-by: Julia Lawall 
Patchwork: http://patchwork.linux-mips.org/patch/789/
Signed-off-by: Ralf Baechle

MIPS: BCM63xx: Fix whitespace damaged board_bcm963xx.c

Sat, 12 Dec 2009 16:57:39 +0000

MIPS: BCM63xx: Fix whitespace damaged board_bcm963xx.c

Signed-off-by: Florian Fainelli 
Signed-off-by: Ralf Baechle

MIPS: VR41xx: Use strlcat() for the command line arguments

Thu, 10 Dec 2009 05:00:39 +0000

MIPS: VR41xx: Use strlcat() for the command line arguments

Signed-off-by: Yoichi Yuasa 
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/784/
Signed-off-by: Ralf Baechle

MIPS: Cleanup and Fixup of compressed kernel support

Thu, 10 Dec 2009 14:55:13 +0000

MIPS: Cleanup and Fixup of compressed kernel support

 o Remove the .initrd section.  The initrd section was already handled
   when vmlinux was linked.
 o Discard .MIPS.options, .options, .pdr, .reginfo, .comment and .note
   sections.  If .MIPS.options is not removed, kernels compiled with gcc
   3.4.6 will not boot.
 o Clean up the file format.
 o Remove several other unneeded sections.

Tested with GCC 3.4.6 and 4.4.1 with and without initrd.

Signed-off-by: Wu Zhangjin 
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/785/
Signed-off-by: Ralf Baechle

MIPS: Cleanup forgotten label_module_alloc in tlbex.c

Fri, 4 Dec 2009 01:43:54 +0000

MIPS: Cleanup forgotten label_module_alloc in tlbex.c

commit c8af165342e83a4eb078c9607d29a7c399d30a53 (lmo) rsp.
e0cc87f59490d7d62a8ab2a76498dc8a2b64927a (kernel.org) left
label_module_alloc unused.  Remove it now.

Signed-off-by: David Daney 
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/752/
Signed-off-by: Ralf Baechle

Merge branch 'fix/asoc' into for-linus

Tue, 12 Jan 2010 16:50:06 +0000

Merge branch 'fix/asoc' into for-linus

Merge branch 'fix/hda' into for-linus

Tue, 12 Jan 2010 16:50:03 +0000

Merge branch 'fix/hda' into for-linus

ALSA: hda - Fix ALC861-VD capture source mixer

Tue, 12 Jan 2010 13:00:11 +0000

ALSA: hda - Fix ALC861-VD capture source mixer

The capture source or input source mixer element wasn't created properly
for ALC861-VD codec due to the wrong NID passed to
alc_auto_create_input_ctls().

References: Novell bnc#568305
	http://bugzilla.novell.com/show_bug.cgi?id=568305

Signed-off-by: Takashi Iwai 
Cc:

sky2: Fix oops in sky2_xmit_frame() after TX timeout

Mon, 4 Jan 2010 08:48:41 +0000

sky2: Fix oops in sky2_xmit_frame() after TX timeout

During TX timeout procedure dev could be awoken too early, e.g. by
sky2_complete_tx() called from sky2_down(). Then sky2_xmit_frame()
can run while buffers are freed causing an oops. This patch fixes it
by adding netif_device_present() test in sky2_tx_complete().

Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=14925

With debugging by: Mike McCormack 

Reported-by: Berck E. Nash 
Tested-by: Berck E. Nash 
Signed-off-by: Jarek Poplawski 
Signed-off-by: David S. Miller

OMAP: DSS2: OMAPFB: fix crash when panel driver was not loaded

Thu, 7 Jan 2010 15:45:03 +0000

OMAP: DSS2: OMAPFB: fix crash when panel driver was not loaded

If the panel's probe had failed, omapfb would still go on, eventually
crashing.

A better fix would be to handle each display properly, and leaving just
the failed display out. But that is a bigger change.

Signed-off-by: Tomi Valkeinen

OMAP: DSS2: Reject scaling settings when they cannot be supported

Fri, 8 Jan 2010 09:56:41 +0000

OMAP: DSS2: Reject scaling settings when they cannot be supported

If the scaling ratio is below 0.5 video output width can't be identical
to the display width. Reject such settings.

Signed-off-by: Ville SyrjÃ¤lÃ¤ 
Acked-by: Tomi Valkeinen

Merge remote branch 'alsa/fixes' into fix/misc

Tue, 12 Jan 2010 08:40:48 +0000

Merge remote branch 'alsa/fixes' into fix/misc

Revert "x86, apic: Use logical flat on intel with <= 8 logical cpus"

Mon, 11 Jan 2010 23:51:04 +0000

Revert "x86, apic: Use logical flat on intel with <= 8 logical cpus"

Revert commit 2fbd07a5f5d1295fa9b0c0564ec27da7c276a75a, as this commit
breaks an IBM platform with quad-core Xeon cpu's.

According to Suresh, this might be an IBM platform issue, as on other
Intel platforms with <= 8 logical cpu's, logical flat mode works fine
irespective of physical apic id values (inline with the xapic
architecture).

Revert this for now because of the IBM platform breakage.

Another version will be re-submitted after the complete analysis.

Signed-off-by: Ananth N Mavinakayanahalli 
Acked-by: Suresh Siddha 
Signed-off-by: Linus Torvalds

cfg80211: fix refcount imbalance when wext is disabled

Mon, 11 Jan 2010 15:14:57 +0000

cfg80211: fix refcount imbalance when wext is disabled

When CONFIG_CFG80211_WEXT is not set, there is
a refcount imbalance with rdev->opencount, fix
that by moving it out of the ifdef.

Reported-by: Alan Stern 
Signed-off-by: Johannes Berg 
Signed-off-by: John W. Linville

mac80211: fix queue selection for data frames on monitor interfaces

Mon, 11 Jan 2010 05:47:00 +0000

mac80211: fix queue selection for data frames on monitor interfaces

When ieee80211_monitor_select_queue encounters data frames, it selects
the WMM AC based on skb->priority and assumes that skb->priority
contains a valid 802.1d tag. However this assumption is incorrect, since
ieee80211_select_queue has not been called at this point.
If skb->priority > 7, an array overrun occurs, which could lead to
invalid values, resulting in crashes in the tx path.
Fix this by setting skb->priority based on the 802.11 header for QoS
frames and using the default AC for all non-QoS frames.

Signed-off-by: Felix Fietkau 
Signed-off-by: John W. Linville

Documentation/3c509: document ethtool support

Mon, 11 Jan 2010 23:53:45 +0000

Documentation/3c509: document ethtool support

3c509 was changed to support ethtool in 2002, making the 'xcvr' module
parameter obsolete in most cases.  More recently 3c509 was converted
to the modern driver model and this parameter was removed.  Fix the
documentation to refer to ethtool rather than the module parameter.

Signed-off-by: Ben Hutchings 
Signed-off-by: David S. Miller

af_packet: Don't use skb after dev_queue_xmit()

Sun, 10 Jan 2010 22:04:19 +0000

af_packet: Don't use skb after dev_queue_xmit()

tpacket_snd() can change and kfree an skb after dev_queue_xmit(),
which is illegal.

With debugging by: Stephen Hemminger 

Reported-by: Michael Breuer 
With help from: David S. Miller 
Signed-off-by: Jarek Poplawski 
Tested-by: Michael Breuer
Signed-off-by: David S. Miller

iwlwifi: silence buffer overflow warning

Sat, 9 Jan 2010 08:41:48 +0000

iwlwifi: silence buffer overflow warning

Smatch (and presumably other static checkers) complain that MAX_TID_COUNT is
past the end of the array.  In the resulting discussion, Zhu Yi pointed out
that this value is not used in real life and the assignment was only there to
silence a gcc warning.

If there were a bug in the surrounding code and the value were used, the
WARN_ON(!qc) would print a warning before the crash.

Signed-off-by: Dan Carpenter 
Acked-by: Zhu Yi 
Signed-off-by: John W. Linville

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

Mon, 11 Jan 2010 17:48:48 +0000

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: Ensure we force all busy extents in range to disk
  xfs: Don't flush stale inodes
  xfs: fix timestamp handling in xfs_setattr
  xfs: use DECLARE_EVENT_CLASS

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

Mon, 11 Jan 2010 17:48:29 +0000

Merge git://git./linux/kernel/git/steve/gfs2-2.6-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Use MAX_LFS_FILESIZE for meta inode size
  GFS2: Fix gfs2_xattr_acl_chmod()
  GFS2: Fix locking bug in rename
  GFS2: Ensure uptodate inode size when using O_APPEND

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux ...

Mon, 11 Jan 2010 17:48:14 +0000

Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  quota: Fix dquot_transfer for filesystems different from ext4

Merge branch 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied ...

Mon, 11 Jan 2010 17:47:52 +0000

Merge branch 'agp-fixes' of git://git./linux/kernel/git/airlied/agp-2.6

* 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp/hp: fail gracefully if we don't find an IOC
  agp/hp: fixup hp agp after ACPI changes
  agp: correct missing cleanup on error in agp_add_bridge

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied ...

Mon, 11 Jan 2010 17:46:20 +0000

Merge branch 'drm-linus' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (45 commits)
  drm/nv04: Fix set_operation software method.
  drm/nouveau: initialise DMA tracking parameters earlier
  drm/nouveau: use dma.max rather than pushbuf size for checking GET validity
  drm/nv04: differentiate between nv04/nv05
  drm/nouveau: Fix null deref in nouveau_fence_emit due to deleted fence
  drm/nv50: prevent a possible ctxprog hang
  drm/nouveau: have ttm's fault handler called directly
  drm/nv50: restore correct cache1 get/put address on fifoctx load
  drm/nouveau: create function for "dealing" with gpu lockup
  drm/nouveau: remove unused nouveau_channel_idle() function
  drm/nouveau: fix handling of fbcon colours in 8bpp
  drm/nv04: Context switching fixes.
  drm/nouveau: Use the software object for fencing.
  drm/nouveau: Allocate a per-channel instance of NV_SW.
  drm/nv50: make the blocksize depend on vram size
  drm/nouveau: better alignment of bo sizes and use roundup instead of ALIGN
  drm/nouveau: Don't skip card take down on nv0x.
  drm/nouveau: Implement nv42-nv43 TV load detection.
  drm/nouveau: Clean up the nv17-nv4x load detection code a bit.
  drm/nv50: fix fillrect color
  ...

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv ...

Mon, 11 Jan 2010 17:45:55 +0000

Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/jdelvare/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: Make PCI device ids constant
  hwmon: (coretemp) Fix TjMax for Atom N450/D410/D510 CPUs
  hwmon: (k10temp) Blacklist more family 10h processors
  hwmon: (asus_atk0110) Add debugfs interface
  hwmon: (asus_atk0110) Refactor interface probe code
  hwmon: (adt7462) Fix pin 28 monitoring

core, x86: make LIST_POISON less deadly

Sun, 10 Jan 2010 14:28:09 +0000

core, x86: make LIST_POISON less deadly

The list macros use LIST_POISON1 and LIST_POISON2 as undereferencable
pointers in order to trap erronous use of freed list_heads.  Unfortunately
userspace can arrange for those pointers to actually be dereferencable,
potentially turning an oops to an expolit.

To avoid this allow architectures (currently x86_64 only) to override
the default values for these pointers with truly-undereferencable values.
This is easy on x86_64 as the virtual address space is large and contains
areas that cannot be mapped.

Other 64-bit architectures will likely find similar unmapped ranges.

[ingo: switch to 0xdead000000000000 as the unmapped area]
[ingo: add comments, cleanup]
[jaswinder: eliminate sparse warnings]

Acked-by: Linus Torvalds 
Signed-off-by: Jaswinder Singh Rajput 
Signed-off-by: Ingo Molnar 
Signed-off-by: Avi Kivity 
Signed-off-by: Linus Torvalds

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel ...

Mon, 11 Jan 2010 17:44:19 +0000

Merge branch 'omap-fixes-for-linus' of git://git./linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (26 commits)
  OMAP2 clock: dynamically allocate CPUFreq frequency table
  OMAP clock/CPUFreq: add clk_exit_cpufreq_table()
  OMAP2xxx OPP: clean up comments in OPP data
  OMAP2xxx clock: clk2xxx.c doesn't compile if CPUFREQ is enabled
  OMAP1 clock: remove __initdata from struct clk_functions to prevent crash
  OMAP1 clock: Add missing clocks for OMAP 7xx
  OMAP clock: remove incorrect EXPORT_SYMBOL()s
  OMAP3 clock: Add capability to change rate of dpll4_m5_ck
  OMAP3 clock: McBSP 2, 3, 4 functional clock parent is PER_96M_FCLK, not CORE_96M_FCLK
  OMAP3: clock: add clockdomains for UART1 & 2
  OMAP2420 IO mapping: move IVA mapping virtual address out of vmalloc space
  OMAP2xxx IO mapping: mark DSP mappings as being 2420-only
  ARM: OMAP3: PM: Fix the Invalid CM_CLKSTCTRL reg access.
  OMAP2: remove duplicated #include
  omap3: EVM: Choose OMAP_PACKAGE_CBB
  omap3: Fix booting if package is uninitialized
  omap3: add missing parentheses
  omap3: add missing parentheses
  omap2/3: ZOOM: Correcting key mapping for few keys
  omap2/3: make serial_in_override() address the right uart port
  ...

mn10300: update the ASB2303 defconfig

Fri, 8 Jan 2010 22:43:21 +0000

mn10300: update the ASB2303 defconfig

Update the defconfig for the ASB2303 platform.

Signed-off-by: David Howells 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mn10300: make the ASB2305's PCnet32 NIC work by using the PCI bridge's SRAM

Fri, 8 Jan 2010 22:43:21 +0000

mn10300: make the ASB2305's PCnet32 NIC work by using the PCI bridge's SRAM

Access to the ASB2305's PCnet32 NIC doesn't work correctly because when
the NIC attempts to update the ring buffer flags by DMA, the change to RAM
crops up about 17uS after the interrupt line is asserted.  This is almost
certainly due to a bug in the PCI bridge FPGA on that board.

We can get around this by making dma_alloc_coherent() put the ring buffer
in the SRAM attached to the PCI bridge rather than in the SDRAM.

Signed-off-by: David Howells 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mn10300: insert PCI root bus resources for the ASB2305 devel motherboard

Fri, 8 Jan 2010 22:43:20 +0000

mn10300: insert PCI root bus resources for the ASB2305 devel motherboard

Insert PCI root bus resources for the MN10300-based ASB2305 development
kit motherboard.  This is required because the CPU's window onto the PCI
bus address space is considerably smaller than the CPU's full address
space and non-PCI devices lie outside of the PCI window that we might want
to access.

Without this patch, the PCI root bus uses the platform-level bus
resources, and these are then confined to the PCI window, thus making
platform_device_add() reject devices outside of this window.

We also add a reservation for the PCI SRAM region.

Signed-off-by: David Howells 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mn10300: use generic pci_enable_resources()

Fri, 8 Jan 2010 22:43:19 +0000

mn10300: use generic pci_enable_resources()

Use the generic pci_enable_resources() instead of the arch-specific code.

Unlike this arch-specific code, the generic version:

 - checks PCI_NUM_RESOURCES (11), not 6, resources
 - skips resources that have neither IORESOURCE_IO nor IORESOURCE_MEM set
 - skips ROM resources unless IORESOURCE_ROM_ENABLE is set
 - checks for resource collisions with "!r->parent"

Signed-off-by: Bjorn Helgaas 
Signed-off-by: David Howells 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mn10300: use KERN_ERR not KERN_ERROR

Fri, 8 Jan 2010 22:43:18 +0000

mn10300: use KERN_ERR not KERN_ERROR

Use KERN_ERR not KERN_ERROR in the ASB2305 platform code.

Signed-off-by: David Howells 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mn10300: fix several bogus includes on abs2305

Fri, 8 Jan 2010 22:43:17 +0000

mn10300: fix several bogus includes on abs2305

asm/cpu never existed for mn10300; the files they are looking for are in
asm.

Signed-off-by: Al Viro 
Signed-off-by: David Howells 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mn10300: wire up missing new syscalls

Fri, 8 Jan 2010 22:43:17 +0000

mn10300: wire up missing new syscalls

Wire up missing new system calls for MN10300.

Signed-off-by: David Howells 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mn10300: add cc clobbers to asm statements

Fri, 8 Jan 2010 22:43:16 +0000

mn10300: add cc clobbers to asm statements

gcc 4.2.1 for MN10300 is more agressive than the older gcc in
reordering/moving other insns between an insn that sets flags and an insn
that uses those flags.  This leads to trouble with asm statements which
are missing an explicit "cc" clobber.  This patch adds the explicit "cc"
clobber to asm statements which do indeed clobber the condition flags.

Signed-off-by: Mark Salter 
Signed-off-by: David Howells 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mn10300: objcopy flags fix

Fri, 8 Jan 2010 22:43:15 +0000

mn10300: objcopy flags fix

The gcc-4.2.1 based toolchain for MN10300 adds some new note sections
which need to be stripped from the binary image.  This patch takes care of
that.

Signed-off-by: Mark Salter 
Signed-off-by: David Howells 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mn10300: signal stack fix

Fri, 8 Jan 2010 22:43:14 +0000

mn10300: signal stack fix

This fixes a signal stack handling problem in the MN10300 arch.  When new
threads are cloned with CLONE_VM, they don't inherit the alternate signal
stack.  They do share the signal flags, though.  When deciding whether to
use an alternate stack, the arch code needs to check to make sure the task
struct contains a valid alternate stack.  This patch fixes the MN10300
arch by using the sas_ss_flags() test provided by sched.h rather than the
on_sig_stack() test which is insufficient by itself.

Signed-off-by: Mark Salter 
Signed-off-by: David Howells 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

rtc_cmos: convert shutdown to new pnp_driver->shutdown

Fri, 8 Jan 2010 22:43:11 +0000

rtc_cmos: convert shutdown to new pnp_driver->shutdown

commit abd6633c67925f90775bb74755f9c547e30f1f20 ("pnp: add a shutdown
method to pnp drivers") adds shutdown method to bus driver blindly.  With
it, driver->shutdown is no longer valid.

Use pnp_driver->shutdown instead.

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14889

Signed-off-by: OGAWA Hirofumi 
Reported-by: Malte SchrÃ¶der 
Cc: "Rafael J. Wysocki" 
Cc: Bjorn Helgaas 
Cc: David Hardeman 
Cc: Dmitry Torokhov 
Cc: Alessandro Zummo 
Cc: Paul Gortmaker 
Cc: 		[2.6.32.x]
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

smaps: fix wrong rss count

Fri, 8 Jan 2010 22:43:10 +0000

smaps: fix wrong rss count

A long time ago we regarded zero page as file_rss and vm_normal_page
doesn't return NULL.

But now, we reinstated ZERO_PAGE and vm_normal_page's implementation can
return NULL in case of zero page.  Also we don't count it with file_rss
any more.

Then, RSS and PSS can't be matched.  For consistency, Let's ignore zero
page in smaps_pte_range.

Signed-off-by: Minchan Kim 
Acked-by: KAMEZAWA Hiroyuki 
Acked-by: Hugh Dickins 
Acked-by: Matt Mackall 
Reviewed-by: KOSAKI Motohiro 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

documentation: update kernel-doc-nano-HOWTO information

Fri, 8 Jan 2010 22:43:09 +0000

documentation: update kernel-doc-nano-HOWTO information

Remove comments about function short descriptions not allowed to be on
multiple lines (that was fixed/changed recently).

Add comments that function "section header:" names need to be unique per
function/struct/union/typedef/enum.

Signed-off-by: Randy Dunlap 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

gpio: adp5588-gpio: new driver for ADP5588 GPIO expanders

Fri, 8 Jan 2010 22:43:08 +0000

gpio: adp5588-gpio: new driver for ADP5588 GPIO expanders

Signed-off-by: Michael Hennerich 
Signed-off-by: Mike Frysinger 
Cc: Jean Delvare 
Cc: David Brownell 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

drivers/cpuidle/governors/menu.c: fix undefined reference to `__udivdi3'

Fri, 8 Jan 2010 22:43:08 +0000

drivers/cpuidle/governors/menu.c: fix undefined reference to `__udivdi3'

menu: use proper 64 bit math

The new menu governor is incorrectly doing a 64 bit divide.  Compile
tested only

Signed-off-by: Stephen Hemminger 
Cc: Arjan van de Ven 
Cc: Len Brown 
Cc: Venkatesh Pallipadi 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Documentation: update ring-buffer-design.txt

Fri, 8 Jan 2010 22:43:07 +0000

Documentation: update ring-buffer-design.txt

Fix typos, grammos, spellos, hyphenation.

Signed-off-by: Randy Dunlap 
Acked-by: Steven Rostedt 
Cc: Mel Gorman 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm: hugetlb: fix clear_huge_page()

Fri, 8 Jan 2010 22:43:05 +0000

mm: hugetlb: fix clear_huge_page()

sz is in bytes, MAX_ORDER_NR_PAGES is in pages.

Signed-off-by: Andrea Arcangeli 
Acked-by: David Gibson 
Cc: Mel Gorman 
Cc: David Rientjes 
Cc: Lee Schermerhorn 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

hwmon: driver for Texas Instruments amc6821 chip

Fri, 8 Jan 2010 22:43:04 +0000

hwmon: driver for Texas Instruments amc6821 chip

Signed-off-by: 
Cc: Jean Delvare 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

gpiolib: fix poll(2) support reconfigure on sysfs polarity change

Fri, 8 Jan 2010 22:43:03 +0000

gpiolib: fix poll(2) support reconfigure on sysfs polarity change

Previously enabled poll(2) support on one edge was never reconfigured when
sysfs polarity change was triggered from kernel, because 'struct device
*dev' shadowed an earlier definition.

Found by sparse, which I should've run much earlier.

Signed-off-by: Jani Nikula 
Cc: David Brownell 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

vsnprintf: fix reference for compressed ipv6 addresses

Fri, 8 Jan 2010 22:43:02 +0000

vsnprintf: fix reference for compressed ipv6 addresses

Signed-off-by: Uwe Kleine-KÃ¶nig 
Reported-by: Josip Rodin 
Cc: Joe Perches 
Cc: David S. Miller 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc: allow for MMC v4.4

Fri, 8 Jan 2010 22:43:01 +0000

mmc: allow for MMC v4.4

JEDEC eMMC specification version 4.4 (MMCA 4.4) defines Extended CSD
structure versions up to 5.

Signed-off-by: Adrian Hunter 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc_block: fix queue cleanup

Fri, 8 Jan 2010 22:43:00 +0000

mmc_block: fix queue cleanup

The main bug was that 'blk_cleanup_queue()' was called while the block
device could still be in use, for example, because the card was removed
while files were still open.

In addition, to be sure that 'mmc_request()' will get called for all new
requests (so it can error them out), the queue is emptied during cleanup.
This is done after the worker thread is stopped to avoid racing with it.

Finally, it is not a device error for this to be happening, so quiet the
(sometimes very many) error messages.

Signed-off-by: Adrian Hunter 
Cc: 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc_block: fix probe error cleanup bug

Fri, 8 Jan 2010 22:42:59 +0000

mmc_block: fix probe error cleanup bug

If mmc_blk_set_blksize() fails mmc_blk_probe() the request queue and its
thread have been set up and they need to be shut down properly before
putting the disk.

Signed-off-by: Jarkko Lavinen 
Signed-off-by: Adrian Hunter 
Cc: 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc_block: add dev_t initialization check

Fri, 8 Jan 2010 22:42:58 +0000

mmc_block: add dev_t initialization check

When a card is removed before mmc_blk_probe() has called add_disk(), then
the minor field is uninitialized and has value 0.  This caused
mmc_blk_put() to always release devidx 0 even if 0 was still in use.  Then
the next mmc_blk_probe() used the first free idx of 0, which oopses in
sysfs, since it is used by another card.

Signed-off-by: Anna Lemehova 
Signed-off-by: Adrian Hunter 
Cc: 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

power: fix kernel-doc notation

Fri, 8 Jan 2010 22:42:57 +0000

power: fix kernel-doc notation

Warning(drivers/base/power/main.c:453): No description found for parameter 'dev'
Warning(drivers/base/power/main.c:453): No description found for parameter 'cb'
Warning(drivers/base/power/main.c:719): No description found for parameter 'dev'
Warning(drivers/base/power/main.c:719): No description found for parameter 'state'
Warning(drivers/base/power/main.c:719): No description found for parameter 'cb'

Signed-off-by: Randy Dunlap 
Cc: Rafael J. Wysocki 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

proc: partially revert "procfs: provide stack information for threads"

Fri, 8 Jan 2010 22:42:56 +0000

proc: partially revert "procfs: provide stack information for threads"

Commit d899bf7b (procfs: provide stack information for threads) introduced
to show stack information in /proc/{pid}/status.  But it cause large
performance regression.  Unfortunately /proc/{pid}/status is used ps
command too and ps is one of most important component.  Because both to
take mmap_sem and page table walk are heavily operation.

If many process run, the ps performance is,

[before d899bf7b]

% perf stat ps >/dev/null

 Performance counter stats for 'ps':

     4090.435806  task-clock-msecs         #      0.032 CPUs
             229  context-switches         #      0.000 M/sec
               0  CPU-migrations           #      0.000 M/sec
             234  page-faults              #      0.000 M/sec
      8587565207  cycles                   #   2099.425 M/sec
      9866662403  instructions             #      1.149 IPC
      3789415411  cache-references         #    926.409 M/sec
        30419509  cache-misses             #      7.437 M/sec

   128.859521955  seconds time elapsed

[after d899bf7b]

% perf stat  ps  > /dev/null

 Performance counter stats for 'ps':

     4305.081146  task-clock-msecs         #      0.028 CPUs
             480  context-switches         #      0.000 M/sec
               2  CPU-migrations           #      0.000 M/sec
             237  page-faults              #      0.000 M/sec
      9021211334  cycles                   #   2095.480 M/sec
     10605887536  instructions             #      1.176 IPC
      3612650999  cache-references         #    839.160 M/sec
        23917502  cache-misses             #      5.556 M/sec

   152.277819582  seconds time elapsed

Thus, this patch revert it. Fortunately /proc/{pid}/task/{tid}/smaps
provide almost same information. we can use it.

Commit d899bf7b introduced two features:

 1) Add the annotattion of [thread stack: xxxx] mark to
    /proc/{pid}/task/{tid}/maps.
 2) Add StackUsage field to /proc/{pid}/status.

I only revert (2), because I haven't seen (1) cause regression.

Signed-off-by: KOSAKI Motohiro 
Cc: Stefani Seibold 
Cc: Ingo Molnar 
Cc: Peter Zijlstra 
Cc: Alexey Dobriyan 
Cc: "Eric W. Biederman" 
Cc: Randy Dunlap 
Cc: Andrew Morton 
Cc: Andi Kleen 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

.gitignore: ignore vmlinuz

Fri, 8 Jan 2010 22:42:54 +0000

.gitignore: ignore vmlinuz

MIPS compressed kernels output a vmlinuz file in the top-level directory
(maybe others do).  Add vmlinuz to the list of files to ignore by git.

Signed-off-by: Florian Fainelli 
Cc: Ralf Baechle 
Cc: Maxime Bizon 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

kernel/signal.c: fix kernel information leak with print-fatal-signals=1

Fri, 8 Jan 2010 22:42:52 +0000

kernel/signal.c: fix kernel information leak with print-fatal-signals=1

When print-fatal-signals is enabled it's possible to dump any memory
reachable by the kernel to the log by simply jumping to that address from
user space.

Or crash the system if there's some hardware with read side effects.

The fatal signals handler will dump 16 bytes at the execution address,
which is fully controlled by ring 3.

In addition when something jumps to a unmapped address there will be up to
16 additional useless page faults, which might be potentially slow (and at
least is not very efficient)

Fortunately this option is off by default and only there on i386.

But fix it by checking for kernel addresses and also stopping when there's
a page fault.

Signed-off-by: Andi Kleen 
Cc: Ingo Molnar 
Cc: Oleg Nesterov 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

cgroups: fix 2.6.32 regression causing BUG_ON() in cgroup_diput()

Fri, 8 Jan 2010 22:42:50 +0000

cgroups: fix 2.6.32 regression causing BUG_ON() in cgroup_diput()

The LTP cgroup test suite generates a "kernel BUG at kernel/cgroup.c:790!"
here in cgroup_diput():

                 /*
                  * if we're getting rid of the cgroup, refcount should ensure
                  * that there are no pidlists left.
                  */
                 BUG_ON(!list_empty(&cgrp->pidlists));

The cgroup pidlist rework in 2.6.32 generates the BUG_ON, which is caused
when pidlist_array_load() calls cgroup_pidlist_find():

(1) if a matching cgroup_pidlist is found, it down_write's the mutex of the
     pre-existing cgroup_pidlist, and increments its use_count.
(2) if no matching cgroup_pidlist is found, then a new one is allocated, it
     down_write's its mutex, and the use_count is set to 0.
(3) the matching, or new, cgroup_pidlist gets returned back to pidlist_array_load(),
     which increments its use_count -- regardless whether new or pre-existing --
     and up_write's the mutex.

So if a matching list is ever encountered by cgroup_pidlist_find() during
the life of a cgroup directory, it results in an inflated use_count value,
preventing it from ever getting released by cgroup_release_pid_array().
Then if the directory is subsequently removed, cgroup_diput() hits the
BUG_ON() when it finds that the directory's cgroup is still populated with
a pidlist.

The patch simply removes the use_count increment when a matching pidlist
is found by cgroup_pidlist_find(), because it gets bumped by the calling
pidlist_array_load() function while still protected by the list's mutex.

Signed-off-by: Dave Anderson 
Reviewed-by: Li Zefan 
Acked-by: Ben Blum 
Cc: Paul Menage 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

scripts/get_maintainer.pl: fix file exclusion X: logic

Fri, 8 Jan 2010 22:42:48 +0000

scripts/get_maintainer.pl: fix file exclusion X: logic

The following command doesn't generate any output.
`./scripts/get_maintainer.pl --no-git -f drivers/net/wireless/wl12xx/wl1271_acx.c`

An excluded "X:" pattern match in any section would cause a file not to
match any other section.

Signed-off-by: Joe Perches 
Reported-by: Dan Carpenter 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

lib/rational.c needs module.h

Fri, 8 Jan 2010 22:42:47 +0000

lib/rational.c needs module.h

lib/rational.c:62: warning: data definition has no type or storage class
lib/rational.c:62: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
lib/rational.c:62: warning: parameter names (without types) in function declaration

Signed-off-by: Sascha Hauer 
Signed-off-by: Uwe Kleine-KÃ¶nig 
Acked-by: WANG Cong 
Cc: Oskar Schirmer 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Add LZO compression support for initramfs and old-style initrd

Fri, 8 Jan 2010 22:42:46 +0000

Add LZO compression support for initramfs and old-style initrd

Signed-off-by: Albin Tonnerre 
Tested-by: Wu Zhangjin 
Acked-by: "H. Peter Anvin" 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Tested-by: Russell King 
Acked-by: Russell King 
Cc: Ralf Baechle 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

x86: add support for LZO-compressed kernels

Fri, 8 Jan 2010 22:42:45 +0000

x86: add support for LZO-compressed kernels

The necessary changes to the x86 Kconfig and boot/compressed to allow the
use of this new compression method

Signed-off-by: Albin Tonnerre 
Acked-by: H. Peter Anvin 
Tested-by: Wu Zhangjin 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Tested-by: Russell King 
Acked-by: Russell King 
Cc: Ralf Baechle 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

arm: add support for LZO-compressed kernels

Fri, 8 Jan 2010 22:42:43 +0000

arm: add support for LZO-compressed kernels

- changes to ach/arch/boot/Makefile to make it easier to add new
   compression types
 - new piggy.lzo.S necessary for lzo compression
 - changes in arch/arm/boot/compressed/misc.c to allow the use of lzo or
   gzip, depending on the config
 - Kconfig support

Signed-off-by: Albin Tonnerre 
Tested-by: Wu Zhangjin 
Acked-by: "H. Peter Anvin" 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Tested-by: Russell King 
Acked-by: Russell King 
Cc: Ralf Baechle 
Cc: Martin Michlmayr 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

lib: add support for LZO-compressed kernels

Fri, 8 Jan 2010 22:42:42 +0000

lib: add support for LZO-compressed kernels

This patch series adds generic support for creating and extracting
LZO-compressed kernel images, as well as support for using such images on
the x86 and ARM architectures, and support for creating and using
LZO-compressed initrd and initramfs images.

Russell King said:

: Testing on a Cortex A9 model:
: - lzo decompressor is 65% of the time gzip takes to decompress a kernel
: - lzo kernel is 9% larger than a gzip kernel
:
: which I'm happy to say confirms your figures when comparing the two.
:
: However, when comparing your new gzip code to the old gzip code:
: - new is 99% of the size of the old code
: - new takes 42% of the time to decompress than the old code
:
: What this means is that for a proper comparison, the results get even better:
: - lzo is 7.5% larger than the old gzip'd kernel image
: - lzo takes 28% of the time that the old gzip code took
:
: So the expense seems definitely worth the effort.  The only reason I
: can think of ever using gzip would be if you needed the additional
: compression (eg, because you have limited flash to store the image.)
:
: I would argue that the default for ARM should therefore be LZO.

This patch:

The lzo compressor is worse than gzip at compression, but faster at
extraction.  Here are some figures for an ARM board I'm working on:

Uncompressed size: 3.24Mo
gzip  1.61Mo 0.72s
lzo   1.75Mo 0.48s

So for a compression ratio that is still relatively close to gzip, it's
much faster to extract, at least in that case.

This part contains:
 - Makefile routine to support lzo compression
 - Fixes to the existing lzo compressor so that it can be used in
   compressed kernels
 - wrapper around the existing lzo1x_decompress, as it only extracts one
   block at a time, while we need to extract a whole file here
 - config dialog for kernel compression

[akpm@linux-foundation.org: coding-style fixes]
[akpm@linux-foundation.org: cleanup]
Signed-off-by: Albin Tonnerre 
Tested-by: Wu Zhangjin 
Acked-by: "H. Peter Anvin" 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Tested-by: Russell King 
Acked-by: Russell King 
Cc: Ralf Baechle 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

zlib: optimize inffast when copying direct from output

Fri, 8 Jan 2010 22:42:40 +0000

zlib: optimize inffast when copying direct from output

JFFS2 uses lesser compression ratio and inflate always ends up in "copy
direct from output" case.

This patch tries to optimize the direct copy procedure.  Uses
get_unaligned() but only in one place.

The copy loop just above this one can also use this optimization, but I
havn't done so as I have not tested if it is a win there too.

On my MPC8321 this is about 17% faster on my JFFS2 root FS than the
original.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Joakim Tjernlund 
Cc: Roel Kluin 
Cc: Richard Purdie 
Cc: David Woodhouse 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

percpu: avoid calling __pcpu_ptr_to_addr(NULL)

Fri, 8 Jan 2010 22:42:39 +0000

percpu: avoid calling __pcpu_ptr_to_addr(NULL)

__pcpu_ptr_to_addr() can be overridden by the architecture and might not
behave well if passed a NULL pointer.  So avoid calling it until we have
verified that its arg is not NULL.

Cc: Rusty Russell 
Cc: Kamalesh Babulal 
Acked-by: Tejun Heo 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

kmod: fix resource leak in call_usermodehelper_pipe()

Fri, 8 Jan 2010 22:42:38 +0000

kmod: fix resource leak in call_usermodehelper_pipe()

Fix resource (write-pipe file) leak in call_usermodehelper_pipe().

When call_usermodehelper_exec() fails, write-pipe file is opened and
call_usermodehelper_pipe() just returns an error.  Since it is hard for
caller to determine whether the error occured when opening the pipe or
executing the helper, the caller cannot close the pipe by themselves.

I've found this resoruce leak when testing coredump.  You can check how
the resource leaks as below;

$ echo "|nocommand" > /proc/sys/kernel/core_pattern
$ ulimit -c unlimited
$ while [ 1 ]; do ./segv; done &> /dev/null &
$ cat /proc/meminfo (<- repeat it)

where segv.c is;
//-----
int main () {
        char *p = 0;
        *p = 1;
}
//-----

This patch closes write-pipe file if call_usermodehelper_exec() failed.

Signed-off-by: Masami Hiramatsu 
Cc: Rusty Russell 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dma-debug: allow DMA_BIDIRECTIONAL mappings to be synced with DMA_FROM_DEVICE and

Fri, 8 Jan 2010 22:42:36 +0000

dma-debug: allow DMA_BIDIRECTIONAL mappings to be synced with DMA_FROM_DEVICE and

There is no need to perform full BIDIR sync (copying the buffers in case
of swiotlb and similar schemes) if we know that the owner (CPU or device)
hasn't altered the data.

Addresses the false-positive reported at
http://bugzilla.kernel.org/show_bug.cgi?id=14169

Signed-off-by: Krzysztof Halasa 
Cc: David Miller 
Cc: Joerg Roedel 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

kmemcheck: make bitfield annotations truly no-ops when disabled

Fri, 8 Jan 2010 22:42:35 +0000

kmemcheck: make bitfield annotations truly no-ops when disabled

It turns out that even zero-sized struct members (int foo[0];) will affect
the struct layout, causing us in particular to lose 4 bytes in struct
sock.

This patch fixes the regression in CONFIG_KMEMCHECK=n case.

Reported-by: Eric Dumazet 
Signed-off-by: Vegard Nossum 
Acked-by: Pekka Enberg 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

docs: large update to ioctl-number.txt

Fri, 8 Jan 2010 22:42:34 +0000

docs: large update to ioctl-number.txt

Add many ioctl definitions to ioctl-number.txt.
Fix some whitespace/formatting.
Correct some filenames/paths.

Signed-off-by: Randy Dunlap 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm: make totalhigh_pages unsigned long

Fri, 8 Jan 2010 22:42:31 +0000

mm: make totalhigh_pages unsigned long

Makes it consistent with the extern declaration, used when CONFIG_HIGHMEM
is set Removes redundant casts in printout messages

Signed-off-by: Andreas Fenkart 
Acked-by: Russell King 
Cc: Ralf Baechle 
Cc: David Howells 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Cc: Chen Liqin 
Cc: Lennox Wu 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ARM: 5874/1: serial21285: fix disable_irq-from-interrupt-handler deadlock

Mon, 11 Jan 2010 14:57:24 +0000

ARM: 5874/1: serial21285: fix disable_irq-from-interrupt-handler deadlock

The console hangs during bootup when disable_irq is called from the
transmit interrupt handler (it will wait forever for it's "own"
interrupt in synchronize_irq). Fix by using disable_irq_nosync()
instead.

Signed-off-by: Simon Kagstrom 
Signed-off-by: Russell King

ARM: 5873/1: ARM: Fix the reset logic for ARM RealView boards

Mon, 11 Jan 2010 10:09:15 +0000

ARM: 5873/1: ARM: Fix the reset logic for ARM RealView boards

Extend the patch from Philby John to the other "RealView" boards.
Rename the constants and offsets to reflect their actual functions.

Cc: Philby John 
Signed-off-by: Colin Tuckley 
Acked-by: Catalin Marinas 
Signed-off-by: Russell King

OMAP: DSS2: Make check-delay-loops consistent

Thu, 7 Jan 2010 12:19:48 +0000

OMAP: DSS2: Make check-delay-loops consistent

Loops checking for certain condition were rather inconsistent.

Signed-off-by: Tomi Valkeinen 
Reported-by: Juha Leppanen

OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem()

Thu, 7 Jan 2010 11:37:30 +0000

OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem()

Fixes bug causing VRFB memory area to be released twice.

Signed-off-by: Tomi Valkeinen 
Reported-by: Eino-Ville Talvala

video/omap: add init/exit macros to drivers/video/omap/lcd_htcherald.c

Tue, 22 Dec 2009 08:34:49 +0000

video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c

Trivial patch which adds the __init/__exit macros to the module_init/
module_exit functions of

drivers/video/omap/lcd_htcherald.c

Please have a look at the small patch and either pull it through
your tree, or please ack' it so Jiri can pull it through the trivial
tree.

Patch against linux-next-tree, 22. Dez 08:38:18 CET 2009
but also present in linus tree.

Signed-off-by: Peter Huewe 
Acked-by: Tony Lindgren

OMAP: DSS2: Fix compile warning

Mon, 4 Jan 2010 14:34:14 +0000

OMAP: DSS2: Fix compile warning

Signed-off-by: Vaibhav Hiremath 
Acked-by: Tomi Valkeinen

MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry

Thu, 7 Jan 2010 11:18:04 +0000

MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry

There isn't really any reason to divide those.

Signed-off-by: Tomi Valkeinen

quota: Fix dquot_transfer for filesystems different from ext4

Wed, 6 Jan 2010 17:03:36 +0000

quota: Fix dquot_transfer for filesystems different from ext4

Commit fd8fbfc1 modified the way we find amount of reserved space
belonging to an inode. The amount of reserved space is checked
from dquot_transfer and thus inode_reserved_space gets called
even for filesystems that don't provide get_reserved_space callback
which results in a BUG.

Fix the problem by checking get_reserved_space callback and return 0 if
the filesystem does not provide it.

CC: Dmitry Monakhov 
Signed-off-by: Jan Kara

MAINTAINERS: change omapfb maintainer

Thu, 7 Jan 2010 11:06:51 +0000

MAINTAINERS: change omapfb maintainer

Signed-off-by: Tomi Valkeinen 
Acked-by: Imre Deak

OMAP: OMAPFB: add dummy release function for omapdss

Thu, 7 Jan 2010 09:56:14 +0000

OMAP: OMAPFB: add dummy release function for omapdss

This should fix:
WARNING: at drivers/base/core.c:131 device_release+0x68/0x7c()
Device 'omapdss' does not have a release() function, it is broken and
must be fixed.

Signed-off-by: Tomi Valkeinen

OMAP: OMAPFB: fix clk_get for RFBI

Wed, 16 Dec 2009 11:18:07 +0000

OMAP: OMAPFB: fix clk_get for RFBI

omapfb platform device was still used to get clocks inside rfbi.c

Signed-off-by: Tomi Valkeinen 
Tested-by: Sergey Lapin

OMAP: DSS2: RFBI: convert to new kfifo API

Mon, 4 Jan 2010 13:23:50 +0000

OMAP: DSS2: RFBI: convert to new kfifo API

Signed-off-by: Tomi Valkeinen

GFS2: Use MAX_LFS_FILESIZE for meta inode size

Fri, 8 Jan 2010 13:44:49 +0000

GFS2: Use MAX_LFS_FILESIZE for meta inode size

Using ~0ULL was cauing sign issues in filemap_fdatawrite_range, so
use MAX_LFS_FILESIZE instead.

Signed-off-by: Steven Whitehouse

Input: i8042 - add Dritek quirk for Acer Aspire 5610.

Mon, 11 Jan 2010 07:59:05 +0000

Input: i8042 - add Dritek quirk for Acer Aspire 5610.

Signed-off-by: Elliott Sales de Andrade 
Signed-off-by: Dmitry Torokhov

agp/hp: fail gracefully if we don't find an IOC

Thu, 7 Jan 2010 19:58:56 +0000

agp/hp: fail gracefully if we don't find an IOC

Bail out if we don't find an enclosing IOC.  Previously, if we didn't
find one, we tried to set things up using garbage for the SBA/IOC register
address, which causes a crash.

This crash only happens if firmware supplies a defective ACPI namespace, so
it doesn't fix any problems in the field.

Signed-off-by: Bjorn Helgaas 
Signed-off-by: Dave Airlie

agp/hp: fixup hp agp after ACPI changes

Thu, 7 Jan 2010 19:58:51 +0000

agp/hp: fixup hp agp after ACPI changes

Commit 15b8dd53f5ffa changed the string in info->hardware_id from a static
array to a pointer and added a length field.  But instead of changing
"sizeof(array)" to "length", we changed it to "sizeof(length)" (== 4),
which corrupts the string we're trying to null-terminate.

We no longer even need to null-terminate the string, but we *do* need to
check whether we found a HID.  If there's no HID, we used to have an empty
array, but now we have a null pointer.

The combination of these defects causes this oops:

  Unable to handle kernel NULL pointer dereference (address 0000000000000003)
  modprobe[895]: Oops 8804682956800 [1]
  ip is at zx1_gart_probe+0xd0/0xcc0 [hp_agp]

  http://marc.info/?l=linux-ia64&m=126264484923647&w=2

Signed-off-by: Bjorn Helgaas 
Reported-by: Ãmeric Maschino 
Signed-off-by: Dave Airlie

agp: correct missing cleanup on error in agp_add_bridge

Tue, 17 Nov 2009 22:38:45 +0000

agp: correct missing cleanup on error in agp_add_bridge

While investigating a kmemleak detected leak, I encountered the
agp_add_bridge function.  It appears to be responsible for freeing
the agp_bridge_data in the case of a failure, but it is only doing
so for some errors.

Fix it to always free the bridge data if a failure condition is
encountered.

Signed-off-by: Kevin Winchester 
Signed-off-by: Andrew Morton 
Signed-off-by: Dave Airlie

Merge branch 'for-airlied' of /ssd/git/drm-nouveau-next into drm-linus

Mon, 11 Jan 2010 04:43:16 +0000

Merge branch 'for-airlied' of /ssd/git/drm-nouveau-next into drm-linus

* 'for-airlied' of /ssd/git/drm-nouveau-next: (28 commits)
  drm/nv04: Fix set_operation software method.
  drm/nouveau: initialise DMA tracking parameters earlier
  drm/nouveau: use dma.max rather than pushbuf size for checking GET validity
  drm/nv04: differentiate between nv04/nv05
  drm/nouveau: Fix null deref in nouveau_fence_emit due to deleted fence
  drm/nv50: prevent a possible ctxprog hang
  drm/nouveau: have ttm's fault handler called directly
  drm/nv50: restore correct cache1 get/put address on fifoctx load
  drm/nouveau: create function for "dealing" with gpu lockup
  drm/nouveau: remove unused nouveau_channel_idle() function
  drm/nouveau: fix handling of fbcon colours in 8bpp
  drm/nv04: Context switching fixes.
  drm/nouveau: Use the software object for fencing.
  drm/nouveau: Allocate a per-channel instance of NV_SW.
  drm/nv50: make the blocksize depend on vram size
  drm/nouveau: better alignment of bo sizes and use roundup instead of ALIGN
  drm/nouveau: Don't skip card take down on nv0x.
  drm/nouveau: Implement nv42-nv43 TV load detection.
  drm/nouveau: Clean up the nv17-nv4x load detection code a bit.
  drm/nv50: fix fillrect color
  ...

Merge remote branch 'korg/drm-radeon-next' into drm-linus

Mon, 11 Jan 2010 04:42:58 +0000

Merge remote branch 'korg/drm-radeon-next' into drm-linus

* korg/drm-radeon-next:
  drm/radeon/kms: add additional safe regs for r4xx/rs6xx and r5xx
  drm/radeon/kms: Don't try to enable IRQ if we have no handler installed
  drm: Avoid calling vblank function is vblank wasn't initialized
  drm/radeon: mkregtable.c: close a file before exit
  drm/radeon/kms: Make sure we release AGP device if we acquired it
  drm/radeon/kms: Schedule host path read cache flush through the ring V2
  drm/radeon/kms: Workaround RV410/R420 CP errata (V3)
  drm/radeon/kms: detect sideport memory on IGP chips
  drm/radeon: fix a couple of array index errors
  drm/radeon/kms: add support for eDP (embedded DisplayPort)
  drm: Add eDP connector type
  drm/radeon/kms: pull in the latest upstream ObjectID.h changes
  drm/radeon/kms: whitespace changes to ObjectID.h
  drm/radeon/kms: fix typo in atom connector type handling

drm/nv04: Fix set_operation software method.

Sun, 10 Jan 2010 17:09:14 +0000

drm/nv04: Fix set_operation software method.

Signed-off-by: Ben Skeggs

drm/nouveau: initialise DMA tracking parameters earlier

Fri, 8 Jan 2010 00:57:39 +0000

drm/nouveau: initialise DMA tracking parameters earlier

Signed-off-by: Ben Skeggs

drm/nouveau: use dma.max rather than pushbuf size for checking GET validity

Fri, 8 Jan 2010 00:53:40 +0000

drm/nouveau: use dma.max rather than pushbuf size for checking GET validity

Some upcoming G80 DMA changes will depend on this, but it's split out for
bisectibility just in case it causes some unexpected issues.

Signed-off-by: Ben Skeggs

drm/nv04: differentiate between nv04/nv05

Thu, 7 Jan 2010 03:47:57 +0000

drm/nv04: differentiate between nv04/nv05

Signed-off-by: Ben Skeggs

drm/nouveau: Fix null deref in nouveau_fence_emit due to deleted fence

Wed, 6 Jan 2010 03:02:45 +0000

drm/nouveau: Fix null deref in nouveau_fence_emit due to deleted fence

Currently Nouveau will unvalidate all buffers if it is forced to wait on
one, and then start revalidating from the beginning.  While doing so, it
destroys the operation fence, causing nouveau_fence_emit to crash.

This patch fixes this bug by taking the fence object out of validate_op
and creating it just before emit.  The fence pointer is initialized to 0
and unref'ed unconditionally.

In addition to fixing the bug, this prevents its reintroduction and
simplifies the code.

Signed-off-by: Luca Barbieri 
Signed-off-by: Ben Skeggs

drm/nv50: prevent a possible ctxprog hang

Wed, 6 Jan 2010 02:00:02 +0000

drm/nv50: prevent a possible ctxprog hang

The below is mainly an educated guess at what's going on, docs would
sure be handy...  NVIDIA? :P

It appears it's possible for a ctxprog to run even while a GPU exception
is pending.  The GF8 and up ctxprogs appear to have a small snippet of
code which detects this, and stalls the ctxprog until it's been handled,
which essentially looks like:

	if (r2 & 0x00008000) {
		r0 |= 0x80000000;
		while (r0 & 0x80000000) {}
	}

I don't know of any way that flag would get cleared unless the driver
intervenes (and indeed, in the cases I've seen the hang, nothing steps
in to automagically clear it for us).  This patch causes the driver to
clear the flag during the PGRAPH IRQ handler.

Signed-off-by: Ben Skeggs

drm/nouveau: have ttm's fault handler called directly

Mon, 4 Jan 2010 05:52:20 +0000

drm/nouveau: have ttm's fault handler called directly

There's no good reason for us to have our own anymore, this is left over
from an early port to these TTM interfaces.

Signed-off-by: Ben Skeggs

drm/nv50: restore correct cache1 get/put address on fifoctx load

Mon, 4 Jan 2010 23:41:05 +0000

drm/nv50: restore correct cache1 get/put address on fifoctx load

Signed-off-by: Ben Skeggs

drm/nouveau: create function for "dealing" with gpu lockup

Mon, 4 Jan 2010 18:25:09 +0000

drm/nouveau: create function for "dealing" with gpu lockup

It's mostly a cleanup, but in nv50_fbcon_accel_init gpu lockup
message was printed, but HWACCEL_DISBALED flag was not set.

Signed-off-by: Marcin Slusarz 
Signed-off-by: Ben Skeggs

drm/nouveau: remove unused nouveau_channel_idle() function

Mon, 4 Jan 2010 02:53:01 +0000

drm/nouveau: remove unused nouveau_channel_idle() function

Signed-off-by: Ben Skeggs

drm/nouveau: fix handling of fbcon colours in 8bpp

Sun, 3 Jan 2010 23:10:55 +0000

drm/nouveau: fix handling of fbcon colours in 8bpp

Depending on the visual, the colours handed to us in fillrect() can either be
an actual colour, or an index into the pseudo-palette.

Signed-off-by: Ben Skeggs

drm/nv04: Context switching fixes.

Sat, 26 Dec 2009 13:39:46 +0000

drm/nv04: Context switching fixes.

Signed-off-by: Francisco Jerez

drm/nouveau: Use the software object for fencing.

Sat, 26 Dec 2009 01:09:36 +0000

drm/nouveau: Use the software object for fencing.

This should avoid a race condition on nv0x, if we're doing it with
actual PGRAPH objects and a there's a fence within the FIFO DMA fetch
area when a context switch kicks in.

In that case we get an ILLEGAL_MTHD interrupt as expected, but the
values in PGRAPH_TRAPPED_ADDR aren't calculated correctly and they're
almost useless (e.g. you can see ILLEGAL_MTHDs for the now inactive
channel, with a wrong offset/data pair).

Signed-off-by: Francisco Jerez

drm/nouveau: Allocate a per-channel instance of NV_SW.

Sat, 26 Dec 2009 01:42:45 +0000

drm/nouveau: Allocate a per-channel instance of NV_SW.

It will be useful for various synchronization purposes, mostly stolen
from "[PATCH] drm/nv50: synchronize user channel after buffer object
move on kernel channel" by Maarten Maathuis.

Signed-off-by: Francisco Jerez

drm/nv50: make the blocksize depend on vram size

Sat, 26 Dec 2009 20:46:36 +0000

drm/nv50: make the blocksize depend on vram size

- This should be better than what we have now.
- I'm less sure about the non power of two path.

Signed-off-by: Maarten Maathuis

drm/nouveau: better alignment of bo sizes and use roundup instead of ALIGN

Fri, 25 Dec 2009 17:51:17 +0000

drm/nouveau: better alignment of bo sizes and use roundup instead of ALIGN

- Aligning to block size should ensure that the extra size is enough.
- Using roundup, because not all sizes are powers of two.

Signed-off-by: Maarten Maathuis

drm/nouveau: Don't skip card take down on nv0x.

Tue, 22 Dec 2009 17:24:09 +0000

drm/nouveau: Don't skip card take down on nv0x.

Signed-off-by: Francisco Jerez

drm/nouveau: Implement nv42-nv43 TV load detection.

Thu, 17 Dec 2009 17:57:44 +0000

drm/nouveau: Implement nv42-nv43 TV load detection.

Signed-off-by: Francisco Jerez

drm/nouveau: Clean up the nv17-nv4x load detection code a bit.

Thu, 17 Dec 2009 17:52:44 +0000

drm/nouveau: Clean up the nv17-nv4x load detection code a bit.

Signed-off-by: Francisco Jerez

drm/nv50: fix fillrect color

Mon, 21 Dec 2009 22:00:41 +0000

drm/nv50: fix fillrect color

struct fb_fillrect->color is not a color, but index into pseudo_palette
array

Signed-off-by: Marcin Slusarz 
Signed-off-by: Ben Skeggs

drm/nv50: ignore vbios table's claim to the contrary if EDID says >8bpc

Mon, 21 Dec 2009 02:16:52 +0000

drm/nv50: ignore vbios table's claim to the contrary if EDID says >8bpc

Should fix dim panel issues reported on Dell M6400/M6500.

Signed-off-by: Ben Skeggs

drm/nouveau: Drop redundant placement initialization.

Wed, 16 Dec 2009 18:03:28 +0000

drm/nouveau: Drop redundant placement initialization.

Signed-off-by: Francisco Jerez

drm/nouveau: No need to force evict=true when swapping evicted BOs back in.

Wed, 16 Dec 2009 18:05:38 +0000

drm/nouveau: No need to force evict=true when swapping evicted BOs back in.

Signed-off-by: Francisco Jerez

drm/nouveau: Fix "general protection fault" in the flipd/flips eviction path.

Wed, 16 Dec 2009 18:05:00 +0000

drm/nouveau: Fix "general protection fault" in the flipd/flips eviction path.

Signed-off-by: Francisco Jerez

drm/i2c/ch7006: Drop build time dependency to nouveau.

Wed, 16 Dec 2009 11:27:11 +0000

drm/i2c/ch7006: Drop build time dependency to nouveau.

This partially reverts e4b41066, as this driver is intended to be
useful with any KMS driver for suitable hardware. The missing build
dependency that commit workarounded was DRM_KMS_HELPER.

Signed-off-by: Francisco Jerez

drm/nouveau: Make the MM aware of pre-G80 tiling.

Fri, 11 Dec 2009 15:51:09 +0000

drm/nouveau: Make the MM aware of pre-G80 tiling.

This commit has also the following 3 bugfix commits squashed into it from
the nouveau git tree:

drm/nouveau: Fix up the tiling alignment restrictions for nv1x.
drm/nouveau: Fix up the nv2x tiling alignment restrictions.
drm/nv50: fix align typo for g9x

Signed-off-by: Francisco Jerez

drm/nouveau: Pre-G80 tiling support.

Wed, 16 Dec 2009 11:12:27 +0000

drm/nouveau: Pre-G80 tiling support.

Signed-off-by: Francisco Jerez

drm/nouveau: Add cache_flush/pull fifo engine functions.

Sun, 13 Dec 2009 19:07:42 +0000

drm/nouveau: Add cache_flush/pull fifo engine functions.

Signed-off-by: Francisco Jerez

drm: reduce WARN_ON to a printk.

Mon, 11 Jan 2010 04:20:55 +0000

drm: reduce WARN_ON to a printk.

Lots of ppl keep thinking this is an oops, it was just a warning for
me to see, just make it a printk now.

Signed-off-by: Dave Airlie

drm/kms/fb: check for depth changes from userspace for resizing.

Thu, 7 Jan 2010 23:27:08 +0000

drm/kms/fb: check for depth changes from userspace for resizing.

If userspace (plymouth in this case) asks for a deeper depth,
refuse it as well due to lack of resizing.

This fixes an issue since < 32MB cards went to 8bpp and plymouth
crashes on startup.

Signed-off-by: Dave Airlie

drm: Keep disabled outputs disabled after suspend / resume

Thu, 31 Dec 2009 06:30:46 +0000

drm: Keep disabled outputs disabled after suspend / resume

With the current DRM code, an output that has been powered off
from userspace will automatically power back on when resuming
from suspend. This patch fixes this behaviour.

Tested only with the Intel i915 driver on an Intel GM45 Express
chipset.

Signed-off-by: David John 
Reviewed-by: Jesse Barnes 
Signed-off-by: Dave Airlie

drm/radeon/kms: add additional safe regs for r4xx/rs6xx and r5xx

Fri, 8 Jan 2010 20:58:49 +0000

drm/radeon/kms: add additional safe regs for r4xx/rs6xx and r5xx

- r4xx/rs6xx: add support for extended pixel shader
instruction/temp regs
- r5xx: add SM3 regs

Signed-off-by: Alex Deucher 
Signed-off-by: Dave Airlie

vxge: use pci_dma_mapping_error to test return value

Sun, 10 Jan 2010 21:40:10 +0000

vxge: use pci_dma_mapping_error to test return value

pci_dma_mapping_error should be used to test return value of
pci_map_single or pci_map_page.

Signed-off-by: Denis Kirjanov 
Signed-off-by: David S. Miller

hwmon: Make PCI device ids constant

Sun, 10 Jan 2010 19:52:35 +0000

hwmon: Make PCI device ids constant

The id_table field of the struct pci_driver is constant in 
so it is worth to make pci_device_id also constant.

The semantic match that finds this kind of pattern is as follows:
(http://coccinelle.lip6.fr/)

// 
@r@
identifier I1, I2, x;
@@
	struct I1 {
	  ...
	  const struct I2 *x;
	  ...
	};
@s@
identifier r.I1, y;
identifier r.x, E;
@@
	struct I1 y = {
	  .x = E,
	};
@c@
identifier r.I2;
identifier s.E;
@@
	const struct I2 E[] = ... ;
@depends on !c@
identifier r.I2;
identifier s.E;
@@
+	const
	struct I2 E[] = ...;
// 

Signed-off-by: MÃ¡rton NÃ©meth 
Cc: Julia Lawall 
Signed-off-by: Jean Delvare

hwmon: (coretemp) Fix TjMax for Atom N450/D410/D510 CPUs

Sun, 10 Jan 2010 19:52:34 +0000

hwmon: (coretemp) Fix TjMax for Atom N450/D410/D510 CPUs

The max junction temperature of Atom N450/D410/D510 CPUs is 100 degrees
Celsius. Since these CPUs are always coupled with Intel NM10 chipset in
one package, the best way to verify whether an Atom CPU is N450/D410/D510
is to check the host bridge device.

Signed-off-by: Yong Wang 
Acked-by: Huaxu Wan 
Signed-off-by: Jean Delvare

hwmon: (k10temp) Blacklist more family 10h processors

Sun, 10 Jan 2010 19:52:34 +0000

hwmon: (k10temp) Blacklist more family 10h processors

The latest version of the Revision Guide for AMD Family 10h Processors
lists two more processor revisions which may be affected by erratum 319.
Change the blacklisting code to correctly detect those processors, by
implementing AMD's recommended algorithm.

Signed-off-by: Clemens Ladisch 
Signed-off-by: Jean Delvare 
Cc: Andreas Herrmann

hwmon: (asus_atk0110) Add debugfs interface

Sun, 10 Jan 2010 19:52:33 +0000

hwmon: (asus_atk0110) Add debugfs interface

Expose the raw GGRP/GITM interface via debugfs. The hwmon interface is
reverse engineered and the driver tends to break on newer boards...
Using this interface it's possible to poke directly at the ACPI methods
without the need to recompile, reducing the guesswork and the round trips
needed to support a new revision of the interface.

Signed-off-by: Luca Tettamanti 
Signed-off-by: Jean Delvare

hwmon: (asus_atk0110) Refactor interface probe code

Sun, 10 Jan 2010 19:52:33 +0000

hwmon: (asus_atk0110) Refactor interface probe code

The behaviour is unmodified, this makes easier to override the heuristic (which
is probably needed for some boards).

Signed-off-by: Luca Tettamanti 
Signed-off-by: Jean Delvare

hwmon: (adt7462) Fix pin 28 monitoring

Sun, 10 Jan 2010 19:52:32 +0000

hwmon: (adt7462) Fix pin 28 monitoring

The ADT7462_PIN28_VOLT value is a 4-bit field, so the corresponding
shift must be 4.

Signed-off-by: Roger Blofeld 
Signed-off-by: Jean Delvare

xfs: Ensure we force all busy extents in range to disk

Sat, 2 Jan 2010 02:38:56 +0000

xfs: Ensure we force all busy extents in range to disk

When we search for and find a busy extent during allocation we
force the log out to ensure the extent free transaction is on
disk before the allocation transaction. The current implementation
has a subtle bug in it--it does not handle multiple overlapping
ranges.

That is, if we free lots of little extents into a single
contiguous extent, then allocate the contiguous extent, the busy
search code stops searching at the first extent it finds that
overlaps the allocated range. It then uses the commit LSN of the
transaction to force the log out to.

Unfortunately, the other busy ranges might have more recent
commit LSNs than the first busy extent that is found, and this
results in xfs_alloc_search_busy() returning before all the
extent free transactions are on disk for the range being
allocated. This can lead to potential metadata corruption or
stale data exposure after a crash because log replay won't replay
all the extent free transactions that cover the allocation range.

Modified-by: Alex Elder 

(Dropped the "found" argument from the xfs_alloc_busysearch trace
event.)

Signed-off-by: Dave Chinner 
Reviewed-by: Christoph Hellwig 
Signed-off-by: Alex Elder

xfs: Don't flush stale inodes

Sat, 2 Jan 2010 02:39:40 +0000

xfs: Don't flush stale inodes

Because inodes remain in cache much longer than inode buffers do
under memory pressure, we can get the situation where we have
stale, dirty inodes being reclaimed but the backing storage has
been freed.  Hence we should never, ever flush XFS_ISTALE inodes
to disk as there is no guarantee that the backing buffer is in
cache and still marked stale when the flush occurs.

Signed-off-by: Dave Chinner 
Signed-off-by: Alex Elder

xfs: fix timestamp handling in xfs_setattr

Wed, 23 Dec 2009 16:09:13 +0000

xfs: fix timestamp handling in xfs_setattr

We currently have some rather odd code in xfs_setattr for
updating the a/c/mtime timestamps:

 - first we do a non-transaction update if all three are updated
   together
 - second we implicitly update the ctime for various changes
   instead of relying on the ATTR_CTIME flag
 - third we set the timestamps to the current time instead of the
   arguments in the iattr structure in many cases.

This patch makes sure we update it in a consistent way:

 - always transactional
 - ctime is only updated if ATTR_CTIME is set or we do a size
   update, which is a special case
 - always to the times passed in from the caller instead of the
   current time

The only non-size caller of xfs_setattr that doesn't come from
the VFS is updated to set ATTR_CTIME and pass in a valid ctime
value.

Reported-by: Eric Blake 
Signed-off-by: Christoph Hellwig 
Signed-off-by: Alex Elder

xfs: use DECLARE_EVENT_CLASS

Mon, 21 Dec 2009 14:03:03 +0000

xfs: use DECLARE_EVENT_CLASS

Using DECLARE_EVENT_CLASS allows us to to use trace event code
instead of duplicating it in the binary.  This was not available
before 2.6.33 so it had to be done as a separate step once the
prerequisite was merged.

This only requires changes to xfs_trace.h and the results are
rather impressive:

hch@brick:~/work/linux-2.6/obj-kvm$ size fs/xfs/xfs.o*
text	   data	    bss	    dec	    hex	filename
 607732	  41884	   3616	 653232	  9f7b0	fs/xfs/xfs.o
1026732	  41884	   3808	1072424	 105d28	fs/xfs/xfs.o.old

Signed-off-by: Christoph Hellwig 
Signed-off-by: Alex Elder

ALSA: ac97: add AC97 STMicroelectronics' codecs

Sun, 10 Jan 2010 16:21:14 +0000

ALSA: ac97: add AC97 STMicroelectronics' codecs

Add the STMicroelectronics ST7597 codec and an unknown codec
from the same manufacturer found on the Creative SB 128 card (CT4810).

Signed-off-by: Krzysztof Helt 
Signed-off-by: Jaroslav Kysela

ALSA: ac97: Add Dell Dimension 2400 to Headphone/Line Jack Sense blacklist

Sat, 9 Jan 2010 06:22:29 +0000

ALSA: ac97: Add Dell Dimension 2400 to Headphone/Line Jack Sense blacklist

This model needs both 'Headphone Jack Sense' and 'Line Jack Sense' muted
for audible playback, so just add it to the ad1981 jack sense blacklist.

Cc: stable@kernel.org
Tested-by: Pete 
Signed-off-by: Daniel T Chen 
Signed-off-by: Jaroslav Kysela

ARM: 5872/1: ARM: include needed linux/cpu.h in asm/cpu.h

Sun, 10 Jan 2010 08:21:53 +0000

ARM: 5872/1: ARM: include needed linux/cpu.h in asm/cpu.h

The file arch/arm/include/asm/cpu.h needs to include 'linux/cpu.h' to
meet its dependency. Otherwise when using "struct cpuinfo_arm" and
including just 'asm/cpu.h' throws below error -
	arch/arm/include/asm/cpu.h:16: error: field 'cpu' has incomplete type

To fix this  otherway, one can also include both linux/cpu.h and
asm/cpu.h but it shoudn't be that way.  So this patch fixes this by
including the linux/cpu.h in asm/cpu.h, so that including alone
asm/cpu.h is enough.

Signed-off-by: Santosh Shilimkar 
Signed-off-by: Russell King

Input: xbox - do not use GFP_KERNEL under spinlock

Sat, 9 Jan 2010 08:13:36 +0000

Input: xbox - do not use GFP_KERNEL under spinlock

xbox_play_effect() is called while holding dev->event_lock with
interrupts disabled and thus may not use GFP_KERNEL when submitting
urbs.

Signed-off-by: Dmitry Torokhov

ARM: 5871/1: arch/arm: Fix build failure for lpd7a404_defconfig caused by missing ...

Sat, 9 Jan 2010 12:46:57 +0000

ARM: 5871/1: arch/arm: Fix build failure for lpd7a404_defconfig caused by missing includes

This patch fixes a build failure [1] due to missing includes
This should make the arm tree build again with lpd7a404_defconfig

References:
http://kisskb.ellerman.id.au/kisskb/buildresult/1983329/

Signed-off-by: Peter Huewe 
Signed-off-by: Russell King

ARM: 5870/1: arch/arm: Fix build failure for defconfigs without CONFIG_ISA_DMA_API set

Sat, 9 Jan 2010 12:46:08 +0000

ARM: 5870/1: arch/arm: Fix build failure for defconfigs without CONFIG_ISA_DMA_API set

A lot of ARM-defconfigs (those without CONFIG_ISA_DMA_API set) fail to
build [1][2][3] due to the changes of the patch
    [PATCH] PCI: Clean up build for CONFIG_PCI_QUIRKS unset
    by Rafael J. Wysocki (Sat, 2 Jan 2010 22:57:24 +0100) [4]
as the referenced variable 'isa_dma_bridge_buggy' in asm/dma.h is
enclosed by the CONFIG_ISA_DMA_API conditional all configs without this
setting fail to build.

I'm not sure wether moving the condition is the right way to solve the
issue, but atleast it fixes the issue :)

References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/1983354/
[2] http://kisskb.ellerman.id.au/kisskb/buildresult/1983333/
[3] http://kisskb.ellerman.id.au/kisskb/buildresult/1983337/
[4] http://lkml.org/lkml/2010/1/2/102

Signed-off-by: Peter Huewe 
Signed-off-by: Russell King

DRM / i915: Fix resume regression on MSI Wind U100 w/o KMS

Fri, 8 Jan 2010 23:45:33 +0000

DRM / i915: Fix resume regression on MSI Wind U100 w/o KMS

Commit cbda12d77ea590082edb6d30bd342a67ebc459e0 (drm/i915: implement
new pm ops for i915), among other things, removed the .suspend and
.resume pointers from the struct drm_driver object in i915_drv.c,
which broke resume without KMS on my MSI Wind U100.

Fix this by reverting that part of commit cbda12d77ea59.

[ The DRM layer will not use the class-specific suspend/resume functions
  if the driver is marked MODESET-aware, and conversely it will not
  register the PCI device if the drievr isn't so marked, so you always
  end up with _either_ the drm-class suspend/resume _or_ the PCI layer
  PM functionality, never both.  - Linus ]

Signed-off-by: Rafael J. Wysocki 
Acked-by: Jesse Barnes 
Signed-off-by: Linus Torvalds

Merge branch 'for_2.6.33rc_c' of git://git.pwsan.com/linux-2.6 into omap-fixes-for ...

Fri, 8 Jan 2010 22:27:56 +0000

Merge branch 'for_2.6.33rc_c' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus

OMAP2 clock: dynamically allocate CPUFreq frequency table

Fri, 8 Jan 2010 22:23:17 +0000

OMAP2 clock: dynamically allocate CPUFreq frequency table

Dynamically allocate the CPUFreq frequency table on OMAP2xxx chips.
This fixes some compilation problems, since the kernel may not know
what chip it is running on until boot-time.  This also reduces the size
of the CPUFreq frequency table.

Problem originally reported by Felipe Balbi .
Thanks also for comments on the patch from Felipe and Kevin.

Signed-off-by: Paul Walmsley 
Cc: Felipe Balbi 
Cc: Kevin Hilman

OMAP clock/CPUFreq: add clk_exit_cpufreq_table()

Fri, 8 Jan 2010 22:23:16 +0000

OMAP clock/CPUFreq: add clk_exit_cpufreq_table()

A subsequent patch adds code on OMAP2xxx to dynamically allocate the
CPUFreq frequency table in clk_init_cpufreq_table(), so for it to
avoid a leak, it will need a corresponding function to free the
memory.  This patch adds clk_exit_cpufreq_table() with generic
code to call a chip-specific variant inside the clockfw_lock spinlock via
struct clk_functions.

Signed-off-by: Paul Walmsley

OMAP2xxx OPP: clean up comments in OPP data

Fri, 8 Jan 2010 22:23:15 +0000

OMAP2xxx OPP: clean up comments in OPP data

Revise some of the comments in the OMAP2xxx OPP data for clarity.

Signed-off-by: Paul Walmsley 
Cc: Richard Woodruff

OMAP2xxx clock: clk2xxx.c doesn't compile if CPUFREQ is enabled

Fri, 8 Jan 2010 22:23:15 +0000

OMAP2xxx clock: clk2xxx.c doesn't compile if CPUFREQ is enabled

if we enable CPUFREQ we can't build omap2 for two reasons,
one of them is fixed by the patch below.

It's failing because the __must_be_array() check in
ARRAY_SIZE() is failing and printing the following message:

arch/arm/mach-omap2/clock2xxx.c:453: error: negative width in bit-field ''

Signed-off-by: Felipe Balbi 
[paul@pwsan.com: commit message updated; changed rate variable name]
Signed-off-by: Paul Walmsley

OMAP1 clock: remove __initdata from struct clk_functions to prevent crash

Fri, 8 Jan 2010 22:23:14 +0000

OMAP1 clock: remove __initdata from struct clk_functions to prevent crash

Commit 52650505fbf3a6ab851c801f54e73e76c55ab8da added an __initdata
decoration to the structure containing the clk_enable and clk_disable
functions.  Once init data was freed, these pointers went to null, and
the next enable or disable call caused the kernel to crash.  This
change removes this decoration.

Signed-off-by: Cory Maccarrone 
[paul@pwsan.com: patch manually split and commit message edited]
Signed-off-by: Paul Walmsley

OMAP1 clock: Add missing clocks for OMAP 7xx

Fri, 8 Jan 2010 22:23:10 +0000

OMAP1 clock: Add missing clocks for OMAP 7xx

This change adds in some missing clocks that were needed as a result
of 526505... (OMAP1 clock: convert mach-omap1/clock.h to
mach-omap1/clock_data.c).  Prior to this, it was just assumed that
these clocks existed for all devices, and it was used directly instead
of calling it out with a clock_get call or similar.  So, not having
the CK_7XX meant these clocks weren't being used anymore for omap 7xx
devices, which broke things badly.

Signed-off-by: Cory Maccarrone 
[paul@pwsan.com: commit message edited]
Signed-off-by: Paul Walmsley

OMAP clock: remove incorrect EXPORT_SYMBOL()s

Fri, 8 Jan 2010 22:23:09 +0000

OMAP clock: remove incorrect EXPORT_SYMBOL()s

The only symbols that should be exported are symbols that are to be
called from loadable kernel modules, e.g., device drivers.  In the
context of plat-omap/clock.c, these should only be the Linux clock
interface symbols as defined by include/linux/clk.h.  Core code
doesn't need these symbols to be exported.  Also, clean up an old
comment while here.

Signed-off-by: Paul Walmsley

OMAP3 clock: Add capability to change rate of dpll4_m5_ck

Fri, 8 Jan 2010 22:23:08 +0000

OMAP3 clock: Add capability to change rate of dpll4_m5_ck

Add necessary definitions to clock framework to allow changing
dpll4_m5_ck rate.  This is used by the camera code.

Signed-off-by: Jouni HÃ¶gander 
Signed-off-by: Tuukka Toivonen 
Signed-off-by: Paul Walmsley

OMAP3 clock: McBSP 2, 3, 4 functional clock parent is PER_96M_FCLK, not CORE_96M ...

Fri, 8 Jan 2010 22:23:07 +0000

OMAP3 clock: McBSP 2, 3, 4 functional clock parent is PER_96M_FCLK, not CORE_96M_FCLK

The correct parent of the McBSP 2, 3, and 4 functional clocks is
PER_96M_FCLK, not CORE_96M_FCLK.  Fix this in the OMAP clock tree.
Reported by Nicole Chalhoub .

Signed-off-by: Paul Walmsley 
Cc: Nicole Chalhoub

OMAP3: clock: add clockdomains for UART1 & 2

Fri, 8 Jan 2010 22:23:06 +0000

OMAP3: clock: add clockdomains for UART1 & 2

UART1 & 2 were missing clockdomains resulting in broken omap_hwmod
init for these devices.

Signed-off-by: Kevin Hilman 
Signed-off-by: Paul Walmsley

OMAP2420 IO mapping: move IVA mapping virtual address out of vmalloc space

Fri, 8 Jan 2010 22:23:06 +0000

OMAP2420 IO mapping: move IVA mapping virtual address out of vmalloc space

Commit 10db25fea4c11661070b97832b8cc3d2af495092 causes the following
kernel messages during N800 boot (and presumably all other 2420
boards):

[    0.000000] BUG: mapping for 0x58000000 at 0xe0000000 overlaps vmalloc space
[    0.000000] BUG: mapping for 0x59000000 at 0xe1000000 overlaps vmalloc space
[    0.000000] BUG: mapping for 0x5a000000 at 0xe2000000 overlaps vmalloc space

Fix by remapping the IVA memory areas somewhere outside vmalloc space.

Signed-off-by: Paul Walmsley 
Cc: Santosh Shilimkar 
Cc: Tony Lindgren

OMAP2xxx IO mapping: mark DSP mappings as being 2420-only

Fri, 8 Jan 2010 22:23:05 +0000

OMAP2xxx IO mapping: mark DSP mappings as being 2420-only

Out of the three major OMAP2 chip types, OMAP2420, OMAP2430, and OMAP3430,
we only map the IVA on OMAP2420.  The memory mapping is not shared between
OMAP2420 and OMAP2430, so it is inappropriate to label those macros as
'24XX'; this patch changes them to '2420'.

Signed-off-by: Paul Walmsley

ARM: OMAP3: PM: Fix the Invalid CM_CLKSTCTRL reg access.

Fri, 8 Jan 2010 22:23:04 +0000

ARM: OMAP3: PM: Fix the Invalid CM_CLKSTCTRL reg access.

In OMAP2/3 some of the clock-domains which did not have control
facility were being falsely written to and read using the CM_CLKSTCTRL
register though it did not exist for them. One check is added to remove
this flaw.

Signed-off-by: Abhijit Pagare 
Signed-off-by: Paul Walmsley 
Cc: Benoit Cousson 
Cc: Rajendra Nayak

OMAP2: remove duplicated #include

Fri, 8 Jan 2010 22:23:03 +0000

OMAP2: remove duplicated #include

Remove duplicated #include('s) in
  arch/arm/mach-omap2/clock34xx.c
  arch/arm/mach-omap2/io.c

Signed-off-by: Huang Weiyi 
Signed-off-by: Paul Walmsley

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland ...

Fri, 8 Jan 2010 22:05:28 +0000

Merge branch 'for-linus' of git://git./linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/addr: Correct CONFIG_IPv6 to CONFIG_IPV6
  mlx4_core: Fix cleanup in __mlx4_init_one() error path
  IB/mlx4: Fix queue overflow check in post_recv
  IB/mlx4: Initialize SRQ scatter entries when creating an SRQ

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel ...

Fri, 8 Jan 2010 22:04:20 +0000

Merge branch 'for_linus' of git://git./linux/kernel/git/jwessel/linux-2.6-kgdb

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
  kgdb: Fix kernel-doc format error in kgdb.h
  blackfin,kgdb: Do not put PC in gdb_regs into retx.
  blackfin,kgdb,probe_kernel: Cleanup probe_kernel_read/write
  maccess,probe_kernel: Allow arch specific override probe_kernel_(read|write)

Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git ...

Fri, 8 Jan 2010 22:03:55 +0000

Merge branch 'reiserfs/kill-bkl' of git://git./linux/kernel/git/frederic/random-tracing

* 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
  reiserfs: Relax reiserfs_xattr_set_handle() while acquiring xattr locks
  reiserfs: Fix unreachable statement
  reiserfs: Don't call reiserfs_get_acl() with the reiserfs lock
  reiserfs: Relax lock on xattr removing
  reiserfs: Relax the lock before truncating pages
  reiserfs: Fix recursive lock on lchown
  reiserfs: Fix mistake in down_write() conversion

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

Fri, 8 Jan 2010 21:57:32 +0000

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: kill some warnings on i386 builds

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

Fri, 8 Jan 2010 21:57:19 +0000

Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] move fnptr definition inside #ifdef __KERNEL__

Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux

Fri, 8 Jan 2010 21:56:31 +0000

Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux

* 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux:
  ARM: S3C64XX: Fix possible clock look in EPLL and MPLL clock chains

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git ...

Fri, 8 Jan 2010 21:55:52 +0000

Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/x86/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
  x86, irq: Check move_in_progress before freeing the vector mapping
  x86: copy_from_user() should not return -EFAULT
  Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium"
  x86/pci: Intel ioh bus num reg accessing fix
  x86: Fix size for ex trampoline with 32bit

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes ...

Fri, 8 Jan 2010 21:55:39 +0000

Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCIe AER: prevent AER injection if hardware masks error reporting
  PCI/PM: Use per-device D3 delays
  PCI: Check the node argument passed to cpumask_of_node
  PCI: AER: fix aer inject result in kernel oops
  PCI: pcie portdrv: style cleanup

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

Fri, 8 Jan 2010 21:55:14 +0000

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  nfs: fix oops in nfs_rename()
  sunrpc: fix build-time warning
  sunrpc: on successful gss error pipe write, don't return error
  SUNRPC: Fix the return value in gss_import_sec_context()
  SUNRPC: Fix up an error return value in gss_import_sec_context_kerberos()

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

Fri, 8 Jan 2010 21:15:47 +0000

Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-2.6

iwlwifi: disable tx on beacon update notification

Fri, 8 Jan 2010 18:04:31 +0000

iwlwifi: disable tx on beacon update notification

On beacon change update notification from mac we are not disabling
the tx in adhoc mode. Mac sends BSS_CHANGED_BEACON_ENABLED when
station leaves IBSS. Driver should indicate uCode to not to send
anything on receiving this notification.

Functionality to indicate uCode is duplicated across
two notifications so created a common function called iwl_set_no_assoc.

Fix the issue at
http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2133.

Signed-off-by: Abhijeet Kolekar 
Tested-by: Johannes Berg 
Signed-off-by: Reinette Chatre 
Signed-off-by: John W. Linville

iwlwifi: fix iwl_queue_used bug when read_ptr == write_ptr

Fri, 8 Jan 2010 18:04:30 +0000

iwlwifi: fix iwl_queue_used bug when read_ptr == write_ptr

When txq read_ptr equals to write_ptr, iwl_queue_used should
always return false. Because there is no used TFD in this case.

This is a complementary fix to the fix already included in commit "iwl3945:
fix panic in iwl3945 driver". Both fixes are needed to address the panic
below.

This problem was discussed on linux-wireless in
http://thread.gmane.org/gmane.linux.kernel.wireless.general/43568

<1>[ 7290.414172] IP: [] iwl3945_rx_reply_tx+0xc1/0x450 [iwl3945]
<4>[ 7290.414205] PGD 0
<1>[ 7290.414214] Thread overran stack, or stack corrupted
<0>[ 7290.414229] Oops: 0002 [#1] PREEMPT SMP
<0>[ 7290.414246] last sysfs file: /sys/devices/platform/coretemp.1/temp1_input
<4>[ 7290.414265] CPU 0
<4>[ 7290.414274] Modules linked in: af_packet nfsd usb_storage usb_libusual cpufreq_powersave exportfs cpufreq_conservative iwl3945 nfs cpufreq_userspace snd_hda_codec_realtek acpi_cpufreq uvcvideo lockd iwlcore snd_hda_intel joydev coretemp nfs_acl videodev snd_hda_codec mac80211 v4l1_compat snd_hwdep sbp2 v4l2_compat_ioctl32 uhci_hcd psmouse auth_rpcgss ohci1394 cfg80211 ehci_hcd video ieee1394 snd_pcm serio_raw battery ac nvidia(P) usbcore output sunrpc evdev lirc_ene0100 snd_page_alloc rfkill tg3 libphy fuse lzo lzo_decompress lzo_compress
<6>[ 7290.414486] Pid: 0, comm: swapper Tainted: P           2.6.32-rc8-wl #213 Aspire 5720
<6>[ 7290.414507] RIP: 0010:[]  [] iwl3945_rx_reply_tx+0xc1/0x450 [iwl3945]
<6>[ 7290.414541] RSP: 0018:ffff880002203d60  EFLAGS: 00010246
<6>[ 7290.414557] RAX: 000000000000004f RBX: ffff880064c11600 RCX: 0000000000000013
<6>[ 7290.414576] RDX: ffffffffa0ddcf20 RSI: ffff8800512b7008 RDI: 0000000000000038
<6>[ 7290.414596] RBP: ffff880002203dd0 R08: 0000000000000000 R09: 0000000000000100
<6>[ 7290.414616] R10: 0000000000000001 R11: 0000000000000000 R12: 00000000000000a0
<6>[ 7290.414635] R13: 0000000000000002 R14: 0000000000000013 R15: 0000000000020201
<6>[ 7290.414655] FS:  0000000000000000(0000) GS:ffff880002200000(0000) knlGS:0000000000000000
<6>[ 7290.414677] CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
<6>[ 7290.414693] CR2: 0000000000000041 CR3: 0000000001001000 CR4: 00000000000006f0
<6>[ 7290.414712] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
<6>[ 7290.414732] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
<4>[ 7290.414752] Process swapper (pid: 0, threadinfo ffffffff81524000, task ffffffff81528b60)
<0>[ 7290.414772] Stack:
<4>[ 7290.414780]  ffff880002203da0 0000000000000046 0000000000000000 0000000000000046
<4>[ 7290.414804] <0> 0000000000000282 0000000000000282 0000000000000282 ffff880064c12010
<4>[ 7290.414830] <0> ffff880002203db0 ffff880064c11600 ffff880064c12e50 ffff8800512b7000
<0>[ 7290.414858] Call Trace:
<0>[ 7290.414867]  
<4>[ 7290.414884]  [] iwl3945_irq_tasklet+0x657/0x1740 [iwl3945]
<4>[ 7290.414910]  [] ? _spin_unlock+0x30/0x60
<4>[ 7290.414931]  [] tasklet_action+0x101/0x110
<4>[ 7290.414950]  [] __do_softirq+0xc0/0x160
<4>[ 7290.414968]  [] call_softirq+0x1c/0x30
<4>[ 7290.414986]  [] do_softirq+0x75/0xb0
<4>[ 7290.415003]  [] irq_exit+0x95/0xa0
<4>[ 7290.415020]  [] do_IRQ+0x77/0xf0
<4>[ 7290.415038]  [] ret_from_intr+0x0/0xf
<0>[ 7290.415052]  
<4>[ 7290.415067]  [] ? acpi_idle_enter_bm+0x270/0x2a5
<4>[ 7290.415087]  [] ? acpi_idle_enter_bm+0x27a/0x2a5
<4>[ 7290.415107]  [] ? acpi_idle_enter_bm+0x270/0x2a5
<4>[ 7290.415130]  [] ? cpuidle_idle_call+0x93/0xf0
<4>[ 7290.415149]  [] ? cpu_idle+0xa7/0x110
<4>[ 7290.415168]  [] ? rest_init+0x75/0x80
<4>[ 7290.415187]  [] ? start_kernel+0x3a7/0x3b3
<4>[ 7290.415206]  [] ? x86_64_start_reservations+0x125/0x129
<4>[ 7290.415227]  [] ? x86_64_start_kernel+0xe4/0xeb
<0>[ 7290.415243] Code: 00 41 39 ce 0f 8d e8 01 00 00 48 8b 47 40 48 63 d2 48 69 d2 98 00 00 00 4c 8b 04 02 48 c7 c2 20 cf dd a0 49 8d 78 38 49 8d 40 4f  47 09 00 c6 47 0c 00 c6 47 0f 00 c6 47 12 00 c6 47 15 00 49
<1>[ 7290.415382] RIP  [] iwl3945_rx_reply_tx+0xc1/0x450 [iwl3945]
<4>[ 7290.415410]  RSP 
<0>[ 7290.415421] CR2: 0000000000000041
<4>[ 7290.415436] ---[ end trace ec46807277caa515 ]---
<0>[ 7290.415450] Kernel panic - not syncing: Fatal exception in interrupt
<4>[ 7290.415468] Pid: 0, comm: swapper Tainted: P      D    2.6.32-rc8-wl #213
<4>[ 7290.415486] Call Trace:
<4>[ 7290.415495]    [] panic+0x7d/0x13a
<4>[ 7290.415519]  [] oops_end+0xda/0xe0
<4>[ 7290.415538]  [] no_context+0xea/0x250
<4>[ 7290.415557]  [] ? select_task_rq_fair+0x511/0x780
<4>[ 7290.415578]  [] __bad_area_nosemaphore+0x125/0x1e0
<4>[ 7290.415597]  [] ? __enqueue_entity+0x7c/0x80
<4>[ 7290.415616]  [] ? enqueue_task_fair+0x111/0x150
<4>[ 7290.415636]  [] bad_area_nosemaphore+0xe/0x10
<4>[ 7290.415656]  [] do_page_fault+0x26a/0x320
<4>[ 7290.415674]  [] page_fault+0x1f/0x30
<4>[ 7290.415697]  [] ? iwl3945_rx_reply_tx+0xc1/0x450 [iwl3945]
<4>[ 7290.415723]  [] iwl3945_irq_tasklet+0x657/0x1740 [iwl3945]
<4>[ 7290.415746]  [] ? _spin_unlock+0x30/0x60
<4>[ 7290.415764]  [] tasklet_action+0x101/0x110
<4>[ 7290.415783]  [] __do_softirq+0xc0/0x160
<4>[ 7290.415801]  [] call_softirq+0x1c/0x30
<4>[ 7290.415818]  [] do_softirq+0x75/0xb0
<4>[ 7290.415835]  [] irq_exit+0x95/0xa0
<4>[ 7290.415852]  [] do_IRQ+0x77/0xf0
<4>[ 7290.415869]  [] ret_from_intr+0x0/0xf
<4>[ 7290.415883]    [] ? acpi_idle_enter_bm+0x270/0x2a5
<4>[ 7290.415911]  [] ? acpi_idle_enter_bm+0x27a/0x2a5
<4>[ 7290.415931]  [] ? acpi_idle_enter_bm+0x270/0x2a5
<4>[ 7290.415952]  [] ? cpuidle_idle_call+0x93/0xf0
<4>[ 7290.415971]  [] ? cpu_idle+0xa7/0x110
<4>[ 7290.415989]  [] ? rest_init+0x75/0x80
<4>[ 7290.416007]  [] ? start_kernel+0x3a7/0x3b3
<4>[ 7290.416026]  [] ? x86_64_start_reservations+0x125/0x129
<4>[ 7290.416047]  [] ? x86_64_start_kernel+0xe4/0xeb

Reported-by: Maxim Levitsky 
Tested-by: Maxim Levitsky 
Signed-off-by: Zhu Yi 
Signed-off-by: Reinette Chatre 
CC: stable@kernel.org
Signed-off-by: John W. Linville

mac80211: fix endian error

Fri, 8 Jan 2010 18:00:00 +0000

mac80211: fix endian error

I forgot to convert the radiotap length to
CPU endian, which sparse found thankfully.

Signed-off-by: Johannes Berg 
Cc: stable@kernel.org
Signed-off-by: John W. Linville

mac80211: add missing sanity checks for action frames

Thu, 7 Jan 2010 19:23:53 +0000

mac80211: add missing sanity checks for action frames

Various missing sanity checks caused rejected action frames to be
interpreted as channel switch announcements, which can cause a client
mode interface to switch away from its operating channel, thereby losing
connectivity. This patch ensures that only spectrum management action
frames are processed by the CSA handling function and prevents rejected
action frames from getting processed by the MLME code.

Signed-off-by: Felix Fietkau 
Cc: stable@kernel.org
Signed-off-by: John W. Linville

mac80211: fix queue selection for packets injected via monitor interface

Thu, 7 Jan 2010 14:01:42 +0000

mac80211: fix queue selection for packets injected via monitor interface

Commit 'mac80211: fix skb buffering issue' added an ->ndo_select_queue()
for monitor interfaces which can end up dereferencing ieee802_1d_to_ac[]
beyond the end of the array for injected data packets (as skb->priority
isn't guaranteed to be zero or within [0:7]), which then triggers the
WARN_ON in net/core/dev.c:dev_cap_txqueue().  Fix this by always setting
the priority to zero on injected data frames.

Signed-off-by: Lennert Buytenhek 
Cc: stable@kernel.org
Signed-off-by: John W. Linville

xfs: kill some warnings on i386 builds

Thu, 17 Dec 2009 00:20:07 +0000

xfs: kill some warnings on i386 builds

Randy Dunlap Reported printk() format-related warnings reported
on i386 builds in his environment.  Dave Chinner provided this
patch to eliminate them.

Signed-off by: Dave Chinner 
Acked-by: Randy Dunlap 

Signed-off-by: Alex Elder

[IA64] move fnptr definition inside #ifdef KERNEL

Fri, 8 Jan 2010 18:53:28 +0000

[IA64] move fnptr definition inside #ifdef __KERNEL__

Linus pointed out that this definition should not be
exported to user space.

Signed-off-by: Tony Luck

omap3: EVM: Choose OMAP_PACKAGE_CBB

Fri, 8 Jan 2010 18:29:08 +0000

omap3: EVM: Choose OMAP_PACKAGE_CBB

Without this the kernel doesn't boot, it craches in
omap_mux_package_fixup(), since the package_subset becomes NULL.

Signed-off-by: Vaibhav Hiremath 
Signed-off-by: Tony Lindgren

omap3: Fix booting if package is uninitialized

Fri, 8 Jan 2010 18:29:08 +0000

omap3: Fix booting if package is uninitialized

Otherwise bringing up new boards can be harder:

Unable to handle kernel NULL pointer dereference at virtual address 00000000
pgd = c0004000
[00000000] *pgd=00000000
Internal error: Oops: 5 [#1]
last sysfs file:
Modules linked in:
CPU: 0    Not tainted  (2.6.33-rc2-00015-g0bc9c93-dirty #37)
PC is at omap_mux_init+0xa4/0x3d8
LR is at omap_mux_init+0x3c/0x3d8
...

Signed-off-by: Tony Lindgren

omap3: add missing parentheses

Fri, 8 Jan 2010 18:29:07 +0000

omap3: add missing parentheses

`!' has a higher precedence than `&' so parentheses are required.

Signed-off-by: Roel Kluin 
Signed-off-by: Tony Lindgren

omap3: add missing parentheses

Fri, 8 Jan 2010 18:29:07 +0000

omap3: add missing parentheses

not(!) has a higher precedence than bit and(&).

Signed-off-by: Roel Kluin 
Signed-off-by: Tony Lindgren

omap2/3: ZOOM: Correcting key mapping for few keys

Fri, 8 Jan 2010 18:29:07 +0000

omap2/3: ZOOM: Correcting key mapping for few keys

Keys: 'right arrow', 'up arrow' and 'select' were mapped
wrongly. This patch corrects them.
This patch also adds one missing key present in the board,
currently I added it as 'unknown' key, as I am not able to
find proper description for this key.
One key entry (r: 7, c: 5) is present in the keymap, which
is really not present in the board, removing it.

Signed-off-by: Vimal Singh 
Signed-off-by: Tony Lindgren

omap2/3: make serial_in_override() address the right uart port

Fri, 8 Jan 2010 18:29:06 +0000

omap2/3: make serial_in_override() address the right uart port

Commit f62349ee9788b1d94c55eb6c291d74a1f69bdd9e makes it possible to
have some other than first uart port as ttyS0, which breaks the workaround
serial_in_override() function which will try to address the first uart
port (for ttyS0) and not the one that was initialized.

Signed-off-by: Alexander Shishkin 
CC: Mika Westerberg 
Acked-by: Kevin Hilman 
Signed-off-by: Tony Lindgren

omap1: Fix compile for omap1_bl.c

Fri, 8 Jan 2010 18:29:06 +0000

omap1: Fix compile for omap1_bl.c

Commit 9905a43b made struct backlight_ops const. Omap was
setting check_fb dynamically, which caused the following
compile error:

drivers/video/backlight/omap1_bl.c: In function 'omapbl_probe':
drivers/video/backlight/omap1_bl.c:142: error: assignment of read-only variable 'omapbl_ops'

Turns out pdata->check_fb is not being used, so just remove
it to fix the compile.

Cc: Emese Revfy 
Cc: Richard Purdie 
Signed-off-by: Tony Lindgren

omap1: Add 7xx clocks and pin muxes for SPI

Fri, 8 Jan 2010 18:29:05 +0000

omap1: Add 7xx clocks and pin muxes for SPI

Commit 35c9049b27040d09461bc90928ad770be7ddf661 added
drivers/spi/omap_spi_100k.c.

This patch add the related clocks and pin muxing
entries to make the driver work on omap7xx platforms.

Signed-off-by: Cory Maccarrone 
Signed-off-by: Tony Lindgren

omap: Remove uninitialized warning for gpio.c

Fri, 8 Jan 2010 18:29:05 +0000

omap: Remove uninitialized warning for gpio.c

Flags is not used on 15xx.

Signed-off-by: Tony Lindgren

omap: &&/|| confusion in iommu_put()

Fri, 8 Jan 2010 18:29:05 +0000

omap: &&/|| confusion in iommu_put()

obj can't be both NULL and be an error pointer.

Signed-off-by: Roel Kluin 
Signed-off-by: Tony Lindgren

omap: gpio: Simultaneously requested rising and falling edge

Fri, 8 Jan 2010 18:29:04 +0000

omap: gpio: Simultaneously requested rising and falling edge

Some chips, namely any OMAP1 chips using METHOD_MPUIO,
OMAP15xx and OMAP7xx, cannot be setup to respond to on-chip GPIO
interrupts in both rising and falling edge directions -- they can
only respond to one direction or the other, depending on how the
ICR is configured.

Additionally, current code forces rising edge detection if both
flags are specified:

        if (trigger & IRQ_TYPE_EDGE_RISING)
                l |= 1 << gpio;
        else if (trigger & IRQ_TYPE_EDGE_FALLING)
                l &= ~(1 << gpio);
        else
                goto bad;

This change implements a toggle function that will modify the ICR
to flip the direction of interrupt for IRQs that are requested with
both rising and falling flags.  The toggle function is not called
for chips and GPIOs it does not apply to through the use of a flip_mask
that's added on a per-bank basis.  The mask is only set for those
GPIOs where a toggle is necessary.  Edge detection starts out the
same as above with FALLING mode first.

The toggle happens on EACH interrupt; without it, we have the
following sequence of actions on GPIO transition:

  ICR    GPIO               Result
  0x1    0 -> 1 (rising)    Interrupt
  0x1    1 -> 0 (falling)   No interrupt

  (set ICR to 0x0 manually)
  0x0    0 -> 1 (rising)    No interrupt
  0x0    1 -> 0 (falling)   Interrupt

That is, with the ICR set to 1 for a gpio, only rising edge interrupts
are caught, and with it set to 0, only falling edge interrupts are
caught.  If we add in the toggle, we get this:

  ICR    GPIO               Result
  0x1    0 -> 1 (rising)    Interrupt (ICR set to 0x0)
  0x0    1 -> 0 (falling)   Interrupt (ICR set to 0x1)
  0x1    0 -> 1 ...

so, both rising and falling are caught, per the request for both
(IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING).

Signed-off-by: Cory Maccarrone 
Acked-by: Kevin Hilman 
Signed-off-by: Tony Lindgren

omap: McBSP: Fix possible port lockout

Fri, 8 Jan 2010 18:29:04 +0000

omap: McBSP: Fix possible port lockout

In its current form, the omap_mcbsp_request() function can return after
irq_request() failure without any cleanups, effectively locking out the port
forever with clocks left running. Fix it.

Signed-off-by: Janusz Krzysztofik 
Acked-by: Jarkko Nikula 
Acked-by: Peter Ujfalusi 
Signed-off-by: Tony Lindgren

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux ...

Fri, 8 Jan 2010 17:32:50 +0000

Merge branch 'release' of git://git./linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  hp-wmi: remove double free caused by merge conflict

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

Fri, 8 Jan 2010 17:32:15 +0000

Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] __per_cpu_idtrs[] is a memory hog
  [IA64] sanity in #include files.  Move fnptr to types.h
  [IA64] use helpers for rlimits
  [IA64] cpumask_of_node() should handle -1 as a node

netfilter: ebtables: enforce CAP_NET_ADMIN

Fri, 8 Jan 2010 16:31:24 +0000

netfilter: ebtables: enforce CAP_NET_ADMIN

normal users are currently allowed to set/modify ebtables rules.
Restrict it to processes with CAP_NET_ADMIN.

Note that this cannot be reproduced with unmodified ebtables binary
because it uses SOCK_RAW.

Signed-off-by: Florian Westphal 
Cc: stable@kernel.org
Signed-off-by: Patrick McHardy

ASoC: Fix WM8350 DSP mode B configuration

Thu, 7 Jan 2010 16:29:20 +0000

ASoC: Fix WM8350 DSP mode B configuration

We need to set the LRCLK inversion bit to select DSP mode.

Signed-off-by: Mark Brown 
Acked-by: Liam Girdwood 
Cc: stable@kernel.org

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

Fri, 8 Jan 2010 16:18:37 +0000

Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6

ARM: 5868/1: ARM: fix "BUG: using smp_processor_id() in preemptible code"

Fri, 8 Jan 2010 15:59:34 +0000

ARM: 5868/1: ARM: fix "BUG: using smp_processor_id() in preemptible code"

Fix the following warning, which appears when the register dump for a
faulting process is printed in a kernel with SMP, DEBUG_PREEMPT, and
DEBUG_USER (with user_debug=31) enabled:

BUG: using smp_processor_id() in preemptible [00000000] code: init/1
caller is __show_regs+0x18/0x234
Backtrace:
[] (dump_backtrace+0x0/0x114) from [] (dump_stack+0x18/0x1c)
 r6:c781a000 r5:c0157544 r4:00000001 r3:00000000
[] (dump_stack+0x0/0x1c) from [] (debug_smp_processor_id+0xc4/0xf8)
[] (debug_smp_processor_id+0x0/0xf8) from [] (__show_regs+0x18/0x234)
 r6:c781bfb0 r5:00000000 r4:c781bfb0 r3:00000000
[] (__show_regs+0x0/0x234) from [] (show_regs+0x40/0x50)
[] (show_regs+0x0/0x50) from [] (__do_user_fault+0x5c/0xa4)
 r4:c781c000 r3:00000000
[] (__do_user_fault+0x0/0xa4) from [] (do_page_fault+0x1b4/0x1e4)
 r7:00000000 r6:00010000 r5:c781bfb0 r4:c781c000
[] (do_page_fault+0x0/0x1e4) from [] (do_DataAbort+0x3c/0xa0)
[] (do_DataAbort+0x0/0xa0) from [] (ret_from_exception+0x0/0x10)

Signed-off-by: Rabin Vincent 
Signed-off-by: Russell King

ARM: 5867/1: Update U300 defconfig

Thu, 7 Jan 2010 10:25:42 +0000

ARM: 5867/1: Update U300 defconfig

This updates the U300 defconfig to include the DMA driver merged
in 2.6.33-rc1 and adds a codepage that's needed to mount VFAT MMC
cards as default. The rest is new config options.

Signed-off-by: Linus Walleij 
Signed-off-by: Russell King

ARM: 5866/1: arm ptrace: use unsigned types for kernel pt_regs

Wed, 6 Jan 2010 09:50:08 +0000

ARM: 5866/1: arm ptrace: use unsigned types for kernel pt_regs

Make registers unsigned for kernel space. This is important for
example in the perf events where the PC is stored into a u64. We
don't want it sign extended so make the regs unsigned to prevent
casts throughout the kernel.

Signed-off-by: Jamie Iles 
Signed-off-by: Russell King

GFS2: Fix gfs2_xattr_acl_chmod()

Mon, 21 Dec 2009 13:55:28 +0000

GFS2: Fix gfs2_xattr_acl_chmod()

The ref counting for the bh returned by gfs2_ea_find() was
wrong. This patch ensures that we always drop the ref count
to that bh correctly.

Signed-off-by: Steven Whitehouse

GFS2: Fix locking bug in rename

Wed, 9 Dec 2009 13:55:12 +0000

GFS2: Fix locking bug in rename

The rename code was taking a resource group lock in cases where
it wasn't actually needed, this caused problems if the rename
was resulting in an inode being unlinked. The patch ensures that
we only take the rgrp lock early if it is really needed.

Signed-off-by: Steven Whitehouse

GFS2: Ensure uptodate inode size when using O_APPEND

Tue, 8 Dec 2009 10:25:33 +0000

GFS2: Ensure uptodate inode size when using O_APPEND

The VFS reads the inode size during generic_file_aio_write() but
with no locking around it. In order to get the expected result
from O_APPEND opens, this patch updated the inode size before
calling generic_file_aio_write()

There is of course still a race here, in that there is nothing to
prevent another node coming in and extending the file in the
mean time. On the other hand, when used with file locking this
will ensure that the expected results are obtained.

Signed-off-by: Steven Whitehouse

OMAP: DSS2: Fix crash when panel doesn't define enable_te()

Tue, 8 Dec 2009 15:30:24 +0000

OMAP: DSS2: Fix crash when panel doesn't define enable_te()

DSI driver didn't check if the panel driver actually implements
enable_te().

Signed-off-by: Tomi Valkeinen

OMAP: DSS2: Collect interrupt statistics

Thu, 17 Dec 2009 12:35:21 +0000

OMAP: DSS2: Collect interrupt statistics

Collect interrupt statistics, printable via debugfs:

debugfs/omapdss/dispc_irq
debugfs/omapdss/dsi_irq

The counters are reset when printed.

Signed-off-by: Tomi Valkeinen

OMAP: DSS2: DSI: print debug DCS cmd in hex

Thu, 3 Dec 2009 11:38:04 +0000

OMAP: DSS2: DSI: print debug DCS cmd in hex

Signed-off-by: Tomi Valkeinen

OMAP: DSS2: DSI: fix VC channels in send_short and send_null

Thu, 3 Dec 2009 11:37:31 +0000

OMAP: DSS2: DSI: fix VC channels in send_short and send_null

- dsi_vc_send_short() needs to use dest_per for the peripheral id
- dsi_vc_send_null() was always using channel id 0

Signed-off-by: Tomi Valkeinen

e1000e: fix and commonize code for setting the receive address registers

Thu, 7 Jan 2010 16:32:13 +0000

e1000e: fix and commonize code for setting the receive address registers

Fix e1000e_rar_set() to flush consecutive register writes to avoid write
combining which some parts cannot handle.  Update e1000e_init_rx_addrs()
to call the fixed e1000e_rar_set() instead of duplicating code.

Also change e1000e_rar_set() to _not_ set the Address Valid bit if the MAC
address is all zeros.

Signed-off-by: Bruce Allan 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value

Thu, 7 Jan 2010 16:31:54 +0000

e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value

e1000e_enable_tx_pkt_filtering() will return a non-zero value if the
driver fails to enable the manageability interface on the host for
any reason; instead it should retun zero to indicate filtering has been
disabled.  Also provide a single exit point for the function.

Signed-off-by: Bruce Allan 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

e1000e: perform 10/100 adaptive IFS only on parts that support it

Thu, 7 Jan 2010 16:31:35 +0000

e1000e: perform 10/100 adaptive IFS only on parts that support it

Adaptive IFS which involves writing to the Adaptive IFS Throttle register
was being done for all devices supported by the driver even though it is
not supported (i.e. the register doesn't even exist) on some devices.  The
feature is supported on 8257x/82583 and ICH/PCH based devices, but not
on ESB2.

Signed-off-by: Bruce Allan 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

e1000e: don't accumulate PHY statistics on PHY read failure

Thu, 7 Jan 2010 16:31:16 +0000

e1000e: don't accumulate PHY statistics on PHY read failure

Signed-off-by: Bruce Allan 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

e1000e: call pci_save_state() after pci_restore_state()

Thu, 7 Jan 2010 16:30:56 +0000

e1000e: call pci_save_state() after pci_restore_state()

Due to a change in pci_restore_state()[1] which clears the saved_state
flag, the driver should call pci_save_state() to set the flag once again
to avoid issues with EEH (same fix that recently was submitted for ixgbe).

[1] commmit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff

Signed-off-by: Bruce Allan 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

netxen: update version to 4.0.72

Thu, 7 Jan 2010 22:10:17 +0000

netxen: update version to 4.0.72

Signed-off-by: Amit Kumar Salecha 
Signed-off-by: David S. Miller

netxen: fix set mac addr

Thu, 7 Jan 2010 22:10:16 +0000

netxen: fix set mac addr

o If tx and rx resources are not available, during set mac request.
  Then this request wont be passed to firmware and it will be added to
  driver mac list and will never make it to firmware.
  So if resources are not available, don't add it to driver mac list.

Signed-off-by: Amit Kumar Salecha 
Signed-off-by: David S. Miller

netxen: fix smatch warning

Thu, 7 Jan 2010 22:10:15 +0000

netxen: fix smatch warning

o Fix pointless assignments

Signed-off-by: Amit Kumar Salecha 
Signed-off-by: David S. Miller

netxen: fix tx ring memory leak

Thu, 7 Jan 2010 22:10:14 +0000

netxen: fix tx ring memory leak

o While unloading driver or resetting the context, tx ring was not
  getting free.

Signed-off-by: Amit Kumar Salecha 
Signed-off-by: David S. Miller

sbawe: fix memory detection part 2

Mon, 4 Jan 2010 21:23:34 +0000

sbawe: fix memory detection part 2

The patch "sbawe: fix memory detection" fixed detection
for memoryless SB32 cards but broke detection of memory
above 512KB. This patch fixes the regression.

The patch has been tested on the SB32 card (CT3670) with
0MB, 2MB and 8MB memory installed.

Signed-off-by: Krzysztof Helt 
Signed-off-by: Jaroslav Kysela

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ...

Fri, 8 Jan 2010 08:26:34 +0000

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into fixes

sound: oss: off by one bug

Sun, 3 Jan 2010 11:39:27 +0000

sound: oss: off by one bug

The problem is that in the original code sound_nblocks could go up to 1024
which would be an array overflow.

This was found with a static checker and has been compile tested only.

Signed-off-by: Dan Carpenter 
Signed-off-by: Jaroslav Kysela

tcp: update the netstamp_needed counter when cloning sockets

Fri, 8 Jan 2010 08:00:09 +0000

tcp: update the netstamp_needed counter when cloning sockets

This fixes a netstamp_needed accounting issue when the listen socket
has SO_TIMESTAMP set:

    s = socket(AF_INET, SOCK_STREAM, 0);
    setsockopt(s, SOL_SOCKET, SO_TIMESTAMP, 1); -> netstamp_needed = 1
    bind(s, ...);
    listen(s, ...);
    s2 = accept(s, ...); -> netstamp_needed = 1
    close(s2); -> netstamp_needed = 0
    close(s); -> netstamp_needed = -1

Signed-off-by: Octavian Purdila 
Signed-off-by: David S. Miller

drm/radeon/kms: Don't try to enable IRQ if we have no handler installed

Thu, 7 Jan 2010 14:39:14 +0000

drm/radeon/kms: Don't try to enable IRQ if we have no handler installed

If for any reason we haven't installed handler we shouldn't try to
enable IRQ/MSI on the hw so we don't get unhandled IRQ/MSI which
makes the kernel sad.

Signed-off-by: Jerome Glisse 
Signed-off-by: Dave Airlie

drm: Avoid calling vblank function is vblank wasn't initialized

Thu, 7 Jan 2010 14:39:13 +0000

drm: Avoid calling vblank function is vblank wasn't initialized

In some case vblank might not be initialized and we shouldn't
try to use associated function. This patch make sure this is
the case. It also export drm_vblank_cleanup so driver can cleanup
vblank if for any reason IRQ/MSI is not working.

Signed-off-by: Jerome Glisse 
Signed-off-by: Dave Airlie

drm/radeon: mkregtable.c: close a file before exit

Wed, 6 Jan 2010 23:59:31 +0000

drm/radeon: mkregtable.c: close a file before exit

Signed-off-by: Alexander Beregalov 
Signed-off-by: Dave Airlie

drm/radeon/kms: Make sure we release AGP device if we acquired it

Thu, 7 Jan 2010 15:08:32 +0000

drm/radeon/kms: Make sure we release AGP device if we acquired it

In some case we weren't releasing the AGP device at module unloading.
This leaded to unfunctional AGP at next module load. This patch make
sure we release the AGP bus if we acquire it.

Signed-off-by: Jerome Glisse 
Signed-off-by: Dave Airlie

drm/radeon/kms: Schedule host path read cache flush through the ring V2

Thu, 7 Jan 2010 11:39:21 +0000

drm/radeon/kms: Schedule host path read cache flush through the ring V2

R300 family will hard lockup if host path read cache flush is
done through MMIO to HOST_PATH_CNTL. But scheduling same flush
through ring seems harmless. This patch remove the hdp_flush
callback and add a flush after each fence emission which means
a flush after each IB schedule. Thus we should have same behavior
without the hard lockup.

Tested on R100,R200,R300,R400,R500,R600,R700 family.

V2: Adjust fence counts in r600_blit_prepare_copy()

Signed-off-by: Jerome Glisse 
Reviewed-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm/radeon/kms: Workaround RV410/R420 CP errata (V3)

Wed, 6 Jan 2010 18:28:48 +0000

drm/radeon/kms: Workaround RV410/R420 CP errata (V3)

Long story short, this fixes sporadic hardlocks with my rv410 during
times of intense 2D acceleration (Flash on Fx3).

V2: Fix indentation and move errata_fini to suspend function so we
don't leak scratch register over suspend/resume cycle.
V3: Move scratch_reg to asic specific structure (aim is to slowly
    move stuff to asic specific structure and avoid poluting
    radeon_device struct with asic specific variables)

Signed-off-by: Corbin Simpson 
Signed-off-by: Jerome Glisse 
Signed-off-by: Dave Airlie

drm/radeon/kms: detect sideport memory on IGP chips

Tue, 5 Jan 2010 16:27:29 +0000

drm/radeon/kms: detect sideport memory on IGP chips

This detects if the sideport memory is enabled and
if it is VRAM is evicted on suspend/resume.

This should fix s/r issues on some IGPs.

Signed-off-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm/radeon: fix a couple of array index errors

Thu, 7 Jan 2010 06:35:21 +0000

drm/radeon: fix a couple of array index errors

There are a couple of array overruns, and some associated confusion in
the code.
This is just a wild guess at what the code should actually look like.

Coverity CID: 13305 13306

agd5f: fix up the original intent of the timing code

Signed-off-by: Darren Jenkins 
Signed-off-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm/radeon/kms: add support for eDP (embedded DisplayPort)

Thu, 7 Jan 2010 19:22:32 +0000

drm/radeon/kms: add support for eDP (embedded DisplayPort)

This is displayport used for internal connections such
as laptop panels and systems with integrated monitors.

Signed-off-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm: Add eDP connector type

Thu, 7 Jan 2010 18:47:47 +0000

drm: Add eDP connector type

Add a new connector type for eDP (embedded displayport)

eDP is more or less the same as DP but there are some
cases when you might want to handle it separately.

Signed-off-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm/radeon/kms: pull in the latest upstream ObjectID.h changes

Thu, 7 Jan 2010 16:39:07 +0000

drm/radeon/kms: pull in the latest upstream ObjectID.h changes

Signed-off-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm/radeon/kms: whitespace changes to ObjectID.h

Thu, 7 Jan 2010 16:35:48 +0000

drm/radeon/kms: whitespace changes to ObjectID.h

Makes it easier to keep in sync with ddx and the upstream
AMD versions.

Signed-off-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm/radeon/kms: fix typo in atom connector type handling

Thu, 7 Jan 2010 19:19:47 +0000

drm/radeon/kms: fix typo in atom connector type handling

Also remove the problematic enums that were unused
remnants from the ddx.

Signed-off-by: Alex Deucher 
Signed-off-by: Dave Airlie

[ARM] pxa: fix strange characters in zaurus gpio .desc

Thu, 7 Jan 2010 20:31:04 +0000

[ARM] pxa: fix strange characters in zaurus gpio .desc

Somehow, strange characters made their way zaurus gpio .desc
fields. Fix it.

Signed-off-by: Pavel Machek 
Acked-by: Stanislav Brabec 
Signed-off-by: Eric Miao

TI DaVinci EMAC: Handle emac module clock correctly.

Thu, 7 Jan 2010 00:22:37 +0000

TI DaVinci EMAC: Handle emac module clock correctly.

In the driver probe function the emac module clock needs to
be enabled before calling register_netdev(). As soon as the
device is registered the driver get_stats function can be invoked
by the core - the module clock must be switched on to be able to
read from stats registers. Also explicitly call matching clk_disable
for failure conditions in probe function.

Signed-off-by: Sriramakrishnan 
Signed-off-by: David S. Miller

dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips

Thu, 7 Jan 2010 02:41:51 +0000

dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips

The Davicom DM9100 and DM9102 chips are used on the motherboards of
some SPARC systems (supported by the tulip driver) and also in PCI
expansion cards (supported by the dmfe driver).  There is no
difference in the PCI device ids for the two different configurations,
so these drivers both claim the device ids.  However, it is possible
to distinguish the two configurations by the presence of Open Firmware
properties for them, so we do that.

Signed-off-by: Ben Hutchings 
Signed-off-by: Grant Grundler 
Signed-off-by: David S. Miller

ixgbe: Fix compiler warning about variable being used uninitialized

Wed, 6 Jan 2010 17:50:29 +0000

ixgbe: Fix compiler warning about variable being used uninitialized

tc is still throwing a warning that is could be used
uninitialized.  This fixes it, and properly formats the device ID
checks for the use of this variable.

Signed-off-by: Peter P Waskiewicz Jr 
Signed-off-by: Jeff Kirsher 
Signed-off-by: David S. Miller

[IA64] __per_cpu_idtrs[] is a memory hog

Fri, 8 Jan 2010 00:10:57 +0000

[IA64] __per_cpu_idtrs[] is a memory hog

__per_cpu_idtrs is statically allocated ... on CONFIG_NR_CPUS=4096
systems it hogs 16MB of memory. This is way too much for a quite
probably unused facility (only KVM uses dynamic TR registers).

Change to an array of pointers, and allocate entries as needed on
a per cpu basis.  Change the name too as the __per_cpu_ prefix is
confusing (this isn't a classic  type object).

Signed-off-by: Tony Luck

kgdb: Fix kernel-doc format error in kgdb.h

Thu, 7 Jan 2010 17:58:37 +0000

kgdb: Fix kernel-doc format error in kgdb.h

linux-next-20081022//include/linux/kgdb.h:308): duplicate section name 'Description'

and fix typos in that file's kernel-doc comments.

Signed-off-by: Randy Dunlap 
Signed-off-by: Andrew Morton 
Signed-off-by: Jason Wessel

blackfin,kgdb: Do not put PC in gdb_regs into retx.

Thu, 7 Jan 2010 17:58:37 +0000

blackfin,kgdb: Do not put PC in gdb_regs into retx.

In blackfin, kgdb is running in delayed exception IRQ5 other than in
exception IRQ3 directly.  Register reti other than retx in pt_regs is
the kgdb return address. So, don't put PC in gdb_regs into retx.

CC: Mike Frysinger 
Signed-off-by: Sonic Zhang 
Signed-off-by: Jason Wessel

blackfin,kgdb,probe_kernel: Cleanup probe_kernel_read/write

Thu, 7 Jan 2010 17:58:36 +0000

blackfin,kgdb,probe_kernel: Cleanup probe_kernel_read/write

Blackfin needs it own arch specific probe_kernel_read() and
probe_kernel_write().

This was moved out of the kgdb code and into the
arch/blackfin/maccess.c, because it is a generic kernel api.

The arch specific kgdb.c for blackfin was cleaned of all functions
which exist in the kgdb core that do the same thing after resolving
the probe_kernel_read() and probe_kernel_write().  This also
eliminated the need for most of the #include's.

CC: Sonic Zhang 
Signed-off-by: Jason Wessel 
Signed-off-by: Mike Frysinger

maccess,probe_kernel: Allow arch specific override probe_kernel_(read|write)

Thu, 7 Jan 2010 17:58:36 +0000

maccess,probe_kernel: Allow arch specific override probe_kernel_(read|write)

Some archs such as blackfin, would like to have an arch specific
probe_kernel_read() and probe_kernel_write() implementation which can
fall back to the generic implementation if no special operations are
needed.

CC: Thomas Gleixner 
CC: Ingo Molnar 
Signed-off-by: Jason Wessel 
Signed-off-by: Mike Frysinger

ARM: add missing recvmmsg syscall number

Thu, 7 Jan 2010 17:52:26 +0000

ARM: add missing recvmmsg syscall number

Signed-off-by: Russell King

netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()

Thu, 7 Jan 2010 17:33:18 +0000

netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()

As noticed by Dan Carpenter , update_nl_seq()
currently contains an out of bounds read of the seq_aft_nl array
when looking for the oldest sequence number position.

Fix it to only compare valid positions.

Cc: stable@kernel.org
Signed-off-by: Patrick McHardy

reiserfs: Relax reiserfs_xattr_set_handle() while acquiring xattr locks

Thu, 7 Jan 2010 14:55:31 +0000

reiserfs: Relax reiserfs_xattr_set_handle() while acquiring xattr locks

Fix remaining xattr locks acquired in reiserfs_xattr_set_handle()
while we are holding the reiserfs lock to avoid lock inversions.

Signed-off-by: Frederic Weisbecker 
Cc: Christian Kujau 
Cc: Alexander Beregalov 
Cc: Chris Mason 
Cc: Ingo Molnar

reiserfs: Fix unreachable statement

Wed, 6 Jan 2010 22:09:50 +0000

reiserfs: Fix unreachable statement

Stanse found an unreachable statement in reiserfs_ioctl. There is a
if followed by error assignment and `break' with no braces. Add the
braces so that we don't break every time, but only in error case,
so that REISERFS_IOC_SETVERSION actually works when it returns no
error.

Signed-off-by: Jiri Slaby 
Cc: Reiserfs 
Cc: Andrew Morton 
Signed-off-by: Frederic Weisbecker

reiserfs: Don't call reiserfs_get_acl() with the reiserfs lock

Thu, 7 Jan 2010 11:57:47 +0000

reiserfs: Don't call reiserfs_get_acl() with the reiserfs lock

reiserfs_get_acl is usually not called under the reiserfs lock,
as it doesn't need it. But it happens when it is called by
reiserfs_acl_chmod(), which creates a dependency inversion against
the private xattr inodes mutexes for the given inode.

We need to call it without the reiserfs lock, especially since
it's unnecessary.

Signed-off-by: Frederic Weisbecker 
Cc: Christian Kujau 
Cc: Alexander Beregalov 
Cc: Chris Mason 
Cc: Ingo Molnar

Input: psmouse - fix Synaptics detection when protocol is disabled

Thu, 7 Jan 2010 09:52:39 +0000

Input: psmouse - fix Synaptics detection when protocol is disabled

For configurations where Synaptics hardware is present but the Synaptics
extensions support is not compiled in, the mouse is reprobed and a new
device is allocated on every suspend/resume.

During probe, psmouse_switch_protocol() calls psmouse_extensions() with
set_properties=1. This calls the dummy synaptics_init() which returns an
error code, instructing us not to use the synaptics extensions.

During resume, psmouse_reconnect() calls psmouse_extensions() with
set_properties=0, in which case call to synaptics_init() is bypassed and
PSMOUSE_SYNAPTICS is returned. Since the result is different from previous
attempt psmouse_reconnect() fails and full re-probe happens.

Fix this by tweaking the set_properties=0 codepath in psmouse_extensions()
to be more careful about offering PSMOUSE_SYNAPTICS extensions.

Signed-off-by: Daniel Drake 
Signed-off-by: Dmitry Torokhov

mv643xx_eth: don't include cache padding in rx desc buffer size

Tue, 5 Jan 2010 09:15:32 +0000

mv643xx_eth: don't include cache padding in rx desc buffer size

If NET_SKB_PAD is not a multiple of the cache line size, mv643xx_eth
allocates a couple of extra bytes at the start of each receive buffer
to make the data payload end up on a cache line boundary.

These extra bytes are skb_reserve()'d before DMA mapping, so they
should not be included in the DMA map byte count (as the mapping is
done starting at skb->data), nor should they be included in the
receive descriptor buffer size field, or the hardware can end up
DMAing beyond the end of the buffer, which can happen if someone
sends us a larger-than-MTU sized packet.

This problem was introduced in commit 7fd96ce47ff ("mv643xx_eth:
rework receive skb cache alignment", May 6 2009), but hasn't appeared
to be problematic so far, probably as the main users of mv643xx_eth
all have NET_SKB_PAD == L1_CACHE_BYTES.

Signed-off-by: Saeed Bishara 
Signed-off-by: Lennert Buytenhek 
Signed-off-by: David S. Miller

NET: atlx, fix memory leak

Wed, 6 Jan 2010 06:54:16 +0000

NET: atlx, fix memory leak

Stanse found a memory leak in atl2_get_eeprom. eeprom_buff is not
freed/assigned on all paths. Fix that.

Signed-off-by: Jiri Slaby 
Cc: Jay Cliburn 
Cc: Chris Snook 
Cc: Jie Yang 
Cc: atl1-devel@lists.sourceforge.net
Cc: "David S. Miller" 
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller

pcmcia: ncmlan_cs: remove odd bracket

Wed, 6 Jan 2010 13:05:46 +0000

pcmcia: ncmlan_cs: remove odd bracket

Signed-off-by: Alexander Beregalov 
Signed-off-by: David S. Miller

cs89x0: Always report failure to request interrupt

Thu, 7 Jan 2010 08:53:05 +0000

cs89x0: Always report failure to request interrupt

A failure on request_irq() is always fatal but unlike other fatal
errors it's only reported to the user if net_debug is set. Make the
diagnostic unconditional and raise the priority so that errors are
more obvious to the user.

Signed-off-by: Mark Brown 
Signed-off-by: David S. Miller

hso: fixed missing newlines

Tue, 5 Jan 2010 04:53:00 +0000

hso: fixed missing newlines

Fixed missing newlines in calls to dev_warn & dev_err.

Signed-off-by: Jan Dumon 
Signed-off-by: David S. Miller

hso: Fix for 5 sec timeouts with v2.x firmware

Tue, 5 Jan 2010 04:52:42 +0000

hso: Fix for 5 sec timeouts with v2.x firmware

Don't send flow control settings to any port other than the modem port.
Older firmware ignored this request but did sent a reply. Newer firmware just
ignores it without reply and causes a 5 second timeout every time a port
(except for the modem port) is opened or if tiocm settings are changed.

Signed-off-by: Jan Dumon 
Signed-off-by: David S. Miller

hso: Attempt to recover from usb bus errors

Tue, 5 Jan 2010 04:52:13 +0000

hso: Attempt to recover from usb bus errors

Attempt to reset the usb device when we receive usb bus errors.

Signed-off-by: Jan Dumon 
Signed-off-by: David S. Miller

hso: don't change the state of a closed port

Tue, 5 Jan 2010 04:51:28 +0000

hso: don't change the state of a closed port

Don't change the state of a port if it's not open. This fixes an issue where a
port sometimes has to be opened twice before data can be received.

Signed-off-by: Jan Dumon 
Signed-off-by: David S. Miller

hso: Fix for endian issues on big endian machines

Tue, 5 Jan 2010 04:51:02 +0000

hso: Fix for endian issues on big endian machines

Some fields are always little endian and have to be converted on big endian
machines.

Signed-off-by: Jan Dumon 
Signed-off-by: David S. Miller

hso: Add Vendor/Product ID's for new devices

Tue, 5 Jan 2010 04:50:31 +0000

hso: Add Vendor/Product ID's for new devices

Add product ID's for new devices.

Signed-off-by: Jan Dumon 
Signed-off-by: David S. Miller

claw: use "claw" as root device name

Mon, 4 Jan 2010 03:14:45 +0000

claw: use "claw" as root device name

Claw module cannot be loaded together with qeth, because "qeth" has
been errorneously used as root device name. It is changed into "claw".

Signed-off-by: Ursula Braun 
Signed-off-by: David S. Miller

pcnet_cs: add cis of KTI PE520 pcmcia network card

Thu, 7 Jan 2010 04:37:58 +0000

pcnet_cs: add cis of KTI PE520 pcmcia network card

pcnet_cs,serial_cs:

add cis of KTI PE520 pcmcia network card,
and serial card(Sierra Wireless AC860).

Signed-off-by: Ken Kawasaki 
Signed-off-by: David S. Miller

ip: fix mc_loop checks for tunnels with multicast outer addresses

Thu, 7 Jan 2010 04:37:01 +0000

ip: fix mc_loop checks for tunnels with multicast outer addresses

When we have L3 tunnels with different inner/outer families
(i.e. IPV4/IPV6) which use a multicast address as the outer tunnel
destination address, multicast packets will be loopbacked back to the
sending socket even if IP*_MULTICAST_LOOP is set to disabled.

The mc_loop flag is present in the family specific part of the socket
(e.g. the IPv4 or IPv4 specific part).  setsockopt sets the inner
family mc_loop flag. When the packet is pushed through the L3 tunnel
it will eventually be processed by the outer family which if different
will check the flag in a different part of the socket then it was set.

Signed-off-by: Octavian Purdila 
Signed-off-by: David S. Miller

ucc_geth: Fix the wrong the Rx/Tx FIFO size

Thu, 7 Jan 2010 04:32:38 +0000

ucc_geth: Fix the wrong the Rx/Tx FIFO size

current the Rx/Tx FIFO size settings cause problem
when four UEC ethernets work simultaneously.

eg: GETH1, UEM-J15, GETH2, UEC-J5 on 8569MDS board

 $ ifconfig eth0 10.193.20.166
 $ ifconfig eth1 10.193.20.167
 $ ifconfig eth2 10.193.20.168
 then
 $ ifconfig eth3 10.193.20.169

The fourth ethernet will cause all of interface broken,
you cann't ping successfully any more.
The patch fix this issue for MPC8569 Rev1.0 and Rev2.0

Signed-off-by: Dave Liu 
Acked-by: Anton Vorontsov 
Signed-off-by: David S. Miller

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied ...

Thu, 7 Jan 2010 04:26:42 +0000

Merge branch 'drm-linus' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: rs600: use correct mask for SW interrupt
  gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL test
  drm/radeon/radeon_device.c: move a dereference below a NULL test
  drm/radeon/radeon_fence.c: move a dereference below the NULL test
  drm/radeon/radeon_connectors.c: add a NULL test before dereference
  drm/radeon/kms: fix memory leak
  drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()
  drm/edid: Fix CVT width/height decode
  drm/edid: Skip empty CVT codepoints
  drm: remove address mask param for drm_pci_alloc()
  drm/radeon/kms: add missing breaks in i2c and ss lookups
  drm/radeon/kms: add primary dac adj values table
  drm/radeon/kms: fallback to default connector table

Merge remote branch 'korg/drm-radeon-next' into drm-linus

Thu, 7 Jan 2010 04:00:29 +0000

Merge remote branch 'korg/drm-radeon-next' into drm-linus

* korg/drm-radeon-next:
  drm/radeon/kms: rs600: use correct mask for SW interrupt
  gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL test
  drm/radeon/radeon_device.c: move a dereference below a NULL test
  drm/radeon/radeon_fence.c: move a dereference below the NULL test
  drm/radeon/radeon_connectors.c: add a NULL test before dereference
  drm/radeon/kms: fix memory leak
  drm/radeon/kms: add missing breaks in i2c and ss lookups
  drm/radeon/kms: add primary dac adj values table
  drm/radeon/kms: fallback to default connector table

drm/radeon/kms: rs600: use correct mask for SW interrupt

Mon, 28 Dec 2009 21:53:05 +0000

drm/radeon/kms: rs600: use correct mask for SW interrupt

The mask happens to be the same, but the IH is reading the status, not the
not the control register.

Signed-off-by: Luca Tettamanti 
Signed-off-by: Dave Airlie

gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL test

Wed, 30 Dec 2009 01:16:35 +0000

gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL test

If a NULL value is possible, the dereference should only occur after the
NULL test.

Coverity CID: 13338

Signed-off-by: Darren Jenkins 
Signed-off-by: Dave Airlie

drm/radeon/radeon_device.c: move a dereference below a NULL test

Wed, 30 Dec 2009 01:18:30 +0000

drm/radeon/radeon_device.c: move a dereference below a NULL test

If a NULL value is possible, the dereference should only occur after the
NULL test.

Coverity CID: 13335

Signed-off-by: Darren Jenkins 
Signed-off-by: Dave Airlie

drm/radeon/radeon_fence.c: move a dereference below the NULL test

Wed, 30 Dec 2009 01:20:05 +0000

drm/radeon/radeon_fence.c: move a dereference below the NULL test

If a NULL value is possible, the dereference should only occur after the
NULL test.

Coverity CID: 13334

Signed-off-by: Darren Jenkins 
Signed-off-by: Dave Airlie

drm/radeon/radeon_connectors.c: add a NULL test before dereference

Wed, 30 Dec 2009 01:22:55 +0000

drm/radeon/radeon_connectors.c: add a NULL test before dereference

The encoder variable can be NULL in this function so I believe it should
be checked before dereference.

Coverity CID: 13253

[airlied: extremely unlikely to happen]

Signed-off-by: Darren Jenkins 
Signed-off-by: Dave Airlie

drm/radeon/kms: fix memory leak

Wed, 6 Jan 2010 16:39:31 +0000

drm/radeon/kms: fix memory leak

Stanse found a memory leak in radeon_master_create. master_priv is not
freed/assigned on all paths. Fix that.

Signed-off-by: Jiri Slaby 
Signed-off-by: Dave Airlie

Merge branch 'drm-core-next' into drm-linus

Thu, 7 Jan 2010 03:36:00 +0000

Merge branch 'drm-core-next' into drm-linus

* drm-core-next:
  drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()
  drm/edid: Fix CVT width/height decode
  drm/edid: Skip empty CVT codepoints
  drm: remove address mask param for drm_pci_alloc()

drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()

Thu, 31 Dec 2009 12:06:29 +0000

drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()

This always evaluates to true.

Signed-off-by: Roel Kluin 
Signed-off-by: Dave Airlie

drm/edid: Fix CVT width/height decode

Mon, 4 Jan 2010 22:53:07 +0000

drm/edid: Fix CVT width/height decode

Signed-off-by: Adam Jackson 
Signed-off-by: Dave Airlie

drm/edid: Skip empty CVT codepoints

Mon, 4 Jan 2010 22:53:06 +0000

drm/edid: Skip empty CVT codepoints

Signed-off-by: Adam Jackson 
Signed-off-by: Dave Airlie

drm: remove address mask param for drm_pci_alloc()

Tue, 5 Jan 2010 03:25:05 +0000

drm: remove address mask param for drm_pci_alloc()

drm_pci_alloc() has input of address mask for setting pci dma
mask on the device, which should be properly setup by drm driver.
And leave it as a param for drm_pci_alloc() would cause confusion
or mistake would corrupt the correct dma mask setting, as seen on
intel hw which set wrong dma mask for hw status page. So remove
it from drm_pci_alloc() function.

Signed-off-by: Zhenyu Wang 
Signed-off-by: Dave Airlie

ARM: S3C64XX: Fix possible clock look in EPLL and MPLL clock chains

Thu, 7 Jan 2010 02:05:55 +0000

ARM: S3C64XX: Fix possible clock look in EPLL and MPLL clock chains

There is a possibility of a loop happening in the PLL output clock
chain on the S3C64XX series. clk_mpll's parent was set to be
clk_mout_mpll, but this is fed from clk_fout_epll (which is also
clk_mpll).

clk_mpll is meant to be the output from the MPLL, and clk_mout_mpll
is a seperate clock derived from the mux of clk_mpll and clk_fin_mpll
and thus should be considered a seperate clock.

Anything using clk_mpll directly really should not be relying on this
being the clock that is eventually routed to a peripheral, so remove the
loop and ensure that the clocks accurately represent the clock chain
in the device.

The clk_mpll is not being used outside of the s3c6400-clock.c code, so
this change should not break anything else.

Do the same for the EPLL.

Signed-off-by: Ben Dooks

Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt ...

Thu, 7 Jan 2010 02:16:17 +0000

Merge branch 'drm-intel-next' of git://git./linux/kernel/git/anholt/drm-intel

* 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (23 commits)
  drm/i915: remove full registers dump debug
  drm/i915: Add DP dpll limit on ironlake and use existing DPLL search function
  drm/i915: Select the correct BPC for LVDS on Ironlake
  drm/i915: Make the BPC in FDI rx/transcoder be consistent with that in pipeconf on Ironlake
  drm/i915: Enable/disable the dithering for LVDS based on VBT setting
  drm/i915: Permit pinning whilst the device is 'suspended'
  drm/i915: Hold struct mutex whilst pinning power context bo.
  drm/i915: fix unused var
  drm/i915: Storage class should be before const qualifier
  drm/i915: remove render reclock support
  drm/i915: Fix RC6 suspend/resume
  drm/i915: execbuf2 support
  drm/i915: Reload hangcheck timer too for Ironlake
  drm/i915: only enable hotplug for detected outputs
  drm/i915: Track whether cursor needs physical address in intel_device_info
  drm/i915: Implement IS_* macros using static tables
  drm/i915: Move PCI IDs into i915 driver
  drm/i915: Update LVDS connector status when receiving ACPI LID event
  drm/i915: Add MALATA PC-81005 to ACPI LID quirk list
  drm/i915: implement new pm ops for i915
  ...

NOMMU: Use copy_*_user_page() in access_process_vm()

Wed, 6 Jan 2010 17:23:28 +0000

NOMMU: Use copy_*_user_page() in access_process_vm()

The MMU code uses the copy_*_user_page() variants in access_process_vm()
rather than copy_*_user() as the former includes an icache flush.  This
is important when doing things like setting software breakpoints with
gdb.  So switch the NOMMU code over to do the same.

This patch makes the reasonable assumption that copy_from_user_page()
won't fail - which is probably fine, as we've checked the VMA from which
we're copying is usable, and the copy is not allowed to cross VMAs.  The
one case where it might go wrong is if the VMA is a device rather than
RAM, and that device returns an error which - in which case rubbish will
be returned rather than EIO.

Signed-off-by: Jie Zhang 
Signed-off-by: Mike Frysinger 
Signed-off-by: David Howells 
Acked-by: David McCullough 
Acked-by: Paul Mundt 
Acked-by: Greg Ungerer 
Signed-off-by: Linus Torvalds

NOMMU: Avoiding duplicate icache flushes of shared maps

Wed, 6 Jan 2010 17:23:23 +0000

NOMMU: Avoiding duplicate icache flushes of shared maps

When working with FDPIC, there are many shared mappings of read-only
code regions between applications (the C library, applet packages like
busybox, etc.), but the current do_mmap_pgoff() function will issue an
icache flush whenever a VMA is added to an MM instead of only doing it
when the map is initially created.

The flush can instead be done when a region is first mmapped PROT_EXEC.
Note that we may not rely on the first mapping of a region being
executable - it's possible for it to be PROT_READ only, so we have to
remember whether we've flushed the region or not, and then flush the
entire region when a bit of it is made executable.

However, this also affects the brk area.  That will no longer be
executable.  We can mprotect() it to PROT_EXEC on MPU-mode kernels, but
for NOMMU mode kernels, when it increases the brk allocation, making
sys_brk() flush the extra from the icache should suffice.  The brk area
probably isn't used by NOMMU programs since the brk area can only use up
the leavings from the stack allocation, where the stack allocation is
larger than requested.

Signed-off-by: David Howells 
Signed-off-by: Mike Frysinger 
Signed-off-by: Linus Torvalds

FDPIC: Respect PT_GNU_STACK exec protection markings when creating NOMMU stack

Wed, 6 Jan 2010 17:23:17 +0000

FDPIC: Respect PT_GNU_STACK exec protection markings when creating NOMMU stack

The current code will load the stack size and protection markings, but
then only use the markings in the MMU code path.  The NOMMU code path
always passes PROT_EXEC to the mmap() call.  While this doesn't matter
to most people whilst the code is running, it will cause a pointless
icache flush when starting every FDPIC application.  Typically this
icache flush will be of a region on the order of 128KB in size, or may
be the entire icache, depending on the facilities available on the CPU.

In the case where the arch default behaviour seems to be desired
(EXSTACK_DEFAULT), we probe VM_STACK_FLAGS for VM_EXEC to determine
whether we should be setting PROT_EXEC or not.

For arches that support an MPU (Memory Protection Unit - an MMU without
the virtual mapping capability), setting PROT_EXEC or not will make an
important difference.

It should be noted that this change also affects the executability of
the brk region, since ELF-FDPIC has that share with the stack.  However,
this is probably irrelevant as NOMMU programs aren't likely to use the
brk region, preferring instead allocation via mmap().

Signed-off-by: Mike Frysinger 
Signed-off-by: David Howells 
Signed-off-by: Linus Torvalds

Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

Thu, 7 Jan 2010 02:10:15 +0000

Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.33' of git://linux-nfs.org/~bfields/linux:
  sunrpc: fix peername failed on closed listener
  nfsd: make sure data is on disk before calling ->fsync
  nfsd: fix "insecure" export option

[IA64] sanity in #include files. Move fnptr to types.h

Wed, 6 Jan 2010 23:52:35 +0000

[IA64] sanity in #include files.  Move fnptr to types.h

Signed-off-by: Tony Luck

[IA64] use helpers for rlimits

Wed, 6 Jan 2010 15:24:30 +0000

[IA64] use helpers for rlimits

Make sure compiler won't do weird things with limits. E.g. fetching
them twice may return 2 different values after writable limits are
implemented.

I.e. either use rlimit helpers added in
3e10e716abf3c71bdb5d86b8f507f9e72236c9cd
or ACCESS_ONCE if not applicable.

Signed-off-by: Jiri Slaby 
Cc: Fenghua Yu 
Signed-off-by: Tony Luck

nfs: fix oops in nfs_rename()

Wed, 6 Jan 2010 23:48:26 +0000

nfs: fix oops in nfs_rename()

Recent change is missing to update "rehash".  With that change, it will
become the cause of adding dentry to hash twice.

This explains the reason of Oops (dereference the freed dentry in
__d_lookup()) on my machine.

Signed-off-by: OGAWA Hirofumi 
Reported-by: Marvin 
Cc: Trond Myklebust 
Signed-off-by: Andrew Morton 
Signed-off-by: Trond Myklebust

[IA64] cpumask_of_node() should handle -1 as a node

Wed, 6 Jan 2010 04:55:12 +0000

[IA64] cpumask_of_node() should handle -1 as a node

pcibus_to_node can return -1 if we cannot determine which node a pci bus
is on. If passed -1, cpumask_of_node will negatively index the lookup array
and pull in random data:

# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
00000000,00000003,00000000,00000000
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
64-65

Change cpumask_of_node to check for -1 and return cpu_all_mask in this
case:

# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
ffffffff,ffffffff,ffffffff,ffffffff
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
0-127

Signed-off-by: Anton Blanchard 
Signed-off-by: Tony Luck

sunrpc: fix peername failed on closed listener

Thu, 31 Dec 2009 02:52:36 +0000

sunrpc: fix peername failed on closed listener

There're some warnings of "nfsd: peername failed (err 107)!"
socket error -107 means Transport endpoint is not connected.
This warning message was outputed by svc_tcp_accept() [net/sunrpc/svcsock.c],
when kernel_getpeername returns -107. This means socket might be CLOSED.

And svc_tcp_accept was called by svc_recv() [net/sunrpc/svc_xprt.c]

        if (test_bit(XPT_LISTENER, &xprt->xpt_flags)) {
        
                newxpt = xprt->xpt_ops->xpo_accept(xprt);
        

So this might happen when xprt->xpt_flags has both XPT_LISTENER and XPT_CLOSE.

Let's take a look at commit b0401d72, this commit has moved the close
processing after do recvfrom method, but this commit also introduces this
warnings, if the xpt_flags has both XPT_LISTENER and XPT_CLOSED, we should
close it, not accpet then close.

Signed-off-by: Xiaotian Feng 
Cc: J. Bruce Fields 
Cc: Neil Brown 
Cc: Trond Myklebust 
Cc: David S. Miller 
Cc: stable@kernel.org
Signed-off-by: J. Bruce Fields

nfsd: make sure data is on disk before calling ->fsync

Fri, 25 Dec 2009 16:44:45 +0000

nfsd: make sure data is on disk before calling ->fsync

nfsd is not using vfs_fsync, so I missed it when changing the calling
convention during the 2.6.32 window.  This patch fixes it to not only
start the data writeout, but also wait for it to complete before calling
into ->fsync.

Signed-off-by: Christoph Hellwig 
Cc: stable@kernel.org
Signed-off-by: J. Bruce Fields

sunrpc: fix build-time warning

Wed, 6 Jan 2010 22:26:27 +0000

sunrpc: fix build-time warning

Fix auth_gss printk format warning:

net/sunrpc/auth_gss/auth_gss.c:660: warning: format '%ld' expects type 'long int', but argument 3 has type 'ssize_t'

Signed-off-by: Randy Dunlap 
Acked-by: Jeff Layton 
Signed-off-by: Trond Myklebust

Merge branches 'misc' and 'mlx4' into for-next

Wed, 6 Jan 2010 21:16:47 +0000

Merge branches 'misc' and 'mlx4' into for-next

Revert "mac80211: replace netif_tx_{start,stop,wake}_all_queues"

Wed, 6 Jan 2010 20:39:39 +0000

Revert "mac80211: replace netif_tx_{start,stop,wake}_all_queues"

This reverts commit 53623f1a09c7a7d23b74f0f7d93dba0ebde1006b.

This was inadvertantly missed in "mac80211: fix skb buffering issue",
and is required with that patch to restore proper queue operation.

Signed-off-by: John W. Linville

IB/addr: Correct CONFIG_IPv6 to CONFIG_IPV6

Wed, 6 Jan 2010 21:16:30 +0000

IB/addr: Correct CONFIG_IPv6 to CONFIG_IPV6

Correct misspelled "CONFIG_IPv6" that was introduced in commit
d14714df ("IB/addr: Fix IPv6 routing lookup").  The config variable
should be all uppercase.

Signed-off-by: Robert P. J. Day 

[ This was my fault when I munged the original patch.  - Roland ]

Signed-off-by: Roland Dreier

mlx4_core: Fix cleanup in __mlx4_init_one() error path

Wed, 6 Jan 2010 20:54:39 +0000

mlx4_core: Fix cleanup in __mlx4_init_one() error path

If mlx4_init_port_info() fails, cleanup the initialized ports only.

Signed-off-by: Eli Cohen 
Signed-off-by: Roland Dreier

IB/mlx4: Fix queue overflow check in post_recv

Wed, 6 Jan 2010 20:51:30 +0000

IB/mlx4: Fix queue overflow check in post_recv

In mlx4_ib_post_recv(), we should check the queue for overflow using
recv_cq instead of send_cq (current code looks like a copy-and-paste
mistake).

Signed-off-by: Or Gerlitz 
Signed-off-by: Roland Dreier

IB/mlx4: Initialize SRQ scatter entries when creating an SRQ

Wed, 6 Jan 2010 20:48:55 +0000

IB/mlx4: Initialize SRQ scatter entries when creating an SRQ

As for memfree mthca hardware, ConnectX also requires SRQ WQE scatter
entries to be initialized with the invalid L_Key at SRQ creation time.

Signed-off-by: Jack Morgenstein 
Signed-off-by: Roland Dreier

mac80211: fix-up build breakage in 2.6.33

Wed, 6 Jan 2010 20:35:49 +0000

mac80211: fix-up build breakage in 2.6.33

"mac80211: fix skb buffering issue" is based on what will become 2.6.34,
so it includes an incompatible usage of sta_info_get.  This patch will
need to be effectively reverted when merging for 2.6.34.

Signed-off-by: John W. Linville

x86, irq: Check move_in_progress before freeing the vector mapping

Wed, 6 Jan 2010 18:56:31 +0000

x86, irq: Check move_in_progress before freeing the vector mapping

With the recent irq migration fixes (post 2.6.32), Gary Hade has noticed
"No IRQ handler for vector" messages during the 2.6.33-rc1 kernel boot on IBM
AMD platforms and root caused the issue to this commit:

> commit 23359a88e7eca3c4f402562b102f23014db3c2aa
> Author: Suresh Siddha 
> Date:   Mon Oct 26 14:24:33 2009 -0800
>
>    x86: Remove move_cleanup_count from irq_cfg

As part of this patch, we have removed the move_cleanup_count check
in smp_irq_move_cleanup_interrupt(). With this change, we can run into a
situation where an irq cleanup interrupt on a cpu can cleanup the vector
mappings associated with multiple irqs, of which one of the irq's migration
might be still in progress. As such when that irq hits the old cpu, we get
the "No IRQ handler" messages.

Fix this by checking for the irq_cfg's move_in_progress and if the move
is still in progress delay the vector cleanup to another irq cleanup
interrupt request (which will happen when the irq starts arriving at the
new cpu destination).

Reported-and-tested-by: Gary Hade 
Signed-off-by: Suresh Siddha 
LKML-Reference: <1262804191.2732.7.camel@sbs-t61.sc.intel.com>
Cc: Eric W. Biederman 
Signed-off-by: H. Peter Anvin

Merge branch 'davinci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman ...

Wed, 6 Jan 2010 18:46:27 +0000

Merge branch 'davinci-fixes' of git://git./linux/kernel/git/khilman/linux-davinci

* 'davinci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci:
  DaVinci: DM365: Add the device_enable for the DaVinci Keyscan
  davinci: enable ARCH_HAS_HOLES_MEMORYMODEL for DaVinci
  davinci: da8xx/omap-l1: mark RTC as a wakeup source
  davinci: cp_intc: provide set_wake function
  Davinci VPFE Capture: Take i2c adapter id through platform data

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

Wed, 6 Jan 2010 18:45:50 +0000

Merge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] lpfc 8.3.7: Update Driver version to 8.3.7
  [SCSI] lpfc 8.3.7: Fix discovery failures.
  [SCSI] lpfc 8.3.7: Fix SCSI protocol related errors.
  [SCSI] lpfc 8.3.7: Fix hardware/SLI relates issues
  [SCSI] lpfc 8.3.7: Fix NPIV operation errors
  [SCSI] lpfc 8.3.7: Fix FC protocol errors
  [SCSI] stex: fix scan of nonexistent lun
  [SCSI] pmcraid: fix to avoid twice scsi_dma_unmap for a command
  [SCSI] qla2xxx: Update version number to 8.03.01-k9.
  [SCSI] qla2xxx: Added to EEH support.
  [SCSI] qla2xxx: Extend base EEH support in qla2xxx.
  [SCSI] qla2xxx: Fix for a multiqueue bug in CPU affinity mode
  [SCSI] qla2xxx: Get the link data rate explicitly during device resync.
  [SCSI] cxgb3i: Fix a login over vlan issue

drm/i915: remove full registers dump debug

Mon, 28 Dec 2009 05:23:36 +0000

drm/i915: remove full registers dump debug

This one reverts 9e3a6d155ed0a7636b926a798dd7221ea107b274.
As reported by http://bugzilla.kernel.org/show_bug.cgi?id=14485,
this dump will cause hang problem on some machine. If something
really needs this kind of full registers dump, that could be done
within intel-gpu-tools.

Cc: Ben Gamari 
Signed-off-by: Zhenyu Wang 
Signed-off-by: Eric Anholt

drm/i915: Add DP dpll limit on ironlake and use existing DPLL search function

Thu, 31 Dec 2009 08:06:04 +0000

drm/i915: Add DP dpll limit on ironlake and use existing DPLL search function

For some clocks, the old Ironlake DPLL calculator wold give m/n/p
combinations that didn't match the spreadsheet of what HW validation
tests.  Instead, use the G4X DPLL calculator, which does a better job
at it.

So we use the intel_g4x_find_best_pll to calculate the DPLL for CRT/HDMI/LVDS
on ironlake. At the same time to consider the dpll setting for display port, we
add the display port DPLL limit on ironlake, which will directly use the
function of intel_find_pll_ironlake_dp to get the corresponding dpll setting.

Signed-off-by: Zhao Yakui 
Signed-off-by: Eric Anholt

drm/i915: Select the correct BPC for LVDS on Ironlake

Mon, 4 Jan 2010 08:29:32 +0000

drm/i915: Select the correct BPC for LVDS on Ironlake

Select the correct BPC for LVDS on Ironlake. If it is 18-bit LVDS panel,
the BPC will be 6. When it is 24-bit LVDS panel, the BPC will 8.
At the same time the BPC will be 8 when the output device is CRT/HDMI/DP.

Signed-off-by: Zhao Yakui 
Signed-off-by: Eric Anholt

drm/i915: Make the BPC in FDI rx/transcoder be consistent with that in pipeconf on ...

Mon, 4 Jan 2010 08:29:31 +0000

drm/i915: Make the BPC in FDI rx/transcoder be consistent with that in pipeconf on Ironlake

Make the BPC in FDI rx/transcoder be consistent with that in pipeconf on Ironlake.

Signed-off-by: Zhao Yakui 
Signed-off-by: Eric Anholt

drm/i915: Enable/disable the dithering for LVDS based on VBT setting

Mon, 4 Jan 2010 08:29:30 +0000

drm/i915: Enable/disable the dithering for LVDS based on VBT setting

Enable/disable the dithering for LVDS based on VBT setting. On the 965/g4x
platform the dithering flag is defined in LVDS register. And on the ironlake
the dithering flag is defined in pipeconf register.

Signed-off-by: Zhao Yakui 
Signed-off-by: Eric Anholt

drm/i915: Permit pinning whilst the device is 'suspended'

Mon, 4 Jan 2010 18:57:57 +0000

drm/i915: Permit pinning whilst the device is 'suspended'

As pinning (allocating and binding GTT memory) does not actually invoke
GPU commands, it is safe, and indeed is attempted, during resumption
from suspension:

  [drm:intel_init_clock_gating] *ERROR* failed to pin power context: -16

Signed-off-by: Chris Wilson 
Reported-by: Hugh Dickins 
Cc: stable@kernel.org
Signed-off-by: Eric Anholt

drm/i915: Hold struct mutex whilst pinning power context bo.

Mon, 4 Jan 2010 18:57:56 +0000

drm/i915: Hold struct mutex whilst pinning power context bo.

Hugh found an error path where we were attempting to unref a bo without
holding the struct mutex:

  [drm:intel_init_clock_gating] *ERROR* failed to pin power context: -16
  ------------[ cut here ]------------
  WARNING: at drivers/gpu/drm/drm_gem.c:438 drm_gem_object_free+0x20/0x5e()
  Hardware name: ESPRIMO Mobile V5505
  Modules linked in: snd_pcm_oss snd_mixer_oss snd_seq snd_seq_device
  Pid: 3793, comm: s2ram Not tainted 2.6.33-rc2 #4
  Call Trace:
   [<7815298e>] warn_slowpath_common+0x59/0x6b
   [<781529b3>] warn_slowpath_null+0x13/0x18
   [<78317c1a>] ? drm_gem_object_free+0x20/0x5e
   [<78317c1a>] drm_gem_object_free+0x20/0x5e
   [<78317bfa>] ? drm_gem_object_free+0x0/0x5e
   [<7829df11>] kref_put+0x38/0x45
   [<7833a5f0>] intel_init_clock_gating+0x232/0x271
   [<78317bfa>] ? drm_gem_object_free+0x0/0x5e
   [<7832c307>] i915_restore_state+0x21a/0x2b3
   [<7832379d>] i915_resume+0x3c/0xbb
   [<78174fe5>] ? trace_hardirqs_on_caller+0xfc/0x123
   [<7831c756>] ? drm_class_resume+0x0/0x3e
   [<7831c78d>] drm_class_resume+0x37/0x3e
   [<78351e0a>] legacy_resume+0x1e/0x51
   [<78351ece>] device_resume+0x91/0xab
   [<7831c756>] ? drm_class_resume+0x0/0x3e
   [<78352226>] dpm_resume+0x58/0x10f
   [<783522fb>] dpm_resume_end+0x1e/0x2c
   [<78180f80>] suspend_devices_and_enter+0x61/0x84
   [<78180ff8>] enter_state+0x55/0x83
   [<7818091c>] state_store+0x94/0xaa
   [<7829d09e>] kobj_attr_store+0x1e/0x23
   [<782098e0>] sysfs_write_file+0x66/0x99
   [<781cd2f0>] vfs_write+0x8a/0x108
   [<781cd408>] sys_write+0x3c/0x63
   [<78125c10>] sysenter_do_call+0x12/0x36
  ---[ end trace a343537f29950fda ]---

It is in fact slightly more insiduous that first appears since we are
attempting to not just free the object without the lock, but are trying
to do the whole bo manipulation without holding the lock.

Reported-by: Hugh Dickins 
Signed-off-by: Chris Wilson 
Cc: stable@kernel.org
Signed-off-by: Eric Anholt

drm/i915: fix unused var

Tue, 17 Nov 2009 22:08:52 +0000

drm/i915: fix unused var

drivers/gpu/drm/i915/i915_dma.c: In function 'i915_driver_load':
drivers/gpu/drm/i915/i915_dma.c:1114: warning: 'll_base' may be used uninitialized in this function

Partly this is because gcc isn't smart enough.  But `ll_base' does get used
uninitialised in the DRM_DEBUG() call.

Cc: Jesse Barnes 
Cc: Eric Anholt 
Cc: Dave Airlie 
Signed-off-by: Andrew Morton 
Signed-off-by: Eric Anholt

drm/i915: Storage class should be before const qualifier

Wed, 23 Dec 2009 13:14:34 +0000

drm/i915: Storage class should be before const qualifier

The C99 specification states in section 6.11.5:

The placement of a storage-class specifier other than at the beginning
of the declaration specifiers in a declaration is an obsolescent
feature.

Signed-off-by: Tobias Klauser 
Signed-off-by: Eric Anholt

drm/i915: remove render reclock support

Thu, 17 Dec 2009 19:11:13 +0000

drm/i915: remove render reclock support

This code generally fails to adjust the render clock, and when it does,
it conflicts with some other register settings and can cause problems.

So remove this code altogether.  I'm reworking it now to do the right
thing, but the only bit it will share is the VBT check for whether
reclocking is supported, so I'm leaving that bit.

Reverts most of 652c393a3368af84359da37c45afc35a91144960 ("add dynamic
clock frequency control"), though for many the regressions showed up
in the later 181a5336d6cc836f05507410d66988c483ad0154 ("Fix render
reclock availability detection").

Signed-off-by: Jesse Barnes 
Signed-off-by: Eric Anholt

drm/i915: Fix RC6 suspend/resume

Mon, 21 Dec 2009 15:10:22 +0000

drm/i915: Fix RC6 suspend/resume

We restored RC6 twice on resume, even with modesetting off.  Instead,
only restore it once and skip RC6 initialization entirely in non-KMS mode.

Signed-off-by: Andy Lutomirski 
Tested-by: Jeff Chua 
Signed-off-by: Eric Anholt

drm/i915: execbuf2 support

Fri, 18 Dec 2009 03:05:42 +0000

drm/i915: execbuf2 support

This patch adds a new execbuf ioctl, execbuf2, for use by clients that
want to control fence register allocation more finely.  The buffer
passed in to the new ioctl includes a new relocation type to indicate
whether a given object needs a fence register assigned for the command
buffer in question.

Compatibility with the existing execbuf ioctl is implemented in terms
of the new code, preserving the assumption that fence registers are
required for pre-965 rendering commands.

Signed-off-by: Jesse Barnes 
[ickle: Remove pre-emptive clear_fence_reg()]
Signed-off-by: Chris Wilson 
Signed-off-by: Kristian HÃ¸gsberg 
[anholt: Removed dmesg spam]
Signed-off-by: Eric Anholt

DaVinci: DM365: Add the device_enable for the DaVinci Keyscan

Fri, 13 Nov 2009 19:44:23 +0000

DaVinci: DM365: Add the device_enable for the DaVinci Keyscan

Adds the device_enable function to the DaVinci Keyscan platform data
to setup the PINMUX configuration.

It also removes #ifdef from the DM365 EVM board in order to load it
properly as a module.

Signed-off-by: Miguel Aguilar 
Signed-off-by: Kevin Hilman

davinci: enable ARCH_HAS_HOLES_MEMORYMODEL for DaVinci

Thu, 19 Nov 2009 10:04:01 +0000

davinci: enable ARCH_HAS_HOLES_MEMORYMODEL for DaVinci

All DaVinci platforms include a DSP or co-processor for
audio/video acceleration.

While creating memory for the DSP/co-processor, system
integrator can end up creating a hole in the memory map
of the sort:

  

This sort of configuration needs ARCH_HAS_HOLES_MEMORYMODEL
enabled. See further details see this discussion on ARM
linux mailing list:
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg15262.html

The patch is boot tested on OMAP-L138, DM6446 and DM355 EVMs

Signed-off-by: Sekhar Nori 
CC: Sriramakrishnan 
CC: Khasim Syed Mohammed 
Signed-off-by: Kevin Hilman

davinci: da8xx/omap-l1: mark RTC as a wakeup source

Mon, 16 Nov 2009 11:51:31 +0000

davinci: da8xx/omap-l1: mark RTC as a wakeup source

On da850, RTC alarm is a wakeup source from deep sleep.
Mark it as a wakeup source after the rtc platform device
is registered.

Without this patch, the rtc-omap driver suspends the RTC
during the suspend sequence and hence it cannot wakeup the
SoC.

Signed-off-by: Sekhar Nori 
Signed-off-by: Kevin Hilman

davinci: cp_intc: provide set_wake function

Mon, 16 Nov 2009 11:51:30 +0000

davinci: cp_intc: provide set_wake function

There is nothing special to be done for interrupts
which can wakeup the device from sleep on CP-INTC,
but not having a set_wake implemented prevents use
of common drivers which expect this function to be
implemented for all wakeup interrupt sources.

This patch fixes the issue encountered when using the
omap-rtc driver on DA850. On DA850 the RTC alarm
interrupt is used to wake up the SoC from deep sleep
mode. Without this patch, the disable_irq_wake throws
an unbalanced wake disable warning while resuming
because the previous enable call fails for lack of
set_wake implementation.

Signed-off-by: Sekhar Nori 
Signed-off-by: Kevin Hilman

Davinci VPFE Capture: Take i2c adapter id through platform data

Tue, 13 Oct 2009 15:08:54 +0000

Davinci VPFE Capture: Take i2c adapter id through platform data

The I2C adapter ID is actually depends on Board and may vary, Davinci
uses id=1, but in case of AM3517 id=3.

So modified respective davinci board files.

Signed-off-by: Vaibhav Hiremath 
Signed-off-by: Kevin Hilman

Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

Wed, 6 Jan 2010 09:41:07 +0000

Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  exofs: simple_write_end does not mark_inode_dirty
  exofs: fix pnfs_osd re-definitions in pre-pnfs trees

Merge master.kernel.org:/home/rmk/linux-2.6-arm

Wed, 6 Jan 2010 09:16:26 +0000

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits)
  ARM: 5865/1: nuc900 ethernet driver needs mii
  ARM: 5864/1: Implement arch_reset() in NUC900
  ARM: 5863/1: fix bugs of clock source of NUC900
  ARM: 5858/1: Remove unused vma_vm_flags macro from v7wbi_flush_user_tlb_range
  imx/mx3: depend on USB_ULPI for otg_ulpi_create
  ARM: MX3: make CPU revision number detection work on all boards
  mx25: pdk: add platform code for FEC support
  mx25: add support for FEC on i.MX25
  mx25: s/NO_PAD_CTL/NO_PAD_CTRL/
  mx31moboard: fix usbh device names
  mx3: add support for the mt9v022 camera sensor to pcm037 platform
  mx27: mxt_td60: Remove not used UART pins
  [ARM] pxa/poodle: fix incorrect 'gpio_card_detect' of MMC
  [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slot
  [ARM] pxa/ttc_dkb: remove duplicate macro definition
  [ARM] pxa/zeus: provide power-source information when APM is enabled
  [ARM] pxa/zeus: relax memory timings on Zeus ethernet ports
  [ARM] pxa/zeus: make internal zeus_get_pcb_info static
  [ARM] pxa/littleton: select CPU_PXA300 and CPU_PXA310
  [ARM] pxa/littleton: add UART3 GPIO config
  ...

modules: Skip empty sections when exporting section notes

Sat, 19 Dec 2009 14:43:01 +0000

modules: Skip empty sections when exporting section notes

Commit 35dead4 "modules: don't export section names of empty sections
via sysfs" changed the set of sections that have attributes, but did
not change the iteration over these attributes in add_notes_attrs().
This can lead to add_notes_attrs() creating attributes with the wrong
names or with null name pointers.

Introduce a sect_empty() function and use it in both add_sect_attrs()
and add_notes_attrs().

Reported-by: Martin Michlmayr 
Signed-off-by: Ben Hutchings 
Tested-by: Martin Michlmayr 
Cc: stable@kernel.org
Signed-off-by: Rusty Russell 
Signed-off-by: Linus Torvalds

Input: bcm5974 - report ABS_MT events

Wed, 6 Jan 2010 08:32:48 +0000

Input: bcm5974 - report ABS_MT events

Make bcm5974 report raw multi-touch (MT) data in the form of ABS_MT events.

[dtor@mail.ru: get rid of module option, always report all events]
Signed-off-by: Henrik Rydberg 
Signed-off-by: Andrew Morton 
Signed-off-by: Dmitry Torokhov

Input: davinci_keyscan - add device_enable method to platform data

Wed, 6 Jan 2010 08:06:50 +0000

Input: davinci_keyscan - add device_enable method to platform data

Add a function pointer in the platform data of the DaVinci Keyscan driver
called device_enable, in order to perform board specific actions when
the device is initialized, like setup the PINMUX configuration.

Signed-off-by: Miguel Aguilar 
Signed-off-by: Kevin Hilman 
Signed-off-by: Dmitry Torokhov

Input: evdev - be less aggressive about sending SIGIO notifies

Wed, 6 Jan 2010 01:56:04 +0000

Input: evdev - be less aggressive about sending SIGIO notifies

When using realtime signals, we'll enqueue one signal for every event.
This is unfortunate, because (for example) keyboard presses are three
events: key, msc scancode, and syn.  They'll be enqueued fast enough in
kernel space that all three events will be ready to read by the time
userspace runs, so the first invocation of the signal handler will read
all three events, but then the second two invocations still have to run
to do no work.

Instead, only send the SIGIO notification on syn events.  This is a
slight abuse of SIGIO semantics, in principle it ought to fire as soon
as any events are readable.  But it matches evdev semantics, which is
more important since SIGIO is rather vaguely defined to begin with.

Signed-off-by: Adam Jackson 
Signed-off-by: Dmitry Torokhov

Input: atkbd - fix canceling event_work in disconnect

Wed, 6 Jan 2010 01:56:02 +0000

Input: atkbd - fix canceling event_work in disconnect

We need to first unregister input device and only then cancel event work
since events can arrive (and cause event work to get scheduled again)
until input_unregister_device() returns.

Signed-off-by: Dmitry Torokhov

Input: serio - fix potential deadlock when unbinding drivers

Wed, 6 Jan 2010 01:56:02 +0000

Input: serio - fix potential deadlock when unbinding drivers

sysfs_remove_group() waits for sysfs attributes to be removed, therefore
we do not need to worry about driver-specific attributes being accessed
after driver has been detached from the device. In fact, attempts to take
serio->drv_mutex in attribute methods may lead to the following deadlock:

                                          sysfs_read_file()
                                            fill_read_buffer()
                                              sysfs_get_active_two()
                                                psmouse_attr_show_helper()
                                                  serio_pin_driver()
serio_disconnect_driver()
  mutex_lock(&serio->drv_mutex);
                                <-------->        mutex_lock(&serio_drv_mutex);
    psmouse_disconnect()
      sysfs_remove_group(... psmouse_attr_group);
        ....
        sysfs_deactivate();
          wait_for_completion();

Fix this by removing calls to serio_[un]pin_driver() and functions themselves
and using driver-private mutexes to serialize access to attribute's set()
methods that may change device state.

Signed-off-by: Eric W. Biederman 
Signed-off-by: Dmitry Torokhov

drm/radeon/kms: add missing breaks in i2c and ss lookups

Mon, 28 Dec 2009 18:45:23 +0000

drm/radeon/kms: add missing breaks in i2c and ss lookups

Should fix fdo bug 25741

Signed-off-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm/radeon/kms: add primary dac adj values table

Tue, 29 Dec 2009 17:09:17 +0000

drm/radeon/kms: add primary dac adj values table

Look up primary dac adj values from the table if
there is no bios or bios dac table to reference.

The lookup table may need to be adjusted for certain
families.

Should fix kernel bug 14945.

Signed-off-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm/radeon/kms: fallback to default connector table

Tue, 5 Jan 2010 00:12:02 +0000

drm/radeon/kms: fallback to default connector table

if necessary for combios

Some early combios radeon cards don't have a connector
table or dac table in the bios, if they do not, fallback
to the default tables.

Should fix kernel bug 14963.

Signed-off-by: Alex Deucher 
Signed-off-by: Dave Airlie

Linux 2.6.33-rc3

Wed, 6 Jan 2010 00:02:46 +0000

Linux 2.6.33-rc3

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

Wed, 6 Jan 2010 00:01:58 +0000

Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix Niagara2 perf event handling.
  sparc64: Fix NMI programming when perf events are active.
  bbc_envctrl: Clean up properly if kthread_run() fails.

Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium"

Tue, 5 Jan 2010 02:18:49 +0000

Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium"

This reverts commit ae1b22f6e46c03cede7cea234d0bf2253b4261cf.

As Linus said in 982d007a6ee: "There was something really messy about
cmpxchg8b and clone CPU's, so if you enable it on other CPUs later, do it
carefully."

This breaks lguest for those configs, but we can fix that by emulating
if we have to.

Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=14884
Signed-off-by: Rusty Russell 
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec ...

Wed, 6 Jan 2010 00:01:04 +0000

Merge branch 'upstream-linus' of git://git./linux/kernel/git/jlbec/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2: Handle O_DIRECT when writing to a refcounted cluster.

Merge branch 'for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie ...

Tue, 5 Jan 2010 23:59:56 +0000

Merge branch 'for-2.6.33' of git://git./linux/kernel/git/broonie/sound-2.6

* 'for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6:
  ASoC: fixup oops in generic AC97 codec glue
  ASoC: fix params_rate() macro use in several codecs
  ASoC: fsi-ak4642: Remove ak4642_add_i2c_device

x86: copy_from_user() should not return -EFAULT

Tue, 5 Jan 2010 13:19:11 +0000

x86: copy_from_user() should not return -EFAULT

Callers of copy_from_user() expect it to return the number of bytes
it could not copy. In no case it is supposed to return -EFAULT.

In case of a detected buffer overflow just return the requested
length. In addition one could think of a memset that would clear
the size of the target object.

[ hpa: code is not in .32 so not needed for -stable ]

Signed-off-by: Heiko Carstens 
Acked-by: Arjan van de Ven 
LKML-Reference: <20100105131911.GC5480@osiris.boeblingen.de.ibm.com>
Signed-off-by: H. Peter Anvin

rt2x00: Properly request tx headroom for alignment operations.

Wed, 30 Dec 2009 10:36:30 +0000

rt2x00: Properly request tx headroom for alignment operations.

Current rt2x00 drivers may result in a "ieee80211_tx_status: headroom too
small" error message when a frame needs to be properly aligned before
transmitting it.
This is because the space needed to ensure proper alignment isn't
requested from mac80211.
Fix this by adding sufficient amount of alignment space to the amount
of headroom requested for TX frames.

Reported-by: David Ellingsworth 
Signed-off-by: Gertjan van Wingerde 
Acked-by: Ivo van Doorn 
Signed-off-by: John W. Linville

mac80211: fix skb buffering issue

Tue, 5 Jan 2010 17:00:58 +0000

mac80211: fix skb buffering issue

Since I removed the master netdev, we've been
keeping internal queues only, and even before
that we never told the networking stack above
the virtual interfaces about congestion. This
means that packets are queued in mac80211 and
the upper layers never know, possibly leading
to memory exhaustion and other problems.

This patch makes all interfaces multiqueue and
uses ndo_select_queue to put the packets into
queues per AC. Additionally, when the driver
stops a queue, we now stop all corresponding
queues for the virtual interfaces as well.

The injection case will use VO by default for
non-data frames, and BE for data frames, but
downgrade any data frames according to ACM. It
needs to be fleshed out in the future to allow
chosing the queue/AC in radiotap.

Reported-by: Lennert Buytenhek 
Signed-off-by: Johannes Berg 
Cc: stable@kernel.org [2.6.32]
Signed-off-by: John W. Linville

rt2x00: Fix LED configuration setting for rt2800.

Wed, 30 Dec 2009 10:36:33 +0000

rt2x00: Fix LED configuration setting for rt2800.

rt2800_blink_set uses an illegal value to set the LED_CFG_G_LED_MODE
field of the LED_CFG register. This field is only 2 bits large, so
should be initialized with value that fits. Use default value from
the vendor driver.

Signed-off-by: Gertjan van Wingerde 
Acked-by: Ivo van Doorn 
Signed-off-by: John W. Linville

rt2x00: use correct headroom for transmission

Wed, 30 Dec 2009 10:36:29 +0000

rt2x00: use correct headroom for transmission

Use rt2x00dev->ops->extra_tx_headroom, not rt2x00dev->hw->extra_tx_headroom
in the tx code, as the later may include other headroom not to be used in
the chipset driver.

Signed-off-by: Pavel Roskin 
Signed-off-by: Gertjan van Wingerde 
Acked-by: Ivo van Doorn 
Signed-off-by: John W. Linville

ARM: 5865/1: nuc900 ethernet driver needs mii

Thu, 31 Dec 2009 15:03:16 +0000

ARM: 5865/1: nuc900 ethernet driver needs mii

nuc900 ethernet driver uses mii_xx_xx serials api, so mii module should be selected.

Signed-off-by: lijie 
Acked-by: Wan ZongShun 
Signed-off-by: Russell King

ARM: 5864/1: Implement arch_reset() in NUC900

Thu, 31 Dec 2009 14:50:02 +0000

ARM: 5864/1: Implement arch_reset() in NUC900

Implement arch_reset(), reboot from shell become possible.

Signed-off-by: lijie 
Acked-by: Wan ZongShun 
Signed-off-by: Russell King

ARM: 5863/1: fix bugs of clock source of NUC900

Thu, 31 Dec 2009 14:57:53 +0000

ARM: 5863/1: fix bugs of clock source of NUC900

This patch fix following bugs:

1. typo error, CLOCK_EVT_MODE_PERIODIC -> CLOCK_EVT_FEAT_PERIODIC
2. TCSR register of timer1 missed PRESCALE
3. timer1 should be enabled before register it to clock source.

Signed-off-by: lijie 
Acked-by: Wan ZongShun 
Signed-off-by: Russell King

ARM: 5858/1: Remove unused vma_vm_flags macro from v7wbi_flush_user_tlb_range

Fri, 25 Dec 2009 13:25:48 +0000

ARM: 5858/1: Remove unused vma_vm_flags macro from v7wbi_flush_user_tlb_range

Signed-off-by: Bahadir Balban 
Signed-off-by: Russell King

sparc64: Fix Niagara2 perf event handling.

Tue, 5 Jan 2010 07:16:03 +0000

sparc64: Fix Niagara2 perf event handling.

For chips like Niagara2 that have true overflow indications
in the %pcr (which we don't actually need and don't use)
the interrupt signal persists until the overflow bits are
cleared by an explicit %pcr write.

Signed-off-by: David S. Miller

exofs: simple_write_end does not mark_inode_dirty

Sun, 27 Dec 2009 15:01:42 +0000

exofs: simple_write_end does not mark_inode_dirty

exofs uses simple_write_end() for it's .write_end handler. But
it is not enough because simple_write_end() does not call
mark_inode_dirty() when it extends i_size. So even if we do
call mark_inode_dirty at beginning of write out, with a very
long IO and a saturated system we might get the .write_inode()
called while still extend-writing to file and miss out on the last
i_size updates.

So override .write_end, call simple_write_end(), and afterwords if
i_size was changed call mark_inode_dirty().

It stands to logic that since simple_write_end() was the one extending
i_size it should also call mark_inode_dirty(). But it looks like all
users of simple_write_end() are memory-bound pseudo filesystems, who
could careless about mark_inode_dirty(). I might submit a
warning-comment patch to simple_write_end() in future.

CC: Stable 
Signed-off-by: Boaz Harrosh

exofs: fix pnfs_osd re-definitions in pre-pnfs trees

Mon, 21 Dec 2009 14:36:23 +0000

exofs: fix pnfs_osd re-definitions in pre-pnfs trees

Some on disk exofs constants and types are defined in the pnfs_osd_xdr.h
file. Since we needed these types before the pnfs-objects code was
accepted to mainline we duplicated the minimal needed definitions into
an exofs local header. The definitions where conditionally included
depending on !CONFIG_PNFS defined. So if PNFS was present in the tree
definitions are taken from there and if not they are defined locally.

That was all good but, the CONFIG_PNFS is planed to be included upstream
before the pnfs-objects is also included. (The first pnfs batch might be
pnfs-files only)

So condition exofs local definitions on the absence of pnfs_osd_xdr.h
inclusion (__PNFS_OSD_XDR_H__ not defined). User code must make sure
that in future pnfs_osd_xdr.h will be included before fs/exofs/pnfs.h,
which happens to be so in current code.

Once pnfs-objects hits mainline, exofs's local header will be removed.

Signed-off-by: Boaz Harrosh

reiserfs: Relax lock on xattr removing

Tue, 5 Jan 2010 01:14:30 +0000

reiserfs: Relax lock on xattr removing

When we remove an xattr, we call lookup_and_delete_xattr()
that takes some private xattr inodes mutexes. But we hold
the reiserfs lock at this time, which leads to dependency
inversions.

We can safely call lookup_and_delete_xattr() without the
reiserfs lock, where xattr inodes lookups only need the
xattr inodes mutexes.

Signed-off-by: Frederic Weisbecker 
Cc: Christian Kujau 
Cc: Alexander Beregalov 
Cc: Chris Mason 
Cc: Ingo Molnar

reiserfs: Relax the lock before truncating pages

Mon, 4 Jan 2010 23:15:38 +0000

reiserfs: Relax the lock before truncating pages

While truncating a file, reiserfs_setattr() calls inode_setattr()
that will truncate the mapping for the given inode, but for that
it needs the pages locks.

In order to release these, the owners need the reiserfs lock to
complete their jobs. But they can't, as we don't release it before
calling inode_setattr().

We need to do that to fix the following softlockups:

INFO: task flush-8:0:2149 blocked for more than 120 seconds.
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
flush-8:0     D f51af998     0  2149      2 0x00000000
 f51af9ac 00000092 00000002 f51af998 c2803304 00000000 c1894ad0 010f3000
 f51af9cc c1462604 c189ef80 f51af974 c1710304 f715b450 f715b5ec c2807c40
 00000000 0005bb00 c2803320 c102c55b c1710304 c2807c50 c2803304 00000246
Call Trace:
 [] ? schedule+0x434/0xb20
 [] ? resched_task+0x4b/0x70
 [] ? mark_held_locks+0x62/0x80
 [] ? mutex_lock_nested+0x1fd/0x350
 [] mutex_lock_nested+0x169/0x350
 [] ? reiserfs_write_lock+0x2e/0x40
 [] reiserfs_write_lock+0x2e/0x40
 [] do_journal_end+0xc2/0xe70
 [] journal_end+0xb2/0x120
 [] ? pathrelse+0x33/0xb0
 [] reiserfs_end_persistent_transaction+0x64/0x70
 [] reiserfs_get_block+0x12ba/0x15f0
 [] ? mark_held_locks+0x62/0x80
 [] reiserfs_writepage+0xa74/0xe80
 [] ? _raw_spin_unlock_irq+0x27/0x50
 [] ? radix_tree_gang_lookup_tag_slot+0x95/0xc0
 [] ? find_get_pages_tag+0x127/0x1a0
 [] ? mark_held_locks+0x62/0x80
 [] ? trace_hardirqs_on_caller+0x124/0x170
 [] __writepage+0x10/0x40
 [] write_cache_pages+0x16b/0x320
 [] ? __writepage+0x0/0x40
 [] generic_writepages+0x28/0x40
 [] do_writepages+0x35/0x40
 [] writeback_single_inode+0xc7/0x330
 [] writeback_inodes_wb+0x2c2/0x490
 [] wb_writeback+0x106/0x1b0
 [] wb_do_writeback+0x106/0x1e0
 [] ? wb_do_writeback+0x28/0x1e0
 [] bdi_writeback_task+0x3a/0xb0
 [] bdi_start_fn+0x63/0xc0
 [] ? bdi_start_fn+0x0/0xc0
 [] kthread+0x74/0x80
 [] ? kthread+0x0/0x80
 [] kernel_thread_helper+0x6/0x10
3 locks held by flush-8:0/2149:
 #0:  (&type->s_umount_key#30){+++++.}, at: [] writeback_inodes_wb+0x27f/0x490
 #1:  (&journal->j_mutex){+.+...}, at: [] do_journal_end+0xba/0xe70
 #2:  (&REISERFS_SB(s)->lock){+.+.+.}, at: [] reiserfs_write_lock+0x2e/0x40
INFO: task fstest:3813 blocked for more than 120 seconds.
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
fstest        D 00000002     0  3813   3812 0x00000000
 f5103c94 00000082 f5103c40 00000002 f5ad5450 00000007 f5103c28 011f3000
 00000006 f5ad5450 c10bb005 00000480 c1710304 f5ad5450 f5ad55ec c2907c40
 00000001 f5ad5450 f5103c74 00000046 00000002 f5ad5450 00000007 f5103c6c
Call Trace:
 [] ? free_hot_cold_page+0x1d5/0x280
 [] io_schedule+0x74/0xc0
 [] sync_page+0x35/0x60
 [] __wait_on_bit_lock+0x4a/0x90
 [] ? sync_page+0x0/0x60
 [] __lock_page+0x85/0x90
 [] ? wake_bit_function+0x0/0x60
 [] truncate_inode_pages_range+0x1e4/0x2d0
 [] truncate_inode_pages+0x1f/0x30
 [] truncate_pagecache+0x5f/0xa0
 [] vmtruncate+0x5a/0x70
 [] inode_setattr+0x5d/0x190
 [] reiserfs_setattr+0x1f7/0x2f0
 [] ? down_write+0x49/0x70
 [] notify_change+0x151/0x330
 [] do_truncate+0x6d/0xa0
 [] do_filp_open+0x9a2/0xcf0
 [] ? _raw_spin_unlock+0x2c/0x50
 [] ? alloc_fd+0xe0/0x100
 [] do_sys_open+0x6d/0x130
 [] ? sysenter_exit+0xf/0x16
 [] sys_open+0x2e/0x40
 [] sysenter_do_call+0x12/0x32
3 locks held by fstest/3813:
 #0:  (&sb->s_type->i_mutex_key#4){+.+.+.}, at: [] do_truncate+0x63/0xa0
 #1:  (&sb->s_type->i_alloc_sem_key#3){+.+.+.}, at: [] notify_change+0x257/0x330
 #2:  (&REISERFS_SB(s)->lock){+.+.+.}, at: [] reiserfs_write_lock_once+0x2e/0x50

Signed-off-by: Frederic Weisbecker 
Cc: Christian Kujau 
Cc: Alexander Beregalov 
Cc: Chris Mason 
Cc: Ingo Molnar

reiserfs: Fix recursive lock on lchown

Mon, 4 Jan 2010 21:04:01 +0000

reiserfs: Fix recursive lock on lchown

On chown, reiserfs will call reiserfs_setattr() to change the owner
of the given inode, but it may also recursively call
reiserfs_setattr() to propagate the owner change to the private xattr
files for this inode.

Hence, the reiserfs lock may be acquired twice which is not wanted
as reiserfs_setattr() calls journal_begin() that is going to try to
relax the lock in order to safely acquire the journal mutex.

Using reiserfs_write_lock_once() from reiserfs_setattr() solves
the problem.

This fixes the following warning, that precedes a lockdep report.

WARNING: at fs/reiserfs/lock.c:95 reiserfs_lock_check_recursive+0x3f/0x50()
Hardware name: MS-7418
Unwanted recursive reiserfs lock!
Pid: 4189, comm: fsstress Not tainted 2.6.33-rc2-tip-atom+ #195
Call Trace:
 [] ? reiserfs_lock_check_recursive+0x3f/0x50
 [] ? reiserfs_lock_check_recursive+0x3f/0x50
 [] warn_slowpath_common+0x6c/0xc0
 [] ? reiserfs_lock_check_recursive+0x3f/0x50
 [] warn_slowpath_fmt+0x2b/0x30
 [] reiserfs_lock_check_recursive+0x3f/0x50
 [] do_journal_begin_r+0x83/0x350
 [] journal_begin+0x7d/0x140
 [] ? in_group_p+0x2a/0x30
 [] ? inode_change_ok+0x91/0x140
 [] reiserfs_setattr+0x15d/0x2e0
 [] ? dput+0xe3/0x140
 [] ? _raw_spin_unlock+0x2c/0x50
 [] chown_one_xattr+0xd/0x10
 [] reiserfs_for_each_xattr+0x113/0x2c0
 [] ? chown_one_xattr+0x0/0x10
 [] ? mutex_lock_nested+0x2a9/0x350
 [] reiserfs_chown_xattrs+0x1f/0x60
 [] ? in_group_p+0x2a/0x30
 [] ? inode_change_ok+0x91/0x140
 [] reiserfs_setattr+0x126/0x2e0
 [] ? reiserfs_getxattr+0x0/0x90
 [] ? cap_inode_need_killpriv+0x37/0x50
 [] notify_change+0x151/0x330
 [] chown_common+0x6f/0x90
 [] sys_lchown+0x6d/0x80
 [] sysenter_do_call+0x12/0x32
---[ end trace 7c2b77224c1442fc ]---

Signed-off-by: Frederic Weisbecker 
Cc: Christian Kujau 
Cc: Alexander Beregalov 
Cc: Chris Mason 
Cc: Ingo Molnar

Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium"

Tue, 5 Jan 2010 02:18:49 +0000

Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium"

This reverts commit ae1b22f6e46c03cede7cea234d0bf2253b4261cf.

As Linus said in 982d007a6ee: "There was something really messy about
cmpxchg8b and clone CPU's, so if you enable it on other CPUs later, do it
carefully."

This breaks lguest for those configs, but we can fix that by emulating
if we have to.

Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=14884
Signed-off-by: Rusty Russell 
LKML-Reference: <201001051248.49700.rusty@rustcorp.com.au>
Cc: stable@kernel.org
Signed-off-by: H. Peter Anvin

PCIe AER: prevent AER injection if hardware masks error reporting

Thu, 17 Dec 2009 13:22:48 +0000

PCIe AER: prevent AER injection if hardware masks error reporting

The Correcteable/Uncorrectable Error Mask Registers are used by PCIe AER
driver which will controls the reporting of individual errors to PCIe RC
via PCIe error messages.

If hardware masks special error reporting to RC, the aer_inject driver
should not inject aer error.

Acked-by: Andi Kleen 
Signed-off-by: Youquan, Song 
Acked-by: Ying, Huang 
Signed-off-by: Jesse Barnes

PCI/PM: Use per-device D3 delays

Thu, 31 Dec 2009 11:15:54 +0000

PCI/PM: Use per-device D3 delays

It turns out that some PCI devices require extra delays when changing
power state from D3 to D0 (and the other way around).  Although this
is against the PCI specification, we can handle it quite easily by
allowing drivers to define arbitrary D3 delays for devices known to
require extra time for switching power states.

Introduce additional field d3_delay in struct pci_dev and use it to
store the value of the device's D0->D3 delay, in miliseconds.  Make
the PCI PM core code use the per-device d3_delay unless
pci_pm_d3_delay is greater (in which case the latter is used).
[This also allows the driver to specify d3_delay shorter than the
 10 ms required by the PCI standard if the device is known to be able
 to handle that.]

Make the sky2 driver set d3_delay to 150 for devices handled by it.

Fixes http://bugzilla.kernel.org/show_bug.cgi?id=14730 which is a
listed regression from 2.6.30.

Signed-off-by: Rafael J. Wysocki 
Signed-off-by: Jesse Barnes

sparc64: Fix NMI programming when perf events are active.

Mon, 4 Jan 2010 23:37:04 +0000

sparc64: Fix NMI programming when perf events are active.

If perf events are active, we should not reset the %pcr to
PCR_PIC_PRIV.  That perf events code does the management.

Signed-off-by: David S. Miller

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Mon, 4 Jan 2010 23:33:22 +0000

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

bbc_envctrl: Clean up properly if kthread_run() fails.

Mon, 4 Jan 2010 23:31:10 +0000

bbc_envctrl: Clean up properly if kthread_run() fails.

In bbc_envctrl_init() we have to unlink the fan and temp instances
from the lists because our caller is going to free up the 'bp' object
if we return an error.

We can't rely upon bbc_envctrl_cleanup() to do this work for us in
this case.

Reported-by: Patrick Finnegan 
Signed-off-by: David S. Miller

PCI: Check the node argument passed to cpumask_of_node

Mon, 4 Jan 2010 14:58:57 +0000

PCI: Check the node argument passed to cpumask_of_node

Commit e0cd516 "PCI: derive nearby CPUs from device's instead of bus'
NUMA information" causes an null pointer dereference when reading from
the sysfs attributes local_cpu* on Intel machines with no ACPI NUMA
proximity info, since dev->numa_node gets set to -1 for all PCI devices,
which then gets passed to cpumask_of_node.

Add a check to prevent this.

Signed-off-by: David John 
Signed-off-by: Jesse Barnes

cxgb3i: Fix flags test.

Mon, 4 Jan 2010 22:36:40 +0000

cxgb3i: Fix flags test.

As noticed by Stephen Rothwell.

Signed-off-by: David S. Miller

x86/pci: Intel ioh bus num reg accessing fix

Tue, 22 Dec 2009 23:40:40 +0000

x86/pci: Intel ioh bus num reg accessing fix

It is above 0x100 (PCI-Express extended register space), so if mmconf
is not enable, we can't access it.

[ hpa: changed the bound from 0x200 to 0x120, which is the tight
  bound. ]

Reported-by: Jens Axboe 
Signed-off-by: Yinghai Lu 
LKML-Reference: <1261525263-13763-3-git-send-email-yinghai@kernel.org>
Signed-off-by: H. Peter Anvin

x86: Fix size for ex trampoline with 32bit

Tue, 22 Dec 2009 23:40:39 +0000

x86: Fix size for ex trampoline with 32bit

fix for error that is introduced by
| x86: Use find_e820() instead of hard coded trampoline address

it should end with PAGE_SIZE + PAGE_SIZE

Signed-off-by: Yinghai Lu 
LKML-Reference: <1261525263-13763-2-git-send-email-yinghai@kernel.org>
Signed-off-by: H. Peter Anvin

cfg80211: fix syntax error on user regulatory hints

Mon, 4 Jan 2010 16:37:39 +0000

cfg80211: fix syntax error on user regulatory hints

This fixes a syntax error when setting up the user regulatory
hint. This change yields the same exact binary object though
so it ends up just being a syntax typo fix, fortunately.

Cc: stable@kernel.org
Signed-off-by: Luis R. Rodriguez 
Signed-off-by: John W. Linville

ath5k: Fix eeprom checksum check for custom sized eeproms

Mon, 4 Jan 2010 15:40:39 +0000

ath5k: Fix eeprom checksum check for custom sized eeproms

Commit 8bf3d79bc401ca417ccf9fc076d3295d1a71dbf5 enabled EEPROM
checksum checks to avoid bogus bug reports but failed to address
updating the code to consider devices with custom EEPROM sizes.
Devices with custom sized EEPROMs have the upper limit size stuffed
in the EEPROM. Use this as the upper limit instead of the static
default size. In case of a checksum error also provide back the
max size and whether or not this was the default size or a custom
one. If the EEPROM is busted we add a failsafe check to ensure
we don't loop forever or try to read bogus areas of hardware.

This closes bug 14874

http://bugzilla.kernel.org/show_bug.cgi?id=14874

Cc: stable@kernel.org
Cc: David Quan 
Cc: Stephen Beahm 
Reported-by: Joshua Covington 
Signed-off-by: Luis R. Rodriguez 
Signed-off-by: John W. Linville

zd1211rw: Fix multicast filtering.

Sun, 3 Jan 2010 09:20:01 +0000

zd1211rw: Fix multicast filtering.

If multicast parameter (as returned by zd_op_prepare_multicast) has
changed, no bit in changed_flags is set. To handle this situation, we do
not return if changed_flags is 0. If we do so, we will have some issue
with IPv6 which uses multicast for link layer address resolution.

Signed-off-by: Benoit Papillault 
Signed-off-by: John W. Linville

iwl: off by one bug

Sun, 3 Jan 2010 09:19:35 +0000

iwl: off by one bug

tid is used as an array offset.
	agg = &priv->stations[sta_id].tid[tid].agg;
	iwl4965_tx_status_reply_tx(priv, agg, tx_resp, txq_id, index);

It should be limitted to MAX_TID_COUNT - 1;
        struct iwl_tid_data tid[MAX_TID_COUNT];

regards,
dan carpenter

Signed-off-by: Dan Carpenter 
CC: stable@kernel.org
Signed-off-by: John W. Linville

mwl8k: fix configure_filter() memory leak on error

Sat, 2 Jan 2010 09:31:42 +0000

mwl8k: fix configure_filter() memory leak on error

If there was an error acquiring the firmware lock in
mwl8k_configure_filter(), we would end up leaking the multicast
command packet prepared by mwl8k_prepare_multicast().

Signed-off-by: Lennert Buytenhek 
Signed-off-by: John W. Linville

ath9k: fix ito64

Tue, 29 Dec 2009 14:57:28 +0000

ath9k: fix ito64

The unit of sizeof() is byte instead of bit, so fix it.
The patch can fix debug output of some dma_addr_t variables.

Signed-off-by: John W. Linville

ath9k: Fix Kconfig depends for ATH9K_DEBUGFS

Tue, 29 Dec 2009 07:27:57 +0000

ath9k: Fix Kconfig depends for ATH9K_DEBUGFS

Add missing DEBUG_FS dependency for ATH9K_DEBUGFS in ath9k's Kconfig.

Signed-off-by: Dominik D. Geyer 
Signed-off-by: John W. Linville

Merge branch 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux

Mon, 4 Jan 2010 20:36:54 +0000

Merge branch 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux

* 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux:
  resource: add helpers for fetching rlimits
  resource: move kernel function inside __KERNEL__
  SECURITY: selinux, fix update_rlimit_cpu parameter

Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux

Mon, 4 Jan 2010 20:35:18 +0000

Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux

* 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux:
  ARM: S3C: Fix NAND device registration by s3c_nand_set_platdata().
  ARM: S3C24XX: touchscreen device definition
  ARM: mach-bast: add NAND_SCAN_SILENT_NODEV to optional devices
  ARM: mach-osiris: add NAND_SCAN_SILENT_NODEV to optional devices
  ARM: S3C24XX: touchscreen device definition

sysfs: Add lockdep annotations for the sysfs active reference

Sat, 2 Jan 2010 21:37:12 +0000

sysfs: Add lockdep annotations for the sysfs active reference

Holding locks over device_del -> kobject_del -> sysfs_deactivate can
cause deadlocks if those same locks are grabbed in sysfs show or store
methods.

The I model s_active count + completion as a sleeping read/write lock.
I describe to lockdep sysfs_get_active as a read_trylock,
sysfs_put_active as a read_unlock, and sysfs_deactivate as a
write_lock and write_unlock pair.  This seems to capture the essence
for purposes of finding deadlocks, and in my testing gives finds real
issues and ignores non-issues.

This brings us back to holding locks over kobject_del is a problem
that ideally we should find a way of addressing, but at least lockdep
can tell us about the problems instead of requiring developers to debug
rare strange system deadlocks, that happen when sysfs files are removed
while being written to.

Signed-off-by: Eric W. Biederman 
Acked-by: Tejun Heo 
Signed-off-by: Linus Torvalds

lguest: fix bug in setting guest GDT entry

Mon, 4 Jan 2010 08:56:14 +0000

lguest: fix bug in setting guest GDT entry

We kill the guest, but then we blatt random stuff.

Reported-by: Dan Carpenter 
Signed-off-by: Rusty Russell 
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

Mon, 4 Jan 2010 20:32:42 +0000

Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] Update default configuration.
  [S390] Have param.h simply include .
  [S390] qdio: convert global statistics to per-device stats

Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal ...

Mon, 4 Jan 2010 20:32:09 +0000

Merge branch 'sh/for-2.6.33' of git://git./linux/kernel/git/lethal/sh-2.6

* 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  binfmt_elf_fdpic: Fix build breakage introduced by coredump changes.
  sh: update defconfigs.
  sh: Don't default enable PMB support.
  sh: Disable PMB for SH4AL-DSP CPUs.
  sh: Only provide a PCLK definition for legacy CPG CPUs.

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Mon, 4 Jan 2010 20:31:52 +0000

Merge branch 'for_linus' of git://git./linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: Calculate metadata requirements more accurately
  ext4: Fix accounting of reserved metadata blocks

tosh: Use non bkl ioctl

Mon, 4 Jan 2010 16:19:55 +0000

tosh: Use non bkl ioctl

We wrap the smm calls and other bits with the BKL push down as a
precaution but they can probably go

Signed-off-by: Alan Cox 
Signed-off-by: Linus Torvalds

i2o: propogate the BKL down into the ioctl method

Mon, 4 Jan 2010 16:18:27 +0000

i2o: propogate the BKL down into the ioctl method

Nobody seems to want to own I2O patches so sending this one directly.

Signed-off-by: Alan Cox 
Signed-off-by: Linus Torvalds

sony_pi: Remove the BKL from open and ioctl

Sun, 18 Oct 2009 21:49:49 +0000

sony_pi: Remove the BKL from open and ioctl

The BKL is in this function because of the BKL pushdown (see commit
f8f2c79d594463427f7114cedb1555110d547d89)

It is not needed here because the mutex_lock sonypi_device.lock provides
the necessary locking.

sonypi_misc_ioctl can be converted to unlocked ioctls since it relies on
its own locking (the mutex sonypi_device.lock) and not the bkl

Document that llseek is not needed by explictly setting it to no_llseek

LKML-Reference: 
Signed-off-by: John Kacur 
Acked-by: Arnd Bergmann 
Signed-off-by: Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke ...

Mon, 4 Jan 2010 20:28:26 +0000

Merge branch 'for-linus' of git://git./linux/kernel/git/ryusuke/nilfs2

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: update mailing list address
  nilfs2: Storage class should be before const qualifier
  nilfs2: trivial coding style fix

ASoC: fixup oops in generic AC97 codec glue

Mon, 4 Jan 2010 15:29:49 +0000

ASoC: fixup oops in generic AC97 codec glue

Initialize the glue by calling snd_soc_new_ac97_codec() as is done
in other ASoC AC97 codecs.  Fixes an oops caused by dereferencing
uninitialized members in snd_soc_new_pcms().

Run-tested on Au1250.

Signed-off-by: Manuel Lauss 
Acked-by: Liam Girdwood 
Signed-off-by: Mark Brown

[SCSI] lpfc 8.3.7: Update Driver version to 8.3.7

Mon, 21 Dec 2009 22:03:47 +0000

[SCSI] lpfc 8.3.7: Update Driver version to 8.3.7

Update Driver version to 8.3.7

Signed-off-by: James Smart 
Signed-off-by: James Bottomley

[SCSI] lpfc 8.3.7: Fix discovery failures.

Mon, 21 Dec 2009 22:03:15 +0000

[SCSI] lpfc 8.3.7: Fix discovery failures.

Fix discovery failures:
- Move all accesses to the fc_flag field inside the host lock.
- Restore link state after going through linkdown processing for FCF DEAD event.

Signed-off-by: James Smart 
Signed-off-by: James Bottomley

[SCSI] lpfc 8.3.7: Fix SCSI protocol related errors.

Mon, 21 Dec 2009 22:02:51 +0000

[SCSI] lpfc 8.3.7: Fix SCSI protocol related errors.

Fix SCSI protocol related errors:
- Avoid I/O failures during EEH and HBA/CNA reset by correcting when
  we block the targets on the adapter.

Signed-off-by: James Smart 
Signed-off-by: James Bottomley

[SCSI] lpfc 8.3.7: Fix hardware/SLI relates issues

Mon, 21 Dec 2009 22:02:28 +0000

[SCSI] lpfc 8.3.7: Fix hardware/SLI relates issues

Fix hardware/SLI relates issues:
- Fix CNA uses more than one EQ when in INTx interrupt mode.
- Fix driver tries to process failed read FCF record mailbox request.
- Fix allocating single receive buffer breaks FCoE receive queue.
- Support new read FCF record mailbox error case.

Signed-off-by: James Smart 
Signed-off-by: James Bottomley

[SCSI] lpfc 8.3.7: Fix NPIV operation errors

Mon, 21 Dec 2009 22:02:00 +0000

[SCSI] lpfc 8.3.7: Fix NPIV operation errors

Fix NPIV operation errors:
- Fix vport not logging out of fabric when being deleted
- Fix vport fails to discover targets after devloss timeout.

Signed-off-by: James Smart 
Signed-off-by: James Bottomley

[SCSI] lpfc 8.3.7: Fix FC protocol errors

Mon, 21 Dec 2009 22:01:23 +0000

[SCSI] lpfc 8.3.7: Fix FC protocol errors

Fix FC protocol errors:
- Fix multi-frame unsolicited sequences not queued properly
- Fix frames for unsolicited sequences not being associated with sequence.
- Fix unsolicited frame buffer sizes are not set properly
- Fix Sequence count for unsolicited frame headers not byte swapped.
- Fix Multi-frame sequence response frames go to wrong DID.

Signed-off-by: James Smart 
Signed-off-by: James Bottomley

[SCSI] stex: fix scan of nonexistent lun

Sat, 19 Dec 2009 01:34:51 +0000

[SCSI] stex: fix scan of nonexistent lun

During a manual scan, a user can send command to a nonexistent
lun, precisely at the point of max_lun. Normally it's possible
(but not required) that the firmware has the knowledge that it
is an invalid lun. In the particular case when max_lun is 256,
however, the nonexistent lun 256 will be confused with lun 0,
because the lun member in a request message is only u8, and 256
will become 0. So we need to fix the problem, at least, at the
driver level.

Signed-off-by: Ed Lin 
Signed-off-by: James Bottomley

PCI: AER: fix aer inject result in kernel oops

Fri, 11 Dec 2009 23:42:35 +0000

PCI: AER: fix aer inject result in kernel oops

If the BIOS does not export _OSC to allow OS take over the PCIe AER, the
pcie aer driver will not initialize the aer service. However, the
aer_inject driver does not check this scenario, which results in a kernel
oops when injecting an aer error into OS.  For example:

BUG: unable to handle kernel NULL pointer dereference at 0000000000000350
IP: [] _spin_lock_irqsave+0xc/0x23
PGD 155c41067 PUD 157fe0067 PMD 0
Oops: 0002 [#1] SMP
Pid: 5119, comm: aer-inject Not tainted 2.6.32-rc8-mce #2
RIP: 0010:[]  [] _spin_lock_irqsave+0xc/0x23
RSP: 0018:ffff880157f81e28  EFLAGS: 00010096
RAX: 0000000000000296 RBX: 0000000000000000 RCX: 0000000000000100
RDX: 0000000000010000 RSI: 0000000000000246 RDI: 0000000000000350
RBP: ffff880157f81e28 R08: 0000000000000004 R09: ffff880157f81dac
R10: ffff88015a666f60 R11: ffff88015a666f40 R12: ffff88015758cc00
R13: 0000000000000350 R14: 0000000000000000 R15: 0000000000000100
FS:  00007f4d4a66e6f0(0000) GS:ffff8800282e0000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 0000000000000350 CR3: 000000015661a000 CR4: 00000000000006e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process aer-inject (pid: 5119, threadinfo ffff880157f80000, task ffff8801585f4340)
Stack:
 ffff880157f81e78 ffffffff811b1615 ffff880157f81e78 ffffffff81222823
Call Trace:
 [] aer_irq+0x38/0x117
 [] ? device_for_each_child+0x5f/0x6f
 [] aer_inject_write+0x409/0x45e [aer_inject]
 [] vfs_write+0xae/0x16a
 [] sys_write+0x47/0x6e
 [] system_call_fastpath+0x16/0x1b
RIP  [] _spin_lock_irqsave+0xc/0x23
 RSP 
CR2: 0000000000000350

So check the _OSC before assuming that AER is available to the OS.

Signed-off-by: Youquan, Song 
Acked-by: Ying, Huang 
Signed-off-by: Jesse Barnes

PCI: pcie portdrv: style cleanup

Tue, 15 Dec 2009 02:38:04 +0000

PCI: pcie portdrv: style cleanup

No change in logic.

Before:
  drivers/pci/pcie/portdrv_core.c:
    total: 7 errors, 2 warnings, 508 lines checked
  drivers/pci/pcie/portdrv_pci.c:
    total: 4 errors, 2 warnings, 300 lines checked

After:
  drivers/pci/pcie/portdrv_core.c:
    total: 0 errors, 0 warnings, 506 lines checked
  drivers/pci/pcie/portdrv_pci.c:
    total: 0 errors, 0 warnings, 299 lines checked

Signed-off-by: Hidetoshi Seto 
Signed-off-by: Jesse Barnes

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6

Mon, 4 Jan 2010 15:51:38 +0000

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6

ipvs: Add boundary check on ioctl arguments

Mon, 4 Jan 2010 15:37:12 +0000

ipvs: Add boundary check on ioctl arguments

The ipvs code has a nifty system for doing the size of ioctl command
copies; it defines an array with values into which it indexes the cmd
to find the right length.

Unfortunately, the ipvs code forgot to check if the cmd was in the
range that the array provides, allowing for an index outside of the
array, which then gives a "garbage" result into the length, which
then gets used for copying into a stack buffer.

Fix this by adding sanity checks on these as well as the copy size.

[ horms@verge.net.au: adjusted limit to IP_VS_SO_GET_MAX ]
Signed-off-by: Arjan van de Ven 
Acked-by: Julian Anastasov 
Signed-off-by: Simon Horman 
Signed-off-by: Patrick McHardy

imx/mx3: depend on USB_ULPI for otg_ulpi_create

Tue, 22 Dec 2009 16:31:05 +0000

imx/mx3: depend on USB_ULPI for otg_ulpi_create

otg_ulpi_create is defined in drivers/usb/otg/ulpi.c which depends on
CONFIG_USB_ULPI.  So protect its usage by the same symbol.  Moreover
mxc_ulpi_access_ops needs CONFIG_MXC_ULPI.

Signed-off-by: Uwe Kleine-KÃ¶nig 
Cc: Sascha Hauer 
Cc: Valentin Longchamp 
Cc: Daniel Mack 
Signed-off-by: Sascha Hauer

ARM: MX3: make CPU revision number detection work on all boards

Mon, 14 Dec 2009 23:27:42 +0000

ARM: MX3: make CPU revision number detection work on all boards

Commit 52939c03 (ARM: MX3: fix CPU revision number detection) started
using the CPU's SREV register for revision number detection. This
makes it mandatory to have a valid SPBA0 mapping. Add this to the
global map_io code instead of adding multiple copies for each board.

Signed-off-by: Wolfgang Denk 
Cc: Daniel Mack 
Cc: Sascha Hauer 

Tested on Qong (EVB-Lite)
Tested-by: Wolfgang Denk 
Signed-off-by: Sascha Hauer

mx25: pdk: add platform code for FEC support

Mon, 21 Dec 2009 11:44:32 +0000

mx25: pdk: add platform code for FEC support

Signed-off-by: Sascha Hauer

mx25: add support for FEC on i.MX25

Mon, 21 Dec 2009 11:44:31 +0000

mx25: add support for FEC on i.MX25

Signed-off-by: Sascha Hauer

mx25: s/NO_PAD_CTL/NO_PAD_CTRL/

Mon, 14 Dec 2009 10:19:39 +0000

mx25: s/NO_PAD_CTL/NO_PAD_CTRL/

NO_PAD_CTL is not defined anywhere.

Signed-off-by: Baruch Siach 
Signed-off-by: Sascha Hauer

mx31moboard: fix usbh device names

Fri, 4 Dec 2009 15:50:29 +0000

mx31moboard: fix usbh device names

Signed-off-by: Valentin Longchamp 
Signed-off-by: Sascha Hauer

mx3: add support for the mt9v022 camera sensor to pcm037 platform

Fri, 11 Dec 2009 13:29:06 +0000

mx3: add support for the mt9v022 camera sensor to pcm037 platform

Signed-off-by: Guennadi Liakhovetski 
Signed-off-by: Sascha Hauer

mx27: mxt_td60: Remove not used UART pins

Fri, 4 Dec 2009 17:44:06 +0000

mx27: mxt_td60: Remove not used UART pins

Signed-off-by: Alan Carvalho de Assis 
Signed-off-by: Sascha Hauer

resource: add helpers for fetching rlimits

Thu, 19 Nov 2009 16:16:37 +0000

resource: add helpers for fetching rlimits

We want to be sure that compiler fetches the limit variable only
once, so add helpers for fetching current and maximal resource
limits which do that.

Add them to sched.h (instead of resource.h) due to circular dependency
 sched.h->resource.h->task_struct
Alternative would be to create a separate res_access.h or similar.

Signed-off-by: Jiri Slaby 
Cc: James Morris 
Cc: Heiko Carstens 
Cc: Andrew Morton 
Cc: Ingo Molnar

resource: move kernel function inside KERNEL

Fri, 20 Nov 2009 13:16:33 +0000

resource: move kernel function inside __KERNEL__

It is an internal function. Move it inside __KERNEL__ ifdef, along
with task_struct declaration.

Then we get:
--- /usr/include/linux/resource.h       2009-09-14 15:09:29.000000000 +0200
+++ usr/include/linux/resource.h       2010-01-04 11:30:54.000000000 +0100
@@ -3,8 +3,6 @@

 #include 

-struct task_struct;
-
 /*
  * Resource control/accounting header file for linux
  */
@@ -70,6 +68,5 @@
  */
 #include 

-int getrusage(struct task_struct *p, int who, struct rusage *ru);

 #endif

***********

include/linux/Kbuild is untouched, since unifdef is run even on
headers-y nowadays.

Signed-off-by: Jiri Slaby

SECURITY: selinux, fix update_rlimit_cpu parameter

Fri, 28 Aug 2009 08:47:16 +0000

SECURITY: selinux, fix update_rlimit_cpu parameter

Don't pass current RLIMIT_RTTIME to update_rlimit_cpu() in
selinux_bprm_committing_creds, since update_rlimit_cpu expects
RLIMIT_CPU limit.

Use proper rlim[RLIMIT_CPU].rlim_cur instead to fix that.

Signed-off-by: Jiri Slaby 
Acked-by: James Morris 
Cc: Stephen Smalley 
Cc: Eric Paris 
Cc: David Howells

[S390] Update default configuration.

Mon, 4 Jan 2010 08:05:44 +0000

[S390] Update default configuration.

Signed-off-by: Martin Schwidefsky

[S390] Have param.h simply include .

Mon, 4 Jan 2010 08:05:43 +0000

[S390] Have param.h simply include .

Since the files have identical content, might as well simplify.

Signed-off-by: Robert P. J. Day 
Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

[S390] qdio: convert global statistics to per-device stats

Mon, 4 Jan 2010 08:05:42 +0000

[S390] qdio: convert global statistics to per-device stats

Revamp the qdio performance statistics and move them from procfs to
debugfs using the seq_file interface. Since the statistics are not
intended for the general user the removal of /proc/qdio_perf should
not surprise anyone.

The per device statistics are disabled by default, writing 1 to
//qdio//statistics enables the
statistics for the given device.

Signed-off-by: Jan Glauber 
Signed-off-by: Martin Schwidefsky

[ARM] pxa: fix compiler warnings of unused variable 'id' in cpu_is_pxa9*()

Mon, 4 Jan 2010 06:44:42 +0000

[ARM] pxa: fix compiler warnings of unused variable 'id' in cpu_is_pxa9*()

Signed-off-by: Eric Miao

binfmt_elf_fdpic: Fix build breakage introduced by coredump changes.

Mon, 4 Jan 2010 06:42:14 +0000

binfmt_elf_fdpic: Fix build breakage introduced by coredump changes.

Commit f6151dfea21496d43dbaba32cfcd9c9f404769bc introduces build
breakage, so this patch fixes it together with some printk formatting
cleanup.

Signed-off-by: Daisuke HATAYAMA 
Signed-off-by: Paul Mundt

sh: update defconfigs.

Mon, 4 Jan 2010 06:38:50 +0000

sh: update defconfigs.

Signed-off-by: Paul Mundt

netxen: fix ethtool link test

Sat, 2 Jan 2010 03:25:19 +0000

netxen: fix ethtool link test

o Fix ethtool link test for NX3031 chip.
o Remove unused code from phy interrupt callback

Signed-off-by: Sucheta Chakraborty 
Signed-off-by: Amit Kumar Salecha 
Signed-off-by: David S. Miller

netxen: fix ethtool register dump

Sat, 2 Jan 2010 03:25:18 +0000

netxen: fix ethtool register dump

o Dump registers such as tx ring and rx ring counter, firmware state,
  niu regs, etc. which can be useful for debugging purpose.

Signed-off-by: Sucheta Chakraborty 
Signed-off-by: Amit Kumar Salecha 
Signed-off-by: David S. Miller

rrunner: fix buffer overflow

Sat, 2 Jan 2010 04:08:46 +0000

rrunner: fix buffer overflow

tx_skbuff is define as:
        struct sk_buff          *tx_skbuff[TX_RING_ENTRIES];

EVT_RING_ENTRIES is 64 and TX_RING_ENTRIES is 32.

This function is in a error path so that's why it wasn't noticed.

Signed-off-by: Dan Carpenter 
Signed-off-by: David S. Miller

broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk()

Wed, 30 Dec 2009 06:43:06 +0000

broadcom: Fix &&/|| confusion in bcm54xx_adjust_rxrefclk()

This always evaluates to true.

Signed-off-by: Roel Kluin 
Signed-off-by: David S. Miller

net: Test off by one in sh_eth_reset()

Wed, 30 Dec 2009 01:43:45 +0000

net: Test off by one in sh_eth_reset()

If no break occurred, cnt reaches 0 after the loop.

Signed-off-by: Roel Kluin 
Signed-off-by: David S. Miller

niu: timeout ignored in tcam_wait_bit()

Sun, 27 Dec 2009 04:10:59 +0000

niu: timeout ignored in tcam_wait_bit()

With `while (--limit > 0)' i reaches 0 after the loop, so upon timeout the
error was not returned.

Signed-off-by: Roel Kluin 
Signed-off-by: David S. Miller

atarilance: timeout ignored in lance_open()

Sun, 27 Dec 2009 03:26:12 +0000

atarilance: timeout ignored in lance_open()

With `while (--i > 0)' i reaches 0 after the loop, so upon timeout the
error was not issued.

Signed-off-by: Roel Kluin 
Signed-off-by: David S. Miller

drivers/net : Correct the size argument to kzalloc

Tue, 29 Dec 2009 09:15:42 +0000

drivers/net : Correct the size argument to kzalloc

lp->rx_skb has type struct sk_buff **, not struct sk_buff *, so the
elements of the array should have pointer type, not structure type.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// 
@disable sizeof_type_expr@
type T;
T **x;
@@

  x =
  <+...sizeof(
- T
+ *x
  )...+>
// 

Signed-off-by: Julia Lawall 
Signed-off-by: David S. Miller

cxgb3i: Fix a login over vlan issue

Sun, 27 Dec 2009 07:03:08 +0000

cxgb3i: Fix a login over vlan issue

Fix a target login issue, when parent interface is vlan and we are using cxgb3i sepecific
private ip address in '/etc/iscsi/ifaces/' iface file.

Acked-by: Karen Xie 
Signed-off-by: Rakesh Ranjan 
Signed-off-by: David S. Miller

hamradio: avoid null deref v3

Mon, 28 Dec 2009 06:54:55 +0000

hamradio: avoid null deref v3

This should address the problems in version 1 (lazy) and version 2 (ugly).

Bump the stats on orig_dev not on the newly assigned NULL dev variable.

Signed-off-by: Dan Carpenter 
Signed-off-by: David S. Miller

usbnet: test off by one

Sun, 27 Dec 2009 11:22:08 +0000

usbnet: test off by one

With `while (i++ < MII_TIMEOUT)' i reaches MII_TIMEOUT + 1 after the loop
This is probably unlikely a problem in practice.

Signed-off-by: Roel Kluin 
Signed-off-by: David S. Miller

drivers/net/can: Correct NULL test

Sun, 27 Dec 2009 11:27:44 +0000

drivers/net/can: Correct NULL test

Test the just-allocated value for NULL rather than some other value.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// 
@@
expression x,y;
statement S;
@@

x = \(kmalloc\|kcalloc\|kzalloc\)(...);
(
if ((x) == NULL) S
|
if (
-   y
+   x
       == NULL)
 S
)
// 

Signed-off-by: Julia Lawall 
Acked-by: Oliver Hartkopp 
Signed-off-by: David S. Miller

drivers/isdn: eliminate duplicated test

Mon, 21 Dec 2009 14:25:32 +0000

drivers/isdn: eliminate duplicated test

The code checked slot_rx twice.  Check slot_tx by analogy with the bank
case.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// 
@@
expression E;
@@

(
*E && E
|
*E || E
)
// 

Signed-off-by: Julia Lawall 
Cc: Karsten Keil 
Signed-off-by: Andrew Morton 
Signed-off-by: David S. Miller

net/sctp/socket.c: squish warning

Mon, 21 Dec 2009 14:25:06 +0000

net/sctp/socket.c: squish warning

net/sctp/socket.c: In function 'sctp_setsockopt_autoclose':
net/sctp/socket.c:2090: warning: comparison is always false due to limited range of data type

Cc: Andrei Pelinescu-Onciul 
Cc: Vlad Yasevich 
Cc: "David S. Miller" 
Signed-off-by: Andrew Morton 
Signed-off-by: David S. Miller

rose_loopback_timer sets VC number <= ROSE_DEFAULT_MAXVC

Thu, 17 Dec 2009 05:25:18 +0000

rose_loopback_timer sets VC number <= ROSE_DEFAULT_MAXVC

cat /proc/net/rose displayed a rose sockets abnormal lci value, i.e.
greater than maximum number of VCs per neighbour allowed.
This number prevents further test of lci value during rose operations.

Example (lines shortened) :
[bernard]# cat /proc/net/rose
dest_addr  dest_call src_addr   src_call  dev   lci neigh st vs vr va
*          *         2080175520 F6BVP-1   rose0 000 00000  0  0  0  0
2080175520 FPAD-0    2080175520 WP-0      rose0 FFE 00001  3  0  0  0

Here are the default parameters :

linux/include/net/rose.h:#define ROSE_DEFAULT_MAXVC 50 /* Maximum number of VCs per neighbour */
linux/net/rose/af_rose.c:int sysctl_rose_maximum_vcs = ROSE_DEFAULT_MAXVC;

With the following patch, rose_loopback_timer() attributes a VC number
within limits.

Signed-off-by: Bernard Pidoux 
Signed-off-by: David S. Miller

via-velocity: Give RX descriptors to the NIC later on open or MTU change

Mon, 14 Dec 2009 16:05:09 +0000

via-velocity: Give RX descriptors to the NIC later on open or MTU change

velocity_open() calls velocity_give_many_rx_descs(), which gives RX
descriptors to the NIC, before installing an interrupt handler or
calling velocity_init_registers().  I think this is very unsafe and it
appears to explain the bug report .

On MTU change, velocity_give_many_rx_descs() is again called before
velocity_init_registers().  I'm not sure whether this is unsafe but
it does look wrong.

Therefore, move the calls to velocity_give_many_rx_descs() after
request_irq() and velocity_init_registers().

Signed-off-by: Ben Hutchings 
Tested-by: Jan Ceuleers 
Signed-off-by: David S. Miller

[ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *'

Mon, 4 Jan 2010 03:42:01 +0000

[ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *'

Signed-off-by: Eric Miao

sh: Don't default enable PMB support.

Mon, 4 Jan 2010 02:16:33 +0000

sh: Don't default enable PMB support.

This has the adverse effect of converting many 29bit configs to 32bit
mode, while this is a change that needs to be done manually for each
platform. Turn it off by default in order to cut down on spurious bug
reports.

Signed-off-by: Paul Mundt

sh: Disable PMB for SH4AL-DSP CPUs.

Mon, 4 Jan 2010 02:13:54 +0000

sh: Disable PMB for SH4AL-DSP CPUs.

While the PMB is available on SH-4A parts, SH4AL-DSP parts exclude it
altogether. As such, explicitly disable PMB support for these parts. If
this changes in the future for newer subtypes, this will have to be made
more fine-grained.

Signed-off-by: Paul Mundt