diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpufreq.h | 8 | ||||
| -rw-r--r-- | include/linux/mmc/host.h | 2 | ||||
| -rw-r--r-- | include/linux/sched.h | 1 | ||||
| -rw-r--r-- | include/net/bluetooth/hci.h | 3 | ||||
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 2 | ||||
| -rw-r--r-- | include/net/netfilter/ipv4/nf_reject.h | 8 | ||||
| -rw-r--r-- | include/net/netfilter/ipv6/nf_reject.h | 9 | ||||
| -rw-r--r-- | include/uapi/asm-generic/unistd.h | 5 |
8 files changed, 13 insertions, 25 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index b0d360c87602..a15944d5a06f 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -17,6 +17,8 @@ #include <linux/kobject.h> #include <linux/notifier.h> #include <linux/sysfs.h> +#include <asm/cputime.h> + /********************************************************************* * CPUFREQ INTERFACE * @@ -509,4 +511,10 @@ static inline int cpufreq_generic_exit(struct cpufreq_policy *policy) return 0; } +/********************************************************************* + * CPUFREQ STATS * + *********************************************************************/ + +void acct_update_power(struct task_struct *p, cputime_t cputime); + #endif /* _LINUX_CPUFREQ_H */ diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 1c923ab2dd73..9b92af47577f 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -15,7 +15,6 @@ #include <linux/sched.h> #include <linux/device.h> #include <linux/fault-inject.h> -#include <linux/wakelock.h> #include <linux/mmc/core.h> #include <linux/mmc/pm.h> @@ -330,7 +329,6 @@ struct mmc_host { int claim_cnt; /* "claim" nesting count */ struct delayed_work detect; - struct wake_lock detect_wake_lock; int detect_change; /* card detect flag */ struct mmc_slot slot; diff --git a/include/linux/sched.h b/include/linux/sched.h index 22913f78b829..67f59c1e0c7b 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1297,6 +1297,7 @@ struct task_struct { cputime_t utime, stime, utimescaled, stimescaled; cputime_t gtime; + unsigned long long cpu_power; #ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE struct cputime prev_cputime; #endif diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 73a22fd1fd66..66c1cd87bfe7 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -1762,9 +1762,6 @@ struct hci_conn_info { __u8 out; __u16 state; __u32 link_mode; - __u32 mtu; - __u32 cnt; - __u32 pkts; }; struct hci_dev_req { diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 6e17a54ac302..f2f0cf5865c4 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -659,7 +659,7 @@ static inline void hci_conn_drop(struct hci_conn *conn) if (conn->state == BT_CONNECTED) { timeo = conn->disc_timeout; if (!conn->out) - timeo *= 20; + timeo *= 2; } else { timeo = msecs_to_jiffies(10); } diff --git a/include/net/netfilter/ipv4/nf_reject.h b/include/net/netfilter/ipv4/nf_reject.h index 99fdd82a1306..931fbf812171 100644 --- a/include/net/netfilter/ipv4/nf_reject.h +++ b/include/net/netfilter/ipv4/nf_reject.h @@ -9,14 +9,6 @@ static inline void nf_send_unreach(struct sk_buff *skb_in, int code) { icmp_send(skb_in, ICMP_DEST_UNREACH, code, 0); -#ifdef CONFIG_IP_NF_TARGET_REJECT_SKERR - if (skb_in->sk) { - skb_in->sk->sk_err = icmp_err_convert[code].errno; - skb_in->sk->sk_error_report(skb_in->sk); - pr_debug("ipt_REJECT: sk_err=%d for skb=%p sk=%p\n", - skb_in->sk->sk_err, skb_in, skb_in->sk); - } -#endif } /* Send RST reply */ diff --git a/include/net/netfilter/ipv6/nf_reject.h b/include/net/netfilter/ipv6/nf_reject.h index 5f9795c8feb6..710d17ed70b4 100644 --- a/include/net/netfilter/ipv6/nf_reject.h +++ b/include/net/netfilter/ipv6/nf_reject.h @@ -15,15 +15,6 @@ nf_send_unreach6(struct net *net, struct sk_buff *skb_in, unsigned char code, skb_in->dev = net->loopback_dev; icmpv6_send(skb_in, ICMPV6_DEST_UNREACH, code, 0); -#ifdef CONFIG_IP6_NF_TARGET_REJECT_SKERR - if (skb_in->sk) { - icmpv6_err_convert(ICMPV6_DEST_UNREACH, code, - &skb_in->sk->sk_err); - skb_in->sk->sk_error_report(skb_in->sk); - pr_debug("ip6t_REJECT: sk_err=%d for skb=%p sk=%p\n", - skb_in->sk->sk_err, skb_in, skb_in->sk); - } -#endif } /* Send RST reply */ diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 0f74c7bdff3c..f2011a9b37d7 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -696,11 +696,12 @@ __SYSCALL(__NR_finit_module, sys_finit_module) __SYSCALL(__NR_sched_setattr, sys_sched_setattr) #define __NR_sched_getattr 275 __SYSCALL(__NR_sched_getattr, sys_sched_getattr) -#define __NR_seccomp 276 + +#define __NR_seccomp 277 __SYSCALL(__NR_seccomp, sys_seccomp) #undef __NR_syscalls -#define __NR_syscalls 277 +#define __NR_syscalls 278 /* * All syscalls below here should go away really, |