Commit 27ea6dfd authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull misc ia64 bits from Tony Luck.

* tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  MAINTAINERS: update SGI & ia64 Altix stuff
  sysctl: Enable IA64 "ignore-unaligned-usertrap" to be used cross-arch
parents 81ec44a6 cc883afc
...@@ -6841,7 +6841,8 @@ S: Supported ...@@ -6841,7 +6841,8 @@ S: Supported
F: drivers/net/ethernet/sfc/ F: drivers/net/ethernet/sfc/
SGI GRU DRIVER SGI GRU DRIVER
M: Jack Steiner <steiner@sgi.com> M: Dimitri Sivanich <sivanich@sgi.com>
M: Robin Holt <holt@sgi.com>
S: Maintained S: Maintained
F: drivers/misc/sgi-gru/ F: drivers/misc/sgi-gru/
...@@ -7036,14 +7037,6 @@ L: linux-fbdev@vger.kernel.org ...@@ -7036,14 +7037,6 @@ L: linux-fbdev@vger.kernel.org
S: Maintained S: Maintained
F: drivers/video/smscufx.c F: drivers/video/smscufx.c
SN-IA64 (Itanium) SUB-PLATFORM
M: Jes Sorensen <jes@sgi.com>
L: linux-altix@sgi.com
L: linux-ia64@vger.kernel.org
W: http://www.sgi.com/altix
S: Maintained
F: arch/ia64/sn/
SOC-CAMERA V4L2 SUBSYSTEM SOC-CAMERA V4L2 SUBSYSTEM
M: Guennadi Liakhovetski <g.liakhovetski@gmx.de> M: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
......
...@@ -39,6 +39,7 @@ config IA64 ...@@ -39,6 +39,7 @@ config IA64
select ARCH_THREAD_INFO_ALLOCATOR select ARCH_THREAD_INFO_ALLOCATOR
select ARCH_CLOCKSOURCE_DATA select ARCH_CLOCKSOURCE_DATA
select GENERIC_TIME_VSYSCALL_OLD select GENERIC_TIME_VSYSCALL_OLD
select SYSCTL_ARCH_UNALIGN_NO_WARN
select HAVE_MOD_ARCH_SPECIFIC select HAVE_MOD_ARCH_SPECIFIC
select MODULES_USE_ELF_RELA select MODULES_USE_ELF_RELA
default y default y
......
...@@ -1229,6 +1229,13 @@ config SYSCTL_EXCEPTION_TRACE ...@@ -1229,6 +1229,13 @@ config SYSCTL_EXCEPTION_TRACE
help help
Enable support for /proc/sys/debug/exception-trace. Enable support for /proc/sys/debug/exception-trace.
config SYSCTL_ARCH_UNALIGN_NO_WARN
bool
help
Enable support for /proc/sys/kernel/ignore-unaligned-usertrap
Allows arch to define/use @no_unaligned_warning to possibly warn
about unaligned access emulation going on under the hood.
config KALLSYMS config KALLSYMS
bool "Load all symbols for debugging/ksymoops" if EXPERT bool "Load all symbols for debugging/ksymoops" if EXPERT
default y default y
......
...@@ -162,10 +162,13 @@ extern int unaligned_enabled; ...@@ -162,10 +162,13 @@ extern int unaligned_enabled;
#endif #endif
#ifdef CONFIG_IA64 #ifdef CONFIG_IA64
extern int no_unaligned_warning;
extern int unaligned_dump_stack; extern int unaligned_dump_stack;
#endif #endif
#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN
extern int no_unaligned_warning;
#endif
#ifdef CONFIG_PROC_SYSCTL #ifdef CONFIG_PROC_SYSCTL
static int proc_do_cad_pid(struct ctl_table *table, int write, static int proc_do_cad_pid(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos); void __user *buffer, size_t *lenp, loff_t *ppos);
...@@ -919,7 +922,7 @@ static struct ctl_table kern_table[] = { ...@@ -919,7 +922,7 @@ static struct ctl_table kern_table[] = {
.proc_handler = proc_doulongvec_minmax, .proc_handler = proc_doulongvec_minmax,
}, },
#endif #endif
#ifdef CONFIG_IA64 #ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN
{ {
.procname = "ignore-unaligned-usertrap", .procname = "ignore-unaligned-usertrap",
.data = &no_unaligned_warning, .data = &no_unaligned_warning,
...@@ -927,6 +930,8 @@ static struct ctl_table kern_table[] = { ...@@ -927,6 +930,8 @@ static struct ctl_table kern_table[] = {
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#endif
#ifdef CONFIG_IA64
{ {
.procname = "unaligned-dump-stack", .procname = "unaligned-dump-stack",
.data = &unaligned_dump_stack, .data = &unaligned_dump_stack,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment