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

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

Pull SuperH fixes from Paul Mundt.

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
sh: ecovec: add sample amixer settings
sh: Fix up stack debugging build.
sh: wire up finit_module syscall.
sh: Fix FDPIC binary loader
sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6
sh: define TASK_UNMAPPED_BASE as a page aligned constant

Linus Torvalds aa8b550c a6d3bd27

+28 -6
+10
arch/sh/boards/mach-ecovec24/setup.c
··· 70 70 * OFF-ON : MMC 71 71 */ 72 72 73 + /* 74 + * FSI - DA7210 75 + * 76 + * it needs amixer settings for playing 77 + * 78 + * amixer set 'HeadPhone' 80 79 + * amixer set 'Out Mixer Left DAC Left' on 80 + * amixer set 'Out Mixer Right DAC Right' on 81 + */ 82 + 73 83 /* Heartbeat */ 74 84 static unsigned char led_pos[] = { 0, 1, 2, 3 }; 75 85
+2 -2
arch/sh/include/asm/elf.h
··· 203 203 if (vdso_enabled) \ 204 204 NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE); \ 205 205 else \ 206 - NEW_AUX_ENT(AT_IGNORE, 0); 206 + NEW_AUX_ENT(AT_IGNORE, 0) 207 207 #else 208 - #define VSYSCALL_AUX_ENT 208 + #define VSYSCALL_AUX_ENT NEW_AUX_ENT(AT_IGNORE, 0) 209 209 #endif /* CONFIG_VSYSCALL */ 210 210 211 211 #ifdef CONFIG_SH_FPU
+1 -1
arch/sh/include/asm/processor_32.h
··· 39 39 /* This decides where the kernel will search for a free chunk of vm 40 40 * space during mmap's. 41 41 */ 42 - #define TASK_UNMAPPED_BASE (TASK_SIZE / 3) 42 + #define TASK_UNMAPPED_BASE PAGE_ALIGN(TASK_SIZE / 3) 43 43 44 44 /* 45 45 * Bit of SR register
+1 -1
arch/sh/include/asm/processor_64.h
··· 47 47 /* This decides where the kernel will search for a free chunk of vm 48 48 * space during mmap's. 49 49 */ 50 - #define TASK_UNMAPPED_BASE (TASK_SIZE / 3) 50 + #define TASK_UNMAPPED_BASE PAGE_ALIGN(TASK_SIZE / 3) 51 51 52 52 /* 53 53 * Bit of SR register
+2 -1
arch/sh/include/uapi/asm/unistd_32.h
··· 379 379 #define __NR_process_vm_readv 365 380 380 #define __NR_process_vm_writev 366 381 381 #define __NR_kcmp 367 382 + #define __NR_finit_module 368 382 383 383 - #define NR_syscalls 368 384 + #define NR_syscalls 369 384 385 385 386 #endif /* __ASM_SH_UNISTD_32_H */
+2 -1
arch/sh/include/uapi/asm/unistd_64.h
··· 399 399 #define __NR_process_vm_readv 376 400 400 #define __NR_process_vm_writev 377 401 401 #define __NR_kcmp 378 402 + #define __NR_finit_module 379 402 403 403 - #define NR_syscalls 379 404 + #define NR_syscalls 380 404 405 405 406 #endif /* __ASM_SH_UNISTD_64_H */
+1
arch/sh/kernel/syscalls_32.S
··· 385 385 .long sys_process_vm_readv /* 365 */ 386 386 .long sys_process_vm_writev 387 387 .long sys_kcmp 388 + .long sys_finit_module
+1
arch/sh/kernel/syscalls_64.S
··· 405 405 .long sys_process_vm_readv 406 406 .long sys_process_vm_writev 407 407 .long sys_kcmp 408 + .long sys_finit_module
+2
arch/sh/lib/mcount.S
··· 294 294 .align 2 295 295 .L_init_thread_union: 296 296 .long init_thread_union 297 + .L_ebss: 298 + .long __bss_stop 297 299 .Lpanic: 298 300 .long panic 299 301 .Lpanic_s:
+6
drivers/sh/clk/cpg.c
··· 126 126 127 127 static int sh_clk_div_enable(struct clk *clk) 128 128 { 129 + if (clk->div_mask == SH_CLK_DIV6_MSK) { 130 + int ret = sh_clk_div_set_rate(clk, clk->rate); 131 + if (ret < 0) 132 + return ret; 133 + } 134 + 129 135 sh_clk_write(sh_clk_read(clk) & ~CPG_CKSTP_BIT, clk); 130 136 return 0; 131 137 }