aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-05-28FRV: ARCH_KMALLOC_MINALIGN was already definedDavid Howells2-4/+2
ARCH_KMALLOC_MINALIGN was already defined in asm/mem-layout.h and so shouldn't have been added to asm/cache.h as well, but rather altered in place. The commit that added it to asm/cache.h was: commit 69dcf3db03626c4f18de624e8632454ea12ff260 Author: FUJITA Tomonori <[email protected]> Date: Mon May 24 14:32:54 2010 -0700 frv: set ARCH_KMALLOC_MINALIGN Architectures that handle DMA-non-coherent memory need to set ARCH_KMALLOC_MINALIGN to make sure that kmalloc'ed buffer is DMA-safe: the buffer doesn't share a cache with the others. Signed-off-by: David Howells <[email protected]> cc: FUJITA Tomonori <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-28Merge branch 'timers-fixes-for-linus' of ↵Linus Torvalds3-11/+12
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: posix_timer: Fix error path in timer_create hrtimer: Avoid double seqlock timers: Move local variable into else section timers: Fix slack calculation really
2010-05-28Merge branch 'for-linus' of ↵Linus Torvalds112-415/+782
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: remove detritus left by "mm: make read_cache_page synchronous" fix fs/sysv s_dirt handling fat: convert to use the new truncate convention. ext2: convert to use the new truncate convention. tmpfs: convert to use the new truncate convention fs: convert simple fs to new truncate kill spurious reference to vmtruncate fs: introduce new truncate sequence fs/super: fix kernel-doc warning fs/minix: bugfix, number of indirect block ptrs per block depends on block size rename the generic fsync implementations drop unused dentry argument to ->fsync fs: Add missing mutex_unlock Fix racy use of anon_inode_getfd() in perf_event.c get rid of the magic around f_count in aio VFS: fix recent breakage of FS_REVAL_DOT Revert "anon_inode: set S_IFREG on the anon_inode"
2010-05-28remove detritus left by "mm: make read_cache_page synchronous"Al Viro1-4/+1
gets minix get_dir_page() in sync with its analogs; back in 2007 Nick has switched read_cache_page() and friends to sync behaviour (i.e. they wait for the page to get unlocked, check if it's uptodate and if it isn't return ERR_PTR(-EIO) instead) and removed the duplicate logics from the callers. In case of fs/minix/dir.c he'd removed only half of that... Signed-off-by: Al Viro <[email protected]>
2010-05-28netlink: bug fix: wrong size was calculated for vfinfo list blobScott Feldman1-5/+6
The wrong size was being calculated for vfinfo. In one case, it was over- calculating using nlmsg_total_size on attrs, in another case, it was under-calculating by assuming ifla_vf_* structs are packed together, but each struct is it's own attr w/ hdr (and padding). Signed-off-by: Scott Feldman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-28netlink: bug fix: don't overrun skbs on vf_port dumpScott Feldman1-6/+9
Noticed by Patrick McHardy: was continuing to fill skb after a nla_put_failure, ignoring the size calculated by upper layer. Now, return -EMSGSIZE on any overruns, but also allow netdev to fail ndo_get_vf_port with error other than -EMSGSIZE, thus unwinding nest. Signed-off-by: Scott Feldman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-28xt_tee: use skb_dst_drop()Eric Dumazet1-2/+2
After commit 7fee226a (net: add a noref bit on skb dst), its wrong to use : dst_release(skb_dst(skb)), since we could decrement a refcount while skb dst was not refcounted. We should use skb_dst_drop(skb) instead. Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-28netdev/fec: fix ifconfig eth0 down hang issueBryan Wu1-12/+16
BugLink: http://bugs.launchpad.net/bugs/559065 In fec open/close function, we need to use phy_connect and phy_disconnect operation before we start/stop phy. Otherwise it will cause system hang. Only call fec_enet_mii_probe() in open function, because the first open action will cause NULL pointer error. Signed-off-by: Bryan Wu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-28ARM: S5PV210: serial: Fix section mismatch warningMarek Szyprowski1-4/+4
Rename the structure to avoid the following warning: WARNING: drivers/serial/built-in.o(.data+0x534): Section mismatch in reference from the variable s5p_serial_drv to the function .devexit.text:s3c24xx_serial_remove() The variable s5p_serial_drv references the function __devexit s3c24xx_serial_remove() If the reference is valid then annotate the variable with __exit* (see linux/init.h) or name the variable: *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, Signed-off-by: Marek Szyprowski <[email protected]> Signed-off-by: Joonyoung Shim <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: Merge for-2635/defconfig3Ben Dooks2-22/+403
Merge branch 'for-2635/defconfig3' into for-linus/2635-updates
2010-05-28ARM: s3c2410_defconfig: Add new machinesBen Dooks1-8/+27
Add the SMDK2416, and the GTA02 to the list of machines that are included in the s3c2410_defconfig. Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: s3c6400_defconfig: Add framebuffer and basic LCDBen Dooks1-2/+43
Add the framebuffer driver and some basic LCD configurations that should be suitable for the SMDK boards. Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: s3c6400_defconfig: Add RTC driver supportBen Dooks1-1/+66
Now that the RTC driver supports the S3C64XX, enable it in the build. Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: s3c6400_defconfig: Enable USB host sideBen Dooks1-3/+217
Enable the USB Host side by adding the USB OHCI and some basic USB driver modules. Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: s3c6400_defconfig: Add SPI driverBen Dooks1-1/+37
The SPI driver was added last kernel round, so enable the core SPI and add the 64XX and bitbang driver as modules. Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: s3c6400_defconfig: Update compiled machinesBen Dooks1-7/+13
Add the machines that have been added in the last round to the list of builds. Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: S5P: Regoster clk_xusbxti clock for hsotg driverThomas Abraham1-0/+1
The clk_xusbxti clock is added to the list of clocks to be registred during boot time clock registration. Signed-off-by: Thomas Abraham <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> [[email protected]: edited title] Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: S3C64XX: Add USB OTG HCLK to the list of clocksThomas Abraham1-0/+6
Add the USB OTG HCLK clock to the list of clocks to be registered during initialization. Signed-off-by: Thomas Abraham <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: SAMSUNG: gpio-cfg.h: update documentationBen Dooks1-0/+21
Update the documentation on the gpio configuration calls to add more references to useful information and also to document the values that are passed. Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: SAMSUNG: Documentation: add documentation on GPIO codeBen Dooks3-0/+48
Add some documentation in Documentation/arm/Samsung for the GPIO code and where to look for the necessary functions. Update the S3C24XX case as well. Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: SAMSUNG: Fix documentation for s3c_gpio_cfgpin()Ben Dooks1-1/+1
Fix typo in s3c_gpio_cfgpin() documentation, the second argument is @to not @pin again. Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: S3C24XX: Documentation: add section on gpiolib changesBen Dooks1-0/+44
Add section to the S3C24XX GPIO documentation on the recent changes to move towards gpiolib integration. Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: S3C24XX: Documentation: update GPIO documentationBen Dooks1-2/+33
Upate the S3C24XX GPIO documentation after the changes for gpiolib and show which calls are being replaced by gpiolib or the new s3c generic calls. Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: S3C24XX: Documentation: update documentation overviewBen Dooks1-1/+10
Add the two new SoCs added in this release cycle and update the notes on the gpiolib conversion. Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: SAMSUNG: Documentation: update directory layoutBen Dooks1-7/+16
Update the directory layout in Documentation/arm/Samsung/Overview.txt to reflect the changes that have been made in the latest kernel updates. Signed-off-by: Ben Dooks <[email protected]>
2010-05-28ARM: SAMSUNG: Documentation: update the list of SoCs supportedBen Dooks1-3/+7
Update the list of SoCs supported for the plat-s5p range. Signed-off-by: Ben Dooks <[email protected]>
2010-05-28cnic: Fix context memory init. on 5709.Michael Chan2-9/+5
We need to zero context memory on 5709 in the function cnic_init_context(). Without this, iscsid restart on 5709 will not work because of stale data. TX context blocks should not be initialized by cnic_init_context() because of the special remapping on 5709. Update version to 2.1.2. Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-28drivers/net: Eliminate a NULL pointer dereferenceJulia Lawall1-2/+1
At the point of the print, dev is NULL. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ expression E,E1; identifier f; statement S1,S2,S3; @@ if ((E == NULL && ...) || ...) { ... when != if (...) S1 else S2 when != E = E1 * E->f ... when any return ...; } else S3 // </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-28drivers/net/hamradio: Eliminate a NULL pointer dereferenceJulia Lawall1-2/+1
At the point of the print, dev is NULL. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ expression E,E1; identifier f; statement S1,S2,S3; @@ if ((E == NULL && ...) || ...) { ... when != if (...) S1 else S2 when != E = E1 * E->f ... when any return ...; } else S3 // </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-28be2net: Patch removes redundant while statement in loop.Sarveshwar Bandi1-1/+1
Signed-off-by: Sarveshwar Bandi <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-28ipv6: Add GSO support on forwarding pathHerbert Xu1-1/+1
Currently we disallow GSO packets on the IPv6 forward path. This patch fixes this. Note that I discovered that our existing GSO MTU checks (e.g., IPv4 forwarding) are buggy in that they skip the check altogether, when they really should be checking gso_size + header instead. I have also been lazy here in that I haven't bothered to segment the GSO packet by hand before generating an ICMP message. Someone should add that to be 100% correct. Reported-by: Ralf Baechle <[email protected]> Signed-off-by: Herbert Xu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-28net: fix __neigh_event_send()Eric Dumazet1-0/+1
commit 7fee226ad23 (net: add a noref bit on skb dst) missed one spot where an skb is enqueued, with a possibly not refcounted dst entry. __neigh_event_send() inserts skb into arp_queue, so we must make sure dst entry is refcounted, or dst entry can be freed by garbage collector after caller exits from rcu protected section. Reported-by: Ingo Molnar <[email protected]> Tested-by: Ingo Molnar <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-05-28ALSA: hda: Add support for another Lenovo ThinkPad Edge in conexant codecAndreas Herrmann1-0/+1
On a Thinkpad Edge 13 "01972NG" I had the problem that speakers played sound although headphones were plugged in. Using model=ideapad with latest alsa-git kernel fixed this. So adding this quirk to use ideapad for another Thinkpad Edge variant seems sensible. Cc: Jerone Young <[email protected]> Signed-off-by: Andreas Herrmann <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-05-28leds: Fix leds-gpio openfirmware compile issueRichard Purdie1-1/+0
Fix a compile issue when openfirmware is enabled from commit 2146325df2c2640059a9e064890c30c6e259b458. Signed-off-by: Richard Purdie <[email protected]>
2010-05-28leds: Kconfig fixesRichard Purdie1-3/+3
Soekris net5501 is x86 only and cleanup some undeeded dependencies Signed-off-by: Richard Purdie <[email protected]>
2010-05-28ALSA: hda: Use LPIB for Sony VPCS11V9EDaniel T Chen1-0/+1
BugLink: https://launchpad.net/bugs/586347 Symptom: On the Sony VPCS11V9E, using GStreamer-based applications with PulseAudio in Ubuntu 10.04 LTS results in stuttering audio. It appears to worsen with increased I/O. Test case: use Rhythmbox under increased I/O pressure. This symptom is reproducible in the current daily stable alsa-driver snapshots (at least up until 21 May 2010; later snapshots fail to build from source due to missing preprocessor directives when compiled against 2.6.32). Resolution: add SSID for this machine to the position_fix quirk table, explicitly specifying the LPIB method. Reported-and-Tested-By: Lauri Kainulainen <[email protected]> Cc: <[email protected]> Signed-off-by: Daniel T Chen <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-05-28ALSA: usb-audio: fix feature unit parser for UAC2Daniel Mack1-1/+1
Fix a small off-by-one bug which causes the feature unit to announce a wrong number of channels. This leads to illegal requests sent to the firmware eventually. Signed-off-by: Daniel Mack <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-05-27fix fs/sysv s_dirt handlingAl Viro1-0/+1
got broken on ->sync_fs() conversion a year ago, nobody noticed... Signed-off-by: Al Viro <[email protected]>
2010-05-27fat: convert to use the new truncate convention.[email protected]3-15/+57
Cc: OGAWA Hirofumi <[email protected]> Cc: Christoph Hellwig <[email protected]> Signed-off-by: Nick Piggin <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-27ext2: convert to use the new truncate convention.[email protected]3-36/+119
I also have commented a possible bug in existing ext2 code, marked with XXX. Cc: [email protected] Cc: Christoph Hellwig <[email protected]> Signed-off-by: Nick Piggin <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-27tmpfs: convert to use the new truncate convention[email protected]1-21/+22
Cc: Christoph Hellwig <[email protected]> Acked-by: Hugh Dickins <[email protected]> Signed-off-by: Nick Piggin <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-27fs: convert simple fs to new truncateNick Piggin5-19/+15
Convert simple filesystems: ramfs, configfs, sysfs, block_dev to new truncate sequence. Cc: Christoph Hellwig <[email protected]> Signed-off-by: Nick Piggin <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-27kill spurious reference to vmtruncate[email protected]10-22/+37
Lots of filesystems calls vmtruncate despite not implementing the old ->truncate method. Switch them to use simple_setsize and add some comments about the truncate code where it seems fitting. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Nick Piggin <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-27fs: introduce new truncate sequence[email protected]8-63/+300
Introduce a new truncate calling sequence into fs/mm subsystems. Rather than setattr > vmtruncate > truncate, have filesystems call their truncate sequence from ->setattr if filesystem specific operations are required. vmtruncate is deprecated, and truncate_pagecache and inode_newsize_ok helpers introduced previously should be used. simple_setattr is introduced for simple in-ram filesystems to implement the new truncate sequence. Eventually all filesystems should be converted to implement a setattr, and the default code in notify_change should go away. simple_setsize is also introduced to perform just the ATTR_SIZE portion of simple_setattr (ie. changing i_size and trimming pagecache). To implement the new truncate sequence: - filesystem specific manipulations (eg freeing blocks) must be done in the setattr method rather than ->truncate. - vmtruncate can not be used by core code to trim blocks past i_size in the event of write failure after allocation, so this must be performed in the fs code. - convert usage of helpers block_write_begin, nobh_write_begin, cont_write_begin, and *blockdev_direct_IO* to use _newtrunc postfixed variants. These avoid calling vmtruncate to trim blocks (see previous). - inode_setattr should not be used. generic_setattr is a new function to be used to copy simple attributes into the generic inode. - make use of the better opportunity to handle errors with the new sequence. Big problem with the previous calling sequence: the filesystem is not called until i_size has already changed. This means it is not allowed to fail the call, and also it does not know what the previous i_size was. Also, generic code calling vmtruncate to truncate allocated blocks in case of error had no good way to return a meaningful error (or, for example, atomically handle block deallocation). Cc: Christoph Hellwig <[email protected]> Acked-by: Jan Kara <[email protected]> Signed-off-by: Nick Piggin <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-27fs/super: fix kernel-doc warningRandy Dunlap1-2/+2
Fix fs/super.c kernel-doc warning and function notation: Warning(fs/super.c:957): No description found for parameter 'sb' Signed-off-by: Randy Dunlap <[email protected]> Cc: Alexander Viro <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-27fs/minix: bugfix, number of indirect block ptrs per block depends on block sizeErik van der Kouwe1-12/+15
The MINIX filesystem driver used a constant number of indirect block pointers in an indirect block. This worked only for filesystems with 1kb block, while the MINIX default block size is now 4kb. As a consequence, large files were read incorrectly on such filesystems and writing a large file would cause the filesystem to become corrupted. This patch computes the number of indirect block pointers based on the block size, making the driver work for each block size. I would like to thank Feiran Zheng ('Fam') for pointing out the cause of the corruption. Signed-off-by: Erik van der Kouwe <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-27rename the generic fsync implementationsChristoph Hellwig23-32/+44
We don't name our generic fsync implementations very well currently. The no-op implementation for in-memory filesystems currently is called simple_sync_file which doesn't make too much sense to start with, the the generic one for simple filesystems is called simple_fsync which can lead to some confusion. This patch renames the generic file fsync method to generic_file_fsync to match the other generic_file_* routines it is supposed to be used with, and the no-op implementation to noop_fsync to make it obvious what to expect. In addition add some documentation for both methods. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-27drop unused dentry argument to ->fsyncChristoph Hellwig69-157/+129
Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-27fs: Add missing mutex_unlockJulia Lawall1-4/+9
Add a mutex_unlock missing on the error path. At other exists from the function that return an error flag, the mutex is unlocked, so do the same here. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression E1; @@ * mutex_lock(E1,...); <+... when != E1 if (...) { ... when != E1 * return ...; } ...+> * mutex_unlock(E1,...); // </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-27Fix racy use of anon_inode_getfd() in perf_event.cAl Viro1-18/+22
once anon_inode_getfd() is called, you can't expect *anything* about struct file that descriptor points to - another thread might be doing whatever it likes with descriptor table at that point. Cc: stable <[email protected]> Signed-off-by: Al Viro <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.