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

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

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

* 'sh-fixes-for-linus' of git://github.com/pmundt/linux-sh:
  mailmap: Fix up some renesas attributions
  sh: clkfwk: Kill off remaining debugfs cruft.
  drivers: sh: Kill off dead pathname for runtime PM stub.
  drivers: sh: Generalize runtime PM platform stub.
  sh: Wire up process_vm syscalls.
  sh: clkfwk: add clk_rate_mult_range_round()
  serial: sh-sci: Fix up SH-2A SCIF support.
  sh: Fix cached/uncaced address calculation in 29bit mode
parents d291ffb3 ab4f75cd

.mailmap

+2 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,7 @@ Juha Yrjola <juha.yrjola@solidboot.com> 
Kay Sievers <kay.sievers@vrfy.org>

Kay Sievers <kay.sievers@vrfy.org>

Kenneth W Chen <kenneth.w.chen@intel.com>

Kenneth W Chen <kenneth.w.chen@intel.com>

Koushik <raghavendra.koushik@neterion.com>

Koushik <raghavendra.koushik@neterion.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Linas Vepstas <linas@austin.ibm.com>

Linas Vepstas <linas@austin.ibm.com>

Mark Brown <broonie@sirena.org.uk>

Mark Brown <broonie@sirena.org.uk>
@@ -111,3 +112,4 @@ Uwe Kleine-König <ukl@pengutronix.de> 
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

arch/arm/mach-shmobile/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
#

#





# Common objects

# Common objects

obj-y				:= timer.o console.o clock.o pm_runtime.o

obj-y				:= timer.o console.o clock.o





# CPU objects

# CPU objects

obj-$(CONFIG_ARCH_SH7367)	+= setup-sh7367.o clock-sh7367.o intc-sh7367.o

obj-$(CONFIG_ARCH_SH7367)	+= setup-sh7367.o clock-sh7367.o intc-sh7367.o

arch/sh/include/asm/page.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -151,8 +151,13 @@ typedef struct page *pgtable_t; 
#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLY__ */





#ifdef CONFIG_UNCACHED_MAPPING

#ifdef CONFIG_UNCACHED_MAPPING

#if defined(CONFIG_29BIT)

#define UNCAC_ADDR(addr)	P2SEGADDR(addr)

#define CAC_ADDR(addr)		P1SEGADDR(addr)

#else

#define UNCAC_ADDR(addr)	((addr) - PAGE_OFFSET + uncached_start)

#define UNCAC_ADDR(addr)	((addr) - PAGE_OFFSET + uncached_start)

#define CAC_ADDR(addr)		((addr) - uncached_start + PAGE_OFFSET)

#define CAC_ADDR(addr)		((addr) - uncached_start + PAGE_OFFSET)

#endif

#else

#else

#define UNCAC_ADDR(addr)	((addr))

#define UNCAC_ADDR(addr)	((addr))

#define CAC_ADDR(addr)		((addr))

#define CAC_ADDR(addr)		((addr))

arch/sh/include/asm/unistd_32.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -375,8 +375,10 @@ 
#define __NR_syncfs		362

#define __NR_syncfs		362

#define __NR_sendmmsg		363

#define __NR_sendmmsg		363

#define __NR_setns		364

#define __NR_setns		364

#define __NR_process_vm_readv	365

#define __NR_process_vm_writev	366





#define NR_syscalls 365

#define NR_syscalls 367





#ifdef __KERNEL__

#ifdef __KERNEL__

arch/sh/include/asm/unistd_64.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -396,10 +396,12 @@ 
#define __NR_syncfs		373

#define __NR_syncfs		373

#define __NR_sendmmsg		374

#define __NR_sendmmsg		374

#define __NR_setns		375

#define __NR_setns		375

#define __NR_process_vm_readv	376

#define __NR_process_vm_writev	377





#ifdef __KERNEL__

#ifdef __KERNEL__





#define NR_syscalls 376

#define NR_syscalls 378





#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_OLD_READDIR