3.0.70-gnu_0loongsonlibre

3 files changed, 33 insertions, 7 deletions

diff --git a/lemote/gnewsense/branches/3.0/3.0.67-df393801-loongson-community.patch b/lemote/gnewsense/branches/3.0/3.0.70-32874a3-loongson-community.patch
index 2ab4b4134..e015e55f1 100644
--- a/lemote/gnewsense/branches/3.0/3.0.67-df393801-loongson-community.patch
+++ b/lemote/gnewsense/branches/3.0/3.0.70-32874a3-loongson-community.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 7d4347a..1af2c06 100644
+index 6754172..da371e4 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -245,8 +245,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -2905,6 +2905,32 @@ index 4321338..8575995 100644
  #endif
  
  #endif /* __ASM_MACH_LOONGSON_MACHINE_H */
+diff --git a/arch/mips/include/asm/signal.h b/arch/mips/include/asm/signal.h
+index c783f36..49abd51 100644
+--- a/arch/mips/include/asm/signal.h
++++ b/arch/mips/include/asm/signal.h
+@@ -72,6 +72,12 @@ typedef unsigned long old_sigset_t;		/* at least 32 bits */
+  *
+  * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
+  * Unix names RESETHAND and NODEFER respectively.
++ *
++ * SA_RESTORER used to be defined as 0x04000000 but only the O32 ABI ever
++ * supported its use and no libc was using it, so the entire sa-restorer
++ * functionality was removed with lmo commit 39bffc12c3580ab for 2.5.48
++ * retaining only the SA_RESTORER definition as a reminder to avoid
++ * accidental reuse of the mask bit.
+  */
+ #define SA_ONSTACK	0x08000000
+ #define SA_RESETHAND	0x80000000
+@@ -84,8 +90,6 @@ typedef unsigned long old_sigset_t;		/* at least 32 bits */
+ #define SA_NOMASK	SA_NODEFER
+ #define SA_ONESHOT	SA_RESETHAND
+ 
+-#define SA_RESTORER	0x04000000	/* Only for o32 */
+-
+ /*
+  * sigaltstack controls
+  */
 diff --git a/arch/mips/include/asm/timex.h b/arch/mips/include/asm/timex.h
 index 6529704..bf6a701 100644
 --- a/arch/mips/include/asm/timex.h
@@ -48506,7 +48532,7 @@ index 0f097d3..d7bead0 100644
  static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
  {
 diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index 24a3ea6..2d0a85a 100644
+index 4418538..78fc8f8 100644
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
 @@ -79,6 +79,9 @@ static void option_instat_callback(struct urb *urb);
@@ -48519,14 +48545,14 @@ index 24a3ea6..2d0a85a 100644
  #define HUAWEI_VENDOR_ID			0x12D1
  #define HUAWEI_PRODUCT_E173			0x140C
  #define HUAWEI_PRODUCT_K4505			0x1464
-@@ -578,6 +581,7 @@ static const struct usb_device_id option_ids[] = {
+@@ -580,6 +583,7 @@ static const struct usb_device_id option_ids[] = {
  	{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
  	{ USB_DEVICE(QUANTA_VENDOR_ID, 0xea42),
  		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
 +	{ USB_DEVICE(HUAWO_VENDOR_ID, HUAWO_PRODUCT_E1621) },	/* QUANTA 6500 chips, Unicom extensive use of this card */
  	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c05, USB_CLASS_COMM, 0x02, 0xff) },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c1f, USB_CLASS_COMM, 0x02, 0xff) },
  	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff),
 diff --git a/drivers/video/Makefile b/drivers/video/Makefile
 index 8b83129..a19e44e 100644
 --- a/drivers/video/Makefile
diff --git a/lemote/gnewsense/branches/3.0/config.patch b/lemote/gnewsense/branches/3.0/config.patch
index 765c97f21..e4ac63530 100644
--- a/lemote/gnewsense/branches/3.0/config.patch
+++ b/lemote/gnewsense/branches/3.0/config.patch
@@ -1,11 +1,11 @@
 Index: .config
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ .config	2013-03-15 19:58:54.000000000 +0000
++++ .config	2013-03-27 08:14:16.000000000 +0000
 @@ -0,0 +1,4595 @@
 +#
 +# Automatically generated make config: don't edit
-+# Linux/mips 3.0.69-gnu Kernel Configuration
++# Linux/mips 3.0.70-gnu Kernel Configuration
 +#
 +CONFIG_MIPS=y
 +
diff --git a/lemote/gnewsense/branches/3.0/series b/lemote/gnewsense/branches/3.0/series
index 50d8eb1c2..a9865cb05 100644
--- a/lemote/gnewsense/branches/3.0/series
+++ b/lemote/gnewsense/branches/3.0/series
@@ -1,4 +1,4 @@
-3.0.67-df393801-loongson-community.patch -p1 # loongson-community patches
+3.0.70-32874a3-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