Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa8b550c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a6d3bd27 035688d9

arch/sh/boards/mach-ecovec24/setup.c

+10 −0
Original line number Diff line number Diff line
@@ -70,6 +70,16 @@ 
 *                                  OFF-ON : MMC

 */



/*

 * FSI - DA7210

 *

 * it needs amixer settings for playing

 *

 * amixer set 'HeadPhone' 80

 * amixer set 'Out Mixer Left DAC Left' on

 * amixer set 'Out Mixer Right DAC Right' on

 */



/* Heartbeat */

static unsigned char led_pos[] = { 0, 1, 2, 3 };

arch/sh/include/asm/elf.h

+2 −2
Original line number Diff line number Diff line
@@ -203,9 +203,9 @@ extern void __kernel_vsyscall; 
	if (vdso_enabled)					\

		NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE);	\

	else							\

		NEW_AUX_ENT(AT_IGNORE, 0);

		NEW_AUX_ENT(AT_IGNORE, 0)

#else

#define VSYSCALL_AUX_ENT

#define VSYSCALL_AUX_ENT	NEW_AUX_ENT(AT_IGNORE, 0)

#endif /* CONFIG_VSYSCALL */



#ifdef CONFIG_SH_FPU

arch/sh/include/asm/processor_32.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
/* This decides where the kernel will search for a free chunk of vm

 * space during mmap's.

 */

#define TASK_UNMAPPED_BASE	(TASK_SIZE / 3)

#define TASK_UNMAPPED_BASE	PAGE_ALIGN(TASK_SIZE / 3)



/*

 * Bit of SR register

arch/sh/include/asm/processor_64.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ pc; }) 
/* This decides where the kernel will search for a free chunk of vm

 * space during mmap's.

 */

#define TASK_UNMAPPED_BASE	(TASK_SIZE / 3)

#define TASK_UNMAPPED_BASE	PAGE_ALIGN(TASK_SIZE / 3)



/*

 * Bit of SR register

arch/sh/include/uapi/asm/unistd_32.h

+2 −1
Original line number Diff line number Diff line
@@ -379,7 +379,8 @@ 
#define __NR_process_vm_readv	365

#define __NR_process_vm_writev	366

#define __NR_kcmp		367

#define __NR_finit_module	368



#define NR_syscalls 368

#define NR_syscalls 369



#endif /* __ASM_SH_UNISTD_32_H */