diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-25 09:00:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-25 09:00:02 -0700 |
| commit | e108a3c3268d4539e4ae538aa41bca1afb15dc3e (patch) | |
| tree | e658e24728861006e7632fcb61eae467b7840eb8 /lib | |
| parent | 56d27adcb536b7430d5f8a6240df8ad261eb00bd (diff) | |
| parent | be8cfc4af15cf611dfeb66a1fb5df43d5f1e280a (diff) | |
Merge branch 'akpm' (sundry from Andrew)
Merge misc fixes from Andrew Morton:
"One maintainer change and three bugfixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (4 commits)
c/r: prctl: fix build error for no-MMU case
lib/flex_proportions.c: fix corruption of denominator in flexible proportions
checksyscalls: fix "here document" handling
pwm-backlight: take over maintenance
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/flex_proportions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/flex_proportions.c b/lib/flex_proportions.c index c785554f952..ebf3bac460b 100644 --- a/lib/flex_proportions.c +++ b/lib/flex_proportions.c @@ -62,7 +62,7 @@ void fprop_global_destroy(struct fprop_global *p) */ bool fprop_new_period(struct fprop_global *p, int periods) { - u64 events; + s64 events; unsigned long flags; local_irq_save(flags); |