aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sparc64/defconfig155
-rw-r--r--arch/sparc64/kernel/hvtramp.S3
-rw-r--r--arch/sparc64/kernel/signal.c15
3 files changed, 37 insertions, 136 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 65840a62bb9c..45ebf91a280c 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc1 3# Linux kernel version: 2.6.22
4# Mon May 14 04:17:48 2007 4# Tue Jul 17 01:19:52 2007
5# 5#
6CONFIG_SPARC=y 6CONFIG_SPARC=y
7CONFIG_SPARC64=y 7CONFIG_SPARC64=y
@@ -42,12 +42,11 @@ CONFIG_LOCALVERSION=""
42# CONFIG_LOCALVERSION_AUTO is not set 42# CONFIG_LOCALVERSION_AUTO is not set
43CONFIG_SWAP=y 43CONFIG_SWAP=y
44CONFIG_SYSVIPC=y 44CONFIG_SYSVIPC=y
45# CONFIG_IPC_NS is not set
46CONFIG_SYSVIPC_SYSCTL=y 45CONFIG_SYSVIPC_SYSCTL=y
47CONFIG_POSIX_MQUEUE=y 46CONFIG_POSIX_MQUEUE=y
48# CONFIG_BSD_PROCESS_ACCT is not set 47# CONFIG_BSD_PROCESS_ACCT is not set
49# CONFIG_TASKSTATS is not set 48# CONFIG_TASKSTATS is not set
50# CONFIG_UTS_NS is not set 49# CONFIG_USER_NS is not set
51# CONFIG_AUDIT is not set 50# CONFIG_AUDIT is not set
52# CONFIG_IKCONFIG is not set 51# CONFIG_IKCONFIG is not set
53CONFIG_LOG_BUF_SHIFT=18 52CONFIG_LOG_BUF_SHIFT=18
@@ -82,22 +81,15 @@ CONFIG_SLUB=y
82CONFIG_RT_MUTEXES=y 81CONFIG_RT_MUTEXES=y
83# CONFIG_TINY_SHMEM is not set 82# CONFIG_TINY_SHMEM is not set
84CONFIG_BASE_SMALL=0 83CONFIG_BASE_SMALL=0
85
86#
87# Loadable module support
88#
89CONFIG_MODULES=y 84CONFIG_MODULES=y
90CONFIG_MODULE_UNLOAD=y 85CONFIG_MODULE_UNLOAD=y
91CONFIG_MODULE_FORCE_UNLOAD=y 86CONFIG_MODULE_FORCE_UNLOAD=y
92CONFIG_MODVERSIONS=y 87CONFIG_MODVERSIONS=y
93CONFIG_MODULE_SRCVERSION_ALL=y 88CONFIG_MODULE_SRCVERSION_ALL=y
94CONFIG_KMOD=y 89CONFIG_KMOD=y
95
96#
97# Block layer
98#
99CONFIG_BLOCK=y 90CONFIG_BLOCK=y
100CONFIG_BLK_DEV_IO_TRACE=y 91CONFIG_BLK_DEV_IO_TRACE=y
92CONFIG_BLK_DEV_BSG=y
101 93
102# 94#
103# IO Schedulers 95# IO Schedulers
@@ -156,12 +148,15 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
156CONFIG_RESOURCES_64BIT=y 148CONFIG_RESOURCES_64BIT=y
157CONFIG_ZONE_DMA_FLAG=0 149CONFIG_ZONE_DMA_FLAG=0
158CONFIG_NR_QUICK=1 150CONFIG_NR_QUICK=1
151CONFIG_VIRT_TO_BUS=y
159CONFIG_SBUS=y 152CONFIG_SBUS=y
160CONFIG_SBUSCHAR=y 153CONFIG_SBUSCHAR=y
161CONFIG_SUN_AUXIO=y 154CONFIG_SUN_AUXIO=y
162CONFIG_SUN_IO=y 155CONFIG_SUN_IO=y
156# CONFIG_SUN_LDOMS is not set
163CONFIG_PCI=y 157CONFIG_PCI=y
164CONFIG_PCI_DOMAINS=y 158CONFIG_PCI_DOMAINS=y
159CONFIG_PCI_SYSCALL=y
165CONFIG_ARCH_SUPPORTS_MSI=y 160CONFIG_ARCH_SUPPORTS_MSI=y
166CONFIG_PCI_MSI=y 161CONFIG_PCI_MSI=y
167# CONFIG_PCI_DEBUG is not set 162# CONFIG_PCI_DEBUG is not set
@@ -246,10 +241,6 @@ CONFIG_IPV6_TUNNEL=m
246# CONFIG_IPV6_MULTIPLE_TABLES is not set 241# CONFIG_IPV6_MULTIPLE_TABLES is not set
247# CONFIG_NETWORK_SECMARK is not set 242# CONFIG_NETWORK_SECMARK is not set
248# CONFIG_NETFILTER is not set 243# CONFIG_NETFILTER is not set
249
250#
251# DCCP Configuration (EXPERIMENTAL)
252#
253CONFIG_IP_DCCP=m 244CONFIG_IP_DCCP=m
254CONFIG_INET_DCCP_DIAG=m 245CONFIG_INET_DCCP_DIAG=m
255CONFIG_IP_DCCP_ACKVEC=y 246CONFIG_IP_DCCP_ACKVEC=y
@@ -269,15 +260,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100
269# 260#
270# CONFIG_IP_DCCP_DEBUG is not set 261# CONFIG_IP_DCCP_DEBUG is not set
271# CONFIG_NET_DCCPPROBE is not set 262# CONFIG_NET_DCCPPROBE is not set
272
273#
274# SCTP Configuration (EXPERIMENTAL)
275#
276# CONFIG_IP_SCTP is not set 263# CONFIG_IP_SCTP is not set
277
278#
279# TIPC Configuration (EXPERIMENTAL)
280#
281# CONFIG_TIPC is not set 264# CONFIG_TIPC is not set
282# CONFIG_ATM is not set 265# CONFIG_ATM is not set
283# CONFIG_BRIDGE is not set 266# CONFIG_BRIDGE is not set
@@ -314,6 +297,7 @@ CONFIG_NET_TCPPROBE=m
314# CONFIG_MAC80211 is not set 297# CONFIG_MAC80211 is not set
315# CONFIG_IEEE80211 is not set 298# CONFIG_IEEE80211 is not set
316# CONFIG_RFKILL is not set 299# CONFIG_RFKILL is not set
300# CONFIG_NET_9P is not set
317 301
318# 302#
319# Device Drivers 303# Device Drivers
@@ -328,26 +312,10 @@ CONFIG_FW_LOADER=y
328# CONFIG_DEBUG_DRIVER is not set 312# CONFIG_DEBUG_DRIVER is not set
329# CONFIG_DEBUG_DEVRES is not set 313# CONFIG_DEBUG_DEVRES is not set
330# CONFIG_SYS_HYPERVISOR is not set 314# CONFIG_SYS_HYPERVISOR is not set
331
332#
333# Connector - unified userspace <-> kernelspace linker
334#
335CONFIG_CONNECTOR=m 315CONFIG_CONNECTOR=m
336# CONFIG_MTD is not set 316# CONFIG_MTD is not set
337
338#
339# Parallel port support
340#
341# CONFIG_PARPORT is not set 317# CONFIG_PARPORT is not set
342 318CONFIG_BLK_DEV=y
343#
344# Plug and Play support
345#
346# CONFIG_PNPACPI is not set
347
348#
349# Block devices
350#
351# CONFIG_BLK_DEV_FD is not set 319# CONFIG_BLK_DEV_FD is not set
352# CONFIG_BLK_CPQ_DA is not set 320# CONFIG_BLK_CPQ_DA is not set
353# CONFIG_BLK_CPQ_CISS_DA is not set 321# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -364,18 +332,11 @@ CONFIG_CDROM_PKTCDVD=m
364CONFIG_CDROM_PKTCDVD_BUFFERS=8 332CONFIG_CDROM_PKTCDVD_BUFFERS=8
365CONFIG_CDROM_PKTCDVD_WCACHE=y 333CONFIG_CDROM_PKTCDVD_WCACHE=y
366CONFIG_ATA_OVER_ETH=m 334CONFIG_ATA_OVER_ETH=m
367 335CONFIG_MISC_DEVICES=y
368#
369# Misc devices
370#
371# CONFIG_PHANTOM is not set 336# CONFIG_PHANTOM is not set
337# CONFIG_EEPROM_93CX6 is not set
372# CONFIG_SGI_IOC4 is not set 338# CONFIG_SGI_IOC4 is not set
373# CONFIG_TIFM_CORE is not set 339# CONFIG_TIFM_CORE is not set
374# CONFIG_BLINK is not set
375
376#
377# ATA/ATAPI/MFM/RLL support
378#
379CONFIG_IDE=y 340CONFIG_IDE=y
380CONFIG_BLK_DEV_IDE=y 341CONFIG_BLK_DEV_IDE=y
381 342
@@ -440,6 +401,7 @@ CONFIG_BLK_DEV_IDEDMA=y
440# 401#
441CONFIG_RAID_ATTRS=m 402CONFIG_RAID_ATTRS=m
442CONFIG_SCSI=y 403CONFIG_SCSI=y
404CONFIG_SCSI_DMA=y
443# CONFIG_SCSI_TGT is not set 405# CONFIG_SCSI_TGT is not set
444CONFIG_SCSI_NETLINK=y 406CONFIG_SCSI_NETLINK=y
445CONFIG_SCSI_PROC_FS=y 407CONFIG_SCSI_PROC_FS=y
@@ -505,7 +467,6 @@ CONFIG_ISCSI_TCP=m
505# CONFIG_SCSI_DC395x is not set 467# CONFIG_SCSI_DC395x is not set
506# CONFIG_SCSI_DC390T is not set 468# CONFIG_SCSI_DC390T is not set
507# CONFIG_SCSI_DEBUG is not set 469# CONFIG_SCSI_DEBUG is not set
508# CONFIG_SCSI_ESP_CORE is not set
509# CONFIG_SCSI_SUNESP is not set 470# CONFIG_SCSI_SUNESP is not set
510# CONFIG_SCSI_SRP is not set 471# CONFIG_SCSI_SRP is not set
511# CONFIG_ATA is not set 472# CONFIG_ATA is not set
@@ -545,30 +506,16 @@ CONFIG_DM_ZERO=m
545# 506#
546# CONFIG_FIREWIRE is not set 507# CONFIG_FIREWIRE is not set
547# CONFIG_IEEE1394 is not set 508# CONFIG_IEEE1394 is not set
548
549#
550# I2O device support
551#
552# CONFIG_I2O is not set 509# CONFIG_I2O is not set
553
554#
555# Network device support
556#
557CONFIG_NETDEVICES=y 510CONFIG_NETDEVICES=y
511# CONFIG_NETDEVICES_MULTIQUEUE is not set
558CONFIG_DUMMY=m 512CONFIG_DUMMY=m
559# CONFIG_BONDING is not set 513# CONFIG_BONDING is not set
514# CONFIG_MACVLAN is not set
560# CONFIG_EQUALIZER is not set 515# CONFIG_EQUALIZER is not set
561# CONFIG_TUN is not set 516# CONFIG_TUN is not set
562
563#
564# ARCnet devices
565#
566# CONFIG_ARCNET is not set 517# CONFIG_ARCNET is not set
567# CONFIG_PHYLIB is not set 518# CONFIG_PHYLIB is not set
568
569#
570# Ethernet (10 or 100Mbit)
571#
572CONFIG_NET_ETHERNET=y 519CONFIG_NET_ETHERNET=y
573CONFIG_MII=m 520CONFIG_MII=m
574# CONFIG_SUNLANCE is not set 521# CONFIG_SUNLANCE is not set
@@ -578,10 +525,6 @@ CONFIG_MII=m
578# CONFIG_SUNGEM is not set 525# CONFIG_SUNGEM is not set
579CONFIG_CASSINI=m 526CONFIG_CASSINI=m
580# CONFIG_NET_VENDOR_3COM is not set 527# CONFIG_NET_VENDOR_3COM is not set
581
582#
583# Tulip family network device support
584#
585# CONFIG_NET_TULIP is not set 528# CONFIG_NET_TULIP is not set
586# CONFIG_HP100 is not set 529# CONFIG_HP100 is not set
587CONFIG_NET_PCI=y 530CONFIG_NET_PCI=y
@@ -617,7 +560,6 @@ CONFIG_E1000_NAPI=y
617# CONFIG_SIS190 is not set 560# CONFIG_SIS190 is not set
618# CONFIG_SKGE is not set 561# CONFIG_SKGE is not set
619# CONFIG_SKY2 is not set 562# CONFIG_SKY2 is not set
620# CONFIG_SK98LIN is not set
621# CONFIG_VIA_VELOCITY is not set 563# CONFIG_VIA_VELOCITY is not set
622CONFIG_TIGON3=m 564CONFIG_TIGON3=m
623CONFIG_BNX2=m 565CONFIG_BNX2=m
@@ -631,11 +573,6 @@ CONFIG_NETDEV_10000=y
631# CONFIG_MYRI10GE is not set 573# CONFIG_MYRI10GE is not set
632# CONFIG_NETXEN_NIC is not set 574# CONFIG_NETXEN_NIC is not set
633# CONFIG_MLX4_CORE is not set 575# CONFIG_MLX4_CORE is not set
634CONFIG_MLX4_DEBUG=y
635
636#
637# Token Ring devices
638#
639# CONFIG_TR is not set 576# CONFIG_TR is not set
640 577
641# 578#
@@ -665,6 +602,7 @@ CONFIG_PPP_DEFLATE=m
665CONFIG_PPP_BSDCOMP=m 602CONFIG_PPP_BSDCOMP=m
666CONFIG_PPP_MPPE=m 603CONFIG_PPP_MPPE=m
667CONFIG_PPPOE=m 604CONFIG_PPPOE=m
605# CONFIG_PPPOL2TP is not set
668# CONFIG_SLIP is not set 606# CONFIG_SLIP is not set
669CONFIG_SLHC=m 607CONFIG_SLHC=m
670# CONFIG_NET_FC is not set 608# CONFIG_NET_FC is not set
@@ -677,10 +615,6 @@ CONFIG_SLHC=m
677# ISDN subsystem 615# ISDN subsystem
678# 616#
679# CONFIG_ISDN is not set 617# CONFIG_ISDN is not set
680
681#
682# Telephony Support
683#
684# CONFIG_PHONE is not set 618# CONFIG_PHONE is not set
685 619
686# 620#
@@ -688,6 +622,7 @@ CONFIG_SLHC=m
688# 622#
689CONFIG_INPUT=y 623CONFIG_INPUT=y
690# CONFIG_INPUT_FF_MEMLESS is not set 624# CONFIG_INPUT_FF_MEMLESS is not set
625# CONFIG_INPUT_POLLDEV is not set
691 626
692# 627#
693# Userland interfaces 628# Userland interfaces
@@ -733,7 +668,6 @@ CONFIG_INPUT_SPARCSPKR=y
733# CONFIG_INPUT_POWERMATE is not set 668# CONFIG_INPUT_POWERMATE is not set
734# CONFIG_INPUT_YEALINK is not set 669# CONFIG_INPUT_YEALINK is not set
735# CONFIG_INPUT_UINPUT is not set 670# CONFIG_INPUT_UINPUT is not set
736# CONFIG_INPUT_POLLDEV is not set
737 671
738# 672#
739# Hardware I/O ports 673# Hardware I/O ports
@@ -773,10 +707,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
773# CONFIG_SERIAL_JSM is not set 707# CONFIG_SERIAL_JSM is not set
774CONFIG_UNIX98_PTYS=y 708CONFIG_UNIX98_PTYS=y
775# CONFIG_LEGACY_PTYS is not set 709# CONFIG_LEGACY_PTYS is not set
776
777#
778# IPMI
779#
780# CONFIG_IPMI_HANDLER is not set 710# CONFIG_IPMI_HANDLER is not set
781# CONFIG_WATCHDOG is not set 711# CONFIG_WATCHDOG is not set
782# CONFIG_HW_RANDOM is not set 712# CONFIG_HW_RANDOM is not set
@@ -785,10 +715,6 @@ CONFIG_RTC=y
785# CONFIG_APPLICOM is not set 715# CONFIG_APPLICOM is not set
786# CONFIG_DRM is not set 716# CONFIG_DRM is not set
787# CONFIG_RAW_DRIVER is not set 717# CONFIG_RAW_DRIVER is not set
788
789#
790# TPM devices
791#
792# CONFIG_TCG_TPM is not set 718# CONFIG_TCG_TPM is not set
793CONFIG_DEVPORT=y 719CONFIG_DEVPORT=y
794CONFIG_I2C=y 720CONFIG_I2C=y
@@ -822,6 +748,7 @@ CONFIG_I2C_ALGOBIT=y
822# CONFIG_I2C_SIS5595 is not set 748# CONFIG_I2C_SIS5595 is not set
823# CONFIG_I2C_SIS630 is not set 749# CONFIG_I2C_SIS630 is not set
824# CONFIG_I2C_SIS96X is not set 750# CONFIG_I2C_SIS96X is not set
751# CONFIG_I2C_TAOS_EVM is not set
825# CONFIG_I2C_STUB is not set 752# CONFIG_I2C_STUB is not set
826# CONFIG_I2C_TINY_USB is not set 753# CONFIG_I2C_TINY_USB is not set
827# CONFIG_I2C_VIA is not set 754# CONFIG_I2C_VIA is not set
@@ -833,11 +760,13 @@ CONFIG_I2C_ALGOBIT=y
833# 760#
834# CONFIG_SENSORS_DS1337 is not set 761# CONFIG_SENSORS_DS1337 is not set
835# CONFIG_SENSORS_DS1374 is not set 762# CONFIG_SENSORS_DS1374 is not set
763# CONFIG_DS1682 is not set
836# CONFIG_SENSORS_EEPROM is not set 764# CONFIG_SENSORS_EEPROM is not set
837# CONFIG_SENSORS_PCF8574 is not set 765# CONFIG_SENSORS_PCF8574 is not set
838# CONFIG_SENSORS_PCA9539 is not set 766# CONFIG_SENSORS_PCA9539 is not set
839# CONFIG_SENSORS_PCF8591 is not set 767# CONFIG_SENSORS_PCF8591 is not set
840# CONFIG_SENSORS_MAX6875 is not set 768# CONFIG_SENSORS_MAX6875 is not set
769# CONFIG_SENSORS_TSL2550 is not set
841# CONFIG_I2C_DEBUG_CORE is not set 770# CONFIG_I2C_DEBUG_CORE is not set
842# CONFIG_I2C_DEBUG_ALGO is not set 771# CONFIG_I2C_DEBUG_ALGO is not set
843# CONFIG_I2C_DEBUG_BUS is not set 772# CONFIG_I2C_DEBUG_BUS is not set
@@ -848,11 +777,8 @@ CONFIG_I2C_ALGOBIT=y
848# 777#
849# CONFIG_SPI is not set 778# CONFIG_SPI is not set
850# CONFIG_SPI_MASTER is not set 779# CONFIG_SPI_MASTER is not set
851
852#
853# Dallas's 1-wire bus
854#
855# CONFIG_W1 is not set 780# CONFIG_W1 is not set
781# CONFIG_POWER_SUPPLY is not set
856CONFIG_HWMON=y 782CONFIG_HWMON=y
857# CONFIG_HWMON_VID is not set 783# CONFIG_HWMON_VID is not set
858# CONFIG_SENSORS_ABITUGURU is not set 784# CONFIG_SENSORS_ABITUGURU is not set
@@ -949,6 +875,8 @@ CONFIG_FB_TILEBLITTING=y
949# CONFIG_FB_ASILIANT is not set 875# CONFIG_FB_ASILIANT is not set
950# CONFIG_FB_IMSTT is not set 876# CONFIG_FB_IMSTT is not set
951# CONFIG_FB_SBUS is not set 877# CONFIG_FB_SBUS is not set
878# CONFIG_FB_XVR500 is not set
879# CONFIG_FB_XVR2500 is not set
952# CONFIG_FB_S1D13XXX is not set 880# CONFIG_FB_S1D13XXX is not set
953# CONFIG_FB_NVIDIA is not set 881# CONFIG_FB_NVIDIA is not set
954# CONFIG_FB_RIVA is not set 882# CONFIG_FB_RIVA is not set
@@ -970,9 +898,6 @@ CONFIG_FB_RADEON_I2C=y
970# CONFIG_FB_TRIDENT is not set 898# CONFIG_FB_TRIDENT is not set
971# CONFIG_FB_ARK is not set 899# CONFIG_FB_ARK is not set
972# CONFIG_FB_PM3 is not set 900# CONFIG_FB_PM3 is not set
973# CONFIG_FB_XVR500 is not set
974# CONFIG_FB_XVR2500 is not set
975# CONFIG_FB_PCI is not set
976# CONFIG_FB_VIRTUAL is not set 901# CONFIG_FB_VIRTUAL is not set
977 902
978# 903#
@@ -1118,10 +1043,7 @@ CONFIG_SND_SUN_CS4231=m
1118# 1043#
1119# CONFIG_SOUND_PRIME is not set 1044# CONFIG_SOUND_PRIME is not set
1120CONFIG_AC97_BUS=m 1045CONFIG_AC97_BUS=m
1121 1046CONFIG_HID_SUPPORT=y
1122#
1123# HID Devices
1124#
1125CONFIG_HID=y 1047CONFIG_HID=y
1126# CONFIG_HID_DEBUG is not set 1048# CONFIG_HID_DEBUG is not set
1127 1049
@@ -1132,10 +1054,7 @@ CONFIG_USB_HID=y
1132# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1054# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1133# CONFIG_HID_FF is not set 1055# CONFIG_HID_FF is not set
1134CONFIG_USB_HIDDEV=y 1056CONFIG_USB_HIDDEV=y
1135 1057CONFIG_USB_SUPPORT=y
1136#
1137# USB support
1138#
1139CONFIG_USB_ARCH_HAS_HCD=y 1058CONFIG_USB_ARCH_HAS_HCD=y
1140CONFIG_USB_ARCH_HAS_OHCI=y 1059CONFIG_USB_ARCH_HAS_OHCI=y
1141CONFIG_USB_ARCH_HAS_EHCI=y 1060CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1157,7 +1076,6 @@ CONFIG_USB_EHCI_HCD=m
1157# CONFIG_USB_EHCI_SPLIT_ISO is not set 1076# CONFIG_USB_EHCI_SPLIT_ISO is not set
1158# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1077# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1159# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1078# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1160# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1161# CONFIG_USB_ISP116X_HCD is not set 1079# CONFIG_USB_ISP116X_HCD is not set
1162CONFIG_USB_OHCI_HCD=y 1080CONFIG_USB_OHCI_HCD=y
1163# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1081# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -1165,6 +1083,7 @@ CONFIG_USB_OHCI_HCD=y
1165CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1083CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1166CONFIG_USB_UHCI_HCD=m 1084CONFIG_USB_UHCI_HCD=m
1167# CONFIG_USB_SL811_HCD is not set 1085# CONFIG_USB_SL811_HCD is not set
1086# CONFIG_USB_R8A66597_HCD is not set
1168 1087
1169# 1088#
1170# USB Device Class drivers 1089# USB Device Class drivers
@@ -1256,17 +1175,9 @@ CONFIG_USB_STORAGE=m
1256# 1175#
1257# LED Triggers 1176# LED Triggers
1258# 1177#
1259
1260#
1261# InfiniBand support
1262#
1263# CONFIG_INFINIBAND is not set 1178# CONFIG_INFINIBAND is not set
1264 1179
1265# 1180#
1266# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1267#
1268
1269#
1270# Real Time Clock 1181# Real Time Clock
1271# 1182#
1272# CONFIG_RTC_CLASS is not set 1183# CONFIG_RTC_CLASS is not set
@@ -1387,7 +1298,6 @@ CONFIG_RAMFS=y
1387# CONFIG_NCP_FS is not set 1298# CONFIG_NCP_FS is not set
1388# CONFIG_CODA_FS is not set 1299# CONFIG_CODA_FS is not set
1389# CONFIG_AFS_FS is not set 1300# CONFIG_AFS_FS is not set
1390# CONFIG_9P_FS is not set
1391 1301
1392# 1302#
1393# Partition Types 1303# Partition Types
@@ -1465,8 +1375,10 @@ CONFIG_DEBUG_FS=y
1465CONFIG_DEBUG_KERNEL=y 1375CONFIG_DEBUG_KERNEL=y
1466# CONFIG_DEBUG_SHIRQ is not set 1376# CONFIG_DEBUG_SHIRQ is not set
1467CONFIG_DETECT_SOFTLOCKUP=y 1377CONFIG_DETECT_SOFTLOCKUP=y
1378# CONFIG_SCHED_DEBUG is not set
1468CONFIG_SCHEDSTATS=y 1379CONFIG_SCHEDSTATS=y
1469# CONFIG_TIMER_STATS is not set 1380# CONFIG_TIMER_STATS is not set
1381# CONFIG_SLUB_DEBUG_ON is not set
1470# CONFIG_DEBUG_RT_MUTEXES is not set 1382# CONFIG_DEBUG_RT_MUTEXES is not set
1471# CONFIG_RT_MUTEX_TESTER is not set 1383# CONFIG_RT_MUTEX_TESTER is not set
1472# CONFIG_DEBUG_SPINLOCK is not set 1384# CONFIG_DEBUG_SPINLOCK is not set
@@ -1496,10 +1408,10 @@ CONFIG_FORCED_INLINING=y
1496CONFIG_KEYS=y 1408CONFIG_KEYS=y
1497# CONFIG_KEYS_DEBUG_PROC_KEYS is not set 1409# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
1498# CONFIG_SECURITY is not set 1410# CONFIG_SECURITY is not set
1499 1411CONFIG_XOR_BLOCKS=m
1500# 1412CONFIG_ASYNC_CORE=m
1501# Cryptographic options 1413CONFIG_ASYNC_MEMCPY=m
1502# 1414CONFIG_ASYNC_XOR=m
1503CONFIG_CRYPTO=y 1415CONFIG_CRYPTO=y
1504CONFIG_CRYPTO_ALGAPI=y 1416CONFIG_CRYPTO_ALGAPI=y
1505CONFIG_CRYPTO_BLKCIPHER=y 1417CONFIG_CRYPTO_BLKCIPHER=y
@@ -1539,10 +1451,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
1539CONFIG_CRYPTO_CRC32C=m 1451CONFIG_CRYPTO_CRC32C=m
1540CONFIG_CRYPTO_CAMELLIA=m 1452CONFIG_CRYPTO_CAMELLIA=m
1541CONFIG_CRYPTO_TEST=m 1453CONFIG_CRYPTO_TEST=m
1542 1454CONFIG_CRYPTO_HW=y
1543#
1544# Hardware crypto devices
1545#
1546 1455
1547# 1456#
1548# Library routines 1457# Library routines
diff --git a/arch/sparc64/kernel/hvtramp.S b/arch/sparc64/kernel/hvtramp.S
index 76a090e2c2a8..a55c252e18cc 100644
--- a/arch/sparc64/kernel/hvtramp.S
+++ b/arch/sparc64/kernel/hvtramp.S
@@ -10,6 +10,7 @@
10#include <asm/hvtramp.h> 10#include <asm/hvtramp.h>
11#include <asm/pstate.h> 11#include <asm/pstate.h>
12#include <asm/ptrace.h> 12#include <asm/ptrace.h>
13#include <asm/head.h>
13#include <asm/asi.h> 14#include <asm/asi.h>
14 15
15 .text 16 .text
@@ -28,7 +29,7 @@
28 * First setup basic privileged cpu state. 29 * First setup basic privileged cpu state.
29 */ 30 */
30hv_cpu_startup: 31hv_cpu_startup:
31 wrpr %g0, 0, %gl 32 SET_GL(0)
32 wrpr %g0, 15, %pil 33 wrpr %g0, 15, %pil
33 wrpr %g0, 0, %canrestore 34 wrpr %g0, 0, %canrestore
34 wrpr %g0, 0, %otherwin 35 wrpr %g0, 0, %otherwin
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c
index 203e87301005..fb13775b3682 100644
--- a/arch/sparc64/kernel/signal.c
+++ b/arch/sparc64/kernel/signal.c
@@ -289,9 +289,7 @@ void do_rt_sigreturn(struct pt_regs *regs)
289 struct rt_signal_frame __user *sf; 289 struct rt_signal_frame __user *sf;
290 unsigned long tpc, tnpc, tstate; 290 unsigned long tpc, tnpc, tstate;
291 __siginfo_fpu_t __user *fpu_save; 291 __siginfo_fpu_t __user *fpu_save;
292 mm_segment_t old_fs;
293 sigset_t set; 292 sigset_t set;
294 stack_t st;
295 int err; 293 int err;
296 294
297 /* Always make any pending restarted system calls return -EINTR */ 295 /* Always make any pending restarted system calls return -EINTR */
@@ -327,20 +325,13 @@ void do_rt_sigreturn(struct pt_regs *regs)
327 err |= restore_fpu_state(regs, &sf->fpu_state); 325 err |= restore_fpu_state(regs, &sf->fpu_state);
328 326
329 err |= __copy_from_user(&set, &sf->mask, sizeof(sigset_t)); 327 err |= __copy_from_user(&set, &sf->mask, sizeof(sigset_t));
330 err |= __copy_from_user(&st, &sf->stack, sizeof(stack_t)); 328 err |= do_sigaltstack(&sf->stack, NULL, (unsigned long)sf);
331 329
332 if (err) 330 if (err)
333 goto segv; 331 goto segv;
334 332
335 regs->tpc = tpc; 333 regs->tpc = tpc;
336 regs->tnpc = tnpc; 334 regs->tnpc = tnpc;
337
338 /* It is more difficult to avoid calling this function than to
339 call it and ignore errors. */
340 old_fs = get_fs();
341 set_fs(KERNEL_DS);
342 do_sigaltstack((const stack_t __user *) &st, NULL, (unsigned long)sf);
343 set_fs(old_fs);
344 335
345 sigdelsetmask(&set, ~_BLOCKABLE); 336 sigdelsetmask(&set, ~_BLOCKABLE);
346 spin_lock_irq(&current->sighand->siglock); 337 spin_lock_irq(&current->sighand->siglock);