diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:08:42 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:08:42 -0400 |
| commit | 7203781c98ad9147564d327de6f6513ad8fc0f4e (patch) | |
| tree | 5c29a2a04a626bf08a0d56fd8a0068b3c92ad284 /arch/blackfin/kernel/cplb-nompu/cacheinit.c | |
| parent | 671eef85a3e885dff4ce210d8774ad50a91d5967 (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
Merge branch 'x86/cpu' into x86/core
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'arch/blackfin/kernel/cplb-nompu/cacheinit.c')
| -rw-r--r-- | arch/blackfin/kernel/cplb-nompu/cacheinit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/cplb-nompu/cacheinit.c b/arch/blackfin/kernel/cplb-nompu/cacheinit.c index 8a18399f6072..bd0831592c2c 100644 --- a/arch/blackfin/kernel/cplb-nompu/cacheinit.c +++ b/arch/blackfin/kernel/cplb-nompu/cacheinit.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <asm/cplbinit.h> | 25 | #include <asm/cplbinit.h> |
| 26 | 26 | ||
| 27 | #if defined(CONFIG_BFIN_ICACHE) | 27 | #if defined(CONFIG_BFIN_ICACHE) |
| 28 | void bfin_icache_init(void) | 28 | void __init bfin_icache_init(void) |
| 29 | { | 29 | { |
| 30 | unsigned long *table = icplb_table; | 30 | unsigned long *table = icplb_table; |
| 31 | unsigned long ctrl; | 31 | unsigned long ctrl; |
| @@ -47,7 +47,7 @@ void bfin_icache_init(void) | |||
| 47 | #endif | 47 | #endif |
| 48 | 48 | ||
| 49 | #if defined(CONFIG_BFIN_DCACHE) | 49 | #if defined(CONFIG_BFIN_DCACHE) |
| 50 | void bfin_dcache_init(void) | 50 | void __init bfin_dcache_init(void) |
| 51 | { | 51 | { |
| 52 | unsigned long *table = dcplb_table; | 52 | unsigned long *table = dcplb_table; |
| 53 | unsigned long ctrl; | 53 | unsigned long ctrl; |