aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/syscall_table.S1
-rw-r--r--arch/ia64/kernel/entry.S1
-rw-r--r--arch/ia64/kernel/gate.lds.S1
-rw-r--r--arch/ia64/kernel/iosapic.c265
-rw-r--r--arch/ia64/kernel/vmlinux.lds.S18
-rw-r--r--arch/ia64/mm/init.c8
-rw-r--r--arch/ia64/mm/ioremap.c6
-rw-r--r--arch/ia64/mm/tlb.c12
-rw-r--r--arch/ia64/sn/kernel/sn2/sn_hwperf.c8
-rw-r--r--arch/parisc/Kconfig6
-rw-r--r--arch/parisc/configs/712_defconfig160
-rw-r--r--arch/parisc/configs/a500_defconfig4
-rw-r--r--arch/parisc/configs/b180_defconfig12
-rw-r--r--arch/parisc/configs/c3000_defconfig252
-rw-r--r--arch/parisc/defconfig165
-rw-r--r--arch/parisc/kernel/cache.c6
-rw-r--r--arch/parisc/kernel/entry.S45
-rw-r--r--arch/parisc/kernel/pacache.S4
-rw-r--r--arch/parisc/kernel/parisc_ksyms.c19
-rw-r--r--arch/parisc/kernel/pdc_chassis.c5
-rw-r--r--arch/parisc/kernel/perf.c2
-rw-r--r--arch/parisc/kernel/syscall_table.S2
-rw-r--r--arch/parisc/lib/iomap.c4
-rw-r--r--arch/parisc/mm/init.c7
-rw-r--r--arch/parisc/mm/ioremap.c54
25 files changed, 558 insertions, 509 deletions
diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table.S
index 326595f3fa4d..ce3ef4fa0551 100644
--- a/arch/i386/kernel/syscall_table.S
+++ b/arch/i386/kernel/syscall_table.S
@@ -312,3 +312,4 @@ ENTRY(sys_call_table)
312 .long sys_unshare /* 310 */ 312 .long sys_unshare /* 310 */
313 .long sys_set_robust_list 313 .long sys_set_robust_list
314 .long sys_get_robust_list 314 .long sys_get_robust_list
315 .long sys_splice
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 0e3eda99e549..750e8e7fbdc3 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1605,5 +1605,6 @@ sys_call_table:
1605 data8 sys_ni_syscall // reserved for pselect 1605 data8 sys_ni_syscall // reserved for pselect
1606 data8 sys_ni_syscall // 1295 reserved for ppoll 1606 data8 sys_ni_syscall // 1295 reserved for ppoll
1607 data8 sys_unshare 1607 data8 sys_unshare
1608 data8 sys_splice
1608 1609
1609 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls 1610 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
diff --git a/arch/ia64/kernel/gate.lds.S b/arch/ia64/kernel/gate.lds.S
index e1e4aba9ecd0..7c99e6ec3daf 100644
--- a/arch/ia64/kernel/gate.lds.S
+++ b/arch/ia64/kernel/gate.lds.S
@@ -59,6 +59,7 @@ SECTIONS
59 *(.dynbss) 59 *(.dynbss)
60 *(.bss .bss.* .gnu.linkonce.b.*) 60 *(.bss .bss.* .gnu.linkonce.b.*)
61 *(__ex_table) 61 *(__ex_table)
62 *(__mca_table)
62 } 63 }
63} 64}
64 65
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 8832c553230a..7956eb9058fc 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -9,54 +9,65 @@
9 * Copyright (C) 1999 VA Linux Systems 9 * Copyright (C) 1999 VA Linux Systems
10 * Copyright (C) 1999,2000 Walt Drummond <drummond@valinux.com> 10 * Copyright (C) 1999,2000 Walt Drummond <drummond@valinux.com>
11 * 11 *
12 * 00/04/19 D. Mosberger Rewritten to mirror more closely the x86 I/O APIC code. 12 * 00/04/19 D. Mosberger Rewritten to mirror more closely the x86 I/O
13 * In particular, we now have separate handlers for edge 13 * APIC code. In particular, we now have separate
14 * and level triggered interrupts. 14 * handlers for edge and level triggered
15 * 00/10/27 Asit Mallick, Goutham Rao <goutham.rao@intel.com> IRQ vector allocation 15 * interrupts.
16 * PCI to vector mapping, shared PCI interrupts. 16 * 00/10/27 Asit Mallick, Goutham Rao <goutham.rao@intel.com> IRQ vector
17 * 00/10/27 D. Mosberger Document things a bit more to make them more understandable. 17 * allocation PCI to vector mapping, shared PCI
18 * Clean up much of the old IOSAPIC cruft. 18 * interrupts.
19 * 01/07/27 J.I. Lee PCI irq routing, Platform/Legacy interrupts and fixes for 19 * 00/10/27 D. Mosberger Document things a bit more to make them more
20 * ACPI S5(SoftOff) support. 20 * understandable. Clean up much of the old
21 * IOSAPIC cruft.
22 * 01/07/27 J.I. Lee PCI irq routing, Platform/Legacy interrupts
23 * and fixes for ACPI S5(SoftOff) support.
21 * 02/01/23 J.I. Lee iosapic pgm fixes for PCI irq routing from _PRT 24 * 02/01/23 J.I. Lee iosapic pgm fixes for PCI irq routing from _PRT
22 * 02/01/07 E. Focht <efocht@ess.nec.de> Redirectable interrupt vectors in 25 * 02/01/07 E. Focht <efocht@ess.nec.de> Redirectable interrupt
23 * iosapic_set_affinity(), initializations for 26 * vectors in iosapic_set_affinity(),
24 * /proc/irq/#/smp_affinity 27 * initializations for /proc/irq/#/smp_affinity
25 * 02/04/02 P. Diefenbaugh Cleaned up ACPI PCI IRQ routing. 28 * 02/04/02 P. Diefenbaugh Cleaned up ACPI PCI IRQ routing.
26 * 02/04/18 J.I. Lee bug fix in iosapic_init_pci_irq 29 * 02/04/18 J.I. Lee bug fix in iosapic_init_pci_irq
27 * 02/04/30 J.I. Lee bug fix in find_iosapic to fix ACPI PCI IRQ to IOSAPIC mapping 30 * 02/04/30 J.I. Lee bug fix in find_iosapic to fix ACPI PCI IRQ to
28 * error 31 * IOSAPIC mapping error
29 * 02/07/29 T. Kochi Allocate interrupt vectors dynamically 32 * 02/07/29 T. Kochi Allocate interrupt vectors dynamically
30 * 02/08/04 T. Kochi Cleaned up terminology (irq, global system interrupt, vector, etc.) 33 * 02/08/04 T. Kochi Cleaned up terminology (irq, global system
31 * 02/09/20 D. Mosberger Simplified by taking advantage of ACPI's pci_irq code. 34 * interrupt, vector, etc.)
35 * 02/09/20 D. Mosberger Simplified by taking advantage of ACPI's
36 * pci_irq code.
32 * 03/02/19 B. Helgaas Make pcat_compat system-wide, not per-IOSAPIC. 37 * 03/02/19 B. Helgaas Make pcat_compat system-wide, not per-IOSAPIC.
33 * Remove iosapic_address & gsi_base from external interfaces. 38 * Remove iosapic_address & gsi_base from
34 * Rationalize __init/__devinit attributes. 39 * external interfaces. Rationalize
40 * __init/__devinit attributes.
35 * 04/12/04 Ashok Raj <ashok.raj@intel.com> Intel Corporation 2004 41 * 04/12/04 Ashok Raj <ashok.raj@intel.com> Intel Corporation 2004
36 * Updated to work with irq migration necessary for CPU Hotplug 42 * Updated to work with irq migration necessary
43 * for CPU Hotplug
37 */ 44 */
38/* 45/*
39 * Here is what the interrupt logic between a PCI device and the kernel looks like: 46 * Here is what the interrupt logic between a PCI device and the kernel looks
47 * like:
40 * 48 *
41 * (1) A PCI device raises one of the four interrupt pins (INTA, INTB, INTC, INTD). The 49 * (1) A PCI device raises one of the four interrupt pins (INTA, INTB, INTC,
42 * device is uniquely identified by its bus--, and slot-number (the function 50 * INTD). The device is uniquely identified by its bus-, and slot-number
43 * number does not matter here because all functions share the same interrupt 51 * (the function number does not matter here because all functions share
44 * lines). 52 * the same interrupt lines).
45 * 53 *
46 * (2) The motherboard routes the interrupt line to a pin on a IOSAPIC controller. 54 * (2) The motherboard routes the interrupt line to a pin on a IOSAPIC
47 * Multiple interrupt lines may have to share the same IOSAPIC pin (if they're level 55 * controller. Multiple interrupt lines may have to share the same
48 * triggered and use the same polarity). Each interrupt line has a unique Global 56 * IOSAPIC pin (if they're level triggered and use the same polarity).
49 * System Interrupt (GSI) number which can be calculated as the sum of the controller's 57 * Each interrupt line has a unique Global System Interrupt (GSI) number
50 * base GSI number and the IOSAPIC pin number to which the line connects. 58 * which can be calculated as the sum of the controller's base GSI number
59 * and the IOSAPIC pin number to which the line connects.
51 * 60 *
52 * (3) The IOSAPIC uses an internal routing table entries (RTEs) to map the IOSAPIC pin 61 * (3) The IOSAPIC uses an internal routing table entries (RTEs) to map the
53 * into the IA-64 interrupt vector. This interrupt vector is then sent to the CPU. 62 * IOSAPIC pin into the IA-64 interrupt vector. This interrupt vector is then
63 * sent to the CPU.
54 * 64 *
55 * (4) The kernel recognizes an interrupt as an IRQ. The IRQ interface is used as 65 * (4) The kernel recognizes an interrupt as an IRQ. The IRQ interface is
56 * architecture-independent interrupt handling mechanism in Linux. As an 66 * used as architecture-independent interrupt handling mechanism in Linux.
57 * IRQ is a number, we have to have IA-64 interrupt vector number <-> IRQ number 67 * As an IRQ is a number, we have to have
58 * mapping. On smaller systems, we use one-to-one mapping between IA-64 vector and 68 * IA-64 interrupt vector number <-> IRQ number mapping. On smaller
59 * IRQ. A platform can implement platform_irq_to_vector(irq) and 69 * systems, we use one-to-one mapping between IA-64 vector and IRQ. A
70 * platform can implement platform_irq_to_vector(irq) and
60 * platform_local_vector_to_irq(vector) APIs to differentiate the mapping. 71 * platform_local_vector_to_irq(vector) APIs to differentiate the mapping.
61 * Please see also include/asm-ia64/hw_irq.h for those APIs. 72 * Please see also include/asm-ia64/hw_irq.h for those APIs.
62 * 73 *
@@ -64,9 +75,9 @@
64 * 75 *
65 * PCI pin -> global system interrupt (GSI) -> IA-64 vector <-> IRQ 76 * PCI pin -> global system interrupt (GSI) -> IA-64 vector <-> IRQ
66 * 77 *
67 * Note: The term "IRQ" is loosely used everywhere in Linux kernel to describe interrupts. 78 * Note: The term "IRQ" is loosely used everywhere in Linux kernel to
68 * Now we use "IRQ" only for Linux IRQ's. ISA IRQ (isa_irq) is the only exception in this 79 * describeinterrupts. Now we use "IRQ" only for Linux IRQ's. ISA IRQ
69 * source code. 80 * (isa_irq) is the only exception in this source code.
70 */ 81 */
71#include <linux/config.h> 82#include <linux/config.h>
72 83
@@ -90,7 +101,6 @@
90#include <asm/ptrace.h> 101#include <asm/ptrace.h>
91#include <asm/system.h> 102#include <asm/system.h>
92 103
93
94#undef DEBUG_INTERRUPT_ROUTING 104#undef DEBUG_INTERRUPT_ROUTING
95 105
96#ifdef DEBUG_INTERRUPT_ROUTING 106#ifdef DEBUG_INTERRUPT_ROUTING
@@ -99,36 +109,46 @@
99#define DBG(fmt...) 109#define DBG(fmt...)
100#endif 110#endif
101 111
102#define NR_PREALLOCATE_RTE_ENTRIES (PAGE_SIZE / sizeof(struct iosapic_rte_info)) 112#define NR_PREALLOCATE_RTE_ENTRIES \
113 (PAGE_SIZE / sizeof(struct iosapic_rte_info))
103#define RTE_PREALLOCATED (1) 114#define RTE_PREALLOCATED (1)
104 115
105static DEFINE_SPINLOCK(iosapic_lock); 116static DEFINE_SPINLOCK(iosapic_lock);
106 117
107/* These tables map IA-64 vectors to the IOSAPIC pin that generates this vector. */ 118/*
119 * These tables map IA-64 vectors to the IOSAPIC pin that generates this
120 * vector.
121 */
108 122
109struct iosapic_rte_info { 123struct iosapic_rte_info {
110 struct list_head rte_list; /* node in list of RTEs sharing the same vector */ 124 struct list_head rte_list; /* node in list of RTEs sharing the
125 * same vector */
111 char __iomem *addr; /* base address of IOSAPIC */ 126 char __iomem *addr; /* base address of IOSAPIC */
112 unsigned int gsi_base; /* first GSI assigned to this IOSAPIC */ 127 unsigned int gsi_base; /* first GSI assigned to this
128 * IOSAPIC */
113 char rte_index; /* IOSAPIC RTE index */ 129 char rte_index; /* IOSAPIC RTE index */
114 int refcnt; /* reference counter */ 130 int refcnt; /* reference counter */
115 unsigned int flags; /* flags */ 131 unsigned int flags; /* flags */
116} ____cacheline_aligned; 132} ____cacheline_aligned;
117 133
118static struct iosapic_intr_info { 134static struct iosapic_intr_info {
119 struct list_head rtes; /* RTEs using this vector (empty => not an IOSAPIC interrupt) */ 135 struct list_head rtes; /* RTEs using this vector (empty =>
136 * not an IOSAPIC interrupt) */
120 int count; /* # of RTEs that shares this vector */ 137 int count; /* # of RTEs that shares this vector */
121 u32 low32; /* current value of low word of Redirection table entry */ 138 u32 low32; /* current value of low word of
139 * Redirection table entry */
122 unsigned int dest; /* destination CPU physical ID */ 140 unsigned int dest; /* destination CPU physical ID */
123 unsigned char dmode : 3; /* delivery mode (see iosapic.h) */ 141 unsigned char dmode : 3; /* delivery mode (see iosapic.h) */
124 unsigned char polarity: 1; /* interrupt polarity (see iosapic.h) */ 142 unsigned char polarity: 1; /* interrupt polarity
143 * (see iosapic.h) */
125 unsigned char trigger : 1; /* trigger mode (see iosapic.h) */ 144 unsigned char trigger : 1; /* trigger mode (see iosapic.h) */
126} iosapic_intr_info[IA64_NUM_VECTORS]; 145} iosapic_intr_info[IA64_NUM_VECTORS];
127 146
128static struct iosapic { 147static struct iosapic {
129 char __iomem *addr; /* base address of IOSAPIC */ 148 char __iomem *addr; /* base address of IOSAPIC */
130 unsigned int gsi_base; /* first GSI assigned to this IOSAPIC */ 149 unsigned int gsi_base; /* first GSI assigned to this
131 unsigned short num_rte; /* number of RTE in this IOSAPIC */ 150 * IOSAPIC */
151 unsigned short num_rte; /* # of RTEs on this IOSAPIC */
132 int rtes_inuse; /* # of RTEs in use on this IOSAPIC */ 152 int rtes_inuse; /* # of RTEs in use on this IOSAPIC */
133#ifdef CONFIG_NUMA 153#ifdef CONFIG_NUMA
134 unsigned short node; /* numa node association via pxm */ 154 unsigned short node; /* numa node association via pxm */
@@ -149,7 +169,8 @@ find_iosapic (unsigned int gsi)
149 int i; 169 int i;
150 170
151 for (i = 0; i < NR_IOSAPICS; i++) { 171 for (i = 0; i < NR_IOSAPICS; i++) {
152 if ((unsigned) (gsi - iosapic_lists[i].gsi_base) < iosapic_lists[i].num_rte) 172 if ((unsigned) (gsi - iosapic_lists[i].gsi_base) <
173 iosapic_lists[i].num_rte)
153 return i; 174 return i;
154 } 175 }
155 176
@@ -162,7 +183,8 @@ _gsi_to_vector (unsigned int gsi)
162 struct iosapic_intr_info *info; 183 struct iosapic_intr_info *info;
163 struct iosapic_rte_info *rte; 184 struct iosapic_rte_info *rte;
164 185
165 for (info = iosapic_intr_info; info < iosapic_intr_info + IA64_NUM_VECTORS; ++info) 186 for (info = iosapic_intr_info; info <
187 iosapic_intr_info + IA64_NUM_VECTORS; ++info)
166 list_for_each_entry(rte, &info->rtes, rte_list) 188 list_for_each_entry(rte, &info->rtes, rte_list)
167 if (rte->gsi_base + rte->rte_index == gsi) 189 if (rte->gsi_base + rte->rte_index == gsi)
168 return info - iosapic_intr_info; 190 return info - iosapic_intr_info;
@@ -185,8 +207,8 @@ gsi_to_irq (unsigned int gsi)
185 unsigned long flags; 207 unsigned long flags;
186 int irq; 208 int irq;
187 /* 209 /*
188 * XXX fix me: this assumes an identity mapping vetween IA-64 vector and Linux irq 210 * XXX fix me: this assumes an identity mapping between IA-64 vector
189 * numbers... 211 * and Linux irq numbers...
190 */ 212 */
191 spin_lock_irqsave(&iosapic_lock, flags); 213 spin_lock_irqsave(&iosapic_lock, flags);
192 { 214 {
@@ -197,7 +219,8 @@ gsi_to_irq (unsigned int gsi)
197 return irq; 219 return irq;
198} 220}
199 221
200static struct iosapic_rte_info *gsi_vector_to_rte(unsigned int gsi, unsigned int vec) 222static struct iosapic_rte_info *gsi_vector_to_rte(unsigned int gsi,
223 unsigned int vec)
201{ 224{
202 struct iosapic_rte_info *rte; 225 struct iosapic_rte_info *rte;
203 226
@@ -237,7 +260,9 @@ set_rte (unsigned int gsi, unsigned int vector, unsigned int dest, int mask)
237 260
238 for (irq = 0; irq < NR_IRQS; ++irq) 261 for (irq = 0; irq < NR_IRQS; ++irq)
239 if (irq_to_vector(irq) == vector) { 262 if (irq_to_vector(irq) == vector) {
240 set_irq_affinity_info(irq, (int)(dest & 0xffff), redir); 263 set_irq_affinity_info(irq,
264 (int)(dest & 0xffff),
265 redir);
241 break; 266 break;
242 } 267 }
243 } 268 }
@@ -259,7 +284,7 @@ set_rte (unsigned int gsi, unsigned int vector, unsigned int dest, int mask)
259} 284}
260 285
261static void 286static void
262nop (unsigned int vector) 287nop (unsigned int irq)
263{ 288{
264 /* do nothing... */ 289 /* do nothing... */
265} 290}
@@ -281,7 +306,8 @@ mask_irq (unsigned int irq)
281 { 306 {
282 /* set only the mask bit */ 307 /* set only the mask bit */
283 low32 = iosapic_intr_info[vec].low32 |= IOSAPIC_MASK; 308 low32 = iosapic_intr_info[vec].low32 |= IOSAPIC_MASK;
284 list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, rte_list) { 309 list_for_each_entry(rte, &iosapic_intr_info[vec].rtes,
310 rte_list) {
285 addr = rte->addr; 311 addr = rte->addr;
286 rte_index = rte->rte_index; 312 rte_index = rte->rte_index;
287 iosapic_write(addr, IOSAPIC_RTE_LOW(rte_index), low32); 313 iosapic_write(addr, IOSAPIC_RTE_LOW(rte_index), low32);
@@ -306,7 +332,8 @@ unmask_irq (unsigned int irq)
306 spin_lock_irqsave(&iosapic_lock, flags); 332 spin_lock_irqsave(&iosapic_lock, flags);
307 { 333 {
308 low32 = iosapic_intr_info[vec].low32 &= ~IOSAPIC_MASK; 334 low32 = iosapic_intr_info[vec].low32 &= ~IOSAPIC_MASK;
309 list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, rte_list) { 335 list_for_each_entry(rte, &iosapic_intr_info[vec].rtes,
336 rte_list) {
310 addr = rte->addr; 337 addr = rte->addr;
311 rte_index = rte->rte_index; 338 rte_index = rte->rte_index;
312 iosapic_write(addr, IOSAPIC_RTE_LOW(rte_index), low32); 339 iosapic_write(addr, IOSAPIC_RTE_LOW(rte_index), low32);
@@ -346,21 +373,25 @@ iosapic_set_affinity (unsigned int irq, cpumask_t mask)
346 373
347 spin_lock_irqsave(&iosapic_lock, flags); 374 spin_lock_irqsave(&iosapic_lock, flags);
348 { 375 {
349 low32 = iosapic_intr_info[vec].low32 & ~(7 << IOSAPIC_DELIVERY_SHIFT); 376 low32 = iosapic_intr_info[vec].low32 &
377 ~(7 << IOSAPIC_DELIVERY_SHIFT);
350 378
351 if (redir) 379 if (redir)
352 /* change delivery mode to lowest priority */ 380 /* change delivery mode to lowest priority */
353 low32 |= (IOSAPIC_LOWEST_PRIORITY << IOSAPIC_DELIVERY_SHIFT); 381 low32 |= (IOSAPIC_LOWEST_PRIORITY <<
382 IOSAPIC_DELIVERY_SHIFT);
354 else 383 else
355 /* change delivery mode to fixed */ 384 /* change delivery mode to fixed */
356 low32 |= (IOSAPIC_FIXED << IOSAPIC_DELIVERY_SHIFT); 385 low32 |= (IOSAPIC_FIXED << IOSAPIC_DELIVERY_SHIFT);
357 386
358 iosapic_intr_info[vec].low32 = low32; 387 iosapic_intr_info[vec].low32 = low32;
359 iosapic_intr_info[vec].dest = dest; 388 iosapic_intr_info[vec].dest = dest;
360 list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, rte_list) { 389 list_for_each_entry(rte, &iosapic_intr_info[vec].rtes,
390 rte_list) {
361 addr = rte->addr; 391 addr = rte->addr;
362 rte_index = rte->rte_index; 392 rte_index = rte->rte_index;
363 iosapic_write(addr, IOSAPIC_RTE_HIGH(rte_index), high32); 393 iosapic_write(addr, IOSAPIC_RTE_HIGH(rte_index),
394 high32);
364 iosapic_write(addr, IOSAPIC_RTE_LOW(rte_index), low32); 395 iosapic_write(addr, IOSAPIC_RTE_LOW(rte_index), low32);
365 } 396 }
366 } 397 }
@@ -433,7 +464,8 @@ iosapic_ack_edge_irq (unsigned int irq)
433 * interrupt for real. This prevents IRQ storms from unhandled 464 * interrupt for real. This prevents IRQ storms from unhandled
434 * devices. 465 * devices.
435 */ 466 */
436 if ((idesc->status & (IRQ_PENDING|IRQ_DISABLED)) == (IRQ_PENDING|IRQ_DISABLED)) 467 if ((idesc->status & (IRQ_PENDING|IRQ_DISABLED)) ==
468 (IRQ_PENDING|IRQ_DISABLED))
437 mask_irq(irq); 469 mask_irq(irq);
438} 470}
439 471
@@ -467,7 +499,8 @@ iosapic_version (char __iomem *addr)
467 return iosapic_read(addr, IOSAPIC_VERSION); 499 return iosapic_read(addr, IOSAPIC_VERSION);
468} 500}
469 501
470static int iosapic_find_sharable_vector (unsigned long trigger, unsigned long pol) 502static int iosapic_find_sharable_vector (unsigned long trigger,
503 unsigned long pol)
471{ 504{
472 int i, vector = -1, min_count = -1; 505 int i, vector = -1, min_count = -1;
473 struct iosapic_intr_info *info; 506 struct iosapic_intr_info *info;
@@ -482,7 +515,8 @@ static int iosapic_find_sharable_vector (unsigned long trigger, unsigned long po
482 for (i = IA64_FIRST_DEVICE_VECTOR; i <= IA64_LAST_DEVICE_VECTOR; i++) { 515 for (i = IA64_FIRST_DEVICE_VECTOR; i <= IA64_LAST_DEVICE_VECTOR; i++) {
483 info = &iosapic_intr_info[i]; 516 info = &iosapic_intr_info[i];
484 if (info->trigger == trigger && info->polarity == pol && 517 if (info->trigger == trigger && info->polarity == pol &&
485 (info->dmode == IOSAPIC_FIXED || info->dmode == IOSAPIC_LOWEST_PRIORITY)) { 518 (info->dmode == IOSAPIC_FIXED || info->dmode ==
519 IOSAPIC_LOWEST_PRIORITY)) {
486 if (min_count == -1 || info->count < min_count) { 520 if (min_count == -1 || info->count < min_count) {
487 vector = i; 521 vector = i;
488 min_count = info->count; 522 min_count = info->count;
@@ -506,12 +540,15 @@ iosapic_reassign_vector (int vector)
506 new_vector = assign_irq_vector(AUTO_ASSIGN); 540 new_vector = assign_irq_vector(AUTO_ASSIGN);
507 if (new_vector < 0) 541 if (new_vector < 0)
508 panic("%s: out of interrupt vectors!\n", __FUNCTION__); 542 panic("%s: out of interrupt vectors!\n", __FUNCTION__);
509 printk(KERN_INFO "Reassigning vector %d to %d\n", vector, new_vector); 543 printk(KERN_INFO "Reassigning vector %d to %d\n",
544 vector, new_vector);
510 memcpy(&iosapic_intr_info[new_vector], &iosapic_intr_info[vector], 545 memcpy(&iosapic_intr_info[new_vector], &iosapic_intr_info[vector],
511 sizeof(struct iosapic_intr_info)); 546 sizeof(struct iosapic_intr_info));
512 INIT_LIST_HEAD(&iosapic_intr_info[new_vector].rtes); 547 INIT_LIST_HEAD(&iosapic_intr_info[new_vector].rtes);
513 list_move(iosapic_intr_info[vector].rtes.next, &iosapic_intr_info[new_vector].rtes); 548 list_move(iosapic_intr_info[vector].rtes.next,
514 memset(&iosapic_intr_info[vector], 0, sizeof(struct iosapic_intr_info)); 549 &iosapic_intr_info[new_vector].rtes);
550 memset(&iosapic_intr_info[vector], 0,
551 sizeof(struct iosapic_intr_info));
515 iosapic_intr_info[vector].low32 = IOSAPIC_MASK; 552 iosapic_intr_info[vector].low32 = IOSAPIC_MASK;
516 INIT_LIST_HEAD(&iosapic_intr_info[vector].rtes); 553 INIT_LIST_HEAD(&iosapic_intr_info[vector].rtes);
517 } 554 }
@@ -524,7 +561,8 @@ static struct iosapic_rte_info *iosapic_alloc_rte (void)
524 int preallocated = 0; 561 int preallocated = 0;
525 562
526 if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) { 563 if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) {
527 rte = alloc_bootmem(sizeof(struct iosapic_rte_info) * NR_PREALLOCATE_RTE_ENTRIES); 564 rte = alloc_bootmem(sizeof(struct iosapic_rte_info) *
565 NR_PREALLOCATE_RTE_ENTRIES);
528 if (!rte) 566 if (!rte)
529 return NULL; 567 return NULL;
530 for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++) 568 for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++)
@@ -532,7 +570,8 @@ static struct iosapic_rte_info *iosapic_alloc_rte (void)
532 } 570 }
533 571
534 if (!list_empty(&free_rte_list)) { 572 if (!list_empty(&free_rte_list)) {
535 rte = list_entry(free_rte_list.next, struct iosapic_rte_info, rte_list); 573 rte = list_entry(free_rte_list.next, struct iosapic_rte_info,
574 rte_list);
536 list_del(&rte->rte_list); 575 list_del(&rte->rte_list);
537 preallocated++; 576 preallocated++;
538 } else { 577 } else {
@@ -575,7 +614,8 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,
575 614
576 index = find_iosapic(gsi); 615 index = find_iosapic(gsi);
577 if (index < 0) { 616 if (index < 0) {
578 printk(KERN_WARNING "%s: No IOSAPIC for GSI %u\n", __FUNCTION__, gsi); 617 printk(KERN_WARNING "%s: No IOSAPIC for GSI %u\n",
618 __FUNCTION__, gsi);
579 return -ENODEV; 619 return -ENODEV;
580 } 620 }
581 621
@@ -586,7 +626,8 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,
586 if (!rte) { 626 if (!rte) {
587 rte = iosapic_alloc_rte(); 627 rte = iosapic_alloc_rte();
588 if (!rte) { 628 if (!rte) {
589 printk(KERN_WARNING "%s: cannot allocate memory\n", __FUNCTION__); 629 printk(KERN_WARNING "%s: cannot allocate memory\n",
630 __FUNCTION__);
590 return -ENOMEM; 631 return -ENOMEM;
591 } 632 }
592 633
@@ -602,7 +643,9 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,
602 else if (vector_is_shared(vector)) { 643 else if (vector_is_shared(vector)) {
603 struct iosapic_intr_info *info = &iosapic_intr_info[vector]; 644 struct iosapic_intr_info *info = &iosapic_intr_info[vector];
604 if (info->trigger != trigger || info->polarity != polarity) { 645 if (info->trigger != trigger || info->polarity != polarity) {
605 printk (KERN_WARNING "%s: cannot override the interrupt\n", __FUNCTION__); 646 printk (KERN_WARNING
647 "%s: cannot override the interrupt\n",
648 __FUNCTION__);
606 return -EINVAL; 649 return -EINVAL;
607 } 650 }
608 } 651 }
@@ -619,8 +662,10 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,
619 idesc = irq_descp(vector); 662 idesc = irq_descp(vector);
620 if (idesc->handler != irq_type) { 663 if (idesc->handler != irq_type) {
621 if (idesc->handler != &no_irq_type) 664 if (idesc->handler != &no_irq_type)
622 printk(KERN_WARNING "%s: changing vector %d from %s to %s\n", 665 printk(KERN_WARNING
623 __FUNCTION__, vector, idesc->handler->typename, irq_type->typename); 666 "%s: changing vector %d from %s to %s\n",
667 __FUNCTION__, vector,
668 idesc->handler->typename, irq_type->typename);
624 idesc->handler = irq_type; 669 idesc->handler = irq_type;
625 } 670 }
626 return 0; 671 return 0;
@@ -681,7 +726,7 @@ get_target_cpu (unsigned int gsi, int vector)
681 if (!num_cpus) 726 if (!num_cpus)
682 goto skip_numa_setup; 727 goto skip_numa_setup;
683 728
684 /* Use vector assigment to distribute across cpus in node */ 729 /* Use vector assignment to distribute across cpus in node */
685 cpu_index = vector % num_cpus; 730 cpu_index = vector % num_cpus;
686 731
687 for (numa_cpu = first_cpu(cpu_mask) ; i < cpu_index ; i++) 732 for (numa_cpu = first_cpu(cpu_mask) ; i < cpu_index ; i++)
@@ -703,7 +748,7 @@ skip_numa_setup:
703 } while (!cpu_online(cpu)); 748 } while (!cpu_online(cpu));
704 749
705 return cpu_physical_id(cpu); 750 return cpu_physical_id(cpu);
706#else 751#else /* CONFIG_SMP */
707 return cpu_physical_id(smp_processor_id()); 752 return cpu_physical_id(smp_processor_id());
708#endif 753#endif
709} 754}
@@ -755,7 +800,8 @@ again:
755 if (list_empty(&iosapic_intr_info[vector].rtes)) 800 if (list_empty(&iosapic_intr_info[vector].rtes))
756 free_irq_vector(vector); 801 free_irq_vector(vector);
757 spin_unlock(&iosapic_lock); 802 spin_unlock(&iosapic_lock);
758 spin_unlock_irqrestore(&irq_descp(vector)->lock, flags); 803 spin_unlock_irqrestore(&irq_descp(vector)->lock,
804 flags);
759 goto again; 805 goto again;
760 } 806 }
761 807
@@ -764,7 +810,8 @@ again:
764 polarity, trigger); 810 polarity, trigger);
765 if (err < 0) { 811 if (err < 0) {
766 spin_unlock(&iosapic_lock); 812 spin_unlock(&iosapic_lock);
767 spin_unlock_irqrestore(&irq_descp(vector)->lock, flags); 813 spin_unlock_irqrestore(&irq_descp(vector)->lock,
814 flags);
768 return err; 815 return err;
769 } 816 }
770 817
@@ -806,7 +853,8 @@ iosapic_unregister_intr (unsigned int gsi)
806 */ 853 */
807 irq = gsi_to_irq(gsi); 854 irq = gsi_to_irq(gsi);
808 if (irq < 0) { 855 if (irq < 0) {
809 printk(KERN_ERR "iosapic_unregister_intr(%u) unbalanced\n", gsi); 856 printk(KERN_ERR "iosapic_unregister_intr(%u) unbalanced\n",
857 gsi);
810 WARN_ON(1); 858 WARN_ON(1);
811 return; 859 return;
812 } 860 }
@@ -817,7 +865,9 @@ iosapic_unregister_intr (unsigned int gsi)
817 spin_lock(&iosapic_lock); 865 spin_lock(&iosapic_lock);
818 { 866 {
819 if ((rte = gsi_vector_to_rte(gsi, vector)) == NULL) { 867 if ((rte = gsi_vector_to_rte(gsi, vector)) == NULL) {
820 printk(KERN_ERR "iosapic_unregister_intr(%u) unbalanced\n", gsi); 868 printk(KERN_ERR
869 "iosapic_unregister_intr(%u) unbalanced\n",
870 gsi);
821 WARN_ON(1); 871 WARN_ON(1);
822 goto out; 872 goto out;
823 } 873 }
@@ -827,7 +877,8 @@ iosapic_unregister_intr (unsigned int gsi)
827 877
828 /* Mask the interrupt */ 878 /* Mask the interrupt */
829 low32 = iosapic_intr_info[vector].low32 | IOSAPIC_MASK; 879 low32 = iosapic_intr_info[vector].low32 | IOSAPIC_MASK;
830 iosapic_write(rte->addr, IOSAPIC_RTE_LOW(rte->rte_index), low32); 880 iosapic_write(rte->addr, IOSAPIC_RTE_LOW(rte->rte_index),
881 low32);
831 882
832 /* Remove the rte entry from the list */ 883 /* Remove the rte entry from the list */
833 list_del(&rte->rte_list); 884 list_del(&rte->rte_list);
@@ -840,7 +891,9 @@ iosapic_unregister_intr (unsigned int gsi)
840 trigger = iosapic_intr_info[vector].trigger; 891 trigger = iosapic_intr_info[vector].trigger;
841 polarity = iosapic_intr_info[vector].polarity; 892 polarity = iosapic_intr_info[vector].polarity;
842 dest = iosapic_intr_info[vector].dest; 893 dest = iosapic_intr_info[vector].dest;
843 printk(KERN_INFO "GSI %u (%s, %s) -> CPU %d (0x%04x) vector %d unregistered\n", 894 printk(KERN_INFO
895 "GSI %u (%s, %s) -> CPU %d (0x%04x)"
896 " vector %d unregistered\n",
844 gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"), 897 gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"),
845 (polarity == IOSAPIC_POL_HIGH ? "high" : "low"), 898 (polarity == IOSAPIC_POL_HIGH ? "high" : "low"),
846 cpu_logical_id(dest), dest, vector); 899 cpu_logical_id(dest), dest, vector);
@@ -853,12 +906,15 @@ iosapic_unregister_intr (unsigned int gsi)
853 idesc->handler = &no_irq_type; 906 idesc->handler = &no_irq_type;
854 907
855 /* Clear the interrupt information */ 908 /* Clear the interrupt information */
856 memset(&iosapic_intr_info[vector], 0, sizeof(struct iosapic_intr_info)); 909 memset(&iosapic_intr_info[vector], 0,
910 sizeof(struct iosapic_intr_info));
857 iosapic_intr_info[vector].low32 |= IOSAPIC_MASK; 911 iosapic_intr_info[vector].low32 |= IOSAPIC_MASK;
858 INIT_LIST_HEAD(&iosapic_intr_info[vector].rtes); 912 INIT_LIST_HEAD(&iosapic_intr_info[vector].rtes);
859 913
860 if (idesc->action) { 914 if (idesc->action) {
861 printk(KERN_ERR "interrupt handlers still exist on IRQ %u\n", irq); 915 printk(KERN_ERR
916 "interrupt handlers still exist on"
917 "IRQ %u\n", irq);
862 WARN_ON(1); 918 WARN_ON(1);
863 } 919 }
864 920
@@ -873,7 +929,6 @@ iosapic_unregister_intr (unsigned int gsi)
873 929
874/* 930/*
875 * ACPI calls this when it finds an entry for a platform interrupt. 931 * ACPI calls this when it finds an entry for a platform interrupt.
876 * Note that the irq_base and IOSAPIC address must be set in iosapic_init().
877 */ 932 */
878int __init 933int __init
879iosapic_register_platform_intr (u32 int_type, unsigned int gsi, 934iosapic_register_platform_intr (u32 int_type, unsigned int gsi,
@@ -907,13 +962,16 @@ iosapic_register_platform_intr (u32 int_type, unsigned int gsi,
907 mask = 1; 962 mask = 1;
908 break; 963 break;
909 default: 964 default:
910 printk(KERN_ERR "iosapic_register_platform_irq(): invalid int type 0x%x\n", int_type); 965 printk(KERN_ERR "%s: invalid int type 0x%x\n", __FUNCTION__,
966 int_type);
911 return -1; 967 return -1;
912 } 968 }
913 969
914 register_intr(gsi, vector, delivery, polarity, trigger); 970 register_intr(gsi, vector, delivery, polarity, trigger);
915 971
916 printk(KERN_INFO "PLATFORM int %s (0x%x): GSI %u (%s, %s) -> CPU %d (0x%04x) vector %d\n", 972 printk(KERN_INFO
973 "PLATFORM int %s (0x%x): GSI %u (%s, %s) -> CPU %d (0x%04x)"
974 " vector %d\n",
917 int_type < ARRAY_SIZE(name) ? name[int_type] : "unknown", 975 int_type < ARRAY_SIZE(name) ? name[int_type] : "unknown",
918 int_type, gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"), 976 int_type, gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"),
919 (polarity == IOSAPIC_POL_HIGH ? "high" : "low"), 977 (polarity == IOSAPIC_POL_HIGH ? "high" : "low"),
@@ -923,10 +981,8 @@ iosapic_register_platform_intr (u32 int_type, unsigned int gsi,
923 return vector; 981 return vector;
924} 982}
925 983
926
927/* 984/*
928 * ACPI calls this when it finds an entry for a legacy ISA IRQ override. 985 * ACPI calls this when it finds an entry for a legacy ISA IRQ override.
929 * Note that the gsi_base and IOSAPIC address must be set in iosapic_init().
930 */ 986 */
931void __init 987void __init
932iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi, 988iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi,
@@ -955,16 +1011,19 @@ iosapic_system_init (int system_pcat_compat)
955 1011
956 for (vector = 0; vector < IA64_NUM_VECTORS; ++vector) { 1012 for (vector = 0; vector < IA64_NUM_VECTORS; ++vector) {
957 iosapic_intr_info[vector].low32 = IOSAPIC_MASK; 1013 iosapic_intr_info[vector].low32 = IOSAPIC_MASK;
958 INIT_LIST_HEAD(&iosapic_intr_info[vector].rtes); /* mark as unused */ 1014 /* mark as unused */
1015 INIT_LIST_HEAD(&iosapic_intr_info[vector].rtes);
959 } 1016 }
960 1017
961 pcat_compat = system_pcat_compat; 1018 pcat_compat = system_pcat_compat;
962 if (pcat_compat) { 1019 if (pcat_compat) {
963 /* 1020 /*
964 * Disable the compatibility mode interrupts (8259 style), needs IN/OUT support 1021 * Disable the compatibility mode interrupts (8259 style),
965 * enabled. 1022 * needs IN/OUT support enabled.
966 */ 1023 */
967 printk(KERN_INFO "%s: Disabling PC-AT compatible 8259 interrupts\n", __FUNCTION__); 1024 printk(KERN_INFO
1025 "%s: Disabling PC-AT compatible 8259 interrupts\n",
1026 __FUNCTION__);
968 outb(0xff, 0xA1); 1027 outb(0xff, 0xA1);
969 outb(0xff, 0x21); 1028 outb(0xff, 0x21);
970 } 1029 }
@@ -1004,10 +1063,7 @@ iosapic_check_gsi_range (unsigned int gsi_base, unsigned int ver)
1004 base = iosapic_lists[index].gsi_base; 1063 base = iosapic_lists[index].gsi_base;
1005 end = base + iosapic_lists[index].num_rte - 1; 1064 end = base + iosapic_lists[index].num_rte - 1;
1006 1065
1007 if (gsi_base < base && gsi_end < base) 1066 if (gsi_end < base || end < gsi_base)
1008 continue;/* OK */
1009
1010 if (gsi_base > end && gsi_end > end)
1011 continue; /* OK */ 1067 continue; /* OK */
1012 1068
1013 return -EBUSY; 1069 return -EBUSY;
@@ -1053,12 +1109,14 @@ iosapic_init (unsigned long phys_addr, unsigned int gsi_base)
1053 1109
1054 if ((gsi_base == 0) && pcat_compat) { 1110 if ((gsi_base == 0) && pcat_compat) {
1055 /* 1111 /*
1056 * Map the legacy ISA devices into the IOSAPIC data. Some of these may 1112 * Map the legacy ISA devices into the IOSAPIC data. Some of
1057 * get reprogrammed later on with data from the ACPI Interrupt Source 1113 * these may get reprogrammed later on with data from the ACPI
1058 * Override table. 1114 * Interrupt Source Override table.
1059 */ 1115 */
1060 for (isa_irq = 0; isa_irq < 16; ++isa_irq) 1116 for (isa_irq = 0; isa_irq < 16; ++isa_irq)
1061 iosapic_override_isa_irq(isa_irq, isa_irq, IOSAPIC_POL_HIGH, IOSAPIC_EDGE); 1117 iosapic_override_isa_irq(isa_irq, isa_irq,
1118 IOSAPIC_POL_HIGH,
1119 IOSAPIC_EDGE);
1062 } 1120 }
1063 return 0; 1121 return 0;
1064} 1122}
@@ -1081,7 +1139,8 @@ iosapic_remove (unsigned int gsi_base)
1081 1139
1082 if (iosapic_lists[index].rtes_inuse) { 1140 if (iosapic_lists[index].rtes_inuse) {
1083 err = -EBUSY; 1141 err = -EBUSY;
1084 printk(KERN_WARNING "%s: IOSAPIC for GSI base %u is busy\n", 1142 printk(KERN_WARNING
1143 "%s: IOSAPIC for GSI base %u is busy\n",
1085 __FUNCTION__, gsi_base); 1144 __FUNCTION__, gsi_base);
1086 goto out; 1145 goto out;
1087 } 1146 }
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 0b9e56dd7f05..783600fe52b2 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -70,6 +70,15 @@ SECTIONS
70 __stop___ex_table = .; 70 __stop___ex_table = .;
71 } 71 }
72 72
73 /* MCA table */
74 . = ALIGN(16);
75 __mca_table : AT(ADDR(__mca_table) - LOAD_OFFSET)
76 {
77 __start___mca_table = .;
78 *(__mca_table)
79 __stop___mca_table = .;
80 }
81
73 /* Global data */ 82 /* Global data */
74 _data = .; 83 _data = .;
75 84
@@ -130,15 +139,6 @@ SECTIONS
130 __initcall_end = .; 139 __initcall_end = .;
131 } 140 }
132 141
133 /* MCA table */
134 . = ALIGN(16);
135 __mca_table : AT(ADDR(__mca_table) - LOAD_OFFSET)
136 {
137 __start___mca_table = .;
138 *(__mca_table)
139 __stop___mca_table = .;
140 }
141
142 .data.patch.vtop : AT(ADDR(.data.patch.vtop) - LOAD_OFFSET) 142 .data.patch.vtop : AT(ADDR(.data.patch.vtop) - LOAD_OFFSET)
143 { 143 {
144 __start___vtop_patchlist = .; 144 __start___vtop_patchlist = .;
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 2ef1151cde90..cafa8776a53d 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -109,6 +109,7 @@ lazy_mmu_prot_update (pte_t pte)
109{ 109{
110 unsigned long addr; 110 unsigned long addr;
111 struct page *page; 111 struct page *page;
112 unsigned long order;
112 113
113 if (!pte_exec(pte)) 114 if (!pte_exec(pte))
114 return; /* not an executable page... */ 115 return; /* not an executable page... */
@@ -119,7 +120,12 @@ lazy_mmu_prot_update (pte_t pte)
119 if (test_bit(PG_arch_1, &page->flags)) 120 if (test_bit(PG_arch_1, &page->flags))
120 return; /* i-cache is already coherent with d-cache */ 121 return; /* i-cache is already coherent with d-cache */
121 122
122 flush_icache_range(addr, addr + PAGE_SIZE); 123 if (PageCompound(page)) {
124 order = (unsigned long) (page[1].lru.prev);
125 flush_icache_range(addr, addr + (1UL << order << PAGE_SHIFT));
126 }
127 else
128 flush_icache_range(addr, addr + PAGE_SIZE);
123 set_bit(PG_arch_1, &page->flags); /* mark page as clean */ 129 set_bit(PG_arch_1, &page->flags); /* mark page as clean */
124} 130}
125 131
diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c
index 62328621f99c..643ccc6960ce 100644
--- a/arch/ia64/mm/ioremap.c
+++ b/arch/ia64/mm/ioremap.c
@@ -21,12 +21,12 @@ __ioremap (unsigned long offset, unsigned long size)
21void __iomem * 21void __iomem *
22ioremap (unsigned long offset, unsigned long size) 22ioremap (unsigned long offset, unsigned long size)
23{ 23{
24 if (efi_mem_attribute_range(offset, size, EFI_MEMORY_UC))
25 return __ioremap(offset, size);
26
27 if (efi_mem_attribute_range(offset, size, EFI_MEMORY_WB)) 24 if (efi_mem_attribute_range(offset, size, EFI_MEMORY_WB))
28 return phys_to_virt(offset); 25 return phys_to_virt(offset);
29 26
27 if (efi_mem_attribute_range(offset, size, EFI_MEMORY_UC))
28 return __ioremap(offset, size);
29
30 /* 30 /*
31 * Someday this should check ACPI resources so we 31 * Someday this should check ACPI resources so we
32 * can do the right thing for hot-plugged regions. 32 * can do the right thing for hot-plugged regions.
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c
index 6a4eec9113e8..4dbbca0b5e9c 100644
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -156,17 +156,19 @@ flush_tlb_range (struct vm_area_struct *vma, unsigned long start,
156 nbits = purge.max_bits; 156 nbits = purge.max_bits;
157 start &= ~((1UL << nbits) - 1); 157 start &= ~((1UL << nbits) - 1);
158 158
159# ifdef CONFIG_SMP
160 platform_global_tlb_purge(mm, start, end, nbits);
161# else
162 preempt_disable(); 159 preempt_disable();
160#ifdef CONFIG_SMP
161 if (mm != current->active_mm || cpus_weight(mm->cpu_vm_mask) != 1) {
162 platform_global_tlb_purge(mm, start, end, nbits);
163 preempt_enable();
164 return;
165 }
166#endif
163 do { 167 do {
164 ia64_ptcl(start, (nbits<<2)); 168 ia64_ptcl(start, (nbits<<2));
165 start += (1UL << nbits); 169 start += (1UL << nbits);
166 } while (start < end); 170 } while (start < end);
167 preempt_enable(); 171 preempt_enable();
168# endif
169
170 ia64_srlz_i(); /* srlz.i implies srlz.d */ 172 ia64_srlz_i(); /* srlz.i implies srlz.d */
171} 173}
172EXPORT_SYMBOL(flush_tlb_range); 174EXPORT_SYMBOL(flush_tlb_range);
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 70db21f3df21..d917afa30b27 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -110,7 +110,11 @@ static int sn_hwperf_geoid_to_cnode(char *location)
110 if (sn_hwperf_location_to_bpos(location, &rack, &bay, &slot, &slab)) 110 if (sn_hwperf_location_to_bpos(location, &rack, &bay, &slot, &slab))
111 return -1; 111 return -1;
112 112
113 for_each_node(cnode) { 113 /*
114 * FIXME: replace with cleaner for_each_XXX macro which addresses
115 * both compute and IO nodes once ACPI3.0 is available.
116 */
117 for (cnode = 0; cnode < num_cnodes; cnode++) {
114 geoid = cnodeid_get_geoid(cnode); 118 geoid = cnodeid_get_geoid(cnode);
115 module_id = geo_module(geoid); 119 module_id = geo_module(geoid);
116 this_rack = MODULE_GET_RACK(module_id); 120 this_rack = MODULE_GET_RACK(module_id);
@@ -605,7 +609,7 @@ static int sn_hwperf_op_cpu(struct sn_hwperf_op_info *op_info)
605 op_info->a->arg &= SN_HWPERF_ARG_OBJID_MASK; 609 op_info->a->arg &= SN_HWPERF_ARG_OBJID_MASK;
606 610
607 if (cpu != SN_HWPERF_ARG_ANY_CPU) { 611 if (cpu != SN_HWPERF_ARG_ANY_CPU) {
608 if (cpu >= num_online_cpus() || !cpu_online(cpu)) { 612 if (cpu >= NR_CPUS || !cpu_online(cpu)) {
609 r = -EINVAL; 613 r = -EINVAL;
610 goto out; 614 goto out;
611 } 615 }
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 6b3c50964ca9..2fdf21989dc2 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -177,14 +177,10 @@ config ARCH_DISCONTIGMEM_DEFAULT
177 def_bool y 177 def_bool y
178 depends on ARCH_DISCONTIGMEM_ENABLE 178 depends on ARCH_DISCONTIGMEM_ENABLE
179 179
180source "kernel/Kconfig.preempt"
180source "kernel/Kconfig.hz" 181source "kernel/Kconfig.hz"
181source "mm/Kconfig" 182source "mm/Kconfig"
182 183
183config PREEMPT
184 bool
185# bool "Preemptible Kernel"
186 default n
187
188config COMPAT 184config COMPAT
189 def_bool y 185 def_bool y
190 depends on 64BIT 186 depends on 64BIT
diff --git a/arch/parisc/configs/712_defconfig b/arch/parisc/configs/712_defconfig
index 3e013f55df64..41fd0696bbe7 100644
--- a/arch/parisc/configs/712_defconfig
+++ b/arch/parisc/configs/712_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc5-pa1 3# Linux kernel version: 2.6.16-pa6
4# Fri Oct 21 23:04:34 2005 4# Sun Mar 26 19:59:51 2006
5# 5#
6CONFIG_PARISC=y 6CONFIG_PARISC=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -10,14 +10,11 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y 10CONFIG_GENERIC_CALIBRATE_DELAY=y
11CONFIG_GENERIC_HARDIRQS=y 11CONFIG_GENERIC_HARDIRQS=y
12CONFIG_GENERIC_IRQ_PROBE=y 12CONFIG_GENERIC_IRQ_PROBE=y
13CONFIG_ARCH_MAY_HAVE_PC_FDC=y
14 13
15# 14#
16# Code maturity level options 15# Code maturity level options
17# 16#
18CONFIG_EXPERIMENTAL=y 17CONFIG_EXPERIMENTAL=y
19# CONFIG_CLEAN_COMPILE is not set
20CONFIG_BROKEN=y
21CONFIG_BROKEN_ON_SMP=y 18CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32 19CONFIG_INIT_ENV_ARG_LIMIT=32
23 20
@@ -32,17 +29,18 @@ CONFIG_POSIX_MQUEUE=y
32# CONFIG_BSD_PROCESS_ACCT is not set 29# CONFIG_BSD_PROCESS_ACCT is not set
33CONFIG_SYSCTL=y 30CONFIG_SYSCTL=y
34# CONFIG_AUDIT is not set 31# CONFIG_AUDIT is not set
35CONFIG_HOTPLUG=y
36CONFIG_KOBJECT_UEVENT=y
37CONFIG_IKCONFIG=y 32CONFIG_IKCONFIG=y
38CONFIG_IKCONFIG_PROC=y 33CONFIG_IKCONFIG_PROC=y
39CONFIG_INITRAMFS_SOURCE="" 34CONFIG_INITRAMFS_SOURCE=""
35CONFIG_CC_OPTIMIZE_FOR_SIZE=y
40# CONFIG_EMBEDDED is not set 36# CONFIG_EMBEDDED is not set
41CONFIG_KALLSYMS=y 37CONFIG_KALLSYMS=y
42CONFIG_KALLSYMS_ALL=y 38CONFIG_KALLSYMS_ALL=y
43# CONFIG_KALLSYMS_EXTRA_PASS is not set 39# CONFIG_KALLSYMS_EXTRA_PASS is not set
40CONFIG_HOTPLUG=y
44CONFIG_PRINTK=y 41CONFIG_PRINTK=y
45CONFIG_BUG=y 42CONFIG_BUG=y
43CONFIG_ELF_CORE=y
46CONFIG_BASE_FULL=y 44CONFIG_BASE_FULL=y
47CONFIG_FUTEX=y 45CONFIG_FUTEX=y
48CONFIG_EPOLL=y 46CONFIG_EPOLL=y
@@ -51,8 +49,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0
51CONFIG_CC_ALIGN_LABELS=0 49CONFIG_CC_ALIGN_LABELS=0
52CONFIG_CC_ALIGN_LOOPS=0 50CONFIG_CC_ALIGN_LOOPS=0
53CONFIG_CC_ALIGN_JUMPS=0 51CONFIG_CC_ALIGN_JUMPS=0
52CONFIG_SLAB=y
54# CONFIG_TINY_SHMEM is not set 53# CONFIG_TINY_SHMEM is not set
55CONFIG_BASE_SMALL=0 54CONFIG_BASE_SMALL=0
55# CONFIG_SLOB is not set
56 56
57# 57#
58# Loadable module support 58# Loadable module support
@@ -66,6 +66,23 @@ CONFIG_OBSOLETE_MODPARM=y
66CONFIG_KMOD=y 66CONFIG_KMOD=y
67 67
68# 68#
69# Block layer
70#
71
72#
73# IO Schedulers
74#
75CONFIG_IOSCHED_NOOP=y
76CONFIG_IOSCHED_AS=y
77CONFIG_IOSCHED_DEADLINE=y
78CONFIG_IOSCHED_CFQ=y
79CONFIG_DEFAULT_AS=y
80# CONFIG_DEFAULT_DEADLINE is not set
81# CONFIG_DEFAULT_CFQ is not set
82# CONFIG_DEFAULT_NOOP is not set
83CONFIG_DEFAULT_IOSCHED="anticipatory"
84
85#
69# Processor type and features 86# Processor type and features
70# 87#
71# CONFIG_PA7000 is not set 88# CONFIG_PA7000 is not set
@@ -75,6 +92,10 @@ CONFIG_PA7100LC=y
75# CONFIG_PA8X00 is not set 92# CONFIG_PA8X00 is not set
76CONFIG_PA11=y 93CONFIG_PA11=y
77# CONFIG_SMP is not set 94# CONFIG_SMP is not set
95CONFIG_ARCH_FLATMEM_ENABLE=y
96# CONFIG_PREEMPT_NONE is not set
97CONFIG_PREEMPT_VOLUNTARY=y
98# CONFIG_PREEMPT is not set
78# CONFIG_HZ_100 is not set 99# CONFIG_HZ_100 is not set
79CONFIG_HZ_250=y 100CONFIG_HZ_250=y
80# CONFIG_HZ_1000 is not set 101# CONFIG_HZ_1000 is not set
@@ -86,7 +107,7 @@ CONFIG_FLATMEM_MANUAL=y
86CONFIG_FLATMEM=y 107CONFIG_FLATMEM=y
87CONFIG_FLAT_NODE_MEM_MAP=y 108CONFIG_FLAT_NODE_MEM_MAP=y
88# CONFIG_SPARSEMEM_STATIC is not set 109# CONFIG_SPARSEMEM_STATIC is not set
89# CONFIG_PREEMPT is not set 110CONFIG_SPLIT_PTLOCK_CPUS=4096
90# CONFIG_HPUX is not set 111# CONFIG_HPUX is not set
91 112
92# 113#
@@ -130,6 +151,7 @@ CONFIG_NET=y
130# 151#
131# Networking options 152# Networking options
132# 153#
154# CONFIG_NETDEBUG is not set
133CONFIG_PACKET=y 155CONFIG_PACKET=y
134CONFIG_PACKET_MMAP=y 156CONFIG_PACKET_MMAP=y
135CONFIG_UNIX=y 157CONFIG_UNIX=y
@@ -165,7 +187,12 @@ CONFIG_TCP_CONG_BIC=y
165# CONFIG_IPV6 is not set 187# CONFIG_IPV6 is not set
166CONFIG_NETFILTER=y 188CONFIG_NETFILTER=y
167# CONFIG_NETFILTER_DEBUG is not set 189# CONFIG_NETFILTER_DEBUG is not set
190
191#
192# Core Netfilter Configuration
193#
168# CONFIG_NETFILTER_NETLINK is not set 194# CONFIG_NETFILTER_NETLINK is not set
195# CONFIG_NETFILTER_XTABLES is not set
169 196
170# 197#
171# IP: Netfilter Configuration 198# IP: Netfilter Configuration
@@ -182,64 +209,6 @@ CONFIG_IP_NF_TFTP=m
182CONFIG_IP_NF_AMANDA=m 209CONFIG_IP_NF_AMANDA=m
183# CONFIG_IP_NF_PPTP is not set 210# CONFIG_IP_NF_PPTP is not set
184CONFIG_IP_NF_QUEUE=m 211CONFIG_IP_NF_QUEUE=m
185CONFIG_IP_NF_IPTABLES=m
186CONFIG_IP_NF_MATCH_LIMIT=m
187CONFIG_IP_NF_MATCH_IPRANGE=m
188CONFIG_IP_NF_MATCH_MAC=m
189CONFIG_IP_NF_MATCH_PKTTYPE=m
190CONFIG_IP_NF_MATCH_MARK=m
191CONFIG_IP_NF_MATCH_MULTIPORT=m
192CONFIG_IP_NF_MATCH_TOS=m
193CONFIG_IP_NF_MATCH_RECENT=m
194CONFIG_IP_NF_MATCH_ECN=m
195CONFIG_IP_NF_MATCH_DSCP=m
196CONFIG_IP_NF_MATCH_AH_ESP=m
197CONFIG_IP_NF_MATCH_LENGTH=m
198CONFIG_IP_NF_MATCH_TTL=m
199CONFIG_IP_NF_MATCH_TCPMSS=m
200CONFIG_IP_NF_MATCH_HELPER=m
201CONFIG_IP_NF_MATCH_STATE=m
202CONFIG_IP_NF_MATCH_CONNTRACK=m
203CONFIG_IP_NF_MATCH_OWNER=m
204# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
205# CONFIG_IP_NF_MATCH_REALM is not set
206CONFIG_IP_NF_MATCH_SCTP=m
207# CONFIG_IP_NF_MATCH_DCCP is not set
208CONFIG_IP_NF_MATCH_COMMENT=m
209CONFIG_IP_NF_MATCH_CONNMARK=m
210CONFIG_IP_NF_MATCH_HASHLIMIT=m
211# CONFIG_IP_NF_MATCH_STRING is not set
212CONFIG_IP_NF_FILTER=m
213CONFIG_IP_NF_TARGET_REJECT=m
214CONFIG_IP_NF_TARGET_LOG=m
215CONFIG_IP_NF_TARGET_ULOG=m
216CONFIG_IP_NF_TARGET_TCPMSS=m
217# CONFIG_IP_NF_TARGET_NFQUEUE is not set
218CONFIG_IP_NF_NAT=m
219CONFIG_IP_NF_NAT_NEEDED=y
220CONFIG_IP_NF_TARGET_MASQUERADE=m
221CONFIG_IP_NF_TARGET_REDIRECT=m
222CONFIG_IP_NF_TARGET_NETMAP=m
223CONFIG_IP_NF_TARGET_SAME=m
224CONFIG_IP_NF_NAT_SNMP_BASIC=m
225CONFIG_IP_NF_NAT_IRC=m
226CONFIG_IP_NF_NAT_FTP=m
227CONFIG_IP_NF_NAT_TFTP=m
228CONFIG_IP_NF_NAT_AMANDA=m
229CONFIG_IP_NF_MANGLE=m
230CONFIG_IP_NF_TARGET_TOS=m
231CONFIG_IP_NF_TARGET_ECN=m
232CONFIG_IP_NF_TARGET_DSCP=m
233CONFIG_IP_NF_TARGET_MARK=m
234CONFIG_IP_NF_TARGET_CLASSIFY=m
235# CONFIG_IP_NF_TARGET_TTL is not set
236CONFIG_IP_NF_TARGET_CONNMARK=m
237CONFIG_IP_NF_TARGET_CLUSTERIP=m
238CONFIG_IP_NF_RAW=m
239CONFIG_IP_NF_TARGET_NOTRACK=m
240CONFIG_IP_NF_ARPTABLES=m
241CONFIG_IP_NF_ARPFILTER=m
242CONFIG_IP_NF_ARP_MANGLE=m
243 212
244# 213#
245# DCCP Configuration (EXPERIMENTAL) 214# DCCP Configuration (EXPERIMENTAL)
@@ -250,6 +219,11 @@ CONFIG_IP_NF_ARP_MANGLE=m
250# SCTP Configuration (EXPERIMENTAL) 219# SCTP Configuration (EXPERIMENTAL)
251# 220#
252# CONFIG_IP_SCTP is not set 221# CONFIG_IP_SCTP is not set
222
223#
224# TIPC Configuration (EXPERIMENTAL)
225#
226# CONFIG_TIPC is not set
253# CONFIG_ATM is not set 227# CONFIG_ATM is not set
254# CONFIG_BRIDGE is not set 228# CONFIG_BRIDGE is not set
255# CONFIG_VLAN_8021Q is not set 229# CONFIG_VLAN_8021Q is not set
@@ -263,8 +237,11 @@ CONFIG_LLC2=m
263# CONFIG_NET_DIVERT is not set 237# CONFIG_NET_DIVERT is not set
264# CONFIG_ECONET is not set 238# CONFIG_ECONET is not set
265# CONFIG_WAN_ROUTER is not set 239# CONFIG_WAN_ROUTER is not set
240
241#
242# QoS and/or fair queueing
243#
266# CONFIG_NET_SCHED is not set 244# CONFIG_NET_SCHED is not set
267# CONFIG_NET_CLS_ROUTE is not set
268 245
269# 246#
270# Network testing 247# Network testing
@@ -304,6 +281,7 @@ CONFIG_PARPORT=y
304CONFIG_PARPORT_PC=m 281CONFIG_PARPORT_PC=m
305# CONFIG_PARPORT_PC_FIFO is not set 282# CONFIG_PARPORT_PC_FIFO is not set
306# CONFIG_PARPORT_PC_SUPERIO is not set 283# CONFIG_PARPORT_PC_SUPERIO is not set
284CONFIG_PARPORT_NOT_PC=y
307CONFIG_PARPORT_GSC=y 285CONFIG_PARPORT_GSC=y
308# CONFIG_PARPORT_1284 is not set 286# CONFIG_PARPORT_1284 is not set
309 287
@@ -314,7 +292,6 @@ CONFIG_PARPORT_GSC=y
314# 292#
315# Block devices 293# Block devices
316# 294#
317# CONFIG_BLK_DEV_FD is not set
318# CONFIG_PARIDE is not set 295# CONFIG_PARIDE is not set
319# CONFIG_BLK_DEV_COW_COMMON is not set 296# CONFIG_BLK_DEV_COW_COMMON is not set
320CONFIG_BLK_DEV_LOOP=y 297CONFIG_BLK_DEV_LOOP=y
@@ -325,14 +302,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
325CONFIG_BLK_DEV_RAM_SIZE=6144 302CONFIG_BLK_DEV_RAM_SIZE=6144
326CONFIG_BLK_DEV_INITRD=y 303CONFIG_BLK_DEV_INITRD=y
327# CONFIG_CDROM_PKTCDVD is not set 304# CONFIG_CDROM_PKTCDVD is not set
328
329#
330# IO Schedulers
331#
332CONFIG_IOSCHED_NOOP=y
333CONFIG_IOSCHED_AS=y
334CONFIG_IOSCHED_DEADLINE=y
335CONFIG_IOSCHED_CFQ=y
336CONFIG_ATA_OVER_ETH=m 305CONFIG_ATA_OVER_ETH=m
337 306
338# 307#
@@ -376,6 +345,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m
376# 345#
377# SCSI low-level drivers 346# SCSI low-level drivers
378# 347#
348# CONFIG_ISCSI_TCP is not set
379# CONFIG_SCSI_SATA is not set 349# CONFIG_SCSI_SATA is not set
380# CONFIG_SCSI_PPA is not set 350# CONFIG_SCSI_PPA is not set
381# CONFIG_SCSI_IMM is not set 351# CONFIG_SCSI_IMM is not set
@@ -407,7 +377,6 @@ CONFIG_MD_RAID1=m
407# 377#
408# IEEE 1394 (FireWire) support 378# IEEE 1394 (FireWire) support
409# 379#
410# CONFIG_IEEE1394 is not set
411 380
412# 381#
413# I2O device support 382# I2O device support
@@ -471,6 +440,7 @@ CONFIG_PPP_ASYNC=m
471CONFIG_PPP_SYNC_TTY=m 440CONFIG_PPP_SYNC_TTY=m
472CONFIG_PPP_DEFLATE=m 441CONFIG_PPP_DEFLATE=m
473CONFIG_PPP_BSDCOMP=m 442CONFIG_PPP_BSDCOMP=m
443CONFIG_PPP_MPPE=m
474CONFIG_PPPOE=m 444CONFIG_PPPOE=m
475# CONFIG_SLIP is not set 445# CONFIG_SLIP is not set
476# CONFIG_SHAPER is not set 446# CONFIG_SHAPER is not set
@@ -516,8 +486,8 @@ CONFIG_KEYBOARD_ATKBD_HP_KEYCODES=y
516# CONFIG_KEYBOARD_LKKBD is not set 486# CONFIG_KEYBOARD_LKKBD is not set
517# CONFIG_KEYBOARD_XTKBD is not set 487# CONFIG_KEYBOARD_XTKBD is not set
518# CONFIG_KEYBOARD_NEWTON is not set 488# CONFIG_KEYBOARD_NEWTON is not set
519CONFIG_KEYBOARD_HIL_OLD=y 489# CONFIG_KEYBOARD_HIL_OLD is not set
520# CONFIG_KEYBOARD_HIL is not set 490CONFIG_KEYBOARD_HIL=y
521CONFIG_INPUT_MOUSE=y 491CONFIG_INPUT_MOUSE=y
522CONFIG_MOUSE_PS2=y 492CONFIG_MOUSE_PS2=y
523CONFIG_MOUSE_SERIAL=m 493CONFIG_MOUSE_SERIAL=m
@@ -554,6 +524,7 @@ CONFIG_HW_CONSOLE=y
554CONFIG_SERIAL_8250=y 524CONFIG_SERIAL_8250=y
555CONFIG_SERIAL_8250_CONSOLE=y 525CONFIG_SERIAL_8250_CONSOLE=y
556CONFIG_SERIAL_8250_NR_UARTS=17 526CONFIG_SERIAL_8250_NR_UARTS=17
527CONFIG_SERIAL_8250_RUNTIME_UARTS=4
557CONFIG_SERIAL_8250_EXTENDED=y 528CONFIG_SERIAL_8250_EXTENDED=y
558CONFIG_SERIAL_8250_MANY_PORTS=y 529CONFIG_SERIAL_8250_MANY_PORTS=y
559CONFIG_SERIAL_8250_SHARE_IRQ=y 530CONFIG_SERIAL_8250_SHARE_IRQ=y
@@ -598,6 +569,8 @@ CONFIG_MAX_RAW_DEVS=256
598# 569#
599# TPM devices 570# TPM devices
600# 571#
572# CONFIG_TCG_TPM is not set
573# CONFIG_TELCLOCK is not set
601 574
602# 575#
603# I2C support 576# I2C support
@@ -605,6 +578,12 @@ CONFIG_MAX_RAW_DEVS=256
605# CONFIG_I2C is not set 578# CONFIG_I2C is not set
606 579
607# 580#
581# SPI support
582#
583# CONFIG_SPI is not set
584# CONFIG_SPI_MASTER is not set
585
586#
608# Dallas's 1-wire bus 587# Dallas's 1-wire bus
609# 588#
610# CONFIG_W1 is not set 589# CONFIG_W1 is not set
@@ -640,7 +619,6 @@ CONFIG_FB=y
640CONFIG_FB_CFB_FILLRECT=y 619CONFIG_FB_CFB_FILLRECT=y
641CONFIG_FB_CFB_COPYAREA=y 620CONFIG_FB_CFB_COPYAREA=y
642CONFIG_FB_CFB_IMAGEBLIT=y 621CONFIG_FB_CFB_IMAGEBLIT=y
643CONFIG_FB_SOFT_CURSOR=y
644# CONFIG_FB_MACMODES is not set 622# CONFIG_FB_MACMODES is not set
645CONFIG_FB_MODE_HELPERS=y 623CONFIG_FB_MODE_HELPERS=y
646CONFIG_FB_TILEBLITTING=y 624CONFIG_FB_TILEBLITTING=y
@@ -655,6 +633,7 @@ CONFIG_DUMMY_CONSOLE=y
655CONFIG_DUMMY_CONSOLE_COLUMNS=128 633CONFIG_DUMMY_CONSOLE_COLUMNS=128
656CONFIG_DUMMY_CONSOLE_ROWS=48 634CONFIG_DUMMY_CONSOLE_ROWS=48
657CONFIG_FRAMEBUFFER_CONSOLE=y 635CONFIG_FRAMEBUFFER_CONSOLE=y
636# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
658CONFIG_STI_CONSOLE=y 637CONFIG_STI_CONSOLE=y
659CONFIG_FONTS=y 638CONFIG_FONTS=y
660CONFIG_FONT_8x8=y 639CONFIG_FONT_8x8=y
@@ -695,6 +674,8 @@ CONFIG_SND_OSSEMUL=y
695CONFIG_SND_MIXER_OSS=y 674CONFIG_SND_MIXER_OSS=y
696CONFIG_SND_PCM_OSS=y 675CONFIG_SND_PCM_OSS=y
697CONFIG_SND_SEQUENCER_OSS=y 676CONFIG_SND_SEQUENCER_OSS=y
677# CONFIG_SND_DYNAMIC_MINORS is not set
678CONFIG_SND_SUPPORT_OLD_API=y
698# CONFIG_SND_VERBOSE_PRINTK is not set 679# CONFIG_SND_VERBOSE_PRINTK is not set
699# CONFIG_SND_DEBUG is not set 680# CONFIG_SND_DEBUG is not set
700 681
@@ -724,6 +705,10 @@ CONFIG_SND_HARMONY=y
724# CONFIG_USB_ARCH_HAS_OHCI is not set 705# CONFIG_USB_ARCH_HAS_OHCI is not set
725 706
726# 707#
708# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
709#
710
711#
727# USB Gadget Support 712# USB Gadget Support
728# 713#
729# CONFIG_USB_GADGET is not set 714# CONFIG_USB_GADGET is not set
@@ -736,10 +721,9 @@ CONFIG_SND_HARMONY=y
736# 721#
737# InfiniBand support 722# InfiniBand support
738# 723#
739# CONFIG_INFINIBAND is not set
740 724
741# 725#
742# SN Devices 726# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
743# 727#
744 728
745# 729#
@@ -765,6 +749,7 @@ CONFIG_XFS_EXPORT=y
765# CONFIG_XFS_SECURITY is not set 749# CONFIG_XFS_SECURITY is not set
766# CONFIG_XFS_POSIX_ACL is not set 750# CONFIG_XFS_POSIX_ACL is not set
767# CONFIG_XFS_RT is not set 751# CONFIG_XFS_RT is not set
752# CONFIG_OCFS2_FS is not set
768# CONFIG_MINIX_FS is not set 753# CONFIG_MINIX_FS is not set
769# CONFIG_ROMFS_FS is not set 754# CONFIG_ROMFS_FS is not set
770CONFIG_INOTIFY=y 755CONFIG_INOTIFY=y
@@ -800,10 +785,10 @@ CONFIG_PROC_FS=y
800CONFIG_PROC_KCORE=y 785CONFIG_PROC_KCORE=y
801CONFIG_SYSFS=y 786CONFIG_SYSFS=y
802CONFIG_TMPFS=y 787CONFIG_TMPFS=y
803# CONFIG_HUGETLBFS is not set
804# CONFIG_HUGETLB_PAGE is not set 788# CONFIG_HUGETLB_PAGE is not set
805CONFIG_RAMFS=y 789CONFIG_RAMFS=y
806# CONFIG_RELAYFS_FS is not set 790# CONFIG_RELAYFS_FS is not set
791# CONFIG_CONFIGFS_FS is not set
807 792
808# 793#
809# Miscellaneous filesystems 794# Miscellaneous filesystems
@@ -821,7 +806,6 @@ CONFIG_RAMFS=y
821# CONFIG_QNX4FS_FS is not set 806# CONFIG_QNX4FS_FS is not set
822# CONFIG_SYSV_FS is not set 807# CONFIG_SYSV_FS is not set
823CONFIG_UFS_FS=m 808CONFIG_UFS_FS=m
824# CONFIG_UFS_FS_WRITE is not set
825 809
826# 810#
827# Network File Systems 811# Network File Systems
@@ -917,18 +901,22 @@ CONFIG_OPROFILE=m
917# Kernel hacking 901# Kernel hacking
918# 902#
919# CONFIG_PRINTK_TIME is not set 903# CONFIG_PRINTK_TIME is not set
920CONFIG_DEBUG_KERNEL=y
921CONFIG_MAGIC_SYSRQ=y 904CONFIG_MAGIC_SYSRQ=y
905CONFIG_DEBUG_KERNEL=y
922CONFIG_LOG_BUF_SHIFT=16 906CONFIG_LOG_BUF_SHIFT=16
923CONFIG_DETECT_SOFTLOCKUP=y 907CONFIG_DETECT_SOFTLOCKUP=y
924# CONFIG_SCHEDSTATS is not set 908# CONFIG_SCHEDSTATS is not set
925# CONFIG_DEBUG_SLAB is not set 909# CONFIG_DEBUG_SLAB is not set
910CONFIG_DEBUG_MUTEXES=y
926# CONFIG_DEBUG_SPINLOCK is not set 911# CONFIG_DEBUG_SPINLOCK is not set
927# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 912# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
928# CONFIG_DEBUG_KOBJECT is not set 913# CONFIG_DEBUG_KOBJECT is not set
929# CONFIG_DEBUG_INFO is not set 914# CONFIG_DEBUG_INFO is not set
930# CONFIG_DEBUG_IOREMAP is not set
931# CONFIG_DEBUG_FS is not set 915# CONFIG_DEBUG_FS is not set
916# CONFIG_DEBUG_VM is not set
917CONFIG_FORCED_INLINING=y
918# CONFIG_RCU_TORTURE_TEST is not set
919CONFIG_DEBUG_RODATA=y
932 920
933# 921#
934# Security options 922# Security options
diff --git a/arch/parisc/configs/a500_defconfig b/arch/parisc/configs/a500_defconfig
index 959ad3c4e372..f3b812f04592 100644
--- a/arch/parisc/configs/a500_defconfig
+++ b/arch/parisc/configs/a500_defconfig
@@ -1031,8 +1031,8 @@ CONFIG_NLS_CODEPAGE_850=m
1031# CONFIG_NLS_ISO8859_8 is not set 1031# CONFIG_NLS_ISO8859_8 is not set
1032# CONFIG_NLS_CODEPAGE_1250 is not set 1032# CONFIG_NLS_CODEPAGE_1250 is not set
1033# CONFIG_NLS_CODEPAGE_1251 is not set 1033# CONFIG_NLS_CODEPAGE_1251 is not set
1034# CONFIG_NLS_ASCII is not set 1034CONFIG_NLS_ASCII=m
1035# CONFIG_NLS_ISO8859_1 is not set 1035CONFIG_NLS_ISO8859_1=m
1036# CONFIG_NLS_ISO8859_2 is not set 1036# CONFIG_NLS_ISO8859_2 is not set
1037# CONFIG_NLS_ISO8859_3 is not set 1037# CONFIG_NLS_ISO8859_3 is not set
1038# CONFIG_NLS_ISO8859_4 is not set 1038# CONFIG_NLS_ISO8859_4 is not set
diff --git a/arch/parisc/configs/b180_defconfig b/arch/parisc/configs/b180_defconfig
index 37e98241ce4b..35093612ad2c 100644
--- a/arch/parisc/configs/b180_defconfig
+++ b/arch/parisc/configs/b180_defconfig
@@ -939,10 +939,10 @@ CONFIG_MSDOS_PARTITION=y
939# 939#
940CONFIG_NLS=y 940CONFIG_NLS=y
941CONFIG_NLS_DEFAULT="iso8859-1" 941CONFIG_NLS_DEFAULT="iso8859-1"
942# CONFIG_NLS_CODEPAGE_437 is not set 942CONFIG_NLS_CODEPAGE_437=m
943# CONFIG_NLS_CODEPAGE_737 is not set 943# CONFIG_NLS_CODEPAGE_737 is not set
944# CONFIG_NLS_CODEPAGE_775 is not set 944# CONFIG_NLS_CODEPAGE_775 is not set
945# CONFIG_NLS_CODEPAGE_850 is not set 945CONFIG_NLS_CODEPAGE_850=m
946# CONFIG_NLS_CODEPAGE_852 is not set 946# CONFIG_NLS_CODEPAGE_852 is not set
947# CONFIG_NLS_CODEPAGE_855 is not set 947# CONFIG_NLS_CODEPAGE_855 is not set
948# CONFIG_NLS_CODEPAGE_857 is not set 948# CONFIG_NLS_CODEPAGE_857 is not set
@@ -962,8 +962,8 @@ CONFIG_NLS_DEFAULT="iso8859-1"
962# CONFIG_NLS_ISO8859_8 is not set 962# CONFIG_NLS_ISO8859_8 is not set
963# CONFIG_NLS_CODEPAGE_1250 is not set 963# CONFIG_NLS_CODEPAGE_1250 is not set
964# CONFIG_NLS_CODEPAGE_1251 is not set 964# CONFIG_NLS_CODEPAGE_1251 is not set
965# CONFIG_NLS_ASCII is not set 965CONFIG_NLS_ASCII=m
966# CONFIG_NLS_ISO8859_1 is not set 966CONFIG_NLS_ISO8859_1=m
967# CONFIG_NLS_ISO8859_2 is not set 967# CONFIG_NLS_ISO8859_2 is not set
968# CONFIG_NLS_ISO8859_3 is not set 968# CONFIG_NLS_ISO8859_3 is not set
969# CONFIG_NLS_ISO8859_4 is not set 969# CONFIG_NLS_ISO8859_4 is not set
@@ -973,10 +973,10 @@ CONFIG_NLS_DEFAULT="iso8859-1"
973# CONFIG_NLS_ISO8859_9 is not set 973# CONFIG_NLS_ISO8859_9 is not set
974# CONFIG_NLS_ISO8859_13 is not set 974# CONFIG_NLS_ISO8859_13 is not set
975# CONFIG_NLS_ISO8859_14 is not set 975# CONFIG_NLS_ISO8859_14 is not set
976# CONFIG_NLS_ISO8859_15 is not set 976CONFIG_NLS_ISO8859_15=m
977# CONFIG_NLS_KOI8_R is not set 977# CONFIG_NLS_KOI8_R is not set
978# CONFIG_NLS_KOI8_U is not set 978# CONFIG_NLS_KOI8_U is not set
979# CONFIG_NLS_UTF8 is not set 979CONFIG_NLS_UTF8=m
980 980
981# 981#
982# Kernel hacking 982# Kernel hacking
diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig
index 0b1c8c1fa8a3..782906b644dd 100644
--- a/arch/parisc/configs/c3000_defconfig
+++ b/arch/parisc/configs/c3000_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc5-pa1 3# Linux kernel version: 2.6.16-pa6
4# Fri Oct 21 23:06:31 2005 4# Sun Mar 26 20:03:29 2006
5# 5#
6CONFIG_PARISC=y 6CONFIG_PARISC=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -10,14 +10,11 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y 10CONFIG_GENERIC_CALIBRATE_DELAY=y
11CONFIG_GENERIC_HARDIRQS=y 11CONFIG_GENERIC_HARDIRQS=y
12CONFIG_GENERIC_IRQ_PROBE=y 12CONFIG_GENERIC_IRQ_PROBE=y
13CONFIG_ARCH_MAY_HAVE_PC_FDC=y
14 13
15# 14#
16# Code maturity level options 15# Code maturity level options
17# 16#
18CONFIG_EXPERIMENTAL=y 17CONFIG_EXPERIMENTAL=y
19# CONFIG_CLEAN_COMPILE is not set
20CONFIG_BROKEN=y
21CONFIG_BROKEN_ON_SMP=y 18CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32 19CONFIG_INIT_ENV_ARG_LIMIT=32
23 20
@@ -32,28 +29,30 @@ CONFIG_SYSVIPC=y
32# CONFIG_BSD_PROCESS_ACCT is not set 29# CONFIG_BSD_PROCESS_ACCT is not set
33CONFIG_SYSCTL=y 30CONFIG_SYSCTL=y
34# CONFIG_AUDIT is not set 31# CONFIG_AUDIT is not set
35CONFIG_HOTPLUG=y
36CONFIG_KOBJECT_UEVENT=y
37CONFIG_IKCONFIG=y 32CONFIG_IKCONFIG=y
38CONFIG_IKCONFIG_PROC=y 33CONFIG_IKCONFIG_PROC=y
39CONFIG_INITRAMFS_SOURCE="" 34CONFIG_INITRAMFS_SOURCE=""
35# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_EMBEDDED=y 36CONFIG_EMBEDDED=y
41CONFIG_KALLSYMS=y 37CONFIG_KALLSYMS=y
42CONFIG_KALLSYMS_ALL=y 38CONFIG_KALLSYMS_ALL=y
43# CONFIG_KALLSYMS_EXTRA_PASS is not set 39# CONFIG_KALLSYMS_EXTRA_PASS is not set
40CONFIG_HOTPLUG=y
44CONFIG_PRINTK=y 41CONFIG_PRINTK=y
45CONFIG_BUG=y 42CONFIG_BUG=y
43CONFIG_ELF_CORE=y
46CONFIG_BASE_FULL=y 44CONFIG_BASE_FULL=y
47CONFIG_FUTEX=y 45CONFIG_FUTEX=y
48CONFIG_EPOLL=y 46CONFIG_EPOLL=y
49# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
50CONFIG_SHMEM=y 47CONFIG_SHMEM=y
51CONFIG_CC_ALIGN_FUNCTIONS=0 48CONFIG_CC_ALIGN_FUNCTIONS=0
52CONFIG_CC_ALIGN_LABELS=0 49CONFIG_CC_ALIGN_LABELS=0
53CONFIG_CC_ALIGN_LOOPS=0 50CONFIG_CC_ALIGN_LOOPS=0
54CONFIG_CC_ALIGN_JUMPS=0 51CONFIG_CC_ALIGN_JUMPS=0
52CONFIG_SLAB=y
55# CONFIG_TINY_SHMEM is not set 53# CONFIG_TINY_SHMEM is not set
56CONFIG_BASE_SMALL=0 54CONFIG_BASE_SMALL=0
55# CONFIG_SLOB is not set
57 56
58# 57#
59# Loadable module support 58# Loadable module support
@@ -67,6 +66,23 @@ CONFIG_OBSOLETE_MODPARM=y
67CONFIG_KMOD=y 66CONFIG_KMOD=y
68 67
69# 68#
69# Block layer
70#
71
72#
73# IO Schedulers
74#
75CONFIG_IOSCHED_NOOP=y
76CONFIG_IOSCHED_AS=y
77CONFIG_IOSCHED_DEADLINE=y
78CONFIG_IOSCHED_CFQ=y
79CONFIG_DEFAULT_AS=y
80# CONFIG_DEFAULT_DEADLINE is not set
81# CONFIG_DEFAULT_CFQ is not set
82# CONFIG_DEFAULT_NOOP is not set
83CONFIG_DEFAULT_IOSCHED="anticipatory"
84
85#
70# Processor type and features 86# Processor type and features
71# 87#
72# CONFIG_PA7000 is not set 88# CONFIG_PA7000 is not set
@@ -78,6 +94,10 @@ CONFIG_PA20=y
78CONFIG_PREFETCH=y 94CONFIG_PREFETCH=y
79# CONFIG_64BIT is not set 95# CONFIG_64BIT is not set
80# CONFIG_SMP is not set 96# CONFIG_SMP is not set
97CONFIG_ARCH_FLATMEM_ENABLE=y
98# CONFIG_PREEMPT_NONE is not set
99CONFIG_PREEMPT_VOLUNTARY=y
100# CONFIG_PREEMPT is not set
81# CONFIG_HZ_100 is not set 101# CONFIG_HZ_100 is not set
82CONFIG_HZ_250=y 102CONFIG_HZ_250=y
83# CONFIG_HZ_1000 is not set 103# CONFIG_HZ_1000 is not set
@@ -89,7 +109,7 @@ CONFIG_FLATMEM_MANUAL=y
89CONFIG_FLATMEM=y 109CONFIG_FLATMEM=y
90CONFIG_FLAT_NODE_MEM_MAP=y 110CONFIG_FLAT_NODE_MEM_MAP=y
91# CONFIG_SPARSEMEM_STATIC is not set 111# CONFIG_SPARSEMEM_STATIC is not set
92# CONFIG_PREEMPT is not set 112CONFIG_SPLIT_PTLOCK_CPUS=4
93# CONFIG_HPUX is not set 113# CONFIG_HPUX is not set
94 114
95# 115#
@@ -135,6 +155,7 @@ CONFIG_NET=y
135# 155#
136# Networking options 156# Networking options
137# 157#
158# CONFIG_NETDEBUG is not set
138CONFIG_PACKET=y 159CONFIG_PACKET=y
139CONFIG_PACKET_MMAP=y 160CONFIG_PACKET_MMAP=y
140CONFIG_UNIX=y 161CONFIG_UNIX=y
@@ -175,7 +196,12 @@ CONFIG_INET6_TUNNEL=m
175CONFIG_IPV6_TUNNEL=m 196CONFIG_IPV6_TUNNEL=m
176CONFIG_NETFILTER=y 197CONFIG_NETFILTER=y
177CONFIG_NETFILTER_DEBUG=y 198CONFIG_NETFILTER_DEBUG=y
199
200#
201# Core Netfilter Configuration
202#
178# CONFIG_NETFILTER_NETLINK is not set 203# CONFIG_NETFILTER_NETLINK is not set
204# CONFIG_NETFILTER_XTABLES is not set
179 205
180# 206#
181# IP: Netfilter Configuration 207# IP: Netfilter Configuration
@@ -192,87 +218,11 @@ CONFIG_IP_NF_TFTP=m
192CONFIG_IP_NF_AMANDA=m 218CONFIG_IP_NF_AMANDA=m
193# CONFIG_IP_NF_PPTP is not set 219# CONFIG_IP_NF_PPTP is not set
194CONFIG_IP_NF_QUEUE=m 220CONFIG_IP_NF_QUEUE=m
195CONFIG_IP_NF_IPTABLES=m
196CONFIG_IP_NF_MATCH_LIMIT=m
197CONFIG_IP_NF_MATCH_IPRANGE=m
198CONFIG_IP_NF_MATCH_MAC=m
199CONFIG_IP_NF_MATCH_PKTTYPE=m
200CONFIG_IP_NF_MATCH_MARK=m
201CONFIG_IP_NF_MATCH_MULTIPORT=m
202CONFIG_IP_NF_MATCH_TOS=m
203CONFIG_IP_NF_MATCH_RECENT=m
204CONFIG_IP_NF_MATCH_ECN=m
205CONFIG_IP_NF_MATCH_DSCP=m
206CONFIG_IP_NF_MATCH_AH_ESP=m
207CONFIG_IP_NF_MATCH_LENGTH=m
208CONFIG_IP_NF_MATCH_TTL=m
209CONFIG_IP_NF_MATCH_TCPMSS=m
210CONFIG_IP_NF_MATCH_HELPER=m
211CONFIG_IP_NF_MATCH_STATE=m
212CONFIG_IP_NF_MATCH_CONNTRACK=m
213CONFIG_IP_NF_MATCH_OWNER=m
214# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
215# CONFIG_IP_NF_MATCH_REALM is not set
216# CONFIG_IP_NF_MATCH_SCTP is not set
217# CONFIG_IP_NF_MATCH_DCCP is not set
218# CONFIG_IP_NF_MATCH_COMMENT is not set
219# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
220# CONFIG_IP_NF_MATCH_STRING is not set
221CONFIG_IP_NF_FILTER=m
222CONFIG_IP_NF_TARGET_REJECT=m
223CONFIG_IP_NF_TARGET_LOG=m
224CONFIG_IP_NF_TARGET_ULOG=m
225CONFIG_IP_NF_TARGET_TCPMSS=m
226# CONFIG_IP_NF_TARGET_NFQUEUE is not set
227CONFIG_IP_NF_NAT=m
228CONFIG_IP_NF_NAT_NEEDED=y
229CONFIG_IP_NF_TARGET_MASQUERADE=m
230CONFIG_IP_NF_TARGET_REDIRECT=m
231CONFIG_IP_NF_TARGET_NETMAP=m
232CONFIG_IP_NF_TARGET_SAME=m
233CONFIG_IP_NF_NAT_SNMP_BASIC=m
234CONFIG_IP_NF_NAT_IRC=m
235CONFIG_IP_NF_NAT_FTP=m
236CONFIG_IP_NF_NAT_TFTP=m
237CONFIG_IP_NF_NAT_AMANDA=m
238CONFIG_IP_NF_MANGLE=m
239CONFIG_IP_NF_TARGET_TOS=m
240CONFIG_IP_NF_TARGET_ECN=m
241CONFIG_IP_NF_TARGET_DSCP=m
242CONFIG_IP_NF_TARGET_MARK=m
243CONFIG_IP_NF_TARGET_CLASSIFY=m
244# CONFIG_IP_NF_TARGET_TTL is not set
245# CONFIG_IP_NF_RAW is not set
246CONFIG_IP_NF_ARPTABLES=m
247CONFIG_IP_NF_ARPFILTER=m
248CONFIG_IP_NF_ARP_MANGLE=m
249 221
250# 222#
251# IPv6: Netfilter Configuration (EXPERIMENTAL) 223# IPv6: Netfilter Configuration (EXPERIMENTAL)
252# 224#
253# CONFIG_IP6_NF_QUEUE is not set 225# CONFIG_IP6_NF_QUEUE is not set
254CONFIG_IP6_NF_IPTABLES=m
255# CONFIG_IP6_NF_MATCH_LIMIT is not set
256CONFIG_IP6_NF_MATCH_MAC=m
257CONFIG_IP6_NF_MATCH_RT=m
258# CONFIG_IP6_NF_MATCH_OPTS is not set
259# CONFIG_IP6_NF_MATCH_FRAG is not set
260# CONFIG_IP6_NF_MATCH_HL is not set
261# CONFIG_IP6_NF_MATCH_MULTIPORT is not set
262CONFIG_IP6_NF_MATCH_OWNER=m
263# CONFIG_IP6_NF_MATCH_MARK is not set
264CONFIG_IP6_NF_MATCH_IPV6HEADER=m
265# CONFIG_IP6_NF_MATCH_AHESP is not set
266CONFIG_IP6_NF_MATCH_LENGTH=m
267# CONFIG_IP6_NF_MATCH_EUI64 is not set
268CONFIG_IP6_NF_FILTER=m
269CONFIG_IP6_NF_TARGET_LOG=m
270CONFIG_IP6_NF_TARGET_REJECT=m
271# CONFIG_IP6_NF_TARGET_NFQUEUE is not set
272CONFIG_IP6_NF_MANGLE=m
273# CONFIG_IP6_NF_TARGET_MARK is not set
274# CONFIG_IP6_NF_TARGET_HL is not set
275# CONFIG_IP6_NF_RAW is not set
276 226
277# 227#
278# DCCP Configuration (EXPERIMENTAL) 228# DCCP Configuration (EXPERIMENTAL)
@@ -283,6 +233,11 @@ CONFIG_IP6_NF_MANGLE=m
283# SCTP Configuration (EXPERIMENTAL) 233# SCTP Configuration (EXPERIMENTAL)
284# 234#
285# CONFIG_IP_SCTP is not set 235# CONFIG_IP_SCTP is not set
236
237#
238# TIPC Configuration (EXPERIMENTAL)
239#
240# CONFIG_TIPC is not set
286# CONFIG_ATM is not set 241# CONFIG_ATM is not set
287# CONFIG_BRIDGE is not set 242# CONFIG_BRIDGE is not set
288# CONFIG_VLAN_8021Q is not set 243# CONFIG_VLAN_8021Q is not set
@@ -295,8 +250,11 @@ CONFIG_IP6_NF_MANGLE=m
295# CONFIG_NET_DIVERT is not set 250# CONFIG_NET_DIVERT is not set
296# CONFIG_ECONET is not set 251# CONFIG_ECONET is not set
297# CONFIG_WAN_ROUTER is not set 252# CONFIG_WAN_ROUTER is not set
253
254#
255# QoS and/or fair queueing
256#
298# CONFIG_NET_SCHED is not set 257# CONFIG_NET_SCHED is not set
299# CONFIG_NET_CLS_ROUTE is not set
300 258
301# 259#
302# Network testing 260# Network testing
@@ -341,7 +299,6 @@ CONFIG_FW_LOADER=y
341# 299#
342# Block devices 300# Block devices
343# 301#
344# CONFIG_BLK_DEV_FD is not set
345# CONFIG_BLK_CPQ_DA is not set 302# CONFIG_BLK_CPQ_DA is not set
346# CONFIG_BLK_CPQ_CISS_DA is not set 303# CONFIG_BLK_CPQ_CISS_DA is not set
347# CONFIG_BLK_DEV_DAC960 is not set 304# CONFIG_BLK_DEV_DAC960 is not set
@@ -355,14 +312,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
355# CONFIG_BLK_DEV_RAM is not set 312# CONFIG_BLK_DEV_RAM is not set
356CONFIG_BLK_DEV_RAM_COUNT=16 313CONFIG_BLK_DEV_RAM_COUNT=16
357# CONFIG_CDROM_PKTCDVD is not set 314# CONFIG_CDROM_PKTCDVD is not set
358
359#
360# IO Schedulers
361#
362CONFIG_IOSCHED_NOOP=y
363CONFIG_IOSCHED_AS=y
364CONFIG_IOSCHED_DEADLINE=y
365CONFIG_IOSCHED_CFQ=y
366# CONFIG_ATA_OVER_ETH is not set 315# CONFIG_ATA_OVER_ETH is not set
367 316
368# 317#
@@ -458,6 +407,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m
458# 407#
459# SCSI low-level drivers 408# SCSI low-level drivers
460# 409#
410# CONFIG_ISCSI_TCP is not set
461# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 411# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
462# CONFIG_SCSI_3W_9XXX is not set 412# CONFIG_SCSI_3W_9XXX is not set
463# CONFIG_SCSI_ACARD is not set 413# CONFIG_SCSI_ACARD is not set
@@ -466,7 +416,6 @@ CONFIG_SCSI_ISCSI_ATTRS=m
466# CONFIG_SCSI_AIC7XXX_OLD is not set 416# CONFIG_SCSI_AIC7XXX_OLD is not set
467# CONFIG_SCSI_AIC79XX is not set 417# CONFIG_SCSI_AIC79XX is not set
468# CONFIG_SCSI_DPT_I2O is not set 418# CONFIG_SCSI_DPT_I2O is not set
469# CONFIG_SCSI_ADVANSYS is not set
470# CONFIG_MEGARAID_NEWGEN is not set 419# CONFIG_MEGARAID_NEWGEN is not set
471# CONFIG_MEGARAID_LEGACY is not set 420# CONFIG_MEGARAID_LEGACY is not set
472# CONFIG_MEGARAID_SAS is not set 421# CONFIG_MEGARAID_SAS is not set
@@ -476,18 +425,18 @@ CONFIG_SCSI_SATA=y
476CONFIG_SCSI_ATA_PIIX=m 425CONFIG_SCSI_ATA_PIIX=m
477# CONFIG_SCSI_SATA_MV is not set 426# CONFIG_SCSI_SATA_MV is not set
478# CONFIG_SCSI_SATA_NV is not set 427# CONFIG_SCSI_SATA_NV is not set
479CONFIG_SCSI_SATA_PROMISE=m 428# CONFIG_SCSI_PDC_ADMA is not set
480# CONFIG_SCSI_SATA_QSTOR is not set 429# CONFIG_SCSI_SATA_QSTOR is not set
430CONFIG_SCSI_SATA_PROMISE=m
481# CONFIG_SCSI_SATA_SX4 is not set 431# CONFIG_SCSI_SATA_SX4 is not set
482CONFIG_SCSI_SATA_SIL=m 432CONFIG_SCSI_SATA_SIL=m
433# CONFIG_SCSI_SATA_SIL24 is not set
483# CONFIG_SCSI_SATA_SIS is not set 434# CONFIG_SCSI_SATA_SIS is not set
484# CONFIG_SCSI_SATA_ULI is not set 435# CONFIG_SCSI_SATA_ULI is not set
485CONFIG_SCSI_SATA_VIA=m 436CONFIG_SCSI_SATA_VIA=m
486# CONFIG_SCSI_SATA_VITESSE is not set 437# CONFIG_SCSI_SATA_VITESSE is not set
487CONFIG_SCSI_SATA_INTEL_COMBINED=y 438CONFIG_SCSI_SATA_INTEL_COMBINED=y
488# CONFIG_SCSI_CPQFCTS is not set
489# CONFIG_SCSI_DMX3191D is not set 439# CONFIG_SCSI_DMX3191D is not set
490# CONFIG_SCSI_EATA_PIO is not set
491# CONFIG_SCSI_FUTURE_DOMAIN is not set 440# CONFIG_SCSI_FUTURE_DOMAIN is not set
492# CONFIG_SCSI_IPS is not set 441# CONFIG_SCSI_IPS is not set
493# CONFIG_SCSI_INITIO is not set 442# CONFIG_SCSI_INITIO is not set
@@ -496,18 +445,11 @@ CONFIG_SCSI_SYM53C8XX_2=y
496CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 445CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
497CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 446CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
498CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 447CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
499# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 448CONFIG_SCSI_SYM53C8XX_MMIO=y
500# CONFIG_SCSI_IPR is not set 449# CONFIG_SCSI_IPR is not set
501# CONFIG_SCSI_QLOGIC_ISP is not set
502# CONFIG_SCSI_QLOGIC_FC is not set 450# CONFIG_SCSI_QLOGIC_FC is not set
503# CONFIG_SCSI_QLOGIC_1280 is not set 451# CONFIG_SCSI_QLOGIC_1280 is not set
504CONFIG_SCSI_QLA2XXX=y 452# CONFIG_SCSI_QLA_FC is not set
505# CONFIG_SCSI_QLA21XX is not set
506# CONFIG_SCSI_QLA22XX is not set
507# CONFIG_SCSI_QLA2300 is not set
508# CONFIG_SCSI_QLA2322 is not set
509# CONFIG_SCSI_QLA6312 is not set
510# CONFIG_SCSI_QLA24XX is not set
511# CONFIG_SCSI_LPFC is not set 453# CONFIG_SCSI_LPFC is not set
512# CONFIG_SCSI_DC395x is not set 454# CONFIG_SCSI_DC395x is not set
513# CONFIG_SCSI_DC390T is not set 455# CONFIG_SCSI_DC390T is not set
@@ -633,6 +575,7 @@ CONFIG_E1000=m
633# CONFIG_R8169 is not set 575# CONFIG_R8169 is not set
634# CONFIG_SIS190 is not set 576# CONFIG_SIS190 is not set
635# CONFIG_SKGE is not set 577# CONFIG_SKGE is not set
578# CONFIG_SKY2 is not set
636# CONFIG_SK98LIN is not set 579# CONFIG_SK98LIN is not set
637# CONFIG_VIA_VELOCITY is not set 580# CONFIG_VIA_VELOCITY is not set
638CONFIG_TIGON3=m 581CONFIG_TIGON3=m
@@ -668,6 +611,7 @@ CONFIG_PPP_ASYNC=m
668CONFIG_PPP_SYNC_TTY=m 611CONFIG_PPP_SYNC_TTY=m
669CONFIG_PPP_DEFLATE=m 612CONFIG_PPP_DEFLATE=m
670CONFIG_PPP_BSDCOMP=m 613CONFIG_PPP_BSDCOMP=m
614# CONFIG_PPP_MPPE is not set
671CONFIG_PPPOE=m 615CONFIG_PPPOE=m
672# CONFIG_SLIP is not set 616# CONFIG_SLIP is not set
673# CONFIG_NET_FC is not set 617# CONFIG_NET_FC is not set
@@ -744,6 +688,7 @@ CONFIG_HW_CONSOLE=y
744CONFIG_SERIAL_8250=y 688CONFIG_SERIAL_8250=y
745CONFIG_SERIAL_8250_CONSOLE=y 689CONFIG_SERIAL_8250_CONSOLE=y
746CONFIG_SERIAL_8250_NR_UARTS=13 690CONFIG_SERIAL_8250_NR_UARTS=13
691CONFIG_SERIAL_8250_RUNTIME_UARTS=4
747CONFIG_SERIAL_8250_EXTENDED=y 692CONFIG_SERIAL_8250_EXTENDED=y
748CONFIG_SERIAL_8250_MANY_PORTS=y 693CONFIG_SERIAL_8250_MANY_PORTS=y
749CONFIG_SERIAL_8250_SHARE_IRQ=y 694CONFIG_SERIAL_8250_SHARE_IRQ=y
@@ -753,7 +698,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
753# 698#
754# Non-8250 serial port support 699# Non-8250 serial port support
755# 700#
756# CONFIG_SERIAL_MUX is not set
757# CONFIG_PDC_CONSOLE is not set 701# CONFIG_PDC_CONSOLE is not set
758CONFIG_SERIAL_CORE=y 702CONFIG_SERIAL_CORE=y
759CONFIG_SERIAL_CORE_CONSOLE=y 703CONFIG_SERIAL_CORE_CONSOLE=y
@@ -788,6 +732,7 @@ CONFIG_MAX_RAW_DEVS=256
788# TPM devices 732# TPM devices
789# 733#
790# CONFIG_TCG_TPM is not set 734# CONFIG_TCG_TPM is not set
735# CONFIG_TELCLOCK is not set
791 736
792# 737#
793# I2C support 738# I2C support
@@ -795,6 +740,12 @@ CONFIG_MAX_RAW_DEVS=256
795# CONFIG_I2C is not set 740# CONFIG_I2C is not set
796 741
797# 742#
743# SPI support
744#
745# CONFIG_SPI is not set
746# CONFIG_SPI_MASTER is not set
747
748#
798# Dallas's 1-wire bus 749# Dallas's 1-wire bus
799# 750#
800# CONFIG_W1 is not set 751# CONFIG_W1 is not set
@@ -830,7 +781,6 @@ CONFIG_FB=y
830CONFIG_FB_CFB_FILLRECT=y 781CONFIG_FB_CFB_FILLRECT=y
831CONFIG_FB_CFB_COPYAREA=y 782CONFIG_FB_CFB_COPYAREA=y
832CONFIG_FB_CFB_IMAGEBLIT=y 783CONFIG_FB_CFB_IMAGEBLIT=y
833CONFIG_FB_SOFT_CURSOR=y
834# CONFIG_FB_MACMODES is not set 784# CONFIG_FB_MACMODES is not set
835# CONFIG_FB_MODE_HELPERS is not set 785# CONFIG_FB_MODE_HELPERS is not set
836# CONFIG_FB_TILEBLITTING is not set 786# CONFIG_FB_TILEBLITTING is not set
@@ -840,6 +790,7 @@ CONFIG_FB_SOFT_CURSOR=y
840# CONFIG_FB_ASILIANT is not set 790# CONFIG_FB_ASILIANT is not set
841# CONFIG_FB_IMSTT is not set 791# CONFIG_FB_IMSTT is not set
842CONFIG_FB_STI=y 792CONFIG_FB_STI=y
793# CONFIG_FB_S1D13XXX is not set
843# CONFIG_FB_NVIDIA is not set 794# CONFIG_FB_NVIDIA is not set
844# CONFIG_FB_RIVA is not set 795# CONFIG_FB_RIVA is not set
845# CONFIG_FB_MATROX is not set 796# CONFIG_FB_MATROX is not set
@@ -853,10 +804,7 @@ CONFIG_FB_STI=y
853# CONFIG_FB_KYRO is not set 804# CONFIG_FB_KYRO is not set
854# CONFIG_FB_3DFX is not set 805# CONFIG_FB_3DFX is not set
855# CONFIG_FB_VOODOO1 is not set 806# CONFIG_FB_VOODOO1 is not set
856# CONFIG_FB_CYBLA is not set
857# CONFIG_FB_TRIDENT is not set 807# CONFIG_FB_TRIDENT is not set
858# CONFIG_FB_PM3 is not set
859# CONFIG_FB_S1D13XXX is not set
860# CONFIG_FB_VIRTUAL is not set 808# CONFIG_FB_VIRTUAL is not set
861 809
862# 810#
@@ -866,6 +814,7 @@ CONFIG_DUMMY_CONSOLE=y
866CONFIG_DUMMY_CONSOLE_COLUMNS=160 814CONFIG_DUMMY_CONSOLE_COLUMNS=160
867CONFIG_DUMMY_CONSOLE_ROWS=64 815CONFIG_DUMMY_CONSOLE_ROWS=64
868CONFIG_FRAMEBUFFER_CONSOLE=y 816CONFIG_FRAMEBUFFER_CONSOLE=y
817# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
869CONFIG_STI_CONSOLE=y 818CONFIG_STI_CONSOLE=y
870# CONFIG_FONTS is not set 819# CONFIG_FONTS is not set
871CONFIG_FONT_8x8=y 820CONFIG_FONT_8x8=y
@@ -898,23 +847,27 @@ CONFIG_SND_OSSEMUL=y
898CONFIG_SND_MIXER_OSS=y 847CONFIG_SND_MIXER_OSS=y
899CONFIG_SND_PCM_OSS=y 848CONFIG_SND_PCM_OSS=y
900CONFIG_SND_SEQUENCER_OSS=y 849CONFIG_SND_SEQUENCER_OSS=y
850# CONFIG_SND_DYNAMIC_MINORS is not set
851CONFIG_SND_SUPPORT_OLD_API=y
901# CONFIG_SND_VERBOSE_PRINTK is not set 852# CONFIG_SND_VERBOSE_PRINTK is not set
902# CONFIG_SND_DEBUG is not set 853# CONFIG_SND_DEBUG is not set
903 854
904# 855#
905# Generic devices 856# Generic devices
906# 857#
858CONFIG_SND_AC97_CODEC=y
859CONFIG_SND_AC97_BUS=y
907# CONFIG_SND_DUMMY is not set 860# CONFIG_SND_DUMMY is not set
908# CONFIG_SND_VIRMIDI is not set 861# CONFIG_SND_VIRMIDI is not set
909# CONFIG_SND_MTPAV is not set 862# CONFIG_SND_MTPAV is not set
910# CONFIG_SND_SERIAL_U16550 is not set 863# CONFIG_SND_SERIAL_U16550 is not set
911# CONFIG_SND_MPU401 is not set 864# CONFIG_SND_MPU401 is not set
912CONFIG_SND_AC97_CODEC=y
913CONFIG_SND_AC97_BUS=y
914 865
915# 866#
916# PCI devices 867# PCI devices
917# 868#
869CONFIG_SND_AD1889=y
870# CONFIG_SND_AD1889_OPL3 is not set
918# CONFIG_SND_ALI5451 is not set 871# CONFIG_SND_ALI5451 is not set
919# CONFIG_SND_ATIIXP is not set 872# CONFIG_SND_ATIIXP is not set
920# CONFIG_SND_ATIIXP_MODEM is not set 873# CONFIG_SND_ATIIXP_MODEM is not set
@@ -923,39 +876,38 @@ CONFIG_SND_AC97_BUS=y
923# CONFIG_SND_AU8830 is not set 876# CONFIG_SND_AU8830 is not set
924# CONFIG_SND_AZT3328 is not set 877# CONFIG_SND_AZT3328 is not set
925# CONFIG_SND_BT87X is not set 878# CONFIG_SND_BT87X is not set
926# CONFIG_SND_CS46XX is not set 879# CONFIG_SND_CA0106 is not set
880# CONFIG_SND_CMIPCI is not set
927# CONFIG_SND_CS4281 is not set 881# CONFIG_SND_CS4281 is not set
882# CONFIG_SND_CS46XX is not set
928# CONFIG_SND_EMU10K1 is not set 883# CONFIG_SND_EMU10K1 is not set
929# CONFIG_SND_EMU10K1X is not set 884# CONFIG_SND_EMU10K1X is not set
930# CONFIG_SND_CA0106 is not set
931# CONFIG_SND_KORG1212 is not set
932# CONFIG_SND_MIXART is not set
933# CONFIG_SND_NM256 is not set
934# CONFIG_SND_RME32 is not set
935# CONFIG_SND_RME96 is not set
936# CONFIG_SND_RME9652 is not set
937# CONFIG_SND_HDSP is not set
938# CONFIG_SND_HDSPM is not set
939# CONFIG_SND_TRIDENT is not set
940# CONFIG_SND_YMFPCI is not set
941CONFIG_SND_AD1889=y
942# CONFIG_SND_AD1889_OPL3 is not set
943# CONFIG_SND_CMIPCI is not set
944# CONFIG_SND_ENS1370 is not set 885# CONFIG_SND_ENS1370 is not set
945# CONFIG_SND_ENS1371 is not set 886# CONFIG_SND_ENS1371 is not set
946# CONFIG_SND_ES1938 is not set 887# CONFIG_SND_ES1938 is not set
947# CONFIG_SND_ES1968 is not set 888# CONFIG_SND_ES1968 is not set
948# CONFIG_SND_MAESTRO3 is not set
949# CONFIG_SND_FM801 is not set 889# CONFIG_SND_FM801 is not set
890# CONFIG_SND_HDA_INTEL is not set
891# CONFIG_SND_HDSP is not set
892# CONFIG_SND_HDSPM is not set
950# CONFIG_SND_ICE1712 is not set 893# CONFIG_SND_ICE1712 is not set
951# CONFIG_SND_ICE1724 is not set 894# CONFIG_SND_ICE1724 is not set
952# CONFIG_SND_INTEL8X0 is not set 895# CONFIG_SND_INTEL8X0 is not set
953# CONFIG_SND_INTEL8X0M is not set 896# CONFIG_SND_INTEL8X0M is not set
897# CONFIG_SND_KORG1212 is not set
898# CONFIG_SND_MAESTRO3 is not set
899# CONFIG_SND_MIXART is not set
900# CONFIG_SND_NM256 is not set
901# CONFIG_SND_PCXHR is not set
902# CONFIG_SND_RME32 is not set
903# CONFIG_SND_RME96 is not set
904# CONFIG_SND_RME9652 is not set
954# CONFIG_SND_SONICVIBES is not set 905# CONFIG_SND_SONICVIBES is not set
906# CONFIG_SND_TRIDENT is not set
955# CONFIG_SND_VIA82XX is not set 907# CONFIG_SND_VIA82XX is not set
956# CONFIG_SND_VIA82XX_MODEM is not set 908# CONFIG_SND_VIA82XX_MODEM is not set
957# CONFIG_SND_VX222 is not set 909# CONFIG_SND_VX222 is not set
958# CONFIG_SND_HDA_INTEL is not set 910# CONFIG_SND_YMFPCI is not set
959 911
960# 912#
961# USB devices 913# USB devices
@@ -998,12 +950,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
998# USB Device Class drivers 950# USB Device Class drivers
999# 951#
1000# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set 952# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
1001# CONFIG_USB_BLUETOOTH_TTY is not set
1002# CONFIG_USB_ACM is not set 953# CONFIG_USB_ACM is not set
1003CONFIG_USB_PRINTER=m 954CONFIG_USB_PRINTER=m
1004 955
1005# 956#
1006# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 957# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
958#
959
960#
961# may also be needed; see USB_STORAGE Help for more information
1007# 962#
1008CONFIG_USB_STORAGE=m 963CONFIG_USB_STORAGE=m
1009# CONFIG_USB_STORAGE_DEBUG is not set 964# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1015,12 +970,15 @@ CONFIG_USB_STORAGE_USBAT=y
1015CONFIG_USB_STORAGE_SDDR09=y 970CONFIG_USB_STORAGE_SDDR09=y
1016CONFIG_USB_STORAGE_SDDR55=y 971CONFIG_USB_STORAGE_SDDR55=y
1017CONFIG_USB_STORAGE_JUMPSHOT=y 972CONFIG_USB_STORAGE_JUMPSHOT=y
973# CONFIG_USB_STORAGE_ALAUDA is not set
974# CONFIG_USB_LIBUSUAL is not set
1018 975
1019# 976#
1020# USB Input Devices 977# USB Input Devices
1021# 978#
1022CONFIG_USB_HID=y 979CONFIG_USB_HID=y
1023CONFIG_USB_HIDINPUT=y 980CONFIG_USB_HIDINPUT=y
981# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1024# CONFIG_HID_FF is not set 982# CONFIG_HID_FF is not set
1025CONFIG_USB_HIDDEV=y 983CONFIG_USB_HIDDEV=y
1026# CONFIG_USB_AIPTEK is not set 984# CONFIG_USB_AIPTEK is not set
@@ -1034,6 +992,7 @@ CONFIG_USB_HIDDEV=y
1034# CONFIG_USB_YEALINK is not set 992# CONFIG_USB_YEALINK is not set
1035# CONFIG_USB_XPAD is not set 993# CONFIG_USB_XPAD is not set
1036# CONFIG_USB_ATI_REMOTE is not set 994# CONFIG_USB_ATI_REMOTE is not set
995# CONFIG_USB_ATI_REMOTE2 is not set
1037# CONFIG_USB_KEYSPAN_REMOTE is not set 996# CONFIG_USB_KEYSPAN_REMOTE is not set
1038# CONFIG_USB_APPLETOUCH is not set 997# CONFIG_USB_APPLETOUCH is not set
1039 998
@@ -1108,7 +1067,7 @@ CONFIG_USB_LEGOTOWER=m
1108# CONFIG_INFINIBAND is not set 1067# CONFIG_INFINIBAND is not set
1109 1068
1110# 1069#
1111# SN Devices 1070# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1112# 1071#
1113 1072
1114# 1073#
@@ -1130,6 +1089,7 @@ CONFIG_XFS_EXPORT=y
1130# CONFIG_XFS_SECURITY is not set 1089# CONFIG_XFS_SECURITY is not set
1131# CONFIG_XFS_POSIX_ACL is not set 1090# CONFIG_XFS_POSIX_ACL is not set
1132# CONFIG_XFS_RT is not set 1091# CONFIG_XFS_RT is not set
1092# CONFIG_OCFS2_FS is not set
1133# CONFIG_MINIX_FS is not set 1093# CONFIG_MINIX_FS is not set
1134# CONFIG_ROMFS_FS is not set 1094# CONFIG_ROMFS_FS is not set
1135CONFIG_INOTIFY=y 1095CONFIG_INOTIFY=y
@@ -1164,10 +1124,10 @@ CONFIG_PROC_FS=y
1164CONFIG_PROC_KCORE=y 1124CONFIG_PROC_KCORE=y
1165CONFIG_SYSFS=y 1125CONFIG_SYSFS=y
1166CONFIG_TMPFS=y 1126CONFIG_TMPFS=y
1167# CONFIG_HUGETLBFS is not set
1168# CONFIG_HUGETLB_PAGE is not set 1127# CONFIG_HUGETLB_PAGE is not set
1169CONFIG_RAMFS=y 1128CONFIG_RAMFS=y
1170# CONFIG_RELAYFS_FS is not set 1129# CONFIG_RELAYFS_FS is not set
1130# CONFIG_CONFIGFS_FS is not set
1171 1131
1172# 1132#
1173# Miscellaneous filesystems 1133# Miscellaneous filesystems
@@ -1225,10 +1185,10 @@ CONFIG_MSDOS_PARTITION=y
1225# 1185#
1226CONFIG_NLS=y 1186CONFIG_NLS=y
1227CONFIG_NLS_DEFAULT="iso8859-1" 1187CONFIG_NLS_DEFAULT="iso8859-1"
1228# CONFIG_NLS_CODEPAGE_437 is not set 1188CONFIG_NLS_CODEPAGE_437=m
1229# CONFIG_NLS_CODEPAGE_737 is not set 1189# CONFIG_NLS_CODEPAGE_737 is not set
1230# CONFIG_NLS_CODEPAGE_775 is not set 1190# CONFIG_NLS_CODEPAGE_775 is not set
1231# CONFIG_NLS_CODEPAGE_850 is not set 1191CONFIG_NLS_CODEPAGE_850=m
1232# CONFIG_NLS_CODEPAGE_852 is not set 1192# CONFIG_NLS_CODEPAGE_852 is not set
1233# CONFIG_NLS_CODEPAGE_855 is not set 1193# CONFIG_NLS_CODEPAGE_855 is not set
1234# CONFIG_NLS_CODEPAGE_857 is not set 1194# CONFIG_NLS_CODEPAGE_857 is not set
@@ -1248,8 +1208,8 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1248# CONFIG_NLS_ISO8859_8 is not set 1208# CONFIG_NLS_ISO8859_8 is not set
1249# CONFIG_NLS_CODEPAGE_1250 is not set 1209# CONFIG_NLS_CODEPAGE_1250 is not set
1250# CONFIG_NLS_CODEPAGE_1251 is not set 1210# CONFIG_NLS_CODEPAGE_1251 is not set
1251# CONFIG_NLS_ASCII is not set 1211CONFIG_NLS_ASCII=m
1252# CONFIG_NLS_ISO8859_1 is not set 1212CONFIG_NLS_ISO8859_1=m
1253# CONFIG_NLS_ISO8859_2 is not set 1213# CONFIG_NLS_ISO8859_2 is not set
1254# CONFIG_NLS_ISO8859_3 is not set 1214# CONFIG_NLS_ISO8859_3 is not set
1255# CONFIG_NLS_ISO8859_4 is not set 1215# CONFIG_NLS_ISO8859_4 is not set
@@ -1259,10 +1219,10 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1259# CONFIG_NLS_ISO8859_9 is not set 1219# CONFIG_NLS_ISO8859_9 is not set
1260# CONFIG_NLS_ISO8859_13 is not set 1220# CONFIG_NLS_ISO8859_13 is not set
1261# CONFIG_NLS_ISO8859_14 is not set 1221# CONFIG_NLS_ISO8859_14 is not set
1262# CONFIG_NLS_ISO8859_15 is not set 1222CONFIG_NLS_ISO8859_15=m
1263# CONFIG_NLS_KOI8_R is not set 1223# CONFIG_NLS_KOI8_R is not set
1264# CONFIG_NLS_KOI8_U is not set 1224# CONFIG_NLS_KOI8_U is not set
1265# CONFIG_NLS_UTF8 is not set 1225CONFIG_NLS_UTF8=m
1266 1226
1267# 1227#
1268# Profiling support 1228# Profiling support
@@ -1274,18 +1234,22 @@ CONFIG_OPROFILE=m
1274# Kernel hacking 1234# Kernel hacking
1275# 1235#
1276# CONFIG_PRINTK_TIME is not set 1236# CONFIG_PRINTK_TIME is not set
1277CONFIG_DEBUG_KERNEL=y
1278CONFIG_MAGIC_SYSRQ=y 1237CONFIG_MAGIC_SYSRQ=y
1238CONFIG_DEBUG_KERNEL=y
1279CONFIG_LOG_BUF_SHIFT=16 1239CONFIG_LOG_BUF_SHIFT=16
1280CONFIG_DETECT_SOFTLOCKUP=y 1240CONFIG_DETECT_SOFTLOCKUP=y
1281# CONFIG_SCHEDSTATS is not set 1241# CONFIG_SCHEDSTATS is not set
1282# CONFIG_DEBUG_SLAB is not set 1242# CONFIG_DEBUG_SLAB is not set
1243CONFIG_DEBUG_MUTEXES=y
1283# CONFIG_DEBUG_SPINLOCK is not set 1244# CONFIG_DEBUG_SPINLOCK is not set
1284# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1245# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1285# CONFIG_DEBUG_KOBJECT is not set 1246# CONFIG_DEBUG_KOBJECT is not set
1286# CONFIG_DEBUG_INFO is not set 1247# CONFIG_DEBUG_INFO is not set
1287# CONFIG_DEBUG_IOREMAP is not set
1288# CONFIG_DEBUG_FS is not set 1248# CONFIG_DEBUG_FS is not set
1249# CONFIG_DEBUG_VM is not set
1250CONFIG_FORCED_INLINING=y
1251# CONFIG_RCU_TORTURE_TEST is not set
1252CONFIG_DEBUG_RODATA=y
1289 1253
1290# 1254#
1291# Security options 1255# Security options
diff --git a/arch/parisc/defconfig b/arch/parisc/defconfig
index f38a4620d24f..59f7bc38e72e 100644
--- a/arch/parisc/defconfig
+++ b/arch/parisc/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc5-pa1 3# Linux kernel version: 2.6.16-pa6
4# Fri Oct 21 23:01:33 2005 4# Sun Mar 26 19:50:07 2006
5# 5#
6CONFIG_PARISC=y 6CONFIG_PARISC=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -15,7 +15,6 @@ CONFIG_GENERIC_IRQ_PROBE=y
15# Code maturity level options 15# Code maturity level options
16# 16#
17CONFIG_EXPERIMENTAL=y 17CONFIG_EXPERIMENTAL=y
18CONFIG_CLEAN_COMPILE=y
19CONFIG_BROKEN_ON_SMP=y 18CONFIG_BROKEN_ON_SMP=y
20CONFIG_INIT_ENV_ARG_LIMIT=32 19CONFIG_INIT_ENV_ARG_LIMIT=32
21 20
@@ -30,17 +29,18 @@ CONFIG_SYSVIPC=y
30# CONFIG_BSD_PROCESS_ACCT is not set 29# CONFIG_BSD_PROCESS_ACCT is not set
31CONFIG_SYSCTL=y 30CONFIG_SYSCTL=y
32# CONFIG_AUDIT is not set 31# CONFIG_AUDIT is not set
33# CONFIG_HOTPLUG is not set
34CONFIG_KOBJECT_UEVENT=y
35CONFIG_IKCONFIG=y 32CONFIG_IKCONFIG=y
36CONFIG_IKCONFIG_PROC=y 33CONFIG_IKCONFIG_PROC=y
37CONFIG_INITRAMFS_SOURCE="" 34CONFIG_INITRAMFS_SOURCE=""
35CONFIG_CC_OPTIMIZE_FOR_SIZE=y
38# CONFIG_EMBEDDED is not set 36# CONFIG_EMBEDDED is not set
39CONFIG_KALLSYMS=y 37CONFIG_KALLSYMS=y
40# CONFIG_KALLSYMS_ALL is not set 38# CONFIG_KALLSYMS_ALL is not set
41# CONFIG_KALLSYMS_EXTRA_PASS is not set 39# CONFIG_KALLSYMS_EXTRA_PASS is not set
40CONFIG_HOTPLUG=y
42CONFIG_PRINTK=y 41CONFIG_PRINTK=y
43CONFIG_BUG=y 42CONFIG_BUG=y
43CONFIG_ELF_CORE=y
44CONFIG_BASE_FULL=y 44CONFIG_BASE_FULL=y
45CONFIG_FUTEX=y 45CONFIG_FUTEX=y
46CONFIG_EPOLL=y 46CONFIG_EPOLL=y
@@ -49,8 +49,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0
49CONFIG_CC_ALIGN_LABELS=0 49CONFIG_CC_ALIGN_LABELS=0
50CONFIG_CC_ALIGN_LOOPS=0 50CONFIG_CC_ALIGN_LOOPS=0
51CONFIG_CC_ALIGN_JUMPS=0 51CONFIG_CC_ALIGN_JUMPS=0
52CONFIG_SLAB=y
52# CONFIG_TINY_SHMEM is not set 53# CONFIG_TINY_SHMEM is not set
53CONFIG_BASE_SMALL=0 54CONFIG_BASE_SMALL=0
55# CONFIG_SLOB is not set
54 56
55# 57#
56# Loadable module support 58# Loadable module support
@@ -58,6 +60,23 @@ CONFIG_BASE_SMALL=0
58# CONFIG_MODULES is not set 60# CONFIG_MODULES is not set
59 61
60# 62#
63# Block layer
64#
65
66#
67# IO Schedulers
68#
69CONFIG_IOSCHED_NOOP=y
70CONFIG_IOSCHED_AS=y
71CONFIG_IOSCHED_DEADLINE=y
72CONFIG_IOSCHED_CFQ=y
73CONFIG_DEFAULT_AS=y
74# CONFIG_DEFAULT_DEADLINE is not set
75# CONFIG_DEFAULT_CFQ is not set
76# CONFIG_DEFAULT_NOOP is not set
77CONFIG_DEFAULT_IOSCHED="anticipatory"
78
79#
61# Processor type and features 80# Processor type and features
62# 81#
63CONFIG_PA7000=y 82CONFIG_PA7000=y
@@ -67,6 +86,10 @@ CONFIG_PA7000=y
67# CONFIG_PA8X00 is not set 86# CONFIG_PA8X00 is not set
68CONFIG_PA11=y 87CONFIG_PA11=y
69# CONFIG_SMP is not set 88# CONFIG_SMP is not set
89CONFIG_ARCH_FLATMEM_ENABLE=y
90CONFIG_PREEMPT_NONE=y
91# CONFIG_PREEMPT_VOLUNTARY is not set
92# CONFIG_PREEMPT is not set
70# CONFIG_HZ_100 is not set 93# CONFIG_HZ_100 is not set
71CONFIG_HZ_250=y 94CONFIG_HZ_250=y
72# CONFIG_HZ_1000 is not set 95# CONFIG_HZ_1000 is not set
@@ -78,7 +101,7 @@ CONFIG_FLATMEM_MANUAL=y
78CONFIG_FLATMEM=y 101CONFIG_FLATMEM=y
79CONFIG_FLAT_NODE_MEM_MAP=y 102CONFIG_FLAT_NODE_MEM_MAP=y
80# CONFIG_SPARSEMEM_STATIC is not set 103# CONFIG_SPARSEMEM_STATIC is not set
81# CONFIG_PREEMPT is not set 104CONFIG_SPLIT_PTLOCK_CPUS=4096
82# CONFIG_HPUX is not set 105# CONFIG_HPUX is not set
83 106
84# 107#
@@ -132,6 +155,7 @@ CONFIG_NET=y
132# 155#
133# Networking options 156# Networking options
134# 157#
158# CONFIG_NETDEBUG is not set
135CONFIG_PACKET=y 159CONFIG_PACKET=y
136CONFIG_PACKET_MMAP=y 160CONFIG_PACKET_MMAP=y
137CONFIG_UNIX=y 161CONFIG_UNIX=y
@@ -174,6 +198,11 @@ CONFIG_IPV6=y
174# SCTP Configuration (EXPERIMENTAL) 198# SCTP Configuration (EXPERIMENTAL)
175# 199#
176# CONFIG_IP_SCTP is not set 200# CONFIG_IP_SCTP is not set
201
202#
203# TIPC Configuration (EXPERIMENTAL)
204#
205# CONFIG_TIPC is not set
177# CONFIG_ATM is not set 206# CONFIG_ATM is not set
178# CONFIG_BRIDGE is not set 207# CONFIG_BRIDGE is not set
179# CONFIG_VLAN_8021Q is not set 208# CONFIG_VLAN_8021Q is not set
@@ -186,8 +215,11 @@ CONFIG_IPV6=y
186# CONFIG_NET_DIVERT is not set 215# CONFIG_NET_DIVERT is not set
187# CONFIG_ECONET is not set 216# CONFIG_ECONET is not set
188# CONFIG_WAN_ROUTER is not set 217# CONFIG_WAN_ROUTER is not set
218
219#
220# QoS and/or fair queueing
221#
189# CONFIG_NET_SCHED is not set 222# CONFIG_NET_SCHED is not set
190# CONFIG_NET_CLS_ROUTE is not set
191 223
192# 224#
193# Network testing 225# Network testing
@@ -228,6 +260,7 @@ CONFIG_PARPORT_PC=y
228# CONFIG_PARPORT_SERIAL is not set 260# CONFIG_PARPORT_SERIAL is not set
229# CONFIG_PARPORT_PC_FIFO is not set 261# CONFIG_PARPORT_PC_FIFO is not set
230# CONFIG_PARPORT_PC_SUPERIO is not set 262# CONFIG_PARPORT_PC_SUPERIO is not set
263CONFIG_PARPORT_NOT_PC=y
231CONFIG_PARPORT_GSC=y 264CONFIG_PARPORT_GSC=y
232# CONFIG_PARPORT_1284 is not set 265# CONFIG_PARPORT_1284 is not set
233 266
@@ -254,14 +287,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
254CONFIG_BLK_DEV_RAM_SIZE=4096 287CONFIG_BLK_DEV_RAM_SIZE=4096
255CONFIG_BLK_DEV_INITRD=y 288CONFIG_BLK_DEV_INITRD=y
256# CONFIG_CDROM_PKTCDVD is not set 289# CONFIG_CDROM_PKTCDVD is not set
257
258#
259# IO Schedulers
260#
261CONFIG_IOSCHED_NOOP=y
262CONFIG_IOSCHED_AS=y
263CONFIG_IOSCHED_DEADLINE=y
264CONFIG_IOSCHED_CFQ=y
265# CONFIG_ATA_OVER_ETH is not set 290# CONFIG_ATA_OVER_ETH is not set
266 291
267# 292#
@@ -305,6 +330,7 @@ CONFIG_SCSI_SPI_ATTRS=y
305# 330#
306# SCSI low-level drivers 331# SCSI low-level drivers
307# 332#
333# CONFIG_ISCSI_TCP is not set
308# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 334# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
309# CONFIG_SCSI_3W_9XXX is not set 335# CONFIG_SCSI_3W_9XXX is not set
310# CONFIG_SCSI_ACARD is not set 336# CONFIG_SCSI_ACARD is not set
@@ -331,7 +357,7 @@ CONFIG_SCSI_SYM53C8XX_2=y
331CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 357CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
332CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 358CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
333CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 359CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
334# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 360CONFIG_SCSI_SYM53C8XX_MMIO=y
335# CONFIG_SCSI_IPR is not set 361# CONFIG_SCSI_IPR is not set
336CONFIG_SCSI_ZALON=y 362CONFIG_SCSI_ZALON=y
337CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8 363CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
@@ -340,13 +366,7 @@ CONFIG_SCSI_NCR53C8XX_SYNC=20
340# CONFIG_SCSI_NCR53C8XX_PROFILE is not set 366# CONFIG_SCSI_NCR53C8XX_PROFILE is not set
341# CONFIG_SCSI_QLOGIC_FC is not set 367# CONFIG_SCSI_QLOGIC_FC is not set
342# CONFIG_SCSI_QLOGIC_1280 is not set 368# CONFIG_SCSI_QLOGIC_1280 is not set
343CONFIG_SCSI_QLA2XXX=y 369# CONFIG_SCSI_QLA_FC is not set
344# CONFIG_SCSI_QLA21XX is not set
345# CONFIG_SCSI_QLA22XX is not set
346# CONFIG_SCSI_QLA2300 is not set
347# CONFIG_SCSI_QLA2322 is not set
348# CONFIG_SCSI_QLA6312 is not set
349# CONFIG_SCSI_QLA24XX is not set
350# CONFIG_SCSI_LPFC is not set 370# CONFIG_SCSI_LPFC is not set
351# CONFIG_SCSI_SIM710 is not set 371# CONFIG_SCSI_SIM710 is not set
352# CONFIG_SCSI_DC395x is not set 372# CONFIG_SCSI_DC395x is not set
@@ -471,6 +491,7 @@ CONFIG_ACENIC=y
471# CONFIG_R8169 is not set 491# CONFIG_R8169 is not set
472# CONFIG_SIS190 is not set 492# CONFIG_SIS190 is not set
473# CONFIG_SKGE is not set 493# CONFIG_SKGE is not set
494# CONFIG_SKY2 is not set
474# CONFIG_SK98LIN is not set 495# CONFIG_SK98LIN is not set
475# CONFIG_VIA_VELOCITY is not set 496# CONFIG_VIA_VELOCITY is not set
476CONFIG_TIGON3=y 497CONFIG_TIGON3=y
@@ -562,13 +583,13 @@ CONFIG_INPUT_KEYBOARD=y
562# CONFIG_KEYBOARD_LKKBD is not set 583# CONFIG_KEYBOARD_LKKBD is not set
563# CONFIG_KEYBOARD_XTKBD is not set 584# CONFIG_KEYBOARD_XTKBD is not set
564# CONFIG_KEYBOARD_NEWTON is not set 585# CONFIG_KEYBOARD_NEWTON is not set
565CONFIG_KEYBOARD_HIL_OLD=y 586# CONFIG_KEYBOARD_HIL_OLD is not set
566CONFIG_KEYBOARD_HIL=y 587CONFIG_KEYBOARD_HIL=y
567CONFIG_INPUT_MOUSE=y 588CONFIG_INPUT_MOUSE=y
568# CONFIG_MOUSE_PS2 is not set 589# CONFIG_MOUSE_PS2 is not set
569# CONFIG_MOUSE_SERIAL is not set 590# CONFIG_MOUSE_SERIAL is not set
570# CONFIG_MOUSE_VSXXXAA is not set 591# CONFIG_MOUSE_VSXXXAA is not set
571# CONFIG_MOUSE_HIL is not set 592CONFIG_MOUSE_HIL=y
572CONFIG_INPUT_JOYSTICK=y 593CONFIG_INPUT_JOYSTICK=y
573# CONFIG_JOYSTICK_ANALOG is not set 594# CONFIG_JOYSTICK_ANALOG is not set
574# CONFIG_JOYSTICK_A3D is not set 595# CONFIG_JOYSTICK_A3D is not set
@@ -628,6 +649,7 @@ CONFIG_HW_CONSOLE=y
628CONFIG_SERIAL_8250=y 649CONFIG_SERIAL_8250=y
629CONFIG_SERIAL_8250_CONSOLE=y 650CONFIG_SERIAL_8250_CONSOLE=y
630CONFIG_SERIAL_8250_NR_UARTS=13 651CONFIG_SERIAL_8250_NR_UARTS=13
652CONFIG_SERIAL_8250_RUNTIME_UARTS=4
631CONFIG_SERIAL_8250_EXTENDED=y 653CONFIG_SERIAL_8250_EXTENDED=y
632CONFIG_SERIAL_8250_MANY_PORTS=y 654CONFIG_SERIAL_8250_MANY_PORTS=y
633CONFIG_SERIAL_8250_SHARE_IRQ=y 655CONFIG_SERIAL_8250_SHARE_IRQ=y
@@ -675,6 +697,7 @@ CONFIG_GEN_RTC=y
675# TPM devices 697# TPM devices
676# 698#
677# CONFIG_TCG_TPM is not set 699# CONFIG_TCG_TPM is not set
700# CONFIG_TELCLOCK is not set
678 701
679# 702#
680# I2C support 703# I2C support
@@ -682,6 +705,12 @@ CONFIG_GEN_RTC=y
682# CONFIG_I2C is not set 705# CONFIG_I2C is not set
683 706
684# 707#
708# SPI support
709#
710# CONFIG_SPI is not set
711# CONFIG_SPI_MASTER is not set
712
713#
685# Dallas's 1-wire bus 714# Dallas's 1-wire bus
686# 715#
687# CONFIG_W1 is not set 716# CONFIG_W1 is not set
@@ -691,6 +720,7 @@ CONFIG_GEN_RTC=y
691# 720#
692CONFIG_HWMON=y 721CONFIG_HWMON=y
693# CONFIG_HWMON_VID is not set 722# CONFIG_HWMON_VID is not set
723# CONFIG_SENSORS_F71805F is not set
694# CONFIG_HWMON_DEBUG_CHIP is not set 724# CONFIG_HWMON_DEBUG_CHIP is not set
695 725
696# 726#
@@ -718,7 +748,6 @@ CONFIG_FB=y
718CONFIG_FB_CFB_FILLRECT=y 748CONFIG_FB_CFB_FILLRECT=y
719CONFIG_FB_CFB_COPYAREA=y 749CONFIG_FB_CFB_COPYAREA=y
720CONFIG_FB_CFB_IMAGEBLIT=y 750CONFIG_FB_CFB_IMAGEBLIT=y
721CONFIG_FB_SOFT_CURSOR=y
722# CONFIG_FB_MACMODES is not set 751# CONFIG_FB_MACMODES is not set
723# CONFIG_FB_MODE_HELPERS is not set 752# CONFIG_FB_MODE_HELPERS is not set
724# CONFIG_FB_TILEBLITTING is not set 753# CONFIG_FB_TILEBLITTING is not set
@@ -728,6 +757,7 @@ CONFIG_FB_SOFT_CURSOR=y
728# CONFIG_FB_ASILIANT is not set 757# CONFIG_FB_ASILIANT is not set
729# CONFIG_FB_IMSTT is not set 758# CONFIG_FB_IMSTT is not set
730CONFIG_FB_STI=y 759CONFIG_FB_STI=y
760# CONFIG_FB_S1D13XXX is not set
731# CONFIG_FB_NVIDIA is not set 761# CONFIG_FB_NVIDIA is not set
732# CONFIG_FB_RIVA is not set 762# CONFIG_FB_RIVA is not set
733# CONFIG_FB_MATROX is not set 763# CONFIG_FB_MATROX is not set
@@ -741,9 +771,7 @@ CONFIG_FB_STI=y
741# CONFIG_FB_KYRO is not set 771# CONFIG_FB_KYRO is not set
742# CONFIG_FB_3DFX is not set 772# CONFIG_FB_3DFX is not set
743# CONFIG_FB_VOODOO1 is not set 773# CONFIG_FB_VOODOO1 is not set
744# CONFIG_FB_CYBLA is not set
745# CONFIG_FB_TRIDENT is not set 774# CONFIG_FB_TRIDENT is not set
746# CONFIG_FB_S1D13XXX is not set
747# CONFIG_FB_VIRTUAL is not set 775# CONFIG_FB_VIRTUAL is not set
748 776
749# 777#
@@ -753,15 +781,28 @@ CONFIG_DUMMY_CONSOLE=y
753CONFIG_DUMMY_CONSOLE_COLUMNS=160 781CONFIG_DUMMY_CONSOLE_COLUMNS=160
754CONFIG_DUMMY_CONSOLE_ROWS=64 782CONFIG_DUMMY_CONSOLE_ROWS=64
755CONFIG_FRAMEBUFFER_CONSOLE=y 783CONFIG_FRAMEBUFFER_CONSOLE=y
784# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
756CONFIG_STI_CONSOLE=y 785CONFIG_STI_CONSOLE=y
757# CONFIG_FONTS is not set 786CONFIG_FONTS=y
758CONFIG_FONT_8x8=y 787# CONFIG_FONT_8x8 is not set
759CONFIG_FONT_8x16=y 788CONFIG_FONT_8x16=y
789# CONFIG_FONT_6x11 is not set
790# CONFIG_FONT_7x14 is not set
791# CONFIG_FONT_PEARL_8x8 is not set
792# CONFIG_FONT_ACORN_8x8 is not set
793# CONFIG_FONT_MINI_4x6 is not set
794# CONFIG_FONT_SUN8x16 is not set
795# CONFIG_FONT_SUN12x22 is not set
796# CONFIG_FONT_10x18 is not set
760 797
761# 798#
762# Logo configuration 799# Logo configuration
763# 800#
764# CONFIG_LOGO is not set 801CONFIG_LOGO=y
802# CONFIG_LOGO_LINUX_MONO is not set
803# CONFIG_LOGO_LINUX_VGA16 is not set
804# CONFIG_LOGO_LINUX_CLUT224 is not set
805CONFIG_LOGO_PARISC_CLUT224=y
765# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 806# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
766 807
767# 808#
@@ -781,23 +822,27 @@ CONFIG_SND_OSSEMUL=y
781CONFIG_SND_MIXER_OSS=y 822CONFIG_SND_MIXER_OSS=y
782CONFIG_SND_PCM_OSS=y 823CONFIG_SND_PCM_OSS=y
783CONFIG_SND_SEQUENCER_OSS=y 824CONFIG_SND_SEQUENCER_OSS=y
825# CONFIG_SND_DYNAMIC_MINORS is not set
826CONFIG_SND_SUPPORT_OLD_API=y
784# CONFIG_SND_VERBOSE_PRINTK is not set 827# CONFIG_SND_VERBOSE_PRINTK is not set
785# CONFIG_SND_DEBUG is not set 828# CONFIG_SND_DEBUG is not set
786 829
787# 830#
788# Generic devices 831# Generic devices
789# 832#
833CONFIG_SND_AC97_CODEC=y
834CONFIG_SND_AC97_BUS=y
790# CONFIG_SND_DUMMY is not set 835# CONFIG_SND_DUMMY is not set
791# CONFIG_SND_VIRMIDI is not set 836# CONFIG_SND_VIRMIDI is not set
792# CONFIG_SND_MTPAV is not set 837# CONFIG_SND_MTPAV is not set
793# CONFIG_SND_SERIAL_U16550 is not set 838# CONFIG_SND_SERIAL_U16550 is not set
794# CONFIG_SND_MPU401 is not set 839# CONFIG_SND_MPU401 is not set
795CONFIG_SND_AC97_CODEC=y
796CONFIG_SND_AC97_BUS=y
797 840
798# 841#
799# PCI devices 842# PCI devices
800# 843#
844CONFIG_SND_AD1889=y
845# CONFIG_SND_AD1889_OPL3 is not set
801# CONFIG_SND_ALI5451 is not set 846# CONFIG_SND_ALI5451 is not set
802# CONFIG_SND_ATIIXP is not set 847# CONFIG_SND_ATIIXP is not set
803# CONFIG_SND_ATIIXP_MODEM is not set 848# CONFIG_SND_ATIIXP_MODEM is not set
@@ -806,39 +851,38 @@ CONFIG_SND_AC97_BUS=y
806# CONFIG_SND_AU8830 is not set 851# CONFIG_SND_AU8830 is not set
807# CONFIG_SND_AZT3328 is not set 852# CONFIG_SND_AZT3328 is not set
808# CONFIG_SND_BT87X is not set 853# CONFIG_SND_BT87X is not set
809# CONFIG_SND_CS46XX is not set 854# CONFIG_SND_CA0106 is not set
855# CONFIG_SND_CMIPCI is not set
810# CONFIG_SND_CS4281 is not set 856# CONFIG_SND_CS4281 is not set
857# CONFIG_SND_CS46XX is not set
811# CONFIG_SND_EMU10K1 is not set 858# CONFIG_SND_EMU10K1 is not set
812# CONFIG_SND_EMU10K1X is not set 859# CONFIG_SND_EMU10K1X is not set
813# CONFIG_SND_CA0106 is not set
814# CONFIG_SND_KORG1212 is not set
815# CONFIG_SND_MIXART is not set
816# CONFIG_SND_NM256 is not set
817# CONFIG_SND_RME32 is not set
818# CONFIG_SND_RME96 is not set
819# CONFIG_SND_RME9652 is not set
820# CONFIG_SND_HDSP is not set
821# CONFIG_SND_HDSPM is not set
822# CONFIG_SND_TRIDENT is not set
823# CONFIG_SND_YMFPCI is not set
824CONFIG_SND_AD1889=y
825# CONFIG_SND_AD1889_OPL3 is not set
826# CONFIG_SND_CMIPCI is not set
827# CONFIG_SND_ENS1370 is not set 860# CONFIG_SND_ENS1370 is not set
828# CONFIG_SND_ENS1371 is not set 861# CONFIG_SND_ENS1371 is not set
829# CONFIG_SND_ES1938 is not set 862# CONFIG_SND_ES1938 is not set
830# CONFIG_SND_ES1968 is not set 863# CONFIG_SND_ES1968 is not set
831# CONFIG_SND_MAESTRO3 is not set
832# CONFIG_SND_FM801 is not set 864# CONFIG_SND_FM801 is not set
865# CONFIG_SND_HDA_INTEL is not set
866# CONFIG_SND_HDSP is not set
867# CONFIG_SND_HDSPM is not set
833# CONFIG_SND_ICE1712 is not set 868# CONFIG_SND_ICE1712 is not set
834# CONFIG_SND_ICE1724 is not set 869# CONFIG_SND_ICE1724 is not set
835# CONFIG_SND_INTEL8X0 is not set 870# CONFIG_SND_INTEL8X0 is not set
836# CONFIG_SND_INTEL8X0M is not set 871# CONFIG_SND_INTEL8X0M is not set
872# CONFIG_SND_KORG1212 is not set
873# CONFIG_SND_MAESTRO3 is not set
874# CONFIG_SND_MIXART is not set
875# CONFIG_SND_NM256 is not set
876# CONFIG_SND_PCXHR is not set
877# CONFIG_SND_RME32 is not set
878# CONFIG_SND_RME96 is not set
879# CONFIG_SND_RME9652 is not set
837# CONFIG_SND_SONICVIBES is not set 880# CONFIG_SND_SONICVIBES is not set
881# CONFIG_SND_TRIDENT is not set
838# CONFIG_SND_VIA82XX is not set 882# CONFIG_SND_VIA82XX is not set
839# CONFIG_SND_VIA82XX_MODEM is not set 883# CONFIG_SND_VIA82XX_MODEM is not set
840# CONFIG_SND_VX222 is not set 884# CONFIG_SND_VX222 is not set
841# CONFIG_SND_HDA_INTEL is not set 885# CONFIG_SND_YMFPCI is not set
842 886
843# 887#
844# USB devices 888# USB devices
@@ -888,14 +932,18 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
888# USB Device Class drivers 932# USB Device Class drivers
889# 933#
890# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set 934# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
891# CONFIG_USB_BLUETOOTH_TTY is not set
892# CONFIG_USB_ACM is not set 935# CONFIG_USB_ACM is not set
893# CONFIG_USB_PRINTER is not set 936# CONFIG_USB_PRINTER is not set
894 937
895# 938#
896# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 939# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
940#
941
942#
943# may also be needed; see USB_STORAGE Help for more information
897# 944#
898# CONFIG_USB_STORAGE is not set 945# CONFIG_USB_STORAGE is not set
946# CONFIG_USB_LIBUSUAL is not set
899 947
900# 948#
901# USB Input Devices 949# USB Input Devices
@@ -918,6 +966,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
918# CONFIG_USB_YEALINK is not set 966# CONFIG_USB_YEALINK is not set
919# CONFIG_USB_XPAD is not set 967# CONFIG_USB_XPAD is not set
920# CONFIG_USB_ATI_REMOTE is not set 968# CONFIG_USB_ATI_REMOTE is not set
969# CONFIG_USB_ATI_REMOTE2 is not set
921# CONFIG_USB_KEYSPAN_REMOTE is not set 970# CONFIG_USB_KEYSPAN_REMOTE is not set
922# CONFIG_USB_APPLETOUCH is not set 971# CONFIG_USB_APPLETOUCH is not set
923 972
@@ -994,7 +1043,7 @@ CONFIG_USB_MON=y
994# CONFIG_INFINIBAND is not set 1043# CONFIG_INFINIBAND is not set
995 1044
996# 1045#
997# SN Devices 1046# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
998# 1047#
999 1048
1000# 1049#
@@ -1011,6 +1060,7 @@ CONFIG_JBD=y
1011# CONFIG_JFS_FS is not set 1060# CONFIG_JFS_FS is not set
1012# CONFIG_FS_POSIX_ACL is not set 1061# CONFIG_FS_POSIX_ACL is not set
1013# CONFIG_XFS_FS is not set 1062# CONFIG_XFS_FS is not set
1063# CONFIG_OCFS2_FS is not set
1014# CONFIG_MINIX_FS is not set 1064# CONFIG_MINIX_FS is not set
1015# CONFIG_ROMFS_FS is not set 1065# CONFIG_ROMFS_FS is not set
1016CONFIG_INOTIFY=y 1066CONFIG_INOTIFY=y
@@ -1045,6 +1095,7 @@ CONFIG_TMPFS=y
1045# CONFIG_HUGETLB_PAGE is not set 1095# CONFIG_HUGETLB_PAGE is not set
1046CONFIG_RAMFS=y 1096CONFIG_RAMFS=y
1047# CONFIG_RELAYFS_FS is not set 1097# CONFIG_RELAYFS_FS is not set
1098# CONFIG_CONFIGFS_FS is not set
1048 1099
1049# 1100#
1050# Miscellaneous filesystems 1101# Miscellaneous filesystems
@@ -1151,18 +1202,22 @@ CONFIG_OPROFILE=y
1151# Kernel hacking 1202# Kernel hacking
1152# 1203#
1153# CONFIG_PRINTK_TIME is not set 1204# CONFIG_PRINTK_TIME is not set
1154CONFIG_DEBUG_KERNEL=y
1155CONFIG_MAGIC_SYSRQ=y 1205CONFIG_MAGIC_SYSRQ=y
1206CONFIG_DEBUG_KERNEL=y
1156CONFIG_LOG_BUF_SHIFT=15 1207CONFIG_LOG_BUF_SHIFT=15
1157CONFIG_DETECT_SOFTLOCKUP=y 1208CONFIG_DETECT_SOFTLOCKUP=y
1158# CONFIG_SCHEDSTATS is not set 1209# CONFIG_SCHEDSTATS is not set
1159# CONFIG_DEBUG_SLAB is not set 1210# CONFIG_DEBUG_SLAB is not set
1211CONFIG_DEBUG_MUTEXES=y
1160# CONFIG_DEBUG_SPINLOCK is not set 1212# CONFIG_DEBUG_SPINLOCK is not set
1161# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1213# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1162# CONFIG_DEBUG_KOBJECT is not set 1214# CONFIG_DEBUG_KOBJECT is not set
1163# CONFIG_DEBUG_INFO is not set 1215# CONFIG_DEBUG_INFO is not set
1164# CONFIG_DEBUG_IOREMAP is not set
1165# CONFIG_DEBUG_FS is not set 1216# CONFIG_DEBUG_FS is not set
1217# CONFIG_DEBUG_VM is not set
1218CONFIG_FORCED_INLINING=y
1219# CONFIG_RCU_TORTURE_TEST is not set
1220CONFIG_DEBUG_RODATA=y
1166 1221
1167# 1222#
1168# Security options 1223# Security options
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index d8a4ca021aac..360b7391cb8c 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -89,7 +89,7 @@ update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t pte)
89 if (pfn_valid(page_to_pfn(page)) && page_mapping(page) && 89 if (pfn_valid(page_to_pfn(page)) && page_mapping(page) &&
90 test_bit(PG_dcache_dirty, &page->flags)) { 90 test_bit(PG_dcache_dirty, &page->flags)) {
91 91
92 flush_kernel_dcache_page(page_address(page)); 92 flush_kernel_dcache_page(page);
93 clear_bit(PG_dcache_dirty, &page->flags); 93 clear_bit(PG_dcache_dirty, &page->flags);
94 } 94 }
95} 95}
@@ -278,7 +278,7 @@ void flush_dcache_page(struct page *page)
278 return; 278 return;
279 } 279 }
280 280
281 flush_kernel_dcache_page(page_address(page)); 281 flush_kernel_dcache_page(page);
282 282
283 if (!mapping) 283 if (!mapping)
284 return; 284 return;
@@ -317,7 +317,7 @@ EXPORT_SYMBOL(flush_dcache_page);
317 317
318/* Defined in arch/parisc/kernel/pacache.S */ 318/* Defined in arch/parisc/kernel/pacache.S */
319EXPORT_SYMBOL(flush_kernel_dcache_range_asm); 319EXPORT_SYMBOL(flush_kernel_dcache_range_asm);
320EXPORT_SYMBOL(flush_kernel_dcache_page); 320EXPORT_SYMBOL(flush_kernel_dcache_page_asm);
321EXPORT_SYMBOL(flush_data_cache_local); 321EXPORT_SYMBOL(flush_data_cache_local);
322EXPORT_SYMBOL(flush_kernel_icache_range_asm); 322EXPORT_SYMBOL(flush_kernel_icache_range_asm);
323 323
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index 9af4b22a6d77..7c95d7663c29 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -563,10 +563,10 @@
563 extrd,u,*= \pte,_PAGE_GATEWAY_BIT+32,1,%r0 563 extrd,u,*= \pte,_PAGE_GATEWAY_BIT+32,1,%r0
564 depd %r0,11,2,\prot /* If Gateway, Set PL2 to 0 */ 564 depd %r0,11,2,\prot /* If Gateway, Set PL2 to 0 */
565 565
566 /* Get rid of prot bits and convert to page addr for iitlbt */ 566 /* Get rid of prot bits and convert to page addr for iitlbt and idtlbt */
567 567
568 depd %r0,63,PAGE_SHIFT,\pte 568 depd %r0,63,PAGE_SHIFT,\pte
569 extrd,u \pte,56,32,\pte 569 extrd,s \pte,(63-PAGE_SHIFT)+(63-58),64-PAGE_SHIFT,\pte
570 .endm 570 .endm
571 571
572 /* Identical macro to make_insert_tlb above, except it 572 /* Identical macro to make_insert_tlb above, except it
@@ -584,7 +584,7 @@
584 584
585 /* Get rid of prot bits and convert to page addr for iitlba */ 585 /* Get rid of prot bits and convert to page addr for iitlba */
586 586
587 depi 0,31,12,\pte 587 depi 0,31,PAGE_SHIFT,\pte
588 extru \pte,24,25,\pte 588 extru \pte,24,25,\pte
589 589
590 .endm 590 .endm
@@ -1014,14 +1014,21 @@ intr_restore:
1014 nop 1014 nop
1015 nop 1015 nop
1016 1016
1017#ifndef CONFIG_PREEMPT
1018# define intr_do_preempt intr_restore
1019#endif /* !CONFIG_PREEMPT */
1020
1017 .import schedule,code 1021 .import schedule,code
1018intr_do_resched: 1022intr_do_resched:
1019 /* Only do reschedule if we are returning to user space */ 1023 /* Only call schedule on return to userspace. If we're returning
1024 * to kernel space, we may schedule if CONFIG_PREEMPT, otherwise
1025 * we jump back to intr_restore.
1026 */
1020 LDREG PT_IASQ0(%r16), %r20 1027 LDREG PT_IASQ0(%r16), %r20
1021 CMPIB= 0,%r20,intr_restore /* backward */ 1028 CMPIB= 0, %r20, intr_do_preempt
1022 nop 1029 nop
1023 LDREG PT_IASQ1(%r16), %r20 1030 LDREG PT_IASQ1(%r16), %r20
1024 CMPIB= 0,%r20,intr_restore /* backward */ 1031 CMPIB= 0, %r20, intr_do_preempt
1025 nop 1032 nop
1026 1033
1027#ifdef CONFIG_64BIT 1034#ifdef CONFIG_64BIT
@@ -1037,6 +1044,32 @@ intr_do_resched:
1037#endif 1044#endif
1038 ldo R%intr_check_sig(%r2), %r2 1045 ldo R%intr_check_sig(%r2), %r2
1039 1046
1047 /* preempt the current task on returning to kernel
1048 * mode from an interrupt, iff need_resched is set,
1049 * and preempt_count is 0. otherwise, we continue on
1050 * our merry way back to the current running task.
1051 */
1052#ifdef CONFIG_PREEMPT
1053 .import preempt_schedule_irq,code
1054intr_do_preempt:
1055 rsm PSW_SM_I, %r0 /* disable interrupts */
1056
1057 /* current_thread_info()->preempt_count */
1058 mfctl %cr30, %r1
1059 LDREG TI_PRE_COUNT(%r1), %r19
1060 CMPIB<> 0, %r19, intr_restore /* if preempt_count > 0 */
1061 nop /* prev insn branched backwards */
1062
1063 /* check if we interrupted a critical path */
1064 LDREG PT_PSW(%r16), %r20
1065 bb,<,n %r20, 31 - PSW_SM_I, intr_restore
1066 nop
1067
1068 BL preempt_schedule_irq, %r2
1069 nop
1070
1071 b intr_restore /* ssm PSW_SM_I done by intr_restore */
1072#endif /* CONFIG_PREEMPT */
1040 1073
1041 .import do_signal,code 1074 .import do_signal,code
1042intr_do_signal: 1075intr_do_signal:
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S
index 9534ee17b9be..7a4f07e8d3c3 100644
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
@@ -621,9 +621,9 @@ __clear_user_page_asm:
621 621
622 .procend 622 .procend
623 623
624 .export flush_kernel_dcache_page 624 .export flush_kernel_dcache_page_asm
625 625
626flush_kernel_dcache_page: 626flush_kernel_dcache_page_asm:
627 .proc 627 .proc
628 .callinfo NO_CALLS 628 .callinfo NO_CALLS
629 .entry 629 .entry
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c
index 1d00c365f2b1..47ca5c0a323b 100644
--- a/arch/parisc/kernel/parisc_ksyms.c
+++ b/arch/parisc/kernel/parisc_ksyms.c
@@ -30,22 +30,7 @@
30#include <linux/syscalls.h> 30#include <linux/syscalls.h>
31 31
32#include <linux/string.h> 32#include <linux/string.h>
33EXPORT_SYMBOL(memchr);
34EXPORT_SYMBOL(memcmp);
35EXPORT_SYMBOL(memmove);
36EXPORT_SYMBOL(memscan);
37EXPORT_SYMBOL(memset); 33EXPORT_SYMBOL(memset);
38EXPORT_SYMBOL(strcat);
39EXPORT_SYMBOL(strchr);
40EXPORT_SYMBOL(strcmp);
41EXPORT_SYMBOL(strcpy);
42EXPORT_SYMBOL(strlen);
43EXPORT_SYMBOL(strncat);
44EXPORT_SYMBOL(strncmp);
45EXPORT_SYMBOL(strncpy);
46EXPORT_SYMBOL(strnlen);
47EXPORT_SYMBOL(strrchr);
48EXPORT_SYMBOL(strstr);
49EXPORT_SYMBOL(strpbrk); 34EXPORT_SYMBOL(strpbrk);
50 35
51#include <asm/atomic.h> 36#include <asm/atomic.h>
@@ -82,16 +67,12 @@ EXPORT_SYMBOL($global$);
82#endif 67#endif
83 68
84#include <asm/io.h> 69#include <asm/io.h>
85EXPORT_SYMBOL(__ioremap);
86EXPORT_SYMBOL(iounmap);
87EXPORT_SYMBOL(memcpy_toio); 70EXPORT_SYMBOL(memcpy_toio);
88EXPORT_SYMBOL(memcpy_fromio); 71EXPORT_SYMBOL(memcpy_fromio);
89EXPORT_SYMBOL(memset_io); 72EXPORT_SYMBOL(memset_io);
90 73
91#include <asm/unistd.h> 74#include <asm/unistd.h>
92EXPORT_SYMBOL(sys_open);
93EXPORT_SYMBOL(sys_lseek); 75EXPORT_SYMBOL(sys_lseek);
94EXPORT_SYMBOL(sys_read);
95EXPORT_SYMBOL(sys_write); 76EXPORT_SYMBOL(sys_write);
96 77
97#include <asm/semaphore.h> 78#include <asm/semaphore.h>
diff --git a/arch/parisc/kernel/pdc_chassis.c b/arch/parisc/kernel/pdc_chassis.c
index 0cea6958f427..a45e2e2ffd9f 100644
--- a/arch/parisc/kernel/pdc_chassis.c
+++ b/arch/parisc/kernel/pdc_chassis.c
@@ -5,9 +5,8 @@
5 * Copyright (C) 2002-2004 Thibaut VARENE <varenet@parisc-linux.org> 5 * Copyright (C) 2002-2004 Thibaut VARENE <varenet@parisc-linux.org>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License, version 2, as
9 * the Free Software Foundation; either version 2 of the License, or 9 * published by the Free Software Foundation.
10 * (at your option) any later version.
11 * 10 *
12 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c
index 53f861c82f93..ac8ee205c351 100644
--- a/arch/parisc/kernel/perf.c
+++ b/arch/parisc/kernel/perf.c
@@ -805,7 +805,7 @@ static int perf_write_image(uint64_t *memaddr)
805 return -1; 805 return -1;
806 } 806 }
807 807
808 runway = ioremap(cpu_device->hpa.start, 4096); 808 runway = ioremap_nocache(cpu_device->hpa.start, 4096);
809 809
810 /* Merge intrigue bits into Runway STATUS 0 */ 810 /* Merge intrigue bits into Runway STATUS 0 */
811 tmp64 = __raw_readq(runway + RUNWAY_STATUS) & 0xffecfffffffffffful; 811 tmp64 = __raw_readq(runway + RUNWAY_STATUS) & 0xffecfffffffffffful;
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 89b6c56ea0a8..bbeeb614cfab 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -287,7 +287,7 @@
287 ENTRY_SAME(chown) /* 180 */ 287 ENTRY_SAME(chown) /* 180 */
288 /* setsockopt() used by iptables: SO_SET_REPLACE/SO_SET_ADD_COUNTERS */ 288 /* setsockopt() used by iptables: SO_SET_REPLACE/SO_SET_ADD_COUNTERS */
289 ENTRY_COMP(setsockopt) 289 ENTRY_COMP(setsockopt)
290 ENTRY_SAME(getsockopt) 290 ENTRY_COMP(getsockopt)
291 ENTRY_COMP(sendmsg) 291 ENTRY_COMP(sendmsg)
292 ENTRY_COMP(recvmsg) 292 ENTRY_COMP(recvmsg)
293 ENTRY_SAME(semop) /* 185 */ 293 ENTRY_SAME(semop) /* 185 */
diff --git a/arch/parisc/lib/iomap.c b/arch/parisc/lib/iomap.c
index 01bec8fcbd0d..f4a811690ab3 100644
--- a/arch/parisc/lib/iomap.c
+++ b/arch/parisc/lib/iomap.c
@@ -263,11 +263,7 @@ static const struct iomap_ops iomem_ops = {
263 263
264const struct iomap_ops *iomap_ops[8] = { 264const struct iomap_ops *iomap_ops[8] = {
265 [0] = &ioport_ops, 265 [0] = &ioport_ops,
266#ifdef CONFIG_DEBUG_IOREMAP
267 [6] = &iomem_ops,
268#else
269 [7] = &iomem_ops 266 [7] = &iomem_ops
270#endif
271}; 267};
272 268
273 269
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 852eda3953dc..3796be67cd53 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -1013,9 +1013,9 @@ void flush_tlb_all(void)
1013#ifdef CONFIG_BLK_DEV_INITRD 1013#ifdef CONFIG_BLK_DEV_INITRD
1014void free_initrd_mem(unsigned long start, unsigned long end) 1014void free_initrd_mem(unsigned long start, unsigned long end)
1015{ 1015{
1016#if 0 1016 if (start >= end)
1017 if (start < end) 1017 return;
1018 printk(KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10); 1018 printk(KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
1019 for (; start < end; start += PAGE_SIZE) { 1019 for (; start < end; start += PAGE_SIZE) {
1020 ClearPageReserved(virt_to_page(start)); 1020 ClearPageReserved(virt_to_page(start));
1021 init_page_count(virt_to_page(start)); 1021 init_page_count(virt_to_page(start));
@@ -1023,6 +1023,5 @@ void free_initrd_mem(unsigned long start, unsigned long end)
1023 num_physpages++; 1023 num_physpages++;
1024 totalram_pages++; 1024 totalram_pages++;
1025 } 1025 }
1026#endif
1027} 1026}
1028#endif 1027#endif
diff --git a/arch/parisc/mm/ioremap.c b/arch/parisc/mm/ioremap.c
index edd9a9559cba..0db12818d7bc 100644
--- a/arch/parisc/mm/ioremap.c
+++ b/arch/parisc/mm/ioremap.c
@@ -72,7 +72,6 @@ remap_area_pmd(pmd_t *pmd, unsigned long address, unsigned long size,
72 return 0; 72 return 0;
73} 73}
74 74
75#if USE_HPPA_IOREMAP
76static int 75static int
77remap_area_pages(unsigned long address, unsigned long phys_addr, 76remap_area_pages(unsigned long address, unsigned long phys_addr,
78 unsigned long size, unsigned long flags) 77 unsigned long size, unsigned long flags)
@@ -114,31 +113,6 @@ remap_area_pages(unsigned long address, unsigned long phys_addr,
114 113
115 return error; 114 return error;
116} 115}
117#endif /* USE_HPPA_IOREMAP */
118
119#ifdef CONFIG_DEBUG_IOREMAP
120static unsigned long last = 0;
121
122void gsc_bad_addr(unsigned long addr)
123{
124 if (time_after(jiffies, last + HZ*10)) {
125 printk("gsc_foo() called with bad address 0x%lx\n", addr);
126 dump_stack();
127 last = jiffies;
128 }
129}
130EXPORT_SYMBOL(gsc_bad_addr);
131
132void __raw_bad_addr(const volatile void __iomem *addr)
133{
134 if (time_after(jiffies, last + HZ*10)) {
135 printk("__raw_foo() called with bad address 0x%p\n", addr);
136 dump_stack();
137 last = jiffies;
138 }
139}
140EXPORT_SYMBOL(__raw_bad_addr);
141#endif
142 116
143/* 117/*
144 * Generic mapping function (not visible outside): 118 * Generic mapping function (not visible outside):
@@ -154,26 +128,19 @@ EXPORT_SYMBOL(__raw_bad_addr);
154 */ 128 */
155void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags) 129void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags)
156{ 130{
157#if !(USE_HPPA_IOREMAP) 131 void *addr;
132 struct vm_struct *area;
133 unsigned long offset, last_addr;
158 134
135#ifdef CONFIG_EISA
159 unsigned long end = phys_addr + size - 1; 136 unsigned long end = phys_addr + size - 1;
160 /* Support EISA addresses */ 137 /* Support EISA addresses */
161 if ((phys_addr >= 0x00080000 && end < 0x000fffff) 138 if ((phys_addr >= 0x00080000 && end < 0x000fffff) ||
162 || (phys_addr >= 0x00500000 && end < 0x03bfffff)) { 139 (phys_addr >= 0x00500000 && end < 0x03bfffff)) {
163 phys_addr |= 0xfc000000; 140 phys_addr |= F_EXTEND(0xfc000000);
164 } 141 }
165
166#ifdef CONFIG_DEBUG_IOREMAP
167 return (void __iomem *)(phys_addr - (0x1UL << NYBBLE_SHIFT));
168#else
169 return (void __iomem *)phys_addr;
170#endif 142#endif
171 143
172#else
173 void *addr;
174 struct vm_struct *area;
175 unsigned long offset, last_addr;
176
177 /* Don't allow wraparound or zero size */ 144 /* Don't allow wraparound or zero size */
178 last_addr = phys_addr + size - 1; 145 last_addr = phys_addr + size - 1;
179 if (!size || last_addr < phys_addr) 146 if (!size || last_addr < phys_addr)
@@ -217,15 +184,12 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
217 } 184 }
218 185
219 return (void __iomem *) (offset + (char *)addr); 186 return (void __iomem *) (offset + (char *)addr);
220#endif
221} 187}
188EXPORT_SYMBOL(__ioremap);
222 189
223void iounmap(void __iomem *addr) 190void iounmap(void __iomem *addr)
224{ 191{
225#if !(USE_HPPA_IOREMAP)
226 return;
227#else
228 if (addr > high_memory) 192 if (addr > high_memory)
229 return vfree((void *) (PAGE_MASK & (unsigned long __force) addr)); 193 return vfree((void *) (PAGE_MASK & (unsigned long __force) addr));
230#endif
231} 194}
195EXPORT_SYMBOL(iounmap);
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-23 13:04:01 -0500