diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-25 08:58:08 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-25 08:58:07 -0700 |
| commit | 4df80cc49c5ae13629f98f72677655296dff9f24 (patch) | |
| tree | 0dccb925e505531ec692c0f79df79aa8b9cf696d /include/linux | |
| parent | 32645e12c30024d342f0e9e6fafc88cd251c75b3 (diff) | |
| parent | a0cf9875da2ed54d377a84bcfbfca04ecfa438d3 (diff) | |
Merge "Merge android-4.4.132 (46155cc) into msm-4.4"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clocksource.h | 2 | ||||
| -rw-r--r-- | include/linux/sysfs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 39c7de8c3048..d282307214ac 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -110,7 +110,7 @@ struct clocksource { #define CLOCK_SOURCE_RESELECT 0x100 /* simplify initialization of mask field */ -#define CLOCKSOURCE_MASK(bits) (cycle_t)((bits) < 64 ? ((1ULL<<(bits))-1) : -1) +#define CLOCKSOURCE_MASK(bits) GENMASK_ULL((bits) - 1, 0) /** * clocksource_khz2mult - calculates mult from khz and shift diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index 00a1f330f93a..9c452f6db438 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -518,7 +518,7 @@ static inline void sysfs_notify_dirent(struct kernfs_node *kn) } static inline struct kernfs_node *sysfs_get_dirent(struct kernfs_node *parent, - const unsigned char *name) + const char *name) { return kernfs_find_and_get(parent, name); } |