summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-25 09:00:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-25 09:00:02 -0700
commite108a3c3268d4539e4ae538aa41bca1afb15dc3e (patch)
treee658e24728861006e7632fcb61eae467b7840eb8
parent56d27adcb536b7430d5f8a6240df8ad261eb00bd (diff)
parentbe8cfc4af15cf611dfeb66a1fb5df43d5f1e280a (diff)
downloadop-kernel-dev-e108a3c3268d4539e4ae538aa41bca1afb15dc3e.zip
op-kernel-dev-e108a3c3268d4539e4ae538aa41bca1afb15dc3e.tar.gz
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 b17587d..1796fa3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5544,6 +5544,8 @@ F: Documentation/devicetree/bindings/pwm/
F: include/linux/pwm.h
F: include/linux/of_pwm.h
F: drivers/pwm/
+F: drivers/video/backlight/pwm_bl.c
+F: include/linux/pwm_backlight.h
PXA2xx/PXA3xx SUPPORT
M: Eric Miao <eric.y.miao@gmail.com>
diff --git a/include/linux/security.h b/include/linux/security.h
index 3dea6a9..d143b8e 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -118,6 +118,7 @@ void reset_security_ops(void);
extern unsigned long mmap_min_addr;
extern unsigned long dac_mmap_min_addr;
#else
+#define mmap_min_addr 0UL
#define dac_mmap_min_addr 0UL
#endif
diff --git a/lib/flex_proportions.c b/lib/flex_proportions.c
index c785554..ebf3bac 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);
diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
index d24810f..fd8fa9a 100755
--- a/scripts/checksyscalls.sh
+++ b/scripts/checksyscalls.sh
@@ -200,7 +200,7 @@ EOF
syscall_list() {
grep '^[0-9]' "$1" | sort -n | (
while read nr abi name entry ; do
- echo <<EOF
+ cat <<EOF
#if !defined(__NR_${name}) && !defined(__IGNORE_${name})
#warning syscall ${name} not implemented
#endif
OpenPOWER on IntegriCloud