diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-04-02 03:57:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-04-02 03:57:43 -0700 |
| commit | 6a214b82afd7003b84fbfbd2754693ce294c6be4 (patch) | |
| tree | c3e43b340a504be9492f1d8d21e92b4e9cb02b12 /include/linux | |
| parent | 6e016ebde6389f290650d76181d96e4894ff1351 (diff) | |
| parent | 19342ee004a99ae621daba6ae960a243abc7f7ed (diff) | |
Merge "Merge android-4.4.177 (0c3b8c4) into msm-4.4"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpufreq.h | 12 | ||||
| -rw-r--r-- | include/linux/device-mapper.h | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index a998cf205cdc..0c84c69d54f8 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -228,20 +228,12 @@ __ATTR(_name, _perm, show_##_name, NULL) static struct freq_attr _name = \ __ATTR(_name, 0644, show_##_name, store_##_name) -struct global_attr { - struct attribute attr; - ssize_t (*show)(struct kobject *kobj, - struct attribute *attr, char *buf); - ssize_t (*store)(struct kobject *a, struct attribute *b, - const char *c, size_t count); -}; - #define define_one_global_ro(_name) \ -static struct global_attr _name = \ +static struct kobj_attribute _name = \ __ATTR(_name, 0444, show_##_name, NULL) #define define_one_global_rw(_name) \ -static struct global_attr _name = \ +static struct kobj_attribute _name = \ __ATTR(_name, 0644, show_##_name, store_##_name) diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index 403a239b7aa1..b393ab66073a 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -606,7 +606,7 @@ extern struct ratelimit_state dm_ratelimit_state; */ #define dm_target_offset(ti, sector) ((sector) - (ti)->begin) -static inline sector_t to_sector(unsigned long n) +static inline sector_t to_sector(unsigned long long n) { return (n >> SECTOR_SHIFT); } |