Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh: Allow SH-3 and SH-5 to use common headers.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

+1 -83
arch/sh/include/cpu-sh2/cpu/rtc.h arch/sh/include/cpu-common/cpu/rtc.h
-19
arch/sh/include/cpu-sh3/cpu/addrspace.h
··· 1 - /* 2 - * This file is subject to the terms and conditions of the GNU General Public 3 - * License. See the file "COPYING" in the main directory of this archive 4 - * for more details. 5 - * 6 - * Copyright (C) 1999 by Kaz Kojima 7 - * 8 - * Defitions for the address spaces of the SH-3 CPUs. 9 - */ 10 - #ifndef __ASM_CPU_SH3_ADDRSPACE_H 11 - #define __ASM_CPU_SH3_ADDRSPACE_H 12 - 13 - #define P0SEG 0x00000000 14 - #define P1SEG 0x80000000 15 - #define P2SEG 0xa0000000 16 - #define P3SEG 0xc0000000 17 - #define P4SEG 0xe0000000 18 - 19 - #endif /* __ASM_CPU_SH3_ADDRSPACE_H */
+1 -35
arch/sh/include/cpu-sh3/cpu/cacheflush.h
··· 10 10 #ifndef __ASM_CPU_SH3_CACHEFLUSH_H 11 11 #define __ASM_CPU_SH3_CACHEFLUSH_H 12 12 13 - /* 14 - * Cache flushing: 15 - * 16 - * - flush_cache_all() flushes entire cache 17 - * - flush_cache_mm(mm) flushes the specified mm context's cache lines 18 - * - flush_cache_dup mm(mm) handles cache flushing when forking 19 - * - flush_cache_page(mm, vmaddr, pfn) flushes a single page 20 - * - flush_cache_range(vma, start, end) flushes a range of pages 21 - * 22 - * - flush_dcache_page(pg) flushes(wback&invalidates) a page for dcache 23 - * - flush_icache_range(start, end) flushes(invalidates) a range for icache 24 - * - flush_icache_page(vma, pg) flushes(invalidates) a page for icache 25 - * 26 - * Caches are indexed (effectively) by physical address on SH-3, so 27 - * we don't need them. 28 - */ 29 - 30 13 #if defined(CONFIG_SH7705_CACHE_32KB) 31 - 32 14 /* SH7705 is an SH3 processor with 32KB cache. This has alias issues like the 33 15 * SH4. Unlike the SH4 this is a unified cache so we need to do some work 34 16 * in mmap when 'exec'ing a new binary ··· 30 48 void flush_icache_range(unsigned long start, unsigned long end); 31 49 void flush_icache_page(struct vm_area_struct *vma, struct page *page); 32 50 #else 33 - #define flush_cache_all() do { } while (0) 34 - #define flush_cache_mm(mm) do { } while (0) 35 - #define flush_cache_dup_mm(mm) do { } while (0) 36 - #define flush_cache_range(vma, start, end) do { } while (0) 37 - #define flush_cache_page(vma, vmaddr, pfn) do { } while (0) 38 - #define flush_dcache_page(page) do { } while (0) 39 - #define flush_icache_range(start, end) do { } while (0) 40 - #define flush_icache_page(vma,pg) do { } while (0) 51 + #include <cpu-common/cpu/cacheflush.h> 41 52 #endif 42 - 43 - #define flush_dcache_mmap_lock(mapping) do { } while (0) 44 - #define flush_dcache_mmap_unlock(mapping) do { } while (0) 45 - 46 - /* SH3 has unified cache so no special action needed here */ 47 - #define flush_cache_sigtramp(vaddr) do { } while (0) 48 - #define flush_icache_user_range(vma,pg,adr,len) do { } while (0) 49 - 50 - #define p3_cache_init() do { } while (0) 51 53 52 54 #endif /* __ASM_CPU_SH3_CACHEFLUSH_H */
-8
arch/sh/include/cpu-sh3/cpu/rtc.h
··· 1 - #ifndef __ASM_SH_CPU_SH3_RTC_H 2 - #define __ASM_SH_CPU_SH3_RTC_H 3 - 4 - #define rtc_reg_size sizeof(u16) 5 - #define RTC_BIT_INVERTED 0 /* No bug on SH7708, SH7709A */ 6 - #define RTC_DEF_CAPABILITIES 0UL 7 - 8 - #endif /* __ASM_SH_CPU_SH3_RTC_H */
-17
arch/sh/include/cpu-sh3/cpu/sigcontext.h
··· 1 - #ifndef __ASM_CPU_SH3_SIGCONTEXT_H 2 - #define __ASM_CPU_SH3_SIGCONTEXT_H 3 - 4 - struct sigcontext { 5 - unsigned long oldmask; 6 - 7 - /* CPU registers */ 8 - unsigned long sc_regs[16]; 9 - unsigned long sc_pc; 10 - unsigned long sc_pr; 11 - unsigned long sc_sr; 12 - unsigned long sc_gbr; 13 - unsigned long sc_mach; 14 - unsigned long sc_macl; 15 - }; 16 - 17 - #endif /* __ASM_CPU_SH3_SIGCONTEXT_H */
-4
arch/sh/include/cpu-sh5/cpu/timer.h
··· 1 - #ifndef __ASM_SH_CPU_SH5_TIMER_H 2 - #define __ASM_SH_CPU_SH5_TIMER_H 3 - 4 - #endif /* __ASM_SH_CPU_SH5_TIMER_H */