Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
292311 commits 1 branch 0 tags 2 GiB
Commit graph

292311 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cong Wang
c4bc8dcbbe ocfs2: remove the second argument of k[un]map_atomic() 
Acked-by: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:25 +08:00
Cong Wang
a3ac1414eb ntfs: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:25 +08:00
Cong Wang
7b9c0976ac nilfs2: remove the second argument of k[un]map_atomic() 
Acked-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:24 +08:00
Cong Wang
2b86ce2db3 nfs: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:24 +08:00
Cong Wang
27a6d5c742 minix: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:24 +08:00
Cong Wang
50bc9b65b6 logfs: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:24 +08:00
Cong Wang
303a8f2afc jbd2: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:23 +08:00
Cong Wang
8fb53c46d9 jbd: remove the second argument of k[un]map_atomic() 
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:23 +08:00
Cong Wang
d93492855f gfs2: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:23 +08:00
Cong Wang
2408f6ef6b fuse: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:22 +08:00
Cong Wang
d4a23aee23 ext2: remove the second argument of k[un]map_atomic() 
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:22 +08:00
Cong Wang
bf7014b67f exofs: remove the second argument of k[un]map_atomic() 
Ack-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:22 +08:00
Cong Wang
da4aa36d01 afs: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:22 +08:00
Cong Wang
7ac687d9e0 btrfs: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:21 +08:00
Cong Wang
e8e3c3d66f fs: remove the second argument of k[un]map_atomic() 
Acked-by: Benjamin LaHaise <bcrl@kvack.org>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:21 +08:00
Cong Wang
c6daa7ffa8 vhost: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:21 +08:00
Cong Wang
ca747d610b target: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:20 +08:00
Cong Wang
ba82fe2e69 zram: remove the second argument of k[un]map_atomic() 
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:20 +08:00
Cong Wang
e3debd2763 rtl8192u: remove the second argument of k[un]map_atomic() 
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:20 +08:00
Cong Wang
86cbce4de2 hv: remove the second argument of k[un]map_atomic() 
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:20 +08:00
Cong Wang
77dfce076c scsi: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:19 +08:00
Cong Wang
4679026d78 net: remove the second argument of k[un]map_atomic() 
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:19 +08:00
Cong Wang
eb3f062094 memstick: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:19 +08:00
Cong Wang
b0b38c767e media: remove the second argument of k[un]map_atomic() 
Acked-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:18 +08:00
Cong Wang
b2f46e6882 md: remove the second argument of k[un]map_atomic() 
Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:18 +08:00
Cong Wang
2a156d094d infiniband: remove the second argument of k[un]map_atomic() 
Acked-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:18 +08:00
Cong Wang
45b408d2ef ide: remove the second argument of k[un]map_atomic() 
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:17 +08:00
Cong Wang
1c9c20f602 drm: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:17 +08:00
Cong Wang
4e5df7ca30 edac: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:17 +08:00
Cong Wang
237f259ce2 crypto: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:16 +08:00
Cong Wang
cfd8005c99 block: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:16 +08:00
Cong Wang
496cda8e75 ata: remove the second argument of k[un]map_atomic() 
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:16 +08:00
Cong Wang
f0dfc0b0b7 crypto: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:16 +08:00
Cong Wang
8fd75e1216 x86: remove the second argument of k[un]map_atomic() 
Acked-by: Avi Kivity <avi@redhat.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:15 +08:00
Cong Wang
91f2359396 um: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:15 +08:00
Cong Wang
bc3e11be88 sh: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:15 +08:00
Cong Wang
2480b20892 powerpc: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:14 +08:00
Cong Wang
9c02048fcd mips: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:14 +08:00
Cong Wang
5472e862de arm: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:14 +08:00
Cong Wang
1ec9c5ddc1 include/linux/highmem.h: remove the second argument of k[un]map_atomic() 
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:13 +08:00
Cong Wang
980c19e3f8 highmem: mark k[un]map_atomic() with two arguments as deprecated 
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 <cesarb@cesarb.net>
Cc: Nick Bowler <nbowler@elliptictech.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Cong Wang <amwang@redhat.com>
 2012-03-20 21:48:13 +08:00
Hans de Goede
312869ec93 hwmon: (sch56xx) Add support for the integrated watchdog (v2) 
Add support for the watchdog integrated into the SMSC SCH5627 and
SCH5636 superio-s. Since the watchdog is part of the hwmon logical device
and thus shares ioports with it, the watchdog driver is integrated into the
existing hwmon drivers for these.

Note that this version of the watchdog support for sch56xx superio-s
implements the watchdog chardev interface itself, rather then relying on
the recently added watchdog core / watchdog_dev. This is done because
currently some needed functionality is missing from watchdog_dev, as soon
as this functionality is added (which is being discussed on the
linux-watchdog mailinglist), I'll convert this driver over to using
watchdog_dev.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
[guenter.roeck@ericsson.com: Added missing linux/slab.h include]
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
 2012-03-20 06:42:05 -07:00
Jiri Kosina
4a247a4119 Merge branch 'upstream' into for-linus 
Conflicts:
	drivers/hid/Makefile
 2012-03-20 13:18:05 +01:00
Andreas Nielsen
4d5df5d11e HID: multitouch: add PID for Fructel product 
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 <eas@svep.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
 2012-03-20 13:17:22 +01:00
Jiri Kosina
77aa8e65f0 Merge branches 'roccat' and 'wacom' into for-linus 2012-03-20 13:05:18 +01:00
Jiri Kosina
3abee3526d Merge branches 'battery-scope', 'logitech' and 'multitouch' into for-linus 2012-03-20 13:04:25 +01:00
Laura Vasilescu
f1f996b66c kcore: fix spelling in read_kcore() comment 
Signed-off-by: Laura Vasilescu <laura@rosedu.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
 2012-03-20 12:24:10 +01:00
Gao feng
1f85851e17 ipv6: fix incorrent ipv6 ipsec packet fragment 
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 <gaofeng@cn.fujitsu.com>
Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-03-20 05:39:34 -04:00
David S. Miller
5c473ed26d cpsw: Hook up default ndo_change_mtu. 
Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
 2012-03-20 00:33:59 -04:00
James Morris
09f61cdbb3 Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into next 2012-03-20 12:52:17 +11:00