diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-09 06:53:02 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-09 06:53:02 +0100 |
| commit | ce6d841e9c0e177a594615dc0e69dd04972a696c (patch) | |
| tree | 61c24c2dcd481502fdc0250407918469b5298a61 /arch | |
| parent | c0cba03baa0d285b1a8f9d3481be1868df7af1ad (diff) | |
| parent | 6893f5675f54d6452aded27f9a1d5e86a3bddcbe (diff) | |
| download | linux-stable-ce6d841e9c0e177a594615dc0e69dd04972a696c.tar.gz linux-stable-ce6d841e9c0e177a594615dc0e69dd04972a696c.tar.bz2 linux-stable-ce6d841e9c0e177a594615dc0e69dd04972a696c.zip | |
Merge branch 'akpm' (Fixes from Andrew)
Merge misc fixes from Andrew Morton:
"Five fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (5 patches)
h8300: add missing L1_CACHE_SHIFT
mm: bugfix: set current->reclaim_state to NULL while returning from kswapd()
fanotify: fix missing break
revert "epoll: support for disabling items, and a self-test app"
checkpatch: improve network block comment style checking
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/h8300/include/asm/cache.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/h8300/include/asm/cache.h b/arch/h8300/include/asm/cache.h index c6350283649d..05887a1d80e5 100644 --- a/arch/h8300/include/asm/cache.h +++ b/arch/h8300/include/asm/cache.h @@ -2,7 +2,8 @@ #define __ARCH_H8300_CACHE_H /* bytes per L1 cache line */ -#define L1_CACHE_BYTES 4 +#define L1_CACHE_SHIFT 2 +#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) /* m68k-elf-gcc 2.95.2 doesn't like these */ |