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
Unified · Split
| @@ -5544,6 +5544,8 @@ F: Documentation/devicetree/bindings/pwm/ · 5543 unmodified lines | |||
| 5544 | F: include/linux/pwm.h | 5544 | F: include/linux/pwm.h |
| 5545 | F: include/linux/of_pwm.h | 5545 | F: include/linux/of_pwm.h |
| 5546 | F: drivers/pwm/ | 5546 | F: drivers/pwm/ |
| 5547 | F: drivers/video/backlight/pwm_bl.c | ||
| 5548 | F: include/linux/pwm_backlight.h | ||
| 5547 | 5549 | ||
| 5548 | PXA2xx/PXA3xx SUPPORT | 5550 | PXA2xx/PXA3xx SUPPORT |
| 5549 | M: Eric Miao <eric.y.miao@gmail.com> | 5551 | M: Eric Miao <eric.y.miao@gmail.com> |
| @@ -118,6 +118,7 @@ void reset_security_ops(void); · 117 unmodified lines | |||
| 118 | extern unsigned long mmap_min_addr; | 118 | extern unsigned long mmap_min_addr; |
| 119 | extern unsigned long dac_mmap_min_addr; | 119 | extern unsigned long dac_mmap_min_addr; |
| 120 | #else | 120 | #else |
| 121 | #define mmap_min_addr 0UL | ||
| 121 | #define dac_mmap_min_addr 0UL | 122 | #define dac_mmap_min_addr 0UL |
| 122 | #endif | 123 | #endif |
| 123 | 124 | ||
| @@ -62,7 +62,7 @@ void fprop_global_destroy(struct fprop_global *p) · 61 unmodified lines | |||
| 62 | */ | 62 | */ |
| 63 | bool fprop_new_period(struct fprop_global *p, int periods) | 63 | bool fprop_new_period(struct fprop_global *p, int periods) |
| 64 | { | 64 | { |
| 65 | u64 events; | 65 | s64 events; |
| 66 | unsigned long flags; | 66 | unsigned long flags; |
| 67 | 67 | ||
| 68 | local_irq_save(flags); | 68 | local_irq_save(flags); |
| @@ -200,7 +200,7 @@ EOF · 199 unmodified lines | |||
| 200 | syscall_list() { | 200 | syscall_list() { |
| 201 | grep '^[0-9]' "$1" | sort -n | ( | 201 | grep '^[0-9]' "$1" | sort -n | ( |
| 202 | while read nr abi name entry ; do | 202 | while read nr abi name entry ; do |
| 203 | echo <<EOF | 203 | cat <<EOF |
| 204 | #if !defined(__NR_${name}) && !defined(__IGNORE_${name}) | 204 | #if !defined(__NR_${name}) && !defined(__IGNORE_${name}) |
| 205 | #warning syscall ${name} not implemented | 205 | #warning syscall ${name} not implemented |
| 206 | #endif | 206 | #endif |