aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-03-20jbd2: remove the second argument of k[un]map_atomic()Cong Wang3-10/+10
Signed-off-by: Cong Wang <[email protected]>
2012-03-20jbd: remove the second argument of k[un]map_atomic()Cong Wang2-8/+8
Acked-by: Jan Kara <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20gfs2: remove the second argument of k[un]map_atomic()Cong Wang3-12/+12
Signed-off-by: Cong Wang <[email protected]>
2012-03-20fuse: remove the second argument of k[un]map_atomic()Cong Wang2-4/+4
Signed-off-by: Cong Wang <[email protected]>
2012-03-20ext2: remove the second argument of k[un]map_atomic()Cong Wang1-2/+2
Acked-by: Jan Kara <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20exofs: remove the second argument of k[un]map_atomic()Cong Wang1-2/+2
Ack-by: Boaz Harrosh <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20afs: remove the second argument of k[un]map_atomic()Cong Wang2-6/+6
Signed-off-by: Cong Wang <[email protected]>
2012-03-20btrfs: remove the second argument of k[un]map_atomic()Cong Wang7-37/+37
Signed-off-by: Cong Wang <[email protected]>
2012-03-20fs: remove the second argument of k[un]map_atomic()Cong Wang7-37/+34
Acked-by: Benjamin LaHaise <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20vhost: remove the second argument of k[un]map_atomic()Cong Wang1-2/+2
Signed-off-by: Cong Wang <[email protected]>
2012-03-20target: remove the second argument of k[un]map_atomic()Cong Wang2-8/+6
Signed-off-by: Cong Wang <[email protected]>
2012-03-20zram: remove the second argument of k[un]map_atomic()Cong Wang2-42/+41
Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20rtl8192u: remove the second argument of k[un]map_atomic()Cong Wang5-59/+13
Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20hv: remove the second argument of k[un]map_atomic()Cong Wang1-17/+14
Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20scsi: remove the second argument of k[un]map_atomic()Cong Wang19-69/+64
Signed-off-by: Cong Wang <[email protected]>
2012-03-20net: remove the second argument of k[un]map_atomic()Cong Wang3-12/+8
Acked-by: David S. Miller <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20memstick: remove the second argument of k[un]map_atomic()Cong Wang2-4/+4
Signed-off-by: Cong Wang <[email protected]>
2012-03-20media: remove the second argument of k[un]map_atomic()Cong Wang1-2/+2
Acked-by: Andy Walls <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20md: remove the second argument of k[un]map_atomic()Cong Wang1-21/+21
Acked-by: NeilBrown <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20infiniband: remove the second argument of k[un]map_atomic()Cong Wang1-4/+4
Acked-by: Roland Dreier <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20ide: remove the second argument of k[un]map_atomic()Cong Wang1-2/+2
Acked-by: David S. Miller <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20drm: remove the second argument of k[un]map_atomic()Cong Wang3-15/+15
Signed-off-by: Cong Wang <[email protected]>
2012-03-20edac: remove the second argument of k[un]map_atomic()Cong Wang1-2/+2
Signed-off-by: Cong Wang <[email protected]>
2012-03-20crypto: remove the second argument of k[un]map_atomic()Cong Wang1-5/+5
Signed-off-by: Cong Wang <[email protected]>
2012-03-20block: remove the second argument of k[un]map_atomic()Cong Wang5-42/+42
Signed-off-by: Cong Wang <[email protected]>
2012-03-20ata: remove the second argument of k[un]map_atomic()Cong Wang1-4/+4
Acked-by: Jeff Garzik <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20crypto: remove the second argument of k[un]map_atomic()Cong Wang7-45/+23
Signed-off-by: Cong Wang <[email protected]>
2012-03-20x86: remove the second argument of k[un]map_atomic()Cong Wang6-27/+27
Acked-by: Avi Kivity <[email protected]> Acked-by: Herbert Xu <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20um: remove the second argument of k[un]map_atomic()Cong Wang1-2/+2
Signed-off-by: Cong Wang <[email protected]>
2012-03-20sh: remove the second argument of k[un]map_atomic()Cong Wang2-8/+8
Signed-off-by: Cong Wang <[email protected]>
2012-03-20powerpc: remove the second argument of k[un]map_atomic()Cong Wang4-9/+8
Signed-off-by: Cong Wang <[email protected]>
2012-03-20mips: remove the second argument of k[un]map_atomic()Cong Wang2-6/+6
Signed-off-by: Cong Wang <[email protected]>
2012-03-20arm: remove the second argument of k[un]map_atomic()Cong Wang9-50/+50
Signed-off-by: Cong Wang <[email protected]>
2012-03-20include/linux/highmem.h: remove the second argument of k[un]map_atomic()Cong Wang1-14/+14
Signed-off-by: Cong Wang <[email protected]>
2012-03-20highmem: mark k[un]map_atomic() with two arguments as deprecatedCong Wang1-6/+46
For backward compatibility, we still keep the deprecated form, and will warn the users if they still use the deprecated one, like this: drivers/block/drbd/drbd_bitmap.c: In function ‘bm_page_io_async’: drivers/block/drbd/drbd_bitmap.c:973:3: warning: ‘kmap_atomic_deprecated’ is deprecated (declared at /home/wangcong/linux-2.6/include/linux/highmem.h:124) drivers/block/drbd/drbd_bitmap.c:977:3: warning: ‘kunmap_atomic_deprecated’ is deprecated (declared at /home/wangcong/linux-2.6/include/linux/highmem.h:144) Thanks to Nick Bowler for the cpp trick! Cc: Cesar Eduardo Barros <[email protected]> Cc: Nick Bowler <[email protected]> Cc: Peter Zijlstra <[email protected]> Signed-off-by: Cong Wang <[email protected]>
2012-03-20Merge branch 'upstream' into for-linusJiri Kosina15-1084/+860
Conflicts: drivers/hid/Makefile
2012-03-20HID: multitouch: add PID for Fructel productAndreas Nielsen3-0/+9
Adds multitouch support for the Gametel Android game controller. The multitouch events are emulated by the Gametel device. Each physical button is configured to generate a MT event on a specific coordinate. This seems to be the only way for us to support Android games that doesn't support HID gamepads. It is possible to inject MT events at Android level, but this requires root on the phone. Signed-off-by: Andreas Nielsen <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2012-03-20Merge branches 'roccat' and 'wacom' into for-linusJiri Kosina3-70/+90
2012-03-20Merge branches 'battery-scope', 'logitech' and 'multitouch' into for-linusJiri Kosina7-59/+204
2012-03-20kcore: fix spelling in read_kcore() commentLaura Vasilescu1-1/+1
Signed-off-by: Laura Vasilescu <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2012-03-20ipv6: fix incorrent ipv6 ipsec packet fragmentGao feng1-5/+6
Since commit 299b0767(ipv6: Fix IPsec slowpath fragmentation problem) In func ip6_append_data,after call skb_put(skb, fraglen + dst_exthdrlen) the skb->len contains dst_exthdrlen,and we don't reduce dst_exthdrlen at last This will make fraggap>0 in next "while cycle",and cause the size of skb incorrent Fix this by reserve headroom for dst_exthdrlen. Signed-off-by: Gao feng <[email protected]> Acked-by: Steffen Klassert <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-20cpsw: Hook up default ndo_change_mtu.David S. Miller1-0/+1
Reported-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-19Merge branch 'core-locking-for-linus' of ↵Linus Torvalds1-28/+23
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull core/locking changes for v3.4 from Ingo Molnar * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: futex: Simplify return logic futex: Cover all PI opcodes with cmpxchg enabled check
2012-03-19Merge branch 'core-iommu-for-linus' of ↵Linus Torvalds1-24/+35
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull core/iommu changes for v3.4 from Ingo Molnar * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/iommu/intel: Increase the number of iommus supported to MAX_IO_APICS x86/iommu/intel: Fix identity mapping for sandy bridge
2012-03-19Merge branch 'dcache-word-accesses'Linus Torvalds4-0/+150
* branch 'dcache-word-accesses': vfs: use 'unsigned long' accesses for dcache name comparison and hashing This does the name hashing and lookup using word-sized accesses when that is efficient, namely on x86 (although any little-endian machine with good unaligned accesses would do). It does very much depend on little-endian logic, but it's a very hot couple of functions under some real loads, and this patch improves the performance of __d_lookup_rcu() and link_path_walk() by up to about 30%. Giving a 10% improvement on some very pathname-heavy benchmarks. Because we do make unaligned accesses past the filename, the optimization is disabled when CONFIG_DEBUG_PAGEALLOC is active, and we effectively depend on the fact that on x86 we don't really ever have the last page of usable RAM followed immediately by any IO memory (due to ACPI tables, BIOS buffer areas etc). Some of the bit operations we do are a bit "subtle". It's commented, but you do need to really think about the code. Or just consider it black magic. Thanks to people on G+ for some of the optimized bit tricks.
2012-03-20constify struct pci_dev * in obvious casesAl Viro3-8/+8
Signed-off-by: Al Viro <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2012-03-19vfs: get rid of batshit-insane pointless dentry hash calculationsLinus Torvalds1-3/+3
For some odd historical reason, the final mixing round for the dentry cache hash table lookup had an insane "xor with big constant" logic. In two places. The big constant that is being xor'ed is GOLDEN_RATIO_PRIME, which is a fairly random-looking number that is designed to be *multiplied* with so that the bits get spread out over a whole long-word. But xor'ing with it is insane. It doesn't really even change the hash - it really only shifts the hash around in the hash table. To make matters worse, the insane big constant is different on 32-bit and 64-bit builds, even though the name hash bits we use are always 32-bit (and the bits from the pointer we mix in effectively are too). It's all total voodoo programming, in other words. Now, some testing and analysis of the hash chains shows that the rest of the hash function seems to be fairly good. It does pick the right bits of the parent dentry pointer, for example, and while it's generally a bad idea to use an xor to mix down the upper bits (because if there is a repeating pattern, the xor can cause "destructive interference"), it seems to not have been a disaster. For example, replacing the hash with the normal "hash_long()" code (that uses the GOLDEN_RATIO_PRIME constant correctly, btw) actually just makes the hash worse. The hand-picked hash knew which bits of the pointer had the highest entropy, and hash_long() ends up mixing bits less optimally at least in some trivial tests. So the hash function overall seems fine, it just has that really odd "shift result around by a constant xor". So get rid of the silly xor, and replace the down-mixing of the bits with an add instead of an xor that tends to not have the same kind of destructive interference issues. Some stats on the resulting hash chains shows that they look statistically identical before and after, but the code is simpler and no longer makes you go "WTF?". Also, the incoming hash really is just "unsigned int", not a long, and there's no real point to worry about the high 26 bits of the dentry pointer for the 64-bit case, because they are all going to be identical anyway. So also change the hashing to be done in the more natural 'unsigned int' that is the real size of the actual hashed data anyway. Signed-off-by: Linus Torvalds <[email protected]>
2012-03-19net: qmi_wwan: fix build error due to cdc-wdm dependecyBjørn Mork1-0/+1
Fixes: drivers/built-in.o: In function `qmi_wwan_bind_shared': qmi_wwan.c:(.text+0x25b686): undefined reference to `usb_cdc_wdm_register' make[1]: *** [.tmp_vmlinux1] Error 1 Reported-by: Randy Dunlap <[email protected]> Signed-off-by: Bjørn Mork <[email protected]> Acked-by: Randy Dunlap <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-19netdev: driver: ethernet: Add TI CPSW driverMugunthan V N4-0/+1086
This patch adds support for TI's CPSW driver. The three port switch gigabit ethernet subsystem provides ethernet packet communication and can be configured as an ethernet switch. Supports 10/100/1000 Mbps. Signed-off-by: Cyril Chemparathy <[email protected]> Signed-off-by: Sriramakrishnan A G <[email protected]> Signed-off-by: Mugunthan V N <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-19netdev: driver: ethernet: add cpsw address lookup engine supportMugunthan V N2-0/+734
TI CPSW ethernet switch has a built-in address lookup engine. This patch adds the code necessary for programming this module. Signed-off-by: Cyril Chemparathy <[email protected]> Signed-off-by: Mugunthan V N <[email protected]> Signed-off-by: David S. Miller <[email protected]>