aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-08-28Merge branch 'lguest' of ↵Linus Torvalds3-13/+15
git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * 'lguest' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: lguest: Odd Fixes lguest: clean up warnings in demonstration launcher.
2010-08-28Merge branch 'omap-fixes-for-linus' of ↵Linus Torvalds8-20/+20
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: OMAP3: PM: ensure IO wakeups are properly disabled omap: Fix omap_4430sdp_defconfig for make oldconfig omap: Use CONFIG_SMP for test_for_ipi and test_for_ltirq omap: Fix sev instruction usage for multi-omap OMAP3: Fix a cpu type check problem omap3: id: fix 3630 rev detection
2010-08-28Merge branch 'for-linus' of ↵Linus Torvalds14-107/+185
git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: fix get_ticket_handler() error handling ceph: don't BUG on ENOMEM during mds reconnect ceph: ceph_mdsc_build_path() returns an ERR_PTR ceph: Fix warnings ceph: ceph_get_inode() returns an ERR_PTR ceph: initialize fields on new dentry_infos ceph: maintain i_head_snapc when any caps are dirty, not just for data ceph: fix osd request lru adjustment when sending request ceph: don't improperly set dir complete when holding EXCL cap mm: exporting account_page_dirty ceph: direct requests in snapped namespace based on nonsnap parent ceph: queue cap snap writeback for realm children on snap update ceph: include dirty xattrs state in snapped caps ceph: fix xattr cap writeback ceph: fix multiple mds session shutdown
2010-08-28Merge branch 'pm-fixes' of ↵Linus Torvalds1-5/+7
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM QoS: Fix inline documentation. PM QoS: Fix kzalloc() parameters swapped in pm_qos_power_open()
2010-08-28Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linuxLinus Torvalds3-24/+30
* 'for-2.6.36' of git://linux-nfs.org/~bfields/linux: nfsd: fix NULL dereference in nfsd_statfs() nfsd4: fix downgrade/lock logic nfsd4: typo fix in find_any_file nfsd4: bad BUG() in preprocess_stateid_op
2010-08-28Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds2-2/+3
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: Cannot allocate memory error on mount [CIFS] Eliminate unused variable warning
2010-08-28Alpha: Fix a missing comma in sys_osf_statfs()David Howells1-1/+1
Fix a comma that got accidentally deleted from sys_osf_statfs() leading to the following warning: arch/alpha/kernel/osf_sys.c: In function 'SYSC_osf_statfs': arch/alpha/kernel/osf_sys.c:255: error: syntax error before 'buffer' Signed-off-by: David Howells <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-08-28NOMMU: Stub out vm_get_page_prot() if there's no MMUDavid Howells1-0/+8
Stub out vm_get_page_prot() if there's no MMU. This was added by commit 804af2cf6e7a ("[AGPGART] remove private page protection map") and is used in commit c07fbfd17e61 ("fbmem: VM_IO set, but not propagated") in the fbmem video driver, but the function doesn't exist on NOMMU, resulting in an undefined symbol at link time. Signed-off-by: David Howells <[email protected]> Reviewed-by: Konrad Rzeszutek Wilk <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-08-28Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bpLinus Torvalds2-17/+10
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: Do not report error overflow as a separate error MCE, AMD: Limit MCE decoding to current families for now
2010-08-28Merge branch 'for-linus' of ↵Linus Torvalds31-80/+75
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: pxa27x_keypad - remove input_free_device() in pxa27x_keypad_remove() Input: mousedev - fix regression of inverting axes Input: uinput - add devname alias to allow module on-demand load Input: hil_kbd - fix compile error USB: drop tty argument from usb_serial_handle_sysrq_char() Input: sysrq - drop tty argument form handle_sysrq() Input: sysrq - drop tty argument from sysrq ops handlers
2010-08-28Merge branch 'upstream-linus' of ↵Linus Torvalds12-309/+85
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata-sff: remove harmful BUG_ON from ata_bmdma_qc_issue sata_mv: fix broken DSM/TRIM support (v2) libata: be less of a drama queen on empty data commands [libata] sata_dwc_460ex: signdness bug ahci: add HFLAG_YES_FBS and apply it to 88SE9128 libata: remove no longer needed pata_winbond driver pata_cmd64x: revert commit d62f5576
2010-08-28mm: fix hang on anon_vma->root->lockHugh Dickins1-3/+16
After several hours, kbuild tests hang with anon_vma_prepare() spinning on a newly allocated anon_vma's lock - on a box with CONFIG_TREE_PREEMPT_RCU=y (which makes this very much more likely, but it could happen without). The ever-subtle page_lock_anon_vma() now needs a further twist: since anon_vma_prepare() and anon_vma_fork() are liable to change the ->root of a reused anon_vma structure at any moment, page_lock_anon_vma() needs to check page_mapped() again before succeeding, otherwise page_unlock_anon_vma() might address a different root->lock. Signed-off-by: Hugh Dickins <[email protected]> Reviewed-by: Rik van Riel <[email protected]> Cc: Christoph Lameter <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Andrea Arcangeli <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-08-28Merge branch 'fix/asoc' into for-linusTakashi Iwai1-1/+1
2010-08-28Merge branch 'fix/hda' into for-linusTakashi Iwai1-0/+1
2010-08-28ALSA: pcm: add more format namesDan Carpenter1-0/+6
There were some new formats added in commit 15c0cee6c809 "ALSA: pcm: Define G723 3-bit and 5-bit formats". That commit increased SNDRV_PCM_FORMAT_LAST as well. My concern is that there are a couple places which do: for (i = 0; i < SNDRV_PCM_FORMAT_LAST; i++) { if (dummy->pcm_hw.formats & (1ULL << i)) snd_iprintf(buffer, " %s", snd_pcm_format_name(i)); } I haven't tested these but it looks like if "i" were equal to SNDRV_PCM_FORMAT_G723_24 or higher then we might read past the end of the array. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-08-28sound: oss: fix uninitialized spinlockAkinobu Mita1-1/+1
The spinlock lock in sound_timer.c is used without initialization. Signed-off-by: Akinobu Mita <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-08-28ALSA: asihpi - Return hw error directly from oustream_write.Eliot Blennerhassett1-2/+5
If hw error is ignored, status is updated with invalid info. Signed-off-by: Eliot Blennerhassett <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-08-27net/ipv4: Eliminate kstrdup memory leakJulia Lawall1-2/+3
The string clone is only used as a temporary copy of the argument val within the while loop, and so it should be freed before leaving the function. The call to strsep, however, modifies clone, so a pointer to the front of the string is kept in saved_clone, to make it possible to free it. The sematic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ local idexpression x; expression E; identifier l; statement S; @@ *x= \(kasprintf\|kstrdup\)(...); ... if (x == NULL) S ... when != kfree(x) when != E = x if (...) { <... when != kfree(x) * goto l; ...> * return ...; } // </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-27fsnotify: drop two useless bools in the fnsotify main loopEric Paris1-8/+5
The fsnotify main loop has 2 bools which indicated if we processed the inode or vfsmount mark in that particular pass through the loop. These bool can we replaced with the inode_group and vfsmount_group variables and actually make the code a little easier to understand. Signed-off-by: Eric Paris <[email protected]>
2010-08-27fsnotify: fix list walk orderEric Paris1-6/+5
Marks were stored on the inode and vfsmonut mark list in order from highest memory address to lowest memory address. The code to walk those lists thought they were in order from lowest to highest with unpredictable results when trying to match up marks from each. It was possible that extra events would be sent to userspace when inode marks ignoring events wouldn't get matched with the vfsmount marks. This problem only affected fanotify when using both vfsmount and inode marks simultaneously. Signed-off-by: Eric Paris <[email protected]>
2010-08-27fanotify: Return EPERM when a process is not privilegedAndreas Gruenbacher1-1/+1
The appropriate error code when privileged operations are denied is EPERM, not EACCES. Signed-off-by: Andreas Gruenbacher <[email protected]> Signed-off-by: Eric Paris <[email protected]>
2010-08-27fanotify: resize pid and reorder structureTvrtko Ursulin1-3/+3
resize pid and reorder the fanotify_event_metadata so it is naturally aligned and we can work towards dropping the packed attributed Signed-off-by: Tvrtko Ursulin <[email protected]> Cc: Andreas Dilger <[email protected]> Signed-off-by: Eric Paris <[email protected]>
2010-08-27Blackfin: bf52x/bf54x boards: drop unused nand page sizeBarry Song5-5/+0
Now that the driver for the Blackfin on-chip NFC no longer uses/respects the page_size from the platform resources (figures out the needs on the fly), drop it from the platform resources. This fixes some build errors since the defines no longer exists. Signed-off-by: Barry Song <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2010-08-27Blackfin: punt duplicate SPORT MMR definesMike Frysinger8-576/+0
The common bfin_sport.h header now has unified definitions of these, so stop polluting the global namespace. Signed-off-by: Mike Frysinger <[email protected]>
2010-08-27ASoC: soc-core: fix debugfs_pop_time file permissionsAxel Lin1-1/+1
I think this is a typo, debugfs_pop_time should not be executable. Signed-off-by: Axel Lin <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-08-27libertas: if_sdio: fix buffer alignment in struct if_sdio_cardMike Rapoport1-1/+1
The commit 886275ce41a9751117367fb387ed171049eb6148 (param: lock if_sdio's lbs_helper_name and lbs_fw_name against sysfs changes) introduced new fields into the if_sdio_card structure. It caused missalignment of the if_sdio_card.buffer field and failure at driver load time: ~# modprobe libertas_sdio [ 62.315124] libertas_sdio: Libertas SDIO driver [ 62.319976] libertas_sdio: Copyright Pierre Ossman [ 63.020629] DMA misaligned error with device 48 [ 63.025207] mmci-omap-hs mmci-omap-hs.1: unexpected dma status 800 [ 66.005035] libertas: command 0x0003 timed out [ 66.009826] libertas: Timeout submitting command 0x0003 [ 66.016296] libertas: PREP_CMD: command 0x0003 failed: -110 Adding explicit alignment attribute for the if_sdio_card.buffer field fixes this problem. Signed-off-by: Mike Rapoport <[email protected]> Acked-by: Marek Vasut <[email protected]> Acked-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-08-27eCryptfs: Fix encrypted file name lookup regressionTyler Hicks2-8/+24
Fixes a regression caused by 21edad32205e97dc7ccb81a85234c77e760364c8 When file name encryption was enabled, ecryptfs_lookup() failed to use the encrypted and encoded version of the upper, plaintext, file name when performing a lookup in the lower file system. This made it impossible to lookup existing encrypted file names and any newly created files would have plaintext file names in the lower file system. https://bugs.launchpad.net/ecryptfs/+bug/623087 Signed-off-by: Tyler Hicks <[email protected]>
2010-08-27ecryptfs: properly mark init functionsJerome Marchand4-4/+4
Some ecryptfs init functions are not prefixed by __init and thus not freed after initialization. This patch saved about 1kB in ecryptfs module. Signed-off-by: Jerome Marchand <[email protected]> Signed-off-by: Tyler Hicks <[email protected]>
2010-08-27fs/ecryptfs: Return -ENOMEM on memory allocation failureJulia Lawall1-0/+2
In this code, 0 is returned on memory allocation failure, even though other failures return -ENOMEM or other similar values. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression ret; expression x,e1,e2,e3; @@ ret = 0 ... when != ret = e1 *x = \(kmalloc\|kcalloc\|kzalloc\)(...) ... when != ret = e2 if (x == NULL) { ... when != ret = e3 return ret; } // </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Tyler Hicks <[email protected]>
2010-08-27workqueue: Add a workqueue chapter to the tracepoint docbookJason Baron1-0/+5
Add a workqueue chapter to the traceopint docbook. Current book is at: http://www.kernel.org/doc/htmldocs/tracepoint/ Signed-off-by: Jason Baron <[email protected]> Signed-off-by: Tejun Heo <[email protected]>
2010-08-27percpu: fix a mismatch between code and commentNamhyung Kim1-1/+1
When pcpu_build_alloc_info() searches best_upa value, it ignores current value if the number of waste units exceeds 1/3 of the number of total cpus. But the comment on the code says that it will ignore if wastage is over 25%. Modify the comment. Signed-off-by: Namhyung Kim <[email protected]> Signed-off-by: Tejun Heo <[email protected]>
2010-08-27percpu: fix a memory leak in pcpu_extend_area_map()Huang Shijie1-1/+3
The original code did not free the old map. This patch fixes it. tj: use @old as memcpy source instead of @chunk->map, and indentation and description update Signed-off-by: Huang Shijie <[email protected]> Signed-off-by: Tejun Heo <[email protected]> Cc: [email protected]
2010-08-27ARM: S5PV310: Fix on Secondary CPU startupChanghwan Youn4-2/+10
Following occurs on boot message without this patch. CPU1: processor failed to boot Brought up 1 CPUs SMP: Total of 1 processors activated... This patch adds SYSRAM mapping for fixing Secondary CPU startup. CPU1: Booted secondary processor Brought up 2 CPUs SMP: Total of 2 processors activated... Signed-off-by: Changhwan Youn <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2010-08-27ARM: S5PV310: Bug fix on uclk1 and sclk_pwmJongpill Lee2-8/+15
This patch fixes on enable and ctrlbit of uclk1 and sclk_pwm. Signed-off-by: Jongpill Lee <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2010-08-27ARM: S5PV310: Fix missed uart clocksJongpill Lee1-7/+37
This patch adds missed uart clocks for S5PV310/S5PC210. Signed-off-by: Jongpill Lee <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2010-08-27ARM: S5PV310: Should be clk_sclk_apll not clk_mout_apllJongpill Lee1-3/+12
This patch adds clk_sclk_apll so that fixes on clk_mout_apll. Signed-off-by: Jongpill Lee <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2010-08-27ARM: S5PV310: Fix on PLL setting for S5PV310Jongpill Lee1-2/+2
This patch fixes on PLL setting for S5PV310/S5PC210. Signed-off-by: Jongpill Lee <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2010-08-27ARM: S5PV310: Add CMU block for S5PV310 ClockKukjin Kim4-31/+38
This patch adds CMU block for S5PV310/S5PC210 clock. (CMU: Clock Management Unit) Of course, changed current clock addresses for it together. Signed-off-by: Kukjin Kim <[email protected]>
2010-08-27ARM: S5PV310: Fix on typo irqs.h of S5PV310Kukjin Kim1-4/+7
This patch fixes typo 'IRQ_WTD' in the irqs.h of S5PV310. And minor update comments. Signed-off-by: Kukjin Kim <[email protected]>
2010-08-27ARM: S5PV310: Fix on default ZRELADDR of ARCH_S5PV310Kukjin Kim1-1/+2
This patch adds default zreladdr of ARCH_S5PV310. Signed-off-by: Kukjin Kim <[email protected]>
2010-08-27ARM: S5PV310: Fix on GPIO base addressesKyungmin Park1-2/+10
The S5PV310/S5PC210 has following three GPIO base addresses. Part1 Base Address=0x11400000 Part2 Base Address=0x11000000 Part3 Base Address=0x03860000 Signed-off-by: Kyungmin Park <[email protected]> [[email protected]: minor edit of title] Signed-off-by: Kukjin Kim <[email protected]>
2010-08-27ARM: SAMSUNG: Fix on build warning regarding VMALLOC_END typeKukjin Kim4-4/+4
Fix this warning: arch/arm/mm/init.c: In function 'mem_init': arch/arm/mm/init.c:644: warning: format '%08lx' expects type 'long unsigned int', but argument 12 has type 'unsigned int' And removes the useless parens and white space. Reported-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> Cc: Ben Dooks <[email protected]>
2010-08-26net/caif/cfrfml.c: use asm/unaligned.hJeff Mahoney1-1/+1
caif does not build on ia64 starting with 2.6.32-rc1. Using asm/unaligned.h instead of linux/unaligned/le_byteshift.h fixes the issue. include/linux/unaligned/le_byteshift.h:40:50: error: redefinition of 'get_unaligned_le16' include/linux/unaligned/le_byteshift.h:45:50: error: redefinition of 'get_unaligned_le32' include/linux/unaligned/le_byteshift.h:50:50: error: redefinition of 'get_unaligned_le64' include/linux/unaligned/le_byteshift.h:55:51: error: redefinition of 'put_unaligned_le16' include/linux/unaligned/le_byteshift.h:60:51: error: redefinition of 'put_unaligned_le32' include/linux/unaligned/le_byteshift.h:65:51: error: redefinition of 'put_unaligned_le64' include/linux/unaligned/le_struct.h:31:51: note: previous definition of 'put_unaligned_le64' was here Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-27vgaarb: Wrap vga_(get|put) in CONFIG_VGA_ARBChris Wilson1-2/+13
Fix link failure without the vga arbitrator. Signed-off-by: Chris Wilson <[email protected]> Cc: Dave Airlie <[email protected]> Cc: Jesse Barnes <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-08-27drm/radeon/kms: add missing scratch update in dp_detectAlex Deucher1-0/+1
Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-08-27drm/modes: Fix CVT-R modeline generationAdam Jackson1-1/+4
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=16651 Signed-off-by: Adam Jackson <[email protected]> Tested-by: Adam Serbinski <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-08-27drm: fix regression in drm locking since BKL removal.Arnd Bergmann1-0/+2
This locking path needs proper auditing but probably too late for changes at this point for 2.6.36, so lets go with the quick fix, which is to drop the lock around schedule. Reported-by: Andreas Schwab <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-08-27drm/radeon/kms: remove stray radeon_i2c_destroyAlex Deucher1-2/+0
I missed this one in the i2c unification patch. This is handled in the core radeon i2c code now. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-08-27drm: mm: fix range restricted allocationsDaniel Vetter1-10/+14
With the code cleanup in 7a6b2896f261894dde287d3faefa4b432cddca53 is the first bad commit commit 7a6b2896f261894dde287d3faefa4b432cddca53 Author: Daniel Vetter <[email protected]> Date: Fri Jul 2 15:02:15 2010 +0100 drm_mm: extract check_free_mm_node I've botched up the range-restriction checks. The result is usually an X server dying with SIGBUS in libpixman (software fallback rendering). Change the code to adjust the start and end for range restricted allocations. IMHO this even makes the code a bit clearer. Fixes regression bug: https://bugs.freedesktop.org/show_bug.cgi?id=29738 Reported-by-Tested-by: Till MAtthiesen <[email protected]> Acked-by: Alex Deucher <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-08-27lguest: Odd FixesRusty Russell1-1/+1
It's been in fix-mode-only for a while now. Signed-off-by: Rusty Russell <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.