Permalink
Switch branches/tags
Commits on Mar 18, 2010
  1. Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds committed Mar 18, 2010
    …t/brodo/pcmcia-2.6
    
    * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
      PCMCIA: resource, fix lock imbalance
      pcmcia: add important if statement
      pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessary
      pcmcia: allow for cb_irq to differ from pci_dev's irq in yenta_socket
      pcmcia: honor saved flags in yenta_socket's I365_CSCINT register
      pcmcia: revert "irq probe can be done without risking an IRQ storm"
      pcmcia: pd6729, i82092: use parent (PCI) resources
      pcmcia/vrc4171: use local spinlock for device local lock.
  2. memory hotplug/s390: set phys_device

    Heiko Carstens committed with torvalds Mar 15, 2010
    Implement arch specific arch_get_memory_phys_device function and
    initialize phys_device for each memory section.  That way we finally can
    tell which piece of memory belongs to which physical device.
    
    This makes s390's /sys/devices/system/memory/memoryX/phys_device display
    the correct thing?
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Dave Hansen <haveblue@us.ibm.com>
    Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. memory hotplug: allow setting of phys_device

    Heiko Carstens committed with torvalds Mar 15, 2010
    /sys/devices/system/memory/memoryX/phys_device is supposed to contain the
    number of the physical device that the corresponding piece of memory
    belongs to.
    
    In case a physical device should be replaced or taken offline for whatever
    reason it is necessary to set all corresponding memory pieces offline.
    The current implementation always sets phys_device to '0' and there is no
    way or hook to change that.  Seems like there was a plan to implement that
    but it wasn't finished for whatever reason.
    
    So add a weak function which architectures can override to actually set
    the phys_device from within add_memory_block().
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Dave Hansen <haveblue@us.ibm.com>
    Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. hpet: use for_each_set_bit()

    mita committed with torvalds Mar 15, 2010
    Replace open-coded loop with for_each_set_bit().
    
    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
    Cc: Clemens Ladisch <clemens@ladisch.de>
    Cc: Bob Picco <bob.picco@hp.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. ntfs: use bitmap_weight

    mita committed with torvalds Mar 15, 2010
    Use bitmap_weight() instead of doing hweight32() for each u32 element in
    the page.
    
    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
    Cc: Anton Altaparmakov <aia21@cantab.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. jffs2: fix up rb_root initializations to use RB_ROOT

    Venkatesh Pallipadi committed with torvalds Mar 15, 2010
    jffs2 uses rb_node = NULL; to zero rb_root.
    
    The problem with this is that 17d9ddc ("rbtree: Add
    support for augmented rbtrees") in the linux-next tree adds a new field
    to that struct which needs to be NULL as well.  This patch uses RB_ROOT
    as the intializer so all of the relevant fields will be NULL'd.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Cc: Eric Paris <eparis@redhat.com>
    Acked-by: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. memcg: avoid use cmpxchg in swap cgroup maintainance

    hkamezawa committed with torvalds Mar 15, 2010
    swap_cgroup uses 2bytes data and uses cmpxchg in a new operation.  2byte
    cmpxchg/xchg is not available on some archs.  This patch replaces
    cmpxchg/xchg with operations under lock.
    
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Reported-by: Sachin Sant <sachinp@in.ibm.com> wrote:
    Acked-by: Balbir Singh <balbir@in.ibm.com>
    Acked-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Cc: Li Zefan <lizf@cn.fujitsu.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Mar 16, 2010
  1. PCMCIA: resource, fix lock imbalance

    Jiri Slaby committed with Dominik Brodowski Mar 16, 2010
    Stanse found that one error path (when alloc_skb fails) in netdev_tx
    omits to unlock hw_priv->hwlock. Fix that by moving away from unlock in
    each fail path. Unlock at one place instead.
    
    Introduced in 94a819f
    (pcmcia: assert locking to struct pcmcia_device)
    
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Commits on Mar 15, 2010
  1. pcmcia: add important if statement

    error27 committed with Dominik Brodowski Mar 15, 2010
    There was a problem introduced in Jul 2008 by:
    0e6f9d2 pcmcia: use pcmcia_loop_config in scsi pcmcia drivers
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  2. pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessary

    fpga68k committed with Dominik Brodowski Mar 6, 2010
    As the PCI irq pin of the ti1130 pcmcia bridge is not connected (at
    least on some old IBM Thinkpad 760ED notebooks), the Cardbus IRQ has
    to be routed to an ISA irq.
    
    Part 3 of a series to allow the ISA irq to be used for Cardbus devices
    if the socket's PCI irq is unusable.
    
    [linux@dominikbrodowski.net: split up the original patch, commit message,
     cleanup]
    
    Signed-off-by: Jens Kuenzer <Jens.Kuenzer@fpga.homeip.net>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  3. pcmcia: allow for cb_irq to differ from pci_dev's irq in yenta_socket

    fpga68k committed with Dominik Brodowski Mar 6, 2010
    cb_irq is presumed to be the same as the pci_dev's irq. This won't be
    true any more as soon as we allow the ISA irq to be used for Cardbus
    devices. Therefore, use the pci_dev's irq explicitely whenever we
    care about it.
    
    Part 2 of a series to allow the ISA irq to be used for Cardbus devices
    if the socket's PCI irq is unusable.
    
    [linux@dominikbrodowski.net: split up the original patch, commit message]
    
    Signed-off-by: Jens Kuenzer <Jens.Kuenzer@fpga.homeip.net>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  4. pcmcia: honor saved flags in yenta_socket's I365_CSCINT register

    fpga68k committed with Dominik Brodowski Mar 6, 2010
    Instead of overwriting the I365_CSCINT register, save the old value and
    merely change the bits we care about.
    
    Part 1 of a series to allow the ISA irq to be used for Cardbus devices
    if the socket's PCI irq is unusable.
    
    [linux@dominikbrodowski.net: split up the original patch, commit message]
    
    Signed-off-by: Jens Kuenzer <Jens.Kuenzer@fpga.homeip.net>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  5. pcmcia: revert "irq probe can be done without risking an IRQ storm"

    Dominik Brodowski committed Mar 9, 2010
    This reverts commit 635416e. The
    argument passed to request_irq() only affects action->flags (IRQF_*),
    but IRQ_NOAUTOEN relates to desc->status.
    
    Reported-by: Jan Beulich <JBeulich@novell.com>
    CC: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  6. pcmcia: pd6729, i82092: use parent (PCI) resources

    Dominik Brodowski committed Mar 13, 2010
    A newly added parent resource entry for the root PCI bus, such as
    
    40000000-ffffffff : PCI Bus #00
    
    means that the pd6729 and i82092 drivers cannot allocate iomem as
    freely as before, unless they do so as PCI devices. Therefore, set
    socket->cb_dev so that rsrc_nonstatic.c does the right thing.
    
    Reported-by: Komuro <komurojun-mbn@nifty.com>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  7. pcmcia/vrc4171: use local spinlock for device local lock.

    Yoichi Yuasa committed with Dominik Brodowski Mar 10, 2010
    struct pcmcia_socket lock had been used before.
    
    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  8. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds committed Mar 15, 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
      ...
  9. 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>
  10. Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', …

    lenb committed Mar 15, 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
  11. 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>
  12. 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>
  13. 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>
  14. 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>
  15. 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>
  16. 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>
  17. 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>
  18. 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>
  19. 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>
  20. 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>
  21. 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>
  22. ACPI: plan to delete "acpi=ht" boot option

    lenb committed Mar 14, 2010
    Signed-off-by: Len Brown <len.brown@intel.com>
  23. ACPI: remove "acpi=ht" DMI blacklist

    lenb committed Feb 19, 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>
  24. 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>
  25. 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>
  26. 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>
  27. 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>