History

Merge branch 'akpm' (patches from Andrew)

Merge second patch-bomb from Andrew Morton: - a couple of hotfixes - the rest of MM - a new timer slack control in procfs - a couple of procfs fixes - a few misc things - some printk tweaks - lib/ updates, notably to radix-tree. - add my and Nick Piggin's old userspace radix-tree test harness to tools/testing/radix-tree/. Matthew said it was a godsend during the radix-tree work he did. - a few code-size improvements, switching to __always_inline where gcc screwed up. - partially implement character sets in sscanf * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits) sscanf: implement basic character sets lib/bug.c: use common WARN helper param: convert some "on"/"off" users to strtobool lib: add "on"/"off" support to kstrtobool lib: update single-char callers of strtobool() lib: move strtobool() to kstrtobool() include/linux/unaligned: force inlining of byteswap operations include/uapi/linux/byteorder, swab: force inlining of some byteswap operations include/asm-generic/atomic-long.h: force inlining of some atomic_long operations usb: common: convert to use match_string() helper ide: hpt366: convert to use match_string() helper ata: hpt366: convert to use match_string() helper power: ab8500: convert to use match_string() helper power: charger_manager: convert to use match_string() helper drm/edid: convert to use match_string() helper pinctrl: convert to use match_string() helper device property: convert to use match_string() helper lib/string: introduce match_string() helper radix-tree tests: add test for radix_tree_iter_next radix-tree tests: add regression3 test ...

Linus Torvalds committed 10 years ago

Commit 814a2bf2 parents 237045f f9310b2225 files · +5048 −1915Browse files

Showing the changes to include/uapi (5 of 225 files). Show all

Unified · Split

5 files
  1. include/uapi/linux/byteorder/big_endian.h +12 −12
  2. include/uapi/linux/byteorder/little_endian.h +12 −12
  3. include/uapi/linux/elf-em.h +0 −3
  4. include/uapi/linux/swab.h +5 −5
  5. include/uapi/linux/virtio_balloon.h +2 −1
