summaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.0/100-overlayfs_v10.patch2
-rw-r--r--target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch8
-rw-r--r--target/linux/generic/patches-3.0/400-rootfs_split.patch2
-rw-r--r--target/linux/generic/patches-3.0/630-packet_socket_type.patch8
-rw-r--r--target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch2
-rw-r--r--target/linux/generic/patches-3.0/950-vm_exports.patch6
6 files changed, 14 insertions, 14 deletions
diff --git a/target/linux/generic/patches-3.0/100-overlayfs_v10.patch b/target/linux/generic/patches-3.0/100-overlayfs_v10.patch
index 2d6dcf128..e4fe1a57e 100644
--- a/target/linux/generic/patches-3.0/100-overlayfs_v10.patch
+++ b/target/linux/generic/patches-3.0/100-overlayfs_v10.patch
@@ -184,7 +184,7 @@
struct pipe_inode_info *opipe,
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1494,6 +1494,23 @@ void drop_collected_mounts(struct vfsmou
+@@ -1495,6 +1495,23 @@ void drop_collected_mounts(struct vfsmou
release_mounts(&umount_list);
}
diff --git a/target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch
index 79e26b32d..2da61397d 100644
--- a/target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch
+++ b/target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch
@@ -11,7 +11,7 @@
&ehci->regs->intr_enable); /* Turn On Interrupts */
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
-@@ -656,7 +656,7 @@ ehci_hub_status_data (struct usb_hcd *hc
+@@ -655,7 +655,7 @@ ehci_hub_status_data (struct usb_hcd *hc
* always set, seem to clear PORT_OCC and PORT_CSC when writing to
* PORT_POWER; that's surprising, but maybe within-spec.
*/
@@ -20,7 +20,7 @@
mask = PORT_CSC | PORT_PEC | PORT_OCC;
else
mask = PORT_CSC | PORT_PEC;
-@@ -881,7 +881,7 @@ static int ehci_hub_control (
+@@ -880,7 +880,7 @@ static int ehci_hub_control (
if (temp & PORT_PEC)
status |= USB_PORT_STAT_C_ENABLE << 16;
@@ -31,10 +31,10 @@
/*
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
-@@ -137,6 +137,7 @@ struct ehci_hcd { /* one per controlle
- unsigned fs_i_thresh:1; /* Intel iso scheduling */
+@@ -138,6 +138,7 @@ struct ehci_hcd { /* one per controlle
unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/
unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
+ unsigned frame_index_bug:1; /* MosChip (AKA NetMos) */
+ unsigned ignore_oc:1;
/* required for usb32 quirk */
diff --git a/target/linux/generic/patches-3.0/400-rootfs_split.patch b/target/linux/generic/patches-3.0/400-rootfs_split.patch
index ccbe83ea3..9eb05c4af 100644
--- a/target/linux/generic/patches-3.0/400-rootfs_split.patch
+++ b/target/linux/generic/patches-3.0/400-rootfs_split.patch
@@ -257,7 +257,7 @@
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
-@@ -948,6 +948,12 @@ static int mtd_ioctl(struct file *file,
+@@ -949,6 +949,12 @@ static int mtd_ioctl(struct file *file,
break;
}
diff --git a/target/linux/generic/patches-3.0/630-packet_socket_type.patch b/target/linux/generic/patches-3.0/630-packet_socket_type.patch
index 934e195b8..99b5553b4 100644
--- a/target/linux/generic/patches-3.0/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-3.0/630-packet_socket_type.patch
@@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -687,12 +690,12 @@ static int tpacket_rcv(struct sk_buff *s
+@@ -690,12 +693,12 @@ static int tpacket_rcv(struct sk_buff *s
struct timespec ts;
struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -1529,6 +1532,7 @@ static int packet_create(struct net *net
+@@ -1532,6 +1535,7 @@ static int packet_create(struct net *net
spin_lock_init(&po->bind_lock);
mutex_init(&po->pg_vec_lock);
po->prot_hook.func = packet_rcv;
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -2102,6 +2106,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -2105,6 +2109,16 @@ packet_setsockopt(struct socket *sock, i
po->tp_tstamp = val;
return 0;
}
@@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
default:
return -ENOPROTOOPT;
}
-@@ -2159,6 +2173,13 @@ static int packet_getsockopt(struct sock
+@@ -2162,6 +2176,13 @@ static int packet_getsockopt(struct sock
data = &val;
break;
diff --git a/target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch
index 1a003ee3c..3bbadd42a 100644
--- a/target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/patches-3.0/811-pci_disable_usb_common_quirks.patch
@@ -10,7 +10,7 @@
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{
u16 cmd;
-@@ -869,3 +871,5 @@ static void __devinit quirk_usb_early_ha
+@@ -883,3 +885,5 @@ static void __devinit quirk_usb_early_ha
quirk_usb_handoff_xhci(pdev);
}
DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
diff --git a/target/linux/generic/patches-3.0/950-vm_exports.patch b/target/linux/generic/patches-3.0/950-vm_exports.patch
index 4be67a3a8..7e80ced39 100644
--- a/target/linux/generic/patches-3.0/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.0/950-vm_exports.patch
@@ -61,7 +61,7 @@
{
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -4937,6 +4937,7 @@ int can_nice(const struct task_struct *p
+@@ -4923,6 +4923,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
@@ -97,7 +97,7 @@
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
{
-@@ -1361,6 +1362,7 @@ struct vm_struct *get_vm_area(unsigned l
+@@ -1383,6 +1384,7 @@ struct vm_struct *get_vm_area(unsigned l
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
-1, GFP_KERNEL, __builtin_return_address(0));
}
@@ -107,7 +107,7 @@
void *caller)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -871,6 +871,7 @@ extern bool skip_free_areas_node(unsigne
+@@ -870,6 +870,7 @@ extern bool skip_free_areas_node(unsigne
int shmem_lock(struct file *file, int lock, struct user_struct *user);
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);