1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

upgrade to 2.6.30-rc8

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16307 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
kaloz
2009-06-03 13:42:28 +00:00
parent 9592a6ef10
commit 7d01bddd18
24 changed files with 69 additions and 435 deletions

View File

@@ -189,8 +189,8 @@
.globl __kuser_helper_start
__kuser_helper_start:
@@ -821,7 +822,7 @@ __kuser_memory_barrier: @ 0xffff0fa0
#endif
@@ -818,7 +819,7 @@ __kuser_memory_barrier: @ 0xffff0fa0
smp_dmb
usr_ret lr
- .align 5
@@ -198,7 +198,7 @@
/*
* Reference prototype:
@@ -953,7 +954,7 @@ kuser_cmpxchg_fixup:
@@ -950,7 +951,7 @@ kuser_cmpxchg_fixup:
#endif
@@ -207,7 +207,7 @@
/*
* Reference prototype:
@@ -1035,7 +1036,7 @@ __kuser_helper_end:
@@ -1032,7 +1033,7 @@ __kuser_helper_end:
* of which is copied into r0 for the mode specific abort handler.
*/
.macro vector_stub, name, mode, correction=0
@@ -216,7 +216,7 @@
vector_\name:
.if \correction
@@ -1160,7 +1161,7 @@ __stubs_start:
@@ -1157,7 +1158,7 @@ __stubs_start:
.long __und_invalid @ e
.long __und_invalid @ f
@@ -225,7 +225,7 @@
/*=============================================================================
* Undefined FIQs
@@ -1190,7 +1191,7 @@ vector_addrexcptn:
@@ -1187,7 +1188,7 @@ vector_addrexcptn:
* We group all the following data together to optimise
* for CPUs with separate I & D caches.
*/
@@ -850,7 +850,7 @@
+#endif /* __MACH_GMAC_H__ */
--- a/arch/arm/mach-gemini/include/mach/hardware.h
+++ b/arch/arm/mach-gemini/include/mach/hardware.h
@@ -72,4 +72,12 @@
@@ -71,4 +71,12 @@
*/
#define IO_ADDRESS(x) ((((x) & 0xFFF00000) >> 4) | ((x) & 0x000FFFFF) | 0xF0000000)