mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[kernel] upgrade to 2.6.25.7, and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11523 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
Index: linux-2.6.25.4/arch/mips/mm/init.c
|
||||
===================================================================
|
||||
--- linux-2.6.25.4.orig/arch/mips/mm/init.c
|
||||
+++ linux-2.6.25.4/arch/mips/mm/init.c
|
||||
@@ -205,32 +205,6 @@ void kunmap_coherent(void)
|
||||
--- a/arch/mips/mm/init.c
|
||||
+++ b/arch/mips/mm/init.c
|
||||
@@ -205,32 +205,6 @@
|
||||
preempt_check_resched();
|
||||
}
|
||||
|
||||
@@ -35,10 +33,8 @@ Index: linux-2.6.25.4/arch/mips/mm/init.c
|
||||
void copy_to_user_page(struct vm_area_struct *vma,
|
||||
struct page *page, unsigned long vaddr, void *dst, const void *src,
|
||||
unsigned long len)
|
||||
Index: linux-2.6.25.4/include/asm-mips/page.h
|
||||
===================================================================
|
||||
--- linux-2.6.25.4.orig/include/asm-mips/page.h
|
||||
+++ linux-2.6.25.4/include/asm-mips/page.h
|
||||
--- a/include/asm-mips/page.h
|
||||
+++ b/include/asm-mips/page.h
|
||||
@@ -32,6 +32,7 @@
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
@@ -47,7 +43,7 @@ Index: linux-2.6.25.4/include/asm-mips/page.h
|
||||
#include <asm/io.h>
|
||||
|
||||
/*
|
||||
@@ -64,13 +65,16 @@ static inline void clear_user_page(void
|
||||
@@ -64,13 +65,16 @@
|
||||
flush_data_cache_page((unsigned long)addr);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user