diff options
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/kernel/cputable.c | 5 | ||||
| -rw-r--r-- | arch/ppc/kernel/dma-mapping.c | 4 | ||||
| -rw-r--r-- | arch/ppc/platforms/pmac_time.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/arch/ppc/kernel/cputable.c b/arch/ppc/kernel/cputable.c index 546e1ea4cafa..6b76cf58d9e0 100644 --- a/arch/ppc/kernel/cputable.c +++ b/arch/ppc/kernel/cputable.c | |||
| @@ -91,7 +91,7 @@ struct cpu_spec cpu_specs[] = { | |||
| 91 | .cpu_features = CPU_FTR_COMMON | CPU_FTR_601 | | 91 | .cpu_features = CPU_FTR_COMMON | CPU_FTR_601 | |
| 92 | CPU_FTR_HPTE_TABLE, | 92 | CPU_FTR_HPTE_TABLE, |
| 93 | .cpu_user_features = COMMON_PPC | PPC_FEATURE_601_INSTR | | 93 | .cpu_user_features = COMMON_PPC | PPC_FEATURE_601_INSTR | |
| 94 | PPC_FEATURE_UNIFIED_CACHE, | 94 | PPC_FEATURE_UNIFIED_CACHE | PPC_FEATURE_NO_TB, |
| 95 | .icache_bsize = 32, | 95 | .icache_bsize = 32, |
| 96 | .dcache_bsize = 32, | 96 | .dcache_bsize = 32, |
| 97 | .cpu_setup = __setup_cpu_601 | 97 | .cpu_setup = __setup_cpu_601 |
| @@ -745,7 +745,8 @@ struct cpu_spec cpu_specs[] = { | |||
| 745 | .cpu_name = "403GCX", | 745 | .cpu_name = "403GCX", |
| 746 | .cpu_features = CPU_FTR_SPLIT_ID_CACHE | | 746 | .cpu_features = CPU_FTR_SPLIT_ID_CACHE | |
| 747 | CPU_FTR_USE_TB, | 747 | CPU_FTR_USE_TB, |
| 748 | .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, | 748 | .cpu_user_features = PPC_FEATURE_32 | |
| 749 | PPC_FEATURE_HAS_MMU | PPC_FEATURE_NO_TB, | ||
| 749 | .icache_bsize = 16, | 750 | .icache_bsize = 16, |
| 750 | .dcache_bsize = 16, | 751 | .dcache_bsize = 16, |
| 751 | }, | 752 | }, |
diff --git a/arch/ppc/kernel/dma-mapping.c b/arch/ppc/kernel/dma-mapping.c index b566d982806c..8edee806dae7 100644 --- a/arch/ppc/kernel/dma-mapping.c +++ b/arch/ppc/kernel/dma-mapping.c | |||
| @@ -401,10 +401,10 @@ EXPORT_SYMBOL(__dma_sync); | |||
| 401 | static inline void __dma_sync_page_highmem(struct page *page, | 401 | static inline void __dma_sync_page_highmem(struct page *page, |
| 402 | unsigned long offset, size_t size, int direction) | 402 | unsigned long offset, size_t size, int direction) |
| 403 | { | 403 | { |
| 404 | size_t seg_size = min((size_t)PAGE_SIZE, size) - offset; | 404 | size_t seg_size = min((size_t)(PAGE_SIZE - offset), size); |
| 405 | size_t cur_size = seg_size; | 405 | size_t cur_size = seg_size; |
| 406 | unsigned long flags, start, seg_offset = offset; | 406 | unsigned long flags, start, seg_offset = offset; |
| 407 | int nr_segs = PAGE_ALIGN(size + (PAGE_SIZE - offset))/PAGE_SIZE; | 407 | int nr_segs = 1 + ((size - seg_size) + PAGE_SIZE - 1)/PAGE_SIZE; |
| 408 | int seg_nr = 0; | 408 | int seg_nr = 0; |
| 409 | 409 | ||
| 410 | local_irq_save(flags); | 410 | local_irq_save(flags); |
diff --git a/arch/ppc/platforms/pmac_time.c b/arch/ppc/platforms/pmac_time.c index 778ce4fec368..efb819f9490d 100644 --- a/arch/ppc/platforms/pmac_time.c +++ b/arch/ppc/platforms/pmac_time.c | |||
| @@ -195,7 +195,7 @@ via_calibrate_decr(void) | |||
| 195 | ; | 195 | ; |
| 196 | dend = get_dec(); | 196 | dend = get_dec(); |
| 197 | 197 | ||
| 198 | tb_ticks_per_jiffy = (dstart - dend) / (6 * (HZ/100)); | 198 | tb_ticks_per_jiffy = (dstart - dend) / ((6 * HZ)/100); |
| 199 | tb_to_us = mulhwu_scale_factor(dstart - dend, 60000); | 199 | tb_to_us = mulhwu_scale_factor(dstart - dend, 60000); |
| 200 | 200 | ||
| 201 | printk(KERN_INFO "via_calibrate_decr: ticks per jiffy = %u (%u ticks)\n", | 201 | printk(KERN_INFO "via_calibrate_decr: ticks per jiffy = %u (%u ticks)\n", |