diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:18:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:18:00 -0400 |
| commit | 45de6fd958d7f407bdb5fdc6914b3262519d891c (patch) | |
| tree | c1b9f9023e93d0f28f773ca4be41d107f79cd600 /arch/parisc/kernel/cache.c | |
| parent | 1f5d5dbf0372dd933d8325054889ba09d996e50b (diff) | |
| parent | 3b908870b8332dfd40be0e919e187aa4991536fb (diff) | |
Merge branch 'upstream-fixes' into upstream
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 360b7391cb8c..c057ad7605ba 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * License. See the file "COPYING" in the main directory of this archive | 4 | * License. See the file "COPYING" in the main directory of this archive |
| 5 | * for more details. | 5 | * for more details. |
| 6 | * | 6 | * |
| 7 | * Copyright (C) 1999 Helge Deller (07-13-1999) | 7 | * Copyright (C) 1999-2006 Helge Deller <deller@gmx.de> (07-13-1999) |
| 8 | * Copyright (C) 1999 SuSE GmbH Nuernberg | 8 | * Copyright (C) 1999 SuSE GmbH Nuernberg |
| 9 | * Copyright (C) 2000 Philipp Rumpf (prumpf@tux.org) | 9 | * Copyright (C) 2000 Philipp Rumpf (prumpf@tux.org) |
| 10 | * | 10 | * |
| @@ -358,5 +358,5 @@ void parisc_setup_cache_timing(void) | |||
| 358 | if (!parisc_cache_flush_threshold) | 358 | if (!parisc_cache_flush_threshold) |
| 359 | parisc_cache_flush_threshold = FLUSH_THRESHOLD; | 359 | parisc_cache_flush_threshold = FLUSH_THRESHOLD; |
| 360 | 360 | ||
| 361 | printk("Setting cache flush threshold to %x (%d CPUs online)\n", parisc_cache_flush_threshold, num_online_cpus()); | 361 | printk(KERN_INFO "Setting cache flush threshold to %x (%d CPUs online)\n", parisc_cache_flush_threshold, num_online_cpus()); |
| 362 | } | 362 | } |