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

sh: Trivial build fixes for SH-2 support.

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

authored by

Yoshinori Sato and committed by
Paul Mundt
11cbb70e 780a1568

+7 -16
+1 -13
arch/sh/Kconfig
··· 479 479 int "CPU Mode Pin Setting" 480 480 depends on CPU_SUBTYPE_SH7619 || CPU_SUBTYPE_SH7206 481 481 help 482 - MD2 - MD0 Setting. 482 + MD2 - MD0 pin setting. 483 483 484 484 menu "CPU Frequency scaling" 485 485 ··· 579 579 approximately eight kilobytes to the kernel image. 580 580 581 581 source "kernel/Kconfig.preempt" 582 - 583 - config CPU_HAS_SR_RB 584 - bool "CPU has SR.RB" 585 - depends on CPU_SH3 || CPU_SH4 586 - default y 587 - help 588 - This will enable the use of SR.RB register bank usage. Processors 589 - that are lacking this bit must have another method in place for 590 - accomplishing what is taken care of by the banked registers. 591 - 592 - See <file:Documentation/sh/register-banks.txt> for further 593 - information on SR.RB and register banking in the kernel in general. 594 582 595 583 config NODES_SHIFT 596 584 int
+2 -1
arch/sh/Kconfig.debug
··· 31 31 hex "SCIF port for early console" 32 32 depends on EARLY_SCIF_CONSOLE 33 33 default "0xffe00000" if CPU_SUBTYPE_SH7780 34 - default "0xfffe9800" if CPU_SUBTYPE_SH72060 34 + default "0xfffe9800" if CPU_SUBTYPE_SH7206 35 + default "0xf8420000" if CPU_SUBTYPE_SH7619 35 36 default "0xffe80000" if CPU_SH4 36 37 37 38 config EARLY_PRINTK
+1 -1
arch/sh/kernel/signal.c
··· 101 101 */ 102 102 103 103 #define MOVW(n) (0x9300|((n)-2)) /* Move mem word at PC+n to R3 */ 104 - #if defined(CONFIG_CPU_SH2) || defined(CONFIG_CPU_SH2A) 104 + #if defined(CONFIG_CPU_SH2) 105 105 #define TRAP_NOARG 0xc320 /* Syscall w/no args (NR in R3) */ 106 106 #else 107 107 #define TRAP_NOARG 0xc310 /* Syscall w/no args (NR in R3) */
+1 -1
arch/sh/kernel/sys_sh.c
··· 324 324 register long __sc4 __asm__ ("r4") = (long) filename; 325 325 register long __sc5 __asm__ ("r5") = (long) argv; 326 326 register long __sc6 __asm__ ("r6") = (long) envp; 327 - __asm__ __volatile__ ("trapa #0x13" : "=z" (__sc0) 327 + __asm__ __volatile__ (SYSCALL_ARG3 : "=z" (__sc0) 328 328 : "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6) 329 329 : "memory"); 330 330 return __sc0;
+2
arch/sh/mm/init.c
··· 77 77 printk("%d pages swap cached\n",cached); 78 78 } 79 79 80 + #ifdef CONFIG_MMU 80 81 static void set_pte_phys(unsigned long addr, unsigned long phys, pgprot_t prot) 81 82 { 82 83 pgd_t *pgd; ··· 140 139 141 140 set_pte_phys(address, phys, prot); 142 141 } 142 + #endif /* CONFIG_MMU */ 143 143 144 144 /* References to section boundaries */ 145 145