Permalink
Switch branches/tags
Commits on Jul 11, 2010
  1. Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: Fix autoloading of fschmd on recent Fujitsu machines
      hwmon: (coretemp) Properly label the sensors
      hwmon: (coretemp) Skip duplicate CPU entries
      hwmon: (it87) Fix in7 on IT8720F
      hwmon: (k8temp) Fix temperature reporting for ASB1 processor revisions
    torvalds committed Jul 11, 2010
  2. Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/ke…

    …rnel/git/jdelvare/staging
    
    * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      i2c/mips: Fix error return codes from Sibyte i2c bus driver
      i2c: Fix probability check
    torvalds committed Jul 11, 2010
Commits on Jul 10, 2010
  1. i2c/mips: Fix error return codes from Sibyte i2c bus driver

    Sibyte i2c bus driver returns non-descriptive error values.
    Update to return error values as defined in Documentation/i2c/fault-codes.
    
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Guenter Roeck committed with Jean Delvare Jul 10, 2010
  2. i2c: Fix probability check

    The new unified probing function differs from the original code, and
    the preliminary test whether probing is possible must be updated
    accordingly.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Jean Delvare committed Jul 10, 2010
Commits on Jul 9, 2010
  1. hwmon: Fix autoloading of fschmd on recent Fujitsu machines

    Fujitsu slightly changed the DMI strings in their recent machines,
    (for example the D2778) and this breaks the automatic loading of the
    needed fschmd driver. Being more tolerant on string comparison fixes
    the issue.
    
    This closes bug #15634:
    https://bugzilla.kernel.org/show_bug.cgi?id=15634
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Tested-by: Sergey Spiridonov <sena@hurd.homeunix.org>
    Cc: Hans de Goede <hdegoede@redhat.com>
    Jean Delvare committed Jul 9, 2010
  2. hwmon: (coretemp) Properly label the sensors

    Don't assume that CPU entry number and core ID always match. It
    worked in the simple cases (single CPU, no HT) but fails on
    multi-CPU systems.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Huaxu Wan <huaxu.wan@intel.com>
    Cc: stable@kernel.org
    Jean Delvare committed Jul 9, 2010
  3. hwmon: (coretemp) Skip duplicate CPU entries

    On hyper-threaded CPUs, each core appears twice in the CPU list. Skip
    the second entry to avoid duplicate sensors.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Huaxu Wan <huaxu.wan@intel.com>
    Cc: stable@kernel.org
    Jean Delvare committed Jul 9, 2010
  4. hwmon: (it87) Fix in7 on IT8720F

    The IT8720F has no VIN7 pin, so VCCH should always be routed
    internally to VIN7 with an internal divider. Curiously, there still
    is a configuration bit to control this, which means it can be set
    incorrectly. And even more curiously, many boards out there are
    improperly configured, even though the IT8720F datasheet claims that
    the internal routing of VCCH to VIN7 is the default setting. So we
    force the internal routing in this case.
    
    It turns out that all boards with the wrong setting are from Gigabyte,
    so I suspect a BIOS bug. But it's easy enough to workaround in the
    driver, so let's do it.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Jean-Marc Spaggiari <jean-marc@spaggiari.org>
    Cc: stable@kernel.org
    Jean Delvare committed Jul 9, 2010
  5. hwmon: (k8temp) Fix temperature reporting for ASB1 processor revisions

    Reported temperature for ASB1 CPUs is too high.
    Add ASB1 CPU revisions (these are also non-desktop variants) to the
    list of CPUs for which the temperature fixup is not required.
    
    Example: (from LENOVO ThinkPad Edge 13, 01972NG, system was idle)
    
      Current kernel reports
    
      $ sensors
      k8temp-pci-00c3
      Adapter: PCI adapter
      Core0 Temp:  +74.0 C
      Core0 Temp:  +70.0 C
      Core1 Temp:  +69.0 C
      Core1 Temp:  +70.0 C
    
      With this patch I have
    
      $ sensors
      k8temp-pci-00c3
      Adapter: PCI adapter
      Core0 Temp:  +54.0 C
      Core0 Temp:  +51.0 C
      Core1 Temp:  +48.0 C
      Core1 Temp:  +49.0 C
    
    Cc: stable@kernel.org [.32.x .33.x, .34.x]
    Cc: Rudolf Marek <r.marek@assembler.cz>
    Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Andreas Herrmann committed with Jean Delvare Jul 9, 2010
