From 5cea553c398aa83f4d2b2944275c3a964c162e3e Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 3 Nov 2011 14:45:48 +0800 Subject: [PATCH] --- yaml --- r: 275155 b: refs/heads/master c: 816af3bb5022c1468b3d826c645ddc2cac45bc97 h: refs/heads/master i: 275153: 3f47d333effc66ea5815485c3176678a1f17cca5 275151: b4178b7c5e0396921f2d403972e5ad061f1441a8 v: v3 --- [refs] | 2 +- trunk/arch/sparc/include/asm/unistd.h | 4 +--- trunk/arch/sparc/kernel/systbls_32.S | 2 +- trunk/arch/sparc/kernel/systbls_64.S | 4 ++-- trunk/drivers/platform/x86/Kconfig | 4 +--- trunk/drivers/tty/n_gsm.c | 12 +++++------- trunk/include/linux/hwspinlock.h | 1 - 7 files changed, 11 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 3926b84757d8..c843899007b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ccce2b32900a8a6f481036e0cbbfe174742352c +refs/heads/master: 816af3bb5022c1468b3d826c645ddc2cac45bc97 diff --git a/trunk/arch/sparc/include/asm/unistd.h b/trunk/arch/sparc/include/asm/unistd.h index c7cb0af0eb59..6260d5deeabc 100644 --- a/trunk/arch/sparc/include/asm/unistd.h +++ b/trunk/arch/sparc/include/asm/unistd.h @@ -406,10 +406,8 @@ #define __NR_syncfs 335 #define __NR_sendmmsg 336 #define __NR_setns 337 -#define __NR_process_vm_readv 338 -#define __NR_process_vm_writev 339 -#define NR_syscalls 340 +#define NR_syscalls 338 #ifdef __32bit_syscall_numbers__ /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, diff --git a/trunk/arch/sparc/kernel/systbls_32.S b/trunk/arch/sparc/kernel/systbls_32.S index 63402f9e9f51..09d8ec454450 100644 --- a/trunk/arch/sparc/kernel/systbls_32.S +++ b/trunk/arch/sparc/kernel/systbls_32.S @@ -84,4 +84,4 @@ sys_call_table: /*320*/ .long sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv /*325*/ .long sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init /*330*/ .long sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime -/*335*/ .long sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev +/*335*/ .long sys_syncfs, sys_sendmmsg, sys_setns diff --git a/trunk/arch/sparc/kernel/systbls_64.S b/trunk/arch/sparc/kernel/systbls_64.S index db86b1a0e9a9..edbec45d4688 100644 --- a/trunk/arch/sparc/kernel/systbls_64.S +++ b/trunk/arch/sparc/kernel/systbls_64.S @@ -85,7 +85,7 @@ sys_call_table32: /*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, compat_sys_preadv .word compat_sys_pwritev, compat_sys_rt_tgsigqueueinfo, sys_perf_event_open, compat_sys_recvmmsg, sys_fanotify_init /*330*/ .word sys32_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, compat_sys_open_by_handle_at, compat_sys_clock_adjtime - .word sys_syncfs, compat_sys_sendmmsg, sys_setns, compat_sys_process_vm_readv, compat_sys_process_vm_writev + .word sys_syncfs, compat_sys_sendmmsg, sys_setns #endif /* CONFIG_COMPAT */ @@ -162,4 +162,4 @@ sys_call_table: /*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv .word sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init /*330*/ .word sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime - .word sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev + .word sys_syncfs, sys_sendmmsg, sys_setns diff --git a/trunk/drivers/platform/x86/Kconfig b/trunk/drivers/platform/x86/Kconfig index 7f43cf86d776..f4e3d82379d7 100644 --- a/trunk/drivers/platform/x86/Kconfig +++ b/trunk/drivers/platform/x86/Kconfig @@ -83,10 +83,8 @@ config DELL_LAPTOP depends on EXPERIMENTAL depends on BACKLIGHT_CLASS_DEVICE depends on RFKILL || RFKILL = n + depends on POWER_SUPPLY depends on SERIO_I8042 - select POWER_SUPPLY - select LEDS_CLASS - select NEW_LEDS default n ---help--- This driver adds support for rfkill and backlight control to Dell diff --git a/trunk/drivers/tty/n_gsm.c b/trunk/drivers/tty/n_gsm.c index fc7bbba585ce..4cb0d0a3e57b 100644 --- a/trunk/drivers/tty/n_gsm.c +++ b/trunk/drivers/tty/n_gsm.c @@ -66,16 +66,14 @@ static int debug; module_param(debug, int, 0600); -/* Defaults: these are from the specification */ - -#define T1 10 /* 100mS */ -#define T2 34 /* 333mS */ -#define N2 3 /* Retry 3 times */ +#define T1 (HZ/10) +#define T2 (HZ/3) +#define N2 3 /* Use long timers for testing at low speed with debug on */ #ifdef DEBUG_TIMING -#define T1 100 -#define T2 200 +#define T1 HZ +#define T2 (2 * HZ) #endif /* diff --git a/trunk/include/linux/hwspinlock.h b/trunk/include/linux/hwspinlock.h index 08a2fee40659..aad6bd4b3efd 100644 --- a/trunk/include/linux/hwspinlock.h +++ b/trunk/include/linux/hwspinlock.h @@ -118,7 +118,6 @@ int __hwspin_trylock(struct hwspinlock *hwlock, int mode, unsigned long *flags) static inline void __hwspin_unlock(struct hwspinlock *hwlock, int mode, unsigned long *flags) { - return 0; } static inline int hwspin_lock_get_id(struct hwspinlock *hwlock)