diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-09 23:06:24 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 23:06:24 +0000 |
| commit | 4512542b1843804bb19fd108a613f903c1d885a0 (patch) | |
| tree | e8d798695143603f4f392cd2485dff6eed23fa90 /packages/ixp4xx/ixp-osal-2.1/invalidate-cache.patch | |
| parent | 249a5476b2d2ec15e71b126bb02bc885b29604ee (diff) | |
ixp-osal: merge with latest nslu2 CVS patch set in 2.1
- there is no significant change in this merge, just whitespace
- at the end of a couple of source file lines. All patches are
- now 'sanitised' to remove the date stamps (which otherwise
- make comparisons difficult).
Diffstat (limited to 'packages/ixp4xx/ixp-osal-2.1/invalidate-cache.patch')
| -rw-r--r-- | packages/ixp4xx/ixp-osal-2.1/invalidate-cache.patch | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/packages/ixp4xx/ixp-osal-2.1/invalidate-cache.patch b/packages/ixp4xx/ixp-osal-2.1/invalidate-cache.patch index c6ec6ed6a7..33c1d132db 100644 --- a/packages/ixp4xx/ixp-osal-2.1/invalidate-cache.patch +++ b/packages/ixp4xx/ixp-osal-2.1/invalidate-cache.patch @@ -1,5 +1,10 @@ ---- ixp_osal/os/linux/include/core/IxOsalOs.h 2005-08-24 00:16:37.000000000 +0200 -+++ ixp_osal/os/linux/include/core/IxOsalOs.h 2005-08-26 01:56:22.000000000 +0200 + os/linux/include/core/IxOsalOs.h | 17 ++++++++++ + os/linux/src/core/IxOsalOsCacheMMU.c | 56 +++++++++++++++++++++++++++++++++++ + os/linux/src/core/IxOsalOsSymbols.c | 4 ++ + 3 files changed, 76 insertions(+), 1 deletion(-) + +--- ixp_osal/os/linux/include/core/IxOsalOs.h 1970-01-01 00:00:00.000000000 +0000 ++++ ixp_osal/os/linux/include/core/IxOsalOs.h 1970-01-01 00:00:00.000000000 +0000 @@ -56,6 +56,7 @@ #include <linux/cache.h> #include <linux/mm.h> @@ -27,15 +32,15 @@ +#else + -+#define IX_OSAL_OS_CACHE_INVALIDATE(addr, size) ( invalidate_dcache_range((__u32)addr, (__u32)addr + size )) ++#define IX_OSAL_OS_CACHE_INVALIDATE(addr, size) ( invalidate_dcache_range((__u32)addr, (__u32)addr + size )) #define IX_OSAL_OS_CACHE_FLUSH(addr, size) ( clean_dcache_range((__u32)addr, (__u32)addr + size )) +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */ - #define printf printk /* For backword compatibility, needs to move to better location */ - ---- ixp_osal/os/linux/src/core/IxOsalOsCacheMMU.c 2005-08-24 00:16:37.000000000 +0200 -+++ ixp_osal/os/linux/src/core/IxOsalOsCacheMMU.c 2005-08-26 01:56:22.000000000 +0200 -@@ -210,3 +210,59 @@ + /* Cache preload not available*/ + #define IX_OSAL_OS_CACHE_PRELOAD(addr,size) {} +--- ixp_osal/os/linux/src/core/IxOsalOsCacheMMU.c 1970-01-01 00:00:00.000000000 +0000 ++++ ixp_osal/os/linux/src/core/IxOsalOsCacheMMU.c 1970-01-01 00:00:00.000000000 +0000 +@@ -210,3 +210,59 @@ ixOsalCacheDmaFree (void *ptr) free_pages ((unsigned int) memptr, order); } } @@ -95,9 +100,9 @@ +#undef IX_CLM + +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */ ---- ixp_osal/os/linux/src/core/IxOsalOsSymbols.c 2005-08-24 00:16:37.000000000 +0200 -+++ ixp_osal/os/linux/src/core/IxOsalOsSymbols.c 2005-08-30 19:19:33.000000000 +0200 -@@ -64,6 +64,10 @@ +--- ixp_osal/os/linux/src/core/IxOsalOsSymbols.c 1970-01-01 00:00:00.000000000 +0000 ++++ ixp_osal/os/linux/src/core/IxOsalOsSymbols.c 1970-01-01 00:00:00.000000000 +0000 +@@ -64,6 +64,10 @@ EXPORT_SYMBOL (ixOsalMemSet); EXPORT_SYMBOL (ixOsalCacheDmaMalloc); EXPORT_SYMBOL (ixOsalCacheDmaFree); |