aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-25 12:00:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-25 12:00:02 -0400
commite108a3c3268d4539e4ae538aa41bca1afb15dc3e (patch)
treee658e24728861006e7632fcb61eae467b7840eb8
parent56d27adcb536b7430d5f8a6240df8ad261eb00bd (diff)
parentbe8cfc4af15cf611dfeb66a1fb5df43d5f1e280a (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
-rw-r--r--MAINTAINERS2
-rw-r--r--include/linux/security.h1
-rw-r--r--lib/flex_proportions.c2
-rwxr-xr-xscripts/checksyscalls.sh2
4 files changed, 5 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b17587d9412f..1796fa3a1bc1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5544,6 +5544,8 @@ F: Documentation/devicetree/bindings/pwm/
5544F: include/linux/pwm.h 5544F: include/linux/pwm.h
5545F: include/linux/of_pwm.h 5545F: include/linux/of_pwm.h
5546F: drivers/pwm/ 5546F: drivers/pwm/
5547F: drivers/video/backlight/pwm_bl.c
5548F: include/linux/pwm_backlight.h
5547 5549
5548PXA2xx/PXA3xx SUPPORT 5550PXA2xx/PXA3xx SUPPORT
5549M: Eric Miao <eric.y.miao@gmail.com> 5551M: Eric Miao <eric.y.miao@gmail.com>
diff --git a/include/linux/security.h b/include/linux/security.h
index 3dea6a9d568f..d143b8e01954 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -118,6 +118,7 @@ void reset_security_ops(void);
118extern unsigned long mmap_min_addr; 118extern unsigned long mmap_min_addr;
119extern unsigned long dac_mmap_min_addr; 119extern 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
diff --git a/lib/flex_proportions.c b/lib/flex_proportions.c
index c785554f9523..ebf3bac460b0 100644
--- a/lib/flex_proportions.c
+++ b/lib/flex_proportions.c
@@ -62,7 +62,7 @@ void fprop_global_destroy(struct fprop_global *p)
62 */ 62 */
63bool fprop_new_period(struct fprop_global *p, int periods) 63bool 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);
diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
index d24810fc6af6..fd8fa9aa7c4e 100755
--- a/scripts/checksyscalls.sh
+++ b/scripts/checksyscalls.sh
@@ -200,7 +200,7 @@ EOF
200syscall_list() { 200syscall_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