Commits on Jul 8, 2010
  1. IB/qib: Use request_firmware() to load SD7220 firmware

    Extract the microcode for the QLogic QLE7220 series IB HCA and use the
    kernel microcode request facility to load the microcode.  This
    supports Debian Linux's requirements to separate microcode which
    doesn't have open source code available from the device driver.
    
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>
    bwhacks committed with Roland Dreier Jul 1, 2010
  2. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      IPoIB: Fix world-writable child interface control sysfs attributes
      IB/qib: Clean up properly if qib_init() fails
      IB/qib: Completion queue callback needs to be single threaded
      IB/qib: Update 7322 serdes tables
      IB/qib: Clear 6120 hardware error register
      IB/qib: Clear eager buffer memory for each new process
      IB/qib: Mask hardware error during link reset
      IB/qib: Don't mark VL15 bufs as WC to avoid a rare 7322 chip problem
      RDMA/cxgb4: Derive smac_idx from port viid
      RDMA/cxgb4: Avoid false GTS CIDX_INC overflows
      RDMA/cxgb4: Don't call abort_connection() for active connect failures
      RDMA/cxgb4: Use the DMA state API instead of the pci equivalents
    torvalds committed Jul 8, 2010
  3. Merge branches 'cxgb4', 'ipoib' and 'qib' into for-next

    Roland Dreier committed Jul 8, 2010
  4. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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 - Enable beep on Realtek codecs with PCI SSID override
      ALSA: usb-audio - Add volume resolution quirk for some Logitech webcams
      ALSA: hda - Add Macbook 5,2 quirk
      ALSA: hda - Fix uninitialized variable
    torvalds committed Jul 8, 2010
  5. Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      writeback: simplify the write back thread queue
      writeback: split writeback_inodes_wb
      writeback: remove writeback_inodes_wbc
      fs-writeback: fix kernel-doc warnings
      splice: check f_mode for seekable file
      splice: direct_splice_actor() should not use pos in sd
    torvalds committed Jul 8, 2010
  6. Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc: Fix userspace build of ptrace.h
      powerpc: Fix default_machine_crash_shutdown #ifdef botch
      powerpc: Fix logic error in fixup_irqs
      powerpc/iseries: Fix possible null pointer dereference in iSeries_pcibios_fixup_resources
      powerpc: Linux cannot run with 0 cores
      powerpc: Fix feature-fixup tests for gcc 4.5
      powerpc: Disable SPARSE_IRQ by default
      powerpc: Fix compile errors in prom_init_check for gcc 4.5
      powerpc: Fix module building for gcc 4.5 and 64 bit
      powerpc/perf_event: Fix for power_pmu_disable()
    torvalds committed Jul 8, 2010
  7. Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    …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 on wrong function name for S5PV210 sdhci0
      ARM: S5P6442: Fix PLL setting announce message.
      ARM: SAMSUNG: Fix build without SDHCI controllers for S3C64XX
      ARM: S5PV210: Correct clock register properties
      ARM: S5P: Bug fix on external interrupt for S5P SoCs
    torvalds committed Jul 8, 2010
  8. powerpc: Fix userspace build of ptrace.h

    Build of ptrace.h failed for assembly because it
    pulls in stdint.h.
    Use exportable types (__u32, __u64) to avoid the dependency
    on stdint.h.
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Cc: Andrey Volkov <avolkov@varma-el.com>
    Cc: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Acked-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Sam Ravnborg committed with ozbenh May 9, 2010
  9. powerpc: Fix default_machine_crash_shutdown #ifdef botch

    crash_kexec_wait_realmode() is defined only if CONFIG_PPC_STD_MMU_64
    and CONFIG_SMP, but is called if CONFIG_PPC_STD_MMU_64 even if !CONFIG_SMP.
    Fix the conditional compilation around the invocation.
    
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Acked-by: Michael Neuling <mikey@neuling.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    paulmck committed with ozbenh Jun 15, 2010
  10. powerpc: Fix logic error in fixup_irqs

    When SPARSE_IRQ is set, irq_to_desc() can
    return NULL. While the code here has a
    check for NULL, it's not really correct.
    Fix it by separating the check for it.
    
    This fixes CPU hot unplug for me.
    
    Reported-by: Alastair Bridgewater <alastair.bridgewater@gmail.com>
    Cc: stable@kernel.org [2.6.32+]
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    jmberg committed with ozbenh Jun 16, 2010
  11. powerpc/iseries: Fix possible null pointer dereference in iSeries_pci…

    …bios_fixup_resources
    
    I don't know if this is a right fix for the problem
    since of_get_property can return NULL.
    Since iseries_device_information is used only for informational purpose,
    we can skip this function without valid HvSubBusNumber number.
    
    Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Denis Kirjanov committed with ozbenh Jun 16, 2010
  12. powerpc: Linux cannot run with 0 cores

    If we configure with CONFIG_SMP=n or set NR_CPUS less than the number of
    SMT threads we will set the max cores property to 0 in the
    ibm,client-architecture-support structure. On new versions of firmware that
    understand this property it obliges and terminates our partition.
    
    Use DIV_ROUND_UP so we handle not only the CONFIG_SMP=n case but also the
    case where NR_CPUS isn't a multiple of the number of SMT threads.
    
    Signed-off-by: Anton Blanchard <anton@samba.org>
    Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    antonblanchard committed with ozbenh Jun 17, 2010
  13. powerpc: Fix feature-fixup tests for gcc 4.5

    The feature-fixup test declare some extern void variables and then take
    their addresses.  Fix this by declaring them as extern u8 instead.
    
    Fixes these warnings (treated as errors):
    
      CC      arch/powerpc/lib/feature-fixups.o
    cc1: warnings being treated as errors
    arch/powerpc/lib/feature-fixups.c: In function 'test_cpu_macros':
    arch/powerpc/lib/feature-fixups.c:293:23: error: taking address of expression of type 'void'
    arch/powerpc/lib/feature-fixups.c:294:9: error: taking address of expression of type 'void'
    arch/powerpc/lib/feature-fixups.c:297:2: error: taking address of expression of type 'void'
    arch/powerpc/lib/feature-fixups.c:297:2: error: taking address of expression of type 'void'
    arch/powerpc/lib/feature-fixups.c: In function 'test_fw_macros':
    arch/powerpc/lib/feature-fixups.c:306:23: error: taking address of expression of type 'void'
    arch/powerpc/lib/feature-fixups.c:307:9: error: taking address of expression of type 'void'
    arch/powerpc/lib/feature-fixups.c:310:2: error: taking address of expression of type 'void'
    arch/powerpc/lib/feature-fixups.c:310:2: error: taking address of expression of type 'void'
    arch/powerpc/lib/feature-fixups.c: In function 'test_lwsync_macros':
    arch/powerpc/lib/feature-fixups.c:321:23: error: taking address of expression of type 'void'
    arch/powerpc/lib/feature-fixups.c:322:9: error: taking address of expression of type 'void'
    arch/powerpc/lib/feature-fixups.c:326:3: error: taking address of expression of type 'void'
    arch/powerpc/lib/feature-fixups.c:326:3: error: taking address of expression of type 'void'
    arch/powerpc/lib/feature-fixups.c:329:3: error: taking address of expression of type 'void'
    arch/powerpc/lib/feature-fixups.c:329:3: error: taking address of expression of type 'void'
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Stephen Rothwell committed with ozbenh Jun 28, 2010
  14. powerpc: Disable SPARSE_IRQ by default

    The SPARSE_IRQ considerably adds overhead to critical path of IRQ
    handling.  However it doesn't benefit much in space for most systems with
    limited IRQ_NR.  Should be disabled unless really necessary.
    
    Signed-off-by: Li Yang <leoli@freescale.com>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Yang Li committed with ozbenh Jun 28, 2010
  15. powerpc: Fix compile errors in prom_init_check for gcc 4.5

    Just whitelist these extra compiler generated symbols.
    Fixes these errors:
    
    Error: External symbol '_restgpr0_14' referenced from prom_init.c
    Error: External symbol '_restgpr0_20' referenced from prom_init.c
    Error: External symbol '_restgpr0_22' referenced from prom_init.c
    Error: External symbol '_restgpr0_24' referenced from prom_init.c
    Error: External symbol '_restgpr0_25' referenced from prom_init.c
    Error: External symbol '_restgpr0_26' referenced from prom_init.c
    Error: External symbol '_restgpr0_27' referenced from prom_init.c
    Error: External symbol '_restgpr0_28' referenced from prom_init.c
    Error: External symbol '_restgpr0_29' referenced from prom_init.c
    Error: External symbol '_restgpr0_31' referenced from prom_init.c
    Error: External symbol '_savegpr0_14' referenced from prom_init.c
    Error: External symbol '_savegpr0_20' referenced from prom_init.c
    Error: External symbol '_savegpr0_22' referenced from prom_init.c
    Error: External symbol '_savegpr0_24' referenced from prom_init.c
    Error: External symbol '_savegpr0_25' referenced from prom_init.c
    Error: External symbol '_savegpr0_26' referenced from prom_init.c
    Error: External symbol '_savegpr0_27' referenced from prom_init.c
    Error: External symbol '_savegpr0_28' referenced from prom_init.c
    Error: External symbol '_savegpr0_29' referenced from prom_init.c
    Error: External symbol '_savegpr0_31' referenced from prom_init.c
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Acked-by: Segher Boessenkool <segher@kernel.crashing.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Stephen Rothwell committed with ozbenh Jun 29, 2010
  16. powerpc: Fix module building for gcc 4.5 and 64 bit

    Gcc 4.5 is now generating out of line register save and restore
    in the function prefix and postfix when we use -Os.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Stephen Rothwell committed with ozbenh Jun 29, 2010
  17. powerpc/perf_event: Fix for power_pmu_disable()

    When power_pmu_disable() removes the given event from a particular index into
    cpuhw->event[], it shuffles down higher event[] entries.  But, this array is
    paired with cpuhw->events[] and cpuhw->flags[] so should shuffle them
    similarly.
    
    If these arrays get out of sync, code such as power_check_constraints() will
    fail.  This caused a bug where events were temporarily disabled and then failed
    to be re-enabled; subsequent code tried to write_pmc() with its (disabled) idx
    of 0, causing a message "oops trying to write PMC0".  This triggers this bug on
    POWER7, running a miss-heavy test:
    
      perf record -e L1-dcache-load-misses -e L1-dcache-store-misses ./misstest
    
    Signed-off-by: Matt Evans <matt@ozlabs.org>
    Acked-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Matt Evans committed with ozbenh Jul 5, 2010
  18. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (35 commits)
      NET: SB1250: Initialize .owner
      vxge: show startup message with KERN_INFO
      ll_temac: Fix missing iounmaps
      bridge: Clear IPCB before possible entry into IP stack
      bridge br_multicast: BUG: unable to handle kernel NULL pointer dereference
      net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined
      net/ne: fix memory leak in ne_drv_probe()
      xfrm: fix xfrm by MARK logic
      virtio_net: fix oom handling on tx
      virtio_net: do not reschedule rx refill forever
      s2io: resolve statistics issues
      linux/net.h: fix kernel-doc warnings
      net: decreasing real_num_tx_queues needs to flush qdisc
      sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock
      qlge: fix a eeh handler to not add a pending timer
      qlge: Replacing add_timer() to mod_timer()
      usbnet: Set parent device early for netdev_printk()
      net: Revert "rndis_host: Poll status channel before control channel"
      netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT
      drivers: bluetooth: bluecard_cs.c: Fixed include error, changed to linux/io.h
      ...
    torvalds committed Jul 8, 2010
