aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/ia64/Kconfig2
-rw-r--r--arch/ia64/configs/tiger_defconfig19
-rw-r--r--arch/ia64/defconfig138
-rw-r--r--arch/ia64/kernel/entry.h2
-rw-r--r--arch/ia64/kernel/ivt.S13
-rw-r--r--arch/ia64/kernel/ptrace.c15
-rw-r--r--arch/ia64/kernel/signal.c5
-rw-r--r--arch/ia64/kernel/smp.c2
-rw-r--r--arch/ia64/pci/pci.c20
-rw-r--r--include/linux/efi.h2
10 files changed, 127 insertions, 91 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 3ad2c4af099c..992bcfff7913 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -216,7 +216,7 @@ config IOSAPIC
216 216
217config IA64_SGI_SN_SIM 217config IA64_SGI_SN_SIM
218 bool "SGI Medusa Simulator Support" 218 bool "SGI Medusa Simulator Support"
219 depends on IA64_SGI_SN2 219 depends on IA64_SGI_SN2 || IA64_GENERIC
220 help 220 help
221 If you are compiling a kernel that will run under SGI's IA-64 221 If you are compiling a kernel that will run under SGI's IA-64
222 simulator (Medusa) then say Y, otherwise say N. 222 simulator (Medusa) then say Y, otherwise say N.
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig
index 9086b789f6ac..47f45341ac62 100644
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_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.12-rc3 3# Linux kernel version: 2.6.12-20050621
4# Tue May 3 15:55:04 2005 4# Tue Jun 21 14:03:24 2005
5# 5#
6 6
7# 7#
@@ -67,6 +67,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
67CONFIG_TIME_INTERPOLATION=y 67CONFIG_TIME_INTERPOLATION=y
68CONFIG_EFI=y 68CONFIG_EFI=y
69CONFIG_GENERIC_IOMAP=y 69CONFIG_GENERIC_IOMAP=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
70# CONFIG_IA64_GENERIC is not set 71# CONFIG_IA64_GENERIC is not set
71CONFIG_IA64_DIG=y 72CONFIG_IA64_DIG=y
72# CONFIG_IA64_HP_ZX1 is not set 73# CONFIG_IA64_HP_ZX1 is not set
@@ -285,6 +286,7 @@ CONFIG_CHR_DEV_ST=m
285CONFIG_BLK_DEV_SR=m 286CONFIG_BLK_DEV_SR=m
286# CONFIG_BLK_DEV_SR_VENDOR is not set 287# CONFIG_BLK_DEV_SR_VENDOR is not set
287CONFIG_CHR_DEV_SG=m 288CONFIG_CHR_DEV_SG=m
289# CONFIG_CHR_DEV_SCH is not set
288 290
289# 291#
290# Some SCSI devices (e.g. CD jukebox) support multiple LUNs 292# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -313,11 +315,8 @@ CONFIG_SCSI_FC_ATTRS=y
313# CONFIG_MEGARAID_NEWGEN is not set 315# CONFIG_MEGARAID_NEWGEN is not set
314# CONFIG_MEGARAID_LEGACY is not set 316# CONFIG_MEGARAID_LEGACY is not set
315# CONFIG_SCSI_SATA is not set 317# CONFIG_SCSI_SATA is not set
316# CONFIG_SCSI_BUSLOGIC is not set
317# CONFIG_SCSI_DMX3191D is not set 318# CONFIG_SCSI_DMX3191D is not set
318# CONFIG_SCSI_EATA is not set
319# CONFIG_SCSI_FUTURE_DOMAIN is not set 319# CONFIG_SCSI_FUTURE_DOMAIN is not set
320# CONFIG_SCSI_GDTH is not set
321# CONFIG_SCSI_IPS is not set 320# CONFIG_SCSI_IPS is not set
322# CONFIG_SCSI_INITIO is not set 321# CONFIG_SCSI_INITIO is not set
323# CONFIG_SCSI_INIA100 is not set 322# CONFIG_SCSI_INIA100 is not set
@@ -366,8 +365,10 @@ CONFIG_DM_ZERO=m
366# Fusion MPT device support 365# Fusion MPT device support
367# 366#
368CONFIG_FUSION=y 367CONFIG_FUSION=y
369CONFIG_FUSION_MAX_SGE=40 368CONFIG_FUSION_SPI=y
370# CONFIG_FUSION_CTL is not set 369CONFIG_FUSION_FC=y
370CONFIG_FUSION_MAX_SGE=128
371CONFIG_FUSION_CTL=y
371 372
372# 373#
373# IEEE 1394 (FireWire) support 374# IEEE 1394 (FireWire) support
@@ -506,9 +507,11 @@ CONFIG_E1000=y
506# CONFIG_HAMACHI is not set 507# CONFIG_HAMACHI is not set
507# CONFIG_YELLOWFIN is not set 508# CONFIG_YELLOWFIN is not set
508# CONFIG_R8169 is not set 509# CONFIG_R8169 is not set
510# CONFIG_SKGE is not set
509# CONFIG_SK98LIN is not set 511# CONFIG_SK98LIN is not set
510# CONFIG_VIA_VELOCITY is not set 512# CONFIG_VIA_VELOCITY is not set
511CONFIG_TIGON3=y 513CONFIG_TIGON3=y
514# CONFIG_BNX2 is not set
512 515
513# 516#
514# Ethernet (10000 Mbit) 517# Ethernet (10000 Mbit)
@@ -598,7 +601,6 @@ CONFIG_GAMEPORT=m
598# CONFIG_GAMEPORT_VORTEX is not set 601# CONFIG_GAMEPORT_VORTEX is not set
599# CONFIG_GAMEPORT_FM801 is not set 602# CONFIG_GAMEPORT_FM801 is not set
600# CONFIG_GAMEPORT_CS461X is not set 603# CONFIG_GAMEPORT_CS461X is not set
601CONFIG_SOUND_GAMEPORT=m
602 604
603# 605#
604# Character devices 606# Character devices
@@ -611,7 +613,6 @@ CONFIG_SERIAL_NONSTANDARD=y
611# CONFIG_CYCLADES is not set 613# CONFIG_CYCLADES is not set
612# CONFIG_MOXA_SMARTIO is not set 614# CONFIG_MOXA_SMARTIO is not set
613# CONFIG_ISI is not set 615# CONFIG_ISI is not set
614# CONFIG_SYNCLINK is not set
615# CONFIG_SYNCLINKMP is not set 616# CONFIG_SYNCLINKMP is not set
616# CONFIG_N_HDLC is not set 617# CONFIG_N_HDLC is not set
617# CONFIG_SPECIALIX is not set 618# CONFIG_SPECIALIX is not set
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index 7539e83bf054..2aea0f9e6e1d 100644
--- a/arch/ia64/defconfig
+++ b/arch/ia64/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.10 3# Linux kernel version: 2.6.12
4# Thu Jan 6 11:13:13 2005 4# Tue Jun 21 11:30:42 2005
5# 5#
6 6
7# 7#
@@ -10,6 +10,7 @@
10CONFIG_EXPERIMENTAL=y 10CONFIG_EXPERIMENTAL=y
11CONFIG_CLEAN_COMPILE=y 11CONFIG_CLEAN_COMPILE=y
12CONFIG_LOCK_KERNEL=y 12CONFIG_LOCK_KERNEL=y
13CONFIG_INIT_ENV_ARG_LIMIT=32
13 14
14# 15#
15# General setup 16# General setup
@@ -21,24 +22,27 @@ CONFIG_POSIX_MQUEUE=y
21# CONFIG_BSD_PROCESS_ACCT is not set 22# CONFIG_BSD_PROCESS_ACCT is not set
22CONFIG_SYSCTL=y 23CONFIG_SYSCTL=y
23# CONFIG_AUDIT is not set 24# CONFIG_AUDIT is not set
24CONFIG_LOG_BUF_SHIFT=20
25CONFIG_HOTPLUG=y 25CONFIG_HOTPLUG=y
26CONFIG_KOBJECT_UEVENT=y 26CONFIG_KOBJECT_UEVENT=y
27CONFIG_IKCONFIG=y 27CONFIG_IKCONFIG=y
28CONFIG_IKCONFIG_PROC=y 28CONFIG_IKCONFIG_PROC=y
29# CONFIG_CPUSETS is not set
29# CONFIG_EMBEDDED is not set 30# CONFIG_EMBEDDED is not set
30CONFIG_KALLSYMS=y 31CONFIG_KALLSYMS=y
31CONFIG_KALLSYMS_ALL=y 32CONFIG_KALLSYMS_ALL=y
32# CONFIG_KALLSYMS_EXTRA_PASS is not set 33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
33CONFIG_FUTEX=y 37CONFIG_FUTEX=y
34CONFIG_EPOLL=y 38CONFIG_EPOLL=y
35# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
36CONFIG_SHMEM=y 39CONFIG_SHMEM=y
37CONFIG_CC_ALIGN_FUNCTIONS=0 40CONFIG_CC_ALIGN_FUNCTIONS=0
38CONFIG_CC_ALIGN_LABELS=0 41CONFIG_CC_ALIGN_LABELS=0
39CONFIG_CC_ALIGN_LOOPS=0 42CONFIG_CC_ALIGN_LOOPS=0
40CONFIG_CC_ALIGN_JUMPS=0 43CONFIG_CC_ALIGN_JUMPS=0
41# CONFIG_TINY_SHMEM is not set 44# CONFIG_TINY_SHMEM is not set
45CONFIG_BASE_SMALL=0
42 46
43# 47#
44# Loadable module support 48# Loadable module support
@@ -63,9 +67,11 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
63CONFIG_TIME_INTERPOLATION=y 67CONFIG_TIME_INTERPOLATION=y
64CONFIG_EFI=y 68CONFIG_EFI=y
65CONFIG_GENERIC_IOMAP=y 69CONFIG_GENERIC_IOMAP=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
66CONFIG_IA64_GENERIC=y 71CONFIG_IA64_GENERIC=y
67# CONFIG_IA64_DIG is not set 72# CONFIG_IA64_DIG is not set
68# CONFIG_IA64_HP_ZX1 is not set 73# CONFIG_IA64_HP_ZX1 is not set
74# CONFIG_IA64_HP_ZX1_SWIOTLB is not set
69# CONFIG_IA64_SGI_SN2 is not set 75# CONFIG_IA64_SGI_SN2 is not set
70# CONFIG_IA64_HP_SIM is not set 76# CONFIG_IA64_HP_SIM is not set
71# CONFIG_ITANIUM is not set 77# CONFIG_ITANIUM is not set
@@ -77,6 +83,7 @@ CONFIG_IA64_PAGE_SIZE_16KB=y
77CONFIG_IA64_L1_CACHE_SHIFT=7 83CONFIG_IA64_L1_CACHE_SHIFT=7
78CONFIG_NUMA=y 84CONFIG_NUMA=y
79CONFIG_VIRTUAL_MEM_MAP=y 85CONFIG_VIRTUAL_MEM_MAP=y
86CONFIG_HOLES_IN_ZONE=y
80CONFIG_DISCONTIGMEM=y 87CONFIG_DISCONTIGMEM=y
81CONFIG_IA64_CYCLONE=y 88CONFIG_IA64_CYCLONE=y
82CONFIG_IOSAPIC=y 89CONFIG_IOSAPIC=y
@@ -84,6 +91,7 @@ CONFIG_FORCE_MAX_ZONEORDER=18
84CONFIG_SMP=y 91CONFIG_SMP=y
85CONFIG_NR_CPUS=512 92CONFIG_NR_CPUS=512
86CONFIG_HOTPLUG_CPU=y 93CONFIG_HOTPLUG_CPU=y
94# CONFIG_SCHED_SMT is not set
87# CONFIG_PREEMPT is not set 95# CONFIG_PREEMPT is not set
88CONFIG_HAVE_DEC_LOCK=y 96CONFIG_HAVE_DEC_LOCK=y
89CONFIG_IA32_SUPPORT=y 97CONFIG_IA32_SUPPORT=y
@@ -135,6 +143,7 @@ CONFIG_PCI_DOMAINS=y
135# CONFIG_PCI_MSI is not set 143# CONFIG_PCI_MSI is not set
136CONFIG_PCI_LEGACY_PROC=y 144CONFIG_PCI_LEGACY_PROC=y
137CONFIG_PCI_NAMES=y 145CONFIG_PCI_NAMES=y
146# CONFIG_PCI_DEBUG is not set
138 147
139# 148#
140# PCI Hotplug Support 149# PCI Hotplug Support
@@ -144,7 +153,6 @@ CONFIG_HOTPLUG_PCI=m
144CONFIG_HOTPLUG_PCI_ACPI=m 153CONFIG_HOTPLUG_PCI_ACPI=m
145# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set 154# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
146# CONFIG_HOTPLUG_PCI_CPCI is not set 155# CONFIG_HOTPLUG_PCI_CPCI is not set
147# CONFIG_HOTPLUG_PCI_PCIE is not set
148# CONFIG_HOTPLUG_PCI_SHPC is not set 156# CONFIG_HOTPLUG_PCI_SHPC is not set
149 157
150# 158#
@@ -153,10 +161,6 @@ CONFIG_HOTPLUG_PCI_ACPI=m
153# CONFIG_PCCARD is not set 161# CONFIG_PCCARD is not set
154 162
155# 163#
156# PC-card bridges
157#
158
159#
160# Device Drivers 164# Device Drivers
161# 165#
162 166
@@ -190,6 +194,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
190# CONFIG_BLK_CPQ_CISS_DA is not set 194# CONFIG_BLK_CPQ_CISS_DA is not set
191# CONFIG_BLK_DEV_DAC960 is not set 195# CONFIG_BLK_DEV_DAC960 is not set
192# CONFIG_BLK_DEV_UMEM is not set 196# CONFIG_BLK_DEV_UMEM is not set
197# CONFIG_BLK_DEV_COW_COMMON is not set
193CONFIG_BLK_DEV_LOOP=m 198CONFIG_BLK_DEV_LOOP=m
194CONFIG_BLK_DEV_CRYPTOLOOP=m 199CONFIG_BLK_DEV_CRYPTOLOOP=m
195CONFIG_BLK_DEV_NBD=m 200CONFIG_BLK_DEV_NBD=m
@@ -209,6 +214,7 @@ CONFIG_IOSCHED_NOOP=y
209CONFIG_IOSCHED_AS=y 214CONFIG_IOSCHED_AS=y
210CONFIG_IOSCHED_DEADLINE=y 215CONFIG_IOSCHED_DEADLINE=y
211CONFIG_IOSCHED_CFQ=y 216CONFIG_IOSCHED_CFQ=y
217# CONFIG_ATA_OVER_ETH is not set
212 218
213# 219#
214# ATA/ATAPI/MFM/RLL support 220# ATA/ATAPI/MFM/RLL support
@@ -283,6 +289,7 @@ CONFIG_CHR_DEV_ST=m
283CONFIG_BLK_DEV_SR=m 289CONFIG_BLK_DEV_SR=m
284# CONFIG_BLK_DEV_SR_VENDOR is not set 290# CONFIG_BLK_DEV_SR_VENDOR is not set
285CONFIG_CHR_DEV_SG=m 291CONFIG_CHR_DEV_SG=m
292# CONFIG_CHR_DEV_SCH is not set
286 293
287# 294#
288# Some SCSI devices (e.g. CD jukebox) support multiple LUNs 295# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -310,13 +317,21 @@ CONFIG_SCSI_FC_ATTRS=y
310# CONFIG_SCSI_AIC79XX is not set 317# CONFIG_SCSI_AIC79XX is not set
311# CONFIG_MEGARAID_NEWGEN is not set 318# CONFIG_MEGARAID_NEWGEN is not set
312# CONFIG_MEGARAID_LEGACY is not set 319# CONFIG_MEGARAID_LEGACY is not set
313# CONFIG_SCSI_SATA is not set 320CONFIG_SCSI_SATA=y
314# CONFIG_SCSI_BUSLOGIC is not set 321# CONFIG_SCSI_SATA_AHCI is not set
322# CONFIG_SCSI_SATA_SVW is not set
323# CONFIG_SCSI_ATA_PIIX is not set
324# CONFIG_SCSI_SATA_NV is not set
325# CONFIG_SCSI_SATA_PROMISE is not set
326# CONFIG_SCSI_SATA_QSTOR is not set
327# CONFIG_SCSI_SATA_SX4 is not set
328# CONFIG_SCSI_SATA_SIL is not set
329# CONFIG_SCSI_SATA_SIS is not set
330# CONFIG_SCSI_SATA_ULI is not set
331# CONFIG_SCSI_SATA_VIA is not set
332CONFIG_SCSI_SATA_VITESSE=y
315# CONFIG_SCSI_DMX3191D is not set 333# CONFIG_SCSI_DMX3191D is not set
316# CONFIG_SCSI_EATA is not set
317# CONFIG_SCSI_EATA_PIO is not set
318# CONFIG_SCSI_FUTURE_DOMAIN is not set 334# CONFIG_SCSI_FUTURE_DOMAIN is not set
319# CONFIG_SCSI_GDTH is not set
320# CONFIG_SCSI_IPS is not set 335# CONFIG_SCSI_IPS is not set
321# CONFIG_SCSI_INITIO is not set 336# CONFIG_SCSI_INITIO is not set
322# CONFIG_SCSI_INIA100 is not set 337# CONFIG_SCSI_INIA100 is not set
@@ -326,7 +341,6 @@ CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
326CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 341CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
327# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 342# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
328# CONFIG_SCSI_IPR is not set 343# CONFIG_SCSI_IPR is not set
329# CONFIG_SCSI_QLOGIC_ISP is not set
330CONFIG_SCSI_QLOGIC_FC=y 344CONFIG_SCSI_QLOGIC_FC=y
331# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set 345# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
332CONFIG_SCSI_QLOGIC_1280=y 346CONFIG_SCSI_QLOGIC_1280=y
@@ -337,6 +351,7 @@ CONFIG_SCSI_QLA22XX=m
337CONFIG_SCSI_QLA2300=m 351CONFIG_SCSI_QLA2300=m
338CONFIG_SCSI_QLA2322=m 352CONFIG_SCSI_QLA2322=m
339# CONFIG_SCSI_QLA6312 is not set 353# CONFIG_SCSI_QLA6312 is not set
354# CONFIG_SCSI_LPFC is not set
340# CONFIG_SCSI_DC395x is not set 355# CONFIG_SCSI_DC395x is not set
341# CONFIG_SCSI_DC390T is not set 356# CONFIG_SCSI_DC390T is not set
342# CONFIG_SCSI_DEBUG is not set 357# CONFIG_SCSI_DEBUG is not set
@@ -359,12 +374,16 @@ CONFIG_DM_CRYPT=m
359CONFIG_DM_SNAPSHOT=m 374CONFIG_DM_SNAPSHOT=m
360CONFIG_DM_MIRROR=m 375CONFIG_DM_MIRROR=m
361CONFIG_DM_ZERO=m 376CONFIG_DM_ZERO=m
377CONFIG_DM_MULTIPATH=m
378# CONFIG_DM_MULTIPATH_EMC is not set
362 379
363# 380#
364# Fusion MPT device support 381# Fusion MPT device support
365# 382#
366CONFIG_FUSION=y 383CONFIG_FUSION=y
367CONFIG_FUSION_MAX_SGE=40 384CONFIG_FUSION_SPI=y
385CONFIG_FUSION_FC=m
386CONFIG_FUSION_MAX_SGE=128
368# CONFIG_FUSION_CTL is not set 387# CONFIG_FUSION_CTL is not set
369 388
370# 389#
@@ -387,7 +406,6 @@ CONFIG_NET=y
387# 406#
388CONFIG_PACKET=y 407CONFIG_PACKET=y
389# CONFIG_PACKET_MMAP is not set 408# CONFIG_PACKET_MMAP is not set
390CONFIG_NETLINK_DEV=y
391CONFIG_UNIX=y 409CONFIG_UNIX=y
392# CONFIG_NET_KEY is not set 410# CONFIG_NET_KEY is not set
393CONFIG_INET=y 411CONFIG_INET=y
@@ -447,7 +465,6 @@ CONFIG_DUMMY=m
447# CONFIG_BONDING is not set 465# CONFIG_BONDING is not set
448# CONFIG_EQUALIZER is not set 466# CONFIG_EQUALIZER is not set
449# CONFIG_TUN is not set 467# CONFIG_TUN is not set
450# CONFIG_ETHERTAP is not set
451 468
452# 469#
453# ARCnet devices 470# ARCnet devices
@@ -484,9 +501,7 @@ CONFIG_NET_PCI=y
484# CONFIG_FORCEDETH is not set 501# CONFIG_FORCEDETH is not set
485# CONFIG_DGRS is not set 502# CONFIG_DGRS is not set
486CONFIG_EEPRO100=m 503CONFIG_EEPRO100=m
487# CONFIG_EEPRO100_PIO is not set
488CONFIG_E100=m 504CONFIG_E100=m
489# CONFIG_E100_NAPI is not set
490# CONFIG_FEALNX is not set 505# CONFIG_FEALNX is not set
491# CONFIG_NATSEMI is not set 506# CONFIG_NATSEMI is not set
492# CONFIG_NE2K_PCI is not set 507# CONFIG_NE2K_PCI is not set
@@ -508,9 +523,11 @@ CONFIG_E1000=y
508# CONFIG_HAMACHI is not set 523# CONFIG_HAMACHI is not set
509# CONFIG_YELLOWFIN is not set 524# CONFIG_YELLOWFIN is not set
510# CONFIG_R8169 is not set 525# CONFIG_R8169 is not set
526# CONFIG_SKGE is not set
511# CONFIG_SK98LIN is not set 527# CONFIG_SK98LIN is not set
512# CONFIG_VIA_VELOCITY is not set 528# CONFIG_VIA_VELOCITY is not set
513CONFIG_TIGON3=y 529CONFIG_TIGON3=y
530# CONFIG_BNX2 is not set
514 531
515# 532#
516# Ethernet (10000 Mbit) 533# Ethernet (10000 Mbit)
@@ -568,25 +585,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
568# CONFIG_INPUT_EVBUG is not set 585# CONFIG_INPUT_EVBUG is not set
569 586
570# 587#
571# Input I/O drivers
572#
573CONFIG_GAMEPORT=m
574CONFIG_SOUND_GAMEPORT=m
575# CONFIG_GAMEPORT_NS558 is not set
576# CONFIG_GAMEPORT_L4 is not set
577# CONFIG_GAMEPORT_EMU10K1 is not set
578# CONFIG_GAMEPORT_VORTEX is not set
579# CONFIG_GAMEPORT_FM801 is not set
580# CONFIG_GAMEPORT_CS461x is not set
581CONFIG_SERIO=y
582CONFIG_SERIO_I8042=y
583# CONFIG_SERIO_SERPORT is not set
584# CONFIG_SERIO_CT82C710 is not set
585# CONFIG_SERIO_PCIPS2 is not set
586CONFIG_SERIO_LIBPS2=y
587# CONFIG_SERIO_RAW is not set
588
589#
590# Input Device Drivers 588# Input Device Drivers
591# 589#
592CONFIG_INPUT_KEYBOARD=y 590CONFIG_INPUT_KEYBOARD=y
@@ -604,6 +602,23 @@ CONFIG_MOUSE_PS2=y
604# CONFIG_INPUT_MISC is not set 602# CONFIG_INPUT_MISC is not set
605 603
606# 604#
605# Hardware I/O ports
606#
607CONFIG_SERIO=y
608CONFIG_SERIO_I8042=y
609# CONFIG_SERIO_SERPORT is not set
610# CONFIG_SERIO_PCIPS2 is not set
611CONFIG_SERIO_LIBPS2=y
612# CONFIG_SERIO_RAW is not set
613CONFIG_GAMEPORT=m
614# CONFIG_GAMEPORT_NS558 is not set
615# CONFIG_GAMEPORT_L4 is not set
616# CONFIG_GAMEPORT_EMU10K1 is not set
617# CONFIG_GAMEPORT_VORTEX is not set
618# CONFIG_GAMEPORT_FM801 is not set
619# CONFIG_GAMEPORT_CS461X is not set
620
621#
607# Character devices 622# Character devices
608# 623#
609CONFIG_VT=y 624CONFIG_VT=y
@@ -613,11 +628,15 @@ CONFIG_SERIAL_NONSTANDARD=y
613# CONFIG_ROCKETPORT is not set 628# CONFIG_ROCKETPORT is not set
614# CONFIG_CYCLADES is not set 629# CONFIG_CYCLADES is not set
615# CONFIG_MOXA_SMARTIO is not set 630# CONFIG_MOXA_SMARTIO is not set
616# CONFIG_SYNCLINK is not set 631# CONFIG_ISI is not set
617# CONFIG_SYNCLINKMP is not set 632# CONFIG_SYNCLINKMP is not set
618# CONFIG_N_HDLC is not set 633# CONFIG_N_HDLC is not set
634# CONFIG_SPECIALIX is not set
635# CONFIG_SX is not set
619# CONFIG_STALDRV is not set 636# CONFIG_STALDRV is not set
620CONFIG_SGI_SNSC=y 637CONFIG_SGI_SNSC=y
638CONFIG_SGI_TIOCX=y
639CONFIG_SGI_MBCS=m
621 640
622# 641#
623# Serial drivers 642# Serial drivers
@@ -638,6 +657,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
638CONFIG_SERIAL_CORE=y 657CONFIG_SERIAL_CORE=y
639CONFIG_SERIAL_CORE_CONSOLE=y 658CONFIG_SERIAL_CORE_CONSOLE=y
640CONFIG_SERIAL_SGI_L1_CONSOLE=y 659CONFIG_SERIAL_SGI_L1_CONSOLE=y
660# CONFIG_SERIAL_JSM is not set
641CONFIG_UNIX98_PTYS=y 661CONFIG_UNIX98_PTYS=y
642CONFIG_LEGACY_PTYS=y 662CONFIG_LEGACY_PTYS=y
643CONFIG_LEGACY_PTY_COUNT=256 663CONFIG_LEGACY_PTY_COUNT=256
@@ -663,6 +683,7 @@ CONFIG_EFI_RTC=y
663CONFIG_AGP=m 683CONFIG_AGP=m
664CONFIG_AGP_I460=m 684CONFIG_AGP_I460=m
665CONFIG_AGP_HP_ZX1=m 685CONFIG_AGP_HP_ZX1=m
686CONFIG_AGP_SGI_TIOCA=m
666CONFIG_DRM=m 687CONFIG_DRM=m
667CONFIG_DRM_TDFX=m 688CONFIG_DRM_TDFX=m
668CONFIG_DRM_R128=m 689CONFIG_DRM_R128=m
@@ -674,9 +695,15 @@ CONFIG_HPET=y
674# CONFIG_HPET_RTC_IRQ is not set 695# CONFIG_HPET_RTC_IRQ is not set
675CONFIG_HPET_MMAP=y 696CONFIG_HPET_MMAP=y
676CONFIG_MAX_RAW_DEVS=256 697CONFIG_MAX_RAW_DEVS=256
698# CONFIG_HANGCHECK_TIMER is not set
677CONFIG_MMTIMER=y 699CONFIG_MMTIMER=y
678 700
679# 701#
702# TPM devices
703#
704# CONFIG_TCG_TPM is not set
705
706#
680# I2C support 707# I2C support
681# 708#
682# CONFIG_I2C is not set 709# CONFIG_I2C is not set
@@ -760,6 +787,8 @@ CONFIG_SND_CS46XX=m
760CONFIG_SND_CS46XX_NEW_DSP=y 787CONFIG_SND_CS46XX_NEW_DSP=y
761CONFIG_SND_CS4281=m 788CONFIG_SND_CS4281=m
762CONFIG_SND_EMU10K1=m 789CONFIG_SND_EMU10K1=m
790# CONFIG_SND_EMU10K1X is not set
791# CONFIG_SND_CA0106 is not set
763# CONFIG_SND_KORG1212 is not set 792# CONFIG_SND_KORG1212 is not set
764# CONFIG_SND_MIXART is not set 793# CONFIG_SND_MIXART is not set
765# CONFIG_SND_NM256 is not set 794# CONFIG_SND_NM256 is not set
@@ -784,13 +813,14 @@ CONFIG_SND_FM801=m
784# CONFIG_SND_INTEL8X0M is not set 813# CONFIG_SND_INTEL8X0M is not set
785# CONFIG_SND_SONICVIBES is not set 814# CONFIG_SND_SONICVIBES is not set
786# CONFIG_SND_VIA82XX is not set 815# CONFIG_SND_VIA82XX is not set
816# CONFIG_SND_VIA82XX_MODEM is not set
787# CONFIG_SND_VX222 is not set 817# CONFIG_SND_VX222 is not set
818# CONFIG_SND_HDA_INTEL is not set
788 819
789# 820#
790# USB devices 821# USB devices
791# 822#
792# CONFIG_SND_USB_AUDIO is not set 823# CONFIG_SND_USB_AUDIO is not set
793# CONFIG_SND_USB_USX2Y is not set
794 824
795# 825#
796# Open Sound System 826# Open Sound System
@@ -800,6 +830,8 @@ CONFIG_SND_FM801=m
800# 830#
801# USB support 831# USB support
802# 832#
833CONFIG_USB_ARCH_HAS_HCD=y
834CONFIG_USB_ARCH_HAS_OHCI=y
803CONFIG_USB=m 835CONFIG_USB=m
804# CONFIG_USB_DEBUG is not set 836# CONFIG_USB_DEBUG is not set
805 837
@@ -811,8 +843,6 @@ CONFIG_USB_DEVICEFS=y
811# CONFIG_USB_DYNAMIC_MINORS is not set 843# CONFIG_USB_DYNAMIC_MINORS is not set
812# CONFIG_USB_SUSPEND is not set 844# CONFIG_USB_SUSPEND is not set
813# CONFIG_USB_OTG is not set 845# CONFIG_USB_OTG is not set
814CONFIG_USB_ARCH_HAS_HCD=y
815CONFIG_USB_ARCH_HAS_OHCI=y
816 846
817# 847#
818# USB Host Controller Drivers 848# USB Host Controller Drivers
@@ -821,6 +851,8 @@ CONFIG_USB_EHCI_HCD=m
821# CONFIG_USB_EHCI_SPLIT_ISO is not set 851# CONFIG_USB_EHCI_SPLIT_ISO is not set
822# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 852# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
823CONFIG_USB_OHCI_HCD=m 853CONFIG_USB_OHCI_HCD=m
854# CONFIG_USB_OHCI_BIG_ENDIAN is not set
855CONFIG_USB_OHCI_LITTLE_ENDIAN=y
824CONFIG_USB_UHCI_HCD=m 856CONFIG_USB_UHCI_HCD=m
825# CONFIG_USB_SL811_HCD is not set 857# CONFIG_USB_SL811_HCD is not set
826 858
@@ -838,12 +870,11 @@ CONFIG_USB_UHCI_HCD=m
838# 870#
839CONFIG_USB_STORAGE=m 871CONFIG_USB_STORAGE=m
840# CONFIG_USB_STORAGE_DEBUG is not set 872# CONFIG_USB_STORAGE_DEBUG is not set
841# CONFIG_USB_STORAGE_RW_DETECT is not set
842# CONFIG_USB_STORAGE_DATAFAB is not set 873# CONFIG_USB_STORAGE_DATAFAB is not set
843# CONFIG_USB_STORAGE_FREECOM is not set 874# CONFIG_USB_STORAGE_FREECOM is not set
844# CONFIG_USB_STORAGE_ISD200 is not set 875# CONFIG_USB_STORAGE_ISD200 is not set
845# CONFIG_USB_STORAGE_DPCM is not set 876# CONFIG_USB_STORAGE_DPCM is not set
846# CONFIG_USB_STORAGE_HP8200e is not set 877# CONFIG_USB_STORAGE_USBAT is not set
847# CONFIG_USB_STORAGE_SDDR09 is not set 878# CONFIG_USB_STORAGE_SDDR09 is not set
848# CONFIG_USB_STORAGE_SDDR55 is not set 879# CONFIG_USB_STORAGE_SDDR55 is not set
849# CONFIG_USB_STORAGE_JUMPSHOT is not set 880# CONFIG_USB_STORAGE_JUMPSHOT is not set
@@ -893,6 +924,7 @@ CONFIG_USB_HIDINPUT=y
893# CONFIG_USB_PEGASUS is not set 924# CONFIG_USB_PEGASUS is not set
894# CONFIG_USB_RTL8150 is not set 925# CONFIG_USB_RTL8150 is not set
895# CONFIG_USB_USBNET is not set 926# CONFIG_USB_USBNET is not set
927CONFIG_USB_MON=m
896 928
897# 929#
898# USB port drivers 930# USB port drivers
@@ -908,7 +940,6 @@ CONFIG_USB_HIDINPUT=y
908# 940#
909# CONFIG_USB_EMI62 is not set 941# CONFIG_USB_EMI62 is not set
910# CONFIG_USB_EMI26 is not set 942# CONFIG_USB_EMI26 is not set
911# CONFIG_USB_TIGL is not set
912# CONFIG_USB_AUERSWALD is not set 943# CONFIG_USB_AUERSWALD is not set
913# CONFIG_USB_RIO500 is not set 944# CONFIG_USB_RIO500 is not set
914# CONFIG_USB_LEGOTOWER is not set 945# CONFIG_USB_LEGOTOWER is not set
@@ -917,6 +948,8 @@ CONFIG_USB_HIDINPUT=y
917# CONFIG_USB_CYTHERM is not set 948# CONFIG_USB_CYTHERM is not set
918# CONFIG_USB_PHIDGETKIT is not set 949# CONFIG_USB_PHIDGETKIT is not set
919# CONFIG_USB_PHIDGETSERVO is not set 950# CONFIG_USB_PHIDGETSERVO is not set
951# CONFIG_USB_IDMOUSE is not set
952# CONFIG_USB_SISUSBVGA is not set
920# CONFIG_USB_TEST is not set 953# CONFIG_USB_TEST is not set
921 954
922# 955#
@@ -964,7 +997,12 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
964CONFIG_REISERFS_FS_SECURITY=y 997CONFIG_REISERFS_FS_SECURITY=y
965# CONFIG_JFS_FS is not set 998# CONFIG_JFS_FS is not set
966CONFIG_FS_POSIX_ACL=y 999CONFIG_FS_POSIX_ACL=y
1000
1001#
1002# XFS support
1003#
967CONFIG_XFS_FS=y 1004CONFIG_XFS_FS=y
1005CONFIG_XFS_EXPORT=y
968# CONFIG_XFS_RT is not set 1006# CONFIG_XFS_RT is not set
969# CONFIG_XFS_QUOTA is not set 1007# CONFIG_XFS_QUOTA is not set
970# CONFIG_XFS_SECURITY is not set 1008# CONFIG_XFS_SECURITY is not set
@@ -1042,7 +1080,7 @@ CONFIG_NFSD_V4=y
1042CONFIG_NFSD_TCP=y 1080CONFIG_NFSD_TCP=y
1043CONFIG_LOCKD=m 1081CONFIG_LOCKD=m
1044CONFIG_LOCKD_V4=y 1082CONFIG_LOCKD_V4=y
1045CONFIG_EXPORTFS=m 1083CONFIG_EXPORTFS=y
1046CONFIG_SUNRPC=m 1084CONFIG_SUNRPC=m
1047CONFIG_SUNRPC_GSS=m 1085CONFIG_SUNRPC_GSS=m
1048CONFIG_RPCSEC_GSS_KRB5=m 1086CONFIG_RPCSEC_GSS_KRB5=m
@@ -1128,6 +1166,8 @@ CONFIG_NLS_UTF8=m
1128# CONFIG_CRC_CCITT is not set 1166# CONFIG_CRC_CCITT is not set
1129CONFIG_CRC32=y 1167CONFIG_CRC32=y
1130# CONFIG_LIBCRC32C is not set 1168# CONFIG_LIBCRC32C is not set
1169CONFIG_GENERIC_HARDIRQS=y
1170CONFIG_GENERIC_IRQ_PROBE=y
1131 1171
1132# 1172#
1133# HP Simulator drivers 1173# HP Simulator drivers
@@ -1144,14 +1184,17 @@ CONFIG_CRC32=y
1144# 1184#
1145# Kernel hacking 1185# Kernel hacking
1146# 1186#
1187# CONFIG_PRINTK_TIME is not set
1147CONFIG_DEBUG_KERNEL=y 1188CONFIG_DEBUG_KERNEL=y
1148CONFIG_MAGIC_SYSRQ=y 1189CONFIG_MAGIC_SYSRQ=y
1190CONFIG_LOG_BUF_SHIFT=20
1149# CONFIG_SCHEDSTATS is not set 1191# CONFIG_SCHEDSTATS is not set
1150# CONFIG_DEBUG_SLAB is not set 1192# CONFIG_DEBUG_SLAB is not set
1151# CONFIG_DEBUG_SPINLOCK is not set 1193# CONFIG_DEBUG_SPINLOCK is not set
1152# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1194# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1153# CONFIG_DEBUG_KOBJECT is not set 1195# CONFIG_DEBUG_KOBJECT is not set
1154# CONFIG_DEBUG_INFO is not set 1196# CONFIG_DEBUG_INFO is not set
1197# CONFIG_DEBUG_FS is not set
1155CONFIG_IA64_GRANULE_16MB=y 1198CONFIG_IA64_GRANULE_16MB=y
1156# CONFIG_IA64_GRANULE_64MB is not set 1199# CONFIG_IA64_GRANULE_64MB is not set
1157# CONFIG_IA64_PRINT_HAZARDS is not set 1200# CONFIG_IA64_PRINT_HAZARDS is not set
@@ -1178,6 +1221,7 @@ CONFIG_CRYPTO_MD5=m
1178# CONFIG_CRYPTO_SHA256 is not set 1221# CONFIG_CRYPTO_SHA256 is not set
1179# CONFIG_CRYPTO_SHA512 is not set 1222# CONFIG_CRYPTO_SHA512 is not set
1180# CONFIG_CRYPTO_WP512 is not set 1223# CONFIG_CRYPTO_WP512 is not set
1224# CONFIG_CRYPTO_TGR192 is not set
1181CONFIG_CRYPTO_DES=m 1225CONFIG_CRYPTO_DES=m
1182# CONFIG_CRYPTO_BLOWFISH is not set 1226# CONFIG_CRYPTO_BLOWFISH is not set
1183# CONFIG_CRYPTO_TWOFISH is not set 1227# CONFIG_CRYPTO_TWOFISH is not set
diff --git a/arch/ia64/kernel/entry.h b/arch/ia64/kernel/entry.h
index 6d4ecec989b5..78eeb0793419 100644
--- a/arch/ia64/kernel/entry.h
+++ b/arch/ia64/kernel/entry.h
@@ -60,7 +60,7 @@
60 .spillsp @priunat,SW(AR_UNAT)+16+(off); \ 60 .spillsp @priunat,SW(AR_UNAT)+16+(off); \
61 .spillsp ar.rnat,SW(AR_RNAT)+16+(off); \ 61 .spillsp ar.rnat,SW(AR_RNAT)+16+(off); \
62 .spillsp ar.bspstore,SW(AR_BSPSTORE)+16+(off); \ 62 .spillsp ar.bspstore,SW(AR_BSPSTORE)+16+(off); \
63 .spillsp pr,SW(PR)+16+(off)) 63 .spillsp pr,SW(PR)+16+(off)
64 64
65#define DO_SAVE_SWITCH_STACK \ 65#define DO_SAVE_SWITCH_STACK \
66 movl r28=1f; \ 66 movl r28=1f; \
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S
index d9c05d53435b..2bc085a73e30 100644
--- a/arch/ia64/kernel/ivt.S
+++ b/arch/ia64/kernel/ivt.S
@@ -405,17 +405,22 @@ ENTRY(nested_dtlb_miss)
405 * r30: continuation address 405 * r30: continuation address
406 * r31: saved pr 406 * r31: saved pr
407 * 407 *
408 * Clobbered: b0, r18, r19, r21, psr.dt (cleared) 408 * Clobbered: b0, r18, r19, r21, r22, psr.dt (cleared)
409 */ 409 */
410 rsm psr.dt // switch to using physical data addressing 410 rsm psr.dt // switch to using physical data addressing
411 mov r19=IA64_KR(PT_BASE) // get the page table base address 411 mov r19=IA64_KR(PT_BASE) // get the page table base address
412 shl r21=r16,3 // shift bit 60 into sign bit 412 shl r21=r16,3 // shift bit 60 into sign bit
413 mov r18=cr.itir
413 ;; 414 ;;
414 shr.u r17=r16,61 // get the region number into r17 415 shr.u r17=r16,61 // get the region number into r17
416 extr.u r18=r18,2,6 // get the faulting page size
415 ;; 417 ;;
416 cmp.eq p6,p7=5,r17 // is faulting address in region 5? 418 cmp.eq p6,p7=5,r17 // is faulting address in region 5?
417 shr.u r18=r16,PGDIR_SHIFT // get bits 33-63 of faulting address 419 add r22=-PAGE_SHIFT,r18 // adjustment for hugetlb address
420 add r18=PGDIR_SHIFT-PAGE_SHIFT,r18
418 ;; 421 ;;
422 shr.u r22=r16,r22
423 shr.u r18=r16,r18
419(p7) dep r17=r17,r19,(PAGE_SHIFT-3),3 // put region number bits in place 424(p7) dep r17=r17,r19,(PAGE_SHIFT-3),3 // put region number bits in place
420 425
421 srlz.d 426 srlz.d
@@ -428,7 +433,7 @@ ENTRY(nested_dtlb_miss)
428(p6) dep r17=r18,r19,3,(PAGE_SHIFT-3) // r17=PTA + IFA(33,42)*8 433(p6) dep r17=r18,r19,3,(PAGE_SHIFT-3) // r17=PTA + IFA(33,42)*8
429(p7) dep r17=r18,r17,3,(PAGE_SHIFT-6) // r17=PTA + (((IFA(61,63) << 7) | IFA(33,39))*8) 434(p7) dep r17=r18,r17,3,(PAGE_SHIFT-6) // r17=PTA + (((IFA(61,63) << 7) | IFA(33,39))*8)
430 cmp.eq p7,p6=0,r21 // unused address bits all zeroes? 435 cmp.eq p7,p6=0,r21 // unused address bits all zeroes?
431 shr.u r18=r16,PMD_SHIFT // shift L2 index into position 436 shr.u r18=r22,PMD_SHIFT // shift L2 index into position
432 ;; 437 ;;
433 ld8 r17=[r17] // fetch the L1 entry (may be 0) 438 ld8 r17=[r17] // fetch the L1 entry (may be 0)
434 ;; 439 ;;
@@ -436,7 +441,7 @@ ENTRY(nested_dtlb_miss)
436 dep r17=r18,r17,3,(PAGE_SHIFT-3) // compute address of L2 page table entry 441 dep r17=r18,r17,3,(PAGE_SHIFT-3) // compute address of L2 page table entry
437 ;; 442 ;;
438(p7) ld8 r17=[r17] // fetch the L2 entry (may be 0) 443(p7) ld8 r17=[r17] // fetch the L2 entry (may be 0)
439 shr.u r19=r16,PAGE_SHIFT // shift L3 index into position 444 shr.u r19=r22,PAGE_SHIFT // shift L3 index into position
440 ;; 445 ;;
441(p7) cmp.eq.or.andcm p6,p7=r17,r0 // was L2 entry NULL? 446(p7) cmp.eq.or.andcm p6,p7=r17,r0 // was L2 entry NULL?
442 dep r17=r19,r17,3,(PAGE_SHIFT-3) // compute address of L3 page table entry 447 dep r17=r19,r17,3,(PAGE_SHIFT-3) // compute address of L3 page table entry
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 575a8f657b31..6d57aebad485 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -945,6 +945,13 @@ access_uarea (struct task_struct *child, unsigned long addr,
945 *data = (pt->cr_ipsr & IPSR_MASK); 945 *data = (pt->cr_ipsr & IPSR_MASK);
946 return 0; 946 return 0;
947 947
948 case PT_AR_RSC:
949 if (write_access)
950 pt->ar_rsc = *data | (3 << 2); /* force PL3 */
951 else
952 *data = pt->ar_rsc;
953 return 0;
954
948 case PT_AR_RNAT: 955 case PT_AR_RNAT:
949 urbs_end = ia64_get_user_rbs_end(child, pt, NULL); 956 urbs_end = ia64_get_user_rbs_end(child, pt, NULL);
950 rnat_addr = (long) ia64_rse_rnat_addr((long *) 957 rnat_addr = (long) ia64_rse_rnat_addr((long *)
@@ -996,9 +1003,6 @@ access_uarea (struct task_struct *child, unsigned long addr,
996 case PT_AR_BSPSTORE: 1003 case PT_AR_BSPSTORE:
997 ptr = pt_reg_addr(pt, ar_bspstore); 1004 ptr = pt_reg_addr(pt, ar_bspstore);
998 break; 1005 break;
999 case PT_AR_RSC:
1000 ptr = pt_reg_addr(pt, ar_rsc);
1001 break;
1002 case PT_AR_UNAT: 1006 case PT_AR_UNAT:
1003 ptr = pt_reg_addr(pt, ar_unat); 1007 ptr = pt_reg_addr(pt, ar_unat);
1004 break; 1008 break;
@@ -1234,7 +1238,7 @@ ptrace_getregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
1234static long 1238static long
1235ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr) 1239ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
1236{ 1240{
1237 unsigned long psr, ec, lc, rnat, bsp, cfm, nat_bits, val = 0; 1241 unsigned long psr, rsc, ec, lc, rnat, bsp, cfm, nat_bits, val = 0;
1238 struct unw_frame_info info; 1242 struct unw_frame_info info;
1239 struct switch_stack *sw; 1243 struct switch_stack *sw;
1240 struct ia64_fpreg fpval; 1244 struct ia64_fpreg fpval;
@@ -1267,7 +1271,7 @@ ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
1267 /* app regs */ 1271 /* app regs */
1268 1272
1269 retval |= __get_user(pt->ar_pfs, &ppr->ar[PT_AUR_PFS]); 1273 retval |= __get_user(pt->ar_pfs, &ppr->ar[PT_AUR_PFS]);
1270 retval |= __get_user(pt->ar_rsc, &ppr->ar[PT_AUR_RSC]); 1274 retval |= __get_user(rsc, &ppr->ar[PT_AUR_RSC]);
1271 retval |= __get_user(pt->ar_bspstore, &ppr->ar[PT_AUR_BSPSTORE]); 1275 retval |= __get_user(pt->ar_bspstore, &ppr->ar[PT_AUR_BSPSTORE]);
1272 retval |= __get_user(pt->ar_unat, &ppr->ar[PT_AUR_UNAT]); 1276 retval |= __get_user(pt->ar_unat, &ppr->ar[PT_AUR_UNAT]);
1273 retval |= __get_user(pt->ar_ccv, &ppr->ar[PT_AUR_CCV]); 1277 retval |= __get_user(pt->ar_ccv, &ppr->ar[PT_AUR_CCV]);
@@ -1365,6 +1369,7 @@ ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
1365 retval |= __get_user(nat_bits, &ppr->nat); 1369 retval |= __get_user(nat_bits, &ppr->nat);
1366 1370
1367 retval |= access_uarea(child, PT_CR_IPSR, &psr, 1); 1371 retval |= access_uarea(child, PT_CR_IPSR, &psr, 1);
1372 retval |= access_uarea(child, PT_AR_RSC, &rsc, 1);
1368 retval |= access_uarea(child, PT_AR_EC, &ec, 1); 1373 retval |= access_uarea(child, PT_AR_EC, &ec, 1);
1369 retval |= access_uarea(child, PT_AR_LC, &lc, 1); 1374 retval |= access_uarea(child, PT_AR_LC, &lc, 1);
1370 retval |= access_uarea(child, PT_AR_RNAT, &rnat, 1); 1375 retval |= access_uarea(child, PT_AR_RNAT, &rnat, 1);
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index 499b7e5317cf..edd9f07860b2 100644
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
@@ -94,7 +94,7 @@ sys_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, long arg2,
94static long 94static long
95restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr) 95restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
96{ 96{
97 unsigned long ip, flags, nat, um, cfm; 97 unsigned long ip, flags, nat, um, cfm, rsc;
98 long err; 98 long err;
99 99
100 /* Always make any pending restarted system calls return -EINTR */ 100 /* Always make any pending restarted system calls return -EINTR */
@@ -106,7 +106,7 @@ restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
106 err |= __get_user(ip, &sc->sc_ip); /* instruction pointer */ 106 err |= __get_user(ip, &sc->sc_ip); /* instruction pointer */
107 err |= __get_user(cfm, &sc->sc_cfm); 107 err |= __get_user(cfm, &sc->sc_cfm);
108 err |= __get_user(um, &sc->sc_um); /* user mask */ 108 err |= __get_user(um, &sc->sc_um); /* user mask */
109 err |= __get_user(scr->pt.ar_rsc, &sc->sc_ar_rsc); 109 err |= __get_user(rsc, &sc->sc_ar_rsc);
110 err |= __get_user(scr->pt.ar_unat, &sc->sc_ar_unat); 110 err |= __get_user(scr->pt.ar_unat, &sc->sc_ar_unat);
111 err |= __get_user(scr->pt.ar_fpsr, &sc->sc_ar_fpsr); 111 err |= __get_user(scr->pt.ar_fpsr, &sc->sc_ar_fpsr);
112 err |= __get_user(scr->pt.ar_pfs, &sc->sc_ar_pfs); 112 err |= __get_user(scr->pt.ar_pfs, &sc->sc_ar_pfs);
@@ -119,6 +119,7 @@ restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
119 err |= __copy_from_user(&scr->pt.r15, &sc->sc_gr[15], 8); /* r15 */ 119 err |= __copy_from_user(&scr->pt.r15, &sc->sc_gr[15], 8); /* r15 */
120 120
121 scr->pt.cr_ifs = cfm | (1UL << 63); 121 scr->pt.cr_ifs = cfm | (1UL << 63);
122 scr->pt.ar_rsc = rsc | (3 << 2); /* force PL3 */
122 123
123 /* establish new instruction pointer: */ 124 /* establish new instruction pointer: */
124 scr->pt.cr_iip = ip & ~0x3UL; 125 scr->pt.cr_iip = ip & ~0x3UL;
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index 953095e2ce15..b49d4ddaab93 100644
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -269,7 +269,7 @@ smp_call_function_single (int cpuid, void (*func) (void *info), void *info, int
269 int me = get_cpu(); /* prevent preemption and reschedule on another processor */ 269 int me = get_cpu(); /* prevent preemption and reschedule on another processor */
270 270
271 if (cpuid == me) { 271 if (cpuid == me) {
272 printk("%s: trying to call self\n", __FUNCTION__); 272 printk(KERN_INFO "%s: trying to call self\n", __FUNCTION__);
273 put_cpu(); 273 put_cpu();
274 return -EBUSY; 274 return -EBUSY;
275 } 275 }
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 88641e5095b5..e3fc4edea113 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -33,8 +33,6 @@
33#include <asm/hw_irq.h> 33#include <asm/hw_irq.h>
34 34
35 35
36static int pci_routeirq;
37
38/* 36/*
39 * Low-level SAL-based PCI configuration access functions. Note that SAL 37 * Low-level SAL-based PCI configuration access functions. Note that SAL
40 * calls are already serialized (via sal_lock), so we don't need another 38 * calls are already serialized (via sal_lock), so we don't need another
@@ -139,24 +137,8 @@ static void acpi_map_iosapics(void)
139static int __init 137static int __init
140pci_acpi_init (void) 138pci_acpi_init (void)
141{ 139{
142 struct pci_dev *dev = NULL;
143
144 printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
145
146 acpi_map_iosapics(); 140 acpi_map_iosapics();
147 141
148 if (pci_routeirq) {
149 /*
150 * PCI IRQ routing is set up by pci_enable_device(), but we
151 * also do it here in case there are still broken drivers that
152 * don't use pci_enable_device().
153 */
154 printk(KERN_INFO "PCI: Routing interrupts for all devices because \"pci=routeirq\" specified\n");
155 for_each_pci_dev(dev)
156 acpi_pci_irq_enable(dev);
157 } else
158 printk(KERN_INFO "PCI: If a device doesn't work, try \"pci=routeirq\". If it helps, post a report\n");
159
160 return 0; 142 return 0;
161} 143}
162 144
@@ -500,8 +482,6 @@ pcibios_align_resource (void *data, struct resource *res,
500char * __init 482char * __init
501pcibios_setup (char *str) 483pcibios_setup (char *str)
502{ 484{
503 if (!strcmp(str, "routeirq"))
504 pci_routeirq = 1;
505 return NULL; 485 return NULL;
506} 486}
507 487
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 047e7222df7a..73781ec165b4 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -315,7 +315,7 @@ extern struct efi_memory_map memmap;
315 */ 315 */
316static inline int efi_range_is_wc(unsigned long start, unsigned long len) 316static inline int efi_range_is_wc(unsigned long start, unsigned long len)
317{ 317{
318 int i; 318 unsigned long i;
319 319
320 for (i = 0; i < len; i += (1UL << EFI_PAGE_SHIFT)) { 320 for (i = 0; i < len; i += (1UL << EFI_PAGE_SHIFT)) {
321 unsigned long paddr = __pa(start + i); 321 unsigned long paddr = __pa(start + i);
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-01 06:18:29 -0500