aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-11-16drm/i915: Remove trailing white spaceKeith Packard1-2/+2
Found a couple of bare tabs in intel_dp.c Signed-off-by: Keith Packard <[email protected]> Reviewed-by: Jesse Barnes <[email protected]>
2011-11-16drm/i915: Try harder during dp pattern 1 link trainingKeith Packard1-7/+18
Instead of going through the sequence just once, run through the whole set up to 5 times to see if something can work. This isn't part of the DP spec, but the BIOS seems to do it, and given that link training failure is so bad, it seems reasonable to follow suit. Signed-off-by: Keith Packard <[email protected]> Reviewed-by: Jesse Barnes <[email protected]>
2011-11-16drm/i915: Make DP prepare/commit consistent with DP dpmsKeith Packard1-9/+13
Make sure the sequence of operations in all three functions makes sense: 1) The backlight must be off unless the screen is running 2) The link must be running to turn the eDP panel on/off 3) The CPU eDP PLL must be running until everything is off Signed-off-by: Keith Packard <[email protected]>
2011-11-16drm/i915: Let panel power sequencing hardware do its jobKeith Packard2-69/+85
The panel power sequencing hardware tracks the stages of panel power sequencing and signals when the panel is completely on or off. Instead of blindly assuming the panel timings will work, poll the panel power status register until it shows the correct values. Signed-off-by: Keith Packard <[email protected]> Reviewed-by: Jesse Barnes <[email protected]>
2011-11-16drm/i915: Treat PCH eDP like DP in most placesKeith Packard2-34/+72
PCH eDP has many of the same needs as regular PCH DP connections, including the DP_CTl bit settings, the TRANS_DP_CTL register. Signed-off-by: Keith Packard <[email protected]> Reviewed-by: Jesse Barnes <[email protected]>
2011-11-16drm/i915: Remove link_status field from intel_dp structureKeith Packard1-29/+36
No persistent data was ever stored here, so link_status is instead allocated on the stack as needed. Signed-off-by: Keith Packard <[email protected]> Reviewed-by: Jesse Barnes <[email protected]>
2011-11-16drm/i915: Move common PCH_PP_CONTROL setup to ironlake_get_pp_controlKeith Packard1-18/+19
Every usage of PCH_PP_CONTROL sets the PANEL_UNLOCK_REGS value to ensure that writes will be respected, move this to a common function to make the driver cleaner. No functional changes. Signed-off-by: Keith Packard <[email protected]>
2011-11-16new helper: mount_subtree()Al Viro4-53/+41
takes vfsmount and relative path, does lookup within that vfsmount (possibly triggering automounts) and returns the result as root of subtree suitable for return by ->mount() (i.e. a reference to dentry and an active reference to its superblock grabbed, superblock locked exclusive). btrfs and nfs switched to it instead of open-coding the sucker. Signed-off-by: Al Viro <[email protected]>
2011-11-16sky2: version 1.30stephen hemminger1-1/+1
Update version number. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16sky2: used fixed RSS keystephen hemminger1-4/+9
Rather than generating a different RSS key on each boot, just use a predetermined value that will map same flow to same value on every device. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16sky2: reduce default Tx ring sizestephen hemminger1-1/+1
The default Tx ring size for the sky2 driver is quite large and could cause excess buffer bloat for many users. The minimum ring size possible and still allow handling the worst case packet on 64bit platforms is 38 which gets rounded up to a power of 2. But most packets only require a couple of ring elements. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16sky2: rename up/down functionsstephen hemminger1-10/+10
The code is clearer if the up/down functions are renamed to open/close like other drivers. Purely syntax change. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16sky2: pci posting issuesstephen hemminger1-0/+3
A couple of the reset and setup paths have possible PCI posting issues. When setting registers, a read is necessary to force the writes to complete. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16sky2: fix hang on shutdown (and other irq issues)stephen hemminger1-18/+27
There are several problems with recent change to how IRQ's are setup. * synchronize_irq in sky2_shutdown would hang because there was no IRQ setup. * when device was set to down, some IRQ bits left enabled so a hardware error would produce IRQ with no handler * quick link on Optima chip set was enabled without handler * suspend/resume would leave IRQ on with no handler if device was down Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16r6040: fix check against MCRO_HASHEN bit in r6040_multicast_listFlorian Fainelli1-1/+1
We are checking whether the MCR0_HASHEN bit is set using a logical and instead of bitwise and, fix that. Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16random: Fix handing of arch_get_random_long in get_random_bytes()Luck, Tony1-1/+1
If there is an architecture-specific random number generator we use it to acquire randomness one "long" at a time. We should put these random words into consecutive words in the result buffer - not just overwrite the first word again and again. Signed-off-by: Tony Luck <[email protected]> Acked-by: Thomas Gleixner <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: H. Peter Anvin <[email protected]>
2011-11-16MAINTAINERS: change email address for shemmingerStephen Hemminger1-3/+3
My old email account at linux-foundation is no longer usable after the LF breakin. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16pch_gbe: Move #include of module.hJoe Perches1-1/+1
The first #include must be pch_gbe.h as it does a #define of pr_fmt. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16bnx2x: cache-in compressed fw imageDmitry Kravkov2-30/+35
Re-request fw from fs may fail for different reasons, once the fw was loaded we won't release it until driver is removed. This also resolves the boot problem when initial fw is located on initrd, but rootfs is still unavailable, in this case device reset will fail due to absence of fw files. Signed-off-by: Dmitry Kravkov <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16net/cadence: enable by default NET_ATMELJean-Christophe PLAGNIOL-VILLARD1-0/+1
so the defconfig of the atmel continue to have the support of the network as before Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Cc: Nicolas Ferre <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16bridge: correct IPv6 checksum after pullstephen hemminger1-0/+2
Bridge multicast snooping of ICMPv6 would incorrectly report a checksum problem when used with Ethernet devices like sky2 that use CHECKSUM_COMPLETE. When bytes are removed from skb, the computed checksum needs to be adjusted. Signed-off-by: Stephen Hemminger <[email protected]> Tested-by: Martin Volf <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16qeth: Reduce CPU consumption through less SIGA-r callsEinar Lueck1-2/+1
Patch avoids SIGA-r calls in case of SIGA-r required. It only calls SIGA-r if a threshold of free buffer is reached. CPU consumption is reduced as a consequence. Signed-off-by: Einar Lueck <[email protected]> Signed-off-by: Frank Blaschka <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16qeth: l3 fix rcu splat in xmitFrank Blaschka1-0/+7
when use dst_get_neighbour to get neighbour, we need rcu_read_lock to protect, since dst_get_neighbour uses rcu_dereference. Signed-off-by: David S. Miller <[email protected]>
2011-11-16netiucv: reinsert dev_alloc_name for device namingUrsula Braun1-0/+2
Invocation of dev_alloc_name() is re-inserted, because the created net_device name is used to create the device name for the iucv bus. This device is created before the register_netdev call. Signed-off-by: Ursula Braun <[email protected]> Signed-off-by: Frank Blaschka <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16qeth: remove WARN_ON leftoverChristian Borntraeger1-1/+0
The patch "qeth: exploit asynchronous delivery of storage blocks" added a WARN_ON in qeth_schedule_recovery. A device recovery should not cause a kernel warning. This is obviously a debugging left-over that we forgot to remove. Signed-off-by: Christian Borntraeger <[email protected]> Signed-off-by: Frank Blaschka <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16qeth: return with -EPERM if sniffing is not enabledUrsula Braun1-2/+2
Without appropriate configuration at the SE, a HiperSockets device cannot be used for sniffing. Setting the sniffer attribute is rejected with -EPERM. Signed-off-by: Ursula Braun <[email protected]> Signed-off-by: Frank Blaschka <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16tcp: clear xmit timers in tcp_v4_syn_recv_sock()Eric Dumazet1-0/+1
Simon Kirby reported divides by zero errors in __tcp_select_window() This happens when inet_csk_route_child_sock() returns a NULL pointer : We free new socket while we eventually armed keepalive timer in tcp_create_openreq_child() Fix this by a call to tcp_clear_xmit_timers() [ This is a followup to commit 918eb39962dff (net: add missing bh_unlock_sock() calls) ] Reported-by: Simon Kirby <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Tested-by: Simon Kirby <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-16switch create_mnt_ns() to saner calling conventions, fix double mntput() in nfsAl Viro3-18/+11
Life is much saner if create_mnt_ns(mnt) drops mnt in case of error... Switch it to such calling conventions, switch callers, fix double mntput() in fs/nfs/super.c one. Signed-off-by: Al Viro <[email protected]>
2011-11-16btrfs: fix double mntput() in mount_subvol()Al Viro1-1/+0
Signed-off-by: Al Viro <[email protected]>
2011-11-16watchdog: fix initialisation printout in s3c2410_wdtDmitry Artamonow1-2/+2
Looks like a typo creeped in, and driver prints s3c2410-wdt s3c2410-wdt: watchdog active, reset abled, irq abled instead of s3c2410-wdt s3c2410-wdt: watchdog active, reset enabled, irq enabled Also it may completely disinform about irq status, as it prints "irq enabled" when S3C2410_WTCON_INTEN is in fact 0. Fix it. Signed-off-by: Dmitry Artamonow <[email protected]> Tested-by: Thomas Abraham <[email protected]> Signed-off-by: Wim Van Sebroeck <[email protected]>
2011-11-16watchdog: Don't overwrite error value in wm831x_wdt_set_timeout()Mark Brown1-1/+1
Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Wim Van Sebroeck <[email protected]>
2011-11-16encrypted-keys: module build fixesMimi Zohar2-3/+8
Encrypted keys are encrypted/decrypted using either a trusted or user-defined key type, which is referred to as the 'master' key. The master key may be of type trusted iff the trusted key is builtin or both the trusted key and encrypted keys are built as modules. This patch resolves the build dependency problem. - Use "masterkey-$(CONFIG_TRUSTED_KEYS)-$(CONFIG_ENCRYPTED_KEYS)" construct to encapsulate the above logic. (Suggested by Dimtry Kasatkin.) - Fixing the encrypted-keys Makefile, results in a module name change from encrypted.ko to encrypted-keys.ko. - Add module dependency for request_trusted_key() definition Signed-off-by: Mimi Zohar <[email protected]>
2011-11-16encrypted-keys: fix error return codeMimi Zohar1-1/+1
Fix request_master_key() error return code. Signed-off-by: Mimi Zohar <[email protected]>
2011-11-16xen-gntalloc: signedness bug in add_grefs()Dan Carpenter1-1/+1
gref->gref_id is unsigned so the error handling didn't work. gnttab_grant_foreign_access() returns an int type, so we can add a cast here, and it doesn't cause any problems. gnttab_grant_foreign_access() can return a variety of errors including -ENOSPC, -ENOSYS and -ENOMEM. CC: [email protected] Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-11-16xen-gntalloc: integer overflow in gntalloc_ioctl_alloc()Dan Carpenter1-1/+1
On 32 bit systems a high value of op.count could lead to an integer overflow in the kzalloc() and gref_ids would be smaller than expected. If the you triggered another integer overflow in "if (gref_size + op.count > limit)" then you'd probably get memory corruption inside add_grefs(). CC: [email protected] Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-11-16xen-gntdev: integer overflow in gntdev_alloc_map()Dan Carpenter1-5/+5
The multiplications here can overflow resulting in smaller buffer sizes than expected. "count" comes from a copy_from_user(). Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-11-16xen:pvhvm: enable PVHVM VCPU placement when using more than 32 CPUs.Zhenzhong Duan1-2/+1
PVHVM running with more than 32 vcpus and pv_irq/pv_time enabled need VCPU placement to work, or else it will softlockup. CC: [email protected] Acked-by: Stefano Stabellini <[email protected]> Signed-off-by: Zhenzhong Duan <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-11-16xen/balloon: Avoid OOM when requesting highmemDaniel De Graaf1-2/+2
If highmem pages are requested from the balloon on a system without highmem, the implementation of alloc_xenballooned_pages will allocate all available memory trying to find highmem pages to return. Allow low memory to be returned when highmem pages are requested to avoid this loop. Signed-off-by: Daniel De Graaf <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-11-16xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCIDaniel De Graaf1-4/+2
In 5fbdc10395cd500d6ff844825a918c4e6f38de37 the XEN_PLATFORM_PCI config option was removed, but references in header files remained. Clean up those references. Signed-off-by: Daniel De Graaf <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-11-16xen: map foreign pages for shared rings by updating the PTEs directlyDavid Vrabel5-20/+24
When mapping a foreign page with xenbus_map_ring_valloc() with the GNTTABOP_map_grant_ref hypercall, set the GNTMAP_contains_pte flag and pass a pointer to the PTE (in init_mm). After the page is mapped, the usual fault mechanism can be used to update additional MMs. This allows the vmalloc_sync_all() to be removed from alloc_vm_area(). Signed-off-by: David Vrabel <[email protected]> Acked-by: Andrew Morton <[email protected]> [v1: Squashed fix by Michal for no-mmu case] Signed-off-by: Konrad Rzeszutek Wilk <[email protected]> Signed-off-by: Michal Simek <[email protected]>
2011-11-16ALSA: hda - Fix the connection selection of ADCs on Cirrus codecsTakashi Iwai1-10/+13
spec->cur_adc isn't set until cs_capture_pcm_prepare() is called although the driver tries to select the connection at init time and at auto-mic switch. This results in the access to the widget NID 0, which is obviously invalid, also a wrong capture source. This patch fixes the issue by issuing the connect-select verb conditionally at appropriate places. Reported-and-tested-by: Dylan Reid <[email protected]> Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-11-16mm: Make task in balance_dirty_pages() killableJan Kara1-1/+4
There is no reason why task in balance_dirty_pages() shouldn't be killable and it helps in recovering from some error conditions (like when filesystem goes in error state and cannot accept writeback anymore but we still want to kill processes using it to be able to unmount it). There will be follow up patches to further abort the generic_perform_write() and other filesystem write loops, to avoid large write + SIGKILL combination exceeding the dirty limit and possibly strange OOM. Reported-by: Kazuya Mio <[email protected]> Tested-by: Kazuya Mio <[email protected]> Reviewed-by: Neil Brown <[email protected]> Reviewed-by: KOSAKI Motohiro <[email protected]> Signed-off-by: Jan Kara <[email protected]> Signed-off-by: Wu Fengguang <[email protected]>
2011-11-16ALSA: hda - Update URLs in documentTakashi Iwai1-4/+4
Some stuff was moved from kernel.org to other places. Signed-off-by: Takashi Iwai <[email protected]>
2011-11-16ALSA: hda - move eld->spk_alloc fixup to hdmi_update_eld()Wu Fengguang2-10/+8
It looks more natural and saves two lines of code. Signed-off-by: Wu Fengguang <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-11-16ALSA: hda - delayed ELD repollWu Fengguang1-7/+29
The Intel HDMI chips (ironlake at least) are found to have ~250ms delay between the ELD_Valid=1 hotplug event is send and the ELD buffer becomes actually readable. During the time the ELD buffer is mysteriously all 0. Fix it by scheduling a delayed work to re-read ELD buffer after 300ms. Signed-off-by: Wu Fengguang <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-11-16ALSA: hda - fix ELD memory leakWu Fengguang3-10/+9
memset(eld) clears eld->proc_entry which will leak the struct snd_info_entry when unloading module. Fix it by - memset only the fields before eld->eld_buffer - set eld->eld_valid to true _after_ all eld fields have been filled Cc: <[email protected]> Cc: Pierre-louis Bossart <[email protected]> Acked-by: Stephen Warren <[email protected]> Signed-off-by: Wu Fengguang <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-11-16Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds15-23/+115
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] topology: fix topology on z10 machines [S390] crypto: avoid MSA3 and MSA4 instructions in ESA mode [S390] avoid STCKF if running in ESA mode [S390] zfcpdump: Do not initialize zfcpdump in kdump mode [S390] ap: Setup processing for messages in request queue. [S390] Kconfig: Select CONFIG_KEXEC for CONFIG_CRASH_DUMP [S390] incorrect note program header [S390] pfault: ignore leftover completion interrupts [S390] fix pgste update logic [S390] wire up process_vm syscalls
2011-11-16block: add missed trace_block_plugShaohua Li1-1/+3
After flush plug list, the list has no request, so we need to add a trace_block_plug(). Signed-off-by: Shaohua Li <[email protected]> Reviewed-by: Namhyung Kim <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2011-11-16paride: fix potential information leak in pg_read()Dan Carpenter1-0/+1
Smatch has a new check for Rosenberg type information leaks where structs are copied to the user with uninitialized stack data in them. i In this case, the pg_write_hdr struct has a hole in it. struct pg_write_hdr { char magic; /* 0 1 */ char func; /* 1 1 */ /* XXX 2 bytes hole, try to pack */ int dlen; /* 4 4 */ Signed-off-by: Dan Carpenter <[email protected]> Cc: Tim Waugh <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2011-11-16bio: change some signed vars to unsignedDan Carpenter2-5/+6
This is just a cleanup patch to silence a static checker warning. The problem is that we cap "nr_iovecs" so it can't be larger than "UIO_MAXIOV" but we don't check for negative values. It turns out this is prevented at other layers, but logically it doesn't make sense to have negative nr_iovecs so making it unsigned is nicer. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.