15 Mar, 2010

35 commits

  • 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
    Signed-off-by: Dominik Brodowski

    Jens Künzer
     
  • This reverts commit 635416ef393e8cec5a89fc6c1de710ee9596a51e. The
    argument passed to request_irq() only affects action->flags (IRQF_*),
    but IRQ_NOAUTOEN relates to desc->status.

    Reported-by: Jan Beulich
    CC: Alan Cox
    Signed-off-by: Dominik Brodowski

    Dominik Brodowski
     
  • 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
    Signed-off-by: Dominik Brodowski

    Dominik Brodowski
     
  • struct pcmcia_socket lock had been used before.

    Signed-off-by: Yoichi Yuasa
    Signed-off-by: Dominik Brodowski

    Yoichi Yuasa
     
  • * '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
    ...

    Linus Torvalds
     
  • Commit 6992f5334995af474c2b58d010d08bc597f0f2fe ("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
    Cc: Eric W. Biederman
    Signed-off-by: Linus Torvalds

    Wolfram Sang
     
  • …31916-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

    Len Brown
     
  • 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
    Signed-off-by: Alex Chiang
    Signed-off-by: Len Brown

    Alex Chiang
     
  • 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
    Signed-off-by: Alex Chiang
    Signed-off-by: Len Brown

    Alex Chiang
     
  • Untangle the nested if conditions to make this function look
    more similar to the other map_*apic_id() functions.

    Acked-by: Venkatesh Pallipadi
    Signed-off-by: Alex Chiang
    Signed-off-by: Len Brown

    Alex Chiang
     
  • Untangle the if() statement a little for readability.

    Acked-by: Venkatesh Pallipadi
    Signed-off-by: Alex Chiang
    Signed-off-by: Len Brown

    Alex Chiang
     
  • 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
    Acked-by: Venkatesh Pallipadi
    Signed-off-by: Alex Chiang
    Signed-off-by: Len Brown

    Alex Chiang
     
  • 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
    Signed-off-by: Alex Chiang
    Signed-off-by: Len Brown

    Alex Chiang
     
  • 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
    Signed-off-by: Alex Chiang
    Signed-off-by: Len Brown

    Alex Chiang
     
  • 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
    Signed-off-by: Alex Chiang
    Signed-off-by: Len Brown

    Alex Chiang
     
  • 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
    Signed-off-by: Alex Chiang
    Signed-off-by: Len Brown

    Alex Chiang
     
  • 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
    Signed-off-by: Alex Chiang
    Signed-off-by: Len Brown

    Alex Chiang
     
  • 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
    Signed-off-by: Alex Chiang
    Signed-off-by: Len Brown

    Alex Chiang
     
  • Signed-off-by: Len Brown

    Len Brown
     
  • 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
    Signed-off-by: Len Brown

    Len Brown
     
  • 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
    Signed-off-by: Len Brown

    Bjorn Helgaas
     
  • 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
    Signed-off-by: Len Brown

    Bjorn Helgaas
     
  • 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
    Signed-off-by: Len Brown

    Bjorn Helgaas
     
  • Add support for bus number resources. This is for bridges with a range of
    bus numbers behind them.

    Signed-off-by: Bjorn Helgaas
    Signed-off-by: Len Brown

    Bjorn Helgaas
     
  • No functional change; this just makes room for another resource type.

    Signed-off-by: Bjorn Helgaas
    Signed-off-by: Len Brown

    Bjorn Helgaas
     
  • The original code returns a freed pointer. This function is expected to
    return NULL on errors.

    Signed-off-by: Dan Carpenter
    Acked-by: Tetsuo Handa
    Signed-off-by: James Morris

    Dan Carpenter
     
  • 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
    Tested-by: Paul Martin
    Signed-off-by: Len Brown

    Shaohua Li
     
  • 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
    Acked-by: Zhang Rui
    Signed-off-by: Len Brown

    Matthew Garrett
     
  • …/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

    Linus Torvalds
     
  • drivers/i2c/busses/i2c-xiic.c:493: error: implicit declaration of function 'mdelay'

    Signed-off-by: Randy Dunlap
    Cc: "Richard Röjfors"
    Cc: "Ben Dooks (embedded platforms)"
    Cc: linux-i2c@vger.kernel.org
    Signed-off-by: Stephen Rothwell
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • This file was missed in the original patch that went into Linus' tree.

    Cc: "Ben Dooks (embedded platforms)"
    Cc: linux-i2c@vger.kernel.org
    Signed-off-by: Richard Röjfors
    Signed-off-by: Stephen Rothwell
    Signed-off-by: Linus Torvalds

    Richard Röjfors
     
  • * '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

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     

14 Mar, 2010

5 commits

  • Commit f56e8a076 "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
    Cc: "H. Peter Anvin"
    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:
    Signed-off-by: Ingo Molnar

    Ingo Molnar
     
  • ALDI/MEDION netbook E1222 needs to be in the reset quirk list for
    its touchpad's proper function.

    Reported-by: Michael Fischer
    Signed-off-by: Christoph Fritz
    Cc: stable@kernel.org
    Signed-off-by: Dmitry Torokhov

    Christoph Fritz
     
  • 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
    Signed-off-by: Dmitry Torokhov

    Martin Buck
     
  • * 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

    Linus Torvalds
     
  • This kills the following checkpatch warnings:

    WARNING: unnecessary whitespace before a quoted newline
    #869: FILE: super.c:869:
    + "remount to a different snapshot. \n",

    WARNING: unnecessary whitespace before a quoted newline
    #389: FILE: the_nilfs.c:389:
    + printk(KERN_ERR "NILFS: too short segment. \n");

    Signed-off-by: Ryusuke Konishi

    Ryusuke Konishi