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
4040 #define __cpu_to_be16(x) ((__force __be16)(__u16)(x))
4141 #define __be16_to_cpu(x) ((__force __u16)(__be16)(x))
4242
43−static inline __le64 __cpu_to_le64p(const __u64 *p)
43+static __always_inline __le64 __cpu_to_le64p(const __u64 *p)
4444 {
4545 return (__force __le64)__swab64p(p);
4646 }
47−static inline __u64 __le64_to_cpup(const __le64 *p)
47+static __always_inline __u64 __le64_to_cpup(const __le64 *p)
4848 {
4949 return __swab64p((__u64 *)p);
5050 }
51−static inline __le32 __cpu_to_le32p(const __u32 *p)
51+static __always_inline __le32 __cpu_to_le32p(const __u32 *p)
5252 {
5353 return (__force __le32)__swab32p(p);
5454 }
55−static inline __u32 __le32_to_cpup(const __le32 *p)
55+static __always_inline __u32 __le32_to_cpup(const __le32 *p)
5656 {
5757 return __swab32p((__u32 *)p);
5858 }
59−static inline __le16 __cpu_to_le16p(const __u16 *p)
59+static __always_inline __le16 __cpu_to_le16p(const __u16 *p)
6060 {
6161 return (__force __le16)__swab16p(p);
6262 }
63−static inline __u16 __le16_to_cpup(const __le16 *p)
63+static __always_inline __u16 __le16_to_cpup(const __le16 *p)
6464 {
6565 return __swab16p((__u16 *)p);
6666 }
67−static inline __be64 __cpu_to_be64p(const __u64 *p)
67+static __always_inline __be64 __cpu_to_be64p(const __u64 *p)
6868 {
6969 return (__force __be64)*p;
7070 }
71−static inline __u64 __be64_to_cpup(const __be64 *p)
71+static __always_inline __u64 __be64_to_cpup(const __be64 *p)
7272 {
7373 return (__force __u64)*p;
7474 }
75−static inline __be32 __cpu_to_be32p(const __u32 *p)
75+static __always_inline __be32 __cpu_to_be32p(const __u32 *p)
7676 {
7777 return (__force __be32)*p;
7878 }
79−static inline __u32 __be32_to_cpup(const __be32 *p)
79+static __always_inline __u32 __be32_to_cpup(const __be32 *p)
8080 {
8181 return (__force __u32)*p;
8282 }
83−static inline __be16 __cpu_to_be16p(const __u16 *p)
83+static __always_inline __be16 __cpu_to_be16p(const __u16 *p)
8484 {
8585 return (__force __be16)*p;
8686 }
87−static inline __u16 __be16_to_cpup(const __be16 *p)
87+static __always_inline __u16 __be16_to_cpup(const __be16 *p)
8888 {
8989 return (__force __u16)*p;
9090 }
include/uapi/linux/byteorder/little_endian.h+12−12
@@ -40,51 +40,51 @@ · 39 unmodified lines
4040 #define __cpu_to_be16(x) ((__force __be16)__swab16((x)))
4141 #define __be16_to_cpu(x) __swab16((__force __u16)(__be16)(x))
4242
43−static inline __le64 __cpu_to_le64p(const __u64 *p)
43+static __always_inline __le64 __cpu_to_le64p(const __u64 *p)
4444 {
4545 return (__force __le64)*p;
4646 }
47−static inline __u64 __le64_to_cpup(const __le64 *p)
47+static __always_inline __u64 __le64_to_cpup(const __le64 *p)
4848 {
4949 return (__force __u64)*p;
5050 }
51−static inline __le32 __cpu_to_le32p(const __u32 *p)
51+static __always_inline __le32 __cpu_to_le32p(const __u32 *p)
5252 {
5353 return (__force __le32)*p;
5454 }
55−static inline __u32 __le32_to_cpup(const __le32 *p)
55+static __always_inline __u32 __le32_to_cpup(const __le32 *p)
5656 {
5757 return (__force __u32)*p;
5858 }
59−static inline __le16 __cpu_to_le16p(const __u16 *p)
59+static __always_inline __le16 __cpu_to_le16p(const __u16 *p)
6060 {
6161 return (__force __le16)*p;
6262 }
63−static inline __u16 __le16_to_cpup(const __le16 *p)
63+static __always_inline __u16 __le16_to_cpup(const __le16 *p)
6464 {
6565 return (__force __u16)*p;
6666 }
67−static inline __be64 __cpu_to_be64p(const __u64 *p)
67+static __always_inline __be64 __cpu_to_be64p(const __u64 *p)
6868 {
6969 return (__force __be64)__swab64p(p);
7070 }
71−static inline __u64 __be64_to_cpup(const __be64 *p)
71+static __always_inline __u64 __be64_to_cpup(const __be64 *p)
7272 {
7373 return __swab64p((__u64 *)p);
7474 }
75−static inline __be32 __cpu_to_be32p(const __u32 *p)
75+static __always_inline __be32 __cpu_to_be32p(const __u32 *p)
7676 {
7777 return (__force __be32)__swab32p(p);
7878 }
79−static inline __u32 __be32_to_cpup(const __be32 *p)
79+static __always_inline __u32 __be32_to_cpup(const __be32 *p)
8080 {
8181 return __swab32p((__u32 *)p);
8282 }
83−static inline __be16 __cpu_to_be16p(const __u16 *p)
83+static __always_inline __be16 __cpu_to_be16p(const __u16 *p)
8484 {
8585 return (__force __be16)__swab16p(p);
8686 }
87−static inline __u16 __be16_to_cpup(const __be16 *p)
87+static __always_inline __u16 __be16_to_cpup(const __be16 *p)
8888 {
8989 return __swab16p((__u16 *)p);
9090 }
include/uapi/linux/elf-em.h+0−3
@@ -30,7 +30,6 @@ · 29 unmodified lines
3030 #define EM_X86_64 62 /* AMD x86-64 */
3131 #define EM_S390 22 /* IBM S/390 */
3232 #define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */
33−#define EM_V850 87 /* NEC v850 */
3433 #define EM_M32R 88 /* Renesas M32R */
3534 #define EM_MN10300 89 /* Panasonic/MEI MN10300, AM33 */
3635 #define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */
@@ -50,8 +49,6 @@ · 13 unmodified lines
5049 */
5150 #define EM_ALPHA 0x9026
5251
53−/* Bogus old v850 magic number, used by old tools. */
54−#define EM_CYGNUS_V850 0x9080
5552 /* Bogus old m32r magic number, used by old tools. */
5653 #define EM_CYGNUS_M32R 0x9041
5754 /* 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
151151 * __swab16p - return a byteswapped 16-bit value from a pointer
152152 * @p: pointer to a naturally-aligned 16-bit value
153153 */
154−static inline __u16 __swab16p(const __u16 *p)
154+static __always_inline __u16 __swab16p(const __u16 *p)
155155 {
156156 #ifdef __arch_swab16p
157157 return __arch_swab16p(p);
@@ -164,7 +164,7 @@ static inline __u16 __swab16p(const __u16 *p) · 6 unmodified lines
164164 * __swab32p - return a byteswapped 32-bit value from a pointer
165165 * @p: pointer to a naturally-aligned 32-bit value
166166 */
167−static inline __u32 __swab32p(const __u32 *p)
167+static __always_inline __u32 __swab32p(const __u32 *p)
168168 {
169169 #ifdef __arch_swab32p
170170 return __arch_swab32p(p);
@@ -177,7 +177,7 @@ static inline __u32 __swab32p(const __u32 *p) · 6 unmodified lines
177177 * __swab64p - return a byteswapped 64-bit value from a pointer
178178 * @p: pointer to a naturally-aligned 64-bit value
179179 */
180−static inline __u64 __swab64p(const __u64 *p)
180+static __always_inline __u64 __swab64p(const __u64 *p)
181181 {
182182 #ifdef __arch_swab64p
183183 return __arch_swab64p(p);
@@ -232,7 +232,7 @@ static inline void __swab16s(__u16 *p) · 48 unmodified lines
232232 * __swab32s - byteswap a 32-bit value in-place
233233 * @p: pointer to a naturally-aligned 32-bit value
234234 */
235−static inline void __swab32s(__u32 *p)
235+static __always_inline void __swab32s(__u32 *p)
236236 {
237237 #ifdef __arch_swab32s
238238 __arch_swab32s(p);
@@ -245,7 +245,7 @@ static inline void __swab32s(__u32 *p) · 6 unmodified lines
245245 * __swab64s - byteswap a 64-bit value in-place
246246 * @p: pointer to a naturally-aligned 64-bit value
247247 */
248−static inline void __swab64s(__u64 *p)
248+static __always_inline void __swab64s(__u64 *p)
249249 {
250250 #ifdef __arch_swab64s
251251 __arch_swab64s(p);
include/uapi/linux/virtio_balloon.h+2−1
@@ -51,7 +51,8 @@ struct virtio_balloon_config { · 50 unmodified lines
5151 #define VIRTIO_BALLOON_S_MINFLT 3 /* Number of minor faults */
5252 #define VIRTIO_BALLOON_S_MEMFREE 4 /* Total amount of free memory */
5353 #define VIRTIO_BALLOON_S_MEMTOT 5 /* Total amount of memory */
54−#define VIRTIO_BALLOON_S_NR 6
54+#define VIRTIO_BALLOON_S_AVAIL 6 /* Available memory as in /proc */
55+#define VIRTIO_BALLOON_S_NR 7
5556
5657 /*
5758 * Memory statistics structure.