Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'akpm' (sundry from Andrew)

Browse source 
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
This commit is contained in:
Linus Torvalds 2012-09-25 09:00:02 -07:00
commit e108a3c326
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MAINTAINERS
View file

@ -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>

1
include/linux/security.h
View file

@ -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

2
lib/flex_proportions.c
View file

@ -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);

2
scripts/checksyscalls.sh
View file

@ -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