Permalink
Switch branches/tags
Commits on Nov 16, 2010
  1. Linux 2.6.37-rc2

    torvalds committed Nov 16, 2010
Commits on Nov 15, 2010
  1. capabilities/syslog: open code cap_syslog logic to fix build failure

    eparis committed with torvalds Nov 15, 2010
    The addition of CONFIG_SECURITY_DMESG_RESTRICT resulted in a build
    failure when CONFIG_PRINTK=n.  This is because the capabilities code
    which used the new option was built even though the variable in question
    didn't exist.
    
    The patch here fixes this by moving the capabilities checks out of the
    LSM and into the caller.  All (known) LSMs should have been calling the
    capabilities hook already so it actually makes the code organization
    better to eliminate the hook altogether.
    
    Signed-off-by: Eric Paris <eparis@redhat.com>
    Acked-by: James Morris <jmorris@namei.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds committed Nov 15, 2010
    …inux/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:
      arm: omap1: devices: need to return with a value
      OMAP1: camera.h: add missing include
      omap: dma: Add read-back to DMA interrupt handler to avoid spuriousinterrupts
      OMAP2: Devkit8000: Fix mmc regulator failure
  3. Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    torvalds committed Nov 15, 2010
    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: (w83795) Check for BEEP pin availability
      hwmon: (w83795) Clear intrusion alarm immediately
      hwmon: (w83795) Read the intrusion state properly
      hwmon: (w83795) Print the actual temperature channels as sources
      hwmon: (w83795) List all usable temperature sources
      hwmon: (w83795) Expose fan control method
      hwmon: (w83795) Fix fan control mode attributes
      hwmon: (lm95241) Check validity of input values
      hwmon: Change mail address of Hans J. Koch
  4. Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/ke…

    torvalds committed Nov 15, 2010
    …rnel/git/jdelvare/staging
    
    * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      i2c: Sanity checks on adapter registration
      i2c: Mark i2c_adapter.id as deprecated
      i2c: Drivers shouldn't include <linux/i2c-id.h>
      i2c: Delete unused adapter IDs
      i2c: Remove obsolete cleanup for clientdata
  5. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Nov 15, 2010
    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI: sysfs: fix printk warnings
      PCI: fix pci_bus_alloc_resource() hang, prefer positive decode
      PCI: read current power state at enable time
      PCI: fix size checks for mmap() on /proc/bus/pci files
      x86/PCI: coalesce overlapping host bridge windows
      PCI hotplug: ibmphp: Add check to prevent reading beyond mapped area
  6. i2c: Sanity checks on adapter registration

    Jean Delvare committed with Jean Delvare Nov 15, 2010
    Make sure I2C adapters being registered have the required struct
    fields set. If they don't, problems will happen later.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  7. i2c: Mark i2c_adapter.id as deprecated

    Jean Delvare committed with Jean Delvare Nov 15, 2010
    It's about time to make it clear that i2c_adapter.id is deprecated.
    Hopefully this will remind the last user to move over to a different
    strategy.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Jarod Wilson <jarod@redhat.com>
    Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
  8. i2c: Drivers shouldn't include <linux/i2c-id.h>

    Jean Delvare committed with Jean Delvare Nov 15, 2010
    Drivers don't need to include <linux/i2c-id.h>, especially not when
    they don't use anything that header file provides.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Michael Hunold <michael@mihu.de>
    Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  9. i2c: Delete unused adapter IDs

    Jean Delvare committed with Jean Delvare Nov 15, 2010
    Delete unused I2C adapter IDs. Special cases are:
    
    * I2C_HW_B_RIVA was still set in driver rivafb, however no other
      driver is ever looking for this value, so we can safely remove it.
    * I2C_HW_B_HDPVR is used in staging driver lirc_zilog, however no
      adapter ID is ever set to this value, so the code in question never
      runs. As the code additionally expects that I2C_HW_B_HDPVR may not
      be defined, we can delete it now and let the lirc_zilog driver
      maintainer rewrite this piece of code.
    
    Big thanks for Hans Verkuil for doing all the hard work :)
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Jarod Wilson <jarod@redhat.com>
    Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
  10. i2c: Remove obsolete cleanup for clientdata

    Wolfram Sang committed with Jean Delvare Nov 15, 2010
    A few new i2c-drivers came into the kernel which clear the clientdata-pointer
    on exit. This is obsolete meanwhile, so fix it and hope the word will spread.
    
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Acked-by: Alan Cox <alan@linux.intel.com>
    Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  11. include/linux/kernel.h: Move logging bits to include/linux/printk.h

    torvalds committed Nov 15, 2010
    Move the logging bits from kernel.h into printk.h so that
    there is a bit more logical separation of the generic from
    the printk logging specific parts.
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. Fix gcc 4.5.1 miscompiling drivers/char/i8k.c (again)

    Jim Bos committed with torvalds Nov 15, 2010
    The fix in commit 6b4e81d ("i8k: Tell gcc that *regs gets
    clobbered") to work around the gcc miscompiling i8k.c to add "+m
    (*regs)" caused register pressure problems and a build failure.
    
    Changing the 'asm' statement to 'asm volatile' instead should prevent
    that and works around the gcc bug as well, so we can remove the "+m".
    
    [ Background on the gcc bug: a memory clobber fails to mark the function
      the asm resides in as non-pure (aka "__attribute__((const))"), so if
      the function does nothing else that triggers the non-pure logic, gcc
      will think that that function has no side effects at all. As a result,
      callers will be mis-compiled.
    
      Adding the "+m" made gcc see that it's not a pure function, and so
      does "asm volatile". The problem was never really the need to mark
      "*regs" as changed, since the memory clobber did that part - the
      problem was just a bug in the gcc "pure" function analysis  - Linus ]
    
    Signed-off-by: Jim Bos <jim876@xs4all.nl>
    Acked-by: Jakub Jelinek <jakub@redhat.com>
    Cc: Andi Kleen <andi@firstfloor.org>
    Cc: Andreas Schwab <schwab@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. hwmon: (w83795) Check for BEEP pin availability

    Jean Delvare committed with Jean Delvare Nov 15, 2010
    On the W83795ADG, there's a single pin for BEEP and OVT#, so you
    can't have both. Check the configuration and don't create beep
    attributes when BEEP pin is not available.
    
    The W83795G has a dedicated BEEP pin so the functionality is always
    available there.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
  14. hwmon: (w83795) Clear intrusion alarm immediately

    Jean Delvare committed with Jean Delvare Nov 15, 2010
    When asked to clear the intrusion alarm, do so immediately. We have to
    invalidate the cache to make sure the new status will be read. But we
    also have to read from the status register once to clear the pending
    alarm, as writing to CLR_CHS surprising won't clear it automatically.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
  15. hwmon: (w83795) Read the intrusion state properly

    Jean Delvare committed with Jean Delvare Nov 15, 2010
    We can't read the intrusion state from the real-time alarm registers
    as we do for all other alarm flags, because real-time alarm bits don't
    stick (by definition) and the intrusion state has to stick until
    explicitly cleared (otherwise it has little value.)
    
    So we have to use the interrupt status register instead, which is read
    from the same address but with a configuration bit flipped in another
    register.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
  16. hwmon: (w83795) Print the actual temperature channels as sources

    Jean Delvare committed with Jean Delvare Nov 15, 2010
    Don't expose raw register values to user-space. Decode and encode
    temperature channels selected as temperature sources as needed.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
  17. hwmon: (w83795) List all usable temperature sources

    Jean Delvare committed with Jean Delvare Nov 15, 2010
    Temperature sources are not correlated directly with temperature
    channels. A look-up table is required to find out which temperature
    sources can be used depending on which temperature channels (both
    analog and digital) are enabled.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
  18. hwmon: (w83795) Expose fan control method

    Jean Delvare committed with Jean Delvare Nov 15, 2010
    Expose fan control method (DC vs. PWM) using the standard sysfs
    attributes. I've made it read-only as the board should be wired for
    a given mode, the BIOS should have set up the chip for this mode, and
    you shouldn't have to change it. But it would be easy enough to make
    it changeable if someone comes up with a use case.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
  19. hwmon: (w83795) Fix fan control mode attributes

    Jean Delvare committed with Jean Delvare Nov 15, 2010
    There were two bugs:
    * Speed cruise mode was improperly reported for all fans but fan1.
    * Fan control method (PWM vs. DC) was mixed with the control mode.
      It will be added back as a separate attribute, as per the standard
      sysfs interface.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
  20. hwmon: (lm95241) Check validity of input values

    Jean Delvare committed with Jean Delvare Nov 15, 2010
    This clears the following build-time warnings I was seeing:
    
    drivers/hwmon/lm95241.c: In function "set_interval":
    drivers/hwmon/lm95241.c:132:15: warning: ignoring return value of "strict_strtol", declared with attribute warn_unused_result
    drivers/hwmon/lm95241.c: In function "set_max2":
    drivers/hwmon/lm95241.c:278:1: warning: ignoring return value of "strict_strtol", declared with attribute warn_unused_result
    drivers/hwmon/lm95241.c: In function "set_max1":
    drivers/hwmon/lm95241.c:277:1: warning: ignoring return value of "strict_strtol", declared with attribute warn_unused_result
    drivers/hwmon/lm95241.c: In function "set_min2":
    drivers/hwmon/lm95241.c:249:1: warning: ignoring return value of "strict_strtol", declared with attribute warn_unused_result
    drivers/hwmon/lm95241.c: In function "set_min1":
    drivers/hwmon/lm95241.c:248:1: warning: ignoring return value of "strict_strtol", declared with attribute warn_unused_result
    drivers/hwmon/lm95241.c: In function "set_type2":
    drivers/hwmon/lm95241.c:220:1: warning: ignoring return value of "strict_strtol", declared with attribute warn_unused_result
    drivers/hwmon/lm95241.c: In function "set_type1":
    drivers/hwmon/lm95241.c:219:1: warning: ignoring return value of "strict_strtol", declared with attribute warn_unused_result
    
    This also fixes a small race in set_interval() as a side effect: by
    working with a temporary local variable we prevent data->interval from
    being accessed at a time it contains the interval value in the wrong
    unit.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Davide Rizzo <elpa.rizzo@gmail.com>
  21. hwmon: Change mail address of Hans J. Koch

    Hans J. Koch committed with Jean Delvare Nov 15, 2010
    My old mail address doesn't exist anymore. This changes all occurrences
    to my new address.
    
    Signed-off-by: Hans J. Koch <hjk@hansjkoch.de>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  22. PCI: sysfs: fix printk warnings

    Randy Dunlap committed with jbarnes993 Nov 13, 2010
    Cast pci_resource_start() and pci_resource_len() to u64 for printk.
    
    drivers/pci/pci-sysfs.c:753: warning: format '%16Lx' expects type 'long long unsigned int', but argument 9 has type 'resource_size_t'
    drivers/pci/pci-sysfs.c:753: warning: format '%16Lx' expects type 'long long unsigned int', but argument 10 has type 'resource_size_t'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  23. Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

    torvalds committed Nov 15, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
      GFS2: Fix inode deallocation race
  24. Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds committed Nov 15, 2010
    …nux/kernel/git/kgene/linux-samsung
    
    * 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
      ARM: SAMSUNG: Fix HAVE_S3C_RTC warnings
      ARM: SAMSUNG: Fix HAVE_S3C2410_I2C warnings
      ARM: SAMSUNG: Fix HAVE_S3C2410_WATCHDOG warnings
  25. Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    torvalds committed Nov 15, 2010
    …linux/kernel/git/lethal/fbdev-2.6
    
    * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
      fsl-diu-fb: drop dead ioctl define
      MAINTAINERS: Add an fbdev git tree entry.
      OMAP: DSS: Fix documentation regarding 'vram' kernel parameter
      OMAP: VRAM: Fix boot-time memory allocation
      OMAP: VRAM: improve VRAM error prints
      sisfb: limit POST memory test according to PCI resource length
      fbdev: sh_mobile_lcdc: use correct number of modes, when using the default
      fbdev: sh_mobile_lcdc: use the standard CEA-861 720p timing
      fbdev: sh_mobile_hdmi: properly clean up modedb on monitor unplug
  26. Merge branches 'sh-fixes-for-linus' and 'rmobile-fixes-for-linus' of …

    torvalds committed Nov 15, 2010
    …git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
    
    * 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: intc: Fix up build failure introduced by radix tree changes.
      MAINTAINERS: update the sh git tree entry.
      sh: clkfwk: fix up compiler warnings.
      sh: intc: Fix up initializers for gcc 4.5.
      rtc: rtc-sh - fix a memory leak
    
    * 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      ARM: mach-shmobile: ap4evb: add fsib 44100Hz rate
      MAINTAINERS: update the ARM SH-Mobile git tree entry.
      ARM: mach-shmobile: ap4evb: Mark NOR boot loader partitions read-only.
      ARM: mach-shmobile: intc-sh7372: fix interrupt number
  27. GFS2: Fix inode deallocation race

    swhiteho committed Nov 3, 2010
    This area of the code has always been a bit delicate due to the
    subtleties of lock ordering. The problem is that for "normal"
    alloc/dealloc, we always grab the inode locks first and the rgrp lock
    later.
    
    In order to ensure no races in looking up the unlinked, but still
    allocated inodes, we need to hold the rgrp lock when we do the lookup,
    which means that we can't take the inode glock.
    
    The solution is to borrow the technique already used by NFS to solve
    what is essentially the same problem (given an inode number, look up
    the inode carefully, checking that it really is in the expected
    state).
    
    We cannot do that directly from the allocation code (lock ordering
    again) so we give the job to the pre-existing delete workqueue and
    carry on with the allocation as normal.
    
    If we find there is no space, we do a journal flush (required anyway
    if space from a deallocation is to be released) which should block
    against the pending deallocations, so we should always get the space
    back.
    
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
  28. ARM: mach-shmobile: ap4evb: add fsib 44100Hz rate

    morimoto committed with Paul Mundt Nov 15, 2010
    Tested-by: Tony SIM <chinyeow.sim.xt@renesas.com>
    Tested-by: TAKEI Mitsuharu <takei.andr@gmail.com>
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  29. sh: intc: Fix up build failure introduced by radix tree changes.

    Paul Mundt committed Nov 15, 2010
    The radix tree retry logic got a bit of an overhaul and subsequently
    broke the virtual IRQ subgroup build. Simply switch over to
    radix_tree_deref_retry() as per the filemap changes, which the virq
    lookup logic was modelled after in the first place.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  30. Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    Paul Mundt committed Nov 15, 2010
    …t/torvalds/linux-2.6 into sh/urgent
  31. fsl-diu-fb: drop dead ioctl define

    vapier committed with Paul Mundt Nov 13, 2010
    The fsl-diu-fb driver no longer uses this define, and we have a common one
    to cover this already (FBIO_WAITFORVSYNC).
    
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  32. MAINTAINERS: Add an fbdev git tree entry.

    Paul Mundt committed Nov 15, 2010
    Now that there's an fbdev git tree (this is also what is pulled in to
    -next), stub it in to the MAINTAINERS entry.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Commits on Nov 14, 2010
  1. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Nov 14, 2010
    …/git/penberg/slab-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
      slub: Fix slub_lock down/up imbalance