1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 09:10:37 +02:00

kernel: refresh 2.6.38 patches for final release

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26194 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-03-16 18:31:23 +00:00
parent 4edd0fb0ba
commit c2f8669f74
26 changed files with 74 additions and 76 deletions

View File

@ -8,7 +8,7 @@ Acked-by: Rob Landley <rob@landley.net>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -802,9 +802,6 @@ config ARC
@@ -806,9 +806,6 @@ config ARC
config ARCH_MAY_HAVE_PC_FDC
bool
@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480
bool
@@ -2240,6 +2237,18 @@ config USE_OF
@@ -2244,6 +2241,18 @@ config USE_OF
help
Include support for flattened device tree machine descriptions.

View File

@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -898,6 +898,10 @@ config SYNC_R4K
@@ -902,6 +902,10 @@ config SYNC_R4K
config MIPS_MACHINE
def_bool n

View File

@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
--
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -883,6 +883,17 @@ config I8259
@@ -887,6 +887,17 @@ config I8259
config MIPS_BONITO64
bool

View File

@ -1,6 +1,6 @@
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -60,7 +60,7 @@ int br_handle_frame_finish(struct sk_buf
@@ -64,7 +64,7 @@ int br_handle_frame_finish(struct sk_buf
br_multicast_rcv(br, p, skb))
goto drop;

View File

@ -11038,14 +11038,14 @@
+ yaffs_UnpackTags2(tags, &pt);
+ }
+ }
+
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+ if (localData)
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-
+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
if (retval == 0)
return YAFFS_OK;
else

View File

@ -829,7 +829,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2867,6 +2867,11 @@ T: git git://git.kernel.org/pub/scm/linu
@@ -2884,6 +2884,11 @@ T: git git://git.kernel.org/pub/scm/linu
S: Maintained
F: drivers/media/video/gspca/

View File

@ -76,7 +76,7 @@
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4640,6 +4640,7 @@ int can_nice(const struct task_struct *p
@@ -4641,6 +4641,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
@@ -2690,6 +2691,7 @@ int vmtruncate_range(struct inode *inode
@@ -2692,6 +2693,7 @@ int vmtruncate_range(struct inode *inode
return 0;
}

View File

@ -1,7 +1,5 @@
Index: linux-2.6.38-rc6/lib/Kconfig
===================================================================
--- linux-2.6.38-rc6.orig/lib/Kconfig 2011-03-01 19:24:16.246703947 +0100
+++ linux-2.6.38-rc6/lib/Kconfig 2011-03-01 19:26:58.696312483 +0100
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -223,6 +223,13 @@ config LRU_CACHE
tristate