3.19.0-gnu_0loongsonlibre

3 files changed, 6 insertions, 72 deletions

diff --git a/lemote/gnewsense/branches/3.19/3.19-rc6-a74394aab8-loongson-community.patch b/lemote/gnewsense/branches/3.19/3.19-d230a5811d-loongson-community.patch
index dbd22cf0f..f2ceb146a 100644
--- a/lemote/gnewsense/branches/3.19/3.19-rc6-a74394aab8-loongson-community.patch
+++ b/lemote/gnewsense/branches/3.19/3.19-d230a5811d-loongson-community.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 95a0e82..0487243 100644
+index b15036b..5180a92 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -297,8 +297,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -23,7 +23,7 @@ index 95a0e82..0487243 100644
  
  # Tell gcc to never replace conditional load with a non-conditional one
 diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 3289969..b426148d 100644
+index 843713c..e01e4f6 100644
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
 @@ -332,7 +332,7 @@ config LASAT
@@ -156,72 +156,6 @@ index 5a33409..de04ac9 100644
 +		*(.gnu.attributes)
  	}
  }
-diff --git a/arch/mips/include/asm/fpu.h b/arch/mips/include/asm/fpu.h
-index 994d219..5528f4e 100644
---- a/arch/mips/include/asm/fpu.h
-+++ b/arch/mips/include/asm/fpu.h
-@@ -74,8 +74,10 @@ static inline int __enable_fpu(enum fpu_mode mode)
- #endif
- 		/* fall through */
- 	case FPU_32BIT:
--		/* clear FRE */
--		write_c0_config5(read_c0_config5() & ~MIPS_CONF5_FRE);
-+		if (cpu_has_fre) {
-+			/* clear FRE */
-+			write_c0_config5(read_c0_config5() & ~MIPS_CONF5_FRE);
-+		}
- fr_common:
- 		/* set CU1 & change FR appropriately */
- 		fr = (int)mode & FPU_FR_MASK;
-@@ -182,25 +184,34 @@ static inline int init_fpu(void)
- 	int ret = 0;
- 
- 	if (cpu_has_fpu) {
-+		unsigned int config5;
-+
- 		ret = __own_fpu();
--		if (!ret) {
--			unsigned int config5 = read_c0_config5();
--
--			/*
--			 * Ensure FRE is clear whilst running _init_fpu, since
--			 * single precision FP instructions are used. If FRE
--			 * was set then we'll just end up initialising all 32
--			 * 64b registers.
--			 */
--			write_c0_config5(config5 & ~MIPS_CONF5_FRE);
--			enable_fpu_hazard();
-+		if (ret)
-+			return ret;
- 
-+		if (!cpu_has_fre) {
- 			_init_fpu();
- 
--			/* Restore FRE */
--			write_c0_config5(config5);
--			enable_fpu_hazard();
-+			return 0;
- 		}
-+
-+		config5 = read_c0_config5();
-+
-+		/*
-+		 * Ensure FRE is clear whilst running _init_fpu, since
-+		 * single precision FP instructions are used. If FRE
-+		 * was set then we'll just end up initialising all 32
-+		 * 64b registers.
-+		 */
-+		write_c0_config5(config5 & ~MIPS_CONF5_FRE);
-+		enable_fpu_hazard();
-+
-+		_init_fpu();
-+
-+		/* Restore FRE */
-+		write_c0_config5(config5);
-+		enable_fpu_hazard();
- 	} else
- 		fpu_emulator_init_fpu();
- 
 diff --git a/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h b/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h
 index a0ee0cb..4e18add 100644
 --- a/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h
@@ -480,7 +414,7 @@ index 89c2243..6257b9f 100644
  	msub_s_op    =	0x28, msub_d_op	   =  0x29,
  	msub_e_op    =	0x2a, nmadd_s_op   =  0x30,
 diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
-index 6f8db9f..196bb27 100644
+index d07b210..69996f2 100644
 --- a/arch/mips/kernel/scall64-o32.S
 +++ b/arch/mips/kernel/scall64-o32.S
 @@ -26,6 +26,18 @@
diff --git a/lemote/gnewsense/branches/3.19/config.patch b/lemote/gnewsense/branches/3.19/config.patch
index eabba2d6e..b1175b015 100644
--- a/lemote/gnewsense/branches/3.19/config.patch
+++ b/lemote/gnewsense/branches/3.19/config.patch
@@ -1,11 +1,11 @@
 Index: .config
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ .config	2015-02-04 06:32:19.495572815 -0500
++++ .config	2015-02-09 06:14:35.518399963 -0500
 @@ -0,0 +1,5161 @@
 +#
 +# Automatically generated file; DO NOT EDIT.
-+# Linux/mips 3.19.0-rc7-gnu Kernel Configuration
++# Linux/mips 3.19.0-gnu Kernel Configuration
 +#
 +CONFIG_MIPS=y
 +
diff --git a/lemote/gnewsense/branches/3.19/series b/lemote/gnewsense/branches/3.19/series
index 93e403fc0..1cb1ab3f1 100644
--- a/lemote/gnewsense/branches/3.19/series
+++ b/lemote/gnewsense/branches/3.19/series
@@ -1,4 +1,4 @@
-3.19-rc6-a74394aab8-loongson-community.patch -p1 # loongson-community patches
+3.19-d230a5811d-loongson-community.patch -p1 # loongson-community patches
 gnewsense-binutils-flag.patch -p0
 100gnu+freedo.patch -p1 # 100% Freedo[m] GNU+Freedo logo
 config.patch -p0 # config file