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 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

Linus Torvalds 63d39fe8 2c536200

+20 -2
+1 -1
arch/arm/mach-s3c2410/common-smdk.c
··· 50 50 .offset = 0, 51 51 }, 52 52 [1] = { 53 - .name = "S3C2410 flash parition 1", 53 + .name = "S3C2410 flash partition 1", 54 54 .offset = 0, 55 55 .size = SZ_2M, 56 56 },
+1 -1
arch/arm/mach-s3c2410/s3c2440-clock.c
··· 139 139 140 140 clkdivn = __raw_readl(S3C2410_CLKDIVN); 141 141 clkdivn |= S3C2440_CLKDIVN_UCLK; 142 - __raw_writel(camdivn, S3C2410_CLKDIVN); 142 + __raw_writel(clkdivn, S3C2410_CLKDIVN); 143 143 144 144 mutex_unlock(&clocks_mutex); 145 145 }
+18
include/asm-arm/unistd.h
··· 360 360 #define __ARM_NR_usr32 (__ARM_NR_BASE+4) 361 361 #define __ARM_NR_set_tls (__ARM_NR_BASE+5) 362 362 363 + /* 364 + * The following syscalls are obsolete and no longer available for EABI. 365 + */ 366 + #if defined(__ARM_EABI__) 367 + #undef __NR_time 368 + #undef __NR_umount 369 + #undef __NR_stime 370 + #undef __NR_alarm 371 + #undef __NR_utime 372 + #undef __NR_getrlimit 373 + #undef __NR_select 374 + #undef __NR_readdir 375 + #undef __NR_mmap 376 + #undef __NR_socketcall 377 + #undef __NR_syscall 378 + #undef __NR_ipc 379 + #endif 380 + 363 381 #define __sys2(x) #x 364 382 #define __sys1(x) __sys2(x) 365 383