aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-12-22 19:43:25 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-12-22 19:43:25 +0000
commitd5bda1db31f04855a5bed39e70907e25cdc6facb (patch)
tree438d23fb68b1ff5ee86ff17c8224f992f47d7af1 /target/linux/generic
parent4bee3672dd6f29b9e89f0a4a570d585402114bbb (diff)
downloadupstream-d5bda1db31f04855a5bed39e70907e25cdc6facb.tar.gz
upstream-d5bda1db31f04855a5bed39e70907e25cdc6facb.tar.bz2
upstream-d5bda1db31f04855a5bed39e70907e25cdc6facb.zip
kernel: refresh patches with kernel 2.6.37-rc7
SVN-Revision: 24804
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-2.6.37/020-mips_multi_machine_support.patch2
-rw-r--r--target/linux/generic/patches-2.6.37/021-mips_image_cmdline_hack.patch2
-rw-r--r--target/linux/generic/patches-2.6.37/025-mips_disable_fpu.patch6
-rw-r--r--target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch2
-rw-r--r--target/linux/generic/patches-2.6.37/980-vm_exports.patch2
5 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/patches-2.6.37/020-mips_multi_machine_support.patch b/target/linux/generic/patches-2.6.37/020-mips_multi_machine_support.patch
index 524ce39a82..729934f283 100644
--- a/target/linux/generic/patches-2.6.37/020-mips_multi_machine_support.patch
+++ b/target/linux/generic/patches-2.6.37/020-mips_multi_machine_support.patch
@@ -156,7 +156,7 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -881,6 +881,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
+@@ -883,6 +883,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
config SYNC_R4K
bool
diff --git a/target/linux/generic/patches-2.6.37/021-mips_image_cmdline_hack.patch b/target/linux/generic/patches-2.6.37/021-mips_image_cmdline_hack.patch
index 455610dd0a..f1d1aac3b7 100644
--- a/target/linux/generic/patches-2.6.37/021-mips_image_cmdline_hack.patch
+++ b/target/linux/generic/patches-2.6.37/021-mips_image_cmdline_hack.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -884,6 +884,10 @@ config SYNC_R4K
+@@ -886,6 +886,10 @@ config SYNC_R4K
config MIPS_MACHINE
def_bool n
diff --git a/target/linux/generic/patches-2.6.37/025-mips_disable_fpu.patch b/target/linux/generic/patches-2.6.37/025-mips_disable_fpu.patch
index 3d80a9e926..2ccfe4be80 100644
--- a/target/linux/generic/patches-2.6.37/025-mips_disable_fpu.patch
+++ b/target/linux/generic/patches-2.6.37/025-mips_disable_fpu.patch
@@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
--
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -869,6 +869,17 @@ config I8259
+@@ -871,6 +871,17 @@ config I8259
config MIPS_BONITO64
bool
@@ -69,7 +69,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
/* Control registers */
#define FPCREG_RID 0 /* $0 = revision id */
-@@ -1287,7 +1287,6 @@ int fpu_emulator_cop1Handler(struct pt_r
+@@ -1361,7 +1361,6 @@ int fpu_emulator_cop1Handler(struct pt_r
return sig;
}
@@ -77,7 +77,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
#ifdef CONFIG_DEBUG_FS
static int fpuemu_stat_get(void *data, u64 *val)
-@@ -1336,4 +1335,11 @@ static int __init debugfs_fpuemu(void)
+@@ -1410,4 +1409,11 @@ static int __init debugfs_fpuemu(void)
return 0;
}
__initcall(debugfs_fpuemu);
diff --git a/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch
index fdb7e818ea..a951437102 100644
--- a/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch
+++ b/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch
@@ -33,7 +33,7 @@
/* Enable 1k I/O space granularity on the Intel P64H2 */
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
{
-@@ -2666,6 +2669,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2669,6 +2672,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
#endif /* CONFIG_PCI_IOV */
diff --git a/target/linux/generic/patches-2.6.37/980-vm_exports.patch b/target/linux/generic/patches-2.6.37/980-vm_exports.patch
index e93971a752..35b9b925fb 100644
--- a/target/linux/generic/patches-2.6.37/980-vm_exports.patch
+++ b/target/linux/generic/patches-2.6.37/980-vm_exports.patch
@@ -76,7 +76,7 @@
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -4588,6 +4588,7 @@ int can_nice(const struct task_struct *p
+@@ -4773,6 +4773,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}