diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 15:45:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 15:45:53 -0800 |
| commit | 2ddb3b15f1b46836c61cfac5b00d8f08a24236e6 (patch) | |
| tree | fb1b7879d6e5cd5460bc256fae11c02aebd94256 /arch/parisc/kernel/cache.c | |
| parent | 5980bb3ee6e733d66eea04c221a140dea15d52de (diff) | |
| parent | 6ee77658ce387ad6c85dcbda4a68bc33efd8de39 (diff) | |
| download | kernel-crypto-2ddb3b15f1b46836c61cfac5b00d8f08a24236e6.tar.gz kernel-crypto-2ddb3b15f1b46836c61cfac5b00d8f08a24236e6.tar.xz kernel-crypto-2ddb3b15f1b46836c61cfac5b00d8f08a24236e6.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: use __ratelimit in unaligned.c
parisc: Convert to read/update_persistent_clock
parisc: Simplify param.h by including <asm-generic/param.h>
parisc: drop unnecessary cast in __ldcw_align() macro
parisc: add strict copy size checks (v2)
parisc: remove trailing space in messages
parisc: ditto sys_accept4
parisc: wire up sys_recvmmsg
Diffstat (limited to 'arch/parisc/kernel/cache.c')
| -rw-r--r-- | arch/parisc/kernel/cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index 1054baa2fc6..d054f3da3ff 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c @@ -171,14 +171,14 @@ parisc_cache_init(void) cache_info.ic_conf.cc_cst, cache_info.ic_conf.cc_hv); - printk("D-TLB conf: sh %d page %d cst %d aid %d pad1 %d \n", + printk("D-TLB conf: sh %d page %d cst %d aid %d pad1 %d\n", cache_info.dt_conf.tc_sh, cache_info.dt_conf.tc_page, cache_info.dt_conf.tc_cst, cache_info.dt_conf.tc_aid, cache_info.dt_conf.tc_pad1); - printk("I-TLB conf: sh %d page %d cst %d aid %d pad1 %d \n", + printk("I-TLB conf: sh %d page %d cst %d aid %d pad1 %d\n", cache_info.it_conf.tc_sh, cache_info.it_conf.tc_page, cache_info.it_conf.tc_cst, |