Skip to content

Commit ba0c041

Browse files
committed
Revert "parisc: Increase parisc_cache_flush_threshold setting"
This reverts commit a58e9d0. Triggers segfaults with 32-bit kernels on PA8500 machines. Signed-off-by: Helge Deller <[email protected]>
1 parent 340233d commit ba0c041

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

arch/parisc/kernel/cache.c

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ void __init parisc_setup_cache_timing(void)
403403
{
404404
unsigned long rangetime, alltime;
405405
unsigned long size;
406-
unsigned long threshold, threshold2;
406+
unsigned long threshold;
407407

408408
alltime = mfctl(16);
409409
flush_data_cache();
@@ -418,20 +418,8 @@ void __init parisc_setup_cache_timing(void)
418418
alltime, size, rangetime);
419419

420420
threshold = L1_CACHE_ALIGN(size * alltime / rangetime);
421-
422-
/*
423-
* The threshold computed above isn't very reliable since the
424-
* flush times depend greatly on the percentage of dirty lines
425-
* in the flush range. Further, the whole cache time doesn't
426-
* include the time to refill lines that aren't in the mm/vma
427-
* being flushed. By timing glibc build and checks on mako cpus,
428-
* the following formula seems to work reasonably well. The
429-
* value from the timing calculation is too small, and increases
430-
* build and check times by almost a factor two.
431-
*/
432-
threshold2 = cache_info.dc_size * num_online_cpus();
433-
if (threshold2 > threshold)
434-
threshold = threshold2;
421+
if (threshold > cache_info.dc_size)
422+
threshold = cache_info.dc_size;
435423
if (threshold)
436424
parisc_cache_flush_threshold = threshold;
437425
printk(KERN_INFO "Cache flush threshold set to %lu KiB\n",

0 commit comments

Comments
 (0)