Skip to content
Commits on Mar 15, 2010
  1. @torvalds

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds committed Mar 14, 2010
    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (34 commits)
      ACPI: processor: push file static MADT pointer into internal map_madt_entry()
      ACPI: processor: refactor internal map_lsapic_id()
      ACPI: processor: refactor internal map_x2apic_id()
      ACPI: processor: refactor internal map_lapic_id()
      ACPI: processor: driver doesn't need to evaluate _PDC
      ACPI: processor: remove early _PDC optin quirks
      ACPI: processor: add internal processor_physically_present()
      ACPI: processor: move acpi_get_cpuid into processor_core.c
      ACPI: processor: export acpi_get_cpuid()
      ACPI: processor: mv processor_pdc.c processor_core.c
      ACPI: processor: mv processor_core.c processor_driver.c
      ACPI: plan to delete "acpi=ht" boot option
      ACPI: remove "acpi=ht" DMI blacklist
      PNPACPI: add bus number support
      PNPACPI: add window support
      resource: add window support
      resource: add bus number support
      resource: expand IORESOURCE_TYPE_BITS to make room for bus resource type
      acpiphp: Execute ACPI _REG method for hotadded devices
      ACPI video: Be more liberal in validating _BQC behaviour
      ...
  2. @torvalds

    init dynamic bin_attribute structures

    Wolfram Sang committed with torvalds Mar 15, 2010
    Commit 6992f53 ("sysfs: Use one lockdep
    class per sysfs attribute.") introduced this requirement.  First, at25
    was fixed manually.  Then, other occurences were found with coccinelle
    and the following semantic patch.  Results were reviewed and fixed up:
    
        @ init @
        identifier struct_name, bin;
        @@
    
        	struct struct_name {
        		...
        		struct bin_attribute bin;
        		...
        	};
    
        @ main extends init @
        expression E;
        statement S;
        identifier name, err;
        @@
    
        (
        	struct struct_name *name;
        |
        -	struct struct_name *name = NULL;
        +	struct struct_name *name;
        )
        	...
        (
        	sysfs_bin_attr_init(&name->bin);
        |
        +	sysfs_bin_attr_init(&name->bin);
        	if (sysfs_create_bin_file(E, &name->bin))
        		S
        |
        +	sysfs_bin_attr_init(&name->bin);
        	err = sysfs_create_bin_file(E, &name->bin);
        )
    
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Cc: Eric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @lenb

    Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', …

    lenb committed Mar 14, 2010
    …'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release
  4. @lenb

    ACPI: processor: push file static MADT pointer into internal map_madt…

    Alex Chiang committed with lenb Feb 22, 2010
    …_entry()
    
    There's no real need for a pointer to the MADT to be global. The only
    function who uses it is map_madt_entry.
    
    This allows us to remove some more ugly #ifdefs.
    
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Alex Chiang <achiang@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  5. @lenb

    ACPI: processor: refactor internal map_lsapic_id()

    Alex Chiang committed with lenb Feb 22, 2010
    Un-nest the if statements for readability.
    
    Remove comments that re-state the obvious.
    
    Change the control flow so that we no longer need a temp variable.
    
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Alex Chiang <achiang@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  6. @lenb

    ACPI: processor: refactor internal map_x2apic_id()

    Alex Chiang committed with lenb Feb 22, 2010
    Untangle the nested if conditions to make this function look
    more similar to the other map_*apic_id() functions.
    
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Alex Chiang <achiang@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  7. @lenb

    ACPI: processor: refactor internal map_lapic_id()

    Alex Chiang committed with lenb Feb 22, 2010
    Untangle the if() statement a little for readability.
    
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Alex Chiang <achiang@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  8. @lenb

    ACPI: processor: driver doesn't need to evaluate _PDC

    Alex Chiang committed with lenb Feb 22, 2010
    Now that the early _PDC evaluation path knows how to correctly
    evaluate _PDC on only physically present processors, there's no
    need for the processor driver to evaluate it later when it loads.
    
    To cover the hotplug case, push _PDC evaluation down into the
    hotplug paths.
    
    Cc: x86@kernel.org
    Cc: Tony Luck <tony.luck@intel.com>
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Alex Chiang <achiang@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  9. @lenb

    ACPI: processor: remove early _PDC optin quirks

    Alex Chiang committed with lenb Feb 22, 2010
    Now that we check for physically present processors before blindly
    evaluating _PDC, we no longer need to maintain a DMI opt-in table
    nor a kernel param.
    
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Alex Chiang <achiang@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  10. @lenb

    ACPI: processor: add internal processor_physically_present()

    Alex Chiang committed with lenb Feb 22, 2010
    Detect if a processor is physically present before evaluating _PDC.
    
    We want this because some BIOS will provide a _PDC even for processors
    that are not present. These bogus _PDC methods then attempt to load
    non-existent tables, which causes problems.
    
    Avoid those bogus landmines.
    
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Alex Chiang <achiang@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  11. @lenb

    ACPI: processor: move acpi_get_cpuid into processor_core.c

    Alex Chiang committed with lenb Feb 22, 2010
    Enumerating processors (via MADT/_MAT) belongs in the processor core,
    which is always built-in, rather than living in the processor driver
    which may not be built.
    
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Alex Chiang <achiang@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  12. @lenb

    ACPI: processor: export acpi_get_cpuid()

    Alex Chiang committed with lenb Feb 22, 2010
    Rename static get_cpu_id() to acpi_get_cpuid() and export it.
    
    This change also gives us an opportunity to remove the
    #ifndef CONFIG_SMP from processor_driver.c and into a header file
    where it properly belongs.
    
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Alex Chiang <achiang@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  13. @lenb

    ACPI: processor: mv processor_pdc.c processor_core.c

    Alex Chiang committed with lenb Feb 22, 2010
    We've renamed the old processor_core.c to processor_driver.c, to
    convey the idea that it can be built modular and has driver-like
    bits.
    
    Now let's re-create a processor_core.c for the bits needed
    statically by the rest of the kernel. The contents of processor_pdc.c
    are a good starting spot, so let's just rename that file and
    complete our three card monte.
    
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Alex Chiang <achiang@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  14. @lenb

    ACPI: processor: mv processor_core.c processor_driver.c

    Alex Chiang committed with lenb Feb 22, 2010
    The ACPI processor driver can be built as a module. But it has
    pieces of code that should always be built statically into the
    kernel.
    
    The plan is for processor_core.c to contain the static bits while
    processor_driver.c contains the module-like bits.
    
    Since the bulk of the code in the current processor_core.c is
    module-like, first step is to rename the file to processor_driver.c
    
    Next step will re-create processor_core.c and cherry-pick out
    the static bits.
    
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Alex Chiang <achiang@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  15. @lenb

    ACPI: plan to delete "acpi=ht" boot option

    lenb committed Mar 14, 2010
    Signed-off-by: Len Brown <len.brown@intel.com>
  16. @lenb

    ACPI: remove "acpi=ht" DMI blacklist

    lenb committed Feb 18, 2010
    SuSE added these entries when deploying ACPI in Linux-2.4.
    I pulled them into Linux-2.6 on 2003-08-09.
    Over the last 6+ years, several entries have proven to be
    unnecessary and deleted, while no new entries have been added.
    Matthew suggests that they now have negative value, and I agree.
    
    Based-on-patch-by: Matthew Garrett <mjg59@srcf.ucam.org>
    Signed-off-by: Len Brown <len.brown@intel.com>
  17. @lenb

    PNPACPI: add bus number support

    Bjorn Helgaas committed with lenb Mar 5, 2010
    Add support for bus number resources.  This is for bridges with a range of
    bus numbers behind them.  Previously, PNP ignored bus number resources.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  18. @lenb

    PNPACPI: add window support

    Bjorn Helgaas committed with lenb Mar 5, 2010
    Add support for resource windows.  This is for bridge resources, i.e.,
    regions where a bridge forwards transactions from the primary to the
    secondary side.  This does not add support for *setting* windows via
    the /proc interface.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  19. @lenb

    resource: add window support

    Bjorn Helgaas committed with lenb Mar 5, 2010
    Add support for resource windows.  This is for bridge resources, i.e.,
    regions where a bridge forwards transactions from the primary to the
    secondary side.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  20. @lenb

    resource: add bus number support

    Bjorn Helgaas committed with lenb Mar 5, 2010
    Add support for bus number resources.  This is for bridges with a range of
    bus numbers behind them.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  21. @lenb

    resource: expand IORESOURCE_TYPE_BITS to make room for bus resource type

    Bjorn Helgaas committed with lenb Mar 5, 2010
    No functional change; this just makes room for another resource type.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
Commits on Mar 14, 2010
  1. @error27

    tomoyo: fix potential use after free

    error27 committed with James Morris Mar 13, 2010
    The original code returns a freed pointer.  This function is expected to
    return NULL on errors.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Signed-off-by: James Morris <jmorris@namei.org>
  2. @lenb

    acpiphp: Execute ACPI _REG method for hotadded devices

    Shaohua Li committed with lenb Feb 25, 2010
    Per ACPI spec, _ERG method should be executed before device driver
    gets control for hotpluged device. Firmware might do some configuration
    there. See http://bugzilla.kernel.org/show_bug.cgi?id=10805. In this
    machine, _REG method of docked device will configure cardbus bridge.
    
    Signed-off-by: Shaohua Li <shaohua.li@intel.com>
    Tested-by: Paul Martin <pm@debian.org>
    Signed-off-by: Len Brown <len.brown@intel.com>
  3. @lenb

    ACPI video: Be more liberal in validating _BQC behaviour

    Matthew Garrett committed with lenb Feb 16, 2010
    Right now, if _BQC returns a value we don't understand we immediately
    invalidate it. Change this behaviour so we only invalidate it if it
    continues to give an invalid answer after we've already set a brightness.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Acked-by: Zhang Rui <rui.zhang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  4. @torvalds

    Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds committed Mar 14, 2010
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86/mce: Fix build bug with CONFIG_PROVE_LOCKING=y && CONFIG_X86_MCE_INTEL=y
  5. @torvalds

    Add include to i2c-xii.c to fix build error

    Randy Dunlap committed with torvalds Feb 4, 2010
    drivers/i2c/busses/i2c-xiic.c:493: error: implicit declaration of function 'mdelay'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: "Richard Röjfors" <richard.rojfors@pelagicore.com>
    Cc: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
    Cc: linux-i2c@vger.kernel.org
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    Add the platform data include for the Xilinx XPS IIC Bus Interface

    Richard Röjfors committed with torvalds Mar 9, 2010
    This file was missed in the original patch that went into Linus' tree.
    
    Cc: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
    Cc: linux-i2c@vger.kernel.org
    Signed-off-by: Richard Röjfors <richard.rojfors@pelagicore.com>
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @torvalds

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

    torvalds committed Mar 14, 2010
    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: i8042 - add ALDI/MEDION netbook E1222 to qurik reset table
      Input: ALPS - fix stuck buttons on some touchpads
      Input: wm831x-on - convert to use genirq
      Input: ads7846 - add wakeup support
      Input: appletouch - fix integer overflow issue
      Input: ad7877 - increase pen up imeout
      Input: ads7846 - add support for AD7843 parts
      Input: bf54x-keys - fix system hang when pressing a key
      Input: alps - add support for the touchpad on Toshiba Tecra A11-11L
      Input: remove BKL, fix input_open_file() locking
      Input: serio_raw - remove BKL
      Input: mousedev - remove BKL
      Input: add driver for TWL4030 vibrator device
      Input: enable remote wakeup for PNP i8042 keyboard ports
      Input: scancode in get/set_keycodes should be unsigned
      Input: i8042 - use platfrom_create_bundle() helper
      Input: wacom - merge out and in prox events
      Input: gamecon - fix off by one range check
      Input: wacom - replace WACOM_PKGLEN_PENABLED
  8. @torvalds

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

    torvalds committed Mar 14, 2010
    …/git/ryusuke/nilfs2
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
      nilfs2: remove whitespaces before quoted newlines
      nilfs2: remove spaces before tabs
      nilfs2: fix various typos in comments
      nilfs2: fix typo "cout" -> "count" in error message
      nilfs2: fix function name typos in docbook comments
      nilfs2: fix discrepancy in use of static specifier
  9. @torvalds

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

    torvalds committed Mar 14, 2010
    …rnel/git/jdelvare/staging
    
    * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      i2c-algo-bit: Add pre- and post-xfer hooks
      at24: Init dynamic bin_attribute structures
      i2c: Drop configure option I2C_DEBUG_CHIP
      tsl2550: Move from i2c/chips to misc
      i2c-i801: Don't use the block buffer for I2C block writes
      i2c-powermac: Be less verbose in the absence of real errors.
      i2c-smbus: Use device_lock/device_unlock
  10. @torvalds

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

    torvalds committed Mar 14, 2010
    …/git/ericvh/v9fs
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
      9p: Skip check for mandatory locks when unlocking
      9p: Fixes a simple bug enabling writes beyond 2GB.
      9p: Change the name of new protocol from 9p2010.L to 9p2000.L
      fs/9p: re-init the wstat in readdir loop
      net/9p: Add sysfs mount_tag file for virtio 9P device
      net/9p: Use the tag name in the config space for identifying mount point
  11. x86/mce: Fix build bug with CONFIG_PROVE_LOCKING=y && CONFIG_X86_MCE_…

    Ingo Molnar committed Mar 14, 2010
    …INTEL=y
    
    Commit f56e8a0 "x86/mce: Fix RCU lockdep splats" introduced the
    following build bug:
    
      arch/x86/kernel/cpu/mcheck/mce.c: In function 'mce_log':
      arch/x86/kernel/cpu/mcheck/mce.c:166: error: 'mce_read_mutex' undeclared (first use in this function)
      arch/x86/kernel/cpu/mcheck/mce.c:166: error: (Each undeclared identifier is reported only once
      arch/x86/kernel/cpu/mcheck/mce.c:166: error: for each function it appears in.)
    
    Move the in-the-middle-of-file lock variable up to the variable
    definition section, the top of the .c file.
    
    Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: x86@kernel.org
    Cc: laijs@cn.fujitsu.com
    Cc: dipankar@in.ibm.com
    Cc: mathieu.desnoyers@polymtl.ca
    Cc: josh@joshtriplett.org
    Cc: dvhltc@us.ibm.com
    Cc: niv@us.ibm.com
    Cc: peterz@infradead.org
    Cc: rostedt@goodmis.org
    Cc: Valdis.Kletnieks@vt.edu
    Cc: dhowells@redhat.com
    LKML-Reference: <1267830207-9474-3-git-send-email-paulmck@linux.vnet.ibm.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  12. @ch-f @dtor

    Input: i8042 - add ALDI/MEDION netbook E1222 to qurik reset table

    ch-f committed with dtor Mar 13, 2010
    ALDI/MEDION netbook E1222 needs to be in the reset quirk list for
    its touchpad's proper function.
    
    Reported-by: Michael Fischer <mifi@gmx.de>
    Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
    Cc: stable@kernel.org
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  13. @dtor

    Input: ALPS - fix stuck buttons on some touchpads

    Martin Buck committed with dtor Mar 13, 2010
    Enable button release event redirection to the device that got the
    button press not only for touchpads with interleaved protocols, but
    unconditionally for all Alps touchpads. This is required at least
    for the touchpads in Dell Inspiron 8200 and Latitude d630.
    
    Signed-off-by: Martin Buck <mb-tmp-yvahk-vachg@gromit.dyndns.org>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  14. @torvalds

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

    torvalds committed Mar 13, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Add very basic XVR-1000 framebuffer driver.
      qlogicpti: Remove slash in QlogicPTI irq name
Something went wrong with that request. Please try again.