aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-12-14dmaengine: at_hdmac: fix buffer transfer size specificationNicolas Ferre1-1/+1
Buffer transfer size is the number of transfers to be performed in relation with the width of the _source_ interface. So in the DMA_FROM_DEVICE case, it should be the register width that should be taken into account. Signed-off-by: Nicolas Ferre <[email protected]> Signed-off-by: Dan Williams <[email protected]>
2010-12-13kgdboc,input: Fix regression with keyboard release key and early debuggingJason Wessel1-1/+2
The commit 111c182340cd22e238ab1cc6564df336c6ebd7cb (kgdboc: reset input devices (keyboards) when exiting debugger) introduced a regression in early debugging such that you get a kernel oops on continue (with the go command) if you boot a kernel with: earlyprintk=vga ekgdboc=kbd kgdbwait The restore kgdboc_restore_input() routine schedules work for the purpose of sending key release events for any keys that were in the depressed state prior to entering the kernel debugger. A simple fix to the crash is to not invoke the schedule_work() if the kernel system_state is anything other than SYSTEM_RUNNING. Signed-off-by: Jason Wessel <[email protected]> Acked-by: Dmitry Torokhov <[email protected]> Reviewed-by: Sergei Shtylyov <[email protected]>
2010-12-13Merge branch 'bugzilla-23002' into releaseLen Brown1-0/+8
2010-12-13ACPI / PM: Do not save/restore NVS on Sony Vaio VGN-NW130DRafael J. Wysocki1-0/+8
The saving of the NVS memory area during suspend and restoring it during resume causes problems to appear on Sony Vaio VGN-NW130D, so blacklist that machine to avoid those problems. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=23002 Signed-off-by: Rafael J. Wysocki <[email protected]> Reported-and-tested-by: Adriano <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-12-13Btrfs: prevent RAID level downgrades when space is lowChris Mason1-1/+19
The extent allocator has code that allows us to fill allocations from any available block group, even if it doesn't match the raid level we've requested. This was put in because adding a new drive to a filesystem made with the default mkfs options actually upgrades the metadata from single spindle dup to full RAID1. But, the code also allows us to allocate from a raid0 chunk when we really want a raid1 or raid10 chunk. This can cause big trouble because mkfs creates a small (4MB) raid0 chunk for data and metadata which then goes unused for raid1/raid10 installs. The allocator will happily wander in and allocate from that chunk when things get tight, which is not correct. The fix here is to make sure that we provide duplication when the caller has asked for it. It does all the dups to be any raid level, which preserves the dup->raid1 upgrade abilities. Signed-off-by: Chris Mason <[email protected]>
2010-12-13Btrfs: account for missing devices in RAID allocation profilesChris Mason3-3/+36
When we mount in RAID degraded mode without adding a new device to replace the failed one, we can end up using the wrong RAID flags for allocations. This results in strange combinations of block groups (raid1 in a raid10 filesystem) and corruptions when we try to allocate blocks from single spindle chunks on drives that are actually missing. The first device has two small 4MB chunks in it that mkfs creates and these are usually unused in a raid1 or raid10 setup. But, in -o degraded, the allocator will fall back to these because the mask of desired raid groups isn't correct. The fix here is to count the missing devices as we build up the list of devices in the system. This count is used when picking the raid level to make sure we continue using the same levels that were in place before we lost a drive. Signed-off-by: Chris Mason <[email protected]>
2010-12-13fsldma: fix issue of slow dmaForrest Shi2-3/+12
Fixed fsl dma slow issue by initializing dma mode register with bandwidth control. It boosts dma performance and should works with 85xx board. Signed-off-by: Forrest Shi <[email protected]> Signed-off-by: Li Yang <[email protected]> Signed-off-by: Dan Williams <[email protected]>
2010-12-13Btrfs: EIO when we fail to read tree rootsChris Mason1-1/+4
If we just get a plain IO error when we read tree roots, the code wasn't properly sending that error up the chain. This allowed mounts to continue when they should failed, and allowed operations on partially setup root structs. The end result was usually oopsen on spinlocks that hadn't been spun up correctly. Signed-off-by: Chris Mason <[email protected]>
2010-12-13hwmon: (ltc4215) make sysfs file match the alarm causeIra W. Snyder1-2/+2
The ltc4215 driver used the chip's "power good" status bit to provide the power1_alarm file. This is wrong: the chip is really reporting the status of one of the monitored voltages. Change the sysfs file from power1_alarm to in2_min_alarm instead. This matches the voltage that the chip is raising an alarm for. Signed-off-by: Ira W. Snyder <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2010-12-13sh: Enable deprecated IRQ chip APIs for MFD and GPIOLIB drivers.Paul Mundt1-1/+2
There are still quite a number of MFD and GPIO expander drivers that are using the old irq_chip APIs that haven't had a chance to update during the .37 cycle, resulting in allyes/modconfig errors on some configurations. Mark Brown has done most of the legwork to get these fixed up in .38, so this should just be a .37 stop-gap that we can drop at the end of the .38 merge window. Reported-by: Mark Brown <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2010-12-12Merge branch 'fix' of ↵Russell King3-3/+3
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
2010-12-12ARM: Update mach-typesRussell King1-4/+179
Signed-off-by: Russell King <[email protected]>
2010-12-12ARM: 6528/1: Use CTR for the I-cache line size on ARMv7Catalin Marinas2-10/+27
The current implementation of the v7_coherent_*_range function assumes that the D and I cache lines have the same size, which is incorrect architecturally. This patch adds the icache_line_size macro which reads the CTR register. The main loop in v7_coherent_*_range is split in two independent loops or the D and I caches. This also has the performance advantage that the DSB is moved outside the main loop. Reported-by: Kevin Sapp <[email protected]> Signed-off-by: Catalin Marinas <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-12-12ARM: 6527/1: Use CTR instead of CCSIDR for the D-cache line size on ARMv7Catalin Marinas1-6/+6
The current implementation of the dcache_line_size macro reads the L1 cache size from the CCSIDR register. This, however, is not guaranteed to be the smallest cache line in the cache hierarchy. The patch changes to the macro to use the more architecturally correct CTR register. Reported-by: Kevin Sapp <[email protected]> Signed-off-by: Catalin Marinas <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-12-12pppoe.c: Fix kernel panic caused by __pppoe_xmitAndrej Ota1-1/+1
__pppoe_xmit function return value was invalid resulting in additional call to kfree_skb on already freed skb. This resulted in memory corruption and consequent kernel panic after PPPoE peer terminated the link. This fixes commit 55c95e738da85373965cb03b4f975d0fd559865b. Reported-by: Gorik Van Steenberge <[email protected]> Reported-by: Daniel Kenzelmann <[email protected]> Reported-by: Denys Fedoryshchenko <[email protected]> Reported-by: Pawel Staszewski <[email protected]> Diagnosed-by: Andrej Ota <[email protected]> Diagnosed-by: Eric Dumazet <[email protected]> Tested-by: Denys Fedoryshchenko <[email protected]> Tested-by: Pawel Staszewski <[email protected]> Signed-off-by: Jarek Poplawski <[email protected]> Signed-off-by: Andrej Ota <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-12WAN: Fix a TX IRQ causing BUG() in PC300 and PCI200SYN drivers.Krzysztof Halasa1-1/+4
We must not wake the TX queue without free TX descriptors. sca_xmit() expects at least one free descriptor and BUGs otherwise. Problem reported and fix tested by Bernie Innocenti and Ward Vandewege. Signed-off-by: Krzysztof Hałasa <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-12bnx2x: Advance a version number to 1.60.01-0Vladislav Zolotarov1-2/+2
Signed-off-by: Vladislav Zolotarov <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-12bnx2x: Fixed a compilation warningVladislav Zolotarov1-2/+2
bnx2x_src_init_t2() is used only when BCM_CNIC is defined. So, to avoid a compilation warning, we won't define it unless BCM_CNIC is defined. Signed-off-by: Vladislav Zolotarov <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-12bnx2x: LSO code was broken on BE platformsVladislav Zolotarov1-16/+26
Make the LSO code work on BE platforms: parsing_data field of a parsing BD (PBD) for 57712 was improperly composed which made FW read wrong values for TCP header's length and offset and, as a result, the corresponding PCI device was performing bad DMA reads triggering EEH. Signed-off-by: Vladislav Zolotarov <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-12qlge: Fix deadlock when cancelling worker.Ron Mercer3-8/+6
Removing usage of rtnl_lock() to protect firmware interface registers. These registers are accessed in some worker threads and can create a deadlock if rtnl_lock is taken by upper layers while the worker is still pending. We remove rtnl_lock and use a driver mutex just while mailboxes are accessed. Signed-off-by: Ron Mercer <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-12Merge branch 'vhost-net' of ↵David S. Miller1-1/+2
git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2010-12-12firewire: ohci: fix regression with Agere FW643 rev 06, disable MSIStefan Richter1-15/+33
Agere FW643 rev 06, listed as "11c1:5901 (rev 06) (prog-if 10 [OHCI])", produced SBP-2 I/O errors since kernel 2.6.36. Disabling MSI fixes it. Since MSI work on Agere FW643-E (same vendor and device ID, but rev 07), introduce a device revision field into firewire-ohci's quirks list so that different quirks can be defined for older and newer revisions. Reported-by: Jonathan Isom <[email protected]> Signed-off-by: Stefan Richter <[email protected]> Cc: <[email protected]> # 2.6.36.y
2010-12-12firewire: ohci: fix regression with VIA VT6315, disable MSIStefan Richter1-1/+2
"VIA Technologies, Inc. VT6315 Series Firewire Controller [1106:3403]" does not generate any interrupts if Message Signaled Interrupts were enabled. This is a regression since kernel 2.6.36 in which MSI support was added to firewire-ohci. Hence blacklist MSI on all VIA controllers. Reported-by: Robin Cook <[email protected]> Signed-off-by: Stefan Richter <[email protected]> Cc: <[email protected]> # 2.6.36.y
2010-12-11Merge branches 'bugzilla-15418', 'bugzilla-21722', 'bugzilla-22932', ↵Len Brown286-3766/+3844
'misc-2.6.37' and 'osi-regression' into release
2010-12-11ACPI/HEST: adjust section selectionJan Beulich1-5/+5
Properly const-, __init-, and __read_mostly-annotate this code. Signed-off-by: Jan Beulich <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-12-11ACPI: eliminate unused variable warning for !ACPI_SLEEPJan Beulich1-2/+2
Signed-off-by: Jan Beulich <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-12-11ACPI/PNP: avoid section mismatch warningJan Beulich1-1/+1
Signed-off-by: Jan Beulich <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-12-11ACPI thermal: remove two unused functionsZhang Rui1-9/+0
When CONFIG_CPU_FREQ=n ... drivers/acpi/processor_thermal.c:159:12: warning: ‘acpi_thermal_cpufreq_increase’ defined but not used drivers/acpi/processor_thermal.c:163:12: warning: ‘acpi_thermal_cpufreq_decrease’ defined but not used Remove unused declaration of ‘acpi_thermal_cpufreq_increase’ and ‘acpi_thermal_cpufreq_decrease’ Signed-off-by: Zhang Rui <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-12-11ACPI: fix a section mismatchZhang Rui1-1/+1
WARNING: drivers/acpi/acpi.o(.text+0xeda): Section mismatch in reference from the function acpi_os_initialize1() to the function .init.text:set_osi_linux() The function acpi_os_initialize1() references the function __init set_osi_linux(). Signed-off-by: Zhang Rui <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-12-11ACPI, APEI, use raw spinlock in ERSTHuang Ying1-17/+17
ERST writing may be used in NMI or Machine Check Exception handler. So it need to use raw spinlock instead of normal spinlock. This patch fixes it. Signed-off-by: Huang Ying <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-12-11ACPI: video: fix build for CONFIG_ACPI=nChris Wilson1-1/+4
In file included from drivers/gpu/drm/i915/intel_opregion.c:30: include/acpi/video.h:22: warning: ‘struct acpi_device’ declared inside parameter list ... include/acpi/video.h:24: error: ‘ENODEV’ undeclared (first use in this function) Signed-off-by: Chris Wilson <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-12-11ACPI: video: fix build for VIDEO_OUTPUT_CONTROL=nLen Brown1-0/+15
drivers/built-in.o: In function `acpi_video_bus_put_devices': video.c:(.text+0x79663): undefined reference to `video_output_unregister' drivers/built-in.o: In function `acpi_video_bus_add': video.c:(.text+0x7b0b3): undefined reference to `video_output_register' Signed-off-by: Len Brown <[email protected]>
2010-12-11ACPI: fix allowing to add/remove multiple _OSI stringsLin Ming1-16/+50
commit b0ed7a91(ACPICA/ACPI: Add new host interfaces for _OSI suppor) introduced another regression that only one _OSI string can be added or removed. Now multiple _OSI strings can be added or removed, for example acpi_osi=Linux acpi_osi=FreeBSD acpi_osi="!Windows 2006" Signed-off-by: Lin Ming <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-12-11acpi: fix _OSI string setup regressionLin Ming2-27/+34
commit b0ed7a91(ACPICA/ACPI: Add new host interfaces for _OSI suppor) introduced a regression that _OSI string setup fails. There are 2 paths to setup _OSI string. DMI: acpi_dmi_osi_linux -> set_osi_linux -> acpi_osi_setup -> copy _OSI string to osi_setup_string Boot command line: acpi_osi_setup -> copy _OSI string to osi_setup_string Later, acpi_osi_setup_late will be called to handle osi_setup_string. If _OSI string is "Linux" or "!Linux", then the call path is, acpi_osi_setup_late -> acpi_cmdline_osi_linux -> set_osi_linux -> acpi_osi_setup -> copy _OSI string to osi_setup_string This actually never installs _OSI string(acpi_install_interface not called), but just copy the _OSI string to osi_setup_string. This patch fixes the regression. Reported-and-tested-by: Lukas Hejtmanek <[email protected]> Signed-off-by: Lin Ming <[email protected]> Signed-off-by: Len Brown <[email protected]>
2010-12-10OMAP2: PRCM: fix some SHIFT macros that were actually bitmasksPaul Walmsley1-5/+6
After Charu's GPIO hwmod patches, GPIO initialization on N800 emits the following messages for all GPIO banks: omap_hwmod: gpio1: cannot be enabled (3) This is due to OMAP24XX_ST_GPIOS_SHIFT being defined as a bitmask. Fix this and also fix two other macros that had the same problem. Thanks to Tony Lindgren <[email protected]> for originally reporting this bug. Signed-off-by: Paul Walmsley <[email protected] Cc: Charulatha Varadarajan <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-12-10net: fix skb_defer_rx_timestamp()Eric Dumazet1-2/+4
After commit c1f19b51d1d8 (net: support time stamping in phy devices.), kernel might crash if CONFIG_NETWORK_PHY_TIMESTAMPING=y and skb_defer_rx_timestamp() handles a packet without an ethernet header. Fixes kernel bugzilla #24102 Reference: https://bugzilla.kernel.org/show_bug.cgi?id=24102 Reported-and-tested-by: Andrew Watts <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-10cxgb4vf: Ingress Queue Entry Size needs to be 64 bytesCasey Leedom1-4/+11
Was using L1_CACHE_BYTES for the Ingress Queue Entry Size but it really needs to be 64 bytes in order to support the largest message sizes. Signed-off-by: Casey Leedom <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-10phy: add the IC+ IP1001 driverGiuseppe CAVALLARO2-6/+55
This patch adds the IC+ IP1001 (Gigabit Ethernet Transceiver) driver. I've had to add an additional delay (2ns) to adjust RX clock phase at GMII/ RGMII interface (according to the PHY data-sheet). This helps to have the RGMII working on some ST platforms. Signed-off-by: Giuseppe Cavallaro <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-10atm: correct sysfs 'device' link creation and parent relationshipsDan Williams19-42/+41
The ATM subsystem was incorrectly creating the 'device' link for ATM nodes in sysfs. This led to incorrect device/parent relationships exposed by sysfs and udev. Instead of rolling the 'device' link by hand in the generic ATM code, pass each ATM driver's bus device down to the sysfs code and let sysfs do this stuff correctly. Signed-off-by: Dan Williams <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-10MAINTAINERS: remove me from tulipKyle McMartin1-1/+0
It was a nice idea, but -ENOTIME and -ENOHW. I never got around to doing a lot of the clean up that I intended to. Signed-off-by: Kyle McMartin <[email protected]> Acked-by: Grant Grundler <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-10SCTP: Fix SCTP_SET_PEER_PRIMARY_ADDR to accpet v4mapped addressWei Yongjun1-0/+8
SCTP_SET_PEER_PRIMARY_ADDR does not accpet v4mapped address, using v4mapped address in SCTP_SET_PEER_PRIMARY_ADDR socket option will get -EADDRNOTAVAIL error if v4map is enabled. This patch try to fix it by mapping v4mapped address to v4 address if allowed. Signed-off-by: Wei Yongjun <[email protected]> Acked-by: Vlad Yasevich <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-10enic: Bug Fix: Pass napi reference to the isr that services receive queueVasanthy Kolluri1-1/+2
Pass reference to napi instead of enic device to the isr that services receive queue. Signed-off-by: Vasanthy Kolluri <[email protected]> Signed-off-by: Roopa Prabhu <[email protected]> Signed-off-by: David Wang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-12-10Btrfs: fix compiler warningsJan Beulich2-7/+5
... regarding an unused function when !MIGRATION, and regarding a printk() format string vs argument mismatch. Signed-off-by: Jan Beulich <[email protected]> Signed-off-by: Chris Mason <[email protected]>
2010-12-10Btrfs: Make async snapshot ioctl more genericLi Zefan2-22/+36
If we had reserved some bytes in struct btrfs_ioctl_vol_args, we wouldn't have to create a new structure for async snapshot creation. Here we convert async snapshot ioctl to use a more generic ABI, as we'll add more ioctls for snapshots/subvolumes in the future, readonly snapshots for example. Signed-off-by: Li Zefan <[email protected]> Signed-off-by: Chris Mason <[email protected]>
2010-12-10Btrfs: pwrite blocked when writing from the mmaped buffer of the same pageXin Zhong1-32/+60
This problem is found in meego testing: http://bugs.meego.com/show_bug.cgi?id=6672 A file in btrfs is mmaped and the mmaped buffer is passed to pwrite to write to the same page of the same file. In btrfs_file_aio_write(), the pages is locked by prepare_pages(). So when btrfs_copy_from_user() is called, page fault happens and the same page needs to be locked again in filemap_fault(). The fix is to move iov_iter_fault_in_readable() before prepage_pages() to make page fault happen before pages are locked. And also disable page fault in critical region in btrfs_copy_from_user(). Reviewed-by: Yan, Zheng<[email protected]> Signed-off-by: Zhong, Xin <[email protected]> Signed-off-by: Chris Mason <[email protected]>
2010-12-10Btrfs: Fix a crash when mounting a subvolumeLi Zefan1-1/+1
We should drop dentry before deactivating the superblock, otherwise we can hit this bug: BUG: Dentry f349a690{i=100,n=/} still in use (1) [unmount of btrfs loop1] ... Steps to reproduce the bug: # mount /dev/loop1 /mnt # mkdir save # btrfs subvolume snapshot /mnt save/snap1 # umount /mnt # mount -o subvol=save/snap1 /dev/loop1 /mnt (crash) Reported-by: Michael Niederle <[email protected]> Signed-off-by: Li Zefan <[email protected]> Signed-off-by: Chris Mason <[email protected]>
2010-12-10Btrfs: fix sync subvol/snapshot creationSage Weil1-9/+11
We were incorrectly taking the async path even for the sync ioctls by passing in &transid unconditionally. There's ample room for further cleanup here, but this keeps the fix simple. Signed-off-by: Sage Weil <[email protected]> Reviewed-by: Li Zefan <[email protected]> Signed-off-by: Chris Mason <[email protected]>
2010-12-10Btrfs: Fix page leak in compressed writeback pathYan, Zheng1-1/+1
"start + num_bytes >= actual_end" can happen when compressed page writeback races with file truncation. In that case we need unlock and release pages past the end of file. Signed-off-by: Yan, Zheng <[email protected]> Signed-off-by: Chris Mason <[email protected]>
2010-12-10Btrfs: do not BUG if we fail to remove the orphan item for dead snapshotsJosef Bacik1-3/+7
Not being able to delete an orphan item isn't a horrible thing. The worst that happens is the next time around we try and do the orphan cleanup and we can't find the referenced object and just delete the item and move on. Signed-off-by: Josef Bacik <[email protected]>
2010-12-10Merge branch 'master' of ↵David S. Miller16-66/+100
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Powered by cgit, Gruvboxed by Blaster4385.