projects
/
openwrt
/
staging
/
wigyori.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
be55b0f
)
kernel: update linux 3.7 to 3.7.5
author
Gabor Juhos
<juhosg@openwrt.org>
Tue, 29 Jan 2013 18:29:45 +0000
(18:29 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Tue, 29 Jan 2013 18:29:45 +0000
(18:29 +0000)
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35390
33 files changed:
include/kernel-version.mk
patch
|
blob
|
history
target/linux/adm5120/Makefile
patch
|
blob
|
history
target/linux/ar71xx/Makefile
patch
|
blob
|
history
target/linux/ar71xx/patches-3.7/169-MIPS-ath79-allow-to-specify-bus-number-in-PCI-IRQ-ma.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-3.7/170-MIPS-ath79-add-PCI-controller-registration-code-for-.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-3.7/203-spi-ath79-use-gpio_request_one.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-3.7/204-spi-ath79-avoid-multiple-initialization-of-the-SPI-c.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-3.7/206-spi-ath79-make-chipselect-logic-more-flexible.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-3.7/212-MIPS-ath79-fix-GPIO-function-selection-for-AR934x-So.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-3.7/406-mtd-m25p80-allow-to-specify-max-read-size.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-3.7/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-3.7/412-mtd-m25p80-zero-partition-parser-data.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-3.7/505-MIPS-ath79-add-ath79_gpio_function_select.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-3.7/521-MIPS-ath79-enable-UART-for-early_serial.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-3.7/606-MIPS-ath79-pb44-fixes.patch
patch
|
blob
|
history
target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch
patch
|
blob
|
history
target/linux/cns21xx/Makefile
patch
|
blob
|
history
target/linux/generic/patches-3.7/010-mtd_mp25p80_add_gd25q32_gd25q64.patch
patch
|
blob
|
history
target/linux/generic/patches-3.7/340-module_alloc_size_check.patch
patch
|
blob
|
history
target/linux/generic/patches-3.7/470-mtd_m25p80_add_pm25lv_flash_support.patch
patch
|
blob
|
history
target/linux/generic/patches-3.7/473-mtd_m25p80_add_w25q128.patch
patch
|
blob
|
history
target/linux/generic/patches-3.7/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
patch
|
blob
|
history
target/linux/generic/patches-3.7/920-unable_to_open_console.patch
patch
|
blob
|
history
target/linux/generic/patches-3.7/950-vm_exports.patch
patch
|
blob
|
history
target/linux/lantiq/Makefile
patch
|
blob
|
history
target/linux/lantiq/patches-3.7/0301-gptu.patch
patch
|
blob
|
history
target/linux/malta/Makefile
patch
|
blob
|
history
target/linux/mpc83xx/Makefile
patch
|
blob
|
history
target/linux/ppc40x/Makefile
patch
|
blob
|
history
target/linux/ppc44x/Makefile
patch
|
blob
|
history
target/linux/ramips/Makefile
patch
|
blob
|
history
target/linux/rb532/Makefile
patch
|
blob
|
history
target/linux/x86/geos/target.mk
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index f3d8aeda6cfb037941f74acb269e78ea82b7daab..d5feae3a0793ed4ee173d24ee7b357aa9948dc98 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-8,8
+8,8
@@
endif
ifeq ($(LINUX_VERSION),3.6.11)
LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54
endif
ifeq ($(LINUX_VERSION),3.6.11)
LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54
endif
-ifeq ($(LINUX_VERSION),3.7.
4
)
- LINUX_KERNEL_MD5SUM:=
b34c31c954bebdfb568244dd3897e7c6
+ifeq ($(LINUX_VERSION),3.7.
5
)
+ LINUX_KERNEL_MD5SUM:=
ae355001775bc841132fe0fea2f354d4
endif
# disable the md5sum check for unknown kernel versions
endif
# disable the md5sum check for unknown kernel versions
diff --git
a/target/linux/adm5120/Makefile
b/target/linux/adm5120/Makefile
index bf8fc986e885a719b06c3ae3e43690fa064a0461..fe919dad988009befcab0a784b8cc052408aa4c0 100644
(file)
--- a/
target/linux/adm5120/Makefile
+++ b/
target/linux/adm5120/Makefile
@@
-9,7
+9,7
@@
include $(TOPDIR)/rules.mk
BOARD:=adm5120
BOARDNAME:=Infineon/ADMtek ADM5120
BOARD:=adm5120
BOARDNAME:=Infineon/ADMtek ADM5120
-LINUX_VERSION:=3.7.
4
+LINUX_VERSION:=3.7.
5
SUBTARGETS:=router_le router_be rb1xx
INITRAMFS_EXTRA_FILES:=
SUBTARGETS:=router_le router_be rb1xx
INITRAMFS_EXTRA_FILES:=
diff --git
a/target/linux/ar71xx/Makefile
b/target/linux/ar71xx/Makefile
index a5412b5a0299c8764aec3b63a8fcbf06b62a2351..315db0ec91d3393e050ef04ccbbb5592148d096b 100644
(file)
--- a/
target/linux/ar71xx/Makefile
+++ b/
target/linux/ar71xx/Makefile
@@
-13,7
+13,7
@@
FEATURES:=squashfs jffs2 targz
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely
SUBTARGETS:=generic nand
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely
SUBTARGETS:=generic nand
-LINUX_VERSION:=3.7.
4
+LINUX_VERSION:=3.7.
5
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/ar71xx/patches-3.7/169-MIPS-ath79-allow-to-specify-bus-number-in-PCI-IRQ-ma.patch
b/target/linux/ar71xx/patches-3.7/169-MIPS-ath79-allow-to-specify-bus-number-in-PCI-IRQ-ma.patch
index 89ab5ace6958950b95c58cf1733d33b277092fbf..bd95d718b2c1e271fde250818e51da357db7a500 100644
(file)
--- a/
target/linux/ar71xx/patches-3.7/169-MIPS-ath79-allow-to-specify-bus-number-in-PCI-IRQ-ma.patch
+++ b/
target/linux/ar71xx/patches-3.7/169-MIPS-ath79-allow-to-specify-bus-number-in-PCI-IRQ-ma.patch
@@
-11,7
+11,7
@@
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/arch/mips/ath79/pci.c
+++ b/arch/mips/ath79/pci.c
--- a/arch/mips/ath79/pci.c
+++ b/arch/mips/ath79/pci.c
-@@ -75,7 +75,9 @@ int __init pcibios_map_irq(const struct
+@@ -75,7 +75,9 @@ int __init pcibios_map_irq(const struct
const struct ath79_pci_irq *entry;
entry = &ath79_pci_irq_map[i];
const struct ath79_pci_irq *entry;
entry = &ath79_pci_irq_map[i];
diff --git
a/target/linux/ar71xx/patches-3.7/170-MIPS-ath79-add-PCI-controller-registration-code-for-.patch
b/target/linux/ar71xx/patches-3.7/170-MIPS-ath79-add-PCI-controller-registration-code-for-.patch
index 5c6388c455b18c5ac74eb054da4b6fa58b6149d8..0c3889fdb9892cc3c3dddc19987137089c71ec7f 100644
(file)
--- a/
target/linux/ar71xx/patches-3.7/170-MIPS-ath79-add-PCI-controller-registration-code-for-.patch
+++ b/
target/linux/ar71xx/patches-3.7/170-MIPS-ath79-add-PCI-controller-registration-code-for-.patch
@@
-44,7
+44,7
@@
Subject: [PATCH 26/34] MIPS: ath79: add PCI controller registration code for the
int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
{
int irq = -1;
int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
{
int irq = -1;
-@@ -64,6 +79,9 @@ int __init pcibios_map_irq(const struct
+@@ -64,6 +79,9 @@ int __init pcibios_map_irq(const struct
soc_is_ar9344()) {
ath79_pci_irq_map = ar724x_pci_irq_map;
ath79_pci_nr_irqs = ARRAY_SIZE(ar724x_pci_irq_map);
soc_is_ar9344()) {
ath79_pci_irq_map = ar724x_pci_irq_map;
ath79_pci_nr_irqs = ARRAY_SIZE(ar724x_pci_irq_map);
diff --git
a/target/linux/ar71xx/patches-3.7/203-spi-ath79-use-gpio_request_one.patch
b/target/linux/ar71xx/patches-3.7/203-spi-ath79-use-gpio_request_one.patch
index a7329b2ab79291dad1ececaf4f4d9b6926cdc689..12559bcae1cda8c3e39f2ca4b675766e098122f8 100644
(file)
--- a/
target/linux/ar71xx/patches-3.7/203-spi-ath79-use-gpio_request_one.patch
+++ b/
target/linux/ar71xx/patches-3.7/203-spi-ath79-use-gpio_request_one.patch
@@
-32,18
+32,19
@@
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
- status = gpio_request(cdata->gpio, dev_name(&spi->dev));
- if (status)
- return status;
- status = gpio_request(cdata->gpio, dev_name(&spi->dev));
- if (status)
- return status;
-+ flags = GPIOF_DIR_OUT;
-+ if (spi->mode & SPI_CS_HIGH)
-+ flags |= GPIOF_INIT_HIGH;
-+ else
-+ flags |= GPIOF_INIT_LOW;
-
+-
- status = gpio_direction_output(cdata->gpio,
- spi->mode & SPI_CS_HIGH);
- if (status) {
- gpio_free(cdata->gpio);
- return status;
- }
- status = gpio_direction_output(cdata->gpio,
- spi->mode & SPI_CS_HIGH);
- if (status) {
- gpio_free(cdata->gpio);
- return status;
- }
++ flags = GPIOF_DIR_OUT;
++ if (spi->mode & SPI_CS_HIGH)
++ flags |= GPIOF_INIT_HIGH;
++ else
++ flags |= GPIOF_INIT_LOW;
++
+ status = gpio_request_one(cdata->gpio, flags,
+ dev_name(&spi->dev));
}
+ status = gpio_request_one(cdata->gpio, flags,
+ dev_name(&spi->dev));
}
diff --git
a/target/linux/ar71xx/patches-3.7/204-spi-ath79-avoid-multiple-initialization-of-the-SPI-c.patch
b/target/linux/ar71xx/patches-3.7/204-spi-ath79-avoid-multiple-initialization-of-the-SPI-c.patch
index 976159c6f9ba777867b2a07b1f9c81bac959e0bb..c6f4b2b95960ca76a9f2becc52d071feb8a0ef4d 100644
(file)
--- a/
target/linux/ar71xx/patches-3.7/204-spi-ath79-avoid-multiple-initialization-of-the-SPI-c.patch
+++ b/
target/linux/ar71xx/patches-3.7/204-spi-ath79-avoid-multiple-initialization-of-the-SPI-c.patch
@@
-20,7
+20,7
@@
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
-@@ -96,16 +96,8 @@ static void ath79_spi_chipselect(struct
+@@ -96,16 +96,8 @@ static void ath79_spi_chipselect(struct
}
}
diff --git
a/target/linux/ar71xx/patches-3.7/206-spi-ath79-make-chipselect-logic-more-flexible.patch
b/target/linux/ar71xx/patches-3.7/206-spi-ath79-make-chipselect-logic-more-flexible.patch
index da83e2ebe8508f7c81f78ebf076d7548f28b58b1..34df1756bbce82e3f6b9f10683cc27256e928f6e 100644
(file)
--- a/
target/linux/ar71xx/patches-3.7/206-spi-ath79-make-chipselect-logic-more-flexible.patch
+++ b/
target/linux/ar71xx/patches-3.7/206-spi-ath79-make-chipselect-logic-more-flexible.patch
@@
-170,7
+170,7
@@
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
struct ath79_spi {
struct spi_bitbang bitbang;
u32 ioc_base;
struct ath79_spi {
struct spi_bitbang bitbang;
u32 ioc_base;
-@@ -69,6 +71,7 @@ static void ath79_spi_chipselect(struct
+@@ -69,6 +71,7 @@ static void ath79_spi_chipselect(struct
{
struct ath79_spi *sp = ath79_spidev_to_sp(spi);
int cs_high = (spi->mode & SPI_CS_HIGH) ? is_active : !is_active;
{
struct ath79_spi *sp = ath79_spidev_to_sp(spi);
int cs_high = (spi->mode & SPI_CS_HIGH) ? is_active : !is_active;
@@
-178,7
+178,7
@@
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
if (is_active) {
/* set initial clock polarity */
if (is_active) {
/* set initial clock polarity */
-@@ -80,20 +83,24 @@ static void ath79_spi_chipselect(struct
+@@ -80,20 +83,24 @@ static void ath79_spi_chipselect(struct
ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
}
ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
}
diff --git
a/target/linux/ar71xx/patches-3.7/212-MIPS-ath79-fix-GPIO-function-selection-for-AR934x-So.patch
b/target/linux/ar71xx/patches-3.7/212-MIPS-ath79-fix-GPIO-function-selection-for-AR934x-So.patch
index 3e41789bf8776d65e537072b48d7c5980c6d272a..a9845baba8f6655d0056308f54128cb9782228aa 100644
(file)
--- a/
target/linux/ar71xx/patches-3.7/212-MIPS-ath79-fix-GPIO-function-selection-for-AR934x-So.patch
+++ b/
target/linux/ar71xx/patches-3.7/212-MIPS-ath79-fix-GPIO-function-selection-for-AR934x-So.patch
@@
-19,7
+19,7
@@
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/arch/mips/ath79/gpio.c
+++ b/arch/mips/ath79/gpio.c
--- a/arch/mips/ath79/gpio.c
+++ b/arch/mips/ath79/gpio.c
-@@ -137,47 +137,61 @@ static struct gpio_chip ath79_gpio_chip
+@@ -137,47 +137,61 @@ static struct gpio_chip ath79_gpio_chip
.base = 0,
};
.base = 0,
};
diff --git
a/target/linux/ar71xx/patches-3.7/406-mtd-m25p80-allow-to-specify-max-read-size.patch
b/target/linux/ar71xx/patches-3.7/406-mtd-m25p80-allow-to-specify-max-read-size.patch
index b80a32ac24ce3e692bc1497bb858997cde4fd692..30d4fcd3edda457ed9d2fe2c744ab131cfb1008e 100644
(file)
--- a/
target/linux/ar71xx/patches-3.7/406-mtd-m25p80-allow-to-specify-max-read-size.patch
+++ b/
target/linux/ar71xx/patches-3.7/406-mtd-m25p80-allow-to-specify-max-read-size.patch
@@
-84,7
+84,7
@@
mutex_unlock(&flash->lock);
mutex_unlock(&flash->lock);
-@@ -91
0,6 +936
,12 @@ static int __devinit m25p_probe(struct s
+@@ -91
4,6 +940
,12 @@ static int __devinit m25p_probe(struct s
flash->mtd._erase = m25p80_erase;
flash->mtd._read = m25p80_read;
flash->mtd._erase = m25p80_erase;
flash->mtd._read = m25p80_read;
diff --git
a/target/linux/ar71xx/patches-3.7/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
b/target/linux/ar71xx/patches-3.7/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
index 707b49d585a0209543d6fa224fcff30c1d221981..7f35b23a600805b4825f5dba00f1c40427221a93 100644
(file)
--- a/
target/linux/ar71xx/patches-3.7/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
+++ b/
target/linux/ar71xx/patches-3.7/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
@@
-1,6
+1,6
@@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -100
3,7 +1003
,9 @@ static int __devinit m25p_probe(struct s
+@@ -100
7,7 +1007
,9 @@ static int __devinit m25p_probe(struct s
/* partitions should match sector boundaries; and it may be good to
* use readonly partitions for writeprotected sectors (BP2..BP0).
*/
/* partitions should match sector boundaries; and it may be good to
* use readonly partitions for writeprotected sectors (BP2..BP0).
*/
diff --git
a/target/linux/ar71xx/patches-3.7/412-mtd-m25p80-zero-partition-parser-data.patch
b/target/linux/ar71xx/patches-3.7/412-mtd-m25p80-zero-partition-parser-data.patch
index a3c7ebc9977aaa6aa92cea4d7fc55f309cf0d8a5..7d49362b7a8a515cbee674c5292d8187e35bb32a 100644
(file)
--- a/
target/linux/ar71xx/patches-3.7/412-mtd-m25p80-zero-partition-parser-data.patch
+++ b/
target/linux/ar71xx/patches-3.7/412-mtd-m25p80-zero-partition-parser-data.patch
@@
-1,6
+1,6
@@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -96
3,6 +963
,7 @@ static int __devinit m25p_probe(struct s
+@@ -96
7,6 +967
,7 @@ static int __devinit m25p_probe(struct s
if (info->flags & M25P_NO_ERASE)
flash->mtd.flags |= MTD_NO_ERASE;
if (info->flags & M25P_NO_ERASE)
flash->mtd.flags |= MTD_NO_ERASE;
diff --git
a/target/linux/ar71xx/patches-3.7/505-MIPS-ath79-add-ath79_gpio_function_select.patch
b/target/linux/ar71xx/patches-3.7/505-MIPS-ath79-add-ath79_gpio_function_select.patch
index 08f4a1e95cb05612313231f39468e66f883ecbf2..86e136f67ec3730a4468843ef57a52f534ade544 100644
(file)
--- a/
target/linux/ar71xx/patches-3.7/505-MIPS-ath79-add-ath79_gpio_function_select.patch
+++ b/
target/linux/ar71xx/patches-3.7/505-MIPS-ath79-add-ath79_gpio_function_select.patch
@@
-10,7
+10,7
@@
#endif /* __ATH79_COMMON_H */
--- a/arch/mips/ath79/gpio.c
+++ b/arch/mips/ath79/gpio.c
#endif /* __ATH79_COMMON_H */
--- a/arch/mips/ath79/gpio.c
+++ b/arch/mips/ath79/gpio.c
-@@ -198,6 +198,34 @@ void ath79_gpio_function_setup(u32 set,
+@@ -198,6 +198,34 @@ void ath79_gpio_function_setup(u32 set,
spin_unlock_irqrestore(&ath79_gpio_lock, flags);
}
spin_unlock_irqrestore(&ath79_gpio_lock, flags);
}
diff --git
a/target/linux/ar71xx/patches-3.7/521-MIPS-ath79-enable-UART-for-early_serial.patch
b/target/linux/ar71xx/patches-3.7/521-MIPS-ath79-enable-UART-for-early_serial.patch
index 2ee025bbf2079fa3ad73fa013991b52a62c32511..489bc967380cb89bb7826d1d05e78fbfe814d16e 100644
(file)
--- a/
target/linux/ar71xx/patches-3.7/521-MIPS-ath79-enable-UART-for-early_serial.patch
+++ b/
target/linux/ar71xx/patches-3.7/521-MIPS-ath79-enable-UART-for-early_serial.patch
@@
-1,6
+1,6
@@
--- a/arch/mips/ath79/early_printk.c
+++ b/arch/mips/ath79/early_printk.c
--- a/arch/mips/ath79/early_printk.c
+++ b/arch/mips/ath79/early_printk.c
-@@ -56,6 +56,46 @@ static void prom_putchar_dummy(unsigned
+@@ -56,6 +56,46 @@ static void prom_putchar_dummy(unsigned
/* nothing to do */
}
/* nothing to do */
}
diff --git
a/target/linux/ar71xx/patches-3.7/606-MIPS-ath79-pb44-fixes.patch
b/target/linux/ar71xx/patches-3.7/606-MIPS-ath79-pb44-fixes.patch
index b38b46121ded4083fe63eae2241156d7f7c32eab..f9ec7753f1aa75c5be2321bd071253217c37f24a 100644
(file)
--- a/
target/linux/ar71xx/patches-3.7/606-MIPS-ath79-pb44-fixes.patch
+++ b/
target/linux/ar71xx/patches-3.7/606-MIPS-ath79-pb44-fixes.patch
@@
-50,7
+50,7
@@
#define PB44_GPIO_SW_RESET (PB44_GPIO_EXP_BASE + 6)
#define PB44_GPIO_SW_JUMP (PB44_GPIO_EXP_BASE + 8)
#define PB44_GPIO_LED_JUMP1 (PB44_GPIO_EXP_BASE + 9)
#define PB44_GPIO_SW_RESET (PB44_GPIO_EXP_BASE + 6)
#define PB44_GPIO_SW_JUMP (PB44_GPIO_EXP_BASE + 8)
#define PB44_GPIO_LED_JUMP1 (PB44_GPIO_EXP_BASE + 9)
-@@ -92,21 +117,66 @@ static struct ath79_spi_controller_data
+@@ -92,21 +117,66 @@ static struct ath79_spi_controller_data
.cs_line = 0,
};
.cs_line = 0,
};
diff --git
a/target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch
b/target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch
index fc05676b83491e7e0f2148fb6d0769ef1a426530..e7e1712b7ee2d33b4b81703b5f2b20364293f261 100644
(file)
--- a/
target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch
+++ b/
target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch
@@
-288,7
+288,7
@@
#include <asm/uaccess.h>
#include <linux/proc_fs.h>
#include <asm/uaccess.h>
#include <linux/proc_fs.h>
-@@ -851,10 +852,10 @@ static void tcp_v6_send_response(struct
+@@ -851,10 +852,10 @@ static void tcp_v6_send_response(struct
topt = (__be32 *)(t1 + 1);
if (ts) {
topt = (__be32 *)(t1 + 1);
if (ts) {
@@
-415,7
+415,7
@@
if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
fl6.flowi6_mark = skb->mark;
if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
fl6.flowi6_mark = skb->mark;
-@@ -1256,7 +1256,7 @@ static int ip6gre_header(struct sk_buff
+@@ -1256,7 +1256,7 @@ static int ip6gre_header(struct sk_buff
struct ipv6hdr *ipv6h = (struct ipv6hdr *)skb_push(skb, t->hlen);
__be16 *p = (__be16 *)(ipv6h+1);
struct ipv6hdr *ipv6h = (struct ipv6hdr *)skb_push(skb, t->hlen);
__be16 *p = (__be16 *)(ipv6h+1);
diff --git
a/target/linux/cns21xx/Makefile
b/target/linux/cns21xx/Makefile
index 7e56e91d3925fbf721b8b4fdfdf178f52e856db6..630d8d20e74f2c6ea9aca6852eb3a0259d0d4dc8 100644
(file)
--- a/
target/linux/cns21xx/Makefile
+++ b/
target/linux/cns21xx/Makefile
@@
-12,7
+12,7
@@
BOARDNAME:=Cavium Networks Econa CNS21xx
FEATURES:=squashfs
CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves
FEATURES:=squashfs
CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves
-LINUX_VERSION:=3.7.
4
+LINUX_VERSION:=3.7.
5
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/generic/patches-3.7/010-mtd_mp25p80_add_gd25q32_gd25q64.patch
b/target/linux/generic/patches-3.7/010-mtd_mp25p80_add_gd25q32_gd25q64.patch
index ddc27b104ebef2aaaf3c3e715ceb2da4f9754adc..4af122e119920ec3e14ff543b25f975e86e73372 100644
(file)
--- a/
target/linux/generic/patches-3.7/010-mtd_mp25p80_add_gd25q32_gd25q64.patch
+++ b/
target/linux/generic/patches-3.7/010-mtd_mp25p80_add_gd25q32_gd25q64.patch
@@
-1,8
+1,8
@@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -6
51,6 +651,10 @@
+@@ -6
45,6 +645,10 @@ static const struct spi_device_id m25p_i
/* Everspin */
/* Everspin */
- { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2) },
+ { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2) },
+ /* GigaDevice */
+ { "gd25q32", INFO(0xc84016, 0, 64 * 1024, 64, SECT_4K) },
+ /* GigaDevice */
+ { "gd25q32", INFO(0xc84016, 0, 64 * 1024, 64, SECT_4K) },
diff --git
a/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch
b/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch
index 2459b6183d38dfa57adbf6f862d9f873de79ff44..99411ac735119cbd2ff72d7155e52478d4315802 100644
(file)
--- a/
target/linux/generic/patches-3.7/340-module_alloc_size_check.patch
+++ b/
target/linux/generic/patches-3.7/340-module_alloc_size_check.patch
@@
-1,6
+1,6
@@
--- a/kernel/module.c
+++ b/kernel/module.c
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -23
78,12 +237
8,15 @@ static void dynamic_debug_remove(struct
+@@ -23
98,12 +239
8,15 @@ static void dynamic_debug_remove(struct
void * __weak module_alloc(unsigned long size)
{
void * __weak module_alloc(unsigned long size)
{
diff --git
a/target/linux/generic/patches-3.7/470-mtd_m25p80_add_pm25lv_flash_support.patch
b/target/linux/generic/patches-3.7/470-mtd_m25p80_add_pm25lv_flash_support.patch
index 5ad1713461eb0ae8d1a03b05cf906a4bfaea7ffd..28e2fa80cafd6b153948b45d16aa76f3cc616337 100644
(file)
--- a/
target/linux/generic/patches-3.7/470-mtd_m25p80_add_pm25lv_flash_support.patch
+++ b/
target/linux/generic/patches-3.7/470-mtd_m25p80_add_pm25lv_flash_support.patch
@@
-16,7
+16,7
@@
};
#define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags) \
};
#define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags) \
-@@ -6
67,6 +669
,10 @@ static const struct spi_device_id m25p_i
+@@ -6
71,6 +673
,10 @@ static const struct spi_device_id m25p_i
{ "n25q128", INFO(0x20ba18, 0, 64 * 1024, 256, 0) },
{ "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) },
{ "n25q128", INFO(0x20ba18, 0, 64 * 1024, 256, 0) },
{ "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) },
@@
-27,7
+27,7
@@
/* Spansion -- single (large) sector size only, at least
* for the chips listed here (without boot sectors).
*/
/* Spansion -- single (large) sector size only, at least
* for the chips listed here (without boot sectors).
*/
-@@ -9
07,6 +913
,9 @@ static int __devinit m25p_probe(struct s
+@@ -9
11,6 +917
,9 @@ static int __devinit m25p_probe(struct s
if (info->flags & SECT_4K) {
flash->erase_opcode = OPCODE_BE_4K;
flash->mtd.erasesize = 4096;
if (info->flags & SECT_4K) {
flash->erase_opcode = OPCODE_BE_4K;
flash->mtd.erasesize = 4096;
diff --git
a/target/linux/generic/patches-3.7/473-mtd_m25p80_add_w25q128.patch
b/target/linux/generic/patches-3.7/473-mtd_m25p80_add_w25q128.patch
index 7466f3b874c5d670d777db420ffe421d540241e3..293b6f21b5ffb102b9e29bda46f00c0e24a3a13a 100644
(file)
--- a/
target/linux/generic/patches-3.7/473-mtd_m25p80_add_w25q128.patch
+++ b/
target/linux/generic/patches-3.7/473-mtd_m25p80_add_w25q128.patch
@@
-1,6
+1,6
@@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -75
1,6 +751
,7 @@ static const struct spi_device_id m25p_i
+@@ -75
5,6 +755
,7 @@ static const struct spi_device_id m25p_i
{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
{ "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
{ "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
diff --git
a/target/linux/generic/patches-3.7/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
b/target/linux/generic/patches-3.7/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
index 2a2541bff6555f42472993de08529f05129b997f..58d8d0636d9e3e858dc90e3b3598733f4eb292df 100644
(file)
--- a/
target/linux/generic/patches-3.7/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
+++ b/
target/linux/generic/patches-3.7/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
@@
-30,7
+30,7
@@
/****************************************************************************/
struct m25p {
/****************************************************************************/
struct m25p {
-@@ -91
1,7 +917
,7 @@ static int __devinit m25p_probe(struct s
+@@ -91
5,7 +921
,7 @@ static int __devinit m25p_probe(struct s
flash->mtd._write = m25p80_write;
/* prefer "small sector" erase if possible */
flash->mtd._write = m25p80_write;
/* prefer "small sector" erase if possible */
diff --git
a/target/linux/generic/patches-3.7/920-unable_to_open_console.patch
b/target/linux/generic/patches-3.7/920-unable_to_open_console.patch
index f9e12ac61bd9cad010d7528c7cd3fd227988c112..731fe457a89af22a342770f6d5b3ef963cd853da 100644
(file)
--- a/
target/linux/generic/patches-3.7/920-unable_to_open_console.patch
+++ b/
target/linux/generic/patches-3.7/920-unable_to_open_console.patch
@@
-1,6
+1,6
@@
--- a/init/main.c
+++ b/init/main.c
--- a/init/main.c
+++ b/init/main.c
-@@ -877,7 +877,7 @@ static
void __init kernel_init_freeable(
+@@ -877,7 +877,7 @@ static
noinline void __init kernel_init_
/* Open the /dev/console on the rootfs, this should never fail */
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
/* Open the /dev/console on the rootfs, this should never fail */
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
diff --git
a/target/linux/generic/patches-3.7/950-vm_exports.patch
b/target/linux/generic/patches-3.7/950-vm_exports.patch
index f1bf3e8a5b841aa6a91eee06e400c0115775cd21..85126e4d60e08e906c4d6d75ae7311a99c071e85 100644
(file)
--- a/
target/linux/generic/patches-3.7/950-vm_exports.patch
+++ b/
target/linux/generic/patches-3.7/950-vm_exports.patch
@@
-59,7
+59,7
@@
* When we die, we re-parent all our children, and try to:
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
* When we die, we re-parent all our children, and try to:
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -356
5,6 +3565
,7 @@ int can_nice(const struct task_struct *p
+@@ -356
6,6 +3566
,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
diff --git
a/target/linux/lantiq/Makefile
b/target/linux/lantiq/Makefile
index eb07e39d1f333354b9697535a206cba5789d7c3e..febdeccfb4ae13159ae32a96883cca744f9712ea 100644
(file)
--- a/
target/linux/lantiq/Makefile
+++ b/
target/linux/lantiq/Makefile
@@
-11,7
+11,7
@@
BOARDNAME:=Lantiq GPON/XWAY/SVIP
FEATURES:=squashfs jffs2
SUBTARGETS=xway ase falcon
FEATURES:=squashfs jffs2
SUBTARGETS=xway ase falcon
-LINUX_VERSION:=3.7.
4
+LINUX_VERSION:=3.7.
5
CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely
CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely
diff --git
a/target/linux/lantiq/patches-3.7/0301-gptu.patch
b/target/linux/lantiq/patches-3.7/0301-gptu.patch
index 35ec060ecfcd5912c12132960f278cb2bd49ea34..4ecf12f6fd12512df8e4cae915b5a43d9d43d0bb 100644
(file)
--- a/
target/linux/lantiq/patches-3.7/0301-gptu.patch
+++ b/
target/linux/lantiq/patches-3.7/0301-gptu.patch
@@
-1,7
+1,5
@@
-Index: linux-3.7.4/arch/mips/lantiq/xway/timer.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.4/arch/mips/lantiq/xway/timer.c 2013-01-28 18:37:52.316180918 +0100
+--- /dev/null
++++ b/arch/mips/lantiq/xway/timer.c
@@ -0,0 +1,845 @@
+#ifndef CONFIG_SOC_AMAZON_SE
+
@@ -0,0 +1,845 @@
+#ifndef CONFIG_SOC_AMAZON_SE
+
@@
-848,10
+846,8
@@
Index: linux-3.7.4/arch/mips/lantiq/xway/timer.c
+module_exit(lq_gptu_exit);
+
+#endif
+module_exit(lq_gptu_exit);
+
+#endif
-Index: linux-3.7.4/arch/mips/include/asm/mach-lantiq/lantiq_timer.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.4/arch/mips/include/asm/mach-lantiq/lantiq_timer.h 2013-01-28 18:26:14.280164283 +0100
+--- /dev/null
++++ b/arch/mips/include/asm/mach-lantiq/lantiq_timer.h
@@ -0,0 +1,155 @@
+#ifndef __DANUBE_GPTU_DEV_H__2005_07_26__10_19__
+#define __DANUBE_GPTU_DEV_H__2005_07_26__10_19__
@@ -0,0 +1,155 @@
+#ifndef __DANUBE_GPTU_DEV_H__2005_07_26__10_19__
+#define __DANUBE_GPTU_DEV_H__2005_07_26__10_19__
@@
-1008,10
+1004,8
@@
Index: linux-3.7.4/arch/mips/include/asm/mach-lantiq/lantiq_timer.h
+ u32 reload, unsigned long arg1, unsigned long arg2);
+
+#endif /* __DANUBE_GPTU_DEV_H__2005_07_26__10_19__ */
+ u32 reload, unsigned long arg1, unsigned long arg2);
+
+#endif /* __DANUBE_GPTU_DEV_H__2005_07_26__10_19__ */
-Index: linux-3.7.4/arch/mips/lantiq/xway/Makefile
-===================================================================
---- linux-3.7.4.orig/arch/mips/lantiq/xway/Makefile 2013-01-28 18:26:06.580164100 +0100
-+++ linux-3.7.4/arch/mips/lantiq/xway/Makefile 2013-01-28 18:38:07.848181285 +0100
+--- a/arch/mips/lantiq/xway/Makefile
++++ b/arch/mips/lantiq/xway/Makefile
@@ -1,3 +1,3 @@
-obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o
+obj-y := prom.o sysctrl.o clk.o reset.o dma.o timer.o dcdc.o
@@ -1,3 +1,3 @@
-obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o
+obj-y := prom.o sysctrl.o clk.o reset.o dma.o timer.o dcdc.o
diff --git
a/target/linux/malta/Makefile
b/target/linux/malta/Makefile
index 78ba3e4af6c51a68b01dccc62f1dc520ccb5a01d..fbf6f819f79ab4d550bb44054e1d334c8c083412 100644
(file)
--- a/
target/linux/malta/Makefile
+++ b/
target/linux/malta/Makefile
@@
-13,7
+13,7
@@
SUBTARGETS:=le be
INITRAMFS_EXTRA_FILES:=
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
INITRAMFS_EXTRA_FILES:=
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.7.
4
+LINUX_VERSION:=3.7.
5
DEVICE_TYPE:=developerboard
DEVICE_TYPE:=developerboard
diff --git
a/target/linux/mpc83xx/Makefile
b/target/linux/mpc83xx/Makefile
index 22223ebe2d2eab124974b8c084cc8a55b470618a..dcd1a8c8268d4b8e951dec197b24c09fd3fa4ccd 100644
(file)
--- a/
target/linux/mpc83xx/Makefile
+++ b/
target/linux/mpc83xx/Makefile
@@
-13,7
+13,7
@@
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=603e
FEATURES:=squashfs targz
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
FEATURES:=squashfs targz
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.7.
4
+LINUX_VERSION:=3.7.
5
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/ppc40x/Makefile
b/target/linux/ppc40x/Makefile
index 675681fe224122013155e1e668d806dc5b4e0012..4a57f217ae02e08d1210c6facbe2186662222856 100644
(file)
--- a/
target/linux/ppc40x/Makefile
+++ b/
target/linux/ppc40x/Makefile
@@
-13,7
+13,7
@@
FEATURES:=squashfs
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=405
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=405
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.7.
4
+LINUX_VERSION:=3.7.
5
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/ppc44x/Makefile
b/target/linux/ppc44x/Makefile
index 83fb0c387e8c71d6b926ddc4d0fd5e8e8481de22..68e5a57b3c02fe464b6ad2aeb91ef59676864c4e 100644
(file)
--- a/
target/linux/ppc44x/Makefile
+++ b/
target/linux/ppc44x/Makefile
@@
-13,7
+13,7
@@
FEATURES:=squashfs broken
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=440
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=440
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.7.
4
+LINUX_VERSION:=3.7.
5
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/ramips/Makefile
b/target/linux/ramips/Makefile
index 346eca63c8a3f2ee724c7901887dbb051d7ea6e7..9a5f8115ea19d3a94da8f107fc554244bd64b1c6 100644
(file)
--- a/
target/linux/ramips/Makefile
+++ b/
target/linux/ramips/Makefile
@@
-13,7
+13,7
@@
SUBTARGETS:=rt288x rt305x rt3883
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely
FEATURES:=squashfs
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely
FEATURES:=squashfs
-LINUX_VERSION:=3.7.
4
+LINUX_VERSION:=3.7.
5
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=\
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=\
diff --git
a/target/linux/rb532/Makefile
b/target/linux/rb532/Makefile
index ab032e332f57e470a23ef8e5980b4a1b82f6d95a..69f01b7476c611903d4f8a07e3f088fe36f7070e 100644
(file)
--- a/
target/linux/rb532/Makefile
+++ b/
target/linux/rb532/Makefile
@@
-11,7
+11,7
@@
BOARD:=rb532
BOARDNAME:=Mikrotik RouterBoard 532
FEATURES:=jffs2 pci targz broken
BOARDNAME:=Mikrotik RouterBoard 532
FEATURES:=jffs2 pci targz broken
-LINUX_VERSION:=3.7.
4
+LINUX_VERSION:=3.7.
5
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532
diff --git
a/target/linux/x86/geos/target.mk
b/target/linux/x86/geos/target.mk
index a45c07f638add460921c624bef9ca0821572b6cc..c82b1895c0aac7eeabc7eecbe460beb8f77d81af 100644
(file)
--- a/
target/linux/x86/geos/target.mk
+++ b/
target/linux/x86/geos/target.mk
@@
-21,7
+21,7
@@
DEFAULT_PACKAGES += \
kmod-cpu-msr \
soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \
hwclock wpad flashrom tc
kmod-cpu-msr \
soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \
hwclock wpad flashrom tc
-LINUX_VERSION:=3.7.
4
+LINUX_VERSION:=3.7.
5
CS5535_MASK:=0x0E000048
CFLAGS += -march=geode -Os -mmmx -m3dnow -fno-align-jumps -fno-align-functions \
CS5535_MASK:=0x0E000048
CFLAGS += -march=geode -Os -mmmx -m3dnow -fno-align-jumps -fno-align-functions \