From c1c6a23f1334265e2571fbf4fad6a448cefe7f65 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 10 Dec 2012 15:03:55 +0000 Subject: [PATCH] kernel/generic: refresh 3.7 patches Signed-off-by: Florian Fainelli SVN-Revision: 34601 --- .../patches-3.7/065-8139cp-fixes.patch | 20 +++++++++---------- .../generic/patches-3.7/100-overlayfs.patch | 12 +++++------ ...330-mips-add-crash-and-kdump-support.patch | 6 +++--- .../generic/patches-3.7/863-gpiommc.patch | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/target/linux/generic/patches-3.7/065-8139cp-fixes.patch b/target/linux/generic/patches-3.7/065-8139cp-fixes.patch index 33ca1a128a..71c53f9cbb 100644 --- a/target/linux/generic/patches-3.7/065-8139cp-fixes.patch +++ b/target/linux/generic/patches-3.7/065-8139cp-fixes.patch @@ -66,11 +66,9 @@ Date: Sun Nov 25 15:52:09 2012 -0500 Signed-off-by: David S. Miller -diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c -index b01f83a..6cb96b4 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c -@@ -648,6 +648,7 @@ static void cp_tx (struct cp_private *cp) +@@ -648,6 +648,7 @@ static void cp_tx (struct cp_private *cp { unsigned tx_head = cp->tx_head; unsigned tx_tail = cp->tx_tail; @@ -78,7 +76,7 @@ index b01f83a..6cb96b4 100644 while (tx_tail != tx_head) { struct cp_desc *txd = cp->tx_ring + tx_tail; -@@ -666,6 +667,9 @@ static void cp_tx (struct cp_private *cp) +@@ -666,6 +667,9 @@ static void cp_tx (struct cp_private *cp le32_to_cpu(txd->opts1) & 0xffff, PCI_DMA_TODEVICE); @@ -88,7 +86,7 @@ index b01f83a..6cb96b4 100644 if (status & LastFrag) { if (status & (TxError | TxFIFOUnder)) { netif_dbg(cp, tx_err, cp->dev, -@@ -697,6 +701,7 @@ static void cp_tx (struct cp_private *cp) +@@ -697,6 +701,7 @@ static void cp_tx (struct cp_private *cp cp->tx_tail = tx_tail; @@ -96,7 +94,7 @@ index b01f83a..6cb96b4 100644 if (TX_BUFFS_AVAIL(cp) > (MAX_SKB_FRAGS + 1)) netif_wake_queue(cp->dev); } -@@ -843,6 +848,8 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, +@@ -843,6 +848,8 @@ static netdev_tx_t cp_start_xmit (struct wmb(); } cp->tx_head = entry; @@ -105,7 +103,7 @@ index b01f83a..6cb96b4 100644 netif_dbg(cp, tx_queued, cp->dev, "tx queued, slot %d, skblen %d\n", entry, skb->len); if (TX_BUFFS_AVAIL(cp) <= (MAX_SKB_FRAGS + 1)) -@@ -937,6 +944,8 @@ static void cp_stop_hw (struct cp_private *cp) +@@ -937,6 +944,8 @@ static void cp_stop_hw (struct cp_privat cp->rx_tail = 0; cp->tx_head = cp->tx_tail = 0; @@ -114,7 +112,7 @@ index b01f83a..6cb96b4 100644 } static void cp_reset_hw (struct cp_private *cp) -@@ -957,8 +966,38 @@ static void cp_reset_hw (struct cp_private *cp) +@@ -957,8 +966,38 @@ static void cp_reset_hw (struct cp_priva static inline void cp_start_hw (struct cp_private *cp) { @@ -153,7 +151,7 @@ index b01f83a..6cb96b4 100644 } static void cp_enable_irq(struct cp_private *cp) -@@ -969,7 +1008,6 @@ static void cp_enable_irq(struct cp_private *cp) +@@ -969,7 +1008,6 @@ static void cp_enable_irq(struct cp_priv static void cp_init_hw (struct cp_private *cp) { struct net_device *dev = cp->dev; @@ -161,7 +159,7 @@ index b01f83a..6cb96b4 100644 cp_reset_hw(cp); -@@ -992,17 +1030,6 @@ static void cp_init_hw (struct cp_private *cp) +@@ -992,17 +1030,6 @@ static void cp_init_hw (struct cp_privat cpw8(Config5, cpr8(Config5) & PMEStatus); @@ -179,7 +177,7 @@ index b01f83a..6cb96b4 100644 cpw16(MultiIntr, 0); cpw8_f(Cfg9346, Cfg9346_Lock); -@@ -1192,6 +1219,7 @@ static void cp_tx_timeout(struct net_device *dev) +@@ -1197,6 +1224,7 @@ static void cp_tx_timeout(struct net_dev cp_clean_rings(cp); rc = cp_init_rings(cp); cp_start_hw(cp); diff --git a/target/linux/generic/patches-3.7/100-overlayfs.patch b/target/linux/generic/patches-3.7/100-overlayfs.patch index 3bc7772876..1c6fc4cc03 100644 --- a/target/linux/generic/patches-3.7/100-overlayfs.patch +++ b/target/linux/generic/patches-3.7/100-overlayfs.patch @@ -301,7 +301,7 @@ /** * sb_permission - Check superblock-level permissions -@@ -2883,9 +2884,12 @@ finish_open_created: +@@ -2888,9 +2889,12 @@ finish_open_created: error = may_open(&nd->path, acc_mode, open_flag); if (error) goto out; @@ -3125,7 +3125,7 @@ /** * enum positive_aop_returns - aop return codes with specific semantics * -@@ -1321,6 +1327,11 @@ struct super_block { +@@ -1319,6 +1325,11 @@ struct super_block { /* Being remounted read-only */ int s_readonly_remount; @@ -3137,7 +3137,7 @@ }; /* superblock cache pruning functions */ -@@ -1578,6 +1589,7 @@ struct inode_operations { +@@ -1576,6 +1587,7 @@ struct inode_operations { int (*atomic_open)(struct inode *, struct dentry *, struct file *, unsigned open_flag, umode_t create_mode, int *opened); @@ -3145,7 +3145,7 @@ } ____cacheline_aligned; struct seq_file; -@@ -2009,6 +2021,7 @@ extern struct file *file_open_name(struc +@@ -2007,6 +2019,7 @@ extern struct file *file_open_name(struc extern struct file *filp_open(const char *, int, umode_t); extern struct file *file_open_root(struct dentry *, struct vfsmount *, const char *, int); @@ -3153,7 +3153,7 @@ extern struct file * dentry_open(const struct path *, int, const struct cred *); extern int filp_close(struct file *, fl_owner_t id); -@@ -2215,6 +2228,7 @@ extern sector_t bmap(struct inode *, sec +@@ -2212,6 +2225,7 @@ extern sector_t bmap(struct inode *, sec #endif extern int notify_change(struct dentry *, struct iattr *); extern int inode_permission(struct inode *, int); @@ -3175,7 +3175,7 @@ int flags, const char *name, --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -5450,6 +5450,13 @@ F: drivers/scsi/osd/ +@@ -5458,6 +5458,13 @@ F: drivers/scsi/osd/ F: include/scsi/osd_* F: fs/exofs/ diff --git a/target/linux/generic/patches-3.7/330-mips-add-crash-and-kdump-support.patch b/target/linux/generic/patches-3.7/330-mips-add-crash-and-kdump-support.patch index def970fd31..479d7d8069 100644 --- a/target/linux/generic/patches-3.7/330-mips-add-crash-and-kdump-support.patch +++ b/target/linux/generic/patches-3.7/330-mips-add-crash-and-kdump-support.patch @@ -437,7 +437,7 @@ Signed-off-by: Wu Zhangjin #include #include -@@ -522,12 +523,62 @@ static void __init arch_mem_init(char ** +@@ -536,12 +537,62 @@ static void __init arch_mem_init(char ** } bootmem_init(); @@ -500,7 +500,7 @@ Signed-off-by: Wu Zhangjin static void __init resource_init(void) { int i; -@@ -543,6 +594,8 @@ static void __init resource_init(void) +@@ -557,6 +608,8 @@ static void __init resource_init(void) /* * Request address space for all standard RAM. */ @@ -509,7 +509,7 @@ Signed-off-by: Wu Zhangjin for (i = 0; i < boot_mem_map.nr_map; i++) { struct resource *res; unsigned long start, end; -@@ -579,6 +632,7 @@ static void __init resource_init(void) +@@ -593,6 +646,7 @@ static void __init resource_init(void) */ request_resource(res, &code_resource); request_resource(res, &data_resource); diff --git a/target/linux/generic/patches-3.7/863-gpiommc.patch b/target/linux/generic/patches-3.7/863-gpiommc.patch index a75b380c41..5a2b4e171b 100644 --- a/target/linux/generic/patches-3.7/863-gpiommc.patch +++ b/target/linux/generic/patches-3.7/863-gpiommc.patch @@ -830,7 +830,7 @@ +be done automatically. --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -3401,6 +3401,11 @@ L: linuxppc-dev@lists.ozlabs.org +@@ -3409,6 +3409,11 @@ L: linuxppc-dev@lists.ozlabs.org S: Odd Fixes F: drivers/tty/hvc/