KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel: refresh patches

Browse source 
SVN-Revision: 22252
This commit is contained in:
Hauke Mehrtens 2010-07-17 14:10:39 +00:00
parent 1d7a6ebc79
commit c5ef57706d
49 changed files with 151 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/linux/generic/patches-2.6.35/006-squashfs_add_lzma.patch
View file

@ -18,7 +18,7 @@ Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
--- a/fs/squashfs/Kconfig
+++ b/fs/squashfs/Kconfig
@@ -26,6 +26,11 @@ config SQUASHFS
@@ -37,6 +37,11 @@ config SQUASHFS_XATTRS
If unsure, say N.
@ -210,7 +210,7 @@ Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
+
--- a/fs/squashfs/squashfs.h
+++ b/fs/squashfs/squashfs.h
@@ -94,3 +94,6 @@ extern const struct address_space_operat
@@ -104,3 +104,6 @@ extern const struct xattr_handler *squas
/* zlib_wrapper.c */
extern const struct squashfs_decompressor squashfs_zlib_comp_ops;

2
target/linux/generic/patches-2.6.35/007-squashfs_make_lzma_available.patch
View file

@ -25,7 +25,7 @@ Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
--- a/fs/squashfs/Kconfig
+++ b/fs/squashfs/Kconfig
@@ -30,6 +30,7 @@ config SQUASHFS_LZMA
@@ -41,6 +41,7 @@ config SQUASHFS_LZMA
bool "Include support for LZMA compressed file systems"
depends on SQUASHFS
select DECOMPRESS_LZMA

4
target/linux/generic/patches-2.6.35/008-jffs2_make_lzma_available.patch
View file

@ -206,7 +206,7 @@
+}
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -254,14 +254,41 @@ static int __init init_jffs2_fs(void)
@@ -252,14 +252,41 @@ static int __init init_jffs2_fs(void)
BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
@ -1081,7 +1081,7 @@
ifdef CONFIG_FUNCTION_TRACER
ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
@@ -66,6 +76,8 @@ obj-$(CONFIG_ZLIB_DEFLATE) += zlib_defla
@@ -69,6 +79,8 @@ obj-$(CONFIG_ZLIB_DEFLATE) += zlib_defla
obj-$(CONFIG_REED_SOLOMON) += reed_solomon/
obj-$(CONFIG_LZO_COMPRESS) += lzo/
obj-$(CONFIG_LZO_DECOMPRESS) += lzo/

4
target/linux/generic/patches-2.6.35/012-extra_optimization.patch
View file

@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
@@ -529,7 +529,7 @@ all: vmlinux
@@ -532,7 +532,7 @@ all: vmlinux
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
KBUILD_CFLAGS += -Os
else
@ -9,7 +9,7 @@
endif
include $(srctree)/arch/$(SRCARCH)/Makefile
@@ -567,6 +567,9 @@ endif
@@ -570,6 +570,9 @@ endif
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS)

4
target/linux/generic/patches-2.6.35/025-mips_disable_fpu.patch
View file

@ -70,7 +70,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
/* Control registers */
#define FPCREG_RID 0 /* $0 = revision id */
@@ -1284,7 +1284,6 @@ int fpu_emulator_cop1Handler(struct pt_r
@@ -1285,7 +1285,6 @@ int fpu_emulator_cop1Handler(struct pt_r
return sig;
}
@ -78,7 +78,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
#ifdef CONFIG_DEBUG_FS
static int fpuemu_stat_get(void *data, u64 *val)
@@ -1333,4 +1332,11 @@ static int __init debugfs_fpuemu(void)
@@ -1334,4 +1333,11 @@ static int __init debugfs_fpuemu(void)
return 0;
}
__initcall(debugfs_fpuemu);

2
target/linux/generic/patches-2.6.35/028-module_exports.patch
View file