Commits on Jul 7, 2010
  1. NET: SB1250: Initialize .owner

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    
     drivers/net/sb1250-mac.c |    1 +
     1 files changed, 1 insertions(+), 0 deletions(-)
    Signed-off-by: David S. Miller <davem@davemloft.net>
    ralfbaechle committed with davem330 Jul 6, 2010
  2. vxge: show startup message with KERN_INFO

    The original KERN_CRIT will mess up terminals.
    
    CC: Sreenivasa Honnur <Sreenivasa.Honnur@neterion.com>
    Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    fengguang committed with davem330 Jul 6, 2010
  3. ll_temac: Fix missing iounmaps

    Fix missing iounmaps.
    
    Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Denis Kirjanov committed with davem330 Jul 5, 2010
  4. bridge: Clear IPCB before possible entry into IP stack

    The bridge protocol lives dangerously by having incestuous relations
    with the IP stack.  In this instance an abomination has been created
    where a bogus IPCB area from a bridged packet leads to a crash in
    the IP stack because it's interpreted as IP options.
    
    This patch papers over the problem by clearing the IPCB area in that
    particular spot.  To fix this properly we'd also need to parse any
    IP options if present but I'm way too lazy for that.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    
    Cheers,
    Signed-off-by: David S. Miller <davem@davemloft.net>
    herbertx committed with davem330 Jul 5, 2010
  5. Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm: correctly update connector DPMS status in drm_fb_helper
      drm/radeon/kms: fix shared ddc handling
      drm/ttm: Allocate the page pool manager in the heap.
    torvalds committed Jul 7, 2010
  6. drm: correctly update connector DPMS status in drm_fb_helper

    We don't currently update the DPMS status of the connector (both in the
    connector itself and the connector's DPMS property) in the fb helper
    code.  This means that if the kernel FB core has blanked the screen,
    sysfs will still show a DPMS status of "on".  It also means that when X
    starts, it will try to light up the connectors, but the drm_crtc_helper
    code will ignore the DPMS change since according to the connector, the
    DPMS status is already on.
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=28436 (the annoying
    "my screen was blanked when I started X and now it won't light up" bug).
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    jbarnes993 committed with Dave Airlie Jul 2, 2010