diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-21 07:56:52 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-21 07:56:52 -0500 |
| commit | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (patch) | |
| tree | 8158b4c88b59391274d539a7e8e6985446d900e7 /include | |
| parent | e64001e8efc107992fd835770f6383d0dc731594 (diff) | |
| parent | 254dc326dbfd23c2678fafad1b84fc0e42ac4374 (diff) | |
Merge tag 'ib-asoc-1' of git://git.linaro.org/people/ljones/mfd into asoc-arizona
Immutable branch for ASoC, as requested by Mark Brown
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/filter.h | 15 | ||||
| -rw-r--r-- | include/linux/ipc_namespace.h | 6 | ||||
| -rw-r--r-- | include/linux/mfd/arizona/registers.h | 37 | ||||
| -rw-r--r-- | include/linux/netdevice.h | 5 | ||||
| -rw-r--r-- | include/linux/percpu.h | 8 | ||||
| -rw-r--r-- | include/linux/yam.h | 2 | ||||
| -rw-r--r-- | include/net/cipso_ipv4.h | 6 | ||||
| -rw-r--r-- | include/net/dst.h | 12 | ||||
| -rw-r--r-- | include/net/ip6_route.h | 6 | ||||
| -rw-r--r-- | include/net/mac802154.h | 2 | ||||
| -rw-r--r-- | include/net/sock.h | 6 | ||||
| -rw-r--r-- | include/trace/events/target.h | 4 | ||||
| -rw-r--r-- | include/uapi/drm/drm_mode.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/perf_event.h | 12 | ||||
| -rw-r--r-- | include/uapi/linux/tc_act/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/linux/tc_act/tc_defact.h (renamed from include/linux/tc_act/tc_defact.h) | 2 | ||||
| -rw-r--r-- | include/uapi/rdma/ib_user_verbs.h | 6 |
17 files changed, 99 insertions, 33 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index a6ac84871d6d..ff4e40cd45b1 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include <linux/atomic.h> | 7 | #include <linux/atomic.h> |
| 8 | #include <linux/compat.h> | 8 | #include <linux/compat.h> |
| 9 | #include <linux/workqueue.h> | ||
| 9 | #include <uapi/linux/filter.h> | 10 | #include <uapi/linux/filter.h> |
| 10 | 11 | ||
| 11 | #ifdef CONFIG_COMPAT | 12 | #ifdef CONFIG_COMPAT |
| @@ -25,15 +26,19 @@ struct sk_filter | |||
| 25 | { | 26 | { |
| 26 | atomic_t refcnt; | 27 | atomic_t refcnt; |
| 27 | unsigned int len; /* Number of filter blocks */ | 28 | unsigned int len; /* Number of filter blocks */ |
| 29 | struct rcu_head rcu; | ||
| 28 | unsigned int (*bpf_func)(const struct sk_buff *skb, | 30 | unsigned int (*bpf_func)(const struct sk_buff *skb, |
| 29 | const struct sock_filter *filter); | 31 | const struct sock_filter *filter); |
| 30 | struct rcu_head rcu; | 32 | union { |
| 31 | struct sock_filter insns[0]; | 33 | struct sock_filter insns[0]; |
| 34 | struct work_struct work; | ||
| 35 | }; | ||
| 32 | }; | 36 | }; |
| 33 | 37 | ||
| 34 | static inline unsigned int sk_filter_len(const struct sk_filter *fp) | 38 | static inline unsigned int sk_filter_size(unsigned int proglen) |
| 35 | { | 39 | { |
| 36 | return fp->len * sizeof(struct sock_filter) + sizeof(*fp); | 40 | return max(sizeof(struct sk_filter), |
| 41 | offsetof(struct sk_filter, insns[proglen])); | ||
| 37 | } | 42 | } |
| 38 | 43 | ||
| 39 | extern int sk_filter(struct sock *sk, struct sk_buff *skb); | 44 | extern int sk_filter(struct sock *sk, struct sk_buff *skb); |
| @@ -67,11 +72,13 @@ static inline void bpf_jit_dump(unsigned int flen, unsigned int proglen, | |||
| 67 | } | 72 | } |
| 68 | #define SK_RUN_FILTER(FILTER, SKB) (*FILTER->bpf_func)(SKB, FILTER->insns) | 73 | #define SK_RUN_FILTER(FILTER, SKB) (*FILTER->bpf_func)(SKB, FILTER->insns) |
| 69 | #else | 74 | #else |
| 75 | #include <linux/slab.h> | ||
| 70 | static inline void bpf_jit_compile(struct sk_filter *fp) | 76 | static inline void bpf_jit_compile(struct sk_filter *fp) |
| 71 | { | 77 | { |
| 72 | } | 78 | } |
| 73 | static inline void bpf_jit_free(struct sk_filter *fp) | 79 | static inline void bpf_jit_free(struct sk_filter *fp) |
| 74 | { | 80 | { |
| 81 | kfree(fp); | ||
| 75 | } | 82 | } |
| 76 | #define SK_RUN_FILTER(FILTER, SKB) sk_run_filter(SKB, FILTER->insns) | 83 | #define SK_RUN_FILTER(FILTER, SKB) sk_run_filter(SKB, FILTER->insns) |
| 77 | #endif | 84 | #endif |
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index 19c19a5eee29..f6c82de12541 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h | |||
| @@ -34,9 +34,9 @@ struct ipc_namespace { | |||
| 34 | int sem_ctls[4]; | 34 | int sem_ctls[4]; |
| 35 | int used_sems; | 35 | int used_sems; |
| 36 | 36 | ||
| 37 | int msg_ctlmax; | 37 | unsigned int msg_ctlmax; |
| 38 | int msg_ctlmnb; | 38 | unsigned int msg_ctlmnb; |
| 39 | int msg_ctlmni; | 39 | unsigned int msg_ctlmni; |
| 40 | atomic_t msg_bytes; | 40 | atomic_t msg_bytes; |
| 41 | atomic_t msg_hdrs; | 41 | atomic_t msg_hdrs; |
| 42 | int auto_msgmni; | 42 | int auto_msgmni; |
diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h index 8f4c9d77ab20..f1088c2a9d24 100644 --- a/include/linux/mfd/arizona/registers.h +++ b/include/linux/mfd/arizona/registers.h | |||
| @@ -139,6 +139,7 @@ | |||
| 139 | #define ARIZONA_INPUT_ENABLES_STATUS 0x301 | 139 | #define ARIZONA_INPUT_ENABLES_STATUS 0x301 |
| 140 | #define ARIZONA_INPUT_RATE 0x308 | 140 | #define ARIZONA_INPUT_RATE 0x308 |
| 141 | #define ARIZONA_INPUT_VOLUME_RAMP 0x309 | 141 | #define ARIZONA_INPUT_VOLUME_RAMP 0x309 |
| 142 | #define ARIZONA_HPF_CONTROL 0x30C | ||
| 142 | #define ARIZONA_IN1L_CONTROL 0x310 | 143 | #define ARIZONA_IN1L_CONTROL 0x310 |
| 143 | #define ARIZONA_ADC_DIGITAL_VOLUME_1L 0x311 | 144 | #define ARIZONA_ADC_DIGITAL_VOLUME_1L 0x311 |
| 144 | #define ARIZONA_DMIC1L_CONTROL 0x312 | 145 | #define ARIZONA_DMIC1L_CONTROL 0x312 |
| @@ -160,6 +161,7 @@ | |||
| 160 | #define ARIZONA_IN4L_CONTROL 0x328 | 161 | #define ARIZONA_IN4L_CONTROL 0x328 |
| 161 | #define ARIZONA_ADC_DIGITAL_VOLUME_4L 0x329 | 162 | #define ARIZONA_ADC_DIGITAL_VOLUME_4L 0x329 |
| 162 | #define ARIZONA_DMIC4L_CONTROL 0x32A | 163 | #define ARIZONA_DMIC4L_CONTROL 0x32A |
| 164 | #define ARIZONA_IN4R_CONTROL 0x32C | ||
| 163 | #define ARIZONA_ADC_DIGITAL_VOLUME_4R 0x32D | 165 | #define ARIZONA_ADC_DIGITAL_VOLUME_4R 0x32D |
| 164 | #define ARIZONA_DMIC4R_CONTROL 0x32E | 166 | #define ARIZONA_DMIC4R_CONTROL 0x32E |
| 165 | #define ARIZONA_OUTPUT_ENABLES_1 0x400 | 167 | #define ARIZONA_OUTPUT_ENABLES_1 0x400 |
| @@ -2325,8 +2327,18 @@ | |||
| 2325 | #define ARIZONA_IN_VI_RAMP_WIDTH 3 /* IN_VI_RAMP - [2:0] */ | 2327 | #define ARIZONA_IN_VI_RAMP_WIDTH 3 /* IN_VI_RAMP - [2:0] */ |
| 2326 | 2328 | ||
| 2327 | /* | 2329 | /* |
| 2330 | * R780 (0x30C) - HPF Control | ||
| 2331 | */ | ||
| 2332 | #define ARIZONA_IN_HPF_CUT_MASK 0x0007 /* IN_HPF_CUT [2:0] */ | ||
| 2333 | #define ARIZONA_IN_HPF_CUT_SHIFT 0 /* IN_HPF_CUT [2:0] */ | ||
| 2334 | #define ARIZONA_IN_HPF_CUT_WIDTH 3 /* IN_HPF_CUT [2:0] */ | ||
| 2335 | |||
| 2336 | /* | ||
| 2328 | * R784 (0x310) - IN1L Control | 2337 | * R784 (0x310) - IN1L Control |
| 2329 | */ | 2338 | */ |
| 2339 | #define ARIZONA_IN1L_HPF_MASK 0x8000 /* IN1L_HPF - [15] */ | ||
| 2340 | #define ARIZONA_IN1L_HPF_SHIFT 15 /* IN1L_HPF - [15] */ | ||
| 2341 | #define ARIZONA_IN1L_HPF_WIDTH 1 /* IN1L_HPF - [15] */ | ||
| 2330 | #define ARIZONA_IN1_OSR_MASK 0x6000 /* IN1_OSR - [14:13] */ | 2342 | #define ARIZONA_IN1_OSR_MASK 0x6000 /* IN1_OSR - [14:13] */ |
| 2331 | #define ARIZONA_IN1_OSR_SHIFT 13 /* IN1_OSR - [14:13] */ | 2343 | #define ARIZONA_IN1_OSR_SHIFT 13 /* IN1_OSR - [14:13] */ |
| 2332 | #define ARIZONA_IN1_OSR_WIDTH 2 /* IN1_OSR - [14:13] */ | 2344 | #define ARIZONA_IN1_OSR_WIDTH 2 /* IN1_OSR - [14:13] */ |
| @@ -2365,6 +2377,9 @@ | |||
| 2365 | /* | 2377 | /* |
| 2366 | * R788 (0x314) - IN1R Control | 2378 | * R788 (0x314) - IN1R Control |
| 2367 | */ | 2379 | */ |
| 2380 | #define ARIZONA_IN1R_HPF_MASK 0x8000 /* IN1R_HPF - [15] */ | ||
| 2381 | #define ARIZONA_IN1R_HPF_SHIFT 15 /* IN1R_HPF - [15] */ | ||
| 2382 | #define ARIZONA_IN1R_HPF_WIDTH 1 /* IN1R_HPF - [15] */ | ||
| 2368 | #define ARIZONA_IN1R_PGA_VOL_MASK 0x00FE /* IN1R_PGA_VOL - [7:1] */ | 2383 | #define ARIZONA_IN1R_PGA_VOL_MASK 0x00FE /* IN1R_PGA_VOL - [7:1] */ |
| 2369 | #define ARIZONA_IN1R_PGA_VOL_SHIFT 1 /* IN1R_PGA_VOL - [7:1] */ | 2384 | #define ARIZONA_IN1R_PGA_VOL_SHIFT 1 /* IN1R_PGA_VOL - [7:1] */ |
| 2370 | #define ARIZONA_IN1R_PGA_VOL_WIDTH 7 /* IN1R_PGA_VOL - [7:1] */ | 2385 | #define ARIZONA_IN1R_PGA_VOL_WIDTH 7 /* IN1R_PGA_VOL - [7:1] */ |
| @@ -2394,6 +2409,9 @@ | |||
| 2394 | /* | 2409 | /* |
| 2395 | * R792 (0x318) - IN2L Control | 2410 | * R792 (0x318) - IN2L Control |
| 2396 | */ | 2411 | */ |
| 2412 | #define ARIZONA_IN2L_HPF_MASK 0x8000 /* IN2L_HPF - [15] */ | ||
| 2413 | #define ARIZONA_IN2L_HPF_SHIFT 15 /* IN2L_HPF - [15] */ | ||
| 2414 | #define ARIZONA_IN2L_HPF_WIDTH 1 /* IN2L_HPF - [15] */ | ||
| 2397 | #define ARIZONA_IN2_OSR_MASK 0x6000 /* IN2_OSR - [14:13] */ | 2415 | #define ARIZONA_IN2_OSR_MASK 0x6000 /* IN2_OSR - [14:13] */ |
| 2398 | #define ARIZONA_IN2_OSR_SHIFT 13 /* IN2_OSR - [14:13] */ | 2416 | #define ARIZONA_IN2_OSR_SHIFT 13 /* IN2_OSR - [14:13] */ |
| 2399 | #define ARIZONA_IN2_OSR_WIDTH 2 /* IN2_OSR - [14:13] */ | 2417 | #define ARIZONA_IN2_OSR_WIDTH 2 /* IN2_OSR - [14:13] */ |
| @@ -2432,6 +2450,9 @@ | |||
| 2432 | /* | 2450 | /* |
| 2433 | * R796 (0x31C) - IN2R Control | 2451 | * R796 (0x31C) - IN2R Control |
| 2434 | */ | 2452 | */ |
| 2453 | #define ARIZONA_IN2R_HPF_MASK 0x8000 /* IN2R_HPF - [15] */ | ||
| 2454 | #define ARIZONA_IN2R_HPF_SHIFT 15 /* IN2R_HPF - [15] */ | ||
| 2455 | #define ARIZONA_IN2R_HPF_WIDTH 1 /* IN2R_HPF - [15] */ | ||
| 2435 | #define ARIZONA_IN2R_PGA_VOL_MASK 0x00FE /* IN2R_PGA_VOL - [7:1] */ | 2456 | #define ARIZONA_IN2R_PGA_VOL_MASK 0x00FE /* IN2R_PGA_VOL - [7:1] */ |
| 2436 | #define ARIZONA_IN2R_PGA_VOL_SHIFT 1 /* IN2R_PGA_VOL - [7:1] */ | 2457 | #define ARIZONA_IN2R_PGA_VOL_SHIFT 1 /* IN2R_PGA_VOL - [7:1] */ |
| 2437 | #define ARIZONA_IN2R_PGA_VOL_WIDTH 7 /* IN2R_PGA_VOL - [7:1] */ | 2458 | #define ARIZONA_IN2R_PGA_VOL_WIDTH 7 /* IN2R_PGA_VOL - [7:1] */ |
| @@ -2461,6 +2482,9 @@ | |||
| 2461 | /* | 2482 | /* |
| 2462 | * R800 (0x320) - IN3L Control | 2483 | * R800 (0x320) - IN3L Control |
| 2463 | */ | 2484 | */ |
| 2485 | #define ARIZONA_IN3L_HPF_MASK 0x8000 /* IN3L_HPF - [15] */ | ||
| 2486 | #define ARIZONA_IN3L_HPF_SHIFT 15 /* IN3L_HPF - [15] */ | ||
| 2487 | #define ARIZONA_IN3L_HPF_WIDTH 1 /* IN3L_HPF - [15] */ | ||
| 2464 | #define ARIZONA_IN3_OSR_MASK 0x6000 /* IN3_OSR - [14:13] */ | 2488 | #define ARIZONA_IN3_OSR_MASK 0x6000 /* IN3_OSR - [14:13] */ |
| 2465 | #define ARIZONA_IN3_OSR_SHIFT 13 /* IN3_OSR - [14:13] */ | 2489 | #define ARIZONA_IN3_OSR_SHIFT 13 /* IN3_OSR - [14:13] */ |
| 2466 | #define ARIZONA_IN3_OSR_WIDTH 2 /* IN3_OSR - [14:13] */ | 2490 | #define ARIZONA_IN3_OSR_WIDTH 2 /* IN3_OSR - [14:13] */ |
| @@ -2499,6 +2523,9 @@ | |||
| 2499 | /* | 2523 | /* |
| 2500 | * R804 (0x324) - IN3R Control | 2524 | * R804 (0x324) - IN3R Control |
| 2501 | */ | 2525 | */ |
| 2526 | #define ARIZONA_IN3R_HPF_MASK 0x8000 /* IN3R_HPF - [15] */ | ||
| 2527 | #define ARIZONA_IN3R_HPF_SHIFT 15 /* IN3R_HPF - [15] */ | ||
| 2528 | #define ARIZONA_IN3R_HPF_WIDTH 1 /* IN3R_HPF - [15] */ | ||
| 2502 | #define ARIZONA_IN3R_PGA_VOL_MASK 0x00FE /* IN3R_PGA_VOL - [7:1] */ | 2529 | #define ARIZONA_IN3R_PGA_VOL_MASK 0x00FE /* IN3R_PGA_VOL - [7:1] */ |
| 2503 | #define ARIZONA_IN3R_PGA_VOL_SHIFT 1 /* IN3R_PGA_VOL - [7:1] */ | 2530 | #define ARIZONA_IN3R_PGA_VOL_SHIFT 1 /* IN3R_PGA_VOL - [7:1] */ |
| 2504 | #define ARIZONA_IN3R_PGA_VOL_WIDTH 7 /* IN3R_PGA_VOL - [7:1] */ | 2531 | #define ARIZONA_IN3R_PGA_VOL_WIDTH 7 /* IN3R_PGA_VOL - [7:1] */ |
| @@ -2528,6 +2555,9 @@ | |||
| 2528 | /* | 2555 | /* |
| 2529 | * R808 (0x328) - IN4 Control | 2556 | * R808 (0x328) - IN4 Control |
| 2530 | */ | 2557 | */ |
| 2558 | #define ARIZONA_IN4L_HPF_MASK 0x8000 /* IN4L_HPF - [15] */ | ||
| 2559 | #define ARIZONA_IN4L_HPF_SHIFT 15 /* IN4L_HPF - [15] */ | ||
| 2560 | #define ARIZONA_IN4L_HPF_WIDTH 1 /* IN4L_HPF - [15] */ | ||
| 2531 | #define ARIZONA_IN4_OSR_MASK 0x6000 /* IN4_OSR - [14:13] */ | 2561 | #define ARIZONA_IN4_OSR_MASK 0x6000 /* IN4_OSR - [14:13] */ |
| 2532 | #define ARIZONA_IN4_OSR_SHIFT 13 /* IN4_OSR - [14:13] */ | 2562 | #define ARIZONA_IN4_OSR_SHIFT 13 /* IN4_OSR - [14:13] */ |
| 2533 | #define ARIZONA_IN4_OSR_WIDTH 2 /* IN4_OSR - [14:13] */ | 2563 | #define ARIZONA_IN4_OSR_WIDTH 2 /* IN4_OSR - [14:13] */ |
| @@ -2558,6 +2588,13 @@ | |||
| 2558 | #define ARIZONA_IN4L_DMIC_DLY_WIDTH 6 /* IN4L_DMIC_DLY - [5:0] */ | 2588 | #define ARIZONA_IN4L_DMIC_DLY_WIDTH 6 /* IN4L_DMIC_DLY - [5:0] */ |
| 2559 | 2589 | ||
| 2560 | /* | 2590 | /* |
| 2591 | * R812 (0x32C) - IN4R Control | ||
| 2592 | */ | ||
| 2593 | #define ARIZONA_IN4R_HPF_MASK 0x8000 /* IN4R_HPF - [15] */ | ||
| 2594 | #define ARIZONA_IN4R_HPF_SHIFT 15 /* IN4R_HPF - [15] */ | ||
| 2595 | #define ARIZONA_IN4R_HPF_WIDTH 1 /* IN4R_HPF - [15] */ | ||
| 2596 | |||
| 2597 | /* | ||
| 2561 | * R813 (0x32D) - ADC Digital Volume 4R | 2598 | * R813 (0x32D) - ADC Digital Volume 4R |
| 2562 | */ | 2599 | */ |
| 2563 | #define ARIZONA_IN_VU 0x0200 /* IN_VU */ | 2600 | #define ARIZONA_IN_VU 0x0200 /* IN_VU */ |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 3de49aca4519..25f5d2d11e7c 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -2264,11 +2264,12 @@ static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index) | |||
| 2264 | } | 2264 | } |
| 2265 | 2265 | ||
| 2266 | #ifdef CONFIG_XPS | 2266 | #ifdef CONFIG_XPS |
| 2267 | extern int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask, | 2267 | extern int netif_set_xps_queue(struct net_device *dev, |
| 2268 | const struct cpumask *mask, | ||
| 2268 | u16 index); | 2269 | u16 index); |
| 2269 | #else | 2270 | #else |
| 2270 | static inline int netif_set_xps_queue(struct net_device *dev, | 2271 | static inline int netif_set_xps_queue(struct net_device *dev, |
| 2271 | struct cpumask *mask, | 2272 | const struct cpumask *mask, |
| 2272 | u16 index) | 2273 | u16 index) |
| 2273 | { | 2274 | { |
| 2274 | return 0; | 2275 | return 0; |
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index cc88172c7d9a..c74088ab103b 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h | |||
| @@ -332,7 +332,7 @@ do { \ | |||
| 332 | #endif | 332 | #endif |
| 333 | 333 | ||
| 334 | #ifndef this_cpu_sub | 334 | #ifndef this_cpu_sub |
| 335 | # define this_cpu_sub(pcp, val) this_cpu_add((pcp), -(val)) | 335 | # define this_cpu_sub(pcp, val) this_cpu_add((pcp), -(typeof(pcp))(val)) |
| 336 | #endif | 336 | #endif |
| 337 | 337 | ||
| 338 | #ifndef this_cpu_inc | 338 | #ifndef this_cpu_inc |
| @@ -418,7 +418,7 @@ do { \ | |||
| 418 | # define this_cpu_add_return(pcp, val) __pcpu_size_call_return2(this_cpu_add_return_, pcp, val) | 418 | # define this_cpu_add_return(pcp, val) __pcpu_size_call_return2(this_cpu_add_return_, pcp, val) |
| 419 | #endif | 419 | #endif |
| 420 | 420 | ||
| 421 | #define this_cpu_sub_return(pcp, val) this_cpu_add_return(pcp, -(val)) | 421 | #define this_cpu_sub_return(pcp, val) this_cpu_add_return(pcp, -(typeof(pcp))(val)) |
| 422 | #define this_cpu_inc_return(pcp) this_cpu_add_return(pcp, 1) | 422 | #define this_cpu_inc_return(pcp) this_cpu_add_return(pcp, 1) |
| 423 | #define this_cpu_dec_return(pcp) this_cpu_add_return(pcp, -1) | 423 | #define this_cpu_dec_return(pcp) this_cpu_add_return(pcp, -1) |
| 424 | 424 | ||
| @@ -586,7 +586,7 @@ do { \ | |||
| 586 | #endif | 586 | #endif |
| 587 | 587 | ||
| 588 | #ifndef __this_cpu_sub | 588 | #ifndef __this_cpu_sub |
| 589 | # define __this_cpu_sub(pcp, val) __this_cpu_add((pcp), -(val)) | 589 | # define __this_cpu_sub(pcp, val) __this_cpu_add((pcp), -(typeof(pcp))(val)) |
| 590 | #endif | 590 | #endif |
| 591 | 591 | ||
| 592 | #ifndef __this_cpu_inc | 592 | #ifndef __this_cpu_inc |
| @@ -668,7 +668,7 @@ do { \ | |||
| 668 | __pcpu_size_call_return2(__this_cpu_add_return_, pcp, val) | 668 | __pcpu_size_call_return2(__this_cpu_add_return_, pcp, val) |
| 669 | #endif | 669 | #endif |
| 670 | 670 | ||
| 671 | #define __this_cpu_sub_return(pcp, val) __this_cpu_add_return(pcp, -(val)) | 671 | #define __this_cpu_sub_return(pcp, val) __this_cpu_add_return(pcp, -(typeof(pcp))(val)) |
| 672 | #define __this_cpu_inc_return(pcp) __this_cpu_add_return(pcp, 1) | 672 | #define __this_cpu_inc_return(pcp) __this_cpu_add_return(pcp, 1) |
| 673 | #define __this_cpu_dec_return(pcp) __this_cpu_add_return(pcp, -1) | 673 | #define __this_cpu_dec_return(pcp) __this_cpu_add_return(pcp, -1) |
| 674 | 674 | ||
diff --git a/include/linux/yam.h b/include/linux/yam.h index 7fe28228b274..512cdc2fb80f 100644 --- a/include/linux/yam.h +++ b/include/linux/yam.h | |||
| @@ -77,6 +77,6 @@ struct yamdrv_ioctl_cfg { | |||
| 77 | 77 | ||
| 78 | struct yamdrv_ioctl_mcs { | 78 | struct yamdrv_ioctl_mcs { |
| 79 | int cmd; | 79 | int cmd; |
| 80 | int bitrate; | 80 | unsigned int bitrate; |
| 81 | unsigned char bits[YAM_FPGA_SIZE]; | 81 | unsigned char bits[YAM_FPGA_SIZE]; |
| 82 | }; | 82 | }; |
diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h index a7a683e30b64..a8c2ef6d3b93 100644 --- a/include/net/cipso_ipv4.h +++ b/include/net/cipso_ipv4.h | |||
| @@ -290,6 +290,7 @@ static inline int cipso_v4_validate(const struct sk_buff *skb, | |||
| 290 | unsigned char err_offset = 0; | 290 | unsigned char err_offset = 0; |
| 291 | u8 opt_len = opt[1]; | 291 | u8 opt_len = opt[1]; |
| 292 | u8 opt_iter; | 292 | u8 opt_iter; |
| 293 | u8 tag_len; | ||
| 293 | 294 | ||
| 294 | if (opt_len < 8) { | 295 | if (opt_len < 8) { |
| 295 | err_offset = 1; | 296 | err_offset = 1; |
| @@ -302,11 +303,12 @@ static inline int cipso_v4_validate(const struct sk_buff *skb, | |||
| 302 | } | 303 | } |
| 303 | 304 | ||
| 304 | for (opt_iter = 6; opt_iter < opt_len;) { | 305 | for (opt_iter = 6; opt_iter < opt_len;) { |
| 305 | if (opt[opt_iter + 1] > (opt_len - opt_iter)) { | 306 | tag_len = opt[opt_iter + 1]; |
| 307 | if ((tag_len == 0) || (opt[opt_iter + 1] > (opt_len - opt_iter))) { | ||
| 306 | err_offset = opt_iter + 1; | 308 | err_offset = opt_iter + 1; |
| 307 | goto out; | 309 | goto out; |
| 308 | } | 310 | } |
| 309 | opt_iter += opt[opt_iter + 1]; | 311 | opt_iter += tag_len; |
| 310 | } | 312 | } |
| 311 | 313 | ||
| 312 | out: | 314 | out: |
diff --git a/include/net/dst.h b/include/net/dst.h index 3bc4865f8267..3c4c944096c9 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
| @@ -479,10 +479,22 @@ static inline struct dst_entry *xfrm_lookup(struct net *net, | |||
| 479 | { | 479 | { |
| 480 | return dst_orig; | 480 | return dst_orig; |
| 481 | } | 481 | } |
| 482 | |||
| 483 | static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst) | ||
| 484 | { | ||
| 485 | return NULL; | ||
| 486 | } | ||
| 487 | |||
| 482 | #else | 488 | #else |
| 483 | extern struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, | 489 | extern struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, |
| 484 | const struct flowi *fl, struct sock *sk, | 490 | const struct flowi *fl, struct sock *sk, |
| 485 | int flags); | 491 | int flags); |
| 492 | |||
| 493 | /* skb attached with this dst needs transformation if dst->xfrm is valid */ | ||
| 494 | static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst) | ||
| 495 | { | ||
| 496 | return dst->xfrm; | ||
| 497 | } | ||
| 486 | #endif | 498 | #endif |
| 487 | 499 | ||
| 488 | #endif /* _NET_DST_H */ | 500 | #endif /* _NET_DST_H */ |
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index f525e7038cca..2b786b7e3585 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
| @@ -194,11 +194,9 @@ static inline int ip6_skb_dst_mtu(struct sk_buff *skb) | |||
| 194 | skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb)); | 194 | skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb)); |
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt, struct in6_addr *dest) | 197 | static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt) |
| 198 | { | 198 | { |
| 199 | if (rt->rt6i_flags & RTF_GATEWAY) | 199 | return &rt->rt6i_gateway; |
| 200 | return &rt->rt6i_gateway; | ||
| 201 | return dest; | ||
| 202 | } | 200 | } |
| 203 | 201 | ||
| 204 | #endif | 202 | #endif |
diff --git a/include/net/mac802154.h b/include/net/mac802154.h index d0d11df9cba1..807d6b7a943f 100644 --- a/include/net/mac802154.h +++ b/include/net/mac802154.h | |||
| @@ -133,7 +133,7 @@ struct ieee802154_ops { | |||
| 133 | 133 | ||
| 134 | /* Basic interface to register ieee802154 device */ | 134 | /* Basic interface to register ieee802154 device */ |
| 135 | struct ieee802154_dev * | 135 | struct ieee802154_dev * |
| 136 | ieee802154_alloc_device(size_t priv_data_lex, struct ieee802154_ops *ops); | 136 | ieee802154_alloc_device(size_t priv_data_len, struct ieee802154_ops *ops); |
| 137 | void ieee802154_free_device(struct ieee802154_dev *dev); | 137 | void ieee802154_free_device(struct ieee802154_dev *dev); |
| 138 | int ieee802154_register_device(struct ieee802154_dev *dev); | 138 | int ieee802154_register_device(struct ieee802154_dev *dev); |
| 139 | void ieee802154_unregister_device(struct ieee802154_dev *dev); | 139 | void ieee802154_unregister_device(struct ieee802154_dev *dev); |
diff --git a/include/net/sock.h b/include/net/sock.h index 1d37a8086bed..808cbc2ec6c1 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -1630,16 +1630,14 @@ static inline void sk_filter_release(struct sk_filter *fp) | |||
| 1630 | 1630 | ||
| 1631 | static inline void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp) | 1631 | static inline void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp) |
| 1632 | { | 1632 | { |
| 1633 | unsigned int size = sk_filter_len(fp); | 1633 | atomic_sub(sk_filter_size(fp->len), &sk->sk_omem_alloc); |
| 1634 | |||
| 1635 | atomic_sub(size, &sk->sk_omem_alloc); | ||
| 1636 | sk_filter_release(fp); | 1634 | sk_filter_release(fp); |
| 1637 | } | 1635 | } |
| 1638 | 1636 | ||
| 1639 | static inline void sk_filter_charge(struct sock *sk, struct sk_filter *fp) | 1637 | static inline void sk_filter_charge(struct sock *sk, struct sk_filter *fp) |
| 1640 | { | 1638 | { |
| 1641 | atomic_inc(&fp->refcnt); | 1639 | atomic_inc(&fp->refcnt); |
| 1642 | atomic_add(sk_filter_len(fp), &sk->sk_omem_alloc); | 1640 | atomic_add(sk_filter_size(fp->len), &sk->sk_omem_alloc); |
| 1643 | } | 1641 | } |
| 1644 | 1642 | ||
| 1645 | /* | 1643 | /* |
diff --git a/include/trace/events/target.h b/include/trace/events/target.h index aef8fc354025..da9cc0f05c93 100644 --- a/include/trace/events/target.h +++ b/include/trace/events/target.h | |||
| @@ -144,7 +144,7 @@ TRACE_EVENT(target_sequencer_start, | |||
| 144 | ), | 144 | ), |
| 145 | 145 | ||
| 146 | TP_fast_assign( | 146 | TP_fast_assign( |
| 147 | __entry->unpacked_lun = cmd->se_lun->unpacked_lun; | 147 | __entry->unpacked_lun = cmd->orig_fe_lun; |
| 148 | __entry->opcode = cmd->t_task_cdb[0]; | 148 | __entry->opcode = cmd->t_task_cdb[0]; |
| 149 | __entry->data_length = cmd->data_length; | 149 | __entry->data_length = cmd->data_length; |
| 150 | __entry->task_attribute = cmd->sam_task_attr; | 150 | __entry->task_attribute = cmd->sam_task_attr; |
| @@ -182,7 +182,7 @@ TRACE_EVENT(target_cmd_complete, | |||
| 182 | ), | 182 | ), |
| 183 | 183 | ||
| 184 | TP_fast_assign( | 184 | TP_fast_assign( |
| 185 | __entry->unpacked_lun = cmd->se_lun->unpacked_lun; | 185 | __entry->unpacked_lun = cmd->orig_fe_lun; |
| 186 | __entry->opcode = cmd->t_task_cdb[0]; | 186 | __entry->opcode = cmd->t_task_cdb[0]; |
| 187 | __entry->data_length = cmd->data_length; | 187 | __entry->data_length = cmd->data_length; |
| 188 | __entry->task_attribute = cmd->sam_task_attr; | 188 | __entry->task_attribute = cmd->sam_task_attr; |
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 550811712f78..28acbaf4a81e 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h | |||
| @@ -223,6 +223,8 @@ struct drm_mode_get_connector { | |||
| 223 | __u32 connection; | 223 | __u32 connection; |
| 224 | __u32 mm_width, mm_height; /**< HxW in millimeters */ | 224 | __u32 mm_width, mm_height; /**< HxW in millimeters */ |
| 225 | __u32 subpixel; | 225 | __u32 subpixel; |
| 226 | |||
| 227 | __u32 pad; | ||
| 226 | }; | 228 | }; |
| 227 | 229 | ||
| 228 | #define DRM_MODE_PROP_PENDING (1<<0) | 230 | #define DRM_MODE_PROP_PENDING (1<<0) |
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index 009a655a5d35..2fc1602e23bb 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h | |||
| @@ -456,13 +456,15 @@ struct perf_event_mmap_page { | |||
| 456 | /* | 456 | /* |
| 457 | * Control data for the mmap() data buffer. | 457 | * Control data for the mmap() data buffer. |
| 458 | * | 458 | * |
| 459 | * User-space reading the @data_head value should issue an rmb(), on | 459 | * User-space reading the @data_head value should issue an smp_rmb(), |
| 460 | * SMP capable platforms, after reading this value -- see | 460 | * after reading this value. |
| 461 | * perf_event_wakeup(). | ||
| 462 | * | 461 | * |
| 463 | * When the mapping is PROT_WRITE the @data_tail value should be | 462 | * When the mapping is PROT_WRITE the @data_tail value should be |
| 464 | * written by userspace to reflect the last read data. In this case | 463 | * written by userspace to reflect the last read data, after issueing |
| 465 | * the kernel will not over-write unread data. | 464 | * an smp_mb() to separate the data read from the ->data_tail store. |
| 465 | * In this case the kernel will not over-write unread data. | ||
| 466 | * | ||
| 467 | * See perf_output_put_handle() for the data ordering. | ||
| 466 | */ | 468 | */ |
| 467 | __u64 data_head; /* head in the data section */ | 469 | __u64 data_head; /* head in the data section */ |
| 468 | __u64 data_tail; /* user-space written tail */ | 470 | __u64 data_tail; /* user-space written tail */ |
diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild index 0623ec4e728f..56f121605c99 100644 --- a/include/uapi/linux/tc_act/Kbuild +++ b/include/uapi/linux/tc_act/Kbuild | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | # UAPI Header export list | 1 | # UAPI Header export list |
| 2 | header-y += tc_csum.h | 2 | header-y += tc_csum.h |
| 3 | header-y += tc_defact.h | ||
| 3 | header-y += tc_gact.h | 4 | header-y += tc_gact.h |
| 4 | header-y += tc_ipt.h | 5 | header-y += tc_ipt.h |
| 5 | header-y += tc_mirred.h | 6 | header-y += tc_mirred.h |
diff --git a/include/linux/tc_act/tc_defact.h b/include/uapi/linux/tc_act/tc_defact.h index 6f65d07c7ce2..17dddb40f740 100644 --- a/include/linux/tc_act/tc_defact.h +++ b/include/uapi/linux/tc_act/tc_defact.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | struct tc_defact { | 6 | struct tc_defact { |
| 7 | tc_gen; | 7 | tc_gen; |
| 8 | }; | 8 | }; |
| 9 | 9 | ||
| 10 | enum { | 10 | enum { |
| 11 | TCA_DEF_UNSPEC, | 11 | TCA_DEF_UNSPEC, |
| 12 | TCA_DEF_TM, | 12 | TCA_DEF_TM, |
diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h index 0b233c56b0e4..e3ddd86c90a6 100644 --- a/include/uapi/rdma/ib_user_verbs.h +++ b/include/uapi/rdma/ib_user_verbs.h | |||
| @@ -87,8 +87,10 @@ enum { | |||
| 87 | IB_USER_VERBS_CMD_CLOSE_XRCD, | 87 | IB_USER_VERBS_CMD_CLOSE_XRCD, |
| 88 | IB_USER_VERBS_CMD_CREATE_XSRQ, | 88 | IB_USER_VERBS_CMD_CREATE_XSRQ, |
| 89 | IB_USER_VERBS_CMD_OPEN_QP, | 89 | IB_USER_VERBS_CMD_OPEN_QP, |
| 90 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 90 | IB_USER_VERBS_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD, | 91 | IB_USER_VERBS_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD, |
| 91 | IB_USER_VERBS_CMD_DESTROY_FLOW | 92 | IB_USER_VERBS_CMD_DESTROY_FLOW |
| 93 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 92 | }; | 94 | }; |
| 93 | 95 | ||
| 94 | /* | 96 | /* |
| @@ -126,6 +128,7 @@ struct ib_uverbs_cmd_hdr { | |||
| 126 | __u16 out_words; | 128 | __u16 out_words; |
| 127 | }; | 129 | }; |
| 128 | 130 | ||
| 131 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 129 | struct ib_uverbs_cmd_hdr_ex { | 132 | struct ib_uverbs_cmd_hdr_ex { |
| 130 | __u32 command; | 133 | __u32 command; |
| 131 | __u16 in_words; | 134 | __u16 in_words; |
| @@ -134,6 +137,7 @@ struct ib_uverbs_cmd_hdr_ex { | |||
| 134 | __u16 provider_out_words; | 137 | __u16 provider_out_words; |
| 135 | __u32 cmd_hdr_reserved; | 138 | __u32 cmd_hdr_reserved; |
| 136 | }; | 139 | }; |
| 140 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 137 | 141 | ||
| 138 | struct ib_uverbs_get_context { | 142 | struct ib_uverbs_get_context { |
| 139 | __u64 response; | 143 | __u64 response; |
| @@ -696,6 +700,7 @@ struct ib_uverbs_detach_mcast { | |||
| 696 | __u64 driver_data[0]; | 700 | __u64 driver_data[0]; |
| 697 | }; | 701 | }; |
| 698 | 702 | ||
| 703 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING | ||
| 699 | struct ib_kern_eth_filter { | 704 | struct ib_kern_eth_filter { |
| 700 | __u8 dst_mac[6]; | 705 | __u8 dst_mac[6]; |
| 701 | __u8 src_mac[6]; | 706 | __u8 src_mac[6]; |
| @@ -780,6 +785,7 @@ struct ib_uverbs_destroy_flow { | |||
| 780 | __u32 comp_mask; | 785 | __u32 comp_mask; |
| 781 | __u32 flow_handle; | 786 | __u32 flow_handle; |
| 782 | }; | 787 | }; |
| 788 | #endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */ | ||
| 783 | 789 | ||
| 784 | struct ib_uverbs_create_srq { | 790 | struct ib_uverbs_create_srq { |
| 785 | __u64 response; | 791 | __u64 response; |
