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

Commit 63d39fe8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3477/1: ARM EABI: undefine removed syscalls
  [ARM] 3475/1: S3C2410: fix spelling mistake in SMDK partition table
  [ARM] 3474/1: S3C2440: USB rate writes wrong var to CLKDIVN
parents 2c536200 463b158a

arch/arm/mach-s3c2410/common-smdk.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static struct mtd_partition smdk_default_nand_part[] = { 
		.offset	= 0,

	},

	[1] = {

		.name	= "S3C2410 flash parition 1",

		.name	= "S3C2410 flash partition 1",

		.offset = 0,

		.size	= SZ_2M,

	},

arch/arm/mach-s3c2410/s3c2440-clock.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static int s3c2440_clk_add(struct sys_device *sysdev) 


		clkdivn = __raw_readl(S3C2410_CLKDIVN);

		clkdivn |= S3C2440_CLKDIVN_UCLK;

		__raw_writel(camdivn, S3C2410_CLKDIVN);

		__raw_writel(clkdivn, S3C2410_CLKDIVN);



		mutex_unlock(&clocks_mutex);

	}

include/asm-arm/unistd.h

+18 −0
Original line number Diff line number Diff line
@@ -360,6 +360,24 @@ 
#define __ARM_NR_usr32			(__ARM_NR_BASE+4)

#define __ARM_NR_set_tls		(__ARM_NR_BASE+5)



/*

 * The following syscalls are obsolete and no longer available for EABI.

 */

#if defined(__ARM_EABI__)

#undef __NR_time

#undef __NR_umount

#undef __NR_stime

#undef __NR_alarm

#undef __NR_utime

#undef __NR_getrlimit

#undef __NR_select

#undef __NR_readdir

#undef __NR_mmap

#undef __NR_socketcall

#undef __NR_syscall

#undef __NR_ipc

#endif



#define __sys2(x) #x

#define __sys1(x) __sys2(x)