aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-06-17 12:57:04 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-06-17 12:57:04 +0000
commit478b3b32f429be04c317e7aa1eb44241dd3429e1 (patch)
treee74befb0c374b234d84de0bc1cc10296d19133f1 /target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch
parent14b8ea6a1a5d851cf316c38d0594f33a4263e142 (diff)
downloadmaster-187ad058-478b3b32f429be04c317e7aa1eb44241dd3429e1.tar.gz
master-187ad058-478b3b32f429be04c317e7aa1eb44241dd3429e1.tar.bz2
master-187ad058-478b3b32f429be04c317e7aa1eb44241dd3429e1.zip
[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
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch16
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch b/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch
index fc25172dd2..a2c27ab7c7 100644
--- a/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch
@@ -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);
}