refresh 2.6.28 patches

SVN-Revision: 16377
This commit is contained in:
Florian Fainelli 2009-06-08 11:31:17 +00:00
parent e7cbce1f9e
commit 5ed3b31ce0
2 changed files with 2 additions and 2 deletions

View File

@ -27,7 +27,7 @@
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.features = RTL_FEATURE_MSI
@@ -3555,10 +3555,12 @@ static irqreturn_t rtl8169_interrupt(int
@@ -3554,10 +3554,12 @@ static irqreturn_t rtl8169_interrupt(int
goto out;
}

View File

@ -67,7 +67,7 @@
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5064,6 +5064,7 @@ int can_nice(const struct task_struct *p
@@ -5015,6 +5015,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
capable(CAP_SYS_NICE));
}