mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-26 05:48:04 +03:00
[kernel] refresh 2.6.33 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21784 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
62f026d7b7
commit
e4eedbb946
@ -71,7 +71,7 @@
|
|||||||
depends on NETFILTER_ADVANCED
|
depends on NETFILTER_ADVANCED
|
||||||
--- a/net/netfilter/Makefile
|
--- a/net/netfilter/Makefile
|
||||||
+++ b/net/netfilter/Makefile
|
+++ b/net/netfilter/Makefile
|
||||||
@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
|
@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
|
||||||
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
|
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
|
||||||
obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
|
obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
|
||||||
obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
|
obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
|
||||||
|
@ -1184,7 +1184,7 @@
|
|||||||
/* return EBUSY when somebody else is registered, return EEXIST if the
|
/* return EBUSY when somebody else is registered, return EEXIST if the
|
||||||
* same handler is registered, return 0 in case of success. */
|
* same handler is registered, return 0 in case of success. */
|
||||||
int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
|
int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
|
||||||
@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const
|
@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
|
EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/arch/mips/include/asm/string.h
|
--- a/arch/mips/include/asm/string.h
|
||||||
+++ b/arch/mips/include/asm/string.h
|
+++ b/arch/mips/include/asm/string.h
|
||||||
@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
|
@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
|
||||||
|
|
||||||
#define __HAVE_ARCH_MEMSET
|
#define __HAVE_ARCH_MEMSET
|
||||||
extern void *memset(void *__s, int __c, size_t __count);
|
extern void *memset(void *__s, int __c, size_t __count);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/include/linux/slab.h
|
--- a/include/linux/slab.h
|
||||||
+++ b/include/linux/slab.h
|
+++ b/include/linux/slab.h
|
||||||
@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache
|
@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache
|
||||||
* to do various tricks to work around compiler limitations in order to
|
* to do various tricks to work around compiler limitations in order to
|
||||||
* ensure proper constant folding.
|
* ensure proper constant folding.
|
||||||
*/
|
*/
|
||||||
|
@ -61,7 +61,7 @@
|
|||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
|
||||||
extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
|
extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
|
||||||
|
|
||||||
@@ -501,6 +505,29 @@ static inline void double_unlock(struct
|
@@ -501,6 +505,29 @@ static inline void double_unlock(struct
|
||||||
#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
|
#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
|
||||||
#endif /* __KERNEL__ */
|
#endif /* __KERNEL__ */
|
||||||
|
|
||||||
@ -127,7 +127,7 @@
|
|||||||
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
|
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
|
||||||
--- a/fs/mini_fo/aux.c
|
--- a/fs/mini_fo/aux.c
|
||||||
+++ b/fs/mini_fo/aux.c
|
+++ b/fs/mini_fo/aux.c
|
||||||
@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
|
@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
|
||||||
err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
|
err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
|
||||||
|
|
||||||
/* validate */
|
/* validate */
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/fs/mini_fo/super.c
|
--- a/fs/mini_fo/super.c
|
||||||
+++ b/fs/mini_fo/super.c
|
+++ b/fs/mini_fo/super.c
|
||||||
@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
|
@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
|
||||||
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
|
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
|
||||||
|
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
endif # NEW_LEDS
|
endif # NEW_LEDS
|
||||||
--- a/drivers/leds/Makefile
|
--- a/drivers/leds/Makefile
|
||||||
+++ b/drivers/leds/Makefile
|
+++ b/drivers/leds/Makefile
|
||||||
@@ -44,3 +44,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
|
@@ -44,3 +44,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o
|
obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
|
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
endif # NEW_LEDS
|
endif # NEW_LEDS
|
||||||
--- a/drivers/leds/Makefile
|
--- a/drivers/leds/Makefile
|
||||||
+++ b/drivers/leds/Makefile
|
+++ b/drivers/leds/Makefile
|
||||||
@@ -45,3 +45,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
|
@@ -45,3 +45,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
|
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
|
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
|
||||||
|
@ -601,7 +601,7 @@
|
|||||||
dev->checkpointBlockList[i] = -1;
|
dev->checkpointBlockList[i] = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
|
@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
|
||||||
|
|
||||||
static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
|
static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
|
||||||
{
|
{
|
||||||
@ -926,7 +926,7 @@
|
|||||||
{
|
{
|
||||||
unsigned char cDelta; /* column parity delta */
|
unsigned char cDelta; /* column parity delta */
|
||||||
unsigned lDelta; /* line parity delta */
|
unsigned lDelta; /* line parity delta */
|
||||||
@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
|
@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
|
||||||
return 0; /* no error */
|
return 0; /* no error */
|
||||||
|
|
||||||
if (lDelta == ~lDeltaPrime &&
|
if (lDelta == ~lDeltaPrime &&
|
||||||
@ -936,7 +936,7 @@
|
|||||||
/* Single bit (recoverable) error in data */
|
/* Single bit (recoverable) error in data */
|
||||||
|
|
||||||
bit = 0;
|
bit = 0;
|
||||||
@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
|
@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
|
||||||
if (cDelta & 0x02)
|
if (cDelta & 0x02)
|
||||||
bit |= 0x01;
|
bit |= 0x01;
|
||||||
|
|
||||||
@ -945,7 +945,7 @@
|
|||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
data[lDelta] ^= (1 << bit);
|
data[lDelta] ^= (1 << bit);
|
||||||
@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
|
@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
|
if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
|
||||||
@ -954,7 +954,7 @@
|
|||||||
/* Reccoverable error in ecc */
|
/* Reccoverable error in ecc */
|
||||||
|
|
||||||
*read_ecc = *test_ecc;
|
*read_ecc = *test_ecc;
|
||||||
@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
|
@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
|
||||||
/* Unrecoverable error */
|
/* Unrecoverable error */
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
@ -1398,7 +1398,7 @@
|
|||||||
{
|
{
|
||||||
unsigned char *alias;
|
unsigned char *alias;
|
||||||
int ret;
|
int ret;
|
||||||
@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
|
@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1560,7 +1560,7 @@
|
|||||||
static int yaffs_file_flush(struct file *file, fl_owner_t id)
|
static int yaffs_file_flush(struct file *file, fl_owner_t id)
|
||||||
#else
|
#else
|
||||||
static int yaffs_file_flush(struct file *file)
|
static int yaffs_file_flush(struct file *file)
|
||||||
@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
|
@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
|
||||||
yaffs_Device *dev = obj->myDev;
|
yaffs_Device *dev = obj->myDev;
|
||||||
|
|
||||||
T(YAFFS_TRACE_OS,
|
T(YAFFS_TRACE_OS,
|
||||||
@ -1571,7 +1571,7 @@
|
|||||||
|
|
||||||
yaffs_GrossLock(dev);
|
yaffs_GrossLock(dev);
|
||||||
|
|
||||||
@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
|
@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
|
||||||
|
|
||||||
yaffs_Device *dev;
|
yaffs_Device *dev;
|
||||||
|
|
||||||
@ -1591,7 +1591,7 @@
|
|||||||
BUG_ON(!PageLocked(pg));
|
BUG_ON(!PageLocked(pg));
|
||||||
#else
|
#else
|
||||||
if (!PageLocked(pg))
|
if (!PageLocked(pg))
|
||||||
@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
|
@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
|
||||||
|
|
||||||
yaffs_GrossLock(dev);
|
yaffs_GrossLock(dev);
|
||||||
|
|
||||||
@ -1604,7 +1604,7 @@
|
|||||||
|
|
||||||
yaffs_GrossUnlock(dev);
|
yaffs_GrossUnlock(dev);
|
||||||
|
|
||||||
@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
|
@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
|
||||||
flush_dcache_page(pg);
|
flush_dcache_page(pg);
|
||||||
kunmap(pg);
|
kunmap(pg);
|
||||||
|
|
||||||
@ -3193,7 +3193,7 @@
|
|||||||
if (n < step) {
|
if (n < step) {
|
||||||
n++;
|
n++;
|
||||||
continue;
|
continue;
|
||||||
@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
|
@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
|
||||||
char *end;
|
char *end;
|
||||||
char *mask_name;
|
char *mask_name;
|
||||||
const char *x;
|
const char *x;
|
||||||
@ -3202,7 +3202,7 @@
|
|||||||
int i;
|
int i;
|
||||||
int done = 0;
|
int done = 0;
|
||||||
int add, len = 0;
|
int add, len = 0;
|
||||||
@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
|
@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
|
||||||
|
|
||||||
while (!done && (pos < count)) {
|
while (!done && (pos < count)) {
|
||||||
done = 1;
|
done = 1;
|
||||||
@ -3213,7 +3213,7 @@
|
|||||||
|
|
||||||
switch (buf[pos]) {
|
switch (buf[pos]) {
|
||||||
case '+':
|
case '+':
|
||||||
@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
|
@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
|
||||||
mask_name = NULL;
|
mask_name = NULL;
|
||||||
|
|
||||||
mask_bitfield = simple_strtoul(buf + pos, &end, 0);
|
mask_bitfield = simple_strtoul(buf + pos, &end, 0);
|
||||||
@ -3240,7 +3240,7 @@
|
|||||||
mask_name = mask_flags[i].mask_name;
|
mask_name = mask_flags[i].mask_name;
|
||||||
mask_bitfield = mask_flags[i].mask_bitfield;
|
mask_bitfield = mask_flags[i].mask_bitfield;
|
||||||
done = 0;
|
done = 0;
|
||||||
@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
|
@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
|
||||||
|
|
||||||
if (mask_name != NULL) {
|
if (mask_name != NULL) {
|
||||||
done = 0;
|
done = 0;
|
||||||
@ -3249,7 +3249,7 @@
|
|||||||
case '-':
|
case '-':
|
||||||
rg &= ~mask_bitfield;
|
rg &= ~mask_bitfield;
|
||||||
break;
|
break;
|
||||||
@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
|
@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
|
||||||
|
|
||||||
yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
|
yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
|
||||||
|
|
||||||
@ -5691,7 +5691,7 @@
|
|||||||
{
|
{
|
||||||
/* Get the real object in case we were fed a hard link as an equivalent object */
|
/* Get the real object in case we were fed a hard link as an equivalent object */
|
||||||
equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
|
equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
|
||||||
@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
|
@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -7622,7 +7622,7 @@
|
|||||||
int nToCopy;
|
int nToCopy;
|
||||||
int n = nBytes;
|
int n = nBytes;
|
||||||
int nDone = 0;
|
int nDone = 0;
|
||||||
@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
|
@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
|
||||||
dev = in->myDev;
|
dev = in->myDev;
|
||||||
|
|
||||||
while (n > 0) {
|
while (n > 0) {
|
||||||
@ -7657,7 +7657,7 @@
|
|||||||
if (dev->nShortOpCaches > 0) {
|
if (dev->nShortOpCaches > 0) {
|
||||||
|
|
||||||
/* If we can't find the data in the cache, then load it up. */
|
/* If we can't find the data in the cache, then load it up. */
|
||||||
@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
|
@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
|
||||||
|
|
||||||
cache->locked = 1;
|
cache->locked = 1;
|
||||||
|
|
||||||
@ -7673,7 +7673,7 @@
|
|||||||
cache->locked = 0;
|
cache->locked = 0;
|
||||||
} else {
|
} else {
|
||||||
/* Read into the local buffer then copy..*/
|
/* Read into the local buffer then copy..*/
|
||||||
@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
|
@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
|
||||||
yaffs_GetTempBuffer(dev, __LINE__);
|
yaffs_GetTempBuffer(dev, __LINE__);
|
||||||
yaffs_ReadChunkDataFromObject(in, chunk,
|
yaffs_ReadChunkDataFromObject(in, chunk,
|
||||||
localBuffer);
|
localBuffer);
|
||||||
@ -7718,7 +7718,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
n -= nToCopy;
|
n -= nToCopy;
|
||||||
@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
|
@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
|
||||||
return nDone;
|
return nDone;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -7923,7 +7923,7 @@
|
|||||||
int newFullChunks;
|
int newFullChunks;
|
||||||
|
|
||||||
yaffs_Device *dev = in->myDev;
|
yaffs_Device *dev = in->myDev;
|
||||||
@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
|
@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
|
||||||
|
|
||||||
yaffs_CheckGarbageCollection(dev);
|
yaffs_CheckGarbageCollection(dev);
|
||||||
|
|
||||||
@ -7941,7 +7941,7 @@
|
|||||||
|
|
||||||
if (newSize < oldFileSize) {
|
if (newSize < oldFileSize) {
|
||||||
|
|
||||||
@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
|
@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -7968,7 +7968,7 @@
|
|||||||
{
|
{
|
||||||
obj = yaffs_GetEquivalentObject(obj);
|
obj = yaffs_GetEquivalentObject(obj);
|
||||||
|
|
||||||
@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
|
@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -9789,7 +9789,7 @@
|
|||||||
{
|
{
|
||||||
int init_failed = 0;
|
int init_failed = 0;
|
||||||
unsigned x;
|
unsigned x;
|
||||||
@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
|
@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
|
||||||
dev->chunkOffset = 0;
|
dev->chunkOffset = 0;
|
||||||
dev->nFreeChunks = 0;
|
dev->nFreeChunks = 0;
|
||||||
|
|
||||||
@ -9798,7 +9798,7 @@
|
|||||||
if (dev->startBlock == 0) {
|
if (dev->startBlock == 0) {
|
||||||
dev->internalStartBlock = dev->startBlock + 1;
|
dev->internalStartBlock = dev->startBlock + 1;
|
||||||
dev->internalEndBlock = dev->endBlock + 1;
|
dev->internalEndBlock = dev->endBlock + 1;
|
||||||
@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
|
@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
|
||||||
|
|
||||||
/* Check geometry parameters. */
|
/* Check geometry parameters. */
|
||||||
|
|
||||||
@ -9823,7 +9823,7 @@
|
|||||||
return YAFFS_FAIL;
|
return YAFFS_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
|
@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
|
||||||
return YAFFS_FAIL;
|
return YAFFS_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -9836,7 +9836,7 @@
|
|||||||
/* Got the right mix of functions? */
|
/* Got the right mix of functions? */
|
||||||
if (!yaffs_CheckDevFunctions(dev)) {
|
if (!yaffs_CheckDevFunctions(dev)) {
|
||||||
/* Function missing */
|
/* Function missing */
|
||||||
@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
|
@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
|
||||||
|
|
||||||
dev->isMounted = 1;
|
dev->isMounted = 1;
|
||||||
|
|
||||||
@ -9875,7 +9875,7 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Calculate chunkGroupBits.
|
* Calculate chunkGroupBits.
|
||||||
@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
|
@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
|
||||||
bits = ShiftsGE(x);
|
bits = ShiftsGE(x);
|
||||||
|
|
||||||
/* Set up tnode width if wide tnodes are enabled. */
|
/* Set up tnode width if wide tnodes are enabled. */
|
||||||
@ -9896,7 +9896,7 @@
|
|||||||
dev->tnodeWidth = 16;
|
dev->tnodeWidth = 16;
|
||||||
|
|
||||||
dev->tnodeMask = (1<<dev->tnodeWidth)-1;
|
dev->tnodeMask = (1<<dev->tnodeWidth)-1;
|
||||||
@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
|
@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
|
||||||
dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
|
dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
|
||||||
|
|
||||||
/* Initialise temporary buffers and caches. */
|
/* Initialise temporary buffers and caches. */
|
||||||
@ -9905,7 +9905,7 @@
|
|||||||
init_failed = 1;
|
init_failed = 1;
|
||||||
|
|
||||||
dev->srCache = NULL;
|
dev->srCache = NULL;
|
||||||
@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
|
@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
|
||||||
if (!init_failed &&
|
if (!init_failed &&
|
||||||
dev->nShortOpCaches > 0) {
|
dev->nShortOpCaches > 0) {
|
||||||
int i;
|
int i;
|
||||||
@ -9940,7 +9940,7 @@
|
|||||||
init_failed = 1;
|
init_failed = 1;
|
||||||
|
|
||||||
dev->srLastUse = 0;
|
dev->srLastUse = 0;
|
||||||
@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
|
@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
|
||||||
|
|
||||||
dev->cacheHits = 0;
|
dev->cacheHits = 0;
|
||||||
|
|
||||||
@ -9979,7 +9979,7 @@
|
|||||||
T(YAFFS_TRACE_ALWAYS,
|
T(YAFFS_TRACE_ALWAYS,
|
||||||
(TSTR("yaffs: restored from checkpoint" TENDSTR)));
|
(TSTR("yaffs: restored from checkpoint" TENDSTR)));
|
||||||
} else {
|
} else {
|
||||||
@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
|
@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
|
||||||
dev->nBackgroundDeletions = 0;
|
dev->nBackgroundDeletions = 0;
|
||||||
dev->oldestDirtySequence = 0;
|
dev->oldestDirtySequence = 0;
|
||||||
|
|
||||||
@ -10011,7 +10011,7 @@
|
|||||||
/* Clean up the mess */
|
/* Clean up the mess */
|
||||||
T(YAFFS_TRACE_TRACING,
|
T(YAFFS_TRACE_TRACING,
|
||||||
(TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
|
(TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
|
||||||
@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
|
@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -10710,7 +10710,7 @@
|
|||||||
{
|
{
|
||||||
if (etags) {
|
if (etags) {
|
||||||
memset(etags, 0, sizeof(*etags));
|
memset(etags, 0, sizeof(*etags));
|
||||||
@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
|
@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
|
||||||
* Returns YAFFS_OK or YAFFS_FAIL.
|
* Returns YAFFS_OK or YAFFS_FAIL.
|
||||||
*/
|
*/
|
||||||
int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
|
int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/include/linux/phy.h
|
--- a/include/linux/phy.h
|
||||||
+++ b/include/linux/phy.h
|
+++ b/include/linux/phy.h
|
||||||
@@ -393,9 +393,18 @@ struct phy_driver {
|
@@ -379,9 +379,18 @@ struct phy_driver {
|
||||||
*/
|
*/
|
||||||
int (*config_aneg)(struct phy_device *phydev);
|
int (*config_aneg)(struct phy_device *phydev);
|
||||||
|
|
||||||
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
--- a/drivers/net/phy/phy_device.c
|
--- a/drivers/net/phy/phy_device.c
|
||||||
+++ b/drivers/net/phy/phy_device.c
|
+++ b/drivers/net/phy/phy_device.c
|
||||||
@@ -695,6 +695,9 @@ int genphy_update_link(struct phy_device
|
@@ -682,6 +682,9 @@ int genphy_update_link(struct phy_device
|
||||||
{
|
{
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
--- a/drivers/net/phy/Kconfig
|
--- a/drivers/net/phy/Kconfig
|
||||||
+++ b/drivers/net/phy/Kconfig
|
+++ b/drivers/net/phy/Kconfig
|
||||||
@@ -106,6 +106,10 @@ config IP175C_PHY
|
@@ -106,6 +106,10 @@ config IP17XX_PHY
|
||||||
tristate "Driver for IC+ IP175C/IP178C switches"
|
tristate "Driver for IC+ IP17xx switches"
|
||||||
select SWCONFIG
|
select SWCONFIG
|
||||||
|
|
||||||
+config AR8216_PHY
|
+config AR8216_PHY
|
||||||
@ -15,7 +15,7 @@
|
|||||||
+++ b/drivers/net/phy/Makefile
|
+++ b/drivers/net/phy/Makefile
|
||||||
@@ -18,6 +18,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
|
@@ -18,6 +18,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
|
||||||
obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.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_REALTEK_PHY) += realtek.o
|
||||||
+obj-$(CONFIG_AR8216_PHY) += ar8216.o
|
+obj-$(CONFIG_AR8216_PHY) += ar8216.o
|
||||||
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
|
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
--- a/drivers/net/phy/Makefile
|
--- a/drivers/net/phy/Makefile
|
||||||
+++ b/drivers/net/phy/Makefile
|
+++ b/drivers/net/phy/Makefile
|
||||||
@@ -19,6 +19,7 @@ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
|
@@ -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_REALTEK_PHY) += realtek.o
|
||||||
obj-$(CONFIG_AR8216_PHY) += ar8216.o
|
obj-$(CONFIG_AR8216_PHY) += ar8216.o
|
||||||
+obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
|
+obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
endif # PHYLIB
|
endif # PHYLIB
|
||||||
--- a/drivers/net/phy/Makefile
|
--- a/drivers/net/phy/Makefile
|
||||||
+++ b/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_REALTEK_PHY) += realtek.o
|
||||||
obj-$(CONFIG_AR8216_PHY) += ar8216.o
|
obj-$(CONFIG_AR8216_PHY) += ar8216.o
|
||||||
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
|
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/wireless/hostap/hostap_ap.c
|
--- a/drivers/net/wireless/hostap/hostap_ap.c
|
||||||
+++ b/drivers/net/wireless/hostap/hostap_ap.c
|
+++ b/drivers/net/wireless/hostap/hostap_ap.c
|
||||||
@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t
|
@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t
|
||||||
addr[count].sa_family = ARPHRD_ETHER;
|
addr[count].sa_family = ARPHRD_ETHER;
|
||||||
memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
|
memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
|
||||||
if (sta->last_rx_silence == 0)
|
if (sta->last_rx_silence == 0)
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
#include <linux/ioport.h>
|
#include <linux/ioport.h>
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
|
|
||||||
@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[]
|
@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[]
|
||||||
MODULE_DEVICE_TABLE(pci, divil_pci);
|
MODULE_DEVICE_TABLE(pci, divil_pci);
|
||||||
|
|
||||||
static struct cdev cs5535_gpio_cdev;
|
static struct cdev cs5535_gpio_cdev;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/scripts/Makefile.lib
|
--- a/scripts/Makefile.lib
|
||||||
+++ b/scripts/Makefile.lib
|
+++ b/scripts/Makefile.lib
|
||||||
@@ -238,7 +238,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
|
@@ -238,7 +238,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
|
||||||
|
|
||||||
quiet_cmd_lzma = LZMA $@
|
quiet_cmd_lzma = LZMA $@
|
||||||
cmd_lzma = (cat $(filter-out FORCE,$^) | \
|
cmd_lzma = (cat $(filter-out FORCE,$^) | \
|
||||||
|
Loading…
Reference in New Issue
Block a user