summaryrefslogtreecommitdiff
path: root/target/linux/x86/patches-3.7
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-12-18 15:13:31 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-12-18 15:13:31 +0000
commit8903f8581b25e9ba7eb7ce2e7a246f9dc59fbc64 (patch)
tree3df2b47f3587083c82f47e68c586d41cc2c663ba /target/linux/x86/patches-3.7
parentb2caa5db248f8a212de2c0adc9835d2949db75ff (diff)
downloadmtk-20170518-8903f8581b25e9ba7eb7ce2e7a246f9dc59fbc64.zip
mtk-20170518-8903f8581b25e9ba7eb7ce2e7a246f9dc59fbc64.tar.gz
mtk-20170518-8903f8581b25e9ba7eb7ce2e7a246f9dc59fbc64.tar.bz2
kernel: update linux 3.7 to 3.7.1
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 34760
Diffstat (limited to 'target/linux/x86/patches-3.7')
-rw-r--r--target/linux/x86/patches-3.7/009-rdc321x_select_embedded.patch2
-rw-r--r--target/linux/x86/patches-3.7/010-rdc_cpu_ident.patch6
-rw-r--r--target/linux/x86/patches-3.7/012-export_erase_write.patch2
-rw-r--r--target/linux/x86/patches-3.7/100-rdc_boards.patch2
-rw-r--r--target/linux/x86/patches-3.7/120-panic_on_unrecovered_nmi.patch4
-rw-r--r--target/linux/x86/patches-3.7/150-pit-tick-rate.patch5
6 files changed, 10 insertions, 11 deletions
diff --git a/target/linux/x86/patches-3.7/009-rdc321x_select_embedded.patch b/target/linux/x86/patches-3.7/009-rdc321x_select_embedded.patch
index 2d094fc..0fd519a 100644
--- a/target/linux/x86/patches-3.7/009-rdc321x_select_embedded.patch
+++ b/target/linux/x86/patches-3.7/009-rdc321x_select_embedded.patch
@@ -1,6 +1,6 @@
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -466,6 +466,8 @@ config X86_RDC321X
+@@ -462,6 +462,8 @@ config X86_RDC321X
depends on X86_EXTENDED_PLATFORM
select M486
select X86_REBOOTFIXUPS
diff --git a/target/linux/x86/patches-3.7/010-rdc_cpu_ident.patch b/target/linux/x86/patches-3.7/010-rdc_cpu_ident.patch
index 0f2314a..88e3482 100644
--- a/target/linux/x86/patches-3.7/010-rdc_cpu_ident.patch
+++ b/target/linux/x86/patches-3.7/010-rdc_cpu_ident.patch
@@ -72,7 +72,7 @@
+
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -464,6 +464,7 @@ config X86_RDC321X
+@@ -460,6 +460,7 @@ config X86_RDC321X
bool "RDC R-321x SoC"
depends on X86_32
depends on X86_EXTENDED_PLATFORM
@@ -82,7 +82,7 @@
select EMBEDDED
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
-@@ -119,7 +119,8 @@ struct cpuinfo_x86 {
+@@ -141,7 +141,8 @@ struct cpuinfo_x86 {
#define X86_VENDOR_CENTAUR 5
#define X86_VENDOR_TRANSMETA 7
#define X86_VENDOR_NSC 8
@@ -94,7 +94,7 @@
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix
+@@ -27,6 +27,7 @@ obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix
obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o
obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o
obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o
diff --git a/target/linux/x86/patches-3.7/012-export_erase_write.patch b/target/linux/x86/patches-3.7/012-export_erase_write.patch
index 893d4d8..0dba19c 100644
--- a/target/linux/x86/patches-3.7/012-export_erase_write.patch
+++ b/target/linux/x86/patches-3.7/012-export_erase_write.patch
@@ -11,7 +11,7 @@
struct erase_info erase;
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
-@@ -530,6 +530,9 @@ extern void register_mtd_user (struct mt
+@@ -396,6 +396,9 @@ extern void register_mtd_user (struct mt
extern int unregister_mtd_user (struct mtd_notifier *old);
void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size);
diff --git a/target/linux/x86/patches-3.7/100-rdc_boards.patch b/target/linux/x86/patches-3.7/100-rdc_boards.patch
index 958bee0..48c42f7 100644
--- a/target/linux/x86/patches-3.7/100-rdc_boards.patch
+++ b/target/linux/x86/patches-3.7/100-rdc_boards.patch
@@ -1,6 +1,6 @@
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
-@@ -136,6 +136,9 @@ libs-y += arch/x86/lib/
+@@ -163,6 +163,9 @@ libs-y += arch/x86/lib/
# See arch/x86/Kbuild for content of core part of the kernel
core-y += arch/x86/
diff --git a/target/linux/x86/patches-3.7/120-panic_on_unrecovered_nmi.patch b/target/linux/x86/patches-3.7/120-panic_on_unrecovered_nmi.patch
index 6a1279c..5f870e8 100644
--- a/target/linux/x86/patches-3.7/120-panic_on_unrecovered_nmi.patch
+++ b/target/linux/x86/patches-3.7/120-panic_on_unrecovered_nmi.patch
@@ -7,5 +7,5 @@
+ panic_on_unrecovered_nmi = 1;
+
return mfd_add_devices(&pdev->dev, -1,
- rdc321x_sb_cells, ARRAY_SIZE(rdc321x_sb_cells), NULL, 0);
- }
+ rdc321x_sb_cells, ARRAY_SIZE(rdc321x_sb_cells),
+ NULL, 0, NULL);
diff --git a/target/linux/x86/patches-3.7/150-pit-tick-rate.patch b/target/linux/x86/patches-3.7/150-pit-tick-rate.patch
index 5af3cef..673453c 100644
--- a/target/linux/x86/patches-3.7/150-pit-tick-rate.patch
+++ b/target/linux/x86/patches-3.7/150-pit-tick-rate.patch
@@ -1,6 +1,6 @@
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
-@@ -274,7 +274,11 @@ extern void hardpps(const struct timespe
+@@ -150,6 +150,10 @@ extern void hardpps(const struct timespe
int read_current_timer(unsigned long *timer_val);
/* The clock frequency of the i8253/i8254 PIT */
@@ -10,5 +10,4 @@
#define PIT_TICK_RATE 1193182ul
+#endif
- #endif /* KERNEL */
-
+ #endif /* LINUX_TIMEX_H */