History

Merge branch 'x86/cpufeature' into x86/cache

Resolve the cpu/scattered conflict.

Thomas Gleixner committed 10 years ago

Commit 7ce7f352 parents f410770 47bdf33924 files · +10155 −6680Browse files

Showing the changes to include/uapi/linux (2 of 924 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/ethtool.h +1 −2
  2. include/uapi/linux/rtnetlink.h +1 −1
include/uapi/linux/ethtool.h+1−2
@@ -119,8 +119,7 @@ struct ethtool_cmd { · 118 unmodified lines
119static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep,119static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep,
120 __u32 speed)120 __u32 speed)
121{121{
122 122 ep->speed = (__u16)(speed & 0xFFFF);
123 ep->speed = (__u16)speed;
124 ep->speed_hi = (__u16)(speed >> 16);123 ep->speed_hi = (__u16)(speed >> 16);
125}124}
126 125
include/uapi/linux/rtnetlink.h+1−1
@@ -350,7 +350,7 @@ struct rtnexthop { · 349 unmodified lines
350#define RTNH_F_OFFLOAD 8 /* offloaded route */350#define RTNH_F_OFFLOAD 8 /* offloaded route */
351#define RTNH_F_LINKDOWN 16 /* carrier-down on nexthop */351#define RTNH_F_LINKDOWN 16 /* carrier-down on nexthop */
352 352
353#define RTNH_COMPARE_MASK (RTNH_F_DEAD | RTNH_F_LINKDOWN)353#define RTNH_COMPARE_MASK (RTNH_F_DEAD | RTNH_F_LINKDOWN | RTNH_F_OFFLOAD)
354 354
355/* Macros to handle hexthops */355/* Macros to handle hexthops */
356 356