3.15-stable patches

added patches:
	drivers-rtc-rtc-puv3.c-remove-dev-for-typo-issue.patch
	drivers-rtc-rtc-puv3.c-use-dev_dbg-instead-of-dev_debug-for-typo-issue.patch
	powerpc-disable-relocatable-for-compile_test-with-ppc64.patch

diff --git a/queue-3.15/drivers-rtc-rtc-puv3.c-remove-dev-for-typo-issue.patch b/queue-3.15/drivers-rtc-rtc-puv3.c-remove-dev-for-typo-issue.patch
new file mode 100644 (file)
index 0000000..e12f9c8
--- /dev/null
+++ b/queue-3.15/drivers-rtc-rtc-puv3.c-remove-dev-for-typo-issue.patch
@@ -0,0 +1,40 @@
+From 73fa540618d8b1f8c2266934f23bd84bb9e28d9e Mon Sep 17 00:00:00 2001
+From: Chen Gang <gang.chen.5i5j@gmail.com>
+Date: Sat, 3 May 2014 13:09:02 +0800
+Subject: drivers/rtc/rtc-puv3.c: remove "&dev->" for typo issue
+
+From: Chen Gang <gang.chen.5i5j@gmail.com>
+
+commit 73fa540618d8b1f8c2266934f23bd84bb9e28d9e upstream.
+
+It is only a typo issue, the related commit:
+
+  "1fbc4c4 drivers/rtc/rtc-puv3.c: use dev_dbg() instead of pr_debug()"
+
+The related error (for unicore32 with allmodconfig):
+
+    CC [M]  drivers/rtc/rtc-puv3.o
+  drivers/rtc/rtc-puv3.c: In function 'puv3_rtc_setalarm':
+  drivers/rtc/rtc-puv3.c:143: error: 'struct device' has no member named 'dev'
+
+Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
+Acked-by: Xuetao Guan <gxt@mprc.pku.edu.cn>
+Signed-off-by: Xuetao Guan <gxt@mprc.pku.edu.cn>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/rtc/rtc-puv3.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/rtc/rtc-puv3.c
++++ b/drivers/rtc/rtc-puv3.c
+@@ -140,7 +140,7 @@ static int puv3_rtc_setalarm(struct devi
+       rtc_tm_to_time(tm, &rtcalarm_count);
+       writel(rtcalarm_count, RTC_RTAR);
+ 
+-      puv3_rtc_setaie(&dev->dev, alrm->enabled);
++      puv3_rtc_setaie(dev, alrm->enabled);
+ 
+       if (alrm->enabled)
+               enable_irq_wake(puv3_rtc_alarmno);

diff --git a/queue-3.15/drivers-rtc-rtc-puv3.c-use-dev_dbg-instead-of-dev_debug-for-typo-issue.patch b/queue-3.15/drivers-rtc-rtc-puv3.c-use-dev_dbg-instead-of-dev_debug-for-typo-issue.patch
new file mode 100644 (file)
index 0000000..39be540
--- /dev/null
+++ b/queue-3.15/drivers-rtc-rtc-puv3.c-use-dev_dbg-instead-of-dev_debug-for-typo-issue.patch
@@ -0,0 +1,40 @@
+From c863810cefc7ffd782e5648a21bfb36a32c8b081 Mon Sep 17 00:00:00 2001
+From: Chen Gang <gang.chen.5i5j@gmail.com>
+Date: Sat, 3 May 2014 13:07:57 +0800
+Subject: drivers/rtc/rtc-puv3.c: use dev_dbg() instead of dev_debug() for typo issue
+
+From: Chen Gang <gang.chen.5i5j@gmail.com>
+
+commit c863810cefc7ffd782e5648a21bfb36a32c8b081 upstream.
+
+It is only a typo issue, the related commit:
+
+  "1fbc4c4 drivers/rtc/rtc-puv3.c: use dev_dbg() instead of pr_debug()"
+
+The related error (unicore32 with allmodconfig):
+
+    CC [M]  drivers/rtc/rtc-puv3.o
+  drivers/rtc/rtc-puv3.c: In function 'puv3_rtc_setpie':
+  drivers/rtc/rtc-puv3.c:74: error: implicit declaration of function 'dev_debug'
+
+Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
+Acked-by: Xuetao Guan <gxt@mprc.pku.edu.cn>
+Signed-off-by: Xuetao Guan <gxt@mprc.pku.edu.cn>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/rtc/rtc-puv3.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/rtc/rtc-puv3.c
++++ b/drivers/rtc/rtc-puv3.c
+@@ -71,7 +71,7 @@ static int puv3_rtc_setpie(struct device
+ {
+       unsigned int tmp;
+ 
+-      dev_debug(dev, "%s: pie=%d\n", __func__, enabled);
++      dev_dbg(dev, "%s: pie=%d\n", __func__, enabled);
+ 
+       spin_lock_irq(&puv3_rtc_pie_lock);
+       tmp = readl(RTC_RTSR) & ~RTC_RTSR_HZE;

diff --git a/queue-3.15/powerpc-disable-relocatable-for-compile_test-with-ppc64.patch b/queue-3.15/powerpc-disable-relocatable-for-compile_test-with-ppc64.patch
new file mode 100644 (file)
index 0000000..4332745
--- /dev/null
+++ b/queue-3.15/powerpc-disable-relocatable-for-compile_test-with-ppc64.patch
@@ -0,0 +1,52 @@
+From fb43e8477ed9006c4f397f904c691a120503038c Mon Sep 17 00:00:00 2001
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Mon, 30 Jun 2014 11:45:30 -0700
+Subject: powerpc: Disable RELOCATABLE for COMPILE_TEST with PPC64
+
+From: Guenter Roeck <linux@roeck-us.net>
+
+commit fb43e8477ed9006c4f397f904c691a120503038c upstream.
+
+powerpc:allmodconfig has been failing for some time with the following
+error.
+
+arch/powerpc/kernel/exceptions-64s.S: Assembler messages:
+arch/powerpc/kernel/exceptions-64s.S:1312: Error: attempt to move .org backwards
+make[1]: *** [arch/powerpc/kernel/head_64.o] Error 1
+
+A number of attempts to fix the problem by moving around code have been
+unsuccessful and resulted in failed builds for some configurations and
+the discovery of toolchain bugs.
+
+Fix the problem by disabling RELOCATABLE for COMPILE_TEST builds instead.
+While this is less than perfect, it avoids substantial code changes
+which would otherwise be necessary just to make COMPILE_TEST builds
+happy and might have undesired side effects.
+
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/powerpc/Kconfig |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -414,7 +414,7 @@ config KEXEC
+ config CRASH_DUMP
+       bool "Build a kdump crash kernel"
+       depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)
+-      select RELOCATABLE if PPC64 || 44x || FSL_BOOKE
++      select RELOCATABLE if (PPC64 && !COMPILE_TEST) || 44x || FSL_BOOKE
+       help
+         Build a kernel suitable for use as a kdump capture kernel.
+         The same kernel binary can be used as production kernel and dump
+@@ -1009,6 +1009,7 @@ endmenu
+ if PPC64
+ config RELOCATABLE
+       bool "Build a relocatable kernel"
++      depends on !COMPILE_TEST
+       select NONSTATIC_KERNEL
+       help
+         This builds a kernel image that is capable of running anywhere

diff --git a/queue-3.15/series b/queue-3.15/series
index 563bff653ae869748fccc619b698ce63c72187da..d2534c6008303b15e1ec027ebbcedc7f3773e9b8 100644 (file)
--- a/queue-3.15/series
+++ b/queue-3.15/series
@@ -72,3 +72,6 @@ kernfs-introduce-kernfs_pin_sb.patch
 cgroup-fix-a-race-between-cgroup_mount-and-cgroup_kill_sb.patch
 f2fs-adjust-free-mem-size-to-flush-dentry-blocks.patch
 f2fs-check-bdi-dirty_exceeded-when-trying-to-skip-data-writes.patch
+drivers-rtc-rtc-puv3.c-remove-dev-for-typo-issue.patch
+drivers-rtc-rtc-puv3.c-use-dev_dbg-instead-of-dev_debug-for-typo-issue.patch
+powerpc-disable-relocatable-for-compile_test-with-ppc64.patch