Skip to content
  1. Jan 21, 2010
  2. Jan 19, 2010
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 24bc7347
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] iTCO_wdt: Add Intel Cougar Point and PCH DeviceIDs
      24bc7347
    • Suresh Siddha's avatar
      x86, apic: use logical flat for systems with <= 8 logical cpus · bb668da6
      Suresh Siddha authored
      
      
      We can use logical flat mode if there are <= 8 logical cpu's
      (irrespective of physical apic id values).  This will enable simplified
      and efficient IPI and device interrupt routing on such platforms.
      
      This has been tested to work on both Intel and AMD platforms.
      Exceptions like IBM summit platform which can't use logical flat mode
      are addressed by using OEM platform checks.
      
      Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
      Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
      Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Chris McDermott <lcm@linux.vnet.ibm.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bb668da6
    • Suresh Siddha's avatar
      x86, apic: use physical mode for IBM summit platforms · dfea91d5
      Suresh Siddha authored
      
      
      Chris McDermott from IBM confirmed that hurricane chipset in IBM summit
      platforms doesn't support logical flat mode.  Irrespective of the other
      things like apic_id's, total number of logical cpu's, Linux kernel
      should default to physical mode for this system.
      
      The 32-bit kernel does so using the OEM checks for the IBM summit
      platform.  Add a similar OEM platform check for the 64bit kernel too.
      
      Otherwise the linux kernel boot can hang on this platform under certain
      bios/platform settings.
      
      Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
      Tested-by: default avatarAnanth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Chris McDermott <lcm@linux.vnet.ibm.com>
      Cc: Yinghai Lu <yinghai@kernel.org>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      dfea91d5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 54ef91dc
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: Remove warning message for invalid OSS minor ranges
        ALSA: hda - Fix capture on Sony VAIO with single input
        ALSA: hda - Fix mute led GPIO on HP dv-series notebooks
        ALSA: use subsys_initcall for sound core instead of module_init
        ALSA: hda - Fix missing capture mixer for ALC861/660 codecs
        ALSA: hda - Improved MacBook (Pro) 5,1 / 5,2 support
        ALSA: hda - Fix Toshiba NB20x quirk entry
      54ef91dc
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze · 91302873
      Linus Torvalds authored
      * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: pci_controller->arch_data really is a struct device_node *
        microblaze: Add missing double apostrophe in Kconfig
        microblaze: Add PT_ macros for special purpose regs
        microblaze: Enable accept4 syscall
        microblaze: Wire up recvmmsg syscall
      91302873
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · fe64454d
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
        mfd: Unlock mc13783 before subsystems initialisation, at probe time.
        mfd: WM835x GPIO direction register is not locked
        mfd: tmio_mmc hardware abstraction for CNF area
        mfd: WM8350 off by one bug
        mfd: Correct WM835x ISINK ramp time defines
      fe64454d
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 8888be69
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: Move cpu hotplug driver lock from pseries to powerpc
        powerpc: Move /proc/ppc64 to /proc/powerpc update
        powerpc/8xx: Fix user space TLB walk in dcbX fixup
        powerpc: Fix decrementer setup on 1GHz boards
        powerpc/iseries: Initialise on-stack completion
        powerpc/hvc: Driver build breaks with !HVC_CONSOLE
        serial/pmac_zilog: Workaround problem due to interrupt on closed port
        powerpc/macintosh: Make Open Firmware device id constant
        powerpc: Use helpers for rlimits
        powerpc: cpumask_of_node() should handle -1 as a node
        powerpc/pseries: Fix dlpar compile warning without CONFIG_PROC_DEVICETREE
        powerpc/pseries: Fix xics interrupt affinity
        powerpc/swsusp_32: Fix TLB invalidation
        powerpc/8xx: Always pin kernel instruction TLB
        powerpc: 2.6.33 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx
        powerpc: Use scripts/mkuboot.sh instead of 'mkimage'
        powerpc/5200: update defconfigs
      8888be69
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 1e868d8e
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: xfs_swap_extents needs to handle dynamic fork offsets
        xfs: fix missing error check in xfs_rtfree_range
        xfs: fix stale inode flush avoidance
        xfs: Remove inode iolock held check during allocation
        xfs: reclaim all inodes by background tree walks
        xfs: Avoid inodes in reclaim when flushing from inode cache
        xfs: reclaim inodes under a write lock
      1e868d8e
    • Linus Torvalds's avatar
      Merge branch 'mantis' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 2faae422
      Linus Torvalds authored
      * 'mantis' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (117 commits)
        V4L/DVB (13851): Fix Input dependency for Mantis
        V4L/DVB(13824a): mantis: Fix __devexit bad annotations
        V4L/DVB (13808b): mantis: replace DMA_nnBIT_MASK to DMA_BIT_MASK(32)
        V4L/DVB (13808): [Mantis/Hopper] Build update for Mantis/Hopper based cards
        V4L/DVB(13808a): mantis: convert it to the new ir-core register/unregister functions
        V4L/DVB (13812): [Mantis/Hopper] Update Copyright header
        V4L/DVB (13811): [MB86A16] Update Copyright header
        V4L/DVB (13810): [MB86A16] Use DVB_* macros
        V4L/DVB (13809): Fix Checkpatch violations
        V4L/DVB (13807): Fix: Free device in the device registration failure case
        V4L/DVB (13806): Register and Initialize Remote control
        V4L/DVB (13805): Fix: Unregister the frontend before detaching
        V4L/DVB (13804): Remove unused I2C Adapter ID
        V4L/DVB (13803): Remove unused dependency on CU1216
        V4L/DVB (13802): [Mantis/Hopper] Fix all build related warnings
        V4L/DVB (13801): [MB86A16] Use the search callback
        V4L/DVB (13800): [Mantis] I2C optimization. Required delay is much lesser than 1mS.
        V4L/DVB (13799): [Mantis] Unregister frontend
        V4L/DVB (13798): [Mantis] Enable power for all cards, use byte mode only on relevant devices
        V4L/DVB (13797): [Mantis/Hopper/TDA665x] Large overhaul,
        ...
      2faae422
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 630ca048
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (23 commits)
        V4L/DVB (13966): DVB-T regression fix for saa7134 cards
        V4L/DVB (13955): cx25821: fix double unlock in medusa_video_init()
        MAINTAINERS: ivtv-devel is moderated
        MAINTAINERS: Andy Walls is the new ivtv maintainer
        V4L/DVB (13941): rj54n1cb0c: remove compiler warning
        V4L/DVB sh_mobile_ceu: don't check platform_get_irq's return value against zero
        V4L/DVB mx1_camera: don't check platform_get_irq's return value against zero
        V4L/DVB (13934): tda8290: Fix FM radio easy programming standard selection for TDA8295
        V4L/DVB (13900): gspca - sunplus: Fix bridge exchanges.
        V4L/DVB (13887): tda8290: add autodetection support for TDA8295c2
        V4L/DVB (13882): gspca - stv06xx-vv6410: Ensure register STV_SCAN_RATE is zero
        V4L/DVB (13880): gspca - m5602-s5k4aa: Add vflip quirk for the Amilo Xi 2428
        V4L/DVB (13875): gspca - vc032x: Fix a possible crash with the vc0321 bridge.
        V4L/DVB (13868): gspca - sn9c20x: Fix test of unsigned.
        V4L/DVB (13858): ir-keytable: use the right header
        feature-removal-schedule: Add v4l1 drivers obsoleted by gspca sub drivers
        V4L/DVB (13622): gspca - ov534: Fix a compilation warning.
        V4L/DVB (13834): dib8000: fix compilation if !DVB_DIB8000
        V4L/DVB (13831): uvcvideo: Fix oops caused by a race condition in buffer dequeuing
        V4L/DVB (13829): uvcvideo: Fix alternate setting selection in isochronous mode
        ...
      630ca048
    • Seth Heasley's avatar
      [WATCHDOG] iTCO_wdt: Add Intel Cougar Point and PCH DeviceIDs · 3c9d8ecc
      Seth Heasley authored
      
      
      This patch adds the Intel Cougar Point and PCH DeviceIDs for iTCO Watchdog.
      
      Signed-off-by: default avatarSeth Heasley <seth.heasley@intel.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      3c9d8ecc
  3. Jan 18, 2010
  4. Jan 17, 2010
    • Manu Abraham's avatar
      V4L/DVB (13851): Fix Input dependency for Mantis · fcd89de3
      Manu Abraham authored
      
      
      >
      >
      >
      > CONFIG_INPUT=n
      
      As reported by Randy Dunlap <randy.dunlap@oracle.com>:
      > ERROR: "ir_input_register" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
      > ERROR: "ir_input_unregister" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
      > ERROR: "ir_input_init" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
      > ERROR: "input_free_device" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
      > ERROR: "input_allocate_device" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
      
      Signed-off-by: default avatarManu Abraham <manu@linuxtv.org>
      Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      fcd89de3
    • Mauro Carvalho Chehab's avatar
      V4L/DVB(13824a): mantis: Fix __devexit bad annotations · 4cf0b3f1
      Mauro Carvalho Chehab authored
      
      
      WARNING: drivers/media/dvb/mantis/built-in.o(.devinit.text+0x13d7): Section mismatch in reference from the function mantis_pci_probe() to the function .devexit.text:mantis_i2c_exit()
      The function __devinit mantis_pci_probe() references
      a function __devexit mantis_i2c_exit().
      This is often seen when error handling in the init function
      uses functionality in the exit path.
      The fix is often to remove the __devexit annotation of
      mantis_i2c_exit() so it may be used outside an exit section.
      
      WARNING: drivers/media/dvb/mantis/built-in.o(.devinit.text+0x1433): Section mismatch in reference from the function mantis_pci_probe() to the function .devexit.text:mantis_pci_exit()
      The function __devinit mantis_pci_probe() references
      a function __devexit mantis_pci_exit().
      This is often seen when error handling in the init function
      uses functionality in the exit path.
      The fix is often to remove the __devexit annotation of
      mantis_pci_exit() so it may be used outside an exit section.
      
      WARNING: drivers/media/dvb/mantis/built-in.o(.devinit.text+0x185e): Section mismatch in reference from the function hopper_pci_probe() to the function
      .devexit.text:mantis_i2c_exit()
      The function __devinit hopper_pci_probe() references
      a function __devexit mantis_i2c_exit().
      This is often seen when error handling in the init function
      uses functionality in the exit path.
      The fix is often to remove the __devexit annotation of
      mantis_i2c_exit() so it may be used outside an exit section.
      
      WARNING: drivers/media/dvb/mantis/built-in.o(.devinit.text+0x18ba): Section mismatch in reference from the function hopper_pci_probe() to the function .devexit.text:mantis_pci_exit()
      The function __devinit hopper_pci_probe() references
      a function __devexit mantis_pci_exit().
      This is often seen when error handling in the init function
      uses functionality in the exit path.
      The fix is often to remove the __devexit annotation of
      mantis_pci_exit() so it may be used outside an exit section.
      
      WARNING: drivers/media/dvb/built-in.o(.devinit.text+0x68b8): Section mismatch in reference from the function mantis_pci_probe() to the function .devexit.text:mantis_i2c_exit()
      The function __devinit mantis_pci_probe() references
      a function __devexit mantis_i2c_exit().
      This is often seen when error handling in the init function
      uses functionality in the exit path.
      The fix is often to remove the __devexit annotation of
      mantis_i2c_exit() so it may be used outside an exit section.
      
      WARNING: drivers/media/dvb/built-in.o(.devinit.text+0x6914): Section mismatch in reference from the function mantis_pci_probe() to the function .devexit.text:mantis_pci_exit()
      The function __devinit mantis_pci_probe() references
      a function __devexit mantis_pci_exit().
      This is often seen when error handling in the init function
      uses functionality in the exit path.
      The fix is often to remove the __devexit annotation of
      mantis_pci_exit() so it may be used outside an exit section.
      
      WARNING: drivers/media/dvb/built-in.o(.devinit.text+0x6d3f): Section mismatch in reference from the function hopper_pci_probe() to the function .devexit.text:mantis_i2c_exit()
      The function __devinit hopper_pci_probe() references
      a function __devexit mantis_i2c_exit().
      This is often seen when error handling in the init function
      uses functionality in the exit path.
      The fix is often to remove the __devexit annotation of
      mantis_i2c_exit() so it may be used outside an exit section.
      
      WARNING: drivers/media/dvb/built-in.o(.devinit.text+0x6d9b): Section mismatch in reference from the function hopper_pci_probe() to the function .devexit.text:mantis_pci_exit()
      The function __devinit hopper_pci_probe() references
      a function __devexit mantis_pci_exit().
      This is often seen when error handling in the init function
      uses functionality in the exit path.
      The fix is often to remove the __devexit annotation of
      mantis_pci_exit() so it may be used outside an exit section.
      
      WARNING: drivers/media/built-in.o(.devinit.text+0x14634): Section mismatch in reference from the function mantis_pci_probe() to the function .devexit.text:mantis_i2c_exit()
      The function __devinit mantis_pci_probe() references
      a function __devexit mantis_i2c_exit().
      This is often seen when error handling in the init function
      uses functionality in the exit path.
      The fix is often to remove the __devexit annotation of
      mantis_i2c_exit() so it may be used outside an exit section.
      
      WARNING: drivers/media/built-in.o(.devinit.text+0x14690): Section mismatch in reference from the function mantis_pci_probe() to the function .devexit.text:mantis_pci_exit()
      The function __devinit mantis_pci_probe() references
      a function __devexit mantis_pci_exit().
      This is often seen when error handling in the init function
      uses functionality in the exit path.
      The fix is often to remove the __devexit annotation of
      mantis_pci_exit() so it may be used outside an exit section.
      
      WARNING: drivers/media/built-in.o(.devinit.text+0x14abb): Section mismatch in reference from the function hopper_pci_probe() to the function .devexit.text:mantis_i2c_exit()
      The function __devinit hopper_pci_probe() references
      a function __devexit mantis_i2c_exit().
      This is often seen when error handling in the init function
      uses functionality in the exit path.
      The fix is often to remove the __devexit annotation of
      mantis_i2c_exit() so it may be used outside an exit section.
      
      WARNING: drivers/media/built-in.o(.devinit.text+0x14b17): Section mismatch in reference from the function hopper_pci_probe() to the function .devexit.text:mantis_pci_exit()
      The function __devinit hopper_pci_probe() references
      a function __devexit mantis_pci_exit().
      This is often seen when error handling in the init function
      uses functionality in the exit path.
      The fix is often to remove the __devexit annotation of
      mantis_pci_exit() so it may be used outside an exit section.
      
      Acked-by: default avatarManu Abraham <manu@linuxtv.org>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      4cf0b3f1
    • Mauro Carvalho Chehab's avatar
      V4L/DVB (13808b): mantis: replace DMA_nnBIT_MASK to DMA_BIT_MASK(32) · 184ac753
      Mauro Carvalho Chehab authored
      
      
      drivers/media/dvb/mantis/mantis_pci.c: In function ‘mantis_pci_init’:
      drivers/media/dvb/mantis/mantis_pci.c:76: warning: ‘DMA_nnBIT_MASK’ is deprecated
      
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      184ac753
    • Manu Abraham's avatar
    • Mauro Carvalho Chehab's avatar
      V4L/DVB(13808a): mantis: convert it to the new ir-core register/unregister functions · 9c0832e3
      Mauro Carvalho Chehab authored
      
      
      Fix a merge conflict between mantis and IR cleanups
      
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      9c0832e3
    • Manu Abraham's avatar
    • Manu Abraham's avatar
    • Manu Abraham's avatar
      28fddb7c