summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* sdhci: catch ADMA errorsPierre Ossman2009-05-031-1/+1
| | | | | | We forgot to add the ADMA error bit to the list of data interrupts. Signed-off-by: Pierre Ossman <pierre@ossman.eu>
* mmc: increase power up delayJosé M. Fernández2009-05-031-2/+2
| | | | | | | | The TI controller on Toshiba Tecra M5 needs more time to power up or the cards will init incorrectly or not at all. Signed-off-by: José M. Fernández <josemariafg@gmail.com> Signed-off-by: Pierre Ossman <pierre@ossman.eu>
* sdhci-pci: bad error handling in probe functionDan Carpenter2009-05-031-3/+5
| | | | | | | | | | | | The goto unmap is too early, we haven't allocated host or done the request_region(). Found by smatch (http://repo.or.cz/w/smatch.git). [ Second error path fix by Pierre Ossman ] Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Pierre Ossman <pierre@ossman.eu>
* mmc_block: be prepared for oversized requestsPierre Ossman2009-05-031-0/+8
| | | | | | | | | | The block layer does not support very low sector count restrictions so we need to be prepared to handle bigger requests than we can send directly to the controller. Problem found by Manuel Lauss. Signed-off-by: Pierre Ossman <pierre@ossman.eu>
* PM/Hibernate: Fix waiting for image device to appear on resumeRafael J. Wysocki2009-04-241-24/+27
| | | | | | | | | | | | | | | | | | | | Commit c751085943362143f84346d274e0011419c84202 ("PM/Hibernate: Wait for SCSI devices scan to complete during resume") added a call to scsi_complete_async_scans() to software_resume(), so that it waited for the SCSI scanning to complete, but the call was added at a wrong place. Namely, it should have been added after wait_for_device_probe(), which is called only if the image partition hasn't been specified yet. Also, it's reasonable to check if the image partition is present and only wait for the device probing and SCSI scanning to complete if it is not the case. Additionally, since noresume is checked right at the beginning of software_resume() and the function returns immediately if it's set, it doesn't make sense to check it once again later. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* ROMFS: Advance destination buffer pointer when reading from a blockdevDavid Howells2009-04-241-0/+1
| | | | | | | | | | | RomFS should advance the destination buffer pointer when reading data from a blockdev source (the data may be split over multiple blocks, each requiring its own sb_read() call). Without this, all the data is copied to the beginning of the output buffer. Signed-off-by: David Howells <dhowells@redhat.com> Tested-by: Michal Simek <monstr@monstr.eu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* ROMFS: romfs_lookup() shouldn't be doing a partial name comparisonDavid Howells2009-04-243-22/+53
| | | | | | | | | | romfs_lookup() should be using a routine akin to strcmp() on the backing store, rather than one akin to strncmp(). If it uses the latter, it's liable to match /bin/shutdown when looking up /bin/sh. Signed-off-by: David Howells <dhowells@redhat.com> Tested-by: Michal Simek <monstr@monstr.eu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* lib: find_last_bit.o needed by a module only, move it from lib to objFred Isaman2009-04-241-1/+1
| | | | | | | | | | | | | | | | Currently, although find_last_bit is EXPORTed, it is statically linked with the kernel and is referenced only under CONFIG_SMP. When CONFIG_SMP is undefined and find_last_bit is referenced only by modules, linking fails with: ERROR: "find_last_bit" [fs/nfs/nfs.ko] undefined! Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Fred Isaman <iisaman@citi.umich.edu> Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* CacheFiles: Fix the documentation to use the correct credential pointer namesMarc Dionne2009-04-241-4/+4
| | | | | | | | | | | | Adjust the CacheFiles documentation to use the correct names of the credential pointers in task_struct. The documentation was using names from the old versions of the credentials patches. Signed-off-by: Marc Dionne <marc.c.dionne@gmail.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* virtio-rng: Remove false BUG for spurious callbacksChristian Borntraeger2009-04-241-2/+2
| | | | | | | | | | | The virtio-rng drivers checks for spurious callbacks. Since callbacks can be implemented via shared interrupts (e.g. PCI) this could lead to guest kernel oopses with lots of virtio devices. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblazeLinus Torvalds2009-04-2418-51/+60
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: add parameter to microblaze_read() microblaze: Use CFLAGS_KERNEL instead of CFLAGS microblaze: Add STATE_SAVE_ARG_SPACE for noMMU kernel too microblaze: Do not check use_dcache microblaze: Do not use PVR configuration for broken MB version microblaze: Fix USR1/2 pvr printing message microblaze: iowrite upon timeout microblaze: Correspond CONFIG...PCMP in Makefile/Kconfig microblaze: Remove redundant variable microblaze: Move start_thread to process.c microblaze: Add missing preadv and pwritev syscalls microblaze: Add missing declaration for die and _exception func microblaze: Remove sparse error in traps.c microblaze: Move task_pt_regs up microblaze: Rename kernel_mode to pt_mode in pt_regs microblaze: Remove uncache shadow condition microblaze: Remove while(1) loop from show_regs function microblaze: Remove unneded per cpu SYSCALL_SAVE variable
| * microblaze: add parameter to microblaze_read()Coly Li2009-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | This patch modifies parameter of microblaze_read() from 'void' to 'struct clocksource *cs', which fixes compile warning for incompatible parameter type. Signed-off-by: Coly Li <coly.li@suse.de> Cc: Michal Simek <monstr@monstr.eu> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Use CFLAGS_KERNEL instead of CFLAGSMichal Simek2009-04-231-4/+2
| | | | | | | | Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Add STATE_SAVE_ARG_SPACE for noMMU kernel tooMichal Simek2009-04-233-4/+15
| | | | | | | | | | | | | | For noMMU kernel this change nothing bring but this change helps with MMU synchronization. Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Do not check use_dcacheMichal Simek2009-04-231-3/+0
| | | | | | | | | | | | | | It is not necessary to check cpuinfo.use_dcache because this checking is done in function which call that functions Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Do not use PVR configuration for broken MB versionMichal Simek2009-04-232-3/+8
| | | | | | | | Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Fix USR1/2 pvr printing messageMichal Simek2009-04-231-2/+2
| | | | | | | | Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: iowrite upon timeoutRoel Kluin2009-04-231-1/+1
| | | | | | | | | | | | | | | | retries reaches -1, so the iowrite occurrs upon timeout. Acked-by: John Williams <john.williams@petalogix.com> Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Correspond CONFIG...PCMP in Makefile/KconfigMichal Simek2009-04-231-1/+1
| | | | | | | | | | | | | | Makefile contained different cpu config flag than is in Kconfig.auto in platform folder Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Remove redundant variableMichal Simek2009-04-231-4/+1
| | | | | | | | Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Move start_thread to process.cMichal Simek2009-04-232-10/+12
| | | | | | | | | | | | This change is due to upcomming MMU merge Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Add missing preadv and pwritev syscallsMichal Simek2009-04-232-1/+5
| | | | | | | | Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Add missing declaration for die and _exception funcMichal Simek2009-04-231-0/+3
| | | | | | | | | | | | This change remove sparse errors. Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Remove sparse error in traps.cMichal Simek2009-04-231-1/+1
| | | | | | | | | | | | | | | | CHECK arch/microblaze/kernel/traps.c arch/microblaze/kernel/traps.c:37:47: warning: Using plain integer as NULL pointer CC arch/microblaze/kernel/traps.o Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Move task_pt_regs upMichal Simek2009-04-231-3/+3
| | | | | | | | | | | | This change is important for easier merge with Microblaze MMU code. Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Rename kernel_mode to pt_mode in pt_regsMichal Simek2009-04-234-6/+6
| | | | | | | | Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Remove uncache shadow conditionMichal Simek2009-04-231-5/+0
| | | | | | | | | | | | | | Uncached shadow feature is not supported in current kernel code that's why I removed it. Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Remove while(1) loop from show_regs functionMichal Simek2009-04-231-2/+0
| | | | | | | | | | | | | | I removed it because of show_regs can't break die function. If process/kernel failed, die (do_exit) function resolve it. Signed-off-by: Michal Simek <monstr@monstr.eu>
| * microblaze: Remove unneded per cpu SYSCALL_SAVE variableMichal Simek2009-04-231-1/+0
| | | | | | | | Signed-off-by: Michal Simek <monstr@monstr.eu>
* | Merge branch 'release' of ↵Linus Torvalds2009-04-2419-263/+318
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (34 commits) ACPI, i915: Register ACPI video even when not modesetting Revert "ACPICA: delete check for AML access to port 0x81-83" I/O port protection: update for windows compatibility. sony-laptop: always try to unblock rfkill on load sony-laptop: fix bogus error message display on resume ACPI: EC: Fix ACPI EC resume non-query interrupt message sony-laptop: SNC input event 38 fix sony-laptop: SNC 127 Initialization Fix sony-laptop: Duplicate SNC 127 Event Fix ACPI: prevent processor.max_cstate=0 boot crash ACPI/hpet: prevent boot hang when hpet=force used on ICH-4M ACPI: delete obsolete "bus master activity" proc field ACPI: idle: mark_tsc_unstable() at init-time, not run-time ACPI: add /sys/firmware/acpi/interrupts/sci_not counter ACPI video: fix an error when the brightness levels on AC and on Battery are same acpi-cpufreq: Do not let get_measured perf depend on internal variable acpi-cpufreq: style-only: add parens to math expression acpi-cpufreq: Cleanup: Use printk_once x86, acpi_cpufreq: Fix the NULL pointer dereference in get_measured_perf thinkpad-acpi: bump up version to 0.23 ...
| * \ Merge branch 'bjorn.button' into releaseLen Brown2009-04-241-96/+44
| |\ \
| | * | ACPI: button: remove control method/fixed hardware distinctionsBjorn Helgaas2009-04-111-26/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the driver distinction between control method (CM) and fixed hardware (FF) buttons. We previously needed that so we could install either a fixed event handler or a notify handler, but the Linux/ACPI code now handles that for us, so we don't need to worry about it. Note that this removes the FF/CM annotation from the "info" files in /proc. For example, /proc/acpi/button/PWRF/info: -type: Power Button (FF) +type: Power Button I don't think there's anything meaningful user-space can do by knowing whether a button is a control method or a fixed hardware button, so nobody should be looking at the FF/CM. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | ACPI: button: remove button->device pointerBjorn Helgaas2009-04-111-18/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer need a pointer from struct acpi_button back to the struct acpi_device. Everywhere we used that pointer, we either already have, or can easily get, the acpi_device pointer without using the copy from acpi_button. So this patch removes the structure element. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | ACPI: button: cache hid/name/class pointersBjorn Helgaas2009-04-111-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds temporaries to cache the acpi_device_hid(), acpi_device_name(), and acpi_device_class() pointers so we don't have to clutter the code with so many uses of those interfaces. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | ACPI: button: use Linux style for getting driver_dataBjorn Helgaas2009-04-111-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's typical and slightly more compact to look up the driver_data structure by initializing the automatic variable at its definition. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | ACPI: button: remove unnecessary null pointer checksBjorn Helgaas2009-04-111-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Better to oops and learn about a bug than to silently cover it up. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | ACPI: button: whitespace changesBjorn Helgaas2009-04-111-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes a bit of whitespace to follow Linux conventions. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
| * | | Merge branch 'bugzilla-13036' into releaseLen Brown2009-04-241-14/+72
| |\ \ \
| | * | | Revert "ACPICA: delete check for AML access to port 0x81-83"Len Brown2009-04-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fdbdc7fc79c02ae4ede869d514179a2c65633d28. That temporary quick-fix is no longer necessary, as the previous patch, a65131e942e25c707a652fa4ec2cfcd8b63fec11, "I/O port protection: update for windows compatibility" should handle this issue for all ports, including this one. Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | I/O port protection: update for windows compatibility.Lin Ming2009-04-241-14/+71
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For windows compatibility, 1) On a port protection violation, simply ignore the request and do not return an exception (allow the control method to continue execution.) 2) If only part of the request overlaps a protected port, read/write the individual ports that are not protected. http://bugzilla.kernel.org/show_bug.cgi?id=13036 Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| * | | Merge branch 'bugzilla-13048' into releaseLen Brown2009-04-241-4/+5
| |\ \ \
| | * | | ACPI, i915: Register ACPI video even when not modesettingMatthew Garrett2009-04-241-4/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ACPI video driver defers registration to the i915 driver if the system supports opregion-mediated backlight control. This registration was only being performed in the KMS case. Ensure it's done even if we don't have modesetting enabled. http://bugzilla.kernel.org/show_bug.cgi?id=13048 Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Len Brown <len.brown@intel.com>
| * | | Merge branch 'bugzilla-13142' into releaseLen Brown2009-04-241-0/+3
| |\ \ \
| | * | | ACPI: prevent processor.max_cstate=0 boot crashLen Brown2009-04-231-0/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As processor.max_cstate is an init-time-only modparam, sanity checking it at init-time is sufficient. http://bugzilla.kernel.org/show_bug.cgi?id=13142 Signed-off-by: Len Brown <len.brown@intel.com>
| * | | Merge branch 'hpet' into releaseLen Brown2009-04-241-3/+3
| |\ \ \
| | * | | ACPI/hpet: prevent boot hang when hpet=force used on ICH-4MLen Brown2009-04-231-3/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linux tells ICH4 users that they can (manually) invoke "hpet=force" to enable the undocumented ICH-4M HPET. The HPET becomes available for both clocksource and clockevents. But as of ff69f2bba67bd45514923aaedbf40fe351787c59 (acpi: fix of pmtimer overflow that make Cx states time incorrect) the HPET may be used via clocksource for idle accounting, and hpet=force on an ICH4 box hangs boot. It turns out that touching the MMIO HPET withing the ARB_DIS part of C3 will hang the hardware. The fix is to simply move the timer access outside the ARB_DIS region. This is a no-op on modern hardware because ARB_DIS is no longer used. http://bugzilla.kernel.org/show_bug.cgi?id=13087 Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| * | | Merge branch 'bugzilla-12249' into releaseLen Brown2009-04-241-21/+22
| |\ \ \
| | * | | ACPI video: handle indexed _BQC correctlyZhang Rui2009-04-111-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current code, for a box with an indexed _BQC method, we 1. get the current brightness level by evaluating _BQC 2. set the value gotten in step 1 to _BCM 3. get the current brightness level again 4. set the _BQC_use_index flag if the results gotten in step 1 and in step 3 don't equal. But this logic doesn't work actually, because the _BQC_use_index is not set when acpi_video_device_lcd_set_level is invoked. This results in a failure in step 2. http://bugzilla.kernel.org/show_bug.cgi?id=12249#c83 Now, we set the _BQC_use_index flag after invoking _BQC for the first time. And reevaluate the _BQC to get the correct brightness level. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| * | | | Merge branch 'bugzilla-12270' into releaseLen Brown2009-04-241-25/+2
| |\ \ \ \
| | * | | | ACPI: Revert conflicting workaround for BIOS w/ mangled PRT entriesZhang Rui2009-04-111-25/+2
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f894ef9c8b36a35d80709bedca276d2fc691941 in Linux-2.6.21 worked around BIOS with mangled _PRT entries: http://bugzilla.kernel.org/show_bug.cgi?id=6859 d0e184abc5983281ef189db2c759d65d56eb1b80 worked around the same issue via ACPICA, and shipped in 2.6.27. Unfortunately the two workarounds conflict: http://bugzilla.kernel.org/show_bug.cgi?id=12270 So revert the Linux specific one. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
View Lorry Controller Status