aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/Kconfig25
-rw-r--r--arch/ia64/configs/tiger_defconfig263
-rw-r--r--arch/ia64/configs/zx1_defconfig344
-rw-r--r--arch/ia64/defconfig322
-rw-r--r--arch/ia64/hp/common/hwsw_iommu.c4
-rw-r--r--arch/ia64/hp/common/sba_iommu.c2
-rw-r--r--arch/ia64/hp/sim/simeth.c3
-rw-r--r--arch/ia64/ia32/binfmt_elf32.c13
-rw-r--r--arch/ia64/ia32/ia32_entry.S2
-rw-r--r--arch/ia64/ia32/sys_ia32.c78
-rw-r--r--arch/ia64/kernel/Makefile1
-rw-r--r--arch/ia64/kernel/acpi.c200
-rw-r--r--arch/ia64/kernel/asm-offsets.c1
-rw-r--r--arch/ia64/kernel/crash.c32
-rw-r--r--arch/ia64/kernel/crash_dump.c3
-rw-r--r--arch/ia64/kernel/efi.c43
-rw-r--r--arch/ia64/kernel/entry.S2
-rw-r--r--arch/ia64/kernel/err_inject.c293
-rw-r--r--arch/ia64/kernel/fsys.S105
-rw-r--r--arch/ia64/kernel/iosapic.c13
-rw-r--r--arch/ia64/kernel/irq_ia64.c2
-rw-r--r--arch/ia64/kernel/machine_kexec.c15
-rw-r--r--arch/ia64/kernel/mca.c8
-rw-r--r--arch/ia64/kernel/mca_drv.c65
-rw-r--r--arch/ia64/kernel/msi_ia64.c25
-rw-r--r--arch/ia64/kernel/perfmon.c80
-rw-r--r--arch/ia64/kernel/process.c16
-rw-r--r--arch/ia64/kernel/ptrace.c15
-rw-r--r--arch/ia64/kernel/sal.c3
-rw-r--r--arch/ia64/kernel/salinfo.c4
-rw-r--r--arch/ia64/kernel/setup.c91
-rw-r--r--arch/ia64/kernel/smp.c4
-rw-r--r--arch/ia64/kernel/smpboot.c17
-rw-r--r--arch/ia64/kernel/traps.c30
-rw-r--r--arch/ia64/kernel/vmlinux.lds.S3
-rw-r--r--arch/ia64/lib/Makefile3
-rw-r--r--arch/ia64/lib/csum_partial_copy.c2
-rw-r--r--arch/ia64/mm/contig.c113
-rw-r--r--arch/ia64/mm/discontig.c50
-rw-r--r--arch/ia64/mm/init.c64
-rw-r--r--arch/ia64/pci/pci.c7
-rw-r--r--arch/ia64/sn/kernel/bte_error.c6
-rw-r--r--arch/ia64/sn/kernel/huberror.c16
-rw-r--r--arch/ia64/sn/kernel/io_acpi_init.c356
-rw-r--r--arch/ia64/sn/kernel/io_common.c90
-rw-r--r--arch/ia64/sn/kernel/io_init.c66
-rw-r--r--arch/ia64/sn/kernel/iomv.c5
-rw-r--r--arch/ia64/sn/kernel/irq.c14
-rw-r--r--arch/ia64/sn/kernel/msi_sn.c22
-rw-r--r--arch/ia64/sn/kernel/setup.c8
-rw-r--r--arch/ia64/sn/kernel/sn2/sn2_smp.c2
-rw-r--r--arch/ia64/sn/kernel/sn2/sn_hwperf.c2
-rw-r--r--arch/ia64/sn/kernel/sn2/sn_proc_fs.c105
-rw-r--r--arch/ia64/sn/kernel/xpc_main.c88
-rw-r--r--arch/ia64/sn/kernel/xpnet.c18
-rw-r--r--arch/ia64/sn/pci/pcibr/pcibr_dma.c8
-rw-r--r--arch/ia64/sn/pci/pcibr/pcibr_provider.c6
57 files changed, 2265 insertions, 913 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index fcacfe291b9b..09866581a326 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -11,6 +11,9 @@ menu "Processor type and features"
11 11
12config IA64 12config IA64
13 bool 13 bool
14 select PCI if (!IA64_HP_SIM)
15 select ACPI if (!IA64_HP_SIM)
16 select PM if (!IA64_HP_SIM)
14 default y 17 default y
15 help 18 help
16 The Itanium Processor Family is Intel's 64-bit successor to 19 The Itanium Processor Family is Intel's 64-bit successor to
@@ -20,15 +23,19 @@ config IA64
20 23
21config 64BIT 24config 64BIT
22 bool 25 bool
26 select ATA_NONSTANDARD if ATA
23 default y 27 default y
24 28
29config ZONE_DMA
30 def_bool y
31 depends on !IA64_SGI_SN2
32
25config MMU 33config MMU
26 bool 34 bool
27 default y 35 default y
28 36
29config SWIOTLB 37config SWIOTLB
30 bool 38 bool
31 default y
32 39
33config RWSEM_XCHGADD_ALGORITHM 40config RWSEM_XCHGADD_ALGORITHM
34 bool 41 bool
@@ -84,10 +91,9 @@ choice
84 91
85config IA64_GENERIC 92config IA64_GENERIC
86 bool "generic" 93 bool "generic"
87 select ACPI
88 select PCI
89 select NUMA 94 select NUMA
90 select ACPI_NUMA 95 select ACPI_NUMA
96 select SWIOTLB
91 help 97 help
92 This selects the system type of your hardware. A "generic" kernel 98 This selects the system type of your hardware. A "generic" kernel
93 will run on any supported IA-64 system. However, if you configure 99 will run on any supported IA-64 system. However, if you configure
@@ -104,6 +110,7 @@ config IA64_GENERIC
104 110
105config IA64_DIG 111config IA64_DIG
106 bool "DIG-compliant" 112 bool "DIG-compliant"
113 select SWIOTLB
107 114
108config IA64_HP_ZX1 115config IA64_HP_ZX1
109 bool "HP-zx1/sx1000" 116 bool "HP-zx1/sx1000"
@@ -113,6 +120,7 @@ config IA64_HP_ZX1
113 120
114config IA64_HP_ZX1_SWIOTLB 121config IA64_HP_ZX1_SWIOTLB
115 bool "HP-zx1/sx1000 with software I/O TLB" 122 bool "HP-zx1/sx1000 with software I/O TLB"
123 select SWIOTLB
116 help 124 help
117 Build a kernel that runs on HP zx1 and sx1000 systems even when they 125 Build a kernel that runs on HP zx1 and sx1000 systems even when they
118 have broken PCI devices which cannot DMA to full 32 bits. Apart 126 have broken PCI devices which cannot DMA to full 32 bits. Apart
@@ -131,6 +139,7 @@ config IA64_SGI_SN2
131 139
132config IA64_HP_SIM 140config IA64_HP_SIM
133 bool "Ski-simulator" 141 bool "Ski-simulator"
142 select SWIOTLB
134 143
135endchoice 144endchoice
136 145
@@ -429,6 +438,16 @@ config IA64_PALINFO
429 To use this option, you have to ensure that the "/proc file system 438 To use this option, you have to ensure that the "/proc file system
430 support" (CONFIG_PROC_FS) is enabled, too. 439 support" (CONFIG_PROC_FS) is enabled, too.
431 440
441config IA64_MC_ERR_INJECT
442 tristate "MC error injection support"
443 help
444 Selets whether support for MC error injection. By enabling the
445 support, kernel provide sysfs interface for user application to
446 call MC error injection PAL procedure to inject various errors.
447 This is a useful tool for MCA testing.
448
449 If you're unsure, do not select this option.
450
432config SGI_SN 451config SGI_SN
433 def_bool y if (IA64_SGI_SN2 || IA64_GENERIC) 452 def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)
434 453
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig
index 9d1cffb57cde..a1446931b401 100644
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@ -1,8 +1,9 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc5 3# Linux kernel version: 2.6.21-rc3
4# Mon Feb 27 15:49:18 2006 4# Thu Mar 8 11:07:09 2007
5# 5#
6CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
6 7
7# 8#
8# Code maturity level options 9# Code maturity level options
@@ -18,16 +19,24 @@ CONFIG_LOCALVERSION=""
18CONFIG_LOCALVERSION_AUTO=y 19CONFIG_LOCALVERSION_AUTO=y
19CONFIG_SWAP=y 20CONFIG_SWAP=y
20CONFIG_SYSVIPC=y 21CONFIG_SYSVIPC=y
22# CONFIG_IPC_NS is not set
23CONFIG_SYSVIPC_SYSCTL=y
21CONFIG_POSIX_MQUEUE=y 24CONFIG_POSIX_MQUEUE=y
22# CONFIG_BSD_PROCESS_ACCT is not set 25# CONFIG_BSD_PROCESS_ACCT is not set
23CONFIG_SYSCTL=y 26# CONFIG_TASKSTATS is not set
27# CONFIG_UTS_NS is not set
24# CONFIG_AUDIT is not set 28# CONFIG_AUDIT is not set
25CONFIG_IKCONFIG=y 29CONFIG_IKCONFIG=y
26CONFIG_IKCONFIG_PROC=y 30CONFIG_IKCONFIG_PROC=y
27# CONFIG_CPUSETS is not set 31# CONFIG_CPUSETS is not set
32CONFIG_SYSFS_DEPRECATED=y
33# CONFIG_RELAY is not set
34CONFIG_BLK_DEV_INITRD=y
28CONFIG_INITRAMFS_SOURCE="" 35CONFIG_INITRAMFS_SOURCE=""
29CONFIG_CC_OPTIMIZE_FOR_SIZE=y 36CONFIG_CC_OPTIMIZE_FOR_SIZE=y
37CONFIG_SYSCTL=y
30# CONFIG_EMBEDDED is not set 38# CONFIG_EMBEDDED is not set
39CONFIG_SYSCTL_SYSCALL=y
31CONFIG_KALLSYMS=y 40CONFIG_KALLSYMS=y
32CONFIG_KALLSYMS_ALL=y 41CONFIG_KALLSYMS_ALL=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set 42# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -39,11 +48,9 @@ CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y 48CONFIG_FUTEX=y
40CONFIG_EPOLL=y 49CONFIG_EPOLL=y
41CONFIG_SHMEM=y 50CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46CONFIG_SLAB=y 51CONFIG_SLAB=y
52CONFIG_VM_EVENT_COUNTERS=y
53CONFIG_RT_MUTEXES=y
47# CONFIG_TINY_SHMEM is not set 54# CONFIG_TINY_SHMEM is not set
48CONFIG_BASE_SMALL=0 55CONFIG_BASE_SMALL=0
49# CONFIG_SLOB is not set 56# CONFIG_SLOB is not set
@@ -54,7 +61,6 @@ CONFIG_BASE_SMALL=0
54CONFIG_MODULES=y 61CONFIG_MODULES=y
55CONFIG_MODULE_UNLOAD=y 62CONFIG_MODULE_UNLOAD=y
56# CONFIG_MODULE_FORCE_UNLOAD is not set 63# CONFIG_MODULE_FORCE_UNLOAD is not set
57CONFIG_OBSOLETE_MODPARM=y
58CONFIG_MODVERSIONS=y 64CONFIG_MODVERSIONS=y
59CONFIG_MODULE_SRCVERSION_ALL=y 65CONFIG_MODULE_SRCVERSION_ALL=y
60CONFIG_KMOD=y 66CONFIG_KMOD=y
@@ -63,6 +69,8 @@ CONFIG_STOP_MACHINE=y
63# 69#
64# Block layer 70# Block layer
65# 71#
72CONFIG_BLOCK=y
73# CONFIG_BLK_DEV_IO_TRACE is not set
66 74
67# 75#
68# IO Schedulers 76# IO Schedulers
@@ -82,15 +90,20 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
82# 90#
83CONFIG_IA64=y 91CONFIG_IA64=y
84CONFIG_64BIT=y 92CONFIG_64BIT=y
93CONFIG_ZONE_DMA=y
85CONFIG_MMU=y 94CONFIG_MMU=y
86CONFIG_SWIOTLB=y 95CONFIG_SWIOTLB=y
87CONFIG_RWSEM_XCHGADD_ALGORITHM=y 96CONFIG_RWSEM_XCHGADD_ALGORITHM=y
97# CONFIG_ARCH_HAS_ILOG2_U32 is not set
98# CONFIG_ARCH_HAS_ILOG2_U64 is not set
99CONFIG_GENERIC_FIND_NEXT_BIT=y
88CONFIG_GENERIC_CALIBRATE_DELAY=y 100CONFIG_GENERIC_CALIBRATE_DELAY=y
89CONFIG_TIME_INTERPOLATION=y 101CONFIG_TIME_INTERPOLATION=y
102CONFIG_DMI=y
90CONFIG_EFI=y 103CONFIG_EFI=y
91CONFIG_GENERIC_IOMAP=y 104CONFIG_GENERIC_IOMAP=y
92CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 105CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
93CONFIG_DMA_IS_DMA32=y 106CONFIG_AUDIT_ARCH=y
94# CONFIG_IA64_GENERIC is not set 107# CONFIG_IA64_GENERIC is not set
95CONFIG_IA64_DIG=y 108CONFIG_IA64_DIG=y
96# CONFIG_IA64_HP_ZX1 is not set 109# CONFIG_IA64_HP_ZX1 is not set
@@ -107,6 +120,7 @@ CONFIG_PGTABLE_3=y
107# CONFIG_PGTABLE_4 is not set 120# CONFIG_PGTABLE_4 is not set
108# CONFIG_HZ_100 is not set 121# CONFIG_HZ_100 is not set
109CONFIG_HZ_250=y 122CONFIG_HZ_250=y
123# CONFIG_HZ_300 is not set
110# CONFIG_HZ_1000 is not set 124# CONFIG_HZ_1000 is not set
111CONFIG_HZ=250 125CONFIG_HZ=250
112CONFIG_IA64_L1_CACHE_SHIFT=7 126CONFIG_IA64_L1_CACHE_SHIFT=7
@@ -116,9 +130,10 @@ CONFIG_FORCE_MAX_ZONEORDER=17
116CONFIG_SMP=y 130CONFIG_SMP=y
117CONFIG_NR_CPUS=16 131CONFIG_NR_CPUS=16
118CONFIG_HOTPLUG_CPU=y 132CONFIG_HOTPLUG_CPU=y
133CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
134# CONFIG_SCHED_SMT is not set
119CONFIG_PERMIT_BSP_REMOVE=y 135CONFIG_PERMIT_BSP_REMOVE=y
120CONFIG_FORCE_CPEI_RETARGET=y 136CONFIG_FORCE_CPEI_RETARGET=y
121# CONFIG_SCHED_SMT is not set
122# CONFIG_PREEMPT is not set 137# CONFIG_PREEMPT is not set
123CONFIG_SELECT_MEMORY_MODEL=y 138CONFIG_SELECT_MEMORY_MODEL=y
124CONFIG_FLATMEM_MANUAL=y 139CONFIG_FLATMEM_MANUAL=y
@@ -128,10 +143,13 @@ CONFIG_FLATMEM=y
128CONFIG_FLAT_NODE_MEM_MAP=y 143CONFIG_FLAT_NODE_MEM_MAP=y
129# CONFIG_SPARSEMEM_STATIC is not set 144# CONFIG_SPARSEMEM_STATIC is not set
130CONFIG_SPLIT_PTLOCK_CPUS=4 145CONFIG_SPLIT_PTLOCK_CPUS=4
146CONFIG_RESOURCES_64BIT=y
147CONFIG_ZONE_DMA_FLAG=1
131CONFIG_ARCH_SELECT_MEMORY_MODEL=y 148CONFIG_ARCH_SELECT_MEMORY_MODEL=y
132CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 149CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
133CONFIG_ARCH_FLATMEM_ENABLE=y 150CONFIG_ARCH_FLATMEM_ENABLE=y
134CONFIG_ARCH_SPARSEMEM_ENABLE=y 151CONFIG_ARCH_SPARSEMEM_ENABLE=y
152CONFIG_ARCH_POPULATES_NODE_MAP=y
135CONFIG_VIRTUAL_MEM_MAP=y 153CONFIG_VIRTUAL_MEM_MAP=y
136CONFIG_HOLES_IN_ZONE=y 154CONFIG_HOLES_IN_ZONE=y
137CONFIG_IA32_SUPPORT=y 155CONFIG_IA32_SUPPORT=y
@@ -139,6 +157,9 @@ CONFIG_COMPAT=y
139CONFIG_IA64_MCA_RECOVERY=y 157CONFIG_IA64_MCA_RECOVERY=y
140CONFIG_PERFMON=y 158CONFIG_PERFMON=y
141CONFIG_IA64_PALINFO=y 159CONFIG_IA64_PALINFO=y
160# CONFIG_IA64_ESI is not set
161CONFIG_KEXEC=y
162# CONFIG_CRASH_DUMP is not set
142 163
143# 164#
144# Firmware Drivers 165# Firmware Drivers
@@ -154,13 +175,16 @@ CONFIG_BINFMT_MISC=m
154CONFIG_PM=y 175CONFIG_PM=y
155CONFIG_PM_LEGACY=y 176CONFIG_PM_LEGACY=y
156# CONFIG_PM_DEBUG is not set 177# CONFIG_PM_DEBUG is not set
178# CONFIG_PM_SYSFS_DEPRECATED is not set
157 179
158# 180#
159# ACPI (Advanced Configuration and Power Interface) Support 181# ACPI (Advanced Configuration and Power Interface) Support
160# 182#
161CONFIG_ACPI=y 183CONFIG_ACPI=y
184CONFIG_ACPI_PROCFS=y
162CONFIG_ACPI_BUTTON=m 185CONFIG_ACPI_BUTTON=m
163CONFIG_ACPI_FAN=m 186CONFIG_ACPI_FAN=m
187# CONFIG_ACPI_DOCK is not set
164CONFIG_ACPI_PROCESSOR=m 188CONFIG_ACPI_PROCESSOR=m
165CONFIG_ACPI_HOTPLUG_CPU=y 189CONFIG_ACPI_HOTPLUG_CPU=y
166CONFIG_ACPI_THERMAL=m 190CONFIG_ACPI_THERMAL=m
@@ -181,8 +205,8 @@ CONFIG_ACPI_CONTAINER=m
181# 205#
182CONFIG_PCI=y 206CONFIG_PCI=y
183CONFIG_PCI_DOMAINS=y 207CONFIG_PCI_DOMAINS=y
208# CONFIG_PCIEPORTBUS is not set
184# CONFIG_PCI_MSI is not set 209# CONFIG_PCI_MSI is not set
185CONFIG_PCI_LEGACY_PROC=y
186# CONFIG_PCI_DEBUG is not set 210# CONFIG_PCI_DEBUG is not set
187 211
188# 212#
@@ -212,6 +236,10 @@ CONFIG_NET=y
212CONFIG_PACKET=y 236CONFIG_PACKET=y
213# CONFIG_PACKET_MMAP is not set 237# CONFIG_PACKET_MMAP is not set
214CONFIG_UNIX=y 238CONFIG_UNIX=y
239CONFIG_XFRM=y
240# CONFIG_XFRM_USER is not set
241# CONFIG_XFRM_SUB_POLICY is not set
242# CONFIG_XFRM_MIGRATE is not set
215# CONFIG_NET_KEY is not set 243# CONFIG_NET_KEY is not set
216CONFIG_INET=y 244CONFIG_INET=y
217CONFIG_IP_MULTICAST=y 245CONFIG_IP_MULTICAST=y
@@ -226,12 +254,21 @@ CONFIG_SYN_COOKIES=y
226# CONFIG_INET_AH is not set 254# CONFIG_INET_AH is not set
227# CONFIG_INET_ESP is not set 255# CONFIG_INET_ESP is not set
228# CONFIG_INET_IPCOMP is not set 256# CONFIG_INET_IPCOMP is not set
257# CONFIG_INET_XFRM_TUNNEL is not set
229# CONFIG_INET_TUNNEL is not set 258# CONFIG_INET_TUNNEL is not set
259CONFIG_INET_XFRM_MODE_TRANSPORT=y
260CONFIG_INET_XFRM_MODE_TUNNEL=y
261CONFIG_INET_XFRM_MODE_BEET=y
230CONFIG_INET_DIAG=y 262CONFIG_INET_DIAG=y
231CONFIG_INET_TCP_DIAG=y 263CONFIG_INET_TCP_DIAG=y
232# CONFIG_TCP_CONG_ADVANCED is not set 264# CONFIG_TCP_CONG_ADVANCED is not set
233CONFIG_TCP_CONG_BIC=y 265CONFIG_TCP_CONG_CUBIC=y
266CONFIG_DEFAULT_TCP_CONG="cubic"
267# CONFIG_TCP_MD5SIG is not set
234# CONFIG_IPV6 is not set 268# CONFIG_IPV6 is not set
269# CONFIG_INET6_XFRM_TUNNEL is not set
270# CONFIG_INET6_TUNNEL is not set
271# CONFIG_NETWORK_SECMARK is not set
235# CONFIG_NETFILTER is not set 272# CONFIG_NETFILTER is not set
236 273
237# 274#
@@ -257,7 +294,6 @@ CONFIG_TCP_CONG_BIC=y
257# CONFIG_ATALK is not set 294# CONFIG_ATALK is not set
258# CONFIG_X25 is not set 295# CONFIG_X25 is not set
259# CONFIG_LAPB is not set 296# CONFIG_LAPB is not set
260# CONFIG_NET_DIVERT is not set
261# CONFIG_ECONET is not set 297# CONFIG_ECONET is not set
262# CONFIG_WAN_ROUTER is not set 298# CONFIG_WAN_ROUTER is not set
263 299
@@ -286,6 +322,8 @@ CONFIG_STANDALONE=y
286CONFIG_PREVENT_FIRMWARE_BUILD=y 322CONFIG_PREVENT_FIRMWARE_BUILD=y
287CONFIG_FW_LOADER=m 323CONFIG_FW_LOADER=m
288# CONFIG_DEBUG_DRIVER is not set 324# CONFIG_DEBUG_DRIVER is not set
325# CONFIG_DEBUG_DEVRES is not set
326# CONFIG_SYS_HYPERVISOR is not set
289 327
290# 328#
291# Connector - unified userspace <-> kernelspace linker 329# Connector - unified userspace <-> kernelspace linker
@@ -329,11 +367,17 @@ CONFIG_BLK_DEV_NBD=m
329CONFIG_BLK_DEV_RAM=y 367CONFIG_BLK_DEV_RAM=y
330CONFIG_BLK_DEV_RAM_COUNT=16 368CONFIG_BLK_DEV_RAM_COUNT=16
331CONFIG_BLK_DEV_RAM_SIZE=4096 369CONFIG_BLK_DEV_RAM_SIZE=4096
332CONFIG_BLK_DEV_INITRD=y 370CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
333# CONFIG_CDROM_PKTCDVD is not set 371# CONFIG_CDROM_PKTCDVD is not set
334# CONFIG_ATA_OVER_ETH is not set 372# CONFIG_ATA_OVER_ETH is not set
335 373
336# 374#
375# Misc devices
376#
377# CONFIG_SGI_IOC4 is not set
378# CONFIG_TIFM_CORE is not set
379
380#
337# ATA/ATAPI/MFM/RLL support 381# ATA/ATAPI/MFM/RLL support
338# 382#
339CONFIG_IDE=y 383CONFIG_IDE=y
@@ -350,6 +394,7 @@ CONFIG_BLK_DEV_IDECD=y
350# CONFIG_BLK_DEV_IDETAPE is not set 394# CONFIG_BLK_DEV_IDETAPE is not set
351CONFIG_BLK_DEV_IDEFLOPPY=y 395CONFIG_BLK_DEV_IDEFLOPPY=y
352CONFIG_BLK_DEV_IDESCSI=m 396CONFIG_BLK_DEV_IDESCSI=m
397# CONFIG_BLK_DEV_IDEACPI is not set
353# CONFIG_IDE_TASK_IOCTL is not set 398# CONFIG_IDE_TASK_IOCTL is not set
354 399
355# 400#
@@ -376,8 +421,10 @@ CONFIG_BLK_DEV_CMD64X=y
376# CONFIG_BLK_DEV_CS5530 is not set 421# CONFIG_BLK_DEV_CS5530 is not set
377# CONFIG_BLK_DEV_HPT34X is not set 422# CONFIG_BLK_DEV_HPT34X is not set
378# CONFIG_BLK_DEV_HPT366 is not set 423# CONFIG_BLK_DEV_HPT366 is not set
424# CONFIG_BLK_DEV_JMICRON is not set
379# CONFIG_BLK_DEV_SC1200 is not set 425# CONFIG_BLK_DEV_SC1200 is not set
380CONFIG_BLK_DEV_PIIX=y 426CONFIG_BLK_DEV_PIIX=y
427# CONFIG_BLK_DEV_IT8213 is not set
381# CONFIG_BLK_DEV_IT821X is not set 428# CONFIG_BLK_DEV_IT821X is not set
382# CONFIG_BLK_DEV_NS87415 is not set 429# CONFIG_BLK_DEV_NS87415 is not set
383# CONFIG_BLK_DEV_PDC202XX_OLD is not set 430# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -387,6 +434,7 @@ CONFIG_BLK_DEV_PIIX=y
387# CONFIG_BLK_DEV_SLC90E66 is not set 434# CONFIG_BLK_DEV_SLC90E66 is not set
388# CONFIG_BLK_DEV_TRM290 is not set 435# CONFIG_BLK_DEV_TRM290 is not set
389# CONFIG_BLK_DEV_VIA82CXXX is not set 436# CONFIG_BLK_DEV_VIA82CXXX is not set
437# CONFIG_BLK_DEV_TC86C001 is not set
390# CONFIG_IDE_ARM is not set 438# CONFIG_IDE_ARM is not set
391CONFIG_BLK_DEV_IDEDMA=y 439CONFIG_BLK_DEV_IDEDMA=y
392# CONFIG_IDEDMA_IVB is not set 440# CONFIG_IDEDMA_IVB is not set
@@ -398,6 +446,8 @@ CONFIG_IDEDMA_AUTO=y
398# 446#
399# CONFIG_RAID_ATTRS is not set 447# CONFIG_RAID_ATTRS is not set
400CONFIG_SCSI=y 448CONFIG_SCSI=y
449# CONFIG_SCSI_TGT is not set
450CONFIG_SCSI_NETLINK=y
401CONFIG_SCSI_PROC_FS=y 451CONFIG_SCSI_PROC_FS=y
402 452
403# 453#
@@ -417,14 +467,16 @@ CONFIG_CHR_DEV_SG=m
417# CONFIG_SCSI_MULTI_LUN is not set 467# CONFIG_SCSI_MULTI_LUN is not set
418# CONFIG_SCSI_CONSTANTS is not set 468# CONFIG_SCSI_CONSTANTS is not set
419# CONFIG_SCSI_LOGGING is not set 469# CONFIG_SCSI_LOGGING is not set
470# CONFIG_SCSI_SCAN_ASYNC is not set
420 471
421# 472#
422# SCSI Transport Attributes 473# SCSI Transports
423# 474#
424CONFIG_SCSI_SPI_ATTRS=y 475CONFIG_SCSI_SPI_ATTRS=y
425CONFIG_SCSI_FC_ATTRS=y 476CONFIG_SCSI_FC_ATTRS=y
426# CONFIG_SCSI_ISCSI_ATTRS is not set 477# CONFIG_SCSI_ISCSI_ATTRS is not set
427# CONFIG_SCSI_SAS_ATTRS is not set 478# CONFIG_SCSI_SAS_ATTRS is not set
479# CONFIG_SCSI_SAS_LIBSAS is not set
428 480
429# 481#
430# SCSI low-level drivers 482# SCSI low-level drivers
@@ -437,29 +489,36 @@ CONFIG_SCSI_FC_ATTRS=y
437# CONFIG_SCSI_AIC7XXX is not set 489# CONFIG_SCSI_AIC7XXX is not set
438# CONFIG_SCSI_AIC7XXX_OLD is not set 490# CONFIG_SCSI_AIC7XXX_OLD is not set
439# CONFIG_SCSI_AIC79XX is not set 491# CONFIG_SCSI_AIC79XX is not set
492# CONFIG_SCSI_AIC94XX is not set
493# CONFIG_SCSI_ARCMSR is not set
440# CONFIG_MEGARAID_NEWGEN is not set 494# CONFIG_MEGARAID_NEWGEN is not set
441# CONFIG_MEGARAID_LEGACY is not set 495# CONFIG_MEGARAID_LEGACY is not set
442# CONFIG_MEGARAID_SAS is not set 496# CONFIG_MEGARAID_SAS is not set
443# CONFIG_SCSI_SATA is not set 497# CONFIG_SCSI_HPTIOP is not set
444# CONFIG_SCSI_DMX3191D is not set 498# CONFIG_SCSI_DMX3191D is not set
445# CONFIG_SCSI_FUTURE_DOMAIN is not set 499# CONFIG_SCSI_FUTURE_DOMAIN is not set
446# CONFIG_SCSI_IPS is not set 500# CONFIG_SCSI_IPS is not set
447# CONFIG_SCSI_INITIO is not set 501# CONFIG_SCSI_INITIO is not set
448# CONFIG_SCSI_INIA100 is not set 502# CONFIG_SCSI_INIA100 is not set
503# CONFIG_SCSI_STEX is not set
449CONFIG_SCSI_SYM53C8XX_2=y 504CONFIG_SCSI_SYM53C8XX_2=y
450CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 505CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
451CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 506CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
452CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 507CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
453# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 508CONFIG_SCSI_SYM53C8XX_MMIO=y
454# CONFIG_SCSI_IPR is not set
455CONFIG_SCSI_QLOGIC_FC=y
456# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
457CONFIG_SCSI_QLOGIC_1280=y 509CONFIG_SCSI_QLOGIC_1280=y
458# CONFIG_SCSI_QLA_FC is not set 510# CONFIG_SCSI_QLA_FC is not set
511# CONFIG_SCSI_QLA_ISCSI is not set
459# CONFIG_SCSI_LPFC is not set 512# CONFIG_SCSI_LPFC is not set
460# CONFIG_SCSI_DC395x is not set 513# CONFIG_SCSI_DC395x is not set
461# CONFIG_SCSI_DC390T is not set 514# CONFIG_SCSI_DC390T is not set
462# CONFIG_SCSI_DEBUG is not set 515# CONFIG_SCSI_DEBUG is not set
516# CONFIG_SCSI_SRP is not set
517
518#
519# Serial ATA (prod) and Parallel ATA (experimental) drivers
520#
521# CONFIG_ATA is not set
463 522
464# 523#
465# Multi-device support (RAID and LVM) 524# Multi-device support (RAID and LVM)
@@ -470,11 +529,11 @@ CONFIG_MD_LINEAR=m
470CONFIG_MD_RAID0=m 529CONFIG_MD_RAID0=m
471CONFIG_MD_RAID1=m 530CONFIG_MD_RAID1=m
472# CONFIG_MD_RAID10 is not set 531# CONFIG_MD_RAID10 is not set
473CONFIG_MD_RAID5=m 532# CONFIG_MD_RAID456 is not set
474CONFIG_MD_RAID6=m
475CONFIG_MD_MULTIPATH=m 533CONFIG_MD_MULTIPATH=m
476# CONFIG_MD_FAULTY is not set 534# CONFIG_MD_FAULTY is not set
477CONFIG_BLK_DEV_DM=m 535CONFIG_BLK_DEV_DM=m
536# CONFIG_DM_DEBUG is not set
478CONFIG_DM_CRYPT=m 537CONFIG_DM_CRYPT=m
479CONFIG_DM_SNAPSHOT=m 538CONFIG_DM_SNAPSHOT=m
480CONFIG_DM_MIRROR=m 539CONFIG_DM_MIRROR=m
@@ -563,6 +622,7 @@ CONFIG_E100=m
563# CONFIG_EPIC100 is not set 622# CONFIG_EPIC100 is not set
564# CONFIG_SUNDANCE is not set 623# CONFIG_SUNDANCE is not set
565# CONFIG_VIA_RHINE is not set 624# CONFIG_VIA_RHINE is not set
625# CONFIG_SC92031 is not set
566 626
567# 627#
568# Ethernet (1000 Mbit) 628# Ethernet (1000 Mbit)
@@ -583,13 +643,18 @@ CONFIG_E1000=y
583# CONFIG_VIA_VELOCITY is not set 643# CONFIG_VIA_VELOCITY is not set
584CONFIG_TIGON3=y 644CONFIG_TIGON3=y
585# CONFIG_BNX2 is not set 645# CONFIG_BNX2 is not set
646# CONFIG_QLA3XXX is not set
647# CONFIG_ATL1 is not set
586 648
587# 649#
588# Ethernet (10000 Mbit) 650# Ethernet (10000 Mbit)
589# 651#
590# CONFIG_CHELSIO_T1 is not set 652# CONFIG_CHELSIO_T1 is not set
653# CONFIG_CHELSIO_T3 is not set
591# CONFIG_IXGB is not set 654# CONFIG_IXGB is not set
592# CONFIG_S2IO is not set 655# CONFIG_S2IO is not set
656# CONFIG_MYRI10GE is not set
657# CONFIG_NETXEN_NIC is not set
593 658
594# 659#
595# Token Ring devices 660# Token Ring devices
@@ -631,6 +696,7 @@ CONFIG_NET_POLL_CONTROLLER=y
631# Input device support 696# Input device support
632# 697#
633CONFIG_INPUT=y 698CONFIG_INPUT=y
699# CONFIG_INPUT_FF_MEMLESS is not set
634 700
635# 701#
636# Userland interfaces 702# Userland interfaces
@@ -653,6 +719,7 @@ CONFIG_KEYBOARD_ATKBD=y
653# CONFIG_KEYBOARD_LKKBD is not set 719# CONFIG_KEYBOARD_LKKBD is not set
654# CONFIG_KEYBOARD_XTKBD is not set 720# CONFIG_KEYBOARD_XTKBD is not set
655# CONFIG_KEYBOARD_NEWTON is not set 721# CONFIG_KEYBOARD_NEWTON is not set
722# CONFIG_KEYBOARD_STOWAWAY is not set
656CONFIG_INPUT_MOUSE=y 723CONFIG_INPUT_MOUSE=y
657CONFIG_MOUSE_PS2=y 724CONFIG_MOUSE_PS2=y
658# CONFIG_MOUSE_SERIAL is not set 725# CONFIG_MOUSE_SERIAL is not set
@@ -682,6 +749,7 @@ CONFIG_GAMEPORT=m
682CONFIG_VT=y 749CONFIG_VT=y
683CONFIG_VT_CONSOLE=y 750CONFIG_VT_CONSOLE=y
684CONFIG_HW_CONSOLE=y 751CONFIG_HW_CONSOLE=y
752# CONFIG_VT_HW_CONSOLE_BINDING is not set
685CONFIG_SERIAL_NONSTANDARD=y 753CONFIG_SERIAL_NONSTANDARD=y
686# CONFIG_COMPUTONE is not set 754# CONFIG_COMPUTONE is not set
687# CONFIG_ROCKETPORT is not set 755# CONFIG_ROCKETPORT is not set
@@ -689,12 +757,14 @@ CONFIG_SERIAL_NONSTANDARD=y
689# CONFIG_DIGIEPCA is not set 757# CONFIG_DIGIEPCA is not set
690# CONFIG_MOXA_INTELLIO is not set 758# CONFIG_MOXA_INTELLIO is not set
691# CONFIG_MOXA_SMARTIO is not set 759# CONFIG_MOXA_SMARTIO is not set
760# CONFIG_MOXA_SMARTIO_NEW is not set
692# CONFIG_ISI is not set 761# CONFIG_ISI is not set
693# CONFIG_SYNCLINKMP is not set 762# CONFIG_SYNCLINKMP is not set
694# CONFIG_SYNCLINK_GT is not set 763# CONFIG_SYNCLINK_GT is not set
695# CONFIG_N_HDLC is not set 764# CONFIG_N_HDLC is not set
696# CONFIG_SPECIALIX is not set 765# CONFIG_SPECIALIX is not set
697# CONFIG_SX is not set 766# CONFIG_SX is not set
767# CONFIG_RIO is not set
698# CONFIG_STALDRV is not set 768# CONFIG_STALDRV is not set
699 769
700# 770#
@@ -702,7 +772,8 @@ CONFIG_SERIAL_NONSTANDARD=y
702# 772#
703CONFIG_SERIAL_8250=y 773CONFIG_SERIAL_8250=y
704CONFIG_SERIAL_8250_CONSOLE=y 774CONFIG_SERIAL_8250_CONSOLE=y
705CONFIG_SERIAL_8250_ACPI=y 775CONFIG_SERIAL_8250_PCI=y
776CONFIG_SERIAL_8250_PNP=y
706CONFIG_SERIAL_8250_NR_UARTS=6 777CONFIG_SERIAL_8250_NR_UARTS=6
707CONFIG_SERIAL_8250_RUNTIME_UARTS=4 778CONFIG_SERIAL_8250_RUNTIME_UARTS=4
708CONFIG_SERIAL_8250_EXTENDED=y 779CONFIG_SERIAL_8250_EXTENDED=y
@@ -734,10 +805,6 @@ CONFIG_EFI_RTC=y
734# CONFIG_DTLK is not set 805# CONFIG_DTLK is not set
735# CONFIG_R3964 is not set 806# CONFIG_R3964 is not set
736# CONFIG_APPLICOM is not set 807# CONFIG_APPLICOM is not set
737
738#
739# Ftape, the floppy tape device driver
740#
741CONFIG_AGP=m 808CONFIG_AGP=m
742CONFIG_AGP_I460=m 809CONFIG_AGP_I460=m
743CONFIG_DRM=m 810CONFIG_DRM=m
@@ -759,7 +826,6 @@ CONFIG_HPET_MMAP=y
759# TPM devices 826# TPM devices
760# 827#
761# CONFIG_TCG_TPM is not set 828# CONFIG_TCG_TPM is not set
762# CONFIG_TELCLOCK is not set
763 829
764# 830#
765# I2C support 831# I2C support
@@ -782,16 +848,16 @@ CONFIG_HPET_MMAP=y
782# 848#
783CONFIG_HWMON=y 849CONFIG_HWMON=y
784# CONFIG_HWMON_VID is not set 850# CONFIG_HWMON_VID is not set
851# CONFIG_SENSORS_ABITUGURU is not set
785# CONFIG_SENSORS_F71805F is not set 852# CONFIG_SENSORS_F71805F is not set
853# CONFIG_SENSORS_PC87427 is not set
854# CONFIG_SENSORS_VT1211 is not set
786# CONFIG_HWMON_DEBUG_CHIP is not set 855# CONFIG_HWMON_DEBUG_CHIP is not set
787 856
788# 857#
789# Misc devices 858# Multifunction device drivers
790#
791
792#
793# Multimedia Capabilities Port drivers
794# 859#
860# CONFIG_MFD_SM501 is not set
795 861
796# 862#
797# Multimedia devices 863# Multimedia devices
@@ -802,16 +868,19 @@ CONFIG_HWMON=y
802# Digital Video Broadcasting Devices 868# Digital Video Broadcasting Devices
803# 869#
804# CONFIG_DVB is not set 870# CONFIG_DVB is not set
871# CONFIG_USB_DABUSB is not set
805 872
806# 873#
807# Graphics support 874# Graphics support
808# 875#
876# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
809# CONFIG_FB is not set 877# CONFIG_FB is not set
810 878
811# 879#
812# Console display driver support 880# Console display driver support
813# 881#
814CONFIG_VGA_CONSOLE=y 882CONFIG_VGA_CONSOLE=y
883# CONFIG_VGACON_SOFT_SCROLLBACK is not set
815CONFIG_DUMMY_CONSOLE=y 884CONFIG_DUMMY_CONSOLE=y
816 885
817# 886#
@@ -820,10 +889,17 @@ CONFIG_DUMMY_CONSOLE=y
820# CONFIG_SOUND is not set 889# CONFIG_SOUND is not set
821 890
822# 891#
892# HID Devices
893#
894CONFIG_HID=y
895# CONFIG_HID_DEBUG is not set
896
897#
823# USB support 898# USB support
824# 899#
825CONFIG_USB_ARCH_HAS_HCD=y 900CONFIG_USB_ARCH_HAS_HCD=y
826CONFIG_USB_ARCH_HAS_OHCI=y 901CONFIG_USB_ARCH_HAS_OHCI=y
902CONFIG_USB_ARCH_HAS_EHCI=y
827CONFIG_USB=y 903CONFIG_USB=y
828# CONFIG_USB_DEBUG is not set 904# CONFIG_USB_DEBUG is not set
829 905
@@ -831,7 +907,6 @@ CONFIG_USB=y
831# Miscellaneous USB options 907# Miscellaneous USB options
832# 908#
833CONFIG_USB_DEVICEFS=y 909CONFIG_USB_DEVICEFS=y
834# CONFIG_USB_BANDWIDTH is not set
835# CONFIG_USB_DYNAMIC_MINORS is not set 910# CONFIG_USB_DYNAMIC_MINORS is not set
836# CONFIG_USB_SUSPEND is not set 911# CONFIG_USB_SUSPEND is not set
837# CONFIG_USB_OTG is not set 912# CONFIG_USB_OTG is not set
@@ -842,9 +917,12 @@ CONFIG_USB_DEVICEFS=y
842CONFIG_USB_EHCI_HCD=m 917CONFIG_USB_EHCI_HCD=m
843# CONFIG_USB_EHCI_SPLIT_ISO is not set 918# CONFIG_USB_EHCI_SPLIT_ISO is not set
844# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 919# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
920# CONFIG_USB_EHCI_TT_NEWSCHED is not set
921# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
845# CONFIG_USB_ISP116X_HCD is not set 922# CONFIG_USB_ISP116X_HCD is not set
846CONFIG_USB_OHCI_HCD=m 923CONFIG_USB_OHCI_HCD=m
847# CONFIG_USB_OHCI_BIG_ENDIAN is not set 924# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
925# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
848CONFIG_USB_OHCI_LITTLE_ENDIAN=y 926CONFIG_USB_OHCI_LITTLE_ENDIAN=y
849CONFIG_USB_UHCI_HCD=y 927CONFIG_USB_UHCI_HCD=y
850# CONFIG_USB_SL811_HCD is not set 928# CONFIG_USB_SL811_HCD is not set
@@ -873,13 +951,13 @@ CONFIG_USB_STORAGE=m
873# CONFIG_USB_STORAGE_SDDR55 is not set 951# CONFIG_USB_STORAGE_SDDR55 is not set
874# CONFIG_USB_STORAGE_JUMPSHOT is not set 952# CONFIG_USB_STORAGE_JUMPSHOT is not set
875# CONFIG_USB_STORAGE_ALAUDA is not set 953# CONFIG_USB_STORAGE_ALAUDA is not set
954# CONFIG_USB_STORAGE_KARMA is not set
876# CONFIG_USB_LIBUSUAL is not set 955# CONFIG_USB_LIBUSUAL is not set
877 956
878# 957#
879# USB Input Devices 958# USB Input Devices
880# 959#
881CONFIG_USB_HID=y 960CONFIG_USB_HID=y
882CONFIG_USB_HIDINPUT=y
883# CONFIG_USB_HIDINPUT_POWERBOOK is not set 961# CONFIG_USB_HIDINPUT_POWERBOOK is not set
884# CONFIG_HID_FF is not set 962# CONFIG_HID_FF is not set
885# CONFIG_USB_HIDDEV is not set 963# CONFIG_USB_HIDDEV is not set
@@ -888,15 +966,14 @@ CONFIG_USB_HIDINPUT=y
888# CONFIG_USB_ACECAD is not set 966# CONFIG_USB_ACECAD is not set
889# CONFIG_USB_KBTAB is not set 967# CONFIG_USB_KBTAB is not set
890# CONFIG_USB_POWERMATE is not set 968# CONFIG_USB_POWERMATE is not set
891# CONFIG_USB_MTOUCH is not set 969# CONFIG_USB_TOUCHSCREEN is not set
892# CONFIG_USB_ITMTOUCH is not set
893# CONFIG_USB_EGALAX is not set
894# CONFIG_USB_YEALINK is not set 970# CONFIG_USB_YEALINK is not set
895# CONFIG_USB_XPAD is not set 971# CONFIG_USB_XPAD is not set
896# CONFIG_USB_ATI_REMOTE is not set 972# CONFIG_USB_ATI_REMOTE is not set
897# CONFIG_USB_ATI_REMOTE2 is not set 973# CONFIG_USB_ATI_REMOTE2 is not set
898# CONFIG_USB_KEYSPAN_REMOTE is not set 974# CONFIG_USB_KEYSPAN_REMOTE is not set
899# CONFIG_USB_APPLETOUCH is not set 975# CONFIG_USB_APPLETOUCH is not set
976# CONFIG_USB_GTCO is not set
900 977
901# 978#
902# USB Imaging devices 979# USB Imaging devices
@@ -905,21 +982,13 @@ CONFIG_USB_HIDINPUT=y
905# CONFIG_USB_MICROTEK is not set 982# CONFIG_USB_MICROTEK is not set
906 983
907# 984#
908# USB Multimedia devices
909#
910# CONFIG_USB_DABUSB is not set
911
912#
913# Video4Linux support is needed for USB Multimedia device support
914#
915
916#
917# USB Network Adapters 985# USB Network Adapters
918# 986#
919# CONFIG_USB_CATC is not set 987# CONFIG_USB_CATC is not set
920# CONFIG_USB_KAWETH is not set 988# CONFIG_USB_KAWETH is not set
921# CONFIG_USB_PEGASUS is not set 989# CONFIG_USB_PEGASUS is not set
922# CONFIG_USB_RTL8150 is not set 990# CONFIG_USB_RTL8150 is not set
991# CONFIG_USB_USBNET_MII is not set
923# CONFIG_USB_USBNET is not set 992# CONFIG_USB_USBNET is not set
924# CONFIG_USB_MON is not set 993# CONFIG_USB_MON is not set
925 994
@@ -937,17 +1006,23 @@ CONFIG_USB_HIDINPUT=y
937# 1006#
938# CONFIG_USB_EMI62 is not set 1007# CONFIG_USB_EMI62 is not set
939# CONFIG_USB_EMI26 is not set 1008# CONFIG_USB_EMI26 is not set
1009# CONFIG_USB_ADUTUX is not set
940# CONFIG_USB_AUERSWALD is not set 1010# CONFIG_USB_AUERSWALD is not set
941# CONFIG_USB_RIO500 is not set 1011# CONFIG_USB_RIO500 is not set
942# CONFIG_USB_LEGOTOWER is not set 1012# CONFIG_USB_LEGOTOWER is not set
943# CONFIG_USB_LCD is not set 1013# CONFIG_USB_LCD is not set
1014# CONFIG_USB_BERRY_CHARGE is not set
944# CONFIG_USB_LED is not set 1015# CONFIG_USB_LED is not set
1016# CONFIG_USB_CYPRESS_CY7C63 is not set
945# CONFIG_USB_CYTHERM is not set 1017# CONFIG_USB_CYTHERM is not set
946# CONFIG_USB_PHIDGETKIT is not set 1018# CONFIG_USB_PHIDGET is not set
947# CONFIG_USB_PHIDGETSERVO is not set
948# CONFIG_USB_IDMOUSE is not set 1019# CONFIG_USB_IDMOUSE is not set
1020# CONFIG_USB_FTDI_ELAN is not set
1021# CONFIG_USB_APPLEDISPLAY is not set
949# CONFIG_USB_SISUSBVGA is not set 1022# CONFIG_USB_SISUSBVGA is not set
950# CONFIG_USB_LD is not set 1023# CONFIG_USB_LD is not set
1024# CONFIG_USB_TRANCEVIBRATOR is not set
1025# CONFIG_USB_IOWARRIOR is not set
951# CONFIG_USB_TEST is not set 1026# CONFIG_USB_TEST is not set
952 1027
953# 1028#
@@ -965,15 +1040,55 @@ CONFIG_USB_HIDINPUT=y
965# CONFIG_MMC is not set 1040# CONFIG_MMC is not set
966 1041
967# 1042#
1043# LED devices
1044#
1045# CONFIG_NEW_LEDS is not set
1046
1047#
1048# LED drivers
1049#
1050
1051#
1052# LED Triggers
1053#
1054
1055#
968# InfiniBand support 1056# InfiniBand support
969# 1057#
970# CONFIG_INFINIBAND is not set 1058# CONFIG_INFINIBAND is not set
971 1059
972# 1060#
973# EDAC - error detection and reporting (RAS) 1061# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1062#
1063
1064#
1065# Real Time Clock
1066#
1067# CONFIG_RTC_CLASS is not set
1068
1069#
1070# DMA Engine support
1071#
1072# CONFIG_DMA_ENGINE is not set
1073
1074#
1075# DMA Clients
974# 1076#
975 1077
976# 1078#
1079# DMA Devices
1080#
1081
1082#
1083# Auxiliary Display support
1084#
1085
1086#
1087# Virtualization
1088#
1089# CONFIG_MSPEC is not set
1090
1091#
977# File systems 1092# File systems
978# 1093#
979CONFIG_EXT2_FS=y 1094CONFIG_EXT2_FS=y
@@ -985,6 +1100,7 @@ CONFIG_EXT3_FS=y
985CONFIG_EXT3_FS_XATTR=y 1100CONFIG_EXT3_FS_XATTR=y
986CONFIG_EXT3_FS_POSIX_ACL=y 1101CONFIG_EXT3_FS_POSIX_ACL=y
987CONFIG_EXT3_FS_SECURITY=y 1102CONFIG_EXT3_FS_SECURITY=y
1103# CONFIG_EXT4DEV_FS is not set
988CONFIG_JBD=y 1104CONFIG_JBD=y
989# CONFIG_JBD_DEBUG is not set 1105# CONFIG_JBD_DEBUG is not set
990CONFIG_FS_MBCACHE=y 1106CONFIG_FS_MBCACHE=y
@@ -997,15 +1113,16 @@ CONFIG_REISERFS_FS_SECURITY=y
997# CONFIG_JFS_FS is not set 1113# CONFIG_JFS_FS is not set
998CONFIG_FS_POSIX_ACL=y 1114CONFIG_FS_POSIX_ACL=y
999CONFIG_XFS_FS=y 1115CONFIG_XFS_FS=y
1000CONFIG_XFS_EXPORT=y
1001# CONFIG_XFS_QUOTA is not set 1116# CONFIG_XFS_QUOTA is not set
1002# CONFIG_XFS_SECURITY is not set 1117# CONFIG_XFS_SECURITY is not set
1003# CONFIG_XFS_POSIX_ACL is not set 1118# CONFIG_XFS_POSIX_ACL is not set
1004# CONFIG_XFS_RT is not set 1119# CONFIG_XFS_RT is not set
1120# CONFIG_GFS2_FS is not set
1005# CONFIG_OCFS2_FS is not set 1121# CONFIG_OCFS2_FS is not set
1006# CONFIG_MINIX_FS is not set 1122# CONFIG_MINIX_FS is not set
1007# CONFIG_ROMFS_FS is not set 1123# CONFIG_ROMFS_FS is not set
1008CONFIG_INOTIFY=y 1124CONFIG_INOTIFY=y
1125CONFIG_INOTIFY_USER=y
1009# CONFIG_QUOTA is not set 1126# CONFIG_QUOTA is not set
1010CONFIG_DNOTIFY=y 1127CONFIG_DNOTIFY=y
1011CONFIG_AUTOFS_FS=y 1128CONFIG_AUTOFS_FS=y
@@ -1038,12 +1155,13 @@ CONFIG_NTFS_FS=m
1038# 1155#
1039CONFIG_PROC_FS=y 1156CONFIG_PROC_FS=y
1040CONFIG_PROC_KCORE=y 1157CONFIG_PROC_KCORE=y
1158CONFIG_PROC_SYSCTL=y
1041CONFIG_SYSFS=y 1159CONFIG_SYSFS=y
1042CONFIG_TMPFS=y 1160CONFIG_TMPFS=y
1161# CONFIG_TMPFS_POSIX_ACL is not set
1043CONFIG_HUGETLBFS=y 1162CONFIG_HUGETLBFS=y
1044CONFIG_HUGETLB_PAGE=y 1163CONFIG_HUGETLB_PAGE=y
1045CONFIG_RAMFS=y 1164CONFIG_RAMFS=y
1046# CONFIG_RELAYFS_FS is not set
1047# CONFIG_CONFIGFS_FS is not set 1165# CONFIG_CONFIGFS_FS is not set
1048 1166
1049# 1167#
@@ -1078,7 +1196,7 @@ CONFIG_NFSD_V4=y
1078CONFIG_NFSD_TCP=y 1196CONFIG_NFSD_TCP=y
1079CONFIG_LOCKD=m 1197CONFIG_LOCKD=m
1080CONFIG_LOCKD_V4=y 1198CONFIG_LOCKD_V4=y
1081CONFIG_EXPORTFS=y 1199CONFIG_EXPORTFS=m
1082CONFIG_NFS_COMMON=y 1200CONFIG_NFS_COMMON=y
1083CONFIG_SUNRPC=m 1201CONFIG_SUNRPC=m
1084CONFIG_SUNRPC_GSS=m 1202CONFIG_SUNRPC_GSS=m
@@ -1089,7 +1207,9 @@ CONFIG_SMB_NLS_DEFAULT=y
1089CONFIG_SMB_NLS_REMOTE="cp437" 1207CONFIG_SMB_NLS_REMOTE="cp437"
1090CONFIG_CIFS=m 1208CONFIG_CIFS=m
1091# CONFIG_CIFS_STATS is not set 1209# CONFIG_CIFS_STATS is not set
1210# CONFIG_CIFS_WEAK_PW_HASH is not set
1092# CONFIG_CIFS_XATTR is not set 1211# CONFIG_CIFS_XATTR is not set
1212# CONFIG_CIFS_DEBUG2 is not set
1093# CONFIG_CIFS_EXPERIMENTAL is not set 1213# CONFIG_CIFS_EXPERIMENTAL is not set
1094# CONFIG_NCP_FS is not set 1214# CONFIG_NCP_FS is not set
1095# CONFIG_CODA_FS is not set 1215# CONFIG_CODA_FS is not set
@@ -1162,15 +1282,25 @@ CONFIG_NLS_KOI8_U=m
1162CONFIG_NLS_UTF8=m 1282CONFIG_NLS_UTF8=m
1163 1283
1164# 1284#
1285# Distributed Lock Manager
1286#
1287# CONFIG_DLM is not set
1288
1289#
1165# Library routines 1290# Library routines
1166# 1291#
1292CONFIG_BITREVERSE=y
1167# CONFIG_CRC_CCITT is not set 1293# CONFIG_CRC_CCITT is not set
1168# CONFIG_CRC16 is not set 1294# CONFIG_CRC16 is not set
1169CONFIG_CRC32=y 1295CONFIG_CRC32=y
1170# CONFIG_LIBCRC32C is not set 1296# CONFIG_LIBCRC32C is not set
1297CONFIG_PLIST=y
1298CONFIG_HAS_IOMEM=y
1299CONFIG_HAS_IOPORT=y
1171CONFIG_GENERIC_HARDIRQS=y 1300CONFIG_GENERIC_HARDIRQS=y
1172CONFIG_GENERIC_IRQ_PROBE=y 1301CONFIG_GENERIC_IRQ_PROBE=y
1173CONFIG_GENERIC_PENDING_IRQ=y 1302CONFIG_GENERIC_PENDING_IRQ=y
1303CONFIG_IRQ_PER_CPU=y
1174 1304
1175# 1305#
1176# Instrumentation Support 1306# Instrumentation Support
@@ -1182,21 +1312,31 @@ CONFIG_GENERIC_PENDING_IRQ=y
1182# Kernel hacking 1312# Kernel hacking
1183# 1313#
1184# CONFIG_PRINTK_TIME is not set 1314# CONFIG_PRINTK_TIME is not set
1315CONFIG_ENABLE_MUST_CHECK=y
1185CONFIG_MAGIC_SYSRQ=y 1316CONFIG_MAGIC_SYSRQ=y
1317# CONFIG_UNUSED_SYMBOLS is not set
1318# CONFIG_DEBUG_FS is not set
1319# CONFIG_HEADERS_CHECK is not set
1186CONFIG_DEBUG_KERNEL=y 1320CONFIG_DEBUG_KERNEL=y
1321# CONFIG_DEBUG_SHIRQ is not set
1187CONFIG_LOG_BUF_SHIFT=20 1322CONFIG_LOG_BUF_SHIFT=20
1188CONFIG_DETECT_SOFTLOCKUP=y 1323CONFIG_DETECT_SOFTLOCKUP=y
1189# CONFIG_SCHEDSTATS is not set 1324# CONFIG_SCHEDSTATS is not set
1325# CONFIG_TIMER_STATS is not set
1190# CONFIG_DEBUG_SLAB is not set 1326# CONFIG_DEBUG_SLAB is not set
1191CONFIG_DEBUG_MUTEXES=y 1327# CONFIG_DEBUG_RT_MUTEXES is not set
1328# CONFIG_RT_MUTEX_TESTER is not set
1192# CONFIG_DEBUG_SPINLOCK is not set 1329# CONFIG_DEBUG_SPINLOCK is not set
1330CONFIG_DEBUG_MUTEXES=y
1193# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1331# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1332# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1194# CONFIG_DEBUG_KOBJECT is not set 1333# CONFIG_DEBUG_KOBJECT is not set
1195# CONFIG_DEBUG_INFO is not set 1334# CONFIG_DEBUG_INFO is not set
1196# CONFIG_DEBUG_FS is not set
1197# CONFIG_DEBUG_VM is not set 1335# CONFIG_DEBUG_VM is not set
1336# CONFIG_DEBUG_LIST is not set
1198CONFIG_FORCED_INLINING=y 1337CONFIG_FORCED_INLINING=y
1199# CONFIG_RCU_TORTURE_TEST is not set 1338# CONFIG_RCU_TORTURE_TEST is not set
1339# CONFIG_FAULT_INJECTION is not set
1200CONFIG_IA64_GRANULE_16MB=y 1340CONFIG_IA64_GRANULE_16MB=y
1201# CONFIG_IA64_GRANULE_64MB is not set 1341# CONFIG_IA64_GRANULE_64MB is not set
1202# CONFIG_IA64_PRINT_HAZARDS is not set 1342# CONFIG_IA64_PRINT_HAZARDS is not set
@@ -1215,7 +1355,11 @@ CONFIG_SYSVIPC_COMPAT=y
1215# Cryptographic options 1355# Cryptographic options
1216# 1356#
1217CONFIG_CRYPTO=y 1357CONFIG_CRYPTO=y
1358CONFIG_CRYPTO_ALGAPI=y
1359CONFIG_CRYPTO_BLKCIPHER=m
1360CONFIG_CRYPTO_MANAGER=m
1218# CONFIG_CRYPTO_HMAC is not set 1361# CONFIG_CRYPTO_HMAC is not set
1362# CONFIG_CRYPTO_XCBC is not set
1219# CONFIG_CRYPTO_NULL is not set 1363# CONFIG_CRYPTO_NULL is not set
1220# CONFIG_CRYPTO_MD4 is not set 1364# CONFIG_CRYPTO_MD4 is not set
1221CONFIG_CRYPTO_MD5=y 1365CONFIG_CRYPTO_MD5=y
@@ -1224,7 +1368,13 @@ CONFIG_CRYPTO_MD5=y
1224# CONFIG_CRYPTO_SHA512 is not set 1368# CONFIG_CRYPTO_SHA512 is not set
1225# CONFIG_CRYPTO_WP512 is not set 1369# CONFIG_CRYPTO_WP512 is not set
1226# CONFIG_CRYPTO_TGR192 is not set 1370# CONFIG_CRYPTO_TGR192 is not set
1371# CONFIG_CRYPTO_GF128MUL is not set
1372CONFIG_CRYPTO_ECB=m
1373CONFIG_CRYPTO_CBC=m
1374CONFIG_CRYPTO_PCBC=m
1375# CONFIG_CRYPTO_LRW is not set
1227CONFIG_CRYPTO_DES=m 1376CONFIG_CRYPTO_DES=m
1377# CONFIG_CRYPTO_FCRYPT is not set
1228# CONFIG_CRYPTO_BLOWFISH is not set 1378# CONFIG_CRYPTO_BLOWFISH is not set
1229# CONFIG_CRYPTO_TWOFISH is not set 1379# CONFIG_CRYPTO_TWOFISH is not set
1230# CONFIG_CRYPTO_SERPENT is not set 1380# CONFIG_CRYPTO_SERPENT is not set
@@ -1238,6 +1388,7 @@ CONFIG_CRYPTO_DES=m
1238# CONFIG_CRYPTO_DEFLATE is not set 1388# CONFIG_CRYPTO_DEFLATE is not set
1239# CONFIG_CRYPTO_MICHAEL_MIC is not set 1389# CONFIG_CRYPTO_MICHAEL_MIC is not set
1240# CONFIG_CRYPTO_CRC32C is not set 1390# CONFIG_CRYPTO_CRC32C is not set
1391# CONFIG_CRYPTO_CAMELLIA is not set
1241# CONFIG_CRYPTO_TEST is not set 1392# CONFIG_CRYPTO_TEST is not set
1242 1393
1243# 1394#
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig
index 949dc4670a0c..1c7955c16358 100644
--- a/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
@@ -1,8 +1,9 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc5 3# Linux kernel version: 2.6.21-rc3
4# Mon Feb 27 15:55:36 2006 4# Thu Mar 8 11:04:20 2007
5# 5#
6CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
6 7
7# 8#
8# Code maturity level options 9# Code maturity level options
@@ -18,16 +19,24 @@ CONFIG_LOCALVERSION=""
18CONFIG_LOCALVERSION_AUTO=y 19CONFIG_LOCALVERSION_AUTO=y
19CONFIG_SWAP=y 20CONFIG_SWAP=y
20CONFIG_SYSVIPC=y 21CONFIG_SYSVIPC=y
22# CONFIG_IPC_NS is not set
23CONFIG_SYSVIPC_SYSCTL=y
21# CONFIG_POSIX_MQUEUE is not set 24# CONFIG_POSIX_MQUEUE is not set
22CONFIG_BSD_PROCESS_ACCT=y 25CONFIG_BSD_PROCESS_ACCT=y
23# CONFIG_BSD_PROCESS_ACCT_V3 is not set 26# CONFIG_BSD_PROCESS_ACCT_V3 is not set
24CONFIG_SYSCTL=y 27# CONFIG_TASKSTATS is not set
28# CONFIG_UTS_NS is not set
25# CONFIG_AUDIT is not set 29# CONFIG_AUDIT is not set
26# CONFIG_IKCONFIG is not set 30# CONFIG_IKCONFIG is not set
27# CONFIG_CPUSETS is not set 31# CONFIG_CPUSETS is not set
32CONFIG_SYSFS_DEPRECATED=y
33# CONFIG_RELAY is not set
34CONFIG_BLK_DEV_INITRD=y
28CONFIG_INITRAMFS_SOURCE="" 35CONFIG_INITRAMFS_SOURCE=""
29CONFIG_CC_OPTIMIZE_FOR_SIZE=y 36CONFIG_CC_OPTIMIZE_FOR_SIZE=y
37CONFIG_SYSCTL=y
30# CONFIG_EMBEDDED is not set 38# CONFIG_EMBEDDED is not set
39CONFIG_SYSCTL_SYSCALL=y
31CONFIG_KALLSYMS=y 40CONFIG_KALLSYMS=y
32# CONFIG_KALLSYMS_ALL is not set 41# CONFIG_KALLSYMS_ALL is not set
33# CONFIG_KALLSYMS_EXTRA_PASS is not set 42# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -39,11 +48,9 @@ CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y 48CONFIG_FUTEX=y
40CONFIG_EPOLL=y 49CONFIG_EPOLL=y
41CONFIG_SHMEM=y 50CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46CONFIG_SLAB=y 51CONFIG_SLAB=y
52CONFIG_VM_EVENT_COUNTERS=y
53CONFIG_RT_MUTEXES=y
47# CONFIG_TINY_SHMEM is not set 54# CONFIG_TINY_SHMEM is not set
48CONFIG_BASE_SMALL=0 55CONFIG_BASE_SMALL=0
49# CONFIG_SLOB is not set 56# CONFIG_SLOB is not set
@@ -53,14 +60,16 @@ CONFIG_BASE_SMALL=0
53# 60#
54CONFIG_MODULES=y 61CONFIG_MODULES=y
55# CONFIG_MODULE_UNLOAD is not set 62# CONFIG_MODULE_UNLOAD is not set
56CONFIG_OBSOLETE_MODPARM=y
57# CONFIG_MODVERSIONS is not set 63# CONFIG_MODVERSIONS is not set
58# CONFIG_MODULE_SRCVERSION_ALL is not set 64# CONFIG_MODULE_SRCVERSION_ALL is not set
59# CONFIG_KMOD is not set 65# CONFIG_KMOD is not set
66CONFIG_STOP_MACHINE=y
60 67
61# 68#
62# Block layer 69# Block layer
63# 70#
71CONFIG_BLOCK=y
72# CONFIG_BLK_DEV_IO_TRACE is not set
64 73
65# 74#
66# IO Schedulers 75# IO Schedulers
@@ -80,15 +89,19 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
80# 89#
81CONFIG_IA64=y 90CONFIG_IA64=y
82CONFIG_64BIT=y 91CONFIG_64BIT=y
92CONFIG_ZONE_DMA=y
83CONFIG_MMU=y 93CONFIG_MMU=y
84CONFIG_SWIOTLB=y
85CONFIG_RWSEM_XCHGADD_ALGORITHM=y 94CONFIG_RWSEM_XCHGADD_ALGORITHM=y
95# CONFIG_ARCH_HAS_ILOG2_U32 is not set
96# CONFIG_ARCH_HAS_ILOG2_U64 is not set
97CONFIG_GENERIC_FIND_NEXT_BIT=y
86CONFIG_GENERIC_CALIBRATE_DELAY=y 98CONFIG_GENERIC_CALIBRATE_DELAY=y
87CONFIG_TIME_INTERPOLATION=y 99CONFIG_TIME_INTERPOLATION=y
100CONFIG_DMI=y
88CONFIG_EFI=y 101CONFIG_EFI=y
89CONFIG_GENERIC_IOMAP=y 102CONFIG_GENERIC_IOMAP=y
90CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 103CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
91CONFIG_DMA_IS_DMA32=y 104CONFIG_AUDIT_ARCH=y
92# CONFIG_IA64_GENERIC is not set 105# CONFIG_IA64_GENERIC is not set
93# CONFIG_IA64_DIG is not set 106# CONFIG_IA64_DIG is not set
94CONFIG_IA64_HP_ZX1=y 107CONFIG_IA64_HP_ZX1=y
@@ -105,6 +118,7 @@ CONFIG_PGTABLE_3=y
105# CONFIG_PGTABLE_4 is not set 118# CONFIG_PGTABLE_4 is not set
106# CONFIG_HZ_100 is not set 119# CONFIG_HZ_100 is not set
107CONFIG_HZ_250=y 120CONFIG_HZ_250=y
121# CONFIG_HZ_300 is not set
108# CONFIG_HZ_1000 is not set 122# CONFIG_HZ_1000 is not set
109CONFIG_HZ=250 123CONFIG_HZ=250
110CONFIG_IA64_L1_CACHE_SHIFT=7 124CONFIG_IA64_L1_CACHE_SHIFT=7
@@ -113,8 +127,10 @@ CONFIG_IOSAPIC=y
113CONFIG_FORCE_MAX_ZONEORDER=17 127CONFIG_FORCE_MAX_ZONEORDER=17
114CONFIG_SMP=y 128CONFIG_SMP=y
115CONFIG_NR_CPUS=16 129CONFIG_NR_CPUS=16
116# CONFIG_HOTPLUG_CPU is not set 130CONFIG_HOTPLUG_CPU=y
131CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
117# CONFIG_SCHED_SMT is not set 132# CONFIG_SCHED_SMT is not set
133# CONFIG_PERMIT_BSP_REMOVE is not set
118# CONFIG_PREEMPT is not set 134# CONFIG_PREEMPT is not set
119CONFIG_SELECT_MEMORY_MODEL=y 135CONFIG_SELECT_MEMORY_MODEL=y
120CONFIG_FLATMEM_MANUAL=y 136CONFIG_FLATMEM_MANUAL=y
@@ -124,11 +140,14 @@ CONFIG_FLATMEM=y
124CONFIG_FLAT_NODE_MEM_MAP=y 140CONFIG_FLAT_NODE_MEM_MAP=y
125# CONFIG_SPARSEMEM_STATIC is not set 141# CONFIG_SPARSEMEM_STATIC is not set
126CONFIG_SPLIT_PTLOCK_CPUS=4 142CONFIG_SPLIT_PTLOCK_CPUS=4
143CONFIG_RESOURCES_64BIT=y
144CONFIG_ZONE_DMA_FLAG=1
127CONFIG_ARCH_SELECT_MEMORY_MODEL=y 145CONFIG_ARCH_SELECT_MEMORY_MODEL=y
128CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 146CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
129CONFIG_ARCH_FLATMEM_ENABLE=y 147CONFIG_ARCH_FLATMEM_ENABLE=y
130CONFIG_ARCH_SPARSEMEM_ENABLE=y 148CONFIG_ARCH_SPARSEMEM_ENABLE=y
131CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y 149CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
150CONFIG_ARCH_POPULATES_NODE_MAP=y
132CONFIG_VIRTUAL_MEM_MAP=y 151CONFIG_VIRTUAL_MEM_MAP=y
133CONFIG_HOLES_IN_ZONE=y 152CONFIG_HOLES_IN_ZONE=y
134CONFIG_IA32_SUPPORT=y 153CONFIG_IA32_SUPPORT=y
@@ -136,6 +155,9 @@ CONFIG_COMPAT=y
136CONFIG_IA64_MCA_RECOVERY=y 155CONFIG_IA64_MCA_RECOVERY=y
137CONFIG_PERFMON=y 156CONFIG_PERFMON=y
138CONFIG_IA64_PALINFO=y 157CONFIG_IA64_PALINFO=y
158# CONFIG_IA64_ESI is not set
159# CONFIG_KEXEC is not set
160CONFIG_CRASH_DUMP=y
139 161
140# 162#
141# Firmware Drivers 163# Firmware Drivers
@@ -151,21 +173,25 @@ CONFIG_BINFMT_MISC=y
151CONFIG_PM=y 173CONFIG_PM=y
152CONFIG_PM_LEGACY=y 174CONFIG_PM_LEGACY=y
153# CONFIG_PM_DEBUG is not set 175# CONFIG_PM_DEBUG is not set
176# CONFIG_PM_SYSFS_DEPRECATED is not set
154 177
155# 178#
156# ACPI (Advanced Configuration and Power Interface) Support 179# ACPI (Advanced Configuration and Power Interface) Support
157# 180#
158CONFIG_ACPI=y 181CONFIG_ACPI=y
182CONFIG_ACPI_PROCFS=y
159CONFIG_ACPI_BUTTON=y 183CONFIG_ACPI_BUTTON=y
160CONFIG_ACPI_FAN=y 184CONFIG_ACPI_FAN=y
185# CONFIG_ACPI_DOCK is not set
161CONFIG_ACPI_PROCESSOR=y 186CONFIG_ACPI_PROCESSOR=y
187CONFIG_ACPI_HOTPLUG_CPU=y
162CONFIG_ACPI_THERMAL=y 188CONFIG_ACPI_THERMAL=y
163CONFIG_ACPI_BLACKLIST_YEAR=0 189CONFIG_ACPI_BLACKLIST_YEAR=0
164# CONFIG_ACPI_DEBUG is not set 190# CONFIG_ACPI_DEBUG is not set
165CONFIG_ACPI_EC=y 191CONFIG_ACPI_EC=y
166CONFIG_ACPI_POWER=y 192CONFIG_ACPI_POWER=y
167CONFIG_ACPI_SYSTEM=y 193CONFIG_ACPI_SYSTEM=y
168# CONFIG_ACPI_CONTAINER is not set 194CONFIG_ACPI_CONTAINER=y
169 195
170# 196#
171# CPU Frequency scaling 197# CPU Frequency scaling
@@ -177,8 +203,8 @@ CONFIG_ACPI_SYSTEM=y
177# 203#
178CONFIG_PCI=y 204CONFIG_PCI=y
179CONFIG_PCI_DOMAINS=y 205CONFIG_PCI_DOMAINS=y
206# CONFIG_PCIEPORTBUS is not set
180# CONFIG_PCI_MSI is not set 207# CONFIG_PCI_MSI is not set
181CONFIG_PCI_LEGACY_PROC=y
182# CONFIG_PCI_DEBUG is not set 208# CONFIG_PCI_DEBUG is not set
183 209
184# 210#
@@ -208,6 +234,10 @@ CONFIG_NET=y
208CONFIG_PACKET=y 234CONFIG_PACKET=y
209# CONFIG_PACKET_MMAP is not set 235# CONFIG_PACKET_MMAP is not set
210CONFIG_UNIX=y 236CONFIG_UNIX=y
237CONFIG_XFRM=y
238# CONFIG_XFRM_USER is not set
239# CONFIG_XFRM_SUB_POLICY is not set
240# CONFIG_XFRM_MIGRATE is not set
211# CONFIG_NET_KEY is not set 241# CONFIG_NET_KEY is not set
212CONFIG_INET=y 242CONFIG_INET=y
213CONFIG_IP_MULTICAST=y 243CONFIG_IP_MULTICAST=y
@@ -222,17 +252,26 @@ CONFIG_IP_FIB_HASH=y
222# CONFIG_INET_AH is not set 252# CONFIG_INET_AH is not set
223# CONFIG_INET_ESP is not set 253# CONFIG_INET_ESP is not set
224# CONFIG_INET_IPCOMP is not set 254# CONFIG_INET_IPCOMP is not set
255# CONFIG_INET_XFRM_TUNNEL is not set
225# CONFIG_INET_TUNNEL is not set 256# CONFIG_INET_TUNNEL is not set
257CONFIG_INET_XFRM_MODE_TRANSPORT=y
258CONFIG_INET_XFRM_MODE_TUNNEL=y
259CONFIG_INET_XFRM_MODE_BEET=y
226CONFIG_INET_DIAG=y 260CONFIG_INET_DIAG=y
227CONFIG_INET_TCP_DIAG=y 261CONFIG_INET_TCP_DIAG=y
228# CONFIG_TCP_CONG_ADVANCED is not set 262# CONFIG_TCP_CONG_ADVANCED is not set
229CONFIG_TCP_CONG_BIC=y 263CONFIG_TCP_CONG_CUBIC=y
264CONFIG_DEFAULT_TCP_CONG="cubic"
265# CONFIG_TCP_MD5SIG is not set
230 266
231# 267#
232# IP: Virtual Server Configuration 268# IP: Virtual Server Configuration
233# 269#
234# CONFIG_IP_VS is not set 270# CONFIG_IP_VS is not set
235# CONFIG_IPV6 is not set 271# CONFIG_IPV6 is not set
272# CONFIG_INET6_XFRM_TUNNEL is not set
273# CONFIG_INET6_TUNNEL is not set
274# CONFIG_NETWORK_SECMARK is not set
236CONFIG_NETFILTER=y 275CONFIG_NETFILTER=y
237# CONFIG_NETFILTER_DEBUG is not set 276# CONFIG_NETFILTER_DEBUG is not set
238 277
@@ -240,14 +279,15 @@ CONFIG_NETFILTER=y
240# Core Netfilter Configuration 279# Core Netfilter Configuration
241# 280#
242# CONFIG_NETFILTER_NETLINK is not set 281# CONFIG_NETFILTER_NETLINK is not set
243# CONFIG_NF_CONNTRACK is not set 282# CONFIG_NF_CONNTRACK_ENABLED is not set
244# CONFIG_NETFILTER_XTABLES is not set 283# CONFIG_NETFILTER_XTABLES is not set
245 284
246# 285#
247# IP: Netfilter Configuration 286# IP: Netfilter Configuration
248# 287#
249# CONFIG_IP_NF_CONNTRACK is not set
250# CONFIG_IP_NF_QUEUE is not set 288# CONFIG_IP_NF_QUEUE is not set
289# CONFIG_IP_NF_IPTABLES is not set
290# CONFIG_IP_NF_ARPTABLES is not set
251 291
252# 292#
253# DCCP Configuration (EXPERIMENTAL) 293# DCCP Configuration (EXPERIMENTAL)
@@ -272,7 +312,6 @@ CONFIG_NETFILTER=y
272# CONFIG_ATALK is not set 312# CONFIG_ATALK is not set
273# CONFIG_X25 is not set 313# CONFIG_X25 is not set
274# CONFIG_LAPB is not set 314# CONFIG_LAPB is not set
275# CONFIG_NET_DIVERT is not set
276# CONFIG_ECONET is not set 315# CONFIG_ECONET is not set
277# CONFIG_WAN_ROUTER is not set 316# CONFIG_WAN_ROUTER is not set
278 317
@@ -285,6 +324,7 @@ CONFIG_NETFILTER=y
285# Network testing 324# Network testing
286# 325#
287# CONFIG_NET_PKTGEN is not set 326# CONFIG_NET_PKTGEN is not set
327# CONFIG_NET_TCPPROBE is not set
288# CONFIG_HAMRADIO is not set 328# CONFIG_HAMRADIO is not set
289# CONFIG_IRDA is not set 329# CONFIG_IRDA is not set
290# CONFIG_BT is not set 330# CONFIG_BT is not set
@@ -301,6 +341,8 @@ CONFIG_STANDALONE=y
301CONFIG_PREVENT_FIRMWARE_BUILD=y 341CONFIG_PREVENT_FIRMWARE_BUILD=y
302# CONFIG_FW_LOADER is not set 342# CONFIG_FW_LOADER is not set
303# CONFIG_DEBUG_DRIVER is not set 343# CONFIG_DEBUG_DRIVER is not set
344# CONFIG_DEBUG_DEVRES is not set
345# CONFIG_SYS_HYPERVISOR is not set
304 346
305# 347#
306# Connector - unified userspace <-> kernelspace linker 348# Connector - unified userspace <-> kernelspace linker
@@ -344,11 +386,17 @@ CONFIG_BLK_DEV_LOOP=y
344CONFIG_BLK_DEV_RAM=y 386CONFIG_BLK_DEV_RAM=y
345CONFIG_BLK_DEV_RAM_COUNT=16 387CONFIG_BLK_DEV_RAM_COUNT=16
346CONFIG_BLK_DEV_RAM_SIZE=4096 388CONFIG_BLK_DEV_RAM_SIZE=4096
347CONFIG_BLK_DEV_INITRD=y 389CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
348# CONFIG_CDROM_PKTCDVD is not set 390# CONFIG_CDROM_PKTCDVD is not set
349# CONFIG_ATA_OVER_ETH is not set 391# CONFIG_ATA_OVER_ETH is not set
350 392
351# 393#
394# Misc devices
395#
396# CONFIG_SGI_IOC4 is not set
397# CONFIG_TIFM_CORE is not set
398
399#
352# ATA/ATAPI/MFM/RLL support 400# ATA/ATAPI/MFM/RLL support
353# 401#
354CONFIG_IDE=y 402CONFIG_IDE=y
@@ -365,6 +413,7 @@ CONFIG_BLK_DEV_IDECD=y
365# CONFIG_BLK_DEV_IDETAPE is not set 413# CONFIG_BLK_DEV_IDETAPE is not set
366# CONFIG_BLK_DEV_IDEFLOPPY is not set 414# CONFIG_BLK_DEV_IDEFLOPPY is not set
367# CONFIG_BLK_DEV_IDESCSI is not set 415# CONFIG_BLK_DEV_IDESCSI is not set
416# CONFIG_BLK_DEV_IDEACPI is not set
368# CONFIG_IDE_TASK_IOCTL is not set 417# CONFIG_IDE_TASK_IOCTL is not set
369 418
370# 419#
@@ -390,8 +439,10 @@ CONFIG_BLK_DEV_CMD64X=y
390# CONFIG_BLK_DEV_CS5530 is not set 439# CONFIG_BLK_DEV_CS5530 is not set
391# CONFIG_BLK_DEV_HPT34X is not set 440# CONFIG_BLK_DEV_HPT34X is not set
392# CONFIG_BLK_DEV_HPT366 is not set 441# CONFIG_BLK_DEV_HPT366 is not set
442# CONFIG_BLK_DEV_JMICRON is not set
393# CONFIG_BLK_DEV_SC1200 is not set 443# CONFIG_BLK_DEV_SC1200 is not set
394# CONFIG_BLK_DEV_PIIX is not set 444# CONFIG_BLK_DEV_PIIX is not set
445# CONFIG_BLK_DEV_IT8213 is not set
395# CONFIG_BLK_DEV_IT821X is not set 446# CONFIG_BLK_DEV_IT821X is not set
396# CONFIG_BLK_DEV_NS87415 is not set 447# CONFIG_BLK_DEV_NS87415 is not set
397# CONFIG_BLK_DEV_PDC202XX_OLD is not set 448# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -401,6 +452,7 @@ CONFIG_BLK_DEV_CMD64X=y
401# CONFIG_BLK_DEV_SLC90E66 is not set 452# CONFIG_BLK_DEV_SLC90E66 is not set
402# CONFIG_BLK_DEV_TRM290 is not set 453# CONFIG_BLK_DEV_TRM290 is not set
403# CONFIG_BLK_DEV_VIA82CXXX is not set 454# CONFIG_BLK_DEV_VIA82CXXX is not set
455# CONFIG_BLK_DEV_TC86C001 is not set
404# CONFIG_IDE_ARM is not set 456# CONFIG_IDE_ARM is not set
405CONFIG_BLK_DEV_IDEDMA=y 457CONFIG_BLK_DEV_IDEDMA=y
406# CONFIG_IDEDMA_IVB is not set 458# CONFIG_IDEDMA_IVB is not set
@@ -412,6 +464,8 @@ CONFIG_BLK_DEV_IDEDMA=y
412# 464#
413# CONFIG_RAID_ATTRS is not set 465# CONFIG_RAID_ATTRS is not set
414CONFIG_SCSI=y 466CONFIG_SCSI=y
467# CONFIG_SCSI_TGT is not set
468CONFIG_SCSI_NETLINK=y
415CONFIG_SCSI_PROC_FS=y 469CONFIG_SCSI_PROC_FS=y
416 470
417# 471#
@@ -431,14 +485,16 @@ CONFIG_CHR_DEV_SG=y
431CONFIG_SCSI_MULTI_LUN=y 485CONFIG_SCSI_MULTI_LUN=y
432CONFIG_SCSI_CONSTANTS=y 486CONFIG_SCSI_CONSTANTS=y
433CONFIG_SCSI_LOGGING=y 487CONFIG_SCSI_LOGGING=y
488# CONFIG_SCSI_SCAN_ASYNC is not set
434 489
435# 490#
436# SCSI Transport Attributes 491# SCSI Transports
437# 492#
438CONFIG_SCSI_SPI_ATTRS=y 493CONFIG_SCSI_SPI_ATTRS=y
439CONFIG_SCSI_FC_ATTRS=y 494CONFIG_SCSI_FC_ATTRS=y
440# CONFIG_SCSI_ISCSI_ATTRS is not set 495# CONFIG_SCSI_ISCSI_ATTRS is not set
441# CONFIG_SCSI_SAS_ATTRS is not set 496# CONFIG_SCSI_SAS_ATTRS is not set
497# CONFIG_SCSI_SAS_LIBSAS is not set
442 498
443# 499#
444# SCSI low-level drivers 500# SCSI low-level drivers
@@ -451,28 +507,36 @@ CONFIG_SCSI_FC_ATTRS=y
451# CONFIG_SCSI_AIC7XXX is not set 507# CONFIG_SCSI_AIC7XXX is not set
452# CONFIG_SCSI_AIC7XXX_OLD is not set 508# CONFIG_SCSI_AIC7XXX_OLD is not set
453# CONFIG_SCSI_AIC79XX is not set 509# CONFIG_SCSI_AIC79XX is not set
510# CONFIG_SCSI_AIC94XX is not set
511# CONFIG_SCSI_ARCMSR is not set
454# CONFIG_MEGARAID_NEWGEN is not set 512# CONFIG_MEGARAID_NEWGEN is not set
455# CONFIG_MEGARAID_LEGACY is not set 513# CONFIG_MEGARAID_LEGACY is not set
456# CONFIG_MEGARAID_SAS is not set 514# CONFIG_MEGARAID_SAS is not set
457# CONFIG_SCSI_SATA is not set 515# CONFIG_SCSI_HPTIOP is not set
458# CONFIG_SCSI_DMX3191D is not set 516# CONFIG_SCSI_DMX3191D is not set
459# CONFIG_SCSI_FUTURE_DOMAIN is not set 517# CONFIG_SCSI_FUTURE_DOMAIN is not set
460# CONFIG_SCSI_IPS is not set 518# CONFIG_SCSI_IPS is not set
461# CONFIG_SCSI_INITIO is not set 519# CONFIG_SCSI_INITIO is not set
462# CONFIG_SCSI_INIA100 is not set 520# CONFIG_SCSI_INIA100 is not set
521# CONFIG_SCSI_STEX is not set
463CONFIG_SCSI_SYM53C8XX_2=y 522CONFIG_SCSI_SYM53C8XX_2=y
464CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 523CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
465CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 524CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
466CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 525CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
467# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 526CONFIG_SCSI_SYM53C8XX_MMIO=y
468# CONFIG_SCSI_IPR is not set
469# CONFIG_SCSI_QLOGIC_FC is not set
470CONFIG_SCSI_QLOGIC_1280=y 527CONFIG_SCSI_QLOGIC_1280=y
471# CONFIG_SCSI_QLA_FC is not set 528# CONFIG_SCSI_QLA_FC is not set
529# CONFIG_SCSI_QLA_ISCSI is not set
472# CONFIG_SCSI_LPFC is not set 530# CONFIG_SCSI_LPFC is not set
473# CONFIG_SCSI_DC395x is not set 531# CONFIG_SCSI_DC395x is not set
474# CONFIG_SCSI_DC390T is not set 532# CONFIG_SCSI_DC390T is not set
475# CONFIG_SCSI_DEBUG is not set 533# CONFIG_SCSI_DEBUG is not set
534# CONFIG_SCSI_SRP is not set
535
536#
537# Serial ATA (prod) and Parallel ATA (experimental) drivers
538#
539# CONFIG_ATA is not set
476 540
477# 541#
478# Multi-device support (RAID and LVM) 542# Multi-device support (RAID and LVM)
@@ -562,6 +626,7 @@ CONFIG_E100=y
562# CONFIG_EPIC100 is not set 626# CONFIG_EPIC100 is not set
563# CONFIG_SUNDANCE is not set 627# CONFIG_SUNDANCE is not set
564# CONFIG_VIA_RHINE is not set 628# CONFIG_VIA_RHINE is not set
629# CONFIG_SC92031 is not set
565 630
566# 631#
567# Ethernet (1000 Mbit) 632# Ethernet (1000 Mbit)
@@ -582,13 +647,18 @@ CONFIG_E1000=y
582# CONFIG_VIA_VELOCITY is not set 647# CONFIG_VIA_VELOCITY is not set
583CONFIG_TIGON3=y 648CONFIG_TIGON3=y
584# CONFIG_BNX2 is not set 649# CONFIG_BNX2 is not set
650# CONFIG_QLA3XXX is not set
651# CONFIG_ATL1 is not set
585 652
586# 653#
587# Ethernet (10000 Mbit) 654# Ethernet (10000 Mbit)
588# 655#
589# CONFIG_CHELSIO_T1 is not set 656# CONFIG_CHELSIO_T1 is not set
657# CONFIG_CHELSIO_T3 is not set
590# CONFIG_IXGB is not set 658# CONFIG_IXGB is not set
591# CONFIG_S2IO is not set 659# CONFIG_S2IO is not set
660# CONFIG_MYRI10GE is not set
661# CONFIG_NETXEN_NIC is not set
592 662
593# 663#
594# Token Ring devices 664# Token Ring devices
@@ -628,6 +698,7 @@ CONFIG_TIGON3=y
628# Input device support 698# Input device support
629# 699#
630CONFIG_INPUT=y 700CONFIG_INPUT=y
701# CONFIG_INPUT_FF_MEMLESS is not set
631 702
632# 703#
633# Userland interfaces 704# Userland interfaces
@@ -666,6 +737,7 @@ CONFIG_SERIO=y
666CONFIG_VT=y 737CONFIG_VT=y
667CONFIG_VT_CONSOLE=y 738CONFIG_VT_CONSOLE=y
668CONFIG_HW_CONSOLE=y 739CONFIG_HW_CONSOLE=y
740# CONFIG_VT_HW_CONSOLE_BINDING is not set
669# CONFIG_SERIAL_NONSTANDARD is not set 741# CONFIG_SERIAL_NONSTANDARD is not set
670 742
671# 743#
@@ -673,7 +745,8 @@ CONFIG_HW_CONSOLE=y
673# 745#
674CONFIG_SERIAL_8250=y 746CONFIG_SERIAL_8250=y
675CONFIG_SERIAL_8250_CONSOLE=y 747CONFIG_SERIAL_8250_CONSOLE=y
676CONFIG_SERIAL_8250_ACPI=y 748CONFIG_SERIAL_8250_PCI=y
749CONFIG_SERIAL_8250_PNP=y
677CONFIG_SERIAL_8250_NR_UARTS=8 750CONFIG_SERIAL_8250_NR_UARTS=8
678CONFIG_SERIAL_8250_RUNTIME_UARTS=4 751CONFIG_SERIAL_8250_RUNTIME_UARTS=4
679CONFIG_SERIAL_8250_EXTENDED=y 752CONFIG_SERIAL_8250_EXTENDED=y
@@ -705,10 +778,6 @@ CONFIG_EFI_RTC=y
705# CONFIG_DTLK is not set 778# CONFIG_DTLK is not set
706# CONFIG_R3964 is not set 779# CONFIG_R3964 is not set
707# CONFIG_APPLICOM is not set 780# CONFIG_APPLICOM is not set
708
709#
710# Ftape, the floppy tape device driver
711#
712CONFIG_AGP=y 781CONFIG_AGP=y
713CONFIG_AGP_HP_ZX1=y 782CONFIG_AGP_HP_ZX1=y
714CONFIG_DRM=y 783CONFIG_DRM=y
@@ -727,7 +796,6 @@ CONFIG_DRM_RADEON=y
727# TPM devices 796# TPM devices
728# 797#
729# CONFIG_TCG_TPM is not set 798# CONFIG_TCG_TPM is not set
730# CONFIG_TELCLOCK is not set
731 799
732# 800#
733# I2C support 801# I2C support
@@ -754,10 +822,11 @@ CONFIG_I2C_ALGOPCF=y
754# CONFIG_I2C_I810 is not set 822# CONFIG_I2C_I810 is not set
755# CONFIG_I2C_PIIX4 is not set 823# CONFIG_I2C_PIIX4 is not set
756# CONFIG_I2C_NFORCE2 is not set 824# CONFIG_I2C_NFORCE2 is not set
825# CONFIG_I2C_OCORES is not set
757# CONFIG_I2C_PARPORT_LIGHT is not set 826# CONFIG_I2C_PARPORT_LIGHT is not set
827# CONFIG_I2C_PASEMI is not set
758# CONFIG_I2C_PROSAVAGE is not set 828# CONFIG_I2C_PROSAVAGE is not set
759# CONFIG_I2C_SAVAGE4 is not set 829# CONFIG_I2C_SAVAGE4 is not set
760# CONFIG_SCx200_ACB is not set
761# CONFIG_I2C_SIS5595 is not set 830# CONFIG_I2C_SIS5595 is not set
762# CONFIG_I2C_SIS630 is not set 831# CONFIG_I2C_SIS630 is not set
763# CONFIG_I2C_SIS96X is not set 832# CONFIG_I2C_SIS96X is not set
@@ -776,9 +845,7 @@ CONFIG_I2C_ALGOPCF=y
776# CONFIG_SENSORS_PCF8574 is not set 845# CONFIG_SENSORS_PCF8574 is not set
777# CONFIG_SENSORS_PCA9539 is not set 846# CONFIG_SENSORS_PCA9539 is not set
778# CONFIG_SENSORS_PCF8591 is not set 847# CONFIG_SENSORS_PCF8591 is not set
779# CONFIG_SENSORS_RTC8564 is not set
780# CONFIG_SENSORS_MAX6875 is not set 848# CONFIG_SENSORS_MAX6875 is not set
781# CONFIG_RTC_X1205_I2C is not set
782# CONFIG_I2C_DEBUG_CORE is not set 849# CONFIG_I2C_DEBUG_CORE is not set
783# CONFIG_I2C_DEBUG_ALGO is not set 850# CONFIG_I2C_DEBUG_ALGO is not set
784# CONFIG_I2C_DEBUG_BUS is not set 851# CONFIG_I2C_DEBUG_BUS is not set
@@ -802,28 +869,31 @@ CONFIG_I2C_ALGOPCF=y
802# CONFIG_HWMON_VID is not set 869# CONFIG_HWMON_VID is not set
803 870
804# 871#
805# Misc devices 872# Multifunction device drivers
806#
807
808#
809# Multimedia Capabilities Port drivers
810# 873#
874# CONFIG_MFD_SM501 is not set
811 875
812# 876#
813# Multimedia devices 877# Multimedia devices
814# 878#
815CONFIG_VIDEO_DEV=y 879CONFIG_VIDEO_DEV=y
880CONFIG_VIDEO_V4L1=y
881CONFIG_VIDEO_V4L1_COMPAT=y
882CONFIG_VIDEO_V4L2=y
816 883
817# 884#
818# Video For Linux 885# Video Capture Adapters
819# 886#
820 887
821# 888#
822# Video Adapters 889# Video Capture Adapters
823# 890#
824# CONFIG_VIDEO_ADV_DEBUG is not set 891# CONFIG_VIDEO_ADV_DEBUG is not set
892CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
893# CONFIG_VIDEO_VIVI is not set
825# CONFIG_VIDEO_BT848 is not set 894# CONFIG_VIDEO_BT848 is not set
826# CONFIG_VIDEO_CPIA is not set 895# CONFIG_VIDEO_CPIA is not set
896# CONFIG_VIDEO_CPIA2 is not set
827# CONFIG_VIDEO_SAA5246A is not set 897# CONFIG_VIDEO_SAA5246A is not set
828# CONFIG_VIDEO_SAA5249 is not set 898# CONFIG_VIDEO_SAA5249 is not set
829# CONFIG_TUNER_3036 is not set 899# CONFIG_TUNER_3036 is not set
@@ -835,10 +905,27 @@ CONFIG_VIDEO_DEV=y
835# CONFIG_VIDEO_HEXIUM_ORION is not set 905# CONFIG_VIDEO_HEXIUM_ORION is not set
836# CONFIG_VIDEO_HEXIUM_GEMINI is not set 906# CONFIG_VIDEO_HEXIUM_GEMINI is not set
837# CONFIG_VIDEO_CX88 is not set 907# CONFIG_VIDEO_CX88 is not set
908# CONFIG_VIDEO_CAFE_CCIC is not set
909
910#
911# V4L USB devices
912#
913# CONFIG_VIDEO_PVRUSB2 is not set
838# CONFIG_VIDEO_EM28XX is not set 914# CONFIG_VIDEO_EM28XX is not set
915# CONFIG_VIDEO_USBVISION is not set
916# CONFIG_USB_VICAM is not set
917# CONFIG_USB_IBMCAM is not set
918# CONFIG_USB_KONICAWC is not set
919# CONFIG_USB_QUICKCAM_MESSENGER is not set
920# CONFIG_USB_ET61X251 is not set
839# CONFIG_VIDEO_OVCAMCHIP is not set 921# CONFIG_VIDEO_OVCAMCHIP is not set
840# CONFIG_VIDEO_AUDIO_DECODER is not set 922# CONFIG_USB_W9968CF is not set
841# CONFIG_VIDEO_DECODER is not set 923# CONFIG_USB_OV511 is not set
924# CONFIG_USB_SE401 is not set
925# CONFIG_USB_SN9C102 is not set
926# CONFIG_USB_STV680 is not set
927# CONFIG_USB_ZC0301 is not set
928# CONFIG_USB_PWC is not set
842 929
843# 930#
844# Radio Adapters 931# Radio Adapters
@@ -846,22 +933,35 @@ CONFIG_VIDEO_DEV=y
846# CONFIG_RADIO_GEMTEK_PCI is not set 933# CONFIG_RADIO_GEMTEK_PCI is not set
847# CONFIG_RADIO_MAXIRADIO is not set 934# CONFIG_RADIO_MAXIRADIO is not set
848# CONFIG_RADIO_MAESTRO is not set 935# CONFIG_RADIO_MAESTRO is not set
936# CONFIG_USB_DSBR is not set
849 937
850# 938#
851# Digital Video Broadcasting Devices 939# Digital Video Broadcasting Devices
852# 940#
853# CONFIG_DVB is not set 941# CONFIG_DVB is not set
942# CONFIG_USB_DABUSB is not set
854 943
855# 944#
856# Graphics support 945# Graphics support
857# 946#
947CONFIG_BACKLIGHT_LCD_SUPPORT=y
948CONFIG_BACKLIGHT_CLASS_DEVICE=y
949CONFIG_LCD_CLASS_DEVICE=m
858CONFIG_FB=y 950CONFIG_FB=y
951# CONFIG_FIRMWARE_EDID is not set
952CONFIG_FB_DDC=y
859CONFIG_FB_CFB_FILLRECT=y 953CONFIG_FB_CFB_FILLRECT=y
860CONFIG_FB_CFB_COPYAREA=y 954CONFIG_FB_CFB_COPYAREA=y
861CONFIG_FB_CFB_IMAGEBLIT=y 955CONFIG_FB_CFB_IMAGEBLIT=y
956# CONFIG_FB_SVGALIB is not set
862# CONFIG_FB_MACMODES is not set 957# CONFIG_FB_MACMODES is not set
958CONFIG_FB_BACKLIGHT=y
863CONFIG_FB_MODE_HELPERS=y 959CONFIG_FB_MODE_HELPERS=y
864# CONFIG_FB_TILEBLITTING is not set 960# CONFIG_FB_TILEBLITTING is not set
961
962#
963# Frambuffer hardware drivers
964#
865# CONFIG_FB_CIRRUS is not set 965# CONFIG_FB_CIRRUS is not set
866# CONFIG_FB_PM2 is not set 966# CONFIG_FB_PM2 is not set
867# CONFIG_FB_CYBER2000 is not set 967# CONFIG_FB_CYBER2000 is not set
@@ -871,12 +971,13 @@ CONFIG_FB_MODE_HELPERS=y
871# CONFIG_FB_NVIDIA is not set 971# CONFIG_FB_NVIDIA is not set
872# CONFIG_FB_RIVA is not set 972# CONFIG_FB_RIVA is not set
873# CONFIG_FB_MATROX is not set 973# CONFIG_FB_MATROX is not set
874# CONFIG_FB_RADEON_OLD is not set
875CONFIG_FB_RADEON=y 974CONFIG_FB_RADEON=y
876CONFIG_FB_RADEON_I2C=y 975CONFIG_FB_RADEON_I2C=y
976CONFIG_FB_RADEON_BACKLIGHT=y
877CONFIG_FB_RADEON_DEBUG=y 977CONFIG_FB_RADEON_DEBUG=y
878# CONFIG_FB_ATY128 is not set 978# CONFIG_FB_ATY128 is not set
879# CONFIG_FB_ATY is not set 979# CONFIG_FB_ATY is not set
980# CONFIG_FB_S3 is not set
880# CONFIG_FB_SAVAGE is not set 981# CONFIG_FB_SAVAGE is not set
881# CONFIG_FB_SIS is not set 982# CONFIG_FB_SIS is not set
882# CONFIG_FB_NEOMAGIC is not set 983# CONFIG_FB_NEOMAGIC is not set
@@ -890,6 +991,7 @@ CONFIG_FB_RADEON_DEBUG=y
890# Console display driver support 991# Console display driver support
891# 992#
892CONFIG_VGA_CONSOLE=y 993CONFIG_VGA_CONSOLE=y
994# CONFIG_VGACON_SOFT_SCROLLBACK is not set
893CONFIG_DUMMY_CONSOLE=y 995CONFIG_DUMMY_CONSOLE=y
894CONFIG_FRAMEBUFFER_CONSOLE=y 996CONFIG_FRAMEBUFFER_CONSOLE=y
895# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 997# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
@@ -904,7 +1006,6 @@ CONFIG_LOGO=y
904# CONFIG_LOGO_LINUX_MONO is not set 1006# CONFIG_LOGO_LINUX_MONO is not set
905# CONFIG_LOGO_LINUX_VGA16 is not set 1007# CONFIG_LOGO_LINUX_VGA16 is not set
906CONFIG_LOGO_LINUX_CLUT224=y 1008CONFIG_LOGO_LINUX_CLUT224=y
907# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
908 1009
909# 1010#
910# Sound 1011# Sound
@@ -924,9 +1025,11 @@ CONFIG_SND_SEQUENCER=y
924CONFIG_SND_OSSEMUL=y 1025CONFIG_SND_OSSEMUL=y
925CONFIG_SND_MIXER_OSS=y 1026CONFIG_SND_MIXER_OSS=y
926CONFIG_SND_PCM_OSS=y 1027CONFIG_SND_PCM_OSS=y
1028CONFIG_SND_PCM_OSS_PLUGINS=y
927CONFIG_SND_SEQUENCER_OSS=y 1029CONFIG_SND_SEQUENCER_OSS=y
928# CONFIG_SND_DYNAMIC_MINORS is not set 1030# CONFIG_SND_DYNAMIC_MINORS is not set
929CONFIG_SND_SUPPORT_OLD_API=y 1031CONFIG_SND_SUPPORT_OLD_API=y
1032CONFIG_SND_VERBOSE_PROCFS=y
930# CONFIG_SND_VERBOSE_PRINTK is not set 1033# CONFIG_SND_VERBOSE_PRINTK is not set
931# CONFIG_SND_DEBUG is not set 1034# CONFIG_SND_DEBUG is not set
932 1035
@@ -936,7 +1039,6 @@ CONFIG_SND_SUPPORT_OLD_API=y
936CONFIG_SND_MPU401_UART=y 1039CONFIG_SND_MPU401_UART=y
937CONFIG_SND_OPL3_LIB=y 1040CONFIG_SND_OPL3_LIB=y
938CONFIG_SND_AC97_CODEC=y 1041CONFIG_SND_AC97_CODEC=y
939CONFIG_SND_AC97_BUS=y
940# CONFIG_SND_DUMMY is not set 1042# CONFIG_SND_DUMMY is not set
941# CONFIG_SND_VIRMIDI is not set 1043# CONFIG_SND_VIRMIDI is not set
942# CONFIG_SND_MTPAV is not set 1044# CONFIG_SND_MTPAV is not set
@@ -947,6 +1049,7 @@ CONFIG_SND_AC97_BUS=y
947# PCI devices 1049# PCI devices
948# 1050#
949# CONFIG_SND_AD1889 is not set 1051# CONFIG_SND_AD1889 is not set
1052# CONFIG_SND_ALS300 is not set
950# CONFIG_SND_ALI5451 is not set 1053# CONFIG_SND_ALI5451 is not set
951# CONFIG_SND_ATIIXP is not set 1054# CONFIG_SND_ATIIXP is not set
952# CONFIG_SND_ATIIXP_MODEM is not set 1055# CONFIG_SND_ATIIXP_MODEM is not set
@@ -959,6 +1062,18 @@ CONFIG_SND_AC97_BUS=y
959# CONFIG_SND_CMIPCI is not set 1062# CONFIG_SND_CMIPCI is not set
960# CONFIG_SND_CS4281 is not set 1063# CONFIG_SND_CS4281 is not set
961# CONFIG_SND_CS46XX is not set 1064# CONFIG_SND_CS46XX is not set
1065# CONFIG_SND_DARLA20 is not set
1066# CONFIG_SND_GINA20 is not set
1067# CONFIG_SND_LAYLA20 is not set
1068# CONFIG_SND_DARLA24 is not set
1069# CONFIG_SND_GINA24 is not set
1070# CONFIG_SND_LAYLA24 is not set
1071# CONFIG_SND_MONA is not set
1072# CONFIG_SND_MIA is not set
1073# CONFIG_SND_ECHO3G is not set
1074# CONFIG_SND_INDIGO is not set
1075# CONFIG_SND_INDIGOIO is not set
1076# CONFIG_SND_INDIGODJ is not set
962# CONFIG_SND_EMU10K1 is not set 1077# CONFIG_SND_EMU10K1 is not set
963# CONFIG_SND_EMU10K1X is not set 1078# CONFIG_SND_EMU10K1X is not set
964# CONFIG_SND_ENS1370 is not set 1079# CONFIG_SND_ENS1370 is not set
@@ -966,7 +1081,7 @@ CONFIG_SND_AC97_BUS=y
966# CONFIG_SND_ES1938 is not set 1081# CONFIG_SND_ES1938 is not set
967# CONFIG_SND_ES1968 is not set 1082# CONFIG_SND_ES1968 is not set
968CONFIG_SND_FM801=y 1083CONFIG_SND_FM801=y
969CONFIG_SND_FM801_TEA575X=y 1084# CONFIG_SND_FM801_TEA575X_BOOL is not set
970# CONFIG_SND_HDA_INTEL is not set 1085# CONFIG_SND_HDA_INTEL is not set
971# CONFIG_SND_HDSP is not set 1086# CONFIG_SND_HDSP is not set
972# CONFIG_SND_HDSPM is not set 1087# CONFIG_SND_HDSPM is not set
@@ -979,6 +1094,7 @@ CONFIG_SND_FM801_TEA575X=y
979# CONFIG_SND_MIXART is not set 1094# CONFIG_SND_MIXART is not set
980# CONFIG_SND_NM256 is not set 1095# CONFIG_SND_NM256 is not set
981# CONFIG_SND_PCXHR is not set 1096# CONFIG_SND_PCXHR is not set
1097# CONFIG_SND_RIPTIDE is not set
982# CONFIG_SND_RME32 is not set 1098# CONFIG_SND_RME32 is not set
983# CONFIG_SND_RME96 is not set 1099# CONFIG_SND_RME96 is not set
984# CONFIG_SND_RME9652 is not set 1100# CONFIG_SND_RME9652 is not set
@@ -988,6 +1104,7 @@ CONFIG_SND_FM801_TEA575X=y
988# CONFIG_SND_VIA82XX_MODEM is not set 1104# CONFIG_SND_VIA82XX_MODEM is not set
989# CONFIG_SND_VX222 is not set 1105# CONFIG_SND_VX222 is not set
990# CONFIG_SND_YMFPCI is not set 1106# CONFIG_SND_YMFPCI is not set
1107# CONFIG_SND_AC97_POWER_SAVE is not set
991 1108
992# 1109#
993# USB devices 1110# USB devices
@@ -995,15 +1112,28 @@ CONFIG_SND_FM801_TEA575X=y
995# CONFIG_SND_USB_AUDIO is not set 1112# CONFIG_SND_USB_AUDIO is not set
996 1113
997# 1114#
1115# SoC audio support
1116#
1117# CONFIG_SND_SOC is not set
1118
1119#
998# Open Sound System 1120# Open Sound System
999# 1121#
1000# CONFIG_SOUND_PRIME is not set 1122# CONFIG_SOUND_PRIME is not set
1123CONFIG_AC97_BUS=y
1124
1125#
1126# HID Devices
1127#
1128CONFIG_HID=y
1129# CONFIG_HID_DEBUG is not set
1001 1130
1002# 1131#
1003# USB support 1132# USB support
1004# 1133#
1005CONFIG_USB_ARCH_HAS_HCD=y 1134CONFIG_USB_ARCH_HAS_HCD=y
1006CONFIG_USB_ARCH_HAS_OHCI=y 1135CONFIG_USB_ARCH_HAS_OHCI=y
1136CONFIG_USB_ARCH_HAS_EHCI=y
1007CONFIG_USB=y 1137CONFIG_USB=y
1008# CONFIG_USB_DEBUG is not set 1138# CONFIG_USB_DEBUG is not set
1009 1139
@@ -1011,7 +1141,6 @@ CONFIG_USB=y
1011# Miscellaneous USB options 1141# Miscellaneous USB options
1012# 1142#
1013# CONFIG_USB_DEVICEFS is not set 1143# CONFIG_USB_DEVICEFS is not set
1014CONFIG_USB_BANDWIDTH=y
1015# CONFIG_USB_DYNAMIC_MINORS is not set 1144# CONFIG_USB_DYNAMIC_MINORS is not set
1016# CONFIG_USB_SUSPEND is not set 1145# CONFIG_USB_SUSPEND is not set
1017# CONFIG_USB_OTG is not set 1146# CONFIG_USB_OTG is not set
@@ -1022,9 +1151,12 @@ CONFIG_USB_BANDWIDTH=y
1022CONFIG_USB_EHCI_HCD=y 1151CONFIG_USB_EHCI_HCD=y
1023# CONFIG_USB_EHCI_SPLIT_ISO is not set 1152# CONFIG_USB_EHCI_SPLIT_ISO is not set
1024# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1153# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1154# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1155# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1025# CONFIG_USB_ISP116X_HCD is not set 1156# CONFIG_USB_ISP116X_HCD is not set
1026CONFIG_USB_OHCI_HCD=y 1157CONFIG_USB_OHCI_HCD=y
1027# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1158# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1159# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
1028CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1160CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1029CONFIG_USB_UHCI_HCD=y 1161CONFIG_USB_UHCI_HCD=y
1030# CONFIG_USB_SL811_HCD is not set 1162# CONFIG_USB_SL811_HCD is not set
@@ -1032,7 +1164,6 @@ CONFIG_USB_UHCI_HCD=y
1032# 1164#
1033# USB Device Class drivers 1165# USB Device Class drivers
1034# 1166#
1035# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
1036# CONFIG_USB_ACM is not set 1167# CONFIG_USB_ACM is not set
1037# CONFIG_USB_PRINTER is not set 1168# CONFIG_USB_PRINTER is not set
1038 1169
@@ -1054,13 +1185,13 @@ CONFIG_USB_STORAGE=y
1054# CONFIG_USB_STORAGE_SDDR55 is not set 1185# CONFIG_USB_STORAGE_SDDR55 is not set
1055# CONFIG_USB_STORAGE_JUMPSHOT is not set 1186# CONFIG_USB_STORAGE_JUMPSHOT is not set
1056# CONFIG_USB_STORAGE_ALAUDA is not set 1187# CONFIG_USB_STORAGE_ALAUDA is not set
1188# CONFIG_USB_STORAGE_KARMA is not set
1057# CONFIG_USB_LIBUSUAL is not set 1189# CONFIG_USB_LIBUSUAL is not set
1058 1190
1059# 1191#
1060# USB Input Devices 1192# USB Input Devices
1061# 1193#
1062CONFIG_USB_HID=y 1194CONFIG_USB_HID=y
1063CONFIG_USB_HIDINPUT=y
1064# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1195# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1065# CONFIG_HID_FF is not set 1196# CONFIG_HID_FF is not set
1066CONFIG_USB_HIDDEV=y 1197CONFIG_USB_HIDDEV=y
@@ -1069,15 +1200,14 @@ CONFIG_USB_HIDDEV=y
1069# CONFIG_USB_ACECAD is not set 1200# CONFIG_USB_ACECAD is not set
1070# CONFIG_USB_KBTAB is not set 1201# CONFIG_USB_KBTAB is not set
1071# CONFIG_USB_POWERMATE is not set 1202# CONFIG_USB_POWERMATE is not set
1072# CONFIG_USB_MTOUCH is not set 1203# CONFIG_USB_TOUCHSCREEN is not set
1073# CONFIG_USB_ITMTOUCH is not set
1074# CONFIG_USB_EGALAX is not set
1075# CONFIG_USB_YEALINK is not set 1204# CONFIG_USB_YEALINK is not set
1076# CONFIG_USB_XPAD is not set 1205# CONFIG_USB_XPAD is not set
1077# CONFIG_USB_ATI_REMOTE is not set 1206# CONFIG_USB_ATI_REMOTE is not set
1078# CONFIG_USB_ATI_REMOTE2 is not set 1207# CONFIG_USB_ATI_REMOTE2 is not set
1079# CONFIG_USB_KEYSPAN_REMOTE is not set 1208# CONFIG_USB_KEYSPAN_REMOTE is not set
1080# CONFIG_USB_APPLETOUCH is not set 1209# CONFIG_USB_APPLETOUCH is not set
1210# CONFIG_USB_GTCO is not set
1081 1211
1082# 1212#
1083# USB Imaging devices 1213# USB Imaging devices
@@ -1086,27 +1216,13 @@ CONFIG_USB_HIDDEV=y
1086# CONFIG_USB_MICROTEK is not set 1216# CONFIG_USB_MICROTEK is not set
1087 1217
1088# 1218#
1089# USB Multimedia devices
1090#
1091# CONFIG_USB_DABUSB is not set
1092# CONFIG_USB_VICAM is not set
1093# CONFIG_USB_DSBR is not set
1094# CONFIG_USB_ET61X251 is not set
1095# CONFIG_USB_IBMCAM is not set
1096# CONFIG_USB_KONICAWC is not set
1097# CONFIG_USB_OV511 is not set
1098# CONFIG_USB_SE401 is not set
1099# CONFIG_USB_SN9C102 is not set
1100# CONFIG_USB_STV680 is not set
1101# CONFIG_USB_PWC is not set
1102
1103#
1104# USB Network Adapters 1219# USB Network Adapters
1105# 1220#
1106# CONFIG_USB_CATC is not set 1221# CONFIG_USB_CATC is not set
1107# CONFIG_USB_KAWETH is not set 1222# CONFIG_USB_KAWETH is not set
1108# CONFIG_USB_PEGASUS is not set 1223# CONFIG_USB_PEGASUS is not set
1109# CONFIG_USB_RTL8150 is not set 1224# CONFIG_USB_RTL8150 is not set
1225# CONFIG_USB_USBNET_MII is not set
1110# CONFIG_USB_USBNET is not set 1226# CONFIG_USB_USBNET is not set
1111CONFIG_USB_MON=y 1227CONFIG_USB_MON=y
1112 1228
@@ -1124,17 +1240,23 @@ CONFIG_USB_MON=y
1124# 1240#
1125# CONFIG_USB_EMI62 is not set 1241# CONFIG_USB_EMI62 is not set
1126# CONFIG_USB_EMI26 is not set 1242# CONFIG_USB_EMI26 is not set
1243# CONFIG_USB_ADUTUX is not set
1127# CONFIG_USB_AUERSWALD is not set 1244# CONFIG_USB_AUERSWALD is not set
1128# CONFIG_USB_RIO500 is not set 1245# CONFIG_USB_RIO500 is not set
1129# CONFIG_USB_LEGOTOWER is not set 1246# CONFIG_USB_LEGOTOWER is not set
1130# CONFIG_USB_LCD is not set 1247# CONFIG_USB_LCD is not set
1248# CONFIG_USB_BERRY_CHARGE is not set
1131# CONFIG_USB_LED is not set 1249# CONFIG_USB_LED is not set
1250# CONFIG_USB_CYPRESS_CY7C63 is not set
1132# CONFIG_USB_CYTHERM is not set 1251# CONFIG_USB_CYTHERM is not set
1133# CONFIG_USB_PHIDGETKIT is not set 1252# CONFIG_USB_PHIDGET is not set
1134# CONFIG_USB_PHIDGETSERVO is not set
1135# CONFIG_USB_IDMOUSE is not set 1253# CONFIG_USB_IDMOUSE is not set
1254# CONFIG_USB_FTDI_ELAN is not set
1255# CONFIG_USB_APPLEDISPLAY is not set
1136# CONFIG_USB_SISUSBVGA is not set 1256# CONFIG_USB_SISUSBVGA is not set
1137# CONFIG_USB_LD is not set 1257# CONFIG_USB_LD is not set
1258# CONFIG_USB_TRANCEVIBRATOR is not set
1259# CONFIG_USB_IOWARRIOR is not set
1138 1260
1139# 1261#
1140# USB DSL modem support 1262# USB DSL modem support
@@ -1151,13 +1273,53 @@ CONFIG_USB_MON=y
1151# CONFIG_MMC is not set 1273# CONFIG_MMC is not set
1152 1274
1153# 1275#
1276# LED devices
1277#
1278# CONFIG_NEW_LEDS is not set
1279
1280#
1281# LED drivers
1282#
1283
1284#
1285# LED Triggers
1286#
1287
1288#
1154# InfiniBand support 1289# InfiniBand support
1155# 1290#
1156# CONFIG_INFINIBAND is not set 1291# CONFIG_INFINIBAND is not set
1157 1292
1158# 1293#
1159# EDAC - error detection and reporting (RAS) 1294# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1295#
1296
1297#
1298# Real Time Clock
1160# 1299#
1300# CONFIG_RTC_CLASS is not set
1301
1302#
1303# DMA Engine support
1304#
1305# CONFIG_DMA_ENGINE is not set
1306
1307#
1308# DMA Clients
1309#
1310
1311#
1312# DMA Devices
1313#
1314
1315#
1316# Auxiliary Display support
1317#
1318
1319#
1320# Virtualization
1321#
1322# CONFIG_MSPEC is not set
1161 1323
1162# 1324#
1163# File systems 1325# File systems
@@ -1171,6 +1333,7 @@ CONFIG_EXT3_FS=y
1171CONFIG_EXT3_FS_XATTR=y 1333CONFIG_EXT3_FS_XATTR=y
1172# CONFIG_EXT3_FS_POSIX_ACL is not set 1334# CONFIG_EXT3_FS_POSIX_ACL is not set
1173# CONFIG_EXT3_FS_SECURITY is not set 1335# CONFIG_EXT3_FS_SECURITY is not set
1336# CONFIG_EXT4DEV_FS is not set
1174CONFIG_JBD=y 1337CONFIG_JBD=y
1175# CONFIG_JBD_DEBUG is not set 1338# CONFIG_JBD_DEBUG is not set
1176CONFIG_FS_MBCACHE=y 1339CONFIG_FS_MBCACHE=y
@@ -1178,6 +1341,7 @@ CONFIG_FS_MBCACHE=y
1178# CONFIG_JFS_FS is not set 1341# CONFIG_JFS_FS is not set
1179# CONFIG_FS_POSIX_ACL is not set 1342# CONFIG_FS_POSIX_ACL is not set
1180# CONFIG_XFS_FS is not set 1343# CONFIG_XFS_FS is not set
1344# CONFIG_GFS2_FS is not set
1181# CONFIG_OCFS2_FS is not set 1345# CONFIG_OCFS2_FS is not set
1182# CONFIG_MINIX_FS is not set 1346# CONFIG_MINIX_FS is not set
1183# CONFIG_ROMFS_FS is not set 1347# CONFIG_ROMFS_FS is not set
@@ -1212,12 +1376,14 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1212# 1376#
1213CONFIG_PROC_FS=y 1377CONFIG_PROC_FS=y
1214CONFIG_PROC_KCORE=y 1378CONFIG_PROC_KCORE=y
1379CONFIG_PROC_VMCORE=y
1380CONFIG_PROC_SYSCTL=y
1215CONFIG_SYSFS=y 1381CONFIG_SYSFS=y
1216CONFIG_TMPFS=y 1382CONFIG_TMPFS=y
1383# CONFIG_TMPFS_POSIX_ACL is not set
1217CONFIG_HUGETLBFS=y 1384CONFIG_HUGETLBFS=y
1218CONFIG_HUGETLB_PAGE=y 1385CONFIG_HUGETLB_PAGE=y
1219CONFIG_RAMFS=y 1386CONFIG_RAMFS=y
1220# CONFIG_RELAYFS_FS is not set
1221# CONFIG_CONFIGFS_FS is not set 1387# CONFIG_CONFIGFS_FS is not set
1222 1388
1223# 1389#
@@ -1331,15 +1497,25 @@ CONFIG_NLS_KOI8_U=y
1331CONFIG_NLS_UTF8=y 1497CONFIG_NLS_UTF8=y
1332 1498
1333# 1499#
1500# Distributed Lock Manager
1501#
1502# CONFIG_DLM is not set
1503
1504#
1334# Library routines 1505# Library routines
1335# 1506#
1507CONFIG_BITREVERSE=y
1336# CONFIG_CRC_CCITT is not set 1508# CONFIG_CRC_CCITT is not set
1337# CONFIG_CRC16 is not set 1509# CONFIG_CRC16 is not set
1338CONFIG_CRC32=y 1510CONFIG_CRC32=y
1339# CONFIG_LIBCRC32C is not set 1511# CONFIG_LIBCRC32C is not set
1512CONFIG_PLIST=y
1513CONFIG_HAS_IOMEM=y
1514CONFIG_HAS_IOPORT=y
1340CONFIG_GENERIC_HARDIRQS=y 1515CONFIG_GENERIC_HARDIRQS=y
1341CONFIG_GENERIC_IRQ_PROBE=y 1516CONFIG_GENERIC_IRQ_PROBE=y
1342CONFIG_GENERIC_PENDING_IRQ=y 1517CONFIG_GENERIC_PENDING_IRQ=y
1518CONFIG_IRQ_PER_CPU=y
1343 1519
1344# 1520#
1345# Instrumentation Support 1521# Instrumentation Support
@@ -1351,21 +1527,32 @@ CONFIG_KPROBES=y
1351# Kernel hacking 1527# Kernel hacking
1352# 1528#
1353# CONFIG_PRINTK_TIME is not set 1529# CONFIG_PRINTK_TIME is not set
1530CONFIG_ENABLE_MUST_CHECK=y
1354CONFIG_MAGIC_SYSRQ=y 1531CONFIG_MAGIC_SYSRQ=y
1532# CONFIG_UNUSED_SYMBOLS is not set
1533# CONFIG_DEBUG_FS is not set
1534# CONFIG_HEADERS_CHECK is not set
1355CONFIG_DEBUG_KERNEL=y 1535CONFIG_DEBUG_KERNEL=y
1536# CONFIG_DEBUG_SHIRQ is not set
1356CONFIG_LOG_BUF_SHIFT=17 1537CONFIG_LOG_BUF_SHIFT=17
1357CONFIG_DETECT_SOFTLOCKUP=y 1538CONFIG_DETECT_SOFTLOCKUP=y
1358# CONFIG_SCHEDSTATS is not set 1539# CONFIG_SCHEDSTATS is not set
1540# CONFIG_TIMER_STATS is not set
1359# CONFIG_DEBUG_SLAB is not set 1541# CONFIG_DEBUG_SLAB is not set
1360CONFIG_DEBUG_MUTEXES=y 1542# CONFIG_DEBUG_RT_MUTEXES is not set
1543# CONFIG_RT_MUTEX_TESTER is not set
1361# CONFIG_DEBUG_SPINLOCK is not set 1544# CONFIG_DEBUG_SPINLOCK is not set
1545CONFIG_DEBUG_MUTEXES=y
1362# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1546# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1547# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1363# CONFIG_DEBUG_KOBJECT is not set 1548# CONFIG_DEBUG_KOBJECT is not set
1364# CONFIG_DEBUG_INFO is not set 1549# CONFIG_DEBUG_INFO is not set
1365# CONFIG_DEBUG_FS is not set
1366# CONFIG_DEBUG_VM is not set 1550# CONFIG_DEBUG_VM is not set
1551# CONFIG_DEBUG_LIST is not set
1367CONFIG_FORCED_INLINING=y 1552CONFIG_FORCED_INLINING=y
1368# CONFIG_RCU_TORTURE_TEST is not set 1553# CONFIG_RCU_TORTURE_TEST is not set
1554# CONFIG_LKDTM is not set
1555# CONFIG_FAULT_INJECTION is not set
1369CONFIG_IA64_GRANULE_16MB=y 1556CONFIG_IA64_GRANULE_16MB=y
1370# CONFIG_IA64_GRANULE_64MB is not set 1557# CONFIG_IA64_GRANULE_64MB is not set
1371CONFIG_IA64_PRINT_HAZARDS=y 1558CONFIG_IA64_PRINT_HAZARDS=y
@@ -1384,7 +1571,11 @@ CONFIG_SYSVIPC_COMPAT=y
1384# Cryptographic options 1571# Cryptographic options
1385# 1572#
1386CONFIG_CRYPTO=y 1573CONFIG_CRYPTO=y
1574CONFIG_CRYPTO_ALGAPI=y
1575CONFIG_CRYPTO_BLKCIPHER=y
1576CONFIG_CRYPTO_MANAGER=y
1387# CONFIG_CRYPTO_HMAC is not set 1577# CONFIG_CRYPTO_HMAC is not set
1578# CONFIG_CRYPTO_XCBC is not set
1388# CONFIG_CRYPTO_NULL is not set 1579# CONFIG_CRYPTO_NULL is not set
1389# CONFIG_CRYPTO_MD4 is not set 1580# CONFIG_CRYPTO_MD4 is not set
1390CONFIG_CRYPTO_MD5=y 1581CONFIG_CRYPTO_MD5=y
@@ -1393,7 +1584,13 @@ CONFIG_CRYPTO_MD5=y
1393# CONFIG_CRYPTO_SHA512 is not set 1584# CONFIG_CRYPTO_SHA512 is not set
1394# CONFIG_CRYPTO_WP512 is not set 1585# CONFIG_CRYPTO_WP512 is not set
1395# CONFIG_CRYPTO_TGR192 is not set 1586# CONFIG_CRYPTO_TGR192 is not set
1587# CONFIG_CRYPTO_GF128MUL is not set
1588CONFIG_CRYPTO_ECB=m
1589CONFIG_CRYPTO_CBC=y
1590CONFIG_CRYPTO_PCBC=m
1591# CONFIG_CRYPTO_LRW is not set
1396CONFIG_CRYPTO_DES=y 1592CONFIG_CRYPTO_DES=y
1593# CONFIG_CRYPTO_FCRYPT is not set
1397# CONFIG_CRYPTO_BLOWFISH is not set 1594# CONFIG_CRYPTO_BLOWFISH is not set
1398# CONFIG_CRYPTO_TWOFISH is not set 1595# CONFIG_CRYPTO_TWOFISH is not set
1399# CONFIG_CRYPTO_SERPENT is not set 1596# CONFIG_CRYPTO_SERPENT is not set
@@ -1407,6 +1604,7 @@ CONFIG_CRYPTO_DES=y
1407# CONFIG_CRYPTO_DEFLATE is not set 1604# CONFIG_CRYPTO_DEFLATE is not set
1408# CONFIG_CRYPTO_MICHAEL_MIC is not set 1605# CONFIG_CRYPTO_MICHAEL_MIC is not set
1409# CONFIG_CRYPTO_CRC32C is not set 1606# CONFIG_CRYPTO_CRC32C is not set
1607# CONFIG_CRYPTO_CAMELLIA is not set
1410# CONFIG_CRYPTO_TEST is not set 1608# CONFIG_CRYPTO_TEST is not set
1411 1609
1412# 1610#
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index 9001b3fbaa32..90bd9601cdde 100644
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -1,8 +1,9 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc5 3# Linux kernel version: 2.6.21-rc3
4# Mon Feb 27 16:02:28 2006 4# Thu Mar 8 11:01:03 2007
5# 5#
6CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
6 7
7# 8#
8# Code maturity level options 9# Code maturity level options
@@ -18,16 +19,24 @@ CONFIG_LOCALVERSION=""
18CONFIG_LOCALVERSION_AUTO=y 19CONFIG_LOCALVERSION_AUTO=y
19CONFIG_SWAP=y 20CONFIG_SWAP=y
20CONFIG_SYSVIPC=y 21CONFIG_SYSVIPC=y
22# CONFIG_IPC_NS is not set
23CONFIG_SYSVIPC_SYSCTL=y
21CONFIG_POSIX_MQUEUE=y 24CONFIG_POSIX_MQUEUE=y
22# CONFIG_BSD_PROCESS_ACCT is not set 25# CONFIG_BSD_PROCESS_ACCT is not set
23CONFIG_SYSCTL=y 26# CONFIG_TASKSTATS is not set
27# CONFIG_UTS_NS is not set
24# CONFIG_AUDIT is not set 28# CONFIG_AUDIT is not set
25CONFIG_IKCONFIG=y 29CONFIG_IKCONFIG=y
26CONFIG_IKCONFIG_PROC=y 30CONFIG_IKCONFIG_PROC=y
27# CONFIG_CPUSETS is not set 31# CONFIG_CPUSETS is not set
32CONFIG_SYSFS_DEPRECATED=y
33# CONFIG_RELAY is not set
34CONFIG_BLK_DEV_INITRD=y
28CONFIG_INITRAMFS_SOURCE="" 35CONFIG_INITRAMFS_SOURCE=""
29CONFIG_CC_OPTIMIZE_FOR_SIZE=y 36CONFIG_CC_OPTIMIZE_FOR_SIZE=y
37CONFIG_SYSCTL=y
30# CONFIG_EMBEDDED is not set 38# CONFIG_EMBEDDED is not set
39CONFIG_SYSCTL_SYSCALL=y
31CONFIG_KALLSYMS=y 40CONFIG_KALLSYMS=y
32CONFIG_KALLSYMS_ALL=y 41CONFIG_KALLSYMS_ALL=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set 42# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -39,11 +48,9 @@ CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y 48CONFIG_FUTEX=y
40CONFIG_EPOLL=y 49CONFIG_EPOLL=y
41CONFIG_SHMEM=y 50CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46CONFIG_SLAB=y 51CONFIG_SLAB=y
52CONFIG_VM_EVENT_COUNTERS=y
53CONFIG_RT_MUTEXES=y
47# CONFIG_TINY_SHMEM is not set 54# CONFIG_TINY_SHMEM is not set
48CONFIG_BASE_SMALL=0 55CONFIG_BASE_SMALL=0
49# CONFIG_SLOB is not set 56# CONFIG_SLOB is not set
@@ -54,7 +61,6 @@ CONFIG_BASE_SMALL=0
54CONFIG_MODULES=y 61CONFIG_MODULES=y
55CONFIG_MODULE_UNLOAD=y 62CONFIG_MODULE_UNLOAD=y
56# CONFIG_MODULE_FORCE_UNLOAD is not set 63# CONFIG_MODULE_FORCE_UNLOAD is not set
57CONFIG_OBSOLETE_MODPARM=y
58CONFIG_MODVERSIONS=y 64CONFIG_MODVERSIONS=y
59# CONFIG_MODULE_SRCVERSION_ALL is not set 65# CONFIG_MODULE_SRCVERSION_ALL is not set
60CONFIG_KMOD=y 66CONFIG_KMOD=y
@@ -63,6 +69,8 @@ CONFIG_STOP_MACHINE=y
63# 69#
64# Block layer 70# Block layer
65# 71#
72CONFIG_BLOCK=y
73# CONFIG_BLK_DEV_IO_TRACE is not set
66 74
67# 75#
68# IO Schedulers 76# IO Schedulers
@@ -82,15 +90,20 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
82# 90#
83CONFIG_IA64=y 91CONFIG_IA64=y
84CONFIG_64BIT=y 92CONFIG_64BIT=y
93CONFIG_ZONE_DMA=y
85CONFIG_MMU=y 94CONFIG_MMU=y
86CONFIG_SWIOTLB=y 95CONFIG_SWIOTLB=y
87CONFIG_RWSEM_XCHGADD_ALGORITHM=y 96CONFIG_RWSEM_XCHGADD_ALGORITHM=y
97# CONFIG_ARCH_HAS_ILOG2_U32 is not set
98# CONFIG_ARCH_HAS_ILOG2_U64 is not set
99CONFIG_GENERIC_FIND_NEXT_BIT=y
88CONFIG_GENERIC_CALIBRATE_DELAY=y 100CONFIG_GENERIC_CALIBRATE_DELAY=y
89CONFIG_TIME_INTERPOLATION=y 101CONFIG_TIME_INTERPOLATION=y
102CONFIG_DMI=y
90CONFIG_EFI=y 103CONFIG_EFI=y
91CONFIG_GENERIC_IOMAP=y 104CONFIG_GENERIC_IOMAP=y
92CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 105CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
93CONFIG_DMA_IS_DMA32=y 106CONFIG_AUDIT_ARCH=y
94CONFIG_IA64_GENERIC=y 107CONFIG_IA64_GENERIC=y
95# CONFIG_IA64_DIG is not set 108# CONFIG_IA64_DIG is not set
96# CONFIG_IA64_HP_ZX1 is not set 109# CONFIG_IA64_HP_ZX1 is not set
@@ -107,6 +120,7 @@ CONFIG_PGTABLE_3=y
107# CONFIG_PGTABLE_4 is not set 120# CONFIG_PGTABLE_4 is not set
108# CONFIG_HZ_100 is not set 121# CONFIG_HZ_100 is not set
109CONFIG_HZ_250=y 122CONFIG_HZ_250=y
123# CONFIG_HZ_300 is not set
110# CONFIG_HZ_1000 is not set 124# CONFIG_HZ_1000 is not set
111CONFIG_HZ=250 125CONFIG_HZ=250
112CONFIG_IA64_L1_CACHE_SHIFT=7 126CONFIG_IA64_L1_CACHE_SHIFT=7
@@ -116,9 +130,10 @@ CONFIG_IOSAPIC=y
116CONFIG_FORCE_MAX_ZONEORDER=17 130CONFIG_FORCE_MAX_ZONEORDER=17
117CONFIG_SMP=y 131CONFIG_SMP=y
118CONFIG_NR_CPUS=512 132CONFIG_NR_CPUS=512
119CONFIG_IA64_NR_NODES=256
120CONFIG_HOTPLUG_CPU=y 133CONFIG_HOTPLUG_CPU=y
134CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
121# CONFIG_SCHED_SMT is not set 135# CONFIG_SCHED_SMT is not set
136# CONFIG_PERMIT_BSP_REMOVE is not set
122# CONFIG_PREEMPT is not set 137# CONFIG_PREEMPT is not set
123CONFIG_SELECT_MEMORY_MODEL=y 138CONFIG_SELECT_MEMORY_MODEL=y
124# CONFIG_FLATMEM_MANUAL is not set 139# CONFIG_FLATMEM_MANUAL is not set
@@ -130,21 +145,35 @@ CONFIG_NEED_MULTIPLE_NODES=y
130# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
131CONFIG_SPLIT_PTLOCK_CPUS=4 146CONFIG_SPLIT_PTLOCK_CPUS=4
132CONFIG_MIGRATION=y 147CONFIG_MIGRATION=y
148CONFIG_RESOURCES_64BIT=y
149CONFIG_ZONE_DMA_FLAG=1
133CONFIG_ARCH_SELECT_MEMORY_MODEL=y 150CONFIG_ARCH_SELECT_MEMORY_MODEL=y
134CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 151CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
135CONFIG_ARCH_FLATMEM_ENABLE=y 152CONFIG_ARCH_FLATMEM_ENABLE=y
136CONFIG_ARCH_SPARSEMEM_ENABLE=y 153CONFIG_ARCH_SPARSEMEM_ENABLE=y
137CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y 154CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
138CONFIG_NUMA=y 155CONFIG_NUMA=y
156CONFIG_NODES_SHIFT=10
157CONFIG_ARCH_POPULATES_NODE_MAP=y
139CONFIG_VIRTUAL_MEM_MAP=y 158CONFIG_VIRTUAL_MEM_MAP=y
140CONFIG_HOLES_IN_ZONE=y 159CONFIG_HOLES_IN_ZONE=y
141CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y 160CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
161CONFIG_HAVE_ARCH_NODEDATA_EXTENSION=y
142CONFIG_IA32_SUPPORT=y 162CONFIG_IA32_SUPPORT=y
143CONFIG_COMPAT=y 163CONFIG_COMPAT=y
144CONFIG_IA64_MCA_RECOVERY=y 164CONFIG_IA64_MCA_RECOVERY=y
145CONFIG_PERFMON=y 165CONFIG_PERFMON=y
146CONFIG_IA64_PALINFO=y 166CONFIG_IA64_PALINFO=y
167# CONFIG_MC_ERR_INJECT is not set
147CONFIG_SGI_SN=y 168CONFIG_SGI_SN=y
169# CONFIG_IA64_ESI is not set
170
171#
172# SN Devices
173#
174CONFIG_SGI_IOC3=m
175CONFIG_KEXEC=y
176CONFIG_CRASH_DUMP=y
148 177
149# 178#
150# Firmware Drivers 179# Firmware Drivers
@@ -160,13 +189,16 @@ CONFIG_BINFMT_MISC=m
160CONFIG_PM=y 189CONFIG_PM=y
161CONFIG_PM_LEGACY=y 190CONFIG_PM_LEGACY=y
162# CONFIG_PM_DEBUG is not set 191# CONFIG_PM_DEBUG is not set
192# CONFIG_PM_SYSFS_DEPRECATED is not set
163 193
164# 194#
165# ACPI (Advanced Configuration and Power Interface) Support 195# ACPI (Advanced Configuration and Power Interface) Support
166# 196#
167CONFIG_ACPI=y 197CONFIG_ACPI=y
198CONFIG_ACPI_PROCFS=y
168CONFIG_ACPI_BUTTON=m 199CONFIG_ACPI_BUTTON=m
169CONFIG_ACPI_FAN=m 200CONFIG_ACPI_FAN=m
201# CONFIG_ACPI_DOCK is not set
170CONFIG_ACPI_PROCESSOR=m 202CONFIG_ACPI_PROCESSOR=m
171CONFIG_ACPI_HOTPLUG_CPU=y 203CONFIG_ACPI_HOTPLUG_CPU=y
172CONFIG_ACPI_THERMAL=m 204CONFIG_ACPI_THERMAL=m
@@ -188,8 +220,8 @@ CONFIG_ACPI_CONTAINER=m
188# 220#
189CONFIG_PCI=y 221CONFIG_PCI=y
190CONFIG_PCI_DOMAINS=y 222CONFIG_PCI_DOMAINS=y
223# CONFIG_PCIEPORTBUS is not set
191# CONFIG_PCI_MSI is not set 224# CONFIG_PCI_MSI is not set
192CONFIG_PCI_LEGACY_PROC=y
193# CONFIG_PCI_DEBUG is not set 225# CONFIG_PCI_DEBUG is not set
194 226
195# 227#
@@ -220,6 +252,10 @@ CONFIG_NET=y
220CONFIG_PACKET=y 252CONFIG_PACKET=y
221# CONFIG_PACKET_MMAP is not set 253# CONFIG_PACKET_MMAP is not set
222CONFIG_UNIX=y 254CONFIG_UNIX=y
255CONFIG_XFRM=y
256# CONFIG_XFRM_USER is not set
257# CONFIG_XFRM_SUB_POLICY is not set
258# CONFIG_XFRM_MIGRATE is not set
223# CONFIG_NET_KEY is not set 259# CONFIG_NET_KEY is not set
224CONFIG_INET=y 260CONFIG_INET=y
225CONFIG_IP_MULTICAST=y 261CONFIG_IP_MULTICAST=y
@@ -234,12 +270,21 @@ CONFIG_SYN_COOKIES=y
234# CONFIG_INET_AH is not set 270# CONFIG_INET_AH is not set
235# CONFIG_INET_ESP is not set 271# CONFIG_INET_ESP is not set
236# CONFIG_INET_IPCOMP is not set 272# CONFIG_INET_IPCOMP is not set
273# CONFIG_INET_XFRM_TUNNEL is not set
237# CONFIG_INET_TUNNEL is not set 274# CONFIG_INET_TUNNEL is not set
275CONFIG_INET_XFRM_MODE_TRANSPORT=y
276CONFIG_INET_XFRM_MODE_TUNNEL=y
277CONFIG_INET_XFRM_MODE_BEET=y
238CONFIG_INET_DIAG=y 278CONFIG_INET_DIAG=y
239CONFIG_INET_TCP_DIAG=y 279CONFIG_INET_TCP_DIAG=y
240# CONFIG_TCP_CONG_ADVANCED is not set 280# CONFIG_TCP_CONG_ADVANCED is not set
241CONFIG_TCP_CONG_BIC=y 281CONFIG_TCP_CONG_CUBIC=y
282CONFIG_DEFAULT_TCP_CONG="cubic"
283# CONFIG_TCP_MD5SIG is not set
242# CONFIG_IPV6 is not set 284# CONFIG_IPV6 is not set
285# CONFIG_INET6_XFRM_TUNNEL is not set
286# CONFIG_INET6_TUNNEL is not set
287# CONFIG_NETWORK_SECMARK is not set
243# CONFIG_NETFILTER is not set 288# CONFIG_NETFILTER is not set
244 289
245# 290#
@@ -265,7 +310,6 @@ CONFIG_TCP_CONG_BIC=y
265# CONFIG_ATALK is not set 310# CONFIG_ATALK is not set
266# CONFIG_X25 is not set 311# CONFIG_X25 is not set
267# CONFIG_LAPB is not set 312# CONFIG_LAPB is not set
268# CONFIG_NET_DIVERT is not set
269# CONFIG_ECONET is not set 313# CONFIG_ECONET is not set
270# CONFIG_WAN_ROUTER is not set 314# CONFIG_WAN_ROUTER is not set
271 315
@@ -294,6 +338,8 @@ CONFIG_STANDALONE=y
294CONFIG_PREVENT_FIRMWARE_BUILD=y 338CONFIG_PREVENT_FIRMWARE_BUILD=y
295CONFIG_FW_LOADER=m 339CONFIG_FW_LOADER=m
296# CONFIG_DEBUG_DRIVER is not set 340# CONFIG_DEBUG_DRIVER is not set
341# CONFIG_DEBUG_DEVRES is not set
342# CONFIG_SYS_HYPERVISOR is not set
297 343
298# 344#
299# Connector - unified userspace <-> kernelspace linker 345# Connector - unified userspace <-> kernelspace linker
@@ -337,11 +383,17 @@ CONFIG_BLK_DEV_NBD=m
337CONFIG_BLK_DEV_RAM=y 383CONFIG_BLK_DEV_RAM=y
338CONFIG_BLK_DEV_RAM_COUNT=16 384CONFIG_BLK_DEV_RAM_COUNT=16
339CONFIG_BLK_DEV_RAM_SIZE=4096 385CONFIG_BLK_DEV_RAM_SIZE=4096
340CONFIG_BLK_DEV_INITRD=y 386CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
341# CONFIG_CDROM_PKTCDVD is not set 387# CONFIG_CDROM_PKTCDVD is not set
342# CONFIG_ATA_OVER_ETH is not set 388# CONFIG_ATA_OVER_ETH is not set
343 389
344# 390#
391# Misc devices
392#
393CONFIG_SGI_IOC4=y
394# CONFIG_TIFM_CORE is not set
395
396#
345# ATA/ATAPI/MFM/RLL support 397# ATA/ATAPI/MFM/RLL support
346# 398#
347CONFIG_IDE=y 399CONFIG_IDE=y
@@ -358,6 +410,7 @@ CONFIG_BLK_DEV_IDECD=y
358# CONFIG_BLK_DEV_IDETAPE is not set 410# CONFIG_BLK_DEV_IDETAPE is not set
359CONFIG_BLK_DEV_IDEFLOPPY=y 411CONFIG_BLK_DEV_IDEFLOPPY=y
360CONFIG_BLK_DEV_IDESCSI=m 412CONFIG_BLK_DEV_IDESCSI=m
413# CONFIG_BLK_DEV_IDEACPI is not set
361# CONFIG_IDE_TASK_IOCTL is not set 414# CONFIG_IDE_TASK_IOCTL is not set
362 415
363# 416#
@@ -384,8 +437,10 @@ CONFIG_BLK_DEV_CMD64X=y
384# CONFIG_BLK_DEV_CS5530 is not set 437# CONFIG_BLK_DEV_CS5530 is not set
385# CONFIG_BLK_DEV_HPT34X is not set 438# CONFIG_BLK_DEV_HPT34X is not set
386# CONFIG_BLK_DEV_HPT366 is not set 439# CONFIG_BLK_DEV_HPT366 is not set
440# CONFIG_BLK_DEV_JMICRON is not set
387# CONFIG_BLK_DEV_SC1200 is not set 441# CONFIG_BLK_DEV_SC1200 is not set
388CONFIG_BLK_DEV_PIIX=y 442CONFIG_BLK_DEV_PIIX=y
443# CONFIG_BLK_DEV_IT8213 is not set
389# CONFIG_BLK_DEV_IT821X is not set 444# CONFIG_BLK_DEV_IT821X is not set
390# CONFIG_BLK_DEV_NS87415 is not set 445# CONFIG_BLK_DEV_NS87415 is not set
391# CONFIG_BLK_DEV_PDC202XX_OLD is not set 446# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -396,6 +451,7 @@ CONFIG_BLK_DEV_SGIIOC4=y
396# CONFIG_BLK_DEV_SLC90E66 is not set 451# CONFIG_BLK_DEV_SLC90E66 is not set
397# CONFIG_BLK_DEV_TRM290 is not set 452# CONFIG_BLK_DEV_TRM290 is not set
398# CONFIG_BLK_DEV_VIA82CXXX is not set 453# CONFIG_BLK_DEV_VIA82CXXX is not set
454# CONFIG_BLK_DEV_TC86C001 is not set
399# CONFIG_IDE_ARM is not set 455# CONFIG_IDE_ARM is not set
400CONFIG_BLK_DEV_IDEDMA=y 456CONFIG_BLK_DEV_IDEDMA=y
401# CONFIG_IDEDMA_IVB is not set 457# CONFIG_IDEDMA_IVB is not set
@@ -407,6 +463,8 @@ CONFIG_IDEDMA_AUTO=y
407# 463#
408# CONFIG_RAID_ATTRS is not set 464# CONFIG_RAID_ATTRS is not set
409CONFIG_SCSI=y 465CONFIG_SCSI=y
466# CONFIG_SCSI_TGT is not set
467CONFIG_SCSI_NETLINK=y
410CONFIG_SCSI_PROC_FS=y 468CONFIG_SCSI_PROC_FS=y
411 469
412# 470#
@@ -426,14 +484,16 @@ CONFIG_CHR_DEV_SG=m
426# CONFIG_SCSI_MULTI_LUN is not set 484# CONFIG_SCSI_MULTI_LUN is not set
427# CONFIG_SCSI_CONSTANTS is not set 485# CONFIG_SCSI_CONSTANTS is not set
428# CONFIG_SCSI_LOGGING is not set 486# CONFIG_SCSI_LOGGING is not set
487# CONFIG_SCSI_SCAN_ASYNC is not set
429 488
430# 489#
431# SCSI Transport Attributes 490# SCSI Transports
432# 491#
433CONFIG_SCSI_SPI_ATTRS=y 492CONFIG_SCSI_SPI_ATTRS=y
434CONFIG_SCSI_FC_ATTRS=y 493CONFIG_SCSI_FC_ATTRS=y
435# CONFIG_SCSI_ISCSI_ATTRS is not set 494# CONFIG_SCSI_ISCSI_ATTRS is not set
436# CONFIG_SCSI_SAS_ATTRS is not set 495# CONFIG_SCSI_SAS_ATTRS is not set
496# CONFIG_SCSI_SAS_LIBSAS is not set
437 497
438# 498#
439# SCSI low-level drivers 499# SCSI low-level drivers
@@ -446,43 +506,36 @@ CONFIG_SCSI_FC_ATTRS=y
446# CONFIG_SCSI_AIC7XXX is not set 506# CONFIG_SCSI_AIC7XXX is not set
447# CONFIG_SCSI_AIC7XXX_OLD is not set 507# CONFIG_SCSI_AIC7XXX_OLD is not set
448# CONFIG_SCSI_AIC79XX is not set 508# CONFIG_SCSI_AIC79XX is not set
509# CONFIG_SCSI_AIC94XX is not set
510# CONFIG_SCSI_ARCMSR is not set
449# CONFIG_MEGARAID_NEWGEN is not set 511# CONFIG_MEGARAID_NEWGEN is not set
450# CONFIG_MEGARAID_LEGACY is not set 512# CONFIG_MEGARAID_LEGACY is not set
451# CONFIG_MEGARAID_SAS is not set 513# CONFIG_MEGARAID_SAS is not set
452CONFIG_SCSI_SATA=y 514# CONFIG_SCSI_HPTIOP is not set
453# CONFIG_SCSI_SATA_AHCI is not set
454# CONFIG_SCSI_SATA_SVW is not set
455# CONFIG_SCSI_ATA_PIIX is not set
456# CONFIG_SCSI_SATA_MV is not set
457# CONFIG_SCSI_SATA_NV is not set
458# CONFIG_SCSI_PDC_ADMA is not set
459# CONFIG_SCSI_SATA_QSTOR is not set
460# CONFIG_SCSI_SATA_PROMISE is not set
461# CONFIG_SCSI_SATA_SX4 is not set
462# CONFIG_SCSI_SATA_SIL is not set
463# CONFIG_SCSI_SATA_SIL24 is not set
464# CONFIG_SCSI_SATA_SIS is not set
465# CONFIG_SCSI_SATA_ULI is not set
466# CONFIG_SCSI_SATA_VIA is not set
467CONFIG_SCSI_SATA_VITESSE=y
468# CONFIG_SCSI_DMX3191D is not set 515# CONFIG_SCSI_DMX3191D is not set
469# CONFIG_SCSI_FUTURE_DOMAIN is not set 516# CONFIG_SCSI_FUTURE_DOMAIN is not set
470# CONFIG_SCSI_IPS is not set 517# CONFIG_SCSI_IPS is not set
471# CONFIG_SCSI_INITIO is not set 518# CONFIG_SCSI_INITIO is not set
472# CONFIG_SCSI_INIA100 is not set 519# CONFIG_SCSI_INIA100 is not set
520# CONFIG_SCSI_STEX is not set
473CONFIG_SCSI_SYM53C8XX_2=y 521CONFIG_SCSI_SYM53C8XX_2=y
474CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 522CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
475CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 523CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
476CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 524CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
477# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 525CONFIG_SCSI_SYM53C8XX_MMIO=y
478# CONFIG_SCSI_IPR is not set
479# CONFIG_SCSI_QLOGIC_FC is not set
480CONFIG_SCSI_QLOGIC_1280=y 526CONFIG_SCSI_QLOGIC_1280=y
481# CONFIG_SCSI_QLA_FC is not set 527# CONFIG_SCSI_QLA_FC is not set
528# CONFIG_SCSI_QLA_ISCSI is not set
482# CONFIG_SCSI_LPFC is not set 529# CONFIG_SCSI_LPFC is not set
483# CONFIG_SCSI_DC395x is not set 530# CONFIG_SCSI_DC395x is not set
484# CONFIG_SCSI_DC390T is not set 531# CONFIG_SCSI_DC390T is not set
485# CONFIG_SCSI_DEBUG is not set 532# CONFIG_SCSI_DEBUG is not set
533# CONFIG_SCSI_SRP is not set
534
535#
536# Serial ATA (prod) and Parallel ATA (experimental) drivers
537#
538# CONFIG_ATA is not set
486 539
487# 540#
488# Multi-device support (RAID and LVM) 541# Multi-device support (RAID and LVM)
@@ -493,11 +546,11 @@ CONFIG_MD_LINEAR=m
493CONFIG_MD_RAID0=m 546CONFIG_MD_RAID0=m
494CONFIG_MD_RAID1=m 547CONFIG_MD_RAID1=m
495# CONFIG_MD_RAID10 is not set 548# CONFIG_MD_RAID10 is not set
496CONFIG_MD_RAID5=m 549# CONFIG_MD_RAID456 is not set
497CONFIG_MD_RAID6=m
498CONFIG_MD_MULTIPATH=m 550CONFIG_MD_MULTIPATH=m
499# CONFIG_MD_FAULTY is not set 551# CONFIG_MD_FAULTY is not set
500CONFIG_BLK_DEV_DM=m 552CONFIG_BLK_DEV_DM=m
553# CONFIG_DM_DEBUG is not set
501CONFIG_DM_CRYPT=m 554CONFIG_DM_CRYPT=m
502CONFIG_DM_SNAPSHOT=m 555CONFIG_DM_SNAPSHOT=m
503CONFIG_DM_MIRROR=m 556CONFIG_DM_MIRROR=m
@@ -587,6 +640,7 @@ CONFIG_E100=m
587# CONFIG_EPIC100 is not set 640# CONFIG_EPIC100 is not set
588# CONFIG_SUNDANCE is not set 641# CONFIG_SUNDANCE is not set
589# CONFIG_VIA_RHINE is not set 642# CONFIG_VIA_RHINE is not set
643# CONFIG_SC92031 is not set
590 644
591# 645#
592# Ethernet (1000 Mbit) 646# Ethernet (1000 Mbit)
@@ -607,13 +661,18 @@ CONFIG_E1000=y
607# CONFIG_VIA_VELOCITY is not set 661# CONFIG_VIA_VELOCITY is not set
608CONFIG_TIGON3=y 662CONFIG_TIGON3=y
609# CONFIG_BNX2 is not set 663# CONFIG_BNX2 is not set
664# CONFIG_QLA3XXX is not set
665# CONFIG_ATL1 is not set
610 666
611# 667#
612# Ethernet (10000 Mbit) 668# Ethernet (10000 Mbit)
613# 669#
614# CONFIG_CHELSIO_T1 is not set 670# CONFIG_CHELSIO_T1 is not set
671# CONFIG_CHELSIO_T3 is not set
615# CONFIG_IXGB is not set 672# CONFIG_IXGB is not set
616# CONFIG_S2IO is not set 673# CONFIG_S2IO is not set
674# CONFIG_MYRI10GE is not set
675# CONFIG_NETXEN_NIC is not set
617 676
618# 677#
619# Token Ring devices 678# Token Ring devices
@@ -655,6 +714,7 @@ CONFIG_NET_POLL_CONTROLLER=y
655# Input device support 714# Input device support
656# 715#
657CONFIG_INPUT=y 716CONFIG_INPUT=y
717# CONFIG_INPUT_FF_MEMLESS is not set
658 718
659# 719#
660# Userland interfaces 720# Userland interfaces
@@ -677,6 +737,7 @@ CONFIG_KEYBOARD_ATKBD=y
677# CONFIG_KEYBOARD_LKKBD is not set 737# CONFIG_KEYBOARD_LKKBD is not set
678# CONFIG_KEYBOARD_XTKBD is not set 738# CONFIG_KEYBOARD_XTKBD is not set
679# CONFIG_KEYBOARD_NEWTON is not set 739# CONFIG_KEYBOARD_NEWTON is not set
740# CONFIG_KEYBOARD_STOWAWAY is not set
680CONFIG_INPUT_MOUSE=y 741CONFIG_INPUT_MOUSE=y
681CONFIG_MOUSE_PS2=y 742CONFIG_MOUSE_PS2=y
682# CONFIG_MOUSE_SERIAL is not set 743# CONFIG_MOUSE_SERIAL is not set
@@ -706,6 +767,7 @@ CONFIG_GAMEPORT=m
706CONFIG_VT=y 767CONFIG_VT=y
707CONFIG_VT_CONSOLE=y 768CONFIG_VT_CONSOLE=y
708CONFIG_HW_CONSOLE=y 769CONFIG_HW_CONSOLE=y
770# CONFIG_VT_HW_CONSOLE_BINDING is not set
709CONFIG_SERIAL_NONSTANDARD=y 771CONFIG_SERIAL_NONSTANDARD=y
710# CONFIG_COMPUTONE is not set 772# CONFIG_COMPUTONE is not set
711# CONFIG_ROCKETPORT is not set 773# CONFIG_ROCKETPORT is not set
@@ -713,12 +775,14 @@ CONFIG_SERIAL_NONSTANDARD=y
713# CONFIG_DIGIEPCA is not set 775# CONFIG_DIGIEPCA is not set
714# CONFIG_MOXA_INTELLIO is not set 776# CONFIG_MOXA_INTELLIO is not set
715# CONFIG_MOXA_SMARTIO is not set 777# CONFIG_MOXA_SMARTIO is not set
778# CONFIG_MOXA_SMARTIO_NEW is not set
716# CONFIG_ISI is not set 779# CONFIG_ISI is not set
717# CONFIG_SYNCLINKMP is not set 780# CONFIG_SYNCLINKMP is not set
718# CONFIG_SYNCLINK_GT is not set 781# CONFIG_SYNCLINK_GT is not set
719# CONFIG_N_HDLC is not set 782# CONFIG_N_HDLC is not set
720# CONFIG_SPECIALIX is not set 783# CONFIG_SPECIALIX is not set
721# CONFIG_SX is not set 784# CONFIG_SX is not set
785# CONFIG_RIO is not set
722# CONFIG_STALDRV is not set 786# CONFIG_STALDRV is not set
723CONFIG_SGI_SNSC=y 787CONFIG_SGI_SNSC=y
724CONFIG_SGI_TIOCX=y 788CONFIG_SGI_TIOCX=y
@@ -729,7 +793,8 @@ CONFIG_SGI_MBCS=m
729# 793#
730CONFIG_SERIAL_8250=y 794CONFIG_SERIAL_8250=y
731CONFIG_SERIAL_8250_CONSOLE=y 795CONFIG_SERIAL_8250_CONSOLE=y
732CONFIG_SERIAL_8250_ACPI=y 796CONFIG_SERIAL_8250_PCI=y
797CONFIG_SERIAL_8250_PNP=y
733CONFIG_SERIAL_8250_NR_UARTS=6 798CONFIG_SERIAL_8250_NR_UARTS=6
734CONFIG_SERIAL_8250_RUNTIME_UARTS=4 799CONFIG_SERIAL_8250_RUNTIME_UARTS=4
735CONFIG_SERIAL_8250_EXTENDED=y 800CONFIG_SERIAL_8250_EXTENDED=y
@@ -764,10 +829,6 @@ CONFIG_EFI_RTC=y
764# CONFIG_DTLK is not set 829# CONFIG_DTLK is not set
765# CONFIG_R3964 is not set 830# CONFIG_R3964 is not set
766# CONFIG_APPLICOM is not set 831# CONFIG_APPLICOM is not set
767
768#
769# Ftape, the floppy tape device driver
770#
771CONFIG_AGP=m 832CONFIG_AGP=m
772CONFIG_AGP_I460=m 833CONFIG_AGP_I460=m
773CONFIG_AGP_HP_ZX1=m 834CONFIG_AGP_HP_ZX1=m
@@ -792,7 +853,6 @@ CONFIG_MMTIMER=y
792# TPM devices 853# TPM devices
793# 854#
794# CONFIG_TCG_TPM is not set 855# CONFIG_TCG_TPM is not set
795# CONFIG_TELCLOCK is not set
796 856
797# 857#
798# I2C support 858# I2C support
@@ -815,16 +875,16 @@ CONFIG_MMTIMER=y
815# 875#
816CONFIG_HWMON=y 876CONFIG_HWMON=y
817# CONFIG_HWMON_VID is not set 877# CONFIG_HWMON_VID is not set
878# CONFIG_SENSORS_ABITUGURU is not set
818# CONFIG_SENSORS_F71805F is not set 879# CONFIG_SENSORS_F71805F is not set
880# CONFIG_SENSORS_PC87427 is not set
881# CONFIG_SENSORS_VT1211 is not set
819# CONFIG_HWMON_DEBUG_CHIP is not set 882# CONFIG_HWMON_DEBUG_CHIP is not set
820 883
821# 884#
822# Misc devices 885# Multifunction device drivers
823#
824
825#
826# Multimedia Capabilities Port drivers
827# 886#
887# CONFIG_MFD_SM501 is not set
828 888
829# 889#
830# Multimedia devices 890# Multimedia devices
@@ -835,16 +895,19 @@ CONFIG_HWMON=y
835# Digital Video Broadcasting Devices 895# Digital Video Broadcasting Devices
836# 896#
837# CONFIG_DVB is not set 897# CONFIG_DVB is not set
898# CONFIG_USB_DABUSB is not set
838 899
839# 900#
840# Graphics support 901# Graphics support
841# 902#
903# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
842# CONFIG_FB is not set 904# CONFIG_FB is not set
843 905
844# 906#
845# Console display driver support 907# Console display driver support
846# 908#
847CONFIG_VGA_CONSOLE=y 909CONFIG_VGA_CONSOLE=y
910# CONFIG_VGACON_SOFT_SCROLLBACK is not set
848CONFIG_DUMMY_CONSOLE=y 911CONFIG_DUMMY_CONSOLE=y
849 912
850# 913#
@@ -865,9 +928,11 @@ CONFIG_SND_SEQ_DUMMY=m
865CONFIG_SND_OSSEMUL=y 928CONFIG_SND_OSSEMUL=y
866CONFIG_SND_MIXER_OSS=m 929CONFIG_SND_MIXER_OSS=m
867CONFIG_SND_PCM_OSS=m 930CONFIG_SND_PCM_OSS=m
931CONFIG_SND_PCM_OSS_PLUGINS=y
868CONFIG_SND_SEQUENCER_OSS=y 932CONFIG_SND_SEQUENCER_OSS=y
869# CONFIG_SND_DYNAMIC_MINORS is not set 933# CONFIG_SND_DYNAMIC_MINORS is not set
870CONFIG_SND_SUPPORT_OLD_API=y 934CONFIG_SND_SUPPORT_OLD_API=y
935CONFIG_SND_VERBOSE_PROCFS=y
871CONFIG_SND_VERBOSE_PRINTK=y 936CONFIG_SND_VERBOSE_PRINTK=y
872# CONFIG_SND_DEBUG is not set 937# CONFIG_SND_DEBUG is not set
873 938
@@ -877,7 +942,6 @@ CONFIG_SND_VERBOSE_PRINTK=y
877CONFIG_SND_MPU401_UART=m 942CONFIG_SND_MPU401_UART=m
878CONFIG_SND_OPL3_LIB=m 943CONFIG_SND_OPL3_LIB=m
879CONFIG_SND_AC97_CODEC=m 944CONFIG_SND_AC97_CODEC=m
880CONFIG_SND_AC97_BUS=m
881CONFIG_SND_DUMMY=m 945CONFIG_SND_DUMMY=m
882CONFIG_SND_VIRMIDI=m 946CONFIG_SND_VIRMIDI=m
883CONFIG_SND_MTPAV=m 947CONFIG_SND_MTPAV=m
@@ -888,6 +952,7 @@ CONFIG_SND_MPU401=m
888# PCI devices 952# PCI devices
889# 953#
890# CONFIG_SND_AD1889 is not set 954# CONFIG_SND_AD1889 is not set
955# CONFIG_SND_ALS300 is not set
891# CONFIG_SND_ALI5451 is not set 956# CONFIG_SND_ALI5451 is not set
892# CONFIG_SND_ATIIXP is not set 957# CONFIG_SND_ATIIXP is not set
893# CONFIG_SND_ATIIXP_MODEM is not set 958# CONFIG_SND_ATIIXP_MODEM is not set
@@ -901,6 +966,18 @@ CONFIG_SND_MPU401=m
901CONFIG_SND_CS4281=m 966CONFIG_SND_CS4281=m
902CONFIG_SND_CS46XX=m 967CONFIG_SND_CS46XX=m
903CONFIG_SND_CS46XX_NEW_DSP=y 968CONFIG_SND_CS46XX_NEW_DSP=y
969# CONFIG_SND_DARLA20 is not set
970# CONFIG_SND_GINA20 is not set
971# CONFIG_SND_LAYLA20 is not set
972# CONFIG_SND_DARLA24 is not set
973# CONFIG_SND_GINA24 is not set
974# CONFIG_SND_LAYLA24 is not set
975# CONFIG_SND_MONA is not set
976# CONFIG_SND_MIA is not set
977# CONFIG_SND_ECHO3G is not set
978# CONFIG_SND_INDIGO is not set
979# CONFIG_SND_INDIGOIO is not set
980# CONFIG_SND_INDIGODJ is not set
904CONFIG_SND_EMU10K1=m 981CONFIG_SND_EMU10K1=m
905# CONFIG_SND_EMU10K1X is not set 982# CONFIG_SND_EMU10K1X is not set
906# CONFIG_SND_ENS1370 is not set 983# CONFIG_SND_ENS1370 is not set
@@ -908,7 +985,7 @@ CONFIG_SND_EMU10K1=m
908# CONFIG_SND_ES1938 is not set 985# CONFIG_SND_ES1938 is not set
909# CONFIG_SND_ES1968 is not set 986# CONFIG_SND_ES1968 is not set
910CONFIG_SND_FM801=m 987CONFIG_SND_FM801=m
911# CONFIG_SND_FM801_TEA575X is not set 988# CONFIG_SND_FM801_TEA575X_BOOL is not set
912# CONFIG_SND_HDA_INTEL is not set 989# CONFIG_SND_HDA_INTEL is not set
913# CONFIG_SND_HDSP is not set 990# CONFIG_SND_HDSP is not set
914# CONFIG_SND_HDSPM is not set 991# CONFIG_SND_HDSPM is not set
@@ -921,6 +998,7 @@ CONFIG_SND_FM801=m
921# CONFIG_SND_MIXART is not set 998# CONFIG_SND_MIXART is not set
922# CONFIG_SND_NM256 is not set 999# CONFIG_SND_NM256 is not set
923# CONFIG_SND_PCXHR is not set 1000# CONFIG_SND_PCXHR is not set
1001# CONFIG_SND_RIPTIDE is not set
924# CONFIG_SND_RME32 is not set 1002# CONFIG_SND_RME32 is not set
925# CONFIG_SND_RME96 is not set 1003# CONFIG_SND_RME96 is not set
926# CONFIG_SND_RME9652 is not set 1004# CONFIG_SND_RME9652 is not set
@@ -930,6 +1008,7 @@ CONFIG_SND_FM801=m
930# CONFIG_SND_VIA82XX_MODEM is not set 1008# CONFIG_SND_VIA82XX_MODEM is not set
931# CONFIG_SND_VX222 is not set 1009# CONFIG_SND_VX222 is not set
932# CONFIG_SND_YMFPCI is not set 1010# CONFIG_SND_YMFPCI is not set
1011# CONFIG_SND_AC97_POWER_SAVE is not set
933 1012
934# 1013#
935# USB devices 1014# USB devices
@@ -937,15 +1016,28 @@ CONFIG_SND_FM801=m
937# CONFIG_SND_USB_AUDIO is not set 1016# CONFIG_SND_USB_AUDIO is not set
938 1017
939# 1018#
1019# SoC audio support
1020#
1021# CONFIG_SND_SOC is not set
1022
1023#
940# Open Sound System 1024# Open Sound System
941# 1025#
942# CONFIG_SOUND_PRIME is not set 1026# CONFIG_SOUND_PRIME is not set
1027CONFIG_AC97_BUS=m
1028
1029#
1030# HID Devices
1031#
1032CONFIG_HID=y
1033# CONFIG_HID_DEBUG is not set
943 1034
944# 1035#
945# USB support 1036# USB support
946# 1037#
947CONFIG_USB_ARCH_HAS_HCD=y 1038CONFIG_USB_ARCH_HAS_HCD=y
948CONFIG_USB_ARCH_HAS_OHCI=y 1039CONFIG_USB_ARCH_HAS_OHCI=y
1040CONFIG_USB_ARCH_HAS_EHCI=y
949CONFIG_USB=m 1041CONFIG_USB=m
950# CONFIG_USB_DEBUG is not set 1042# CONFIG_USB_DEBUG is not set
951 1043
@@ -953,7 +1045,6 @@ CONFIG_USB=m
953# Miscellaneous USB options 1045# Miscellaneous USB options
954# 1046#
955CONFIG_USB_DEVICEFS=y 1047CONFIG_USB_DEVICEFS=y
956# CONFIG_USB_BANDWIDTH is not set
957# CONFIG_USB_DYNAMIC_MINORS is not set 1048# CONFIG_USB_DYNAMIC_MINORS is not set
958# CONFIG_USB_SUSPEND is not set 1049# CONFIG_USB_SUSPEND is not set
959# CONFIG_USB_OTG is not set 1050# CONFIG_USB_OTG is not set
@@ -964,9 +1055,12 @@ CONFIG_USB_DEVICEFS=y
964CONFIG_USB_EHCI_HCD=m 1055CONFIG_USB_EHCI_HCD=m
965# CONFIG_USB_EHCI_SPLIT_ISO is not set 1056# CONFIG_USB_EHCI_SPLIT_ISO is not set
966# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1057# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1058# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1059# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
967# CONFIG_USB_ISP116X_HCD is not set 1060# CONFIG_USB_ISP116X_HCD is not set
968CONFIG_USB_OHCI_HCD=m 1061CONFIG_USB_OHCI_HCD=m
969# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1062# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1063# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
970CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1064CONFIG_USB_OHCI_LITTLE_ENDIAN=y
971CONFIG_USB_UHCI_HCD=m 1065CONFIG_USB_UHCI_HCD=m
972# CONFIG_USB_SL811_HCD is not set 1066# CONFIG_USB_SL811_HCD is not set
@@ -974,7 +1068,6 @@ CONFIG_USB_UHCI_HCD=m
974# 1068#
975# USB Device Class drivers 1069# USB Device Class drivers
976# 1070#
977# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
978# CONFIG_USB_ACM is not set 1071# CONFIG_USB_ACM is not set
979# CONFIG_USB_PRINTER is not set 1072# CONFIG_USB_PRINTER is not set
980 1073
@@ -996,13 +1089,13 @@ CONFIG_USB_STORAGE=m
996# CONFIG_USB_STORAGE_SDDR55 is not set 1089# CONFIG_USB_STORAGE_SDDR55 is not set
997# CONFIG_USB_STORAGE_JUMPSHOT is not set 1090# CONFIG_USB_STORAGE_JUMPSHOT is not set
998# CONFIG_USB_STORAGE_ALAUDA is not set 1091# CONFIG_USB_STORAGE_ALAUDA is not set
1092# CONFIG_USB_STORAGE_KARMA is not set
999# CONFIG_USB_LIBUSUAL is not set 1093# CONFIG_USB_LIBUSUAL is not set
1000 1094
1001# 1095#
1002# USB Input Devices 1096# USB Input Devices
1003# 1097#
1004CONFIG_USB_HID=m 1098CONFIG_USB_HID=m
1005CONFIG_USB_HIDINPUT=y
1006# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1099# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1007# CONFIG_HID_FF is not set 1100# CONFIG_HID_FF is not set
1008# CONFIG_USB_HIDDEV is not set 1101# CONFIG_USB_HIDDEV is not set
@@ -1017,15 +1110,14 @@ CONFIG_USB_HIDINPUT=y
1017# CONFIG_USB_ACECAD is not set 1110# CONFIG_USB_ACECAD is not set
1018# CONFIG_USB_KBTAB is not set 1111# CONFIG_USB_KBTAB is not set
1019# CONFIG_USB_POWERMATE is not set 1112# CONFIG_USB_POWERMATE is not set
1020# CONFIG_USB_MTOUCH is not set 1113# CONFIG_USB_TOUCHSCREEN is not set
1021# CONFIG_USB_ITMTOUCH is not set
1022# CONFIG_USB_EGALAX is not set
1023# CONFIG_USB_YEALINK is not set 1114# CONFIG_USB_YEALINK is not set
1024# CONFIG_USB_XPAD is not set 1115# CONFIG_USB_XPAD is not set
1025# CONFIG_USB_ATI_REMOTE is not set 1116# CONFIG_USB_ATI_REMOTE is not set
1026# CONFIG_USB_ATI_REMOTE2 is not set 1117# CONFIG_USB_ATI_REMOTE2 is not set
1027# CONFIG_USB_KEYSPAN_REMOTE is not set 1118# CONFIG_USB_KEYSPAN_REMOTE is not set
1028# CONFIG_USB_APPLETOUCH is not set 1119# CONFIG_USB_APPLETOUCH is not set
1120# CONFIG_USB_GTCO is not set
1029 1121
1030# 1122#
1031# USB Imaging devices 1123# USB Imaging devices
@@ -1034,21 +1126,13 @@ CONFIG_USB_HIDINPUT=y
1034# CONFIG_USB_MICROTEK is not set 1126# CONFIG_USB_MICROTEK is not set
1035 1127
1036# 1128#
1037# USB Multimedia devices
1038#
1039# CONFIG_USB_DABUSB is not set
1040
1041#
1042# Video4Linux support is needed for USB Multimedia device support
1043#
1044
1045#
1046# USB Network Adapters 1129# USB Network Adapters
1047# 1130#
1048# CONFIG_USB_CATC is not set 1131# CONFIG_USB_CATC is not set
1049# CONFIG_USB_KAWETH is not set 1132# CONFIG_USB_KAWETH is not set
1050# CONFIG_USB_PEGASUS is not set 1133# CONFIG_USB_PEGASUS is not set
1051# CONFIG_USB_RTL8150 is not set 1134# CONFIG_USB_RTL8150 is not set
1135# CONFIG_USB_USBNET_MII is not set
1052# CONFIG_USB_USBNET is not set 1136# CONFIG_USB_USBNET is not set
1053CONFIG_USB_MON=y 1137CONFIG_USB_MON=y
1054 1138
@@ -1066,17 +1150,23 @@ CONFIG_USB_MON=y
1066# 1150#
1067# CONFIG_USB_EMI62 is not set 1151# CONFIG_USB_EMI62 is not set
1068# CONFIG_USB_EMI26 is not set 1152# CONFIG_USB_EMI26 is not set
1153# CONFIG_USB_ADUTUX is not set
1069# CONFIG_USB_AUERSWALD is not set 1154# CONFIG_USB_AUERSWALD is not set
1070# CONFIG_USB_RIO500 is not set 1155# CONFIG_USB_RIO500 is not set
1071# CONFIG_USB_LEGOTOWER is not set 1156# CONFIG_USB_LEGOTOWER is not set
1072# CONFIG_USB_LCD is not set 1157# CONFIG_USB_LCD is not set
1158# CONFIG_USB_BERRY_CHARGE is not set
1073# CONFIG_USB_LED is not set 1159# CONFIG_USB_LED is not set
1160# CONFIG_USB_CYPRESS_CY7C63 is not set
1074# CONFIG_USB_CYTHERM is not set 1161# CONFIG_USB_CYTHERM is not set
1075# CONFIG_USB_PHIDGETKIT is not set 1162# CONFIG_USB_PHIDGET is not set
1076# CONFIG_USB_PHIDGETSERVO is not set
1077# CONFIG_USB_IDMOUSE is not set 1163# CONFIG_USB_IDMOUSE is not set
1164# CONFIG_USB_FTDI_ELAN is not set
1165# CONFIG_USB_APPLEDISPLAY is not set
1078# CONFIG_USB_SISUSBVGA is not set 1166# CONFIG_USB_SISUSBVGA is not set
1079# CONFIG_USB_LD is not set 1167# CONFIG_USB_LD is not set
1168# CONFIG_USB_TRANCEVIBRATOR is not set
1169# CONFIG_USB_IOWARRIOR is not set
1080# CONFIG_USB_TEST is not set 1170# CONFIG_USB_TEST is not set
1081 1171
1082# 1172#
@@ -1094,26 +1184,65 @@ CONFIG_USB_MON=y
1094# CONFIG_MMC is not set 1184# CONFIG_MMC is not set
1095 1185
1096# 1186#
1187# LED devices
1188#
1189# CONFIG_NEW_LEDS is not set
1190
1191#
1192# LED drivers
1193#
1194
1195#
1196# LED Triggers
1197#
1198
1199#
1097# InfiniBand support 1200# InfiniBand support
1098# 1201#
1099CONFIG_INFINIBAND=m 1202CONFIG_INFINIBAND=m
1100# CONFIG_INFINIBAND_USER_MAD is not set 1203# CONFIG_INFINIBAND_USER_MAD is not set
1101# CONFIG_INFINIBAND_USER_ACCESS is not set 1204# CONFIG_INFINIBAND_USER_ACCESS is not set
1205CONFIG_INFINIBAND_ADDR_TRANS=y
1102CONFIG_INFINIBAND_MTHCA=m 1206CONFIG_INFINIBAND_MTHCA=m
1103# CONFIG_INFINIBAND_MTHCA_DEBUG is not set 1207CONFIG_INFINIBAND_MTHCA_DEBUG=y
1208# CONFIG_INFINIBAND_AMSO1100 is not set
1104CONFIG_INFINIBAND_IPOIB=m 1209CONFIG_INFINIBAND_IPOIB=m
1105# CONFIG_INFINIBAND_IPOIB_DEBUG is not set 1210# CONFIG_INFINIBAND_IPOIB_CM is not set
1211CONFIG_INFINIBAND_IPOIB_DEBUG=y
1212# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
1106# CONFIG_INFINIBAND_SRP is not set 1213# CONFIG_INFINIBAND_SRP is not set
1214# CONFIG_INFINIBAND_ISER is not set
1107 1215
1108# 1216#
1109# SN Devices 1217# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1218#
1219
1220#
1221# Real Time Clock
1222#
1223# CONFIG_RTC_CLASS is not set
1224
1225#
1226# DMA Engine support
1227#
1228# CONFIG_DMA_ENGINE is not set
1229
1230#
1231# DMA Clients
1232#
1233
1234#
1235# DMA Devices
1236#
1237
1238#
1239# Auxiliary Display support
1110# 1240#
1111CONFIG_SGI_IOC4=y
1112CONFIG_SGI_IOC3=m
1113 1241
1114# 1242#
1115# EDAC - error detection and reporting (RAS) 1243# Virtualization
1116# 1244#
1245# CONFIG_MSPEC is not set
1117 1246
1118# 1247#
1119# File systems 1248# File systems
@@ -1127,6 +1256,7 @@ CONFIG_EXT3_FS=y
1127CONFIG_EXT3_FS_XATTR=y 1256CONFIG_EXT3_FS_XATTR=y
1128CONFIG_EXT3_FS_POSIX_ACL=y 1257CONFIG_EXT3_FS_POSIX_ACL=y
1129CONFIG_EXT3_FS_SECURITY=y 1258CONFIG_EXT3_FS_SECURITY=y
1259# CONFIG_EXT4DEV_FS is not set
1130CONFIG_JBD=y 1260CONFIG_JBD=y
1131# CONFIG_JBD_DEBUG is not set 1261# CONFIG_JBD_DEBUG is not set
1132CONFIG_FS_MBCACHE=y 1262CONFIG_FS_MBCACHE=y
@@ -1139,15 +1269,16 @@ CONFIG_REISERFS_FS_SECURITY=y
1139# CONFIG_JFS_FS is not set 1269# CONFIG_JFS_FS is not set
1140CONFIG_FS_POSIX_ACL=y 1270CONFIG_FS_POSIX_ACL=y
1141CONFIG_XFS_FS=y 1271CONFIG_XFS_FS=y
1142CONFIG_XFS_EXPORT=y
1143# CONFIG_XFS_QUOTA is not set 1272# CONFIG_XFS_QUOTA is not set
1144# CONFIG_XFS_SECURITY is not set 1273# CONFIG_XFS_SECURITY is not set
1145# CONFIG_XFS_POSIX_ACL is not set 1274# CONFIG_XFS_POSIX_ACL is not set
1146# CONFIG_XFS_RT is not set 1275# CONFIG_XFS_RT is not set
1276# CONFIG_GFS2_FS is not set
1147# CONFIG_OCFS2_FS is not set 1277# CONFIG_OCFS2_FS is not set
1148# CONFIG_MINIX_FS is not set 1278# CONFIG_MINIX_FS is not set
1149# CONFIG_ROMFS_FS is not set 1279# CONFIG_ROMFS_FS is not set
1150CONFIG_INOTIFY=y 1280CONFIG_INOTIFY=y
1281CONFIG_INOTIFY_USER=y
1151# CONFIG_QUOTA is not set 1282# CONFIG_QUOTA is not set
1152CONFIG_DNOTIFY=y 1283CONFIG_DNOTIFY=y
1153CONFIG_AUTOFS_FS=y 1284CONFIG_AUTOFS_FS=y
@@ -1180,12 +1311,14 @@ CONFIG_NTFS_FS=m
1180# 1311#
1181CONFIG_PROC_FS=y 1312CONFIG_PROC_FS=y
1182CONFIG_PROC_KCORE=y 1313CONFIG_PROC_KCORE=y
1314CONFIG_PROC_VMCORE=y
1315CONFIG_PROC_SYSCTL=y
1183CONFIG_SYSFS=y 1316CONFIG_SYSFS=y
1184CONFIG_TMPFS=y 1317CONFIG_TMPFS=y
1318# CONFIG_TMPFS_POSIX_ACL is not set
1185CONFIG_HUGETLBFS=y 1319CONFIG_HUGETLBFS=y
1186CONFIG_HUGETLB_PAGE=y 1320CONFIG_HUGETLB_PAGE=y
1187CONFIG_RAMFS=y 1321CONFIG_RAMFS=y
1188# CONFIG_RELAYFS_FS is not set
1189# CONFIG_CONFIGFS_FS is not set 1322# CONFIG_CONFIGFS_FS is not set
1190 1323
1191# 1324#
@@ -1220,7 +1353,7 @@ CONFIG_NFSD_V4=y
1220CONFIG_NFSD_TCP=y 1353CONFIG_NFSD_TCP=y
1221CONFIG_LOCKD=m 1354CONFIG_LOCKD=m
1222CONFIG_LOCKD_V4=y 1355CONFIG_LOCKD_V4=y
1223CONFIG_EXPORTFS=y 1356CONFIG_EXPORTFS=m
1224CONFIG_NFS_COMMON=y 1357CONFIG_NFS_COMMON=y
1225CONFIG_SUNRPC=m 1358CONFIG_SUNRPC=m
1226CONFIG_SUNRPC_GSS=m 1359CONFIG_SUNRPC_GSS=m
@@ -1231,7 +1364,9 @@ CONFIG_SMB_NLS_DEFAULT=y
1231CONFIG_SMB_NLS_REMOTE="cp437" 1364CONFIG_SMB_NLS_REMOTE="cp437"
1232CONFIG_CIFS=m 1365CONFIG_CIFS=m
1233# CONFIG_CIFS_STATS is not set 1366# CONFIG_CIFS_STATS is not set
1367# CONFIG_CIFS_WEAK_PW_HASH is not set
1234# CONFIG_CIFS_XATTR is not set 1368# CONFIG_CIFS_XATTR is not set
1369# CONFIG_CIFS_DEBUG2 is not set
1235# CONFIG_CIFS_EXPERIMENTAL is not set 1370# CONFIG_CIFS_EXPERIMENTAL is not set
1236# CONFIG_NCP_FS is not set 1371# CONFIG_NCP_FS is not set
1237# CONFIG_CODA_FS is not set 1372# CONFIG_CODA_FS is not set
@@ -1304,15 +1439,25 @@ CONFIG_NLS_KOI8_U=m
1304CONFIG_NLS_UTF8=m 1439CONFIG_NLS_UTF8=m
1305 1440
1306# 1441#
1442# Distributed Lock Manager
1443#
1444# CONFIG_DLM is not set
1445
1446#
1307# Library routines 1447# Library routines
1308# 1448#
1449CONFIG_BITREVERSE=y
1309# CONFIG_CRC_CCITT is not set 1450# CONFIG_CRC_CCITT is not set
1310# CONFIG_CRC16 is not set 1451# CONFIG_CRC16 is not set
1311CONFIG_CRC32=y 1452CONFIG_CRC32=y
1312# CONFIG_LIBCRC32C is not set 1453# CONFIG_LIBCRC32C is not set
1454CONFIG_PLIST=y
1455CONFIG_HAS_IOMEM=y
1456CONFIG_HAS_IOPORT=y
1313CONFIG_GENERIC_HARDIRQS=y 1457CONFIG_GENERIC_HARDIRQS=y
1314CONFIG_GENERIC_IRQ_PROBE=y 1458CONFIG_GENERIC_IRQ_PROBE=y
1315CONFIG_GENERIC_PENDING_IRQ=y 1459CONFIG_GENERIC_PENDING_IRQ=y
1460CONFIG_IRQ_PER_CPU=y
1316 1461
1317# 1462#
1318# HP Simulator drivers 1463# HP Simulator drivers
@@ -1331,21 +1476,31 @@ CONFIG_GENERIC_PENDING_IRQ=y
1331# Kernel hacking 1476# Kernel hacking
1332# 1477#
1333# CONFIG_PRINTK_TIME is not set 1478# CONFIG_PRINTK_TIME is not set
1479CONFIG_ENABLE_MUST_CHECK=y
1334CONFIG_MAGIC_SYSRQ=y 1480CONFIG_MAGIC_SYSRQ=y
1481# CONFIG_UNUSED_SYMBOLS is not set
1482# CONFIG_DEBUG_FS is not set
1483# CONFIG_HEADERS_CHECK is not set
1335CONFIG_DEBUG_KERNEL=y 1484CONFIG_DEBUG_KERNEL=y
1485# CONFIG_DEBUG_SHIRQ is not set
1336CONFIG_LOG_BUF_SHIFT=20 1486CONFIG_LOG_BUF_SHIFT=20
1337CONFIG_DETECT_SOFTLOCKUP=y 1487CONFIG_DETECT_SOFTLOCKUP=y
1338# CONFIG_SCHEDSTATS is not set 1488# CONFIG_SCHEDSTATS is not set
1489# CONFIG_TIMER_STATS is not set
1339# CONFIG_DEBUG_SLAB is not set 1490# CONFIG_DEBUG_SLAB is not set
1340CONFIG_DEBUG_MUTEXES=y 1491# CONFIG_DEBUG_RT_MUTEXES is not set
1492# CONFIG_RT_MUTEX_TESTER is not set
1341# CONFIG_DEBUG_SPINLOCK is not set 1493# CONFIG_DEBUG_SPINLOCK is not set
1494CONFIG_DEBUG_MUTEXES=y
1342# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1495# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1496# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1343# CONFIG_DEBUG_KOBJECT is not set 1497# CONFIG_DEBUG_KOBJECT is not set
1344# CONFIG_DEBUG_INFO is not set 1498# CONFIG_DEBUG_INFO is not set
1345# CONFIG_DEBUG_FS is not set
1346# CONFIG_DEBUG_VM is not set 1499# CONFIG_DEBUG_VM is not set
1500# CONFIG_DEBUG_LIST is not set
1347CONFIG_FORCED_INLINING=y 1501CONFIG_FORCED_INLINING=y
1348# CONFIG_RCU_TORTURE_TEST is not set 1502# CONFIG_RCU_TORTURE_TEST is not set
1503# CONFIG_FAULT_INJECTION is not set
1349CONFIG_IA64_GRANULE_16MB=y 1504CONFIG_IA64_GRANULE_16MB=y
1350# CONFIG_IA64_GRANULE_64MB is not set 1505# CONFIG_IA64_GRANULE_64MB is not set
1351# CONFIG_IA64_PRINT_HAZARDS is not set 1506# CONFIG_IA64_PRINT_HAZARDS is not set
@@ -1364,7 +1519,11 @@ CONFIG_SYSVIPC_COMPAT=y
1364# Cryptographic options 1519# Cryptographic options
1365# 1520#
1366CONFIG_CRYPTO=y 1521CONFIG_CRYPTO=y
1522CONFIG_CRYPTO_ALGAPI=y
1523CONFIG_CRYPTO_BLKCIPHER=m
1524CONFIG_CRYPTO_MANAGER=m
1367# CONFIG_CRYPTO_HMAC is not set 1525# CONFIG_CRYPTO_HMAC is not set
1526# CONFIG_CRYPTO_XCBC is not set
1368# CONFIG_CRYPTO_NULL is not set 1527# CONFIG_CRYPTO_NULL is not set
1369# CONFIG_CRYPTO_MD4 is not set 1528# CONFIG_CRYPTO_MD4 is not set
1370CONFIG_CRYPTO_MD5=y 1529CONFIG_CRYPTO_MD5=y
@@ -1373,7 +1532,13 @@ CONFIG_CRYPTO_MD5=y
1373# CONFIG_CRYPTO_SHA512 is not set 1532# CONFIG_CRYPTO_SHA512 is not set
1374# CONFIG_CRYPTO_WP512 is not set 1533# CONFIG_CRYPTO_WP512 is not set
1375# CONFIG_CRYPTO_TGR192 is not set 1534# CONFIG_CRYPTO_TGR192 is not set
1535# CONFIG_CRYPTO_GF128MUL is not set
1536CONFIG_CRYPTO_ECB=m
1537CONFIG_CRYPTO_CBC=m
1538CONFIG_CRYPTO_PCBC=m
1539# CONFIG_CRYPTO_LRW is not set
1376CONFIG_CRYPTO_DES=m 1540CONFIG_CRYPTO_DES=m
1541# CONFIG_CRYPTO_FCRYPT is not set
1377# CONFIG_CRYPTO_BLOWFISH is not set 1542# CONFIG_CRYPTO_BLOWFISH is not set
1378# CONFIG_CRYPTO_TWOFISH is not set 1543# CONFIG_CRYPTO_TWOFISH is not set
1379# CONFIG_CRYPTO_SERPENT is not set 1544# CONFIG_CRYPTO_SERPENT is not set
@@ -1387,6 +1552,7 @@ CONFIG_CRYPTO_DES=m
1387# CONFIG_CRYPTO_DEFLATE is not set 1552# CONFIG_CRYPTO_DEFLATE is not set
1388# CONFIG_CRYPTO_MICHAEL_MIC is not set 1553# CONFIG_CRYPTO_MICHAEL_MIC is not set
1389# CONFIG_CRYPTO_CRC32C is not set 1554# CONFIG_CRYPTO_CRC32C is not set
1555# CONFIG_CRYPTO_CAMELLIA is not set
1390# CONFIG_CRYPTO_TEST is not set 1556# CONFIG_CRYPTO_TEST is not set
1391 1557
1392# 1558#
diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c
index a5a5637507be..2153bcacbe6c 100644
--- a/arch/ia64/hp/common/hwsw_iommu.c
+++ b/arch/ia64/hp/common/hwsw_iommu.c
@@ -192,3 +192,7 @@ EXPORT_SYMBOL(hwsw_unmap_sg);
192EXPORT_SYMBOL(hwsw_dma_supported); 192EXPORT_SYMBOL(hwsw_dma_supported);
193EXPORT_SYMBOL(hwsw_alloc_coherent); 193EXPORT_SYMBOL(hwsw_alloc_coherent);
194EXPORT_SYMBOL(hwsw_free_coherent); 194EXPORT_SYMBOL(hwsw_free_coherent);
195EXPORT_SYMBOL(hwsw_sync_single_for_cpu);
196EXPORT_SYMBOL(hwsw_sync_single_for_device);
197EXPORT_SYMBOL(hwsw_sync_sg_for_cpu);
198EXPORT_SYMBOL(hwsw_sync_sg_for_device);
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index ce49fe3a3b56..c1dca226b479 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -1881,7 +1881,7 @@ ioc_open(struct inode *inode, struct file *file)
1881 return seq_open(file, &ioc_seq_ops); 1881 return seq_open(file, &ioc_seq_ops);
1882} 1882}
1883 1883
1884static struct file_operations ioc_fops = { 1884static const struct file_operations ioc_fops = {
1885 .open = ioc_open, 1885 .open = ioc_open,
1886 .read = seq_read, 1886 .read = seq_read,
1887 .llseek = seq_lseek, 1887 .llseek = seq_lseek,
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index 424e9257c9a0..f26077a773d5 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -427,7 +427,6 @@ make_new_skb(struct net_device *dev)
427 printk(KERN_NOTICE "%s: memory squeeze. dropping packet.\n", dev->name); 427 printk(KERN_NOTICE "%s: memory squeeze. dropping packet.\n", dev->name);
428 return NULL; 428 return NULL;
429 } 429 }
430 nskb->dev = dev;
431 430
432 skb_reserve(nskb, 2); /* Align IP on 16 byte boundaries */ 431 skb_reserve(nskb, 2); /* Align IP on 16 byte boundaries */
433 432
@@ -474,7 +473,7 @@ simeth_rx(struct net_device *dev)
474 * XXX Fix me 473 * XXX Fix me
475 * Should really do a csum+copy here 474 * Should really do a csum+copy here
476 */ 475 */
477 memcpy(skb->data, frame, len); 476 skb_copy_to_linear_data(skb, frame, len);
478#endif 477#endif
479 skb->protocol = eth_type_trans(skb, dev); 478 skb->protocol = eth_type_trans(skb, dev);
480 479
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
index 578737ec7629..c05bda662364 100644
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -91,9 +91,8 @@ ia64_elf32_init (struct pt_regs *regs)
91 * it with privilege level 3 because the IVE uses non-privileged accesses to these 91 * it with privilege level 3 because the IVE uses non-privileged accesses to these
92 * tables. IA-32 segmentation is used to protect against IA-32 accesses to them. 92 * tables. IA-32 segmentation is used to protect against IA-32 accesses to them.
93 */ 93 */
94 vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); 94 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
95 if (vma) { 95 if (vma) {
96 memset(vma, 0, sizeof(*vma));
97 vma->vm_mm = current->mm; 96 vma->vm_mm = current->mm;
98 vma->vm_start = IA32_GDT_OFFSET; 97 vma->vm_start = IA32_GDT_OFFSET;
99 vma->vm_end = vma->vm_start + PAGE_SIZE; 98 vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -117,9 +116,8 @@ ia64_elf32_init (struct pt_regs *regs)
117 * code is locked in specific gate page, which is pointed by pretcode 116 * code is locked in specific gate page, which is pointed by pretcode
118 * when setup_frame_ia32 117 * when setup_frame_ia32
119 */ 118 */
120 vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); 119 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
121 if (vma) { 120 if (vma) {
122 memset(vma, 0, sizeof(*vma));
123 vma->vm_mm = current->mm; 121 vma->vm_mm = current->mm;
124 vma->vm_start = IA32_GATE_OFFSET; 122 vma->vm_start = IA32_GATE_OFFSET;
125 vma->vm_end = vma->vm_start + PAGE_SIZE; 123 vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -142,9 +140,8 @@ ia64_elf32_init (struct pt_regs *regs)
142 * Install LDT as anonymous memory. This gives us all-zero segment descriptors 140 * Install LDT as anonymous memory. This gives us all-zero segment descriptors
143 * until a task modifies them via modify_ldt(). 141 * until a task modifies them via modify_ldt().
144 */ 142 */
145 vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); 143 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
146 if (vma) { 144 if (vma) {
147 memset(vma, 0, sizeof(*vma));
148 vma->vm_mm = current->mm; 145 vma->vm_mm = current->mm;
149 vma->vm_start = IA32_LDT_OFFSET; 146 vma->vm_start = IA32_LDT_OFFSET;
150 vma->vm_end = vma->vm_start + PAGE_ALIGN(IA32_LDT_ENTRIES*IA32_LDT_ENTRY_SIZE); 147 vma->vm_end = vma->vm_start + PAGE_ALIGN(IA32_LDT_ENTRIES*IA32_LDT_ENTRY_SIZE);
@@ -214,12 +211,10 @@ ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
214 bprm->loader += stack_base; 211 bprm->loader += stack_base;
215 bprm->exec += stack_base; 212 bprm->exec += stack_base;
216 213
217 mpnt = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); 214 mpnt = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
218 if (!mpnt) 215 if (!mpnt)
219 return -ENOMEM; 216 return -ENOMEM;
220 217
221 memset(mpnt, 0, sizeof(*mpnt));
222
223 down_write(&current->mm->mmap_sem); 218 down_write(&current->mm->mmap_sem);
224 { 219 {
225 mpnt->vm_mm = current->mm; 220 mpnt->vm_mm = current->mm;
diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S
index a32cd59b81ed..687e5fdc9683 100644
--- a/arch/ia64/ia32/ia32_entry.S
+++ b/arch/ia64/ia32/ia32_entry.S
@@ -326,7 +326,7 @@ ia32_syscall_table:
326 data8 sys_ni_syscall 326 data8 sys_ni_syscall
327 data8 compat_sys_wait4 327 data8 compat_sys_wait4
328 data8 sys_swapoff /* 115 */ 328 data8 sys_swapoff /* 115 */
329 data8 sys32_sysinfo 329 data8 compat_sys_sysinfo
330 data8 sys32_ipc 330 data8 sys32_ipc
331 data8 sys_fsync 331 data8 sys_fsync
332 data8 sys32_sigreturn 332 data8 sys32_sigreturn
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index 957681c39ad9..0afb4fe7c35b 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -1267,6 +1267,10 @@ sys32_getdents (unsigned int fd, struct compat_dirent __user *dirent, unsigned i
1267 struct getdents32_callback buf; 1267 struct getdents32_callback buf;
1268 int error; 1268 int error;
1269 1269
1270 error = -EFAULT;
1271 if (!access_ok(VERIFY_WRITE, dirent, count))
1272 goto out;
1273
1270 error = -EBADF; 1274 error = -EBADF;
1271 file = fget(fd); 1275 file = fget(fd);
1272 if (!file) 1276 if (!file)
@@ -1283,10 +1287,10 @@ sys32_getdents (unsigned int fd, struct compat_dirent __user *dirent, unsigned i
1283 error = buf.error; 1287 error = buf.error;
1284 lastdirent = buf.previous; 1288 lastdirent = buf.previous;
1285 if (lastdirent) { 1289 if (lastdirent) {
1286 error = -EINVAL;
1287 if (put_user(file->f_pos, &lastdirent->d_off)) 1290 if (put_user(file->f_pos, &lastdirent->d_off))
1288 goto out_putf; 1291 error = -EFAULT;
1289 error = count - buf.count; 1292 else
1293 error = count - buf.count;
1290 } 1294 }
1291 1295
1292out_putf: 1296out_putf:
@@ -2209,74 +2213,6 @@ sys32_fstat64 (unsigned int fd, struct stat64 __user *statbuf)
2209 return ret; 2213 return ret;
2210} 2214}
2211 2215
2212struct sysinfo32 {
2213 s32 uptime;
2214 u32 loads[3];
2215 u32 totalram;
2216 u32 freeram;
2217 u32 sharedram;
2218 u32 bufferram;
2219 u32 totalswap;
2220 u32 freeswap;
2221 u16 procs;
2222 u16 pad;
2223 u32 totalhigh;
2224 u32 freehigh;
2225 u32 mem_unit;
2226 char _f[8];
2227};
2228
2229asmlinkage long
2230sys32_sysinfo (struct sysinfo32 __user *info)
2231{
2232 struct sysinfo s;
2233 long ret, err;
2234 int bitcount = 0;
2235 mm_segment_t old_fs = get_fs();
2236
2237 set_fs(KERNEL_DS);
2238 ret = sys_sysinfo((struct sysinfo __user *) &s);
2239 set_fs(old_fs);
2240 /* Check to see if any memory value is too large for 32-bit and
2241 * scale down if needed.
2242 */
2243 if ((s.totalram >> 32) || (s.totalswap >> 32)) {
2244 while (s.mem_unit < PAGE_SIZE) {
2245 s.mem_unit <<= 1;
2246 bitcount++;
2247 }
2248 s.totalram >>= bitcount;
2249 s.freeram >>= bitcount;
2250 s.sharedram >>= bitcount;
2251 s.bufferram >>= bitcount;
2252 s.totalswap >>= bitcount;
2253 s.freeswap >>= bitcount;
2254 s.totalhigh >>= bitcount;
2255 s.freehigh >>= bitcount;
2256 }
2257
2258 if (!access_ok(VERIFY_WRITE, info, sizeof(*info)))
2259 return -EFAULT;
2260
2261 err = __put_user(s.uptime, &info->uptime);
2262 err |= __put_user(s.loads[0], &info->loads[0]);
2263 err |= __put_user(s.loads[1], &info->loads[1]);
2264 err |= __put_user(s.loads[2], &info->loads[2]);
2265 err |= __put_user(s.totalram, &info->totalram);
2266 err |= __put_user(s.freeram, &info->freeram);
2267 err |= __put_user(s.sharedram, &info->sharedram);
2268 err |= __put_user(s.bufferram, &info->bufferram);
2269 err |= __put_user(s.totalswap, &info->totalswap);
2270 err |= __put_user(s.freeswap, &info->freeswap);
2271 err |= __put_user(s.procs, &info->procs);
2272 err |= __put_user (s.totalhigh, &info->totalhigh);
2273 err |= __put_user (s.freehigh, &info->freehigh);
2274 err |= __put_user (s.mem_unit, &info->mem_unit);
2275 if (err)
2276 return -EFAULT;
2277 return ret;
2278}
2279
2280asmlinkage long 2216asmlinkage long
2281sys32_sched_rr_get_interval (pid_t pid, struct compat_timespec __user *interval) 2217sys32_sched_rr_get_interval (pid_t pid, struct compat_timespec __user *interval)
2282{ 2218{
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index 098ee605bf5e..33e5a598672d 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o
34obj-$(CONFIG_AUDIT) += audit.o 34obj-$(CONFIG_AUDIT) += audit.o
35obj-$(CONFIG_PCI_MSI) += msi_ia64.o 35obj-$(CONFIG_PCI_MSI) += msi_ia64.o
36mca_recovery-y += mca_drv.o mca_drv_asm.o 36mca_recovery-y += mca_drv.o mca_drv_asm.o
37obj-$(CONFIG_IA64_MC_ERR_INJECT)+= err_inject.o
37 38
38obj-$(CONFIG_IA64_ESI) += esi.o 39obj-$(CONFIG_IA64_ESI) += esi.o
39ifneq ($(CONFIG_IA64_ESI),) 40ifneq ($(CONFIG_IA64_ESI),)
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 29f05d4b68cd..3549c94467b8 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -55,7 +55,7 @@
55 55
56#define BAD_MADT_ENTRY(entry, end) ( \ 56#define BAD_MADT_ENTRY(entry, end) ( \
57 (!entry) || (unsigned long)entry + sizeof(*entry) > end || \ 57 (!entry) || (unsigned long)entry + sizeof(*entry) > end || \
58 ((acpi_table_entry_header *)entry)->length < sizeof(*entry)) 58 ((struct acpi_subtable_header *)entry)->length < sizeof(*entry))
59 59
60#define PREFIX "ACPI: " 60#define PREFIX "ACPI: "
61 61
@@ -67,16 +67,11 @@ EXPORT_SYMBOL(pm_power_off);
67unsigned int acpi_cpei_override; 67unsigned int acpi_cpei_override;
68unsigned int acpi_cpei_phys_cpuid; 68unsigned int acpi_cpei_phys_cpuid;
69 69
70#define MAX_SAPICS 256
71u16 ia64_acpiid_to_sapicid[MAX_SAPICS] = {[0 ... MAX_SAPICS - 1] = -1 };
72
73EXPORT_SYMBOL(ia64_acpiid_to_sapicid);
74
75const char *acpi_get_sysname(void) 70const char *acpi_get_sysname(void)
76{ 71{
77#ifdef CONFIG_IA64_GENERIC 72#ifdef CONFIG_IA64_GENERIC
78 unsigned long rsdp_phys; 73 unsigned long rsdp_phys;
79 struct acpi20_table_rsdp *rsdp; 74 struct acpi_table_rsdp *rsdp;
80 struct acpi_table_xsdt *xsdt; 75 struct acpi_table_xsdt *xsdt;
81 struct acpi_table_header *hdr; 76 struct acpi_table_header *hdr;
82 77
@@ -87,16 +82,16 @@ const char *acpi_get_sysname(void)
87 return "dig"; 82 return "dig";
88 } 83 }
89 84
90 rsdp = (struct acpi20_table_rsdp *)__va(rsdp_phys); 85 rsdp = (struct acpi_table_rsdp *)__va(rsdp_phys);
91 if (strncmp(rsdp->signature, RSDP_SIG, sizeof(RSDP_SIG) - 1)) { 86 if (strncmp(rsdp->signature, ACPI_SIG_RSDP, sizeof(ACPI_SIG_RSDP) - 1)) {
92 printk(KERN_ERR 87 printk(KERN_ERR
93 "ACPI 2.0 RSDP signature incorrect, default to \"dig\"\n"); 88 "ACPI 2.0 RSDP signature incorrect, default to \"dig\"\n");
94 return "dig"; 89 return "dig";
95 } 90 }
96 91
97 xsdt = (struct acpi_table_xsdt *)__va(rsdp->xsdt_address); 92 xsdt = (struct acpi_table_xsdt *)__va(rsdp->xsdt_physical_address);
98 hdr = &xsdt->header; 93 hdr = &xsdt->header;
99 if (strncmp(hdr->signature, XSDT_SIG, sizeof(XSDT_SIG) - 1)) { 94 if (strncmp(hdr->signature, ACPI_SIG_XSDT, sizeof(ACPI_SIG_XSDT) - 1)) {
100 printk(KERN_ERR 95 printk(KERN_ERR
101 "ACPI 2.0 XSDT signature incorrect, default to \"dig\"\n"); 96 "ACPI 2.0 XSDT signature incorrect, default to \"dig\"\n");
102 return "dig"; 97 return "dig";
@@ -169,12 +164,12 @@ struct acpi_table_madt *acpi_madt __initdata;
169static u8 has_8259; 164static u8 has_8259;
170 165
171static int __init 166static int __init
172acpi_parse_lapic_addr_ovr(acpi_table_entry_header * header, 167acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header,
173 const unsigned long end) 168 const unsigned long end)
174{ 169{
175 struct acpi_table_lapic_addr_ovr *lapic; 170 struct acpi_madt_local_apic_override *lapic;
176 171
177 lapic = (struct acpi_table_lapic_addr_ovr *)header; 172 lapic = (struct acpi_madt_local_apic_override *)header;
178 173
179 if (BAD_MADT_ENTRY(lapic, end)) 174 if (BAD_MADT_ENTRY(lapic, end))
180 return -EINVAL; 175 return -EINVAL;
@@ -187,22 +182,19 @@ acpi_parse_lapic_addr_ovr(acpi_table_entry_header * header,
187} 182}
188 183
189static int __init 184static int __init
190acpi_parse_lsapic(acpi_table_entry_header * header, const unsigned long end) 185acpi_parse_lsapic(struct acpi_subtable_header * header, const unsigned long end)
191{ 186{
192 struct acpi_table_lsapic *lsapic; 187 struct acpi_madt_local_sapic *lsapic;
193 188
194 lsapic = (struct acpi_table_lsapic *)header; 189 lsapic = (struct acpi_madt_local_sapic *)header;
195 190
196 if (BAD_MADT_ENTRY(lsapic, end)) 191 /*Skip BAD_MADT_ENTRY check, as lsapic size could vary */
197 return -EINVAL;
198 192
199 if (lsapic->flags.enabled) { 193 if (lsapic->lapic_flags & ACPI_MADT_ENABLED) {
200#ifdef CONFIG_SMP 194#ifdef CONFIG_SMP
201 smp_boot_data.cpu_phys_id[available_cpus] = 195 smp_boot_data.cpu_phys_id[available_cpus] =
202 (lsapic->id << 8) | lsapic->eid; 196 (lsapic->id << 8) | lsapic->eid;
203#endif 197#endif
204 ia64_acpiid_to_sapicid[lsapic->acpi_id] =
205 (lsapic->id << 8) | lsapic->eid;
206 ++available_cpus; 198 ++available_cpus;
207 } 199 }
208 200
@@ -211,11 +203,11 @@ acpi_parse_lsapic(acpi_table_entry_header * header, const unsigned long end)
211} 203}
212 204
213static int __init 205static int __init
214acpi_parse_lapic_nmi(acpi_table_entry_header * header, const unsigned long end) 206acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long end)
215{ 207{
216 struct acpi_table_lapic_nmi *lacpi_nmi; 208 struct acpi_madt_local_apic_nmi *lacpi_nmi;
217 209
218 lacpi_nmi = (struct acpi_table_lapic_nmi *)header; 210 lacpi_nmi = (struct acpi_madt_local_apic_nmi *)header;
219 211
220 if (BAD_MADT_ENTRY(lacpi_nmi, end)) 212 if (BAD_MADT_ENTRY(lacpi_nmi, end))
221 return -EINVAL; 213 return -EINVAL;
@@ -225,11 +217,11 @@ acpi_parse_lapic_nmi(acpi_table_entry_header * header, const unsigned long end)
225} 217}
226 218
227static int __init 219static int __init
228acpi_parse_iosapic(acpi_table_entry_header * header, const unsigned long end) 220acpi_parse_iosapic(struct acpi_subtable_header * header, const unsigned long end)
229{ 221{
230 struct acpi_table_iosapic *iosapic; 222 struct acpi_madt_io_sapic *iosapic;
231 223
232 iosapic = (struct acpi_table_iosapic *)header; 224 iosapic = (struct acpi_madt_io_sapic *)header;
233 225
234 if (BAD_MADT_ENTRY(iosapic, end)) 226 if (BAD_MADT_ENTRY(iosapic, end))
235 return -EINVAL; 227 return -EINVAL;
@@ -240,13 +232,13 @@ acpi_parse_iosapic(acpi_table_entry_header * header, const unsigned long end)
240static unsigned int __initdata acpi_madt_rev; 232static unsigned int __initdata acpi_madt_rev;
241 233
242static int __init 234static int __init
243acpi_parse_plat_int_src(acpi_table_entry_header * header, 235acpi_parse_plat_int_src(struct acpi_subtable_header * header,
244 const unsigned long end) 236 const unsigned long end)
245{ 237{
246 struct acpi_table_plat_int_src *plintsrc; 238 struct acpi_madt_interrupt_source *plintsrc;
247 int vector; 239 int vector;
248 240
249 plintsrc = (struct acpi_table_plat_int_src *)header; 241 plintsrc = (struct acpi_madt_interrupt_source *)header;
250 242
251 if (BAD_MADT_ENTRY(plintsrc, end)) 243 if (BAD_MADT_ENTRY(plintsrc, end))
252 return -EINVAL; 244 return -EINVAL;
@@ -257,19 +249,19 @@ acpi_parse_plat_int_src(acpi_table_entry_header * header,
257 */ 249 */
258 vector = iosapic_register_platform_intr(plintsrc->type, 250 vector = iosapic_register_platform_intr(plintsrc->type,
259 plintsrc->global_irq, 251 plintsrc->global_irq,
260 plintsrc->iosapic_vector, 252 plintsrc->io_sapic_vector,
261 plintsrc->eid, 253 plintsrc->eid,
262 plintsrc->id, 254 plintsrc->id,
263 (plintsrc->flags.polarity == 255 ((plintsrc->inti_flags & ACPI_MADT_POLARITY_MASK) ==
264 1) ? IOSAPIC_POL_HIGH : 256 ACPI_MADT_POLARITY_ACTIVE_HIGH) ?
265 IOSAPIC_POL_LOW, 257 IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,
266 (plintsrc->flags.trigger == 258 ((plintsrc->inti_flags & ACPI_MADT_TRIGGER_MASK) ==
267 1) ? IOSAPIC_EDGE : 259 ACPI_MADT_TRIGGER_EDGE) ?
268 IOSAPIC_LEVEL); 260 IOSAPIC_EDGE : IOSAPIC_LEVEL);
269 261
270 platform_intr_list[plintsrc->type] = vector; 262 platform_intr_list[plintsrc->type] = vector;
271 if (acpi_madt_rev > 1) { 263 if (acpi_madt_rev > 1) {
272 acpi_cpei_override = plintsrc->plint_flags.cpei_override_flag; 264 acpi_cpei_override = plintsrc->flags & ACPI_MADT_CPEI_OVERRIDE;
273 } 265 }
274 266
275 /* 267 /*
@@ -324,30 +316,32 @@ unsigned int get_cpei_target_cpu(void)
324} 316}
325 317
326static int __init 318static int __init
327acpi_parse_int_src_ovr(acpi_table_entry_header * header, 319acpi_parse_int_src_ovr(struct acpi_subtable_header * header,
328 const unsigned long end) 320 const unsigned long end)
329{ 321{
330 struct acpi_table_int_src_ovr *p; 322 struct acpi_madt_interrupt_override *p;
331 323
332 p = (struct acpi_table_int_src_ovr *)header; 324 p = (struct acpi_madt_interrupt_override *)header;
333 325
334 if (BAD_MADT_ENTRY(p, end)) 326 if (BAD_MADT_ENTRY(p, end))
335 return -EINVAL; 327 return -EINVAL;
336 328
337 iosapic_override_isa_irq(p->bus_irq, p->global_irq, 329 iosapic_override_isa_irq(p->source_irq, p->global_irq,
338 (p->flags.polarity == 330 ((p->inti_flags & ACPI_MADT_POLARITY_MASK) ==
339 1) ? IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW, 331 ACPI_MADT_POLARITY_ACTIVE_HIGH) ?
340 (p->flags.trigger == 332 IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,
341 1) ? IOSAPIC_EDGE : IOSAPIC_LEVEL); 333 ((p->inti_flags & ACPI_MADT_TRIGGER_MASK) ==
334 ACPI_MADT_TRIGGER_EDGE) ?
335 IOSAPIC_EDGE : IOSAPIC_LEVEL);
342 return 0; 336 return 0;
343} 337}
344 338
345static int __init 339static int __init
346acpi_parse_nmi_src(acpi_table_entry_header * header, const unsigned long end) 340acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end)
347{ 341{
348 struct acpi_table_nmi_src *nmi_src; 342 struct acpi_madt_nmi_source *nmi_src;
349 343
350 nmi_src = (struct acpi_table_nmi_src *)header; 344 nmi_src = (struct acpi_madt_nmi_source *)header;
351 345
352 if (BAD_MADT_ENTRY(nmi_src, end)) 346 if (BAD_MADT_ENTRY(nmi_src, end))
353 return -EINVAL; 347 return -EINVAL;
@@ -371,12 +365,12 @@ static void __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
371 } 365 }
372} 366}
373 367
374static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size) 368static int __init acpi_parse_madt(struct acpi_table_header *table)
375{ 369{
376 if (!phys_addr || !size) 370 if (!table)
377 return -EINVAL; 371 return -EINVAL;
378 372
379 acpi_madt = (struct acpi_table_madt *)__va(phys_addr); 373 acpi_madt = (struct acpi_table_madt *)table;
380 374
381 acpi_madt_rev = acpi_madt->header.revision; 375 acpi_madt_rev = acpi_madt->header.revision;
382 376
@@ -384,14 +378,14 @@ static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size)
384#ifdef CONFIG_ITANIUM 378#ifdef CONFIG_ITANIUM
385 has_8259 = 1; /* Firmware on old Itanium systems is broken */ 379 has_8259 = 1; /* Firmware on old Itanium systems is broken */
386#else 380#else
387 has_8259 = acpi_madt->flags.pcat_compat; 381 has_8259 = acpi_madt->flags & ACPI_MADT_PCAT_COMPAT;
388#endif 382#endif
389 iosapic_system_init(has_8259); 383 iosapic_system_init(has_8259);
390 384
391 /* Get base address of IPI Message Block */ 385 /* Get base address of IPI Message Block */
392 386
393 if (acpi_madt->lapic_address) 387 if (acpi_madt->address)
394 ipi_base_addr = ioremap(acpi_madt->lapic_address, 0); 388 ipi_base_addr = ioremap(acpi_madt->address, 0);
395 389
396 printk(KERN_INFO PREFIX "Local APIC address %p\n", ipi_base_addr); 390 printk(KERN_INFO PREFIX "Local APIC address %p\n", ipi_base_addr);
397 391
@@ -413,23 +407,24 @@ static u32 __devinitdata pxm_flag[PXM_FLAG_LEN];
413#define pxm_bit_test(bit) (test_bit(bit,(void *)pxm_flag)) 407#define pxm_bit_test(bit) (test_bit(bit,(void *)pxm_flag))
414static struct acpi_table_slit __initdata *slit_table; 408static struct acpi_table_slit __initdata *slit_table;
415 409
416static int get_processor_proximity_domain(struct acpi_table_processor_affinity *pa) 410static int get_processor_proximity_domain(struct acpi_srat_cpu_affinity *pa)
417{ 411{
418 int pxm; 412 int pxm;
419 413
420 pxm = pa->proximity_domain; 414 pxm = pa->proximity_domain_lo;
421 if (ia64_platform_is("sn2")) 415 if (ia64_platform_is("sn2"))
422 pxm += pa->reserved[0] << 8; 416 pxm += pa->proximity_domain_hi[0] << 8;
423 return pxm; 417 return pxm;
424} 418}
425 419
426static int get_memory_proximity_domain(struct acpi_table_memory_affinity *ma) 420static int get_memory_proximity_domain(struct acpi_srat_mem_affinity *ma)
427{ 421{
428 int pxm; 422 int pxm;
429 423
430 pxm = ma->proximity_domain; 424 pxm = ma->proximity_domain;
431 if (ia64_platform_is("sn2")) 425 if (!ia64_platform_is("sn2"))
432 pxm += ma->reserved1[0] << 8; 426 pxm &= 0xff;
427
433 return pxm; 428 return pxm;
434} 429}
435 430
@@ -442,7 +437,7 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
442 u32 len; 437 u32 len;
443 438
444 len = sizeof(struct acpi_table_header) + 8 439 len = sizeof(struct acpi_table_header) + 8
445 + slit->localities * slit->localities; 440 + slit->locality_count * slit->locality_count;
446 if (slit->header.length != len) { 441 if (slit->header.length != len) {
447 printk(KERN_ERR 442 printk(KERN_ERR
448 "ACPI 2.0 SLIT: size mismatch: %d expected, %d actual\n", 443 "ACPI 2.0 SLIT: size mismatch: %d expected, %d actual\n",
@@ -454,11 +449,11 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
454} 449}
455 450
456void __init 451void __init
457acpi_numa_processor_affinity_init(struct acpi_table_processor_affinity *pa) 452acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
458{ 453{
459 int pxm; 454 int pxm;
460 455
461 if (!pa->flags.enabled) 456 if (!(pa->flags & ACPI_SRAT_CPU_ENABLED))
462 return; 457 return;
463 458
464 pxm = get_processor_proximity_domain(pa); 459 pxm = get_processor_proximity_domain(pa);
@@ -467,14 +462,14 @@ acpi_numa_processor_affinity_init(struct acpi_table_processor_affinity *pa)
467 pxm_bit_set(pxm); 462 pxm_bit_set(pxm);
468 463
469 node_cpuid[srat_num_cpus].phys_id = 464 node_cpuid[srat_num_cpus].phys_id =
470 (pa->apic_id << 8) | (pa->lsapic_eid); 465 (pa->apic_id << 8) | (pa->local_sapic_eid);
471 /* nid should be overridden as logical node id later */ 466 /* nid should be overridden as logical node id later */
472 node_cpuid[srat_num_cpus].nid = pxm; 467 node_cpuid[srat_num_cpus].nid = pxm;
473 srat_num_cpus++; 468 srat_num_cpus++;
474} 469}
475 470
476void __init 471void __init
477acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma) 472acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
478{ 473{
479 unsigned long paddr, size; 474 unsigned long paddr, size;
480 int pxm; 475 int pxm;
@@ -483,13 +478,11 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
483 pxm = get_memory_proximity_domain(ma); 478 pxm = get_memory_proximity_domain(ma);
484 479
485 /* fill node memory chunk structure */ 480 /* fill node memory chunk structure */
486 paddr = ma->base_addr_hi; 481 paddr = ma->base_address;
487 paddr = (paddr << 32) | ma->base_addr_lo; 482 size = ma->length;
488 size = ma->length_hi;
489 size = (size << 32) | ma->length_lo;
490 483
491 /* Ignore disabled entries */ 484 /* Ignore disabled entries */
492 if (!ma->flags.enabled) 485 if (!(ma->flags & ACPI_SRAT_MEM_ENABLED))
493 return; 486 return;
494 487
495 /* record this node in proximity bitmap */ 488 /* record this node in proximity bitmap */
@@ -560,16 +553,16 @@ void __init acpi_numa_arch_fixup(void)
560 if (!slit_table) 553 if (!slit_table)
561 return; 554 return;
562 memset(numa_slit, -1, sizeof(numa_slit)); 555 memset(numa_slit, -1, sizeof(numa_slit));
563 for (i = 0; i < slit_table->localities; i++) { 556 for (i = 0; i < slit_table->locality_count; i++) {
564 if (!pxm_bit_test(i)) 557 if (!pxm_bit_test(i))
565 continue; 558 continue;
566 node_from = pxm_to_node(i); 559 node_from = pxm_to_node(i);
567 for (j = 0; j < slit_table->localities; j++) { 560 for (j = 0; j < slit_table->locality_count; j++) {
568 if (!pxm_bit_test(j)) 561 if (!pxm_bit_test(j))
569 continue; 562 continue;
570 node_to = pxm_to_node(j); 563 node_to = pxm_to_node(j);
571 node_distance(node_from, node_to) = 564 node_distance(node_from, node_to) =
572 slit_table->entry[i * slit_table->localities + j]; 565 slit_table->entry[i * slit_table->locality_count + j];
573 } 566 }
574 } 567 }
575 568
@@ -617,21 +610,21 @@ void acpi_unregister_gsi(u32 gsi)
617 610
618EXPORT_SYMBOL(acpi_unregister_gsi); 611EXPORT_SYMBOL(acpi_unregister_gsi);
619 612
620static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size) 613static int __init acpi_parse_fadt(struct acpi_table_header *table)
621{ 614{
622 struct acpi_table_header *fadt_header; 615 struct acpi_table_header *fadt_header;
623 struct fadt_descriptor *fadt; 616 struct acpi_table_fadt *fadt;
624 617
625 if (!phys_addr || !size) 618 if (!table)
626 return -EINVAL; 619 return -EINVAL;
627 620
628 fadt_header = (struct acpi_table_header *)__va(phys_addr); 621 fadt_header = (struct acpi_table_header *)table;
629 if (fadt_header->revision != 3) 622 if (fadt_header->revision != 3)
630 return -ENODEV; /* Only deal with ACPI 2.0 FADT */ 623 return -ENODEV; /* Only deal with ACPI 2.0 FADT */
631 624
632 fadt = (struct fadt_descriptor *)fadt_header; 625 fadt = (struct acpi_table_fadt *)fadt_header;
633 626
634 acpi_register_gsi(fadt->sci_int, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW); 627 acpi_register_gsi(fadt->sci_interrupt, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW);
635 return 0; 628 return 0;
636} 629}
637 630
@@ -658,7 +651,7 @@ int __init acpi_boot_init(void)
658 * information -- the successor to MPS tables. 651 * information -- the successor to MPS tables.
659 */ 652 */
660 653
661 if (acpi_table_parse(ACPI_APIC, acpi_parse_madt) < 1) { 654 if (acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt)) {
662 printk(KERN_ERR PREFIX "Can't find MADT\n"); 655 printk(KERN_ERR PREFIX "Can't find MADT\n");
663 goto skip_madt; 656 goto skip_madt;
664 } 657 }
@@ -666,40 +659,40 @@ int __init acpi_boot_init(void)
666 /* Local APIC */ 659 /* Local APIC */
667 660
668 if (acpi_table_parse_madt 661 if (acpi_table_parse_madt
669 (ACPI_MADT_LAPIC_ADDR_OVR, acpi_parse_lapic_addr_ovr, 0) < 0) 662 (ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE, acpi_parse_lapic_addr_ovr, 0) < 0)
670 printk(KERN_ERR PREFIX 663 printk(KERN_ERR PREFIX
671 "Error parsing LAPIC address override entry\n"); 664 "Error parsing LAPIC address override entry\n");
672 665
673 if (acpi_table_parse_madt(ACPI_MADT_LSAPIC, acpi_parse_lsapic, NR_CPUS) 666 if (acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_SAPIC, acpi_parse_lsapic, NR_CPUS)
674 < 1) 667 < 1)
675 printk(KERN_ERR PREFIX 668 printk(KERN_ERR PREFIX
676 "Error parsing MADT - no LAPIC entries\n"); 669 "Error parsing MADT - no LAPIC entries\n");
677 670
678 if (acpi_table_parse_madt(ACPI_MADT_LAPIC_NMI, acpi_parse_lapic_nmi, 0) 671 if (acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_NMI, acpi_parse_lapic_nmi, 0)
679 < 0) 672 < 0)
680 printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n"); 673 printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n");
681 674
682 /* I/O APIC */ 675 /* I/O APIC */
683 676
684 if (acpi_table_parse_madt 677 if (acpi_table_parse_madt
685 (ACPI_MADT_IOSAPIC, acpi_parse_iosapic, NR_IOSAPICS) < 1) 678 (ACPI_MADT_TYPE_IO_SAPIC, acpi_parse_iosapic, NR_IOSAPICS) < 1)
686 printk(KERN_ERR PREFIX 679 printk(KERN_ERR PREFIX
687 "Error parsing MADT - no IOSAPIC entries\n"); 680 "Error parsing MADT - no IOSAPIC entries\n");
688 681
689 /* System-Level Interrupt Routing */ 682 /* System-Level Interrupt Routing */
690 683
691 if (acpi_table_parse_madt 684 if (acpi_table_parse_madt
692 (ACPI_MADT_PLAT_INT_SRC, acpi_parse_plat_int_src, 685 (ACPI_MADT_TYPE_INTERRUPT_SOURCE, acpi_parse_plat_int_src,
693 ACPI_MAX_PLATFORM_INTERRUPTS) < 0) 686 ACPI_MAX_PLATFORM_INTERRUPTS) < 0)
694 printk(KERN_ERR PREFIX 687 printk(KERN_ERR PREFIX
695 "Error parsing platform interrupt source entry\n"); 688 "Error parsing platform interrupt source entry\n");
696 689
697 if (acpi_table_parse_madt 690 if (acpi_table_parse_madt
698 (ACPI_MADT_INT_SRC_OVR, acpi_parse_int_src_ovr, 0) < 0) 691 (ACPI_MADT_TYPE_INTERRUPT_OVERRIDE, acpi_parse_int_src_ovr, 0) < 0)
699 printk(KERN_ERR PREFIX 692 printk(KERN_ERR PREFIX
700 "Error parsing interrupt source overrides entry\n"); 693 "Error parsing interrupt source overrides entry\n");
701 694
702 if (acpi_table_parse_madt(ACPI_MADT_NMI_SRC, acpi_parse_nmi_src, 0) < 0) 695 if (acpi_table_parse_madt(ACPI_MADT_TYPE_NMI_SOURCE, acpi_parse_nmi_src, 0) < 0)
703 printk(KERN_ERR PREFIX "Error parsing NMI SRC entry\n"); 696 printk(KERN_ERR PREFIX "Error parsing NMI SRC entry\n");
704 skip_madt: 697 skip_madt:
705 698
@@ -709,7 +702,7 @@ int __init acpi_boot_init(void)
709 * gets interrupts such as power and sleep buttons. If it's not 702 * gets interrupts such as power and sleep buttons. If it's not
710 * on a Legacy interrupt, it needs to be setup. 703 * on a Legacy interrupt, it needs to be setup.
711 */ 704 */
712 if (acpi_table_parse(ACPI_FADT, acpi_parse_fadt) < 1) 705 if (acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt))
713 printk(KERN_ERR PREFIX "Can't find FADT\n"); 706 printk(KERN_ERR PREFIX "Can't find FADT\n");
714 707
715#ifdef CONFIG_SMP 708#ifdef CONFIG_SMP
@@ -842,7 +835,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
842{ 835{
843 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; 836 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
844 union acpi_object *obj; 837 union acpi_object *obj;
845 struct acpi_table_lsapic *lsapic; 838 struct acpi_madt_local_sapic *lsapic;
846 cpumask_t tmp_map; 839 cpumask_t tmp_map;
847 long physid; 840 long physid;
848 int cpu; 841 int cpu;
@@ -854,16 +847,16 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
854 return -EINVAL; 847 return -EINVAL;
855 848
856 obj = buffer.pointer; 849 obj = buffer.pointer;
857 if (obj->type != ACPI_TYPE_BUFFER || 850 if (obj->type != ACPI_TYPE_BUFFER)
858 obj->buffer.length < sizeof(*lsapic)) { 851 {
859 kfree(buffer.pointer); 852 kfree(buffer.pointer);
860 return -EINVAL; 853 return -EINVAL;
861 } 854 }
862 855
863 lsapic = (struct acpi_table_lsapic *)obj->buffer.pointer; 856 lsapic = (struct acpi_madt_local_sapic *)obj->buffer.pointer;
864 857
865 if ((lsapic->header.type != ACPI_MADT_LSAPIC) || 858 if ((lsapic->header.type != ACPI_MADT_TYPE_LOCAL_SAPIC) ||
866 (!lsapic->flags.enabled)) { 859 (!lsapic->lapic_flags & ACPI_MADT_ENABLED)) {
867 kfree(buffer.pointer); 860 kfree(buffer.pointer);
868 return -EINVAL; 861 return -EINVAL;
869 } 862 }
@@ -883,7 +876,6 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
883 876
884 cpu_set(cpu, cpu_present_map); 877 cpu_set(cpu, cpu_present_map);
885 ia64_cpu_to_sapicid[cpu] = physid; 878 ia64_cpu_to_sapicid[cpu] = physid;
886 ia64_acpiid_to_sapicid[lsapic->acpi_id] = ia64_cpu_to_sapicid[cpu];
887 879
888 *pcpu = cpu; 880 *pcpu = cpu;
889 return (0); 881 return (0);
@@ -893,14 +885,6 @@ EXPORT_SYMBOL(acpi_map_lsapic);
893 885
894int acpi_unmap_lsapic(int cpu) 886int acpi_unmap_lsapic(int cpu)
895{ 887{
896 int i;
897
898 for (i = 0; i < MAX_SAPICS; i++) {
899 if (ia64_acpiid_to_sapicid[i] == ia64_cpu_to_sapicid[cpu]) {
900 ia64_acpiid_to_sapicid[i] = -1;
901 break;
902 }
903 }
904 ia64_cpu_to_sapicid[cpu] = -1; 888 ia64_cpu_to_sapicid[cpu] = -1;
905 cpu_clear(cpu, cpu_present_map); 889 cpu_clear(cpu, cpu_present_map);
906 890
@@ -920,7 +904,7 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)
920{ 904{
921 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; 905 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
922 union acpi_object *obj; 906 union acpi_object *obj;
923 struct acpi_table_iosapic *iosapic; 907 struct acpi_madt_io_sapic *iosapic;
924 unsigned int gsi_base; 908 unsigned int gsi_base;
925 int pxm, node; 909 int pxm, node;
926 910
@@ -938,9 +922,9 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)
938 return AE_OK; 922 return AE_OK;
939 } 923 }
940 924
941 iosapic = (struct acpi_table_iosapic *)obj->buffer.pointer; 925 iosapic = (struct acpi_madt_io_sapic *)obj->buffer.pointer;
942 926
943 if (iosapic->header.type != ACPI_MADT_IOSAPIC) { 927 if (iosapic->header.type != ACPI_MADT_TYPE_IO_SAPIC) {
944 kfree(buffer.pointer); 928 kfree(buffer.pointer);
945 return AE_OK; 929 return AE_OK;
946 } 930 }
diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c
index 75a2a2c12258..2236fabbb3c6 100644
--- a/arch/ia64/kernel/asm-offsets.c
+++ b/arch/ia64/kernel/asm-offsets.c
@@ -35,6 +35,7 @@ void foo(void)
35 BLANK(); 35 BLANK();
36 36
37 DEFINE(TI_FLAGS, offsetof(struct thread_info, flags)); 37 DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
38 DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
38 DEFINE(TI_PRE_COUNT, offsetof(struct thread_info, preempt_count)); 39 DEFINE(TI_PRE_COUNT, offsetof(struct thread_info, preempt_count));
39 40
40 BLANK(); 41 BLANK();
diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c
index bc2f64d72244..80a94e707827 100644
--- a/arch/ia64/kernel/crash.c
+++ b/arch/ia64/kernel/crash.c
@@ -21,9 +21,9 @@
21#include <asm/mca.h> 21#include <asm/mca.h>
22 22
23int kdump_status[NR_CPUS]; 23int kdump_status[NR_CPUS];
24atomic_t kdump_cpu_freezed; 24static atomic_t kdump_cpu_frozen;
25atomic_t kdump_in_progress; 25atomic_t kdump_in_progress;
26int kdump_on_init = 1; 26static int kdump_on_init = 1;
27 27
28static inline Elf64_Word 28static inline Elf64_Word
29*append_elf_note(Elf64_Word *buf, char *name, unsigned type, void *data, 29*append_elf_note(Elf64_Word *buf, char *name, unsigned type, void *data,
@@ -52,7 +52,7 @@ extern void ia64_dump_cpu_regs(void *);
52static DEFINE_PER_CPU(struct elf_prstatus, elf_prstatus); 52static DEFINE_PER_CPU(struct elf_prstatus, elf_prstatus);
53 53
54void 54void
55crash_save_this_cpu() 55crash_save_this_cpu(void)
56{ 56{
57 void *buf; 57 void *buf;
58 unsigned long cfm, sof, sol; 58 unsigned long cfm, sof, sol;
@@ -79,18 +79,20 @@ crash_save_this_cpu()
79 final_note(buf); 79 final_note(buf);
80} 80}
81 81
82#ifdef CONFIG_SMP
82static int 83static int
83kdump_wait_cpu_freeze(void) 84kdump_wait_cpu_freeze(void)
84{ 85{
85 int cpu_num = num_online_cpus() - 1; 86 int cpu_num = num_online_cpus() - 1;
86 int timeout = 1000; 87 int timeout = 1000;
87 while(timeout-- > 0) { 88 while(timeout-- > 0) {
88 if (atomic_read(&kdump_cpu_freezed) == cpu_num) 89 if (atomic_read(&kdump_cpu_frozen) == cpu_num)
89 return 0; 90 return 0;
90 udelay(1000); 91 udelay(1000);
91 } 92 }
92 return 1; 93 return 1;
93} 94}
95#endif
94 96
95void 97void
96machine_crash_shutdown(struct pt_regs *pt) 98machine_crash_shutdown(struct pt_regs *pt)
@@ -106,8 +108,8 @@ machine_crash_shutdown(struct pt_regs *pt)
106 kexec_disable_iosapic(); 108 kexec_disable_iosapic();
107#ifdef CONFIG_SMP 109#ifdef CONFIG_SMP
108 kdump_smp_send_stop(); 110 kdump_smp_send_stop();
111 /* not all cpu response to IPI, send INIT to freeze them */
109 if (kdump_wait_cpu_freeze() && kdump_on_init) { 112 if (kdump_wait_cpu_freeze() && kdump_on_init) {
110 //not all cpu response to IPI, send INIT to freeze them
111 kdump_smp_send_init(); 113 kdump_smp_send_init();
112 } 114 }
113#endif 115#endif
@@ -116,6 +118,11 @@ machine_crash_shutdown(struct pt_regs *pt)
116static void 118static void
117machine_kdump_on_init(void) 119machine_kdump_on_init(void)
118{ 120{
121 if (!ia64_kimage) {
122 printk(KERN_NOTICE "machine_kdump_on_init(): "
123 "kdump not configured\n");
124 return;
125 }
119 local_irq_disable(); 126 local_irq_disable();
120 kexec_disable_iosapic(); 127 kexec_disable_iosapic();
121 machine_kexec(ia64_kimage); 128 machine_kexec(ia64_kimage);
@@ -129,14 +136,15 @@ kdump_cpu_freeze(struct unw_frame_info *info, void *arg)
129 cpuid = smp_processor_id(); 136 cpuid = smp_processor_id();
130 crash_save_this_cpu(); 137 crash_save_this_cpu();
131 current->thread.ksp = (__u64)info->sw - 16; 138 current->thread.ksp = (__u64)info->sw - 16;
132 atomic_inc(&kdump_cpu_freezed); 139 atomic_inc(&kdump_cpu_frozen);
133 kdump_status[cpuid] = 1; 140 kdump_status[cpuid] = 1;
134 mb(); 141 mb();
135 if (cpuid == 0) { 142#ifdef CONFIG_HOTPLUG_CPU
136 for (;;) 143 if (cpuid != 0)
137 cpu_relax();
138 } else
139 ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]); 144 ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);
145#endif
146 for (;;)
147 cpu_relax();
140} 148}
141 149
142static int 150static int
@@ -156,7 +164,7 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data)
156 164
157 nd = (struct ia64_mca_notify_die *)args->err; 165 nd = (struct ia64_mca_notify_die *)args->err;
158 /* Reason code 1 means machine check rendezous*/ 166 /* Reason code 1 means machine check rendezous*/
159 if ((val == DIE_INIT_MONARCH_ENTER || DIE_INIT_SLAVE_ENTER) && 167 if ((val == DIE_INIT_MONARCH_ENTER || val == DIE_INIT_SLAVE_ENTER) &&
160 nd->sos->rv_rc == 1) 168 nd->sos->rv_rc == 1)
161 return NOTIFY_DONE; 169 return NOTIFY_DONE;
162 170
@@ -214,7 +222,7 @@ machine_crash_setup(void)
214 if((ret = register_die_notifier(&kdump_init_notifier_nb)) != 0) 222 if((ret = register_die_notifier(&kdump_init_notifier_nb)) != 0)
215 return ret; 223 return ret;
216#ifdef CONFIG_SYSCTL 224#ifdef CONFIG_SYSCTL
217 register_sysctl_table(sys_table, 0); 225 register_sysctl_table(sys_table);
218#endif 226#endif
219 return 0; 227 return 0;
220} 228}
diff --git a/arch/ia64/kernel/crash_dump.c b/arch/ia64/kernel/crash_dump.c
index 83b8c91c1408..da60e90eeeb1 100644
--- a/arch/ia64/kernel/crash_dump.c
+++ b/arch/ia64/kernel/crash_dump.c
@@ -9,7 +9,8 @@
9#include <linux/errno.h> 9#include <linux/errno.h>
10#include <linux/types.h> 10#include <linux/types.h>
11 11
12#include <linux/uaccess.h> 12#include <asm/page.h>
13#include <asm/uaccess.h>
13 14
14/** 15/**
15 * copy_oldmem_page - copy one page from "oldmem" 16 * copy_oldmem_page - copy one page from "oldmem"
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index 0b25a7d4e1e4..f45f91d38cab 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -21,6 +21,7 @@
21 * Skip non-WB memory and ignore empty memory ranges. 21 * Skip non-WB memory and ignore empty memory ranges.
22 */ 22 */
23#include <linux/module.h> 23#include <linux/module.h>
24#include <linux/bootmem.h>
24#include <linux/kernel.h> 25#include <linux/kernel.h>
25#include <linux/init.h> 26#include <linux/init.h>
26#include <linux/types.h> 27#include <linux/types.h>
@@ -380,7 +381,7 @@ efi_get_pal_addr (void)
380#endif 381#endif
381 return __va(md->phys_addr); 382 return __va(md->phys_addr);
382 } 383 }
383 printk(KERN_WARNING "%s: no PAL-code memory-descriptor found", 384 printk(KERN_WARNING "%s: no PAL-code memory-descriptor found\n",
384 __FUNCTION__); 385 __FUNCTION__);
385 return NULL; 386 return NULL;
386} 387}
@@ -413,11 +414,10 @@ efi_init (void)
413 efi_char16_t *c16; 414 efi_char16_t *c16;
414 u64 efi_desc_size; 415 u64 efi_desc_size;
415 char *cp, vendor[100] = "unknown"; 416 char *cp, vendor[100] = "unknown";
416 extern char saved_command_line[];
417 int i; 417 int i;
418 418
419 /* it's too early to be able to use the standard kernel command line support... */ 419 /* it's too early to be able to use the standard kernel command line support... */
420 for (cp = saved_command_line; *cp; ) { 420 for (cp = boot_command_line; *cp; ) {
421 if (memcmp(cp, "mem=", 4) == 0) { 421 if (memcmp(cp, "mem=", 4) == 0) {
422 mem_limit = memparse(cp + 4, &cp); 422 mem_limit = memparse(cp + 4, &cp);
423 } else if (memcmp(cp, "max_addr=", 9) == 0) { 423 } else if (memcmp(cp, "max_addr=", 9) == 0) {
@@ -971,6 +971,11 @@ efi_memmap_init(unsigned long *s, unsigned long *e)
971 if (!is_memory_available(md)) 971 if (!is_memory_available(md))
972 continue; 972 continue;
973 973
974#ifdef CONFIG_CRASH_DUMP
975 /* saved_max_pfn should ignore max_addr= command line arg */
976 if (saved_max_pfn < (efi_md_end(md) >> PAGE_SHIFT))
977 saved_max_pfn = (efi_md_end(md) >> PAGE_SHIFT);
978#endif
974 /* 979 /*
975 * Round ends inward to granule boundaries 980 * Round ends inward to granule boundaries
976 * Give trimmings to uncached allocator 981 * Give trimmings to uncached allocator
@@ -1137,7 +1142,7 @@ efi_initialize_iomem_resources(struct resource *code_resource,
1137/* find a block of memory aligned to 64M exclude reserved regions 1142/* find a block of memory aligned to 64M exclude reserved regions
1138 rsvd_regions are sorted 1143 rsvd_regions are sorted
1139 */ 1144 */
1140unsigned long 1145unsigned long __init
1141kdump_find_rsvd_region (unsigned long size, 1146kdump_find_rsvd_region (unsigned long size,
1142 struct rsvd_region *r, int n) 1147 struct rsvd_region *r, int n)
1143{ 1148{
@@ -1178,3 +1183,33 @@ kdump_find_rsvd_region (unsigned long size,
1178 return ~0UL; 1183 return ~0UL;
1179} 1184}
1180#endif 1185#endif
1186
1187#ifdef CONFIG_PROC_VMCORE
1188/* locate the size find a the descriptor at a certain address */
1189unsigned long
1190vmcore_find_descriptor_size (unsigned long address)
1191{
1192 void *efi_map_start, *efi_map_end, *p;
1193 efi_memory_desc_t *md;
1194 u64 efi_desc_size;
1195 unsigned long ret = 0;
1196
1197 efi_map_start = __va(ia64_boot_param->efi_memmap);
1198 efi_map_end = efi_map_start + ia64_boot_param->efi_memmap_size;
1199 efi_desc_size = ia64_boot_param->efi_memdesc_size;
1200
1201 for (p = efi_map_start; p < efi_map_end; p += efi_desc_size) {
1202 md = p;
1203 if (efi_wb(md) && md->type == EFI_LOADER_DATA
1204 && md->phys_addr == address) {
1205 ret = efi_md_size(md);
1206 break;
1207 }
1208 }
1209
1210 if (ret == 0)
1211 printk(KERN_WARNING "Cannot locate EFI vmcore descriptor\n");
1212
1213 return ret;
1214}
1215#endif
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index ac4b304bea30..55fd2d5471e1 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1607,5 +1607,7 @@ sys_call_table:
1607 data8 sys_sync_file_range // 1300 1607 data8 sys_sync_file_range // 1300
1608 data8 sys_tee 1608 data8 sys_tee
1609 data8 sys_vmsplice 1609 data8 sys_vmsplice
1610 data8 sys_ni_syscall // reserved for move_pages
1611 data8 sys_getcpu
1610 1612
1611 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls 1613 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
diff --git a/arch/ia64/kernel/err_inject.c b/arch/ia64/kernel/err_inject.c
new file mode 100644
index 000000000000..d3e9f33e8bdd
--- /dev/null
+++ b/arch/ia64/kernel/err_inject.c
@@ -0,0 +1,293 @@
1/*
2 * err_inject.c -
3 * 1.) Inject errors to a processor.
4 * 2.) Query error injection capabilities.
5 * This driver along with user space code can be acting as an error
6 * injection tool.
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful, but
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
16 * NON INFRINGEMENT. See the GNU General Public License for more
17 * details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *
23 * Written by: Fenghua Yu <fenghua.yu@intel.com>, Intel Corporation
24 * Copyright (C) 2006, Intel Corp. All rights reserved.
25 *
26 */
27#include <linux/sysdev.h>
28#include <linux/init.h>
29#include <linux/mm.h>
30#include <linux/cpu.h>
31#include <linux/module.h>
32
33#define ERR_INJ_DEBUG
34
35#define ERR_DATA_BUFFER_SIZE 3 // Three 8-byte;
36
37#define define_one_ro(name) \
38static SYSDEV_ATTR(name, 0444, show_##name, NULL)
39
40#define define_one_rw(name) \
41static SYSDEV_ATTR(name, 0644, show_##name, store_##name)
42
43static u64 call_start[NR_CPUS];
44static u64 phys_addr[NR_CPUS];
45static u64 err_type_info[NR_CPUS];
46static u64 err_struct_info[NR_CPUS];
47static struct {
48 u64 data1;
49 u64 data2;
50 u64 data3;
51} __attribute__((__aligned__(16))) err_data_buffer[NR_CPUS];
52static s64 status[NR_CPUS];
53static u64 capabilities[NR_CPUS];
54static u64 resources[NR_CPUS];
55
56#define show(name) \
57static ssize_t \
58show_##name(struct sys_device *dev, char *buf) \
59{ \
60 u32 cpu=dev->id; \
61 return sprintf(buf, "%lx\n", name[cpu]); \
62}
63
64#define store(name) \
65static ssize_t \
66store_##name(struct sys_device *dev, const char *buf, size_t size) \
67{ \
68 unsigned int cpu=dev->id; \
69 name[cpu] = simple_strtoull(buf, NULL, 16); \
70 return size; \
71}
72
73show(call_start)
74
75/* It's user's responsibility to call the PAL procedure on a specific
76 * processor. The cpu number in driver is only used for storing data.
77 */
78static ssize_t
79store_call_start(struct sys_device *dev, const char *buf, size_t size)
80{
81 unsigned int cpu=dev->id;
82 unsigned long call_start = simple_strtoull(buf, NULL, 16);
83
84#ifdef ERR_INJ_DEBUG
85 printk(KERN_DEBUG "pal_mc_err_inject for cpu%d:\n", cpu);
86 printk(KERN_DEBUG "err_type_info=%lx,\n", err_type_info[cpu]);
87 printk(KERN_DEBUG "err_struct_info=%lx,\n", err_struct_info[cpu]);
88 printk(KERN_DEBUG "err_data_buffer=%lx, %lx, %lx.\n",
89 err_data_buffer[cpu].data1,
90 err_data_buffer[cpu].data2,
91 err_data_buffer[cpu].data3);
92#endif
93 switch (call_start) {
94 case 0: /* Do nothing. */
95 break;
96 case 1: /* Call pal_mc_error_inject in physical mode. */
97 status[cpu]=ia64_pal_mc_error_inject_phys(err_type_info[cpu],
98 err_struct_info[cpu],
99 ia64_tpa(&err_data_buffer[cpu]),
100 &capabilities[cpu],
101 &resources[cpu]);
102 break;
103 case 2: /* Call pal_mc_error_inject in virtual mode. */
104 status[cpu]=ia64_pal_mc_error_inject_virt(err_type_info[cpu],
105 err_struct_info[cpu],
106 ia64_tpa(&err_data_buffer[cpu]),
107 &capabilities[cpu],
108 &resources[cpu]);
109 break;
110 default:
111 status[cpu] = -EINVAL;
112 break;
113 }
114
115#ifdef ERR_INJ_DEBUG
116 printk(KERN_DEBUG "Returns: status=%d,\n", (int)status[cpu]);
117 printk(KERN_DEBUG "capapbilities=%lx,\n", capabilities[cpu]);
118 printk(KERN_DEBUG "resources=%lx\n", resources[cpu]);
119#endif
120 return size;
121}
122
123show(err_type_info)
124store(err_type_info)
125
126static ssize_t
127show_virtual_to_phys(struct sys_device *dev, char *buf)
128{
129 unsigned int cpu=dev->id;
130 return sprintf(buf, "%lx\n", phys_addr[cpu]);
131}
132
133static ssize_t
134store_virtual_to_phys(struct sys_device *dev, const char *buf, size_t size)
135{
136 unsigned int cpu=dev->id;
137 u64 virt_addr=simple_strtoull(buf, NULL, 16);
138 int ret;
139
140 ret = get_user_pages(current, current->mm, virt_addr,
141 1, VM_READ, 0, NULL, NULL);
142 if (ret<=0) {
143#ifdef ERR_INJ_DEBUG
144 printk("Virtual address %lx is not existing.\n",virt_addr);
145#endif
146 return -EINVAL;
147 }
148
149 phys_addr[cpu] = ia64_tpa(virt_addr);
150 return size;
151}
152
153show(err_struct_info)
154store(err_struct_info)
155
156static ssize_t
157show_err_data_buffer(struct sys_device *dev, char *buf)
158{
159 unsigned int cpu=dev->id;
160
161 return sprintf(buf, "%lx, %lx, %lx\n",
162 err_data_buffer[cpu].data1,
163 err_data_buffer[cpu].data2,
164 err_data_buffer[cpu].data3);
165}
166
167static ssize_t
168store_err_data_buffer(struct sys_device *dev, const char *buf, size_t size)
169{
170 unsigned int cpu=dev->id;
171 int ret;
172
173#ifdef ERR_INJ_DEBUG
174 printk("write err_data_buffer=[%lx,%lx,%lx] on cpu%d\n",
175 err_data_buffer[cpu].data1,
176 err_data_buffer[cpu].data2,
177 err_data_buffer[cpu].data3,
178 cpu);
179#endif
180 ret=sscanf(buf, "%lx, %lx, %lx",
181 &err_data_buffer[cpu].data1,
182 &err_data_buffer[cpu].data2,
183 &err_data_buffer[cpu].data3);
184 if (ret!=ERR_DATA_BUFFER_SIZE)
185 return -EINVAL;
186
187 return size;
188}
189
190show(status)
191show(capabilities)
192show(resources)
193
194define_one_rw(call_start);
195define_one_rw(err_type_info);
196define_one_rw(err_struct_info);
197define_one_rw(err_data_buffer);
198define_one_rw(virtual_to_phys);
199define_one_ro(status);
200define_one_ro(capabilities);
201define_one_ro(resources);
202
203static struct attribute *default_attrs[] = {
204 &attr_call_start.attr,
205 &attr_virtual_to_phys.attr,
206 &attr_err_type_info.attr,
207 &attr_err_struct_info.attr,
208 &attr_err_data_buffer.attr,
209 &attr_status.attr,
210 &attr_capabilities.attr,
211 &attr_resources.attr,
212 NULL
213};
214
215static struct attribute_group err_inject_attr_group = {
216 .attrs = default_attrs,
217 .name = "err_inject"
218};
219/* Add/Remove err_inject interface for CPU device */
220static int __cpuinit err_inject_add_dev(struct sys_device * sys_dev)
221{
222 return sysfs_create_group(&sys_dev->kobj, &err_inject_attr_group);
223}
224
225static int __cpuinit err_inject_remove_dev(struct sys_device * sys_dev)
226{
227 sysfs_remove_group(&sys_dev->kobj, &err_inject_attr_group);
228 return 0;
229}
230static int __cpuinit err_inject_cpu_callback(struct notifier_block *nfb,
231 unsigned long action, void *hcpu)
232{
233 unsigned int cpu = (unsigned long)hcpu;
234 struct sys_device *sys_dev;
235
236 sys_dev = get_cpu_sysdev(cpu);
237 switch (action) {
238 case CPU_ONLINE:
239 err_inject_add_dev(sys_dev);
240 break;
241 case CPU_DEAD:
242 err_inject_remove_dev(sys_dev);
243 break;
244 }
245
246 return NOTIFY_OK;
247}
248
249static struct notifier_block __cpuinitdata err_inject_cpu_notifier =
250{
251 .notifier_call = err_inject_cpu_callback,
252};
253
254static int __init
255err_inject_init(void)
256{
257 int i;
258
259#ifdef ERR_INJ_DEBUG
260 printk(KERN_INFO "Enter error injection driver.\n");
261#endif
262 for_each_online_cpu(i) {
263 err_inject_cpu_callback(&err_inject_cpu_notifier, CPU_ONLINE,
264 (void *)(long)i);
265 }
266
267 register_hotcpu_notifier(&err_inject_cpu_notifier);
268
269 return 0;
270}
271
272static void __exit
273err_inject_exit(void)
274{
275 int i;
276 struct sys_device *sys_dev;
277
278#ifdef ERR_INJ_DEBUG
279 printk(KERN_INFO "Exit error injection driver.\n");
280#endif
281 for_each_online_cpu(i) {
282 sys_dev = get_cpu_sysdev(i);
283 sysfs_remove_group(&sys_dev->kobj, &err_inject_attr_group);
284 }
285 unregister_hotcpu_notifier(&err_inject_cpu_notifier);
286}
287
288module_init(err_inject_init);
289module_exit(err_inject_exit);
290
291MODULE_AUTHOR("Fenghua Yu <fenghua.yu@intel.com>");
292MODULE_DESCRIPTION("MC error injection kenrel sysfs interface");
293MODULE_LICENSE("GPL");
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
index 7a05b1cb2ad5..8589e84a27c6 100644
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
@@ -10,6 +10,8 @@
10 * probably broke it along the way... ;-) 10 * probably broke it along the way... ;-)
11 * 13-Jul-04 clameter Implement fsys_clock_gettime and revise fsys_gettimeofday to make 11 * 13-Jul-04 clameter Implement fsys_clock_gettime and revise fsys_gettimeofday to make
12 * it capable of using memory based clocks without falling back to C code. 12 * it capable of using memory based clocks without falling back to C code.
13 * 08-Feb-07 Fenghua Yu Implement fsys_getcpu.
14 *
13 */ 15 */
14 16
15#include <asm/asmmacro.h> 17#include <asm/asmmacro.h>
@@ -505,6 +507,59 @@ EX(.fail_efault, (p15) st8 [r34]=r3)
505#endif 507#endif
506END(fsys_rt_sigprocmask) 508END(fsys_rt_sigprocmask)
507 509
510/*
511 * fsys_getcpu doesn't use the third parameter in this implementation. It reads
512 * current_thread_info()->cpu and corresponding node in cpu_to_node_map.
513 */
514ENTRY(fsys_getcpu)
515 .prologue
516 .altrp b6
517 .body
518 ;;
519 add r2=TI_FLAGS+IA64_TASK_SIZE,r16
520 tnat.nz p6,p0 = r32 // guard against NaT argument
521 add r3=TI_CPU+IA64_TASK_SIZE,r16
522 ;;
523 ld4 r3=[r3] // M r3 = thread_info->cpu
524 ld4 r2=[r2] // M r2 = thread_info->flags
525(p6) br.cond.spnt.few .fail_einval // B
526 ;;
527 tnat.nz p7,p0 = r33 // I guard against NaT argument
528(p7) br.cond.spnt.few .fail_einval // B
529#ifdef CONFIG_NUMA
530 movl r17=cpu_to_node_map
531 ;;
532EX(.fail_efault, probe.w.fault r32, 3) // M This takes 5 cycles
533EX(.fail_efault, probe.w.fault r33, 3) // M This takes 5 cycles
534 shladd r18=r3,1,r17
535 ;;
536 ld2 r20=[r18] // r20 = cpu_to_node_map[cpu]
537 and r2 = TIF_ALLWORK_MASK,r2
538 ;;
539 cmp.ne p8,p0=0,r2
540(p8) br.spnt.many fsys_fallback_syscall
541 ;;
542 ;;
543EX(.fail_efault, st4 [r32] = r3)
544EX(.fail_efault, st2 [r33] = r20)
545 mov r8=0
546 ;;
547#else
548EX(.fail_efault, probe.w.fault r32, 3) // M This takes 5 cycles
549EX(.fail_efault, probe.w.fault r33, 3) // M This takes 5 cycles
550 and r2 = TIF_ALLWORK_MASK,r2
551 ;;
552 cmp.ne p8,p0=0,r2
553(p8) br.spnt.many fsys_fallback_syscall
554 ;;
555EX(.fail_efault, st4 [r32] = r3)
556EX(.fail_efault, st2 [r33] = r0)
557 mov r8=0
558 ;;
559#endif
560 FSYS_RETURN
561END(fsys_getcpu)
562
508ENTRY(fsys_fallback_syscall) 563ENTRY(fsys_fallback_syscall)
509 .prologue 564 .prologue
510 .altrp b6 565 .altrp b6
@@ -878,6 +933,56 @@ fsyscall_table:
878 data8 0 // timer_delete 933 data8 0 // timer_delete
879 data8 0 // clock_settime 934 data8 0 // clock_settime
880 data8 fsys_clock_gettime // clock_gettime 935 data8 fsys_clock_gettime // clock_gettime
936 data8 0 // clock_getres // 1255
937 data8 0 // clock_nanosleep
938 data8 0 // fstatfs64
939 data8 0 // statfs64
940 data8 0 // mbind
941 data8 0 // get_mempolicy // 1260
942 data8 0 // set_mempolicy
943 data8 0 // mq_open
944 data8 0 // mq_unlink
945 data8 0 // mq_timedsend
946 data8 0 // mq_timedreceive // 1265
947 data8 0 // mq_notify
948 data8 0 // mq_getsetattr
949 data8 0 // kexec_load
950 data8 0 // vserver
951 data8 0 // waitid // 1270
952 data8 0 // add_key
953 data8 0 // request_key
954 data8 0 // keyctl
955 data8 0 // ioprio_set
956 data8 0 // ioprio_get // 1275
957 data8 0 // move_pages
958 data8 0 // inotify_init
959 data8 0 // inotify_add_watch
960 data8 0 // inotify_rm_watch
961 data8 0 // migrate_pages // 1280
962 data8 0 // openat
963 data8 0 // mkdirat
964 data8 0 // mknodat
965 data8 0 // fchownat
966 data8 0 // futimesat // 1285
967 data8 0 // newfstatat
968 data8 0 // unlinkat
969 data8 0 // renameat
970 data8 0 // linkat
971 data8 0 // symlinkat // 1290
972 data8 0 // readlinkat
973 data8 0 // fchmodat
974 data8 0 // faccessat
975 data8 0
976 data8 0 // 1295
977 data8 0 // unshare
978 data8 0 // splice
979 data8 0 // set_robust_list
980 data8 0 // get_robust_list
981 data8 0 // sync_file_range // 1300
982 data8 0 // tee
983 data8 0 // vmsplice
984 data8 0
985 data8 fsys_getcpu // getcpu // 1304
881 986
882 // fill in zeros for the remaining entries 987 // fill in zeros for the remaining entries
883 .zero: 988 .zero:
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 0fc5fb7865cf..dcfbf3e7a9ef 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -446,7 +446,7 @@ iosapic_end_level_irq (unsigned int irq)
446#define iosapic_disable_level_irq mask_irq 446#define iosapic_disable_level_irq mask_irq
447#define iosapic_ack_level_irq nop 447#define iosapic_ack_level_irq nop
448 448
449struct hw_interrupt_type irq_type_iosapic_level = { 449struct irq_chip irq_type_iosapic_level = {
450 .name = "IO-SAPIC-level", 450 .name = "IO-SAPIC-level",
451 .startup = iosapic_startup_level_irq, 451 .startup = iosapic_startup_level_irq,
452 .shutdown = iosapic_shutdown_level_irq, 452 .shutdown = iosapic_shutdown_level_irq,
@@ -454,6 +454,8 @@ struct hw_interrupt_type irq_type_iosapic_level = {
454 .disable = iosapic_disable_level_irq, 454 .disable = iosapic_disable_level_irq,
455 .ack = iosapic_ack_level_irq, 455 .ack = iosapic_ack_level_irq,
456 .end = iosapic_end_level_irq, 456 .end = iosapic_end_level_irq,
457 .mask = mask_irq,
458 .unmask = unmask_irq,
457 .set_affinity = iosapic_set_affinity 459 .set_affinity = iosapic_set_affinity
458}; 460};
459 461
@@ -493,7 +495,7 @@ iosapic_ack_edge_irq (unsigned int irq)
493#define iosapic_disable_edge_irq nop 495#define iosapic_disable_edge_irq nop
494#define iosapic_end_edge_irq nop 496#define iosapic_end_edge_irq nop
495 497
496struct hw_interrupt_type irq_type_iosapic_edge = { 498struct irq_chip irq_type_iosapic_edge = {
497 .name = "IO-SAPIC-edge", 499 .name = "IO-SAPIC-edge",
498 .startup = iosapic_startup_edge_irq, 500 .startup = iosapic_startup_edge_irq,
499 .shutdown = iosapic_disable_edge_irq, 501 .shutdown = iosapic_disable_edge_irq,
@@ -501,6 +503,8 @@ struct hw_interrupt_type irq_type_iosapic_edge = {
501 .disable = iosapic_disable_edge_irq, 503 .disable = iosapic_disable_edge_irq,
502 .ack = iosapic_ack_edge_irq, 504 .ack = iosapic_ack_edge_irq,
503 .end = iosapic_end_edge_irq, 505 .end = iosapic_end_edge_irq,
506 .mask = mask_irq,
507 .unmask = unmask_irq,
504 .set_affinity = iosapic_set_affinity 508 .set_affinity = iosapic_set_affinity
505}; 509};
506 510
@@ -925,6 +929,11 @@ iosapic_unregister_intr (unsigned int gsi)
925 /* Clear the interrupt controller descriptor */ 929 /* Clear the interrupt controller descriptor */
926 idesc->chip = &no_irq_type; 930 idesc->chip = &no_irq_type;
927 931
932#ifdef CONFIG_SMP
933 /* Clear affinity */
934 cpus_setall(idesc->affinity);
935#endif
936
928 /* Clear the interrupt information */ 937 /* Clear the interrupt information */
929 memset(&iosapic_intr_info[vector], 0, 938 memset(&iosapic_intr_info[vector], 0,
930 sizeof(struct iosapic_intr_info)); 939 sizeof(struct iosapic_intr_info));
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index ba3ba8bc50be..456f57b087ca 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -275,7 +275,7 @@ static struct irqaction ipi_irqaction = {
275 275
276static struct irqaction resched_irqaction = { 276static struct irqaction resched_irqaction = {
277 .handler = dummy_handler, 277 .handler = dummy_handler,
278 .flags = SA_INTERRUPT, 278 .flags = IRQF_DISABLED,
279 .name = "resched" 279 .name = "resched"
280}; 280};
281#endif 281#endif
diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
index e2ccc9f660c5..4f0f3b8c1ee2 100644
--- a/arch/ia64/kernel/machine_kexec.c
+++ b/arch/ia64/kernel/machine_kexec.c
@@ -14,6 +14,7 @@
14#include <linux/kexec.h> 14#include <linux/kexec.h>
15#include <linux/cpu.h> 15#include <linux/cpu.h>
16#include <linux/irq.h> 16#include <linux/irq.h>
17#include <linux/efi.h>
17#include <asm/mmu_context.h> 18#include <asm/mmu_context.h>
18#include <asm/setup.h> 19#include <asm/setup.h>
19#include <asm/delay.h> 20#include <asm/delay.h>
@@ -68,22 +69,10 @@ void machine_kexec_cleanup(struct kimage *image)
68{ 69{
69} 70}
70 71
71void machine_shutdown(void)
72{
73 int cpu;
74
75 for_each_online_cpu(cpu) {
76 if (cpu != smp_processor_id())
77 cpu_down(cpu);
78 }
79 kexec_disable_iosapic();
80}
81
82/* 72/*
83 * Do not allocate memory (or fail in any way) in machine_kexec(). 73 * Do not allocate memory (or fail in any way) in machine_kexec().
84 * We are past the point of no return, committed to rebooting now. 74 * We are past the point of no return, committed to rebooting now.
85 */ 75 */
86extern void *efi_get_pal_addr(void);
87static void ia64_machine_kexec(struct unw_frame_info *info, void *arg) 76static void ia64_machine_kexec(struct unw_frame_info *info, void *arg)
88{ 77{
89 struct kimage *image = arg; 78 struct kimage *image = arg;
@@ -93,6 +82,7 @@ static void ia64_machine_kexec(struct unw_frame_info *info, void *arg)
93 unsigned long vector; 82 unsigned long vector;
94 int ii; 83 int ii;
95 84
85 BUG_ON(!image);
96 if (image->type == KEXEC_TYPE_CRASH) { 86 if (image->type == KEXEC_TYPE_CRASH) {
97 crash_save_this_cpu(); 87 crash_save_this_cpu();
98 current->thread.ksp = (__u64)info->sw - 16; 88 current->thread.ksp = (__u64)info->sw - 16;
@@ -131,6 +121,7 @@ static void ia64_machine_kexec(struct unw_frame_info *info, void *arg)
131 121
132void machine_kexec(struct kimage *image) 122void machine_kexec(struct kimage *image)
133{ 123{
124 BUG_ON(!image);
134 unw_init_running(ia64_machine_kexec, image); 125 unw_init_running(ia64_machine_kexec, image);
135 for(;;); 126 for(;;);
136} 127}
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index a76add3e76a2..491687f84fb5 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1192,8 +1192,6 @@ void
1192ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw, 1192ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
1193 struct ia64_sal_os_state *sos) 1193 struct ia64_sal_os_state *sos)
1194{ 1194{
1195 pal_processor_state_info_t *psp = (pal_processor_state_info_t *)
1196 &sos->proc_state_param;
1197 int recover, cpu = smp_processor_id(); 1195 int recover, cpu = smp_processor_id();
1198 struct task_struct *previous_current; 1196 struct task_struct *previous_current;
1199 struct ia64_mca_notify_die nd = 1197 struct ia64_mca_notify_die nd =
@@ -1223,10 +1221,8 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
1223 /* Get the MCA error record and log it */ 1221 /* Get the MCA error record and log it */
1224 ia64_mca_log_sal_error_record(SAL_INFO_TYPE_MCA); 1222 ia64_mca_log_sal_error_record(SAL_INFO_TYPE_MCA);
1225 1223
1226 /* TLB error is only exist in this SAL error record */ 1224 /* MCA error recovery */
1227 recover = (psp->tc && !(psp->cc || psp->bc || psp->rc || psp->uc)) 1225 recover = (ia64_mca_ucmc_extension
1228 /* other error recovery */
1229 || (ia64_mca_ucmc_extension
1230 && ia64_mca_ucmc_extension( 1226 && ia64_mca_ucmc_extension(
1231 IA64_LOG_CURR_BUFFER(SAL_INFO_TYPE_MCA), 1227 IA64_LOG_CURR_BUFFER(SAL_INFO_TYPE_MCA),
1232 sos)); 1228 sos));
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c
index afc1403799c9..832cf1e647e8 100644
--- a/arch/ia64/kernel/mca_drv.c
+++ b/arch/ia64/kernel/mca_drv.c
@@ -602,11 +602,40 @@ recover_from_platform_error(slidx_table_t *slidx, peidx_table_t *peidx,
602 default: 602 default:
603 break; 603 break;
604 } 604 }
605 } else if (psp->cc && !psp->bc) { /* Cache error */
606 status = recover_from_read_error(slidx, peidx, pbci, sos);
605 } 607 }
606 608
607 return status; 609 return status;
608} 610}
609 611
612/*
613 * recover_from_tlb_check
614 * @peidx: pointer of index of processor error section
615 *
616 * Return value:
617 * 1 on Success / 0 on Failure
618 */
619static int
620recover_from_tlb_check(peidx_table_t *peidx)
621{
622 sal_log_mod_error_info_t *smei;
623 pal_tlb_check_info_t *ptci;
624
625 smei = (sal_log_mod_error_info_t *)peidx_tlb_check(peidx, 0);
626 ptci = (pal_tlb_check_info_t *)&(smei->check_info);
627
628 /*
629 * Look for signature of a duplicate TLB DTC entry, which is
630 * a SW bug and always fatal.
631 */
632 if (ptci->op == PAL_TLB_CHECK_OP_PURGE
633 && !(ptci->itr || ptci->dtc || ptci->itc))
634 return fatal_mca("Duplicate TLB entry");
635
636 return mca_recovered("TLB check recovered");
637}
638
610/** 639/**
611 * recover_from_processor_error 640 * recover_from_processor_error
612 * @platform: whether there are some platform error section or not 641 * @platform: whether there are some platform error section or not
@@ -618,13 +647,6 @@ recover_from_platform_error(slidx_table_t *slidx, peidx_table_t *peidx,
618 * Return value: 647 * Return value:
619 * 1 on Success / 0 on Failure 648 * 1 on Success / 0 on Failure
620 */ 649 */
621/*
622 * Later we try to recover when below all conditions are satisfied.
623 * 1. Only one processor error section is exist.
624 * 2. BUS_CHECK is exist and the others are not exist.(Except TLB_CHECK)
625 * 3. The entry of BUS_CHECK_INFO is 1.
626 * 4. "External bus error" flag is set and the others are not set.
627 */
628 650
629static int 651static int
630recover_from_processor_error(int platform, slidx_table_t *slidx, 652recover_from_processor_error(int platform, slidx_table_t *slidx,
@@ -652,38 +674,39 @@ recover_from_processor_error(int platform, slidx_table_t *slidx,
652 return fatal_mca("error not contained"); 674 return fatal_mca("error not contained");
653 675
654 /* 676 /*
677 * Look for recoverable TLB check
678 */
679 if (psp->tc && !(psp->cc || psp->bc || psp->rc || psp->uc))
680 return recover_from_tlb_check(peidx);
681
682 /*
655 * The cache check and bus check bits have four possible states 683 * The cache check and bus check bits have four possible states
656 * cc bc 684 * cc bc
657 * 0 0 Weird record, not recovered
658 * 1 0 Cache error, not recovered
659 * 0 1 I/O error, attempt recovery
660 * 1 1 Memory error, attempt recovery 685 * 1 1 Memory error, attempt recovery
686 * 1 0 Cache error, attempt recovery
687 * 0 1 I/O error, attempt recovery
688 * 0 0 Other error type, not recovered
661 */ 689 */
662 if (psp->bc == 0 || pbci == NULL) 690 if (psp->cc == 0 && (psp->bc == 0 || pbci == NULL))
663 return fatal_mca("No bus check"); 691 return fatal_mca("No cache or bus check");
664 692
665 /* 693 /*
666 * Sorry, we cannot handle so many. 694 * Cannot handle more than one bus check.
667 */ 695 */
668 if (peidx_bus_check_num(peidx) > 1) 696 if (peidx_bus_check_num(peidx) > 1)
669 return fatal_mca("Too many bus checks"); 697 return fatal_mca("Too many bus checks");
670 /* 698
671 * Well, here is only one bus error.
672 */
673 if (pbci->ib) 699 if (pbci->ib)
674 return fatal_mca("Internal Bus error"); 700 return fatal_mca("Internal Bus error");
675 if (pbci->cc)
676 return fatal_mca("Cache-cache error");
677 if (pbci->eb && pbci->bsi > 0) 701 if (pbci->eb && pbci->bsi > 0)
678 return fatal_mca("External bus check fatal status"); 702 return fatal_mca("External bus check fatal status");
679 703
680 /* 704 /*
681 * This is a local MCA and estimated as recoverble external bus error. 705 * This is a local MCA and estimated as a recoverble error.
682 * (e.g. a load from poisoned memory)
683 * This means "there are some platform errors".
684 */ 706 */
685 if (platform) 707 if (platform)
686 return recover_from_platform_error(slidx, peidx, pbci, sos); 708 return recover_from_platform_error(slidx, peidx, pbci, sos);
709
687 /* 710 /*
688 * On account of strange SAL error record, we cannot recover. 711 * On account of strange SAL error record, we cannot recover.
689 */ 712 */
diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c
index 822e59a1b822..c81080df70df 100644
--- a/arch/ia64/kernel/msi_ia64.c
+++ b/arch/ia64/kernel/msi_ia64.c
@@ -60,18 +60,23 @@ static void ia64_set_msi_irq_affinity(unsigned int irq, cpumask_t cpu_mask)
60 msg.address_lo = addr; 60 msg.address_lo = addr;
61 61
62 write_msi_msg(irq, &msg); 62 write_msi_msg(irq, &msg);
63 set_native_irq_info(irq, cpu_mask); 63 irq_desc[irq].affinity = cpu_mask;
64} 64}
65#endif /* CONFIG_SMP */ 65#endif /* CONFIG_SMP */
66 66
67int ia64_setup_msi_irq(unsigned int irq, struct pci_dev *pdev) 67int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
68{ 68{
69 struct msi_msg msg; 69 struct msi_msg msg;
70 unsigned long dest_phys_id; 70 unsigned long dest_phys_id;
71 unsigned int vector; 71 int irq, vector;
72 72
73 irq = create_irq();
74 if (irq < 0)
75 return irq;
76
77 set_irq_msi(irq, desc);
73 dest_phys_id = cpu_physical_id(first_cpu(cpu_online_map)); 78 dest_phys_id = cpu_physical_id(first_cpu(cpu_online_map));
74 vector = irq; 79 vector = irq_to_vector(irq);
75 80
76 msg.address_hi = 0; 81 msg.address_hi = 0;
77 msg.address_lo = 82 msg.address_lo =
@@ -89,12 +94,12 @@ int ia64_setup_msi_irq(unsigned int irq, struct pci_dev *pdev)
89 write_msi_msg(irq, &msg); 94 write_msi_msg(irq, &msg);
90 set_irq_chip_and_handler(irq, &ia64_msi_chip, handle_edge_irq); 95 set_irq_chip_and_handler(irq, &ia64_msi_chip, handle_edge_irq);
91 96
92 return 0; 97 return irq;
93} 98}
94 99
95void ia64_teardown_msi_irq(unsigned int irq) 100void ia64_teardown_msi_irq(unsigned int irq)
96{ 101{
97 return; /* no-op */ 102 destroy_irq(irq);
98} 103}
99 104
100static void ia64_ack_msi_irq(unsigned int irq) 105static void ia64_ack_msi_irq(unsigned int irq)
@@ -105,7 +110,7 @@ static void ia64_ack_msi_irq(unsigned int irq)
105 110
106static int ia64_msi_retrigger_irq(unsigned int irq) 111static int ia64_msi_retrigger_irq(unsigned int irq)
107{ 112{
108 unsigned int vector = irq; 113 unsigned int vector = irq_to_vector(irq);
109 ia64_resend_irq(vector); 114 ia64_resend_irq(vector);
110 115
111 return 1; 116 return 1;
@@ -126,12 +131,12 @@ static struct irq_chip ia64_msi_chip = {
126}; 131};
127 132
128 133
129int arch_setup_msi_irq(unsigned int irq, struct pci_dev *pdev) 134int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
130{ 135{
131 if (platform_setup_msi_irq) 136 if (platform_setup_msi_irq)
132 return platform_setup_msi_irq(irq, pdev); 137 return platform_setup_msi_irq(pdev, desc);
133 138
134 return ia64_setup_msi_irq(irq, pdev); 139 return ia64_setup_msi_irq(pdev, desc);
135} 140}
136 141
137void arch_teardown_msi_irq(unsigned int irq) 142void arch_teardown_msi_irq(unsigned int irq)
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index aa94f60fa8e7..abc7ad035886 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -147,7 +147,7 @@
147 * in UP: 147 * in UP:
148 * - we need to protect against PMU overflow interrupts (local_irq_disable) 148 * - we need to protect against PMU overflow interrupts (local_irq_disable)
149 * 149 *
150 * spin_lock_irqsave()/spin_lock_irqrestore(): 150 * spin_lock_irqsave()/spin_unlock_irqrestore():
151 * in SMP: local_irq_disable + spin_lock 151 * in SMP: local_irq_disable + spin_lock
152 * in UP : local_irq_disable 152 * in UP : local_irq_disable
153 * 153 *
@@ -521,19 +521,57 @@ pfm_sysctl_t pfm_sysctl;
521EXPORT_SYMBOL(pfm_sysctl); 521EXPORT_SYMBOL(pfm_sysctl);
522 522
523static ctl_table pfm_ctl_table[]={ 523static ctl_table pfm_ctl_table[]={
524 {1, "debug", &pfm_sysctl.debug, sizeof(int), 0666, NULL, &proc_dointvec, NULL,}, 524 {
525 {2, "debug_ovfl", &pfm_sysctl.debug_ovfl, sizeof(int), 0666, NULL, &proc_dointvec, NULL,}, 525 .ctl_name = CTL_UNNUMBERED,
526 {3, "fastctxsw", &pfm_sysctl.fastctxsw, sizeof(int), 0600, NULL, &proc_dointvec, NULL,}, 526 .procname = "debug",
527 {4, "expert_mode", &pfm_sysctl.expert_mode, sizeof(int), 0600, NULL, &proc_dointvec, NULL,}, 527 .data = &pfm_sysctl.debug,
528 { 0, }, 528 .maxlen = sizeof(int),
529 .mode = 0666,
530 .proc_handler = &proc_dointvec,
531 },
532 {
533 .ctl_name = CTL_UNNUMBERED,
534 .procname = "debug_ovfl",
535 .data = &pfm_sysctl.debug_ovfl,
536 .maxlen = sizeof(int),
537 .mode = 0666,
538 .proc_handler = &proc_dointvec,
539 },
540 {
541 .ctl_name = CTL_UNNUMBERED,
542 .procname = "fastctxsw",
543 .data = &pfm_sysctl.fastctxsw,
544 .maxlen = sizeof(int),
545 .mode = 0600,
546 .proc_handler = &proc_dointvec,
547 },
548 {
549 .ctl_name = CTL_UNNUMBERED,
550 .procname = "expert_mode",
551 .data = &pfm_sysctl.expert_mode,
552 .maxlen = sizeof(int),
553 .mode = 0600,
554 .proc_handler = &proc_dointvec,
555 },
556 {}
529}; 557};
530static ctl_table pfm_sysctl_dir[] = { 558static ctl_table pfm_sysctl_dir[] = {
531 {1, "perfmon", NULL, 0, 0755, pfm_ctl_table, }, 559 {
532 {0,}, 560 .ctl_name = CTL_UNNUMBERED,
561 .procname = "perfmon",
562 .mode = 0755,
563 .child = pfm_ctl_table,
564 },
565 {}
533}; 566};
534static ctl_table pfm_sysctl_root[] = { 567static ctl_table pfm_sysctl_root[] = {
535 {1, "kernel", NULL, 0, 0755, pfm_sysctl_dir, }, 568 {
536 {0,}, 569 .ctl_name = CTL_KERN,
570 .procname = "kernel",
571 .mode = 0755,
572 .child = pfm_sysctl_dir,
573 },
574 {}
537}; 575};
538static struct ctl_table_header *pfm_sysctl_header; 576static struct ctl_table_header *pfm_sysctl_header;
539 577
@@ -621,7 +659,7 @@ EXPORT_PER_CPU_SYMBOL_GPL(pfm_syst_info);
621 659
622 660
623/* forward declaration */ 661/* forward declaration */
624static struct file_operations pfm_file_ops; 662static const struct file_operations pfm_file_ops;
625 663
626/* 664/*
627 * forward declarations 665 * forward declarations
@@ -2126,7 +2164,7 @@ pfm_no_open(struct inode *irrelevant, struct file *dontcare)
2126 2164
2127 2165
2128 2166
2129static struct file_operations pfm_file_ops = { 2167static const struct file_operations pfm_file_ops = {
2130 .llseek = no_llseek, 2168 .llseek = no_llseek,
2131 .read = pfm_read, 2169 .read = pfm_read,
2132 .write = pfm_write, 2170 .write = pfm_write,
@@ -2261,7 +2299,7 @@ pfm_remap_buffer(struct vm_area_struct *vma, unsigned long buf, unsigned long ad
2261 * allocate a sampling buffer and remaps it into the user address space of the task 2299 * allocate a sampling buffer and remaps it into the user address space of the task
2262 */ 2300 */
2263static int 2301static int
2264pfm_smpl_buffer_alloc(struct task_struct *task, pfm_context_t *ctx, unsigned long rsize, void **user_vaddr) 2302pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t *ctx, unsigned long rsize, void **user_vaddr)
2265{ 2303{
2266 struct mm_struct *mm = task->mm; 2304 struct mm_struct *mm = task->mm;
2267 struct vm_area_struct *vma = NULL; 2305 struct vm_area_struct *vma = NULL;
@@ -2301,17 +2339,17 @@ pfm_smpl_buffer_alloc(struct task_struct *task, pfm_context_t *ctx, unsigned lon
2301 DPRINT(("smpl_buf @%p\n", smpl_buf)); 2339 DPRINT(("smpl_buf @%p\n", smpl_buf));
2302 2340
2303 /* allocate vma */ 2341 /* allocate vma */
2304 vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); 2342 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
2305 if (!vma) { 2343 if (!vma) {
2306 DPRINT(("Cannot allocate vma\n")); 2344 DPRINT(("Cannot allocate vma\n"));
2307 goto error_kmem; 2345 goto error_kmem;
2308 } 2346 }
2309 memset(vma, 0, sizeof(*vma));
2310 2347
2311 /* 2348 /*
2312 * partially initialize the vma for the sampling buffer 2349 * partially initialize the vma for the sampling buffer
2313 */ 2350 */
2314 vma->vm_mm = mm; 2351 vma->vm_mm = mm;
2352 vma->vm_file = filp;
2315 vma->vm_flags = VM_READ| VM_MAYREAD |VM_RESERVED; 2353 vma->vm_flags = VM_READ| VM_MAYREAD |VM_RESERVED;
2316 vma->vm_page_prot = PAGE_READONLY; /* XXX may need to change */ 2354 vma->vm_page_prot = PAGE_READONLY; /* XXX may need to change */
2317 2355
@@ -2350,6 +2388,8 @@ pfm_smpl_buffer_alloc(struct task_struct *task, pfm_context_t *ctx, unsigned lon
2350 goto error; 2388 goto error;
2351 } 2389 }
2352 2390
2391 get_file(filp);
2392
2353 /* 2393 /*
2354 * now insert the vma in the vm list for the process, must be 2394 * now insert the vma in the vm list for the process, must be
2355 * done with mmap lock held 2395 * done with mmap lock held
@@ -2427,7 +2467,7 @@ pfarg_is_sane(struct task_struct *task, pfarg_context_t *pfx)
2427} 2467}
2428 2468
2429static int 2469static int
2430pfm_setup_buffer_fmt(struct task_struct *task, pfm_context_t *ctx, unsigned int ctx_flags, 2470pfm_setup_buffer_fmt(struct task_struct *task, struct file *filp, pfm_context_t *ctx, unsigned int ctx_flags,
2431 unsigned int cpu, pfarg_context_t *arg) 2471 unsigned int cpu, pfarg_context_t *arg)
2432{ 2472{
2433 pfm_buffer_fmt_t *fmt = NULL; 2473 pfm_buffer_fmt_t *fmt = NULL;
@@ -2468,7 +2508,7 @@ pfm_setup_buffer_fmt(struct task_struct *task, pfm_context_t *ctx, unsigned int
2468 /* 2508 /*
2469 * buffer is always remapped into the caller's address space 2509 * buffer is always remapped into the caller's address space
2470 */ 2510 */
2471 ret = pfm_smpl_buffer_alloc(current, ctx, size, &uaddr); 2511 ret = pfm_smpl_buffer_alloc(current, filp, ctx, size, &uaddr);
2472 if (ret) goto error; 2512 if (ret) goto error;
2473 2513
2474 /* keep track of user address of buffer */ 2514 /* keep track of user address of buffer */
@@ -2679,7 +2719,7 @@ pfm_context_create(pfm_context_t *ctx, void *arg, int count, struct pt_regs *reg
2679 * does the user want to sample? 2719 * does the user want to sample?
2680 */ 2720 */
2681 if (pfm_uuid_cmp(req->ctx_smpl_buf_id, pfm_null_uuid)) { 2721 if (pfm_uuid_cmp(req->ctx_smpl_buf_id, pfm_null_uuid)) {
2682 ret = pfm_setup_buffer_fmt(current, ctx, ctx_flags, 0, req); 2722 ret = pfm_setup_buffer_fmt(current, filp, ctx, ctx_flags, 0, req);
2683 if (ret) goto buffer_error; 2723 if (ret) goto buffer_error;
2684 } 2724 }
2685 2725
@@ -6597,7 +6637,7 @@ found:
6597 return 0; 6637 return 0;
6598} 6638}
6599 6639
6600static struct file_operations pfm_proc_fops = { 6640static const struct file_operations pfm_proc_fops = {
6601 .open = pfm_proc_open, 6641 .open = pfm_proc_open,
6602 .read = seq_read, 6642 .read = seq_read,
6603 .llseek = seq_lseek, 6643 .llseek = seq_lseek,
@@ -6689,7 +6729,7 @@ pfm_init(void)
6689 /* 6729 /*
6690 * create /proc/sys/kernel/perfmon (for debugging purposes) 6730 * create /proc/sys/kernel/perfmon (for debugging purposes)
6691 */ 6731 */
6692 pfm_sysctl_header = register_sysctl_table(pfm_sysctl_root, 0); 6732 pfm_sysctl_header = register_sysctl_table(pfm_sysctl_root);
6693 6733
6694 /* 6734 /*
6695 * initialize all our spinlocks 6735 * initialize all our spinlocks
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 17685abaf496..ae96d4176995 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -34,6 +34,7 @@
34#include <asm/ia32.h> 34#include <asm/ia32.h>
35#include <asm/irq.h> 35#include <asm/irq.h>
36#include <asm/kdebug.h> 36#include <asm/kdebug.h>
37#include <asm/kexec.h>
37#include <asm/pgalloc.h> 38#include <asm/pgalloc.h>
38#include <asm/processor.h> 39#include <asm/processor.h>
39#include <asm/sal.h> 40#include <asm/sal.h>
@@ -803,6 +804,21 @@ cpu_halt (void)
803 ia64_pal_halt(min_power_state); 804 ia64_pal_halt(min_power_state);
804} 805}
805 806
807void machine_shutdown(void)
808{
809#ifdef CONFIG_HOTPLUG_CPU
810 int cpu;
811
812 for_each_online_cpu(cpu) {
813 if (cpu != smp_processor_id())
814 cpu_down(cpu);
815 }
816#endif
817#ifdef CONFIG_KEXEC
818 kexec_disable_iosapic();
819#endif
820}
821
806void 822void
807machine_restart (char *restart_cmd) 823machine_restart (char *restart_cmd)
808{ 824{
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index aa705e46b974..00f803246948 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -607,7 +607,7 @@ find_thread_for_addr (struct task_struct *child, unsigned long addr)
607 */ 607 */
608 list_for_each_safe(this, next, &current->children) { 608 list_for_each_safe(this, next, &current->children) {
609 p = list_entry(this, struct task_struct, sibling); 609 p = list_entry(this, struct task_struct, sibling);
610 if (p->mm != mm) 610 if (p->tgid != child->tgid)
611 continue; 611 continue;
612 if (thread_matches(p, addr)) { 612 if (thread_matches(p, addr)) {
613 child = p; 613 child = p;
@@ -1405,6 +1405,7 @@ ptrace_disable (struct task_struct *child)
1405 struct ia64_psr *child_psr = ia64_psr(task_pt_regs(child)); 1405 struct ia64_psr *child_psr = ia64_psr(task_pt_regs(child));
1406 1406
1407 /* make sure the single step/taken-branch trap bits are not set: */ 1407 /* make sure the single step/taken-branch trap bits are not set: */
1408 clear_tsk_thread_flag(child, TIF_SINGLESTEP);
1408 child_psr->ss = 0; 1409 child_psr->ss = 0;
1409 child_psr->tb = 0; 1410 child_psr->tb = 0;
1410} 1411}
@@ -1525,6 +1526,7 @@ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
1525 * Make sure the single step/taken-branch trap bits 1526 * Make sure the single step/taken-branch trap bits
1526 * are not set: 1527 * are not set:
1527 */ 1528 */
1529 clear_tsk_thread_flag(child, TIF_SINGLESTEP);
1528 ia64_psr(pt)->ss = 0; 1530 ia64_psr(pt)->ss = 0;
1529 ia64_psr(pt)->tb = 0; 1531 ia64_psr(pt)->tb = 0;
1530 1532
@@ -1556,6 +1558,7 @@ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
1556 goto out_tsk; 1558 goto out_tsk;
1557 1559
1558 clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); 1560 clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
1561 set_tsk_thread_flag(child, TIF_SINGLESTEP);
1559 if (request == PTRACE_SINGLESTEP) { 1562 if (request == PTRACE_SINGLESTEP) {
1560 ia64_psr(pt)->ss = 1; 1563 ia64_psr(pt)->ss = 1;
1561 } else { 1564 } else {
@@ -1570,6 +1573,7 @@ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
1570 1573
1571 case PTRACE_DETACH: 1574 case PTRACE_DETACH:
1572 /* detach a process that was attached. */ 1575 /* detach a process that was attached. */
1576 clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
1573 ret = ptrace_detach(child, data); 1577 ret = ptrace_detach(child, data);
1574 goto out_tsk; 1578 goto out_tsk;
1575 1579
@@ -1595,13 +1599,9 @@ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
1595} 1599}
1596 1600
1597 1601
1598void 1602static void
1599syscall_trace (void) 1603syscall_trace (void)
1600{ 1604{
1601 if (!test_thread_flag(TIF_SYSCALL_TRACE))
1602 return;
1603 if (!(current->ptrace & PT_PTRACED))
1604 return;
1605 /* 1605 /*
1606 * The 0x80 provides a way for the tracing parent to 1606 * The 0x80 provides a way for the tracing parent to
1607 * distinguish between a syscall stop and SIGTRAP delivery. 1607 * distinguish between a syscall stop and SIGTRAP delivery.
@@ -1664,7 +1664,8 @@ syscall_trace_leave (long arg0, long arg1, long arg2, long arg3,
1664 audit_syscall_exit(success, result); 1664 audit_syscall_exit(success, result);
1665 } 1665 }
1666 1666
1667 if (test_thread_flag(TIF_SYSCALL_TRACE) 1667 if ((test_thread_flag(TIF_SYSCALL_TRACE)
1668 || test_thread_flag(TIF_SINGLESTEP))
1668 && (current->ptrace & PT_PTRACED)) 1669 && (current->ptrace & PT_PTRACED))
1669 syscall_trace(); 1670 syscall_trace();
1670} 1671}
diff --git a/arch/ia64/kernel/sal.c b/arch/ia64/kernel/sal.c
index 20bad78b5073..37c876f95dba 100644
--- a/arch/ia64/kernel/sal.c
+++ b/arch/ia64/kernel/sal.c
@@ -194,9 +194,8 @@ static void __init
194chk_nointroute_opt(void) 194chk_nointroute_opt(void)
195{ 195{
196 char *cp; 196 char *cp;
197 extern char saved_command_line[];
198 197
199 for (cp = saved_command_line; *cp; ) { 198 for (cp = boot_command_line; *cp; ) {
200 if (memcmp(cp, "nointroute", 10) == 0) { 199 if (memcmp(cp, "nointroute", 10) == 0) {
201 no_int_routing = 1; 200 no_int_routing = 1;
202 printk ("no_int_routing on\n"); 201 printk ("no_int_routing on\n");
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index e375a2f0f2c3..af9f8754d847 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -352,7 +352,7 @@ retry:
352 return size; 352 return size;
353} 353}
354 354
355static struct file_operations salinfo_event_fops = { 355static const struct file_operations salinfo_event_fops = {
356 .open = salinfo_event_open, 356 .open = salinfo_event_open,
357 .read = salinfo_event_read, 357 .read = salinfo_event_read,
358}; 358};
@@ -568,7 +568,7 @@ salinfo_log_write(struct file *file, const char __user *buffer, size_t count, lo
568 return count; 568 return count;
569} 569}
570 570
571static struct file_operations salinfo_data_fops = { 571static const struct file_operations salinfo_data_fops = {
572 .open = salinfo_log_open, 572 .open = salinfo_log_open,
573 .release = salinfo_log_release, 573 .release = salinfo_log_release,
574 .read = salinfo_log_read, 574 .read = salinfo_log_read,
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index f167b89f24eb..6e19da122ae3 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -90,8 +90,6 @@ static struct resource code_resource = {
90 .name = "Kernel code", 90 .name = "Kernel code",
91 .flags = IORESOURCE_BUSY | IORESOURCE_MEM 91 .flags = IORESOURCE_BUSY | IORESOURCE_MEM
92}; 92};
93extern void efi_initialize_iomem_resources(struct resource *,
94 struct resource *);
95extern char _text[], _end[], _etext[]; 93extern char _text[], _end[], _etext[];
96 94
97unsigned long ia64_max_cacheline_size; 95unsigned long ia64_max_cacheline_size;
@@ -250,6 +248,12 @@ reserve_memory (void)
250 } 248 }
251#endif 249#endif
252 250
251#ifdef CONFIG_PROC_VMCORE
252 if (reserve_elfcorehdr(&rsvd_region[n].start,
253 &rsvd_region[n].end) == 0)
254 n++;
255#endif
256
253 efi_memmap_init(&rsvd_region[n].start, &rsvd_region[n].end); 257 efi_memmap_init(&rsvd_region[n].start, &rsvd_region[n].end);
254 n++; 258 n++;
255 259
@@ -261,7 +265,7 @@ reserve_memory (void)
261 * appropriate after a kernel panic. 265 * appropriate after a kernel panic.
262 */ 266 */
263 { 267 {
264 char *from = strstr(saved_command_line, "crashkernel="); 268 char *from = strstr(boot_command_line, "crashkernel=");
265 unsigned long base, size; 269 unsigned long base, size;
266 if (from) { 270 if (from) {
267 size = memparse(from + 12, &from); 271 size = memparse(from + 12, &from);
@@ -452,6 +456,30 @@ static int __init parse_elfcorehdr(char *arg)
452 return 0; 456 return 0;
453} 457}
454early_param("elfcorehdr", parse_elfcorehdr); 458early_param("elfcorehdr", parse_elfcorehdr);
459
460int __init reserve_elfcorehdr(unsigned long *start, unsigned long *end)
461{
462 unsigned long length;
463
464 /* We get the address using the kernel command line,
465 * but the size is extracted from the EFI tables.
466 * Both address and size are required for reservation
467 * to work properly.
468 */
469
470 if (elfcorehdr_addr >= ELFCORE_ADDR_MAX)
471 return -EINVAL;
472
473 if ((length = vmcore_find_descriptor_size(elfcorehdr_addr)) == 0) {
474 elfcorehdr_addr = ELFCORE_ADDR_MAX;
475 return -EINVAL;
476 }
477
478 *start = (unsigned long)__va(elfcorehdr_addr);
479 *end = *start + length;
480 return 0;
481}
482
455#endif /* CONFIG_PROC_VMCORE */ 483#endif /* CONFIG_PROC_VMCORE */
456 484
457void __init 485void __init
@@ -462,7 +490,7 @@ setup_arch (char **cmdline_p)
462 ia64_patch_vtop((u64) __start___vtop_patchlist, (u64) __end___vtop_patchlist); 490 ia64_patch_vtop((u64) __start___vtop_patchlist, (u64) __end___vtop_patchlist);
463 491
464 *cmdline_p = __va(ia64_boot_param->command_line); 492 *cmdline_p = __va(ia64_boot_param->command_line);
465 strlcpy(saved_command_line, *cmdline_p, COMMAND_LINE_SIZE); 493 strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE);
466 494
467 efi_init(); 495 efi_init();
468 io_port_init(); 496 io_port_init();
@@ -568,34 +596,31 @@ show_cpuinfo (struct seq_file *m, void *v)
568 { 1UL << 1, "spontaneous deferral"}, 596 { 1UL << 1, "spontaneous deferral"},
569 { 1UL << 2, "16-byte atomic ops" } 597 { 1UL << 2, "16-byte atomic ops" }
570 }; 598 };
571 char features[128], *cp, sep; 599 char features[128], *cp, *sep;
572 struct cpuinfo_ia64 *c = v; 600 struct cpuinfo_ia64 *c = v;
573 unsigned long mask; 601 unsigned long mask;
574 unsigned long proc_freq; 602 unsigned long proc_freq;
575 int i; 603 int i, size;
576 604
577 mask = c->features; 605 mask = c->features;
578 606
579 /* build the feature string: */ 607 /* build the feature string: */
580 memcpy(features, " standard", 10); 608 memcpy(features, "standard", 9);
581 cp = features; 609 cp = features;
582 sep = 0; 610 size = sizeof(features);
583 for (i = 0; i < (int) ARRAY_SIZE(feature_bits); ++i) { 611 sep = "";
612 for (i = 0; i < ARRAY_SIZE(feature_bits) && size > 1; ++i) {
584 if (mask & feature_bits[i].mask) { 613 if (mask & feature_bits[i].mask) {
585 if (sep) 614 cp += snprintf(cp, size, "%s%s", sep,
586 *cp++ = sep; 615 feature_bits[i].feature_name),
587 sep = ','; 616 sep = ", ";
588 *cp++ = ' ';
589 strcpy(cp, feature_bits[i].feature_name);
590 cp += strlen(feature_bits[i].feature_name);
591 mask &= ~feature_bits[i].mask; 617 mask &= ~feature_bits[i].mask;
618 size = sizeof(features) - (cp - features);
592 } 619 }
593 } 620 }
594 if (mask) { 621 if (mask && size > 1) {
595 /* print unknown features as a hex value: */ 622 /* print unknown features as a hex value */
596 if (sep) 623 snprintf(cp, size, "%s0x%lx", sep, mask);
597 *cp++ = sep;
598 sprintf(cp, " 0x%lx", mask);
599 } 624 }
600 625
601 proc_freq = cpufreq_quick_get(cpunum); 626 proc_freq = cpufreq_quick_get(cpunum);
@@ -611,10 +636,10 @@ show_cpuinfo (struct seq_file *m, void *v)
611 "model name : %s\n" 636 "model name : %s\n"
612 "revision : %u\n" 637 "revision : %u\n"
613 "archrev : %u\n" 638 "archrev : %u\n"
614 "features :%s\n" /* don't change this---it _is_ right! */ 639 "features : %s\n"
615 "cpu number : %lu\n" 640 "cpu number : %lu\n"
616 "cpu regs : %u\n" 641 "cpu regs : %u\n"
617 "cpu MHz : %lu.%06lu\n" 642 "cpu MHz : %lu.%03lu\n"
618 "itc MHz : %lu.%06lu\n" 643 "itc MHz : %lu.%06lu\n"
619 "BogoMIPS : %lu.%02lu\n", 644 "BogoMIPS : %lu.%02lu\n",
620 cpunum, c->vendor, c->family, c->model, 645 cpunum, c->vendor, c->family, c->model,
@@ -666,12 +691,15 @@ struct seq_operations cpuinfo_op = {
666 .show = show_cpuinfo 691 .show = show_cpuinfo
667}; 692};
668 693
669static char brandname[128]; 694#define MAX_BRANDS 8
695static char brandname[MAX_BRANDS][128];
670 696
671static char * __cpuinit 697static char * __cpuinit
672get_model_name(__u8 family, __u8 model) 698get_model_name(__u8 family, __u8 model)
673{ 699{
700 static int overflow;
674 char brand[128]; 701 char brand[128];
702 int i;
675 703
676 memcpy(brand, "Unknown", 8); 704 memcpy(brand, "Unknown", 8);
677 if (ia64_pal_get_brand_info(brand)) { 705 if (ia64_pal_get_brand_info(brand)) {
@@ -683,12 +711,17 @@ get_model_name(__u8 family, __u8 model)
683 case 2: memcpy(brand, "Madison up to 9M cache", 23); break; 711 case 2: memcpy(brand, "Madison up to 9M cache", 23); break;
684 } 712 }
685 } 713 }
686 if (brandname[0] == '\0') 714 for (i = 0; i < MAX_BRANDS; i++)
687 return strcpy(brandname, brand); 715 if (strcmp(brandname[i], brand) == 0)
688 else if (strcmp(brandname, brand) == 0) 716 return brandname[i];
689 return brandname; 717 for (i = 0; i < MAX_BRANDS; i++)
690 else 718 if (brandname[i][0] == '\0')
691 return kstrdup(brand, GFP_KERNEL); 719 return strcpy(brandname[i], brand);
720 if (overflow++ == 0)
721 printk(KERN_ERR
722 "%s: Table overflow. Some processor model information will be missing\n",
723 __FUNCTION__);
724 return "Unknown";
692} 725}
693 726
694static void __cpuinit 727static void __cpuinit
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index f4c7f7769cf7..55ddd809b02d 100644
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -221,13 +221,13 @@ send_IPI_self (int op)
221 221
222#ifdef CONFIG_KEXEC 222#ifdef CONFIG_KEXEC
223void 223void
224kdump_smp_send_stop() 224kdump_smp_send_stop(void)
225{ 225{
226 send_IPI_allbutself(IPI_KDUMP_CPU_STOP); 226 send_IPI_allbutself(IPI_KDUMP_CPU_STOP);
227} 227}
228 228
229void 229void
230kdump_smp_send_init() 230kdump_smp_send_init(void)
231{ 231{
232 unsigned int cpu, self_cpu; 232 unsigned int cpu, self_cpu;
233 self_cpu = smp_processor_id(); 233 self_cpu = smp_processor_id();
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index b21ddecea943..ff7df439da6d 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -375,6 +375,7 @@ static void __devinit
375smp_callin (void) 375smp_callin (void)
376{ 376{
377 int cpuid, phys_id, itc_master; 377 int cpuid, phys_id, itc_master;
378 struct cpuinfo_ia64 *last_cpuinfo, *this_cpuinfo;
378 extern void ia64_init_itm(void); 379 extern void ia64_init_itm(void);
379 extern volatile int time_keeper_id; 380 extern volatile int time_keeper_id;
380 381
@@ -424,7 +425,21 @@ smp_callin (void)
424 * Get our bogomips. 425 * Get our bogomips.
425 */ 426 */
426 ia64_init_itm(); 427 ia64_init_itm();
427 calibrate_delay(); 428
429 /*
430 * Delay calibration can be skipped if new processor is identical to the
431 * previous processor.
432 */
433 last_cpuinfo = cpu_data(cpuid - 1);
434 this_cpuinfo = local_cpu_data;
435 if (last_cpuinfo->itc_freq != this_cpuinfo->itc_freq ||
436 last_cpuinfo->proc_freq != this_cpuinfo->proc_freq ||
437 last_cpuinfo->features != this_cpuinfo->features ||
438 last_cpuinfo->revision != this_cpuinfo->revision ||
439 last_cpuinfo->family != this_cpuinfo->family ||
440 last_cpuinfo->archrev != this_cpuinfo->archrev ||
441 last_cpuinfo->model != this_cpuinfo->model)
442 calibrate_delay();
428 local_cpu_data->loops_per_jiffy = loops_per_jiffy; 443 local_cpu_data->loops_per_jiffy = loops_per_jiffy;
429 444
430#ifdef CONFIG_IA32_SUPPORT 445#ifdef CONFIG_IA32_SUPPORT
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index ab684747036f..765cbe5ba6ae 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -24,8 +24,6 @@
24#include <asm/uaccess.h> 24#include <asm/uaccess.h>
25#include <asm/kdebug.h> 25#include <asm/kdebug.h>
26 26
27extern spinlock_t timerlist_lock;
28
29fpswa_interface_t *fpswa_interface; 27fpswa_interface_t *fpswa_interface;
30EXPORT_SYMBOL(fpswa_interface); 28EXPORT_SYMBOL(fpswa_interface);
31 29
@@ -53,34 +51,6 @@ trap_init (void)
53 fpswa_interface = __va(ia64_boot_param->fpswa); 51 fpswa_interface = __va(ia64_boot_param->fpswa);
54} 52}
55 53
56/*
57 * Unlock any spinlocks which will prevent us from getting the message out (timerlist_lock
58 * is acquired through the console unblank code)
59 */
60void
61bust_spinlocks (int yes)
62{
63 int loglevel_save = console_loglevel;
64
65 if (yes) {
66 oops_in_progress = 1;
67 return;
68 }
69
70#ifdef CONFIG_VT
71 unblank_screen();
72#endif
73 oops_in_progress = 0;
74 /*
75 * OK, the message is on the console. Now we call printk() without
76 * oops_in_progress set so that printk will give klogd a poke. Hold onto
77 * your hats...
78 */
79 console_loglevel = 15; /* NMI oopser may have shut the console up */
80 printk(" ");
81 console_loglevel = loglevel_save;
82}
83
84void 54void
85die (const char *str, struct pt_regs *regs, long err) 55die (const char *str, struct pt_regs *regs, long err)
86{ 56{
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index d9599dcac787..692382642118 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -118,12 +118,14 @@ SECTIONS
118 .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) 118 .init.data : AT(ADDR(.init.data) - LOAD_OFFSET)
119 { *(.init.data) } 119 { *(.init.data) }
120 120
121#ifdef CONFIG_BLK_DEV_INITRD
121 .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) 122 .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET)
122 { 123 {
123 __initramfs_start = .; 124 __initramfs_start = .;
124 *(.init.ramfs) 125 *(.init.ramfs)
125 __initramfs_end = .; 126 __initramfs_end = .;
126 } 127 }
128#endif
127 129
128 . = ALIGN(16); 130 . = ALIGN(16);
129 .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) 131 .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET)
@@ -164,6 +166,7 @@ SECTIONS
164 } 166 }
165#endif 167#endif
166 168
169 . = ALIGN(8);
167 __con_initcall_start = .; 170 __con_initcall_start = .;
168 .con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) 171 .con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET)
169 { *(.con_initcall.init) } 172 { *(.con_initcall.init) }
diff --git a/arch/ia64/lib/Makefile b/arch/ia64/lib/Makefile
index 38fa6e49e791..46edf8444c7e 100644
--- a/arch/ia64/lib/Makefile
+++ b/arch/ia64/lib/Makefile
@@ -9,12 +9,11 @@ lib-y := __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o \
9 checksum.o clear_page.o csum_partial_copy.o \ 9 checksum.o clear_page.o csum_partial_copy.o \
10 clear_user.o strncpy_from_user.o strlen_user.o strnlen_user.o \ 10 clear_user.o strncpy_from_user.o strlen_user.o strnlen_user.o \
11 flush.o ip_fast_csum.o do_csum.o \ 11 flush.o ip_fast_csum.o do_csum.o \
12 memset.o strlen.o 12 memset.o strlen.o xor.o
13 13
14lib-$(CONFIG_ITANIUM) += copy_page.o copy_user.o memcpy.o 14lib-$(CONFIG_ITANIUM) += copy_page.o copy_user.o memcpy.o
15lib-$(CONFIG_MCKINLEY) += copy_page_mck.o memcpy_mck.o 15lib-$(CONFIG_MCKINLEY) += copy_page_mck.o memcpy_mck.o
16lib-$(CONFIG_PERFMON) += carta_random.o 16lib-$(CONFIG_PERFMON) += carta_random.o
17lib-$(CONFIG_MD_RAID456) += xor.o
18 17
19AFLAGS___divdi3.o = 18AFLAGS___divdi3.o =
20AFLAGS___udivdi3.o = -DUNSIGNED 19AFLAGS___udivdi3.o = -DUNSIGNED
diff --git a/arch/ia64/lib/csum_partial_copy.c b/arch/ia64/lib/csum_partial_copy.c
index 503dfe6d1450..118daf5a0632 100644
--- a/arch/ia64/lib/csum_partial_copy.c
+++ b/arch/ia64/lib/csum_partial_copy.c
@@ -128,6 +128,8 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
128 return (__force __wsum)result; 128 return (__force __wsum)result;
129} 129}
130 130
131EXPORT_SYMBOL(csum_partial_copy_from_user);
132
131__wsum 133__wsum
132csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum) 134csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
133{ 135{
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 1e79551231b9..44ce5ed9444c 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -30,71 +30,73 @@ static unsigned long max_gap;
30#endif 30#endif
31 31
32/** 32/**
33 * show_mem - display a memory statistics summary 33 * show_mem - give short summary of memory stats
34 * 34 *
35 * Just walks the pages in the system and describes where they're allocated. 35 * Shows a simple page count of reserved and used pages in the system.
36 * For discontig machines, it does this on a per-pgdat basis.
36 */ 37 */
37void 38void show_mem(void)
38show_mem (void)
39{ 39{
40 int i, total = 0, reserved = 0; 40 int i, total_reserved = 0;
41 int shared = 0, cached = 0; 41 int total_shared = 0, total_cached = 0;
42 unsigned long total_present = 0;
43 pg_data_t *pgdat;
42 44
43 printk(KERN_INFO "Mem-info:\n"); 45 printk(KERN_INFO "Mem-info:\n");
44 show_free_areas(); 46 show_free_areas();
45
46 printk(KERN_INFO "Free swap: %6ldkB\n", 47 printk(KERN_INFO "Free swap: %6ldkB\n",
47 nr_swap_pages<<(PAGE_SHIFT-10)); 48 nr_swap_pages<<(PAGE_SHIFT-10));
48 i = max_mapnr; 49 printk(KERN_INFO "Node memory in pages:\n");
49 for (i = 0; i < max_mapnr; i++) { 50 for_each_online_pgdat(pgdat) {
50 if (!pfn_valid(i)) { 51 unsigned long present;
52 unsigned long flags;
53 int shared = 0, cached = 0, reserved = 0;
54
55 pgdat_resize_lock(pgdat, &flags);
56 present = pgdat->node_present_pages;
57 for(i = 0; i < pgdat->node_spanned_pages; i++) {
58 struct page *page;
59 if (pfn_valid(pgdat->node_start_pfn + i))
60 page = pfn_to_page(pgdat->node_start_pfn + i);
61 else {
51#ifdef CONFIG_VIRTUAL_MEM_MAP 62#ifdef CONFIG_VIRTUAL_MEM_MAP
52 if (max_gap < LARGE_GAP) 63 if (max_gap < LARGE_GAP)
53 continue; 64 continue;
54 i = vmemmap_find_next_valid_pfn(0, i) - 1;
55#endif 65#endif
56 continue; 66 i = vmemmap_find_next_valid_pfn(pgdat->node_id,
67 i) - 1;
68 continue;
69 }
70 if (PageReserved(page))
71 reserved++;
72 else if (PageSwapCache(page))
73 cached++;
74 else if (page_count(page))
75 shared += page_count(page)-1;
57 } 76 }
58 total++; 77 pgdat_resize_unlock(pgdat, &flags);
59 if (PageReserved(mem_map+i)) 78 total_present += present;
60 reserved++; 79 total_reserved += reserved;
61 else if (PageSwapCache(mem_map+i)) 80 total_cached += cached;
62 cached++; 81 total_shared += shared;
63 else if (page_count(mem_map + i)) 82 printk(KERN_INFO "Node %4d: RAM: %11ld, rsvd: %8d, "
64 shared += page_count(mem_map + i) - 1; 83 "shrd: %10d, swpd: %10d\n", pgdat->node_id,
84 present, reserved, shared, cached);
65 } 85 }
66 printk(KERN_INFO "%d pages of RAM\n", total); 86 printk(KERN_INFO "%ld pages of RAM\n", total_present);
67 printk(KERN_INFO "%d reserved pages\n", reserved); 87 printk(KERN_INFO "%d reserved pages\n", total_reserved);
68 printk(KERN_INFO "%d pages shared\n", shared); 88 printk(KERN_INFO "%d pages shared\n", total_shared);
69 printk(KERN_INFO "%d pages swap cached\n", cached); 89 printk(KERN_INFO "%d pages swap cached\n", total_cached);
70 printk(KERN_INFO "%ld pages in page table cache\n", 90 printk(KERN_INFO "Total of %ld pages in page table cache\n",
71 pgtable_quicklist_total_size()); 91 pgtable_quicklist_total_size());
92 printk(KERN_INFO "%d free buffer pages\n", nr_free_buffer_pages());
72} 93}
73 94
95
74/* physical address where the bootmem map is located */ 96/* physical address where the bootmem map is located */
75unsigned long bootmap_start; 97unsigned long bootmap_start;
76 98
77/** 99/**
78 * find_max_pfn - adjust the maximum page number callback
79 * @start: start of range
80 * @end: end of range
81 * @arg: address of pointer to global max_pfn variable
82 *
83 * Passed as a callback function to efi_memmap_walk() to determine the highest
84 * available page frame number in the system.
85 */
86int
87find_max_pfn (unsigned long start, unsigned long end, void *arg)
88{
89 unsigned long *max_pfnp = arg, pfn;
90
91 pfn = (PAGE_ALIGN(end - 1) - PAGE_OFFSET) >> PAGE_SHIFT;
92 if (pfn > *max_pfnp)
93 *max_pfnp = pfn;
94 return 0;
95}
96
97/**
98 * find_bootmap_location - callback to find a memory area for the bootmap 100 * find_bootmap_location - callback to find a memory area for the bootmap
99 * @start: start of region 101 * @start: start of region
100 * @end: end of region 102 * @end: end of region
@@ -155,9 +157,10 @@ find_memory (void)
155 reserve_memory(); 157 reserve_memory();
156 158
157 /* first find highest page frame number */ 159 /* first find highest page frame number */
158 max_pfn = 0; 160 min_low_pfn = ~0UL;
159 efi_memmap_walk(find_max_pfn, &max_pfn); 161 max_low_pfn = 0;
160 162 efi_memmap_walk(find_max_min_low_pfn, NULL);
163 max_pfn = max_low_pfn;
161 /* how many bytes to cover all the pages */ 164 /* how many bytes to cover all the pages */
162 bootmap_size = bootmem_bootmap_pages(max_pfn) << PAGE_SHIFT; 165 bootmap_size = bootmem_bootmap_pages(max_pfn) << PAGE_SHIFT;
163 166
@@ -167,7 +170,8 @@ find_memory (void)
167 if (bootmap_start == ~0UL) 170 if (bootmap_start == ~0UL)
168 panic("Cannot find %ld bytes for bootmap\n", bootmap_size); 171 panic("Cannot find %ld bytes for bootmap\n", bootmap_size);
169 172
170 bootmap_size = init_bootmem(bootmap_start >> PAGE_SHIFT, max_pfn); 173 bootmap_size = init_bootmem_node(NODE_DATA(0),
174 (bootmap_start >> PAGE_SHIFT), 0, max_pfn);
171 175
172 /* Free all available memory, then mark bootmem-map as being in use. */ 176 /* Free all available memory, then mark bootmem-map as being in use. */
173 efi_memmap_walk(filter_rsvd_memory, free_bootmem); 177 efi_memmap_walk(filter_rsvd_memory, free_bootmem);
@@ -175,11 +179,6 @@ find_memory (void)
175 179
176 find_initrd(); 180 find_initrd();
177 181
178#ifdef CONFIG_CRASH_DUMP
179 /* If we are doing a crash dump, we still need to know the real mem
180 * size before original memory map is * reset. */
181 saved_max_pfn = max_pfn;
182#endif
183} 182}
184 183
185#ifdef CONFIG_SMP 184#ifdef CONFIG_SMP
@@ -237,9 +236,11 @@ paging_init (void)
237 num_physpages = 0; 236 num_physpages = 0;
238 efi_memmap_walk(count_pages, &num_physpages); 237 efi_memmap_walk(count_pages, &num_physpages);
239 238
240 max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT;
241 memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); 239 memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
240#ifdef CONFIG_ZONE_DMA
241 max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT;
242 max_zone_pfns[ZONE_DMA] = max_dma; 242 max_zone_pfns[ZONE_DMA] = max_dma;
243#endif
243 max_zone_pfns[ZONE_NORMAL] = max_low_pfn; 244 max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
244 245
245#ifdef CONFIG_VIRTUAL_MEM_MAP 246#ifdef CONFIG_VIRTUAL_MEM_MAP
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 96722cb1b49d..872da7a2accd 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -37,7 +37,9 @@ struct early_node_data {
37 unsigned long pernode_size; 37 unsigned long pernode_size;
38 struct bootmem_data bootmem_data; 38 struct bootmem_data bootmem_data;
39 unsigned long num_physpages; 39 unsigned long num_physpages;
40#ifdef CONFIG_ZONE_DMA
40 unsigned long num_dma_physpages; 41 unsigned long num_dma_physpages;
42#endif
41 unsigned long min_pfn; 43 unsigned long min_pfn;
42 unsigned long max_pfn; 44 unsigned long max_pfn;
43}; 45};
@@ -86,9 +88,6 @@ static int __init build_node_maps(unsigned long start, unsigned long len,
86 bdp->node_low_pfn = max(epfn, bdp->node_low_pfn); 88 bdp->node_low_pfn = max(epfn, bdp->node_low_pfn);
87 } 89 }
88 90
89 min_low_pfn = min(min_low_pfn, bdp->node_boot_start>>PAGE_SHIFT);
90 max_low_pfn = max(max_low_pfn, bdp->node_low_pfn);
91
92 return 0; 91 return 0;
93} 92}
94 93
@@ -412,37 +411,6 @@ static void __init memory_less_nodes(void)
412 return; 411 return;
413} 412}
414 413
415#ifdef CONFIG_SPARSEMEM
416/**
417 * register_sparse_mem - notify SPARSEMEM that this memory range exists.
418 * @start: physical start of range
419 * @end: physical end of range
420 * @arg: unused
421 *
422 * Simply calls SPARSEMEM to register memory section(s).
423 */
424static int __init register_sparse_mem(unsigned long start, unsigned long end,
425 void *arg)
426{
427 int nid;
428
429 start = __pa(start) >> PAGE_SHIFT;
430 end = __pa(end) >> PAGE_SHIFT;
431 nid = early_pfn_to_nid(start);
432 memory_present(nid, start, end);
433
434 return 0;
435}
436
437static void __init arch_sparse_init(void)
438{
439 efi_memmap_walk(register_sparse_mem, NULL);
440 sparse_init();
441}
442#else
443#define arch_sparse_init() do {} while (0)
444#endif
445
446/** 414/**
447 * find_memory - walk the EFI memory map and setup the bootmem allocator 415 * find_memory - walk the EFI memory map and setup the bootmem allocator
448 * 416 *
@@ -467,12 +435,16 @@ void __init find_memory(void)
467 /* These actually end up getting called by call_pernode_memory() */ 435 /* These actually end up getting called by call_pernode_memory() */
468 efi_memmap_walk(filter_rsvd_memory, build_node_maps); 436 efi_memmap_walk(filter_rsvd_memory, build_node_maps);
469 efi_memmap_walk(filter_rsvd_memory, find_pernode_space); 437 efi_memmap_walk(filter_rsvd_memory, find_pernode_space);
438 efi_memmap_walk(find_max_min_low_pfn, NULL);
470 439
471 for_each_online_node(node) 440 for_each_online_node(node)
472 if (mem_data[node].bootmem_data.node_low_pfn) { 441 if (mem_data[node].bootmem_data.node_low_pfn) {
473 node_clear(node, memory_less_mask); 442 node_clear(node, memory_less_mask);
474 mem_data[node].min_pfn = ~0UL; 443 mem_data[node].min_pfn = ~0UL;
475 } 444 }
445
446 efi_memmap_walk(register_active_ranges, NULL);
447
476 /* 448 /*
477 * Initialize the boot memory maps in reverse order since that's 449 * Initialize the boot memory maps in reverse order since that's
478 * what the bootmem allocator expects 450 * what the bootmem allocator expects
@@ -654,11 +626,12 @@ static __init int count_node_pages(unsigned long start, unsigned long len, int n
654{ 626{
655 unsigned long end = start + len; 627 unsigned long end = start + len;
656 628
657 add_active_range(node, start >> PAGE_SHIFT, end >> PAGE_SHIFT);
658 mem_data[node].num_physpages += len >> PAGE_SHIFT; 629 mem_data[node].num_physpages += len >> PAGE_SHIFT;
630#ifdef CONFIG_ZONE_DMA
659 if (start <= __pa(MAX_DMA_ADDRESS)) 631 if (start <= __pa(MAX_DMA_ADDRESS))
660 mem_data[node].num_dma_physpages += 632 mem_data[node].num_dma_physpages +=
661 (min(end, __pa(MAX_DMA_ADDRESS)) - start) >>PAGE_SHIFT; 633 (min(end, __pa(MAX_DMA_ADDRESS)) - start) >>PAGE_SHIFT;
634#endif
662 start = GRANULEROUNDDOWN(start); 635 start = GRANULEROUNDDOWN(start);
663 start = ORDERROUNDDOWN(start); 636 start = ORDERROUNDDOWN(start);
664 end = GRANULEROUNDUP(end); 637 end = GRANULEROUNDUP(end);
@@ -686,10 +659,11 @@ void __init paging_init(void)
686 659
687 max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT; 660 max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT;
688 661
689 arch_sparse_init();
690
691 efi_memmap_walk(filter_rsvd_memory, count_node_pages); 662 efi_memmap_walk(filter_rsvd_memory, count_node_pages);
692 663
664 sparse_memory_present_with_active_regions(MAX_NUMNODES);
665 sparse_init();
666
693#ifdef CONFIG_VIRTUAL_MEM_MAP 667#ifdef CONFIG_VIRTUAL_MEM_MAP
694 vmalloc_end -= PAGE_ALIGN(ALIGN(max_low_pfn, MAX_ORDER_NR_PAGES) * 668 vmalloc_end -= PAGE_ALIGN(ALIGN(max_low_pfn, MAX_ORDER_NR_PAGES) *
695 sizeof(struct page)); 669 sizeof(struct page));
@@ -710,7 +684,9 @@ void __init paging_init(void)
710 } 684 }
711 685
712 memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); 686 memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
687#ifdef CONFIG_ZONE_DMA
713 max_zone_pfns[ZONE_DMA] = max_dma; 688 max_zone_pfns[ZONE_DMA] = max_dma;
689#endif
714 max_zone_pfns[ZONE_NORMAL] = max_pfn; 690 max_zone_pfns[ZONE_NORMAL] = max_pfn;
715 free_area_init_nodes(max_zone_pfns); 691 free_area_init_nodes(max_zone_pfns);
716 692
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 07d82cd7cbdd..5b70241741b4 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -19,6 +19,7 @@
19#include <linux/swap.h> 19#include <linux/swap.h>
20#include <linux/proc_fs.h> 20#include <linux/proc_fs.h>
21#include <linux/bitops.h> 21#include <linux/bitops.h>
22#include <linux/kexec.h>
22 23
23#include <asm/a.out.h> 24#include <asm/a.out.h>
24#include <asm/dma.h> 25#include <asm/dma.h>
@@ -67,7 +68,7 @@ max_pgt_pages(void)
67#ifndef CONFIG_NUMA 68#ifndef CONFIG_NUMA
68 node_free_pages = nr_free_pages(); 69 node_free_pages = nr_free_pages();
69#else 70#else
70 node_free_pages = nr_free_pages_pgdat(NODE_DATA(numa_node_id())); 71 node_free_pages = node_page_state(numa_node_id(), NR_FREE_PAGES);
71#endif 72#endif
72 max_pgt_pages = node_free_pages / PGT_FRACTION_OF_NODE_MEM; 73 max_pgt_pages = node_free_pages / PGT_FRACTION_OF_NODE_MEM;
73 max_pgt_pages = max(max_pgt_pages, MIN_PGT_PAGES); 74 max_pgt_pages = max(max_pgt_pages, MIN_PGT_PAGES);
@@ -128,6 +129,25 @@ lazy_mmu_prot_update (pte_t pte)
128 set_bit(PG_arch_1, &page->flags); /* mark page as clean */ 129 set_bit(PG_arch_1, &page->flags); /* mark page as clean */
129} 130}
130 131
132/*
133 * Since DMA is i-cache coherent, any (complete) pages that were written via
134 * DMA can be marked as "clean" so that lazy_mmu_prot_update() doesn't have to
135 * flush them when they get mapped into an executable vm-area.
136 */
137void
138dma_mark_clean(void *addr, size_t size)
139{
140 unsigned long pg_addr, end;
141
142 pg_addr = PAGE_ALIGN((unsigned long) addr);
143 end = (unsigned long) addr + size;
144 while (pg_addr + PAGE_SIZE <= end) {
145 struct page *page = virt_to_page(pg_addr);
146 set_bit(PG_arch_1, &page->flags);
147 pg_addr += PAGE_SIZE;
148 }
149}
150
131inline void 151inline void
132ia64_set_rbs_bot (void) 152ia64_set_rbs_bot (void)
133{ 153{
@@ -135,7 +155,7 @@ ia64_set_rbs_bot (void)
135 155
136 if (stack_size > MAX_USER_STACK_SIZE) 156 if (stack_size > MAX_USER_STACK_SIZE)
137 stack_size = MAX_USER_STACK_SIZE; 157 stack_size = MAX_USER_STACK_SIZE;
138 current->thread.rbs_bot = STACK_TOP - stack_size; 158 current->thread.rbs_bot = PAGE_ALIGN(current->mm->start_stack - stack_size);
139} 159}
140 160
141/* 161/*
@@ -156,9 +176,8 @@ ia64_init_addr_space (void)
156 * the problem. When the process attempts to write to the register backing store 176 * the problem. When the process attempts to write to the register backing store
157 * for the first time, it will get a SEGFAULT in this case. 177 * for the first time, it will get a SEGFAULT in this case.
158 */ 178 */
159 vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); 179 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
160 if (vma) { 180 if (vma) {
161 memset(vma, 0, sizeof(*vma));
162 vma->vm_mm = current->mm; 181 vma->vm_mm = current->mm;
163 vma->vm_start = current->thread.rbs_bot & PAGE_MASK; 182 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
164 vma->vm_end = vma->vm_start + PAGE_SIZE; 183 vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -175,9 +194,8 @@ ia64_init_addr_space (void)
175 194
176 /* map NaT-page at address zero to speed up speculative dereferencing of NULL: */ 195 /* map NaT-page at address zero to speed up speculative dereferencing of NULL: */
177 if (!(current->personality & MMAP_PAGE_ZERO)) { 196 if (!(current->personality & MMAP_PAGE_ZERO)) {
178 vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); 197 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
179 if (vma) { 198 if (vma) {
180 memset(vma, 0, sizeof(*vma));
181 vma->vm_mm = current->mm; 199 vma->vm_mm = current->mm;
182 vma->vm_end = PAGE_SIZE; 200 vma->vm_end = PAGE_SIZE;
183 vma->vm_page_prot = __pgprot(pgprot_val(PAGE_READONLY) | _PAGE_MA_NAT); 201 vma->vm_page_prot = __pgprot(pgprot_val(PAGE_READONLY) | _PAGE_MA_NAT);
@@ -586,13 +604,27 @@ find_largest_hole (u64 start, u64 end, void *arg)
586 return 0; 604 return 0;
587} 605}
588 606
607#endif /* CONFIG_VIRTUAL_MEM_MAP */
608
589int __init 609int __init
590register_active_ranges(u64 start, u64 end, void *arg) 610register_active_ranges(u64 start, u64 end, void *arg)
591{ 611{
592 add_active_range(0, __pa(start) >> PAGE_SHIFT, __pa(end) >> PAGE_SHIFT); 612 int nid = paddr_to_nid(__pa(start));
613
614 if (nid < 0)
615 nid = 0;
616#ifdef CONFIG_KEXEC
617 if (start > crashk_res.start && start < crashk_res.end)
618 start = crashk_res.end;
619 if (end > crashk_res.start && end < crashk_res.end)
620 end = crashk_res.start;
621#endif
622
623 if (start < end)
624 add_active_range(nid, __pa(start) >> PAGE_SHIFT,
625 __pa(end) >> PAGE_SHIFT);
593 return 0; 626 return 0;
594} 627}
595#endif /* CONFIG_VIRTUAL_MEM_MAP */
596 628
597static int __init 629static int __init
598count_reserved_pages (u64 start, u64 end, void *arg) 630count_reserved_pages (u64 start, u64 end, void *arg)
@@ -607,6 +639,22 @@ count_reserved_pages (u64 start, u64 end, void *arg)
607 return 0; 639 return 0;
608} 640}
609 641
642int
643find_max_min_low_pfn (unsigned long start, unsigned long end, void *arg)
644{
645 unsigned long pfn_start, pfn_end;
646#ifdef CONFIG_FLATMEM
647 pfn_start = (PAGE_ALIGN(__pa(start))) >> PAGE_SHIFT;
648 pfn_end = (PAGE_ALIGN(__pa(end - 1))) >> PAGE_SHIFT;
649#else
650 pfn_start = GRANULEROUNDDOWN(__pa(start)) >> PAGE_SHIFT;
651 pfn_end = GRANULEROUNDUP(__pa(end - 1)) >> PAGE_SHIFT;
652#endif
653 min_low_pfn = min(min_low_pfn, pfn_start);
654 max_low_pfn = max(max_low_pfn, pfn_end);
655 return 0;
656}
657
610/* 658/*
611 * Boot command-line option "nolwsys" can be used to disable the use of any light-weight 659 * Boot command-line option "nolwsys" can be used to disable the use of any light-weight
612 * system call handler. When this option is in effect, all fsyscalls will end up bubbling 660 * system call handler. When this option is in effect, all fsyscalls will end up bubbling
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 474d179966dc..0e83f3b419b5 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -557,14 +557,17 @@ pcibios_enable_device (struct pci_dev *dev, int mask)
557 if (ret < 0) 557 if (ret < 0)
558 return ret; 558 return ret;
559 559
560 return acpi_pci_irq_enable(dev); 560 if (!dev->msi_enabled)
561 return acpi_pci_irq_enable(dev);
562 return 0;
561} 563}
562 564
563void 565void
564pcibios_disable_device (struct pci_dev *dev) 566pcibios_disable_device (struct pci_dev *dev)
565{ 567{
566 BUG_ON(atomic_read(&dev->enable_cnt)); 568 BUG_ON(atomic_read(&dev->enable_cnt));
567 acpi_pci_irq_disable(dev); 569 if (!dev->msi_enabled)
570 acpi_pci_irq_disable(dev);
568} 571}
569 572
570void 573void
diff --git a/arch/ia64/sn/kernel/bte_error.c b/arch/ia64/sn/kernel/bte_error.c
index f1ec1370b3e3..b6fcf8164f2b 100644
--- a/arch/ia64/sn/kernel/bte_error.c
+++ b/arch/ia64/sn/kernel/bte_error.c
@@ -78,7 +78,7 @@ int shub1_bte_error_handler(unsigned long _nodepda)
78 * There are errors which still need to be cleaned up by 78 * There are errors which still need to be cleaned up by
79 * hubiio_crb_error_handler 79 * hubiio_crb_error_handler
80 */ 80 */
81 mod_timer(recovery_timer, HZ * 5); 81 mod_timer(recovery_timer, jiffies + (HZ * 5));
82 BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda, 82 BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda,
83 smp_processor_id())); 83 smp_processor_id()));
84 return 1; 84 return 1;
@@ -95,7 +95,7 @@ int shub1_bte_error_handler(unsigned long _nodepda)
95 icrbd.ii_icrb0_d_regval = 95 icrbd.ii_icrb0_d_regval =
96 REMOTE_HUB_L(nasid, IIO_ICRB_D(i)); 96 REMOTE_HUB_L(nasid, IIO_ICRB_D(i));
97 if (icrbd.d_bteop) { 97 if (icrbd.d_bteop) {
98 mod_timer(recovery_timer, HZ * 5); 98 mod_timer(recovery_timer, jiffies + (HZ * 5));
99 BTE_PRINTK(("eh:%p:%d Valid %d, Giving up\n", 99 BTE_PRINTK(("eh:%p:%d Valid %d, Giving up\n",
100 err_nodepda, smp_processor_id(), 100 err_nodepda, smp_processor_id(),
101 i)); 101 i));
@@ -150,7 +150,7 @@ int shub2_bte_error_handler(unsigned long _nodepda)
150 status = BTE_LNSTAT_LOAD(bte); 150 status = BTE_LNSTAT_LOAD(bte);
151 if ((status & IBLS_ERROR) || !(status & IBLS_BUSY)) 151 if ((status & IBLS_ERROR) || !(status & IBLS_BUSY))
152 continue; 152 continue;
153 mod_timer(recovery_timer, HZ * 5); 153 mod_timer(recovery_timer, jiffies + (HZ * 5));
154 BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda, 154 BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda,
155 smp_processor_id())); 155 smp_processor_id()));
156 return 1; 156 return 1;
diff --git a/arch/ia64/sn/kernel/huberror.c b/arch/ia64/sn/kernel/huberror.c
index abca6bd7962f..fcf7f93c4b61 100644
--- a/arch/ia64/sn/kernel/huberror.c
+++ b/arch/ia64/sn/kernel/huberror.c
@@ -3,7 +3,7 @@
3 * License. See the file "COPYING" in the main directory of this archive 3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details. 4 * for more details.
5 * 5 *
6 * Copyright (C) 1992 - 1997, 2000,2002-2005 Silicon Graphics, Inc. All rights reserved. 6 * Copyright (C) 1992 - 1997, 2000,2002-2007 Silicon Graphics, Inc. All rights reserved.
7 */ 7 */
8 8
9#include <linux/types.h> 9#include <linux/types.h>
@@ -38,12 +38,20 @@ static irqreturn_t hub_eint_handler(int irq, void *arg)
38 (u64) nasid, 0, 0, 0, 0, 0, 0); 38 (u64) nasid, 0, 0, 0, 0, 0, 0);
39 39
40 if ((int)ret_stuff.v0) 40 if ((int)ret_stuff.v0)
41 panic("hubii_eint_handler(): Fatal TIO Error"); 41 panic("%s: Fatal %s Error", __FUNCTION__,
42 ((nasid & 1) ? "TIO" : "HUBII"));
42 43
43 if (!(nasid & 1)) /* Not a TIO, handle CRB errors */ 44 if (!(nasid & 1)) /* Not a TIO, handle CRB errors */
44 (void)hubiio_crb_error_handler(hubdev_info); 45 (void)hubiio_crb_error_handler(hubdev_info);
45 } else 46 } else
46 bte_error_handler((unsigned long)NODEPDA(nasid_to_cnodeid(nasid))); 47 if (nasid & 1) { /* TIO errors */
48 SAL_CALL_NOLOCK(ret_stuff, SN_SAL_HUB_ERROR_INTERRUPT,
49 (u64) nasid, 0, 0, 0, 0, 0, 0);
50
51 if ((int)ret_stuff.v0)
52 panic("%s: Fatal TIO Error", __FUNCTION__);
53 } else
54 bte_error_handler((unsigned long)NODEPDA(nasid_to_cnodeid(nasid)));
47 55
48 return IRQ_HANDLED; 56 return IRQ_HANDLED;
49} 57}
diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c
index cb96b4ea7df6..c6216f454ffb 100644
--- a/arch/ia64/sn/kernel/io_acpi_init.c
+++ b/arch/ia64/sn/kernel/io_acpi_init.c
@@ -13,6 +13,7 @@
13#include <asm/sn/sn_sal.h> 13#include <asm/sn/sn_sal.h>
14#include "xtalk/hubdev.h" 14#include "xtalk/hubdev.h"
15#include <linux/acpi.h> 15#include <linux/acpi.h>
16#include <acpi/acnamesp.h>
16 17
17 18
18/* 19/*
@@ -31,6 +32,12 @@ struct acpi_vendor_uuid sn_uuid = {
31 0xa2, 0x7c, 0x08, 0x00, 0x69, 0x13, 0xea, 0x51 }, 32 0xa2, 0x7c, 0x08, 0x00, 0x69, 0x13, 0xea, 0x51 },
32}; 33};
33 34
35struct sn_pcidev_match {
36 u8 bus;
37 unsigned int devfn;
38 acpi_handle handle;
39};
40
34/* 41/*
35 * Perform the early IO init in PROM. 42 * Perform the early IO init in PROM.
36 */ 43 */
@@ -46,12 +53,15 @@ sal_ioif_init(u64 *result)
46} 53}
47 54
48/* 55/*
49 * sn_hubdev_add - The 'add' function of the acpi_sn_hubdev_driver. 56 * sn_acpi_hubdev_init() - This function is called by acpi_ns_get_device_callback()
50 * Called for every "SGIHUB" or "SGITIO" device defined 57 * for all SGIHUB and SGITIO acpi devices defined in the
51 * in the ACPI namespace. 58 * DSDT. It obtains the hubdev_info pointer from the
59 * ACPI vendor resource, which the PROM setup, and sets up the
60 * hubdev_info in the pda.
52 */ 61 */
53static int __init 62
54sn_hubdev_add(struct acpi_device *device) 63static acpi_status __init
64sn_acpi_hubdev_init(acpi_handle handle, u32 depth, void *context, void **ret)
55{ 65{
56 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; 66 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
57 u64 addr; 67 u64 addr;
@@ -60,18 +70,19 @@ sn_hubdev_add(struct acpi_device *device)
60 int i; 70 int i;
61 u64 nasid; 71 u64 nasid;
62 struct acpi_resource *resource; 72 struct acpi_resource *resource;
63 int ret = 0;
64 acpi_status status; 73 acpi_status status;
65 struct acpi_resource_vendor_typed *vendor; 74 struct acpi_resource_vendor_typed *vendor;
66 extern void sn_common_hubdev_init(struct hubdev_info *); 75 extern void sn_common_hubdev_init(struct hubdev_info *);
67 76
68 status = acpi_get_vendor_resource(device->handle, METHOD_NAME__CRS, 77 status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,
69 &sn_uuid, &buffer); 78 &sn_uuid, &buffer);
70 if (ACPI_FAILURE(status)) { 79 if (ACPI_FAILURE(status)) {
71 printk(KERN_ERR 80 printk(KERN_ERR
72 "sn_hubdev_add: acpi_get_vendor_resource() failed: %d\n", 81 "sn_acpi_hubdev_init: acpi_get_vendor_resource() "
73 status); 82 "(0x%x) failed for: ", status);
74 return 1; 83 acpi_ns_print_node_pathname(handle, NULL);
84 printk("\n");
85 return AE_OK; /* Continue walking namespace */
75 } 86 }
76 87
77 resource = buffer.pointer; 88 resource = buffer.pointer;
@@ -79,9 +90,10 @@ sn_hubdev_add(struct acpi_device *device)
79 if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) != 90 if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !=
80 sizeof(struct hubdev_info *)) { 91 sizeof(struct hubdev_info *)) {
81 printk(KERN_ERR 92 printk(KERN_ERR
82 "sn_hubdev_add: Invalid vendor data length: %d\n", 93 "sn_acpi_hubdev_init: Invalid vendor data length: %d for: ",
83 vendor->byte_length); 94 vendor->byte_length);
84 ret = 1; 95 acpi_ns_print_node_pathname(handle, NULL);
96 printk("\n");
85 goto exit; 97 goto exit;
86 } 98 }
87 99
@@ -96,7 +108,7 @@ sn_hubdev_add(struct acpi_device *device)
96 108
97exit: 109exit:
98 kfree(buffer.pointer); 110 kfree(buffer.pointer);
99 return ret; 111 return AE_OK; /* Continue walking namespace */
100} 112}
101 113
102/* 114/*
@@ -119,9 +131,11 @@ sn_get_bussoft_ptr(struct pci_bus *bus)
119 status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS, 131 status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,
120 &sn_uuid, &buffer); 132 &sn_uuid, &buffer);
121 if (ACPI_FAILURE(status)) { 133 if (ACPI_FAILURE(status)) {
122 printk(KERN_ERR "get_acpi_pcibus_ptr: " 134 printk(KERN_ERR "%s: "
123 "get_acpi_bussoft_info() failed: %d\n", 135 "acpi_get_vendor_resource() failed (0x%x) for: ",
124 status); 136 __FUNCTION__, status);
137 acpi_ns_print_node_pathname(handle, NULL);
138 printk("\n");
125 return NULL; 139 return NULL;
126 } 140 }
127 resource = buffer.pointer; 141 resource = buffer.pointer;
@@ -130,8 +144,8 @@ sn_get_bussoft_ptr(struct pci_bus *bus)
130 if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) != 144 if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !=
131 sizeof(struct pcibus_bussoft *)) { 145 sizeof(struct pcibus_bussoft *)) {
132 printk(KERN_ERR 146 printk(KERN_ERR
133 "get_acpi_bussoft_ptr: Invalid vendor data " 147 "%s: Invalid vendor data length %d\n",
134 "length %d\n", vendor->byte_length); 148 __FUNCTION__, vendor->byte_length);
135 kfree(buffer.pointer); 149 kfree(buffer.pointer);
136 return NULL; 150 return NULL;
137 } 151 }
@@ -143,34 +157,254 @@ sn_get_bussoft_ptr(struct pci_bus *bus)
143} 157}
144 158
145/* 159/*
146 * sn_acpi_bus_fixup 160 * sn_extract_device_info - Extract the pcidev_info and the sn_irq_info
161 * pointers from the vendor resource using the
162 * provided acpi handle, and copy the structures
163 * into the argument buffers.
147 */ 164 */
148void 165static int
149sn_acpi_bus_fixup(struct pci_bus *bus) 166sn_extract_device_info(acpi_handle handle, struct pcidev_info **pcidev_info,
167 struct sn_irq_info **sn_irq_info)
150{ 168{
151 struct pci_dev *pci_dev = NULL; 169 u64 addr;
152 struct pcibus_bussoft *prom_bussoft_ptr; 170 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
153 extern void sn_common_bus_fixup(struct pci_bus *, 171 struct sn_irq_info *irq_info, *irq_info_prom;
154 struct pcibus_bussoft *); 172 struct pcidev_info *pcidev_ptr, *pcidev_prom_ptr;
173 struct acpi_resource *resource;
174 int ret = 0;
175 acpi_status status;
176 struct acpi_resource_vendor_typed *vendor;
155 177
156 if (!bus->parent) { /* If root bus */ 178 /*
157 prom_bussoft_ptr = sn_get_bussoft_ptr(bus); 179 * The pointer to this device's pcidev_info structure in
158 if (prom_bussoft_ptr == NULL) { 180 * the PROM, is in the vendor resource.
181 */
182 status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,
183 &sn_uuid, &buffer);
184 if (ACPI_FAILURE(status)) {
185 printk(KERN_ERR
186 "%s: acpi_get_vendor_resource() failed (0x%x) for: ",
187 __FUNCTION__, status);
188 acpi_ns_print_node_pathname(handle, NULL);
189 printk("\n");
190 return 1;
191 }
192
193 resource = buffer.pointer;
194 vendor = &resource->data.vendor_typed;
195 if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !=
196 sizeof(struct pci_devdev_info *)) {
197 printk(KERN_ERR
198 "%s: Invalid vendor data length: %d for: ",
199 __FUNCTION__, vendor->byte_length);
200 acpi_ns_print_node_pathname(handle, NULL);
201 printk("\n");
202 ret = 1;
203 goto exit;
204 }
205
206 pcidev_ptr = kzalloc(sizeof(struct pcidev_info), GFP_KERNEL);
207 if (!pcidev_ptr)
208 panic("%s: Unable to alloc memory for pcidev_info", __FUNCTION__);
209
210 memcpy(&addr, vendor->byte_data, sizeof(struct pcidev_info *));
211 pcidev_prom_ptr = __va(addr);
212 memcpy(pcidev_ptr, pcidev_prom_ptr, sizeof(struct pcidev_info));
213
214 /* Get the IRQ info */
215 irq_info = kzalloc(sizeof(struct sn_irq_info), GFP_KERNEL);
216 if (!irq_info)
217 panic("%s: Unable to alloc memory for sn_irq_info", __FUNCTION__);
218
219 if (pcidev_ptr->pdi_sn_irq_info) {
220 irq_info_prom = __va(pcidev_ptr->pdi_sn_irq_info);
221 memcpy(irq_info, irq_info_prom, sizeof(struct sn_irq_info));
222 }
223
224 *pcidev_info = pcidev_ptr;
225 *sn_irq_info = irq_info;
226
227exit:
228 kfree(buffer.pointer);
229 return ret;
230}
231
232static unsigned int
233get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle)
234{
235 unsigned long adr;
236 acpi_handle child;
237 unsigned int devfn;
238 int function;
239 acpi_handle parent;
240 int slot;
241 acpi_status status;
242
243 /*
244 * Do an upward search to find the root bus device, and
245 * obtain the host devfn from the previous child device.
246 */
247 child = device_handle;
248 while (child) {
249 status = acpi_get_parent(child, &parent);
250 if (ACPI_FAILURE(status)) {
251 printk(KERN_ERR "%s: acpi_get_parent() failed "
252 "(0x%x) for: ", __FUNCTION__, status);
253 acpi_ns_print_node_pathname(child, NULL);
254 printk("\n");
255 panic("%s: Unable to find host devfn\n", __FUNCTION__);
256 }
257 if (parent == rootbus_handle)
258 break;
259 child = parent;
260 }
261 if (!child) {
262 printk(KERN_ERR "%s: Unable to find root bus for: ",
263 __FUNCTION__);
264 acpi_ns_print_node_pathname(device_handle, NULL);
265 printk("\n");
266 BUG();
267 }
268
269 status = acpi_evaluate_integer(child, METHOD_NAME__ADR, NULL, &adr);
270 if (ACPI_FAILURE(status)) {
271 printk(KERN_ERR "%s: Unable to get _ADR (0x%x) for: ",
272 __FUNCTION__, status);
273 acpi_ns_print_node_pathname(child, NULL);
274 printk("\n");
275 panic("%s: Unable to find host devfn\n", __FUNCTION__);
276 }
277
278 slot = (adr >> 16) & 0xffff;
279 function = adr & 0xffff;
280 devfn = PCI_DEVFN(slot, function);
281 return devfn;
282}
283
284/*
285 * find_matching_device - Callback routine to find the ACPI device
286 * that matches up with our pci_dev device.
287 * Matching is done on bus number and devfn.
288 * To find the bus number for a particular
289 * ACPI device, we must look at the _BBN method
290 * of its parent.
291 */
292static acpi_status
293find_matching_device(acpi_handle handle, u32 lvl, void *context, void **rv)
294{
295 unsigned long bbn = -1;
296 unsigned long adr;
297 acpi_handle parent = NULL;
298 acpi_status status;
299 unsigned int devfn;
300 int function;
301 int slot;
302 struct sn_pcidev_match *info = context;
303
304 status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL,
305 &adr);
306 if (ACPI_SUCCESS(status)) {
307 status = acpi_get_parent(handle, &parent);
308 if (ACPI_FAILURE(status)) {
159 printk(KERN_ERR 309 printk(KERN_ERR
160 "sn_pci_fixup_bus: 0x%04x:0x%02x Unable to " 310 "%s: acpi_get_parent() failed (0x%x) for: ",
161 "obtain prom_bussoft_ptr\n", 311 __FUNCTION__, status);
162 pci_domain_nr(bus), bus->number); 312 acpi_ns_print_node_pathname(handle, NULL);
163 return; 313 printk("\n");
314 return AE_OK;
315 }
316 status = acpi_evaluate_integer(parent, METHOD_NAME__BBN,
317 NULL, &bbn);
318 if (ACPI_FAILURE(status)) {
319 printk(KERN_ERR
320 "%s: Failed to find _BBN in parent of: ",
321 __FUNCTION__);
322 acpi_ns_print_node_pathname(handle, NULL);
323 printk("\n");
324 return AE_OK;
325 }
326
327 slot = (adr >> 16) & 0xffff;
328 function = adr & 0xffff;
329 devfn = PCI_DEVFN(slot, function);
330 if ((info->devfn == devfn) && (info->bus == bbn)) {
331 /* We have a match! */
332 info->handle = handle;
333 return 1;
164 } 334 }
165 sn_common_bus_fixup(bus, prom_bussoft_ptr);
166 } 335 }
167 list_for_each_entry(pci_dev, &bus->devices, bus_list) { 336 return AE_OK;
168 sn_pci_fixup_slot(pci_dev); 337}
338
339/*
340 * sn_acpi_get_pcidev_info - Search ACPI namespace for the acpi
341 * device matching the specified pci_dev,
342 * and return the pcidev info and irq info.
343 */
344int
345sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info,
346 struct sn_irq_info **sn_irq_info)
347{
348 unsigned int host_devfn;
349 struct sn_pcidev_match pcidev_match;
350 acpi_handle rootbus_handle;
351 unsigned long segment;
352 acpi_status status;
353
354 rootbus_handle = PCI_CONTROLLER(dev)->acpi_handle;
355 status = acpi_evaluate_integer(rootbus_handle, METHOD_NAME__SEG, NULL,
356 &segment);
357 if (ACPI_SUCCESS(status)) {
358 if (segment != pci_domain_nr(dev)) {
359 printk(KERN_ERR
360 "%s: Segment number mismatch, 0x%lx vs 0x%x for: ",
361 __FUNCTION__, segment, pci_domain_nr(dev));
362 acpi_ns_print_node_pathname(rootbus_handle, NULL);
363 printk("\n");
364 return 1;
365 }
366 } else {
367 printk(KERN_ERR "%s: Unable to get __SEG from: ",
368 __FUNCTION__);
369 acpi_ns_print_node_pathname(rootbus_handle, NULL);
370 printk("\n");
371 return 1;
372 }
373
374 /*
375 * We want to search all devices in this segment/domain
376 * of the ACPI namespace for the matching ACPI device,
377 * which holds the pcidev_info pointer in its vendor resource.
378 */
379 pcidev_match.bus = dev->bus->number;
380 pcidev_match.devfn = dev->devfn;
381 pcidev_match.handle = NULL;
382
383 acpi_walk_namespace(ACPI_TYPE_DEVICE, rootbus_handle, ACPI_UINT32_MAX,
384 find_matching_device, &pcidev_match, NULL);
385
386 if (!pcidev_match.handle) {
387 printk(KERN_ERR
388 "%s: Could not find matching ACPI device for %s.\n",
389 __FUNCTION__, pci_name(dev));
390 return 1;
169 } 391 }
392
393 if (sn_extract_device_info(pcidev_match.handle, pcidev_info, sn_irq_info))
394 return 1;
395
396 /* Build up the pcidev_info.pdi_slot_host_handle */
397 host_devfn = get_host_devfn(pcidev_match.handle, rootbus_handle);
398 (*pcidev_info)->pdi_slot_host_handle =
399 ((unsigned long) pci_domain_nr(dev) << 40) |
400 /* bus == 0 */
401 host_devfn;
402 return 0;
170} 403}
171 404
172/* 405/*
173 * sn_acpi_slot_fixup - Perform any SN specific slot fixup. 406 * sn_acpi_slot_fixup - Obtain the pcidev_info and sn_irq_info.
407 * Perform any SN specific slot fixup.
174 * At present there does not appear to be 408 * At present there does not appear to be
175 * any generic way to handle a ROM image 409 * any generic way to handle a ROM image
176 * that has been shadowed by the PROM, so 410 * that has been shadowed by the PROM, so
@@ -179,11 +413,18 @@ sn_acpi_bus_fixup(struct pci_bus *bus)
179 */ 413 */
180 414
181void 415void
182sn_acpi_slot_fixup(struct pci_dev *dev, struct pcidev_info *pcidev_info) 416sn_acpi_slot_fixup(struct pci_dev *dev)
183{ 417{
184 void __iomem *addr; 418 void __iomem *addr;
419 struct pcidev_info *pcidev_info = NULL;
420 struct sn_irq_info *sn_irq_info = NULL;
185 size_t size; 421 size_t size;
186 422
423 if (sn_acpi_get_pcidev_info(dev, &pcidev_info, &sn_irq_info)) {
424 panic("%s: Failure obtaining pcidev_info for %s\n",
425 __FUNCTION__, pci_name(dev));
426 }
427
187 if (pcidev_info->pdi_pio_mapped_addr[PCI_ROM_RESOURCE]) { 428 if (pcidev_info->pdi_pio_mapped_addr[PCI_ROM_RESOURCE]) {
188 /* 429 /*
189 * A valid ROM image exists and has been shadowed by the 430 * A valid ROM image exists and has been shadowed by the
@@ -200,18 +441,40 @@ sn_acpi_slot_fixup(struct pci_dev *dev, struct pcidev_info *pcidev_info)
200 (unsigned long) addr + size; 441 (unsigned long) addr + size;
201 dev->resource[PCI_ROM_RESOURCE].flags |= IORESOURCE_ROM_BIOS_COPY; 442 dev->resource[PCI_ROM_RESOURCE].flags |= IORESOURCE_ROM_BIOS_COPY;
202 } 443 }
444 sn_pci_fixup_slot(dev, pcidev_info, sn_irq_info);
203} 445}
204 446
205static struct acpi_driver acpi_sn_hubdev_driver = { 447EXPORT_SYMBOL(sn_acpi_slot_fixup);
206 .name = "SGI HUBDEV Driver",
207 .ids = "SGIHUB,SGITIO",
208 .ops = {
209 .add = sn_hubdev_add,
210 },
211};
212 448
213 449
214/* 450/*
451 * sn_acpi_bus_fixup - Perform SN specific setup of software structs
452 * (pcibus_bussoft, pcidev_info) and hardware
453 * registers, for the specified bus and devices under it.
454 */
455void
456sn_acpi_bus_fixup(struct pci_bus *bus)
457{
458 struct pci_dev *pci_dev = NULL;
459 struct pcibus_bussoft *prom_bussoft_ptr;
460
461 if (!bus->parent) { /* If root bus */
462 prom_bussoft_ptr = sn_get_bussoft_ptr(bus);
463 if (prom_bussoft_ptr == NULL) {
464 printk(KERN_ERR
465 "%s: 0x%04x:0x%02x Unable to "
466 "obtain prom_bussoft_ptr\n",
467 __FUNCTION__, pci_domain_nr(bus), bus->number);
468 return;
469 }
470 sn_common_bus_fixup(bus, prom_bussoft_ptr);
471 }
472 list_for_each_entry(pci_dev, &bus->devices, bus_list) {
473 sn_acpi_slot_fixup(pci_dev);
474 }
475}
476
477/*
215 * sn_io_acpi_init - PROM has ACPI support for IO, defining at a minimum the 478 * sn_io_acpi_init - PROM has ACPI support for IO, defining at a minimum the
216 * nodes and root buses in the DSDT. As a result, bus scanning 479 * nodes and root buses in the DSDT. As a result, bus scanning
217 * will be initiated by the Linux ACPI code. 480 * will be initiated by the Linux ACPI code.
@@ -226,7 +489,10 @@ sn_io_acpi_init(void)
226 /* SN Altix does not follow the IOSAPIC IRQ routing model */ 489 /* SN Altix does not follow the IOSAPIC IRQ routing model */
227 acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM; 490 acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM;
228 491
229 acpi_bus_register_driver(&acpi_sn_hubdev_driver); 492 /* Setup hubdev_info for all SGIHUB/SGITIO devices */
493 acpi_get_devices("SGIHUB", sn_acpi_hubdev_init, NULL, NULL);
494 acpi_get_devices("SGITIO", sn_acpi_hubdev_init, NULL, NULL);
495
230 status = sal_ioif_init(&result); 496 status = sal_ioif_init(&result);
231 if (status || result) 497 if (status || result)
232 panic("sal_ioif_init failed: [%lx] %s\n", 498 panic("sal_ioif_init failed: [%lx] %s\n",
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c
index d4dd8f4b6b8d..d48bcd83253c 100644
--- a/arch/ia64/sn/kernel/io_common.c
+++ b/arch/ia64/sn/kernel/io_common.c
@@ -26,14 +26,10 @@
26#include <linux/acpi.h> 26#include <linux/acpi.h>
27#include <asm/sn/sn2/sn_hwperf.h> 27#include <asm/sn/sn2/sn_hwperf.h>
28#include <asm/sn/acpi.h> 28#include <asm/sn/acpi.h>
29#include "acpi/acglobal.h"
29 30
30extern void sn_init_cpei_timer(void); 31extern void sn_init_cpei_timer(void);
31extern void register_sn_procfs(void); 32extern void register_sn_procfs(void);
32extern void sn_acpi_bus_fixup(struct pci_bus *);
33extern void sn_bus_fixup(struct pci_bus *);
34extern void sn_acpi_slot_fixup(struct pci_dev *, struct pcidev_info *);
35extern void sn_more_slot_fixup(struct pci_dev *, struct pcidev_info *);
36extern void sn_legacy_pci_window_fixup(struct pci_controller *, u64, u64);
37extern void sn_io_acpi_init(void); 33extern void sn_io_acpi_init(void);
38extern void sn_io_init(void); 34extern void sn_io_init(void);
39 35
@@ -48,6 +44,9 @@ struct sysdata_el {
48 44
49int sn_ioif_inited; /* SN I/O infrastructure initialized? */ 45int sn_ioif_inited; /* SN I/O infrastructure initialized? */
50 46
47int sn_acpi_rev; /* SN ACPI revision */
48EXPORT_SYMBOL_GPL(sn_acpi_rev);
49
51struct sn_pcibus_provider *sn_pci_provider[PCIIO_ASIC_MAX_TYPES]; /* indexed by asic type */ 50struct sn_pcibus_provider *sn_pci_provider[PCIIO_ASIC_MAX_TYPES]; /* indexed by asic type */
52 51
53/* 52/*
@@ -99,25 +98,6 @@ sal_get_device_dmaflush_list(u64 nasid, u64 widget_num, u64 device_num,
99} 98}
100 99
101/* 100/*
102 * Retrieve the pci device information given the bus and device|function number.
103 */
104static inline u64
105sal_get_pcidev_info(u64 segment, u64 bus_number, u64 devfn, u64 pci_dev,
106 u64 sn_irq_info)
107{
108 struct ia64_sal_retval ret_stuff;
109 ret_stuff.status = 0;
110 ret_stuff.v0 = 0;
111
112 SAL_CALL_NOLOCK(ret_stuff,
113 (u64) SN_SAL_IOIF_GET_PCIDEV_INFO,
114 (u64) segment, (u64) bus_number, (u64) devfn,
115 (u64) pci_dev,
116 sn_irq_info, 0, 0);
117 return ret_stuff.v0;
118}
119
120/*
121 * sn_pcidev_info_get() - Retrieve the pcidev_info struct for the specified 101 * sn_pcidev_info_get() - Retrieve the pcidev_info struct for the specified
122 * device. 102 * device.
123 */ 103 */
@@ -249,50 +229,25 @@ void sn_pci_unfixup_slot(struct pci_dev *dev)
249} 229}
250 230
251/* 231/*
252 * sn_pci_fixup_slot() - This routine sets up a slot's resources consistent 232 * sn_pci_fixup_slot()
253 * with the Linux PCI abstraction layer. Resources
254 * acquired from our PCI provider include PIO maps
255 * to BAR space and interrupt objects.
256 */ 233 */
257void sn_pci_fixup_slot(struct pci_dev *dev) 234void sn_pci_fixup_slot(struct pci_dev *dev, struct pcidev_info *pcidev_info,
235 struct sn_irq_info *sn_irq_info)
258{ 236{
259 int segment = pci_domain_nr(dev->bus); 237 int segment = pci_domain_nr(dev->bus);
260 int status = 0;
261 struct pcibus_bussoft *bs; 238 struct pcibus_bussoft *bs;
262 struct pci_bus *host_pci_bus; 239 struct pci_bus *host_pci_bus;
263 struct pci_dev *host_pci_dev; 240 struct pci_dev *host_pci_dev;
264 struct pcidev_info *pcidev_info; 241 unsigned int bus_no, devfn;
265 struct sn_irq_info *sn_irq_info;
266 unsigned int bus_no, devfn;
267 242
268 pci_dev_get(dev); /* for the sysdata pointer */ 243 pci_dev_get(dev); /* for the sysdata pointer */
269 pcidev_info = kzalloc(sizeof(struct pcidev_info), GFP_KERNEL);
270 if (!pcidev_info)
271 BUG(); /* Cannot afford to run out of memory */
272
273 sn_irq_info = kzalloc(sizeof(struct sn_irq_info), GFP_KERNEL);
274 if (!sn_irq_info)
275 BUG(); /* Cannot afford to run out of memory */
276
277 /* Call to retrieve pci device information needed by kernel. */
278 status = sal_get_pcidev_info((u64) segment, (u64) dev->bus->number,
279 dev->devfn,
280 (u64) __pa(pcidev_info),
281 (u64) __pa(sn_irq_info));
282 if (status)
283 BUG(); /* Cannot get platform pci device information */
284 244
285 /* Add pcidev_info to list in pci_controller.platform_data */ 245 /* Add pcidev_info to list in pci_controller.platform_data */
286 list_add_tail(&pcidev_info->pdi_list, 246 list_add_tail(&pcidev_info->pdi_list,
287 &(SN_PLATFORM_DATA(dev->bus)->pcidev_info)); 247 &(SN_PLATFORM_DATA(dev->bus)->pcidev_info));
288
289 if (SN_ACPI_BASE_SUPPORT())
290 sn_acpi_slot_fixup(dev, pcidev_info);
291 else
292 sn_more_slot_fixup(dev, pcidev_info);
293 /* 248 /*
294 * Using the PROMs values for the PCI host bus, get the Linux 249 * Using the PROMs values for the PCI host bus, get the Linux
295 * PCI host_pci_dev struct and set up host bus linkages 250 * PCI host_pci_dev struct and set up host bus linkages
296 */ 251 */
297 252
298 bus_no = (pcidev_info->pdi_slot_host_handle >> 32) & 0xff; 253 bus_no = (pcidev_info->pdi_slot_host_handle >> 32) & 0xff;
@@ -489,11 +444,6 @@ void sn_generate_path(struct pci_bus *pci_bus, char *address)
489 sprintf(address, "%s^%d", address, geo_slot(geoid)); 444 sprintf(address, "%s^%d", address, geo_slot(geoid));
490} 445}
491 446
492/*
493 * sn_pci_fixup_bus() - Perform SN specific setup of software structs
494 * (pcibus_bussoft, pcidev_info) and hardware
495 * registers, for the specified bus and devices under it.
496 */
497void __devinit 447void __devinit
498sn_pci_fixup_bus(struct pci_bus *bus) 448sn_pci_fixup_bus(struct pci_bus *bus)
499{ 449{
@@ -519,6 +469,15 @@ sn_io_early_init(void)
519 if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM()) 469 if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
520 return 0; 470 return 0;
521 471
472 /* we set the acpi revision to that of the DSDT table OEM rev. */
473 {
474 struct acpi_table_header *header = NULL;
475
476 acpi_get_table_by_index(ACPI_TABLE_INDEX_DSDT, &header);
477 BUG_ON(header == NULL);
478 sn_acpi_rev = header->oem_revision;
479 }
480
522 /* 481 /*
523 * prime sn_pci_provider[]. Individial provider init routines will 482 * prime sn_pci_provider[]. Individial provider init routines will
524 * override their respective default entries. 483 * override their respective default entries.
@@ -544,8 +503,12 @@ sn_io_early_init(void)
544 register_sn_procfs(); 503 register_sn_procfs();
545#endif 504#endif
546 505
547 printk(KERN_INFO "ACPI DSDT OEM Rev 0x%x\n", 506 {
548 acpi_gbl_DSDT->oem_revision); 507 struct acpi_table_header *header;
508 (void)acpi_get_table_by_index(ACPI_TABLE_INDEX_DSDT, &header);
509 printk(KERN_INFO "ACPI DSDT OEM Rev 0x%x\n",
510 header->oem_revision);
511 }
549 if (SN_ACPI_BASE_SUPPORT()) 512 if (SN_ACPI_BASE_SUPPORT())
550 sn_io_acpi_init(); 513 sn_io_acpi_init();
551 else 514 else
@@ -605,7 +568,6 @@ sn_io_late_init(void)
605 568
606fs_initcall(sn_io_late_init); 569fs_initcall(sn_io_late_init);
607 570
608EXPORT_SYMBOL(sn_pci_fixup_slot);
609EXPORT_SYMBOL(sn_pci_unfixup_slot); 571EXPORT_SYMBOL(sn_pci_unfixup_slot);
610EXPORT_SYMBOL(sn_bus_store_sysdata); 572EXPORT_SYMBOL(sn_bus_store_sysdata);
611EXPORT_SYMBOL(sn_bus_free_sysdata); 573EXPORT_SYMBOL(sn_bus_free_sysdata);
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 9ad843e0383b..6b10e5d28488 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -56,6 +56,25 @@ static inline u64 sal_get_pcibus_info(u64 segment, u64 busnum, u64 address)
56 return ret_stuff.v0; 56 return ret_stuff.v0;
57} 57}
58 58
59/*
60 * Retrieve the pci device information given the bus and device|function number.
61 */
62static inline u64
63sal_get_pcidev_info(u64 segment, u64 bus_number, u64 devfn, u64 pci_dev,
64 u64 sn_irq_info)
65{
66 struct ia64_sal_retval ret_stuff;
67 ret_stuff.status = 0;
68 ret_stuff.v0 = 0;
69
70 SAL_CALL_NOLOCK(ret_stuff,
71 (u64) SN_SAL_IOIF_GET_PCIDEV_INFO,
72 (u64) segment, (u64) bus_number, (u64) devfn,
73 (u64) pci_dev,
74 sn_irq_info, 0, 0);
75 return ret_stuff.v0;
76}
77
59 78
60/* 79/*
61 * sn_fixup_ionodes() - This routine initializes the HUB data structure for 80 * sn_fixup_ionodes() - This routine initializes the HUB data structure for
@@ -172,18 +191,40 @@ sn_pci_window_fixup(struct pci_dev *dev, unsigned int count,
172} 191}
173 192
174/* 193/*
175 * sn_more_slot_fixup() - We are not running with an ACPI capable PROM, 194 * sn_io_slot_fixup() - We are not running with an ACPI capable PROM,
176 * and need to convert the pci_dev->resource 195 * and need to convert the pci_dev->resource
177 * 'start' and 'end' addresses to mapped addresses, 196 * 'start' and 'end' addresses to mapped addresses,
178 * and setup the pci_controller->window array entries. 197 * and setup the pci_controller->window array entries.
179 */ 198 */
180void 199void
181sn_more_slot_fixup(struct pci_dev *dev, struct pcidev_info *pcidev_info) 200sn_io_slot_fixup(struct pci_dev *dev)
182{ 201{
183 unsigned int count = 0; 202 unsigned int count = 0;
184 int idx; 203 int idx;
185 s64 pci_addrs[PCI_ROM_RESOURCE + 1]; 204 s64 pci_addrs[PCI_ROM_RESOURCE + 1];
186 unsigned long addr, end, size, start; 205 unsigned long addr, end, size, start;
206 struct pcidev_info *pcidev_info;
207 struct sn_irq_info *sn_irq_info;
208 int status;
209
210 pcidev_info = kzalloc(sizeof(struct pcidev_info), GFP_KERNEL);
211 if (!pcidev_info)
212 panic("%s: Unable to alloc memory for pcidev_info", __FUNCTION__);
213
214 sn_irq_info = kzalloc(sizeof(struct sn_irq_info), GFP_KERNEL);
215 if (!sn_irq_info)
216 panic("%s: Unable to alloc memory for sn_irq_info", __FUNCTION__);
217
218 /* Call to retrieve pci device information needed by kernel. */
219 status = sal_get_pcidev_info((u64) pci_domain_nr(dev),
220 (u64) dev->bus->number,
221 dev->devfn,
222 (u64) __pa(pcidev_info),
223 (u64) __pa(sn_irq_info));
224
225 if (status)
226 BUG(); /* Cannot get platform pci device information */
227
187 228
188 /* Copy over PIO Mapped Addresses */ 229 /* Copy over PIO Mapped Addresses */
189 for (idx = 0; idx <= PCI_ROM_RESOURCE; idx++) { 230 for (idx = 0; idx <= PCI_ROM_RESOURCE; idx++) {
@@ -206,10 +247,18 @@ sn_more_slot_fixup(struct pci_dev *dev, struct pcidev_info *pcidev_info)
206 addr = ((addr << 4) >> 4) | __IA64_UNCACHED_OFFSET; 247 addr = ((addr << 4) >> 4) | __IA64_UNCACHED_OFFSET;
207 dev->resource[idx].start = addr; 248 dev->resource[idx].start = addr;
208 dev->resource[idx].end = addr + size; 249 dev->resource[idx].end = addr + size;
250
251 /*
252 * if it's already in the device structure, remove it before
253 * inserting
254 */
255 if (dev->resource[idx].parent && dev->resource[idx].parent->child)
256 release_resource(&dev->resource[idx]);
257
209 if (dev->resource[idx].flags & IORESOURCE_IO) 258 if (dev->resource[idx].flags & IORESOURCE_IO)
210 dev->resource[idx].parent = &ioport_resource; 259 insert_resource(&ioport_resource, &dev->resource[idx]);
211 else 260 else
212 dev->resource[idx].parent = &iomem_resource; 261 insert_resource(&iomem_resource, &dev->resource[idx]);
213 /* If ROM, mark as shadowed in PROM */ 262 /* If ROM, mark as shadowed in PROM */
214 if (idx == PCI_ROM_RESOURCE) 263 if (idx == PCI_ROM_RESOURCE)
215 dev->resource[idx].flags |= IORESOURCE_ROM_BIOS_COPY; 264 dev->resource[idx].flags |= IORESOURCE_ROM_BIOS_COPY;
@@ -219,8 +268,12 @@ sn_more_slot_fixup(struct pci_dev *dev, struct pcidev_info *pcidev_info)
219 */ 268 */
220 if (count > 0) 269 if (count > 0)
221 sn_pci_window_fixup(dev, count, pci_addrs); 270 sn_pci_window_fixup(dev, count, pci_addrs);
271
272 sn_pci_fixup_slot(dev, pcidev_info, sn_irq_info);
222} 273}
223 274
275EXPORT_SYMBOL(sn_io_slot_fixup);
276
224/* 277/*
225 * sn_pci_controller_fixup() - This routine sets up a bus's resources 278 * sn_pci_controller_fixup() - This routine sets up a bus's resources
226 * consistent with the Linux PCI abstraction layer. 279 * consistent with the Linux PCI abstraction layer.
@@ -272,9 +325,6 @@ sn_bus_fixup(struct pci_bus *bus)
272{ 325{
273 struct pci_dev *pci_dev = NULL; 326 struct pci_dev *pci_dev = NULL;
274 struct pcibus_bussoft *prom_bussoft_ptr; 327 struct pcibus_bussoft *prom_bussoft_ptr;
275 extern void sn_common_bus_fixup(struct pci_bus *,
276 struct pcibus_bussoft *);
277
278 328
279 if (!bus->parent) { /* If root bus */ 329 if (!bus->parent) { /* If root bus */
280 prom_bussoft_ptr = PCI_CONTROLLER(bus)->platform_data; 330 prom_bussoft_ptr = PCI_CONTROLLER(bus)->platform_data;
@@ -291,7 +341,7 @@ sn_bus_fixup(struct pci_bus *bus)
291 prom_bussoft_ptr->bs_legacy_mem); 341 prom_bussoft_ptr->bs_legacy_mem);
292 } 342 }
293 list_for_each_entry(pci_dev, &bus->devices, bus_list) { 343 list_for_each_entry(pci_dev, &bus->devices, bus_list) {
294 sn_pci_fixup_slot(pci_dev); 344 sn_io_slot_fixup(pci_dev);
295 } 345 }
296 346
297} 347}
diff --git a/arch/ia64/sn/kernel/iomv.c b/arch/ia64/sn/kernel/iomv.c
index 4aa4f301d56d..ab7e2fd40798 100644
--- a/arch/ia64/sn/kernel/iomv.c
+++ b/arch/ia64/sn/kernel/iomv.c
@@ -1,4 +1,4 @@
1/* 1/*
2 * This file is subject to the terms and conditions of the GNU General Public 2 * This file is subject to the terms and conditions of the GNU General Public
3 * License. See the file "COPYING" in the main directory of this archive 3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details. 4 * for more details.
@@ -26,9 +26,10 @@
26 * @port: port to convert 26 * @port: port to convert
27 * 27 *
28 * Legacy in/out instructions are converted to ld/st instructions 28 * Legacy in/out instructions are converted to ld/st instructions
29 * on IA64. This routine will convert a port number into a valid 29 * on IA64. This routine will convert a port number into a valid
30 * SN i/o address. Used by sn_in*() and sn_out*(). 30 * SN i/o address. Used by sn_in*() and sn_out*().
31 */ 31 */
32
32void *sn_io_addr(unsigned long port) 33void *sn_io_addr(unsigned long port)
33{ 34{
34 if (!IS_RUNNING_ON_SIMULATOR()) { 35 if (!IS_RUNNING_ON_SIMULATOR()) {
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 8c5bee01eaa2..8d2a1bfbfe7c 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -205,7 +205,17 @@ static void sn_set_affinity_irq(unsigned int irq, cpumask_t mask)
205 (void)sn_retarget_vector(sn_irq_info, nasid, slice); 205 (void)sn_retarget_vector(sn_irq_info, nasid, slice);
206} 206}
207 207
208struct hw_interrupt_type irq_type_sn = { 208static void
209sn_mask_irq(unsigned int irq)
210{
211}
212
213static void
214sn_unmask_irq(unsigned int irq)
215{
216}
217
218struct irq_chip irq_type_sn = {
209 .name = "SN hub", 219 .name = "SN hub",
210 .startup = sn_startup_irq, 220 .startup = sn_startup_irq,
211 .shutdown = sn_shutdown_irq, 221 .shutdown = sn_shutdown_irq,
@@ -213,6 +223,8 @@ struct hw_interrupt_type irq_type_sn = {
213 .disable = sn_disable_irq, 223 .disable = sn_disable_irq,
214 .ack = sn_ack_irq, 224 .ack = sn_ack_irq,
215 .end = sn_end_irq, 225 .end = sn_end_irq,
226 .mask = sn_mask_irq,
227 .unmask = sn_unmask_irq,
216 .set_affinity = sn_set_affinity_irq 228 .set_affinity = sn_set_affinity_irq
217}; 229};
218 230
diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c
index b3a435fd70fb..49873aa4a37d 100644
--- a/arch/ia64/sn/kernel/msi_sn.c
+++ b/arch/ia64/sn/kernel/msi_sn.c
@@ -59,13 +59,12 @@ void sn_teardown_msi_irq(unsigned int irq)
59 sn_intr_free(nasid, widget, sn_irq_info); 59 sn_intr_free(nasid, widget, sn_irq_info);
60 sn_msi_info[irq].sn_irq_info = NULL; 60 sn_msi_info[irq].sn_irq_info = NULL;
61 61
62 return; 62 destroy_irq(irq);
63} 63}
64 64
65int sn_setup_msi_irq(unsigned int irq, struct pci_dev *pdev) 65int sn_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *entry)
66{ 66{
67 struct msi_msg msg; 67 struct msi_msg msg;
68 struct msi_desc *entry;
69 int widget; 68 int widget;
70 int status; 69 int status;
71 nasid_t nasid; 70 nasid_t nasid;
@@ -73,8 +72,8 @@ int sn_setup_msi_irq(unsigned int irq, struct pci_dev *pdev)
73 struct sn_irq_info *sn_irq_info; 72 struct sn_irq_info *sn_irq_info;
74 struct pcibus_bussoft *bussoft = SN_PCIDEV_BUSSOFT(pdev); 73 struct pcibus_bussoft *bussoft = SN_PCIDEV_BUSSOFT(pdev);
75 struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev); 74 struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
75 int irq;
76 76
77 entry = get_irq_data(irq);
78 if (!entry->msi_attrib.is_64) 77 if (!entry->msi_attrib.is_64)
79 return -EINVAL; 78 return -EINVAL;
80 79
@@ -84,6 +83,11 @@ int sn_setup_msi_irq(unsigned int irq, struct pci_dev *pdev)
84 if (provider == NULL || provider->dma_map_consistent == NULL) 83 if (provider == NULL || provider->dma_map_consistent == NULL)
85 return -EINVAL; 84 return -EINVAL;
86 85
86 irq = create_irq();
87 if (irq < 0)
88 return irq;
89
90 set_irq_msi(irq, entry);
87 /* 91 /*
88 * Set up the vector plumbing. Let the prom (via sn_intr_alloc) 92 * Set up the vector plumbing. Let the prom (via sn_intr_alloc)
89 * decide which cpu to direct this msi at by default. 93 * decide which cpu to direct this msi at by default.
@@ -95,12 +99,15 @@ int sn_setup_msi_irq(unsigned int irq, struct pci_dev *pdev)
95 SWIN_WIDGETNUM(bussoft->bs_base); 99 SWIN_WIDGETNUM(bussoft->bs_base);
96 100
97 sn_irq_info = kzalloc(sizeof(struct sn_irq_info), GFP_KERNEL); 101 sn_irq_info = kzalloc(sizeof(struct sn_irq_info), GFP_KERNEL);
98 if (! sn_irq_info) 102 if (! sn_irq_info) {
103 destroy_irq(irq);
99 return -ENOMEM; 104 return -ENOMEM;
105 }
100 106
101 status = sn_intr_alloc(nasid, widget, sn_irq_info, irq, -1, -1); 107 status = sn_intr_alloc(nasid, widget, sn_irq_info, irq, -1, -1);
102 if (status) { 108 if (status) {
103 kfree(sn_irq_info); 109 kfree(sn_irq_info);
110 destroy_irq(irq);
104 return -ENOMEM; 111 return -ENOMEM;
105 } 112 }
106 113
@@ -121,6 +128,7 @@ int sn_setup_msi_irq(unsigned int irq, struct pci_dev *pdev)
121 if (! bus_addr) { 128 if (! bus_addr) {
122 sn_intr_free(nasid, widget, sn_irq_info); 129 sn_intr_free(nasid, widget, sn_irq_info);
123 kfree(sn_irq_info); 130 kfree(sn_irq_info);
131 destroy_irq(irq);
124 return -ENOMEM; 132 return -ENOMEM;
125 } 133 }
126 134
@@ -139,7 +147,7 @@ int sn_setup_msi_irq(unsigned int irq, struct pci_dev *pdev)
139 write_msi_msg(irq, &msg); 147 write_msi_msg(irq, &msg);
140 set_irq_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq); 148 set_irq_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq);
141 149
142 return 0; 150 return irq;
143} 151}
144 152
145#ifdef CONFIG_SMP 153#ifdef CONFIG_SMP
@@ -196,7 +204,7 @@ static void sn_set_msi_irq_affinity(unsigned int irq, cpumask_t cpu_mask)
196 msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff); 204 msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff);
197 205
198 write_msi_msg(irq, &msg); 206 write_msi_msg(irq, &msg);
199 set_native_irq_info(irq, cpu_mask); 207 irq_desc[irq].affinity = cpu_mask;
200} 208}
201#endif /* CONFIG_SMP */ 209#endif /* CONFIG_SMP */
202 210
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 8571e52c2efd..a9bed5ca2ed8 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -348,8 +348,7 @@ sn_scan_pcdp(void)
348 continue; /* not PCI interconnect */ 348 continue; /* not PCI interconnect */
349 349
350 if (if_pci.translation & PCDP_PCI_TRANS_IOPORT) 350 if (if_pci.translation & PCDP_PCI_TRANS_IOPORT)
351 vga_console_iobase = 351 vga_console_iobase = if_pci.ioport_tra;
352 if_pci.ioport_tra | __IA64_UNCACHED_OFFSET;
353 352
354 if (if_pci.translation & PCDP_PCI_TRANS_MMIO) 353 if (if_pci.translation & PCDP_PCI_TRANS_MMIO)
355 vga_console_membase = 354 vga_console_membase =
@@ -397,6 +396,8 @@ void __init sn_setup(char **cmdline_p)
397 ia64_sn_set_os_feature(OSF_PCISEGMENT_ENABLE); 396 ia64_sn_set_os_feature(OSF_PCISEGMENT_ENABLE);
398 ia64_sn_set_os_feature(OSF_ACPI_ENABLE); 397 ia64_sn_set_os_feature(OSF_ACPI_ENABLE);
399 398
399 /* Load the new DSDT and SSDT tables into the global table list. */
400 acpi_table_init();
400 401
401#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE) 402#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
402 /* 403 /*
@@ -427,7 +428,8 @@ void __init sn_setup(char **cmdline_p)
427 * bus containing the VGA console. 428 * bus containing the VGA console.
428 */ 429 */
429 if (vga_console_iobase) { 430 if (vga_console_iobase) {
430 io_space[0].mmio_base = vga_console_iobase; 431 io_space[0].mmio_base =
432 (unsigned long) ioremap(vga_console_iobase, 0);
431 io_space[0].sparse = 0; 433 io_space[0].sparse = 0;
432 } 434 }
433 435
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c
index d9d306c79f2d..601747b1e22a 100644
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
@@ -455,7 +455,7 @@ static int sn2_ptc_proc_open(struct inode *inode, struct file *file)
455 return seq_open(file, &sn2_ptc_seq_ops); 455 return seq_open(file, &sn2_ptc_seq_ops);
456} 456}
457 457
458static struct file_operations proc_sn2_ptc_operations = { 458static const struct file_operations proc_sn2_ptc_operations = {
459 .open = sn2_ptc_proc_open, 459 .open = sn2_ptc_proc_open,
460 .read = seq_read, 460 .read = seq_read,
461 .llseek = seq_lseek, 461 .llseek = seq_lseek,
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 33367996d72d..6da9854751cd 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -865,7 +865,7 @@ error:
865 return r; 865 return r;
866} 866}
867 867
868static struct file_operations sn_hwperf_fops = { 868static const struct file_operations sn_hwperf_fops = {
869 .ioctl = sn_hwperf_ioctl, 869 .ioctl = sn_hwperf_ioctl,
870}; 870};
871 871
diff --git a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
index 43ddc2eccb96..62b3e9a496ac 100644
--- a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
+++ b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
@@ -89,61 +89,80 @@ static int coherence_id_open(struct inode *inode, struct file *file)
89 return single_open(file, coherence_id_show, NULL); 89 return single_open(file, coherence_id_show, NULL);
90} 90}
91 91
92static struct proc_dir_entry
93*sn_procfs_create_entry(const char *name, struct proc_dir_entry *parent,
94 int (*openfunc)(struct inode *, struct file *),
95 int (*releasefunc)(struct inode *, struct file *),
96 ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *))
97{
98 struct proc_dir_entry *e = create_proc_entry(name, 0444, parent);
99
100 if (e) {
101 struct file_operations *f;
102
103 f = kzalloc(sizeof(*f), GFP_KERNEL);
104 if (f) {
105 f->open = openfunc;
106 f->read = seq_read;
107 f->llseek = seq_lseek;
108 f->release = releasefunc;
109 f->write = write;
110 e->proc_fops = f;
111 }
112 }
113
114 return e;
115}
116
117/* /proc/sgi_sn/sn_topology uses seq_file, see sn_hwperf.c */ 92/* /proc/sgi_sn/sn_topology uses seq_file, see sn_hwperf.c */
118extern int sn_topology_open(struct inode *, struct file *); 93extern int sn_topology_open(struct inode *, struct file *);
119extern int sn_topology_release(struct inode *, struct file *); 94extern int sn_topology_release(struct inode *, struct file *);
120 95
96static const struct file_operations proc_partition_id_fops = {
97 .open = partition_id_open,
98 .read = seq_read,
99 .llseek = seq_lseek,
100 .release = single_release,
101};
102
103static const struct file_operations proc_system_sn_fops = {
104 .open = system_serial_number_open,
105 .read = seq_read,
106 .llseek = seq_lseek,
107 .release = single_release,
108};
109
110static const struct file_operations proc_license_id_fops = {
111 .open = licenseID_open,
112 .read = seq_read,
113 .llseek = seq_lseek,
114 .release = single_release,
115};
116
117static const struct file_operations proc_sn_force_intr_fops = {
118 .open = sn_force_interrupt_open,
119 .read = seq_read,
120 .write = sn_force_interrupt_write_proc,
121 .llseek = seq_lseek,
122 .release = single_release,
123};
124
125static const struct file_operations proc_coherence_id_fops = {
126 .open = coherence_id_open,
127 .read = seq_read,
128 .llseek = seq_lseek,
129 .release = single_release,
130};
131
132static const struct file_operations proc_sn_topo_fops = {
133 .open = sn_topology_open,
134 .read = seq_read,
135 .llseek = seq_lseek,
136 .release = sn_topology_release,
137};
138
121void register_sn_procfs(void) 139void register_sn_procfs(void)
122{ 140{
123 static struct proc_dir_entry *sgi_proc_dir = NULL; 141 static struct proc_dir_entry *sgi_proc_dir = NULL;
142 struct proc_dir_entry *pde;
124 143
125 BUG_ON(sgi_proc_dir != NULL); 144 BUG_ON(sgi_proc_dir != NULL);
126 if (!(sgi_proc_dir = proc_mkdir("sgi_sn", NULL))) 145 if (!(sgi_proc_dir = proc_mkdir("sgi_sn", NULL)))
127 return; 146 return;
128 147
129 sn_procfs_create_entry("partition_id", sgi_proc_dir, 148 pde = create_proc_entry("partition_id", 0444, sgi_proc_dir);
130 partition_id_open, single_release, NULL); 149 if (pde)
131 150 pde->proc_fops = &proc_partition_id_fops;
132 sn_procfs_create_entry("system_serial_number", sgi_proc_dir, 151 pde = create_proc_entry("system_serial_number", 0444, sgi_proc_dir);
133 system_serial_number_open, single_release, NULL); 152 if (pde)
134 153 pde->proc_fops = &proc_system_sn_fops;
135 sn_procfs_create_entry("licenseID", sgi_proc_dir, 154 pde = create_proc_entry("licenseID", 0444, sgi_proc_dir);
136 licenseID_open, single_release, NULL); 155 if (pde)
137 156 pde->proc_fops = &proc_license_id_fops;
138 sn_procfs_create_entry("sn_force_interrupt", sgi_proc_dir, 157 pde = create_proc_entry("sn_force_interrupt", 0644, sgi_proc_dir);
139 sn_force_interrupt_open, single_release, 158 if (pde)
140 sn_force_interrupt_write_proc); 159 pde->proc_fops = &proc_sn_force_intr_fops;
141 160 pde = create_proc_entry("coherence_id", 0444, sgi_proc_dir);
142 sn_procfs_create_entry("coherence_id", sgi_proc_dir, 161 if (pde)
143 coherence_id_open, single_release, NULL); 162 pde->proc_fops = &proc_coherence_id_fops;
144 163 pde = create_proc_entry("sn_topology", 0444, sgi_proc_dir);
145 sn_procfs_create_entry("sn_topology", sgi_proc_dir, 164 if (pde)
146 sn_topology_open, sn_topology_release, NULL); 165 pde->proc_fops = &proc_sn_topo_fops;
147} 166}
148 167
149#endif /* CONFIG_PROC_FS */ 168#endif /* CONFIG_PROC_FS */
diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c
index 7a387d237363..68355ef6f841 100644
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/arch/ia64/sn/kernel/xpc_main.c
@@ -101,67 +101,57 @@ static int xpc_disengage_request_max_timelimit = 120;
101 101
102static ctl_table xpc_sys_xpc_hb_dir[] = { 102static ctl_table xpc_sys_xpc_hb_dir[] = {
103 { 103 {
104 1, 104 .ctl_name = CTL_UNNUMBERED,
105 "hb_interval", 105 .procname = "hb_interval",
106 &xpc_hb_interval, 106 .data = &xpc_hb_interval,
107 sizeof(int), 107 .maxlen = sizeof(int),
108 0644, 108 .mode = 0644,
109 NULL, 109 .proc_handler = &proc_dointvec_minmax,
110 &proc_dointvec_minmax, 110 .strategy = &sysctl_intvec,
111 &sysctl_intvec, 111 .extra1 = &xpc_hb_min_interval,
112 NULL, 112 .extra2 = &xpc_hb_max_interval
113 &xpc_hb_min_interval,
114 &xpc_hb_max_interval
115 }, 113 },
116 { 114 {
117 2, 115 .ctl_name = CTL_UNNUMBERED,
118 "hb_check_interval", 116 .procname = "hb_check_interval",
119 &xpc_hb_check_interval, 117 .data = &xpc_hb_check_interval,
120 sizeof(int), 118 .maxlen = sizeof(int),
121 0644, 119 .mode = 0644,
122 NULL, 120 .proc_handler = &proc_dointvec_minmax,
123 &proc_dointvec_minmax, 121 .strategy = &sysctl_intvec,
124 &sysctl_intvec, 122 .extra1 = &xpc_hb_check_min_interval,
125 NULL, 123 .extra2 = &xpc_hb_check_max_interval
126 &xpc_hb_check_min_interval,
127 &xpc_hb_check_max_interval
128 }, 124 },
129 {0} 125 {}
130}; 126};
131static ctl_table xpc_sys_xpc_dir[] = { 127static ctl_table xpc_sys_xpc_dir[] = {
132 { 128 {
133 1, 129 .ctl_name = CTL_UNNUMBERED,
134 "hb", 130 .procname = "hb",
135 NULL, 131 .mode = 0555,
136 0, 132 .child = xpc_sys_xpc_hb_dir
137 0555,
138 xpc_sys_xpc_hb_dir
139 }, 133 },
140 { 134 {
141 2, 135 .ctl_name = CTL_UNNUMBERED,
142 "disengage_request_timelimit", 136 .procname = "disengage_request_timelimit",
143 &xpc_disengage_request_timelimit, 137 .data = &xpc_disengage_request_timelimit,
144 sizeof(int), 138 .maxlen = sizeof(int),
145 0644, 139 .mode = 0644,
146 NULL, 140 .proc_handler = &proc_dointvec_minmax,
147 &proc_dointvec_minmax, 141 .strategy = &sysctl_intvec,
148 &sysctl_intvec, 142 .extra1 = &xpc_disengage_request_min_timelimit,
149 NULL, 143 .extra2 = &xpc_disengage_request_max_timelimit
150 &xpc_disengage_request_min_timelimit,
151 &xpc_disengage_request_max_timelimit
152 }, 144 },
153 {0} 145 {}
154}; 146};
155static ctl_table xpc_sys_dir[] = { 147static ctl_table xpc_sys_dir[] = {
156 { 148 {
157 1, 149 .ctl_name = CTL_UNNUMBERED,
158 "xpc", 150 .procname = "xpc",
159 NULL, 151 .mode = 0555,
160 0, 152 .child = xpc_sys_xpc_dir
161 0555,
162 xpc_sys_xpc_dir
163 }, 153 },
164 {0} 154 {}
165}; 155};
166static struct ctl_table_header *xpc_sysctl; 156static struct ctl_table_header *xpc_sysctl;
167 157
@@ -1251,7 +1241,7 @@ xpc_init(void)
1251 snprintf(xpc_part->bus_id, BUS_ID_SIZE, "part"); 1241 snprintf(xpc_part->bus_id, BUS_ID_SIZE, "part");
1252 snprintf(xpc_chan->bus_id, BUS_ID_SIZE, "chan"); 1242 snprintf(xpc_chan->bus_id, BUS_ID_SIZE, "chan");
1253 1243
1254 xpc_sysctl = register_sysctl_table(xpc_sys_dir, 1); 1244 xpc_sysctl = register_sysctl_table(xpc_sys_dir);
1255 1245
1256 /* 1246 /*
1257 * The first few fields of each entry of xpc_partitions[] need to 1247 * The first few fields of each entry of xpc_partitions[] need to
diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c
index c8173db0d84f..5419acb89a8c 100644
--- a/arch/ia64/sn/kernel/xpnet.c
+++ b/arch/ia64/sn/kernel/xpnet.c
@@ -233,7 +233,7 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
233 "%lu)\n", skb->data, &msg->data, 233 "%lu)\n", skb->data, &msg->data,
234 (size_t) msg->embedded_bytes); 234 (size_t) msg->embedded_bytes);
235 235
236 memcpy(skb->data, &msg->data, (size_t) msg->embedded_bytes); 236 skb_copy_to_linear_data(skb, &msg->data, (size_t)msg->embedded_bytes);
237 } else { 237 } else {
238 dev_dbg(xpnet, "transferring buffer to the skb->data area;\n\t" 238 dev_dbg(xpnet, "transferring buffer to the skb->data area;\n\t"
239 "bte_copy(0x%p, 0x%p, %hu)\n", (void *)msg->buf_pa, 239 "bte_copy(0x%p, 0x%p, %hu)\n", (void *)msg->buf_pa,
@@ -264,17 +264,16 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
264 264
265 dev_dbg(xpnet, "<skb->head=0x%p skb->data=0x%p skb->tail=0x%p " 265 dev_dbg(xpnet, "<skb->head=0x%p skb->data=0x%p skb->tail=0x%p "
266 "skb->end=0x%p skb->len=%d\n", (void *) skb->head, 266 "skb->end=0x%p skb->len=%d\n", (void *) skb->head,
267 (void *) skb->data, (void *) skb->tail, (void *) skb->end, 267 (void *)skb->data, skb_tail_pointer(skb), skb_end_pointer(skb),
268 skb->len); 268 skb->len);
269 269
270 skb->dev = xpnet_device;
271 skb->protocol = eth_type_trans(skb, xpnet_device); 270 skb->protocol = eth_type_trans(skb, xpnet_device);
272 skb->ip_summed = CHECKSUM_UNNECESSARY; 271 skb->ip_summed = CHECKSUM_UNNECESSARY;
273 272
274 dev_dbg(xpnet, "passing skb to network layer; \n\tskb->head=0x%p " 273 dev_dbg(xpnet, "passing skb to network layer; \n\tskb->head=0x%p "
275 "skb->data=0x%p skb->tail=0x%p skb->end=0x%p skb->len=%d\n", 274 "skb->data=0x%p skb->tail=0x%p skb->end=0x%p skb->len=%d\n",
276 (void *) skb->head, (void *) skb->data, (void *) skb->tail, 275 (void *)skb->head, (void *)skb->data, skb_tail_pointer(skb),
277 (void *) skb->end, skb->len); 276 skb_end_pointer(skb), skb->len);
278 277
279 278
280 xpnet_device->last_rx = jiffies; 279 xpnet_device->last_rx = jiffies;
@@ -476,7 +475,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
476 475
477 dev_dbg(xpnet, ">skb->head=0x%p skb->data=0x%p skb->tail=0x%p " 476 dev_dbg(xpnet, ">skb->head=0x%p skb->data=0x%p skb->tail=0x%p "
478 "skb->end=0x%p skb->len=%d\n", (void *) skb->head, 477 "skb->end=0x%p skb->len=%d\n", (void *) skb->head,
479 (void *) skb->data, (void *) skb->tail, (void *) skb->end, 478 (void *)skb->data, skb_tail_pointer(skb), skb_end_pointer(skb),
480 skb->len); 479 skb->len);
481 480
482 481
@@ -498,7 +497,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
498 497
499 /* get the beginning of the first cacheline and end of last */ 498 /* get the beginning of the first cacheline and end of last */
500 start_addr = ((u64) skb->data & ~(L1_CACHE_BYTES - 1)); 499 start_addr = ((u64) skb->data & ~(L1_CACHE_BYTES - 1));
501 end_addr = L1_CACHE_ALIGN((u64) skb->tail); 500 end_addr = L1_CACHE_ALIGN((u64)skb_tail_pointer(skb));
502 501
503 /* calculate how many bytes to embed in the XPC message */ 502 /* calculate how many bytes to embed in the XPC message */
504 embedded_bytes = 0; 503 embedded_bytes = 0;
@@ -567,14 +566,15 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
567 msg->version = XPNET_VERSION_EMBED; 566 msg->version = XPNET_VERSION_EMBED;
568 dev_dbg(xpnet, "calling memcpy(0x%p, 0x%p, 0x%lx)\n", 567 dev_dbg(xpnet, "calling memcpy(0x%p, 0x%p, 0x%lx)\n",
569 &msg->data, skb->data, (size_t) embedded_bytes); 568 &msg->data, skb->data, (size_t) embedded_bytes);
570 memcpy(&msg->data, skb->data, (size_t) embedded_bytes); 569 skb_copy_from_linear_data(skb, &msg->data,
570 (size_t)embedded_bytes);
571 } else { 571 } else {
572 msg->version = XPNET_VERSION; 572 msg->version = XPNET_VERSION;
573 } 573 }
574 msg->magic = XPNET_MAGIC; 574 msg->magic = XPNET_MAGIC;
575 msg->size = end_addr - start_addr; 575 msg->size = end_addr - start_addr;
576 msg->leadin_ignore = (u64) skb->data - start_addr; 576 msg->leadin_ignore = (u64) skb->data - start_addr;
577 msg->tailout_ignore = end_addr - (u64) skb->tail; 577 msg->tailout_ignore = end_addr - (u64)skb_tail_pointer(skb);
578 msg->buf_pa = __pa(start_addr); 578 msg->buf_pa = __pa(start_addr);
579 579
580 dev_dbg(xpnet, "sending XPC message to %d:%d\nmsg->buf_pa=" 580 dev_dbg(xpnet, "sending XPC message to %d:%d\nmsg->buf_pa="
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_dma.c b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
index 1ee977fb6ebb..95af40cb22f2 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
@@ -96,10 +96,14 @@ pcibr_dmamap_ate32(struct pcidev_info *info,
96 } 96 }
97 97
98 /* 98 /*
99 * If we're mapping for MSI, set the MSI bit in the ATE 99 * If we're mapping for MSI, set the MSI bit in the ATE. If it's a
100 * TIOCP based pci bus, we also need to set the PIO bit in the ATE.
100 */ 101 */
101 if (dma_flags & SN_DMA_MSI) 102 if (dma_flags & SN_DMA_MSI) {
102 ate |= PCI32_ATE_MSI; 103 ate |= PCI32_ATE_MSI;
104 if (IS_TIOCP_SOFT(pcibus_info))
105 ate |= PCI32_ATE_PIO;
106 }
103 107
104 ate_write(pcibus_info, ate_index, ate_count, ate); 108 ate_write(pcibus_info, ate_index, ate_count, ate);
105 109
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
index 6846dc9b432d..04a8256017eb 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
@@ -20,7 +20,8 @@
20#include "xtalk/hubdev.h" 20#include "xtalk/hubdev.h"
21 21
22int 22int
23sal_pcibr_slot_enable(struct pcibus_info *soft, int device, void *resp) 23sal_pcibr_slot_enable(struct pcibus_info *soft, int device, void *resp,
24 char **ssdt)
24{ 25{
25 struct ia64_sal_retval ret_stuff; 26 struct ia64_sal_retval ret_stuff;
26 u64 busnum; 27 u64 busnum;
@@ -32,7 +33,8 @@ sal_pcibr_slot_enable(struct pcibus_info *soft, int device, void *resp)
32 segment = soft->pbi_buscommon.bs_persist_segment; 33 segment = soft->pbi_buscommon.bs_persist_segment;
33 busnum = soft->pbi_buscommon.bs_persist_busnum; 34 busnum = soft->pbi_buscommon.bs_persist_busnum;
34 SAL_CALL_NOLOCK(ret_stuff, (u64) SN_SAL_IOIF_SLOT_ENABLE, segment, 35 SAL_CALL_NOLOCK(ret_stuff, (u64) SN_SAL_IOIF_SLOT_ENABLE, segment,
35 busnum, (u64) device, (u64) resp, 0, 0, 0); 36 busnum, (u64) device, (u64) resp, (u64)ia64_tpa(ssdt),
37 0, 0);
36 38
37 return (int)ret_stuff.v0; 39 return (int)ret_stuff.v0;
38} 40}
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-26 18:00:49 -0500