p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HSI changes for the v4.9 series 

* fix hsi userspace header
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCgAGBQJX8j7OAAoJENju1/PIO/qa9hEP/24C8IzU1rbAI1TjRPWF2hLl
 5be7jt+/bOheTO2rB9X6lN9h101SUCySdq2WRZVbMLVc3ZsHDlwNyFgFd9u0dTZA
 NSz2IfJewdWS8hUAq/eI9oe6oBgE5cAAstwMc0D/rAXCynpapkpmpG9YJQm1kuGf
 SQEQiD/BMraA/twU0tbYoltNOWyGTmfUBE6GZsLnQZv4y0wUpDsU4s+3tDtM3hkL
 VnEJrE00RcrJVbv13aXnqZknJ2FiUyrG6CAn516Inxh3inxCZhpwYE1/DigBpcwl
 JCocGUyksU+mY75MSIjTrMzuTMcin4dpA9pdXKdLcfk6aV2O3lRXhJ3Dc0YazLts
 9FEhF8L2MMAuic+wj4y0ru0PYdKk3q7CGwgyyEomHRVlOQkqQO5SG4SEqqNFeJvV
 RDh7QmWmLYfnxUvo95/Q8PYEFo6ejvf+vamH2p/mofpZop8q4ysCmUop39DrNd45
 OyEO7THzQ8l7KsUd1oSMoKsYxorrgkPNWf1LUzgfSCEpqoLuv+ikWiffAcuXUhRA
 5q1MKda///f9uA4p//75UsPIh9wD9YdLaTz8de4/CR9Jqs+qb0Yc99yxSATM7Jvc
 Z2yqQkPdhNXEWPB18efzCZaC01iNQdthPvmPOOnzAesuO/VDw1t0Y82qhGd+FI7S
 B+TT7Fac7pQiu4Nt/EYr
 =x/fs
 -----END PGP SIGNATURE-----

Merge tag 'hsi-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

Pull HSI fix from Sebastian Reichel:
 "Fix hsi userspace header"

* tag 'hsi-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: hsi_char.h: use __u32 from linux/types.h
This commit is contained in:
Linus Torvalds 2016-10-06 18:51:59 -07:00
parent 021723e6c5 7ac5d7b1a1
commit 9a687aea2f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/uapi/linux/hsi/hsi_char.h
View File

@ -20,10 +20,11 @@
* 02110-1301 USA
*/
#ifndef __HSI_CHAR_H
#define __HSI_CHAR_H
#include <linux/types.h>
#define HSI_CHAR_MAGIC 'k'
#define HSC_IOW(num, dtype) _IOW(HSI_CHAR_MAGIC, num, dtype)
#define HSC_IOR(num, dtype) _IOR(HSI_CHAR_MAGIC, num, dtype)
@ -48,16 +49,16 @@
#define HSC_ARB_PRIO 1
struct hsc_rx_config {
uint32_t mode;
uint32_t flow;
uint32_t channels;
__u32 mode;
__u32 flow;
__u32 channels;
};
struct hsc_tx_config {
uint32_t mode;
uint32_t channels;
uint32_t speed;
uint32_t arb_mode;
__u32 mode;
__u32 channels;
__u32 speed;
__u32 arb_mode;
};
#endif /* __HSI_CHAR_H */