Commit e108a3c3 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 56d27adc be8cfc4a
...@@ -5544,6 +5544,8 @@ F: Documentation/devicetree/bindings/pwm/ ...@@ -5544,6 +5544,8 @@ F: Documentation/devicetree/bindings/pwm/
F: include/linux/pwm.h F: include/linux/pwm.h
F: include/linux/of_pwm.h F: include/linux/of_pwm.h
F: drivers/pwm/ F: drivers/pwm/
F: drivers/video/backlight/pwm_bl.c
F: include/linux/pwm_backlight.h
PXA2xx/PXA3xx SUPPORT PXA2xx/PXA3xx SUPPORT
M: Eric Miao <eric.y.miao@gmail.com> M: Eric Miao <eric.y.miao@gmail.com>
......
...@@ -118,6 +118,7 @@ void reset_security_ops(void); ...@@ -118,6 +118,7 @@ void reset_security_ops(void);
extern unsigned long mmap_min_addr; extern unsigned long mmap_min_addr;
extern unsigned long dac_mmap_min_addr; extern unsigned long dac_mmap_min_addr;
#else #else
#define mmap_min_addr 0UL
#define dac_mmap_min_addr 0UL #define dac_mmap_min_addr 0UL
#endif #endif
......
...@@ -62,7 +62,7 @@ void fprop_global_destroy(struct fprop_global *p) ...@@ -62,7 +62,7 @@ void fprop_global_destroy(struct fprop_global *p)
*/ */
bool fprop_new_period(struct fprop_global *p, int periods) bool fprop_new_period(struct fprop_global *p, int periods)
{ {
u64 events; s64 events;
unsigned long flags; unsigned long flags;
local_irq_save(flags); local_irq_save(flags);
......
...@@ -200,7 +200,7 @@ EOF ...@@ -200,7 +200,7 @@ EOF
syscall_list() { syscall_list() {
grep '^[0-9]' "$1" | sort -n | ( grep '^[0-9]' "$1" | sort -n | (
while read nr abi name entry ; do while read nr abi name entry ; do
echo <<EOF cat <<EOF
#if !defined(__NR_${name}) && !defined(__IGNORE_${name}) #if !defined(__NR_${name}) && !defined(__IGNORE_${name})
#warning syscall ${name} not implemented #warning syscall ${name} not implemented
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment