hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc ia64 bits for 3.9 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJRJpj1AAoJEKurIx+X31iB9icP/0ps+HenD7ogf1mUVnVLVWIh
 rC+SQa3/ihqw6H+lokyPQsaGL6UMnd3I/mibnH5OFekM/NMFe/nFJJukUec4W9bW
 WtZqoi4nVDZiRQo3cemoK7sfGhHNAb/rXvb7KN0donlWcbmft9Eaj7wZUiX1RwXs
 xkGUP5urmSbhyLDVuQOogSvU0StNc4cVFw0Hu3GOvZuOuhePgxUI0aNzqv//IOMG
 qTsbMh8ABb0J26GdRbxOLnShVcD7HCEsK1SgQevl5mERKcWUJauXKdeJAwwJ0XE2
 s/U7PCzlkVq77Mdaupzdfl78ahurH90Z4eX29PuztYvFNeA+smDHuGM6LytmvVba
 8TjrqcbAWfbRoa5F2jbBXu0Bu+mzYz0xIi2SqegF5oA5j2679LZMHa5ymafZlfjy
 wINph4AehW9mMBZMBlPzR6MZMGAi3xIfZFUu4J91cdmchYxFY9qxqyI7CLbq1he3
 cDJNK9cUBv8NKRxVLjom0lO6uO/Q/6KEC+6qIxJjDcAIvG76O+HRmmlV4l+eU57H
 BqxLl5jt+alfJWs4ElxxFPiNu0RXeYhIcJXfgAdDer3f00NwGUtKNoiw7wipLoI0
 KH3qDmfI8Vgd2rrESeYbqnYEiSZ8wZTP44kmwzIvjaS9fgOK9k4WoMHGLqP001oU
 kQnvI4cHjffCyB9nvppS
 =zl+k
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2013-02-21 17:55:48 -08:00
parent 81ec44a6c6 cc883afcc0
commit 27ea6dfdc2
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MAINTAINERS
View File

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

1
arch/ia64/Kconfig
View File

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

7
init/Kconfig
View File

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

9
kernel/sysctl.c
View File

@ -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[] = {
.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[] = {
.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,