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

Commit 23d88271 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:
 "Two fixes for ARM and one for clkdev:

   - Fix another build issue with vdsomunge on non-glibc systems
   - Fix a randconfig build error caused by an invalid configuration
   - Fix a clkdev problem causing the Nokia n700 to no longer boot"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  clkdev: fix clk_add_alias() with a NULL alias device name
  ARM: 8445/1: fix vdsomunge not to depend on glibc specific byteswap.h
  ARM: make RiscPC depend on MMU
parents 3d0aa366 625faa6a

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -645,6 +645,7 @@ config ARCH_SHMOBILE_LEGACY 




config ARCH_RPC

config ARCH_RPC

	bool "RiscPC"

	bool "RiscPC"

	depends on MMU

	select ARCH_ACORN

	select ARCH_ACORN

	select ARCH_MAY_HAVE_PC_FDC

	select ARCH_MAY_HAVE_PC_FDC

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_SPARSEMEM_ENABLE

arch/arm/vdso/vdsomunge.c

+13 −4
Original line number Original line Diff line number Diff line
@@ -45,7 +45,6 @@ 
 * it does.

 * it does.

 */

 */





#include <byteswap.h>

#include <elf.h>

#include <elf.h>

#include <errno.h>

#include <errno.h>

#include <fcntl.h>

#include <fcntl.h>
@@ -59,6 +58,16 @@ 
#include <sys/types.h>

#include <sys/types.h>

#include <unistd.h>

#include <unistd.h>





#define swab16(x) \

	((((x) & 0x00ff) << 8) | \

	 (((x) & 0xff00) >> 8))



#define swab32(x) \

	((((x) & 0x000000ff) << 24) | \

	 (((x) & 0x0000ff00) <<  8) | \

	 (((x) & 0x00ff0000) >>  8) | \

	 (((x) & 0xff000000) << 24))



#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

#define HOST_ORDER ELFDATA2LSB

#define HOST_ORDER ELFDATA2LSB

#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__

#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
@@ -104,17 +113,17 @@ static void cleanup(void) 




static Elf32_Word read_elf_word(Elf32_Word word, bool swap)

static Elf32_Word read_elf_word(Elf32_Word word, bool swap)

{

{

	return swap ? bswap_32(word) : word;

	return swap ? swab32(word) : word;

}

}





static Elf32_Half read_elf_half(Elf32_Half half, bool swap)

static Elf32_Half read_elf_half(Elf32_Half half, bool swap)

{

{

	return swap ? bswap_16(half) : half;

	return swap ? swab16(half) : half;

}

}





static void write_elf_word(Elf32_Word val, Elf32_Word *dst, bool swap)

static void write_elf_word(Elf32_Word val, Elf32_Word *dst, bool swap)

{

{

	*dst = swap ? bswap_32(val) : val;

	*dst = swap ? swab32(val) : val;

}

}





int main(int argc, char **argv)

int main(int argc, char **argv)

drivers/clk/clkdev.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -333,7 +333,8 @@ int clk_add_alias(const char *alias, const char *alias_dev_name, 
	if (IS_ERR(r))

	if (IS_ERR(r))

		return PTR_ERR(r);

		return PTR_ERR(r);





	l = clkdev_create(r, alias, "%s", alias_dev_name);

	l = clkdev_create(r, alias, alias_dev_name ? "%s" : NULL,

			  alias_dev_name);

	clk_put(r);

	clk_put(r);





	return l ? 0 : -ENODEV;

	return l ? 0 : -ENODEV;