include/uapi/linux/byteorder/big_endian.h+12−12
@@ -40,51 +40,51 @@ · 39 unmodified lines
40#define __cpu_to_be16(x) ((__force __be16)(__u16)(x))40#define __cpu_to_be16(x) ((__force __be16)(__u16)(x))
41#define __be16_to_cpu(x) ((__force __u16)(__be16)(x))41#define __be16_to_cpu(x) ((__force __u16)(__be16)(x))
42 42
43static inline __le64 __cpu_to_le64p(const __u64 *p)43static __always_inline __le64 __cpu_to_le64p(const __u64 *p)
44{44{
45 return (__force __le64)__swab64p(p);45 return (__force __le64)__swab64p(p);
46}46}
47static inline __u64 __le64_to_cpup(const __le64 *p)47static __always_inline __u64 __le64_to_cpup(const __le64 *p)
48{48{
49 return __swab64p((__u64 *)p);49 return __swab64p((__u64 *)p);
50}50}
51static inline __le32 __cpu_to_le32p(const __u32 *p)51static __always_inline __le32 __cpu_to_le32p(const __u32 *p)
52{52{
53 return (__force __le32)__swab32p(p);53 return (__force __le32)__swab32p(p);
54}54}
55static inline __u32 __le32_to_cpup(const __le32 *p)55static __always_inline __u32 __le32_to_cpup(const __le32 *p)
56{56{
57 return __swab32p((__u32 *)p);57 return __swab32p((__u32 *)p);
58}58}
59static inline __le16 __cpu_to_le16p(const __u16 *p)59static __always_inline __le16 __cpu_to_le16p(const __u16 *p)
60{60{
61 return (__force __le16)__swab16p(p);61 return (__force __le16)__swab16p(p);
62}62}
63static inline __u16 __le16_to_cpup(const __le16 *p)63static __always_inline __u16 __le16_to_cpup(const __le16 *p)
64{64{
65 return __swab16p((__u16 *)p);65 return __swab16p((__u16 *)p);
66}66}
67static inline __be64 __cpu_to_be64p(const __u64 *p)67static __always_inline __be64 __cpu_to_be64p(const __u64 *p)
68{68{
69 return (__force __be64)*p;69 return (__force __be64)*p;
70}70}
71static inline __u64 __be64_to_cpup(const __be64 *p)71static __always_inline __u64 __be64_to_cpup(const __be64 *p)
72{72{
73 return (__force __u64)*p;73 return (__force __u64)*p;
74}74}
75static inline __be32 __cpu_to_be32p(const __u32 *p)75static __always_inline __be32 __cpu_to_be32p(const __u32 *p)
76{76{
77 return (__force __be32)*p;77 return (__force __be32)*p;
78}78}
79static inline __u32 __be32_to_cpup(const __be32 *p)79static __always_inline __u32 __be32_to_cpup(const __be32 *p)
80{80{
81 return (__force __u32)*p;81 return (__force __u32)*p;
82}82}
83static inline __be16 __cpu_to_be16p(const __u16 *p)83static __always_inline __be16 __cpu_to_be16p(const __u16 *p)
84{84{
85 return (__force __be16)*p;85 return (__force __be16)*p;
86}86}
87static inline __u16 __be16_to_cpup(const __be16 *p)87static __always_inline __u16 __be16_to_cpup(const __be16 *p)
88{88{
89 return (__force __u16)*p;89 return (__force __u16)*p;
90}90}
include/uapi/linux/byteorder/little_endian.h+12−12
@@ -40,51 +40,51 @@ · 39 unmodified lines
40#define __cpu_to_be16(x) ((__force __be16)__swab16((x)))40#define __cpu_to_be16(x) ((__force __be16)__swab16((x)))
41#define __be16_to_cpu(x) __swab16((__force __u16)(__be16)(x))41#define __be16_to_cpu(x) __swab16((__force __u16)(__be16)(x))
42 42
43static inline __le64 __cpu_to_le64p(const __u64 *p)43static __always_inline __le64 __cpu_to_le64p(const __u64 *p)
44{44{
45 return (__force __le64)*p;45 return (__force __le64)*p;
46}46}
47static inline __u64 __le64_to_cpup(const __le64 *p)47static __always_inline __u64 __le64_to_cpup(const __le64 *p)
48{48{
49 return (__force __u64)*p;49 return (__force __u64)*p;
50}50}
51static inline __le32 __cpu_to_le32p(const __u32 *p)51static __always_inline __le32 __cpu_to_le32p(const __u32 *p)
52{52{
53 return (__force __le32)*p;53 return (__force __le32)*p;
54}54}
55static inline __u32 __le32_to_cpup(const __le32 *p)55static __always_inline __u32 __le32_to_cpup(const __le32 *p)
56{56{
57 return (__force __u32)*p;57 return (__force __u32)*p;
58}58}
59static inline __le16 __cpu_to_le16p(const __u16 *p)59static __always_inline __le16 __cpu_to_le16p(const __u16 *p)
60{60{
61 return (__force __le16)*p;61 return (__force __le16)*p;
62}62}
63static inline __u16 __le16_to_cpup(const __le16 *p)63static __always_inline __u16 __le16_to_cpup(const __le16 *p)
64{64{
65 return (__force __u16)*p;65 return (__force __u16)*p;
66}66}
67static inline __be64 __cpu_to_be64p(const __u64 *p)67static __always_inline __be64 __cpu_to_be64p(const __u64 *p)
68{68{
69 return (__force __be64)__swab64p(p);69 return (__force __be64)__swab64p(p);
70}70}
71static inline __u64 __be64_to_cpup(const __be64 *p)71static __always_inline __u64 __be64_to_cpup(const __be64 *p)
72{72{
73 return __swab64p((__u64 *)p);73 return __swab64p((__u64 *)p);
74}74}
75static inline __be32 __cpu_to_be32p(const __u32 *p)75static __always_inline __be32 __cpu_to_be32p(const __u32 *p)
76{76{
77 return (__force __be32)__swab32p(p);77 return (__force __be32)__swab32p(p);
78}78}
79static inline __u32 __be32_to_cpup(const __be32 *p)79static __always_inline __u32 __be32_to_cpup(const __be32 *p)
80{80{
81 return __swab32p((__u32 *)p);81 return __swab32p((__u32 *)p);
82}82}
83static inline __be16 __cpu_to_be16p(const __u16 *p)83static __always_inline __be16 __cpu_to_be16p(const __u16 *p)
84{84{
85 return (__force __be16)__swab16p(p);85 return (__force __be16)__swab16p(p);
86}86}
87static inline __u16 __be16_to_cpup(const __be16 *p)87static __always_inline __u16 __be16_to_cpup(const __be16 *p)
88{88{
89 return __swab16p((__u16 *)p);89 return __swab16p((__u16 *)p);
90}90}
include/uapi/linux/elf-em.h+0−3
@@ -30,7 +30,6 @@ · 29 unmodified lines
30#define EM_X86_64 62 /* AMD x86-64 */30#define EM_X86_64 62 /* AMD x86-64 */
31#define EM_S390 22 /* IBM S/390 */31#define EM_S390 22 /* IBM S/390 */
32#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */32#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */
33#define EM_V850 87 /* NEC v850 */
34#define EM_M32R 88 /* Renesas M32R */33#define EM_M32R 88 /* Renesas M32R */
35#define EM_MN10300 89 /* Panasonic/MEI MN10300, AM33 */34#define EM_MN10300 89 /* Panasonic/MEI MN10300, AM33 */
36#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */35#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */
@@ -50,8 +49,6 @@ · 13 unmodified lines
50 */49 */
51#define EM_ALPHA 0x902650#define EM_ALPHA 0x9026
52 51
53/* Bogus old v850 magic number, used by old tools. */
54#define EM_CYGNUS_V850 0x9080
55/* Bogus old m32r magic number, used by old tools. */52/* Bogus old m32r magic number, used by old tools. */
56#define EM_CYGNUS_M32R 0x904153#define EM_CYGNUS_M32R 0x9041
57/* This is the old interim value for S/390 architecture */54/* This is the old interim value for S/390 architecture */
include/uapi/linux/swab.h+5−5
@@ -151,7 +151,7 @@ static inline __attribute_const__ __u32 __fswahb32(__u32 val) · 150 unmodified lines
151 * __swab16p - return a byteswapped 16-bit value from a pointer151 * __swab16p - return a byteswapped 16-bit value from a pointer
152 * @p: pointer to a naturally-aligned 16-bit value152 * @p: pointer to a naturally-aligned 16-bit value
153 */153 */
154static inline __u16 __swab16p(const __u16 *p)154static __always_inline __u16 __swab16p(const __u16 *p)
155{155{
156#ifdef __arch_swab16p156#ifdef __arch_swab16p
157 return __arch_swab16p(p);157 return __arch_swab16p(p);
@@ -164,7 +164,7 @@ static inline __u16 __swab16p(const __u16 *p) · 6 unmodified lines
164 * __swab32p - return a byteswapped 32-bit value from a pointer164 * __swab32p - return a byteswapped 32-bit value from a pointer
165 * @p: pointer to a naturally-aligned 32-bit value165 * @p: pointer to a naturally-aligned 32-bit value
166 */166 */
167static inline __u32 __swab32p(const __u32 *p)167static __always_inline __u32 __swab32p(const __u32 *p)
168{168{
169#ifdef __arch_swab32p169#ifdef __arch_swab32p
170 return __arch_swab32p(p);170 return __arch_swab32p(p);
@@ -177,7 +177,7 @@ static inline __u32 __swab32p(const __u32 *p) · 6 unmodified lines
177 * __swab64p - return a byteswapped 64-bit value from a pointer177 * __swab64p - return a byteswapped 64-bit value from a pointer
178 * @p: pointer to a naturally-aligned 64-bit value178 * @p: pointer to a naturally-aligned 64-bit value
179 */179 */
180static inline __u64 __swab64p(const __u64 *p)180static __always_inline __u64 __swab64p(const __u64 *p)
181{181{
182#ifdef __arch_swab64p182#ifdef __arch_swab64p
183 return __arch_swab64p(p);183 return __arch_swab64p(p);
@@ -232,7 +232,7 @@ static inline void __swab16s(__u16 *p) · 48 unmodified lines
232 * __swab32s - byteswap a 32-bit value in-place232 * __swab32s - byteswap a 32-bit value in-place
233 * @p: pointer to a naturally-aligned 32-bit value233 * @p: pointer to a naturally-aligned 32-bit value
234 */234 */
235static inline void __swab32s(__u32 *p)235static __always_inline void __swab32s(__u32 *p)
236{236{
237#ifdef __arch_swab32s237#ifdef __arch_swab32s
238 __arch_swab32s(p);238 __arch_swab32s(p);
@@ -245,7 +245,7 @@ static inline void __swab32s(__u32 *p) · 6 unmodified lines
245 * __swab64s - byteswap a 64-bit value in-place245 * __swab64s - byteswap a 64-bit value in-place
246 * @p: pointer to a naturally-aligned 64-bit value246 * @p: pointer to a naturally-aligned 64-bit value
247 */247 */
248static inline void __swab64s(__u64 *p)248static __always_inline void __swab64s(__u64 *p)
249{249{
250#ifdef __arch_swab64s250#ifdef __arch_swab64s
251 __arch_swab64s(p);251 __arch_swab64s(p);
include/uapi/linux/virtio_balloon.h+2−1
@@ -51,7 +51,8 @@ struct virtio_balloon_config { · 50 unmodified lines
51#define VIRTIO_BALLOON_S_MINFLT 3 /* Number of minor faults */51#define VIRTIO_BALLOON_S_MINFLT 3 /* Number of minor faults */
52#define VIRTIO_BALLOON_S_MEMFREE 4 /* Total amount of free memory */52#define VIRTIO_BALLOON_S_MEMFREE 4 /* Total amount of free memory */
53#define VIRTIO_BALLOON_S_MEMTOT 5 /* Total amount of memory */53#define VIRTIO_BALLOON_S_MEMTOT 5 /* Total amount of memory */
54#define VIRTIO_BALLOON_S_NR 654#define VIRTIO_BALLOON_S_AVAIL 6 /* Available memory as in /proc */
55#define VIRTIO_BALLOON_S_NR 7
55 56
56/*57/*
57 * Memory statistics structure.58 * Memory statistics structure.