diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-31 23:51:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-31 23:51:22 +0100 |
| commit | f3124ba519b42426525585f50dbde3235b1fb89a (patch) | |
| tree | 5343d6c4ea4e88d6b6a8af75d701553d258ea334 /include/linux | |
| parent | 7dcba49cf6c1fd2d6ec1bead821fdd85e84bdc1f (diff) | |
| parent | a2e124daef622d8745510ab24b023027dcdc9146 (diff) | |
Merge tag 'v3.10.35' into linux-linaro-lsk
This is the 3.10.35 stable release
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ceph/osd_client.h | 1 | ||||
| -rw-r--r-- | include/linux/ftrace_event.h | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index 8f47625a066..4fb6a893895 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h @@ -138,6 +138,7 @@ struct ceph_osd_request { __le64 *r_request_pool; void *r_request_pgid; __le32 *r_request_attempts; + bool r_paused; struct ceph_eversion *r_request_reassert_version; int r_result; diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h index 120d57a1c3a..b5e36017acd 100644 --- a/include/linux/ftrace_event.h +++ b/include/linux/ftrace_event.h @@ -325,10 +325,6 @@ enum { FILTER_TRACE_FN, }; -#define EVENT_STORAGE_SIZE 128 -extern struct mutex event_storage_mutex; -extern char event_storage[EVENT_STORAGE_SIZE]; - extern int trace_event_raw_init(struct ftrace_event_call *call); extern int trace_define_field(struct ftrace_event_call *call, const char *type, const char *name, int offset, int size, |