mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-30 23:16:17 +02:00
kernel: refresh patches with kernel 2.6.37-rc7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24804 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
9e9c3a1798
commit
4607d4ead2
@ -156,7 +156,7 @@
|
|||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/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
|
config SYNC_R4K
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -884,6 +884,10 @@ config SYNC_R4K
|
@@ -886,6 +886,10 @@ config SYNC_R4K
|
||||||
config MIPS_MACHINE
|
config MIPS_MACHINE
|
||||||
def_bool n
|
def_bool n
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
|
|||||||
--
|
--
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -869,6 +869,17 @@ config I8259
|
@@ -871,6 +871,17 @@ config I8259
|
||||||
config MIPS_BONITO64
|
config MIPS_BONITO64
|
||||||
bool
|
bool
|
||||||
|
|
||||||
@ -69,7 +69,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
|
|||||||
/* Control registers */
|
/* Control registers */
|
||||||
|
|
||||||
#define FPCREG_RID 0 /* $0 = revision id */
|
#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;
|
return sig;
|
||||||
}
|
}
|
||||||
@ -77,7 +77,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
|
|||||||
#ifdef CONFIG_DEBUG_FS
|
#ifdef CONFIG_DEBUG_FS
|
||||||
|
|
||||||
static int fpuemu_stat_get(void *data, u64 *val)
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
__initcall(debugfs_fpuemu);
|
__initcall(debugfs_fpuemu);
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
/* Enable 1k I/O space granularity on the Intel P64H2 */
|
/* Enable 1k I/O space granularity on the Intel P64H2 */
|
||||||
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
|
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);
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
|
||||||
|
|
||||||
#endif /* CONFIG_PCI_IOV */
|
#endif /* CONFIG_PCI_IOV */
|
||||||
|
@ -76,7 +76,7 @@
|
|||||||
* macro override instead of weak attribute alias, to workaround
|
* macro override instead of weak attribute alias, to workaround
|
||||||
--- a/kernel/sched.c
|
--- a/kernel/sched.c
|
||||||
+++ b/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) ||
|
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
|
||||||
capable(CAP_SYS_NICE));
|
capable(CAP_SYS_NICE));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user