mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-31 00:24:12 +00:00
kernel: update to kernel version 2.6.34.8
SVN-Revision: 26125
This commit is contained in:
parent
b78210955c
commit
425bf41b23
@ -11,8 +11,8 @@ endif
|
|||||||
ifeq ($(LINUX_VERSION),2.6.32.32)
|
ifeq ($(LINUX_VERSION),2.6.32.32)
|
||||||
LINUX_KERNEL_MD5SUM:=25a3ba004aaaa409c24dfb2cc268d03e
|
LINUX_KERNEL_MD5SUM:=25a3ba004aaaa409c24dfb2cc268d03e
|
||||||
endif
|
endif
|
||||||
ifeq ($(LINUX_VERSION),2.6.34.7)
|
ifeq ($(LINUX_VERSION),2.6.34.8)
|
||||||
LINUX_KERNEL_MD5SUM:=8964e26120e84844998a673464a980ea
|
LINUX_KERNEL_MD5SUM:=6dedac89df1af57b08981fcc6ad387db
|
||||||
endif
|
endif
|
||||||
ifeq ($(LINUX_VERSION),2.6.35.11)
|
ifeq ($(LINUX_VERSION),2.6.35.11)
|
||||||
LINUX_KERNEL_MD5SUM:=4c9ee33801f5ad0f4d5e615fac66d535
|
LINUX_KERNEL_MD5SUM:=4c9ee33801f5ad0f4d5e615fac66d535
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
bool ssb_is_sprom_available(struct ssb_bus *bus)
|
bool ssb_is_sprom_available(struct ssb_bus *bus)
|
||||||
--- a/include/linux/ssb/ssb.h
|
--- a/include/linux/ssb/ssb.h
|
||||||
+++ b/include/linux/ssb/ssb.h
|
+++ b/include/linux/ssb/ssb.h
|
||||||
@@ -401,6 +401,7 @@ extern bool ssb_is_sprom_available(struc
|
@@ -408,6 +408,7 @@ extern bool ssb_is_sprom_available(struc
|
||||||
/* Set a fallback SPROM.
|
/* Set a fallback SPROM.
|
||||||
* See kdoc at the function definition for complete documentation. */
|
* See kdoc at the function definition for complete documentation. */
|
||||||
extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
|
extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
/* The Mellanox Tavor device gives false positive parity errors
|
/* The Mellanox Tavor device gives false positive parity errors
|
||||||
* Mark this device with a broken_parity_status, to allow
|
* Mark this device with a broken_parity_status, to allow
|
||||||
* PCI scanning code to "skip" this now blacklisted device.
|
* PCI scanning code to "skip" this now blacklisted device.
|
||||||
@@ -1904,7 +1905,9 @@ static void __devinit fixup_rev1_53c810(
|
@@ -1924,7 +1925,9 @@ static void __devinit fixup_rev1_53c810(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
|
||||||
@ -33,7 +33,7 @@
|
|||||||
/* Enable 1k I/O space granularity on the Intel P64H2 */
|
/* Enable 1k I/O space granularity on the Intel P64H2 */
|
||||||
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
|
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
@@ -2560,6 +2563,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
|
@@ -2580,6 +2583,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
|
||||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
|
||||||
|
|
||||||
#endif /* CONFIG_PCI_IOV */
|
#endif /* CONFIG_PCI_IOV */
|
||||||
|
@ -127,10 +127,11 @@
|
|||||||
|
|
||||||
e = (struct ipt_entry *)(loc_cpu_entry + off);
|
e = (struct ipt_entry *)(loc_cpu_entry + off);
|
||||||
if (copy_to_user(userptr + off
|
if (copy_to_user(userptr + off
|
||||||
@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
|
@@ -1000,6 +1040,14 @@ copy_entries_to_user(unsigned int total_
|
||||||
|
ret = -EFAULT;
|
||||||
goto free_counters;
|
goto free_counters;
|
||||||
}
|
}
|
||||||
|
+
|
||||||
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
|
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
|
||||||
+ if (copy_to_user(userptr + off
|
+ if (copy_to_user(userptr + off
|
||||||
+ + offsetof(struct ipt_entry, ip.flags),
|
+ + offsetof(struct ipt_entry, ip.flags),
|
||||||
@ -138,7 +139,6 @@
|
|||||||
+ ret = -EFAULT;
|
+ ret = -EFAULT;
|
||||||
+ goto free_counters;
|
+ goto free_counters;
|
||||||
+ }
|
+ }
|
||||||
+
|
|
||||||
for (i = sizeof(struct ipt_entry);
|
for (i = sizeof(struct ipt_entry);
|
||||||
i < e->target_offset;
|
i < e->target_offset;
|
||||||
i += m->u.match_size) {
|
|
||||||
|
@ -11038,14 +11038,14 @@
|
|||||||
+ yaffs_UnpackTags2(tags, &pt);
|
+ yaffs_UnpackTags2(tags, &pt);
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
|
+
|
||||||
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
|
||||||
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
|
||||||
+ if (localData)
|
+ if (localData)
|
||||||
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
|
+ 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)
|
+ 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)
|
if (retval == 0)
|
||||||
return YAFFS_OK;
|
return YAFFS_OK;
|
||||||
else
|
else
|
||||||
|
@ -299,7 +299,7 @@
|
|||||||
tx_ring_dma + size > DMA_BIT_MASK(30)) {
|
tx_ring_dma + size > DMA_BIT_MASK(30)) {
|
||||||
kfree(tx_ring);
|
kfree(tx_ring);
|
||||||
goto out_err;
|
goto out_err;
|
||||||
@@ -2178,12 +2169,14 @@ static int __devinit b44_init_one(struct
|
@@ -2176,12 +2167,14 @@ static int __devinit b44_init_one(struct
|
||||||
"Failed to powerup the bus\n");
|
"Failed to powerup the bus\n");
|
||||||
goto err_out_free_dev;
|
goto err_out_free_dev;
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@
|
|||||||
* macro override instead of weak attribute alias, to workaround
|
* macro override instead of weak attribute alias, to workaround
|
||||||
--- a/kernel/sched.c
|
--- a/kernel/sched.c
|
||||||
+++ b/kernel/sched.c
|
+++ b/kernel/sched.c
|
||||||
@@ -4370,6 +4370,7 @@ int can_nice(const struct task_struct *p
|
@@ -4339,6 +4339,7 @@ int can_nice(const struct task_struct *p
|
||||||
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
|
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
|
||||||
capable(CAP_SYS_NICE));
|
capable(CAP_SYS_NICE));
|
||||||
}
|
}
|
||||||
@ -104,7 +104,7 @@
|
|||||||
* We enter with non-exclusive mmap_sem (to exclude vma changes,
|
* We enter with non-exclusive mmap_sem (to exclude vma changes,
|
||||||
--- a/mm/vmalloc.c
|
--- a/mm/vmalloc.c
|
||||||
+++ b/mm/vmalloc.c
|
+++ b/mm/vmalloc.c
|
||||||
@@ -1173,6 +1173,7 @@ void unmap_kernel_range(unsigned long ad
|
@@ -1182,6 +1182,7 @@ void unmap_kernel_range(unsigned long ad
|
||||||
vunmap_page_range(addr, end);
|
vunmap_page_range(addr, end);
|
||||||
flush_tlb_kernel_range(addr, end);
|
flush_tlb_kernel_range(addr, end);
|
||||||
}
|
}
|
||||||
@ -112,7 +112,7 @@
|
|||||||
|
|
||||||
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
|
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
|
||||||
{
|
{
|
||||||
@@ -1288,6 +1289,7 @@ struct vm_struct *get_vm_area(unsigned l
|
@@ -1297,6 +1298,7 @@ struct vm_struct *get_vm_area(unsigned l
|
||||||
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
|
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
|
||||||
-1, GFP_KERNEL, __builtin_return_address(0));
|
-1, GFP_KERNEL, __builtin_return_address(0));
|
||||||
}
|
}
|
||||||
@ -122,7 +122,7 @@
|
|||||||
void *caller)
|
void *caller)
|
||||||
--- a/include/linux/mm.h
|
--- a/include/linux/mm.h
|
||||||
+++ b/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);
|
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);
|
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
|
||||||
|
@ -12,7 +12,7 @@ BOARDNAME:=Freescale i.MX21
|
|||||||
FEATURES:=jffs2
|
FEATURES:=jffs2
|
||||||
CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -funit-at-a-time
|
CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -funit-at-a-time
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.34.7
|
LINUX_VERSION:=2.6.34.8
|
||||||
|
|
||||||
DEVICE_TYPE=phone
|
DEVICE_TYPE=phone
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user