mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
kernel: update to linux-3.0 and refresh patches.
Thank you Peter Wagner for the patch git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27722 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -77,15 +77,17 @@
|
||||
{
|
||||
u16 tmp = pcicore_read16(pc, SSB_PCICORE_SPROM(0));
|
||||
if (((tmp & 0xF000) >> 12) != pc->dev->core_index) {
|
||||
@@ -514,13 +514,13 @@ static void ssb_pcicore_pcie_setup_worka
|
||||
@@ -514,7 +514,7 @@ static void ssb_pcicore_pcie_setup_worka
|
||||
* Generic and Clientmode operation code.
|
||||
**************************************************/
|
||||
|
||||
-static void ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
|
||||
+static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
|
||||
{
|
||||
/* Disable PCI interrupts. */
|
||||
ssb_write32(pc->dev, SSB_INTVEC, 0);
|
||||
ssb_pcicore_fix_sprom_core_index(pc);
|
||||
|
||||
@@ -529,7 +529,7 @@ static void ssb_pcicore_init_clientmode(
|
||||
}
|
||||
}
|
||||
|
||||
-void ssb_pcicore_init(struct ssb_pcicore *pc)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/pppoe.c
|
||||
+++ b/drivers/net/pppoe.c
|
||||
@@ -855,7 +855,7 @@ static int pppoe_sendmsg(struct kiocb *i
|
||||
@@ -856,7 +856,7 @@ static int pppoe_sendmsg(struct kiocb *i
|
||||
goto end;
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
0, GFP_KERNEL);
|
||||
if (!skb) {
|
||||
error = -ENOMEM;
|
||||
@@ -863,7 +863,7 @@ static int pppoe_sendmsg(struct kiocb *i
|
||||
@@ -864,7 +864,7 @@ static int pppoe_sendmsg(struct kiocb *i
|
||||
}
|
||||
|
||||
/* Reserve space for headers. */
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
--- a/include/linux/netdevice.h
|
||||
+++ b/include/linux/netdevice.h
|
||||
@@ -1194,6 +1194,7 @@ struct net_device {
|
||||
@@ -1188,6 +1188,7 @@ struct net_device {
|
||||
void *ax25_ptr; /* AX.25 specific data */
|
||||
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
|
||||
assign before registering */
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
{
|
||||
--- a/kernel/sched.c
|
||||
+++ b/kernel/sched.c
|
||||
@@ -4905,6 +4905,7 @@ int can_nice(const struct task_struct *p
|
||||
@@ -4937,6 +4937,7 @@ int can_nice(const struct task_struct *p
|
||||
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
|
||||
capable(CAP_SYS_NICE));
|
||||
}
|
||||
|
||||
@@ -4,6 +4,6 @@
|
||||
VERSION = 3
|
||||
PATCHLEVEL = 0
|
||||
-SUBLEVEL = 0
|
||||
EXTRAVERSION = -rc7
|
||||
EXTRAVERSION =
|
||||
NAME = Sneaky Weasel
|
||||
|
||||
|
||||
Reference in New Issue
Block a user