@ -90,7 +90,7 @@
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -195,16 +195,24 @@ void *__symbol_get_gpl(const char *symbo
@@ -202,16 +202,24 @@ struct module_use {
#define __CRC_SYMBOL(sym, sec)
#endif

8
target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch
View file

@ -23,7 +23,7 @@
/* The Mellanox Tavor device gives false positive parity errors
* Mark this device with a broken_parity_status, to allow
* PCI scanning code to "skip" this now blacklisted device.
@@ -1901,7 +1902,9 @@ static void __devinit fixup_rev1_53c810(
@@ -1904,7 +1905,9 @@ static void __devinit fixup_rev1_53c810(
}
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
@ -33,11 +33,11 @@
/* Enable 1k I/O space granularity on the Intel P64H2 */
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
{
@@ -2551,6 +2554,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
@@ -2556,6 +2559,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
#endif /* CONFIG_PCI_IOV */
+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
/*
* This is a quirk for the Ricoh MMC controller found as a part of
/* Allow manual resource allocation for PCI hotplug bridges
* via pci=hpmemsize=nnM and pci=hpiosize=nnM parameters. For

4
target/linux/generic/patches-2.6.35/031-ppc_gcc_build_fix.patch
View file

@ -26,7 +26,7 @@ nice.
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -802,3 +802,80 @@ relocate_new_kernel_end:
@@ -822,3 +822,80 @@ relocate_new_kernel_end:
relocate_new_kernel_size:
.long relocate_new_kernel_end - relocate_new_kernel
#endif
@ -109,7 +109,7 @@ nice.
+#endif
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -186,3 +186,114 @@ EXPORT_SYMBOL(__mtdcr);
@@ -190,3 +190,114 @@ EXPORT_SYMBOL(__mtdcr);
EXPORT_SYMBOL(__mfdcr);
#endif
EXPORT_SYMBOL(empty_zero_page);

2
target/linux/generic/patches-2.6.35/060-block2mtd_init.patch
View file

@ -105,7 +105,7 @@
{
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -639,6 +639,7 @@ try_scan:
@@ -677,6 +677,7 @@ rescan:
kfree(state);
return 0;
}

14
target/linux/generic/patches-2.6.35/065-rootfs_split.patch
View file

@ -534,9 +534,9 @@
mutex_init(&dev->write_mutex);
+ rwlock_init(&dev->bdev_mutex);
if (!mtdname)
mtdname = devname;
@@ -298,6 +392,7 @@ static struct block2mtd_dev *add_device(
/* Setup the MTD structure */
/* make the name contain the block device in */
@@ -299,6 +393,7 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@ -546,7 +546,7 @@
part->name = dev->mtd.name;
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -18,6 +18,7 @@
@@ -19,6 +19,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/compatmac.h>
@ -554,7 +554,7 @@
#include <asm/uaccess.h>
@@ -814,6 +815,13 @@ static int mtd_ioctl(struct inode *inode
@@ -826,6 +827,13 @@ static int mtd_ioctl(struct file *file,
file->f_pos = 0;
break;
}
@ -570,7 +570,7 @@
ret = -ENOTTY;
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -101,6 +101,7 @@ struct mtd_oob_ops {
@@ -98,6 +98,7 @@ struct mtd_oob_ops {
uint8_t *oobbuf;
};
@ -578,7 +578,7 @@
struct mtd_info {
u_char type;
uint32_t flags;
@@ -241,6 +242,9 @@ struct mtd_info {
@@ -238,6 +239,9 @@ struct mtd_info {
struct device dev;
int usecount;

2
target/linux/generic/patches-2.6.35/080-mtd_plat_nand_chip_fixup.patch
View file

@ -1,6 +1,6 @@
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -491,6 +491,7 @@ struct platform_nand_chip {
@@ -512,6 +512,7 @@ struct platform_nand_chip {
int chip_delay;
unsigned int options;
const char **part_probe_types;

2
target/linux/generic/patches-2.6.35/180-netfilter_depends.patch
View file

@ -8,7 +8,7 @@
depends on NETFILTER_ADVANCED
help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
@@ -530,7 +529,6 @@ config NETFILTER_XT_TARGET_SECMARK
@@ -550,7 +549,6 @@ config NETFILTER_XT_TARGET_SECMARK
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'

16
target/linux/generic/patches-2.6.35/204-jffs2_eofdetect.patch
View file

@ -43,7 +43,7 @@
if (ret < 0)
goto out;
@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j
@@ -402,7 +405,7 @@ static int jffs2_scan_xref_node(struct j
if (!ref)
return -ENOMEM;
@ -52,7 +52,7 @@
* and AFTER xattr_ref is marked as a dead xref,
* ref->xid is used to store 32bit xid, xd is not used
* ref->ino is used to store 32bit inode-number, ic is not used
@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct
@@ -475,7 +478,7 @@ static int jffs2_scan_eraseblock (struct
struct jffs2_sum_marker *sm;
void *sumptr = NULL;
uint32_t sumlen;
@ -61,7 +61,7 @@
if (!buf_size) {
/* XIP case. Just look, point at the summary if it's there */
sm = (void *)buf + c->sector_size - sizeof(*sm);
@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct
@@ -491,9 +494,9 @@ static int jffs2_scan_eraseblock (struct
buf_len = sizeof(*sm);
/* Read as much as we want into the _end_ of the preallocated buffer */
@ -73,7 +73,7 @@
if (err)
return err;
@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct
@@ -512,9 +515,9 @@ static int jffs2_scan_eraseblock (struct
}
if (buf_len < sumlen) {
/* Need to read more so that the entire summary node is present */
@ -85,7 +85,7 @@
if (err)
return err;
}
@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct
@@ -527,7 +530,7 @@ static int jffs2_scan_eraseblock (struct
if (buf_size && sumlen > buf_size)
kfree(sumptr);
@ -94,7 +94,7 @@
If it returns positive, that's a block classification
(i.e. BLK_STATE_xxx) so return that too.
If it returns zero, fall through to full scan. */
@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct
@@ -548,6 +551,17 @@ static int jffs2_scan_eraseblock (struct
return err;
}
@ -112,7 +112,7 @@
/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
ofs = 0;
@@ -671,7 +685,7 @@ scan_more:
@@ -673,7 +687,7 @@ scan_more:
scan_end = buf_len;
goto more_empty;
}
@ -121,7 +121,7 @@
/* See how much more there is to read in this eraseblock... */
buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
if (!buf_len) {
@@ -907,7 +921,7 @@ scan_more:
@@ -909,7 +923,7 @@ scan_more:
D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));

2
target/linux/generic/patches-2.6.35/222-partial_eraseblock_write.patch
View file

@ -133,7 +133,7 @@
if (master->block_isbad) {
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -46,6 +46,10 @@ struct erase_info {
@@ -45,6 +45,10 @@ struct erase_info {
u_long priv;
u_char state;
struct erase_info *next;

18
target/linux/generic/patches-2.6.35/240-packet_socket_type.patch
View file

@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
unsigned int tp_packets;
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -202,6 +202,7 @@ struct packet_sock {
@@ -203,6 +203,7 @@ struct packet_sock {
unsigned int tp_reserve;
unsigned int tp_loss:1;
struct packet_type prot_hook ____cacheline_aligned_in_smp;
@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
};
struct packet_skb_cb {
@@ -336,6 +337,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -339,6 +340,7 @@ static int packet_rcv_spkt(struct sk_buf
{
struct sock *sk;
struct sockaddr_pkt *spkt;
@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/*
* When we registered the protocol we saved the socket in the data
@@ -343,6 +345,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -346,6 +348,7 @@ static int packet_rcv_spkt(struct sk_buf
*/
sk = pt->af_packet_priv;
@ -50,7 +50,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/*
* Yank back the headers [hope the device set this
@@ -355,7 +358,7 @@ static int packet_rcv_spkt(struct sk_buf
@@ -358,7 +361,7 @@ static int packet_rcv_spkt(struct sk_buf
* so that this procedure is noop.
*/
@ -59,7 +59,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
goto out;
if (!net_eq(dev_net(dev), sock_net(sk)))
@@ -531,12 +534,12 @@ static int packet_rcv(struct sk_buff *sk
@@ -537,12 +540,12 @@ static int packet_rcv(struct sk_buff *sk
int skb_len = skb->len;
unsigned int snaplen, res;
@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
@@ -651,12 +654,12 @@ static int tpacket_rcv(struct sk_buff *s
@@ -657,12 +660,12 @@ static int tpacket_rcv(struct sk_buff *s
struct timeval tv;
struct timespec ts;
@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
@@ -1464,6 +1467,7 @@ static int packet_create(struct net *net
@@ -1473,6 +1476,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;
@@ -1968,6 +1972,16 @@ packet_setsockopt(struct socket *sock, i
@@ -2027,6 +2031,16 @@ packet_setsockopt(struct socket *sock, i
po->has_vnet_hdr = !!val;
return 0;
}
@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
default:
return -ENOPROTOOPT;
}
@@ -2025,6 +2039,13 @@ static int packet_getsockopt(struct sock
@@ -2084,6 +2098,13 @@ static int packet_getsockopt(struct sock
data = &val;
break;

4
target/linux/generic/patches-2.6.35/250-pppoe_header_pad.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -862,7 +862,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;
@@ -870,7 +870,7 @@ static int pppoe_sendmsg(struct kiocb *i
@@ -864,7 +864,7 @@ static int pppoe_sendmsg(struct kiocb *i
}
/* Reserve space for headers. */

6
target/linux/generic/patches-2.6.35/260-crypto_optional_tests.patch
View file

@ -22,7 +22,7 @@
struct tcrypt_result {
struct completion completion;
int err;
@@ -2443,8 +2445,11 @@ static int alg_find_test(const char *alg
@@ -2473,8 +2475,11 @@ static int alg_find_test(const char *alg
return -1;
}
@ -34,7 +34,7 @@
int i;
int j;
int rc;
@@ -2499,5 +2504,8 @@ notest:
@@ -2529,5 +2534,8 @@ notest:
return 0;
non_fips_alg:
return -EINVAL;
@ -54,7 +54,7 @@
#define MAX_DIGEST_SIZE 64
#define MAX_TAP 8
@@ -9552,4 +9554,6 @@ static struct hash_testvec crc32c_tv_tem
@@ -9608,4 +9610,6 @@ static struct hash_testvec crc32c_tv_tem
},
};

4
target/linux/generic/patches-2.6.35/400-ledtrig_morse.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -354,4 +354,8 @@ endif # LEDS_TRIGGERS
@@ -371,4 +371,8 @@ endif # LEDS_TRIGGERS
endif # LEDS_CLASS
@ -11,7 +11,7 @@
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -46,3 +46,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
@@ -48,3 +48,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o

4
target/linux/generic/patches-2.6.35/402-ledtrig_netdev.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -358,4 +358,11 @@ config LEDS_TRIGGER_MORSE
@@ -375,4 +375,11 @@ config LEDS_TRIGGER_MORSE
tristate "LED Morse Trigger"
depends on LEDS_TRIGGERS
@ -14,7 +14,7 @@
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -47,3 +47,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
@@ -49,3 +49,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o

4
target/linux/generic/patches-2.6.35/410-gpio_buttons.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -340,4 +340,20 @@ config INPUT_PCAP
@@ -390,4 +390,20 @@ config INPUT_PCAP
To compile this driver as a module, choose M here: the
module will be called pcap_keys.
@ -23,7 +23,7 @@
endif
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -32,4 +32,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR) += winb
@@ -37,4 +37,5 @@ obj-$(CONFIG_INPUT_WINBOND_CIR) += winb
obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o
obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o
obj-$(CONFIG_INPUT_YEALINK) += yealink.o

4
target/linux/generic/patches-2.6.35/420-gpiodev.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -1024,6 +1024,14 @@ config CS5535_GPIO
@@ -1032,6 +1032,14 @@ config CS5535_GPIO
If compiled as a module, it will be called cs5535_gpio.
@ -17,7 +17,7 @@
depends on BLOCK
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -95,6 +95,7 @@ obj-$(CONFIG_SCx200_GPIO) += scx200_gpio
@@ -96,6 +96,7 @@ obj-$(CONFIG_SCx200_GPIO) += scx200_gpio
obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o
obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o
obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o

2
target/linux/generic/patches-2.6.35/430-scsi_header_fix.patch
View file

@ -1,6 +1,6 @@
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -149,10 +149,10 @@ struct scsi_cmnd;
@@ -151,10 +151,10 @@ struct scsi_cmnd;
/* defined in T10 SCSI Primary Commands-2 (SPC2) */
struct scsi_varlen_cdb_hdr {

2
target/linux/generic/patches-2.6.35/600-phy_extension.patch
View file

@ -71,7 +71,7 @@
idx = phy_find_valid(idx, phydev->supported);
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -492,6 +492,7 @@ void phy_start_machine(struct phy_device
@@ -497,6 +497,7 @@ void phy_start_machine(struct phy_device
void phy_stop_machine(struct phy_device *phydev);
int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);

6
target/linux/generic/patches-2.6.35/601-phy-add-aneg-done-function.patch
View file

@ -1,6 +1,6 @@
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -393,9 +393,18 @@ struct phy_driver {
@@ -384,9 +384,18 @@ struct phy_driver {
*/
int (*config_aneg)(struct phy_device *phydev);
@ -21,7 +21,7 @@
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -695,6 +695,9 @@ int genphy_update_link(struct phy_device
@@ -710,6 +710,9 @@ int genphy_update_link(struct phy_device
{
int status;
@ -33,7 +33,7 @@
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -107,6 +107,9 @@ static inline int phy_aneg_done(struct p
@@ -106,6 +106,9 @@ static inline int phy_aneg_done(struct p
{
int retval;

6
target/linux/generic/patches-2.6.35/630-phy_packets.patch
View file

@ -19,7 +19,7 @@
struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
{
struct phy_device *dev;
@@ -175,6 +187,8 @@ struct phy_device* phy_device_create(str
@@ -176,6 +188,8 @@ struct phy_device* phy_device_create(str
dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
dev->state = PHY_DOWN;
@ -30,7 +30,7 @@
INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -325,6 +325,20 @@ struct phy_device {
@@ -330,6 +330,20 @@ struct phy_device {
void (*adjust_link)(struct net_device *dev);
void (*adjust_state)(struct net_device *dev);
@ -53,7 +53,7 @@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -863,6 +863,7 @@ struct net_device {
@@ -932,6 +932,7 @@ struct net_device {
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */

6
target/linux/generic/patches-2.6.35/680-phy_ar8216.patch
View file

@ -1,7 +1,7 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -111,6 +111,10 @@ config IP175C_PHY
tristate "Driver for IC+ IP175C/IP178C switches"
@@ -111,6 +111,10 @@ config IP17XX_PHY
tristate "Driver for IC+ IP17xx switches"
select SWCONFIG
+config AR8216_PHY
@ -15,7 +15,7 @@
+++ b/drivers/net/phy/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
obj-$(CONFIG_IP175C_PHY) += ip175c.o
obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
+obj-$(CONFIG_AR8216_PHY) += ar8216.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o

2
target/linux/generic/patches-2.6.35/690-phy_rtl8306.patch
View file

@ -14,7 +14,7 @@
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
obj-$(CONFIG_IP175C_PHY) += ip175c.o
obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
obj-$(CONFIG_AR8216_PHY) += ar8216.o
+obj-$(CONFIG_RTL8306_PHY) += rtl8306.o

2
target/linux/generic/patches-2.6.35/691-phy_rtl8366.patch
View file

@ -32,7 +32,7 @@
endif # PHYLIB
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -20,6 +20,9 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
@@ -20,6 +20,9 @@ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
obj-$(CONFIG_AR8216_PHY) += ar8216.o
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o

6
target/linux/generic/patches-2.6.35/700-rtc7301.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -618,6 +618,15 @@ config RTC_DRV_NUC900
@@ -625,6 +625,15 @@ config RTC_DRV_NUC900
If you say yes here you get support for the RTC subsystem of the
NUC910/NUC920 used in embedded systems.
@ -15,10 +15,10 @@
+
comment "on-CPU RTC drivers"
config RTC_DRV_OMAP
config RTC_DRV_DAVINCI
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -74,6 +74,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01) += rtc-rp5c
@@ -76,6 +76,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01) += rtc-rp5c
obj-$(CONFIG_RTC_DRV_RS5C313) += rtc-rs5c313.o
obj-$(CONFIG_RTC_DRV_RS5C348) += rtc-rs5c348.o
obj-$(CONFIG_RTC_DRV_RS5C372) += rtc-rs5c372.o

2
target/linux/generic/patches-2.6.35/750-glamo-headers.patch
View file

@ -1,6 +1,6 @@
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -124,6 +124,7 @@ struct dentry;
@@ -122,6 +122,7 @@
#define FB_ACCEL_TRIDENT_BLADE3D 52 /* Trident Blade3D */
#define FB_ACCEL_TRIDENT_BLADEXP 53 /* Trident BladeXP */
#define FB_ACCEL_CIRRUS_ALPINE 53 /* Cirrus Logic 543x/544x/5480 */

2
target/linux/generic/patches-2.6.35/840-unable_to_open_console.patch
View file

@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
@@ -887,7 +887,7 @@ static int __init kernel_init(void * unu
@@ -903,7 +903,7 @@ static int __init kernel_init(void * unu
/* Open the /dev/console on the rootfs, this should never fail */
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)

2
target/linux/generic/patches-2.6.35/902-darwin_scripts_include.patch
View file

@ -62,7 +62,7 @@
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -140,6 +140,9 @@ check-lxdialog := $(srctree)/$(src)/lxd
@@ -144,6 +144,9 @@ check-lxdialog := $(srctree)/$(src)/lxd
# we really need to do so. (Do not call gcc as part of make mrproper)
HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))

2
target/linux/generic/patches-2.6.35/903-hostap_txpower.patch
View file

@ -116,7 +116,7 @@
return (unsigned char) tmp;
}
@@ -4057,3 +4054,35 @@ int hostap_ioctl(struct net_device *dev,
@@ -4056,3 +4053,35 @@ int hostap_ioctl(struct net_device *dev,
return ret;
}

10
target/linux/generic/patches-2.6.35/920-01-hotpluggable-spi-gpio.patch
View file

@ -6,7 +6,7 @@ Fix spi-gpio for hotplug.
--- a/drivers/spi/spi_gpio.c
+++ b/drivers/spi/spi_gpio.c
@@ -218,7 +218,7 @@ static void spi_gpio_cleanup(struct spi_
@@ -217,7 +217,7 @@ static void spi_gpio_cleanup(struct spi_
spi_bitbang_cleanup(spi);
}
@ -15,7 +15,7 @@ Fix spi-gpio for hotplug.
{
int value;
@@ -232,7 +232,7 @@ static int __init spi_gpio_alloc(unsigne
@@ -231,7 +231,7 @@ static int __init spi_gpio_alloc(unsigne
return value;
}
@ -24,7 +24,7 @@ Fix spi-gpio for hotplug.
spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label)
{
int value;
@@ -261,7 +261,7 @@ done:
@@ -260,7 +260,7 @@ done:
return value;
}
@ -33,7 +33,7 @@ Fix spi-gpio for hotplug.
{
int status;
struct spi_master *master;
@@ -317,7 +317,7 @@ gpio_free:
@@ -316,7 +316,7 @@ gpio_free:
return status;
}
@ -42,7 +42,7 @@ Fix spi-gpio for hotplug.
{
struct spi_gpio *spi_gpio;
struct spi_gpio_platform_data *pdata;
@@ -344,12 +344,13 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
@@ -343,12 +343,13 @@ MODULE_ALIAS("platform:" DRIVER_NAME);
static struct platform_driver spi_gpio_driver = {
.driver.name = DRIVER_NAME,
.driver.owner = THIS_MODULE,

4
target/linux/generic/patches-2.6.35/920-04-spi-gpio-implement-spi-delay.patch
View file

@ -54,5 +54,5 @@ Implement the SPI-GPIO delay function for busses that need speed limitation.
+#endif /* NEED_SPIDELAY */
+}
#define EXPAND_BITBANG_TXRX
#include <linux/spi/spi_bitbang.h>
#include "spi_bitbang_txrx.h"

6
target/linux/generic/patches-2.6.35/921-gpio_spi_driver.patch
View file

@ -338,7 +338,7 @@ Please use the new mainline SPI-GPIO driver, as of 2.6.29.
+MODULE_LICENSE("GPL v2");
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -133,6 +133,15 @@ config SPI_GPIO
@@ -143,6 +143,15 @@ config SPI_GPIO
GPIO operations, you should be able to leverage that for better
speed with a custom version of this driver; see the source code.
@ -356,9 +356,9 @@ Please use the new mainline SPI-GPIO driver, as of 2.6.29.
depends on ARCH_MXC
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_SPI_DESIGNWARE) += dw_spi.
obj-$(CONFIG_SPI_DW_PCI) += dw_spi_pci.o
@@ -23,6 +23,7 @@ obj-$(CONFIG_SPI_DW_PCI) += dw_spi_pci.
obj-$(CONFIG_SPI_DW_MMIO) += dw_spi_mmio.o
obj-$(CONFIG_SPI_EP93XX) += ep93xx_spi.o
obj-$(CONFIG_SPI_GPIO) += spi_gpio.o
+obj-$(CONFIG_SPI_GPIO_OLD) += spi_gpio_old.o
obj-$(CONFIG_SPI_IMX) += spi_imx.o

8
target/linux/generic/patches-2.6.35/922-gpiommc.patch
View file

@ -611,7 +611,7 @@
+module_exit(gpiommc_modexit);
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -370,6 +370,31 @@ config MMC_TMIO
@@ -382,6 +382,31 @@ config MMC_TMIO
This provides support for the SD/MMC cell found in TC6393XB,
T7L66XB and also HTC ASIC3
@ -645,14 +645,14 @@
depends on PCI
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_
@@ -34,6 +34,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_
obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o
obj-$(CONFIG_MMC_CB710) += cb710-mmc.o
obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o
+obj-$(CONFIG_GPIOMMC) += gpiommc.o
obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o
obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o
--- /dev/null
+++ b/include/linux/mmc/gpiommc.h
@@ -0,0 +1,71 @@
@ -829,7 +829,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2540,6 +2540,11 @@ T: git git://git.kernel.org/pub/scm/linu
@@ -2591,6 +2591,11 @@ T: git git://git.kernel.org/pub/scm/linu
S: Maintained
F: drivers/media/video/gspca/

2
target/linux/generic/patches-2.6.35/940-wireless_mesh_header.patch
View file

@ -1,6 +1,6 @@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -138,7 +138,7 @@ static inline bool dev_xmit_complete(int
@@ -139,7 +139,7 @@ static inline bool dev_xmit_complete(int
*/
#if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)

6
target/linux/generic/patches-2.6.35/971-ocf_20100325.patch
View file

@ -88,7 +88,7 @@
* Entropy extraction routines
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -141,6 +141,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
@@ -142,6 +142,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
}
return ret;
}
@ -98,7 +98,7 @@
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -12,6 +12,7 @@
@@ -18,6 +18,7 @@
#define APOLLO_MOUSE_MINOR 7
#define PC110PAD_MINOR 9
/*#define ADB_MOUSE_MINOR 10 FIXME OBSOLETE */
@ -147,7 +147,7 @@
struct rand_pool_info {
int entropy_count;
int buf_size;
@@ -50,6 +75,10 @@ extern void add_input_randomness(unsigne
@@ -54,6 +79,10 @@ extern void add_input_randomness(unsigne
unsigned int value);
extern void add_interrupt_randomness(int irq);

18
target/linux/generic/patches-2.6.35/980-vm_exports.patch
View file

@ -8,7 +8,7 @@
static struct vfsmount *shm_mnt;
@@ -2620,6 +2621,16 @@ int shmem_lock(struct file *file, int lo
@@ -2675,6 +2676,16 @@ out:
/* common code */
@ -25,7 +25,7 @@
/**
* shmem_file_setup - get an unlinked file living in tmpfs
* @name: name for dentry (to be seen in /proc/<pid>/maps
@@ -2697,9 +2708,6 @@ int shmem_zero_setup(struct vm_area_stru
@@ -2752,9 +2763,6 @@ int shmem_zero_setup(struct vm_area_stru
if (IS_ERR(file))
return PTR_ERR(file);
@ -48,7 +48,7 @@
{
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -514,6 +514,7 @@ struct files_struct *get_files_struct(st
@@ -506,6 +506,7 @@ struct files_struct *get_files_struct(st
return files;
}
@ -56,7 +56,7 @@
void put_files_struct(struct files_struct *files)
{
@@ -535,6 +536,7 @@ void put_files_struct(struct files_struc
@@ -527,6 +528,7 @@ void put_files_struct(struct files_struc
rcu_read_unlock();
}
}
@ -66,7 +66,7 @@
{
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -177,6 +177,7 @@ void __put_task_struct(struct task_struc
@@ -190,6 +190,7 @@ void __put_task_struct(struct task_struc
if (!profile_handoff_task(tsk))
free_task(tsk);
}
@ -76,7 +76,7 @@
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4367,6 +4367,7 @@ int can_nice(const struct task_struct *p
@@ -4271,6 +4271,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
@ -94,7 +94,7 @@
/**
* zap_vma_ptes - remove ptes mapping the vma
@@ -2596,6 +2597,7 @@ int vmtruncate_range(struct inode *inode
@@ -2605,6 +2606,7 @@ int vmtruncate_range(struct inode *inode
return 0;
}
@ -122,7 +122,7 @@
void *caller)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -728,6 +728,7 @@ extern void show_free_areas(void);
@@ -732,6 +732,7 @@ extern void show_free_areas(void);
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);
@ -132,7 +132,7 @@
#ifndef CONFIG_MMU
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1121,6 +1121,7 @@ struct sighand_struct *lock_task_sighand
@@ -1124,6 +1124,7 @@ struct sighand_struct *lock_task_sighand
return sighand;
}

4
target/linux/generic/patches-2.6.35/991-ppc4xx_optimization.patch
View file

@ -3,7 +3,7 @@ they still want to support gcc 3.3 -- well, we don't.
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -123,7 +123,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
@@ -130,7 +130,8 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
KBUILD_CFLAGS += -mno-sched-epilog
endif
@ -28,4 +28,4 @@ they still want to support gcc 3.3 -- well, we don't.
+$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
$(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
$(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
$(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
$(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405

2
target/linux/generic/patches-2.6.35/998-openwrt_lzma_options.patch
View file

@ -8,7 +8,7 @@
+ lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
(rm -f $@ ; false)
quiet_cmd_lzo = LZO $@
quiet_cmd_lzo = LZO $@
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -226,7 +226,7 @@ cpio_list=

2
target/linux/generic/patches-2.6.35/999-use_preinit_as_init.patch
View file

@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
@@ -842,10 +842,7 @@ static noinline int init_post(void)
@@ -854,10 +854,7 @@ static noinline int init_post(void)
printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
}