From efbbee334e940d9f9c7634c27ed5604d42c137b0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 11 Oct 2015 18:12:51 +0200 Subject: fix patch and compile error for 4.1.10 + solidrun --- .../solidrun-imx6/patches/4.1.10/0001-xbian.patch | 3508 ++++++++------------ target/linux/config/Config.in.graphics | 2 + 2 files changed, 1463 insertions(+), 2047 deletions(-) diff --git a/target/arm/solidrun-imx6/patches/4.1.10/0001-xbian.patch b/target/arm/solidrun-imx6/patches/4.1.10/0001-xbian.patch index a8bf90ef0..d2ea38153 100644 --- a/target/arm/solidrun-imx6/patches/4.1.10/0001-xbian.patch +++ b/target/arm/solidrun-imx6/patches/4.1.10/0001-xbian.patch @@ -1,6 +1,6 @@ -diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6dl.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6dl.dtsi ---- linux-4.1.6/arch/arm/boot/dts/imx6dl.dtsi 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6dl.dtsi 2015-09-11 17:46:08.539024112 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6dl.dtsi linux-4.1.10/arch/arm/boot/dts/imx6dl.dtsi +--- linux-4.1.10.orig/arch/arm/boot/dts/imx6dl.dtsi 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/boot/dts/imx6dl.dtsi 2015-10-10 16:41:04.845313887 +0200 @@ -30,7 +30,7 @@ /* kHz uV */ 996000 1250000 @@ -157,9 +157,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6dl.dtsi xbian-sources-kernel/arch/ar -&vpu { - compatible = "fsl,imx6dl-vpu", "cnm,coda960"; -}; -diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6dl-hummingboard2.dts xbian-sources-kernel/arch/arm/boot/dts/imx6dl-hummingboard2.dts ---- linux-4.1.6/arch/arm/boot/dts/imx6dl-hummingboard2.dts 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6dl-hummingboard2.dts 2015-09-11 17:46:08.539024112 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6dl-hummingboard2.dts linux-4.1.10/arch/arm/boot/dts/imx6dl-hummingboard2.dts +--- linux-4.1.10.orig/arch/arm/boot/dts/imx6dl-hummingboard2.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/arch/arm/boot/dts/imx6dl-hummingboard2.dts 2015-10-10 16:41:04.965313892 +0200 @@ -0,0 +1,52 @@ +/* + * Device Tree file for SolidRun HummingBoard2 @@ -213,9 +213,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6dl-hummingboard2.dts xbian-sources-k + model = "SolidRun HummingBoard2 Solo/DualLite"; + compatible = "solidrun,hummingboard2/dl", "fsl,imx6dl"; +}; -diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi ---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-09-11 17:46:08.555023041 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 2015-10-10 16:41:04.965313892 +0200 @@ -45,11 +45,22 @@ #include @@ -384,9 +384,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi xbian-sources-kerne + dcic_mux = "dcic-lvds1"; + status = "okay"; }; -diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl.dtsi ---- linux-4.1.6/arch/arm/boot/dts/imx6qdl.dtsi 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl.dtsi 2015-09-11 17:46:08.571021970 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl.dtsi +--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl.dtsi 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl.dtsi 2015-10-10 16:41:04.965313892 +0200 @@ -14,6 +14,7 @@ #include @@ -956,9 +956,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl.dtsi xbian-sources-kernel/arch/a }; }; }; -diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi ---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi 2015-09-11 17:46:08.571021970 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi +--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi 2015-10-10 16:41:04.969313893 +0200 @@ -0,0 +1,686 @@ +/* + * Device Tree file for SolidRun HummingBoard2 @@ -1646,9 +1646,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi xbian-sources + pinctrl-0 = <&pinctrl_hummingboard2_uart3>; + status = "okay"; +}; -diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi ---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-09-11 17:46:08.571021970 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi +--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi 2015-10-10 16:41:04.969313893 +0200 @@ -43,8 +43,11 @@ #include "imx6qdl-microsom-ar8035.dtsi" @@ -2082,9 +2082,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi xbian-sources- + dcic_mux = "dcic-lvds1"; + status = "okay"; +}; -diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-microsom.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-microsom.dtsi ---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-09-11 17:46:08.571021970 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-microsom.dtsi +--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-microsom.dtsi 2015-10-10 16:41:04.969313893 +0200 @@ -39,15 +39,98 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. @@ -2208,9 +2208,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-microsom.dtsi xbian-sources-kern + vmmc-supply = <®_brcm>; + status = "okay"; +}; -diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-sabresd.dtsi ---- linux-4.1.6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-09-11 17:46:08.571021970 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi linux-4.1.10/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +--- linux-4.1.10.orig/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/boot/dts/imx6qdl-sabresd.dtsi 2015-10-10 16:41:04.969313893 +0200 @@ -57,6 +57,13 @@ enable-active-high; }; @@ -2284,9 +2284,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6qdl-sabresd.dtsi xbian-sources-kerne &pwm1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm1>; -diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6q.dtsi ---- linux-4.1.6/arch/arm/boot/dts/imx6q.dtsi 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q.dtsi 2015-09-11 17:46:08.555023041 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6q.dtsi linux-4.1.10/arch/arm/boot/dts/imx6q.dtsi +--- linux-4.1.10.orig/arch/arm/boot/dts/imx6q.dtsi 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/boot/dts/imx6q.dtsi 2015-10-10 16:41:04.969313893 +0200 @@ -14,6 +14,7 @@ / { @@ -2593,9 +2593,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q.dtsi xbian-sources-kernel/arch/arm + "ldb_di0_div_7", "ldb_di1_div_7", + "ldb_di0_div_sel", "ldb_di1_div_sel"; }; -diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard2.dts xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard2.dts ---- linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard2.dts 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard2.dts 2015-09-11 17:46:08.555023041 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6q-hummingboard2.dts linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard2.dts +--- linux-4.1.10.orig/arch/arm/boot/dts/imx6q-hummingboard2.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard2.dts 2015-10-10 16:41:04.973313893 +0200 @@ -0,0 +1,60 @@ +/* + * Device Tree file for SolidRun HummingBoard2 @@ -2657,9 +2657,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard2.dts xbian-sources-ke + fsl,transmit-atten-16ths = <9>; + fsl,no-spread-spectrum; +}; -diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard.dts xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard.dts ---- linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-09-11 17:46:08.555023041 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6q-hummingboard.dts linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard.dts +--- linux-4.1.10.orig/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/boot/dts/imx6q-hummingboard.dts 2015-10-10 16:41:04.973313893 +0200 @@ -48,6 +48,10 @@ / { model = "SolidRun HummingBoard Dual/Quad"; @@ -2679,9 +2679,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6q-hummingboard.dts xbian-sources-ker +&sgtl5000 { + status = "okay"; +}; -diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6sl.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6sl.dtsi ---- linux-4.1.6/arch/arm/boot/dts/imx6sl.dtsi 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6sl.dtsi 2015-09-11 17:46:08.571021970 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6sl.dtsi linux-4.1.10/arch/arm/boot/dts/imx6sl.dtsi +--- linux-4.1.10.orig/arch/arm/boot/dts/imx6sl.dtsi 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/boot/dts/imx6sl.dtsi 2015-10-10 16:41:04.973313893 +0200 @@ -457,20 +457,21 @@ anatop-min-bit-val = <4>; anatop-min-voltage = <800000>; @@ -2732,9 +2732,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6sl.dtsi xbian-sources-kernel/arch/ar fsl,anatop = <&anatop>; }; -diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6sx.dtsi xbian-sources-kernel/arch/arm/boot/dts/imx6sx.dtsi ---- linux-4.1.6/arch/arm/boot/dts/imx6sx.dtsi 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/imx6sx.dtsi 2015-09-11 17:46:08.571021970 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/imx6sx.dtsi linux-4.1.10/arch/arm/boot/dts/imx6sx.dtsi +--- linux-4.1.10.orig/arch/arm/boot/dts/imx6sx.dtsi 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/boot/dts/imx6sx.dtsi 2015-10-10 16:41:04.973313893 +0200 @@ -556,20 +556,21 @@ anatop-min-bit-val = <4>; anatop-min-voltage = <800000>; @@ -2785,9 +2785,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/imx6sx.dtsi xbian-sources-kernel/arch/ar fsl,anatop = <&anatop>; }; -diff -Nur linux-4.1.6/arch/arm/boot/dts/Makefile xbian-sources-kernel/arch/arm/boot/dts/Makefile ---- linux-4.1.6/arch/arm/boot/dts/Makefile 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/boot/dts/Makefile 2015-09-11 17:46:08.487027594 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/boot/dts/Makefile linux-4.1.10/arch/arm/boot/dts/Makefile +--- linux-4.1.10.orig/arch/arm/boot/dts/Makefile 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/boot/dts/Makefile 2015-10-10 16:41:04.973313893 +0200 @@ -264,6 +264,7 @@ imx6dl-gw54xx.dtb \ imx6dl-gw552x.dtb \ @@ -2804,9 +2804,9 @@ diff -Nur linux-4.1.6/arch/arm/boot/dts/Makefile xbian-sources-kernel/arch/arm/b imx6q-nitrogen6x.dtb \ imx6q-phytec-pbab01.dtb \ imx6q-rex-pro.dtb \ -diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_base_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_base_defconfig ---- linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 2015-09-11 17:46:08.655016347 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/configs/imx_v7_cbi_hb_base_defconfig linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_base_defconfig +--- linux-4.1.10.orig/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_base_defconfig 2015-10-10 16:41:04.981313892 +0200 @@ -0,0 +1,367 @@ +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_KERNEL_LZO=y @@ -3175,9 +3175,9 @@ diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_base_defconfig xbian-source +CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m +CONFIG_IR_GPIO_CIR=m -diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_defconfig ---- linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/configs/imx_v7_cbi_hb_defconfig 2015-09-11 17:46:08.655016347 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/configs/imx_v7_cbi_hb_defconfig linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_defconfig +--- linux-4.1.10.orig/arch/arm/configs/imx_v7_cbi_hb_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/arch/arm/configs/imx_v7_cbi_hb_defconfig 2015-10-10 16:41:04.985313893 +0200 @@ -0,0 +1,5139 @@ +# +# Automatically generated make config: don't edit @@ -8318,9 +8318,9 @@ diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_cbi_hb_defconfig xbian-sources-ker +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_PROC_DEVICETREE=y + -diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_defconfig ---- linux-4.1.6/arch/arm/configs/imx_v7_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/configs/imx_v7_defconfig 2015-09-11 17:46:08.655016347 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/configs/imx_v7_defconfig linux-4.1.10/arch/arm/configs/imx_v7_defconfig +--- linux-4.1.10.orig/arch/arm/configs/imx_v7_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/arch/arm/configs/imx_v7_defconfig 2015-10-10 16:41:04.985313893 +0200 @@ -0,0 +1,414 @@ +CONFIG_KERNEL_LZO=y +CONFIG_SYSVIPC=y @@ -8736,9 +8736,9 @@ diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_defconfig xbian-sources-kernel/arc +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y -diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_mfg_defconfig xbian-sources-kernel/arch/arm/configs/imx_v7_mfg_defconfig ---- linux-4.1.6/arch/arm/configs/imx_v7_mfg_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/configs/imx_v7_mfg_defconfig 2015-09-11 17:46:08.655016347 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/configs/imx_v7_mfg_defconfig linux-4.1.10/arch/arm/configs/imx_v7_mfg_defconfig +--- linux-4.1.10.orig/arch/arm/configs/imx_v7_mfg_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/arch/arm/configs/imx_v7_mfg_defconfig 2015-10-10 16:41:04.985313893 +0200 @@ -0,0 +1,332 @@ +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_KERNEL_LZO=y @@ -9072,9 +9072,9 @@ diff -Nur linux-4.1.6/arch/arm/configs/imx_v7_mfg_defconfig xbian-sources-kernel +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y -diff -Nur linux-4.1.6/arch/arm/include/asm/glue-cache.h xbian-sources-kernel/arch/arm/include/asm/glue-cache.h ---- linux-4.1.6/arch/arm/include/asm/glue-cache.h 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/include/asm/glue-cache.h 2015-09-11 17:46:08.695013671 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/include/asm/glue-cache.h linux-4.1.10/arch/arm/include/asm/glue-cache.h +--- linux-4.1.10.orig/arch/arm/include/asm/glue-cache.h 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/include/asm/glue-cache.h 2015-10-10 16:41:04.985313893 +0200 @@ -102,19 +102,19 @@ #endif @@ -9103,10 +9103,10 @@ diff -Nur linux-4.1.6/arch/arm/include/asm/glue-cache.h xbian-sources-kernel/arc #endif #if defined(CONFIG_CPU_V7M) -diff -Nur linux-4.1.6/arch/arm/Kconfig xbian-sources-kernel/arch/arm/Kconfig ---- linux-4.1.6/arch/arm/Kconfig 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/Kconfig 2015-09-11 17:46:08.487027594 +0200 -@@ -1688,6 +1688,7 @@ +diff -Nur linux-4.1.10.orig/arch/arm/Kconfig linux-4.1.10/arch/arm/Kconfig +--- linux-4.1.10.orig/arch/arm/Kconfig 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/Kconfig 2015-10-10 16:41:05.233313895 +0200 +@@ -1689,6 +1689,7 @@ range 11 64 if ARCH_SHMOBILE_LEGACY default "12" if SOC_AM33XX default "9" if SA1111 || ARCH_EFM32 @@ -9114,197 +9114,9 @@ diff -Nur linux-4.1.6/arch/arm/Kconfig xbian-sources-kernel/arch/arm/Kconfig default "11" help The kernel memory allocator divides physically contiguous memory -diff -Nur linux-4.1.6/arch/arm/mach-bcm/brcmstb.h xbian-sources-kernel/arch/arm/mach-bcm/brcmstb.h ---- linux-4.1.6/arch/arm/mach-bcm/brcmstb.h 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-bcm/brcmstb.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,19 +0,0 @@ --/* -- * Copyright (C) 2013-2014 Broadcom Corporation -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License as -- * published by the Free Software Foundation version 2. -- * -- * This program is distributed "as is" WITHOUT ANY WARRANTY of any -- * kind, whether express or implied; without even the implied warranty -- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- */ -- --#ifndef __BRCMSTB_H__ --#define __BRCMSTB_H__ -- --void brcmstb_secondary_startup(void); -- --#endif /* __BRCMSTB_H__ */ -diff -Nur linux-4.1.6/arch/arm/mach-bcm/headsmp-brcmstb.S xbian-sources-kernel/arch/arm/mach-bcm/headsmp-brcmstb.S ---- linux-4.1.6/arch/arm/mach-bcm/headsmp-brcmstb.S 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-bcm/headsmp-brcmstb.S 1970-01-01 01:00:00.000000000 +0100 -@@ -1,33 +0,0 @@ --/* -- * SMP boot code for secondary CPUs -- * Based on arch/arm/mach-tegra/headsmp.S -- * -- * Copyright (C) 2010 NVIDIA, Inc. -- * Copyright (C) 2013-2014 Broadcom Corporation -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License as -- * published by the Free Software Foundation version 2. -- * -- * This program is distributed "as is" WITHOUT ANY WARRANTY of any -- * kind, whether express or implied; without even the implied warranty -- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- */ -- --#include --#include --#include -- -- .section ".text.head", "ax" -- --ENTRY(brcmstb_secondary_startup) -- /* -- * Ensure CPU is in a sane state by disabling all IRQs and switching -- * into SVC mode. -- */ -- setmode PSR_I_BIT | PSR_F_BIT | SVC_MODE, r0 -- -- bl v7_invalidate_l1 -- b secondary_startup --ENDPROC(brcmstb_secondary_startup) -diff -Nur linux-4.1.6/arch/arm/mach-bcm/Makefile xbian-sources-kernel/arch/arm/mach-bcm/Makefile ---- linux-4.1.6/arch/arm/mach-bcm/Makefile 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-bcm/Makefile 2015-09-11 17:46:08.747010190 +0200 -@@ -43,5 +43,5 @@ - ifeq ($(CONFIG_ARCH_BRCMSTB),y) - CFLAGS_platsmp-brcmstb.o += -march=armv7-a - obj-y += brcmstb.o --obj-$(CONFIG_SMP) += headsmp-brcmstb.o platsmp-brcmstb.o -+obj-$(CONFIG_SMP) += platsmp-brcmstb.o - endif -diff -Nur linux-4.1.6/arch/arm/mach-bcm/platsmp-brcmstb.c xbian-sources-kernel/arch/arm/mach-bcm/platsmp-brcmstb.c ---- linux-4.1.6/arch/arm/mach-bcm/platsmp-brcmstb.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-bcm/platsmp-brcmstb.c 2015-09-11 17:46:08.747010190 +0200 -@@ -30,8 +30,6 @@ - #include - #include - --#include "brcmstb.h" -- - enum { - ZONE_MAN_CLKEN_MASK = BIT(0), - ZONE_MAN_RESET_CNTL_MASK = BIT(1), -@@ -153,7 +151,7 @@ - * Set the reset vector to point to the secondary_startup - * routine - */ -- cpu_set_boot_addr(cpu, virt_to_phys(brcmstb_secondary_startup)); -+ cpu_set_boot_addr(cpu, virt_to_phys(secondary_startup)); - - /* Unhalt the cpu */ - cpu_rst_cfg_set(cpu, 0); -diff -Nur linux-4.1.6/arch/arm/mach-berlin/headsmp.S xbian-sources-kernel/arch/arm/mach-berlin/headsmp.S ---- linux-4.1.6/arch/arm/mach-berlin/headsmp.S 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-berlin/headsmp.S 2015-09-11 17:46:08.747010190 +0200 -@@ -12,12 +12,6 @@ - #include - #include - --ENTRY(berlin_secondary_startup) -- ARM_BE8(setend be) -- bl v7_invalidate_l1 -- b secondary_startup --ENDPROC(berlin_secondary_startup) -- - /* - * If the following instruction is set in the reset exception vector, CPUs - * will fetch the value of the software reset address vector when being -diff -Nur linux-4.1.6/arch/arm/mach-berlin/platsmp.c xbian-sources-kernel/arch/arm/mach-berlin/platsmp.c ---- linux-4.1.6/arch/arm/mach-berlin/platsmp.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-berlin/platsmp.c 2015-09-11 17:46:08.747010190 +0200 -@@ -22,7 +22,6 @@ - #define RESET_VECT 0x00 - #define SW_RESET_ADDR 0x94 - --extern void berlin_secondary_startup(void); - extern u32 boot_inst; - - static void __iomem *cpu_ctrl; -@@ -85,7 +84,7 @@ - * Write the secondary startup address into the SW reset address - * vector. This is used by boot_inst. - */ -- writel(virt_to_phys(berlin_secondary_startup), vectors_base + SW_RESET_ADDR); -+ writel(virt_to_phys(secondary_startup), vectors_base + SW_RESET_ADDR); - - iounmap(vectors_base); - unmap_scu: -diff -Nur linux-4.1.6/arch/arm/mach-hisi/core.h xbian-sources-kernel/arch/arm/mach-hisi/core.h ---- linux-4.1.6/arch/arm/mach-hisi/core.h 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-hisi/core.h 2015-09-11 17:46:08.795006977 +0200 -@@ -12,7 +12,6 @@ - extern int hi3xxx_cpu_kill(unsigned int cpu); - extern void hi3xxx_set_cpu(int cpu, bool enable); - --extern void hisi_secondary_startup(void); - extern struct smp_operations hix5hd2_smp_ops; - extern void hix5hd2_set_cpu(int cpu, bool enable); - extern void hix5hd2_cpu_die(unsigned int cpu); -diff -Nur linux-4.1.6/arch/arm/mach-hisi/headsmp.S xbian-sources-kernel/arch/arm/mach-hisi/headsmp.S ---- linux-4.1.6/arch/arm/mach-hisi/headsmp.S 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-hisi/headsmp.S 1970-01-01 01:00:00.000000000 +0100 -@@ -1,16 +0,0 @@ --/* -- * Copyright (c) 2014 Hisilicon Limited. -- * Copyright (c) 2014 Linaro Ltd. -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License version 2 as -- * published by the Free Software Foundation. -- */ --#include --#include -- -- __CPUINIT -- --ENTRY(hisi_secondary_startup) -- bl v7_invalidate_l1 -- b secondary_startup -diff -Nur linux-4.1.6/arch/arm/mach-hisi/Makefile xbian-sources-kernel/arch/arm/mach-hisi/Makefile ---- linux-4.1.6/arch/arm/mach-hisi/Makefile 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-hisi/Makefile 2015-09-11 17:46:08.795006977 +0200 -@@ -6,4 +6,4 @@ - - obj-y += hisilicon.o - obj-$(CONFIG_MCPM) += platmcpm.o --obj-$(CONFIG_SMP) += platsmp.o hotplug.o headsmp.o -+obj-$(CONFIG_SMP) += platsmp.o hotplug.o -diff -Nur linux-4.1.6/arch/arm/mach-hisi/platsmp.c xbian-sources-kernel/arch/arm/mach-hisi/platsmp.c ---- linux-4.1.6/arch/arm/mach-hisi/platsmp.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-hisi/platsmp.c 2015-09-11 17:46:08.795006977 +0200 -@@ -118,7 +118,7 @@ - { - phys_addr_t jumpaddr; - -- jumpaddr = virt_to_phys(hisi_secondary_startup); -+ jumpaddr = virt_to_phys(secondary_startup); - hix5hd2_set_scu_boot_addr(HIX5HD2_BOOT_ADDRESS, jumpaddr); - hix5hd2_set_cpu(cpu, true); - arch_send_wakeup_ipi_mask(cpumask_of(cpu)); -@@ -156,7 +156,7 @@ - struct device_node *node; - - -- jumpaddr = virt_to_phys(hisi_secondary_startup); -+ jumpaddr = virt_to_phys(secondary_startup); - hip01_set_boot_addr(HIP01_BOOT_ADDRESS, jumpaddr); - - node = of_find_compatible_node(NULL, NULL, "hisilicon,hip01-sysctrl"); -diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq_ddr3.c xbian-sources-kernel/arch/arm/mach-imx/busfreq_ddr3.c ---- linux-4.1.6/arch/arm/mach-imx/busfreq_ddr3.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/mach-imx/busfreq_ddr3.c 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/busfreq_ddr3.c linux-4.1.10/arch/arm/mach-imx/busfreq_ddr3.c +--- linux-4.1.10.orig/arch/arm/mach-imx/busfreq_ddr3.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/arch/arm/mach-imx/busfreq_ddr3.c 2015-10-10 16:41:25.125309040 +0200 @@ -0,0 +1,519 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -9825,9 +9637,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq_ddr3.c xbian-sources-kernel/arch + + return 0; +} -diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq-imx6.c xbian-sources-kernel/arch/arm/mach-imx/busfreq-imx6.c ---- linux-4.1.6/arch/arm/mach-imx/busfreq-imx6.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/mach-imx/busfreq-imx6.c 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/busfreq-imx6.c linux-4.1.10/arch/arm/mach-imx/busfreq-imx6.c +--- linux-4.1.10.orig/arch/arm/mach-imx/busfreq-imx6.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/arch/arm/mach-imx/busfreq-imx6.c 2015-10-10 16:41:25.125309040 +0200 @@ -0,0 +1,994 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -10823,9 +10635,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq-imx6.c xbian-sources-kernel/arch +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("BusFreq driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq_lpddr2.c xbian-sources-kernel/arch/arm/mach-imx/busfreq_lpddr2.c ---- linux-4.1.6/arch/arm/mach-imx/busfreq_lpddr2.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/mach-imx/busfreq_lpddr2.c 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/busfreq_lpddr2.c linux-4.1.10/arch/arm/mach-imx/busfreq_lpddr2.c +--- linux-4.1.10.orig/arch/arm/mach-imx/busfreq_lpddr2.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/arch/arm/mach-imx/busfreq_lpddr2.c 2015-10-10 16:41:25.125309040 +0200 @@ -0,0 +1,183 @@ +/* + * Copyright (C) 2011-2015 Freescale Semiconductor, Inc. All Rights Reserved. @@ -11010,9 +10822,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/busfreq_lpddr2.c xbian-sources-kernel/ar + + return 0; +} -diff -Nur linux-4.1.6/arch/arm/mach-imx/clk.h xbian-sources-kernel/arch/arm/mach-imx/clk.h ---- linux-4.1.6/arch/arm/mach-imx/clk.h 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk.h 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk.h linux-4.1.10/arch/arm/mach-imx/clk.h +--- linux-4.1.10.orig/arch/arm/mach-imx/clk.h 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/clk.h 2015-10-10 16:41:25.129309291 +0200 @@ -55,6 +55,34 @@ shift, 0, &imx_ccm_lock, share_count); } @@ -11064,9 +10876,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk.h xbian-sources-kernel/arch/arm/mach static inline struct clk *imx_clk_fixed_factor(const char *name, const char *parent, unsigned int mult, unsigned int div) { -diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx1.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx1.c ---- linux-4.1.6/arch/arm/mach-imx/clk-imx1.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx1.c 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx1.c linux-4.1.10/arch/arm/mach-imx/clk-imx1.c +--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx1.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/clk-imx1.c 2015-10-10 16:41:25.129309291 +0200 @@ -75,7 +75,8 @@ int __init mx1_clocks_init(unsigned long fref) @@ -11086,9 +10898,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx1.c xbian-sources-kernel/arch/arm return 0; } -diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx21.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx21.c ---- linux-4.1.6/arch/arm/mach-imx/clk-imx21.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx21.c 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx21.c linux-4.1.10/arch/arm/mach-imx/clk-imx21.c +--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx21.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/clk-imx21.c 2015-10-10 16:41:25.129309291 +0200 @@ -153,7 +153,7 @@ clk_register_clkdev(clk[IMX21_CLK_I2C_GATE], NULL, "imx21-i2c.0"); clk_register_clkdev(clk[IMX21_CLK_OWIRE_GATE], NULL, "mxc_w1.0"); @@ -11098,9 +10910,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx21.c xbian-sources-kernel/arch/ar return 0; } -diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx27.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx27.c ---- linux-4.1.6/arch/arm/mach-imx/clk-imx27.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx27.c 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx27.c linux-4.1.10/arch/arm/mach-imx/clk-imx27.c +--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx27.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/clk-imx27.c 2015-10-10 16:41:25.129309291 +0200 @@ -229,7 +229,7 @@ clk_register_clkdev(clk[IMX27_CLK_EMMA_AHB_GATE], "ahb", "m2m-emmaprp.0"); clk_register_clkdev(clk[IMX27_CLK_EMMA_IPG_GATE], "ipg", "m2m-emmaprp.0"); @@ -11110,9 +10922,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx27.c xbian-sources-kernel/arch/ar return 0; } -diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx31.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx31.c ---- linux-4.1.6/arch/arm/mach-imx/clk-imx31.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx31.c 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx31.c linux-4.1.10/arch/arm/mach-imx/clk-imx31.c +--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx31.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/clk-imx31.c 2015-10-10 16:41:25.129309291 +0200 @@ -50,9 +50,12 @@ int __init mx31_clocks_init(unsigned long fref) @@ -11136,9 +10948,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx31.c xbian-sources-kernel/arch/ar return 0; } -diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx35.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx35.c ---- linux-4.1.6/arch/arm/mach-imx/clk-imx35.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx35.c 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx35.c linux-4.1.10/arch/arm/mach-imx/clk-imx35.c +--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx35.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/clk-imx35.c 2015-10-10 16:41:25.129309291 +0200 @@ -71,11 +71,14 @@ int __init mx35_clocks_init(void) @@ -11164,9 +10976,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx35.c xbian-sources-kernel/arch/ar #endif return 0; -diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6q.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx6q.c ---- linux-4.1.6/arch/arm/mach-imx/clk-imx6q.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx6q.c 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6q.c linux-4.1.10/arch/arm/mach-imx/clk-imx6q.c +--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6q.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/clk-imx6q.c 2015-10-10 16:41:25.133309588 +0200 @@ -24,7 +24,6 @@ #include "clk.h" #include "common.h" @@ -11489,9 +11301,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6q.c xbian-sources-kernel/arch/ar + } } CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init); -diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6sl.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sl.c ---- linux-4.1.6/arch/arm/mach-imx/clk-imx6sl.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sl.c 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6sl.c linux-4.1.10/arch/arm/mach-imx/clk-imx6sl.c +--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6sl.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/clk-imx6sl.c 2015-10-10 16:41:25.133309588 +0200 @@ -288,9 +288,6 @@ WARN_ON(!base); ccm_base = base; @@ -11511,9 +11323,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6sl.c xbian-sources-kernel/arch/a - imx6q_set_lpm(WAIT_CLOCKED); } CLK_OF_DECLARE(imx6sl, "fsl,imx6sl-ccm", imx6sl_clocks_init); -diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6sx.c xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sx.c ---- linux-4.1.6/arch/arm/mach-imx/clk-imx6sx.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-imx6sx.c 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6sx.c linux-4.1.10/arch/arm/mach-imx/clk-imx6sx.c +--- linux-4.1.10.orig/arch/arm/mach-imx/clk-imx6sx.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/clk-imx6sx.c 2015-10-10 16:41:25.133309588 +0200 @@ -268,8 +268,6 @@ base = of_iomap(np, 0); WARN_ON(!base); @@ -11532,9 +11344,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-imx6sx.c xbian-sources-kernel/arch/a - imx6q_set_lpm(WAIT_CLOCKED); } CLK_OF_DECLARE(imx6sx, "fsl,imx6sx-ccm", imx6sx_clocks_init); -diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-pllv3.c xbian-sources-kernel/arch/arm/mach-imx/clk-pllv3.c ---- linux-4.1.6/arch/arm/mach-imx/clk-pllv3.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/clk-pllv3.c 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/clk-pllv3.c linux-4.1.10/arch/arm/mach-imx/clk-pllv3.c +--- linux-4.1.10.orig/arch/arm/mach-imx/clk-pllv3.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/clk-pllv3.c 2015-10-10 16:41:25.133309588 +0200 @@ -23,6 +23,7 @@ #define PLL_DENOM_OFFSET 0x20 @@ -11587,9 +11399,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/clk-pllv3.c xbian-sources-kernel/arch/ar } static const struct clk_ops clk_pllv3_av_ops = { -diff -Nur linux-4.1.6/arch/arm/mach-imx/common.h xbian-sources-kernel/arch/arm/mach-imx/common.h ---- linux-4.1.6/arch/arm/mach-imx/common.h 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/common.h 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/common.h linux-4.1.10/arch/arm/mach-imx/common.h +--- linux-4.1.10.orig/arch/arm/mach-imx/common.h 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/common.h 2015-10-10 16:41:25.133309588 +0200 @@ -44,7 +44,7 @@ void imx31_soc_init(void); void imx35_soc_init(void); @@ -11650,9 +11462,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/common.h xbian-sources-kernel/arch/arm/m #ifdef CONFIG_PM void imx51_pm_init(void); -diff -Nur linux-4.1.6/arch/arm/mach-imx/common-imx6.c xbian-sources-kernel/arch/arm/mach-imx/common-imx6.c ---- linux-4.1.6/arch/arm/mach-imx/common-imx6.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/mach-imx/common-imx6.c 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/common-imx6.c linux-4.1.10/arch/arm/mach-imx/common-imx6.c +--- linux-4.1.10.orig/arch/arm/mach-imx/common-imx6.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/arch/arm/mach-imx/common-imx6.c 2015-10-10 16:41:25.137309900 +0200 @@ -0,0 +1,96 @@ +/* + * Copyright 2011-2015 Freescale Semiconductor, Inc. @@ -11750,9 +11562,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/common-imx6.c xbian-sources-kernel/arch/ + } +} + -diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6q.c xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6q.c ---- linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6q.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6q.c 2015-09-11 17:46:08.815005638 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6q.c linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6q.c +--- linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6q.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6q.c 2015-10-10 16:41:25.137309900 +0200 @@ -27,9 +27,9 @@ */ if (!spin_trylock(&master_lock)) @@ -11765,9 +11577,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6q.c xbian-sources-kernel/arc spin_unlock(&master_lock); goto done; } -diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sl.c xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sl.c ---- linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-09-11 17:46:08.815005638 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6sl.c linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sl.c +--- linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sl.c 2015-10-10 16:41:25.137309900 +0200 @@ -16,7 +16,7 @@ static int imx6sl_enter_wait(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) @@ -11786,9 +11598,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sl.c xbian-sources-kernel/ar return index; } -diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sx.c xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sx.c ---- linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-09-11 17:46:08.815005638 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6sx.c linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sx.c +--- linux-4.1.10.orig/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/cpuidle-imx6sx.c 2015-10-10 16:41:25.137309900 +0200 @@ -25,7 +25,7 @@ static int imx6sx_enter_wait(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) @@ -11807,9 +11619,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/cpuidle-imx6sx.c xbian-sources-kernel/ar return index; } -diff -Nur linux-4.1.6/arch/arm/mach-imx/ddr3_freq_imx6.S xbian-sources-kernel/arch/arm/mach-imx/ddr3_freq_imx6.S ---- linux-4.1.6/arch/arm/mach-imx/ddr3_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/mach-imx/ddr3_freq_imx6.S 2015-09-11 17:46:08.815005638 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/ddr3_freq_imx6.S linux-4.1.10/arch/arm/mach-imx/ddr3_freq_imx6.S +--- linux-4.1.10.orig/arch/arm/mach-imx/ddr3_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/arch/arm/mach-imx/ddr3_freq_imx6.S 2015-10-10 16:41:25.137309900 +0200 @@ -0,0 +1,893 @@ +/* + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -12704,20 +12516,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/ddr3_freq_imx6.S xbian-sources-kernel/ar +ENTRY(mx6_do_ddr_freq_change) + .word mx6_ddr3_freq_change + .size mx6_ddr3_freq_change, . - mx6_ddr3_freq_change -diff -Nur linux-4.1.6/arch/arm/mach-imx/headsmp.S xbian-sources-kernel/arch/arm/mach-imx/headsmp.S ---- linux-4.1.6/arch/arm/mach-imx/headsmp.S 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/headsmp.S 2015-09-11 17:46:08.815005638 +0200 -@@ -25,7 +25,6 @@ - .endm - - ENTRY(v7_secondary_startup) -- bl v7_invalidate_l1 - set_diag_reg - b secondary_startup - ENDPROC(v7_secondary_startup) -diff -Nur linux-4.1.6/arch/arm/mach-imx/Kconfig xbian-sources-kernel/arch/arm/mach-imx/Kconfig ---- linux-4.1.6/arch/arm/mach-imx/Kconfig 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/Kconfig 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/Kconfig linux-4.1.10/arch/arm/mach-imx/Kconfig +--- linux-4.1.10.orig/arch/arm/mach-imx/Kconfig 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/Kconfig 2015-10-10 16:41:28.701314199 +0200 @@ -1,5 +1,6 @@ menuconfig ARCH_MXC bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 @@ -12741,9 +12542,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/Kconfig xbian-sources-kernel/arch/arm/ma config IMX_HAVE_IOMUX_V1 bool -diff -Nur linux-4.1.6/arch/arm/mach-imx/lpddr2_freq_imx6.S xbian-sources-kernel/arch/arm/mach-imx/lpddr2_freq_imx6.S ---- linux-4.1.6/arch/arm/mach-imx/lpddr2_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/arch/arm/mach-imx/lpddr2_freq_imx6.S 2015-09-11 17:46:08.819005369 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S linux-4.1.10/arch/arm/mach-imx/lpddr2_freq_imx6.S +--- linux-4.1.10.orig/arch/arm/mach-imx/lpddr2_freq_imx6.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/arch/arm/mach-imx/lpddr2_freq_imx6.S 2015-10-10 16:41:28.701314199 +0200 @@ -0,0 +1,484 @@ +/* + * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. All Rights Reserved. @@ -13229,9 +13030,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/lpddr2_freq_imx6.S xbian-sources-kernel/ +ENTRY(mx6_lpddr2_do_iram) + .word mx6_lpddr2_freq_change + .size mx6_lpddr2_freq_change, . - mx6_lpddr2_freq_change -diff -Nur linux-4.1.6/arch/arm/mach-imx/mach-imx6q.c xbian-sources-kernel/arch/arm/mach-imx/mach-imx6q.c ---- linux-4.1.6/arch/arm/mach-imx/mach-imx6q.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/mach-imx6q.c 2015-09-11 17:46:08.819005369 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/mach-imx6q.c linux-4.1.10/arch/arm/mach-imx/mach-imx6q.c +--- linux-4.1.10.orig/arch/arm/mach-imx/mach-imx6q.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/mach-imx6q.c 2015-10-10 16:41:28.701314199 +0200 @@ -31,6 +31,9 @@ #include #include @@ -13436,9 +13237,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/mach-imx6q.c xbian-sources-kernel/arch/a .dt_compat = imx6q_dt_compat, + .restart = mxc_restart, MACHINE_END -diff -Nur linux-4.1.6/arch/arm/mach-imx/mach-imx6sl.c xbian-sources-kernel/arch/arm/mach-imx/mach-imx6sl.c ---- linux-4.1.6/arch/arm/mach-imx/mach-imx6sl.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/mach-imx6sl.c 2015-09-11 17:46:08.819005369 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/mach-imx6sl.c linux-4.1.10/arch/arm/mach-imx/mach-imx6sl.c +--- linux-4.1.10.orig/arch/arm/mach-imx/mach-imx6sl.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/mach-imx6sl.c 2015-10-10 16:41:28.701314199 +0200 @@ -48,6 +48,8 @@ { struct device *parent; @@ -13462,9 +13263,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/mach-imx6sl.c xbian-sources-kernel/arch/ .dt_compat = imx6sl_dt_compat, + .restart = mxc_restart, MACHINE_END -diff -Nur linux-4.1.6/arch/arm/mach-imx/mach-imx6sx.c xbian-sources-kernel/arch/arm/mach-imx/mach-imx6sx.c ---- linux-4.1.6/arch/arm/mach-imx/mach-imx6sx.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/mach-imx6sx.c 2015-09-11 17:46:08.819005369 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/mach-imx6sx.c linux-4.1.10/arch/arm/mach-imx/mach-imx6sx.c +--- linux-4.1.10.orig/arch/arm/mach-imx/mach-imx6sx.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/mach-imx6sx.c 2015-10-10 16:41:28.705314126 +0200 @@ -12,12 +12,135 @@ #include #include @@ -13628,9 +13429,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/mach-imx6sx.c xbian-sources-kernel/arch/ } static void __init imx6sx_init_late(void) -diff -Nur linux-4.1.6/arch/arm/mach-imx/Makefile xbian-sources-kernel/arch/arm/mach-imx/Makefile ---- linux-4.1.6/arch/arm/mach-imx/Makefile 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/Makefile 2015-09-11 17:46:08.811005906 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/Makefile linux-4.1.10/arch/arm/mach-imx/Makefile +--- linux-4.1.10.orig/arch/arm/mach-imx/Makefile 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/Makefile 2015-10-10 16:41:28.705314126 +0200 @@ -28,6 +28,14 @@ obj-$(CONFIG_MXC_USE_EPIT) += epit.o obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o @@ -13659,9 +13460,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/Makefile xbian-sources-kernel/arch/arm/m ifeq ($(CONFIG_SUSPEND),y) AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a -diff -Nur linux-4.1.6/arch/arm/mach-imx/pm-imx6.c xbian-sources-kernel/arch/arm/mach-imx/pm-imx6.c ---- linux-4.1.6/arch/arm/mach-imx/pm-imx6.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/pm-imx6.c 2015-09-11 17:46:08.827004835 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/pm-imx6.c linux-4.1.10/arch/arm/mach-imx/pm-imx6.c +--- linux-4.1.10.orig/arch/arm/mach-imx/pm-imx6.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/pm-imx6.c 2015-10-10 16:41:28.705314126 +0200 @@ -89,6 +89,7 @@ struct imx6_pm_socdata { @@ -13815,9 +13616,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/pm-imx6.c xbian-sources-kernel/arch/arm/ void __init imx6q_pm_init(void) { imx6_pm_common_init(&imx6q_pm_data); -diff -Nur linux-4.1.6/arch/arm/mach-imx/src.c xbian-sources-kernel/arch/arm/mach-imx/src.c ---- linux-4.1.6/arch/arm/mach-imx/src.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/src.c 2015-09-11 17:46:08.827004835 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/src.c linux-4.1.10/arch/arm/mach-imx/src.c +--- linux-4.1.10.orig/arch/arm/mach-imx/src.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/src.c 2015-10-10 16:41:28.705314126 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2011 Freescale Semiconductor, Inc. @@ -13868,9 +13669,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/src.c xbian-sources-kernel/arch/arm/mach val &= ~(1 << BP_SRC_SCR_WARM_RESET_ENABLE); writel_relaxed(val, src_base + SRC_SCR); spin_unlock(&scr_lock); -diff -Nur linux-4.1.6/arch/arm/mach-imx/system.c xbian-sources-kernel/arch/arm/mach-imx/system.c ---- linux-4.1.6/arch/arm/mach-imx/system.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/system.c 2015-09-11 17:46:08.831004567 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/system.c linux-4.1.10/arch/arm/mach-imx/system.c +--- linux-4.1.10.orig/arch/arm/mach-imx/system.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/system.c 2015-10-10 16:41:28.705314126 +0200 @@ -34,6 +34,7 @@ static void __iomem *wdog_base; @@ -13939,9 +13740,9 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/system.c xbian-sources-kernel/arch/arm/m #ifdef CONFIG_CACHE_L2X0 void __init imx_init_l2cache(void) { -diff -Nur linux-4.1.6/arch/arm/mach-imx/time.c xbian-sources-kernel/arch/arm/mach-imx/time.c ---- linux-4.1.6/arch/arm/mach-imx/time.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-imx/time.c 2015-09-11 17:46:08.831004567 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mach-imx/time.c linux-4.1.10/arch/arm/mach-imx/time.c +--- linux-4.1.10.orig/arch/arm/mach-imx/time.c 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mach-imx/time.c 2015-10-10 16:41:28.709314238 +0200 @@ -28,6 +28,7 @@ #include #include @@ -14245,287 +14046,18 @@ diff -Nur linux-4.1.6/arch/arm/mach-imx/time.c xbian-sources-kernel/arch/arm/mac } CLOCKSOURCE_OF_DECLARE(mx1_timer, "fsl,imx1-gpt", mxc_timer_init_dt); CLOCKSOURCE_OF_DECLARE(mx25_timer, "fsl,imx25-gpt", mxc_timer_init_dt); -diff -Nur linux-4.1.6/arch/arm/mach-mvebu/headsmp-a9.S xbian-sources-kernel/arch/arm/mach-mvebu/headsmp-a9.S ---- linux-4.1.6/arch/arm/mach-mvebu/headsmp-a9.S 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-mvebu/headsmp-a9.S 2015-09-11 17:46:08.855002960 +0200 -@@ -21,7 +21,6 @@ - - ENTRY(mvebu_cortex_a9_secondary_startup) - ARM_BE8(setend be) -- bl v7_invalidate_l1 - bl armada_38x_scu_power_up - b secondary_startup - ENDPROC(mvebu_cortex_a9_secondary_startup) -diff -Nur linux-4.1.6/arch/arm/mach-prima2/headsmp.S xbian-sources-kernel/arch/arm/mach-prima2/headsmp.S ---- linux-4.1.6/arch/arm/mach-prima2/headsmp.S 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-prima2/headsmp.S 2015-09-11 17:46:08.954996266 +0200 -@@ -15,7 +15,6 @@ - * ready for them to initialise. - */ - ENTRY(sirfsoc_secondary_startup) -- bl v7_invalidate_l1 - mrc p15, 0, r0, c0, c0, 5 - and r0, r0, #15 - adr r4, 1f -diff -Nur linux-4.1.6/arch/arm/mach-rockchip/core.h xbian-sources-kernel/arch/arm/mach-rockchip/core.h ---- linux-4.1.6/arch/arm/mach-rockchip/core.h 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-rockchip/core.h 2015-09-11 17:46:08.994993589 +0200 -@@ -17,4 +17,3 @@ - extern char rockchip_secondary_trampoline_end; - - extern unsigned long rockchip_boot_fn; --extern void rockchip_secondary_startup(void); -diff -Nur linux-4.1.6/arch/arm/mach-rockchip/headsmp.S xbian-sources-kernel/arch/arm/mach-rockchip/headsmp.S ---- linux-4.1.6/arch/arm/mach-rockchip/headsmp.S 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-rockchip/headsmp.S 2015-09-11 17:46:08.994993589 +0200 -@@ -15,14 +15,6 @@ - #include - #include - --ENTRY(rockchip_secondary_startup) -- mrc p15, 0, r0, c0, c0, 0 @ read main ID register -- ldr r1, =0x00000c09 @ Cortex-A9 primary part number -- teq r0, r1 -- beq v7_invalidate_l1 -- b secondary_startup --ENDPROC(rockchip_secondary_startup) -- - ENTRY(rockchip_secondary_trampoline) - ldr pc, 1f - ENDPROC(rockchip_secondary_trampoline) -diff -Nur linux-4.1.6/arch/arm/mach-rockchip/platsmp.c xbian-sources-kernel/arch/arm/mach-rockchip/platsmp.c ---- linux-4.1.6/arch/arm/mach-rockchip/platsmp.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-rockchip/platsmp.c 2015-09-11 17:46:08.994993589 +0200 -@@ -149,8 +149,7 @@ - * sram_base_addr + 8: start address for pc - * */ - udelay(10); -- writel(virt_to_phys(rockchip_secondary_startup), -- sram_base_addr + 8); -+ writel(virt_to_phys(secondary_startup), sram_base_addr + 8); - writel(0xDEADBEAF, sram_base_addr + 4); - dsb_sev(); - } -@@ -189,7 +188,7 @@ - } - - /* set the boot function for the sram code */ -- rockchip_boot_fn = virt_to_phys(rockchip_secondary_startup); -+ rockchip_boot_fn = virt_to_phys(secondary_startup); - - /* copy the trampoline to sram, that runs during startup of the core */ - memcpy(sram_base_addr, &rockchip_secondary_trampoline, trampoline_sz); -diff -Nur linux-4.1.6/arch/arm/mach-shmobile/common.h xbian-sources-kernel/arch/arm/mach-shmobile/common.h ---- linux-4.1.6/arch/arm/mach-shmobile/common.h 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-shmobile/common.h 2015-09-11 17:46:09.022991714 +0200 -@@ -14,7 +14,6 @@ - extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn, - unsigned long arg); - extern int shmobile_smp_cpu_disable(unsigned int cpu); --extern void shmobile_invalidate_start(void); - extern void shmobile_boot_scu(void); - extern void shmobile_smp_scu_prepare_cpus(unsigned int max_cpus); - extern void shmobile_smp_scu_cpu_die(unsigned int cpu); -diff -Nur linux-4.1.6/arch/arm/mach-shmobile/headsmp.S xbian-sources-kernel/arch/arm/mach-shmobile/headsmp.S ---- linux-4.1.6/arch/arm/mach-shmobile/headsmp.S 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-shmobile/headsmp.S 2015-09-11 17:46:09.022991714 +0200 -@@ -16,13 +16,6 @@ - #include - #include - --#ifdef CONFIG_SMP --ENTRY(shmobile_invalidate_start) -- bl v7_invalidate_l1 -- b secondary_startup --ENDPROC(shmobile_invalidate_start) --#endif -- - /* - * Reset vector for secondary CPUs. - * This will be mapped at address 0 by SBAR register. -diff -Nur linux-4.1.6/arch/arm/mach-shmobile/headsmp-scu.S xbian-sources-kernel/arch/arm/mach-shmobile/headsmp-scu.S ---- linux-4.1.6/arch/arm/mach-shmobile/headsmp-scu.S 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-shmobile/headsmp-scu.S 2015-09-11 17:46:09.022991714 +0200 -@@ -22,7 +22,7 @@ - * Boot code for secondary CPUs. - * - * First we turn on L1 cache coherency for our CPU. Then we jump to -- * shmobile_invalidate_start that invalidates the cache and hands over control -+ * secondary_startup that invalidates the cache and hands over control - * to the common ARM startup code. - */ - ENTRY(shmobile_boot_scu) -@@ -36,7 +36,7 @@ - bic r2, r2, r3 @ Clear bits of our CPU (Run Mode) - str r2, [r0, #8] @ write back - -- b shmobile_invalidate_start -+ b secondary_startup - ENDPROC(shmobile_boot_scu) - - .text -diff -Nur linux-4.1.6/arch/arm/mach-shmobile/platsmp-apmu.c xbian-sources-kernel/arch/arm/mach-shmobile/platsmp-apmu.c ---- linux-4.1.6/arch/arm/mach-shmobile/platsmp-apmu.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-shmobile/platsmp-apmu.c 2015-09-11 17:46:09.042990376 +0200 -@@ -133,7 +133,7 @@ - int shmobile_smp_apmu_boot_secondary(unsigned int cpu, struct task_struct *idle) - { - /* For this particular CPU register boot vector */ -- shmobile_smp_hook(cpu, virt_to_phys(shmobile_invalidate_start), 0); -+ shmobile_smp_hook(cpu, virt_to_phys(secondary_startup), 0); - - return apmu_wrap(cpu, apmu_power_on); - } -diff -Nur linux-4.1.6/arch/arm/mach-socfpga/core.h xbian-sources-kernel/arch/arm/mach-socfpga/core.h ---- linux-4.1.6/arch/arm/mach-socfpga/core.h 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-socfpga/core.h 2015-09-11 17:46:09.046990108 +0200 -@@ -31,7 +31,6 @@ - - #define RSTMGR_MPUMODRST_CPU1 0x2 /* CPU1 Reset */ - --extern void socfpga_secondary_startup(void); - extern void __iomem *socfpga_scu_base_addr; - - extern void socfpga_init_clocks(void); -diff -Nur linux-4.1.6/arch/arm/mach-socfpga/headsmp.S xbian-sources-kernel/arch/arm/mach-socfpga/headsmp.S ---- linux-4.1.6/arch/arm/mach-socfpga/headsmp.S 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-socfpga/headsmp.S 2015-09-11 17:46:09.046990108 +0200 -@@ -30,8 +30,3 @@ - 1: .long . - .long socfpga_cpu1start_addr - ENTRY(secondary_trampoline_end) -- --ENTRY(socfpga_secondary_startup) -- bl v7_invalidate_l1 -- b secondary_startup --ENDPROC(socfpga_secondary_startup) -diff -Nur linux-4.1.6/arch/arm/mach-socfpga/platsmp.c xbian-sources-kernel/arch/arm/mach-socfpga/platsmp.c ---- linux-4.1.6/arch/arm/mach-socfpga/platsmp.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-socfpga/platsmp.c 2015-09-11 17:46:09.046990108 +0200 -@@ -40,7 +40,7 @@ - - memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size); - -- writel(virt_to_phys(socfpga_secondary_startup), -+ writel(virt_to_phys(secondary_startup), - sys_manager_base_addr + (socfpga_cpu1start_addr & 0x000000ff)); - - flush_cache_all(); -diff -Nur linux-4.1.6/arch/arm/mach-tegra/headsmp.S xbian-sources-kernel/arch/arm/mach-tegra/headsmp.S ---- linux-4.1.6/arch/arm/mach-tegra/headsmp.S 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-tegra/headsmp.S 1970-01-01 01:00:00.000000000 +0100 -@@ -1,12 +0,0 @@ --#include --#include -- --#include "sleep.h" -- -- .section ".text.head", "ax" -- --ENTRY(tegra_secondary_startup) -- check_cpu_part_num 0xc09, r8, r9 -- bleq v7_invalidate_l1 -- b secondary_startup --ENDPROC(tegra_secondary_startup) -diff -Nur linux-4.1.6/arch/arm/mach-tegra/Makefile xbian-sources-kernel/arch/arm/mach-tegra/Makefile ---- linux-4.1.6/arch/arm/mach-tegra/Makefile 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-tegra/Makefile 2015-09-11 17:46:09.050989839 +0200 -@@ -19,7 +19,7 @@ - ifeq ($(CONFIG_CPU_IDLE),y) - obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += cpuidle-tegra30.o - endif --obj-$(CONFIG_SMP) += platsmp.o headsmp.o -+obj-$(CONFIG_SMP) += platsmp.o - obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o - - obj-$(CONFIG_ARCH_TEGRA_114_SOC) += sleep-tegra30.o -diff -Nur linux-4.1.6/arch/arm/mach-tegra/reset.c xbian-sources-kernel/arch/arm/mach-tegra/reset.c ---- linux-4.1.6/arch/arm/mach-tegra/reset.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-tegra/reset.c 2015-09-11 17:46:09.050989839 +0200 -@@ -94,7 +94,7 @@ - __tegra_cpu_reset_handler_data[TEGRA_RESET_MASK_PRESENT] = - *((u32 *)cpu_possible_mask); - __tegra_cpu_reset_handler_data[TEGRA_RESET_STARTUP_SECONDARY] = -- virt_to_phys((void *)tegra_secondary_startup); -+ virt_to_phys((void *)secondary_startup); - #endif - - #ifdef CONFIG_PM_SLEEP -diff -Nur linux-4.1.6/arch/arm/mach-tegra/reset.h xbian-sources-kernel/arch/arm/mach-tegra/reset.h ---- linux-4.1.6/arch/arm/mach-tegra/reset.h 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-tegra/reset.h 2015-09-11 17:46:09.050989839 +0200 -@@ -37,7 +37,6 @@ - void __tegra_cpu_reset_handler(void); - void __tegra20_cpu1_resettable_status_offset(void); - void __tegra_cpu_reset_handler_end(void); --void tegra_secondary_startup(void); - - #ifdef CONFIG_PM_SLEEP - #define tegra_cpu_lp1_mask \ -diff -Nur linux-4.1.6/arch/arm/mach-zynq/common.h xbian-sources-kernel/arch/arm/mach-zynq/common.h ---- linux-4.1.6/arch/arm/mach-zynq/common.h 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-zynq/common.h 2015-09-11 17:46:09.078987966 +0200 -@@ -17,8 +17,6 @@ - #ifndef __MACH_ZYNQ_COMMON_H__ - #define __MACH_ZYNQ_COMMON_H__ - --void zynq_secondary_startup(void); -- - extern int zynq_slcr_init(void); - extern int zynq_early_slcr_init(void); - extern void zynq_slcr_system_reset(void); -diff -Nur linux-4.1.6/arch/arm/mach-zynq/headsmp.S xbian-sources-kernel/arch/arm/mach-zynq/headsmp.S ---- linux-4.1.6/arch/arm/mach-zynq/headsmp.S 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-zynq/headsmp.S 2015-09-11 17:46:09.078987966 +0200 -@@ -22,8 +22,3 @@ - .globl zynq_secondary_trampoline_end - zynq_secondary_trampoline_end: - ENDPROC(zynq_secondary_trampoline) -- --ENTRY(zynq_secondary_startup) -- bl v7_invalidate_l1 -- b secondary_startup --ENDPROC(zynq_secondary_startup) -diff -Nur linux-4.1.6/arch/arm/mach-zynq/platsmp.c xbian-sources-kernel/arch/arm/mach-zynq/platsmp.c ---- linux-4.1.6/arch/arm/mach-zynq/platsmp.c 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mach-zynq/platsmp.c 2015-09-11 17:46:09.078987966 +0200 -@@ -87,10 +87,9 @@ - } - EXPORT_SYMBOL(zynq_cpun_start); - --static int zynq_boot_secondary(unsigned int cpu, -- struct task_struct *idle) -+static int zynq_boot_secondary(unsigned int cpu, struct task_struct *idle) - { -- return zynq_cpun_start(virt_to_phys(zynq_secondary_startup), cpu); -+ return zynq_cpun_start(virt_to_phys(secondary_startup), cpu); - } - - /* -diff -Nur linux-4.1.6/arch/arm/mm/cache-v7.S xbian-sources-kernel/arch/arm/mm/cache-v7.S ---- linux-4.1.6/arch/arm/mm/cache-v7.S 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mm/cache-v7.S 2015-09-11 17:46:09.078987966 +0200 +diff -Nur linux-4.1.10.orig/arch/arm/mm/cache-v7.S linux-4.1.10/arch/arm/mm/cache-v7.S +--- linux-4.1.10.orig/arch/arm/mm/cache-v7.S 2015-10-03 13:49:38.000000000 +0200 ++++ linux-4.1.10/arch/arm/mm/cache-v7.S 2015-10-10 16:41:41.873314826 +0200 @@ -446,3 +446,5 @@ @ define struct cpu_cache_fns (see and proc-macros.S) define_cache_functions v7 + + .long v7_dma_flush_range -diff -Nur linux-4.1.6/arch/arm/mm/proc-v7.S xbian-sources-kernel/arch/arm/mm/proc-v7.S ---- linux-4.1.6/arch/arm/mm/proc-v7.S 2015-08-17 05:52:51.000000000 +0200 -+++ xbian-sources-kernel/arch/arm/mm/proc-v7.S 2015-09-11 17:46:09.090987163 +0200 -@@ -336,7 +336,7 @@ - __v7_setup: - adr r12, __v7_setup_stack @ the local stack - stmia r12, {r0-r5, r7, r9, r11, lr} -- bl v7_flush_dcache_louis -+ bl v7_invalidate_l1 - ldmia r12, {r0-r5, r7, r9, r11, lr} - - mrc p15, 0, r0, c0, c0, 0 @ read main ID register -diff -Nur linux-4.1.6/block/bfq-cgroup.c xbian-sources-kernel/block/bfq-cgroup.c ---- linux-4.1.6/block/bfq-cgroup.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/block/bfq-cgroup.c 2015-09-11 17:46:11.298839361 +0200 +diff -Nur linux-4.1.10.orig/block/bfq-cgroup.c linux-4.1.10/block/bfq-cgroup.c +--- linux-4.1.10.orig/block/bfq-cgroup.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/block/bfq-cgroup.c 2015-10-10 16:41:42.089314835 +0200 @@ -0,0 +1,936 @@ +/* + * BFQ: CGROUPS support. @@ -15463,9 +14995,9 @@ diff -Nur linux-4.1.6/block/bfq-cgroup.c xbian-sources-kernel/block/bfq-cgroup.c + return bfqg; +} +#endif -diff -Nur linux-4.1.6/block/bfq.h xbian-sources-kernel/block/bfq.h ---- linux-4.1.6/block/bfq.h 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/block/bfq.h 2015-09-11 17:46:11.302839093 +0200 +diff -Nur linux-4.1.10.orig/block/bfq.h linux-4.1.10/block/bfq.h +--- linux-4.1.10.orig/block/bfq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/block/bfq.h 2015-10-10 16:41:42.093314836 +0200 @@ -0,0 +1,811 @@ +/* + * BFQ-v7r7 for 4.0.0: data structures and common functions prototypes. @@ -16278,9 +15810,9 @@ diff -Nur linux-4.1.6/block/bfq.h xbian-sources-kernel/block/bfq.h +static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq); + +#endif /* _BFQ_H */ -diff -Nur linux-4.1.6/block/bfq-ioc.c xbian-sources-kernel/block/bfq-ioc.c ---- linux-4.1.6/block/bfq-ioc.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/block/bfq-ioc.c 2015-09-11 17:46:11.298839361 +0200 +diff -Nur linux-4.1.10.orig/block/bfq-ioc.c linux-4.1.10/block/bfq-ioc.c +--- linux-4.1.10.orig/block/bfq-ioc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/block/bfq-ioc.c 2015-10-10 16:41:42.093314836 +0200 @@ -0,0 +1,36 @@ +/* + * BFQ: I/O context handling. @@ -16318,9 +15850,9 @@ diff -Nur linux-4.1.6/block/bfq-ioc.c xbian-sources-kernel/block/bfq-ioc.c + return icq_to_bic(ioc_lookup_icq(ioc, bfqd->queue)); + return NULL; +} -diff -Nur linux-4.1.6/block/bfq-iosched.c xbian-sources-kernel/block/bfq-iosched.c ---- linux-4.1.6/block/bfq-iosched.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/block/bfq-iosched.c 2015-09-11 17:46:11.298839361 +0200 +diff -Nur linux-4.1.10.orig/block/bfq-iosched.c linux-4.1.10/block/bfq-iosched.c +--- linux-4.1.10.orig/block/bfq-iosched.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/block/bfq-iosched.c 2015-10-10 16:41:42.101314834 +0200 @@ -0,0 +1,4223 @@ +/* + * Budget Fair Queueing (BFQ) disk scheduler. @@ -20545,9 +20077,9 @@ diff -Nur linux-4.1.6/block/bfq-iosched.c xbian-sources-kernel/block/bfq-iosched + +MODULE_AUTHOR("Fabio Checconi, Paolo Valente"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.6/block/bfq-sched.c xbian-sources-kernel/block/bfq-sched.c ---- linux-4.1.6/block/bfq-sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ xbian-sources-kernel/block/bfq-sched.c 2015-09-11 17:46:11.302839093 +0200 +diff -Nur linux-4.1.10.orig/block/bfq-sched.c linux-4.1.10/block/bfq-sched.c +--- linux-4.1.10.orig/block/bfq-sched.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.10/block/bfq-sched.c 2015-10-10 16:41:42.101314834 +0200 @@ -0,0 +1,1186