diff options
268 files changed, 3883 insertions, 3347 deletions
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt index 614de3124901..251168587899 100644 --- a/Documentation/filesystems/ntfs.txt +++ b/Documentation/filesystems/ntfs.txt | |||
| @@ -457,6 +457,12 @@ ChangeLog | |||
| 457 | 457 | ||
| 458 | Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog. | 458 | Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog. |
| 459 | 459 | ||
| 460 | 2.1.26: | ||
| 461 | - Implement support for sector sizes above 512 bytes (up to the maximum | ||
| 462 | supported by NTFS which is 4096 bytes). | ||
| 463 | - Enhance support for NTFS volumes which were supported by Windows but | ||
| 464 | not by Linux due to invalid attribute list attribute flags. | ||
| 465 | - A few minor updates and bug fixes. | ||
| 460 | 2.1.25: | 466 | 2.1.25: |
| 461 | - Write support is now extended with write(2) being able to both | 467 | - Write support is now extended with write(2) being able to both |
| 462 | overwrite existing file data and to extend files. Also, if a write | 468 | overwrite existing file data and to extend files. Also, if a write |
diff --git a/Documentation/filesystems/tmpfs.txt b/Documentation/filesystems/tmpfs.txt index 8a155418c705..1773106976a2 100644 --- a/Documentation/filesystems/tmpfs.txt +++ b/Documentation/filesystems/tmpfs.txt | |||
| @@ -92,6 +92,15 @@ NodeList format is a comma-separated list of decimal numbers and ranges, | |||
| 92 | a range being two hyphen-separated decimal numbers, the smallest and | 92 | a range being two hyphen-separated decimal numbers, the smallest and |
| 93 | largest node numbers in the range. For example, mpol=bind:0-3,5,7,9-15 | 93 | largest node numbers in the range. For example, mpol=bind:0-3,5,7,9-15 |
| 94 | 94 | ||
| 95 | Note that trying to mount a tmpfs with an mpol option will fail if the | ||
| 96 | running kernel does not support NUMA; and will fail if its nodelist | ||
| 97 | specifies a node >= MAX_NUMNODES. If your system relies on that tmpfs | ||
| 98 | being mounted, but from time to time runs a kernel built without NUMA | ||
| 99 | capability (perhaps a safe recovery kernel), or configured to support | ||
| 100 | fewer nodes, then it is advisable to omit the mpol option from automatic | ||
| 101 | mount options. It can be added later, when the tmpfs is already mounted | ||
| 102 | on MountPoint, by 'mount -o remount,mpol=Policy:NodeList MountPoint'. | ||
| 103 | |||
| 95 | 104 | ||
| 96 | To specify the initial root directory you can use the following mount | 105 | To specify the initial root directory you can use the following mount |
| 97 | options: | 106 | options: |
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index b874771385cd..75205391b335 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1034,6 +1034,8 @@ running once the system is up. | |||
| 1034 | 1034 | ||
| 1035 | nomce [IA-32] Machine Check Exception | 1035 | nomce [IA-32] Machine Check Exception |
| 1036 | 1036 | ||
| 1037 | nomca [IA-64] Disable machine check abort handling | ||
| 1038 | |||
| 1037 | noresidual [PPC] Don't use residual data on PReP machines. | 1039 | noresidual [PPC] Don't use residual data on PReP machines. |
| 1038 | 1040 | ||
| 1039 | noresume [SWSUSP] Disables resume and restores original swap | 1041 | noresume [SWSUSP] Disables resume and restores original swap |
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt index 153740f460a6..1921353259ae 100644 --- a/Documentation/x86_64/boot-options.txt +++ b/Documentation/x86_64/boot-options.txt | |||
| @@ -52,6 +52,10 @@ APICs | |||
| 52 | apicmaintimer. Useful when your PIT timer is totally | 52 | apicmaintimer. Useful when your PIT timer is totally |
| 53 | broken. | 53 | broken. |
| 54 | 54 | ||
| 55 | disable_8254_timer / enable_8254_timer | ||
| 56 | Enable interrupt 0 timer routing over the 8254 in addition to over | ||
| 57 | the IO-APIC. The kernel tries to set a sensible default. | ||
| 58 | |||
| 55 | Early Console | 59 | Early Console |
| 56 | 60 | ||
| 57 | syntax: earlyprintk=vga | 61 | syntax: earlyprintk=vga |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 16 | 3 | SUBLEVEL = 16 |
| 4 | EXTRAVERSION =-rc4 | 4 | EXTRAVERSION =-rc5 |
| 5 | NAME=Sliding Snow Leopard | 5 | NAME=Sliding Snow Leopard |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/arm/mach-at91rm9200/gpio.c b/arch/arm/mach-at91rm9200/gpio.c index a9f718bf8ba8..0e396feec468 100644 --- a/arch/arm/mach-at91rm9200/gpio.c +++ b/arch/arm/mach-at91rm9200/gpio.c | |||
| @@ -274,8 +274,18 @@ static void gpio_irq_handler(unsigned irq, struct irqdesc *desc, struct pt_regs | |||
| 274 | gpio = &irq_desc[pin]; | 274 | gpio = &irq_desc[pin]; |
| 275 | 275 | ||
| 276 | while (isr) { | 276 | while (isr) { |
| 277 | if (isr & 1) | 277 | if (isr & 1) { |
| 278 | gpio->handle(pin, gpio, regs); | 278 | if (unlikely(gpio->disable_depth)) { |
| 279 | /* | ||
| 280 | * The core ARM interrupt handler lazily disables IRQs so | ||
| 281 | * another IRQ must be generated before it actually gets | ||
| 282 | * here to be disabled on the GPIO controller. | ||
| 283 | */ | ||
| 284 | gpio_irq_mask(pin); | ||
| 285 | } | ||
| 286 | else | ||
| 287 | gpio->handle(pin, gpio, regs); | ||
| 288 | } | ||
| 279 | pin++; | 289 | pin++; |
| 280 | gpio++; | 290 | gpio++; |
| 281 | isr >>= 1; | 291 | isr >>= 1; |
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 0afec8566e7b..5b1a7d46d1d9 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
| @@ -733,7 +733,7 @@ config PHYSICAL_START | |||
| 733 | 733 | ||
| 734 | config HOTPLUG_CPU | 734 | config HOTPLUG_CPU |
| 735 | bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" | 735 | bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" |
| 736 | depends on SMP && HOTPLUG && EXPERIMENTAL | 736 | depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER |
| 737 | ---help--- | 737 | ---help--- |
| 738 | Say Y here to experiment with turning CPUs off and on. CPUs | 738 | Say Y here to experiment with turning CPUs off and on. CPUs |
| 739 | can be controlled through /sys/devices/system/cpu. | 739 | can be controlled through /sys/devices/system/cpu. |
| @@ -1060,6 +1060,7 @@ source "arch/i386/oprofile/Kconfig" | |||
| 1060 | 1060 | ||
| 1061 | config KPROBES | 1061 | config KPROBES |
| 1062 | bool "Kprobes (EXPERIMENTAL)" | 1062 | bool "Kprobes (EXPERIMENTAL)" |
| 1063 | depends on EXPERIMENTAL && MODULES | ||
| 1063 | help | 1064 | help |
| 1064 | Kprobes allows you to trap at almost any kernel address and | 1065 | Kprobes allows you to trap at almost any kernel address and |
| 1065 | execute a callback function. register_kprobe() establishes | 1066 | execute a callback function. register_kprobe() establishes |
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 60c3f76dfca4..53bb9a79e274 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile | |||
| @@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.lds | |||
| 7 | obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \ | 7 | obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \ |
| 8 | ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \ | 8 | ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \ |
| 9 | pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \ | 9 | pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \ |
| 10 | quirks.o i8237.o | 10 | quirks.o i8237.o topology.o |
| 11 | 11 | ||
| 12 | obj-y += cpu/ | 12 | obj-y += cpu/ |
| 13 | obj-y += timers/ | 13 | obj-y += timers/ |
diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c index 7eb9213734a3..4ecd4b326ded 100644 --- a/arch/i386/kernel/cpu/common.c +++ b/arch/i386/kernel/cpu/common.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include <linux/smp.h> | 4 | #include <linux/smp.h> |
| 5 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 6 | #include <linux/percpu.h> | 6 | #include <linux/percpu.h> |
| 7 | #include <linux/bootmem.h> | ||
| 7 | #include <asm/semaphore.h> | 8 | #include <asm/semaphore.h> |
| 8 | #include <asm/processor.h> | 9 | #include <asm/processor.h> |
| 9 | #include <asm/i387.h> | 10 | #include <asm/i387.h> |
| @@ -18,6 +19,9 @@ | |||
| 18 | 19 | ||
| 19 | #include "cpu.h" | 20 | #include "cpu.h" |
| 20 | 21 | ||
| 22 | DEFINE_PER_CPU(struct Xgt_desc_struct, cpu_gdt_descr); | ||
| 23 | EXPORT_PER_CPU_SYMBOL(cpu_gdt_descr); | ||
| 24 | |||
| 21 | DEFINE_PER_CPU(unsigned char, cpu_16bit_stack[CPU_16BIT_STACK_SIZE]); | 25 | DEFINE_PER_CPU(unsigned char, cpu_16bit_stack[CPU_16BIT_STACK_SIZE]); |
| 22 | EXPORT_PER_CPU_SYMBOL(cpu_16bit_stack); | 26 | EXPORT_PER_CPU_SYMBOL(cpu_16bit_stack); |
| 23 | 27 | ||
| @@ -571,8 +575,9 @@ void __devinit cpu_init(void) | |||
| 571 | int cpu = smp_processor_id(); | 575 | int cpu = smp_processor_id(); |
| 572 | struct tss_struct * t = &per_cpu(init_tss, cpu); | 576 | struct tss_struct * t = &per_cpu(init_tss, cpu); |
| 573 | struct thread_struct *thread = ¤t->thread; | 577 | struct thread_struct *thread = ¤t->thread; |
| 574 | struct desc_struct *gdt = get_cpu_gdt_table(cpu); | 578 | struct desc_struct *gdt; |
| 575 | __u32 stk16_off = (__u32)&per_cpu(cpu_16bit_stack, cpu); | 579 | __u32 stk16_off = (__u32)&per_cpu(cpu_16bit_stack, cpu); |
| 580 | struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, cpu); | ||
| 576 | 581 | ||
| 577 | if (cpu_test_and_set(cpu, cpu_initialized)) { | 582 | if (cpu_test_and_set(cpu, cpu_initialized)) { |
| 578 | printk(KERN_WARNING "CPU#%d already initialized!\n", cpu); | 583 | printk(KERN_WARNING "CPU#%d already initialized!\n", cpu); |
| @@ -590,6 +595,25 @@ void __devinit cpu_init(void) | |||
| 590 | } | 595 | } |
| 591 | 596 | ||
| 592 | /* | 597 | /* |
| 598 | * This is a horrible hack to allocate the GDT. The problem | ||
| 599 | * is that cpu_init() is called really early for the boot CPU | ||
| 600 | * (and hence needs bootmem) but much later for the secondary | ||
| 601 | * CPUs, when bootmem will have gone away | ||
| 602 | */ | ||
| 603 | if (NODE_DATA(0)->bdata->node_bootmem_map) { | ||
| 604 | gdt = (struct desc_struct *)alloc_bootmem_pages(PAGE_SIZE); | ||
| 605 | /* alloc_bootmem_pages panics on failure, so no check */ | ||
| 606 | memset(gdt, 0, PAGE_SIZE); | ||
| 607 | } else { | ||
| 608 | gdt = (struct desc_struct *)get_zeroed_page(GFP_KERNEL); | ||
| 609 | if (unlikely(!gdt)) { | ||
| 610 | printk(KERN_CRIT "CPU%d failed to allocate GDT\n", cpu); | ||
| 611 | for (;;) | ||
| 612 | local_irq_enable(); | ||
| 613 | } | ||
| 614 | } | ||
| 615 | |||
| 616 | /* | ||
| 593 | * Initialize the per-CPU GDT with the boot GDT, | 617 | * Initialize the per-CPU GDT with the boot GDT, |
| 594 | * and set up the GDT descriptor: | 618 | * and set up the GDT descriptor: |
| 595 | */ | 619 | */ |
| @@ -601,10 +625,10 @@ void __devinit cpu_init(void) | |||
| 601 | ((((__u64)stk16_off) << 32) & 0xff00000000000000ULL) | | 625 | ((((__u64)stk16_off) << 32) & 0xff00000000000000ULL) | |
| 602 | (CPU_16BIT_STACK_SIZE - 1); | 626 | (CPU_16BIT_STACK_SIZE - 1); |
| 603 | 627 | ||
| 604 | cpu_gdt_descr[cpu].size = GDT_SIZE - 1; | 628 | cpu_gdt_descr->size = GDT_SIZE - 1; |
| 605 | cpu_gdt_descr[cpu].address = (unsigned long)gdt; | 629 | cpu_gdt_descr->address = (unsigned long)gdt; |
| 606 | 630 | ||
| 607 | load_gdt(&cpu_gdt_descr[cpu]); | 631 | load_gdt(cpu_gdt_descr); |
| 608 | load_idt(&idt_descr); | 632 | load_idt(&idt_descr); |
| 609 | 633 | ||
| 610 | /* | 634 | /* |
diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c index ecad519fd395..e3e42fd62401 100644 --- a/arch/i386/kernel/efi.c +++ b/arch/i386/kernel/efi.c | |||
| @@ -103,17 +103,19 @@ static void efi_call_phys_prelog(void) | |||
| 103 | */ | 103 | */ |
| 104 | local_flush_tlb(); | 104 | local_flush_tlb(); |
| 105 | 105 | ||
| 106 | cpu_gdt_descr[0].address = __pa(cpu_gdt_descr[0].address); | 106 | per_cpu(cpu_gdt_descr, 0).address = |
| 107 | load_gdt((struct Xgt_desc_struct *) __pa(&cpu_gdt_descr[0])); | 107 | __pa(per_cpu(cpu_gdt_descr, 0).address); |
| 108 | load_gdt((struct Xgt_desc_struct *)__pa(&per_cpu(cpu_gdt_descr, 0))); | ||
| 108 | } | 109 | } |
| 109 | 110 | ||
| 110 | static void efi_call_phys_epilog(void) | 111 | static void efi_call_phys_epilog(void) |
| 111 | { | 112 | { |
| 112 | unsigned long cr4; | 113 | unsigned long cr4; |
| 113 | 114 | ||
| 114 | cpu_gdt_descr[0].address = | 115 | per_cpu(cpu_gdt_descr, 0).address = |
| 115 | (unsigned long) __va(cpu_gdt_descr[0].address); | 116 | (unsigned long)__va(per_cpu(cpu_gdt_descr, 0).address); |
| 116 | load_gdt(&cpu_gdt_descr[0]); | 117 | load_gdt((struct Xgt_desc_struct *)__va(&per_cpu(cpu_gdt_descr, 0))); |
| 118 | |||
| 117 | cr4 = read_cr4(); | 119 | cr4 = read_cr4(); |
| 118 | 120 | ||
| 119 | if (cr4 & X86_CR4_PSE) { | 121 | if (cr4 & X86_CR4_PSE) { |
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S index 2bee6499edd9..e0b7c632efbc 100644 --- a/arch/i386/kernel/head.S +++ b/arch/i386/kernel/head.S | |||
| @@ -534,5 +534,3 @@ ENTRY(cpu_gdt_table) | |||
| 534 | .quad 0x0000000000000000 /* 0xf0 - unused */ | 534 | .quad 0x0000000000000000 /* 0xf0 - unused */ |
| 535 | .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */ | 535 | .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */ |
| 536 | 536 | ||
| 537 | /* Be sure this is zeroed to avoid false validations in Xen */ | ||
| 538 | .fill PAGE_SIZE_asm / 8 - GDT_ENTRIES,8,0 | ||
diff --git a/arch/i386/kernel/i386_ksyms.c b/arch/i386/kernel/i386_ksyms.c index 3999bec50c33..055325056a74 100644 --- a/arch/i386/kernel/i386_ksyms.c +++ b/arch/i386/kernel/i386_ksyms.c | |||
| @@ -3,8 +3,6 @@ | |||
| 3 | #include <asm/checksum.h> | 3 | #include <asm/checksum.h> |
| 4 | #include <asm/desc.h> | 4 | #include <asm/desc.h> |
| 5 | 5 | ||
| 6 | EXPORT_SYMBOL_GPL(cpu_gdt_descr); | ||
| 7 | |||
| 8 | EXPORT_SYMBOL(__down_failed); | 6 | EXPORT_SYMBOL(__down_failed); |
| 9 | EXPORT_SYMBOL(__down_failed_interruptible); | 7 | EXPORT_SYMBOL(__down_failed_interruptible); |
| 10 | EXPORT_SYMBOL(__down_failed_trylock); | 8 | EXPORT_SYMBOL(__down_failed_trylock); |
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index f2dd218d88cb..235822b3f41b 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c | |||
| @@ -2566,8 +2566,10 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id) | |||
| 2566 | spin_unlock_irqrestore(&ioapic_lock, flags); | 2566 | spin_unlock_irqrestore(&ioapic_lock, flags); |
| 2567 | 2567 | ||
| 2568 | /* Sanity check */ | 2568 | /* Sanity check */ |
| 2569 | if (reg_00.bits.ID != apic_id) | 2569 | if (reg_00.bits.ID != apic_id) { |
| 2570 | panic("IOAPIC[%d]: Unable change apic_id!\n", ioapic); | 2570 | printk("IOAPIC[%d]: Unable to change apic_id!\n", ioapic); |
| 2571 | return -1; | ||
| 2572 | } | ||
| 2571 | } | 2573 | } |
| 2572 | 2574 | ||
| 2573 | apic_printk(APIC_VERBOSE, KERN_INFO | 2575 | apic_printk(APIC_VERBOSE, KERN_INFO |
diff --git a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c index 6483eeb1a4e8..694a13997637 100644 --- a/arch/i386/kernel/kprobes.c +++ b/arch/i386/kernel/kprobes.c | |||
| @@ -58,6 +58,11 @@ static inline int is_IF_modifier(kprobe_opcode_t opcode) | |||
| 58 | 58 | ||
| 59 | int __kprobes arch_prepare_kprobe(struct kprobe *p) | 59 | int __kprobes arch_prepare_kprobe(struct kprobe *p) |
| 60 | { | 60 | { |
| 61 | /* insn: must be on special executable page on i386. */ | ||
| 62 | p->ainsn.insn = get_insn_slot(); | ||
| 63 | if (!p->ainsn.insn) | ||
| 64 | return -ENOMEM; | ||
| 65 | |||
| 61 | memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t)); | 66 | memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t)); |
| 62 | p->opcode = *p->addr; | 67 | p->opcode = *p->addr; |
| 63 | return 0; | 68 | return 0; |
| @@ -77,6 +82,13 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p) | |||
| 77 | (unsigned long) p->addr + sizeof(kprobe_opcode_t)); | 82 | (unsigned long) p->addr + sizeof(kprobe_opcode_t)); |
| 78 | } | 83 | } |
| 79 | 84 | ||
| 85 | void __kprobes arch_remove_kprobe(struct kprobe *p) | ||
| 86 | { | ||
| 87 | down(&kprobe_mutex); | ||
| 88 | free_insn_slot(p->ainsn.insn); | ||
| 89 | up(&kprobe_mutex); | ||
| 90 | } | ||
| 91 | |||
| 80 | static inline void save_previous_kprobe(struct kprobe_ctlblk *kcb) | 92 | static inline void save_previous_kprobe(struct kprobe_ctlblk *kcb) |
| 81 | { | 93 | { |
| 82 | kcb->prev_kprobe.kp = kprobe_running(); | 94 | kcb->prev_kprobe.kp = kprobe_running(); |
| @@ -111,7 +123,7 @@ static inline void prepare_singlestep(struct kprobe *p, struct pt_regs *regs) | |||
| 111 | if (p->opcode == BREAKPOINT_INSTRUCTION) | 123 | if (p->opcode == BREAKPOINT_INSTRUCTION) |
| 112 | regs->eip = (unsigned long)p->addr; | 124 | regs->eip = (unsigned long)p->addr; |
| 113 | else | 125 | else |
| 114 | regs->eip = (unsigned long)&p->ainsn.insn; | 126 | regs->eip = (unsigned long)p->ainsn.insn; |
| 115 | } | 127 | } |
| 116 | 128 | ||
| 117 | /* Called with kretprobe_lock held */ | 129 | /* Called with kretprobe_lock held */ |
| @@ -351,7 +363,7 @@ static void __kprobes resume_execution(struct kprobe *p, | |||
| 351 | { | 363 | { |
| 352 | unsigned long *tos = (unsigned long *)®s->esp; | 364 | unsigned long *tos = (unsigned long *)®s->esp; |
| 353 | unsigned long next_eip = 0; | 365 | unsigned long next_eip = 0; |
| 354 | unsigned long copy_eip = (unsigned long)&p->ainsn.insn; | 366 | unsigned long copy_eip = (unsigned long)p->ainsn.insn; |
| 355 | unsigned long orig_eip = (unsigned long)p->addr; | 367 | unsigned long orig_eip = (unsigned long)p->addr; |
| 356 | 368 | ||
| 357 | switch (p->ainsn.insn[0]) { | 369 | switch (p->ainsn.insn[0]) { |
diff --git a/arch/i386/kernel/microcode.c b/arch/i386/kernel/microcode.c index d3fdf0057d82..5390b521aca0 100644 --- a/arch/i386/kernel/microcode.c +++ b/arch/i386/kernel/microcode.c | |||
| @@ -74,6 +74,7 @@ | |||
| 74 | #include <linux/kernel.h> | 74 | #include <linux/kernel.h> |
| 75 | #include <linux/init.h> | 75 | #include <linux/init.h> |
| 76 | #include <linux/sched.h> | 76 | #include <linux/sched.h> |
| 77 | #include <linux/cpumask.h> | ||
| 77 | #include <linux/module.h> | 78 | #include <linux/module.h> |
| 78 | #include <linux/slab.h> | 79 | #include <linux/slab.h> |
| 79 | #include <linux/vmalloc.h> | 80 | #include <linux/vmalloc.h> |
| @@ -250,8 +251,8 @@ static int find_matching_ucodes (void) | |||
| 250 | error = -EINVAL; | 251 | error = -EINVAL; |
| 251 | goto out; | 252 | goto out; |
| 252 | } | 253 | } |
| 253 | 254 | ||
| 254 | for (cpu_num = 0; cpu_num < num_online_cpus(); cpu_num++) { | 255 | for_each_online_cpu(cpu_num) { |
| 255 | struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; | 256 | struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; |
| 256 | if (uci->err != MC_NOTFOUND) /* already found a match or not an online cpu*/ | 257 | if (uci->err != MC_NOTFOUND) /* already found a match or not an online cpu*/ |
| 257 | continue; | 258 | continue; |
| @@ -293,7 +294,7 @@ static int find_matching_ucodes (void) | |||
| 293 | error = -EFAULT; | 294 | error = -EFAULT; |
| 294 | goto out; | 295 | goto out; |
| 295 | } | 296 | } |
| 296 | for (cpu_num = 0; cpu_num < num_online_cpus(); cpu_num++) { | 297 | for_each_online_cpu(cpu_num) { |
| 297 | struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; | 298 | struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; |
| 298 | if (uci->err != MC_NOTFOUND) /* already found a match or not an online cpu*/ | 299 | if (uci->err != MC_NOTFOUND) /* already found a match or not an online cpu*/ |
| 299 | continue; | 300 | continue; |
| @@ -304,7 +305,9 @@ static int find_matching_ucodes (void) | |||
| 304 | } | 305 | } |
| 305 | } | 306 | } |
| 306 | /* now check if any cpu has matched */ | 307 | /* now check if any cpu has matched */ |
| 307 | for (cpu_num = 0, allocated_flag = 0, sum = 0; cpu_num < num_online_cpus(); cpu_num++) { | 308 | allocated_flag = 0; |
| 309 | sum = 0; | ||
| 310 | for_each_online_cpu(cpu_num) { | ||
| 308 | if (ucode_cpu_info[cpu_num].err == MC_MARKED) { | 311 | if (ucode_cpu_info[cpu_num].err == MC_MARKED) { |
| 309 | struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; | 312 | struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num; |
| 310 | if (!allocated_flag) { | 313 | if (!allocated_flag) { |
| @@ -415,12 +418,12 @@ static int do_microcode_update (void) | |||
| 415 | } | 418 | } |
| 416 | 419 | ||
| 417 | out_free: | 420 | out_free: |
| 418 | for (i = 0; i < num_online_cpus(); i++) { | 421 | for_each_online_cpu(i) { |
| 419 | if (ucode_cpu_info[i].mc) { | 422 | if (ucode_cpu_info[i].mc) { |
| 420 | int j; | 423 | int j; |
| 421 | void *tmp = ucode_cpu_info[i].mc; | 424 | void *tmp = ucode_cpu_info[i].mc; |
| 422 | vfree(tmp); | 425 | vfree(tmp); |
| 423 | for (j = i; j < num_online_cpus(); j++) { | 426 | for_each_online_cpu(j) { |
| 424 | if (ucode_cpu_info[j].mc == tmp) | 427 | if (ucode_cpu_info[j].mc == tmp) |
| 425 | ucode_cpu_info[j].mc = NULL; | 428 | ucode_cpu_info[j].mc = NULL; |
| 426 | } | 429 | } |
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c index e7609abf3796..e6e2f43db85e 100644 --- a/arch/i386/kernel/mpparse.c +++ b/arch/i386/kernel/mpparse.c | |||
| @@ -915,6 +915,7 @@ void __init mp_register_ioapic ( | |||
| 915 | u32 gsi_base) | 915 | u32 gsi_base) |
| 916 | { | 916 | { |
| 917 | int idx = 0; | 917 | int idx = 0; |
| 918 | int tmpid; | ||
| 918 | 919 | ||
| 919 | if (nr_ioapics >= MAX_IO_APICS) { | 920 | if (nr_ioapics >= MAX_IO_APICS) { |
| 920 | printk(KERN_ERR "ERROR: Max # of I/O APICs (%d) exceeded " | 921 | printk(KERN_ERR "ERROR: Max # of I/O APICs (%d) exceeded " |
| @@ -935,9 +936,14 @@ void __init mp_register_ioapic ( | |||
| 935 | 936 | ||
| 936 | set_fixmap_nocache(FIX_IO_APIC_BASE_0 + idx, address); | 937 | set_fixmap_nocache(FIX_IO_APIC_BASE_0 + idx, address); |
| 937 | if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && (boot_cpu_data.x86 < 15)) | 938 | if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && (boot_cpu_data.x86 < 15)) |
| 938 | mp_ioapics[idx].mpc_apicid = io_apic_get_unique_id(idx, id); | 939 | tmpid = io_apic_get_unique_id(idx, id); |
| 939 | else | 940 | else |
| 940 | mp_ioapics[idx].mpc_apicid = id; | 941 | tmpid = id; |
| 942 | if (tmpid == -1) { | ||
| 943 | nr_ioapics--; | ||
| 944 | return; | ||
| 945 | } | ||
| 946 | mp_ioapics[idx].mpc_apicid = tmpid; | ||
| 941 | mp_ioapics[idx].mpc_apicver = io_apic_get_version(idx); | 947 | mp_ioapics[idx].mpc_apicver = io_apic_get_version(idx); |
| 942 | 948 | ||
| 943 | /* | 949 | /* |
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c index fb00ab7b7612..eba7f53f8b4a 100644 --- a/arch/i386/kernel/smpboot.c +++ b/arch/i386/kernel/smpboot.c | |||
| @@ -898,12 +898,6 @@ static int __devinit do_boot_cpu(int apicid, int cpu) | |||
| 898 | unsigned long start_eip; | 898 | unsigned long start_eip; |
| 899 | unsigned short nmi_high = 0, nmi_low = 0; | 899 | unsigned short nmi_high = 0, nmi_low = 0; |
| 900 | 900 | ||
| 901 | if (!cpu_gdt_descr[cpu].address && | ||
| 902 | !(cpu_gdt_descr[cpu].address = get_zeroed_page(GFP_KERNEL))) { | ||
| 903 | printk("Failed to allocate GDT for CPU %d\n", cpu); | ||
| 904 | return 1; | ||
| 905 | } | ||
| 906 | |||
| 907 | ++cpucount; | 901 | ++cpucount; |
| 908 | 902 | ||
| 909 | /* | 903 | /* |
diff --git a/arch/i386/mach-default/topology.c b/arch/i386/kernel/topology.c index b64314069e78..67a0e1baa28b 100644 --- a/arch/i386/mach-default/topology.c +++ b/arch/i386/kernel/topology.c | |||
| @@ -1,12 +1,12 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/i386/mach-generic/topology.c - Populate driverfs with topology information | 2 | * arch/i386/kernel/topology.c - Populate driverfs with topology information |
| 3 | * | 3 | * |
| 4 | * Written by: Matthew Dobson, IBM Corporation | 4 | * Written by: Matthew Dobson, IBM Corporation |
| 5 | * Original Code: Paul Dorwin, IBM Corporation, Patrick Mochel, OSDL | 5 | * Original Code: Paul Dorwin, IBM Corporation, Patrick Mochel, OSDL |
| 6 | * | 6 | * |
| 7 | * Copyright (C) 2002, IBM Corp. | 7 | * Copyright (C) 2002, IBM Corp. |
| 8 | * | 8 | * |
| 9 | * All rights reserved. | 9 | * All rights reserved. |
| 10 | * | 10 | * |
| 11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
| 12 | * it under the terms of the GNU General Public License as published by | 12 | * it under the terms of the GNU General Public License as published by |
| @@ -34,7 +34,7 @@ static struct i386_cpu cpu_devices[NR_CPUS]; | |||
| 34 | 34 | ||
| 35 | int arch_register_cpu(int num){ | 35 | int arch_register_cpu(int num){ |
| 36 | struct node *parent = NULL; | 36 | struct node *parent = NULL; |
| 37 | 37 | ||
| 38 | #ifdef CONFIG_NUMA | 38 | #ifdef CONFIG_NUMA |
| 39 | int node = cpu_to_node(num); | 39 | int node = cpu_to_node(num); |
| 40 | if (node_online(node)) | 40 | if (node_online(node)) |
diff --git a/arch/i386/mach-default/Makefile b/arch/i386/mach-default/Makefile index e95bb0237921..012fe34459e6 100644 --- a/arch/i386/mach-default/Makefile +++ b/arch/i386/mach-default/Makefile | |||
| @@ -2,4 +2,4 @@ | |||
| 2 | # Makefile for the linux kernel. | 2 | # Makefile for the linux kernel. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y := setup.o topology.o | 5 | obj-y := setup.o |
diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/i386/mach-voyager/voyager_basic.c index aa49a33a572c..b584060ec004 100644 --- a/arch/i386/mach-voyager/voyager_basic.c +++ b/arch/i386/mach-voyager/voyager_basic.c | |||
| @@ -23,6 +23,8 @@ | |||
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/reboot.h> | 24 | #include <linux/reboot.h> |
| 25 | #include <linux/sysrq.h> | 25 | #include <linux/sysrq.h> |
| 26 | #include <linux/smp.h> | ||
| 27 | #include <linux/nodemask.h> | ||
| 26 | #include <asm/io.h> | 28 | #include <asm/io.h> |
| 27 | #include <asm/voyager.h> | 29 | #include <asm/voyager.h> |
| 28 | #include <asm/vic.h> | 30 | #include <asm/vic.h> |
| @@ -328,4 +330,3 @@ void machine_power_off(void) | |||
| 328 | if (pm_power_off) | 330 | if (pm_power_off) |
| 329 | pm_power_off(); | 331 | pm_power_off(); |
| 330 | } | 332 | } |
| 331 | |||
diff --git a/arch/i386/mach-voyager/voyager_smp.c b/arch/i386/mach-voyager/voyager_smp.c index 6e4c3baef6cc..8165626a5c30 100644 --- a/arch/i386/mach-voyager/voyager_smp.c +++ b/arch/i386/mach-voyager/voyager_smp.c | |||
| @@ -402,6 +402,7 @@ find_smp_config(void) | |||
| 402 | cpus_addr(phys_cpu_present_map)[0] |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 1) << 8; | 402 | cpus_addr(phys_cpu_present_map)[0] |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 1) << 8; |
| 403 | cpus_addr(phys_cpu_present_map)[0] |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 2) << 16; | 403 | cpus_addr(phys_cpu_present_map)[0] |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 2) << 16; |
| 404 | cpus_addr(phys_cpu_present_map)[0] |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 3) << 24; | 404 | cpus_addr(phys_cpu_present_map)[0] |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 3) << 24; |
| 405 | cpu_possible_map = phys_cpu_present_map; | ||
| 405 | printk("VOYAGER SMP: phys_cpu_present_map = 0x%lx\n", cpus_addr(phys_cpu_present_map)[0]); | 406 | printk("VOYAGER SMP: phys_cpu_present_map = 0x%lx\n", cpus_addr(phys_cpu_present_map)[0]); |
| 406 | /* Here we set up the VIC to enable SMP */ | 407 | /* Here we set up the VIC to enable SMP */ |
| 407 | /* enable the CPIs by writing the base vector to their register */ | 408 | /* enable the CPIs by writing the base vector to their register */ |
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 845cd0902a50..a85ea9d37f05 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -453,6 +453,7 @@ source "arch/ia64/oprofile/Kconfig" | |||
| 453 | 453 | ||
| 454 | config KPROBES | 454 | config KPROBES |
| 455 | bool "Kprobes (EXPERIMENTAL)" | 455 | bool "Kprobes (EXPERIMENTAL)" |
| 456 | depends on EXPERIMENTAL && MODULES | ||
| 456 | help | 457 | help |
| 457 | Kprobes allows you to trap at almost any kernel address and | 458 | Kprobes allows you to trap at almost any kernel address and |
| 458 | execute a callback function. register_kprobe() establishes | 459 | execute a callback function. register_kprobe() establishes |
diff --git a/arch/ia64/configs/bigsur_defconfig b/arch/ia64/configs/bigsur_defconfig index b40672bb3ab0..90e9c2e61bf4 100644 --- a/arch/ia64/configs/bigsur_defconfig +++ b/arch/ia64/configs/bigsur_defconfig | |||
| @@ -1,14 +1,13 @@ | |||
| 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-rc1 | 3 | # Linux kernel version: 2.6.16-rc5 |
| 4 | # Wed Sep 14 15:18:49 2005 | 4 | # Mon Feb 27 16:10:42 2006 |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | # | 7 | # |
| 8 | # Code maturity level options | 8 | # Code maturity level options |
| 9 | # | 9 | # |
| 10 | CONFIG_EXPERIMENTAL=y | 10 | CONFIG_EXPERIMENTAL=y |
| 11 | CONFIG_CLEAN_COMPILE=y | ||
| 12 | CONFIG_LOCK_KERNEL=y | 11 | CONFIG_LOCK_KERNEL=y |
| 13 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 12 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 14 | 13 | ||
| @@ -23,17 +22,18 @@ CONFIG_POSIX_MQUEUE=y | |||
| 23 | # CONFIG_BSD_PROCESS_ACCT is not set | 22 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 24 | CONFIG_SYSCTL=y | 23 | CONFIG_SYSCTL=y |
| 25 | # CONFIG_AUDIT is not set | 24 | # CONFIG_AUDIT is not set |
| 26 | CONFIG_HOTPLUG=y | ||
| 27 | CONFIG_KOBJECT_UEVENT=y | ||
| 28 | # CONFIG_IKCONFIG is not set | 25 | # CONFIG_IKCONFIG is not set |
| 29 | # CONFIG_CPUSETS is not set | 26 | # CONFIG_CPUSETS is not set |
| 30 | CONFIG_INITRAMFS_SOURCE="" | 27 | CONFIG_INITRAMFS_SOURCE="" |
| 28 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 31 | # CONFIG_EMBEDDED is not set | 29 | # CONFIG_EMBEDDED is not set |
| 32 | CONFIG_KALLSYMS=y | 30 | CONFIG_KALLSYMS=y |
| 33 | # CONFIG_KALLSYMS_ALL is not set | 31 | # CONFIG_KALLSYMS_ALL is not set |
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 32 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 33 | CONFIG_HOTPLUG=y | ||
| 35 | CONFIG_PRINTK=y | 34 | CONFIG_PRINTK=y |
| 36 | CONFIG_BUG=y | 35 | CONFIG_BUG=y |
| 36 | CONFIG_ELF_CORE=y | ||
| 37 | CONFIG_BASE_FULL=y | 37 | CONFIG_BASE_FULL=y |
| 38 | CONFIG_FUTEX=y | 38 | CONFIG_FUTEX=y |
| 39 | CONFIG_EPOLL=y | 39 | CONFIG_EPOLL=y |
| @@ -42,8 +42,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 | |||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | 42 | CONFIG_CC_ALIGN_LABELS=0 |
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | 43 | CONFIG_CC_ALIGN_LOOPS=0 |
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | 44 | CONFIG_CC_ALIGN_JUMPS=0 |
| 45 | CONFIG_SLAB=y | ||
| 45 | # CONFIG_TINY_SHMEM is not set | 46 | # CONFIG_TINY_SHMEM is not set |
| 46 | CONFIG_BASE_SMALL=0 | 47 | CONFIG_BASE_SMALL=0 |
| 48 | # CONFIG_SLOB is not set | ||
| 47 | 49 | ||
| 48 | # | 50 | # |
| 49 | # Loadable module support | 51 | # Loadable module support |
| @@ -58,17 +60,36 @@ CONFIG_KMOD=y | |||
| 58 | CONFIG_STOP_MACHINE=y | 60 | CONFIG_STOP_MACHINE=y |
| 59 | 61 | ||
| 60 | # | 62 | # |
| 63 | # Block layer | ||
| 64 | # | ||
| 65 | |||
| 66 | # | ||
| 67 | # IO Schedulers | ||
| 68 | # | ||
| 69 | CONFIG_IOSCHED_NOOP=y | ||
| 70 | CONFIG_IOSCHED_AS=y | ||
| 71 | CONFIG_IOSCHED_DEADLINE=y | ||
| 72 | CONFIG_IOSCHED_CFQ=y | ||
| 73 | CONFIG_DEFAULT_AS=y | ||
| 74 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 75 | # CONFIG_DEFAULT_CFQ is not set | ||
| 76 | # CONFIG_DEFAULT_NOOP is not set | ||
| 77 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 78 | |||
| 79 | # | ||
| 61 | # Processor type and features | 80 | # Processor type and features |
| 62 | # | 81 | # |
| 63 | CONFIG_IA64=y | 82 | CONFIG_IA64=y |
| 64 | CONFIG_64BIT=y | 83 | CONFIG_64BIT=y |
| 65 | CONFIG_MMU=y | 84 | CONFIG_MMU=y |
| 85 | CONFIG_SWIOTLB=y | ||
| 66 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 86 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 87 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_TIME_INTERPOLATION=y | 88 | CONFIG_TIME_INTERPOLATION=y |
| 69 | CONFIG_EFI=y | 89 | CONFIG_EFI=y |
| 70 | CONFIG_GENERIC_IOMAP=y | 90 | CONFIG_GENERIC_IOMAP=y |
| 71 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 91 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 92 | CONFIG_DMA_IS_DMA32=y | ||
| 72 | # CONFIG_IA64_GENERIC is not set | 93 | # CONFIG_IA64_GENERIC is not set |
| 73 | CONFIG_IA64_DIG=y | 94 | CONFIG_IA64_DIG=y |
| 74 | # CONFIG_IA64_HP_ZX1 is not set | 95 | # CONFIG_IA64_HP_ZX1 is not set |
| @@ -81,18 +102,17 @@ CONFIG_ITANIUM=y | |||
| 81 | # CONFIG_IA64_PAGE_SIZE_8KB is not set | 102 | # CONFIG_IA64_PAGE_SIZE_8KB is not set |
| 82 | CONFIG_IA64_PAGE_SIZE_16KB=y | 103 | CONFIG_IA64_PAGE_SIZE_16KB=y |
| 83 | # CONFIG_IA64_PAGE_SIZE_64KB is not set | 104 | # CONFIG_IA64_PAGE_SIZE_64KB is not set |
| 105 | CONFIG_PGTABLE_3=y | ||
| 106 | # CONFIG_PGTABLE_4 is not set | ||
| 84 | # CONFIG_HZ_100 is not set | 107 | # CONFIG_HZ_100 is not set |
| 85 | CONFIG_HZ_250=y | 108 | CONFIG_HZ_250=y |
| 86 | # CONFIG_HZ_1000 is not set | 109 | # CONFIG_HZ_1000 is not set |
| 87 | CONFIG_HZ=250 | 110 | CONFIG_HZ=250 |
| 88 | CONFIG_IA64_BRL_EMU=y | 111 | CONFIG_IA64_BRL_EMU=y |
| 89 | CONFIG_IA64_L1_CACHE_SHIFT=6 | 112 | CONFIG_IA64_L1_CACHE_SHIFT=6 |
| 90 | # CONFIG_NUMA is not set | ||
| 91 | # CONFIG_VIRTUAL_MEM_MAP is not set | ||
| 92 | # CONFIG_IA64_CYCLONE is not set | 113 | # CONFIG_IA64_CYCLONE is not set |
| 93 | CONFIG_IOSAPIC=y | 114 | CONFIG_IOSAPIC=y |
| 94 | # CONFIG_IA64_SGI_SN_XP is not set | 115 | CONFIG_FORCE_MAX_ZONEORDER=17 |
| 95 | CONFIG_FORCE_MAX_ZONEORDER=18 | ||
| 96 | CONFIG_SMP=y | 116 | CONFIG_SMP=y |
| 97 | CONFIG_NR_CPUS=2 | 117 | CONFIG_NR_CPUS=2 |
| 98 | # CONFIG_HOTPLUG_CPU is not set | 118 | # CONFIG_HOTPLUG_CPU is not set |
| @@ -105,7 +125,12 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 105 | CONFIG_FLATMEM=y | 125 | CONFIG_FLATMEM=y |
| 106 | CONFIG_FLAT_NODE_MEM_MAP=y | 126 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 107 | # CONFIG_SPARSEMEM_STATIC is not set | 127 | # CONFIG_SPARSEMEM_STATIC is not set |
| 108 | CONFIG_HAVE_DEC_LOCK=y | 128 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 129 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
| 130 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
| 131 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
| 132 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
| 133 | # CONFIG_VIRTUAL_MEM_MAP is not set | ||
| 109 | CONFIG_IA32_SUPPORT=y | 134 | CONFIG_IA32_SUPPORT=y |
| 110 | CONFIG_COMPAT=y | 135 | CONFIG_COMPAT=y |
| 111 | # CONFIG_IA64_MCA_RECOVERY is not set | 136 | # CONFIG_IA64_MCA_RECOVERY is not set |
| @@ -117,7 +142,6 @@ CONFIG_IA64_PALINFO=y | |||
| 117 | # | 142 | # |
| 118 | CONFIG_EFI_VARS=y | 143 | CONFIG_EFI_VARS=y |
| 119 | CONFIG_EFI_PCDP=y | 144 | CONFIG_EFI_PCDP=y |
| 120 | # CONFIG_DELL_RBU is not set | ||
| 121 | CONFIG_BINFMT_ELF=y | 145 | CONFIG_BINFMT_ELF=y |
| 122 | CONFIG_BINFMT_MISC=m | 146 | CONFIG_BINFMT_MISC=m |
| 123 | 147 | ||
| @@ -125,6 +149,7 @@ CONFIG_BINFMT_MISC=m | |||
| 125 | # Power management and ACPI | 149 | # Power management and ACPI |
| 126 | # | 150 | # |
| 127 | CONFIG_PM=y | 151 | CONFIG_PM=y |
| 152 | CONFIG_PM_LEGACY=y | ||
| 128 | # CONFIG_PM_DEBUG is not set | 153 | # CONFIG_PM_DEBUG is not set |
| 129 | 154 | ||
| 130 | # | 155 | # |
| @@ -137,6 +162,7 @@ CONFIG_ACPI_PROCESSOR=m | |||
| 137 | CONFIG_ACPI_THERMAL=m | 162 | CONFIG_ACPI_THERMAL=m |
| 138 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 163 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
| 139 | # CONFIG_ACPI_DEBUG is not set | 164 | # CONFIG_ACPI_DEBUG is not set |
| 165 | CONFIG_ACPI_EC=y | ||
| 140 | CONFIG_ACPI_POWER=y | 166 | CONFIG_ACPI_POWER=y |
| 141 | CONFIG_ACPI_SYSTEM=y | 167 | CONFIG_ACPI_SYSTEM=y |
| 142 | # CONFIG_ACPI_CONTAINER is not set | 168 | # CONFIG_ACPI_CONTAINER is not set |
| @@ -173,6 +199,7 @@ CONFIG_NET=y | |||
| 173 | # | 199 | # |
| 174 | # Networking options | 200 | # Networking options |
| 175 | # | 201 | # |
| 202 | # CONFIG_NETDEBUG is not set | ||
| 176 | CONFIG_PACKET=y | 203 | CONFIG_PACKET=y |
| 177 | CONFIG_PACKET_MMAP=y | 204 | CONFIG_PACKET_MMAP=y |
| 178 | CONFIG_UNIX=y | 205 | CONFIG_UNIX=y |
| @@ -206,6 +233,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 206 | # SCTP Configuration (EXPERIMENTAL) | 233 | # SCTP Configuration (EXPERIMENTAL) |
| 207 | # | 234 | # |
| 208 | # 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 | ||
| 209 | # CONFIG_ATM is not set | 241 | # CONFIG_ATM is not set |
| 210 | # CONFIG_BRIDGE is not set | 242 | # CONFIG_BRIDGE is not set |
| 211 | # CONFIG_VLAN_8021Q is not set | 243 | # CONFIG_VLAN_8021Q is not set |
| @@ -218,14 +250,16 @@ CONFIG_TCP_CONG_BIC=y | |||
| 218 | # CONFIG_NET_DIVERT is not set | 250 | # CONFIG_NET_DIVERT is not set |
| 219 | # CONFIG_ECONET is not set | 251 | # CONFIG_ECONET is not set |
| 220 | # CONFIG_WAN_ROUTER is not set | 252 | # CONFIG_WAN_ROUTER is not set |
| 253 | |||
| 254 | # | ||
| 255 | # QoS and/or fair queueing | ||
| 256 | # | ||
| 221 | # CONFIG_NET_SCHED is not set | 257 | # CONFIG_NET_SCHED is not set |
| 222 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 223 | 258 | ||
| 224 | # | 259 | # |
| 225 | # Network testing | 260 | # Network testing |
| 226 | # | 261 | # |
| 227 | # CONFIG_NET_PKTGEN is not set | 262 | # CONFIG_NET_PKTGEN is not set |
| 228 | # CONFIG_NETFILTER_NETLINK is not set | ||
| 229 | # CONFIG_HAMRADIO is not set | 263 | # CONFIG_HAMRADIO is not set |
| 230 | # CONFIG_IRDA is not set | 264 | # CONFIG_IRDA is not set |
| 231 | # CONFIG_BT is not set | 265 | # CONFIG_BT is not set |
| @@ -286,20 +320,13 @@ CONFIG_BLK_DEV_RAM=m | |||
| 286 | CONFIG_BLK_DEV_RAM_COUNT=16 | 320 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 287 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 321 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 288 | # CONFIG_CDROM_PKTCDVD is not set | 322 | # CONFIG_CDROM_PKTCDVD is not set |
| 289 | |||
| 290 | # | ||
| 291 | # IO Schedulers | ||
| 292 | # | ||
| 293 | CONFIG_IOSCHED_NOOP=y | ||
| 294 | CONFIG_IOSCHED_AS=y | ||
| 295 | CONFIG_IOSCHED_DEADLINE=y | ||
| 296 | CONFIG_IOSCHED_CFQ=y | ||
| 297 | # CONFIG_ATA_OVER_ETH is not set | 323 | # CONFIG_ATA_OVER_ETH is not set |
| 298 | 324 | ||
| 299 | # | 325 | # |
| 300 | # ATA/ATAPI/MFM/RLL support | 326 | # ATA/ATAPI/MFM/RLL support |
| 301 | # | 327 | # |
| 302 | CONFIG_IDE=m | 328 | CONFIG_IDE=m |
| 329 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 303 | CONFIG_BLK_DEV_IDE=m | 330 | CONFIG_BLK_DEV_IDE=m |
| 304 | 331 | ||
| 305 | # | 332 | # |
| @@ -390,6 +417,7 @@ CONFIG_SCSI_SPI_ATTRS=m | |||
| 390 | # | 417 | # |
| 391 | # SCSI low-level drivers | 418 | # SCSI low-level drivers |
| 392 | # | 419 | # |
| 420 | # CONFIG_ISCSI_TCP is not set | ||
| 393 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 421 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 394 | # CONFIG_SCSI_3W_9XXX is not set | 422 | # CONFIG_SCSI_3W_9XXX is not set |
| 395 | # CONFIG_SCSI_ACARD is not set | 423 | # CONFIG_SCSI_ACARD is not set |
| @@ -399,6 +427,7 @@ CONFIG_SCSI_SPI_ATTRS=m | |||
| 399 | # CONFIG_SCSI_AIC79XX is not set | 427 | # CONFIG_SCSI_AIC79XX is not set |
| 400 | # CONFIG_MEGARAID_NEWGEN is not set | 428 | # CONFIG_MEGARAID_NEWGEN is not set |
| 401 | # CONFIG_MEGARAID_LEGACY is not set | 429 | # CONFIG_MEGARAID_LEGACY is not set |
| 430 | # CONFIG_MEGARAID_SAS is not set | ||
| 402 | # CONFIG_SCSI_SATA is not set | 431 | # CONFIG_SCSI_SATA is not set |
| 403 | # CONFIG_SCSI_DMX3191D is not set | 432 | # CONFIG_SCSI_DMX3191D is not set |
| 404 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 433 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| @@ -409,14 +438,7 @@ CONFIG_SCSI_SPI_ATTRS=m | |||
| 409 | # CONFIG_SCSI_IPR is not set | 438 | # CONFIG_SCSI_IPR is not set |
| 410 | # CONFIG_SCSI_QLOGIC_FC is not set | 439 | # CONFIG_SCSI_QLOGIC_FC is not set |
| 411 | CONFIG_SCSI_QLOGIC_1280=y | 440 | CONFIG_SCSI_QLOGIC_1280=y |
| 412 | # CONFIG_SCSI_QLOGIC_1280_1040 is not set | 441 | # CONFIG_SCSI_QLA_FC is not set |
| 413 | CONFIG_SCSI_QLA2XXX=y | ||
| 414 | # CONFIG_SCSI_QLA21XX is not set | ||
| 415 | # CONFIG_SCSI_QLA22XX is not set | ||
| 416 | # CONFIG_SCSI_QLA2300 is not set | ||
| 417 | # CONFIG_SCSI_QLA2322 is not set | ||
| 418 | # CONFIG_SCSI_QLA6312 is not set | ||
| 419 | # CONFIG_SCSI_QLA24XX is not set | ||
| 420 | # CONFIG_SCSI_LPFC is not set | 442 | # CONFIG_SCSI_LPFC is not set |
| 421 | # CONFIG_SCSI_DC395x is not set | 443 | # CONFIG_SCSI_DC395x is not set |
| 422 | # CONFIG_SCSI_DC390T is not set | 444 | # CONFIG_SCSI_DC390T is not set |
| @@ -448,6 +470,7 @@ CONFIG_DM_ZERO=m | |||
| 448 | # CONFIG_FUSION is not set | 470 | # CONFIG_FUSION is not set |
| 449 | # CONFIG_FUSION_SPI is not set | 471 | # CONFIG_FUSION_SPI is not set |
| 450 | # CONFIG_FUSION_FC is not set | 472 | # CONFIG_FUSION_FC is not set |
| 473 | # CONFIG_FUSION_SAS is not set | ||
| 451 | 474 | ||
| 452 | # | 475 | # |
| 453 | # IEEE 1394 (FireWire) support | 476 | # IEEE 1394 (FireWire) support |
| @@ -486,6 +509,7 @@ CONFIG_NET_ETHERNET=y | |||
| 486 | CONFIG_MII=y | 509 | CONFIG_MII=y |
| 487 | # CONFIG_HAPPYMEAL is not set | 510 | # CONFIG_HAPPYMEAL is not set |
| 488 | # CONFIG_SUNGEM is not set | 511 | # CONFIG_SUNGEM is not set |
| 512 | # CONFIG_CASSINI is not set | ||
| 489 | # CONFIG_NET_VENDOR_3COM is not set | 513 | # CONFIG_NET_VENDOR_3COM is not set |
| 490 | 514 | ||
| 491 | # | 515 | # |
| @@ -524,6 +548,7 @@ CONFIG_EEPRO100=y | |||
| 524 | # CONFIG_R8169 is not set | 548 | # CONFIG_R8169 is not set |
| 525 | # CONFIG_SIS190 is not set | 549 | # CONFIG_SIS190 is not set |
| 526 | # CONFIG_SKGE is not set | 550 | # CONFIG_SKGE is not set |
| 551 | # CONFIG_SKY2 is not set | ||
| 527 | # CONFIG_SK98LIN is not set | 552 | # CONFIG_SK98LIN is not set |
| 528 | # CONFIG_VIA_VELOCITY is not set | 553 | # CONFIG_VIA_VELOCITY is not set |
| 529 | # CONFIG_TIGON3 is not set | 554 | # CONFIG_TIGON3 is not set |
| @@ -630,6 +655,7 @@ CONFIG_SERIAL_8250=y | |||
| 630 | CONFIG_SERIAL_8250_CONSOLE=y | 655 | CONFIG_SERIAL_8250_CONSOLE=y |
| 631 | CONFIG_SERIAL_8250_ACPI=y | 656 | CONFIG_SERIAL_8250_ACPI=y |
| 632 | CONFIG_SERIAL_8250_NR_UARTS=4 | 657 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 658 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 633 | CONFIG_SERIAL_8250_EXTENDED=y | 659 | CONFIG_SERIAL_8250_EXTENDED=y |
| 634 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 660 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
| 635 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set | 661 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set |
| @@ -681,6 +707,7 @@ CONFIG_DRM_R128=m | |||
| 681 | # TPM devices | 707 | # TPM devices |
| 682 | # | 708 | # |
| 683 | # CONFIG_TCG_TPM is not set | 709 | # CONFIG_TCG_TPM is not set |
| 710 | # CONFIG_TELCLOCK is not set | ||
| 684 | 711 | ||
| 685 | # | 712 | # |
| 686 | # I2C support | 713 | # I2C support |
| @@ -731,12 +758,19 @@ CONFIG_I2C_ALGOBIT=y | |||
| 731 | # CONFIG_SENSORS_PCF8591 is not set | 758 | # CONFIG_SENSORS_PCF8591 is not set |
| 732 | # CONFIG_SENSORS_RTC8564 is not set | 759 | # CONFIG_SENSORS_RTC8564 is not set |
| 733 | # CONFIG_SENSORS_MAX6875 is not set | 760 | # CONFIG_SENSORS_MAX6875 is not set |
| 761 | # CONFIG_RTC_X1205_I2C is not set | ||
| 734 | # CONFIG_I2C_DEBUG_CORE is not set | 762 | # CONFIG_I2C_DEBUG_CORE is not set |
| 735 | # CONFIG_I2C_DEBUG_ALGO is not set | 763 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 736 | # CONFIG_I2C_DEBUG_BUS is not set | 764 | # CONFIG_I2C_DEBUG_BUS is not set |
| 737 | # CONFIG_I2C_DEBUG_CHIP is not set | 765 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 738 | 766 | ||
| 739 | # | 767 | # |
| 768 | # SPI support | ||
| 769 | # | ||
| 770 | # CONFIG_SPI is not set | ||
| 771 | # CONFIG_SPI_MASTER is not set | ||
| 772 | |||
| 773 | # | ||
| 740 | # Dallas's 1-wire bus | 774 | # Dallas's 1-wire bus |
| 741 | # | 775 | # |
| 742 | # CONFIG_W1 is not set | 776 | # CONFIG_W1 is not set |
| @@ -754,6 +788,7 @@ CONFIG_HWMON=y | |||
| 754 | # CONFIG_SENSORS_ASB100 is not set | 788 | # CONFIG_SENSORS_ASB100 is not set |
| 755 | # CONFIG_SENSORS_ATXP1 is not set | 789 | # CONFIG_SENSORS_ATXP1 is not set |
| 756 | # CONFIG_SENSORS_DS1621 is not set | 790 | # CONFIG_SENSORS_DS1621 is not set |
| 791 | # CONFIG_SENSORS_F71805F is not set | ||
| 757 | # CONFIG_SENSORS_FSCHER is not set | 792 | # CONFIG_SENSORS_FSCHER is not set |
| 758 | # CONFIG_SENSORS_FSCPOS is not set | 793 | # CONFIG_SENSORS_FSCPOS is not set |
| 759 | # CONFIG_SENSORS_GL518SM is not set | 794 | # CONFIG_SENSORS_GL518SM is not set |
| @@ -775,6 +810,7 @@ CONFIG_HWMON=y | |||
| 775 | # CONFIG_SENSORS_SMSC47M1 is not set | 810 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 776 | # CONFIG_SENSORS_SMSC47B397 is not set | 811 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 777 | # CONFIG_SENSORS_VIA686A is not set | 812 | # CONFIG_SENSORS_VIA686A is not set |
| 813 | # CONFIG_SENSORS_VT8231 is not set | ||
| 778 | # CONFIG_SENSORS_W83781D is not set | 814 | # CONFIG_SENSORS_W83781D is not set |
| 779 | # CONFIG_SENSORS_W83792D is not set | 815 | # CONFIG_SENSORS_W83792D is not set |
| 780 | # CONFIG_SENSORS_W83L785TS is not set | 816 | # CONFIG_SENSORS_W83L785TS is not set |
| @@ -830,6 +866,8 @@ CONFIG_SND_OSSEMUL=y | |||
| 830 | CONFIG_SND_MIXER_OSS=m | 866 | CONFIG_SND_MIXER_OSS=m |
| 831 | CONFIG_SND_PCM_OSS=m | 867 | CONFIG_SND_PCM_OSS=m |
| 832 | # CONFIG_SND_SEQUENCER_OSS is not set | 868 | # CONFIG_SND_SEQUENCER_OSS is not set |
| 869 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 870 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 833 | # CONFIG_SND_VERBOSE_PRINTK is not set | 871 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 834 | # CONFIG_SND_DEBUG is not set | 872 | # CONFIG_SND_DEBUG is not set |
| 835 | 873 | ||
| @@ -837,17 +875,18 @@ CONFIG_SND_PCM_OSS=m | |||
| 837 | # Generic devices | 875 | # Generic devices |
| 838 | # | 876 | # |
| 839 | CONFIG_SND_OPL3_LIB=m | 877 | CONFIG_SND_OPL3_LIB=m |
| 878 | CONFIG_SND_AC97_CODEC=m | ||
| 879 | CONFIG_SND_AC97_BUS=m | ||
| 840 | # CONFIG_SND_DUMMY is not set | 880 | # CONFIG_SND_DUMMY is not set |
| 841 | # CONFIG_SND_VIRMIDI is not set | 881 | # CONFIG_SND_VIRMIDI is not set |
| 842 | # CONFIG_SND_MTPAV is not set | 882 | # CONFIG_SND_MTPAV is not set |
| 843 | # CONFIG_SND_SERIAL_U16550 is not set | 883 | # CONFIG_SND_SERIAL_U16550 is not set |
| 844 | # CONFIG_SND_MPU401 is not set | 884 | # CONFIG_SND_MPU401 is not set |
| 845 | CONFIG_SND_AC97_CODEC=m | ||
| 846 | CONFIG_SND_AC97_BUS=m | ||
| 847 | 885 | ||
| 848 | # | 886 | # |
| 849 | # PCI devices | 887 | # PCI devices |
| 850 | # | 888 | # |
| 889 | # CONFIG_SND_AD1889 is not set | ||
| 851 | # CONFIG_SND_ALI5451 is not set | 890 | # CONFIG_SND_ALI5451 is not set |
| 852 | # CONFIG_SND_ATIIXP is not set | 891 | # CONFIG_SND_ATIIXP is not set |
| 853 | # CONFIG_SND_ATIIXP_MODEM is not set | 892 | # CONFIG_SND_ATIIXP_MODEM is not set |
| @@ -856,38 +895,38 @@ CONFIG_SND_AC97_BUS=m | |||
| 856 | # CONFIG_SND_AU8830 is not set | 895 | # CONFIG_SND_AU8830 is not set |
| 857 | # CONFIG_SND_AZT3328 is not set | 896 | # CONFIG_SND_AZT3328 is not set |
| 858 | # CONFIG_SND_BT87X is not set | 897 | # CONFIG_SND_BT87X is not set |
| 859 | # CONFIG_SND_CS46XX is not set | 898 | # CONFIG_SND_CA0106 is not set |
| 899 | # CONFIG_SND_CMIPCI is not set | ||
| 860 | CONFIG_SND_CS4281=m | 900 | CONFIG_SND_CS4281=m |
| 901 | # CONFIG_SND_CS46XX is not set | ||
| 861 | # CONFIG_SND_EMU10K1 is not set | 902 | # CONFIG_SND_EMU10K1 is not set |
| 862 | # CONFIG_SND_EMU10K1X is not set | 903 | # CONFIG_SND_EMU10K1X is not set |
| 863 | # CONFIG_SND_CA0106 is not set | ||
| 864 | # CONFIG_SND_KORG1212 is not set | ||
| 865 | # CONFIG_SND_MIXART is not set | ||
| 866 | # CONFIG_SND_NM256 is not set | ||
| 867 | # CONFIG_SND_RME32 is not set | ||
| 868 | # CONFIG_SND_RME96 is not set | ||
| 869 | # CONFIG_SND_RME9652 is not set | ||
| 870 | # CONFIG_SND_HDSP is not set | ||
| 871 | # CONFIG_SND_HDSPM is not set | ||
| 872 | # CONFIG_SND_TRIDENT is not set | ||
| 873 | # CONFIG_SND_YMFPCI is not set | ||
| 874 | # CONFIG_SND_AD1889 is not set | ||
| 875 | # CONFIG_SND_CMIPCI is not set | ||
| 876 | # CONFIG_SND_ENS1370 is not set | 904 | # CONFIG_SND_ENS1370 is not set |
| 877 | # CONFIG_SND_ENS1371 is not set | 905 | # CONFIG_SND_ENS1371 is not set |
| 878 | # CONFIG_SND_ES1938 is not set | 906 | # CONFIG_SND_ES1938 is not set |
| 879 | # CONFIG_SND_ES1968 is not set | 907 | # CONFIG_SND_ES1968 is not set |
| 880 | # CONFIG_SND_MAESTRO3 is not set | ||
| 881 | # CONFIG_SND_FM801 is not set | 908 | # CONFIG_SND_FM801 is not set |
| 909 | # CONFIG_SND_HDA_INTEL is not set | ||
| 910 | # CONFIG_SND_HDSP is not set | ||
| 911 | # CONFIG_SND_HDSPM is not set | ||
| 882 | # CONFIG_SND_ICE1712 is not set | 912 | # CONFIG_SND_ICE1712 is not set |
| 883 | # CONFIG_SND_ICE1724 is not set | 913 | # CONFIG_SND_ICE1724 is not set |
| 884 | # CONFIG_SND_INTEL8X0 is not set | 914 | # CONFIG_SND_INTEL8X0 is not set |
| 885 | # CONFIG_SND_INTEL8X0M is not set | 915 | # CONFIG_SND_INTEL8X0M is not set |
| 916 | # CONFIG_SND_KORG1212 is not set | ||
| 917 | # CONFIG_SND_MAESTRO3 is not set | ||
| 918 | # CONFIG_SND_MIXART is not set | ||
| 919 | # CONFIG_SND_NM256 is not set | ||
| 920 | # CONFIG_SND_PCXHR is not set | ||
| 921 | # CONFIG_SND_RME32 is not set | ||
| 922 | # CONFIG_SND_RME96 is not set | ||
| 923 | # CONFIG_SND_RME9652 is not set | ||
| 886 | # CONFIG_SND_SONICVIBES is not set | 924 | # CONFIG_SND_SONICVIBES is not set |
| 925 | # CONFIG_SND_TRIDENT is not set | ||
| 887 | # CONFIG_SND_VIA82XX is not set | 926 | # CONFIG_SND_VIA82XX is not set |
| 888 | # CONFIG_SND_VIA82XX_MODEM is not set | 927 | # CONFIG_SND_VIA82XX_MODEM is not set |
| 889 | # CONFIG_SND_VX222 is not set | 928 | # CONFIG_SND_VX222 is not set |
| 890 | # CONFIG_SND_HDA_INTEL is not set | 929 | # CONFIG_SND_YMFPCI is not set |
| 891 | 930 | ||
| 892 | # | 931 | # |
| 893 | # USB devices | 932 | # USB devices |
| @@ -929,12 +968,15 @@ CONFIG_USB_UHCI_HCD=m | |||
| 929 | # USB Device Class drivers | 968 | # USB Device Class drivers |
| 930 | # | 969 | # |
| 931 | # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set | 970 | # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set |
| 932 | CONFIG_USB_BLUETOOTH_TTY=m | ||
| 933 | CONFIG_USB_ACM=m | 971 | CONFIG_USB_ACM=m |
| 934 | CONFIG_USB_PRINTER=m | 972 | CONFIG_USB_PRINTER=m |
| 935 | 973 | ||
| 936 | # | 974 | # |
| 937 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information | 975 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 976 | # | ||
| 977 | |||
| 978 | # | ||
| 979 | # may also be needed; see USB_STORAGE Help for more information | ||
| 938 | # | 980 | # |
| 939 | CONFIG_USB_STORAGE=m | 981 | CONFIG_USB_STORAGE=m |
| 940 | # CONFIG_USB_STORAGE_DEBUG is not set | 982 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -946,13 +988,15 @@ CONFIG_USB_STORAGE=m | |||
| 946 | # CONFIG_USB_STORAGE_SDDR09 is not set | 988 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 947 | # CONFIG_USB_STORAGE_SDDR55 is not set | 989 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 948 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 990 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 949 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 991 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 992 | # CONFIG_USB_LIBUSUAL is not set | ||
| 950 | 993 | ||
| 951 | # | 994 | # |
| 952 | # USB Input Devices | 995 | # USB Input Devices |
| 953 | # | 996 | # |
| 954 | CONFIG_USB_HID=m | 997 | CONFIG_USB_HID=m |
| 955 | CONFIG_USB_HIDINPUT=y | 998 | CONFIG_USB_HIDINPUT=y |
| 999 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 956 | # CONFIG_HID_FF is not set | 1000 | # CONFIG_HID_FF is not set |
| 957 | CONFIG_USB_HIDDEV=y | 1001 | CONFIG_USB_HIDDEV=y |
| 958 | 1002 | ||
| @@ -972,6 +1016,7 @@ CONFIG_USB_HIDDEV=y | |||
| 972 | # CONFIG_USB_YEALINK is not set | 1016 | # CONFIG_USB_YEALINK is not set |
| 973 | # CONFIG_USB_XPAD is not set | 1017 | # CONFIG_USB_XPAD is not set |
| 974 | # CONFIG_USB_ATI_REMOTE is not set | 1018 | # CONFIG_USB_ATI_REMOTE is not set |
| 1019 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
| 975 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 1020 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
| 976 | # CONFIG_USB_APPLETOUCH is not set | 1021 | # CONFIG_USB_APPLETOUCH is not set |
| 977 | 1022 | ||
| @@ -1046,7 +1091,7 @@ CONFIG_USB_MON=y | |||
| 1046 | # CONFIG_INFINIBAND is not set | 1091 | # CONFIG_INFINIBAND is not set |
| 1047 | 1092 | ||
| 1048 | # | 1093 | # |
| 1049 | # SN Devices | 1094 | # EDAC - error detection and reporting (RAS) |
| 1050 | # | 1095 | # |
| 1051 | 1096 | ||
| 1052 | # | 1097 | # |
| @@ -1071,6 +1116,7 @@ CONFIG_XFS_QUOTA=y | |||
| 1071 | CONFIG_XFS_SECURITY=y | 1116 | CONFIG_XFS_SECURITY=y |
| 1072 | CONFIG_XFS_POSIX_ACL=y | 1117 | CONFIG_XFS_POSIX_ACL=y |
| 1073 | # CONFIG_XFS_RT is not set | 1118 | # CONFIG_XFS_RT is not set |
| 1119 | # CONFIG_OCFS2_FS is not set | ||
| 1074 | # CONFIG_MINIX_FS is not set | 1120 | # CONFIG_MINIX_FS is not set |
| 1075 | # CONFIG_ROMFS_FS is not set | 1121 | # CONFIG_ROMFS_FS is not set |
| 1076 | CONFIG_INOTIFY=y | 1122 | CONFIG_INOTIFY=y |
| @@ -1111,6 +1157,7 @@ CONFIG_HUGETLBFS=y | |||
| 1111 | CONFIG_HUGETLB_PAGE=y | 1157 | CONFIG_HUGETLB_PAGE=y |
| 1112 | CONFIG_RAMFS=y | 1158 | CONFIG_RAMFS=y |
| 1113 | # CONFIG_RELAYFS_FS is not set | 1159 | # CONFIG_RELAYFS_FS is not set |
| 1160 | # CONFIG_CONFIGFS_FS is not set | ||
| 1114 | 1161 | ||
| 1115 | # | 1162 | # |
| 1116 | # Miscellaneous filesystems | 1163 | # Miscellaneous filesystems |
| @@ -1153,6 +1200,7 @@ CONFIG_RPCSEC_GSS_KRB5=m | |||
| 1153 | # CONFIG_SMB_FS is not set | 1200 | # CONFIG_SMB_FS is not set |
| 1154 | CONFIG_CIFS=m | 1201 | CONFIG_CIFS=m |
| 1155 | CONFIG_CIFS_STATS=y | 1202 | CONFIG_CIFS_STATS=y |
| 1203 | # CONFIG_CIFS_STATS2 is not set | ||
| 1156 | CONFIG_CIFS_XATTR=y | 1204 | CONFIG_CIFS_XATTR=y |
| 1157 | CONFIG_CIFS_POSIX=y | 1205 | CONFIG_CIFS_POSIX=y |
| 1158 | # CONFIG_CIFS_EXPERIMENTAL is not set | 1206 | # CONFIG_CIFS_EXPERIMENTAL is not set |
| @@ -1179,6 +1227,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1179 | CONFIG_SGI_PARTITION=y | 1227 | CONFIG_SGI_PARTITION=y |
| 1180 | # CONFIG_ULTRIX_PARTITION is not set | 1228 | # CONFIG_ULTRIX_PARTITION is not set |
| 1181 | # CONFIG_SUN_PARTITION is not set | 1229 | # CONFIG_SUN_PARTITION is not set |
| 1230 | # CONFIG_KARMA_PARTITION is not set | ||
| 1182 | CONFIG_EFI_PARTITION=y | 1231 | CONFIG_EFI_PARTITION=y |
| 1183 | 1232 | ||
| 1184 | # | 1233 | # |
| @@ -1237,28 +1286,32 @@ CONFIG_GENERIC_IRQ_PROBE=y | |||
| 1237 | CONFIG_GENERIC_PENDING_IRQ=y | 1286 | CONFIG_GENERIC_PENDING_IRQ=y |
| 1238 | 1287 | ||
| 1239 | # | 1288 | # |
| 1240 | # Profiling support | 1289 | # Instrumentation Support |
| 1241 | # | 1290 | # |
| 1242 | CONFIG_PROFILING=y | 1291 | CONFIG_PROFILING=y |
| 1243 | CONFIG_OPROFILE=y | 1292 | CONFIG_OPROFILE=y |
| 1293 | # CONFIG_KPROBES is not set | ||
| 1244 | 1294 | ||
| 1245 | # | 1295 | # |
| 1246 | # Kernel hacking | 1296 | # Kernel hacking |
| 1247 | # | 1297 | # |
| 1248 | # CONFIG_PRINTK_TIME is not set | 1298 | # CONFIG_PRINTK_TIME is not set |
| 1249 | CONFIG_DEBUG_KERNEL=y | ||
| 1250 | CONFIG_MAGIC_SYSRQ=y | 1299 | CONFIG_MAGIC_SYSRQ=y |
| 1300 | CONFIG_DEBUG_KERNEL=y | ||
| 1251 | CONFIG_LOG_BUF_SHIFT=16 | 1301 | CONFIG_LOG_BUF_SHIFT=16 |
| 1252 | CONFIG_DETECT_SOFTLOCKUP=y | 1302 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1253 | # CONFIG_SCHEDSTATS is not set | 1303 | # CONFIG_SCHEDSTATS is not set |
| 1254 | # CONFIG_DEBUG_SLAB is not set | 1304 | # CONFIG_DEBUG_SLAB is not set |
| 1255 | CONFIG_DEBUG_PREEMPT=y | 1305 | CONFIG_DEBUG_PREEMPT=y |
| 1306 | CONFIG_DEBUG_MUTEXES=y | ||
| 1256 | # CONFIG_DEBUG_SPINLOCK is not set | 1307 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1257 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1308 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1258 | # CONFIG_DEBUG_KOBJECT is not set | 1309 | # CONFIG_DEBUG_KOBJECT is not set |
| 1259 | # CONFIG_DEBUG_INFO is not set | 1310 | # CONFIG_DEBUG_INFO is not set |
| 1260 | # CONFIG_DEBUG_FS is not set | 1311 | # CONFIG_DEBUG_FS is not set |
| 1261 | # CONFIG_KPROBES is not set | 1312 | # CONFIG_DEBUG_VM is not set |
| 1313 | CONFIG_FORCED_INLINING=y | ||
| 1314 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1262 | # CONFIG_IA64_GRANULE_16MB is not set | 1315 | # CONFIG_IA64_GRANULE_16MB is not set |
| 1263 | CONFIG_IA64_GRANULE_64MB=y | 1316 | CONFIG_IA64_GRANULE_64MB=y |
| 1264 | # CONFIG_IA64_PRINT_HAZARDS is not set | 1317 | # CONFIG_IA64_PRINT_HAZARDS is not set |
diff --git a/arch/ia64/configs/gensparse_defconfig b/arch/ia64/configs/gensparse_defconfig index 991c07b57c24..184678fe7832 100644 --- a/arch/ia64/configs/gensparse_defconfig +++ b/arch/ia64/configs/gensparse_defconfig | |||
| @@ -1,14 +1,13 @@ | |||
| 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-rc2 | 3 | # Linux kernel version: 2.6.16-rc5 |
| 4 | # Wed Sep 28 08:27:29 2005 | 4 | # Mon Feb 27 16:15:43 2006 |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | # | 7 | # |
| 8 | # Code maturity level options | 8 | # Code maturity level options |
| 9 | # | 9 | # |
| 10 | CONFIG_EXPERIMENTAL=y | 10 | CONFIG_EXPERIMENTAL=y |
| 11 | CONFIG_CLEAN_COMPILE=y | ||
| 12 | CONFIG_LOCK_KERNEL=y | 11 | CONFIG_LOCK_KERNEL=y |
| 13 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 12 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 14 | 13 | ||
| @@ -23,18 +22,19 @@ CONFIG_POSIX_MQUEUE=y | |||
| 23 | # CONFIG_BSD_PROCESS_ACCT is not set | 22 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 24 | CONFIG_SYSCTL=y | 23 | CONFIG_SYSCTL=y |
| 25 | # CONFIG_AUDIT is not set | 24 | # CONFIG_AUDIT is not set |
| 26 | CONFIG_HOTPLUG=y | ||
| 27 | CONFIG_KOBJECT_UEVENT=y | ||
| 28 | CONFIG_IKCONFIG=y | 25 | CONFIG_IKCONFIG=y |
| 29 | CONFIG_IKCONFIG_PROC=y | 26 | CONFIG_IKCONFIG_PROC=y |
| 30 | # CONFIG_CPUSETS is not set | 27 | # CONFIG_CPUSETS is not set |
| 31 | CONFIG_INITRAMFS_SOURCE="" | 28 | CONFIG_INITRAMFS_SOURCE="" |
| 29 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 32 | # CONFIG_EMBEDDED is not set | 30 | # CONFIG_EMBEDDED is not set |
| 33 | CONFIG_KALLSYMS=y | 31 | CONFIG_KALLSYMS=y |
| 34 | CONFIG_KALLSYMS_ALL=y | 32 | CONFIG_KALLSYMS_ALL=y |
| 35 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 34 | CONFIG_HOTPLUG=y | ||
| 36 | CONFIG_PRINTK=y | 35 | CONFIG_PRINTK=y |
| 37 | CONFIG_BUG=y | 36 | CONFIG_BUG=y |
| 37 | CONFIG_ELF_CORE=y | ||
| 38 | CONFIG_BASE_FULL=y | 38 | CONFIG_BASE_FULL=y |
| 39 | CONFIG_FUTEX=y | 39 | CONFIG_FUTEX=y |
| 40 | CONFIG_EPOLL=y | 40 | CONFIG_EPOLL=y |
| @@ -43,8 +43,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 | |||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | 43 | CONFIG_CC_ALIGN_LABELS=0 |
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | 44 | CONFIG_CC_ALIGN_LOOPS=0 |
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | 45 | CONFIG_CC_ALIGN_JUMPS=0 |
| 46 | CONFIG_SLAB=y | ||
| 46 | # CONFIG_TINY_SHMEM is not set | 47 | # CONFIG_TINY_SHMEM is not set |
| 47 | CONFIG_BASE_SMALL=0 | 48 | CONFIG_BASE_SMALL=0 |
| 49 | # CONFIG_SLOB is not set | ||
| 48 | 50 | ||
| 49 | # | 51 | # |
| 50 | # Loadable module support | 52 | # Loadable module support |
| @@ -59,17 +61,36 @@ CONFIG_KMOD=y | |||
| 59 | CONFIG_STOP_MACHINE=y | 61 | CONFIG_STOP_MACHINE=y |
| 60 | 62 | ||
| 61 | # | 63 | # |
| 64 | # Block layer | ||
| 65 | # | ||
| 66 | |||
| 67 | # | ||
| 68 | # IO Schedulers | ||
| 69 | # | ||
| 70 | CONFIG_IOSCHED_NOOP=y | ||
| 71 | CONFIG_IOSCHED_AS=y | ||
| 72 | CONFIG_IOSCHED_DEADLINE=y | ||
| 73 | CONFIG_IOSCHED_CFQ=y | ||
| 74 | CONFIG_DEFAULT_AS=y | ||
| 75 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 76 | # CONFIG_DEFAULT_CFQ is not set | ||
| 77 | # CONFIG_DEFAULT_NOOP is not set | ||
| 78 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 79 | |||
| 80 | # | ||
| 62 | # Processor type and features | 81 | # Processor type and features |
| 63 | # | 82 | # |
| 64 | CONFIG_IA64=y | 83 | CONFIG_IA64=y |
| 65 | CONFIG_64BIT=y | 84 | CONFIG_64BIT=y |
| 66 | CONFIG_MMU=y | 85 | CONFIG_MMU=y |
| 86 | CONFIG_SWIOTLB=y | ||
| 67 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 87 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 68 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 88 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 69 | CONFIG_TIME_INTERPOLATION=y | 89 | CONFIG_TIME_INTERPOLATION=y |
| 70 | CONFIG_EFI=y | 90 | CONFIG_EFI=y |
| 71 | CONFIG_GENERIC_IOMAP=y | 91 | CONFIG_GENERIC_IOMAP=y |
| 72 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 92 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 93 | CONFIG_DMA_IS_DMA32=y | ||
| 73 | CONFIG_IA64_GENERIC=y | 94 | CONFIG_IA64_GENERIC=y |
| 74 | # CONFIG_IA64_DIG is not set | 95 | # CONFIG_IA64_DIG is not set |
| 75 | # CONFIG_IA64_HP_ZX1 is not set | 96 | # CONFIG_IA64_HP_ZX1 is not set |
| @@ -82,6 +103,8 @@ CONFIG_MCKINLEY=y | |||
| 82 | # CONFIG_IA64_PAGE_SIZE_8KB is not set | 103 | # CONFIG_IA64_PAGE_SIZE_8KB is not set |
| 83 | CONFIG_IA64_PAGE_SIZE_16KB=y | 104 | CONFIG_IA64_PAGE_SIZE_16KB=y |
| 84 | # CONFIG_IA64_PAGE_SIZE_64KB is not set | 105 | # CONFIG_IA64_PAGE_SIZE_64KB is not set |
| 106 | CONFIG_PGTABLE_3=y | ||
| 107 | # CONFIG_PGTABLE_4 is not set | ||
| 85 | # CONFIG_HZ_100 is not set | 108 | # CONFIG_HZ_100 is not set |
| 86 | CONFIG_HZ_250=y | 109 | CONFIG_HZ_250=y |
| 87 | # CONFIG_HZ_1000 is not set | 110 | # CONFIG_HZ_1000 is not set |
| @@ -105,6 +128,9 @@ CONFIG_NEED_MULTIPLE_NODES=y | |||
| 105 | CONFIG_HAVE_MEMORY_PRESENT=y | 128 | CONFIG_HAVE_MEMORY_PRESENT=y |
| 106 | # CONFIG_SPARSEMEM_STATIC is not set | 129 | # CONFIG_SPARSEMEM_STATIC is not set |
| 107 | CONFIG_SPARSEMEM_EXTREME=y | 130 | CONFIG_SPARSEMEM_EXTREME=y |
| 131 | # CONFIG_MEMORY_HOTPLUG is not set | ||
| 132 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 133 | CONFIG_MIGRATION=y | ||
| 108 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 134 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
| 109 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | 135 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |
| 110 | CONFIG_ARCH_FLATMEM_ENABLE=y | 136 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| @@ -117,13 +143,13 @@ CONFIG_COMPAT=y | |||
| 117 | CONFIG_IA64_MCA_RECOVERY=y | 143 | CONFIG_IA64_MCA_RECOVERY=y |
| 118 | CONFIG_PERFMON=y | 144 | CONFIG_PERFMON=y |
| 119 | CONFIG_IA64_PALINFO=y | 145 | CONFIG_IA64_PALINFO=y |
| 146 | CONFIG_SGI_SN=y | ||
| 120 | 147 | ||
| 121 | # | 148 | # |
| 122 | # Firmware Drivers | 149 | # Firmware Drivers |
| 123 | # | 150 | # |
| 124 | CONFIG_EFI_VARS=y | 151 | CONFIG_EFI_VARS=y |
| 125 | CONFIG_EFI_PCDP=y | 152 | CONFIG_EFI_PCDP=y |
| 126 | # CONFIG_DELL_RBU is not set | ||
| 127 | CONFIG_BINFMT_ELF=y | 153 | CONFIG_BINFMT_ELF=y |
| 128 | CONFIG_BINFMT_MISC=m | 154 | CONFIG_BINFMT_MISC=m |
| 129 | 155 | ||
| @@ -131,6 +157,7 @@ CONFIG_BINFMT_MISC=m | |||
| 131 | # Power management and ACPI | 157 | # Power management and ACPI |
| 132 | # | 158 | # |
| 133 | CONFIG_PM=y | 159 | CONFIG_PM=y |
| 160 | CONFIG_PM_LEGACY=y | ||
| 134 | # CONFIG_PM_DEBUG is not set | 161 | # CONFIG_PM_DEBUG is not set |
| 135 | 162 | ||
| 136 | # | 163 | # |
| @@ -145,6 +172,7 @@ CONFIG_ACPI_THERMAL=m | |||
| 145 | CONFIG_ACPI_NUMA=y | 172 | CONFIG_ACPI_NUMA=y |
| 146 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 173 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
| 147 | # CONFIG_ACPI_DEBUG is not set | 174 | # CONFIG_ACPI_DEBUG is not set |
| 175 | CONFIG_ACPI_EC=y | ||
| 148 | CONFIG_ACPI_POWER=y | 176 | CONFIG_ACPI_POWER=y |
| 149 | CONFIG_ACPI_SYSTEM=y | 177 | CONFIG_ACPI_SYSTEM=y |
| 150 | CONFIG_ACPI_CONTAINER=m | 178 | CONFIG_ACPI_CONTAINER=m |
| @@ -187,6 +215,7 @@ CONFIG_NET=y | |||
| 187 | # | 215 | # |
| 188 | # Networking options | 216 | # Networking options |
| 189 | # | 217 | # |
| 218 | # CONFIG_NETDEBUG is not set | ||
| 190 | CONFIG_PACKET=y | 219 | CONFIG_PACKET=y |
| 191 | # CONFIG_PACKET_MMAP is not set | 220 | # CONFIG_PACKET_MMAP is not set |
| 192 | CONFIG_UNIX=y | 221 | CONFIG_UNIX=y |
| @@ -221,6 +250,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 221 | # SCTP Configuration (EXPERIMENTAL) | 250 | # SCTP Configuration (EXPERIMENTAL) |
| 222 | # | 251 | # |
| 223 | # CONFIG_IP_SCTP is not set | 252 | # CONFIG_IP_SCTP is not set |
| 253 | |||
| 254 | # | ||
| 255 | # TIPC Configuration (EXPERIMENTAL) | ||
| 256 | # | ||
| 257 | # CONFIG_TIPC is not set | ||
| 224 | # CONFIG_ATM is not set | 258 | # CONFIG_ATM is not set |
| 225 | # CONFIG_BRIDGE is not set | 259 | # CONFIG_BRIDGE is not set |
| 226 | # CONFIG_VLAN_8021Q is not set | 260 | # CONFIG_VLAN_8021Q is not set |
| @@ -233,8 +267,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 233 | # CONFIG_NET_DIVERT is not set | 267 | # CONFIG_NET_DIVERT is not set |
| 234 | # CONFIG_ECONET is not set | 268 | # CONFIG_ECONET is not set |
| 235 | # CONFIG_WAN_ROUTER is not set | 269 | # CONFIG_WAN_ROUTER is not set |
| 270 | |||
| 271 | # | ||
| 272 | # QoS and/or fair queueing | ||
| 273 | # | ||
| 236 | # CONFIG_NET_SCHED is not set | 274 | # CONFIG_NET_SCHED is not set |
| 237 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 238 | 275 | ||
| 239 | # | 276 | # |
| 240 | # Network testing | 277 | # Network testing |
| @@ -295,20 +332,13 @@ CONFIG_BLK_DEV_RAM_COUNT=16 | |||
| 295 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 332 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 296 | CONFIG_BLK_DEV_INITRD=y | 333 | CONFIG_BLK_DEV_INITRD=y |
| 297 | # CONFIG_CDROM_PKTCDVD is not set | 334 | # CONFIG_CDROM_PKTCDVD is not set |
| 298 | |||
| 299 | # | ||
| 300 | # IO Schedulers | ||
| 301 | # | ||
| 302 | CONFIG_IOSCHED_NOOP=y | ||
| 303 | CONFIG_IOSCHED_AS=y | ||
| 304 | CONFIG_IOSCHED_DEADLINE=y | ||
| 305 | CONFIG_IOSCHED_CFQ=y | ||
| 306 | # CONFIG_ATA_OVER_ETH is not set | 335 | # CONFIG_ATA_OVER_ETH is not set |
| 307 | 336 | ||
| 308 | # | 337 | # |
| 309 | # ATA/ATAPI/MFM/RLL support | 338 | # ATA/ATAPI/MFM/RLL support |
| 310 | # | 339 | # |
| 311 | CONFIG_IDE=y | 340 | CONFIG_IDE=y |
| 341 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 312 | CONFIG_BLK_DEV_IDE=y | 342 | CONFIG_BLK_DEV_IDE=y |
| 313 | 343 | ||
| 314 | # | 344 | # |
| @@ -400,6 +430,7 @@ CONFIG_SCSI_FC_ATTRS=y | |||
| 400 | # | 430 | # |
| 401 | # SCSI low-level drivers | 431 | # SCSI low-level drivers |
| 402 | # | 432 | # |
| 433 | # CONFIG_ISCSI_TCP is not set | ||
| 403 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 434 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 404 | # CONFIG_SCSI_3W_9XXX is not set | 435 | # CONFIG_SCSI_3W_9XXX is not set |
| 405 | # CONFIG_SCSI_ACARD is not set | 436 | # CONFIG_SCSI_ACARD is not set |
| @@ -409,16 +440,19 @@ CONFIG_SCSI_FC_ATTRS=y | |||
| 409 | # CONFIG_SCSI_AIC79XX is not set | 440 | # CONFIG_SCSI_AIC79XX is not set |
| 410 | # CONFIG_MEGARAID_NEWGEN is not set | 441 | # CONFIG_MEGARAID_NEWGEN is not set |
| 411 | # CONFIG_MEGARAID_LEGACY is not set | 442 | # CONFIG_MEGARAID_LEGACY is not set |
| 443 | # CONFIG_MEGARAID_SAS is not set | ||
| 412 | CONFIG_SCSI_SATA=y | 444 | CONFIG_SCSI_SATA=y |
| 413 | # CONFIG_SCSI_SATA_AHCI is not set | 445 | # CONFIG_SCSI_SATA_AHCI is not set |
| 414 | # CONFIG_SCSI_SATA_SVW is not set | 446 | # CONFIG_SCSI_SATA_SVW is not set |
| 415 | # CONFIG_SCSI_ATA_PIIX is not set | 447 | # CONFIG_SCSI_ATA_PIIX is not set |
| 416 | # CONFIG_SCSI_SATA_MV is not set | 448 | # CONFIG_SCSI_SATA_MV is not set |
| 417 | # CONFIG_SCSI_SATA_NV is not set | 449 | # CONFIG_SCSI_SATA_NV is not set |
| 418 | # CONFIG_SCSI_SATA_PROMISE is not set | 450 | # CONFIG_SCSI_PDC_ADMA is not set |
| 419 | # CONFIG_SCSI_SATA_QSTOR is not set | 451 | # CONFIG_SCSI_SATA_QSTOR is not set |
| 452 | # CONFIG_SCSI_SATA_PROMISE is not set | ||
| 420 | # CONFIG_SCSI_SATA_SX4 is not set | 453 | # CONFIG_SCSI_SATA_SX4 is not set |
| 421 | # CONFIG_SCSI_SATA_SIL is not set | 454 | # CONFIG_SCSI_SATA_SIL is not set |
| 455 | # CONFIG_SCSI_SATA_SIL24 is not set | ||
| 422 | # CONFIG_SCSI_SATA_SIS is not set | 456 | # CONFIG_SCSI_SATA_SIS is not set |
| 423 | # CONFIG_SCSI_SATA_ULI is not set | 457 | # CONFIG_SCSI_SATA_ULI is not set |
| 424 | # CONFIG_SCSI_SATA_VIA is not set | 458 | # CONFIG_SCSI_SATA_VIA is not set |
| @@ -436,14 +470,7 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | |||
| 436 | # CONFIG_SCSI_IPR is not set | 470 | # CONFIG_SCSI_IPR is not set |
| 437 | # CONFIG_SCSI_QLOGIC_FC is not set | 471 | # CONFIG_SCSI_QLOGIC_FC is not set |
| 438 | CONFIG_SCSI_QLOGIC_1280=y | 472 | CONFIG_SCSI_QLOGIC_1280=y |
| 439 | # CONFIG_SCSI_QLOGIC_1280_1040 is not set | 473 | # CONFIG_SCSI_QLA_FC is not set |
| 440 | CONFIG_SCSI_QLA2XXX=y | ||
| 441 | CONFIG_SCSI_QLA21XX=m | ||
| 442 | CONFIG_SCSI_QLA22XX=m | ||
| 443 | CONFIG_SCSI_QLA2300=m | ||
| 444 | CONFIG_SCSI_QLA2322=m | ||
| 445 | # CONFIG_SCSI_QLA6312 is not set | ||
| 446 | # CONFIG_SCSI_QLA24XX is not set | ||
| 447 | # CONFIG_SCSI_LPFC is not set | 474 | # CONFIG_SCSI_LPFC is not set |
| 448 | # CONFIG_SCSI_DC395x is not set | 475 | # CONFIG_SCSI_DC395x is not set |
| 449 | # CONFIG_SCSI_DC390T is not set | 476 | # CONFIG_SCSI_DC390T is not set |
| @@ -476,6 +503,7 @@ CONFIG_DM_MULTIPATH=m | |||
| 476 | CONFIG_FUSION=y | 503 | CONFIG_FUSION=y |
| 477 | CONFIG_FUSION_SPI=y | 504 | CONFIG_FUSION_SPI=y |
| 478 | CONFIG_FUSION_FC=m | 505 | CONFIG_FUSION_FC=m |
| 506 | # CONFIG_FUSION_SAS is not set | ||
| 479 | CONFIG_FUSION_MAX_SGE=128 | 507 | CONFIG_FUSION_MAX_SGE=128 |
| 480 | # CONFIG_FUSION_CTL is not set | 508 | # CONFIG_FUSION_CTL is not set |
| 481 | 509 | ||
| @@ -515,6 +543,7 @@ CONFIG_NET_ETHERNET=y | |||
| 515 | CONFIG_MII=m | 543 | CONFIG_MII=m |
| 516 | # CONFIG_HAPPYMEAL is not set | 544 | # CONFIG_HAPPYMEAL is not set |
| 517 | # CONFIG_SUNGEM is not set | 545 | # CONFIG_SUNGEM is not set |
| 546 | # CONFIG_CASSINI is not set | ||
| 518 | # CONFIG_NET_VENDOR_3COM is not set | 547 | # CONFIG_NET_VENDOR_3COM is not set |
| 519 | 548 | ||
| 520 | # | 549 | # |
| @@ -564,6 +593,7 @@ CONFIG_E1000=y | |||
| 564 | # CONFIG_R8169 is not set | 593 | # CONFIG_R8169 is not set |
| 565 | # CONFIG_SIS190 is not set | 594 | # CONFIG_SIS190 is not set |
| 566 | # CONFIG_SKGE is not set | 595 | # CONFIG_SKGE is not set |
| 596 | # CONFIG_SKY2 is not set | ||
| 567 | # CONFIG_SK98LIN is not set | 597 | # CONFIG_SK98LIN is not set |
| 568 | # CONFIG_VIA_VELOCITY is not set | 598 | # CONFIG_VIA_VELOCITY is not set |
| 569 | CONFIG_TIGON3=y | 599 | CONFIG_TIGON3=y |
| @@ -668,12 +698,15 @@ CONFIG_VT=y | |||
| 668 | CONFIG_VT_CONSOLE=y | 698 | CONFIG_VT_CONSOLE=y |
| 669 | CONFIG_HW_CONSOLE=y | 699 | CONFIG_HW_CONSOLE=y |
| 670 | CONFIG_SERIAL_NONSTANDARD=y | 700 | CONFIG_SERIAL_NONSTANDARD=y |
| 701 | # CONFIG_COMPUTONE is not set | ||
| 671 | # CONFIG_ROCKETPORT is not set | 702 | # CONFIG_ROCKETPORT is not set |
| 672 | # CONFIG_CYCLADES is not set | 703 | # CONFIG_CYCLADES is not set |
| 673 | # CONFIG_DIGIEPCA is not set | 704 | # CONFIG_DIGIEPCA is not set |
| 705 | # CONFIG_MOXA_INTELLIO is not set | ||
| 674 | # CONFIG_MOXA_SMARTIO is not set | 706 | # CONFIG_MOXA_SMARTIO is not set |
| 675 | # CONFIG_ISI is not set | 707 | # CONFIG_ISI is not set |
| 676 | # CONFIG_SYNCLINKMP is not set | 708 | # CONFIG_SYNCLINKMP is not set |
| 709 | # CONFIG_SYNCLINK_GT is not set | ||
| 677 | # CONFIG_N_HDLC is not set | 710 | # CONFIG_N_HDLC is not set |
| 678 | # CONFIG_SPECIALIX is not set | 711 | # CONFIG_SPECIALIX is not set |
| 679 | # CONFIG_SX is not set | 712 | # CONFIG_SX is not set |
| @@ -689,6 +722,7 @@ CONFIG_SERIAL_8250=y | |||
| 689 | CONFIG_SERIAL_8250_CONSOLE=y | 722 | CONFIG_SERIAL_8250_CONSOLE=y |
| 690 | CONFIG_SERIAL_8250_ACPI=y | 723 | CONFIG_SERIAL_8250_ACPI=y |
| 691 | CONFIG_SERIAL_8250_NR_UARTS=6 | 724 | CONFIG_SERIAL_8250_NR_UARTS=6 |
| 725 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 692 | CONFIG_SERIAL_8250_EXTENDED=y | 726 | CONFIG_SERIAL_8250_EXTENDED=y |
| 693 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 727 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
| 694 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set | 728 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set |
| @@ -738,10 +772,10 @@ CONFIG_DRM_SIS=m | |||
| 738 | # CONFIG_DRM_VIA is not set | 772 | # CONFIG_DRM_VIA is not set |
| 739 | # CONFIG_DRM_SAVAGE is not set | 773 | # CONFIG_DRM_SAVAGE is not set |
| 740 | CONFIG_RAW_DRIVER=m | 774 | CONFIG_RAW_DRIVER=m |
| 775 | CONFIG_MAX_RAW_DEVS=256 | ||
| 741 | CONFIG_HPET=y | 776 | CONFIG_HPET=y |
| 742 | # CONFIG_HPET_RTC_IRQ is not set | 777 | # CONFIG_HPET_RTC_IRQ is not set |
| 743 | CONFIG_HPET_MMAP=y | 778 | CONFIG_HPET_MMAP=y |
| 744 | CONFIG_MAX_RAW_DEVS=256 | ||
| 745 | # CONFIG_HANGCHECK_TIMER is not set | 779 | # CONFIG_HANGCHECK_TIMER is not set |
| 746 | CONFIG_MMTIMER=y | 780 | CONFIG_MMTIMER=y |
| 747 | 781 | ||
| @@ -749,6 +783,7 @@ CONFIG_MMTIMER=y | |||
| 749 | # TPM devices | 783 | # TPM devices |
| 750 | # | 784 | # |
| 751 | # CONFIG_TCG_TPM is not set | 785 | # CONFIG_TCG_TPM is not set |
| 786 | # CONFIG_TELCLOCK is not set | ||
| 752 | 787 | ||
| 753 | # | 788 | # |
| 754 | # I2C support | 789 | # I2C support |
| @@ -756,6 +791,12 @@ CONFIG_MMTIMER=y | |||
| 756 | # CONFIG_I2C is not set | 791 | # CONFIG_I2C is not set |
| 757 | 792 | ||
| 758 | # | 793 | # |
| 794 | # SPI support | ||
| 795 | # | ||
| 796 | # CONFIG_SPI is not set | ||
| 797 | # CONFIG_SPI_MASTER is not set | ||
| 798 | |||
| 799 | # | ||
| 759 | # Dallas's 1-wire bus | 800 | # Dallas's 1-wire bus |
| 760 | # | 801 | # |
| 761 | # CONFIG_W1 is not set | 802 | # CONFIG_W1 is not set |
| @@ -765,6 +806,7 @@ CONFIG_MMTIMER=y | |||
| 765 | # | 806 | # |
| 766 | CONFIG_HWMON=y | 807 | CONFIG_HWMON=y |
| 767 | # CONFIG_HWMON_VID is not set | 808 | # CONFIG_HWMON_VID is not set |
| 809 | # CONFIG_SENSORS_F71805F is not set | ||
| 768 | # CONFIG_HWMON_DEBUG_CHIP is not set | 810 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 769 | 811 | ||
| 770 | # | 812 | # |
| @@ -815,26 +857,28 @@ CONFIG_SND_OSSEMUL=y | |||
| 815 | CONFIG_SND_MIXER_OSS=m | 857 | CONFIG_SND_MIXER_OSS=m |
| 816 | CONFIG_SND_PCM_OSS=m | 858 | CONFIG_SND_PCM_OSS=m |
| 817 | CONFIG_SND_SEQUENCER_OSS=y | 859 | CONFIG_SND_SEQUENCER_OSS=y |
| 860 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 861 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 818 | CONFIG_SND_VERBOSE_PRINTK=y | 862 | CONFIG_SND_VERBOSE_PRINTK=y |
| 819 | # CONFIG_SND_DEBUG is not set | 863 | # CONFIG_SND_DEBUG is not set |
| 820 | CONFIG_SND_GENERIC_DRIVER=y | ||
| 821 | 864 | ||
| 822 | # | 865 | # |
| 823 | # Generic devices | 866 | # Generic devices |
| 824 | # | 867 | # |
| 825 | CONFIG_SND_MPU401_UART=m | 868 | CONFIG_SND_MPU401_UART=m |
| 826 | CONFIG_SND_OPL3_LIB=m | 869 | CONFIG_SND_OPL3_LIB=m |
| 870 | CONFIG_SND_AC97_CODEC=m | ||
| 871 | CONFIG_SND_AC97_BUS=m | ||
| 827 | CONFIG_SND_DUMMY=m | 872 | CONFIG_SND_DUMMY=m |
| 828 | CONFIG_SND_VIRMIDI=m | 873 | CONFIG_SND_VIRMIDI=m |
| 829 | CONFIG_SND_MTPAV=m | 874 | CONFIG_SND_MTPAV=m |
| 830 | CONFIG_SND_SERIAL_U16550=m | 875 | CONFIG_SND_SERIAL_U16550=m |
| 831 | CONFIG_SND_MPU401=m | 876 | CONFIG_SND_MPU401=m |
| 832 | CONFIG_SND_AC97_CODEC=m | ||
| 833 | CONFIG_SND_AC97_BUS=m | ||
| 834 | 877 | ||
| 835 | # | 878 | # |
| 836 | # PCI devices | 879 | # PCI devices |
| 837 | # | 880 | # |
| 881 | # CONFIG_SND_AD1889 is not set | ||
| 838 | # CONFIG_SND_ALI5451 is not set | 882 | # CONFIG_SND_ALI5451 is not set |
| 839 | # CONFIG_SND_ATIIXP is not set | 883 | # CONFIG_SND_ATIIXP is not set |
| 840 | # CONFIG_SND_ATIIXP_MODEM is not set | 884 | # CONFIG_SND_ATIIXP_MODEM is not set |
| @@ -843,40 +887,40 @@ CONFIG_SND_AC97_BUS=m | |||
| 843 | # CONFIG_SND_AU8830 is not set | 887 | # CONFIG_SND_AU8830 is not set |
| 844 | # CONFIG_SND_AZT3328 is not set | 888 | # CONFIG_SND_AZT3328 is not set |
| 845 | # CONFIG_SND_BT87X is not set | 889 | # CONFIG_SND_BT87X is not set |
| 890 | # CONFIG_SND_CA0106 is not set | ||
| 891 | # CONFIG_SND_CMIPCI is not set | ||
| 892 | CONFIG_SND_CS4281=m | ||
| 846 | CONFIG_SND_CS46XX=m | 893 | CONFIG_SND_CS46XX=m |
| 847 | CONFIG_SND_CS46XX_NEW_DSP=y | 894 | CONFIG_SND_CS46XX_NEW_DSP=y |
| 848 | CONFIG_SND_CS4281=m | ||
| 849 | CONFIG_SND_EMU10K1=m | 895 | CONFIG_SND_EMU10K1=m |
| 850 | # CONFIG_SND_EMU10K1X is not set | 896 | # CONFIG_SND_EMU10K1X is not set |
| 851 | # CONFIG_SND_CA0106 is not set | ||
| 852 | # CONFIG_SND_KORG1212 is not set | ||
| 853 | # CONFIG_SND_MIXART is not set | ||
| 854 | # CONFIG_SND_NM256 is not set | ||
| 855 | # CONFIG_SND_RME32 is not set | ||
| 856 | # CONFIG_SND_RME96 is not set | ||
| 857 | # CONFIG_SND_RME9652 is not set | ||
| 858 | # CONFIG_SND_HDSP is not set | ||
| 859 | # CONFIG_SND_HDSPM is not set | ||
| 860 | # CONFIG_SND_TRIDENT is not set | ||
| 861 | # CONFIG_SND_YMFPCI is not set | ||
| 862 | # CONFIG_SND_AD1889 is not set | ||
| 863 | # CONFIG_SND_CMIPCI is not set | ||
| 864 | # CONFIG_SND_ENS1370 is not set | 897 | # CONFIG_SND_ENS1370 is not set |
| 865 | # CONFIG_SND_ENS1371 is not set | 898 | # CONFIG_SND_ENS1371 is not set |
| 866 | # CONFIG_SND_ES1938 is not set | 899 | # CONFIG_SND_ES1938 is not set |
| 867 | # CONFIG_SND_ES1968 is not set | 900 | # CONFIG_SND_ES1968 is not set |
| 868 | # CONFIG_SND_MAESTRO3 is not set | ||
| 869 | CONFIG_SND_FM801=m | 901 | CONFIG_SND_FM801=m |
| 870 | # CONFIG_SND_FM801_TEA575X is not set | 902 | # CONFIG_SND_FM801_TEA575X is not set |
| 903 | # CONFIG_SND_HDA_INTEL is not set | ||
| 904 | # CONFIG_SND_HDSP is not set | ||
| 905 | # CONFIG_SND_HDSPM is not set | ||
| 871 | # CONFIG_SND_ICE1712 is not set | 906 | # CONFIG_SND_ICE1712 is not set |
| 872 | # CONFIG_SND_ICE1724 is not set | 907 | # CONFIG_SND_ICE1724 is not set |
| 873 | # CONFIG_SND_INTEL8X0 is not set | 908 | # CONFIG_SND_INTEL8X0 is not set |
| 874 | # CONFIG_SND_INTEL8X0M is not set | 909 | # CONFIG_SND_INTEL8X0M is not set |
| 910 | # CONFIG_SND_KORG1212 is not set | ||
| 911 | # CONFIG_SND_MAESTRO3 is not set | ||
| 912 | # CONFIG_SND_MIXART is not set | ||
| 913 | # CONFIG_SND_NM256 is not set | ||
| 914 | # CONFIG_SND_PCXHR is not set | ||
| 915 | # CONFIG_SND_RME32 is not set | ||
| 916 | # CONFIG_SND_RME96 is not set | ||
| 917 | # CONFIG_SND_RME9652 is not set | ||
| 875 | # CONFIG_SND_SONICVIBES is not set | 918 | # CONFIG_SND_SONICVIBES is not set |
| 919 | # CONFIG_SND_TRIDENT is not set | ||
| 876 | # CONFIG_SND_VIA82XX is not set | 920 | # CONFIG_SND_VIA82XX is not set |
| 877 | # CONFIG_SND_VIA82XX_MODEM is not set | 921 | # CONFIG_SND_VIA82XX_MODEM is not set |
| 878 | # CONFIG_SND_VX222 is not set | 922 | # CONFIG_SND_VX222 is not set |
| 879 | # CONFIG_SND_HDA_INTEL is not set | 923 | # CONFIG_SND_YMFPCI is not set |
| 880 | 924 | ||
| 881 | # | 925 | # |
| 882 | # USB devices | 926 | # USB devices |
| @@ -922,12 +966,15 @@ CONFIG_USB_UHCI_HCD=m | |||
| 922 | # USB Device Class drivers | 966 | # USB Device Class drivers |
| 923 | # | 967 | # |
| 924 | # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set | 968 | # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set |
| 925 | # CONFIG_USB_BLUETOOTH_TTY is not set | ||
| 926 | # CONFIG_USB_ACM is not set | 969 | # CONFIG_USB_ACM is not set |
| 927 | # CONFIG_USB_PRINTER is not set | 970 | # CONFIG_USB_PRINTER is not set |
| 928 | 971 | ||
| 929 | # | 972 | # |
| 930 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information | 973 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 974 | # | ||
| 975 | |||
| 976 | # | ||
| 977 | # may also be needed; see USB_STORAGE Help for more information | ||
| 931 | # | 978 | # |
| 932 | CONFIG_USB_STORAGE=m | 979 | CONFIG_USB_STORAGE=m |
| 933 | # CONFIG_USB_STORAGE_DEBUG is not set | 980 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -939,12 +986,15 @@ CONFIG_USB_STORAGE=m | |||
| 939 | # CONFIG_USB_STORAGE_SDDR09 is not set | 986 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 940 | # CONFIG_USB_STORAGE_SDDR55 is not set | 987 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 941 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 988 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 989 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 990 | # CONFIG_USB_LIBUSUAL is not set | ||
| 942 | 991 | ||
| 943 | # | 992 | # |
| 944 | # USB Input Devices | 993 | # USB Input Devices |
| 945 | # | 994 | # |
| 946 | CONFIG_USB_HID=m | 995 | CONFIG_USB_HID=m |
| 947 | CONFIG_USB_HIDINPUT=y | 996 | CONFIG_USB_HIDINPUT=y |
| 997 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 948 | # CONFIG_HID_FF is not set | 998 | # CONFIG_HID_FF is not set |
| 949 | # CONFIG_USB_HIDDEV is not set | 999 | # CONFIG_USB_HIDDEV is not set |
| 950 | 1000 | ||
| @@ -964,6 +1014,7 @@ CONFIG_USB_HIDINPUT=y | |||
| 964 | # CONFIG_USB_YEALINK is not set | 1014 | # CONFIG_USB_YEALINK is not set |
| 965 | # CONFIG_USB_XPAD is not set | 1015 | # CONFIG_USB_XPAD is not set |
| 966 | # CONFIG_USB_ATI_REMOTE is not set | 1016 | # CONFIG_USB_ATI_REMOTE is not set |
| 1017 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
| 967 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 1018 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
| 968 | # CONFIG_USB_APPLETOUCH is not set | 1019 | # CONFIG_USB_APPLETOUCH is not set |
| 969 | 1020 | ||
| @@ -1043,6 +1094,7 @@ CONFIG_INFINIBAND_MTHCA=m | |||
| 1043 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set | 1094 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set |
| 1044 | CONFIG_INFINIBAND_IPOIB=m | 1095 | CONFIG_INFINIBAND_IPOIB=m |
| 1045 | # CONFIG_INFINIBAND_IPOIB_DEBUG is not set | 1096 | # CONFIG_INFINIBAND_IPOIB_DEBUG is not set |
| 1097 | # CONFIG_INFINIBAND_SRP is not set | ||
| 1046 | 1098 | ||
| 1047 | # | 1099 | # |
| 1048 | # SN Devices | 1100 | # SN Devices |
| @@ -1051,6 +1103,10 @@ CONFIG_SGI_IOC4=y | |||
| 1051 | CONFIG_SGI_IOC3=y | 1103 | CONFIG_SGI_IOC3=y |
| 1052 | 1104 | ||
| 1053 | # | 1105 | # |
| 1106 | # EDAC - error detection and reporting (RAS) | ||
| 1107 | # | ||
| 1108 | |||
| 1109 | # | ||
| 1054 | # File systems | 1110 | # File systems |
| 1055 | # | 1111 | # |
| 1056 | CONFIG_EXT2_FS=y | 1112 | CONFIG_EXT2_FS=y |
| @@ -1079,6 +1135,7 @@ CONFIG_XFS_EXPORT=y | |||
| 1079 | # CONFIG_XFS_SECURITY is not set | 1135 | # CONFIG_XFS_SECURITY is not set |
| 1080 | # CONFIG_XFS_POSIX_ACL is not set | 1136 | # CONFIG_XFS_POSIX_ACL is not set |
| 1081 | # CONFIG_XFS_RT is not set | 1137 | # CONFIG_XFS_RT is not set |
| 1138 | # CONFIG_OCFS2_FS is not set | ||
| 1082 | # CONFIG_MINIX_FS is not set | 1139 | # CONFIG_MINIX_FS is not set |
| 1083 | # CONFIG_ROMFS_FS is not set | 1140 | # CONFIG_ROMFS_FS is not set |
| 1084 | CONFIG_INOTIFY=y | 1141 | CONFIG_INOTIFY=y |
| @@ -1120,6 +1177,7 @@ CONFIG_HUGETLBFS=y | |||
| 1120 | CONFIG_HUGETLB_PAGE=y | 1177 | CONFIG_HUGETLB_PAGE=y |
| 1121 | CONFIG_RAMFS=y | 1178 | CONFIG_RAMFS=y |
| 1122 | # CONFIG_RELAYFS_FS is not set | 1179 | # CONFIG_RELAYFS_FS is not set |
| 1180 | # CONFIG_CONFIGFS_FS is not set | ||
| 1123 | 1181 | ||
| 1124 | # | 1182 | # |
| 1125 | # Miscellaneous filesystems | 1183 | # Miscellaneous filesystems |
| @@ -1189,6 +1247,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1189 | CONFIG_SGI_PARTITION=y | 1247 | CONFIG_SGI_PARTITION=y |
| 1190 | # CONFIG_ULTRIX_PARTITION is not set | 1248 | # CONFIG_ULTRIX_PARTITION is not set |
| 1191 | # CONFIG_SUN_PARTITION is not set | 1249 | # CONFIG_SUN_PARTITION is not set |
| 1250 | # CONFIG_KARMA_PARTITION is not set | ||
| 1192 | CONFIG_EFI_PARTITION=y | 1251 | CONFIG_EFI_PARTITION=y |
| 1193 | 1252 | ||
| 1194 | # | 1253 | # |
| @@ -1254,26 +1313,30 @@ CONFIG_GENERIC_PENDING_IRQ=y | |||
| 1254 | # CONFIG_HP_SIMSCSI is not set | 1313 | # CONFIG_HP_SIMSCSI is not set |
| 1255 | 1314 | ||
| 1256 | # | 1315 | # |
| 1257 | # Profiling support | 1316 | # Instrumentation Support |
| 1258 | # | 1317 | # |
| 1259 | # CONFIG_PROFILING is not set | 1318 | # CONFIG_PROFILING is not set |
| 1319 | # CONFIG_KPROBES is not set | ||
| 1260 | 1320 | ||
| 1261 | # | 1321 | # |
| 1262 | # Kernel hacking | 1322 | # Kernel hacking |
| 1263 | # | 1323 | # |
| 1264 | # CONFIG_PRINTK_TIME is not set | 1324 | # CONFIG_PRINTK_TIME is not set |
| 1265 | CONFIG_DEBUG_KERNEL=y | ||
| 1266 | CONFIG_MAGIC_SYSRQ=y | 1325 | CONFIG_MAGIC_SYSRQ=y |
| 1326 | CONFIG_DEBUG_KERNEL=y | ||
| 1267 | CONFIG_LOG_BUF_SHIFT=20 | 1327 | CONFIG_LOG_BUF_SHIFT=20 |
| 1268 | CONFIG_DETECT_SOFTLOCKUP=y | 1328 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1269 | # CONFIG_SCHEDSTATS is not set | 1329 | # CONFIG_SCHEDSTATS is not set |
| 1270 | # CONFIG_DEBUG_SLAB is not set | 1330 | # CONFIG_DEBUG_SLAB is not set |
| 1331 | CONFIG_DEBUG_MUTEXES=y | ||
| 1271 | # CONFIG_DEBUG_SPINLOCK is not set | 1332 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1272 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1333 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1273 | # CONFIG_DEBUG_KOBJECT is not set | 1334 | # CONFIG_DEBUG_KOBJECT is not set |
| 1274 | # CONFIG_DEBUG_INFO is not set | 1335 | # CONFIG_DEBUG_INFO is not set |
| 1275 | # CONFIG_DEBUG_FS is not set | 1336 | # CONFIG_DEBUG_FS is not set |
| 1276 | # CONFIG_KPROBES is not set | 1337 | # CONFIG_DEBUG_VM is not set |
| 1338 | CONFIG_FORCED_INLINING=y | ||
| 1339 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1277 | CONFIG_IA64_GRANULE_16MB=y | 1340 | CONFIG_IA64_GRANULE_16MB=y |
| 1278 | # CONFIG_IA64_GRANULE_64MB is not set | 1341 | # CONFIG_IA64_GRANULE_64MB is not set |
| 1279 | # CONFIG_IA64_PRINT_HAZARDS is not set | 1342 | # CONFIG_IA64_PRINT_HAZARDS is not set |
diff --git a/arch/ia64/configs/sim_defconfig b/arch/ia64/configs/sim_defconfig index a26781cfe8bf..d9146c31ea13 100644 --- a/arch/ia64/configs/sim_defconfig +++ b/arch/ia64/configs/sim_defconfig | |||
| @@ -1,39 +1,52 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc5 | ||
| 4 | # Mon Feb 27 16:13:41 2006 | ||
| 3 | # | 5 | # |
| 4 | 6 | ||
| 5 | # | 7 | # |
| 6 | # Code maturity level options | 8 | # Code maturity level options |
| 7 | # | 9 | # |
| 8 | CONFIG_EXPERIMENTAL=y | 10 | CONFIG_EXPERIMENTAL=y |
| 9 | # CONFIG_CLEAN_COMPILE is not set | 11 | CONFIG_LOCK_KERNEL=y |
| 10 | # CONFIG_STANDALONE is not set | 12 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 11 | CONFIG_BROKEN=y | ||
| 12 | CONFIG_BROKEN_ON_SMP=y | ||
| 13 | 13 | ||
| 14 | # | 14 | # |
| 15 | # General setup | 15 | # General setup |
| 16 | # | 16 | # |
| 17 | CONFIG_LOCALVERSION="" | ||
| 18 | CONFIG_LOCALVERSION_AUTO=y | ||
| 17 | CONFIG_SWAP=y | 19 | CONFIG_SWAP=y |
| 18 | CONFIG_SYSVIPC=y | 20 | CONFIG_SYSVIPC=y |
| 19 | # CONFIG_POSIX_MQUEUE is not set | 21 | # CONFIG_POSIX_MQUEUE is not set |
| 20 | # CONFIG_BSD_PROCESS_ACCT is not set | 22 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 21 | CONFIG_SYSCTL=y | 23 | CONFIG_SYSCTL=y |
| 22 | # CONFIG_AUDIT is not set | 24 | # CONFIG_AUDIT is not set |
| 23 | CONFIG_LOG_BUF_SHIFT=16 | ||
| 24 | # CONFIG_HOTPLUG is not set | ||
| 25 | CONFIG_IKCONFIG=y | 25 | CONFIG_IKCONFIG=y |
| 26 | CONFIG_IKCONFIG_PROC=y | 26 | CONFIG_IKCONFIG_PROC=y |
| 27 | # CONFIG_CPUSETS is not set | ||
| 28 | CONFIG_INITRAMFS_SOURCE="" | ||
| 29 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 27 | # CONFIG_EMBEDDED is not set | 30 | # CONFIG_EMBEDDED is not set |
| 28 | CONFIG_KALLSYMS=y | 31 | CONFIG_KALLSYMS=y |
| 29 | # CONFIG_KALLSYMS_ALL is not set | 32 | # CONFIG_KALLSYMS_ALL is not set |
| 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 34 | CONFIG_HOTPLUG=y | ||
| 35 | CONFIG_PRINTK=y | ||
| 36 | CONFIG_BUG=y | ||
| 37 | CONFIG_ELF_CORE=y | ||
| 38 | CONFIG_BASE_FULL=y | ||
| 30 | CONFIG_FUTEX=y | 39 | CONFIG_FUTEX=y |
| 31 | CONFIG_EPOLL=y | 40 | CONFIG_EPOLL=y |
| 32 | CONFIG_IOSCHED_NOOP=y | 41 | CONFIG_SHMEM=y |
| 33 | CONFIG_IOSCHED_AS=y | 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 |
| 34 | CONFIG_IOSCHED_DEADLINE=y | 43 | CONFIG_CC_ALIGN_LABELS=0 |
| 35 | CONFIG_IOSCHED_CFQ=y | 44 | CONFIG_CC_ALIGN_LOOPS=0 |
| 36 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 45 | CONFIG_CC_ALIGN_JUMPS=0 |
| 46 | CONFIG_SLAB=y | ||
| 47 | # CONFIG_TINY_SHMEM is not set | ||
| 48 | CONFIG_BASE_SMALL=0 | ||
| 49 | # CONFIG_SLOB is not set | ||
| 37 | 50 | ||
| 38 | # | 51 | # |
| 39 | # Loadable module support | 52 | # Loadable module support |
| @@ -43,21 +56,45 @@ CONFIG_MODULE_UNLOAD=y | |||
| 43 | CONFIG_MODULE_FORCE_UNLOAD=y | 56 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 44 | CONFIG_OBSOLETE_MODPARM=y | 57 | CONFIG_OBSOLETE_MODPARM=y |
| 45 | CONFIG_MODVERSIONS=y | 58 | CONFIG_MODVERSIONS=y |
| 59 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 46 | CONFIG_KMOD=y | 60 | CONFIG_KMOD=y |
| 47 | CONFIG_STOP_MACHINE=y | 61 | CONFIG_STOP_MACHINE=y |
| 48 | 62 | ||
| 49 | # | 63 | # |
| 64 | # Block layer | ||
| 65 | # | ||
| 66 | |||
| 67 | # | ||
| 68 | # IO Schedulers | ||
| 69 | # | ||
| 70 | CONFIG_IOSCHED_NOOP=y | ||
| 71 | CONFIG_IOSCHED_AS=y | ||
| 72 | CONFIG_IOSCHED_DEADLINE=y | ||
| 73 | CONFIG_IOSCHED_CFQ=y | ||
| 74 | CONFIG_DEFAULT_AS=y | ||
| 75 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 76 | # CONFIG_DEFAULT_CFQ is not set | ||
| 77 | # CONFIG_DEFAULT_NOOP is not set | ||
| 78 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 79 | |||
| 80 | # | ||
| 50 | # Processor type and features | 81 | # Processor type and features |
| 51 | # | 82 | # |
| 52 | CONFIG_IA64=y | 83 | CONFIG_IA64=y |
| 53 | CONFIG_64BIT=y | 84 | CONFIG_64BIT=y |
| 54 | CONFIG_MMU=y | 85 | CONFIG_MMU=y |
| 86 | CONFIG_SWIOTLB=y | ||
| 55 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 87 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 88 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 56 | CONFIG_TIME_INTERPOLATION=y | 89 | CONFIG_TIME_INTERPOLATION=y |
| 57 | CONFIG_EFI=y | 90 | CONFIG_EFI=y |
| 91 | CONFIG_GENERIC_IOMAP=y | ||
| 92 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 93 | CONFIG_DMA_IS_DMA32=y | ||
| 58 | # CONFIG_IA64_GENERIC is not set | 94 | # CONFIG_IA64_GENERIC is not set |
| 59 | # CONFIG_IA64_DIG is not set | 95 | # CONFIG_IA64_DIG is not set |
| 60 | # CONFIG_IA64_HP_ZX1 is not set | 96 | # CONFIG_IA64_HP_ZX1 is not set |
| 97 | # CONFIG_IA64_HP_ZX1_SWIOTLB is not set | ||
| 61 | # CONFIG_IA64_SGI_SN2 is not set | 98 | # CONFIG_IA64_SGI_SN2 is not set |
| 62 | CONFIG_IA64_HP_SIM=y | 99 | CONFIG_IA64_HP_SIM=y |
| 63 | # CONFIG_ITANIUM is not set | 100 | # CONFIG_ITANIUM is not set |
| @@ -66,17 +103,36 @@ CONFIG_MCKINLEY=y | |||
| 66 | # CONFIG_IA64_PAGE_SIZE_8KB is not set | 103 | # CONFIG_IA64_PAGE_SIZE_8KB is not set |
| 67 | # CONFIG_IA64_PAGE_SIZE_16KB is not set | 104 | # CONFIG_IA64_PAGE_SIZE_16KB is not set |
| 68 | CONFIG_IA64_PAGE_SIZE_64KB=y | 105 | CONFIG_IA64_PAGE_SIZE_64KB=y |
| 106 | CONFIG_PGTABLE_3=y | ||
| 107 | # CONFIG_PGTABLE_4 is not set | ||
| 108 | # CONFIG_HZ_100 is not set | ||
| 109 | CONFIG_HZ_250=y | ||
| 110 | # CONFIG_HZ_1000 is not set | ||
| 111 | CONFIG_HZ=250 | ||
| 69 | CONFIG_IA64_L1_CACHE_SHIFT=7 | 112 | CONFIG_IA64_L1_CACHE_SHIFT=7 |
| 70 | # CONFIG_MCKINLEY_ASTEP_SPECIFIC is not set | ||
| 71 | # CONFIG_VIRTUAL_MEM_MAP is not set | ||
| 72 | # CONFIG_IA64_CYCLONE is not set | 113 | # CONFIG_IA64_CYCLONE is not set |
| 73 | CONFIG_FORCE_MAX_ZONEORDER=18 | 114 | CONFIG_FORCE_MAX_ZONEORDER=17 |
| 74 | CONFIG_SMP=y | 115 | CONFIG_SMP=y |
| 75 | CONFIG_NR_CPUS=64 | 116 | CONFIG_NR_CPUS=64 |
| 117 | # CONFIG_HOTPLUG_CPU is not set | ||
| 118 | # CONFIG_SCHED_SMT is not set | ||
| 76 | CONFIG_PREEMPT=y | 119 | CONFIG_PREEMPT=y |
| 77 | CONFIG_HAVE_DEC_LOCK=y | 120 | CONFIG_SELECT_MEMORY_MODEL=y |
| 121 | CONFIG_FLATMEM_MANUAL=y | ||
| 122 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 123 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 124 | CONFIG_FLATMEM=y | ||
| 125 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 126 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 127 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 128 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
| 129 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
| 130 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
| 131 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
| 132 | # CONFIG_VIRTUAL_MEM_MAP is not set | ||
| 78 | CONFIG_IA32_SUPPORT=y | 133 | CONFIG_IA32_SUPPORT=y |
| 79 | CONFIG_COMPAT=y | 134 | CONFIG_COMPAT=y |
| 135 | # CONFIG_IA64_MCA_RECOVERY is not set | ||
| 80 | # CONFIG_PERFMON is not set | 136 | # CONFIG_PERFMON is not set |
| 81 | CONFIG_IA64_PALINFO=m | 137 | CONFIG_IA64_PALINFO=m |
| 82 | 138 | ||
| @@ -84,7 +140,6 @@ CONFIG_IA64_PALINFO=m | |||
| 84 | # Firmware Drivers | 140 | # Firmware Drivers |
| 85 | # | 141 | # |
| 86 | CONFIG_EFI_VARS=y | 142 | CONFIG_EFI_VARS=y |
| 87 | # CONFIG_SMBIOS is not set | ||
| 88 | CONFIG_BINFMT_ELF=y | 143 | CONFIG_BINFMT_ELF=y |
| 89 | CONFIG_BINFMT_MISC=y | 144 | CONFIG_BINFMT_MISC=y |
| 90 | 145 | ||
| @@ -93,15 +148,98 @@ CONFIG_BINFMT_MISC=y | |||
| 93 | # | 148 | # |
| 94 | 149 | ||
| 95 | # | 150 | # |
| 151 | # Networking | ||
| 152 | # | ||
| 153 | CONFIG_NET=y | ||
| 154 | |||
| 155 | # | ||
| 156 | # Networking options | ||
| 157 | # | ||
| 158 | # CONFIG_NETDEBUG is not set | ||
| 159 | CONFIG_PACKET=y | ||
| 160 | # CONFIG_PACKET_MMAP is not set | ||
| 161 | # CONFIG_UNIX is not set | ||
| 162 | # CONFIG_NET_KEY is not set | ||
| 163 | CONFIG_INET=y | ||
| 164 | CONFIG_IP_MULTICAST=y | ||
| 165 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 166 | CONFIG_IP_FIB_HASH=y | ||
| 167 | # CONFIG_IP_PNP is not set | ||
| 168 | # CONFIG_NET_IPIP is not set | ||
| 169 | # CONFIG_NET_IPGRE is not set | ||
| 170 | # CONFIG_IP_MROUTE is not set | ||
| 171 | # CONFIG_ARPD is not set | ||
| 172 | # CONFIG_SYN_COOKIES is not set | ||
| 173 | # CONFIG_INET_AH is not set | ||
| 174 | # CONFIG_INET_ESP is not set | ||
| 175 | # CONFIG_INET_IPCOMP is not set | ||
| 176 | # CONFIG_INET_TUNNEL is not set | ||
| 177 | CONFIG_INET_DIAG=y | ||
| 178 | CONFIG_INET_TCP_DIAG=y | ||
| 179 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 180 | CONFIG_TCP_CONG_BIC=y | ||
| 181 | # CONFIG_IPV6 is not set | ||
| 182 | # CONFIG_NETFILTER is not set | ||
| 183 | |||
| 184 | # | ||
| 185 | # DCCP Configuration (EXPERIMENTAL) | ||
| 186 | # | ||
| 187 | # CONFIG_IP_DCCP is not set | ||
| 188 | |||
| 189 | # | ||
| 190 | # SCTP Configuration (EXPERIMENTAL) | ||
| 191 | # | ||
| 192 | # CONFIG_IP_SCTP is not set | ||
| 193 | |||
| 194 | # | ||
| 195 | # TIPC Configuration (EXPERIMENTAL) | ||
| 196 | # | ||
| 197 | # CONFIG_TIPC is not set | ||
| 198 | # CONFIG_ATM is not set | ||
| 199 | # CONFIG_BRIDGE is not set | ||
| 200 | # CONFIG_VLAN_8021Q is not set | ||
| 201 | # CONFIG_DECNET is not set | ||
| 202 | # CONFIG_LLC2 is not set | ||
| 203 | # CONFIG_IPX is not set | ||
| 204 | # CONFIG_ATALK is not set | ||
| 205 | # CONFIG_X25 is not set | ||
| 206 | # CONFIG_LAPB is not set | ||
| 207 | # CONFIG_NET_DIVERT is not set | ||
| 208 | # CONFIG_ECONET is not set | ||
| 209 | # CONFIG_WAN_ROUTER is not set | ||
| 210 | |||
| 211 | # | ||
| 212 | # QoS and/or fair queueing | ||
| 213 | # | ||
| 214 | # CONFIG_NET_SCHED is not set | ||
| 215 | |||
| 216 | # | ||
| 217 | # Network testing | ||
| 218 | # | ||
| 219 | # CONFIG_NET_PKTGEN is not set | ||
| 220 | # CONFIG_HAMRADIO is not set | ||
| 221 | # CONFIG_IRDA is not set | ||
| 222 | # CONFIG_BT is not set | ||
| 223 | # CONFIG_IEEE80211 is not set | ||
| 224 | |||
| 225 | # | ||
| 96 | # Device Drivers | 226 | # Device Drivers |
| 97 | # | 227 | # |
| 98 | 228 | ||
| 99 | # | 229 | # |
| 100 | # Generic Driver Options | 230 | # Generic Driver Options |
| 101 | # | 231 | # |
| 232 | # CONFIG_STANDALONE is not set | ||
| 233 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 234 | # CONFIG_FW_LOADER is not set | ||
| 102 | # CONFIG_DEBUG_DRIVER is not set | 235 | # CONFIG_DEBUG_DRIVER is not set |
| 103 | 236 | ||
| 104 | # | 237 | # |
| 238 | # Connector - unified userspace <-> kernelspace linker | ||
| 239 | # | ||
| 240 | # CONFIG_CONNECTOR is not set | ||
| 241 | |||
| 242 | # | ||
| 105 | # Memory Technology Devices (MTD) | 243 | # Memory Technology Devices (MTD) |
| 106 | # | 244 | # |
| 107 | # CONFIG_MTD is not set | 245 | # CONFIG_MTD is not set |
| @@ -118,12 +256,16 @@ CONFIG_BINFMT_MISC=y | |||
| 118 | # | 256 | # |
| 119 | # Block devices | 257 | # Block devices |
| 120 | # | 258 | # |
| 259 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 121 | CONFIG_BLK_DEV_LOOP=y | 260 | CONFIG_BLK_DEV_LOOP=y |
| 122 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 261 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 123 | # CONFIG_BLK_DEV_NBD is not set | 262 | # CONFIG_BLK_DEV_NBD is not set |
| 124 | CONFIG_BLK_DEV_RAM=y | 263 | CONFIG_BLK_DEV_RAM=y |
| 264 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 125 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 265 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 126 | # CONFIG_BLK_DEV_INITRD is not set | 266 | # CONFIG_BLK_DEV_INITRD is not set |
| 267 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 268 | # CONFIG_ATA_OVER_ETH is not set | ||
| 127 | 269 | ||
| 128 | # | 270 | # |
| 129 | # ATA/ATAPI/MFM/RLL support | 271 | # ATA/ATAPI/MFM/RLL support |
| @@ -133,6 +275,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
| 133 | # | 275 | # |
| 134 | # SCSI device support | 276 | # SCSI device support |
| 135 | # | 277 | # |
| 278 | # CONFIG_RAID_ATTRS is not set | ||
| 136 | CONFIG_SCSI=y | 279 | CONFIG_SCSI=y |
| 137 | CONFIG_SCSI_PROC_FS=y | 280 | CONFIG_SCSI_PROC_FS=y |
| 138 | 281 | ||
| @@ -144,6 +287,7 @@ CONFIG_BLK_DEV_SD=y | |||
| 144 | # CONFIG_CHR_DEV_OSST is not set | 287 | # CONFIG_CHR_DEV_OSST is not set |
| 145 | # CONFIG_BLK_DEV_SR is not set | 288 | # CONFIG_BLK_DEV_SR is not set |
| 146 | # CONFIG_CHR_DEV_SG is not set | 289 | # CONFIG_CHR_DEV_SG is not set |
| 290 | # CONFIG_CHR_DEV_SCH is not set | ||
| 147 | 291 | ||
| 148 | # | 292 | # |
| 149 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | 293 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs |
| @@ -157,13 +301,14 @@ CONFIG_SCSI_LOGGING=y | |||
| 157 | # | 301 | # |
| 158 | CONFIG_SCSI_SPI_ATTRS=y | 302 | CONFIG_SCSI_SPI_ATTRS=y |
| 159 | # CONFIG_SCSI_FC_ATTRS is not set | 303 | # CONFIG_SCSI_FC_ATTRS is not set |
| 304 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 305 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 160 | 306 | ||
| 161 | # | 307 | # |
| 162 | # SCSI low-level drivers | 308 | # SCSI low-level drivers |
| 163 | # | 309 | # |
| 164 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 310 | # CONFIG_ISCSI_TCP is not set |
| 165 | # CONFIG_SCSI_SATA is not set | 311 | # CONFIG_SCSI_SATA is not set |
| 166 | # CONFIG_SCSI_EATA_PIO is not set | ||
| 167 | # CONFIG_SCSI_DEBUG is not set | 312 | # CONFIG_SCSI_DEBUG is not set |
| 168 | 313 | ||
| 169 | # | 314 | # |
| @@ -174,77 +319,47 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 174 | # | 319 | # |
| 175 | # Fusion MPT device support | 320 | # Fusion MPT device support |
| 176 | # | 321 | # |
| 322 | # CONFIG_FUSION is not set | ||
| 177 | 323 | ||
| 178 | # | 324 | # |
| 179 | # IEEE 1394 (FireWire) support | 325 | # IEEE 1394 (FireWire) support |
| 180 | # | 326 | # |
| 181 | # CONFIG_IEEE1394 is not set | ||
| 182 | 327 | ||
| 183 | # | 328 | # |
| 184 | # I2O device support | 329 | # I2O device support |
| 185 | # | 330 | # |
| 186 | 331 | ||
| 187 | # | 332 | # |
| 188 | # Networking support | 333 | # Network device support |
| 189 | # | 334 | # |
| 190 | CONFIG_NET=y | 335 | # CONFIG_NETDEVICES is not set |
| 336 | # CONFIG_DUMMY is not set | ||
| 337 | # CONFIG_BONDING is not set | ||
| 338 | # CONFIG_EQUALIZER is not set | ||
| 339 | # CONFIG_TUN is not set | ||
| 191 | 340 | ||
| 192 | # | 341 | # |
| 193 | # Networking options | 342 | # PHY device support |
| 194 | # | 343 | # |
| 195 | CONFIG_PACKET=y | ||
| 196 | # CONFIG_PACKET_MMAP is not set | ||
| 197 | # CONFIG_NETLINK_DEV is not set | ||
| 198 | # CONFIG_UNIX is not set | ||
| 199 | # CONFIG_NET_KEY is not set | ||
| 200 | CONFIG_INET=y | ||
| 201 | CONFIG_IP_MULTICAST=y | ||
| 202 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 203 | # CONFIG_IP_PNP is not set | ||
| 204 | # CONFIG_NET_IPIP is not set | ||
| 205 | # CONFIG_NET_IPGRE is not set | ||
| 206 | # CONFIG_IP_MROUTE is not set | ||
| 207 | # CONFIG_ARPD is not set | ||
| 208 | # CONFIG_SYN_COOKIES is not set | ||
| 209 | # CONFIG_INET_AH is not set | ||
| 210 | # CONFIG_INET_ESP is not set | ||
| 211 | # CONFIG_INET_IPCOMP is not set | ||
| 212 | # CONFIG_IPV6 is not set | ||
| 213 | # CONFIG_NETFILTER is not set | ||
| 214 | 344 | ||
| 215 | # | 345 | # |
| 216 | # SCTP Configuration (EXPERIMENTAL) | 346 | # Ethernet (10 or 100Mbit) |
| 217 | # | 347 | # |
| 218 | # CONFIG_IP_SCTP is not set | 348 | # CONFIG_NET_ETHERNET is not set |
| 219 | # CONFIG_ATM is not set | ||
| 220 | # CONFIG_BRIDGE is not set | ||
| 221 | # CONFIG_VLAN_8021Q is not set | ||
| 222 | # CONFIG_DECNET is not set | ||
| 223 | # CONFIG_LLC2 is not set | ||
| 224 | # CONFIG_IPX is not set | ||
| 225 | # CONFIG_ATALK is not set | ||
| 226 | # CONFIG_X25 is not set | ||
| 227 | # CONFIG_LAPB is not set | ||
| 228 | # CONFIG_NET_DIVERT is not set | ||
| 229 | # CONFIG_ECONET is not set | ||
| 230 | # CONFIG_WAN_ROUTER is not set | ||
| 231 | # CONFIG_NET_HW_FLOWCONTROL is not set | ||
| 232 | 349 | ||
| 233 | # | 350 | # |
| 234 | # QoS and/or fair queueing | 351 | # Ethernet (1000 Mbit) |
| 235 | # | 352 | # |
| 236 | # CONFIG_NET_SCHED is not set | ||
| 237 | 353 | ||
| 238 | # | 354 | # |
| 239 | # Network testing | 355 | # Ethernet (10000 Mbit) |
| 240 | # | 356 | # |
| 241 | # CONFIG_NET_PKTGEN is not set | 357 | # CONFIG_PPP is not set |
| 358 | # CONFIG_SLIP is not set | ||
| 359 | # CONFIG_SHAPER is not set | ||
| 360 | # CONFIG_NETCONSOLE is not set | ||
| 242 | # CONFIG_NETPOLL is not set | 361 | # CONFIG_NETPOLL is not set |
| 243 | # CONFIG_NET_POLL_CONTROLLER is not set | 362 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 244 | # CONFIG_HAMRADIO is not set | ||
| 245 | # CONFIG_IRDA is not set | ||
| 246 | # CONFIG_BT is not set | ||
| 247 | # CONFIG_NETDEVICES is not set | ||
| 248 | 363 | ||
| 249 | # | 364 | # |
| 250 | # ISDN subsystem | 365 | # ISDN subsystem |
| @@ -274,16 +389,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
| 274 | # CONFIG_INPUT_EVBUG is not set | 389 | # CONFIG_INPUT_EVBUG is not set |
| 275 | 390 | ||
| 276 | # | 391 | # |
| 277 | # Input I/O drivers | ||
| 278 | # | ||
| 279 | # CONFIG_GAMEPORT is not set | ||
| 280 | CONFIG_SOUND_GAMEPORT=y | ||
| 281 | CONFIG_SERIO=y | ||
| 282 | # CONFIG_SERIO_I8042 is not set | ||
| 283 | CONFIG_SERIO_SERPORT=y | ||
| 284 | # CONFIG_SERIO_CT82C710 is not set | ||
| 285 | |||
| 286 | # | ||
| 287 | # Input Device Drivers | 392 | # Input Device Drivers |
| 288 | # | 393 | # |
| 289 | # CONFIG_INPUT_KEYBOARD is not set | 394 | # CONFIG_INPUT_KEYBOARD is not set |
| @@ -293,6 +398,15 @@ CONFIG_SERIO_SERPORT=y | |||
| 293 | # CONFIG_INPUT_MISC is not set | 398 | # CONFIG_INPUT_MISC is not set |
| 294 | 399 | ||
| 295 | # | 400 | # |
| 401 | # Hardware I/O ports | ||
| 402 | # | ||
| 403 | CONFIG_SERIO=y | ||
| 404 | # CONFIG_SERIO_I8042 is not set | ||
| 405 | CONFIG_SERIO_SERPORT=y | ||
| 406 | # CONFIG_SERIO_RAW is not set | ||
| 407 | # CONFIG_GAMEPORT is not set | ||
| 408 | |||
| 409 | # | ||
| 296 | # Character devices | 410 | # Character devices |
| 297 | # | 411 | # |
| 298 | CONFIG_VT=y | 412 | CONFIG_VT=y |
| @@ -310,7 +424,6 @@ CONFIG_HW_CONSOLE=y | |||
| 310 | # | 424 | # |
| 311 | CONFIG_UNIX98_PTYS=y | 425 | CONFIG_UNIX98_PTYS=y |
| 312 | # CONFIG_LEGACY_PTYS is not set | 426 | # CONFIG_LEGACY_PTYS is not set |
| 313 | # CONFIG_QIC02_TAPE is not set | ||
| 314 | 427 | ||
| 315 | # | 428 | # |
| 316 | # IPMI | 429 | # IPMI |
| @@ -324,15 +437,19 @@ CONFIG_UNIX98_PTYS=y | |||
| 324 | CONFIG_EFI_RTC=y | 437 | CONFIG_EFI_RTC=y |
| 325 | # CONFIG_DTLK is not set | 438 | # CONFIG_DTLK is not set |
| 326 | # CONFIG_R3964 is not set | 439 | # CONFIG_R3964 is not set |
| 327 | # CONFIG_APPLICOM is not set | ||
| 328 | 440 | ||
| 329 | # | 441 | # |
| 330 | # Ftape, the floppy tape device driver | 442 | # Ftape, the floppy tape device driver |
| 331 | # | 443 | # |
| 332 | # CONFIG_FTAPE is not set | ||
| 333 | # CONFIG_AGP is not set | 444 | # CONFIG_AGP is not set |
| 334 | # CONFIG_DRM is not set | ||
| 335 | # CONFIG_RAW_DRIVER is not set | 445 | # CONFIG_RAW_DRIVER is not set |
| 446 | # CONFIG_HANGCHECK_TIMER is not set | ||
| 447 | |||
| 448 | # | ||
| 449 | # TPM devices | ||
| 450 | # | ||
| 451 | # CONFIG_TCG_TPM is not set | ||
| 452 | # CONFIG_TELCLOCK is not set | ||
| 336 | 453 | ||
| 337 | # | 454 | # |
| 338 | # I2C support | 455 | # I2C support |
| @@ -340,10 +457,33 @@ CONFIG_EFI_RTC=y | |||
| 340 | # CONFIG_I2C is not set | 457 | # CONFIG_I2C is not set |
| 341 | 458 | ||
| 342 | # | 459 | # |
| 460 | # SPI support | ||
| 461 | # | ||
| 462 | # CONFIG_SPI is not set | ||
| 463 | # CONFIG_SPI_MASTER is not set | ||
| 464 | |||
| 465 | # | ||
| 466 | # Dallas's 1-wire bus | ||
| 467 | # | ||
| 468 | # CONFIG_W1 is not set | ||
| 469 | |||
| 470 | # | ||
| 471 | # Hardware Monitoring support | ||
| 472 | # | ||
| 473 | CONFIG_HWMON=y | ||
| 474 | # CONFIG_HWMON_VID is not set | ||
| 475 | # CONFIG_SENSORS_F71805F is not set | ||
| 476 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 477 | |||
| 478 | # | ||
| 343 | # Misc devices | 479 | # Misc devices |
| 344 | # | 480 | # |
| 345 | 481 | ||
| 346 | # | 482 | # |
| 483 | # Multimedia Capabilities Port drivers | ||
| 484 | # | ||
| 485 | |||
| 486 | # | ||
| 347 | # Multimedia devices | 487 | # Multimedia devices |
| 348 | # | 488 | # |
| 349 | # CONFIG_VIDEO_DEV is not set | 489 | # CONFIG_VIDEO_DEV is not set |
| @@ -362,7 +502,6 @@ CONFIG_EFI_RTC=y | |||
| 362 | # Console display driver support | 502 | # Console display driver support |
| 363 | # | 503 | # |
| 364 | # CONFIG_VGA_CONSOLE is not set | 504 | # CONFIG_VGA_CONSOLE is not set |
| 365 | # CONFIG_MDA_CONSOLE is not set | ||
| 366 | CONFIG_DUMMY_CONSOLE=y | 505 | CONFIG_DUMMY_CONSOLE=y |
| 367 | 506 | ||
| 368 | # | 507 | # |
| @@ -373,6 +512,12 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 373 | # | 512 | # |
| 374 | # USB support | 513 | # USB support |
| 375 | # | 514 | # |
| 515 | # CONFIG_USB_ARCH_HAS_HCD is not set | ||
| 516 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
| 517 | |||
| 518 | # | ||
| 519 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 520 | # | ||
| 376 | 521 | ||
| 377 | # | 522 | # |
| 378 | # USB Gadget Support | 523 | # USB Gadget Support |
| @@ -380,22 +525,41 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 380 | # CONFIG_USB_GADGET is not set | 525 | # CONFIG_USB_GADGET is not set |
| 381 | 526 | ||
| 382 | # | 527 | # |
| 528 | # MMC/SD Card support | ||
| 529 | # | ||
| 530 | # CONFIG_MMC is not set | ||
| 531 | |||
| 532 | # | ||
| 533 | # InfiniBand support | ||
| 534 | # | ||
| 535 | |||
| 536 | # | ||
| 537 | # EDAC - error detection and reporting (RAS) | ||
| 538 | # | ||
| 539 | |||
| 540 | # | ||
| 383 | # File systems | 541 | # File systems |
| 384 | # | 542 | # |
| 385 | CONFIG_EXT2_FS=y | 543 | CONFIG_EXT2_FS=y |
| 386 | # CONFIG_EXT2_FS_XATTR is not set | 544 | # CONFIG_EXT2_FS_XATTR is not set |
| 545 | # CONFIG_EXT2_FS_XIP is not set | ||
| 387 | CONFIG_EXT3_FS=y | 546 | CONFIG_EXT3_FS=y |
| 388 | # CONFIG_EXT3_FS_XATTR is not set | 547 | # CONFIG_EXT3_FS_XATTR is not set |
| 389 | CONFIG_JBD=y | 548 | CONFIG_JBD=y |
| 390 | # CONFIG_JBD_DEBUG is not set | 549 | # CONFIG_JBD_DEBUG is not set |
| 391 | # CONFIG_REISERFS_FS is not set | 550 | # CONFIG_REISERFS_FS is not set |
| 392 | # CONFIG_JFS_FS is not set | 551 | # CONFIG_JFS_FS is not set |
| 552 | # CONFIG_FS_POSIX_ACL is not set | ||
| 393 | # CONFIG_XFS_FS is not set | 553 | # CONFIG_XFS_FS is not set |
| 554 | # CONFIG_OCFS2_FS is not set | ||
| 394 | # CONFIG_MINIX_FS is not set | 555 | # CONFIG_MINIX_FS is not set |
| 395 | # CONFIG_ROMFS_FS is not set | 556 | # CONFIG_ROMFS_FS is not set |
| 557 | CONFIG_INOTIFY=y | ||
| 396 | # CONFIG_QUOTA is not set | 558 | # CONFIG_QUOTA is not set |
| 559 | CONFIG_DNOTIFY=y | ||
| 397 | # CONFIG_AUTOFS_FS is not set | 560 | # CONFIG_AUTOFS_FS is not set |
| 398 | # CONFIG_AUTOFS4_FS is not set | 561 | # CONFIG_AUTOFS4_FS is not set |
| 562 | # CONFIG_FUSE_FS is not set | ||
| 399 | 563 | ||
| 400 | # | 564 | # |
| 401 | # CD-ROM/DVD Filesystems | 565 | # CD-ROM/DVD Filesystems |
| @@ -406,7 +570,8 @@ CONFIG_JBD=y | |||
| 406 | # | 570 | # |
| 407 | # DOS/FAT/NT Filesystems | 571 | # DOS/FAT/NT Filesystems |
| 408 | # | 572 | # |
| 409 | # CONFIG_FAT_FS is not set | 573 | # CONFIG_MSDOS_FS is not set |
| 574 | # CONFIG_VFAT_FS is not set | ||
| 410 | # CONFIG_NTFS_FS is not set | 575 | # CONFIG_NTFS_FS is not set |
| 411 | 576 | ||
| 412 | # | 577 | # |
| @@ -415,12 +580,12 @@ CONFIG_JBD=y | |||
| 415 | CONFIG_PROC_FS=y | 580 | CONFIG_PROC_FS=y |
| 416 | CONFIG_PROC_KCORE=y | 581 | CONFIG_PROC_KCORE=y |
| 417 | CONFIG_SYSFS=y | 582 | CONFIG_SYSFS=y |
| 418 | # CONFIG_DEVFS_FS is not set | ||
| 419 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
| 420 | # CONFIG_TMPFS is not set | 583 | # CONFIG_TMPFS is not set |
| 421 | CONFIG_HUGETLBFS=y | 584 | CONFIG_HUGETLBFS=y |
| 422 | CONFIG_HUGETLB_PAGE=y | 585 | CONFIG_HUGETLB_PAGE=y |
| 423 | CONFIG_RAMFS=y | 586 | CONFIG_RAMFS=y |
| 587 | # CONFIG_RELAYFS_FS is not set | ||
| 588 | # CONFIG_CONFIGFS_FS is not set | ||
| 424 | 589 | ||
| 425 | # | 590 | # |
| 426 | # Miscellaneous filesystems | 591 | # Miscellaneous filesystems |
| @@ -448,18 +613,22 @@ CONFIG_NFS_FS=y | |||
| 448 | CONFIG_NFS_DIRECTIO=y | 613 | CONFIG_NFS_DIRECTIO=y |
| 449 | CONFIG_NFSD=y | 614 | CONFIG_NFSD=y |
| 450 | CONFIG_NFSD_V3=y | 615 | CONFIG_NFSD_V3=y |
| 616 | # CONFIG_NFSD_V3_ACL is not set | ||
| 451 | # CONFIG_NFSD_V4 is not set | 617 | # CONFIG_NFSD_V4 is not set |
| 452 | # CONFIG_NFSD_TCP is not set | 618 | # CONFIG_NFSD_TCP is not set |
| 453 | CONFIG_LOCKD=y | 619 | CONFIG_LOCKD=y |
| 454 | CONFIG_LOCKD_V4=y | 620 | CONFIG_LOCKD_V4=y |
| 455 | CONFIG_EXPORTFS=y | 621 | CONFIG_EXPORTFS=y |
| 622 | CONFIG_NFS_COMMON=y | ||
| 456 | CONFIG_SUNRPC=y | 623 | CONFIG_SUNRPC=y |
| 457 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 624 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 625 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 458 | # CONFIG_SMB_FS is not set | 626 | # CONFIG_SMB_FS is not set |
| 459 | # CONFIG_CIFS is not set | 627 | # CONFIG_CIFS is not set |
| 460 | # CONFIG_NCP_FS is not set | 628 | # CONFIG_NCP_FS is not set |
| 461 | # CONFIG_CODA_FS is not set | 629 | # CONFIG_CODA_FS is not set |
| 462 | # CONFIG_AFS_FS is not set | 630 | # CONFIG_AFS_FS is not set |
| 631 | # CONFIG_9P_FS is not set | ||
| 463 | 632 | ||
| 464 | # | 633 | # |
| 465 | # Partition Types | 634 | # Partition Types |
| @@ -476,10 +645,10 @@ CONFIG_MSDOS_PARTITION=y | |||
| 476 | # CONFIG_SOLARIS_X86_PARTITION is not set | 645 | # CONFIG_SOLARIS_X86_PARTITION is not set |
| 477 | # CONFIG_UNIXWARE_DISKLABEL is not set | 646 | # CONFIG_UNIXWARE_DISKLABEL is not set |
| 478 | # CONFIG_LDM_PARTITION is not set | 647 | # CONFIG_LDM_PARTITION is not set |
| 479 | # CONFIG_NEC98_PARTITION is not set | ||
| 480 | # CONFIG_SGI_PARTITION is not set | 648 | # CONFIG_SGI_PARTITION is not set |
| 481 | # CONFIG_ULTRIX_PARTITION is not set | 649 | # CONFIG_ULTRIX_PARTITION is not set |
| 482 | # CONFIG_SUN_PARTITION is not set | 650 | # CONFIG_SUN_PARTITION is not set |
| 651 | # CONFIG_KARMA_PARTITION is not set | ||
| 483 | CONFIG_EFI_PARTITION=y | 652 | CONFIG_EFI_PARTITION=y |
| 484 | 653 | ||
| 485 | # | 654 | # |
| @@ -490,8 +659,13 @@ CONFIG_EFI_PARTITION=y | |||
| 490 | # | 659 | # |
| 491 | # Library routines | 660 | # Library routines |
| 492 | # | 661 | # |
| 662 | # CONFIG_CRC_CCITT is not set | ||
| 663 | # CONFIG_CRC16 is not set | ||
| 493 | CONFIG_CRC32=y | 664 | CONFIG_CRC32=y |
| 494 | # CONFIG_LIBCRC32C is not set | 665 | # CONFIG_LIBCRC32C is not set |
| 666 | CONFIG_GENERIC_HARDIRQS=y | ||
| 667 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 668 | CONFIG_GENERIC_PENDING_IRQ=y | ||
| 495 | 669 | ||
| 496 | # | 670 | # |
| 497 | # HP Simulator drivers | 671 | # HP Simulator drivers |
| @@ -502,33 +676,50 @@ CONFIG_HP_SIMSERIAL_CONSOLE=y | |||
| 502 | CONFIG_HP_SIMSCSI=y | 676 | CONFIG_HP_SIMSCSI=y |
| 503 | 677 | ||
| 504 | # | 678 | # |
| 505 | # Profiling support | 679 | # Instrumentation Support |
| 506 | # | 680 | # |
| 507 | # CONFIG_PROFILING is not set | 681 | # CONFIG_PROFILING is not set |
| 682 | # CONFIG_KPROBES is not set | ||
| 508 | 683 | ||
| 509 | # | 684 | # |
| 510 | # Kernel hacking | 685 | # Kernel hacking |
| 511 | # | 686 | # |
| 512 | # CONFIG_IA64_GRANULE_16MB is not set | 687 | # CONFIG_PRINTK_TIME is not set |
| 513 | CONFIG_IA64_GRANULE_64MB=y | ||
| 514 | CONFIG_DEBUG_KERNEL=y | ||
| 515 | # CONFIG_IA64_PRINT_HAZARDS is not set | ||
| 516 | # CONFIG_DISABLE_VHPT is not set | ||
| 517 | # CONFIG_MAGIC_SYSRQ is not set | 688 | # CONFIG_MAGIC_SYSRQ is not set |
| 689 | CONFIG_DEBUG_KERNEL=y | ||
| 690 | CONFIG_LOG_BUF_SHIFT=16 | ||
| 691 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 692 | # CONFIG_SCHEDSTATS is not set | ||
| 518 | # CONFIG_DEBUG_SLAB is not set | 693 | # CONFIG_DEBUG_SLAB is not set |
| 694 | CONFIG_DEBUG_PREEMPT=y | ||
| 695 | CONFIG_DEBUG_MUTEXES=y | ||
| 519 | # CONFIG_DEBUG_SPINLOCK is not set | 696 | # CONFIG_DEBUG_SPINLOCK is not set |
| 520 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 697 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 698 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 699 | CONFIG_DEBUG_INFO=y | ||
| 700 | # CONFIG_DEBUG_FS is not set | ||
| 701 | # CONFIG_DEBUG_VM is not set | ||
| 702 | CONFIG_FORCED_INLINING=y | ||
| 703 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 704 | # CONFIG_IA64_GRANULE_16MB is not set | ||
| 705 | CONFIG_IA64_GRANULE_64MB=y | ||
| 706 | # CONFIG_IA64_PRINT_HAZARDS is not set | ||
| 707 | # CONFIG_DISABLE_VHPT is not set | ||
| 521 | # CONFIG_IA64_DEBUG_CMPXCHG is not set | 708 | # CONFIG_IA64_DEBUG_CMPXCHG is not set |
| 522 | # CONFIG_IA64_DEBUG_IRQ is not set | 709 | # CONFIG_IA64_DEBUG_IRQ is not set |
| 523 | CONFIG_DEBUG_INFO=y | ||
| 524 | CONFIG_SYSVIPC_COMPAT=y | 710 | CONFIG_SYSVIPC_COMPAT=y |
| 525 | 711 | ||
| 526 | # | 712 | # |
| 527 | # Security options | 713 | # Security options |
| 528 | # | 714 | # |
| 715 | # CONFIG_KEYS is not set | ||
| 529 | # CONFIG_SECURITY is not set | 716 | # CONFIG_SECURITY is not set |
| 530 | 717 | ||
| 531 | # | 718 | # |
| 532 | # Cryptographic options | 719 | # Cryptographic options |
| 533 | # | 720 | # |
| 534 | # CONFIG_CRYPTO is not set | 721 | # CONFIG_CRYPTO is not set |
| 722 | |||
| 723 | # | ||
| 724 | # Hardware crypto devices | ||
| 725 | # | ||
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index 3cb503b659e6..8206752161bb 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig | |||
| @@ -1,14 +1,13 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc4 | 3 | # Linux kernel version: 2.6.16-rc5 |
| 4 | # Fri Dec 2 10:33:48 2005 | 4 | # Mon Feb 27 16:06:38 2006 |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | # | 7 | # |
| 8 | # Code maturity level options | 8 | # Code maturity level options |
| 9 | # | 9 | # |
| 10 | CONFIG_EXPERIMENTAL=y | 10 | CONFIG_EXPERIMENTAL=y |
| 11 | CONFIG_CLEAN_COMPILE=y | ||
| 12 | CONFIG_LOCK_KERNEL=y | 11 | CONFIG_LOCK_KERNEL=y |
| 13 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 12 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 14 | 13 | ||
| @@ -23,17 +22,18 @@ CONFIG_POSIX_MQUEUE=y | |||
| 23 | # CONFIG_BSD_PROCESS_ACCT is not set | 22 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 24 | CONFIG_SYSCTL=y | 23 | CONFIG_SYSCTL=y |
| 25 | # CONFIG_AUDIT is not set | 24 | # CONFIG_AUDIT is not set |
| 26 | CONFIG_HOTPLUG=y | ||
| 27 | CONFIG_KOBJECT_UEVENT=y | ||
| 28 | # CONFIG_IKCONFIG is not set | 25 | # CONFIG_IKCONFIG is not set |
| 29 | CONFIG_CPUSETS=y | 26 | CONFIG_CPUSETS=y |
| 30 | CONFIG_INITRAMFS_SOURCE="" | 27 | CONFIG_INITRAMFS_SOURCE="" |
| 28 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 31 | # CONFIG_EMBEDDED is not set | 29 | # CONFIG_EMBEDDED is not set |
| 32 | CONFIG_KALLSYMS=y | 30 | CONFIG_KALLSYMS=y |
| 33 | CONFIG_KALLSYMS_ALL=y | 31 | CONFIG_KALLSYMS_ALL=y |
| 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 32 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 33 | CONFIG_HOTPLUG=y | ||
| 35 | CONFIG_PRINTK=y | 34 | CONFIG_PRINTK=y |
| 36 | CONFIG_BUG=y | 35 | CONFIG_BUG=y |
| 36 | CONFIG_ELF_CORE=y | ||
| 37 | CONFIG_BASE_FULL=y | 37 | CONFIG_BASE_FULL=y |
| 38 | CONFIG_FUTEX=y | 38 | CONFIG_FUTEX=y |
| 39 | CONFIG_EPOLL=y | 39 | CONFIG_EPOLL=y |
| @@ -42,8 +42,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 | |||
| 42 | CONFIG_CC_ALIGN_LABELS=0 | 42 | CONFIG_CC_ALIGN_LABELS=0 |
| 43 | CONFIG_CC_ALIGN_LOOPS=0 | 43 | CONFIG_CC_ALIGN_LOOPS=0 |
| 44 | CONFIG_CC_ALIGN_JUMPS=0 | 44 | CONFIG_CC_ALIGN_JUMPS=0 |
| 45 | CONFIG_SLAB=y | ||
| 45 | # CONFIG_TINY_SHMEM is not set | 46 | # CONFIG_TINY_SHMEM is not set |
| 46 | CONFIG_BASE_SMALL=0 | 47 | CONFIG_BASE_SMALL=0 |
| 48 | # CONFIG_SLOB is not set | ||
| 47 | 49 | ||
| 48 | # | 50 | # |
| 49 | # Loadable module support | 51 | # Loadable module support |
| @@ -88,7 +90,7 @@ CONFIG_EFI=y | |||
| 88 | CONFIG_GENERIC_IOMAP=y | 90 | CONFIG_GENERIC_IOMAP=y |
| 89 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 91 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 90 | CONFIG_IA64_UNCACHED_ALLOCATOR=y | 92 | CONFIG_IA64_UNCACHED_ALLOCATOR=y |
| 91 | CONFIG_ZONE_DMA_IS_DMA32=y | 93 | CONFIG_DMA_IS_DMA32=y |
| 92 | # CONFIG_IA64_GENERIC is not set | 94 | # CONFIG_IA64_GENERIC is not set |
| 93 | # CONFIG_IA64_DIG is not set | 95 | # CONFIG_IA64_DIG is not set |
| 94 | # CONFIG_IA64_HP_ZX1 is not set | 96 | # CONFIG_IA64_HP_ZX1 is not set |
| @@ -126,6 +128,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
| 126 | CONFIG_NEED_MULTIPLE_NODES=y | 128 | CONFIG_NEED_MULTIPLE_NODES=y |
| 127 | # CONFIG_SPARSEMEM_STATIC is not set | 129 | # CONFIG_SPARSEMEM_STATIC is not set |
| 128 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 130 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 131 | CONFIG_MIGRATION=y | ||
| 129 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 132 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
| 130 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | 133 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |
| 131 | CONFIG_ARCH_FLATMEM_ENABLE=y | 134 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| @@ -140,6 +143,7 @@ CONFIG_COMPAT=y | |||
| 140 | CONFIG_IA64_MCA_RECOVERY=y | 143 | CONFIG_IA64_MCA_RECOVERY=y |
| 141 | CONFIG_PERFMON=y | 144 | CONFIG_PERFMON=y |
| 142 | CONFIG_IA64_PALINFO=y | 145 | CONFIG_IA64_PALINFO=y |
| 146 | CONFIG_SGI_SN=y | ||
| 143 | 147 | ||
| 144 | # | 148 | # |
| 145 | # Firmware Drivers | 149 | # Firmware Drivers |
| @@ -166,6 +170,7 @@ CONFIG_ACPI=y | |||
| 166 | CONFIG_ACPI_NUMA=y | 170 | CONFIG_ACPI_NUMA=y |
| 167 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 171 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
| 168 | # CONFIG_ACPI_DEBUG is not set | 172 | # CONFIG_ACPI_DEBUG is not set |
| 173 | CONFIG_ACPI_EC=y | ||
| 169 | CONFIG_ACPI_POWER=y | 174 | CONFIG_ACPI_POWER=y |
| 170 | CONFIG_ACPI_SYSTEM=y | 175 | CONFIG_ACPI_SYSTEM=y |
| 171 | # CONFIG_ACPI_CONTAINER is not set | 176 | # CONFIG_ACPI_CONTAINER is not set |
| @@ -207,6 +212,7 @@ CONFIG_NET=y | |||
| 207 | # | 212 | # |
| 208 | # Networking options | 213 | # Networking options |
| 209 | # | 214 | # |
| 215 | # CONFIG_NETDEBUG is not set | ||
| 210 | CONFIG_PACKET=y | 216 | CONFIG_PACKET=y |
| 211 | CONFIG_PACKET_MMAP=y | 217 | CONFIG_PACKET_MMAP=y |
| 212 | CONFIG_UNIX=y | 218 | CONFIG_UNIX=y |
| @@ -247,6 +253,11 @@ CONFIG_IPV6=m | |||
| 247 | # SCTP Configuration (EXPERIMENTAL) | 253 | # SCTP Configuration (EXPERIMENTAL) |
| 248 | # | 254 | # |
| 249 | # CONFIG_IP_SCTP is not set | 255 | # CONFIG_IP_SCTP is not set |
| 256 | |||
| 257 | # | ||
| 258 | # TIPC Configuration (EXPERIMENTAL) | ||
| 259 | # | ||
| 260 | # CONFIG_TIPC is not set | ||
| 250 | # CONFIG_ATM is not set | 261 | # CONFIG_ATM is not set |
| 251 | # CONFIG_BRIDGE is not set | 262 | # CONFIG_BRIDGE is not set |
| 252 | # CONFIG_VLAN_8021Q is not set | 263 | # CONFIG_VLAN_8021Q is not set |
| @@ -330,6 +341,7 @@ CONFIG_ATA_OVER_ETH=m | |||
| 330 | # ATA/ATAPI/MFM/RLL support | 341 | # ATA/ATAPI/MFM/RLL support |
| 331 | # | 342 | # |
| 332 | CONFIG_IDE=y | 343 | CONFIG_IDE=y |
| 344 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 333 | CONFIG_BLK_DEV_IDE=y | 345 | CONFIG_BLK_DEV_IDE=y |
| 334 | 346 | ||
| 335 | # | 347 | # |
| @@ -457,13 +469,7 @@ CONFIG_SCSI_SATA_VITESSE=y | |||
| 457 | # CONFIG_SCSI_IPR is not set | 469 | # CONFIG_SCSI_IPR is not set |
| 458 | # CONFIG_SCSI_QLOGIC_FC is not set | 470 | # CONFIG_SCSI_QLOGIC_FC is not set |
| 459 | CONFIG_SCSI_QLOGIC_1280=y | 471 | CONFIG_SCSI_QLOGIC_1280=y |
| 460 | CONFIG_SCSI_QLA2XXX=y | 472 | # CONFIG_SCSI_QLA_FC is not set |
| 461 | # CONFIG_SCSI_QLA21XX is not set | ||
| 462 | CONFIG_SCSI_QLA22XX=y | ||
| 463 | CONFIG_SCSI_QLA2300=y | ||
| 464 | CONFIG_SCSI_QLA2322=y | ||
| 465 | # CONFIG_SCSI_QLA6312 is not set | ||
| 466 | # CONFIG_SCSI_QLA24XX is not set | ||
| 467 | # CONFIG_SCSI_LPFC is not set | 473 | # CONFIG_SCSI_LPFC is not set |
| 468 | # CONFIG_SCSI_DC395x is not set | 474 | # CONFIG_SCSI_DC395x is not set |
| 469 | # CONFIG_SCSI_DC390T is not set | 475 | # CONFIG_SCSI_DC390T is not set |
| @@ -545,6 +551,7 @@ CONFIG_NETDEVICES=y | |||
| 545 | # CONFIG_R8169 is not set | 551 | # CONFIG_R8169 is not set |
| 546 | # CONFIG_SIS190 is not set | 552 | # CONFIG_SIS190 is not set |
| 547 | # CONFIG_SKGE is not set | 553 | # CONFIG_SKGE is not set |
| 554 | # CONFIG_SKY2 is not set | ||
| 548 | # CONFIG_SK98LIN is not set | 555 | # CONFIG_SK98LIN is not set |
| 549 | CONFIG_TIGON3=y | 556 | CONFIG_TIGON3=y |
| 550 | # CONFIG_BNX2 is not set | 557 | # CONFIG_BNX2 is not set |
| @@ -632,12 +639,15 @@ CONFIG_VT=y | |||
| 632 | CONFIG_VT_CONSOLE=y | 639 | CONFIG_VT_CONSOLE=y |
| 633 | CONFIG_HW_CONSOLE=y | 640 | CONFIG_HW_CONSOLE=y |
| 634 | CONFIG_SERIAL_NONSTANDARD=y | 641 | CONFIG_SERIAL_NONSTANDARD=y |
| 642 | # CONFIG_COMPUTONE is not set | ||
| 635 | # CONFIG_ROCKETPORT is not set | 643 | # CONFIG_ROCKETPORT is not set |
| 636 | # CONFIG_CYCLADES is not set | 644 | # CONFIG_CYCLADES is not set |
| 637 | # CONFIG_DIGIEPCA is not set | 645 | # CONFIG_DIGIEPCA is not set |
| 646 | # CONFIG_MOXA_INTELLIO is not set | ||
| 638 | # CONFIG_MOXA_SMARTIO is not set | 647 | # CONFIG_MOXA_SMARTIO is not set |
| 639 | # CONFIG_ISI is not set | 648 | # CONFIG_ISI is not set |
| 640 | # CONFIG_SYNCLINKMP is not set | 649 | # CONFIG_SYNCLINKMP is not set |
| 650 | # CONFIG_SYNCLINK_GT is not set | ||
| 641 | # CONFIG_N_HDLC is not set | 651 | # CONFIG_N_HDLC is not set |
| 642 | # CONFIG_SPECIALIX is not set | 652 | # CONFIG_SPECIALIX is not set |
| 643 | # CONFIG_SX is not set | 653 | # CONFIG_SX is not set |
| @@ -686,8 +696,8 @@ CONFIG_AGP=y | |||
| 686 | CONFIG_AGP_SGI_TIOCA=y | 696 | CONFIG_AGP_SGI_TIOCA=y |
| 687 | # CONFIG_DRM is not set | 697 | # CONFIG_DRM is not set |
| 688 | CONFIG_RAW_DRIVER=m | 698 | CONFIG_RAW_DRIVER=m |
| 689 | # CONFIG_HPET is not set | ||
| 690 | CONFIG_MAX_RAW_DEVS=256 | 699 | CONFIG_MAX_RAW_DEVS=256 |
| 700 | # CONFIG_HPET is not set | ||
| 691 | # CONFIG_HANGCHECK_TIMER is not set | 701 | # CONFIG_HANGCHECK_TIMER is not set |
| 692 | CONFIG_MMTIMER=y | 702 | CONFIG_MMTIMER=y |
| 693 | 703 | ||
| @@ -703,6 +713,12 @@ CONFIG_MMTIMER=y | |||
| 703 | # CONFIG_I2C is not set | 713 | # CONFIG_I2C is not set |
| 704 | 714 | ||
| 705 | # | 715 | # |
| 716 | # SPI support | ||
| 717 | # | ||
| 718 | # CONFIG_SPI is not set | ||
| 719 | # CONFIG_SPI_MASTER is not set | ||
| 720 | |||
| 721 | # | ||
| 706 | # Dallas's 1-wire bus | 722 | # Dallas's 1-wire bus |
| 707 | # | 723 | # |
| 708 | # CONFIG_W1 is not set | 724 | # CONFIG_W1 is not set |
| @@ -791,12 +807,14 @@ CONFIG_USB_UHCI_HCD=m | |||
| 791 | # may also be needed; see USB_STORAGE Help for more information | 807 | # may also be needed; see USB_STORAGE Help for more information |
| 792 | # | 808 | # |
| 793 | # CONFIG_USB_STORAGE is not set | 809 | # CONFIG_USB_STORAGE is not set |
| 810 | # CONFIG_USB_LIBUSUAL is not set | ||
| 794 | 811 | ||
| 795 | # | 812 | # |
| 796 | # USB Input Devices | 813 | # USB Input Devices |
| 797 | # | 814 | # |
| 798 | CONFIG_USB_HID=m | 815 | CONFIG_USB_HID=m |
| 799 | CONFIG_USB_HIDINPUT=y | 816 | CONFIG_USB_HIDINPUT=y |
| 817 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 800 | # CONFIG_HID_FF is not set | 818 | # CONFIG_HID_FF is not set |
| 801 | # CONFIG_USB_HIDDEV is not set | 819 | # CONFIG_USB_HIDDEV is not set |
| 802 | 820 | ||
| @@ -816,6 +834,7 @@ CONFIG_USB_HIDINPUT=y | |||
| 816 | # CONFIG_USB_YEALINK is not set | 834 | # CONFIG_USB_YEALINK is not set |
| 817 | # CONFIG_USB_XPAD is not set | 835 | # CONFIG_USB_XPAD is not set |
| 818 | # CONFIG_USB_ATI_REMOTE is not set | 836 | # CONFIG_USB_ATI_REMOTE is not set |
| 837 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
| 819 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 838 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
| 820 | # CONFIG_USB_APPLETOUCH is not set | 839 | # CONFIG_USB_APPLETOUCH is not set |
| 821 | 840 | ||
| @@ -903,6 +922,10 @@ CONFIG_SGI_IOC4=y | |||
| 903 | CONFIG_SGI_IOC3=y | 922 | CONFIG_SGI_IOC3=y |
| 904 | 923 | ||
| 905 | # | 924 | # |
| 925 | # EDAC - error detection and reporting (RAS) | ||
| 926 | # | ||
| 927 | |||
| 928 | # | ||
| 906 | # File systems | 929 | # File systems |
| 907 | # | 930 | # |
| 908 | CONFIG_EXT2_FS=y | 931 | CONFIG_EXT2_FS=y |
| @@ -931,6 +954,7 @@ CONFIG_XFS_QUOTA=y | |||
| 931 | # CONFIG_XFS_SECURITY is not set | 954 | # CONFIG_XFS_SECURITY is not set |
| 932 | CONFIG_XFS_POSIX_ACL=y | 955 | CONFIG_XFS_POSIX_ACL=y |
| 933 | CONFIG_XFS_RT=y | 956 | CONFIG_XFS_RT=y |
| 957 | # CONFIG_OCFS2_FS is not set | ||
| 934 | # CONFIG_MINIX_FS is not set | 958 | # CONFIG_MINIX_FS is not set |
| 935 | # CONFIG_ROMFS_FS is not set | 959 | # CONFIG_ROMFS_FS is not set |
| 936 | CONFIG_INOTIFY=y | 960 | CONFIG_INOTIFY=y |
| @@ -973,6 +997,7 @@ CONFIG_HUGETLBFS=y | |||
| 973 | CONFIG_HUGETLB_PAGE=y | 997 | CONFIG_HUGETLB_PAGE=y |
| 974 | CONFIG_RAMFS=y | 998 | CONFIG_RAMFS=y |
| 975 | CONFIG_RELAYFS_FS=m | 999 | CONFIG_RELAYFS_FS=m |
| 1000 | # CONFIG_CONFIGFS_FS is not set | ||
| 976 | 1001 | ||
| 977 | # | 1002 | # |
| 978 | # Miscellaneous filesystems | 1003 | # Miscellaneous filesystems |
| @@ -1041,6 +1066,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1041 | CONFIG_SGI_PARTITION=y | 1066 | CONFIG_SGI_PARTITION=y |
| 1042 | # CONFIG_ULTRIX_PARTITION is not set | 1067 | # CONFIG_ULTRIX_PARTITION is not set |
| 1043 | # CONFIG_SUN_PARTITION is not set | 1068 | # CONFIG_SUN_PARTITION is not set |
| 1069 | # CONFIG_KARMA_PARTITION is not set | ||
| 1044 | CONFIG_EFI_PARTITION=y | 1070 | CONFIG_EFI_PARTITION=y |
| 1045 | 1071 | ||
| 1046 | # | 1072 | # |
| @@ -1111,19 +1137,21 @@ CONFIG_GENERIC_PENDING_IRQ=y | |||
| 1111 | # Kernel hacking | 1137 | # Kernel hacking |
| 1112 | # | 1138 | # |
| 1113 | # CONFIG_PRINTK_TIME is not set | 1139 | # CONFIG_PRINTK_TIME is not set |
| 1114 | CONFIG_DEBUG_KERNEL=y | ||
| 1115 | CONFIG_MAGIC_SYSRQ=y | 1140 | CONFIG_MAGIC_SYSRQ=y |
| 1141 | CONFIG_DEBUG_KERNEL=y | ||
| 1116 | CONFIG_LOG_BUF_SHIFT=20 | 1142 | CONFIG_LOG_BUF_SHIFT=20 |
| 1117 | CONFIG_DETECT_SOFTLOCKUP=y | 1143 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1118 | # CONFIG_SCHEDSTATS is not set | 1144 | # CONFIG_SCHEDSTATS is not set |
| 1119 | # CONFIG_DEBUG_SLAB is not set | 1145 | # CONFIG_DEBUG_SLAB is not set |
| 1120 | CONFIG_DEBUG_PREEMPT=y | 1146 | CONFIG_DEBUG_PREEMPT=y |
| 1147 | CONFIG_DEBUG_MUTEXES=y | ||
| 1121 | # CONFIG_DEBUG_SPINLOCK is not set | 1148 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1122 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1149 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1123 | # CONFIG_DEBUG_KOBJECT is not set | 1150 | # CONFIG_DEBUG_KOBJECT is not set |
| 1124 | CONFIG_DEBUG_INFO=y | 1151 | CONFIG_DEBUG_INFO=y |
| 1125 | # CONFIG_DEBUG_FS is not set | 1152 | # CONFIG_DEBUG_FS is not set |
| 1126 | # CONFIG_DEBUG_VM is not set | 1153 | # CONFIG_DEBUG_VM is not set |
| 1154 | CONFIG_FORCED_INLINING=y | ||
| 1127 | # CONFIG_RCU_TORTURE_TEST is not set | 1155 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1128 | CONFIG_IA64_GRANULE_16MB=y | 1156 | CONFIG_IA64_GRANULE_16MB=y |
| 1129 | # CONFIG_IA64_GRANULE_64MB is not set | 1157 | # CONFIG_IA64_GRANULE_64MB is not set |
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig index 6859119bc9dd..125568118b84 100644 --- a/arch/ia64/configs/tiger_defconfig +++ b/arch/ia64/configs/tiger_defconfig | |||
| @@ -1,14 +1,13 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.15-rc4 | 3 | # Linux kernel version: 2.6.16-rc5 |
| 4 | # Fri Dec 2 16:06:32 2005 | 4 | # Mon Feb 27 15:49:18 2006 |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | # | 7 | # |
| 8 | # Code maturity level options | 8 | # Code maturity level options |
| 9 | # | 9 | # |
| 10 | CONFIG_EXPERIMENTAL=y | 10 | CONFIG_EXPERIMENTAL=y |
| 11 | CONFIG_CLEAN_COMPILE=y | ||
| 12 | CONFIG_LOCK_KERNEL=y | 11 | CONFIG_LOCK_KERNEL=y |
| 13 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 12 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 14 | 13 | ||
| @@ -23,18 +22,19 @@ CONFIG_POSIX_MQUEUE=y | |||
| 23 | # CONFIG_BSD_PROCESS_ACCT is not set | 22 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 24 | CONFIG_SYSCTL=y | 23 | CONFIG_SYSCTL=y |
| 25 | # CONFIG_AUDIT is not set | 24 | # CONFIG_AUDIT is not set |
| 26 | CONFIG_HOTPLUG=y | ||
| 27 | CONFIG_KOBJECT_UEVENT=y | ||
| 28 | CONFIG_IKCONFIG=y | 25 | CONFIG_IKCONFIG=y |
| 29 | CONFIG_IKCONFIG_PROC=y | 26 | CONFIG_IKCONFIG_PROC=y |
| 30 | # CONFIG_CPUSETS is not set | 27 | # CONFIG_CPUSETS is not set |
| 31 | CONFIG_INITRAMFS_SOURCE="" | 28 | CONFIG_INITRAMFS_SOURCE="" |
| 29 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 32 | # CONFIG_EMBEDDED is not set | 30 | # CONFIG_EMBEDDED is not set |
| 33 | CONFIG_KALLSYMS=y | 31 | CONFIG_KALLSYMS=y |
| 34 | CONFIG_KALLSYMS_ALL=y | 32 | CONFIG_KALLSYMS_ALL=y |
| 35 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 34 | CONFIG_HOTPLUG=y | ||
| 36 | CONFIG_PRINTK=y | 35 | CONFIG_PRINTK=y |
| 37 | CONFIG_BUG=y | 36 | CONFIG_BUG=y |
| 37 | CONFIG_ELF_CORE=y | ||
| 38 | CONFIG_BASE_FULL=y | 38 | CONFIG_BASE_FULL=y |
| 39 | CONFIG_FUTEX=y | 39 | CONFIG_FUTEX=y |
| 40 | CONFIG_EPOLL=y | 40 | CONFIG_EPOLL=y |
| @@ -43,8 +43,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 | |||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | 43 | CONFIG_CC_ALIGN_LABELS=0 |
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | 44 | CONFIG_CC_ALIGN_LOOPS=0 |
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | 45 | CONFIG_CC_ALIGN_JUMPS=0 |
| 46 | CONFIG_SLAB=y | ||
| 46 | # CONFIG_TINY_SHMEM is not set | 47 | # CONFIG_TINY_SHMEM is not set |
| 47 | CONFIG_BASE_SMALL=0 | 48 | CONFIG_BASE_SMALL=0 |
| 49 | # CONFIG_SLOB is not set | ||
| 48 | 50 | ||
| 49 | # | 51 | # |
| 50 | # Loadable module support | 52 | # Loadable module support |
| @@ -88,7 +90,7 @@ CONFIG_TIME_INTERPOLATION=y | |||
| 88 | CONFIG_EFI=y | 90 | CONFIG_EFI=y |
| 89 | CONFIG_GENERIC_IOMAP=y | 91 | CONFIG_GENERIC_IOMAP=y |
| 90 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 92 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 91 | CONFIG_ZONE_DMA_IS_DMA32=y | 93 | CONFIG_DMA_IS_DMA32=y |
| 92 | # CONFIG_IA64_GENERIC is not set | 94 | # CONFIG_IA64_GENERIC is not set |
| 93 | CONFIG_IA64_DIG=y | 95 | CONFIG_IA64_DIG=y |
| 94 | # CONFIG_IA64_HP_ZX1 is not set | 96 | # CONFIG_IA64_HP_ZX1 is not set |
| @@ -162,6 +164,7 @@ CONFIG_ACPI_HOTPLUG_CPU=y | |||
| 162 | CONFIG_ACPI_THERMAL=m | 164 | CONFIG_ACPI_THERMAL=m |
| 163 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 165 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
| 164 | # CONFIG_ACPI_DEBUG is not set | 166 | # CONFIG_ACPI_DEBUG is not set |
| 167 | CONFIG_ACPI_EC=y | ||
| 165 | CONFIG_ACPI_POWER=y | 168 | CONFIG_ACPI_POWER=y |
| 166 | CONFIG_ACPI_SYSTEM=y | 169 | CONFIG_ACPI_SYSTEM=y |
| 167 | CONFIG_ACPI_CONTAINER=m | 170 | CONFIG_ACPI_CONTAINER=m |
| @@ -203,6 +206,7 @@ CONFIG_NET=y | |||
| 203 | # | 206 | # |
| 204 | # Networking options | 207 | # Networking options |
| 205 | # | 208 | # |
| 209 | # CONFIG_NETDEBUG is not set | ||
| 206 | CONFIG_PACKET=y | 210 | CONFIG_PACKET=y |
| 207 | # CONFIG_PACKET_MMAP is not set | 211 | # CONFIG_PACKET_MMAP is not set |
| 208 | CONFIG_UNIX=y | 212 | CONFIG_UNIX=y |
| @@ -237,6 +241,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 237 | # SCTP Configuration (EXPERIMENTAL) | 241 | # SCTP Configuration (EXPERIMENTAL) |
| 238 | # | 242 | # |
| 239 | # CONFIG_IP_SCTP is not set | 243 | # CONFIG_IP_SCTP is not set |
| 244 | |||
| 245 | # | ||
| 246 | # TIPC Configuration (EXPERIMENTAL) | ||
| 247 | # | ||
| 248 | # CONFIG_TIPC is not set | ||
| 240 | # CONFIG_ATM is not set | 249 | # CONFIG_ATM is not set |
| 241 | # CONFIG_BRIDGE is not set | 250 | # CONFIG_BRIDGE is not set |
| 242 | # CONFIG_VLAN_8021Q is not set | 251 | # CONFIG_VLAN_8021Q is not set |
| @@ -326,6 +335,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 326 | # ATA/ATAPI/MFM/RLL support | 335 | # ATA/ATAPI/MFM/RLL support |
| 327 | # | 336 | # |
| 328 | CONFIG_IDE=y | 337 | CONFIG_IDE=y |
| 338 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 329 | CONFIG_BLK_DEV_IDE=y | 339 | CONFIG_BLK_DEV_IDE=y |
| 330 | 340 | ||
| 331 | # | 341 | # |
| @@ -443,13 +453,7 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | |||
| 443 | CONFIG_SCSI_QLOGIC_FC=y | 453 | CONFIG_SCSI_QLOGIC_FC=y |
| 444 | # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set | 454 | # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set |
| 445 | CONFIG_SCSI_QLOGIC_1280=y | 455 | CONFIG_SCSI_QLOGIC_1280=y |
| 446 | CONFIG_SCSI_QLA2XXX=y | 456 | # CONFIG_SCSI_QLA_FC is not set |
| 447 | CONFIG_SCSI_QLA21XX=m | ||
| 448 | CONFIG_SCSI_QLA22XX=m | ||
| 449 | CONFIG_SCSI_QLA2300=m | ||
| 450 | CONFIG_SCSI_QLA2322=m | ||
| 451 | # CONFIG_SCSI_QLA6312 is not set | ||
| 452 | # CONFIG_SCSI_QLA24XX is not set | ||
| 453 | # CONFIG_SCSI_LPFC is not set | 457 | # CONFIG_SCSI_LPFC is not set |
| 454 | # CONFIG_SCSI_DC395x is not set | 458 | # CONFIG_SCSI_DC395x is not set |
| 455 | # CONFIG_SCSI_DC390T is not set | 459 | # CONFIG_SCSI_DC390T is not set |
| @@ -572,6 +576,7 @@ CONFIG_E1000=y | |||
| 572 | # CONFIG_R8169 is not set | 576 | # CONFIG_R8169 is not set |
| 573 | # CONFIG_SIS190 is not set | 577 | # CONFIG_SIS190 is not set |
| 574 | # CONFIG_SKGE is not set | 578 | # CONFIG_SKGE is not set |
| 579 | # CONFIG_SKY2 is not set | ||
| 575 | # CONFIG_SK98LIN is not set | 580 | # CONFIG_SK98LIN is not set |
| 576 | # CONFIG_VIA_VELOCITY is not set | 581 | # CONFIG_VIA_VELOCITY is not set |
| 577 | CONFIG_TIGON3=y | 582 | CONFIG_TIGON3=y |
| @@ -676,12 +681,15 @@ CONFIG_VT=y | |||
| 676 | CONFIG_VT_CONSOLE=y | 681 | CONFIG_VT_CONSOLE=y |
| 677 | CONFIG_HW_CONSOLE=y | 682 | CONFIG_HW_CONSOLE=y |
| 678 | CONFIG_SERIAL_NONSTANDARD=y | 683 | CONFIG_SERIAL_NONSTANDARD=y |
| 684 | # CONFIG_COMPUTONE is not set | ||
| 679 | # CONFIG_ROCKETPORT is not set | 685 | # CONFIG_ROCKETPORT is not set |
| 680 | # CONFIG_CYCLADES is not set | 686 | # CONFIG_CYCLADES is not set |
| 681 | # CONFIG_DIGIEPCA is not set | 687 | # CONFIG_DIGIEPCA is not set |
| 688 | # CONFIG_MOXA_INTELLIO is not set | ||
| 682 | # CONFIG_MOXA_SMARTIO is not set | 689 | # CONFIG_MOXA_SMARTIO is not set |
| 683 | # CONFIG_ISI is not set | 690 | # CONFIG_ISI is not set |
| 684 | # CONFIG_SYNCLINKMP is not set | 691 | # CONFIG_SYNCLINKMP is not set |
| 692 | # CONFIG_SYNCLINK_GT is not set | ||
| 685 | # CONFIG_N_HDLC is not set | 693 | # CONFIG_N_HDLC is not set |
| 686 | # CONFIG_SPECIALIX is not set | 694 | # CONFIG_SPECIALIX is not set |
| 687 | # CONFIG_SX is not set | 695 | # CONFIG_SX is not set |
| @@ -694,6 +702,7 @@ CONFIG_SERIAL_8250=y | |||
| 694 | CONFIG_SERIAL_8250_CONSOLE=y | 702 | CONFIG_SERIAL_8250_CONSOLE=y |
| 695 | CONFIG_SERIAL_8250_ACPI=y | 703 | CONFIG_SERIAL_8250_ACPI=y |
| 696 | CONFIG_SERIAL_8250_NR_UARTS=6 | 704 | CONFIG_SERIAL_8250_NR_UARTS=6 |
| 705 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 697 | CONFIG_SERIAL_8250_EXTENDED=y | 706 | CONFIG_SERIAL_8250_EXTENDED=y |
| 698 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 707 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
| 699 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set | 708 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set |
| @@ -738,10 +747,10 @@ CONFIG_DRM_SIS=m | |||
| 738 | # CONFIG_DRM_VIA is not set | 747 | # CONFIG_DRM_VIA is not set |
| 739 | # CONFIG_DRM_SAVAGE is not set | 748 | # CONFIG_DRM_SAVAGE is not set |
| 740 | CONFIG_RAW_DRIVER=m | 749 | CONFIG_RAW_DRIVER=m |
| 750 | CONFIG_MAX_RAW_DEVS=256 | ||
| 741 | CONFIG_HPET=y | 751 | CONFIG_HPET=y |
| 742 | # CONFIG_HPET_RTC_IRQ is not set | 752 | # CONFIG_HPET_RTC_IRQ is not set |
| 743 | CONFIG_HPET_MMAP=y | 753 | CONFIG_HPET_MMAP=y |
| 744 | CONFIG_MAX_RAW_DEVS=256 | ||
| 745 | # CONFIG_HANGCHECK_TIMER is not set | 754 | # CONFIG_HANGCHECK_TIMER is not set |
| 746 | 755 | ||
| 747 | # | 756 | # |
| @@ -756,6 +765,12 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 756 | # CONFIG_I2C is not set | 765 | # CONFIG_I2C is not set |
| 757 | 766 | ||
| 758 | # | 767 | # |
| 768 | # SPI support | ||
| 769 | # | ||
| 770 | # CONFIG_SPI is not set | ||
| 771 | # CONFIG_SPI_MASTER is not set | ||
| 772 | |||
| 773 | # | ||
| 759 | # Dallas's 1-wire bus | 774 | # Dallas's 1-wire bus |
| 760 | # | 775 | # |
| 761 | # CONFIG_W1 is not set | 776 | # CONFIG_W1 is not set |
| @@ -765,6 +780,7 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 765 | # | 780 | # |
| 766 | CONFIG_HWMON=y | 781 | CONFIG_HWMON=y |
| 767 | # CONFIG_HWMON_VID is not set | 782 | # CONFIG_HWMON_VID is not set |
| 783 | # CONFIG_SENSORS_F71805F is not set | ||
| 768 | # CONFIG_HWMON_DEBUG_CHIP is not set | 784 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 769 | 785 | ||
| 770 | # | 786 | # |
| @@ -854,12 +870,15 @@ CONFIG_USB_STORAGE=m | |||
| 854 | # CONFIG_USB_STORAGE_SDDR09 is not set | 870 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 855 | # CONFIG_USB_STORAGE_SDDR55 is not set | 871 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 856 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 872 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 873 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 874 | # CONFIG_USB_LIBUSUAL is not set | ||
| 857 | 875 | ||
| 858 | # | 876 | # |
| 859 | # USB Input Devices | 877 | # USB Input Devices |
| 860 | # | 878 | # |
| 861 | CONFIG_USB_HID=y | 879 | CONFIG_USB_HID=y |
| 862 | CONFIG_USB_HIDINPUT=y | 880 | CONFIG_USB_HIDINPUT=y |
| 881 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 863 | # CONFIG_HID_FF is not set | 882 | # CONFIG_HID_FF is not set |
| 864 | # CONFIG_USB_HIDDEV is not set | 883 | # CONFIG_USB_HIDDEV is not set |
| 865 | # CONFIG_USB_AIPTEK is not set | 884 | # CONFIG_USB_AIPTEK is not set |
| @@ -873,6 +892,7 @@ CONFIG_USB_HIDINPUT=y | |||
| 873 | # CONFIG_USB_YEALINK is not set | 892 | # CONFIG_USB_YEALINK is not set |
| 874 | # CONFIG_USB_XPAD is not set | 893 | # CONFIG_USB_XPAD is not set |
| 875 | # CONFIG_USB_ATI_REMOTE is not set | 894 | # CONFIG_USB_ATI_REMOTE is not set |
| 895 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
| 876 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 896 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
| 877 | # CONFIG_USB_APPLETOUCH is not set | 897 | # CONFIG_USB_APPLETOUCH is not set |
| 878 | 898 | ||
| @@ -948,7 +968,7 @@ CONFIG_USB_HIDINPUT=y | |||
| 948 | # CONFIG_INFINIBAND is not set | 968 | # CONFIG_INFINIBAND is not set |
| 949 | 969 | ||
| 950 | # | 970 | # |
| 951 | # SN Devices | 971 | # EDAC - error detection and reporting (RAS) |
| 952 | # | 972 | # |
| 953 | 973 | ||
| 954 | # | 974 | # |
| @@ -980,6 +1000,7 @@ CONFIG_XFS_EXPORT=y | |||
| 980 | # CONFIG_XFS_SECURITY is not set | 1000 | # CONFIG_XFS_SECURITY is not set |
| 981 | # CONFIG_XFS_POSIX_ACL is not set | 1001 | # CONFIG_XFS_POSIX_ACL is not set |
| 982 | # CONFIG_XFS_RT is not set | 1002 | # CONFIG_XFS_RT is not set |
| 1003 | # CONFIG_OCFS2_FS is not set | ||
| 983 | # CONFIG_MINIX_FS is not set | 1004 | # CONFIG_MINIX_FS is not set |
| 984 | # CONFIG_ROMFS_FS is not set | 1005 | # CONFIG_ROMFS_FS is not set |
| 985 | CONFIG_INOTIFY=y | 1006 | CONFIG_INOTIFY=y |
| @@ -1021,6 +1042,7 @@ CONFIG_HUGETLBFS=y | |||
| 1021 | CONFIG_HUGETLB_PAGE=y | 1042 | CONFIG_HUGETLB_PAGE=y |
| 1022 | CONFIG_RAMFS=y | 1043 | CONFIG_RAMFS=y |
| 1023 | # CONFIG_RELAYFS_FS is not set | 1044 | # CONFIG_RELAYFS_FS is not set |
| 1045 | # CONFIG_CONFIGFS_FS is not set | ||
| 1024 | 1046 | ||
| 1025 | # | 1047 | # |
| 1026 | # Miscellaneous filesystems | 1048 | # Miscellaneous filesystems |
| @@ -1090,6 +1112,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1090 | CONFIG_SGI_PARTITION=y | 1112 | CONFIG_SGI_PARTITION=y |
| 1091 | # CONFIG_ULTRIX_PARTITION is not set | 1113 | # CONFIG_ULTRIX_PARTITION is not set |
| 1092 | # CONFIG_SUN_PARTITION is not set | 1114 | # CONFIG_SUN_PARTITION is not set |
| 1115 | # CONFIG_KARMA_PARTITION is not set | ||
| 1093 | CONFIG_EFI_PARTITION=y | 1116 | CONFIG_EFI_PARTITION=y |
| 1094 | 1117 | ||
| 1095 | # | 1118 | # |
| @@ -1157,18 +1180,20 @@ CONFIG_GENERIC_PENDING_IRQ=y | |||
| 1157 | # Kernel hacking | 1180 | # Kernel hacking |
| 1158 | # | 1181 | # |
| 1159 | # CONFIG_PRINTK_TIME is not set | 1182 | # CONFIG_PRINTK_TIME is not set |
| 1160 | CONFIG_DEBUG_KERNEL=y | ||
| 1161 | CONFIG_MAGIC_SYSRQ=y | 1183 | CONFIG_MAGIC_SYSRQ=y |
| 1184 | CONFIG_DEBUG_KERNEL=y | ||
| 1162 | CONFIG_LOG_BUF_SHIFT=20 | 1185 | CONFIG_LOG_BUF_SHIFT=20 |
| 1163 | CONFIG_DETECT_SOFTLOCKUP=y | 1186 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1164 | # CONFIG_SCHEDSTATS is not set | 1187 | # CONFIG_SCHEDSTATS is not set |
| 1165 | # CONFIG_DEBUG_SLAB is not set | 1188 | # CONFIG_DEBUG_SLAB is not set |
| 1189 | CONFIG_DEBUG_MUTEXES=y | ||
| 1166 | # CONFIG_DEBUG_SPINLOCK is not set | 1190 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1167 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1191 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1168 | # CONFIG_DEBUG_KOBJECT is not set | 1192 | # CONFIG_DEBUG_KOBJECT is not set |
| 1169 | # CONFIG_DEBUG_INFO is not set | 1193 | # CONFIG_DEBUG_INFO is not set |
| 1170 | # CONFIG_DEBUG_FS is not set | 1194 | # CONFIG_DEBUG_FS is not set |
| 1171 | # CONFIG_DEBUG_VM is not set | 1195 | # CONFIG_DEBUG_VM is not set |
| 1196 | CONFIG_FORCED_INLINING=y | ||
| 1172 | # CONFIG_RCU_TORTURE_TEST is not set | 1197 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1173 | CONFIG_IA64_GRANULE_16MB=y | 1198 | CONFIG_IA64_GRANULE_16MB=y |
| 1174 | # CONFIG_IA64_GRANULE_64MB is not set | 1199 | # CONFIG_IA64_GRANULE_64MB is not set |
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig index 53899dc8eb53..949dc4670a0c 100644 --- a/arch/ia64/configs/zx1_defconfig +++ b/arch/ia64/configs/zx1_defconfig | |||
| @@ -1,16 +1,13 @@ | |||
| 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-rc1 | 3 | # Linux kernel version: 2.6.16-rc5 |
| 4 | # Wed Sep 14 15:15:01 2005 | 4 | # Mon Feb 27 15:55:36 2006 |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | # | 7 | # |
| 8 | # Code maturity level options | 8 | # Code maturity level options |
| 9 | # | 9 | # |
| 10 | CONFIG_EXPERIMENTAL=y | 10 | CONFIG_EXPERIMENTAL=y |
| 11 | # CONFIG_CLEAN_COMPILE is not set | ||
| 12 | CONFIG_BROKEN=y | ||
| 13 | CONFIG_BROKEN_ON_SMP=y | ||
| 14 | CONFIG_LOCK_KERNEL=y | 11 | CONFIG_LOCK_KERNEL=y |
| 15 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 12 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 16 | 13 | ||
| @@ -26,17 +23,18 @@ CONFIG_BSD_PROCESS_ACCT=y | |||
| 26 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 23 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 27 | CONFIG_SYSCTL=y | 24 | CONFIG_SYSCTL=y |
| 28 | # CONFIG_AUDIT is not set | 25 | # CONFIG_AUDIT is not set |
| 29 | CONFIG_HOTPLUG=y | ||
| 30 | CONFIG_KOBJECT_UEVENT=y | ||
| 31 | # CONFIG_IKCONFIG is not set | 26 | # CONFIG_IKCONFIG is not set |
| 32 | # CONFIG_CPUSETS is not set | 27 | # CONFIG_CPUSETS is not set |
| 33 | CONFIG_INITRAMFS_SOURCE="" | 28 | CONFIG_INITRAMFS_SOURCE="" |
| 29 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 34 | # CONFIG_EMBEDDED is not set | 30 | # CONFIG_EMBEDDED is not set |
| 35 | CONFIG_KALLSYMS=y | 31 | CONFIG_KALLSYMS=y |
| 36 | # CONFIG_KALLSYMS_ALL is not set | 32 | # CONFIG_KALLSYMS_ALL is not set |
| 37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 34 | CONFIG_HOTPLUG=y | ||
| 38 | CONFIG_PRINTK=y | 35 | CONFIG_PRINTK=y |
| 39 | CONFIG_BUG=y | 36 | CONFIG_BUG=y |
| 37 | CONFIG_ELF_CORE=y | ||
| 40 | CONFIG_BASE_FULL=y | 38 | CONFIG_BASE_FULL=y |
| 41 | CONFIG_FUTEX=y | 39 | CONFIG_FUTEX=y |
| 42 | CONFIG_EPOLL=y | 40 | CONFIG_EPOLL=y |
| @@ -45,8 +43,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 | |||
| 45 | CONFIG_CC_ALIGN_LABELS=0 | 43 | CONFIG_CC_ALIGN_LABELS=0 |
| 46 | CONFIG_CC_ALIGN_LOOPS=0 | 44 | CONFIG_CC_ALIGN_LOOPS=0 |
| 47 | CONFIG_CC_ALIGN_JUMPS=0 | 45 | CONFIG_CC_ALIGN_JUMPS=0 |
| 46 | CONFIG_SLAB=y | ||
| 48 | # CONFIG_TINY_SHMEM is not set | 47 | # CONFIG_TINY_SHMEM is not set |
| 49 | CONFIG_BASE_SMALL=0 | 48 | CONFIG_BASE_SMALL=0 |
| 49 | # CONFIG_SLOB is not set | ||
| 50 | 50 | ||
| 51 | # | 51 | # |
| 52 | # Loadable module support | 52 | # Loadable module support |
| @@ -59,17 +59,36 @@ CONFIG_OBSOLETE_MODPARM=y | |||
| 59 | # CONFIG_KMOD is not set | 59 | # CONFIG_KMOD is not set |
| 60 | 60 | ||
| 61 | # | 61 | # |
| 62 | # Block layer | ||
| 63 | # | ||
| 64 | |||
| 65 | # | ||
| 66 | # IO Schedulers | ||
| 67 | # | ||
| 68 | CONFIG_IOSCHED_NOOP=y | ||
| 69 | CONFIG_IOSCHED_AS=y | ||
| 70 | CONFIG_IOSCHED_DEADLINE=y | ||
| 71 | CONFIG_IOSCHED_CFQ=y | ||
| 72 | CONFIG_DEFAULT_AS=y | ||
| 73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 74 | # CONFIG_DEFAULT_CFQ is not set | ||
| 75 | # CONFIG_DEFAULT_NOOP is not set | ||
| 76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 77 | |||
| 78 | # | ||
| 62 | # Processor type and features | 79 | # Processor type and features |
| 63 | # | 80 | # |
| 64 | CONFIG_IA64=y | 81 | CONFIG_IA64=y |
| 65 | CONFIG_64BIT=y | 82 | CONFIG_64BIT=y |
| 66 | CONFIG_MMU=y | 83 | CONFIG_MMU=y |
| 84 | CONFIG_SWIOTLB=y | ||
| 67 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 85 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 68 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 86 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 69 | CONFIG_TIME_INTERPOLATION=y | 87 | CONFIG_TIME_INTERPOLATION=y |
| 70 | CONFIG_EFI=y | 88 | CONFIG_EFI=y |
| 71 | CONFIG_GENERIC_IOMAP=y | 89 | CONFIG_GENERIC_IOMAP=y |
| 72 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 90 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 91 | CONFIG_DMA_IS_DMA32=y | ||
| 73 | # CONFIG_IA64_GENERIC is not set | 92 | # CONFIG_IA64_GENERIC is not set |
| 74 | # CONFIG_IA64_DIG is not set | 93 | # CONFIG_IA64_DIG is not set |
| 75 | CONFIG_IA64_HP_ZX1=y | 94 | CONFIG_IA64_HP_ZX1=y |
| @@ -82,18 +101,16 @@ CONFIG_MCKINLEY=y | |||
| 82 | # CONFIG_IA64_PAGE_SIZE_8KB is not set | 101 | # CONFIG_IA64_PAGE_SIZE_8KB is not set |
| 83 | CONFIG_IA64_PAGE_SIZE_16KB=y | 102 | CONFIG_IA64_PAGE_SIZE_16KB=y |
| 84 | # CONFIG_IA64_PAGE_SIZE_64KB is not set | 103 | # CONFIG_IA64_PAGE_SIZE_64KB is not set |
| 104 | CONFIG_PGTABLE_3=y | ||
| 105 | # CONFIG_PGTABLE_4 is not set | ||
| 85 | # CONFIG_HZ_100 is not set | 106 | # CONFIG_HZ_100 is not set |
| 86 | CONFIG_HZ_250=y | 107 | CONFIG_HZ_250=y |
| 87 | # CONFIG_HZ_1000 is not set | 108 | # CONFIG_HZ_1000 is not set |
| 88 | CONFIG_HZ=250 | 109 | CONFIG_HZ=250 |
| 89 | CONFIG_IA64_L1_CACHE_SHIFT=7 | 110 | CONFIG_IA64_L1_CACHE_SHIFT=7 |
| 90 | # CONFIG_NUMA is not set | ||
| 91 | CONFIG_VIRTUAL_MEM_MAP=y | ||
| 92 | CONFIG_HOLES_IN_ZONE=y | ||
| 93 | # CONFIG_IA64_CYCLONE is not set | 111 | # CONFIG_IA64_CYCLONE is not set |
| 94 | CONFIG_IOSAPIC=y | 112 | CONFIG_IOSAPIC=y |
| 95 | # CONFIG_IA64_SGI_SN_XP is not set | 113 | CONFIG_FORCE_MAX_ZONEORDER=17 |
| 96 | CONFIG_FORCE_MAX_ZONEORDER=18 | ||
| 97 | CONFIG_SMP=y | 114 | CONFIG_SMP=y |
| 98 | CONFIG_NR_CPUS=16 | 115 | CONFIG_NR_CPUS=16 |
| 99 | # CONFIG_HOTPLUG_CPU is not set | 116 | # CONFIG_HOTPLUG_CPU is not set |
| @@ -106,7 +123,14 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 106 | CONFIG_FLATMEM=y | 123 | CONFIG_FLATMEM=y |
| 107 | CONFIG_FLAT_NODE_MEM_MAP=y | 124 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 108 | # CONFIG_SPARSEMEM_STATIC is not set | 125 | # CONFIG_SPARSEMEM_STATIC is not set |
| 109 | CONFIG_HAVE_DEC_LOCK=y | 126 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 127 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
| 128 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
| 129 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
| 130 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
| 131 | CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y | ||
| 132 | CONFIG_VIRTUAL_MEM_MAP=y | ||
| 133 | CONFIG_HOLES_IN_ZONE=y | ||
| 110 | CONFIG_IA32_SUPPORT=y | 134 | CONFIG_IA32_SUPPORT=y |
| 111 | CONFIG_COMPAT=y | 135 | CONFIG_COMPAT=y |
| 112 | CONFIG_IA64_MCA_RECOVERY=y | 136 | CONFIG_IA64_MCA_RECOVERY=y |
| @@ -118,7 +142,6 @@ CONFIG_IA64_PALINFO=y | |||
| 118 | # | 142 | # |
| 119 | CONFIG_EFI_VARS=y | 143 | CONFIG_EFI_VARS=y |
| 120 | CONFIG_EFI_PCDP=y | 144 | CONFIG_EFI_PCDP=y |
| 121 | # CONFIG_DELL_RBU is not set | ||
| 122 | CONFIG_BINFMT_ELF=y | 145 | CONFIG_BINFMT_ELF=y |
| 123 | CONFIG_BINFMT_MISC=y | 146 | CONFIG_BINFMT_MISC=y |
| 124 | 147 | ||
| @@ -126,6 +149,7 @@ CONFIG_BINFMT_MISC=y | |||
| 126 | # Power management and ACPI | 149 | # Power management and ACPI |
| 127 | # | 150 | # |
| 128 | CONFIG_PM=y | 151 | CONFIG_PM=y |
| 152 | CONFIG_PM_LEGACY=y | ||
| 129 | # CONFIG_PM_DEBUG is not set | 153 | # CONFIG_PM_DEBUG is not set |
| 130 | 154 | ||
| 131 | # | 155 | # |
| @@ -138,6 +162,7 @@ CONFIG_ACPI_PROCESSOR=y | |||
| 138 | CONFIG_ACPI_THERMAL=y | 162 | CONFIG_ACPI_THERMAL=y |
| 139 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 163 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
| 140 | # CONFIG_ACPI_DEBUG is not set | 164 | # CONFIG_ACPI_DEBUG is not set |
| 165 | CONFIG_ACPI_EC=y | ||
| 141 | CONFIG_ACPI_POWER=y | 166 | CONFIG_ACPI_POWER=y |
| 142 | CONFIG_ACPI_SYSTEM=y | 167 | CONFIG_ACPI_SYSTEM=y |
| 143 | # CONFIG_ACPI_CONTAINER is not set | 168 | # CONFIG_ACPI_CONTAINER is not set |
| @@ -179,6 +204,7 @@ CONFIG_NET=y | |||
| 179 | # | 204 | # |
| 180 | # Networking options | 205 | # Networking options |
| 181 | # | 206 | # |
| 207 | # CONFIG_NETDEBUG is not set | ||
| 182 | CONFIG_PACKET=y | 208 | CONFIG_PACKET=y |
| 183 | # CONFIG_PACKET_MMAP is not set | 209 | # CONFIG_PACKET_MMAP is not set |
| 184 | CONFIG_UNIX=y | 210 | CONFIG_UNIX=y |
| @@ -211,14 +237,17 @@ CONFIG_NETFILTER=y | |||
| 211 | # CONFIG_NETFILTER_DEBUG is not set | 237 | # CONFIG_NETFILTER_DEBUG is not set |
| 212 | 238 | ||
| 213 | # | 239 | # |
| 240 | # Core Netfilter Configuration | ||
| 241 | # | ||
| 242 | # CONFIG_NETFILTER_NETLINK is not set | ||
| 243 | # CONFIG_NF_CONNTRACK is not set | ||
| 244 | # CONFIG_NETFILTER_XTABLES is not set | ||
| 245 | |||
| 246 | # | ||
| 214 | # IP: Netfilter Configuration | 247 | # IP: Netfilter Configuration |
| 215 | # | 248 | # |
| 216 | # CONFIG_IP_NF_CONNTRACK is not set | 249 | # CONFIG_IP_NF_CONNTRACK is not set |
| 217 | # CONFIG_IP_NF_QUEUE is not set | 250 | # CONFIG_IP_NF_QUEUE is not set |
| 218 | # CONFIG_IP_NF_IPTABLES is not set | ||
| 219 | CONFIG_IP_NF_ARPTABLES=y | ||
| 220 | # CONFIG_IP_NF_ARPFILTER is not set | ||
| 221 | # CONFIG_IP_NF_ARP_MANGLE is not set | ||
| 222 | 251 | ||
| 223 | # | 252 | # |
| 224 | # DCCP Configuration (EXPERIMENTAL) | 253 | # DCCP Configuration (EXPERIMENTAL) |
| @@ -229,6 +258,11 @@ CONFIG_IP_NF_ARPTABLES=y | |||
| 229 | # SCTP Configuration (EXPERIMENTAL) | 258 | # SCTP Configuration (EXPERIMENTAL) |
| 230 | # | 259 | # |
| 231 | # CONFIG_IP_SCTP is not set | 260 | # CONFIG_IP_SCTP is not set |
| 261 | |||
| 262 | # | ||
| 263 | # TIPC Configuration (EXPERIMENTAL) | ||
| 264 | # | ||
| 265 | # CONFIG_TIPC is not set | ||
| 232 | # CONFIG_ATM is not set | 266 | # CONFIG_ATM is not set |
| 233 | # CONFIG_BRIDGE is not set | 267 | # CONFIG_BRIDGE is not set |
| 234 | # CONFIG_VLAN_8021Q is not set | 268 | # CONFIG_VLAN_8021Q is not set |
| @@ -241,14 +275,16 @@ CONFIG_IP_NF_ARPTABLES=y | |||
| 241 | # CONFIG_NET_DIVERT is not set | 275 | # CONFIG_NET_DIVERT is not set |
| 242 | # CONFIG_ECONET is not set | 276 | # CONFIG_ECONET is not set |
| 243 | # CONFIG_WAN_ROUTER is not set | 277 | # CONFIG_WAN_ROUTER is not set |
| 278 | |||
| 279 | # | ||
| 280 | # QoS and/or fair queueing | ||
| 281 | # | ||
| 244 | # CONFIG_NET_SCHED is not set | 282 | # CONFIG_NET_SCHED is not set |
| 245 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 246 | 283 | ||
| 247 | # | 284 | # |
| 248 | # Network testing | 285 | # Network testing |
| 249 | # | 286 | # |
| 250 | # CONFIG_NET_PKTGEN is not set | 287 | # CONFIG_NET_PKTGEN is not set |
| 251 | # CONFIG_NETFILTER_NETLINK is not set | ||
| 252 | # CONFIG_HAMRADIO is not set | 288 | # CONFIG_HAMRADIO is not set |
| 253 | # CONFIG_IRDA is not set | 289 | # CONFIG_IRDA is not set |
| 254 | # CONFIG_BT is not set | 290 | # CONFIG_BT is not set |
| @@ -310,20 +346,13 @@ CONFIG_BLK_DEV_RAM_COUNT=16 | |||
| 310 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 346 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 311 | CONFIG_BLK_DEV_INITRD=y | 347 | CONFIG_BLK_DEV_INITRD=y |
| 312 | # CONFIG_CDROM_PKTCDVD is not set | 348 | # CONFIG_CDROM_PKTCDVD is not set |
| 313 | |||
| 314 | # | ||
| 315 | # IO Schedulers | ||
| 316 | # | ||
| 317 | CONFIG_IOSCHED_NOOP=y | ||
| 318 | CONFIG_IOSCHED_AS=y | ||
| 319 | CONFIG_IOSCHED_DEADLINE=y | ||
| 320 | CONFIG_IOSCHED_CFQ=y | ||
| 321 | # CONFIG_ATA_OVER_ETH is not set | 349 | # CONFIG_ATA_OVER_ETH is not set |
| 322 | 350 | ||
| 323 | # | 351 | # |
| 324 | # ATA/ATAPI/MFM/RLL support | 352 | # ATA/ATAPI/MFM/RLL support |
| 325 | # | 353 | # |
| 326 | CONFIG_IDE=y | 354 | CONFIG_IDE=y |
| 355 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 327 | CONFIG_BLK_DEV_IDE=y | 356 | CONFIG_BLK_DEV_IDE=y |
| 328 | 357 | ||
| 329 | # | 358 | # |
| @@ -407,13 +436,14 @@ CONFIG_SCSI_LOGGING=y | |||
| 407 | # SCSI Transport Attributes | 436 | # SCSI Transport Attributes |
| 408 | # | 437 | # |
| 409 | CONFIG_SCSI_SPI_ATTRS=y | 438 | CONFIG_SCSI_SPI_ATTRS=y |
| 410 | # CONFIG_SCSI_FC_ATTRS is not set | 439 | CONFIG_SCSI_FC_ATTRS=y |
| 411 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 440 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 412 | # CONFIG_SCSI_SAS_ATTRS is not set | 441 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 413 | 442 | ||
| 414 | # | 443 | # |
| 415 | # SCSI low-level drivers | 444 | # SCSI low-level drivers |
| 416 | # | 445 | # |
| 446 | # CONFIG_ISCSI_TCP is not set | ||
| 417 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 447 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 418 | # CONFIG_SCSI_3W_9XXX is not set | 448 | # CONFIG_SCSI_3W_9XXX is not set |
| 419 | # CONFIG_SCSI_ACARD is not set | 449 | # CONFIG_SCSI_ACARD is not set |
| @@ -421,13 +451,11 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
| 421 | # CONFIG_SCSI_AIC7XXX is not set | 451 | # CONFIG_SCSI_AIC7XXX is not set |
| 422 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 452 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
| 423 | # CONFIG_SCSI_AIC79XX is not set | 453 | # CONFIG_SCSI_AIC79XX is not set |
| 424 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 425 | # CONFIG_MEGARAID_NEWGEN is not set | 454 | # CONFIG_MEGARAID_NEWGEN is not set |
| 426 | # CONFIG_MEGARAID_LEGACY is not set | 455 | # CONFIG_MEGARAID_LEGACY is not set |
| 456 | # CONFIG_MEGARAID_SAS is not set | ||
| 427 | # CONFIG_SCSI_SATA is not set | 457 | # CONFIG_SCSI_SATA is not set |
| 428 | # CONFIG_SCSI_CPQFCTS is not set | ||
| 429 | # CONFIG_SCSI_DMX3191D is not set | 458 | # CONFIG_SCSI_DMX3191D is not set |
| 430 | # CONFIG_SCSI_EATA_PIO is not set | ||
| 431 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 459 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| 432 | # CONFIG_SCSI_IPS is not set | 460 | # CONFIG_SCSI_IPS is not set |
| 433 | # CONFIG_SCSI_INITIO is not set | 461 | # CONFIG_SCSI_INITIO is not set |
| @@ -438,17 +466,9 @@ CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 | |||
| 438 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | 466 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 |
| 439 | # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set | 467 | # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set |
| 440 | # CONFIG_SCSI_IPR is not set | 468 | # CONFIG_SCSI_IPR is not set |
| 441 | # CONFIG_SCSI_QLOGIC_ISP is not set | ||
| 442 | # CONFIG_SCSI_QLOGIC_FC is not set | 469 | # CONFIG_SCSI_QLOGIC_FC is not set |
| 443 | CONFIG_SCSI_QLOGIC_1280=y | 470 | CONFIG_SCSI_QLOGIC_1280=y |
| 444 | # CONFIG_SCSI_QLOGIC_1280_1040 is not set | 471 | # CONFIG_SCSI_QLA_FC is not set |
| 445 | CONFIG_SCSI_QLA2XXX=y | ||
| 446 | # CONFIG_SCSI_QLA21XX is not set | ||
| 447 | # CONFIG_SCSI_QLA22XX is not set | ||
| 448 | # CONFIG_SCSI_QLA2300 is not set | ||
| 449 | # CONFIG_SCSI_QLA2322 is not set | ||
| 450 | # CONFIG_SCSI_QLA6312 is not set | ||
| 451 | # CONFIG_SCSI_QLA24XX is not set | ||
| 452 | # CONFIG_SCSI_LPFC is not set | 472 | # CONFIG_SCSI_LPFC is not set |
| 453 | # CONFIG_SCSI_DC395x is not set | 473 | # CONFIG_SCSI_DC395x is not set |
| 454 | # CONFIG_SCSI_DC390T is not set | 474 | # CONFIG_SCSI_DC390T is not set |
| @@ -465,6 +485,7 @@ CONFIG_SCSI_QLA2XXX=y | |||
| 465 | CONFIG_FUSION=y | 485 | CONFIG_FUSION=y |
| 466 | CONFIG_FUSION_SPI=y | 486 | CONFIG_FUSION_SPI=y |
| 467 | CONFIG_FUSION_FC=y | 487 | CONFIG_FUSION_FC=y |
| 488 | # CONFIG_FUSION_SAS is not set | ||
| 468 | CONFIG_FUSION_MAX_SGE=128 | 489 | CONFIG_FUSION_MAX_SGE=128 |
| 469 | CONFIG_FUSION_CTL=m | 490 | CONFIG_FUSION_CTL=m |
| 470 | 491 | ||
| @@ -505,6 +526,7 @@ CONFIG_NET_ETHERNET=y | |||
| 505 | CONFIG_MII=y | 526 | CONFIG_MII=y |
| 506 | # CONFIG_HAPPYMEAL is not set | 527 | # CONFIG_HAPPYMEAL is not set |
| 507 | # CONFIG_SUNGEM is not set | 528 | # CONFIG_SUNGEM is not set |
| 529 | # CONFIG_CASSINI is not set | ||
| 508 | # CONFIG_NET_VENDOR_3COM is not set | 530 | # CONFIG_NET_VENDOR_3COM is not set |
| 509 | 531 | ||
| 510 | # | 532 | # |
| @@ -555,6 +577,7 @@ CONFIG_E1000=y | |||
| 555 | # CONFIG_R8169 is not set | 577 | # CONFIG_R8169 is not set |
| 556 | # CONFIG_SIS190 is not set | 578 | # CONFIG_SIS190 is not set |
| 557 | # CONFIG_SKGE is not set | 579 | # CONFIG_SKGE is not set |
| 580 | # CONFIG_SKY2 is not set | ||
| 558 | # CONFIG_SK98LIN is not set | 581 | # CONFIG_SK98LIN is not set |
| 559 | # CONFIG_VIA_VELOCITY is not set | 582 | # CONFIG_VIA_VELOCITY is not set |
| 560 | CONFIG_TIGON3=y | 583 | CONFIG_TIGON3=y |
| @@ -652,6 +675,7 @@ CONFIG_SERIAL_8250=y | |||
| 652 | CONFIG_SERIAL_8250_CONSOLE=y | 675 | CONFIG_SERIAL_8250_CONSOLE=y |
| 653 | CONFIG_SERIAL_8250_ACPI=y | 676 | CONFIG_SERIAL_8250_ACPI=y |
| 654 | CONFIG_SERIAL_8250_NR_UARTS=8 | 677 | CONFIG_SERIAL_8250_NR_UARTS=8 |
| 678 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 655 | CONFIG_SERIAL_8250_EXTENDED=y | 679 | CONFIG_SERIAL_8250_EXTENDED=y |
| 656 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 680 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
| 657 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set | 681 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set |
| @@ -703,6 +727,7 @@ CONFIG_DRM_RADEON=y | |||
| 703 | # TPM devices | 727 | # TPM devices |
| 704 | # | 728 | # |
| 705 | # CONFIG_TCG_TPM is not set | 729 | # CONFIG_TCG_TPM is not set |
| 730 | # CONFIG_TELCLOCK is not set | ||
| 706 | 731 | ||
| 707 | # | 732 | # |
| 708 | # I2C support | 733 | # I2C support |
| @@ -753,12 +778,19 @@ CONFIG_I2C_ALGOPCF=y | |||
| 753 | # CONFIG_SENSORS_PCF8591 is not set | 778 | # CONFIG_SENSORS_PCF8591 is not set |
| 754 | # CONFIG_SENSORS_RTC8564 is not set | 779 | # CONFIG_SENSORS_RTC8564 is not set |
| 755 | # CONFIG_SENSORS_MAX6875 is not set | 780 | # CONFIG_SENSORS_MAX6875 is not set |
| 781 | # CONFIG_RTC_X1205_I2C is not set | ||
| 756 | # CONFIG_I2C_DEBUG_CORE is not set | 782 | # CONFIG_I2C_DEBUG_CORE is not set |
| 757 | # CONFIG_I2C_DEBUG_ALGO is not set | 783 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 758 | # CONFIG_I2C_DEBUG_BUS is not set | 784 | # CONFIG_I2C_DEBUG_BUS is not set |
| 759 | # CONFIG_I2C_DEBUG_CHIP is not set | 785 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 760 | 786 | ||
| 761 | # | 787 | # |
| 788 | # SPI support | ||
| 789 | # | ||
| 790 | # CONFIG_SPI is not set | ||
| 791 | # CONFIG_SPI_MASTER is not set | ||
| 792 | |||
| 793 | # | ||
| 762 | # Dallas's 1-wire bus | 794 | # Dallas's 1-wire bus |
| 763 | # | 795 | # |
| 764 | # CONFIG_W1 is not set | 796 | # CONFIG_W1 is not set |
| @@ -789,6 +821,7 @@ CONFIG_VIDEO_DEV=y | |||
| 789 | # | 821 | # |
| 790 | # Video Adapters | 822 | # Video Adapters |
| 791 | # | 823 | # |
| 824 | # CONFIG_VIDEO_ADV_DEBUG is not set | ||
| 792 | # CONFIG_VIDEO_BT848 is not set | 825 | # CONFIG_VIDEO_BT848 is not set |
| 793 | # CONFIG_VIDEO_CPIA is not set | 826 | # CONFIG_VIDEO_CPIA is not set |
| 794 | # CONFIG_VIDEO_SAA5246A is not set | 827 | # CONFIG_VIDEO_SAA5246A is not set |
| @@ -796,14 +829,16 @@ CONFIG_VIDEO_DEV=y | |||
| 796 | # CONFIG_TUNER_3036 is not set | 829 | # CONFIG_TUNER_3036 is not set |
| 797 | # CONFIG_VIDEO_STRADIS is not set | 830 | # CONFIG_VIDEO_STRADIS is not set |
| 798 | # CONFIG_VIDEO_ZORAN is not set | 831 | # CONFIG_VIDEO_ZORAN is not set |
| 799 | # CONFIG_VIDEO_ZR36120 is not set | ||
| 800 | # CONFIG_VIDEO_SAA7134 is not set | 832 | # CONFIG_VIDEO_SAA7134 is not set |
| 801 | # CONFIG_VIDEO_MXB is not set | 833 | # CONFIG_VIDEO_MXB is not set |
| 802 | # CONFIG_VIDEO_DPC is not set | 834 | # CONFIG_VIDEO_DPC is not set |
| 803 | # CONFIG_VIDEO_HEXIUM_ORION is not set | 835 | # CONFIG_VIDEO_HEXIUM_ORION is not set |
| 804 | # CONFIG_VIDEO_HEXIUM_GEMINI is not set | 836 | # CONFIG_VIDEO_HEXIUM_GEMINI is not set |
| 805 | # CONFIG_VIDEO_CX88 is not set | 837 | # CONFIG_VIDEO_CX88 is not set |
| 838 | # CONFIG_VIDEO_EM28XX is not set | ||
| 806 | # CONFIG_VIDEO_OVCAMCHIP is not set | 839 | # CONFIG_VIDEO_OVCAMCHIP is not set |
| 840 | # CONFIG_VIDEO_AUDIO_DECODER is not set | ||
| 841 | # CONFIG_VIDEO_DECODER is not set | ||
| 807 | 842 | ||
| 808 | # | 843 | # |
| 809 | # Radio Adapters | 844 | # Radio Adapters |
| @@ -824,7 +859,6 @@ CONFIG_FB=y | |||
| 824 | CONFIG_FB_CFB_FILLRECT=y | 859 | CONFIG_FB_CFB_FILLRECT=y |
| 825 | CONFIG_FB_CFB_COPYAREA=y | 860 | CONFIG_FB_CFB_COPYAREA=y |
| 826 | CONFIG_FB_CFB_IMAGEBLIT=y | 861 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 827 | CONFIG_FB_SOFT_CURSOR=y | ||
| 828 | # CONFIG_FB_MACMODES is not set | 862 | # CONFIG_FB_MACMODES is not set |
| 829 | CONFIG_FB_MODE_HELPERS=y | 863 | CONFIG_FB_MODE_HELPERS=y |
| 830 | # CONFIG_FB_TILEBLITTING is not set | 864 | # CONFIG_FB_TILEBLITTING is not set |
| @@ -833,6 +867,7 @@ CONFIG_FB_MODE_HELPERS=y | |||
| 833 | # CONFIG_FB_CYBER2000 is not set | 867 | # CONFIG_FB_CYBER2000 is not set |
| 834 | # CONFIG_FB_ASILIANT is not set | 868 | # CONFIG_FB_ASILIANT is not set |
| 835 | # CONFIG_FB_IMSTT is not set | 869 | # CONFIG_FB_IMSTT is not set |
| 870 | # CONFIG_FB_S1D13XXX is not set | ||
| 836 | # CONFIG_FB_NVIDIA is not set | 871 | # CONFIG_FB_NVIDIA is not set |
| 837 | # CONFIG_FB_RIVA is not set | 872 | # CONFIG_FB_RIVA is not set |
| 838 | # CONFIG_FB_MATROX is not set | 873 | # CONFIG_FB_MATROX is not set |
| @@ -848,10 +883,7 @@ CONFIG_FB_RADEON_DEBUG=y | |||
| 848 | # CONFIG_FB_KYRO is not set | 883 | # CONFIG_FB_KYRO is not set |
| 849 | # CONFIG_FB_3DFX is not set | 884 | # CONFIG_FB_3DFX is not set |
| 850 | # CONFIG_FB_VOODOO1 is not set | 885 | # CONFIG_FB_VOODOO1 is not set |
| 851 | # CONFIG_FB_CYBLA is not set | ||
| 852 | # CONFIG_FB_TRIDENT is not set | 886 | # CONFIG_FB_TRIDENT is not set |
| 853 | # CONFIG_FB_PM3 is not set | ||
| 854 | # CONFIG_FB_S1D13XXX is not set | ||
| 855 | # CONFIG_FB_VIRTUAL is not set | 887 | # CONFIG_FB_VIRTUAL is not set |
| 856 | 888 | ||
| 857 | # | 889 | # |
| @@ -860,6 +892,7 @@ CONFIG_FB_RADEON_DEBUG=y | |||
| 860 | CONFIG_VGA_CONSOLE=y | 892 | CONFIG_VGA_CONSOLE=y |
| 861 | CONFIG_DUMMY_CONSOLE=y | 893 | CONFIG_DUMMY_CONSOLE=y |
| 862 | CONFIG_FRAMEBUFFER_CONSOLE=y | 894 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 895 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 863 | # CONFIG_FONTS is not set | 896 | # CONFIG_FONTS is not set |
| 864 | CONFIG_FONT_8x8=y | 897 | CONFIG_FONT_8x8=y |
| 865 | CONFIG_FONT_8x16=y | 898 | CONFIG_FONT_8x16=y |
| @@ -892,6 +925,8 @@ CONFIG_SND_OSSEMUL=y | |||
| 892 | CONFIG_SND_MIXER_OSS=y | 925 | CONFIG_SND_MIXER_OSS=y |
| 893 | CONFIG_SND_PCM_OSS=y | 926 | CONFIG_SND_PCM_OSS=y |
| 894 | CONFIG_SND_SEQUENCER_OSS=y | 927 | CONFIG_SND_SEQUENCER_OSS=y |
| 928 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 929 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 895 | # CONFIG_SND_VERBOSE_PRINTK is not set | 930 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 896 | # CONFIG_SND_DEBUG is not set | 931 | # CONFIG_SND_DEBUG is not set |
| 897 | 932 | ||
| @@ -900,17 +935,18 @@ CONFIG_SND_SEQUENCER_OSS=y | |||
| 900 | # | 935 | # |
| 901 | CONFIG_SND_MPU401_UART=y | 936 | CONFIG_SND_MPU401_UART=y |
| 902 | CONFIG_SND_OPL3_LIB=y | 937 | CONFIG_SND_OPL3_LIB=y |
| 938 | CONFIG_SND_AC97_CODEC=y | ||
| 939 | CONFIG_SND_AC97_BUS=y | ||
| 903 | # CONFIG_SND_DUMMY is not set | 940 | # CONFIG_SND_DUMMY is not set |
| 904 | # CONFIG_SND_VIRMIDI is not set | 941 | # CONFIG_SND_VIRMIDI is not set |
| 905 | # CONFIG_SND_MTPAV is not set | 942 | # CONFIG_SND_MTPAV is not set |
| 906 | # CONFIG_SND_SERIAL_U16550 is not set | 943 | # CONFIG_SND_SERIAL_U16550 is not set |
| 907 | # CONFIG_SND_MPU401 is not set | 944 | # CONFIG_SND_MPU401 is not set |
| 908 | CONFIG_SND_AC97_CODEC=y | ||
| 909 | CONFIG_SND_AC97_BUS=y | ||
| 910 | 945 | ||
| 911 | # | 946 | # |
| 912 | # PCI devices | 947 | # PCI devices |
| 913 | # | 948 | # |
| 949 | # CONFIG_SND_AD1889 is not set | ||
| 914 | # CONFIG_SND_ALI5451 is not set | 950 | # CONFIG_SND_ALI5451 is not set |
| 915 | # CONFIG_SND_ATIIXP is not set | 951 | # CONFIG_SND_ATIIXP is not set |
| 916 | # CONFIG_SND_ATIIXP_MODEM is not set | 952 | # CONFIG_SND_ATIIXP_MODEM is not set |
| @@ -919,39 +955,39 @@ CONFIG_SND_AC97_BUS=y | |||
| 919 | # CONFIG_SND_AU8830 is not set | 955 | # CONFIG_SND_AU8830 is not set |
| 920 | # CONFIG_SND_AZT3328 is not set | 956 | # CONFIG_SND_AZT3328 is not set |
| 921 | # CONFIG_SND_BT87X is not set | 957 | # CONFIG_SND_BT87X is not set |
| 922 | # CONFIG_SND_CS46XX is not set | 958 | # CONFIG_SND_CA0106 is not set |
| 959 | # CONFIG_SND_CMIPCI is not set | ||
| 923 | # CONFIG_SND_CS4281 is not set | 960 | # CONFIG_SND_CS4281 is not set |
| 961 | # CONFIG_SND_CS46XX is not set | ||
| 924 | # CONFIG_SND_EMU10K1 is not set | 962 | # CONFIG_SND_EMU10K1 is not set |
| 925 | # CONFIG_SND_EMU10K1X is not set | 963 | # CONFIG_SND_EMU10K1X is not set |
| 926 | # CONFIG_SND_CA0106 is not set | ||
| 927 | # CONFIG_SND_KORG1212 is not set | ||
| 928 | # CONFIG_SND_MIXART is not set | ||
| 929 | # CONFIG_SND_NM256 is not set | ||
| 930 | # CONFIG_SND_RME32 is not set | ||
| 931 | # CONFIG_SND_RME96 is not set | ||
| 932 | # CONFIG_SND_RME9652 is not set | ||
| 933 | # CONFIG_SND_HDSP is not set | ||
| 934 | # CONFIG_SND_HDSPM is not set | ||
| 935 | # CONFIG_SND_TRIDENT is not set | ||
| 936 | # CONFIG_SND_YMFPCI is not set | ||
| 937 | # CONFIG_SND_AD1889 is not set | ||
| 938 | # CONFIG_SND_CMIPCI is not set | ||
| 939 | # CONFIG_SND_ENS1370 is not set | 964 | # CONFIG_SND_ENS1370 is not set |
| 940 | # CONFIG_SND_ENS1371 is not set | 965 | # CONFIG_SND_ENS1371 is not set |
| 941 | # CONFIG_SND_ES1938 is not set | 966 | # CONFIG_SND_ES1938 is not set |
| 942 | # CONFIG_SND_ES1968 is not set | 967 | # CONFIG_SND_ES1968 is not set |
| 943 | # CONFIG_SND_MAESTRO3 is not set | ||
| 944 | CONFIG_SND_FM801=y | 968 | CONFIG_SND_FM801=y |
| 945 | CONFIG_SND_FM801_TEA575X=y | 969 | CONFIG_SND_FM801_TEA575X=y |
| 970 | # CONFIG_SND_HDA_INTEL is not set | ||
| 971 | # CONFIG_SND_HDSP is not set | ||
| 972 | # CONFIG_SND_HDSPM is not set | ||
| 946 | # CONFIG_SND_ICE1712 is not set | 973 | # CONFIG_SND_ICE1712 is not set |
| 947 | # CONFIG_SND_ICE1724 is not set | 974 | # CONFIG_SND_ICE1724 is not set |
| 948 | # CONFIG_SND_INTEL8X0 is not set | 975 | # CONFIG_SND_INTEL8X0 is not set |
| 949 | # CONFIG_SND_INTEL8X0M is not set | 976 | # CONFIG_SND_INTEL8X0M is not set |
| 977 | # CONFIG_SND_KORG1212 is not set | ||
| 978 | # CONFIG_SND_MAESTRO3 is not set | ||
| 979 | # CONFIG_SND_MIXART is not set | ||
| 980 | # CONFIG_SND_NM256 is not set | ||
| 981 | # CONFIG_SND_PCXHR is not set | ||
| 982 | # CONFIG_SND_RME32 is not set | ||
| 983 | # CONFIG_SND_RME96 is not set | ||
| 984 | # CONFIG_SND_RME9652 is not set | ||
| 950 | # CONFIG_SND_SONICVIBES is not set | 985 | # CONFIG_SND_SONICVIBES is not set |
| 986 | # CONFIG_SND_TRIDENT is not set | ||
| 951 | # CONFIG_SND_VIA82XX is not set | 987 | # CONFIG_SND_VIA82XX is not set |
| 952 | # CONFIG_SND_VIA82XX_MODEM is not set | 988 | # CONFIG_SND_VIA82XX_MODEM is not set |
| 953 | # CONFIG_SND_VX222 is not set | 989 | # CONFIG_SND_VX222 is not set |
| 954 | # CONFIG_SND_HDA_INTEL is not set | 990 | # CONFIG_SND_YMFPCI is not set |
| 955 | 991 | ||
| 956 | # | 992 | # |
| 957 | # USB devices | 993 | # USB devices |
| @@ -997,12 +1033,15 @@ CONFIG_USB_UHCI_HCD=y | |||
| 997 | # USB Device Class drivers | 1033 | # USB Device Class drivers |
| 998 | # | 1034 | # |
| 999 | # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set | 1035 | # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set |
| 1000 | # CONFIG_USB_BLUETOOTH_TTY is not set | ||
| 1001 | # CONFIG_USB_ACM is not set | 1036 | # CONFIG_USB_ACM is not set |
| 1002 | # CONFIG_USB_PRINTER is not set | 1037 | # CONFIG_USB_PRINTER is not set |
| 1003 | 1038 | ||
| 1004 | # | 1039 | # |
| 1005 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information | 1040 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 1041 | # | ||
| 1042 | |||
| 1043 | # | ||
| 1044 | # may also be needed; see USB_STORAGE Help for more information | ||
| 1006 | # | 1045 | # |
| 1007 | CONFIG_USB_STORAGE=y | 1046 | CONFIG_USB_STORAGE=y |
| 1008 | # CONFIG_USB_STORAGE_DEBUG is not set | 1047 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -1014,13 +1053,15 @@ CONFIG_USB_STORAGE=y | |||
| 1014 | # CONFIG_USB_STORAGE_SDDR09 is not set | 1053 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 1015 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1054 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1016 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1055 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1017 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1056 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1057 | # CONFIG_USB_LIBUSUAL is not set | ||
| 1018 | 1058 | ||
| 1019 | # | 1059 | # |
| 1020 | # USB Input Devices | 1060 | # USB Input Devices |
| 1021 | # | 1061 | # |
| 1022 | CONFIG_USB_HID=y | 1062 | CONFIG_USB_HID=y |
| 1023 | CONFIG_USB_HIDINPUT=y | 1063 | CONFIG_USB_HIDINPUT=y |
| 1064 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 1024 | # CONFIG_HID_FF is not set | 1065 | # CONFIG_HID_FF is not set |
| 1025 | CONFIG_USB_HIDDEV=y | 1066 | CONFIG_USB_HIDDEV=y |
| 1026 | # CONFIG_USB_AIPTEK is not set | 1067 | # CONFIG_USB_AIPTEK is not set |
| @@ -1034,6 +1075,7 @@ CONFIG_USB_HIDDEV=y | |||
| 1034 | # CONFIG_USB_YEALINK is not set | 1075 | # CONFIG_USB_YEALINK is not set |
| 1035 | # CONFIG_USB_XPAD is not set | 1076 | # CONFIG_USB_XPAD is not set |
| 1036 | # CONFIG_USB_ATI_REMOTE is not set | 1077 | # CONFIG_USB_ATI_REMOTE is not set |
| 1078 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
| 1037 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 1079 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
| 1038 | # CONFIG_USB_APPLETOUCH is not set | 1080 | # CONFIG_USB_APPLETOUCH is not set |
| 1039 | 1081 | ||
| @@ -1049,6 +1091,7 @@ CONFIG_USB_HIDDEV=y | |||
| 1049 | # CONFIG_USB_DABUSB is not set | 1091 | # CONFIG_USB_DABUSB is not set |
| 1050 | # CONFIG_USB_VICAM is not set | 1092 | # CONFIG_USB_VICAM is not set |
| 1051 | # CONFIG_USB_DSBR is not set | 1093 | # CONFIG_USB_DSBR is not set |
| 1094 | # CONFIG_USB_ET61X251 is not set | ||
| 1052 | # CONFIG_USB_IBMCAM is not set | 1095 | # CONFIG_USB_IBMCAM is not set |
| 1053 | # CONFIG_USB_KONICAWC is not set | 1096 | # CONFIG_USB_KONICAWC is not set |
| 1054 | # CONFIG_USB_OV511 is not set | 1097 | # CONFIG_USB_OV511 is not set |
| @@ -1113,7 +1156,7 @@ CONFIG_USB_MON=y | |||
| 1113 | # CONFIG_INFINIBAND is not set | 1156 | # CONFIG_INFINIBAND is not set |
| 1114 | 1157 | ||
| 1115 | # | 1158 | # |
| 1116 | # SN Devices | 1159 | # EDAC - error detection and reporting (RAS) |
| 1117 | # | 1160 | # |
| 1118 | 1161 | ||
| 1119 | # | 1162 | # |
| @@ -1135,6 +1178,7 @@ CONFIG_FS_MBCACHE=y | |||
| 1135 | # CONFIG_JFS_FS is not set | 1178 | # CONFIG_JFS_FS is not set |
| 1136 | # CONFIG_FS_POSIX_ACL is not set | 1179 | # CONFIG_FS_POSIX_ACL is not set |
| 1137 | # CONFIG_XFS_FS is not set | 1180 | # CONFIG_XFS_FS is not set |
| 1181 | # CONFIG_OCFS2_FS is not set | ||
| 1138 | # CONFIG_MINIX_FS is not set | 1182 | # CONFIG_MINIX_FS is not set |
| 1139 | # CONFIG_ROMFS_FS is not set | 1183 | # CONFIG_ROMFS_FS is not set |
| 1140 | # CONFIG_INOTIFY is not set | 1184 | # CONFIG_INOTIFY is not set |
| @@ -1174,6 +1218,7 @@ CONFIG_HUGETLBFS=y | |||
| 1174 | CONFIG_HUGETLB_PAGE=y | 1218 | CONFIG_HUGETLB_PAGE=y |
| 1175 | CONFIG_RAMFS=y | 1219 | CONFIG_RAMFS=y |
| 1176 | # CONFIG_RELAYFS_FS is not set | 1220 | # CONFIG_RELAYFS_FS is not set |
| 1221 | # CONFIG_CONFIGFS_FS is not set | ||
| 1177 | 1222 | ||
| 1178 | # | 1223 | # |
| 1179 | # Miscellaneous filesystems | 1224 | # Miscellaneous filesystems |
| @@ -1238,6 +1283,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1238 | # CONFIG_SGI_PARTITION is not set | 1283 | # CONFIG_SGI_PARTITION is not set |
| 1239 | # CONFIG_ULTRIX_PARTITION is not set | 1284 | # CONFIG_ULTRIX_PARTITION is not set |
| 1240 | # CONFIG_SUN_PARTITION is not set | 1285 | # CONFIG_SUN_PARTITION is not set |
| 1286 | # CONFIG_KARMA_PARTITION is not set | ||
| 1241 | CONFIG_EFI_PARTITION=y | 1287 | CONFIG_EFI_PARTITION=y |
| 1242 | 1288 | ||
| 1243 | # | 1289 | # |
| @@ -1296,26 +1342,30 @@ CONFIG_GENERIC_IRQ_PROBE=y | |||
| 1296 | CONFIG_GENERIC_PENDING_IRQ=y | 1342 | CONFIG_GENERIC_PENDING_IRQ=y |
| 1297 | 1343 | ||
| 1298 | # | 1344 | # |
| 1299 | # Profiling support | 1345 | # Instrumentation Support |
| 1300 | # | 1346 | # |
| 1301 | # CONFIG_PROFILING is not set | 1347 | # CONFIG_PROFILING is not set |
| 1348 | CONFIG_KPROBES=y | ||
| 1302 | 1349 | ||
| 1303 | # | 1350 | # |
| 1304 | # Kernel hacking | 1351 | # Kernel hacking |
| 1305 | # | 1352 | # |
| 1306 | # CONFIG_PRINTK_TIME is not set | 1353 | # CONFIG_PRINTK_TIME is not set |
| 1307 | CONFIG_DEBUG_KERNEL=y | ||
| 1308 | CONFIG_MAGIC_SYSRQ=y | 1354 | CONFIG_MAGIC_SYSRQ=y |
| 1355 | CONFIG_DEBUG_KERNEL=y | ||
| 1309 | CONFIG_LOG_BUF_SHIFT=17 | 1356 | CONFIG_LOG_BUF_SHIFT=17 |
| 1310 | CONFIG_DETECT_SOFTLOCKUP=y | 1357 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1311 | # CONFIG_SCHEDSTATS is not set | 1358 | # CONFIG_SCHEDSTATS is not set |
| 1312 | # CONFIG_DEBUG_SLAB is not set | 1359 | # CONFIG_DEBUG_SLAB is not set |
| 1360 | CONFIG_DEBUG_MUTEXES=y | ||
| 1313 | # CONFIG_DEBUG_SPINLOCK is not set | 1361 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1314 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1362 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1315 | # CONFIG_DEBUG_KOBJECT is not set | 1363 | # CONFIG_DEBUG_KOBJECT is not set |
| 1316 | # CONFIG_DEBUG_INFO is not set | 1364 | # CONFIG_DEBUG_INFO is not set |
| 1317 | # CONFIG_DEBUG_FS is not set | 1365 | # CONFIG_DEBUG_FS is not set |
| 1318 | CONFIG_KPROBES=y | 1366 | # CONFIG_DEBUG_VM is not set |
| 1367 | CONFIG_FORCED_INLINING=y | ||
| 1368 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1319 | CONFIG_IA64_GRANULE_16MB=y | 1369 | CONFIG_IA64_GRANULE_16MB=y |
| 1320 | # CONFIG_IA64_GRANULE_64MB is not set | 1370 | # CONFIG_IA64_GRANULE_64MB is not set |
| 1321 | CONFIG_IA64_PRINT_HAZARDS=y | 1371 | CONFIG_IA64_PRINT_HAZARDS=y |
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index dcbc78a4cfa4..3e767288a745 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig | |||
| @@ -1,14 +1,13 @@ | |||
| 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-rc1 | 3 | # Linux kernel version: 2.6.16-rc5 |
| 4 | # Wed Sep 14 15:13:03 2005 | 4 | # Mon Feb 27 16:02:28 2006 |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | # | 7 | # |
| 8 | # Code maturity level options | 8 | # Code maturity level options |
| 9 | # | 9 | # |
| 10 | CONFIG_EXPERIMENTAL=y | 10 | CONFIG_EXPERIMENTAL=y |
| 11 | CONFIG_CLEAN_COMPILE=y | ||
| 12 | CONFIG_LOCK_KERNEL=y | 11 | CONFIG_LOCK_KERNEL=y |
| 13 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 12 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 14 | 13 | ||
| @@ -23,18 +22,19 @@ CONFIG_POSIX_MQUEUE=y | |||
| 23 | # CONFIG_BSD_PROCESS_ACCT is not set | 22 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 24 | CONFIG_SYSCTL=y | 23 | CONFIG_SYSCTL=y |
| 25 | # CONFIG_AUDIT is not set | 24 | # CONFIG_AUDIT is not set |
| 26 | CONFIG_HOTPLUG=y | ||
| 27 | CONFIG_KOBJECT_UEVENT=y | ||
| 28 | CONFIG_IKCONFIG=y | 25 | CONFIG_IKCONFIG=y |
| 29 | CONFIG_IKCONFIG_PROC=y | 26 | CONFIG_IKCONFIG_PROC=y |
| 30 | # CONFIG_CPUSETS is not set | 27 | # CONFIG_CPUSETS is not set |
| 31 | CONFIG_INITRAMFS_SOURCE="" | 28 | CONFIG_INITRAMFS_SOURCE="" |
| 29 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 32 | # CONFIG_EMBEDDED is not set | 30 | # CONFIG_EMBEDDED is not set |
| 33 | CONFIG_KALLSYMS=y | 31 | CONFIG_KALLSYMS=y |
| 34 | CONFIG_KALLSYMS_ALL=y | 32 | CONFIG_KALLSYMS_ALL=y |
| 35 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 33 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 34 | CONFIG_HOTPLUG=y | ||
| 36 | CONFIG_PRINTK=y | 35 | CONFIG_PRINTK=y |
| 37 | CONFIG_BUG=y | 36 | CONFIG_BUG=y |
| 37 | CONFIG_ELF_CORE=y | ||
| 38 | CONFIG_BASE_FULL=y | 38 | CONFIG_BASE_FULL=y |
| 39 | CONFIG_FUTEX=y | 39 | CONFIG_FUTEX=y |
| 40 | CONFIG_EPOLL=y | 40 | CONFIG_EPOLL=y |
| @@ -43,8 +43,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 | |||
| 43 | CONFIG_CC_ALIGN_LABELS=0 | 43 | CONFIG_CC_ALIGN_LABELS=0 |
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | 44 | CONFIG_CC_ALIGN_LOOPS=0 |
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | 45 | CONFIG_CC_ALIGN_JUMPS=0 |
| 46 | CONFIG_SLAB=y | ||
| 46 | # CONFIG_TINY_SHMEM is not set | 47 | # CONFIG_TINY_SHMEM is not set |
| 47 | CONFIG_BASE_SMALL=0 | 48 | CONFIG_BASE_SMALL=0 |
| 49 | # CONFIG_SLOB is not set | ||
| 48 | 50 | ||
| 49 | # | 51 | # |
| 50 | # Loadable module support | 52 | # Loadable module support |
| @@ -59,17 +61,36 @@ CONFIG_KMOD=y | |||
| 59 | CONFIG_STOP_MACHINE=y | 61 | CONFIG_STOP_MACHINE=y |
| 60 | 62 | ||
| 61 | # | 63 | # |
| 64 | # Block layer | ||
| 65 | # | ||
| 66 | |||
| 67 | # | ||
| 68 | # IO Schedulers | ||
| 69 | # | ||
| 70 | CONFIG_IOSCHED_NOOP=y | ||
| 71 | CONFIG_IOSCHED_AS=y | ||
| 72 | CONFIG_IOSCHED_DEADLINE=y | ||
| 73 | CONFIG_IOSCHED_CFQ=y | ||
| 74 | CONFIG_DEFAULT_AS=y | ||
| 75 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 76 | # CONFIG_DEFAULT_CFQ is not set | ||
| 77 | # CONFIG_DEFAULT_NOOP is not set | ||
| 78 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 79 | |||
| 80 | # | ||
| 62 | # Processor type and features | 81 | # Processor type and features |
| 63 | # | 82 | # |
| 64 | CONFIG_IA64=y | 83 | CONFIG_IA64=y |
| 65 | CONFIG_64BIT=y | 84 | CONFIG_64BIT=y |
| 66 | CONFIG_MMU=y | 85 | CONFIG_MMU=y |
| 86 | CONFIG_SWIOTLB=y | ||
| 67 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 87 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 68 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 88 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 69 | CONFIG_TIME_INTERPOLATION=y | 89 | CONFIG_TIME_INTERPOLATION=y |
| 70 | CONFIG_EFI=y | 90 | CONFIG_EFI=y |
| 71 | CONFIG_GENERIC_IOMAP=y | 91 | CONFIG_GENERIC_IOMAP=y |
| 72 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 92 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 93 | CONFIG_DMA_IS_DMA32=y | ||
| 73 | CONFIG_IA64_GENERIC=y | 94 | CONFIG_IA64_GENERIC=y |
| 74 | # CONFIG_IA64_DIG is not set | 95 | # CONFIG_IA64_DIG is not set |
| 75 | # CONFIG_IA64_HP_ZX1 is not set | 96 | # CONFIG_IA64_HP_ZX1 is not set |
| @@ -89,14 +110,10 @@ CONFIG_HZ_250=y | |||
| 89 | # CONFIG_HZ_1000 is not set | 110 | # CONFIG_HZ_1000 is not set |
| 90 | CONFIG_HZ=250 | 111 | CONFIG_HZ=250 |
| 91 | CONFIG_IA64_L1_CACHE_SHIFT=7 | 112 | CONFIG_IA64_L1_CACHE_SHIFT=7 |
| 92 | CONFIG_NUMA=y | ||
| 93 | CONFIG_VIRTUAL_MEM_MAP=y | ||
| 94 | CONFIG_HOLES_IN_ZONE=y | ||
| 95 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
| 96 | CONFIG_IA64_CYCLONE=y | 113 | CONFIG_IA64_CYCLONE=y |
| 97 | CONFIG_IOSAPIC=y | 114 | CONFIG_IOSAPIC=y |
| 98 | # CONFIG_IA64_SGI_SN_XP is not set | 115 | # CONFIG_IA64_SGI_SN_XP is not set |
| 99 | CONFIG_FORCE_MAX_ZONEORDER=18 | 116 | CONFIG_FORCE_MAX_ZONEORDER=17 |
| 100 | CONFIG_SMP=y | 117 | CONFIG_SMP=y |
| 101 | CONFIG_NR_CPUS=512 | 118 | CONFIG_NR_CPUS=512 |
| 102 | CONFIG_HOTPLUG_CPU=y | 119 | CONFIG_HOTPLUG_CPU=y |
| @@ -110,19 +127,29 @@ CONFIG_DISCONTIGMEM=y | |||
| 110 | CONFIG_FLAT_NODE_MEM_MAP=y | 127 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 111 | CONFIG_NEED_MULTIPLE_NODES=y | 128 | CONFIG_NEED_MULTIPLE_NODES=y |
| 112 | # CONFIG_SPARSEMEM_STATIC is not set | 129 | # CONFIG_SPARSEMEM_STATIC is not set |
| 113 | CONFIG_HAVE_DEC_LOCK=y | 130 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 131 | CONFIG_MIGRATION=y | ||
| 132 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
| 133 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
| 134 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
| 135 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
| 136 | CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y | ||
| 137 | CONFIG_NUMA=y | ||
| 138 | CONFIG_VIRTUAL_MEM_MAP=y | ||
| 139 | CONFIG_HOLES_IN_ZONE=y | ||
| 140 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | ||
| 114 | CONFIG_IA32_SUPPORT=y | 141 | CONFIG_IA32_SUPPORT=y |
| 115 | CONFIG_COMPAT=y | 142 | CONFIG_COMPAT=y |
| 116 | CONFIG_IA64_MCA_RECOVERY=y | 143 | CONFIG_IA64_MCA_RECOVERY=y |
| 117 | CONFIG_PERFMON=y | 144 | CONFIG_PERFMON=y |
| 118 | CONFIG_IA64_PALINFO=y | 145 | CONFIG_IA64_PALINFO=y |
| 146 | CONFIG_SGI_SN=y | ||
| 119 | 147 | ||
| 120 | # | 148 | # |
| 121 | # Firmware Drivers | 149 | # Firmware Drivers |
| 122 | # | 150 | # |
| 123 | CONFIG_EFI_VARS=y | 151 | CONFIG_EFI_VARS=y |
| 124 | CONFIG_EFI_PCDP=y | 152 | CONFIG_EFI_PCDP=y |
| 125 | # CONFIG_DELL_RBU is not set | ||
| 126 | CONFIG_BINFMT_ELF=y | 153 | CONFIG_BINFMT_ELF=y |
| 127 | CONFIG_BINFMT_MISC=m | 154 | CONFIG_BINFMT_MISC=m |
| 128 | 155 | ||
| @@ -130,6 +157,7 @@ CONFIG_BINFMT_MISC=m | |||
| 130 | # Power management and ACPI | 157 | # Power management and ACPI |
| 131 | # | 158 | # |
| 132 | CONFIG_PM=y | 159 | CONFIG_PM=y |
| 160 | CONFIG_PM_LEGACY=y | ||
| 133 | # CONFIG_PM_DEBUG is not set | 161 | # CONFIG_PM_DEBUG is not set |
| 134 | 162 | ||
| 135 | # | 163 | # |
| @@ -144,6 +172,7 @@ CONFIG_ACPI_THERMAL=m | |||
| 144 | CONFIG_ACPI_NUMA=y | 172 | CONFIG_ACPI_NUMA=y |
| 145 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 173 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
| 146 | # CONFIG_ACPI_DEBUG is not set | 174 | # CONFIG_ACPI_DEBUG is not set |
| 175 | CONFIG_ACPI_EC=y | ||
| 147 | CONFIG_ACPI_POWER=y | 176 | CONFIG_ACPI_POWER=y |
| 148 | CONFIG_ACPI_SYSTEM=y | 177 | CONFIG_ACPI_SYSTEM=y |
| 149 | CONFIG_ACPI_CONTAINER=m | 178 | CONFIG_ACPI_CONTAINER=m |
| @@ -186,6 +215,7 @@ CONFIG_NET=y | |||
| 186 | # | 215 | # |
| 187 | # Networking options | 216 | # Networking options |
| 188 | # | 217 | # |
| 218 | # CONFIG_NETDEBUG is not set | ||
| 189 | CONFIG_PACKET=y | 219 | CONFIG_PACKET=y |
| 190 | # CONFIG_PACKET_MMAP is not set | 220 | # CONFIG_PACKET_MMAP is not set |
| 191 | CONFIG_UNIX=y | 221 | CONFIG_UNIX=y |
| @@ -220,6 +250,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 220 | # SCTP Configuration (EXPERIMENTAL) | 250 | # SCTP Configuration (EXPERIMENTAL) |
| 221 | # | 251 | # |
| 222 | # CONFIG_IP_SCTP is not set | 252 | # CONFIG_IP_SCTP is not set |
| 253 | |||
| 254 | # | ||
| 255 | # TIPC Configuration (EXPERIMENTAL) | ||
| 256 | # | ||
| 257 | # CONFIG_TIPC is not set | ||
| 223 | # CONFIG_ATM is not set | 258 | # CONFIG_ATM is not set |
| 224 | # CONFIG_BRIDGE is not set | 259 | # CONFIG_BRIDGE is not set |
| 225 | # CONFIG_VLAN_8021Q is not set | 260 | # CONFIG_VLAN_8021Q is not set |
| @@ -232,14 +267,16 @@ CONFIG_TCP_CONG_BIC=y | |||
| 232 | # CONFIG_NET_DIVERT is not set | 267 | # CONFIG_NET_DIVERT is not set |
| 233 | # CONFIG_ECONET is not set | 268 | # CONFIG_ECONET is not set |
| 234 | # CONFIG_WAN_ROUTER is not set | 269 | # CONFIG_WAN_ROUTER is not set |
| 270 | |||
| 271 | # | ||
| 272 | # QoS and/or fair queueing | ||
| 273 | # | ||
| 235 | # CONFIG_NET_SCHED is not set | 274 | # CONFIG_NET_SCHED is not set |
| 236 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 237 | 275 | ||
| 238 | # | 276 | # |
| 239 | # Network testing | 277 | # Network testing |
| 240 | # | 278 | # |
| 241 | # CONFIG_NET_PKTGEN is not set | 279 | # CONFIG_NET_PKTGEN is not set |
| 242 | # CONFIG_NETFILTER_NETLINK is not set | ||
| 243 | # CONFIG_HAMRADIO is not set | 280 | # CONFIG_HAMRADIO is not set |
| 244 | # CONFIG_IRDA is not set | 281 | # CONFIG_IRDA is not set |
| 245 | # CONFIG_BT is not set | 282 | # CONFIG_BT is not set |
| @@ -301,20 +338,13 @@ CONFIG_BLK_DEV_RAM_COUNT=16 | |||
| 301 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 338 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 302 | CONFIG_BLK_DEV_INITRD=y | 339 | CONFIG_BLK_DEV_INITRD=y |
| 303 | # CONFIG_CDROM_PKTCDVD is not set | 340 | # CONFIG_CDROM_PKTCDVD is not set |
| 304 | |||
| 305 | # | ||
| 306 | # IO Schedulers | ||
| 307 | # | ||
| 308 | CONFIG_IOSCHED_NOOP=y | ||
| 309 | CONFIG_IOSCHED_AS=y | ||
| 310 | CONFIG_IOSCHED_DEADLINE=y | ||
| 311 | CONFIG_IOSCHED_CFQ=y | ||
| 312 | # CONFIG_ATA_OVER_ETH is not set | 341 | # CONFIG_ATA_OVER_ETH is not set |
| 313 | 342 | ||
| 314 | # | 343 | # |
| 315 | # ATA/ATAPI/MFM/RLL support | 344 | # ATA/ATAPI/MFM/RLL support |
| 316 | # | 345 | # |
| 317 | CONFIG_IDE=y | 346 | CONFIG_IDE=y |
| 347 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 318 | CONFIG_BLK_DEV_IDE=y | 348 | CONFIG_BLK_DEV_IDE=y |
| 319 | 349 | ||
| 320 | # | 350 | # |
| @@ -407,6 +437,7 @@ CONFIG_SCSI_FC_ATTRS=y | |||
| 407 | # | 437 | # |
| 408 | # SCSI low-level drivers | 438 | # SCSI low-level drivers |
| 409 | # | 439 | # |
| 440 | # CONFIG_ISCSI_TCP is not set | ||
| 410 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 441 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 411 | # CONFIG_SCSI_3W_9XXX is not set | 442 | # CONFIG_SCSI_3W_9XXX is not set |
| 412 | # CONFIG_SCSI_ACARD is not set | 443 | # CONFIG_SCSI_ACARD is not set |
| @@ -416,16 +447,19 @@ CONFIG_SCSI_FC_ATTRS=y | |||
| 416 | # CONFIG_SCSI_AIC79XX is not set | 447 | # CONFIG_SCSI_AIC79XX is not set |
| 417 | # CONFIG_MEGARAID_NEWGEN is not set | 448 | # CONFIG_MEGARAID_NEWGEN is not set |
| 418 | # CONFIG_MEGARAID_LEGACY is not set | 449 | # CONFIG_MEGARAID_LEGACY is not set |
| 450 | # CONFIG_MEGARAID_SAS is not set | ||
| 419 | CONFIG_SCSI_SATA=y | 451 | CONFIG_SCSI_SATA=y |
| 420 | # CONFIG_SCSI_SATA_AHCI is not set | 452 | # CONFIG_SCSI_SATA_AHCI is not set |
| 421 | # CONFIG_SCSI_SATA_SVW is not set | 453 | # CONFIG_SCSI_SATA_SVW is not set |
| 422 | # CONFIG_SCSI_ATA_PIIX is not set | 454 | # CONFIG_SCSI_ATA_PIIX is not set |
| 423 | # CONFIG_SCSI_SATA_MV is not set | 455 | # CONFIG_SCSI_SATA_MV is not set |
| 424 | # CONFIG_SCSI_SATA_NV is not set | 456 | # CONFIG_SCSI_SATA_NV is not set |
| 425 | # CONFIG_SCSI_SATA_PROMISE is not set | 457 | # CONFIG_SCSI_PDC_ADMA is not set |
| 426 | # CONFIG_SCSI_SATA_QSTOR is not set | 458 | # CONFIG_SCSI_SATA_QSTOR is not set |
| 459 | # CONFIG_SCSI_SATA_PROMISE is not set | ||
| 427 | # CONFIG_SCSI_SATA_SX4 is not set | 460 | # CONFIG_SCSI_SATA_SX4 is not set |
| 428 | # CONFIG_SCSI_SATA_SIL is not set | 461 | # CONFIG_SCSI_SATA_SIL is not set |
| 462 | # CONFIG_SCSI_SATA_SIL24 is not set | ||
| 429 | # CONFIG_SCSI_SATA_SIS is not set | 463 | # CONFIG_SCSI_SATA_SIS is not set |
| 430 | # CONFIG_SCSI_SATA_ULI is not set | 464 | # CONFIG_SCSI_SATA_ULI is not set |
| 431 | # CONFIG_SCSI_SATA_VIA is not set | 465 | # CONFIG_SCSI_SATA_VIA is not set |
| @@ -443,14 +477,7 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | |||
| 443 | # CONFIG_SCSI_IPR is not set | 477 | # CONFIG_SCSI_IPR is not set |
| 444 | # CONFIG_SCSI_QLOGIC_FC is not set | 478 | # CONFIG_SCSI_QLOGIC_FC is not set |
| 445 | CONFIG_SCSI_QLOGIC_1280=y | 479 | CONFIG_SCSI_QLOGIC_1280=y |
| 446 | # CONFIG_SCSI_QLOGIC_1280_1040 is not set | 480 | # CONFIG_SCSI_QLA_FC is not set |
| 447 | CONFIG_SCSI_QLA2XXX=y | ||
| 448 | CONFIG_SCSI_QLA21XX=m | ||
| 449 | CONFIG_SCSI_QLA22XX=m | ||
| 450 | CONFIG_SCSI_QLA2300=m | ||
| 451 | CONFIG_SCSI_QLA2322=m | ||
| 452 | # CONFIG_SCSI_QLA6312 is not set | ||
| 453 | # CONFIG_SCSI_QLA24XX is not set | ||
| 454 | # CONFIG_SCSI_LPFC is not set | 481 | # CONFIG_SCSI_LPFC is not set |
| 455 | # CONFIG_SCSI_DC395x is not set | 482 | # CONFIG_SCSI_DC395x is not set |
| 456 | # CONFIG_SCSI_DC390T is not set | 483 | # CONFIG_SCSI_DC390T is not set |
| @@ -483,6 +510,7 @@ CONFIG_DM_MULTIPATH=m | |||
| 483 | CONFIG_FUSION=y | 510 | CONFIG_FUSION=y |
| 484 | CONFIG_FUSION_SPI=y | 511 | CONFIG_FUSION_SPI=y |
| 485 | CONFIG_FUSION_FC=m | 512 | CONFIG_FUSION_FC=m |
| 513 | # CONFIG_FUSION_SAS is not set | ||
| 486 | CONFIG_FUSION_MAX_SGE=128 | 514 | CONFIG_FUSION_MAX_SGE=128 |
| 487 | # CONFIG_FUSION_CTL is not set | 515 | # CONFIG_FUSION_CTL is not set |
| 488 | 516 | ||
| @@ -523,6 +551,7 @@ CONFIG_NET_ETHERNET=y | |||
| 523 | CONFIG_MII=m | 551 | CONFIG_MII=m |
| 524 | # CONFIG_HAPPYMEAL is not set | 552 | # CONFIG_HAPPYMEAL is not set |
| 525 | # CONFIG_SUNGEM is not set | 553 | # CONFIG_SUNGEM is not set |
| 554 | # CONFIG_CASSINI is not set | ||
| 526 | # CONFIG_NET_VENDOR_3COM is not set | 555 | # CONFIG_NET_VENDOR_3COM is not set |
| 527 | 556 | ||
| 528 | # | 557 | # |
| @@ -572,6 +601,7 @@ CONFIG_E1000=y | |||
| 572 | # CONFIG_R8169 is not set | 601 | # CONFIG_R8169 is not set |
| 573 | # CONFIG_SIS190 is not set | 602 | # CONFIG_SIS190 is not set |
| 574 | # CONFIG_SKGE is not set | 603 | # CONFIG_SKGE is not set |
| 604 | # CONFIG_SKY2 is not set | ||
| 575 | # CONFIG_SK98LIN is not set | 605 | # CONFIG_SK98LIN is not set |
| 576 | # CONFIG_VIA_VELOCITY is not set | 606 | # CONFIG_VIA_VELOCITY is not set |
| 577 | CONFIG_TIGON3=y | 607 | CONFIG_TIGON3=y |
| @@ -676,12 +706,15 @@ CONFIG_VT=y | |||
| 676 | CONFIG_VT_CONSOLE=y | 706 | CONFIG_VT_CONSOLE=y |
| 677 | CONFIG_HW_CONSOLE=y | 707 | CONFIG_HW_CONSOLE=y |
| 678 | CONFIG_SERIAL_NONSTANDARD=y | 708 | CONFIG_SERIAL_NONSTANDARD=y |
| 709 | # CONFIG_COMPUTONE is not set | ||
| 679 | # CONFIG_ROCKETPORT is not set | 710 | # CONFIG_ROCKETPORT is not set |
| 680 | # CONFIG_CYCLADES is not set | 711 | # CONFIG_CYCLADES is not set |
| 681 | # CONFIG_DIGIEPCA is not set | 712 | # CONFIG_DIGIEPCA is not set |
| 713 | # CONFIG_MOXA_INTELLIO is not set | ||
| 682 | # CONFIG_MOXA_SMARTIO is not set | 714 | # CONFIG_MOXA_SMARTIO is not set |
| 683 | # CONFIG_ISI is not set | 715 | # CONFIG_ISI is not set |
| 684 | # CONFIG_SYNCLINKMP is not set | 716 | # CONFIG_SYNCLINKMP is not set |
| 717 | # CONFIG_SYNCLINK_GT is not set | ||
| 685 | # CONFIG_N_HDLC is not set | 718 | # CONFIG_N_HDLC is not set |
| 686 | # CONFIG_SPECIALIX is not set | 719 | # CONFIG_SPECIALIX is not set |
| 687 | # CONFIG_SX is not set | 720 | # CONFIG_SX is not set |
| @@ -697,6 +730,7 @@ CONFIG_SERIAL_8250=y | |||
| 697 | CONFIG_SERIAL_8250_CONSOLE=y | 730 | CONFIG_SERIAL_8250_CONSOLE=y |
| 698 | CONFIG_SERIAL_8250_ACPI=y | 731 | CONFIG_SERIAL_8250_ACPI=y |
| 699 | CONFIG_SERIAL_8250_NR_UARTS=6 | 732 | CONFIG_SERIAL_8250_NR_UARTS=6 |
| 733 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 700 | CONFIG_SERIAL_8250_EXTENDED=y | 734 | CONFIG_SERIAL_8250_EXTENDED=y |
| 701 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 735 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
| 702 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set | 736 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set |
| @@ -710,6 +744,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 710 | CONFIG_SERIAL_SGI_L1_CONSOLE=y | 744 | CONFIG_SERIAL_SGI_L1_CONSOLE=y |
| 711 | # CONFIG_SERIAL_JSM is not set | 745 | # CONFIG_SERIAL_JSM is not set |
| 712 | CONFIG_SERIAL_SGI_IOC4=y | 746 | CONFIG_SERIAL_SGI_IOC4=y |
| 747 | # CONFIG_SERIAL_SGI_IOC3 is not set | ||
| 713 | CONFIG_UNIX98_PTYS=y | 748 | CONFIG_UNIX98_PTYS=y |
| 714 | CONFIG_LEGACY_PTYS=y | 749 | CONFIG_LEGACY_PTYS=y |
| 715 | CONFIG_LEGACY_PTY_COUNT=256 | 750 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -745,10 +780,10 @@ CONFIG_DRM_SIS=m | |||
| 745 | # CONFIG_DRM_VIA is not set | 780 | # CONFIG_DRM_VIA is not set |
| 746 | # CONFIG_DRM_SAVAGE is not set | 781 | # CONFIG_DRM_SAVAGE is not set |
| 747 | CONFIG_RAW_DRIVER=m | 782 | CONFIG_RAW_DRIVER=m |
| 783 | CONFIG_MAX_RAW_DEVS=256 | ||
| 748 | CONFIG_HPET=y | 784 | CONFIG_HPET=y |
| 749 | # CONFIG_HPET_RTC_IRQ is not set | 785 | # CONFIG_HPET_RTC_IRQ is not set |
| 750 | CONFIG_HPET_MMAP=y | 786 | CONFIG_HPET_MMAP=y |
| 751 | CONFIG_MAX_RAW_DEVS=256 | ||
| 752 | # CONFIG_HANGCHECK_TIMER is not set | 787 | # CONFIG_HANGCHECK_TIMER is not set |
| 753 | CONFIG_MMTIMER=y | 788 | CONFIG_MMTIMER=y |
| 754 | 789 | ||
| @@ -756,6 +791,7 @@ CONFIG_MMTIMER=y | |||
| 756 | # TPM devices | 791 | # TPM devices |
| 757 | # | 792 | # |
| 758 | # CONFIG_TCG_TPM is not set | 793 | # CONFIG_TCG_TPM is not set |
| 794 | # CONFIG_TELCLOCK is not set | ||
| 759 | 795 | ||
| 760 | # | 796 | # |
| 761 | # I2C support | 797 | # I2C support |
| @@ -763,6 +799,12 @@ CONFIG_MMTIMER=y | |||
| 763 | # CONFIG_I2C is not set | 799 | # CONFIG_I2C is not set |
| 764 | 800 | ||
| 765 | # | 801 | # |
| 802 | # SPI support | ||
| 803 | # | ||
| 804 | # CONFIG_SPI is not set | ||
| 805 | # CONFIG_SPI_MASTER is not set | ||
| 806 | |||
| 807 | # | ||
| 766 | # Dallas's 1-wire bus | 808 | # Dallas's 1-wire bus |
| 767 | # | 809 | # |
| 768 | # CONFIG_W1 is not set | 810 | # CONFIG_W1 is not set |
| @@ -772,6 +814,7 @@ CONFIG_MMTIMER=y | |||
| 772 | # | 814 | # |
| 773 | CONFIG_HWMON=y | 815 | CONFIG_HWMON=y |
| 774 | # CONFIG_HWMON_VID is not set | 816 | # CONFIG_HWMON_VID is not set |
| 817 | # CONFIG_SENSORS_F71805F is not set | ||
| 775 | # CONFIG_HWMON_DEBUG_CHIP is not set | 818 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 776 | 819 | ||
| 777 | # | 820 | # |
| @@ -822,26 +865,28 @@ CONFIG_SND_OSSEMUL=y | |||
| 822 | CONFIG_SND_MIXER_OSS=m | 865 | CONFIG_SND_MIXER_OSS=m |
| 823 | CONFIG_SND_PCM_OSS=m | 866 | CONFIG_SND_PCM_OSS=m |
| 824 | CONFIG_SND_SEQUENCER_OSS=y | 867 | CONFIG_SND_SEQUENCER_OSS=y |
| 868 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 869 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 825 | CONFIG_SND_VERBOSE_PRINTK=y | 870 | CONFIG_SND_VERBOSE_PRINTK=y |
| 826 | # CONFIG_SND_DEBUG is not set | 871 | # CONFIG_SND_DEBUG is not set |
| 827 | CONFIG_SND_GENERIC_DRIVER=y | ||
| 828 | 872 | ||
| 829 | # | 873 | # |
| 830 | # Generic devices | 874 | # Generic devices |
| 831 | # | 875 | # |
| 832 | CONFIG_SND_MPU401_UART=m | 876 | CONFIG_SND_MPU401_UART=m |
| 833 | CONFIG_SND_OPL3_LIB=m | 877 | CONFIG_SND_OPL3_LIB=m |
| 878 | CONFIG_SND_AC97_CODEC=m | ||
| 879 | CONFIG_SND_AC97_BUS=m | ||
| 834 | CONFIG_SND_DUMMY=m | 880 | CONFIG_SND_DUMMY=m |
| 835 | CONFIG_SND_VIRMIDI=m | 881 | CONFIG_SND_VIRMIDI=m |
| 836 | CONFIG_SND_MTPAV=m | 882 | CONFIG_SND_MTPAV=m |
| 837 | CONFIG_SND_SERIAL_U16550=m | 883 | CONFIG_SND_SERIAL_U16550=m |
| 838 | CONFIG_SND_MPU401=m | 884 | CONFIG_SND_MPU401=m |
| 839 | CONFIG_SND_AC97_CODEC=m | ||
| 840 | CONFIG_SND_AC97_BUS=m | ||
| 841 | 885 | ||
| 842 | # | 886 | # |
| 843 | # PCI devices | 887 | # PCI devices |
| 844 | # | 888 | # |
| 889 | # CONFIG_SND_AD1889 is not set | ||
| 845 | # CONFIG_SND_ALI5451 is not set | 890 | # CONFIG_SND_ALI5451 is not set |
| 846 | # CONFIG_SND_ATIIXP is not set | 891 | # CONFIG_SND_ATIIXP is not set |
| 847 | # CONFIG_SND_ATIIXP_MODEM is not set | 892 | # CONFIG_SND_ATIIXP_MODEM is not set |
| @@ -850,40 +895,40 @@ CONFIG_SND_AC97_BUS=m | |||
| 850 | # CONFIG_SND_AU8830 is not set | 895 | # CONFIG_SND_AU8830 is not set |
| 851 | # CONFIG_SND_AZT3328 is not set | 896 | # CONFIG_SND_AZT3328 is not set |
| 852 | # CONFIG_SND_BT87X is not set | 897 | # CONFIG_SND_BT87X is not set |
| 898 | # CONFIG_SND_CA0106 is not set | ||
| 899 | # CONFIG_SND_CMIPCI is not set | ||
| 900 | CONFIG_SND_CS4281=m | ||
| 853 | CONFIG_SND_CS46XX=m | 901 | CONFIG_SND_CS46XX=m |
| 854 | CONFIG_SND_CS46XX_NEW_DSP=y | 902 | CONFIG_SND_CS46XX_NEW_DSP=y |
| 855 | CONFIG_SND_CS4281=m | ||
| 856 | CONFIG_SND_EMU10K1=m | 903 | CONFIG_SND_EMU10K1=m |
| 857 | # CONFIG_SND_EMU10K1X is not set | 904 | # CONFIG_SND_EMU10K1X is not set |
| 858 | # CONFIG_SND_CA0106 is not set | ||
| 859 | # CONFIG_SND_KORG1212 is not set | ||
| 860 | # CONFIG_SND_MIXART is not set | ||
| 861 | # CONFIG_SND_NM256 is not set | ||
| 862 | # CONFIG_SND_RME32 is not set | ||
| 863 | # CONFIG_SND_RME96 is not set | ||
| 864 | # CONFIG_SND_RME9652 is not set | ||
| 865 | # CONFIG_SND_HDSP is not set | ||
| 866 | # CONFIG_SND_HDSPM is not set | ||
| 867 | # CONFIG_SND_TRIDENT is not set | ||
| 868 | # CONFIG_SND_YMFPCI is not set | ||
| 869 | # CONFIG_SND_AD1889 is not set | ||
| 870 | # CONFIG_SND_CMIPCI is not set | ||
| 871 | # CONFIG_SND_ENS1370 is not set | 905 | # CONFIG_SND_ENS1370 is not set |
| 872 | # CONFIG_SND_ENS1371 is not set | 906 | # CONFIG_SND_ENS1371 is not set |
| 873 | # CONFIG_SND_ES1938 is not set | 907 | # CONFIG_SND_ES1938 is not set |
| 874 | # CONFIG_SND_ES1968 is not set | 908 | # CONFIG_SND_ES1968 is not set |
| 875 | # CONFIG_SND_MAESTRO3 is not set | ||
| 876 | CONFIG_SND_FM801=m | 909 | CONFIG_SND_FM801=m |
| 877 | # CONFIG_SND_FM801_TEA575X is not set | 910 | # CONFIG_SND_FM801_TEA575X is not set |
| 911 | # CONFIG_SND_HDA_INTEL is not set | ||
| 912 | # CONFIG_SND_HDSP is not set | ||
| 913 | # CONFIG_SND_HDSPM is not set | ||
| 878 | # CONFIG_SND_ICE1712 is not set | 914 | # CONFIG_SND_ICE1712 is not set |
| 879 | # CONFIG_SND_ICE1724 is not set | 915 | # CONFIG_SND_ICE1724 is not set |
| 880 | # CONFIG_SND_INTEL8X0 is not set | 916 | # CONFIG_SND_INTEL8X0 is not set |
| 881 | # CONFIG_SND_INTEL8X0M is not set | 917 | # CONFIG_SND_INTEL8X0M is not set |
| 918 | # CONFIG_SND_KORG1212 is not set | ||
| 919 | # CONFIG_SND_MAESTRO3 is not set | ||
| 920 | # CONFIG_SND_MIXART is not set | ||
| 921 | # CONFIG_SND_NM256 is not set | ||
| 922 | # CONFIG_SND_PCXHR is not set | ||
| 923 | # CONFIG_SND_RME32 is not set | ||
| 924 | # CONFIG_SND_RME96 is not set | ||
| 925 | # CONFIG_SND_RME9652 is not set | ||
| 882 | # CONFIG_SND_SONICVIBES is not set | 926 | # CONFIG_SND_SONICVIBES is not set |
| 927 | # CONFIG_SND_TRIDENT is not set | ||
| 883 | # CONFIG_SND_VIA82XX is not set | 928 | # CONFIG_SND_VIA82XX is not set |
| 884 | # CONFIG_SND_VIA82XX_MODEM is not set | 929 | # CONFIG_SND_VIA82XX_MODEM is not set |
| 885 | # CONFIG_SND_VX222 is not set | 930 | # CONFIG_SND_VX222 is not set |
| 886 | # CONFIG_SND_HDA_INTEL is not set | 931 | # CONFIG_SND_YMFPCI is not set |
| 887 | 932 | ||
| 888 | # | 933 | # |
| 889 | # USB devices | 934 | # USB devices |
| @@ -929,12 +974,15 @@ CONFIG_USB_UHCI_HCD=m | |||
| 929 | # USB Device Class drivers | 974 | # USB Device Class drivers |
| 930 | # | 975 | # |
| 931 | # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set | 976 | # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set |
| 932 | # CONFIG_USB_BLUETOOTH_TTY is not set | ||
| 933 | # CONFIG_USB_ACM is not set | 977 | # CONFIG_USB_ACM is not set |
| 934 | # CONFIG_USB_PRINTER is not set | 978 | # CONFIG_USB_PRINTER is not set |
| 935 | 979 | ||
| 936 | # | 980 | # |
| 937 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information | 981 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 982 | # | ||
| 983 | |||
| 984 | # | ||
| 985 | # may also be needed; see USB_STORAGE Help for more information | ||
| 938 | # | 986 | # |
| 939 | CONFIG_USB_STORAGE=m | 987 | CONFIG_USB_STORAGE=m |
| 940 | # CONFIG_USB_STORAGE_DEBUG is not set | 988 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -946,12 +994,15 @@ CONFIG_USB_STORAGE=m | |||
| 946 | # CONFIG_USB_STORAGE_SDDR09 is not set | 994 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 947 | # CONFIG_USB_STORAGE_SDDR55 is not set | 995 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 948 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 996 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 997 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 998 | # CONFIG_USB_LIBUSUAL is not set | ||
| 949 | 999 | ||
| 950 | # | 1000 | # |
| 951 | # USB Input Devices | 1001 | # USB Input Devices |
| 952 | # | 1002 | # |
| 953 | CONFIG_USB_HID=m | 1003 | CONFIG_USB_HID=m |
| 954 | CONFIG_USB_HIDINPUT=y | 1004 | CONFIG_USB_HIDINPUT=y |
| 1005 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 955 | # CONFIG_HID_FF is not set | 1006 | # CONFIG_HID_FF is not set |
| 956 | # CONFIG_USB_HIDDEV is not set | 1007 | # CONFIG_USB_HIDDEV is not set |
| 957 | 1008 | ||
| @@ -971,6 +1022,7 @@ CONFIG_USB_HIDINPUT=y | |||
| 971 | # CONFIG_USB_YEALINK is not set | 1022 | # CONFIG_USB_YEALINK is not set |
| 972 | # CONFIG_USB_XPAD is not set | 1023 | # CONFIG_USB_XPAD is not set |
| 973 | # CONFIG_USB_ATI_REMOTE is not set | 1024 | # CONFIG_USB_ATI_REMOTE is not set |
| 1025 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
| 974 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 1026 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
| 975 | # CONFIG_USB_APPLETOUCH is not set | 1027 | # CONFIG_USB_APPLETOUCH is not set |
| 976 | 1028 | ||
| @@ -1050,11 +1102,17 @@ CONFIG_INFINIBAND_MTHCA=m | |||
| 1050 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set | 1102 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set |
| 1051 | CONFIG_INFINIBAND_IPOIB=m | 1103 | CONFIG_INFINIBAND_IPOIB=m |
| 1052 | # CONFIG_INFINIBAND_IPOIB_DEBUG is not set | 1104 | # CONFIG_INFINIBAND_IPOIB_DEBUG is not set |
| 1105 | # CONFIG_INFINIBAND_SRP is not set | ||
| 1053 | 1106 | ||
| 1054 | # | 1107 | # |
| 1055 | # SN Devices | 1108 | # SN Devices |
| 1056 | # | 1109 | # |
| 1057 | CONFIG_SGI_IOC4=y | 1110 | CONFIG_SGI_IOC4=y |
| 1111 | CONFIG_SGI_IOC3=m | ||
| 1112 | |||
| 1113 | # | ||
| 1114 | # EDAC - error detection and reporting (RAS) | ||
| 1115 | # | ||
| 1058 | 1116 | ||
| 1059 | # | 1117 | # |
| 1060 | # File systems | 1118 | # File systems |
| @@ -1085,6 +1143,7 @@ CONFIG_XFS_EXPORT=y | |||
| 1085 | # CONFIG_XFS_SECURITY is not set | 1143 | # CONFIG_XFS_SECURITY is not set |
| 1086 | # CONFIG_XFS_POSIX_ACL is not set | 1144 | # CONFIG_XFS_POSIX_ACL is not set |
| 1087 | # CONFIG_XFS_RT is not set | 1145 | # CONFIG_XFS_RT is not set |
| 1146 | # CONFIG_OCFS2_FS is not set | ||
| 1088 | # CONFIG_MINIX_FS is not set | 1147 | # CONFIG_MINIX_FS is not set |
| 1089 | # CONFIG_ROMFS_FS is not set | 1148 | # CONFIG_ROMFS_FS is not set |
| 1090 | CONFIG_INOTIFY=y | 1149 | CONFIG_INOTIFY=y |
| @@ -1126,6 +1185,7 @@ CONFIG_HUGETLBFS=y | |||
| 1126 | CONFIG_HUGETLB_PAGE=y | 1185 | CONFIG_HUGETLB_PAGE=y |
| 1127 | CONFIG_RAMFS=y | 1186 | CONFIG_RAMFS=y |
| 1128 | # CONFIG_RELAYFS_FS is not set | 1187 | # CONFIG_RELAYFS_FS is not set |
| 1188 | # CONFIG_CONFIGFS_FS is not set | ||
| 1129 | 1189 | ||
| 1130 | # | 1190 | # |
| 1131 | # Miscellaneous filesystems | 1191 | # Miscellaneous filesystems |
| @@ -1195,6 +1255,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1195 | CONFIG_SGI_PARTITION=y | 1255 | CONFIG_SGI_PARTITION=y |
| 1196 | # CONFIG_ULTRIX_PARTITION is not set | 1256 | # CONFIG_ULTRIX_PARTITION is not set |
| 1197 | # CONFIG_SUN_PARTITION is not set | 1257 | # CONFIG_SUN_PARTITION is not set |
| 1258 | # CONFIG_KARMA_PARTITION is not set | ||
| 1198 | CONFIG_EFI_PARTITION=y | 1259 | CONFIG_EFI_PARTITION=y |
| 1199 | 1260 | ||
| 1200 | # | 1261 | # |
| @@ -1260,26 +1321,30 @@ CONFIG_GENERIC_PENDING_IRQ=y | |||
| 1260 | # CONFIG_HP_SIMSCSI is not set | 1321 | # CONFIG_HP_SIMSCSI is not set |
| 1261 | 1322 | ||
| 1262 | # | 1323 | # |
| 1263 | # Profiling support | 1324 | # Instrumentation Support |
| 1264 | # | 1325 | # |
| 1265 | # CONFIG_PROFILING is not set | 1326 | # CONFIG_PROFILING is not set |
| 1327 | # CONFIG_KPROBES is not set | ||
| 1266 | 1328 | ||
| 1267 | # | 1329 | # |
| 1268 | # Kernel hacking | 1330 | # Kernel hacking |
| 1269 | # | 1331 | # |
| 1270 | # CONFIG_PRINTK_TIME is not set | 1332 | # CONFIG_PRINTK_TIME is not set |
| 1271 | CONFIG_DEBUG_KERNEL=y | ||
| 1272 | CONFIG_MAGIC_SYSRQ=y | 1333 | CONFIG_MAGIC_SYSRQ=y |
| 1334 | CONFIG_DEBUG_KERNEL=y | ||
| 1273 | CONFIG_LOG_BUF_SHIFT=20 | 1335 | CONFIG_LOG_BUF_SHIFT=20 |
| 1274 | CONFIG_DETECT_SOFTLOCKUP=y | 1336 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1275 | # CONFIG_SCHEDSTATS is not set | 1337 | # CONFIG_SCHEDSTATS is not set |
| 1276 | # CONFIG_DEBUG_SLAB is not set | 1338 | # CONFIG_DEBUG_SLAB is not set |
| 1339 | CONFIG_DEBUG_MUTEXES=y | ||
| 1277 | # CONFIG_DEBUG_SPINLOCK is not set | 1340 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1278 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1341 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1279 | # CONFIG_DEBUG_KOBJECT is not set | 1342 | # CONFIG_DEBUG_KOBJECT is not set |
| 1280 | # CONFIG_DEBUG_INFO is not set | 1343 | # CONFIG_DEBUG_INFO is not set |
| 1281 | # CONFIG_DEBUG_FS is not set | 1344 | # CONFIG_DEBUG_FS is not set |
| 1282 | # CONFIG_KPROBES is not set | 1345 | # CONFIG_DEBUG_VM is not set |
| 1346 | CONFIG_FORCED_INLINING=y | ||
| 1347 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1283 | CONFIG_IA64_GRANULE_16MB=y | 1348 | CONFIG_IA64_GRANULE_16MB=y |
| 1284 | # CONFIG_IA64_GRANULE_64MB is not set | 1349 | # CONFIG_IA64_GRANULE_64MB is not set |
| 1285 | # CONFIG_IA64_PRINT_HAZARDS is not set | 1350 | # CONFIG_IA64_PRINT_HAZARDS is not set |
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S index ac6055c83115..7a05b1cb2ad5 100644 --- a/arch/ia64/kernel/fsys.S +++ b/arch/ia64/kernel/fsys.S | |||
| @@ -878,8 +878,7 @@ fsyscall_table: | |||
| 878 | data8 0 // timer_delete | 878 | data8 0 // timer_delete |
| 879 | data8 0 // clock_settime | 879 | data8 0 // clock_settime |
| 880 | data8 fsys_clock_gettime // clock_gettime | 880 | data8 fsys_clock_gettime // clock_gettime |
| 881 | #define __NR_syscall_last 1255 | ||
| 882 | 881 | ||
| 883 | .space 8*(NR_syscalls + 1024 - __NR_syscall_last), 0 | 882 | // fill in zeros for the remaining entries |
| 884 | 883 | .zero: | |
| 885 | .org fsyscall_table + 8*NR_syscalls // guard against failures to increase NR_syscalls | 884 | .space fsyscall_table + 8*NR_syscalls - .zero, 0 |
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S index 301f2e9d262e..9f80569a32b0 100644 --- a/arch/ia64/kernel/ivt.S +++ b/arch/ia64/kernel/ivt.S | |||
| @@ -1362,7 +1362,6 @@ END(debug_vector) | |||
| 1362 | // 0x5a00 Entry 30 (size 16 bundles) Unaligned Reference (57) | 1362 | // 0x5a00 Entry 30 (size 16 bundles) Unaligned Reference (57) |
| 1363 | ENTRY(unaligned_access) | 1363 | ENTRY(unaligned_access) |
| 1364 | DBG_FAULT(30) | 1364 | DBG_FAULT(30) |
| 1365 | mov r16=cr.ipsr | ||
| 1366 | mov r31=pr // prepare to save predicates | 1365 | mov r31=pr // prepare to save predicates |
| 1367 | ;; | 1366 | ;; |
| 1368 | br.sptk.many dispatch_unaligned_handler | 1367 | br.sptk.many dispatch_unaligned_handler |
diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c index f9e0ae936d1a..1e357550c776 100644 --- a/arch/ia64/kernel/unaligned.c +++ b/arch/ia64/kernel/unaligned.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
| 25 | #include <asm/unaligned.h> | 25 | #include <asm/unaligned.h> |
| 26 | 26 | ||
| 27 | extern void die_if_kernel(char *str, struct pt_regs *regs, long err) __attribute__ ((noreturn)); | 27 | extern void die_if_kernel(char *str, struct pt_regs *regs, long err); |
| 28 | 28 | ||
| 29 | #undef DEBUG_UNALIGNED_TRAP | 29 | #undef DEBUG_UNALIGNED_TRAP |
| 30 | 30 | ||
| @@ -53,6 +53,15 @@ dump (const char *str, void *vp, size_t len) | |||
| 53 | #define SIGN_EXT9 0xffffffffffffff00ul | 53 | #define SIGN_EXT9 0xffffffffffffff00ul |
| 54 | 54 | ||
| 55 | /* | 55 | /* |
| 56 | * sysctl settable hook which tells the kernel whether to honor the | ||
| 57 | * IA64_THREAD_UAC_NOPRINT prctl. Because this is user settable, we want | ||
| 58 | * to allow the super user to enable/disable this for security reasons | ||
| 59 | * (i.e. don't allow attacker to fill up logs with unaligned accesses). | ||
| 60 | */ | ||
| 61 | int no_unaligned_warning; | ||
| 62 | static int noprint_warning; | ||
| 63 | |||
| 64 | /* | ||
| 56 | * For M-unit: | 65 | * For M-unit: |
| 57 | * | 66 | * |
| 58 | * opcode | m | x6 | | 67 | * opcode | m | x6 | |
| @@ -1324,8 +1333,9 @@ ia64_handle_unaligned (unsigned long ifa, struct pt_regs *regs) | |||
| 1324 | if ((current->thread.flags & IA64_THREAD_UAC_SIGBUS) != 0) | 1333 | if ((current->thread.flags & IA64_THREAD_UAC_SIGBUS) != 0) |
| 1325 | goto force_sigbus; | 1334 | goto force_sigbus; |
| 1326 | 1335 | ||
| 1327 | if (!(current->thread.flags & IA64_THREAD_UAC_NOPRINT) | 1336 | if (!no_unaligned_warning && |
| 1328 | && within_logging_rate_limit()) | 1337 | !(current->thread.flags & IA64_THREAD_UAC_NOPRINT) && |
| 1338 | within_logging_rate_limit()) | ||
| 1329 | { | 1339 | { |
| 1330 | char buf[200]; /* comm[] is at most 16 bytes... */ | 1340 | char buf[200]; /* comm[] is at most 16 bytes... */ |
| 1331 | size_t len; | 1341 | size_t len; |
| @@ -1340,7 +1350,22 @@ ia64_handle_unaligned (unsigned long ifa, struct pt_regs *regs) | |||
| 1340 | if (user_mode(regs)) | 1350 | if (user_mode(regs)) |
| 1341 | tty_write_message(current->signal->tty, buf); | 1351 | tty_write_message(current->signal->tty, buf); |
| 1342 | buf[len-1] = '\0'; /* drop '\r' */ | 1352 | buf[len-1] = '\0'; /* drop '\r' */ |
| 1343 | printk(KERN_WARNING "%s", buf); /* watch for command names containing %s */ | 1353 | /* watch for command names containing %s */ |
| 1354 | printk(KERN_WARNING "%s", buf); | ||
| 1355 | } else { | ||
| 1356 | if (no_unaligned_warning && !noprint_warning) { | ||
| 1357 | noprint_warning = 1; | ||
| 1358 | printk(KERN_WARNING "%s(%d) encountered an " | ||
| 1359 | "unaligned exception which required\n" | ||
| 1360 | "kernel assistance, which degrades " | ||
| 1361 | "the performance of the application.\n" | ||
| 1362 | "Unaligned exception warnings have " | ||
| 1363 | "been disabled by the system " | ||
| 1364 | "administrator\n" | ||
| 1365 | "echo 0 > /proc/sys/kernel/ignore-" | ||
| 1366 | "unaligned-usertrap to re-enable\n", | ||
| 1367 | current->comm, current->pid); | ||
| 1368 | } | ||
| 1344 | } | 1369 | } |
| 1345 | } else { | 1370 | } else { |
| 1346 | if (within_logging_rate_limit()) | 1371 | if (within_logging_rate_limit()) |
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 0b30ca006286..9ba32b2d96d0 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
| @@ -579,7 +579,7 @@ pcibios_align_resource (void *data, struct resource *res, | |||
| 579 | char * __init | 579 | char * __init |
| 580 | pcibios_setup (char *str) | 580 | pcibios_setup (char *str) |
| 581 | { | 581 | { |
| 582 | return NULL; | 582 | return str; |
| 583 | } | 583 | } |
| 584 | 584 | ||
| 585 | int | 585 | int |
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index 3edef0d32f86..dfb3f2902379 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c | |||
| @@ -716,4 +716,3 @@ EXPORT_SYMBOL(sn_pci_unfixup_slot); | |||
| 716 | EXPORT_SYMBOL(sn_pci_controller_fixup); | 716 | EXPORT_SYMBOL(sn_pci_controller_fixup); |
| 717 | EXPORT_SYMBOL(sn_bus_store_sysdata); | 717 | EXPORT_SYMBOL(sn_bus_store_sysdata); |
| 718 | EXPORT_SYMBOL(sn_bus_free_sysdata); | 718 | EXPORT_SYMBOL(sn_bus_free_sysdata); |
| 719 | EXPORT_SYMBOL(sn_pcidev_info_get); | ||
diff --git a/arch/m32r/Makefile b/arch/m32r/Makefile index 983d438b14b6..4b3c90ba926c 100644 --- a/arch/m32r/Makefile +++ b/arch/m32r/Makefile | |||
| @@ -12,14 +12,14 @@ CFLAGS_MODULE += -mmodel=large | |||
| 12 | 12 | ||
| 13 | ifdef CONFIG_CHIP_VDEC2 | 13 | ifdef CONFIG_CHIP_VDEC2 |
| 14 | cflags-$(CONFIG_ISA_M32R2) += -DNO_FPU -Wa,-bitinst | 14 | cflags-$(CONFIG_ISA_M32R2) += -DNO_FPU -Wa,-bitinst |
| 15 | aflags-$(CONFIG_ISA_M32R2) += -DNO_FPU -Wa,-bitinst | 15 | aflags-$(CONFIG_ISA_M32R2) += -DNO_FPU -O2 -Wa,-bitinst -Wa,-no-parallel |
| 16 | else | 16 | else |
| 17 | cflags-$(CONFIG_ISA_M32R2) += -DNO_FPU -m32r2 | 17 | cflags-$(CONFIG_ISA_M32R2) += -DNO_FPU -m32r2 |
| 18 | aflags-$(CONFIG_ISA_M32R2) += -DNO_FPU -m32r2 | 18 | aflags-$(CONFIG_ISA_M32R2) += -DNO_FPU -m32r2 -O2 |
| 19 | endif | 19 | endif |
| 20 | 20 | ||
| 21 | cflags-$(CONFIG_ISA_M32R) += -DNO_FPU | 21 | cflags-$(CONFIG_ISA_M32R) += -DNO_FPU |
| 22 | aflags-$(CONFIG_ISA_M32R) += -DNO_FPU -Wa,-no-bitinst | 22 | aflags-$(CONFIG_ISA_M32R) += -DNO_FPU -O2 -Wa,-no-bitinst |
| 23 | 23 | ||
| 24 | CFLAGS += $(cflags-y) | 24 | CFLAGS += $(cflags-y) |
| 25 | AFLAGS += $(aflags-y) | 25 | AFLAGS += $(aflags-y) |
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index 71763f7a1d19..cb33097fefc4 100644 --- a/arch/m32r/kernel/signal.c +++ b/arch/m32r/kernel/signal.c | |||
| @@ -36,7 +36,7 @@ int do_signal(struct pt_regs *, sigset_t *); | |||
| 36 | asmlinkage int | 36 | asmlinkage int |
| 37 | sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize, | 37 | sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize, |
| 38 | unsigned long r2, unsigned long r3, unsigned long r4, | 38 | unsigned long r2, unsigned long r3, unsigned long r4, |
| 39 | unsigned long r5, unsigned long r6, struct pt_regs regs) | 39 | unsigned long r5, unsigned long r6, struct pt_regs *regs) |
| 40 | { | 40 | { |
| 41 | sigset_t saveset, newset; | 41 | sigset_t saveset, newset; |
| 42 | 42 | ||
| @@ -54,21 +54,21 @@ sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize, | |||
| 54 | recalc_sigpending(); | 54 | recalc_sigpending(); |
| 55 | spin_unlock_irq(¤t->sighand->siglock); | 55 | spin_unlock_irq(¤t->sighand->siglock); |
| 56 | 56 | ||
| 57 | regs.r0 = -EINTR; | 57 | regs->r0 = -EINTR; |
| 58 | while (1) { | 58 | while (1) { |
| 59 | current->state = TASK_INTERRUPTIBLE; | 59 | current->state = TASK_INTERRUPTIBLE; |
| 60 | schedule(); | 60 | schedule(); |
| 61 | if (do_signal(®s, &saveset)) | 61 | if (do_signal(regs, &saveset)) |
| 62 | return regs.r0; | 62 | return regs->r0; |
| 63 | } | 63 | } |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | asmlinkage int | 66 | asmlinkage int |
| 67 | sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, | 67 | sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, |
| 68 | unsigned long r2, unsigned long r3, unsigned long r4, | 68 | unsigned long r2, unsigned long r3, unsigned long r4, |
| 69 | unsigned long r5, unsigned long r6, struct pt_regs regs) | 69 | unsigned long r5, unsigned long r6, struct pt_regs *regs) |
| 70 | { | 70 | { |
| 71 | return do_sigaltstack(uss, uoss, regs.spu); | 71 | return do_sigaltstack(uss, uoss, regs->spu); |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | 74 | ||
| @@ -140,11 +140,10 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, | |||
| 140 | asmlinkage int | 140 | asmlinkage int |
| 141 | sys_rt_sigreturn(unsigned long r0, unsigned long r1, | 141 | sys_rt_sigreturn(unsigned long r0, unsigned long r1, |
| 142 | unsigned long r2, unsigned long r3, unsigned long r4, | 142 | unsigned long r2, unsigned long r3, unsigned long r4, |
| 143 | unsigned long r5, unsigned long r6, struct pt_regs regs) | 143 | unsigned long r5, unsigned long r6, struct pt_regs *regs) |
| 144 | { | 144 | { |
| 145 | struct rt_sigframe __user *frame = (struct rt_sigframe __user *)regs.spu; | 145 | struct rt_sigframe __user *frame = (struct rt_sigframe __user *)regs->spu; |
| 146 | sigset_t set; | 146 | sigset_t set; |
| 147 | stack_t st; | ||
| 148 | int result; | 147 | int result; |
| 149 | 148 | ||
| 150 | if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) | 149 | if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) |
| @@ -158,14 +157,11 @@ sys_rt_sigreturn(unsigned long r0, unsigned long r1, | |||
| 158 | recalc_sigpending(); | 157 | recalc_sigpending(); |
| 159 | spin_unlock_irq(¤t->sighand->siglock); | 158 | spin_unlock_irq(¤t->sighand->siglock); |
| 160 | 159 | ||
| 161 | if (restore_sigcontext(®s, &frame->uc.uc_mcontext, &result)) | 160 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &result)) |
| 162 | goto badframe; | 161 | goto badframe; |
| 163 | 162 | ||
| 164 | if (__copy_from_user(&st, &frame->uc.uc_stack, sizeof(st))) | 163 | if (do_sigaltstack(&frame->uc.uc_stack, NULL, regs->spu) == -EFAULT) |
| 165 | goto badframe; | 164 | goto badframe; |
| 166 | /* It is more difficult to avoid calling this function than to | ||
| 167 | call it and ignore errors. */ | ||
| 168 | do_sigaltstack(&st, NULL, regs.spu); | ||
| 169 | 165 | ||
| 170 | return result; | 166 | return result; |
| 171 | 167 | ||
diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c index ce16bbe26a52..2d1dd2106c4d 100644 --- a/arch/m32r/lib/usercopy.c +++ b/arch/m32r/lib/usercopy.c | |||
| @@ -64,7 +64,7 @@ do { \ | |||
| 64 | " .balign 4\n" \ | 64 | " .balign 4\n" \ |
| 65 | " .long 0b,3b\n" \ | 65 | " .long 0b,3b\n" \ |
| 66 | ".previous" \ | 66 | ".previous" \ |
| 67 | : "=r"(res), "=r"(count), "=&r" (__d0), "=&r" (__d1), \ | 67 | : "=&r"(res), "=&r"(count), "=&r" (__d0), "=&r" (__d1), \ |
| 68 | "=&r" (__d2) \ | 68 | "=&r" (__d2) \ |
| 69 | : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), \ | 69 | : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), \ |
| 70 | "4"(dst) \ | 70 | "4"(dst) \ |
| @@ -101,7 +101,7 @@ do { \ | |||
| 101 | " .balign 4\n" \ | 101 | " .balign 4\n" \ |
| 102 | " .long 0b,3b\n" \ | 102 | " .long 0b,3b\n" \ |
| 103 | ".previous" \ | 103 | ".previous" \ |
| 104 | : "=r"(res), "=r"(count), "=&r" (__d0), "=&r" (__d1), \ | 104 | : "=&r"(res), "=&r"(count), "=&r" (__d0), "=&r" (__d1), \ |
| 105 | "=&r" (__d2) \ | 105 | "=&r" (__d2) \ |
| 106 | : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), \ | 106 | : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), \ |
| 107 | "4"(dst) \ | 107 | "4"(dst) \ |
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 5f68b220c26d..e00e5f6e7fdd 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
| @@ -161,60 +161,6 @@ out: | |||
| 161 | return error; | 161 | return error; |
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | struct dirent32 { | ||
| 165 | unsigned int d_ino; | ||
| 166 | unsigned int d_off; | ||
| 167 | unsigned short d_reclen; | ||
| 168 | char d_name[NAME_MAX + 1]; | ||
| 169 | }; | ||
| 170 | |||
| 171 | static void | ||
| 172 | xlate_dirent(void *dirent64, void *dirent32, long n) | ||
| 173 | { | ||
| 174 | long off; | ||
| 175 | struct dirent *dirp; | ||
| 176 | struct dirent32 *dirp32; | ||
| 177 | |||
| 178 | off = 0; | ||
| 179 | while (off < n) { | ||
| 180 | dirp = (struct dirent *)(dirent64 + off); | ||
| 181 | dirp32 = (struct dirent32 *)(dirent32 + off); | ||
| 182 | off += dirp->d_reclen; | ||
| 183 | dirp32->d_ino = dirp->d_ino; | ||
| 184 | dirp32->d_off = (unsigned int)dirp->d_off; | ||
| 185 | dirp32->d_reclen = dirp->d_reclen; | ||
| 186 | strncpy(dirp32->d_name, dirp->d_name, dirp->d_reclen - ((3 * 4) + 2)); | ||
| 187 | } | ||
| 188 | return; | ||
| 189 | } | ||
| 190 | |||
| 191 | asmlinkage long | ||
| 192 | sys32_getdents(unsigned int fd, void * dirent32, unsigned int count) | ||
| 193 | { | ||
| 194 | long n; | ||
| 195 | void *dirent64; | ||
| 196 | |||
| 197 | dirent64 = (void *)((unsigned long)(dirent32 + (sizeof(long) - 1)) & ~(sizeof(long) - 1)); | ||
| 198 | if ((n = sys_getdents(fd, dirent64, count - (dirent64 - dirent32))) < 0) | ||
| 199 | return(n); | ||
| 200 | xlate_dirent(dirent64, dirent32, n); | ||
| 201 | return(n); | ||
| 202 | } | ||
| 203 | |||
| 204 | asmlinkage int old_readdir(unsigned int fd, void * dirent, unsigned int count); | ||
| 205 | |||
| 206 | asmlinkage int | ||
| 207 | sys32_readdir(unsigned int fd, void * dirent32, unsigned int count) | ||
| 208 | { | ||
| 209 | int n; | ||
| 210 | struct dirent dirent64; | ||
| 211 | |||
| 212 | if ((n = old_readdir(fd, &dirent64, count)) < 0) | ||
| 213 | return(n); | ||
| 214 | xlate_dirent(&dirent64, dirent32, dirent64.d_reclen); | ||
| 215 | return(n); | ||
| 216 | } | ||
| 217 | |||
| 218 | asmlinkage int | 164 | asmlinkage int |
| 219 | sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr, int options) | 165 | sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr, int options) |
| 220 | { | 166 | { |
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index d83e033dbc87..2f2dc54b2e26 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
| @@ -626,7 +626,7 @@ einval: li v0, -EINVAL | |||
| 626 | sys sys_fstatat64 4 | 626 | sys sys_fstatat64 4 |
| 627 | sys sys_unlinkat 3 | 627 | sys sys_unlinkat 3 |
| 628 | sys sys_renameat 4 /* 4295 */ | 628 | sys sys_renameat 4 /* 4295 */ |
| 629 | sys sys_linkat 4 | 629 | sys sys_linkat 5 |
| 630 | sys sys_symlinkat 3 | 630 | sys sys_symlinkat 3 |
| 631 | sys sys_readlinkat 4 | 631 | sys sys_readlinkat 4 |
| 632 | sys sys_fchmodat 3 | 632 | sys sys_fchmodat 3 |
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index d87b5446fa13..02c8267e45e7 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -195,7 +195,7 @@ EXPORT(sysn32_call_table) | |||
| 195 | PTR sys_fdatasync | 195 | PTR sys_fdatasync |
| 196 | PTR sys_truncate | 196 | PTR sys_truncate |
| 197 | PTR sys_ftruncate /* 6075 */ | 197 | PTR sys_ftruncate /* 6075 */ |
| 198 | PTR sys32_getdents | 198 | PTR compat_sys_getdents |
| 199 | PTR sys_getcwd | 199 | PTR sys_getcwd |
| 200 | PTR sys_chdir | 200 | PTR sys_chdir |
| 201 | PTR sys_fchdir | 201 | PTR sys_fchdir |
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 5b0414018c9a..797e0d874889 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
| @@ -293,7 +293,7 @@ sys_call_table: | |||
| 293 | PTR sys_uselib | 293 | PTR sys_uselib |
| 294 | PTR sys_swapon | 294 | PTR sys_swapon |
| 295 | PTR sys_reboot | 295 | PTR sys_reboot |
| 296 | PTR sys32_readdir | 296 | PTR compat_sys_old_readdir |
| 297 | PTR old_mmap /* 4090 */ | 297 | PTR old_mmap /* 4090 */ |
| 298 | PTR sys_munmap | 298 | PTR sys_munmap |
| 299 | PTR sys_truncate | 299 | PTR sys_truncate |
| @@ -345,7 +345,7 @@ sys_call_table: | |||
| 345 | PTR sys_setfsuid | 345 | PTR sys_setfsuid |
| 346 | PTR sys_setfsgid | 346 | PTR sys_setfsgid |
| 347 | PTR sys32_llseek /* 4140 */ | 347 | PTR sys32_llseek /* 4140 */ |
| 348 | PTR sys32_getdents | 348 | PTR compat_sys_getdents |
| 349 | PTR compat_sys_select | 349 | PTR compat_sys_select |
| 350 | PTR sys_flock | 350 | PTR sys_flock |
| 351 | PTR sys_msync | 351 | PTR sys_msync |
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index d86affa21278..d9293c558e41 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
| @@ -540,6 +540,9 @@ void __init setup_arch(char **cmdline_p) | |||
| 540 | sparse_init(); | 540 | sparse_init(); |
| 541 | paging_init(); | 541 | paging_init(); |
| 542 | resource_init(); | 542 | resource_init(); |
| 543 | #ifdef CONFIG_SMP | ||
| 544 | plat_smp_setup(); | ||
| 545 | #endif | ||
| 543 | } | 546 | } |
| 544 | 547 | ||
| 545 | int __init fpu_disable(char *s) | 548 | int __init fpu_disable(char *s) |
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c index 5e189862e523..06ed90752424 100644 --- a/arch/mips/kernel/smp.c +++ b/arch/mips/kernel/smp.c | |||
| @@ -236,7 +236,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) | |||
| 236 | init_new_context(current, &init_mm); | 236 | init_new_context(current, &init_mm); |
| 237 | current_thread_info()->cpu = 0; | 237 | current_thread_info()->cpu = 0; |
| 238 | smp_tune_scheduling(); | 238 | smp_tune_scheduling(); |
| 239 | prom_prepare_cpus(max_cpus); | 239 | plat_prepare_cpus(max_cpus); |
| 240 | } | 240 | } |
| 241 | 241 | ||
| 242 | /* preload SMP state for boot cpu */ | 242 | /* preload SMP state for boot cpu */ |
diff --git a/arch/mips/kernel/smp_mt.c b/arch/mips/kernel/smp_mt.c index c930364830d0..993b8bf56aaf 100644 --- a/arch/mips/kernel/smp_mt.c +++ b/arch/mips/kernel/smp_mt.c | |||
| @@ -143,7 +143,7 @@ static struct irqaction irq_call = { | |||
| 143 | * Make sure all CPU's are in a sensible state before we boot any of the | 143 | * Make sure all CPU's are in a sensible state before we boot any of the |
| 144 | * secondarys | 144 | * secondarys |
| 145 | */ | 145 | */ |
| 146 | void prom_prepare_cpus(unsigned int max_cpus) | 146 | void plat_smp_setup(void) |
| 147 | { | 147 | { |
| 148 | unsigned long val; | 148 | unsigned long val; |
| 149 | int i, num; | 149 | int i, num; |
| @@ -179,11 +179,9 @@ void prom_prepare_cpus(unsigned int max_cpus) | |||
| 179 | write_vpe_c0_vpeconf0(tmp); | 179 | write_vpe_c0_vpeconf0(tmp); |
| 180 | 180 | ||
| 181 | /* Record this as available CPU */ | 181 | /* Record this as available CPU */ |
| 182 | if (i < max_cpus) { | 182 | cpu_set(i, phys_cpu_present_map); |
| 183 | cpu_set(i, phys_cpu_present_map); | 183 | __cpu_number_map[i] = ++num; |
| 184 | __cpu_number_map[i] = ++num; | 184 | __cpu_logical_map[num] = i; |
| 185 | __cpu_logical_map[num] = i; | ||
| 186 | } | ||
| 187 | } | 185 | } |
| 188 | 186 | ||
| 189 | /* disable multi-threading with TC's */ | 187 | /* disable multi-threading with TC's */ |
| @@ -241,7 +239,10 @@ void prom_prepare_cpus(unsigned int max_cpus) | |||
| 241 | set_vi_handler (MIPS_CPU_IPI_RESCHED_IRQ, ipi_resched_dispatch); | 239 | set_vi_handler (MIPS_CPU_IPI_RESCHED_IRQ, ipi_resched_dispatch); |
| 242 | set_vi_handler (MIPS_CPU_IPI_CALL_IRQ, ipi_call_dispatch); | 240 | set_vi_handler (MIPS_CPU_IPI_CALL_IRQ, ipi_call_dispatch); |
| 243 | } | 241 | } |
| 242 | } | ||
| 244 | 243 | ||
| 244 | void __init plat_prepare_cpus(unsigned int max_cpus) | ||
| 245 | { | ||
| 245 | cpu_ipi_resched_irq = MIPSCPU_INT_BASE + MIPS_CPU_IPI_RESCHED_IRQ; | 246 | cpu_ipi_resched_irq = MIPSCPU_INT_BASE + MIPS_CPU_IPI_RESCHED_IRQ; |
| 246 | cpu_ipi_call_irq = MIPSCPU_INT_BASE + MIPS_CPU_IPI_CALL_IRQ; | 247 | cpu_ipi_call_irq = MIPSCPU_INT_BASE + MIPS_CPU_IPI_CALL_IRQ; |
| 247 | 248 | ||
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 7050b4ffffcd..42c94c771afb 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c | |||
| @@ -163,7 +163,7 @@ void do_gettimeofday(struct timeval *tv) | |||
| 163 | unsigned long seq; | 163 | unsigned long seq; |
| 164 | unsigned long lost; | 164 | unsigned long lost; |
| 165 | unsigned long usec, sec; | 165 | unsigned long usec, sec; |
| 166 | unsigned long max_ntp_tick = tick_usec - tickadj; | 166 | unsigned long max_ntp_tick; |
| 167 | 167 | ||
| 168 | do { | 168 | do { |
| 169 | seq = read_seqbegin(&xtime_lock); | 169 | seq = read_seqbegin(&xtime_lock); |
| @@ -178,12 +178,13 @@ void do_gettimeofday(struct timeval *tv) | |||
| 178 | * Better to lose some accuracy than have time go backwards.. | 178 | * Better to lose some accuracy than have time go backwards.. |
| 179 | */ | 179 | */ |
| 180 | if (unlikely(time_adjust < 0)) { | 180 | if (unlikely(time_adjust < 0)) { |
| 181 | max_ntp_tick = (USEC_PER_SEC / HZ) - tickadj; | ||
| 181 | usec = min(usec, max_ntp_tick); | 182 | usec = min(usec, max_ntp_tick); |
| 182 | 183 | ||
| 183 | if (lost) | 184 | if (lost) |
| 184 | usec += lost * max_ntp_tick; | 185 | usec += lost * max_ntp_tick; |
| 185 | } else if (unlikely(lost)) | 186 | } else if (unlikely(lost)) |
| 186 | usec += lost * tick_usec; | 187 | usec += lost * (USEC_PER_SEC / HZ); |
| 187 | 188 | ||
| 188 | sec = xtime.tv_sec; | 189 | sec = xtime.tv_sec; |
| 189 | usec += (xtime.tv_nsec / 1000); | 190 | usec += (xtime.tv_nsec / 1000); |
diff --git a/arch/mips/lib/iomap.c b/arch/mips/lib/iomap.c index 7e2ced715cfb..f4ac5bbcd81f 100644 --- a/arch/mips/lib/iomap.c +++ b/arch/mips/lib/iomap.c | |||
| @@ -63,7 +63,7 @@ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) | |||
| 63 | return ioport_map(start, len); | 63 | return ioport_map(start, len); |
| 64 | if (flags & IORESOURCE_MEM) { | 64 | if (flags & IORESOURCE_MEM) { |
| 65 | if (flags & IORESOURCE_CACHEABLE) | 65 | if (flags & IORESOURCE_CACHEABLE) |
| 66 | return ioremap_cacheable_cow(start, len); | 66 | return ioremap_cachable(start, len); |
| 67 | return ioremap_nocache(start, len); | 67 | return ioremap_nocache(start, len); |
| 68 | } | 68 | } |
| 69 | 69 | ||
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 1b71d91e8268..0668e9bfce41 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
| @@ -235,7 +235,9 @@ static inline void r4k_blast_scache_page_setup(void) | |||
| 235 | { | 235 | { |
| 236 | unsigned long sc_lsize = cpu_scache_line_size(); | 236 | unsigned long sc_lsize = cpu_scache_line_size(); |
| 237 | 237 | ||
| 238 | if (sc_lsize == 16) | 238 | if (scache_size == 0) |
| 239 | r4k_blast_scache_page = (void *)no_sc_noop; | ||
| 240 | else if (sc_lsize == 16) | ||
| 239 | r4k_blast_scache_page = blast_scache16_page; | 241 | r4k_blast_scache_page = blast_scache16_page; |
| 240 | else if (sc_lsize == 32) | 242 | else if (sc_lsize == 32) |
| 241 | r4k_blast_scache_page = blast_scache32_page; | 243 | r4k_blast_scache_page = blast_scache32_page; |
| @@ -251,7 +253,9 @@ static inline void r4k_blast_scache_page_indexed_setup(void) | |||
| 251 | { | 253 | { |
| 252 | unsigned long sc_lsize = cpu_scache_line_size(); | 254 | unsigned long sc_lsize = cpu_scache_line_size(); |
| 253 | 255 | ||
| 254 | if (sc_lsize == 16) | 256 | if (scache_size == 0) |
| 257 | r4k_blast_scache_page_indexed = (void *)no_sc_noop; | ||
| 258 | else if (sc_lsize == 16) | ||
| 255 | r4k_blast_scache_page_indexed = blast_scache16_page_indexed; | 259 | r4k_blast_scache_page_indexed = blast_scache16_page_indexed; |
| 256 | else if (sc_lsize == 32) | 260 | else if (sc_lsize == 32) |
| 257 | r4k_blast_scache_page_indexed = blast_scache32_page_indexed; | 261 | r4k_blast_scache_page_indexed = blast_scache32_page_indexed; |
| @@ -267,7 +271,9 @@ static inline void r4k_blast_scache_setup(void) | |||
| 267 | { | 271 | { |
| 268 | unsigned long sc_lsize = cpu_scache_line_size(); | 272 | unsigned long sc_lsize = cpu_scache_line_size(); |
| 269 | 273 | ||
| 270 | if (sc_lsize == 16) | 274 | if (scache_size == 0) |
| 275 | r4k_blast_scache = (void *)no_sc_noop; | ||
| 276 | else if (sc_lsize == 16) | ||
| 271 | r4k_blast_scache = blast_scache16; | 277 | r4k_blast_scache = blast_scache16; |
| 272 | else if (sc_lsize == 32) | 278 | else if (sc_lsize == 32) |
| 273 | r4k_blast_scache = blast_scache32; | 279 | r4k_blast_scache = blast_scache32; |
| @@ -482,7 +488,7 @@ static inline void local_r4k_flush_icache_range(void *args) | |||
| 482 | protected_blast_dcache_range(start, end); | 488 | protected_blast_dcache_range(start, end); |
| 483 | } | 489 | } |
| 484 | 490 | ||
| 485 | if (!cpu_icache_snoops_remote_store) { | 491 | if (!cpu_icache_snoops_remote_store && scache_size) { |
| 486 | if (end - start > scache_size) | 492 | if (end - start > scache_size) |
| 487 | r4k_blast_scache(); | 493 | r4k_blast_scache(); |
| 488 | else | 494 | else |
| @@ -651,7 +657,7 @@ static void local_r4k_flush_cache_sigtramp(void * arg) | |||
| 651 | 657 | ||
| 652 | R4600_HIT_CACHEOP_WAR_IMPL; | 658 | R4600_HIT_CACHEOP_WAR_IMPL; |
| 653 | protected_writeback_dcache_line(addr & ~(dc_lsize - 1)); | 659 | protected_writeback_dcache_line(addr & ~(dc_lsize - 1)); |
| 654 | if (!cpu_icache_snoops_remote_store) | 660 | if (!cpu_icache_snoops_remote_store && scache_size) |
| 655 | protected_writeback_scache_line(addr & ~(sc_lsize - 1)); | 661 | protected_writeback_scache_line(addr & ~(sc_lsize - 1)); |
| 656 | protected_flush_icache_line(addr & ~(ic_lsize - 1)); | 662 | protected_flush_icache_line(addr & ~(ic_lsize - 1)); |
| 657 | if (MIPS4K_ICACHE_REFILL_WAR) { | 663 | if (MIPS4K_ICACHE_REFILL_WAR) { |
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c index 7f8fda962190..c197311e15d3 100644 --- a/arch/mips/pmc-sierra/yosemite/smp.c +++ b/arch/mips/pmc-sierra/yosemite/smp.c | |||
| @@ -50,37 +50,25 @@ void __init prom_grab_secondary(void) | |||
| 50 | * We don't want to start the secondary CPU yet nor do we have a nice probing | 50 | * We don't want to start the secondary CPU yet nor do we have a nice probing |
| 51 | * feature in PMON so we just assume presence of the secondary core. | 51 | * feature in PMON so we just assume presence of the secondary core. |
| 52 | */ | 52 | */ |
| 53 | static char maxcpus_string[] __initdata = | 53 | void __init plat_smp_setup(void) |
| 54 | KERN_WARNING "max_cpus set to 0; using 1 instead\n"; | ||
| 55 | |||
| 56 | void __init prom_prepare_cpus(unsigned int max_cpus) | ||
| 57 | { | 54 | { |
| 58 | int enabled = 0, i; | 55 | int i; |
| 59 | |||
| 60 | if (max_cpus == 0) { | ||
| 61 | printk(maxcpus_string); | ||
| 62 | max_cpus = 1; | ||
| 63 | } | ||
| 64 | 56 | ||
| 65 | cpus_clear(phys_cpu_present_map); | 57 | cpus_clear(phys_cpu_present_map); |
| 66 | 58 | ||
| 67 | for (i = 0; i < 2; i++) { | 59 | for (i = 0; i < 2; i++) { |
| 68 | if (i == max_cpus) | ||
| 69 | break; | ||
| 70 | |||
| 71 | /* | ||
| 72 | * The boot CPU | ||
| 73 | */ | ||
| 74 | cpu_set(i, phys_cpu_present_map); | 60 | cpu_set(i, phys_cpu_present_map); |
| 75 | __cpu_number_map[i] = i; | 61 | __cpu_number_map[i] = i; |
| 76 | __cpu_logical_map[i] = i; | 62 | __cpu_logical_map[i] = i; |
| 77 | enabled++; | ||
| 78 | } | 63 | } |
| 64 | } | ||
| 79 | 65 | ||
| 66 | void __init plat_prepare_cpus(unsigned int max_cpus) | ||
| 67 | { | ||
| 80 | /* | 68 | /* |
| 81 | * Be paranoid. Enable the IPI only if we're really about to go SMP. | 69 | * Be paranoid. Enable the IPI only if we're really about to go SMP. |
| 82 | */ | 70 | */ |
| 83 | if (enabled > 1) | 71 | if (cpus_weight(cpu_possible_map)) |
| 84 | set_c0_status(STATUSF_IP5); | 72 | set_c0_status(STATUSF_IP5); |
| 85 | } | 73 | } |
| 86 | 74 | ||
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c index dbef3f6b5650..09fa7f5216f0 100644 --- a/arch/mips/sgi-ip27/ip27-smp.c +++ b/arch/mips/sgi-ip27/ip27-smp.c | |||
| @@ -140,7 +140,7 @@ static __init void intr_clear_all(nasid_t nasid) | |||
| 140 | REMOTE_HUB_CLR_INTR(nasid, i); | 140 | REMOTE_HUB_CLR_INTR(nasid, i); |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | void __init prom_prepare_cpus(unsigned int max_cpus) | 143 | void __init plat_smp_setup(void) |
| 144 | { | 144 | { |
| 145 | cnodeid_t cnode; | 145 | cnodeid_t cnode; |
| 146 | 146 | ||
| @@ -161,6 +161,11 @@ void __init prom_prepare_cpus(unsigned int max_cpus) | |||
| 161 | alloc_cpupda(0, 0); | 161 | alloc_cpupda(0, 0); |
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | void __init plat_prepare_cpus(unsigned int max_cpus) | ||
| 165 | { | ||
| 166 | /* We already did everything necessary earlier */ | ||
| 167 | } | ||
| 168 | |||
| 164 | /* | 169 | /* |
| 165 | * Launch a slave into smp_bootstrap(). It doesn't take an argument, and we | 170 | * Launch a slave into smp_bootstrap(). It doesn't take an argument, and we |
| 166 | * set sp to the kernel stack of the newly created idle process, gp to the proc | 171 | * set sp to the kernel stack of the newly created idle process, gp to the proc |
diff --git a/arch/mips/sibyte/cfe/smp.c b/arch/mips/sibyte/cfe/smp.c index 4477af3d8074..eab20e2db323 100644 --- a/arch/mips/sibyte/cfe/smp.c +++ b/arch/mips/sibyte/cfe/smp.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | * | 31 | * |
| 32 | * Common setup before any secondaries are started | 32 | * Common setup before any secondaries are started |
| 33 | */ | 33 | */ |
| 34 | void __init prom_prepare_cpus(unsigned int max_cpus) | 34 | void __init plat_smp_setup(void) |
| 35 | { | 35 | { |
| 36 | int i, num; | 36 | int i, num; |
| 37 | 37 | ||
| @@ -40,14 +40,18 @@ void __init prom_prepare_cpus(unsigned int max_cpus) | |||
| 40 | __cpu_number_map[0] = 0; | 40 | __cpu_number_map[0] = 0; |
| 41 | __cpu_logical_map[0] = 0; | 41 | __cpu_logical_map[0] = 0; |
| 42 | 42 | ||
| 43 | for (i=1, num=0; i<NR_CPUS; i++) { | 43 | for (i = 1, num = 0; i < NR_CPUS; i++) { |
| 44 | if (cfe_cpu_stop(i) == 0) { | 44 | if (cfe_cpu_stop(i) == 0) { |
| 45 | cpu_set(i, phys_cpu_present_map); | 45 | cpu_set(i, phys_cpu_present_map); |
| 46 | __cpu_number_map[i] = ++num; | 46 | __cpu_number_map[i] = ++num; |
| 47 | __cpu_logical_map[num] = i; | 47 | __cpu_logical_map[num] = i; |
| 48 | } | 48 | } |
| 49 | } | 49 | } |
| 50 | printk("Detected %i available secondary CPU(s)\n", num); | 50 | printk(KERN_INFO "Detected %i available secondary CPU(s)\n", num); |
| 51 | } | ||
| 52 | |||
| 53 | void __init plat_prepare_cpus(unsigned int max_cpus) | ||
| 54 | { | ||
| 51 | } | 55 | } |
| 52 | 56 | ||
| 53 | /* | 57 | /* |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 80d114a3a837..a834f9e0bbb3 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -963,7 +963,7 @@ source "arch/powerpc/oprofile/Kconfig" | |||
| 963 | 963 | ||
| 964 | config KPROBES | 964 | config KPROBES |
| 965 | bool "Kprobes (EXPERIMENTAL)" | 965 | bool "Kprobes (EXPERIMENTAL)" |
| 966 | depends on PPC64 | 966 | depends on PPC64 && EXPERIMENTAL && MODULES |
| 967 | help | 967 | help |
| 968 | Kprobes allows you to trap at almost any kernel address and | 968 | Kprobes allows you to trap at almost any kernel address and |
| 969 | execute a callback function. register_kprobe() establishes | 969 | execute a callback function. register_kprobe() establishes |
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index d6fed3f56580..2c3fd2007676 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_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.15-rc5 | 3 | # Linux kernel version: 2.6.16-rc2 |
| 4 | # Tue Dec 20 15:59:30 2005 | 4 | # Fri Feb 10 17:33:08 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -16,6 +16,10 @@ CONFIG_COMPAT=y | |||
| 16 | CONFIG_SYSVIPC_COMPAT=y | 16 | CONFIG_SYSVIPC_COMPAT=y |
| 17 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 17 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 18 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 18 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 19 | CONFIG_PPC_OF=y | ||
| 20 | # CONFIG_PPC_UDBG_16550 is not set | ||
| 21 | CONFIG_GENERIC_TBSYNC=y | ||
| 22 | # CONFIG_DEFAULT_UIMAGE is not set | ||
| 19 | 23 | ||
| 20 | # | 24 | # |
| 21 | # Processor support | 25 | # Processor support |
| @@ -26,13 +30,12 @@ CONFIG_PPC_FPU=y | |||
| 26 | CONFIG_ALTIVEC=y | 30 | CONFIG_ALTIVEC=y |
| 27 | CONFIG_PPC_STD_MMU=y | 31 | CONFIG_PPC_STD_MMU=y |
| 28 | CONFIG_SMP=y | 32 | CONFIG_SMP=y |
| 29 | CONFIG_NR_CPUS=2 | 33 | CONFIG_NR_CPUS=4 |
| 30 | 34 | ||
| 31 | # | 35 | # |
| 32 | # Code maturity level options | 36 | # Code maturity level options |
| 33 | # | 37 | # |
| 34 | CONFIG_EXPERIMENTAL=y | 38 | CONFIG_EXPERIMENTAL=y |
| 35 | CONFIG_CLEAN_COMPILE=y | ||
| 36 | CONFIG_LOCK_KERNEL=y | 39 | CONFIG_LOCK_KERNEL=y |
| 37 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 40 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 38 | 41 | ||
| @@ -47,8 +50,6 @@ CONFIG_POSIX_MQUEUE=y | |||
| 47 | # CONFIG_BSD_PROCESS_ACCT is not set | 50 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 48 | CONFIG_SYSCTL=y | 51 | CONFIG_SYSCTL=y |
| 49 | # CONFIG_AUDIT is not set | 52 | # CONFIG_AUDIT is not set |
| 50 | CONFIG_HOTPLUG=y | ||
| 51 | CONFIG_KOBJECT_UEVENT=y | ||
| 52 | CONFIG_IKCONFIG=y | 53 | CONFIG_IKCONFIG=y |
| 53 | CONFIG_IKCONFIG_PROC=y | 54 | CONFIG_IKCONFIG_PROC=y |
| 54 | # CONFIG_CPUSETS is not set | 55 | # CONFIG_CPUSETS is not set |
| @@ -58,8 +59,10 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 58 | CONFIG_KALLSYMS=y | 59 | CONFIG_KALLSYMS=y |
| 59 | # CONFIG_KALLSYMS_ALL is not set | 60 | # CONFIG_KALLSYMS_ALL is not set |
| 60 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 61 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 62 | CONFIG_HOTPLUG=y | ||
| 61 | CONFIG_PRINTK=y | 63 | CONFIG_PRINTK=y |
| 62 | CONFIG_BUG=y | 64 | CONFIG_BUG=y |
| 65 | CONFIG_ELF_CORE=y | ||
| 63 | CONFIG_BASE_FULL=y | 66 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 67 | CONFIG_FUTEX=y |
| 65 | CONFIG_EPOLL=y | 68 | CONFIG_EPOLL=y |
| @@ -68,8 +71,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 | |||
| 68 | CONFIG_CC_ALIGN_LABELS=0 | 71 | CONFIG_CC_ALIGN_LABELS=0 |
| 69 | CONFIG_CC_ALIGN_LOOPS=0 | 72 | CONFIG_CC_ALIGN_LOOPS=0 |
| 70 | CONFIG_CC_ALIGN_JUMPS=0 | 73 | CONFIG_CC_ALIGN_JUMPS=0 |
| 74 | CONFIG_SLAB=y | ||
| 71 | # CONFIG_TINY_SHMEM is not set | 75 | # CONFIG_TINY_SHMEM is not set |
| 72 | CONFIG_BASE_SMALL=0 | 76 | CONFIG_BASE_SMALL=0 |
| 77 | # CONFIG_SLOB is not set | ||
| 73 | 78 | ||
| 74 | # | 79 | # |
| 75 | # Loadable module support | 80 | # Loadable module support |
| @@ -112,13 +117,12 @@ CONFIG_PPC_PMAC=y | |||
| 112 | CONFIG_PPC_PMAC64=y | 117 | CONFIG_PPC_PMAC64=y |
| 113 | # CONFIG_PPC_MAPLE is not set | 118 | # CONFIG_PPC_MAPLE is not set |
| 114 | # CONFIG_PPC_CELL is not set | 119 | # CONFIG_PPC_CELL is not set |
| 115 | CONFIG_PPC_OF=y | ||
| 116 | CONFIG_U3_DART=y | 120 | CONFIG_U3_DART=y |
| 117 | CONFIG_MPIC=y | 121 | CONFIG_MPIC=y |
| 118 | # CONFIG_PPC_RTAS is not set | 122 | # CONFIG_PPC_RTAS is not set |
| 119 | # CONFIG_MMIO_NVRAM is not set | 123 | # CONFIG_MMIO_NVRAM is not set |
| 124 | CONFIG_MPIC_BROKEN_U3=y | ||
| 120 | # CONFIG_PPC_MPC106 is not set | 125 | # CONFIG_PPC_MPC106 is not set |
| 121 | CONFIG_GENERIC_TBSYNC=y | ||
| 122 | CONFIG_CPU_FREQ=y | 126 | CONFIG_CPU_FREQ=y |
| 123 | CONFIG_CPU_FREQ_TABLE=y | 127 | CONFIG_CPU_FREQ_TABLE=y |
| 124 | # CONFIG_CPU_FREQ_DEBUG is not set | 128 | # CONFIG_CPU_FREQ_DEBUG is not set |
| @@ -151,6 +155,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
| 151 | CONFIG_IOMMU_VMERGE=y | 155 | CONFIG_IOMMU_VMERGE=y |
| 152 | # CONFIG_HOTPLUG_CPU is not set | 156 | # CONFIG_HOTPLUG_CPU is not set |
| 153 | CONFIG_KEXEC=y | 157 | CONFIG_KEXEC=y |
| 158 | # CONFIG_CRASH_DUMP is not set | ||
| 154 | CONFIG_IRQ_ALL_CPUS=y | 159 | CONFIG_IRQ_ALL_CPUS=y |
| 155 | # CONFIG_NUMA is not set | 160 | # CONFIG_NUMA is not set |
| 156 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 161 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
| @@ -202,6 +207,7 @@ CONFIG_NET=y | |||
| 202 | # | 207 | # |
| 203 | # Networking options | 208 | # Networking options |
| 204 | # | 209 | # |
| 210 | # CONFIG_NETDEBUG is not set | ||
| 205 | CONFIG_PACKET=y | 211 | CONFIG_PACKET=y |
| 206 | # CONFIG_PACKET_MMAP is not set | 212 | # CONFIG_PACKET_MMAP is not set |
| 207 | CONFIG_UNIX=y | 213 | CONFIG_UNIX=y |
| @@ -239,6 +245,7 @@ CONFIG_NETFILTER=y | |||
| 239 | # Core Netfilter Configuration | 245 | # Core Netfilter Configuration |
| 240 | # | 246 | # |
| 241 | # CONFIG_NETFILTER_NETLINK is not set | 247 | # CONFIG_NETFILTER_NETLINK is not set |
| 248 | # CONFIG_NETFILTER_XTABLES is not set | ||
| 242 | 249 | ||
| 243 | # | 250 | # |
| 244 | # IP: Netfilter Configuration | 251 | # IP: Netfilter Configuration |
| @@ -255,65 +262,6 @@ CONFIG_IP_NF_TFTP=m | |||
| 255 | CONFIG_IP_NF_AMANDA=m | 262 | CONFIG_IP_NF_AMANDA=m |
| 256 | # CONFIG_IP_NF_PPTP is not set | 263 | # CONFIG_IP_NF_PPTP is not set |
| 257 | CONFIG_IP_NF_QUEUE=m | 264 | CONFIG_IP_NF_QUEUE=m |
| 258 | CONFIG_IP_NF_IPTABLES=m | ||
| 259 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
| 260 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
| 261 | CONFIG_IP_NF_MATCH_MAC=m | ||
| 262 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
| 263 | CONFIG_IP_NF_MATCH_MARK=m | ||
| 264 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
| 265 | CONFIG_IP_NF_MATCH_TOS=m | ||
| 266 | CONFIG_IP_NF_MATCH_RECENT=m | ||
| 267 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 268 | CONFIG_IP_NF_MATCH_DSCP=m | ||
| 269 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
| 270 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
| 271 | CONFIG_IP_NF_MATCH_TTL=m | ||
| 272 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
| 273 | CONFIG_IP_NF_MATCH_HELPER=m | ||
| 274 | CONFIG_IP_NF_MATCH_STATE=m | ||
| 275 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
| 276 | CONFIG_IP_NF_MATCH_OWNER=m | ||
| 277 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 278 | CONFIG_IP_NF_MATCH_REALM=m | ||
| 279 | CONFIG_IP_NF_MATCH_SCTP=m | ||
| 280 | # CONFIG_IP_NF_MATCH_DCCP is not set | ||
| 281 | CONFIG_IP_NF_MATCH_COMMENT=m | ||
| 282 | CONFIG_IP_NF_MATCH_CONNMARK=m | ||
| 283 | CONFIG_IP_NF_MATCH_CONNBYTES=m | ||
| 284 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
| 285 | CONFIG_IP_NF_MATCH_STRING=m | ||
| 286 | CONFIG_IP_NF_FILTER=m | ||
| 287 | CONFIG_IP_NF_TARGET_REJECT=m | ||
| 288 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 289 | CONFIG_IP_NF_TARGET_ULOG=m | ||
| 290 | CONFIG_IP_NF_TARGET_TCPMSS=m | ||
| 291 | CONFIG_IP_NF_TARGET_NFQUEUE=m | ||
| 292 | CONFIG_IP_NF_NAT=m | ||
| 293 | CONFIG_IP_NF_NAT_NEEDED=y | ||
| 294 | CONFIG_IP_NF_TARGET_MASQUERADE=m | ||
| 295 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 296 | CONFIG_IP_NF_TARGET_NETMAP=m | ||
| 297 | CONFIG_IP_NF_TARGET_SAME=m | ||
| 298 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | ||
| 299 | CONFIG_IP_NF_NAT_IRC=m | ||
| 300 | CONFIG_IP_NF_NAT_FTP=m | ||
| 301 | CONFIG_IP_NF_NAT_TFTP=m | ||
| 302 | CONFIG_IP_NF_NAT_AMANDA=m | ||
| 303 | CONFIG_IP_NF_MANGLE=m | ||
| 304 | CONFIG_IP_NF_TARGET_TOS=m | ||
| 305 | CONFIG_IP_NF_TARGET_ECN=m | ||
| 306 | CONFIG_IP_NF_TARGET_DSCP=m | ||
| 307 | CONFIG_IP_NF_TARGET_MARK=m | ||
| 308 | CONFIG_IP_NF_TARGET_CLASSIFY=m | ||
| 309 | CONFIG_IP_NF_TARGET_TTL=m | ||
| 310 | CONFIG_IP_NF_TARGET_CONNMARK=m | ||
| 311 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 312 | CONFIG_IP_NF_RAW=m | ||
| 313 | CONFIG_IP_NF_TARGET_NOTRACK=m | ||
| 314 | CONFIG_IP_NF_ARPTABLES=m | ||
| 315 | CONFIG_IP_NF_ARPFILTER=m | ||
| 316 | CONFIG_IP_NF_ARP_MANGLE=m | ||
| 317 | 265 | ||
| 318 | # | 266 | # |
| 319 | # DCCP Configuration (EXPERIMENTAL) | 267 | # DCCP Configuration (EXPERIMENTAL) |
| @@ -324,6 +272,11 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 324 | # SCTP Configuration (EXPERIMENTAL) | 272 | # SCTP Configuration (EXPERIMENTAL) |
| 325 | # | 273 | # |
| 326 | # CONFIG_IP_SCTP is not set | 274 | # CONFIG_IP_SCTP is not set |
| 275 | |||
| 276 | # | ||
| 277 | # TIPC Configuration (EXPERIMENTAL) | ||
| 278 | # | ||
| 279 | # CONFIG_TIPC is not set | ||
| 327 | # CONFIG_ATM is not set | 280 | # CONFIG_ATM is not set |
| 328 | # CONFIG_BRIDGE is not set | 281 | # CONFIG_BRIDGE is not set |
| 329 | # CONFIG_VLAN_8021Q is not set | 282 | # CONFIG_VLAN_8021Q is not set |
| @@ -342,7 +295,6 @@ CONFIG_LLC=y | |||
| 342 | # QoS and/or fair queueing | 295 | # QoS and/or fair queueing |
| 343 | # | 296 | # |
| 344 | # CONFIG_NET_SCHED is not set | 297 | # CONFIG_NET_SCHED is not set |
| 345 | CONFIG_NET_CLS_ROUTE=y | ||
| 346 | 298 | ||
| 347 | # | 299 | # |
| 348 | # Network testing | 300 | # Network testing |
| @@ -545,13 +497,7 @@ CONFIG_SCSI_SATA_SVW=y | |||
| 545 | # CONFIG_SCSI_IPR is not set | 497 | # CONFIG_SCSI_IPR is not set |
| 546 | # CONFIG_SCSI_QLOGIC_FC is not set | 498 | # CONFIG_SCSI_QLOGIC_FC is not set |
| 547 | # CONFIG_SCSI_QLOGIC_1280 is not set | 499 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 548 | CONFIG_SCSI_QLA2XXX=y | 500 | # CONFIG_SCSI_QLA_FC is not set |
| 549 | # CONFIG_SCSI_QLA21XX is not set | ||
| 550 | # CONFIG_SCSI_QLA22XX is not set | ||
| 551 | # CONFIG_SCSI_QLA2300 is not set | ||
| 552 | # CONFIG_SCSI_QLA2322 is not set | ||
| 553 | # CONFIG_SCSI_QLA6312 is not set | ||
| 554 | # CONFIG_SCSI_QLA24XX is not set | ||
| 555 | # CONFIG_SCSI_LPFC is not set | 501 | # CONFIG_SCSI_LPFC is not set |
| 556 | # CONFIG_SCSI_DC395x is not set | 502 | # CONFIG_SCSI_DC395x is not set |
| 557 | # CONFIG_SCSI_DC390T is not set | 503 | # CONFIG_SCSI_DC390T is not set |
| @@ -614,7 +560,6 @@ CONFIG_IEEE1394_SBP2=m | |||
| 614 | CONFIG_IEEE1394_ETH1394=m | 560 | CONFIG_IEEE1394_ETH1394=m |
| 615 | CONFIG_IEEE1394_DV1394=m | 561 | CONFIG_IEEE1394_DV1394=m |
| 616 | CONFIG_IEEE1394_RAWIO=y | 562 | CONFIG_IEEE1394_RAWIO=y |
| 617 | # CONFIG_IEEE1394_CMP is not set | ||
| 618 | 563 | ||
| 619 | # | 564 | # |
| 620 | # I2O device support | 565 | # I2O device support |
| @@ -630,6 +575,7 @@ CONFIG_THERM_PM72=y | |||
| 630 | CONFIG_WINDFARM=y | 575 | CONFIG_WINDFARM=y |
| 631 | CONFIG_WINDFARM_PM81=y | 576 | CONFIG_WINDFARM_PM81=y |
| 632 | CONFIG_WINDFARM_PM91=y | 577 | CONFIG_WINDFARM_PM91=y |
| 578 | CONFIG_WINDFARM_PM112=y | ||
| 633 | 579 | ||
| 634 | # | 580 | # |
| 635 | # Network device support | 581 | # Network device support |
| @@ -682,8 +628,9 @@ CONFIG_E1000=y | |||
| 682 | # CONFIG_R8169 is not set | 628 | # CONFIG_R8169 is not set |
| 683 | # CONFIG_SIS190 is not set | 629 | # CONFIG_SIS190 is not set |
| 684 | # CONFIG_SKGE is not set | 630 | # CONFIG_SKGE is not set |
| 631 | # CONFIG_SKY2 is not set | ||
| 685 | # CONFIG_SK98LIN is not set | 632 | # CONFIG_SK98LIN is not set |
| 686 | CONFIG_TIGON3=m | 633 | CONFIG_TIGON3=y |
| 687 | # CONFIG_BNX2 is not set | 634 | # CONFIG_BNX2 is not set |
| 688 | # CONFIG_MV643XX_ETH is not set | 635 | # CONFIG_MV643XX_ETH is not set |
| 689 | 636 | ||
| @@ -861,8 +808,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 861 | # CONFIG_I2C_I801 is not set | 808 | # CONFIG_I2C_I801 is not set |
| 862 | # CONFIG_I2C_I810 is not set | 809 | # CONFIG_I2C_I810 is not set |
| 863 | # CONFIG_I2C_PIIX4 is not set | 810 | # CONFIG_I2C_PIIX4 is not set |
| 864 | CONFIG_I2C_KEYWEST=y | 811 | CONFIG_I2C_POWERMAC=y |
| 865 | CONFIG_I2C_PMAC_SMU=y | ||
| 866 | # CONFIG_I2C_NFORCE2 is not set | 812 | # CONFIG_I2C_NFORCE2 is not set |
| 867 | # CONFIG_I2C_PARPORT_LIGHT is not set | 813 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 868 | # CONFIG_I2C_PROSAVAGE is not set | 814 | # CONFIG_I2C_PROSAVAGE is not set |
| @@ -895,6 +841,12 @@ CONFIG_I2C_PMAC_SMU=y | |||
| 895 | # CONFIG_I2C_DEBUG_CHIP is not set | 841 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 896 | 842 | ||
| 897 | # | 843 | # |
| 844 | # SPI support | ||
| 845 | # | ||
| 846 | # CONFIG_SPI is not set | ||
| 847 | # CONFIG_SPI_MASTER is not set | ||
| 848 | |||
| 849 | # | ||
| 898 | # Dallas's 1-wire bus | 850 | # Dallas's 1-wire bus |
| 899 | # | 851 | # |
| 900 | # CONFIG_W1 is not set | 852 | # CONFIG_W1 is not set |
| @@ -961,7 +913,6 @@ CONFIG_FB_RADEON_I2C=y | |||
| 961 | # CONFIG_FB_KYRO is not set | 913 | # CONFIG_FB_KYRO is not set |
| 962 | # CONFIG_FB_3DFX is not set | 914 | # CONFIG_FB_3DFX is not set |
| 963 | # CONFIG_FB_VOODOO1 is not set | 915 | # CONFIG_FB_VOODOO1 is not set |
| 964 | # CONFIG_FB_CYBLA is not set | ||
| 965 | # CONFIG_FB_TRIDENT is not set | 916 | # CONFIG_FB_TRIDENT is not set |
| 966 | # CONFIG_FB_VIRTUAL is not set | 917 | # CONFIG_FB_VIRTUAL is not set |
| 967 | 918 | ||
| @@ -1008,9 +959,10 @@ CONFIG_SND_OSSEMUL=y | |||
| 1008 | CONFIG_SND_MIXER_OSS=m | 959 | CONFIG_SND_MIXER_OSS=m |
| 1009 | CONFIG_SND_PCM_OSS=m | 960 | CONFIG_SND_PCM_OSS=m |
| 1010 | CONFIG_SND_SEQUENCER_OSS=y | 961 | CONFIG_SND_SEQUENCER_OSS=y |
| 962 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 963 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 1011 | # CONFIG_SND_VERBOSE_PRINTK is not set | 964 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 1012 | # CONFIG_SND_DEBUG is not set | 965 | # CONFIG_SND_DEBUG is not set |
| 1013 | CONFIG_SND_GENERIC_DRIVER=y | ||
| 1014 | 966 | ||
| 1015 | # | 967 | # |
| 1016 | # Generic devices | 968 | # Generic devices |
| @@ -1024,6 +976,8 @@ CONFIG_SND_GENERIC_DRIVER=y | |||
| 1024 | # | 976 | # |
| 1025 | # PCI devices | 977 | # PCI devices |
| 1026 | # | 978 | # |
| 979 | # CONFIG_SND_AD1889 is not set | ||
| 980 | # CONFIG_SND_ALS4000 is not set | ||
| 1027 | # CONFIG_SND_ALI5451 is not set | 981 | # CONFIG_SND_ALI5451 is not set |
| 1028 | # CONFIG_SND_ATIIXP is not set | 982 | # CONFIG_SND_ATIIXP is not set |
| 1029 | # CONFIG_SND_ATIIXP_MODEM is not set | 983 | # CONFIG_SND_ATIIXP_MODEM is not set |
| @@ -1032,39 +986,38 @@ CONFIG_SND_GENERIC_DRIVER=y | |||
| 1032 | # CONFIG_SND_AU8830 is not set | 986 | # CONFIG_SND_AU8830 is not set |
| 1033 | # CONFIG_SND_AZT3328 is not set | 987 | # CONFIG_SND_AZT3328 is not set |
| 1034 | # CONFIG_SND_BT87X is not set | 988 | # CONFIG_SND_BT87X is not set |
| 1035 | # CONFIG_SND_CS46XX is not set | 989 | # CONFIG_SND_CA0106 is not set |
| 990 | # CONFIG_SND_CMIPCI is not set | ||
| 1036 | # CONFIG_SND_CS4281 is not set | 991 | # CONFIG_SND_CS4281 is not set |
| 992 | # CONFIG_SND_CS46XX is not set | ||
| 1037 | # CONFIG_SND_EMU10K1 is not set | 993 | # CONFIG_SND_EMU10K1 is not set |
| 1038 | # CONFIG_SND_EMU10K1X is not set | 994 | # CONFIG_SND_EMU10K1X is not set |
| 1039 | # CONFIG_SND_CA0106 is not set | ||
| 1040 | # CONFIG_SND_KORG1212 is not set | ||
| 1041 | # CONFIG_SND_MIXART is not set | ||
| 1042 | # CONFIG_SND_NM256 is not set | ||
| 1043 | # CONFIG_SND_RME32 is not set | ||
| 1044 | # CONFIG_SND_RME96 is not set | ||
| 1045 | # CONFIG_SND_RME9652 is not set | ||
| 1046 | # CONFIG_SND_HDSP is not set | ||
| 1047 | # CONFIG_SND_HDSPM is not set | ||
| 1048 | # CONFIG_SND_TRIDENT is not set | ||
| 1049 | # CONFIG_SND_YMFPCI is not set | ||
| 1050 | # CONFIG_SND_AD1889 is not set | ||
| 1051 | # CONFIG_SND_ALS4000 is not set | ||
| 1052 | # CONFIG_SND_CMIPCI is not set | ||
| 1053 | # CONFIG_SND_ENS1370 is not set | 995 | # CONFIG_SND_ENS1370 is not set |
| 1054 | # CONFIG_SND_ENS1371 is not set | 996 | # CONFIG_SND_ENS1371 is not set |
| 1055 | # CONFIG_SND_ES1938 is not set | 997 | # CONFIG_SND_ES1938 is not set |
| 1056 | # CONFIG_SND_ES1968 is not set | 998 | # CONFIG_SND_ES1968 is not set |
| 1057 | # CONFIG_SND_MAESTRO3 is not set | ||
| 1058 | # CONFIG_SND_FM801 is not set | 999 | # CONFIG_SND_FM801 is not set |
| 1000 | # CONFIG_SND_HDA_INTEL is not set | ||
| 1001 | # CONFIG_SND_HDSP is not set | ||
| 1002 | # CONFIG_SND_HDSPM is not set | ||
| 1059 | # CONFIG_SND_ICE1712 is not set | 1003 | # CONFIG_SND_ICE1712 is not set |
| 1060 | # CONFIG_SND_ICE1724 is not set | 1004 | # CONFIG_SND_ICE1724 is not set |
| 1061 | # CONFIG_SND_INTEL8X0 is not set | 1005 | # CONFIG_SND_INTEL8X0 is not set |
| 1062 | # CONFIG_SND_INTEL8X0M is not set | 1006 | # CONFIG_SND_INTEL8X0M is not set |
| 1007 | # CONFIG_SND_KORG1212 is not set | ||
| 1008 | # CONFIG_SND_MAESTRO3 is not set | ||
| 1009 | # CONFIG_SND_MIXART is not set | ||
| 1010 | # CONFIG_SND_NM256 is not set | ||
| 1011 | # CONFIG_SND_PCXHR is not set | ||
| 1012 | # CONFIG_SND_RME32 is not set | ||
| 1013 | # CONFIG_SND_RME96 is not set | ||
| 1014 | # CONFIG_SND_RME9652 is not set | ||
| 1063 | # CONFIG_SND_SONICVIBES is not set | 1015 | # CONFIG_SND_SONICVIBES is not set |
| 1016 | # CONFIG_SND_TRIDENT is not set | ||
| 1064 | # CONFIG_SND_VIA82XX is not set | 1017 | # CONFIG_SND_VIA82XX is not set |
| 1065 | # CONFIG_SND_VIA82XX_MODEM is not set | 1018 | # CONFIG_SND_VIA82XX_MODEM is not set |
| 1066 | # CONFIG_SND_VX222 is not set | 1019 | # CONFIG_SND_VX222 is not set |
| 1067 | # CONFIG_SND_HDA_INTEL is not set | 1020 | # CONFIG_SND_YMFPCI is not set |
| 1068 | 1021 | ||
| 1069 | # | 1022 | # |
| 1070 | # ALSA PowerMac devices | 1023 | # ALSA PowerMac devices |
| @@ -1136,13 +1089,16 @@ CONFIG_USB_STORAGE_DPCM=y | |||
| 1136 | CONFIG_USB_STORAGE_SDDR09=y | 1089 | CONFIG_USB_STORAGE_SDDR09=y |
| 1137 | CONFIG_USB_STORAGE_SDDR55=y | 1090 | CONFIG_USB_STORAGE_SDDR55=y |
| 1138 | CONFIG_USB_STORAGE_JUMPSHOT=y | 1091 | CONFIG_USB_STORAGE_JUMPSHOT=y |
| 1092 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 1139 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1093 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1094 | # CONFIG_USB_LIBUSUAL is not set | ||
| 1140 | 1095 | ||
| 1141 | # | 1096 | # |
| 1142 | # USB Input Devices | 1097 | # USB Input Devices |
| 1143 | # | 1098 | # |
| 1144 | CONFIG_USB_HID=y | 1099 | CONFIG_USB_HID=y |
| 1145 | CONFIG_USB_HIDINPUT=y | 1100 | CONFIG_USB_HIDINPUT=y |
| 1101 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 1146 | CONFIG_HID_FF=y | 1102 | CONFIG_HID_FF=y |
| 1147 | CONFIG_HID_PID=y | 1103 | CONFIG_HID_PID=y |
| 1148 | CONFIG_LOGITECH_FF=y | 1104 | CONFIG_LOGITECH_FF=y |
| @@ -1159,6 +1115,7 @@ CONFIG_USB_HIDDEV=y | |||
| 1159 | # CONFIG_USB_YEALINK is not set | 1115 | # CONFIG_USB_YEALINK is not set |
| 1160 | # CONFIG_USB_XPAD is not set | 1116 | # CONFIG_USB_XPAD is not set |
| 1161 | # CONFIG_USB_ATI_REMOTE is not set | 1117 | # CONFIG_USB_ATI_REMOTE is not set |
| 1118 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
| 1162 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 1119 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
| 1163 | # CONFIG_USB_APPLETOUCH is not set | 1120 | # CONFIG_USB_APPLETOUCH is not set |
| 1164 | 1121 | ||
| @@ -1207,6 +1164,7 @@ CONFIG_USB_SERIAL_GENERIC=y | |||
| 1207 | # CONFIG_USB_SERIAL_AIRPRIME is not set | 1164 | # CONFIG_USB_SERIAL_AIRPRIME is not set |
| 1208 | # CONFIG_USB_SERIAL_ANYDATA is not set | 1165 | # CONFIG_USB_SERIAL_ANYDATA is not set |
| 1209 | CONFIG_USB_SERIAL_BELKIN=m | 1166 | CONFIG_USB_SERIAL_BELKIN=m |
| 1167 | # CONFIG_USB_SERIAL_WHITEHEAT is not set | ||
| 1210 | CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m | 1168 | CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m |
| 1211 | # CONFIG_USB_SERIAL_CP2101 is not set | 1169 | # CONFIG_USB_SERIAL_CP2101 is not set |
| 1212 | CONFIG_USB_SERIAL_CYPRESS_M8=m | 1170 | CONFIG_USB_SERIAL_CYPRESS_M8=m |
| @@ -1288,6 +1246,10 @@ CONFIG_USB_EZUSB=y | |||
| 1288 | # | 1246 | # |
| 1289 | 1247 | ||
| 1290 | # | 1248 | # |
| 1249 | # EDAC - error detection and reporting (RAS) | ||
| 1250 | # | ||
| 1251 | |||
| 1252 | # | ||
| 1291 | # File systems | 1253 | # File systems |
| 1292 | # | 1254 | # |
| 1293 | CONFIG_EXT2_FS=y | 1255 | CONFIG_EXT2_FS=y |
| @@ -1317,6 +1279,7 @@ CONFIG_XFS_EXPORT=y | |||
| 1317 | CONFIG_XFS_SECURITY=y | 1279 | CONFIG_XFS_SECURITY=y |
| 1318 | CONFIG_XFS_POSIX_ACL=y | 1280 | CONFIG_XFS_POSIX_ACL=y |
| 1319 | # CONFIG_XFS_RT is not set | 1281 | # CONFIG_XFS_RT is not set |
| 1282 | # CONFIG_OCFS2_FS is not set | ||
| 1320 | # CONFIG_MINIX_FS is not set | 1283 | # CONFIG_MINIX_FS is not set |
| 1321 | # CONFIG_ROMFS_FS is not set | 1284 | # CONFIG_ROMFS_FS is not set |
| 1322 | CONFIG_INOTIFY=y | 1285 | CONFIG_INOTIFY=y |
| @@ -1357,6 +1320,7 @@ CONFIG_HUGETLBFS=y | |||
| 1357 | CONFIG_HUGETLB_PAGE=y | 1320 | CONFIG_HUGETLB_PAGE=y |
| 1358 | CONFIG_RAMFS=y | 1321 | CONFIG_RAMFS=y |
| 1359 | # CONFIG_RELAYFS_FS is not set | 1322 | # CONFIG_RELAYFS_FS is not set |
| 1323 | # CONFIG_CONFIGFS_FS is not set | ||
| 1360 | 1324 | ||
| 1361 | # | 1325 | # |
| 1362 | # Miscellaneous filesystems | 1326 | # Miscellaneous filesystems |
| @@ -1426,6 +1390,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1426 | # CONFIG_SGI_PARTITION is not set | 1390 | # CONFIG_SGI_PARTITION is not set |
| 1427 | # CONFIG_ULTRIX_PARTITION is not set | 1391 | # CONFIG_ULTRIX_PARTITION is not set |
| 1428 | # CONFIG_SUN_PARTITION is not set | 1392 | # CONFIG_SUN_PARTITION is not set |
| 1393 | # CONFIG_KARMA_PARTITION is not set | ||
| 1429 | # CONFIG_EFI_PARTITION is not set | 1394 | # CONFIG_EFI_PARTITION is not set |
| 1430 | 1395 | ||
| 1431 | # | 1396 | # |
| @@ -1481,10 +1446,6 @@ CONFIG_CRC32=y | |||
| 1481 | CONFIG_LIBCRC32C=m | 1446 | CONFIG_LIBCRC32C=m |
| 1482 | CONFIG_ZLIB_INFLATE=y | 1447 | CONFIG_ZLIB_INFLATE=y |
| 1483 | CONFIG_ZLIB_DEFLATE=m | 1448 | CONFIG_ZLIB_DEFLATE=m |
| 1484 | CONFIG_TEXTSEARCH=y | ||
| 1485 | CONFIG_TEXTSEARCH_KMP=m | ||
| 1486 | CONFIG_TEXTSEARCH_BM=m | ||
| 1487 | CONFIG_TEXTSEARCH_FSM=m | ||
| 1488 | 1449 | ||
| 1489 | # | 1450 | # |
| 1490 | # Instrumentation Support | 1451 | # Instrumentation Support |
| @@ -1497,24 +1458,31 @@ CONFIG_OPROFILE=y | |||
| 1497 | # Kernel hacking | 1458 | # Kernel hacking |
| 1498 | # | 1459 | # |
| 1499 | # CONFIG_PRINTK_TIME is not set | 1460 | # CONFIG_PRINTK_TIME is not set |
| 1500 | CONFIG_DEBUG_KERNEL=y | ||
| 1501 | CONFIG_MAGIC_SYSRQ=y | 1461 | CONFIG_MAGIC_SYSRQ=y |
| 1462 | CONFIG_DEBUG_KERNEL=y | ||
| 1502 | CONFIG_LOG_BUF_SHIFT=17 | 1463 | CONFIG_LOG_BUF_SHIFT=17 |
| 1503 | CONFIG_DETECT_SOFTLOCKUP=y | 1464 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1504 | # CONFIG_SCHEDSTATS is not set | 1465 | # CONFIG_SCHEDSTATS is not set |
| 1505 | # CONFIG_DEBUG_SLAB is not set | 1466 | # CONFIG_DEBUG_SLAB is not set |
| 1467 | CONFIG_DEBUG_MUTEXES=y | ||
| 1506 | # CONFIG_DEBUG_SPINLOCK is not set | 1468 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1507 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1469 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1508 | # CONFIG_DEBUG_KOBJECT is not set | 1470 | # CONFIG_DEBUG_KOBJECT is not set |
| 1509 | # CONFIG_DEBUG_INFO is not set | 1471 | # CONFIG_DEBUG_INFO is not set |
| 1510 | CONFIG_DEBUG_FS=y | 1472 | CONFIG_DEBUG_FS=y |
| 1511 | # CONFIG_DEBUG_VM is not set | 1473 | # CONFIG_DEBUG_VM is not set |
| 1474 | CONFIG_FORCED_INLINING=y | ||
| 1512 | # CONFIG_RCU_TORTURE_TEST is not set | 1475 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1513 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1476 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1514 | # CONFIG_DEBUG_STACK_USAGE is not set | 1477 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1515 | # CONFIG_DEBUGGER is not set | 1478 | # CONFIG_DEBUGGER is not set |
| 1516 | CONFIG_IRQSTACKS=y | 1479 | CONFIG_IRQSTACKS=y |
| 1517 | CONFIG_BOOTX_TEXT=y | 1480 | CONFIG_BOOTX_TEXT=y |
| 1481 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | ||
| 1482 | # CONFIG_PPC_EARLY_DEBUG_G5 is not set | ||
| 1483 | # CONFIG_PPC_EARLY_DEBUG_RTAS is not set | ||
| 1484 | # CONFIG_PPC_EARLY_DEBUG_MAPLE is not set | ||
| 1485 | # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set | ||
| 1518 | 1486 | ||
| 1519 | # | 1487 | # |
| 1520 | # Security options | 1488 | # Security options |
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 6f6c6bed1aa5..0362a70aa97c 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_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.15-rc5 | 3 | # Linux kernel version: 2.6.16-rc2 |
| 4 | # Tue Dec 20 15:59:38 2005 | 4 | # Fri Feb 10 17:32:14 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -16,6 +16,10 @@ CONFIG_COMPAT=y | |||
| 16 | CONFIG_SYSVIPC_COMPAT=y | 16 | CONFIG_SYSVIPC_COMPAT=y |
| 17 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 17 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 18 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 18 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 19 | CONFIG_PPC_OF=y | ||
| 20 | CONFIG_PPC_UDBG_16550=y | ||
| 21 | CONFIG_GENERIC_TBSYNC=y | ||
| 22 | # CONFIG_DEFAULT_UIMAGE is not set | ||
| 19 | 23 | ||
| 20 | # | 24 | # |
| 21 | # Processor support | 25 | # Processor support |
| @@ -33,7 +37,6 @@ CONFIG_NR_CPUS=32 | |||
| 33 | # Code maturity level options | 37 | # Code maturity level options |
| 34 | # | 38 | # |
| 35 | CONFIG_EXPERIMENTAL=y | 39 | CONFIG_EXPERIMENTAL=y |
| 36 | CONFIG_CLEAN_COMPILE=y | ||
| 37 | CONFIG_LOCK_KERNEL=y | 40 | CONFIG_LOCK_KERNEL=y |
| 38 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 41 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 39 | 42 | ||
| @@ -48,8 +51,6 @@ CONFIG_POSIX_MQUEUE=y | |||
| 48 | # CONFIG_BSD_PROCESS_ACCT is not set | 51 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 49 | CONFIG_SYSCTL=y | 52 | CONFIG_SYSCTL=y |
| 50 | # CONFIG_AUDIT is not set | 53 | # CONFIG_AUDIT is not set |
| 51 | CONFIG_HOTPLUG=y | ||
| 52 | CONFIG_KOBJECT_UEVENT=y | ||
| 53 | CONFIG_IKCONFIG=y | 54 | CONFIG_IKCONFIG=y |
| 54 | CONFIG_IKCONFIG_PROC=y | 55 | CONFIG_IKCONFIG_PROC=y |
| 55 | CONFIG_CPUSETS=y | 56 | CONFIG_CPUSETS=y |
| @@ -59,8 +60,10 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 59 | CONFIG_KALLSYMS=y | 60 | CONFIG_KALLSYMS=y |
| 60 | CONFIG_KALLSYMS_ALL=y | 61 | CONFIG_KALLSYMS_ALL=y |
| 61 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 62 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 63 | CONFIG_HOTPLUG=y | ||
| 62 | CONFIG_PRINTK=y | 64 | CONFIG_PRINTK=y |
| 63 | CONFIG_BUG=y | 65 | CONFIG_BUG=y |
| 66 | CONFIG_ELF_CORE=y | ||
| 64 | CONFIG_BASE_FULL=y | 67 | CONFIG_BASE_FULL=y |
| 65 | CONFIG_FUTEX=y | 68 | CONFIG_FUTEX=y |
| 66 | CONFIG_EPOLL=y | 69 | CONFIG_EPOLL=y |
| @@ -69,8 +72,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 | |||
| 69 | CONFIG_CC_ALIGN_LABELS=0 | 72 | CONFIG_CC_ALIGN_LABELS=0 |
| 70 | CONFIG_CC_ALIGN_LOOPS=0 | 73 | CONFIG_CC_ALIGN_LOOPS=0 |
| 71 | CONFIG_CC_ALIGN_JUMPS=0 | 74 | CONFIG_CC_ALIGN_JUMPS=0 |
| 75 | CONFIG_SLAB=y | ||
| 72 | # CONFIG_TINY_SHMEM is not set | 76 | # CONFIG_TINY_SHMEM is not set |
| 73 | CONFIG_BASE_SMALL=0 | 77 | CONFIG_BASE_SMALL=0 |
| 78 | # CONFIG_SLOB is not set | ||
| 74 | 79 | ||
| 75 | # | 80 | # |
| 76 | # Loadable module support | 81 | # Loadable module support |
| @@ -113,7 +118,6 @@ CONFIG_PPC_PMAC=y | |||
| 113 | CONFIG_PPC_PMAC64=y | 118 | CONFIG_PPC_PMAC64=y |
| 114 | CONFIG_PPC_MAPLE=y | 119 | CONFIG_PPC_MAPLE=y |
| 115 | # CONFIG_PPC_CELL is not set | 120 | # CONFIG_PPC_CELL is not set |
| 116 | CONFIG_PPC_OF=y | ||
| 117 | CONFIG_XICS=y | 121 | CONFIG_XICS=y |
| 118 | CONFIG_U3_DART=y | 122 | CONFIG_U3_DART=y |
| 119 | CONFIG_MPIC=y | 123 | CONFIG_MPIC=y |
| @@ -124,8 +128,8 @@ CONFIG_RTAS_FLASH=m | |||
| 124 | # CONFIG_MMIO_NVRAM is not set | 128 | # CONFIG_MMIO_NVRAM is not set |
| 125 | CONFIG_MPIC_BROKEN_U3=y | 129 | CONFIG_MPIC_BROKEN_U3=y |
| 126 | CONFIG_IBMVIO=y | 130 | CONFIG_IBMVIO=y |
| 131 | # CONFIG_IBMEBUS is not set | ||
| 127 | # CONFIG_PPC_MPC106 is not set | 132 | # CONFIG_PPC_MPC106 is not set |
| 128 | CONFIG_GENERIC_TBSYNC=y | ||
| 129 | CONFIG_CPU_FREQ=y | 133 | CONFIG_CPU_FREQ=y |
| 130 | CONFIG_CPU_FREQ_TABLE=y | 134 | CONFIG_CPU_FREQ_TABLE=y |
| 131 | # CONFIG_CPU_FREQ_DEBUG is not set | 135 | # CONFIG_CPU_FREQ_DEBUG is not set |
| @@ -158,6 +162,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
| 158 | CONFIG_IOMMU_VMERGE=y | 162 | CONFIG_IOMMU_VMERGE=y |
| 159 | CONFIG_HOTPLUG_CPU=y | 163 | CONFIG_HOTPLUG_CPU=y |
| 160 | CONFIG_KEXEC=y | 164 | CONFIG_KEXEC=y |
| 165 | # CONFIG_CRASH_DUMP is not set | ||
| 161 | CONFIG_IRQ_ALL_CPUS=y | 166 | CONFIG_IRQ_ALL_CPUS=y |
| 162 | CONFIG_PPC_SPLPAR=y | 167 | CONFIG_PPC_SPLPAR=y |
| 163 | CONFIG_EEH=y | 168 | CONFIG_EEH=y |
| @@ -178,6 +183,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y | |||
| 178 | CONFIG_SPARSEMEM_EXTREME=y | 183 | CONFIG_SPARSEMEM_EXTREME=y |
| 179 | # CONFIG_MEMORY_HOTPLUG is not set | 184 | # CONFIG_MEMORY_HOTPLUG is not set |
| 180 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 185 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 186 | CONFIG_MIGRATION=y | ||
| 181 | # CONFIG_PPC_64K_PAGES is not set | 187 | # CONFIG_PPC_64K_PAGES is not set |
| 182 | # CONFIG_SCHED_SMT is not set | 188 | # CONFIG_SCHED_SMT is not set |
| 183 | CONFIG_PROC_DEVICETREE=y | 189 | CONFIG_PROC_DEVICETREE=y |
| @@ -221,6 +227,7 @@ CONFIG_NET=y | |||
| 221 | # | 227 | # |
| 222 | # Networking options | 228 | # Networking options |
| 223 | # | 229 | # |
| 230 | # CONFIG_NETDEBUG is not set | ||
| 224 | CONFIG_PACKET=y | 231 | CONFIG_PACKET=y |
| 225 | # CONFIG_PACKET_MMAP is not set | 232 | # CONFIG_PACKET_MMAP is not set |
| 226 | CONFIG_UNIX=y | 233 | CONFIG_UNIX=y |
| @@ -260,6 +267,7 @@ CONFIG_NETFILTER=y | |||
| 260 | CONFIG_NETFILTER_NETLINK=y | 267 | CONFIG_NETFILTER_NETLINK=y |
| 261 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 268 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
| 262 | CONFIG_NETFILTER_NETLINK_LOG=m | 269 | CONFIG_NETFILTER_NETLINK_LOG=m |
| 270 | # CONFIG_NETFILTER_XTABLES is not set | ||
| 263 | 271 | ||
| 264 | # | 272 | # |
| 265 | # IP: Netfilter Configuration | 273 | # IP: Netfilter Configuration |
| @@ -277,65 +285,6 @@ CONFIG_IP_NF_TFTP=m | |||
| 277 | CONFIG_IP_NF_AMANDA=m | 285 | CONFIG_IP_NF_AMANDA=m |
| 278 | # CONFIG_IP_NF_PPTP is not set | 286 | # CONFIG_IP_NF_PPTP is not set |
| 279 | CONFIG_IP_NF_QUEUE=m | 287 | CONFIG_IP_NF_QUEUE=m |
| 280 | CONFIG_IP_NF_IPTABLES=m | ||
| 281 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
| 282 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
| 283 | CONFIG_IP_NF_MATCH_MAC=m | ||
| 284 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
| 285 | CONFIG_IP_NF_MATCH_MARK=m | ||
| 286 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
| 287 | CONFIG_IP_NF_MATCH_TOS=m | ||
| 288 | CONFIG_IP_NF_MATCH_RECENT=m | ||
| 289 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 290 | CONFIG_IP_NF_MATCH_DSCP=m | ||
| 291 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
| 292 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
| 293 | CONFIG_IP_NF_MATCH_TTL=m | ||
| 294 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
| 295 | CONFIG_IP_NF_MATCH_HELPER=m | ||
| 296 | CONFIG_IP_NF_MATCH_STATE=m | ||
| 297 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
| 298 | CONFIG_IP_NF_MATCH_OWNER=m | ||
| 299 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 300 | CONFIG_IP_NF_MATCH_REALM=m | ||
| 301 | CONFIG_IP_NF_MATCH_SCTP=m | ||
| 302 | CONFIG_IP_NF_MATCH_DCCP=m | ||
| 303 | CONFIG_IP_NF_MATCH_COMMENT=m | ||
| 304 | CONFIG_IP_NF_MATCH_CONNMARK=m | ||
| 305 | CONFIG_IP_NF_MATCH_CONNBYTES=m | ||
| 306 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
| 307 | CONFIG_IP_NF_MATCH_STRING=m | ||
| 308 | CONFIG_IP_NF_FILTER=m | ||
| 309 | CONFIG_IP_NF_TARGET_REJECT=m | ||
| 310 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 311 | CONFIG_IP_NF_TARGET_ULOG=m | ||
| 312 | CONFIG_IP_NF_TARGET_TCPMSS=m | ||
| 313 | CONFIG_IP_NF_TARGET_NFQUEUE=m | ||
| 314 | CONFIG_IP_NF_NAT=m | ||
| 315 | CONFIG_IP_NF_NAT_NEEDED=y | ||
| 316 | CONFIG_IP_NF_TARGET_MASQUERADE=m | ||
| 317 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 318 | CONFIG_IP_NF_TARGET_NETMAP=m | ||
| 319 | CONFIG_IP_NF_TARGET_SAME=m | ||
| 320 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | ||
| 321 | CONFIG_IP_NF_NAT_IRC=m | ||
| 322 | CONFIG_IP_NF_NAT_FTP=m | ||
| 323 | CONFIG_IP_NF_NAT_TFTP=m | ||
| 324 | CONFIG_IP_NF_NAT_AMANDA=m | ||
| 325 | CONFIG_IP_NF_MANGLE=m | ||
| 326 | CONFIG_IP_NF_TARGET_TOS=m | ||
| 327 | CONFIG_IP_NF_TARGET_ECN=m | ||
| 328 | CONFIG_IP_NF_TARGET_DSCP=m | ||
| 329 | CONFIG_IP_NF_TARGET_MARK=m | ||
| 330 | CONFIG_IP_NF_TARGET_CLASSIFY=m | ||
| 331 | CONFIG_IP_NF_TARGET_TTL=m | ||
| 332 | CONFIG_IP_NF_TARGET_CONNMARK=m | ||
| 333 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 334 | CONFIG_IP_NF_RAW=m | ||
| 335 | CONFIG_IP_NF_TARGET_NOTRACK=m | ||
| 336 | CONFIG_IP_NF_ARPTABLES=m | ||
| 337 | CONFIG_IP_NF_ARPFILTER=m | ||
| 338 | CONFIG_IP_NF_ARP_MANGLE=m | ||
| 339 | 288 | ||
| 340 | # | 289 | # |
| 341 | # DCCP Configuration (EXPERIMENTAL) | 290 | # DCCP Configuration (EXPERIMENTAL) |
| @@ -346,6 +295,11 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 346 | # SCTP Configuration (EXPERIMENTAL) | 295 | # SCTP Configuration (EXPERIMENTAL) |
| 347 | # | 296 | # |
| 348 | # CONFIG_IP_SCTP is not set | 297 | # CONFIG_IP_SCTP is not set |
| 298 | |||
| 299 | # | ||
| 300 | # TIPC Configuration (EXPERIMENTAL) | ||
| 301 | # | ||
| 302 | # CONFIG_TIPC is not set | ||
| 349 | # CONFIG_ATM is not set | 303 | # CONFIG_ATM is not set |
| 350 | # CONFIG_BRIDGE is not set | 304 | # CONFIG_BRIDGE is not set |
| 351 | # CONFIG_VLAN_8021Q is not set | 305 | # CONFIG_VLAN_8021Q is not set |
| @@ -364,7 +318,6 @@ CONFIG_LLC=y | |||
| 364 | # QoS and/or fair queueing | 318 | # QoS and/or fair queueing |
| 365 | # | 319 | # |
| 366 | # CONFIG_NET_SCHED is not set | 320 | # CONFIG_NET_SCHED is not set |
| 367 | CONFIG_NET_CLS_ROUTE=y | ||
| 368 | 321 | ||
| 369 | # | 322 | # |
| 370 | # Network testing | 323 | # Network testing |
| @@ -572,13 +525,7 @@ CONFIG_SCSI_IPR_TRACE=y | |||
| 572 | CONFIG_SCSI_IPR_DUMP=y | 525 | CONFIG_SCSI_IPR_DUMP=y |
| 573 | # CONFIG_SCSI_QLOGIC_FC is not set | 526 | # CONFIG_SCSI_QLOGIC_FC is not set |
| 574 | # CONFIG_SCSI_QLOGIC_1280 is not set | 527 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 575 | CONFIG_SCSI_QLA2XXX=y | 528 | # CONFIG_SCSI_QLA_FC is not set |
| 576 | CONFIG_SCSI_QLA21XX=m | ||
| 577 | CONFIG_SCSI_QLA22XX=m | ||
| 578 | CONFIG_SCSI_QLA2300=m | ||
| 579 | CONFIG_SCSI_QLA2322=m | ||
| 580 | CONFIG_SCSI_QLA6312=m | ||
| 581 | CONFIG_SCSI_QLA24XX=m | ||
| 582 | CONFIG_SCSI_LPFC=m | 529 | CONFIG_SCSI_LPFC=m |
| 583 | # CONFIG_SCSI_DC395x is not set | 530 | # CONFIG_SCSI_DC395x is not set |
| 584 | # CONFIG_SCSI_DC390T is not set | 531 | # CONFIG_SCSI_DC390T is not set |
| @@ -642,8 +589,6 @@ CONFIG_IEEE1394_SBP2=m | |||
| 642 | CONFIG_IEEE1394_ETH1394=m | 589 | CONFIG_IEEE1394_ETH1394=m |
| 643 | CONFIG_IEEE1394_DV1394=m | 590 | CONFIG_IEEE1394_DV1394=m |
| 644 | CONFIG_IEEE1394_RAWIO=y | 591 | CONFIG_IEEE1394_RAWIO=y |
| 645 | CONFIG_IEEE1394_CMP=m | ||
| 646 | CONFIG_IEEE1394_AMDTP=m | ||
| 647 | 592 | ||
| 648 | # | 593 | # |
| 649 | # I2O device support | 594 | # I2O device support |
| @@ -659,6 +604,7 @@ CONFIG_THERM_PM72=y | |||
| 659 | CONFIG_WINDFARM=y | 604 | CONFIG_WINDFARM=y |
| 660 | CONFIG_WINDFARM_PM81=y | 605 | CONFIG_WINDFARM_PM81=y |
| 661 | CONFIG_WINDFARM_PM91=y | 606 | CONFIG_WINDFARM_PM91=y |
| 607 | CONFIG_WINDFARM_PM112=y | ||
| 662 | 608 | ||
| 663 | # | 609 | # |
| 664 | # Network device support | 610 | # Network device support |
| @@ -731,6 +677,7 @@ CONFIG_E1000=y | |||
| 731 | # CONFIG_R8169 is not set | 677 | # CONFIG_R8169 is not set |
| 732 | # CONFIG_SIS190 is not set | 678 | # CONFIG_SIS190 is not set |
| 733 | # CONFIG_SKGE is not set | 679 | # CONFIG_SKGE is not set |
| 680 | # CONFIG_SKY2 is not set | ||
| 734 | # CONFIG_SK98LIN is not set | 681 | # CONFIG_SK98LIN is not set |
| 735 | # CONFIG_VIA_VELOCITY is not set | 682 | # CONFIG_VIA_VELOCITY is not set |
| 736 | CONFIG_TIGON3=y | 683 | CONFIG_TIGON3=y |
| @@ -853,6 +800,7 @@ CONFIG_HW_CONSOLE=y | |||
| 853 | CONFIG_SERIAL_8250=y | 800 | CONFIG_SERIAL_8250=y |
| 854 | CONFIG_SERIAL_8250_CONSOLE=y | 801 | CONFIG_SERIAL_8250_CONSOLE=y |
| 855 | CONFIG_SERIAL_8250_NR_UARTS=4 | 802 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 803 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 856 | # CONFIG_SERIAL_8250_EXTENDED is not set | 804 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| 857 | 805 | ||
| 858 | # | 806 | # |
| @@ -880,6 +828,7 @@ CONFIG_HVCS=m | |||
| 880 | # CONFIG_WATCHDOG is not set | 828 | # CONFIG_WATCHDOG is not set |
| 881 | # CONFIG_RTC is not set | 829 | # CONFIG_RTC is not set |
| 882 | CONFIG_GEN_RTC=y | 830 | CONFIG_GEN_RTC=y |
| 831 | # CONFIG_GEN_RTC_X is not set | ||
| 883 | # CONFIG_DTLK is not set | 832 | # CONFIG_DTLK is not set |
| 884 | # CONFIG_R3964 is not set | 833 | # CONFIG_R3964 is not set |
| 885 | # CONFIG_APPLICOM is not set | 834 | # CONFIG_APPLICOM is not set |
| @@ -923,8 +872,7 @@ CONFIG_I2C_AMD8111=y | |||
| 923 | # CONFIG_I2C_I801 is not set | 872 | # CONFIG_I2C_I801 is not set |
| 924 | # CONFIG_I2C_I810 is not set | 873 | # CONFIG_I2C_I810 is not set |
| 925 | # CONFIG_I2C_PIIX4 is not set | 874 | # CONFIG_I2C_PIIX4 is not set |
| 926 | CONFIG_I2C_KEYWEST=y | 875 | CONFIG_I2C_POWERMAC=y |
| 927 | CONFIG_I2C_PMAC_SMU=y | ||
| 928 | # CONFIG_I2C_NFORCE2 is not set | 876 | # CONFIG_I2C_NFORCE2 is not set |
| 929 | # CONFIG_I2C_PARPORT_LIGHT is not set | 877 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 930 | # CONFIG_I2C_PROSAVAGE is not set | 878 | # CONFIG_I2C_PROSAVAGE is not set |
| @@ -957,6 +905,12 @@ CONFIG_I2C_PMAC_SMU=y | |||
| 957 | # CONFIG_I2C_DEBUG_CHIP is not set | 905 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 958 | 906 | ||
| 959 | # | 907 | # |
| 908 | # SPI support | ||
| 909 | # | ||
| 910 | # CONFIG_SPI is not set | ||
| 911 | # CONFIG_SPI_MASTER is not set | ||
| 912 | |||
| 913 | # | ||
| 960 | # Dallas's 1-wire bus | 914 | # Dallas's 1-wire bus |
| 961 | # | 915 | # |
| 962 | # CONFIG_W1 is not set | 916 | # CONFIG_W1 is not set |
| @@ -1028,7 +982,6 @@ CONFIG_FB_RADEON_I2C=y | |||
| 1028 | # CONFIG_FB_KYRO is not set | 982 | # CONFIG_FB_KYRO is not set |
| 1029 | # CONFIG_FB_3DFX is not set | 983 | # CONFIG_FB_3DFX is not set |
| 1030 | # CONFIG_FB_VOODOO1 is not set | 984 | # CONFIG_FB_VOODOO1 is not set |
| 1031 | # CONFIG_FB_CYBLA is not set | ||
| 1032 | # CONFIG_FB_TRIDENT is not set | 985 | # CONFIG_FB_TRIDENT is not set |
| 1033 | # CONFIG_FB_VIRTUAL is not set | 986 | # CONFIG_FB_VIRTUAL is not set |
| 1034 | 987 | ||
| @@ -1073,9 +1026,10 @@ CONFIG_SND_OSSEMUL=y | |||
| 1073 | CONFIG_SND_MIXER_OSS=m | 1026 | CONFIG_SND_MIXER_OSS=m |
| 1074 | CONFIG_SND_PCM_OSS=m | 1027 | CONFIG_SND_PCM_OSS=m |
| 1075 | CONFIG_SND_SEQUENCER_OSS=y | 1028 | CONFIG_SND_SEQUENCER_OSS=y |
| 1029 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 1030 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 1076 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1031 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 1077 | # CONFIG_SND_DEBUG is not set | 1032 | # CONFIG_SND_DEBUG is not set |
| 1078 | CONFIG_SND_GENERIC_DRIVER=y | ||
| 1079 | 1033 | ||
| 1080 | # | 1034 | # |
| 1081 | # Generic devices | 1035 | # Generic devices |
| @@ -1089,6 +1043,8 @@ CONFIG_SND_GENERIC_DRIVER=y | |||
| 1089 | # | 1043 | # |
| 1090 | # PCI devices | 1044 | # PCI devices |
| 1091 | # | 1045 | # |
| 1046 | # CONFIG_SND_AD1889 is not set | ||
| 1047 | # CONFIG_SND_ALS4000 is not set | ||
| 1092 | # CONFIG_SND_ALI5451 is not set | 1048 | # CONFIG_SND_ALI5451 is not set |
| 1093 | # CONFIG_SND_ATIIXP is not set | 1049 | # CONFIG_SND_ATIIXP is not set |
| 1094 | # CONFIG_SND_ATIIXP_MODEM is not set | 1050 | # CONFIG_SND_ATIIXP_MODEM is not set |
| @@ -1097,39 +1053,38 @@ CONFIG_SND_GENERIC_DRIVER=y | |||
| 1097 | # CONFIG_SND_AU8830 is not set | 1053 | # CONFIG_SND_AU8830 is not set |
| 1098 | # CONFIG_SND_AZT3328 is not set | 1054 | # CONFIG_SND_AZT3328 is not set |
| 1099 | # CONFIG_SND_BT87X is not set | 1055 | # CONFIG_SND_BT87X is not set |
| 1100 | # CONFIG_SND_CS46XX is not set | 1056 | # CONFIG_SND_CA0106 is not set |
| 1057 | # CONFIG_SND_CMIPCI is not set | ||
| 1101 | # CONFIG_SND_CS4281 is not set | 1058 | # CONFIG_SND_CS4281 is not set |
| 1059 | # CONFIG_SND_CS46XX is not set | ||
| 1102 | # CONFIG_SND_EMU10K1 is not set | 1060 | # CONFIG_SND_EMU10K1 is not set |
| 1103 | # CONFIG_SND_EMU10K1X is not set | 1061 | # CONFIG_SND_EMU10K1X is not set |
| 1104 | # CONFIG_SND_CA0106 is not set | ||
| 1105 | # CONFIG_SND_KORG1212 is not set | ||
| 1106 | # CONFIG_SND_MIXART is not set | ||
| 1107 | # CONFIG_SND_NM256 is not set | ||
| 1108 | # CONFIG_SND_RME32 is not set | ||
| 1109 | # CONFIG_SND_RME96 is not set | ||
| 1110 | # CONFIG_SND_RME9652 is not set | ||
| 1111 | # CONFIG_SND_HDSP is not set | ||
| 1112 | # CONFIG_SND_HDSPM is not set | ||
| 1113 | # CONFIG_SND_TRIDENT is not set | ||
| 1114 | # CONFIG_SND_YMFPCI is not set | ||
| 1115 | # CONFIG_SND_AD1889 is not set | ||
| 1116 | # CONFIG_SND_ALS4000 is not set | ||
| 1117 | # CONFIG_SND_CMIPCI is not set | ||
| 1118 | # CONFIG_SND_ENS1370 is not set | 1062 | # CONFIG_SND_ENS1370 is not set |
| 1119 | # CONFIG_SND_ENS1371 is not set | 1063 | # CONFIG_SND_ENS1371 is not set |
| 1120 | # CONFIG_SND_ES1938 is not set | 1064 | # CONFIG_SND_ES1938 is not set |
| 1121 | # CONFIG_SND_ES1968 is not set | 1065 | # CONFIG_SND_ES1968 is not set |
| 1122 | # CONFIG_SND_MAESTRO3 is not set | ||
| 1123 | # CONFIG_SND_FM801 is not set | 1066 | # CONFIG_SND_FM801 is not set |
| 1067 | # CONFIG_SND_HDA_INTEL is not set | ||
| 1068 | # CONFIG_SND_HDSP is not set | ||
| 1069 | # CONFIG_SND_HDSPM is not set | ||
| 1124 | # CONFIG_SND_ICE1712 is not set | 1070 | # CONFIG_SND_ICE1712 is not set |
| 1125 | # CONFIG_SND_ICE1724 is not set | 1071 | # CONFIG_SND_ICE1724 is not set |
| 1126 | # CONFIG_SND_INTEL8X0 is not set | 1072 | # CONFIG_SND_INTEL8X0 is not set |
| 1127 | # CONFIG_SND_INTEL8X0M is not set | 1073 | # CONFIG_SND_INTEL8X0M is not set |
| 1074 | # CONFIG_SND_KORG1212 is not set | ||
| 1075 | # CONFIG_SND_MAESTRO3 is not set | ||
| 1076 | # CONFIG_SND_MIXART is not set | ||
| 1077 | # CONFIG_SND_NM256 is not set | ||
| 1078 | # CONFIG_SND_PCXHR is not set | ||
| 1079 | # CONFIG_SND_RME32 is not set | ||
| 1080 | # CONFIG_SND_RME96 is not set | ||
| 1081 | # CONFIG_SND_RME9652 is not set | ||
| 1128 | # CONFIG_SND_SONICVIBES is not set | 1082 | # CONFIG_SND_SONICVIBES is not set |
| 1083 | # CONFIG_SND_TRIDENT is not set | ||
| 1129 | # CONFIG_SND_VIA82XX is not set | 1084 | # CONFIG_SND_VIA82XX is not set |
| 1130 | # CONFIG_SND_VIA82XX_MODEM is not set | 1085 | # CONFIG_SND_VIA82XX_MODEM is not set |
| 1131 | # CONFIG_SND_VX222 is not set | 1086 | # CONFIG_SND_VX222 is not set |
| 1132 | # CONFIG_SND_HDA_INTEL is not set | 1087 | # CONFIG_SND_YMFPCI is not set |
| 1133 | 1088 | ||
| 1134 | # | 1089 | # |
| 1135 | # ALSA PowerMac devices | 1090 | # ALSA PowerMac devices |
| @@ -1201,13 +1156,16 @@ CONFIG_USB_STORAGE=m | |||
| 1201 | # CONFIG_USB_STORAGE_SDDR09 is not set | 1156 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 1202 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1157 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1203 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1158 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1159 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 1204 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1160 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1161 | # CONFIG_USB_LIBUSUAL is not set | ||
| 1205 | 1162 | ||
| 1206 | # | 1163 | # |
| 1207 | # USB Input Devices | 1164 | # USB Input Devices |
| 1208 | # | 1165 | # |
| 1209 | CONFIG_USB_HID=y | 1166 | CONFIG_USB_HID=y |
| 1210 | CONFIG_USB_HIDINPUT=y | 1167 | CONFIG_USB_HIDINPUT=y |
| 1168 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 1211 | # CONFIG_HID_FF is not set | 1169 | # CONFIG_HID_FF is not set |
| 1212 | CONFIG_USB_HIDDEV=y | 1170 | CONFIG_USB_HIDDEV=y |
| 1213 | # CONFIG_USB_AIPTEK is not set | 1171 | # CONFIG_USB_AIPTEK is not set |
| @@ -1221,6 +1179,7 @@ CONFIG_USB_HIDDEV=y | |||
| 1221 | # CONFIG_USB_YEALINK is not set | 1179 | # CONFIG_USB_YEALINK is not set |
| 1222 | # CONFIG_USB_XPAD is not set | 1180 | # CONFIG_USB_XPAD is not set |
| 1223 | # CONFIG_USB_ATI_REMOTE is not set | 1181 | # CONFIG_USB_ATI_REMOTE is not set |
| 1182 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
| 1224 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 1183 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
| 1225 | # CONFIG_USB_APPLETOUCH is not set | 1184 | # CONFIG_USB_APPLETOUCH is not set |
| 1226 | 1185 | ||
| @@ -1307,6 +1266,10 @@ CONFIG_INFINIBAND_IPOIB=m | |||
| 1307 | # | 1266 | # |
| 1308 | 1267 | ||
| 1309 | # | 1268 | # |
| 1269 | # EDAC - error detection and reporting (RAS) | ||
| 1270 | # | ||
| 1271 | |||
| 1272 | # | ||
| 1310 | # File systems | 1273 | # File systems |
| 1311 | # | 1274 | # |
| 1312 | CONFIG_EXT2_FS=y | 1275 | CONFIG_EXT2_FS=y |
| @@ -1340,6 +1303,7 @@ CONFIG_XFS_EXPORT=y | |||
| 1340 | CONFIG_XFS_SECURITY=y | 1303 | CONFIG_XFS_SECURITY=y |
| 1341 | CONFIG_XFS_POSIX_ACL=y | 1304 | CONFIG_XFS_POSIX_ACL=y |
| 1342 | # CONFIG_XFS_RT is not set | 1305 | # CONFIG_XFS_RT is not set |
| 1306 | # CONFIG_OCFS2_FS is not set | ||
| 1343 | # CONFIG_MINIX_FS is not set | 1307 | # CONFIG_MINIX_FS is not set |
| 1344 | # CONFIG_ROMFS_FS is not set | 1308 | # CONFIG_ROMFS_FS is not set |
| 1345 | CONFIG_INOTIFY=y | 1309 | CONFIG_INOTIFY=y |
| @@ -1379,6 +1343,7 @@ CONFIG_HUGETLBFS=y | |||
| 1379 | CONFIG_HUGETLB_PAGE=y | 1343 | CONFIG_HUGETLB_PAGE=y |
| 1380 | CONFIG_RAMFS=y | 1344 | CONFIG_RAMFS=y |
| 1381 | # CONFIG_RELAYFS_FS is not set | 1345 | # CONFIG_RELAYFS_FS is not set |
| 1346 | # CONFIG_CONFIGFS_FS is not set | ||
| 1382 | 1347 | ||
| 1383 | # | 1348 | # |
| 1384 | # Miscellaneous filesystems | 1349 | # Miscellaneous filesystems |
| @@ -1449,6 +1414,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1449 | # CONFIG_SGI_PARTITION is not set | 1414 | # CONFIG_SGI_PARTITION is not set |
| 1450 | # CONFIG_ULTRIX_PARTITION is not set | 1415 | # CONFIG_ULTRIX_PARTITION is not set |
| 1451 | # CONFIG_SUN_PARTITION is not set | 1416 | # CONFIG_SUN_PARTITION is not set |
| 1417 | # CONFIG_KARMA_PARTITION is not set | ||
| 1452 | # CONFIG_EFI_PARTITION is not set | 1418 | # CONFIG_EFI_PARTITION is not set |
| 1453 | 1419 | ||
| 1454 | # | 1420 | # |
| @@ -1504,10 +1470,6 @@ CONFIG_CRC32=y | |||
| 1504 | CONFIG_LIBCRC32C=m | 1470 | CONFIG_LIBCRC32C=m |
| 1505 | CONFIG_ZLIB_INFLATE=y | 1471 | CONFIG_ZLIB_INFLATE=y |
| 1506 | CONFIG_ZLIB_DEFLATE=m | 1472 | CONFIG_ZLIB_DEFLATE=m |
| 1507 | CONFIG_TEXTSEARCH=y | ||
| 1508 | CONFIG_TEXTSEARCH_KMP=m | ||
| 1509 | CONFIG_TEXTSEARCH_BM=m | ||
| 1510 | CONFIG_TEXTSEARCH_FSM=m | ||
| 1511 | 1473 | ||
| 1512 | # | 1474 | # |
| 1513 | # Instrumentation Support | 1475 | # Instrumentation Support |
| @@ -1520,18 +1482,20 @@ CONFIG_OPROFILE=y | |||
| 1520 | # Kernel hacking | 1482 | # Kernel hacking |
| 1521 | # | 1483 | # |
| 1522 | # CONFIG_PRINTK_TIME is not set | 1484 | # CONFIG_PRINTK_TIME is not set |
| 1523 | CONFIG_DEBUG_KERNEL=y | ||
| 1524 | CONFIG_MAGIC_SYSRQ=y | 1485 | CONFIG_MAGIC_SYSRQ=y |
| 1486 | CONFIG_DEBUG_KERNEL=y | ||
| 1525 | CONFIG_LOG_BUF_SHIFT=17 | 1487 | CONFIG_LOG_BUF_SHIFT=17 |
| 1526 | CONFIG_DETECT_SOFTLOCKUP=y | 1488 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1527 | # CONFIG_SCHEDSTATS is not set | 1489 | # CONFIG_SCHEDSTATS is not set |
| 1528 | # CONFIG_DEBUG_SLAB is not set | 1490 | # CONFIG_DEBUG_SLAB is not set |
| 1491 | CONFIG_DEBUG_MUTEXES=y | ||
| 1529 | # CONFIG_DEBUG_SPINLOCK is not set | 1492 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1530 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1493 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1531 | # CONFIG_DEBUG_KOBJECT is not set | 1494 | # CONFIG_DEBUG_KOBJECT is not set |
| 1532 | # CONFIG_DEBUG_INFO is not set | 1495 | # CONFIG_DEBUG_INFO is not set |
| 1533 | CONFIG_DEBUG_FS=y | 1496 | CONFIG_DEBUG_FS=y |
| 1534 | # CONFIG_DEBUG_VM is not set | 1497 | # CONFIG_DEBUG_VM is not set |
| 1498 | CONFIG_FORCED_INLINING=y | ||
| 1535 | # CONFIG_RCU_TORTURE_TEST is not set | 1499 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1536 | CONFIG_DEBUG_STACKOVERFLOW=y | 1500 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 1537 | CONFIG_DEBUG_STACK_USAGE=y | 1501 | CONFIG_DEBUG_STACK_USAGE=y |
| @@ -1540,6 +1504,11 @@ CONFIG_XMON=y | |||
| 1540 | # CONFIG_XMON_DEFAULT is not set | 1504 | # CONFIG_XMON_DEFAULT is not set |
| 1541 | CONFIG_IRQSTACKS=y | 1505 | CONFIG_IRQSTACKS=y |
| 1542 | CONFIG_BOOTX_TEXT=y | 1506 | CONFIG_BOOTX_TEXT=y |
| 1507 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | ||
| 1508 | # CONFIG_PPC_EARLY_DEBUG_G5 is not set | ||
| 1509 | # CONFIG_PPC_EARLY_DEBUG_RTAS is not set | ||
| 1510 | # CONFIG_PPC_EARLY_DEBUG_MAPLE is not set | ||
| 1511 | # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set | ||
| 1543 | 1512 | ||
| 1544 | # | 1513 | # |
| 1545 | # Security options | 1514 | # Security options |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index aa9893a1f6e8..daaf038a1faa 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_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.15-rc5 | 3 | # Linux kernel version: 2.6.16-rc2 |
| 4 | # Tue Dec 20 15:59:40 2005 | 4 | # Fri Feb 10 17:33:32 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -16,6 +16,10 @@ CONFIG_COMPAT=y | |||
| 16 | CONFIG_SYSVIPC_COMPAT=y | 16 | CONFIG_SYSVIPC_COMPAT=y |
| 17 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 17 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 18 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 18 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 19 | CONFIG_PPC_OF=y | ||
| 20 | CONFIG_PPC_UDBG_16550=y | ||
| 21 | # CONFIG_GENERIC_TBSYNC is not set | ||
| 22 | # CONFIG_DEFAULT_UIMAGE is not set | ||
| 19 | 23 | ||
| 20 | # | 24 | # |
| 21 | # Processor support | 25 | # Processor support |
| @@ -33,7 +37,6 @@ CONFIG_NR_CPUS=128 | |||
| 33 | # Code maturity level options | 37 | # Code maturity level options |
| 34 | # | 38 | # |
| 35 | CONFIG_EXPERIMENTAL=y | 39 | CONFIG_EXPERIMENTAL=y |
| 36 | CONFIG_CLEAN_COMPILE=y | ||
| 37 | CONFIG_LOCK_KERNEL=y | 40 | CONFIG_LOCK_KERNEL=y |
| 38 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 41 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 39 | 42 | ||
| @@ -49,8 +52,6 @@ CONFIG_POSIX_MQUEUE=y | |||
| 49 | CONFIG_SYSCTL=y | 52 | CONFIG_SYSCTL=y |
| 50 | CONFIG_AUDIT=y | 53 | CONFIG_AUDIT=y |
| 51 | CONFIG_AUDITSYSCALL=y | 54 | CONFIG_AUDITSYSCALL=y |
| 52 | CONFIG_HOTPLUG=y | ||
| 53 | CONFIG_KOBJECT_UEVENT=y | ||
| 54 | CONFIG_IKCONFIG=y | 55 | CONFIG_IKCONFIG=y |
| 55 | CONFIG_IKCONFIG_PROC=y | 56 | CONFIG_IKCONFIG_PROC=y |
| 56 | CONFIG_CPUSETS=y | 57 | CONFIG_CPUSETS=y |
| @@ -60,8 +61,10 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 60 | CONFIG_KALLSYMS=y | 61 | CONFIG_KALLSYMS=y |
| 61 | CONFIG_KALLSYMS_ALL=y | 62 | CONFIG_KALLSYMS_ALL=y |
| 62 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 63 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 64 | CONFIG_HOTPLUG=y | ||
| 63 | CONFIG_PRINTK=y | 65 | CONFIG_PRINTK=y |
| 64 | CONFIG_BUG=y | 66 | CONFIG_BUG=y |
| 67 | CONFIG_ELF_CORE=y | ||
| 65 | CONFIG_BASE_FULL=y | 68 | CONFIG_BASE_FULL=y |
| 66 | CONFIG_FUTEX=y | 69 | CONFIG_FUTEX=y |
| 67 | CONFIG_EPOLL=y | 70 | CONFIG_EPOLL=y |
| @@ -70,8 +73,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 | |||
| 70 | CONFIG_CC_ALIGN_LABELS=0 | 73 | CONFIG_CC_ALIGN_LABELS=0 |
| 71 | CONFIG_CC_ALIGN_LOOPS=0 | 74 | CONFIG_CC_ALIGN_LOOPS=0 |
| 72 | CONFIG_CC_ALIGN_JUMPS=0 | 75 | CONFIG_CC_ALIGN_JUMPS=0 |
| 76 | CONFIG_SLAB=y | ||
| 73 | # CONFIG_TINY_SHMEM is not set | 77 | # CONFIG_TINY_SHMEM is not set |
| 74 | CONFIG_BASE_SMALL=0 | 78 | CONFIG_BASE_SMALL=0 |
| 79 | # CONFIG_SLOB is not set | ||
| 75 | 80 | ||
| 76 | # | 81 | # |
| 77 | # Loadable module support | 82 | # Loadable module support |
| @@ -113,7 +118,6 @@ CONFIG_PPC_PSERIES=y | |||
| 113 | # CONFIG_PPC_PMAC is not set | 118 | # CONFIG_PPC_PMAC is not set |
| 114 | # CONFIG_PPC_MAPLE is not set | 119 | # CONFIG_PPC_MAPLE is not set |
| 115 | # CONFIG_PPC_CELL is not set | 120 | # CONFIG_PPC_CELL is not set |
| 116 | CONFIG_PPC_OF=y | ||
| 117 | CONFIG_XICS=y | 121 | CONFIG_XICS=y |
| 118 | # CONFIG_U3_DART is not set | 122 | # CONFIG_U3_DART is not set |
| 119 | CONFIG_MPIC=y | 123 | CONFIG_MPIC=y |
| @@ -123,8 +127,8 @@ CONFIG_RTAS_PROC=y | |||
| 123 | CONFIG_RTAS_FLASH=m | 127 | CONFIG_RTAS_FLASH=m |
| 124 | # CONFIG_MMIO_NVRAM is not set | 128 | # CONFIG_MMIO_NVRAM is not set |
| 125 | CONFIG_IBMVIO=y | 129 | CONFIG_IBMVIO=y |
| 130 | # CONFIG_IBMEBUS is not set | ||
| 126 | # CONFIG_PPC_MPC106 is not set | 131 | # CONFIG_PPC_MPC106 is not set |
| 127 | # CONFIG_GENERIC_TBSYNC is not set | ||
| 128 | # CONFIG_CPU_FREQ is not set | 132 | # CONFIG_CPU_FREQ is not set |
| 129 | # CONFIG_WANT_EARLY_SERIAL is not set | 133 | # CONFIG_WANT_EARLY_SERIAL is not set |
| 130 | 134 | ||
| @@ -145,6 +149,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
| 145 | CONFIG_IOMMU_VMERGE=y | 149 | CONFIG_IOMMU_VMERGE=y |
| 146 | CONFIG_HOTPLUG_CPU=y | 150 | CONFIG_HOTPLUG_CPU=y |
| 147 | CONFIG_KEXEC=y | 151 | CONFIG_KEXEC=y |
| 152 | # CONFIG_CRASH_DUMP is not set | ||
| 148 | CONFIG_IRQ_ALL_CPUS=y | 153 | CONFIG_IRQ_ALL_CPUS=y |
| 149 | CONFIG_PPC_SPLPAR=y | 154 | CONFIG_PPC_SPLPAR=y |
| 150 | CONFIG_EEH=y | 155 | CONFIG_EEH=y |
| @@ -165,6 +170,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y | |||
| 165 | CONFIG_SPARSEMEM_EXTREME=y | 170 | CONFIG_SPARSEMEM_EXTREME=y |
| 166 | # CONFIG_MEMORY_HOTPLUG is not set | 171 | # CONFIG_MEMORY_HOTPLUG is not set |
| 167 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 172 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 173 | CONFIG_MIGRATION=y | ||
| 168 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | 174 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y |
| 169 | # CONFIG_PPC_64K_PAGES is not set | 175 | # CONFIG_PPC_64K_PAGES is not set |
| 170 | CONFIG_SCHED_SMT=y | 176 | CONFIG_SCHED_SMT=y |
| @@ -209,6 +215,7 @@ CONFIG_NET=y | |||
| 209 | # | 215 | # |
| 210 | # Networking options | 216 | # Networking options |
| 211 | # | 217 | # |
| 218 | # CONFIG_NETDEBUG is not set | ||
| 212 | CONFIG_PACKET=y | 219 | CONFIG_PACKET=y |
| 213 | # CONFIG_PACKET_MMAP is not set | 220 | # CONFIG_PACKET_MMAP is not set |
| 214 | CONFIG_UNIX=y | 221 | CONFIG_UNIX=y |
| @@ -248,6 +255,7 @@ CONFIG_NETFILTER=y | |||
| 248 | CONFIG_NETFILTER_NETLINK=y | 255 | CONFIG_NETFILTER_NETLINK=y |
| 249 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 256 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
| 250 | CONFIG_NETFILTER_NETLINK_LOG=m | 257 | CONFIG_NETFILTER_NETLINK_LOG=m |
| 258 | # CONFIG_NETFILTER_XTABLES is not set | ||
| 251 | 259 | ||
| 252 | # | 260 | # |
| 253 | # IP: Netfilter Configuration | 261 | # IP: Netfilter Configuration |
| @@ -265,65 +273,6 @@ CONFIG_IP_NF_TFTP=m | |||
| 265 | CONFIG_IP_NF_AMANDA=m | 273 | CONFIG_IP_NF_AMANDA=m |
| 266 | # CONFIG_IP_NF_PPTP is not set | 274 | # CONFIG_IP_NF_PPTP is not set |
| 267 | CONFIG_IP_NF_QUEUE=m | 275 | CONFIG_IP_NF_QUEUE=m |
| 268 | CONFIG_IP_NF_IPTABLES=m | ||
| 269 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
| 270 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
| 271 | CONFIG_IP_NF_MATCH_MAC=m | ||
| 272 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
| 273 | CONFIG_IP_NF_MATCH_MARK=m | ||
| 274 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
| 275 | CONFIG_IP_NF_MATCH_TOS=m | ||
| 276 | CONFIG_IP_NF_MATCH_RECENT=m | ||
| 277 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 278 | CONFIG_IP_NF_MATCH_DSCP=m | ||
| 279 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
| 280 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
| 281 | CONFIG_IP_NF_MATCH_TTL=m | ||
| 282 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
| 283 | CONFIG_IP_NF_MATCH_HELPER=m | ||
| 284 | CONFIG_IP_NF_MATCH_STATE=m | ||
| 285 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
| 286 | CONFIG_IP_NF_MATCH_OWNER=m | ||
| 287 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 288 | CONFIG_IP_NF_MATCH_REALM=m | ||
| 289 | CONFIG_IP_NF_MATCH_SCTP=m | ||
| 290 | # CONFIG_IP_NF_MATCH_DCCP is not set | ||
| 291 | CONFIG_IP_NF_MATCH_COMMENT=m | ||
| 292 | CONFIG_IP_NF_MATCH_CONNMARK=m | ||
| 293 | CONFIG_IP_NF_MATCH_CONNBYTES=m | ||
| 294 | CONFIG_IP_NF_MATCH_HASHLIMIT=m | ||
| 295 | CONFIG_IP_NF_MATCH_STRING=m | ||
| 296 | CONFIG_IP_NF_FILTER=m | ||
| 297 | CONFIG_IP_NF_TARGET_REJECT=m | ||
| 298 | CONFIG_IP_NF_TARGET_LOG=m | ||
| 299 | CONFIG_IP_NF_TARGET_ULOG=m | ||
| 300 | CONFIG_IP_NF_TARGET_TCPMSS=m | ||
| 301 | CONFIG_IP_NF_TARGET_NFQUEUE=m | ||
| 302 | CONFIG_IP_NF_NAT=m | ||
| 303 | CONFIG_IP_NF_NAT_NEEDED=y | ||
| 304 | CONFIG_IP_NF_TARGET_MASQUERADE=m | ||
| 305 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 306 | CONFIG_IP_NF_TARGET_NETMAP=m | ||
| 307 | CONFIG_IP_NF_TARGET_SAME=m | ||
| 308 | CONFIG_IP_NF_NAT_SNMP_BASIC=m | ||
| 309 | CONFIG_IP_NF_NAT_IRC=m | ||
| 310 | CONFIG_IP_NF_NAT_FTP=m | ||
| 311 | CONFIG_IP_NF_NAT_TFTP=m | ||
| 312 | CONFIG_IP_NF_NAT_AMANDA=m | ||
| 313 | CONFIG_IP_NF_MANGLE=m | ||
| 314 | CONFIG_IP_NF_TARGET_TOS=m | ||
| 315 | CONFIG_IP_NF_TARGET_ECN=m | ||
| 316 | CONFIG_IP_NF_TARGET_DSCP=m | ||
| 317 | CONFIG_IP_NF_TARGET_MARK=m | ||
| 318 | CONFIG_IP_NF_TARGET_CLASSIFY=m | ||
| 319 | CONFIG_IP_NF_TARGET_TTL=m | ||
| 320 | CONFIG_IP_NF_TARGET_CONNMARK=m | ||
| 321 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 322 | CONFIG_IP_NF_RAW=m | ||
| 323 | CONFIG_IP_NF_TARGET_NOTRACK=m | ||
| 324 | CONFIG_IP_NF_ARPTABLES=m | ||
| 325 | CONFIG_IP_NF_ARPFILTER=m | ||
| 326 | CONFIG_IP_NF_ARP_MANGLE=m | ||
| 327 | 276 | ||
| 328 | # | 277 | # |
| 329 | # DCCP Configuration (EXPERIMENTAL) | 278 | # DCCP Configuration (EXPERIMENTAL) |
| @@ -334,6 +283,11 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 334 | # SCTP Configuration (EXPERIMENTAL) | 283 | # SCTP Configuration (EXPERIMENTAL) |
| 335 | # | 284 | # |
| 336 | # CONFIG_IP_SCTP is not set | 285 | # CONFIG_IP_SCTP is not set |
| 286 | |||
| 287 | # | ||
| 288 | # TIPC Configuration (EXPERIMENTAL) | ||
| 289 | # | ||
| 290 | # CONFIG_TIPC is not set | ||
| 337 | # CONFIG_ATM is not set | 291 | # CONFIG_ATM is not set |
| 338 | # CONFIG_BRIDGE is not set | 292 | # CONFIG_BRIDGE is not set |
| 339 | # CONFIG_VLAN_8021Q is not set | 293 | # CONFIG_VLAN_8021Q is not set |
| @@ -352,7 +306,6 @@ CONFIG_LLC=y | |||
| 352 | # QoS and/or fair queueing | 306 | # QoS and/or fair queueing |
| 353 | # | 307 | # |
| 354 | # CONFIG_NET_SCHED is not set | 308 | # CONFIG_NET_SCHED is not set |
| 355 | CONFIG_NET_CLS_ROUTE=y | ||
| 356 | 309 | ||
| 357 | # | 310 | # |
| 358 | # Network testing | 311 | # Network testing |
| @@ -550,13 +503,7 @@ CONFIG_SCSI_IPR_TRACE=y | |||
| 550 | CONFIG_SCSI_IPR_DUMP=y | 503 | CONFIG_SCSI_IPR_DUMP=y |
| 551 | # CONFIG_SCSI_QLOGIC_FC is not set | 504 | # CONFIG_SCSI_QLOGIC_FC is not set |
| 552 | # CONFIG_SCSI_QLOGIC_1280 is not set | 505 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 553 | CONFIG_SCSI_QLA2XXX=y | 506 | # CONFIG_SCSI_QLA_FC is not set |
| 554 | CONFIG_SCSI_QLA21XX=m | ||
| 555 | CONFIG_SCSI_QLA22XX=m | ||
| 556 | CONFIG_SCSI_QLA2300=m | ||
| 557 | CONFIG_SCSI_QLA2322=m | ||
| 558 | CONFIG_SCSI_QLA6312=m | ||
| 559 | CONFIG_SCSI_QLA24XX=m | ||
| 560 | CONFIG_SCSI_LPFC=m | 507 | CONFIG_SCSI_LPFC=m |
| 561 | # CONFIG_SCSI_DC395x is not set | 508 | # CONFIG_SCSI_DC395x is not set |
| 562 | # CONFIG_SCSI_DC390T is not set | 509 | # CONFIG_SCSI_DC390T is not set |
| @@ -678,6 +625,7 @@ CONFIG_E1000=y | |||
| 678 | # CONFIG_R8169 is not set | 625 | # CONFIG_R8169 is not set |
| 679 | # CONFIG_SIS190 is not set | 626 | # CONFIG_SIS190 is not set |
| 680 | # CONFIG_SKGE is not set | 627 | # CONFIG_SKGE is not set |
| 628 | # CONFIG_SKY2 is not set | ||
| 681 | # CONFIG_SK98LIN is not set | 629 | # CONFIG_SK98LIN is not set |
| 682 | # CONFIG_VIA_VELOCITY is not set | 630 | # CONFIG_VIA_VELOCITY is not set |
| 683 | CONFIG_TIGON3=y | 631 | CONFIG_TIGON3=y |
| @@ -803,6 +751,7 @@ CONFIG_HW_CONSOLE=y | |||
| 803 | CONFIG_SERIAL_8250=y | 751 | CONFIG_SERIAL_8250=y |
| 804 | CONFIG_SERIAL_8250_CONSOLE=y | 752 | CONFIG_SERIAL_8250_CONSOLE=y |
| 805 | CONFIG_SERIAL_8250_NR_UARTS=4 | 753 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 754 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 806 | # CONFIG_SERIAL_8250_EXTENDED is not set | 755 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| 807 | 756 | ||
| 808 | # | 757 | # |
| @@ -909,6 +858,12 @@ CONFIG_I2C_ALGOBIT=y | |||
| 909 | # CONFIG_I2C_DEBUG_CHIP is not set | 858 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 910 | 859 | ||
| 911 | # | 860 | # |
| 861 | # SPI support | ||
| 862 | # | ||
| 863 | # CONFIG_SPI is not set | ||
| 864 | # CONFIG_SPI_MASTER is not set | ||
| 865 | |||
| 866 | # | ||
| 912 | # Dallas's 1-wire bus | 867 | # Dallas's 1-wire bus |
| 913 | # | 868 | # |
| 914 | # CONFIG_W1 is not set | 869 | # CONFIG_W1 is not set |
| @@ -976,7 +931,6 @@ CONFIG_FB_RADEON_I2C=y | |||
| 976 | # CONFIG_FB_KYRO is not set | 931 | # CONFIG_FB_KYRO is not set |
| 977 | # CONFIG_FB_3DFX is not set | 932 | # CONFIG_FB_3DFX is not set |
| 978 | # CONFIG_FB_VOODOO1 is not set | 933 | # CONFIG_FB_VOODOO1 is not set |
| 979 | # CONFIG_FB_CYBLA is not set | ||
| 980 | # CONFIG_FB_TRIDENT is not set | 934 | # CONFIG_FB_TRIDENT is not set |
| 981 | # CONFIG_FB_VIRTUAL is not set | 935 | # CONFIG_FB_VIRTUAL is not set |
| 982 | 936 | ||
| @@ -1061,12 +1015,15 @@ CONFIG_USB_STORAGE=y | |||
| 1061 | # CONFIG_USB_STORAGE_SDDR09 is not set | 1015 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 1062 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1016 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1063 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1017 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1018 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 1019 | # CONFIG_USB_LIBUSUAL is not set | ||
| 1064 | 1020 | ||
| 1065 | # | 1021 | # |
| 1066 | # USB Input Devices | 1022 | # USB Input Devices |
| 1067 | # | 1023 | # |
| 1068 | CONFIG_USB_HID=y | 1024 | CONFIG_USB_HID=y |
| 1069 | CONFIG_USB_HIDINPUT=y | 1025 | CONFIG_USB_HIDINPUT=y |
| 1026 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 1070 | # CONFIG_HID_FF is not set | 1027 | # CONFIG_HID_FF is not set |
| 1071 | CONFIG_USB_HIDDEV=y | 1028 | CONFIG_USB_HIDDEV=y |
| 1072 | # CONFIG_USB_AIPTEK is not set | 1029 | # CONFIG_USB_AIPTEK is not set |
| @@ -1080,6 +1037,7 @@ CONFIG_USB_HIDDEV=y | |||
| 1080 | # CONFIG_USB_YEALINK is not set | 1037 | # CONFIG_USB_YEALINK is not set |
| 1081 | # CONFIG_USB_XPAD is not set | 1038 | # CONFIG_USB_XPAD is not set |
| 1082 | # CONFIG_USB_ATI_REMOTE is not set | 1039 | # CONFIG_USB_ATI_REMOTE is not set |
| 1040 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
| 1083 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 1041 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
| 1084 | # CONFIG_USB_APPLETOUCH is not set | 1042 | # CONFIG_USB_APPLETOUCH is not set |
| 1085 | 1043 | ||
| @@ -1167,6 +1125,10 @@ CONFIG_INFINIBAND_IPOIB=m | |||
| 1167 | # | 1125 | # |
| 1168 | 1126 | ||
| 1169 | # | 1127 | # |
| 1128 | # EDAC - error detection and reporting (RAS) | ||
| 1129 | # | ||
| 1130 | |||
| 1131 | # | ||
| 1170 | # File systems | 1132 | # File systems |
| 1171 | # | 1133 | # |
| 1172 | CONFIG_EXT2_FS=y | 1134 | CONFIG_EXT2_FS=y |
| @@ -1200,6 +1162,7 @@ CONFIG_XFS_EXPORT=y | |||
| 1200 | CONFIG_XFS_SECURITY=y | 1162 | CONFIG_XFS_SECURITY=y |
| 1201 | CONFIG_XFS_POSIX_ACL=y | 1163 | CONFIG_XFS_POSIX_ACL=y |
| 1202 | # CONFIG_XFS_RT is not set | 1164 | # CONFIG_XFS_RT is not set |
| 1165 | # CONFIG_OCFS2_FS is not set | ||
| 1203 | # CONFIG_MINIX_FS is not set | 1166 | # CONFIG_MINIX_FS is not set |
| 1204 | # CONFIG_ROMFS_FS is not set | 1167 | # CONFIG_ROMFS_FS is not set |
| 1205 | CONFIG_INOTIFY=y | 1168 | CONFIG_INOTIFY=y |
| @@ -1240,6 +1203,7 @@ CONFIG_HUGETLBFS=y | |||
| 1240 | CONFIG_HUGETLB_PAGE=y | 1203 | CONFIG_HUGETLB_PAGE=y |
| 1241 | CONFIG_RAMFS=y | 1204 | CONFIG_RAMFS=y |
| 1242 | # CONFIG_RELAYFS_FS is not set | 1205 | # CONFIG_RELAYFS_FS is not set |
| 1206 | # CONFIG_CONFIGFS_FS is not set | ||
| 1243 | 1207 | ||
| 1244 | # | 1208 | # |
| 1245 | # Miscellaneous filesystems | 1209 | # Miscellaneous filesystems |
| @@ -1351,10 +1315,6 @@ CONFIG_CRC32=y | |||
| 1351 | CONFIG_LIBCRC32C=m | 1315 | CONFIG_LIBCRC32C=m |
| 1352 | CONFIG_ZLIB_INFLATE=y | 1316 | CONFIG_ZLIB_INFLATE=y |
| 1353 | CONFIG_ZLIB_DEFLATE=m | 1317 | CONFIG_ZLIB_DEFLATE=m |
| 1354 | CONFIG_TEXTSEARCH=y | ||
| 1355 | CONFIG_TEXTSEARCH_KMP=m | ||
| 1356 | CONFIG_TEXTSEARCH_BM=m | ||
| 1357 | CONFIG_TEXTSEARCH_FSM=m | ||
| 1358 | 1318 | ||
| 1359 | # | 1319 | # |
| 1360 | # Instrumentation Support | 1320 | # Instrumentation Support |
| @@ -1367,18 +1327,20 @@ CONFIG_OPROFILE=y | |||
| 1367 | # Kernel hacking | 1327 | # Kernel hacking |
| 1368 | # | 1328 | # |
| 1369 | # CONFIG_PRINTK_TIME is not set | 1329 | # CONFIG_PRINTK_TIME is not set |
| 1370 | CONFIG_DEBUG_KERNEL=y | ||
| 1371 | CONFIG_MAGIC_SYSRQ=y | 1330 | CONFIG_MAGIC_SYSRQ=y |
| 1331 | CONFIG_DEBUG_KERNEL=y | ||
| 1372 | CONFIG_LOG_BUF_SHIFT=17 | 1332 | CONFIG_LOG_BUF_SHIFT=17 |
| 1373 | CONFIG_DETECT_SOFTLOCKUP=y | 1333 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1374 | # CONFIG_SCHEDSTATS is not set | 1334 | # CONFIG_SCHEDSTATS is not set |
| 1375 | # CONFIG_DEBUG_SLAB is not set | 1335 | # CONFIG_DEBUG_SLAB is not set |
| 1336 | CONFIG_DEBUG_MUTEXES=y | ||
| 1376 | # CONFIG_DEBUG_SPINLOCK is not set | 1337 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1377 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1338 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1378 | # CONFIG_DEBUG_KOBJECT is not set | 1339 | # CONFIG_DEBUG_KOBJECT is not set |
| 1379 | # CONFIG_DEBUG_INFO is not set | 1340 | # CONFIG_DEBUG_INFO is not set |
| 1380 | CONFIG_DEBUG_FS=y | 1341 | CONFIG_DEBUG_FS=y |
| 1381 | # CONFIG_DEBUG_VM is not set | 1342 | # CONFIG_DEBUG_VM is not set |
| 1343 | CONFIG_FORCED_INLINING=y | ||
| 1382 | # CONFIG_RCU_TORTURE_TEST is not set | 1344 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1383 | CONFIG_DEBUG_STACKOVERFLOW=y | 1345 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 1384 | CONFIG_DEBUG_STACK_USAGE=y | 1346 | CONFIG_DEBUG_STACK_USAGE=y |
| @@ -1387,6 +1349,11 @@ CONFIG_XMON=y | |||
| 1387 | CONFIG_XMON_DEFAULT=y | 1349 | CONFIG_XMON_DEFAULT=y |
| 1388 | CONFIG_IRQSTACKS=y | 1350 | CONFIG_IRQSTACKS=y |
| 1389 | # CONFIG_BOOTX_TEXT is not set | 1351 | # CONFIG_BOOTX_TEXT is not set |
| 1352 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | ||
| 1353 | # CONFIG_PPC_EARLY_DEBUG_G5 is not set | ||
| 1354 | # CONFIG_PPC_EARLY_DEBUG_RTAS is not set | ||
| 1355 | # CONFIG_PPC_EARLY_DEBUG_MAPLE is not set | ||
| 1356 | # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set | ||
| 1390 | 1357 | ||
| 1391 | # | 1358 | # |
| 1392 | # Security options | 1359 | # Security options |
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index 8c21d378f5d2..778f22fd85d2 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c | |||
| @@ -134,8 +134,10 @@ static void crash_kexec_prepare_cpus(void) | |||
| 134 | * the crash CPU will send an IPI and wait for other CPUs to | 134 | * the crash CPU will send an IPI and wait for other CPUs to |
| 135 | * respond. If not, proceed the kexec boot even though we failed to | 135 | * respond. If not, proceed the kexec boot even though we failed to |
| 136 | * capture other CPU states. | 136 | * capture other CPU states. |
| 137 | * Delay of at least 10 seconds. | ||
| 137 | */ | 138 | */ |
| 138 | msecs = 1000000; | 139 | printk(KERN_ALERT "Sending IPI to other cpus...\n"); |
| 140 | msecs = 10000; | ||
| 139 | while ((atomic_read(&waiting_for_crash_ipi) > 0) && (--msecs > 0)) { | 141 | while ((atomic_read(&waiting_for_crash_ipi) > 0) && (--msecs > 0)) { |
| 140 | barrier(); | 142 | barrier(); |
| 141 | mdelay(1); | 143 | mdelay(1); |
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index 03b25f9359f8..a0579e859b21 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S | |||
| @@ -714,6 +714,7 @@ AltiVecUnavailable: | |||
| 714 | #ifdef CONFIG_ALTIVEC | 714 | #ifdef CONFIG_ALTIVEC |
| 715 | bne load_up_altivec /* if from user, just load it up */ | 715 | bne load_up_altivec /* if from user, just load it up */ |
| 716 | #endif /* CONFIG_ALTIVEC */ | 716 | #endif /* CONFIG_ALTIVEC */ |
| 717 | addi r3,r1,STACK_FRAME_OVERHEAD | ||
| 717 | EXC_XFER_EE_LITE(0xf20, altivec_unavailable_exception) | 718 | EXC_XFER_EE_LITE(0xf20, altivec_unavailable_exception) |
| 718 | 719 | ||
| 719 | PerformanceMonitor: | 720 | PerformanceMonitor: |
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index 2b03a09fe5e9..11f2cd5af7dc 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S | |||
| @@ -139,7 +139,7 @@ _GLOBAL(__secondary_hold) | |||
| 139 | ori r24,r24,MSR_RI | 139 | ori r24,r24,MSR_RI |
| 140 | mtmsrd r24 /* RI on */ | 140 | mtmsrd r24 /* RI on */ |
| 141 | 141 | ||
| 142 | /* Grab our linux cpu number */ | 142 | /* Grab our physical cpu number */ |
| 143 | mr r24,r3 | 143 | mr r24,r3 |
| 144 | 144 | ||
| 145 | /* Tell the master cpu we're here */ | 145 | /* Tell the master cpu we're here */ |
| @@ -153,11 +153,7 @@ _GLOBAL(__secondary_hold) | |||
| 153 | cmpdi 0,r4,1 | 153 | cmpdi 0,r4,1 |
| 154 | bne 100b | 154 | bne 100b |
| 155 | 155 | ||
| 156 | #ifdef CONFIG_HMT | 156 | #if defined(CONFIG_SMP) || defined(CONFIG_KEXEC) |
| 157 | SET_REG_IMMEDIATE(r4, .hmt_init) | ||
| 158 | mtctr r4 | ||
| 159 | bctr | ||
| 160 | #elif defined(CONFIG_SMP) || defined(CONFIG_KEXEC) | ||
| 161 | LOAD_REG_IMMEDIATE(r4, .pSeries_secondary_smp_init) | 157 | LOAD_REG_IMMEDIATE(r4, .pSeries_secondary_smp_init) |
| 162 | mtctr r4 | 158 | mtctr r4 |
| 163 | mr r3,r24 | 159 | mr r3,r24 |
| @@ -319,7 +315,6 @@ exception_marker: | |||
| 319 | label##_pSeries: \ | 315 | label##_pSeries: \ |
| 320 | HMT_MEDIUM; \ | 316 | HMT_MEDIUM; \ |
| 321 | mtspr SPRN_SPRG1,r13; /* save r13 */ \ | 317 | mtspr SPRN_SPRG1,r13; /* save r13 */ \ |
| 322 | RUNLATCH_ON(r13); \ | ||
| 323 | EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common) | 318 | EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common) |
| 324 | 319 | ||
| 325 | #define STD_EXCEPTION_ISERIES(n, label, area) \ | 320 | #define STD_EXCEPTION_ISERIES(n, label, area) \ |
| @@ -327,7 +322,6 @@ label##_pSeries: \ | |||
| 327 | label##_iSeries: \ | 322 | label##_iSeries: \ |
| 328 | HMT_MEDIUM; \ | 323 | HMT_MEDIUM; \ |
| 329 | mtspr SPRN_SPRG1,r13; /* save r13 */ \ | 324 | mtspr SPRN_SPRG1,r13; /* save r13 */ \ |
| 330 | RUNLATCH_ON(r13); \ | ||
| 331 | EXCEPTION_PROLOG_ISERIES_1(area); \ | 325 | EXCEPTION_PROLOG_ISERIES_1(area); \ |
| 332 | EXCEPTION_PROLOG_ISERIES_2; \ | 326 | EXCEPTION_PROLOG_ISERIES_2; \ |
| 333 | b label##_common | 327 | b label##_common |
| @@ -337,7 +331,6 @@ label##_iSeries: \ | |||
| 337 | label##_iSeries: \ | 331 | label##_iSeries: \ |
| 338 | HMT_MEDIUM; \ | 332 | HMT_MEDIUM; \ |
| 339 | mtspr SPRN_SPRG1,r13; /* save r13 */ \ | 333 | mtspr SPRN_SPRG1,r13; /* save r13 */ \ |
| 340 | RUNLATCH_ON(r13); \ | ||
| 341 | EXCEPTION_PROLOG_ISERIES_1(PACA_EXGEN); \ | 334 | EXCEPTION_PROLOG_ISERIES_1(PACA_EXGEN); \ |
| 342 | lbz r10,PACAPROCENABLED(r13); \ | 335 | lbz r10,PACAPROCENABLED(r13); \ |
| 343 | cmpwi 0,r10,0; \ | 336 | cmpwi 0,r10,0; \ |
| @@ -390,6 +383,7 @@ label##_common: \ | |||
| 390 | label##_common: \ | 383 | label##_common: \ |
| 391 | EXCEPTION_PROLOG_COMMON(trap, PACA_EXGEN); \ | 384 | EXCEPTION_PROLOG_COMMON(trap, PACA_EXGEN); \ |
| 392 | DISABLE_INTS; \ | 385 | DISABLE_INTS; \ |
| 386 | bl .ppc64_runlatch_on; \ | ||
| 393 | addi r3,r1,STACK_FRAME_OVERHEAD; \ | 387 | addi r3,r1,STACK_FRAME_OVERHEAD; \ |
| 394 | bl hdlr; \ | 388 | bl hdlr; \ |
| 395 | b .ret_from_except_lite | 389 | b .ret_from_except_lite |
| @@ -407,7 +401,6 @@ __start_interrupts: | |||
| 407 | _machine_check_pSeries: | 401 | _machine_check_pSeries: |
| 408 | HMT_MEDIUM | 402 | HMT_MEDIUM |
| 409 | mtspr SPRN_SPRG1,r13 /* save r13 */ | 403 | mtspr SPRN_SPRG1,r13 /* save r13 */ |
| 410 | RUNLATCH_ON(r13) | ||
| 411 | EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common) | 404 | EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common) |
| 412 | 405 | ||
| 413 | . = 0x300 | 406 | . = 0x300 |
| @@ -434,7 +427,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SLB) | |||
| 434 | data_access_slb_pSeries: | 427 | data_access_slb_pSeries: |
| 435 | HMT_MEDIUM | 428 | HMT_MEDIUM |
| 436 | mtspr SPRN_SPRG1,r13 | 429 | mtspr SPRN_SPRG1,r13 |
| 437 | RUNLATCH_ON(r13) | ||
| 438 | mfspr r13,SPRN_SPRG3 /* get paca address into r13 */ | 430 | mfspr r13,SPRN_SPRG3 /* get paca address into r13 */ |
| 439 | std r3,PACA_EXSLB+EX_R3(r13) | 431 | std r3,PACA_EXSLB+EX_R3(r13) |
| 440 | mfspr r3,SPRN_DAR | 432 | mfspr r3,SPRN_DAR |
| @@ -460,7 +452,6 @@ data_access_slb_pSeries: | |||
| 460 | instruction_access_slb_pSeries: | 452 | instruction_access_slb_pSeries: |
| 461 | HMT_MEDIUM | 453 | HMT_MEDIUM |
| 462 | mtspr SPRN_SPRG1,r13 | 454 | mtspr SPRN_SPRG1,r13 |
| 463 | RUNLATCH_ON(r13) | ||
| 464 | mfspr r13,SPRN_SPRG3 /* get paca address into r13 */ | 455 | mfspr r13,SPRN_SPRG3 /* get paca address into r13 */ |
| 465 | std r3,PACA_EXSLB+EX_R3(r13) | 456 | std r3,PACA_EXSLB+EX_R3(r13) |
| 466 | mfspr r3,SPRN_SRR0 /* SRR0 is faulting address */ | 457 | mfspr r3,SPRN_SRR0 /* SRR0 is faulting address */ |
| @@ -491,7 +482,6 @@ instruction_access_slb_pSeries: | |||
| 491 | .globl system_call_pSeries | 482 | .globl system_call_pSeries |
| 492 | system_call_pSeries: | 483 | system_call_pSeries: |
| 493 | HMT_MEDIUM | 484 | HMT_MEDIUM |
| 494 | RUNLATCH_ON(r9) | ||
| 495 | mr r9,r13 | 485 | mr r9,r13 |
| 496 | mfmsr r10 | 486 | mfmsr r10 |
| 497 | mfspr r13,SPRN_SPRG3 | 487 | mfspr r13,SPRN_SPRG3 |
| @@ -575,7 +565,6 @@ slb_miss_user_pseries: | |||
| 575 | system_reset_fwnmi: | 565 | system_reset_fwnmi: |
| 576 | HMT_MEDIUM | 566 | HMT_MEDIUM |
| 577 | mtspr SPRN_SPRG1,r13 /* save r13 */ | 567 | mtspr SPRN_SPRG1,r13 /* save r13 */ |
| 578 | RUNLATCH_ON(r13) | ||
| 579 | EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common) | 568 | EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common) |
| 580 | 569 | ||
| 581 | .globl machine_check_fwnmi | 570 | .globl machine_check_fwnmi |
| @@ -583,7 +572,6 @@ system_reset_fwnmi: | |||
| 583 | machine_check_fwnmi: | 572 | machine_check_fwnmi: |
| 584 | HMT_MEDIUM | 573 | HMT_MEDIUM |
| 585 | mtspr SPRN_SPRG1,r13 /* save r13 */ | 574 | mtspr SPRN_SPRG1,r13 /* save r13 */ |
| 586 | RUNLATCH_ON(r13) | ||
| 587 | EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common) | 575 | EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common) |
| 588 | 576 | ||
| 589 | #ifdef CONFIG_PPC_ISERIES | 577 | #ifdef CONFIG_PPC_ISERIES |
| @@ -894,7 +882,6 @@ unrecov_fer: | |||
| 894 | .align 7 | 882 | .align 7 |
| 895 | .globl data_access_common | 883 | .globl data_access_common |
| 896 | data_access_common: | 884 | data_access_common: |
| 897 | RUNLATCH_ON(r10) /* It wont fit in the 0x300 handler */ | ||
| 898 | mfspr r10,SPRN_DAR | 885 | mfspr r10,SPRN_DAR |
| 899 | std r10,PACA_EXGEN+EX_DAR(r13) | 886 | std r10,PACA_EXGEN+EX_DAR(r13) |
| 900 | mfspr r10,SPRN_DSISR | 887 | mfspr r10,SPRN_DSISR |
| @@ -1042,6 +1029,7 @@ hardware_interrupt_common: | |||
| 1042 | EXCEPTION_PROLOG_COMMON(0x500, PACA_EXGEN) | 1029 | EXCEPTION_PROLOG_COMMON(0x500, PACA_EXGEN) |
| 1043 | hardware_interrupt_entry: | 1030 | hardware_interrupt_entry: |
| 1044 | DISABLE_INTS | 1031 | DISABLE_INTS |
| 1032 | bl .ppc64_runlatch_on | ||
| 1045 | addi r3,r1,STACK_FRAME_OVERHEAD | 1033 | addi r3,r1,STACK_FRAME_OVERHEAD |
| 1046 | bl .do_IRQ | 1034 | bl .do_IRQ |
| 1047 | b .ret_from_except_lite | 1035 | b .ret_from_except_lite |
| @@ -1816,22 +1804,6 @@ _STATIC(start_here_multiplatform) | |||
| 1816 | ori r6,r6,MSR_RI | 1804 | ori r6,r6,MSR_RI |
| 1817 | mtmsrd r6 /* RI on */ | 1805 | mtmsrd r6 /* RI on */ |
| 1818 | 1806 | ||
| 1819 | #ifdef CONFIG_HMT | ||
| 1820 | /* Start up the second thread on cpu 0 */ | ||
| 1821 | mfspr r3,SPRN_PVR | ||
| 1822 | srwi r3,r3,16 | ||
| 1823 | cmpwi r3,0x34 /* Pulsar */ | ||
| 1824 | beq 90f | ||
| 1825 | cmpwi r3,0x36 /* Icestar */ | ||
| 1826 | beq 90f | ||
| 1827 | cmpwi r3,0x37 /* SStar */ | ||
| 1828 | beq 90f | ||
| 1829 | b 91f /* HMT not supported */ | ||
| 1830 | 90: li r3,0 | ||
| 1831 | bl .hmt_start_secondary | ||
| 1832 | 91: | ||
| 1833 | #endif | ||
| 1834 | |||
| 1835 | /* The following gets the stack and TOC set up with the regs */ | 1807 | /* The following gets the stack and TOC set up with the regs */ |
| 1836 | /* pointing to the real addr of the kernel stack. This is */ | 1808 | /* pointing to the real addr of the kernel stack. This is */ |
| 1837 | /* all done to support the C function call below which sets */ | 1809 | /* all done to support the C function call below which sets */ |
| @@ -1945,77 +1917,8 @@ _STATIC(start_here_common) | |||
| 1945 | 1917 | ||
| 1946 | bl .start_kernel | 1918 | bl .start_kernel |
| 1947 | 1919 | ||
| 1948 | _GLOBAL(hmt_init) | 1920 | /* Not reached */ |
| 1949 | #ifdef CONFIG_HMT | 1921 | BUG_OPCODE |
| 1950 | LOAD_REG_IMMEDIATE(r5, hmt_thread_data) | ||
| 1951 | mfspr r7,SPRN_PVR | ||
| 1952 | srwi r7,r7,16 | ||
| 1953 | cmpwi r7,0x34 /* Pulsar */ | ||
| 1954 | beq 90f | ||
| 1955 | cmpwi r7,0x36 /* Icestar */ | ||
| 1956 | beq 91f | ||
| 1957 | cmpwi r7,0x37 /* SStar */ | ||
| 1958 | beq 91f | ||
| 1959 | b 101f | ||
| 1960 | 90: mfspr r6,SPRN_PIR | ||
| 1961 | andi. r6,r6,0x1f | ||
| 1962 | b 92f | ||
| 1963 | 91: mfspr r6,SPRN_PIR | ||
| 1964 | andi. r6,r6,0x3ff | ||
| 1965 | 92: sldi r4,r24,3 | ||
| 1966 | stwx r6,r5,r4 | ||
| 1967 | bl .hmt_start_secondary | ||
| 1968 | b 101f | ||
| 1969 | |||
| 1970 | __hmt_secondary_hold: | ||
| 1971 | LOAD_REG_IMMEDIATE(r5, hmt_thread_data) | ||
| 1972 | clrldi r5,r5,4 | ||
| 1973 | li r7,0 | ||
| 1974 | mfspr r6,SPRN_PIR | ||
| 1975 | mfspr r8,SPRN_PVR | ||
| 1976 | srwi r8,r8,16 | ||
| 1977 | cmpwi r8,0x34 | ||
| 1978 | bne 93f | ||
| 1979 | andi. r6,r6,0x1f | ||
| 1980 | b 103f | ||
| 1981 | 93: andi. r6,r6,0x3f | ||
| 1982 | |||
| 1983 | 103: lwzx r8,r5,r7 | ||
| 1984 | cmpw r8,r6 | ||
| 1985 | beq 104f | ||
| 1986 | addi r7,r7,8 | ||
| 1987 | b 103b | ||
| 1988 | |||
| 1989 | 104: addi r7,r7,4 | ||
| 1990 | lwzx r9,r5,r7 | ||
| 1991 | mr r24,r9 | ||
| 1992 | 101: | ||
| 1993 | #endif | ||
| 1994 | mr r3,r24 | ||
| 1995 | b .pSeries_secondary_smp_init | ||
| 1996 | |||
| 1997 | #ifdef CONFIG_HMT | ||
| 1998 | _GLOBAL(hmt_start_secondary) | ||
| 1999 | LOAD_REG_IMMEDIATE(r4,__hmt_secondary_hold) | ||
| 2000 | clrldi r4,r4,4 | ||
| 2001 | mtspr SPRN_NIADORM, r4 | ||
| 2002 | mfspr r4, SPRN_MSRDORM | ||
| 2003 | li r5, -65 | ||
| 2004 | and r4, r4, r5 | ||
| 2005 | mtspr SPRN_MSRDORM, r4 | ||
| 2006 | lis r4,0xffef | ||
| 2007 | ori r4,r4,0x7403 | ||
| 2008 | mtspr SPRN_TSC, r4 | ||
| 2009 | li r4,0x1f4 | ||
| 2010 | mtspr SPRN_TST, r4 | ||
| 2011 | mfspr r4, SPRN_HID0 | ||
| 2012 | ori r4, r4, 0x1 | ||
| 2013 | mtspr SPRN_HID0, r4 | ||
| 2014 | mfspr r4, SPRN_CTRLF | ||
| 2015 | oris r4, r4, 0x40 | ||
| 2016 | mtspr SPRN_CTRLT, r4 | ||
| 2017 | blr | ||
| 2018 | #endif | ||
| 2019 | 1922 | ||
| 2020 | /* | 1923 | /* |
| 2021 | * We put a few things here that have to be page-aligned. | 1924 | * We put a few things here that have to be page-aligned. |
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c index d6431440c54f..ee166c586642 100644 --- a/arch/powerpc/kernel/machine_kexec_64.c +++ b/arch/powerpc/kernel/machine_kexec_64.c | |||
| @@ -26,8 +26,6 @@ | |||
| 26 | #include <asm/prom.h> | 26 | #include <asm/prom.h> |
| 27 | #include <asm/smp.h> | 27 | #include <asm/smp.h> |
| 28 | 28 | ||
| 29 | #define HASH_GROUP_SIZE 0x80 /* size of each hash group, asm/mmu.h */ | ||
| 30 | |||
| 31 | int default_machine_kexec_prepare(struct kimage *image) | 29 | int default_machine_kexec_prepare(struct kimage *image) |
| 32 | { | 30 | { |
| 33 | int i; | 31 | int i; |
| @@ -61,7 +59,7 @@ int default_machine_kexec_prepare(struct kimage *image) | |||
| 61 | */ | 59 | */ |
| 62 | if (htab_address) { | 60 | if (htab_address) { |
| 63 | low = __pa(htab_address); | 61 | low = __pa(htab_address); |
| 64 | high = low + (htab_hash_mask + 1) * HASH_GROUP_SIZE; | 62 | high = low + htab_size_bytes; |
| 65 | 63 | ||
| 66 | for (i = 0; i < image->nr_segments; i++) { | 64 | for (i = 0; i < image->nr_segments; i++) { |
| 67 | begin = image->segment[i].mem; | 65 | begin = image->segment[i].mem; |
| @@ -294,7 +292,7 @@ void default_machine_kexec(struct kimage *image) | |||
| 294 | } | 292 | } |
| 295 | 293 | ||
| 296 | /* Values we need to export to the second kernel via the device tree. */ | 294 | /* Values we need to export to the second kernel via the device tree. */ |
| 297 | static unsigned long htab_base, htab_size, kernel_end; | 295 | static unsigned long htab_base, kernel_end; |
| 298 | 296 | ||
| 299 | static struct property htab_base_prop = { | 297 | static struct property htab_base_prop = { |
| 300 | .name = "linux,htab-base", | 298 | .name = "linux,htab-base", |
| @@ -305,7 +303,7 @@ static struct property htab_base_prop = { | |||
| 305 | static struct property htab_size_prop = { | 303 | static struct property htab_size_prop = { |
| 306 | .name = "linux,htab-size", | 304 | .name = "linux,htab-size", |
| 307 | .length = sizeof(unsigned long), | 305 | .length = sizeof(unsigned long), |
| 308 | .value = (unsigned char *)&htab_size, | 306 | .value = (unsigned char *)&htab_size_bytes, |
| 309 | }; | 307 | }; |
| 310 | 308 | ||
| 311 | static struct property kernel_end_prop = { | 309 | static struct property kernel_end_prop = { |
| @@ -331,8 +329,6 @@ static void __init export_htab_values(void) | |||
| 331 | 329 | ||
| 332 | htab_base = __pa(htab_address); | 330 | htab_base = __pa(htab_address); |
| 333 | prom_add_property(node, &htab_base_prop); | 331 | prom_add_property(node, &htab_base_prop); |
| 334 | |||
| 335 | htab_size = 1UL << ppc64_pft_size; | ||
| 336 | prom_add_property(node, &htab_size_prop); | 332 | prom_add_property(node, &htab_size_prop); |
| 337 | 333 | ||
| 338 | out: | 334 | out: |
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 57703994a063..c225cf154bfe 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c | |||
| @@ -888,3 +888,35 @@ void dump_stack(void) | |||
| 888 | show_stack(current, NULL); | 888 | show_stack(current, NULL); |
| 889 | } | 889 | } |
| 890 | EXPORT_SYMBOL(dump_stack); | 890 | EXPORT_SYMBOL(dump_stack); |
| 891 | |||
| 892 | #ifdef CONFIG_PPC64 | ||
| 893 | void ppc64_runlatch_on(void) | ||
| 894 | { | ||
| 895 | unsigned long ctrl; | ||
| 896 | |||
| 897 | if (cpu_has_feature(CPU_FTR_CTRL) && !test_thread_flag(TIF_RUNLATCH)) { | ||
| 898 | HMT_medium(); | ||
| 899 | |||
| 900 | ctrl = mfspr(SPRN_CTRLF); | ||
| 901 | ctrl |= CTRL_RUNLATCH; | ||
| 902 | mtspr(SPRN_CTRLT, ctrl); | ||
| 903 | |||
| 904 | set_thread_flag(TIF_RUNLATCH); | ||
| 905 | } | ||
| 906 | } | ||
| 907 | |||
| 908 | void ppc64_runlatch_off(void) | ||
| 909 | { | ||
| 910 | unsigned long ctrl; | ||
| 911 | |||
| 912 | if (cpu_has_feature(CPU_FTR_CTRL) && test_thread_flag(TIF_RUNLATCH)) { | ||
| 913 | HMT_medium(); | ||
| 914 | |||
| 915 | clear_thread_flag(TIF_RUNLATCH); | ||
| 916 | |||
| 917 | ctrl = mfspr(SPRN_CTRLF); | ||
| 918 | ctrl &= ~CTRL_RUNLATCH; | ||
| 919 | mtspr(SPRN_CTRLT, ctrl); | ||
| 920 | } | ||
| 921 | } | ||
| 922 | #endif | ||
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 294832a7e0a6..6dbd21726770 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
| @@ -816,8 +816,6 @@ void __init unflatten_device_tree(void) | |||
| 816 | { | 816 | { |
| 817 | unsigned long start, mem, size; | 817 | unsigned long start, mem, size; |
| 818 | struct device_node **allnextp = &allnodes; | 818 | struct device_node **allnextp = &allnodes; |
| 819 | char *p = NULL; | ||
| 820 | int l = 0; | ||
| 821 | 819 | ||
| 822 | DBG(" -> unflatten_device_tree()\n"); | 820 | DBG(" -> unflatten_device_tree()\n"); |
| 823 | 821 | ||
| @@ -857,19 +855,6 @@ void __init unflatten_device_tree(void) | |||
| 857 | if (of_chosen == NULL) | 855 | if (of_chosen == NULL) |
| 858 | of_chosen = of_find_node_by_path("/chosen@0"); | 856 | of_chosen = of_find_node_by_path("/chosen@0"); |
| 859 | 857 | ||
| 860 | /* Retreive command line */ | ||
| 861 | if (of_chosen != NULL) { | ||
| 862 | p = (char *)get_property(of_chosen, "bootargs", &l); | ||
| 863 | if (p != NULL && l > 0) | ||
| 864 | strlcpy(cmd_line, p, min(l, COMMAND_LINE_SIZE)); | ||
| 865 | } | ||
| 866 | #ifdef CONFIG_CMDLINE | ||
| 867 | if (l == 0 || (l == 1 && (*p) == 0)) | ||
| 868 | strlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE); | ||
| 869 | #endif /* CONFIG_CMDLINE */ | ||
| 870 | |||
| 871 | DBG("Command line is: %s\n", cmd_line); | ||
| 872 | |||
| 873 | DBG(" <- unflatten_device_tree()\n"); | 858 | DBG(" <- unflatten_device_tree()\n"); |
| 874 | } | 859 | } |
| 875 | 860 | ||
| @@ -940,6 +925,8 @@ static int __init early_init_dt_scan_chosen(unsigned long node, | |||
| 940 | { | 925 | { |
| 941 | u32 *prop; | 926 | u32 *prop; |
| 942 | unsigned long *lprop; | 927 | unsigned long *lprop; |
| 928 | unsigned long l; | ||
| 929 | char *p; | ||
| 943 | 930 | ||
| 944 | DBG("search \"chosen\", depth: %d, uname: %s\n", depth, uname); | 931 | DBG("search \"chosen\", depth: %d, uname: %s\n", depth, uname); |
| 945 | 932 | ||
| @@ -1004,6 +991,41 @@ static int __init early_init_dt_scan_chosen(unsigned long node, | |||
| 1004 | crashk_res.end = crashk_res.start + *lprop - 1; | 991 | crashk_res.end = crashk_res.start + *lprop - 1; |
| 1005 | #endif | 992 | #endif |
| 1006 | 993 | ||
| 994 | /* Retreive command line */ | ||
| 995 | p = of_get_flat_dt_prop(node, "bootargs", &l); | ||
| 996 | if (p != NULL && l > 0) | ||
| 997 | strlcpy(cmd_line, p, min((int)l, COMMAND_LINE_SIZE)); | ||
| 998 | |||
| 999 | #ifdef CONFIG_CMDLINE | ||
| 1000 | if (l == 0 || (l == 1 && (*p) == 0)) | ||
| 1001 | strlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE); | ||
| 1002 | #endif /* CONFIG_CMDLINE */ | ||
| 1003 | |||
| 1004 | DBG("Command line is: %s\n", cmd_line); | ||
| 1005 | |||
| 1006 | if (strstr(cmd_line, "mem=")) { | ||
| 1007 | char *p, *q; | ||
| 1008 | unsigned long maxmem = 0; | ||
| 1009 | |||
| 1010 | for (q = cmd_line; (p = strstr(q, "mem=")) != 0; ) { | ||
| 1011 | q = p + 4; | ||
| 1012 | if (p > cmd_line && p[-1] != ' ') | ||
| 1013 | continue; | ||
| 1014 | maxmem = simple_strtoul(q, &q, 0); | ||
| 1015 | if (*q == 'k' || *q == 'K') { | ||
| 1016 | maxmem <<= 10; | ||
| 1017 | ++q; | ||
| 1018 | } else if (*q == 'm' || *q == 'M') { | ||
| 1019 | maxmem <<= 20; | ||
| 1020 | ++q; | ||
| 1021 | } else if (*q == 'g' || *q == 'G') { | ||
| 1022 | maxmem <<= 30; | ||
| 1023 | ++q; | ||
| 1024 | } | ||
| 1025 | } | ||
| 1026 | memory_limit = maxmem; | ||
| 1027 | } | ||
| 1028 | |||
| 1007 | /* break now */ | 1029 | /* break now */ |
| 1008 | return 1; | 1030 | return 1; |
| 1009 | } | 1031 | } |
| @@ -1124,7 +1146,7 @@ static void __init early_reserve_mem(void) | |||
| 1124 | size_32 = *(reserve_map_32++); | 1146 | size_32 = *(reserve_map_32++); |
| 1125 | if (size_32 == 0) | 1147 | if (size_32 == 0) |
| 1126 | break; | 1148 | break; |
| 1127 | DBG("reserving: %lx -> %lx\n", base_32, size_32); | 1149 | DBG("reserving: %x -> %x\n", base_32, size_32); |
| 1128 | lmb_reserve(base_32, size_32); | 1150 | lmb_reserve(base_32, size_32); |
| 1129 | } | 1151 | } |
| 1130 | return; | 1152 | return; |
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index ec7153f4d47c..d34fe537400e 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
| @@ -205,14 +205,6 @@ static cell_t __initdata regbuf[1024]; | |||
| 205 | 205 | ||
| 206 | #define MAX_CPU_THREADS 2 | 206 | #define MAX_CPU_THREADS 2 |
| 207 | 207 | ||
| 208 | /* TO GO */ | ||
| 209 | #ifdef CONFIG_HMT | ||
| 210 | struct { | ||
| 211 | unsigned int pir; | ||
| 212 | unsigned int threadid; | ||
| 213 | } hmt_thread_data[NR_CPUS]; | ||
| 214 | #endif /* CONFIG_HMT */ | ||
| 215 | |||
| 216 | /* | 208 | /* |
| 217 | * Error results ... some OF calls will return "-1" on error, some | 209 | * Error results ... some OF calls will return "-1" on error, some |
| 218 | * will return 0, some will return either. To simplify, here are | 210 | * will return 0, some will return either. To simplify, here are |
| @@ -1319,10 +1311,6 @@ static void __init prom_hold_cpus(void) | |||
| 1319 | */ | 1311 | */ |
| 1320 | *spinloop = 0; | 1312 | *spinloop = 0; |
| 1321 | 1313 | ||
| 1322 | #ifdef CONFIG_HMT | ||
| 1323 | for (i = 0; i < NR_CPUS; i++) | ||
| 1324 | RELOC(hmt_thread_data)[i].pir = 0xdeadbeef; | ||
| 1325 | #endif | ||
| 1326 | /* look for cpus */ | 1314 | /* look for cpus */ |
| 1327 | for (node = 0; prom_next_node(&node); ) { | 1315 | for (node = 0; prom_next_node(&node); ) { |
| 1328 | type[0] = 0; | 1316 | type[0] = 0; |
| @@ -1389,32 +1377,6 @@ static void __init prom_hold_cpus(void) | |||
| 1389 | /* Reserve cpu #s for secondary threads. They start later. */ | 1377 | /* Reserve cpu #s for secondary threads. They start later. */ |
| 1390 | cpuid += cpu_threads; | 1378 | cpuid += cpu_threads; |
| 1391 | } | 1379 | } |
| 1392 | #ifdef CONFIG_HMT | ||
| 1393 | /* Only enable HMT on processors that provide support. */ | ||
| 1394 | if (__is_processor(PV_PULSAR) || | ||
| 1395 | __is_processor(PV_ICESTAR) || | ||
| 1396 | __is_processor(PV_SSTAR)) { | ||
| 1397 | prom_printf(" starting secondary threads\n"); | ||
| 1398 | |||
| 1399 | for (i = 0; i < NR_CPUS; i += 2) { | ||
| 1400 | if (!cpu_online(i)) | ||
| 1401 | continue; | ||
| 1402 | |||
| 1403 | if (i == 0) { | ||
| 1404 | unsigned long pir = mfspr(SPRN_PIR); | ||
| 1405 | if (__is_processor(PV_PULSAR)) { | ||
| 1406 | RELOC(hmt_thread_data)[i].pir = | ||
| 1407 | pir & 0x1f; | ||
| 1408 | } else { | ||
| 1409 | RELOC(hmt_thread_data)[i].pir = | ||
| 1410 | pir & 0x3ff; | ||
| 1411 | } | ||
| 1412 | } | ||
| 1413 | } | ||
| 1414 | } else { | ||
| 1415 | prom_printf("Processor is not HMT capable\n"); | ||
| 1416 | } | ||
| 1417 | #endif | ||
| 1418 | 1380 | ||
| 1419 | if (cpuid > NR_CPUS) | 1381 | if (cpuid > NR_CPUS) |
| 1420 | prom_printf("WARNING: maximum CPUs (" __stringify(NR_CPUS) | 1382 | prom_printf("WARNING: maximum CPUs (" __stringify(NR_CPUS) |
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index f0c47dab0903..04f7df39ffbb 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c | |||
| @@ -182,8 +182,8 @@ static struct page * vdso_vma_nopage(struct vm_area_struct * vma, | |||
| 182 | unsigned long offset = address - vma->vm_start; | 182 | unsigned long offset = address - vma->vm_start; |
| 183 | struct page *pg; | 183 | struct page *pg; |
| 184 | #ifdef CONFIG_PPC64 | 184 | #ifdef CONFIG_PPC64 |
| 185 | void *vbase = test_thread_flag(TIF_32BIT) ? | 185 | void *vbase = (vma->vm_mm->task_size > TASK_SIZE_USER32) ? |
| 186 | vdso32_kbase : vdso64_kbase; | 186 | vdso64_kbase : vdso32_kbase; |
| 187 | #else | 187 | #else |
| 188 | void *vbase = vdso32_kbase; | 188 | void *vbase = vdso32_kbase; |
| 189 | #endif | 189 | #endif |
diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S index ccaeda5136d1..4ee871f1cadb 100644 --- a/arch/powerpc/kernel/vdso64/gettimeofday.S +++ b/arch/powerpc/kernel/vdso64/gettimeofday.S | |||
| @@ -225,9 +225,9 @@ V_FUNCTION_BEGIN(__do_get_xsec) | |||
| 225 | .cfi_startproc | 225 | .cfi_startproc |
| 226 | /* check for update count & load values */ | 226 | /* check for update count & load values */ |
| 227 | 1: ld r8,CFG_TB_UPDATE_COUNT(r3) | 227 | 1: ld r8,CFG_TB_UPDATE_COUNT(r3) |
| 228 | andi. r0,r4,1 /* pending update ? loop */ | 228 | andi. r0,r8,1 /* pending update ? loop */ |
| 229 | bne- 1b | 229 | bne- 1b |
| 230 | xor r0,r4,r4 /* create dependency */ | 230 | xor r0,r8,r8 /* create dependency */ |
| 231 | add r3,r3,r0 | 231 | add r3,r3,r0 |
| 232 | 232 | ||
| 233 | /* Get TB & offset it */ | 233 | /* Get TB & offset it */ |
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c index d96bcfe4c6f6..33654d1b1b43 100644 --- a/arch/powerpc/mm/hash_native_64.c +++ b/arch/powerpc/mm/hash_native_64.c | |||
| @@ -403,12 +403,17 @@ static void native_hpte_clear(void) | |||
| 403 | */ | 403 | */ |
| 404 | hpte_v = hptep->v; | 404 | hpte_v = hptep->v; |
| 405 | 405 | ||
| 406 | /* | ||
| 407 | * Call __tlbie() here rather than tlbie() since we | ||
| 408 | * already hold the native_tlbie_lock. | ||
| 409 | */ | ||
| 406 | if (hpte_v & HPTE_V_VALID) { | 410 | if (hpte_v & HPTE_V_VALID) { |
| 407 | hptep->v = 0; | 411 | hptep->v = 0; |
| 408 | tlbie(slot2va(hpte_v, slot), MMU_PAGE_4K, 0); | 412 | __tlbie(slot2va(hpte_v, slot), MMU_PAGE_4K); |
| 409 | } | 413 | } |
| 410 | } | 414 | } |
| 411 | 415 | ||
| 416 | asm volatile("eieio; tlbsync; ptesync":::"memory"); | ||
| 412 | spin_unlock(&native_tlbie_lock); | 417 | spin_unlock(&native_tlbie_lock); |
| 413 | local_irq_restore(flags); | 418 | local_irq_restore(flags); |
| 414 | } | 419 | } |
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 149351a84b94..e9d589eefc14 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c | |||
| @@ -88,6 +88,7 @@ static unsigned long _SDR1; | |||
| 88 | struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT]; | 88 | struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT]; |
| 89 | 89 | ||
| 90 | hpte_t *htab_address; | 90 | hpte_t *htab_address; |
| 91 | unsigned long htab_size_bytes; | ||
| 91 | unsigned long htab_hash_mask; | 92 | unsigned long htab_hash_mask; |
| 92 | int mmu_linear_psize = MMU_PAGE_4K; | 93 | int mmu_linear_psize = MMU_PAGE_4K; |
| 93 | int mmu_virtual_psize = MMU_PAGE_4K; | 94 | int mmu_virtual_psize = MMU_PAGE_4K; |
| @@ -168,7 +169,7 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend, | |||
| 168 | #ifdef CONFIG_PPC_ISERIES | 169 | #ifdef CONFIG_PPC_ISERIES |
| 169 | if (_machine == PLATFORM_ISERIES_LPAR) | 170 | if (_machine == PLATFORM_ISERIES_LPAR) |
| 170 | ret = iSeries_hpte_insert(hpteg, va, | 171 | ret = iSeries_hpte_insert(hpteg, va, |
| 171 | virt_to_abs(paddr), | 172 | __pa(vaddr), |
| 172 | tmp_mode, | 173 | tmp_mode, |
| 173 | HPTE_V_BOLTED, | 174 | HPTE_V_BOLTED, |
| 174 | psize); | 175 | psize); |
| @@ -399,7 +400,7 @@ void create_section_mapping(unsigned long start, unsigned long end) | |||
| 399 | 400 | ||
| 400 | void __init htab_initialize(void) | 401 | void __init htab_initialize(void) |
| 401 | { | 402 | { |
| 402 | unsigned long table, htab_size_bytes; | 403 | unsigned long table; |
| 403 | unsigned long pteg_count; | 404 | unsigned long pteg_count; |
| 404 | unsigned long mode_rw; | 405 | unsigned long mode_rw; |
| 405 | unsigned long base = 0, size = 0; | 406 | unsigned long base = 0, size = 0; |
diff --git a/arch/powerpc/oprofile/Kconfig b/arch/powerpc/oprofile/Kconfig index eb2dece76a54..d03c0e5ca870 100644 --- a/arch/powerpc/oprofile/Kconfig +++ b/arch/powerpc/oprofile/Kconfig | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | config PROFILING | 1 | config PROFILING |
| 2 | depends on !PPC_ISERIES | ||
| 2 | bool "Profiling support (EXPERIMENTAL)" | 3 | bool "Profiling support (EXPERIMENTAL)" |
| 3 | help | 4 | help |
| 4 | Say Y here to enable the extended profiling support mechanisms used | 5 | Say Y here to enable the extended profiling support mechanisms used |
diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c index 0b885300d1d1..8ca7b9396355 100644 --- a/arch/powerpc/platforms/iseries/lpevents.c +++ b/arch/powerpc/platforms/iseries/lpevents.c | |||
| @@ -184,6 +184,8 @@ void setup_hvlpevent_queue(void) | |||
| 184 | { | 184 | { |
| 185 | void *eventStack; | 185 | void *eventStack; |
| 186 | 186 | ||
| 187 | spin_lock_init(&hvlpevent_queue.lock); | ||
| 188 | |||
| 187 | /* Allocate a page for the Event Stack. */ | 189 | /* Allocate a page for the Event Stack. */ |
| 188 | eventStack = alloc_bootmem_pages(LpEventStackSize); | 190 | eventStack = alloc_bootmem_pages(LpEventStackSize); |
| 189 | memset(eventStack, 0, LpEventStackSize); | 191 | memset(eventStack, 0, LpEventStackSize); |
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 3f8790146b00..3ecc4a652d82 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c | |||
| @@ -648,6 +648,7 @@ static void yield_shared_processor(void) | |||
| 648 | * here and let the timer_interrupt code sort out the actual time. | 648 | * here and let the timer_interrupt code sort out the actual time. |
| 649 | */ | 649 | */ |
| 650 | get_lppaca()->int_dword.fields.decr_int = 1; | 650 | get_lppaca()->int_dword.fields.decr_int = 1; |
| 651 | ppc64_runlatch_on(); | ||
| 651 | process_iSeries_events(); | 652 | process_iSeries_events(); |
| 652 | } | 653 | } |
| 653 | 654 | ||
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c index 7d4099a34f92..85d6c93659cc 100644 --- a/arch/powerpc/platforms/maple/pci.c +++ b/arch/powerpc/platforms/maple/pci.c | |||
| @@ -435,8 +435,8 @@ void __init maple_pci_init(void) | |||
| 435 | PCI_DN(np)->busno = 0xf0; | 435 | PCI_DN(np)->busno = 0xf0; |
| 436 | } | 436 | } |
| 437 | 437 | ||
| 438 | /* Tell pci.c to use the common resource allocation mecanism */ | 438 | /* Tell pci.c to not change any resource allocations. */ |
| 439 | pci_probe_only = 0; | 439 | pci_probe_only = 1; |
| 440 | 440 | ||
| 441 | /* Allow all IO */ | 441 | /* Allow all IO */ |
| 442 | io_page_mask = -1; | 442 | io_page_mask = -1; |
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index e3fc3407bb1f..4e5c8f8d869d 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig | |||
| @@ -9,13 +9,6 @@ config PPC_SPLPAR | |||
| 9 | processors, that is, which share physical processors between | 9 | processors, that is, which share physical processors between |
| 10 | two or more partitions. | 10 | two or more partitions. |
| 11 | 11 | ||
| 12 | config HMT | ||
| 13 | bool "Hardware multithreading" | ||
| 14 | depends on SMP && PPC_PSERIES && BROKEN | ||
| 15 | help | ||
| 16 | This option enables hardware multithreading on RS64 cpus. | ||
| 17 | pSeries systems p620 and p660 have such a cpu type. | ||
| 18 | |||
| 19 | config EEH | 12 | config EEH |
| 20 | bool "PCI Extended Error Handling (EEH)" if EMBEDDED | 13 | bool "PCI Extended Error Handling (EEH)" if EMBEDDED |
| 21 | depends on PPC_PSERIES | 14 | depends on PPC_PSERIES |
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c index 83578313ee7e..2ab9dcdfb415 100644 --- a/arch/powerpc/platforms/pseries/eeh.c +++ b/arch/powerpc/platforms/pseries/eeh.c | |||
| @@ -893,6 +893,20 @@ void eeh_add_device_tree_early(struct device_node *dn) | |||
| 893 | } | 893 | } |
| 894 | EXPORT_SYMBOL_GPL(eeh_add_device_tree_early); | 894 | EXPORT_SYMBOL_GPL(eeh_add_device_tree_early); |
| 895 | 895 | ||
| 896 | void eeh_add_device_tree_late(struct pci_bus *bus) | ||
| 897 | { | ||
| 898 | struct pci_dev *dev; | ||
| 899 | |||
| 900 | list_for_each_entry(dev, &bus->devices, bus_list) { | ||
| 901 | eeh_add_device_late(dev); | ||
| 902 | if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) { | ||
| 903 | struct pci_bus *subbus = dev->subordinate; | ||
| 904 | if (subbus) | ||
| 905 | eeh_add_device_tree_late(subbus); | ||
| 906 | } | ||
| 907 | } | ||
| 908 | } | ||
| 909 | |||
| 896 | /** | 910 | /** |
| 897 | * eeh_add_device_late - perform EEH initialization for the indicated pci device | 911 | * eeh_add_device_late - perform EEH initialization for the indicated pci device |
| 898 | * @dev: pci device for which to set up EEH | 912 | * @dev: pci device for which to set up EEH |
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c index e3cbba49fd6e..b811d5ff92fe 100644 --- a/arch/powerpc/platforms/pseries/eeh_driver.c +++ b/arch/powerpc/platforms/pseries/eeh_driver.c | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | 37 | ||
| 38 | static inline const char * pcid_name (struct pci_dev *pdev) | 38 | static inline const char * pcid_name (struct pci_dev *pdev) |
| 39 | { | 39 | { |
| 40 | if (pdev->dev.driver) | 40 | if (pdev && pdev->dev.driver) |
| 41 | return pdev->dev.driver->name; | 41 | return pdev->dev.driver->name; |
| 42 | return ""; | 42 | return ""; |
| 43 | } | 43 | } |
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c index bdaa8aabdaa6..f3bad900bbcf 100644 --- a/arch/powerpc/platforms/pseries/pci_dlpar.c +++ b/arch/powerpc/platforms/pseries/pci_dlpar.c | |||
| @@ -106,6 +106,8 @@ pcibios_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus) | |||
| 106 | } | 106 | } |
| 107 | } | 107 | } |
| 108 | } | 108 | } |
| 109 | |||
| 110 | eeh_add_device_tree_late(bus); | ||
| 109 | } | 111 | } |
| 110 | EXPORT_SYMBOL_GPL(pcibios_fixup_new_pci_devices); | 112 | EXPORT_SYMBOL_GPL(pcibios_fixup_new_pci_devices); |
| 111 | 113 | ||
| @@ -114,7 +116,6 @@ pcibios_pci_config_bridge(struct pci_dev *dev) | |||
| 114 | { | 116 | { |
| 115 | u8 sec_busno; | 117 | u8 sec_busno; |
| 116 | struct pci_bus *child_bus; | 118 | struct pci_bus *child_bus; |
| 117 | struct pci_dev *child_dev; | ||
| 118 | 119 | ||
| 119 | /* Get busno of downstream bus */ | 120 | /* Get busno of downstream bus */ |
| 120 | pci_read_config_byte(dev, PCI_SECONDARY_BUS, &sec_busno); | 121 | pci_read_config_byte(dev, PCI_SECONDARY_BUS, &sec_busno); |
| @@ -129,10 +130,6 @@ pcibios_pci_config_bridge(struct pci_dev *dev) | |||
| 129 | 130 | ||
| 130 | pci_scan_child_bus(child_bus); | 131 | pci_scan_child_bus(child_bus); |
| 131 | 132 | ||
| 132 | list_for_each_entry(child_dev, &child_bus->devices, bus_list) { | ||
| 133 | eeh_add_device_late(child_dev); | ||
| 134 | } | ||
| 135 | |||
| 136 | /* Fixup new pci devices without touching bus struct */ | 133 | /* Fixup new pci devices without touching bus struct */ |
| 137 | pcibios_fixup_new_pci_devices(child_bus, 0); | 134 | pcibios_fixup_new_pci_devices(child_bus, 0); |
| 138 | 135 | ||
| @@ -160,18 +157,25 @@ pcibios_add_pci_devices(struct pci_bus * bus) | |||
| 160 | 157 | ||
| 161 | eeh_add_device_tree_early(dn); | 158 | eeh_add_device_tree_early(dn); |
| 162 | 159 | ||
| 163 | /* pci_scan_slot should find all children */ | 160 | if (_machine == PLATFORM_PSERIES_LPAR) { |
| 164 | slotno = PCI_SLOT(PCI_DN(dn->child)->devfn); | 161 | /* use ofdt-based probe */ |
| 165 | num = pci_scan_slot(bus, PCI_DEVFN(slotno, 0)); | 162 | of_scan_bus(dn, bus); |
| 166 | if (num) { | 163 | if (!list_empty(&bus->devices)) { |
| 167 | pcibios_fixup_new_pci_devices(bus, 1); | 164 | pcibios_fixup_new_pci_devices(bus, 0); |
| 168 | pci_bus_add_devices(bus); | 165 | pci_bus_add_devices(bus); |
| 169 | } | 166 | } |
| 167 | } else { | ||
| 168 | /* use legacy probe */ | ||
| 169 | slotno = PCI_SLOT(PCI_DN(dn->child)->devfn); | ||
| 170 | num = pci_scan_slot(bus, PCI_DEVFN(slotno, 0)); | ||
| 171 | if (num) { | ||
| 172 | pcibios_fixup_new_pci_devices(bus, 1); | ||
| 173 | pci_bus_add_devices(bus); | ||
| 174 | } | ||
| 170 | 175 | ||
| 171 | list_for_each_entry(dev, &bus->devices, bus_list) { | 176 | list_for_each_entry(dev, &bus->devices, bus_list) |
| 172 | eeh_add_device_late (dev); | 177 | if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) |
| 173 | if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) | 178 | pcibios_pci_config_bridge(dev); |
| 174 | pcibios_pci_config_bridge(dev); | ||
| 175 | } | 179 | } |
| 176 | } | 180 | } |
| 177 | EXPORT_SYMBOL_GPL(pcibios_add_pci_devices); | 181 | EXPORT_SYMBOL_GPL(pcibios_add_pci_devices); |
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 4f26304d0263..7dcdfcb3c984 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
| @@ -234,7 +234,7 @@ static void mpic_shutdown_ht_interrupt(struct mpic *mpic, unsigned int source, | |||
| 234 | spin_lock_irqsave(&mpic->fixup_lock, flags); | 234 | spin_lock_irqsave(&mpic->fixup_lock, flags); |
| 235 | writeb(0x10 + 2 * fixup->index, fixup->base + 2); | 235 | writeb(0x10 + 2 * fixup->index, fixup->base + 2); |
| 236 | tmp = readl(fixup->base + 4); | 236 | tmp = readl(fixup->base + 4); |
| 237 | tmp &= ~1U; | 237 | tmp |= 1; |
| 238 | writel(tmp, fixup->base + 4); | 238 | writel(tmp, fixup->base + 4); |
| 239 | spin_unlock_irqrestore(&mpic->fixup_lock, flags); | 239 | spin_unlock_irqrestore(&mpic->fixup_lock, flags); |
| 240 | } | 240 | } |
| @@ -446,14 +446,15 @@ static unsigned int mpic_startup_irq(unsigned int irq) | |||
| 446 | #ifdef CONFIG_MPIC_BROKEN_U3 | 446 | #ifdef CONFIG_MPIC_BROKEN_U3 |
| 447 | struct mpic *mpic = mpic_from_irq(irq); | 447 | struct mpic *mpic = mpic_from_irq(irq); |
| 448 | unsigned int src = irq - mpic->irq_offset; | 448 | unsigned int src = irq - mpic->irq_offset; |
| 449 | #endif /* CONFIG_MPIC_BROKEN_U3 */ | ||
| 450 | |||
| 451 | mpic_enable_irq(irq); | ||
| 449 | 452 | ||
| 453 | #ifdef CONFIG_MPIC_BROKEN_U3 | ||
| 450 | if (mpic_is_ht_interrupt(mpic, src)) | 454 | if (mpic_is_ht_interrupt(mpic, src)) |
| 451 | mpic_startup_ht_interrupt(mpic, src, irq_desc[irq].status); | 455 | mpic_startup_ht_interrupt(mpic, src, irq_desc[irq].status); |
| 452 | |||
| 453 | #endif /* CONFIG_MPIC_BROKEN_U3 */ | 456 | #endif /* CONFIG_MPIC_BROKEN_U3 */ |
| 454 | 457 | ||
| 455 | mpic_enable_irq(irq); | ||
| 456 | |||
| 457 | return 0; | 458 | return 0; |
| 458 | } | 459 | } |
| 459 | 460 | ||
diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S index c5a890dca9cf..53ea845fb911 100644 --- a/arch/ppc/kernel/head.S +++ b/arch/ppc/kernel/head.S | |||
| @@ -751,6 +751,7 @@ AltiVecUnavailable: | |||
| 751 | #ifdef CONFIG_ALTIVEC | 751 | #ifdef CONFIG_ALTIVEC |
| 752 | bne load_up_altivec /* if from user, just load it up */ | 752 | bne load_up_altivec /* if from user, just load it up */ |
| 753 | #endif /* CONFIG_ALTIVEC */ | 753 | #endif /* CONFIG_ALTIVEC */ |
| 754 | addi r3,r1,STACK_FRAME_OVERHEAD | ||
| 754 | EXC_XFER_EE_LITE(0xf20, altivec_unavailable_exception) | 755 | EXC_XFER_EE_LITE(0xf20, altivec_unavailable_exception) |
| 755 | 756 | ||
| 756 | #ifdef CONFIG_PPC64BRIDGE | 757 | #ifdef CONFIG_PPC64BRIDGE |
diff --git a/arch/ppc/xmon/adb.c b/arch/ppc/xmon/adb.c deleted file mode 100644 index e91384dcccac..000000000000 --- a/arch/ppc/xmon/adb.c +++ /dev/null | |||
| @@ -1,212 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 1996 Paul Mackerras. | ||
| 3 | */ | ||
| 4 | #include "nonstdio.h" | ||
| 5 | #include "privinst.h" | ||
| 6 | |||
| 7 | #define scanhex xmon_scanhex | ||
| 8 | #define skipbl xmon_skipbl | ||
| 9 | |||
| 10 | #define ADB_B (*(volatile unsigned char *)0xf3016000) | ||
| 11 | #define ADB_SR (*(volatile unsigned char *)0xf3017400) | ||
| 12 | #define ADB_ACR (*(volatile unsigned char *)0xf3017600) | ||
| 13 | #define ADB_IFR (*(volatile unsigned char *)0xf3017a00) | ||
| 14 | |||
| 15 | static inline void eieio(void) { asm volatile ("eieio" : :); } | ||
| 16 | |||
| 17 | #define N_ADB_LOG 1000 | ||
| 18 | struct adb_log { | ||
| 19 | unsigned char b; | ||
| 20 | unsigned char ifr; | ||
| 21 | unsigned char acr; | ||
| 22 | unsigned int time; | ||
| 23 | } adb_log[N_ADB_LOG]; | ||
| 24 | int n_adb_log; | ||
| 25 | |||
| 26 | void | ||
| 27 | init_adb_log(void) | ||
| 28 | { | ||
| 29 | adb_log[0].b = ADB_B; | ||
| 30 | adb_log[0].ifr = ADB_IFR; | ||
| 31 | adb_log[0].acr = ADB_ACR; | ||
| 32 | adb_log[0].time = get_dec(); | ||
| 33 | n_adb_log = 0; | ||
| 34 | } | ||
| 35 | |||
| 36 | void | ||
| 37 | dump_adb_log(void) | ||
| 38 | { | ||
| 39 | unsigned t, t0; | ||
| 40 | struct adb_log *ap; | ||
| 41 | int i; | ||
| 42 | |||
| 43 | ap = adb_log; | ||
| 44 | t0 = ap->time; | ||
| 45 | for (i = 0; i <= n_adb_log; ++i, ++ap) { | ||
| 46 | t = t0 - ap->time; | ||
| 47 | printf("b=%x ifr=%x acr=%x at %d.%.7d\n", ap->b, ap->ifr, ap->acr, | ||
| 48 | t / 1000000000, (t % 1000000000) / 100); | ||
| 49 | } | ||
| 50 | } | ||
| 51 | |||
| 52 | void | ||
| 53 | adb_chklog(void) | ||
| 54 | { | ||
| 55 | struct adb_log *ap = &adb_log[n_adb_log + 1]; | ||
| 56 | |||
| 57 | ap->b = ADB_B; | ||
| 58 | ap->ifr = ADB_IFR; | ||
| 59 | ap->acr = ADB_ACR; | ||
| 60 | if (ap->b != ap[-1].b || (ap->ifr & 4) != (ap[-1].ifr & 4) | ||
| 61 | || ap->acr != ap[-1].acr) { | ||
| 62 | ap->time = get_dec(); | ||
| 63 | ++n_adb_log; | ||
| 64 | } | ||
| 65 | } | ||
| 66 | |||
| 67 | int | ||
| 68 | adb_bitwait(int bmask, int bval, int fmask, int fval) | ||
| 69 | { | ||
| 70 | int i; | ||
| 71 | struct adb_log *ap; | ||
| 72 | |||
| 73 | for (i = 10000; i > 0; --i) { | ||
| 74 | adb_chklog(); | ||
| 75 | ap = &adb_log[n_adb_log]; | ||
| 76 | if ((ap->b & bmask) == bval && (ap->ifr & fmask) == fval) | ||
| 77 | return 0; | ||
| 78 | } | ||
| 79 | return -1; | ||
| 80 | } | ||
| 81 | |||
| 82 | int | ||
| 83 | adb_wait(void) | ||
| 84 | { | ||
| 85 | if (adb_bitwait(0, 0, 4, 4) < 0) { | ||
| 86 | printf("adb: ready wait timeout\n"); | ||
| 87 | return -1; | ||
| 88 | } | ||
| 89 | return 0; | ||
| 90 | } | ||
| 91 | |||
| 92 | void | ||
| 93 | adb_readin(void) | ||
| 94 | { | ||
| 95 | int i, j; | ||
| 96 | unsigned char d[64]; | ||
| 97 | |||
| 98 | if (ADB_B & 8) { | ||
| 99 | printf("ADB_B: %x\n", ADB_B); | ||
| 100 | return; | ||
| 101 | } | ||
| 102 | i = 0; | ||
| 103 | adb_wait(); | ||
| 104 | j = ADB_SR; | ||
| 105 | eieio(); | ||
| 106 | ADB_B &= ~0x20; | ||
| 107 | eieio(); | ||
| 108 | for (;;) { | ||
| 109 | if (adb_wait() < 0) | ||
| 110 | break; | ||
| 111 | d[i++] = ADB_SR; | ||
| 112 | eieio(); | ||
| 113 | if (ADB_B & 8) | ||
| 114 | break; | ||
| 115 | ADB_B ^= 0x10; | ||
| 116 | eieio(); | ||
| 117 | } | ||
| 118 | ADB_B |= 0x30; | ||
| 119 | if (adb_wait() == 0) | ||
| 120 | j = ADB_SR; | ||
| 121 | for (j = 0; j < i; ++j) | ||
| 122 | printf("%.2x ", d[j]); | ||
| 123 | printf("\n"); | ||
| 124 | } | ||
| 125 | |||
| 126 | int | ||
| 127 | adb_write(unsigned char *d, int i) | ||
| 128 | { | ||
| 129 | int j; | ||
| 130 | unsigned x; | ||
| 131 | |||
| 132 | if ((ADB_B & 8) == 0) { | ||
| 133 | printf("r: "); | ||
| 134 | adb_readin(); | ||
| 135 | } | ||
| 136 | for (;;) { | ||
| 137 | ADB_ACR = 0x1c; | ||
| 138 | eieio(); | ||
| 139 | ADB_SR = d[0]; | ||
| 140 | eieio(); | ||
| 141 | ADB_B &= ~0x20; | ||
| 142 | eieio(); | ||
| 143 | if (ADB_B & 8) | ||
| 144 | break; | ||
| 145 | ADB_ACR = 0xc; | ||
| 146 | eieio(); | ||
| 147 | ADB_B |= 0x20; | ||
| 148 | eieio(); | ||
| 149 | adb_readin(); | ||
| 150 | } | ||
| 151 | adb_wait(); | ||
| 152 | for (j = 1; j < i; ++j) { | ||
| 153 | ADB_SR = d[j]; | ||
| 154 | eieio(); | ||
| 155 | ADB_B ^= 0x10; | ||
| 156 | eieio(); | ||
| 157 | if (adb_wait() < 0) | ||
| 158 | break; | ||
| 159 | } | ||
| 160 | ADB_ACR = 0xc; | ||
| 161 | eieio(); | ||
| 162 | x = ADB_SR; | ||
| 163 | eieio(); | ||
| 164 | ADB_B |= 0x30; | ||
| 165 | return j; | ||
| 166 | } | ||
| 167 | |||
| 168 | void | ||
| 169 | adbcmds(void) | ||
| 170 | { | ||
| 171 | char cmd; | ||
| 172 | unsigned rtcu, rtcl, dec, pdec, x; | ||
| 173 | int i, j; | ||
| 174 | unsigned char d[64]; | ||
| 175 | |||
| 176 | cmd = skipbl(); | ||
| 177 | switch (cmd) { | ||
| 178 | case 't': | ||
| 179 | for (;;) { | ||
| 180 | rtcl = get_rtcl(); | ||
| 181 | rtcu = get_rtcu(); | ||
| 182 | dec = get_dec(); | ||
| 183 | printf("rtc u=%u l=%u dec=%x (%d = %d.%.7d)\n", | ||
| 184 | rtcu, rtcl, dec, pdec - dec, (pdec - dec) / 1000000000, | ||
| 185 | ((pdec - dec) % 1000000000) / 100); | ||
| 186 | pdec = dec; | ||
| 187 | if (cmd == 'x') | ||
| 188 | break; | ||
| 189 | while (xmon_read(stdin, &cmd, 1) != 1) | ||
| 190 | ; | ||
| 191 | } | ||
| 192 | break; | ||
| 193 | case 'r': | ||
| 194 | init_adb_log(); | ||
| 195 | while (adb_bitwait(8, 0, 0, 0) == 0) | ||
| 196 | adb_readin(); | ||
| 197 | break; | ||
| 198 | case 'w': | ||
| 199 | i = 0; | ||
| 200 | while (scanhex(&x)) | ||
| 201 | d[i++] = x; | ||
| 202 | init_adb_log(); | ||
| 203 | j = adb_write(d, i); | ||
| 204 | printf("sent %d bytes\n", j); | ||
| 205 | while (adb_bitwait(8, 0, 0, 0) == 0) | ||
| 206 | adb_readin(); | ||
| 207 | break; | ||
| 208 | case 'l': | ||
| 209 | dump_adb_log(); | ||
| 210 | break; | ||
| 211 | } | ||
| 212 | } | ||
diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c index 484f5bb1aa3e..ff86b2d814cb 100644 --- a/arch/ppc/xmon/start.c +++ b/arch/ppc/xmon/start.c | |||
| @@ -6,16 +6,11 @@ | |||
| 6 | #include <asm/machdep.h> | 6 | #include <asm/machdep.h> |
| 7 | #include <asm/io.h> | 7 | #include <asm/io.h> |
| 8 | #include <asm/page.h> | 8 | #include <asm/page.h> |
| 9 | #include <linux/adb.h> | ||
| 10 | #include <linux/pmu.h> | ||
| 11 | #include <linux/cuda.h> | ||
| 12 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 13 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 14 | #include <linux/sysrq.h> | 11 | #include <linux/sysrq.h> |
| 15 | #include <linux/bitops.h> | 12 | #include <linux/bitops.h> |
| 16 | #include <asm/xmon.h> | 13 | #include <asm/xmon.h> |
| 17 | #include <asm/prom.h> | ||
| 18 | #include <asm/bootx.h> | ||
| 19 | #include <asm/machdep.h> | 14 | #include <asm/machdep.h> |
| 20 | #include <asm/errno.h> | 15 | #include <asm/errno.h> |
| 21 | #include <asm/processor.h> | 16 | #include <asm/processor.h> |
| @@ -26,9 +21,7 @@ static volatile unsigned char *sccc, *sccd; | |||
| 26 | unsigned int TXRDY, RXRDY, DLAB; | 21 | unsigned int TXRDY, RXRDY, DLAB; |
| 27 | static int xmon_expect(const char *str, unsigned int timeout); | 22 | static int xmon_expect(const char *str, unsigned int timeout); |
| 28 | 23 | ||
| 29 | static int use_screen; | ||
| 30 | static int via_modem; | 24 | static int via_modem; |
| 31 | static int xmon_use_sccb; | ||
| 32 | 25 | ||
| 33 | #define TB_SPEED 25000000 | 26 | #define TB_SPEED 25000000 |
| 34 | 27 | ||
| @@ -46,47 +39,6 @@ void buf_access(void) | |||
| 46 | sccd[3] &= ~DLAB; /* reset DLAB */ | 39 | sccd[3] &= ~DLAB; /* reset DLAB */ |
| 47 | } | 40 | } |
| 48 | 41 | ||
| 49 | extern int adb_init(void); | ||
| 50 | |||
| 51 | #ifdef CONFIG_PPC_CHRP | ||
| 52 | /* | ||
| 53 | * This looks in the "ranges" property for the primary PCI host bridge | ||
| 54 | * to find the physical address of the start of PCI/ISA I/O space. | ||
| 55 | * It is basically a cut-down version of pci_process_bridge_OF_ranges. | ||
| 56 | */ | ||
| 57 | static unsigned long chrp_find_phys_io_base(void) | ||
| 58 | { | ||
| 59 | struct device_node *node; | ||
| 60 | unsigned int *ranges; | ||
| 61 | unsigned long base = CHRP_ISA_IO_BASE; | ||
| 62 | int rlen = 0; | ||
| 63 | int np; | ||
| 64 | |||
| 65 | node = find_devices("isa"); | ||
| 66 | if (node != NULL) { | ||
| 67 | node = node->parent; | ||
| 68 | if (node == NULL || node->type == NULL | ||
| 69 | || strcmp(node->type, "pci") != 0) | ||
| 70 | node = NULL; | ||
| 71 | } | ||
| 72 | if (node == NULL) | ||
| 73 | node = find_devices("pci"); | ||
| 74 | if (node == NULL) | ||
| 75 | return base; | ||
| 76 | |||
| 77 | ranges = (unsigned int *) get_property(node, "ranges", &rlen); | ||
| 78 | np = prom_n_addr_cells(node) + 5; | ||
| 79 | while ((rlen -= np * sizeof(unsigned int)) >= 0) { | ||
| 80 | if ((ranges[0] >> 24) == 1 && ranges[2] == 0) { | ||
| 81 | /* I/O space starting at 0, grab the phys base */ | ||
| 82 | base = ranges[np - 3]; | ||
| 83 | break; | ||
| 84 | } | ||
| 85 | ranges += np; | ||
| 86 | } | ||
| 87 | return base; | ||
| 88 | } | ||
| 89 | #endif /* CONFIG_PPC_CHRP */ | ||
| 90 | 42 | ||
| 91 | #ifdef CONFIG_MAGIC_SYSRQ | 43 | #ifdef CONFIG_MAGIC_SYSRQ |
| 92 | static void sysrq_handle_xmon(int key, struct pt_regs *regs, | 44 | static void sysrq_handle_xmon(int key, struct pt_regs *regs, |
| @@ -109,22 +61,6 @@ xmon_map_scc(void) | |||
| 109 | #ifdef CONFIG_PPC_MULTIPLATFORM | 61 | #ifdef CONFIG_PPC_MULTIPLATFORM |
| 110 | volatile unsigned char *base; | 62 | volatile unsigned char *base; |
| 111 | 63 | ||
| 112 | #ifdef CONFIG_PPC_CHRP | ||
| 113 | base = (volatile unsigned char *) isa_io_base; | ||
| 114 | if (_machine == _MACH_chrp) | ||
| 115 | base = (volatile unsigned char *) | ||
| 116 | ioremap(chrp_find_phys_io_base(), 0x1000); | ||
| 117 | |||
| 118 | sccc = base + 0x3fd; | ||
| 119 | sccd = base + 0x3f8; | ||
| 120 | if (xmon_use_sccb) { | ||
| 121 | sccc -= 0x100; | ||
| 122 | sccd -= 0x100; | ||
| 123 | } | ||
| 124 | TXRDY = 0x20; | ||
| 125 | RXRDY = 1; | ||
| 126 | DLAB = 0x80; | ||
| 127 | #endif /* CONFIG_PPC_CHRP */ | ||
| 128 | #elif defined(CONFIG_GEMINI) | 64 | #elif defined(CONFIG_GEMINI) |
| 129 | /* should already be mapped by the kernel boot */ | 65 | /* should already be mapped by the kernel boot */ |
| 130 | sccc = (volatile unsigned char *) 0xffeffb0d; | 66 | sccc = (volatile unsigned char *) 0xffeffb0d; |
| @@ -143,7 +79,7 @@ xmon_map_scc(void) | |||
| 143 | register_sysrq_key('x', &sysrq_xmon_op); | 79 | register_sysrq_key('x', &sysrq_xmon_op); |
| 144 | } | 80 | } |
| 145 | 81 | ||
| 146 | static int scc_initialized = 0; | 82 | static int scc_initialized; |
| 147 | 83 | ||
| 148 | void xmon_init_scc(void); | 84 | void xmon_init_scc(void); |
| 149 | 85 | ||
| @@ -163,14 +99,6 @@ xmon_write(void *handle, void *ptr, int nb) | |||
| 163 | break; | 99 | break; |
| 164 | #endif | 100 | #endif |
| 165 | 101 | ||
| 166 | #ifdef CONFIG_BOOTX_TEXT | ||
| 167 | if (use_screen) { | ||
| 168 | /* write it on the screen */ | ||
| 169 | for (i = 0; i < nb; ++i) | ||
| 170 | btext_drawchar(*p++); | ||
| 171 | goto out; | ||
| 172 | } | ||
| 173 | #endif | ||
| 174 | if (!scc_initialized) | 102 | if (!scc_initialized) |
| 175 | xmon_init_scc(); | 103 | xmon_init_scc(); |
| 176 | ct = 0; | 104 | ct = 0; |
| @@ -190,7 +118,6 @@ xmon_write(void *handle, void *ptr, int nb) | |||
| 190 | eieio(); | 118 | eieio(); |
| 191 | } | 119 | } |
| 192 | 120 | ||
| 193 | out: | ||
| 194 | #ifdef CONFIG_SMP | 121 | #ifdef CONFIG_SMP |
| 195 | if (!locked) | 122 | if (!locked) |
| 196 | clear_bit(0, &xmon_write_lock); | 123 | clear_bit(0, &xmon_write_lock); |
| @@ -199,65 +126,7 @@ xmon_write(void *handle, void *ptr, int nb) | |||
| 199 | } | 126 | } |
| 200 | 127 | ||
| 201 | int xmon_wants_key; | 128 | int xmon_wants_key; |
| 202 | int xmon_adb_keycode; | ||
| 203 | |||
| 204 | #ifdef CONFIG_BOOTX_TEXT | ||
| 205 | static int xmon_adb_shiftstate; | ||
| 206 | |||
| 207 | static unsigned char xmon_keytab[128] = | ||
| 208 | "asdfhgzxcv\000bqwer" /* 0x00 - 0x0f */ | ||
| 209 | "yt123465=97-80]o" /* 0x10 - 0x1f */ | ||
| 210 | "u[ip\rlj'k;\\,/nm." /* 0x20 - 0x2f */ | ||
| 211 | "\t `\177\0\033\0\0\0\0\0\0\0\0\0\0" /* 0x30 - 0x3f */ | ||
| 212 | "\0.\0*\0+\0\0\0\0\0/\r\0-\0" /* 0x40 - 0x4f */ | ||
| 213 | "\0\0000123456789\0\0\0"; /* 0x50 - 0x5f */ | ||
| 214 | |||
| 215 | static unsigned char xmon_shift_keytab[128] = | ||
| 216 | "ASDFHGZXCV\000BQWER" /* 0x00 - 0x0f */ | ||
| 217 | "YT!@#$^%+(&_*)}O" /* 0x10 - 0x1f */ | ||
| 218 | "U{IP\rLJ\"K:|<?NM>" /* 0x20 - 0x2f */ | ||
| 219 | "\t ~\177\0\033\0\0\0\0\0\0\0\0\0\0" /* 0x30 - 0x3f */ | ||
| 220 | "\0.\0*\0+\0\0\0\0\0/\r\0-\0" /* 0x40 - 0x4f */ | ||
| 221 | "\0\0000123456789\0\0\0"; /* 0x50 - 0x5f */ | ||
| 222 | |||
| 223 | static int | ||
| 224 | xmon_get_adb_key(void) | ||
| 225 | { | ||
| 226 | int k, t, on; | ||
| 227 | 129 | ||
| 228 | xmon_wants_key = 1; | ||
| 229 | for (;;) { | ||
| 230 | xmon_adb_keycode = -1; | ||
| 231 | t = 0; | ||
| 232 | on = 0; | ||
| 233 | do { | ||
| 234 | if (--t < 0) { | ||
| 235 | on = 1 - on; | ||
| 236 | btext_drawchar(on? 0xdb: 0x20); | ||
| 237 | btext_drawchar('\b'); | ||
| 238 | t = 200000; | ||
| 239 | } | ||
| 240 | do_poll_adb(); | ||
| 241 | } while (xmon_adb_keycode == -1); | ||
| 242 | k = xmon_adb_keycode; | ||
| 243 | if (on) | ||
| 244 | btext_drawstring(" \b"); | ||
| 245 | |||
| 246 | /* test for shift keys */ | ||
| 247 | if ((k & 0x7f) == 0x38 || (k & 0x7f) == 0x7b) { | ||
| 248 | xmon_adb_shiftstate = (k & 0x80) == 0; | ||
| 249 | continue; | ||
| 250 | } | ||
| 251 | if (k >= 0x80) | ||
| 252 | continue; /* ignore up transitions */ | ||
| 253 | k = (xmon_adb_shiftstate? xmon_shift_keytab: xmon_keytab)[k]; | ||
| 254 | if (k != 0) | ||
| 255 | break; | ||
| 256 | } | ||
| 257 | xmon_wants_key = 0; | ||
| 258 | return k; | ||
| 259 | } | ||
| 260 | #endif /* CONFIG_BOOTX_TEXT */ | ||
| 261 | 130 | ||
| 262 | int | 131 | int |
| 263 | xmon_read(void *handle, void *ptr, int nb) | 132 | xmon_read(void *handle, void *ptr, int nb) |
| @@ -265,18 +134,11 @@ xmon_read(void *handle, void *ptr, int nb) | |||
| 265 | char *p = ptr; | 134 | char *p = ptr; |
| 266 | int i; | 135 | int i; |
| 267 | 136 | ||
| 268 | #ifdef CONFIG_BOOTX_TEXT | ||
| 269 | if (use_screen) { | ||
| 270 | for (i = 0; i < nb; ++i) | ||
| 271 | *p++ = xmon_get_adb_key(); | ||
| 272 | return i; | ||
| 273 | } | ||
| 274 | #endif | ||
| 275 | if (!scc_initialized) | 137 | if (!scc_initialized) |
| 276 | xmon_init_scc(); | 138 | xmon_init_scc(); |
| 277 | for (i = 0; i < nb; ++i) { | 139 | for (i = 0; i < nb; ++i) { |
| 278 | while ((*sccc & RXRDY) == 0) | 140 | while ((*sccc & RXRDY) == 0) |
| 279 | do_poll_adb(); | 141 | ; |
| 280 | buf_access(); | 142 | buf_access(); |
| 281 | *p++ = *sccd; | 143 | *p++ = *sccd; |
| 282 | } | 144 | } |
| @@ -287,7 +149,7 @@ int | |||
| 287 | xmon_read_poll(void) | 149 | xmon_read_poll(void) |
| 288 | { | 150 | { |
| 289 | if ((*sccc & RXRDY) == 0) { | 151 | if ((*sccc & RXRDY) == 0) { |
| 290 | do_poll_adb(); | 152 | ; |
| 291 | return -1; | 153 | return -1; |
| 292 | } | 154 | } |
| 293 | buf_access(); | 155 | buf_access(); |
| @@ -297,15 +159,6 @@ xmon_read_poll(void) | |||
| 297 | void | 159 | void |
| 298 | xmon_init_scc(void) | 160 | xmon_init_scc(void) |
| 299 | { | 161 | { |
| 300 | if ( _machine == _MACH_chrp ) | ||
| 301 | { | ||
| 302 | sccd[3] = 0x83; eieio(); /* LCR = 8N1 + DLAB */ | ||
| 303 | sccd[0] = 12; eieio(); /* DLL = 9600 baud */ | ||
| 304 | sccd[1] = 0; eieio(); | ||
| 305 | sccd[2] = 0; eieio(); /* FCR = 0 */ | ||
| 306 | sccd[3] = 3; eieio(); /* LCR = 8N1 */ | ||
| 307 | sccd[1] = 0; eieio(); /* IER = 0 */ | ||
| 308 | } | ||
| 309 | scc_initialized = 1; | 162 | scc_initialized = 1; |
| 310 | if (via_modem) { | 163 | if (via_modem) { |
| 311 | for (;;) { | 164 | for (;;) { |
| @@ -321,22 +174,6 @@ xmon_init_scc(void) | |||
| 321 | } | 174 | } |
| 322 | } | 175 | } |
| 323 | 176 | ||
| 324 | #if 0 | ||
| 325 | extern int (*prom_entry)(void *); | ||
| 326 | |||
| 327 | int | ||
| 328 | xmon_exit(void) | ||
| 329 | { | ||
| 330 | struct prom_args { | ||
| 331 | char *service; | ||
| 332 | } args; | ||
| 333 | |||
| 334 | for (;;) { | ||
| 335 | args.service = "exit"; | ||
| 336 | (*prom_entry)(&args); | ||
| 337 | } | ||
| 338 | } | ||
| 339 | #endif | ||
| 340 | 177 | ||
| 341 | void *xmon_stdin; | 178 | void *xmon_stdin; |
| 342 | void *xmon_stdout; | 179 | void *xmon_stdout; |
diff --git a/arch/ppc/xmon/xmon.c b/arch/ppc/xmon/xmon.c index bdaf6597b4c2..06fa44b5c647 100644 --- a/arch/ppc/xmon/xmon.c +++ b/arch/ppc/xmon/xmon.c | |||
| @@ -12,8 +12,6 @@ | |||
| 12 | #include <linux/kallsyms.h> | 12 | #include <linux/kallsyms.h> |
| 13 | #include <asm/ptrace.h> | 13 | #include <asm/ptrace.h> |
| 14 | #include <asm/string.h> | 14 | #include <asm/string.h> |
| 15 | #include <asm/prom.h> | ||
| 16 | #include <asm/bootx.h> | ||
| 17 | #include <asm/machdep.h> | 15 | #include <asm/machdep.h> |
| 18 | #include <asm/xmon.h> | 16 | #include <asm/xmon.h> |
| 19 | #include "nonstdio.h" | 17 | #include "nonstdio.h" |
| @@ -101,9 +99,6 @@ void cacheflush(void); | |||
| 101 | static void cpu_cmd(void); | 99 | static void cpu_cmd(void); |
| 102 | #endif /* CONFIG_SMP */ | 100 | #endif /* CONFIG_SMP */ |
| 103 | static void csum(void); | 101 | static void csum(void); |
| 104 | #ifdef CONFIG_BOOTX_TEXT | ||
| 105 | static void vidcmds(void); | ||
| 106 | #endif | ||
| 107 | static void bootcmds(void); | 102 | static void bootcmds(void); |
| 108 | static void proccall(void); | 103 | static void proccall(void); |
| 109 | static void printtime(void); | 104 | static void printtime(void); |
| @@ -522,11 +517,6 @@ cmds(struct pt_regs *excp) | |||
| 522 | cpu_cmd(); | 517 | cpu_cmd(); |
| 523 | break; | 518 | break; |
| 524 | #endif /* CONFIG_SMP */ | 519 | #endif /* CONFIG_SMP */ |
| 525 | #ifdef CONFIG_BOOTX_TEXT | ||
| 526 | case 'v': | ||
| 527 | vidcmds(); | ||
| 528 | break; | ||
| 529 | #endif | ||
| 530 | case 'z': | 520 | case 'z': |
| 531 | bootcmds(); | 521 | bootcmds(); |
| 532 | break; | 522 | break; |
| @@ -618,43 +608,6 @@ static void cpu_cmd(void) | |||
| 618 | } | 608 | } |
| 619 | #endif /* CONFIG_SMP */ | 609 | #endif /* CONFIG_SMP */ |
| 620 | 610 | ||
| 621 | #ifdef CONFIG_BOOTX_TEXT | ||
| 622 | extern boot_infos_t disp_bi; | ||
| 623 | |||
| 624 | static void vidcmds(void) | ||
| 625 | { | ||
| 626 | int c = inchar(); | ||
| 627 | unsigned int val, w; | ||
| 628 | extern int boot_text_mapped; | ||
| 629 | |||
| 630 | if (!boot_text_mapped) | ||
| 631 | return; | ||
| 632 | if (c != '\n' && scanhex(&val)) { | ||
| 633 | switch (c) { | ||
| 634 | case 'd': | ||
| 635 | w = disp_bi.dispDeviceRowBytes | ||
| 636 | / (disp_bi.dispDeviceDepth >> 3); | ||
| 637 | disp_bi.dispDeviceDepth = val; | ||
| 638 | disp_bi.dispDeviceRowBytes = w * (val >> 3); | ||
| 639 | return; | ||
| 640 | case 'p': | ||
| 641 | disp_bi.dispDeviceRowBytes = val; | ||
| 642 | return; | ||
| 643 | case 'w': | ||
| 644 | disp_bi.dispDeviceRect[2] = val; | ||
| 645 | return; | ||
| 646 | case 'h': | ||
| 647 | disp_bi.dispDeviceRect[3] = val; | ||
| 648 | return; | ||
| 649 | } | ||
| 650 | } | ||
| 651 | printf("W = %d (0x%x) H = %d (0x%x) D = %d (0x%x) P = %d (0x%x)\n", | ||
| 652 | disp_bi.dispDeviceRect[2], disp_bi.dispDeviceRect[2], | ||
| 653 | disp_bi.dispDeviceRect[3], disp_bi.dispDeviceRect[3], | ||
| 654 | disp_bi.dispDeviceDepth, disp_bi.dispDeviceDepth, | ||
| 655 | disp_bi.dispDeviceRowBytes, disp_bi.dispDeviceRowBytes); | ||
| 656 | } | ||
| 657 | #endif /* CONFIG_BOOTX_TEXT */ | ||
| 658 | 611 | ||
| 659 | static unsigned short fcstab[256] = { | 612 | static unsigned short fcstab[256] = { |
| 660 | 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, | 613 | 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, |
| @@ -1020,7 +973,6 @@ dump_hash_table(void) | |||
| 1020 | } | 973 | } |
| 1021 | #else | 974 | #else |
| 1022 | 975 | ||
| 1023 | #ifndef CONFIG_PPC64BRIDGE | ||
| 1024 | static void | 976 | static void |
| 1025 | dump_hash_table_seg(unsigned seg, unsigned start, unsigned end) | 977 | dump_hash_table_seg(unsigned seg, unsigned start, unsigned end) |
| 1026 | { | 978 | { |
| @@ -1079,66 +1031,6 @@ dump_hash_table_seg(unsigned seg, unsigned start, unsigned end) | |||
| 1079 | printf(" ... %x\n", last_va); | 1031 | printf(" ... %x\n", last_va); |
| 1080 | } | 1032 | } |
| 1081 | 1033 | ||
| 1082 | #else /* CONFIG_PPC64BRIDGE */ | ||
| 1083 | static void | ||
| 1084 | dump_hash_table_seg(unsigned seg, unsigned start, unsigned end) | ||
| 1085 | { | ||
| 1086 | extern void *Hash; | ||
| 1087 | extern unsigned long Hash_size; | ||
| 1088 | unsigned *htab = Hash; | ||
| 1089 | unsigned hsize = Hash_size; | ||
| 1090 | unsigned v, hmask, va, last_va; | ||
| 1091 | int found, last_found, i; | ||
| 1092 | unsigned *hg, w1, last_w2, last_va0; | ||
| 1093 | |||
| 1094 | last_found = 0; | ||
| 1095 | hmask = hsize / 128 - 1; | ||
| 1096 | va = start; | ||
| 1097 | start = (start >> 12) & 0xffff; | ||
| 1098 | end = (end >> 12) & 0xffff; | ||
| 1099 | for (v = start; v < end; ++v) { | ||
| 1100 | found = 0; | ||
| 1101 | hg = htab + (((v ^ seg) & hmask) * 32); | ||
| 1102 | w1 = 1 | (seg << 12) | ((v & 0xf800) >> 4); | ||
| 1103 | for (i = 0; i < 8; ++i, hg += 4) { | ||
| 1104 | if (hg[1] == w1) { | ||
| 1105 | found = 1; | ||
| 1106 | break; | ||
| 1107 | } | ||
| 1108 | } | ||
| 1109 | if (!found) { | ||
| 1110 | w1 ^= 2; | ||
| 1111 | hg = htab + ((~(v ^ seg) & hmask) * 32); | ||
| 1112 | for (i = 0; i < 8; ++i, hg += 4) { | ||
| 1113 | if (hg[1] == w1) { | ||
| 1114 | found = 1; | ||
| 1115 | break; | ||
| 1116 | } | ||
| 1117 | } | ||
| 1118 | } | ||
| 1119 | if (!(last_found && found && (hg[3] & ~0x180) == last_w2 + 4096)) { | ||
| 1120 | if (last_found) { | ||
| 1121 | if (last_va != last_va0) | ||
| 1122 | printf(" ... %x", last_va); | ||
| 1123 | printf("\n"); | ||
| 1124 | } | ||
| 1125 | if (found) { | ||
| 1126 | printf("%x to %x", va, hg[3]); | ||
| 1127 | last_va0 = va; | ||
| 1128 | } | ||
| 1129 | last_found = found; | ||
| 1130 | } | ||
| 1131 | if (found) { | ||
| 1132 | last_w2 = hg[3] & ~0x180; | ||
| 1133 | last_va = va; | ||
| 1134 | } | ||
| 1135 | va += 4096; | ||
| 1136 | } | ||
| 1137 | if (last_found) | ||
| 1138 | printf(" ... %x\n", last_va); | ||
| 1139 | } | ||
| 1140 | #endif /* CONFIG_PPC64BRIDGE */ | ||
| 1141 | |||
| 1142 | static unsigned hash_ctx; | 1034 | static unsigned hash_ctx; |
| 1143 | static unsigned hash_start; | 1035 | static unsigned hash_start; |
| 1144 | static unsigned hash_end; | 1036 | static unsigned hash_end; |
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S index 615964cca15f..50e80138e7ad 100644 --- a/arch/s390/kernel/compat_wrapper.S +++ b/arch/s390/kernel/compat_wrapper.S | |||
| @@ -1552,6 +1552,7 @@ sys_linkat_wrapper: | |||
| 1552 | llgtr %r3,%r3 # const char * | 1552 | llgtr %r3,%r3 # const char * |
| 1553 | lgfr %r4,%r4 # int | 1553 | lgfr %r4,%r4 # int |
| 1554 | llgtr %r5,%r5 # const char * | 1554 | llgtr %r5,%r5 # const char * |
| 1555 | lgfr %r6,%r6 # int | ||
| 1555 | jg sys_linkat | 1556 | jg sys_linkat |
| 1556 | 1557 | ||
| 1557 | .globl sys_symlinkat_wrapper | 1558 | .globl sys_symlinkat_wrapper |
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index ab733be9af08..4c0a50a76554 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
| @@ -383,6 +383,7 @@ source "arch/sparc64/oprofile/Kconfig" | |||
| 383 | 383 | ||
| 384 | config KPROBES | 384 | config KPROBES |
| 385 | bool "Kprobes (EXPERIMENTAL)" | 385 | bool "Kprobes (EXPERIMENTAL)" |
| 386 | depends on EXPERIMENTAL && MODULES | ||
| 386 | help | 387 | help |
| 387 | Kprobes allows you to trap at almost any kernel address and | 388 | Kprobes allows you to trap at almost any kernel address and |
| 388 | execute a callback function. register_kprobe() establishes | 389 | execute a callback function. register_kprobe() establishes |
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index 054461e6946d..158bd31e15b7 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c | |||
| @@ -542,6 +542,8 @@ void __init setup_arch(char **cmdline_p) | |||
| 542 | } | 542 | } |
| 543 | #endif | 543 | #endif |
| 544 | 544 | ||
| 545 | smp_setup_cpu_possible_map(); | ||
| 546 | |||
| 545 | paging_init(); | 547 | paging_init(); |
| 546 | } | 548 | } |
| 547 | 549 | ||
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index 1fb6323e65a4..1f7ad8a69052 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c | |||
| @@ -1079,18 +1079,12 @@ int setup_profiling_timer(unsigned int multiplier) | |||
| 1079 | return 0; | 1079 | return 0; |
| 1080 | } | 1080 | } |
| 1081 | 1081 | ||
| 1082 | /* Constrain the number of cpus to max_cpus. */ | ||
| 1082 | void __init smp_prepare_cpus(unsigned int max_cpus) | 1083 | void __init smp_prepare_cpus(unsigned int max_cpus) |
| 1083 | { | 1084 | { |
| 1084 | int instance, mid; | ||
| 1085 | |||
| 1086 | instance = 0; | ||
| 1087 | while (!cpu_find_by_instance(instance, NULL, &mid)) { | ||
| 1088 | if (mid < max_cpus) | ||
| 1089 | cpu_set(mid, phys_cpu_present_map); | ||
| 1090 | instance++; | ||
| 1091 | } | ||
| 1092 | |||
| 1093 | if (num_possible_cpus() > max_cpus) { | 1085 | if (num_possible_cpus() > max_cpus) { |
| 1086 | int instance, mid; | ||
| 1087 | |||
| 1094 | instance = 0; | 1088 | instance = 0; |
| 1095 | while (!cpu_find_by_instance(instance, NULL, &mid)) { | 1089 | while (!cpu_find_by_instance(instance, NULL, &mid)) { |
| 1096 | if (mid != boot_cpu_id) { | 1090 | if (mid != boot_cpu_id) { |
| @@ -1105,6 +1099,22 @@ void __init smp_prepare_cpus(unsigned int max_cpus) | |||
| 1105 | smp_store_cpu_info(boot_cpu_id); | 1099 | smp_store_cpu_info(boot_cpu_id); |
| 1106 | } | 1100 | } |
| 1107 | 1101 | ||
| 1102 | /* Set this up early so that things like the scheduler can init | ||
| 1103 | * properly. We use the same cpu mask for both the present and | ||
| 1104 | * possible cpu map. | ||
| 1105 | */ | ||
| 1106 | void __init smp_setup_cpu_possible_map(void) | ||
| 1107 | { | ||
| 1108 | int instance, mid; | ||
| 1109 | |||
| 1110 | instance = 0; | ||
| 1111 | while (!cpu_find_by_instance(instance, NULL, &mid)) { | ||
| 1112 | if (mid < NR_CPUS) | ||
| 1113 | cpu_set(mid, phys_cpu_present_map); | ||
| 1114 | instance++; | ||
| 1115 | } | ||
| 1116 | } | ||
| 1117 | |||
| 1108 | void __devinit smp_prepare_boot_cpu(void) | 1118 | void __devinit smp_prepare_boot_cpu(void) |
| 1109 | { | 1119 | { |
| 1110 | if (hard_smp_processor_id() >= NR_CPUS) { | 1120 | if (hard_smp_processor_id() >= NR_CPUS) { |
diff --git a/arch/um/drivers/cow.h b/arch/um/drivers/cow.h index dc36b222100b..04e3958266e0 100644 --- a/arch/um/drivers/cow.h +++ b/arch/um/drivers/cow.h | |||
| @@ -46,7 +46,7 @@ extern int file_reader(__u64 offset, char *buf, int len, void *arg); | |||
| 46 | extern int read_cow_header(int (*reader)(__u64, char *, int, void *), | 46 | extern int read_cow_header(int (*reader)(__u64, char *, int, void *), |
| 47 | void *arg, __u32 *version_out, | 47 | void *arg, __u32 *version_out, |
| 48 | char **backing_file_out, time_t *mtime_out, | 48 | char **backing_file_out, time_t *mtime_out, |
| 49 | unsigned long long *size_out, int *sectorsize_out, | 49 | __u64 *size_out, int *sectorsize_out, |
| 50 | __u32 *align_out, int *bitmap_offset_out); | 50 | __u32 *align_out, int *bitmap_offset_out); |
| 51 | 51 | ||
| 52 | extern int write_cow_header(char *cow_file, int fd, char *backing_file, | 52 | extern int write_cow_header(char *cow_file, int fd, char *backing_file, |
diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h index c83fc5d68936..94de4ead4f7a 100644 --- a/arch/um/drivers/cow_sys.h +++ b/arch/um/drivers/cow_sys.h | |||
| @@ -23,17 +23,17 @@ static inline char *cow_strdup(char *str) | |||
| 23 | return(uml_strdup(str)); | 23 | return(uml_strdup(str)); |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | static inline int cow_seek_file(int fd, unsigned long long offset) | 26 | static inline int cow_seek_file(int fd, __u64 offset) |
| 27 | { | 27 | { |
| 28 | return(os_seek_file(fd, offset)); | 28 | return(os_seek_file(fd, offset)); |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | static inline int cow_file_size(char *file, unsigned long long *size_out) | 31 | static inline int cow_file_size(char *file, __u64 *size_out) |
| 32 | { | 32 | { |
| 33 | return(os_file_size(file, size_out)); | 33 | return(os_file_size(file, size_out)); |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | static inline int cow_write_file(int fd, char *buf, int size) | 36 | static inline int cow_write_file(int fd, void *buf, int size) |
| 37 | { | 37 | { |
| 38 | return(os_write_file(fd, buf, size)); | 38 | return(os_write_file(fd, buf, size)); |
| 39 | } | 39 | } |
diff --git a/arch/um/drivers/cow_user.c b/arch/um/drivers/cow_user.c index fbe2217db5dd..61951b721268 100644 --- a/arch/um/drivers/cow_user.c +++ b/arch/um/drivers/cow_user.c | |||
| @@ -176,7 +176,7 @@ int write_cow_header(char *cow_file, int fd, char *backing_file, | |||
| 176 | err = -ENOMEM; | 176 | err = -ENOMEM; |
| 177 | header = cow_malloc(sizeof(*header)); | 177 | header = cow_malloc(sizeof(*header)); |
| 178 | if(header == NULL){ | 178 | if(header == NULL){ |
| 179 | cow_printf("Failed to allocate COW V3 header\n"); | 179 | cow_printf("write_cow_header - failed to allocate COW V3 header\n"); |
| 180 | goto out; | 180 | goto out; |
| 181 | } | 181 | } |
| 182 | header->magic = htonl(COW_MAGIC); | 182 | header->magic = htonl(COW_MAGIC); |
| @@ -196,15 +196,17 @@ int write_cow_header(char *cow_file, int fd, char *backing_file, | |||
| 196 | 196 | ||
| 197 | err = os_file_modtime(header->backing_file, &modtime); | 197 | err = os_file_modtime(header->backing_file, &modtime); |
| 198 | if(err < 0){ | 198 | if(err < 0){ |
| 199 | cow_printf("Backing file '%s' mtime request failed, " | 199 | cow_printf("write_cow_header - backing file '%s' mtime " |
| 200 | "err = %d\n", header->backing_file, -err); | 200 | "request failed, err = %d\n", header->backing_file, |
| 201 | -err); | ||
| 201 | goto out_free; | 202 | goto out_free; |
| 202 | } | 203 | } |
| 203 | 204 | ||
| 204 | err = cow_file_size(header->backing_file, size); | 205 | err = cow_file_size(header->backing_file, size); |
| 205 | if(err < 0){ | 206 | if(err < 0){ |
| 206 | cow_printf("Couldn't get size of backing file '%s', " | 207 | cow_printf("write_cow_header - couldn't get size of " |
| 207 | "err = %d\n", header->backing_file, -err); | 208 | "backing file '%s', err = %d\n", |
| 209 | header->backing_file, -err); | ||
| 208 | goto out_free; | 210 | goto out_free; |
| 209 | } | 211 | } |
| 210 | 212 | ||
| @@ -214,10 +216,11 @@ int write_cow_header(char *cow_file, int fd, char *backing_file, | |||
| 214 | header->alignment = htonl(alignment); | 216 | header->alignment = htonl(alignment); |
| 215 | header->cow_format = COW_BITMAP; | 217 | header->cow_format = COW_BITMAP; |
| 216 | 218 | ||
| 217 | err = os_write_file(fd, header, sizeof(*header)); | 219 | err = cow_write_file(fd, header, sizeof(*header)); |
| 218 | if(err != sizeof(*header)){ | 220 | if(err != sizeof(*header)){ |
| 219 | cow_printf("Write of header to new COW file '%s' failed, " | 221 | cow_printf("write_cow_header - write of header to " |
| 220 | "err = %d\n", cow_file, -err); | 222 | "new COW file '%s' failed, err = %d\n", cow_file, |
| 223 | -err); | ||
| 221 | goto out_free; | 224 | goto out_free; |
| 222 | } | 225 | } |
| 223 | err = 0; | 226 | err = 0; |
| @@ -299,7 +302,7 @@ int read_cow_header(int (*reader)(__u64, char *, int, void *), void *arg, | |||
| 299 | } | 302 | } |
| 300 | else if(version == 3){ | 303 | else if(version == 3){ |
| 301 | if(n < sizeof(header->v3)){ | 304 | if(n < sizeof(header->v3)){ |
| 302 | cow_printf("read_cow_header - failed to read V2 " | 305 | cow_printf("read_cow_header - failed to read V3 " |
| 303 | "header\n"); | 306 | "header\n"); |
| 304 | goto out; | 307 | goto out; |
| 305 | } | 308 | } |
| @@ -359,7 +362,8 @@ int init_cow_file(int fd, char *cow_file, char *backing_file, int sectorsize, | |||
| 359 | if(err != sizeof(zero)){ | 362 | if(err != sizeof(zero)){ |
| 360 | cow_printf("Write of bitmap to new COW file '%s' failed, " | 363 | cow_printf("Write of bitmap to new COW file '%s' failed, " |
| 361 | "err = %d\n", cow_file, -err); | 364 | "err = %d\n", cow_file, -err); |
| 362 | err = -EINVAL; | 365 | if (err >= 0) |
| 366 | err = -EINVAL; | ||
| 363 | goto out; | 367 | goto out; |
| 364 | } | 368 | } |
| 365 | 369 | ||
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c index 098fa65981ab..0e2f06187ea7 100644 --- a/arch/um/drivers/net_user.c +++ b/arch/um/drivers/net_user.c | |||
| @@ -47,10 +47,12 @@ void tap_check_ips(char *gate_addr, unsigned char *eth_addr) | |||
| 47 | } | 47 | } |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | /* Do reliable error handling as this fails frequently enough. */ | ||
| 50 | void read_output(int fd, char *output, int len) | 51 | void read_output(int fd, char *output, int len) |
| 51 | { | 52 | { |
| 52 | int remain, n, actual; | 53 | int remain, ret, expected; |
| 53 | char c; | 54 | char c; |
| 55 | char *str; | ||
| 54 | 56 | ||
| 55 | if(output == NULL){ | 57 | if(output == NULL){ |
| 56 | output = &c; | 58 | output = &c; |
| @@ -58,23 +60,31 @@ void read_output(int fd, char *output, int len) | |||
| 58 | } | 60 | } |
| 59 | 61 | ||
| 60 | *output = '\0'; | 62 | *output = '\0'; |
| 61 | n = os_read_file(fd, &remain, sizeof(remain)); | 63 | ret = os_read_file(fd, &remain, sizeof(remain)); |
| 62 | if(n != sizeof(remain)){ | 64 | |
| 63 | printk("read_output - read of length failed, err = %d\n", -n); | 65 | if (ret != sizeof(remain)) { |
| 64 | return; | 66 | expected = sizeof(remain); |
| 67 | str = "length"; | ||
| 68 | goto err; | ||
| 65 | } | 69 | } |
| 66 | 70 | ||
| 67 | while(remain != 0){ | 71 | while(remain != 0){ |
| 68 | n = (remain < len) ? remain : len; | 72 | expected = (remain < len) ? remain : len; |
| 69 | actual = os_read_file(fd, output, n); | 73 | ret = os_read_file(fd, output, expected); |
| 70 | if(actual != n){ | 74 | if (ret != expected) { |
| 71 | printk("read_output - read of data failed, " | 75 | str = "data"; |
| 72 | "err = %d\n", -actual); | 76 | goto err; |
| 73 | return; | ||
| 74 | } | 77 | } |
| 75 | remain -= actual; | 78 | remain -= ret; |
| 76 | } | 79 | } |
| 80 | |||
| 77 | return; | 81 | return; |
| 82 | |||
| 83 | err: | ||
| 84 | if (ret < 0) | ||
| 85 | printk("read_output - read of %s failed, errno = %d\n", str, -ret); | ||
| 86 | else | ||
| 87 | printk("read_output - read of %s failed, read only %d of %d bytes\n", str, ret, expected); | ||
| 78 | } | 88 | } |
| 79 | 89 | ||
| 80 | int net_read(int fd, void *buf, int len) | 90 | int net_read(int fd, void *buf, int len) |
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 101efd26d467..fa617e0719ab 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c | |||
| @@ -1135,7 +1135,7 @@ static int path_requires_switch(char *from_cmdline, char *from_cow, char *cow) | |||
| 1135 | static int backing_file_mismatch(char *file, __u64 size, time_t mtime) | 1135 | static int backing_file_mismatch(char *file, __u64 size, time_t mtime) |
| 1136 | { | 1136 | { |
| 1137 | unsigned long modtime; | 1137 | unsigned long modtime; |
| 1138 | long long actual; | 1138 | unsigned long long actual; |
| 1139 | int err; | 1139 | int err; |
| 1140 | 1140 | ||
| 1141 | err = os_file_modtime(file, &modtime); | 1141 | err = os_file_modtime(file, &modtime); |
diff --git a/arch/um/include/init.h b/arch/um/include/init.h index cbd79a8d213d..d4de7c0120ce 100644 --- a/arch/um/include/init.h +++ b/arch/um/include/init.h | |||
| @@ -122,7 +122,7 @@ extern struct uml_param __uml_setup_start, __uml_setup_end; | |||
| 122 | 122 | ||
| 123 | #define __exitcall(fn) static exitcall_t __exitcall_##fn __exit_call = fn | 123 | #define __exitcall(fn) static exitcall_t __exitcall_##fn __exit_call = fn |
| 124 | 124 | ||
| 125 | #define __init_call __attribute__ ((unused,__section__ (".initcall.init"))) | 125 | #define __init_call __attribute_used__ __attribute__ ((__section__ (".initcall.init"))) |
| 126 | 126 | ||
| 127 | #endif | 127 | #endif |
| 128 | 128 | ||
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index eb1710b81255..2a1c64d8d0bf 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h | |||
| @@ -179,8 +179,11 @@ extern void os_stop_process(int pid); | |||
| 179 | extern void os_kill_process(int pid, int reap_child); | 179 | extern void os_kill_process(int pid, int reap_child); |
| 180 | extern void os_kill_ptraced_process(int pid, int reap_child); | 180 | extern void os_kill_ptraced_process(int pid, int reap_child); |
| 181 | extern void os_usr1_process(int pid); | 181 | extern void os_usr1_process(int pid); |
| 182 | extern long os_ptrace_ldt(long pid, long addr, long data); | ||
| 183 | |||
| 182 | extern int os_getpid(void); | 184 | extern int os_getpid(void); |
| 183 | extern int os_getpgrp(void); | 185 | extern int os_getpgrp(void); |
| 186 | |||
| 184 | extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int)); | 187 | extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int)); |
| 185 | extern void init_new_thread_signals(int altstack); | 188 | extern void init_new_thread_signals(int altstack); |
| 186 | extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr); | 189 | extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr); |
diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c index f55773c819e6..3bd10deea280 100644 --- a/arch/um/os-Linux/file.c +++ b/arch/um/os-Linux/file.c | |||
| @@ -272,14 +272,23 @@ int os_connect_socket(char *name) | |||
| 272 | snprintf(sock.sun_path, sizeof(sock.sun_path), "%s", name); | 272 | snprintf(sock.sun_path, sizeof(sock.sun_path), "%s", name); |
| 273 | 273 | ||
| 274 | fd = socket(AF_UNIX, SOCK_STREAM, 0); | 274 | fd = socket(AF_UNIX, SOCK_STREAM, 0); |
| 275 | if(fd < 0) | 275 | if(fd < 0) { |
| 276 | return(fd); | 276 | err = -errno; |
| 277 | goto out; | ||
| 278 | } | ||
| 277 | 279 | ||
| 278 | err = connect(fd, (struct sockaddr *) &sock, sizeof(sock)); | 280 | err = connect(fd, (struct sockaddr *) &sock, sizeof(sock)); |
| 279 | if(err) | 281 | if(err) { |
| 280 | return(-errno); | 282 | err = -errno; |
| 283 | goto out_close; | ||
| 284 | } | ||
| 281 | 285 | ||
| 282 | return(fd); | 286 | return fd; |
| 287 | |||
| 288 | out_close: | ||
| 289 | close(fd); | ||
| 290 | out: | ||
| 291 | return err; | ||
| 283 | } | 292 | } |
| 284 | 293 | ||
| 285 | void os_close_file(int fd) | 294 | void os_close_file(int fd) |
diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c index 7f5e2dac2a35..d261888f39c4 100644 --- a/arch/um/os-Linux/process.c +++ b/arch/um/os-Linux/process.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include "irq_user.h" | 19 | #include "irq_user.h" |
| 20 | #include "kern_util.h" | 20 | #include "kern_util.h" |
| 21 | #include "longjmp.h" | 21 | #include "longjmp.h" |
| 22 | #include "skas_ptrace.h" | ||
| 22 | 23 | ||
| 23 | #define ARBITRARY_ADDR -1 | 24 | #define ARBITRARY_ADDR -1 |
| 24 | #define FAILURE_PID -1 | 25 | #define FAILURE_PID -1 |
| @@ -100,6 +101,21 @@ void os_kill_process(int pid, int reap_child) | |||
| 100 | 101 | ||
| 101 | } | 102 | } |
| 102 | 103 | ||
| 104 | /* This is here uniquely to have access to the userspace errno, i.e. the one | ||
| 105 | * used by ptrace in case of error. | ||
| 106 | */ | ||
| 107 | |||
| 108 | long os_ptrace_ldt(long pid, long addr, long data) | ||
| 109 | { | ||
| 110 | int ret; | ||
| 111 | |||
| 112 | ret = ptrace(PTRACE_LDT, pid, addr, data); | ||
| 113 | |||
| 114 | if (ret < 0) | ||
| 115 | return -errno; | ||
| 116 | return ret; | ||
| 117 | } | ||
| 118 | |||
| 103 | /* Kill off a ptraced child by all means available. kill it normally first, | 119 | /* Kill off a ptraced child by all means available. kill it normally first, |
| 104 | * then PTRACE_KILL it, then PTRACE_CONT it in case it's in a run state from | 120 | * then PTRACE_KILL it, then PTRACE_CONT it in case it's in a run state from |
| 105 | * which it can't exit directly. | 121 | * which it can't exit directly. |
diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c index 1fa09a79a10b..fe0877b3509c 100644 --- a/arch/um/sys-i386/ldt.c +++ b/arch/um/sys-i386/ldt.c | |||
| @@ -107,7 +107,7 @@ long write_ldt_entry(struct mm_id * mm_idp, int func, struct user_desc * desc, | |||
| 107 | * So we need to switch child's mm into our userspace, then | 107 | * So we need to switch child's mm into our userspace, then |
| 108 | * later switch back. | 108 | * later switch back. |
| 109 | * | 109 | * |
| 110 | * Note: I'm unshure: should interrupts be disabled here? | 110 | * Note: I'm unsure: should interrupts be disabled here? |
| 111 | */ | 111 | */ |
| 112 | if(!current->active_mm || current->active_mm == &init_mm || | 112 | if(!current->active_mm || current->active_mm == &init_mm || |
| 113 | mm_idp != ¤t->active_mm->context.skas.id) | 113 | mm_idp != ¤t->active_mm->context.skas.id) |
| @@ -129,9 +129,7 @@ long write_ldt_entry(struct mm_id * mm_idp, int func, struct user_desc * desc, | |||
| 129 | pid = userspace_pid[cpu]; | 129 | pid = userspace_pid[cpu]; |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | res = ptrace(PTRACE_LDT, pid, 0, (unsigned long) &ldt_op); | 132 | res = os_ptrace_ldt(pid, 0, (unsigned long) &ldt_op); |
| 133 | if(res) | ||
| 134 | res = errno; | ||
| 135 | 133 | ||
| 136 | if(proc_mm) | 134 | if(proc_mm) |
| 137 | put_cpu(); | 135 | put_cpu(); |
| @@ -181,8 +179,7 @@ static long read_ldt_from_host(void __user * ptr, unsigned long bytecount) | |||
| 181 | */ | 179 | */ |
| 182 | 180 | ||
| 183 | cpu = get_cpu(); | 181 | cpu = get_cpu(); |
| 184 | res = ptrace(PTRACE_LDT, userspace_pid[cpu], 0, | 182 | res = os_ptrace_ldt(userspace_pid[cpu], 0, (unsigned long) &ptrace_ldt); |
| 185 | (unsigned long) &ptrace_ldt); | ||
| 186 | put_cpu(); | 183 | put_cpu(); |
| 187 | if(res < 0) | 184 | if(res < 0) |
| 188 | goto out; | 185 | goto out; |
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 2f9deca31cc9..e18eb79bf855 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig | |||
| @@ -354,21 +354,6 @@ config HPET_TIMER | |||
| 354 | as it is off-chip. You can find the HPET spec at | 354 | as it is off-chip. You can find the HPET spec at |
| 355 | <http://www.intel.com/hardwaredesign/hpetspec.htm>. | 355 | <http://www.intel.com/hardwaredesign/hpetspec.htm>. |
| 356 | 356 | ||
| 357 | config X86_PM_TIMER | ||
| 358 | bool "PM timer" if EMBEDDED | ||
| 359 | depends on ACPI | ||
| 360 | default y | ||
| 361 | help | ||
| 362 | Support the ACPI PM timer for time keeping. This is slow, | ||
| 363 | but is useful on some chipsets without HPET on systems with more | ||
| 364 | than one CPU. On a single processor or single socket multi core | ||
| 365 | system it is normally not required. | ||
| 366 | When the PM timer is active 64bit vsyscalls are disabled | ||
| 367 | and should not be enabled (/proc/sys/kernel/vsyscall64 should | ||
| 368 | not be changed). | ||
| 369 | The kernel selects the PM timer only as a last resort, so it is | ||
| 370 | useful to enable just in case. | ||
| 371 | |||
| 372 | config HPET_EMULATE_RTC | 357 | config HPET_EMULATE_RTC |
| 373 | bool "Provide RTC interrupt" | 358 | bool "Provide RTC interrupt" |
| 374 | depends on HPET_TIMER && RTC=y | 359 | depends on HPET_TIMER && RTC=y |
| @@ -592,6 +577,7 @@ source "arch/x86_64/oprofile/Kconfig" | |||
| 592 | 577 | ||
| 593 | config KPROBES | 578 | config KPROBES |
| 594 | bool "Kprobes (EXPERIMENTAL)" | 579 | bool "Kprobes (EXPERIMENTAL)" |
| 580 | depends on EXPERIMENTAL && MODULES | ||
| 595 | help | 581 | help |
| 596 | Kprobes allows you to trap at almost any kernel address and | 582 | Kprobes allows you to trap at almost any kernel address and |
| 597 | execute a callback function. register_kprobe() establishes | 583 | execute a callback function. register_kprobe() establishes |
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index 72fe60c20d39..a098a11e7755 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile | |||
| @@ -43,7 +43,7 @@ CFLAGS_vsyscall.o := $(PROFILING) -g0 | |||
| 43 | 43 | ||
| 44 | bootflag-y += ../../i386/kernel/bootflag.o | 44 | bootflag-y += ../../i386/kernel/bootflag.o |
| 45 | cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o | 45 | cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o |
| 46 | topology-y += ../../i386/mach-default/topology.o | 46 | topology-y += ../../i386/kernel/topology.o |
| 47 | microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../i386/kernel/microcode.o | 47 | microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../i386/kernel/microcode.o |
| 48 | intel_cacheinfo-y += ../../i386/kernel/cpu/intel_cacheinfo.o | 48 | intel_cacheinfo-y += ../../i386/kernel/cpu/intel_cacheinfo.o |
| 49 | quirks-y += ../../i386/kernel/quirks.o | 49 | quirks-y += ../../i386/kernel/quirks.o |
diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c index e4e2b7d01f89..a0f955b9995f 100644 --- a/arch/x86_64/kernel/aperture.c +++ b/arch/x86_64/kernel/aperture.c | |||
| @@ -248,7 +248,7 @@ void __init iommu_hole_init(void) | |||
| 248 | /* Got the aperture from the AGP bridge */ | 248 | /* Got the aperture from the AGP bridge */ |
| 249 | } else if (swiotlb && !valid_agp) { | 249 | } else if (swiotlb && !valid_agp) { |
| 250 | /* Do nothing */ | 250 | /* Do nothing */ |
| 251 | } else if ((!no_iommu && end_pfn >= MAX_DMA32_PFN) || | 251 | } else if ((!no_iommu && end_pfn > MAX_DMA32_PFN) || |
| 252 | force_iommu || | 252 | force_iommu || |
| 253 | valid_agp || | 253 | valid_agp || |
| 254 | fallback_aper_force) { | 254 | fallback_aper_force) { |
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index 2585c1d92b26..ffed464e6b12 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c | |||
| @@ -50,6 +50,8 @@ static int no_timer_check; | |||
| 50 | 50 | ||
| 51 | int disable_timer_pin_1 __initdata; | 51 | int disable_timer_pin_1 __initdata; |
| 52 | 52 | ||
| 53 | int timer_over_8254 __initdata = 1; | ||
| 54 | |||
| 53 | /* Where if anywhere is the i8259 connect in external int mode */ | 55 | /* Where if anywhere is the i8259 connect in external int mode */ |
| 54 | static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; | 56 | static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; |
| 55 | 57 | ||
| @@ -251,6 +253,20 @@ static int __init enable_ioapic_setup(char *str) | |||
| 251 | __setup("noapic", disable_ioapic_setup); | 253 | __setup("noapic", disable_ioapic_setup); |
| 252 | __setup("apic", enable_ioapic_setup); | 254 | __setup("apic", enable_ioapic_setup); |
| 253 | 255 | ||
| 256 | static int __init setup_disable_8254_timer(char *s) | ||
| 257 | { | ||
| 258 | timer_over_8254 = -1; | ||
| 259 | return 1; | ||
| 260 | } | ||
| 261 | static int __init setup_enable_8254_timer(char *s) | ||
| 262 | { | ||
| 263 | timer_over_8254 = 2; | ||
| 264 | return 1; | ||
| 265 | } | ||
| 266 | |||
| 267 | __setup("disable_8254_timer", setup_disable_8254_timer); | ||
| 268 | __setup("enable_8254_timer", setup_enable_8254_timer); | ||
| 269 | |||
| 254 | #include <asm/pci-direct.h> | 270 | #include <asm/pci-direct.h> |
| 255 | #include <linux/pci_ids.h> | 271 | #include <linux/pci_ids.h> |
| 256 | #include <linux/pci.h> | 272 | #include <linux/pci.h> |
| @@ -309,27 +325,20 @@ void __init check_ioapic(void) | |||
| 309 | #endif | 325 | #endif |
| 310 | /* RED-PEN skip them on mptables too? */ | 326 | /* RED-PEN skip them on mptables too? */ |
| 311 | return; | 327 | return; |
| 328 | |||
| 329 | /* This should be actually default, but | ||
| 330 | for 2.6.16 let's do it for ATI only where | ||
| 331 | it's really needed. */ | ||
| 312 | case PCI_VENDOR_ID_ATI: | 332 | case PCI_VENDOR_ID_ATI: |
| 313 | if (apic_runs_main_timer != 0) | 333 | if (timer_over_8254 == 1) { |
| 314 | break; | 334 | timer_over_8254 = 0; |
| 315 | #ifdef CONFIG_ACPI | ||
| 316 | /* Don't do this for laptops right | ||
| 317 | right now because their timer | ||
| 318 | doesn't necessarily tick in C2/3 */ | ||
| 319 | if (acpi_fadt.revision >= 3 && | ||
| 320 | (acpi_fadt.plvl2_lat + acpi_fadt.plvl3_lat) < 1100) { | ||
| 321 | printk(KERN_INFO | ||
| 322 | "ATI board detected, but seems to be a laptop. Timer might be shakey, sorry\n"); | ||
| 323 | break; | ||
| 324 | } | ||
| 325 | #endif | ||
| 326 | printk(KERN_INFO | 335 | printk(KERN_INFO |
| 327 | "ATI board detected. Using APIC/PM timer.\n"); | 336 | "ATI board detected. Disabling timer routing over 8254.\n"); |
| 328 | apic_runs_main_timer = 1; | 337 | } |
| 329 | nohpet = 1; | ||
| 330 | return; | 338 | return; |
| 331 | } | 339 | } |
| 332 | 340 | ||
| 341 | |||
| 333 | /* No multi-function device? */ | 342 | /* No multi-function device? */ |
| 334 | type = read_pci_config_byte(num,slot,func, | 343 | type = read_pci_config_byte(num,slot,func, |
| 335 | PCI_HEADER_TYPE); | 344 | PCI_HEADER_TYPE); |
| @@ -1773,6 +1782,8 @@ static inline void unlock_ExtINT_logic(void) | |||
| 1773 | * a wide range of boards and BIOS bugs. Fortunately only the timer IRQ | 1782 | * a wide range of boards and BIOS bugs. Fortunately only the timer IRQ |
| 1774 | * is so screwy. Thanks to Brian Perkins for testing/hacking this beast | 1783 | * is so screwy. Thanks to Brian Perkins for testing/hacking this beast |
| 1775 | * fanatically on his truly buggy board. | 1784 | * fanatically on his truly buggy board. |
| 1785 | * | ||
| 1786 | * FIXME: really need to revamp this for modern platforms only. | ||
| 1776 | */ | 1787 | */ |
| 1777 | static inline void check_timer(void) | 1788 | static inline void check_timer(void) |
| 1778 | { | 1789 | { |
| @@ -1795,7 +1806,8 @@ static inline void check_timer(void) | |||
| 1795 | */ | 1806 | */ |
| 1796 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | 1807 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); |
| 1797 | init_8259A(1); | 1808 | init_8259A(1); |
| 1798 | enable_8259A_irq(0); | 1809 | if (timer_over_8254 > 0) |
| 1810 | enable_8259A_irq(0); | ||
| 1799 | 1811 | ||
| 1800 | pin1 = find_isa_irq_pin(0, mp_INT); | 1812 | pin1 = find_isa_irq_pin(0, mp_INT); |
| 1801 | apic1 = find_isa_irq_apic(0, mp_INT); | 1813 | apic1 = find_isa_irq_apic(0, mp_INT); |
| @@ -1850,7 +1862,7 @@ static inline void check_timer(void) | |||
| 1850 | } | 1862 | } |
| 1851 | printk(" failed.\n"); | 1863 | printk(" failed.\n"); |
| 1852 | 1864 | ||
| 1853 | if (nmi_watchdog) { | 1865 | if (nmi_watchdog == NMI_IO_APIC) { |
| 1854 | printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); | 1866 | printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); |
| 1855 | nmi_watchdog = 0; | 1867 | nmi_watchdog = 0; |
| 1856 | } | 1868 | } |
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c index dd0718dc178b..0c3f052ba6ce 100644 --- a/arch/x86_64/kernel/pci-gart.c +++ b/arch/x86_64/kernel/pci-gart.c | |||
| @@ -228,11 +228,6 @@ static inline int need_iommu(struct device *dev, unsigned long addr, size_t size | |||
| 228 | int mmu = high; | 228 | int mmu = high; |
| 229 | if (force_iommu) | 229 | if (force_iommu) |
| 230 | mmu = 1; | 230 | mmu = 1; |
| 231 | if (no_iommu) { | ||
| 232 | if (high) | ||
| 233 | panic("PCI-DMA: high address but no IOMMU.\n"); | ||
| 234 | mmu = 0; | ||
| 235 | } | ||
| 236 | return mmu; | 231 | return mmu; |
| 237 | } | 232 | } |
| 238 | 233 | ||
| @@ -241,11 +236,6 @@ static inline int nonforced_iommu(struct device *dev, unsigned long addr, size_t | |||
| 241 | u64 mask = *dev->dma_mask; | 236 | u64 mask = *dev->dma_mask; |
| 242 | int high = addr + size >= mask; | 237 | int high = addr + size >= mask; |
| 243 | int mmu = high; | 238 | int mmu = high; |
| 244 | if (no_iommu) { | ||
| 245 | if (high) | ||
| 246 | panic("PCI-DMA: high address but no IOMMU.\n"); | ||
| 247 | mmu = 0; | ||
| 248 | } | ||
| 249 | return mmu; | 239 | return mmu; |
| 250 | } | 240 | } |
| 251 | 241 | ||
| @@ -310,7 +300,7 @@ void gart_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, int di | |||
| 310 | 300 | ||
| 311 | for (i = 0; i < nents; i++) { | 301 | for (i = 0; i < nents; i++) { |
| 312 | struct scatterlist *s = &sg[i]; | 302 | struct scatterlist *s = &sg[i]; |
| 313 | if (!s->dma_length) | 303 | if (!s->dma_length || !s->length) |
| 314 | break; | 304 | break; |
| 315 | dma_unmap_single(dev, s->dma_address, s->dma_length, dir); | 305 | dma_unmap_single(dev, s->dma_address, s->dma_length, dir); |
| 316 | } | 306 | } |
| @@ -364,6 +354,7 @@ static int __dma_map_cont(struct scatterlist *sg, int start, int stopat, | |||
| 364 | 354 | ||
| 365 | BUG_ON(i > start && s->offset); | 355 | BUG_ON(i > start && s->offset); |
| 366 | if (i == start) { | 356 | if (i == start) { |
| 357 | *sout = *s; | ||
| 367 | sout->dma_address = iommu_bus_base; | 358 | sout->dma_address = iommu_bus_base; |
| 368 | sout->dma_address += iommu_page*PAGE_SIZE + s->offset; | 359 | sout->dma_address += iommu_page*PAGE_SIZE + s->offset; |
| 369 | sout->dma_length = s->length; | 360 | sout->dma_length = s->length; |
| @@ -390,6 +381,7 @@ static inline int dma_map_cont(struct scatterlist *sg, int start, int stopat, | |||
| 390 | { | 381 | { |
| 391 | if (!need) { | 382 | if (!need) { |
| 392 | BUG_ON(stopat - start != 1); | 383 | BUG_ON(stopat - start != 1); |
| 384 | *sout = sg[start]; | ||
| 393 | sout->dma_length = sg[start].length; | 385 | sout->dma_length = sg[start].length; |
| 394 | return 0; | 386 | return 0; |
| 395 | } | 387 | } |
| @@ -632,17 +624,13 @@ static int __init pci_iommu_init(void) | |||
| 632 | (agp_copy_info(agp_bridge, &info) < 0); | 624 | (agp_copy_info(agp_bridge, &info) < 0); |
| 633 | #endif | 625 | #endif |
| 634 | 626 | ||
| 635 | if (swiotlb) { | 627 | if (swiotlb) |
| 636 | no_iommu = 1; | ||
| 637 | return -1; | 628 | return -1; |
| 638 | } | 629 | |
| 639 | |||
| 640 | if (no_iommu || | 630 | if (no_iommu || |
| 641 | (!force_iommu && end_pfn <= MAX_DMA32_PFN) || | 631 | (!force_iommu && end_pfn <= MAX_DMA32_PFN) || |
| 642 | !iommu_aperture || | 632 | !iommu_aperture || |
| 643 | (no_agp && init_k8_gatt(&info) < 0)) { | 633 | (no_agp && init_k8_gatt(&info) < 0)) { |
| 644 | no_iommu = 1; | ||
| 645 | no_iommu_init(); | ||
| 646 | printk(KERN_INFO "PCI-DMA: Disabling IOMMU.\n"); | 634 | printk(KERN_INFO "PCI-DMA: Disabling IOMMU.\n"); |
| 647 | if (end_pfn > MAX_DMA32_PFN) { | 635 | if (end_pfn > MAX_DMA32_PFN) { |
| 648 | printk(KERN_ERR "WARNING more than 4GB of memory " | 636 | printk(KERN_ERR "WARNING more than 4GB of memory " |
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 9435ab7d6fb8..aa55e3cec665 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c | |||
| @@ -423,6 +423,12 @@ static __init void parse_cmdline_early (char ** cmdline_p) | |||
| 423 | else if(!memcmp(from, "elfcorehdr=", 11)) | 423 | else if(!memcmp(from, "elfcorehdr=", 11)) |
| 424 | elfcorehdr_addr = memparse(from+11, &from); | 424 | elfcorehdr_addr = memparse(from+11, &from); |
| 425 | #endif | 425 | #endif |
| 426 | |||
| 427 | #ifdef CONFIG_HOTPLUG_CPU | ||
| 428 | else if (!memcmp(from, "additional_cpus=", 16)) | ||
| 429 | setup_additional_cpus(from+16); | ||
| 430 | #endif | ||
| 431 | |||
| 426 | next_char: | 432 | next_char: |
| 427 | c = *(from++); | 433 | c = *(from++); |
| 428 | if (!c) | 434 | if (!c) |
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c index 67e4e28f4df8..66e98659d077 100644 --- a/arch/x86_64/kernel/smpboot.c +++ b/arch/x86_64/kernel/smpboot.c | |||
| @@ -1152,8 +1152,6 @@ void __init smp_cpus_done(unsigned int max_cpus) | |||
| 1152 | setup_ioapic_dest(); | 1152 | setup_ioapic_dest(); |
| 1153 | #endif | 1153 | #endif |
| 1154 | 1154 | ||
| 1155 | time_init_gtod(); | ||
| 1156 | |||
| 1157 | check_nmi_watchdog(); | 1155 | check_nmi_watchdog(); |
| 1158 | } | 1156 | } |
| 1159 | 1157 | ||
| @@ -1244,7 +1242,7 @@ void __cpu_die(unsigned int cpu) | |||
| 1244 | printk(KERN_ERR "CPU %u didn't die...\n", cpu); | 1242 | printk(KERN_ERR "CPU %u didn't die...\n", cpu); |
| 1245 | } | 1243 | } |
| 1246 | 1244 | ||
| 1247 | static __init int setup_additional_cpus(char *s) | 1245 | __init int setup_additional_cpus(char *s) |
| 1248 | { | 1246 | { |
| 1249 | return get_option(&s, &additional_cpus); | 1247 | return get_option(&s, &additional_cpus); |
| 1250 | } | 1248 | } |
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index 67841d11ed1f..3080f84bf7b7 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c | |||
| @@ -48,6 +48,8 @@ static void cpufreq_delayed_get(void); | |||
| 48 | extern void i8254_timer_resume(void); | 48 | extern void i8254_timer_resume(void); |
| 49 | extern int using_apic_timer; | 49 | extern int using_apic_timer; |
| 50 | 50 | ||
| 51 | static char *time_init_gtod(void); | ||
| 52 | |||
| 51 | DEFINE_SPINLOCK(rtc_lock); | 53 | DEFINE_SPINLOCK(rtc_lock); |
| 52 | DEFINE_SPINLOCK(i8253_lock); | 54 | DEFINE_SPINLOCK(i8253_lock); |
| 53 | 55 | ||
| @@ -901,6 +903,7 @@ static struct irqaction irq0 = { | |||
| 901 | void __init time_init(void) | 903 | void __init time_init(void) |
| 902 | { | 904 | { |
| 903 | char *timename; | 905 | char *timename; |
| 906 | char *gtod; | ||
| 904 | 907 | ||
| 905 | #ifdef HPET_HACK_ENABLE_DANGEROUS | 908 | #ifdef HPET_HACK_ENABLE_DANGEROUS |
| 906 | if (!vxtime.hpet_address) { | 909 | if (!vxtime.hpet_address) { |
| @@ -945,21 +948,19 @@ void __init time_init(void) | |||
| 945 | timename = "PIT"; | 948 | timename = "PIT"; |
| 946 | } | 949 | } |
| 947 | 950 | ||
| 948 | printk(KERN_INFO "time.c: Using %ld.%06ld MHz %s timer.\n", | 951 | vxtime.mode = VXTIME_TSC; |
| 949 | vxtime_hz / 1000000, vxtime_hz % 1000000, timename); | 952 | gtod = time_init_gtod(); |
| 953 | |||
| 954 | printk(KERN_INFO "time.c: Using %ld.%06ld MHz WALL %s GTOD %s timer.\n", | ||
| 955 | vxtime_hz / 1000000, vxtime_hz % 1000000, timename, gtod); | ||
| 950 | printk(KERN_INFO "time.c: Detected %d.%03d MHz processor.\n", | 956 | printk(KERN_INFO "time.c: Detected %d.%03d MHz processor.\n", |
| 951 | cpu_khz / 1000, cpu_khz % 1000); | 957 | cpu_khz / 1000, cpu_khz % 1000); |
| 952 | vxtime.mode = VXTIME_TSC; | ||
| 953 | vxtime.quot = (1000000L << 32) / vxtime_hz; | 958 | vxtime.quot = (1000000L << 32) / vxtime_hz; |
| 954 | vxtime.tsc_quot = (1000L << 32) / cpu_khz; | 959 | vxtime.tsc_quot = (1000L << 32) / cpu_khz; |
| 955 | vxtime.last_tsc = get_cycles_sync(); | 960 | vxtime.last_tsc = get_cycles_sync(); |
| 956 | setup_irq(0, &irq0); | 961 | setup_irq(0, &irq0); |
| 957 | 962 | ||
| 958 | set_cyc2ns_scale(cpu_khz); | 963 | set_cyc2ns_scale(cpu_khz); |
| 959 | |||
| 960 | #ifndef CONFIG_SMP | ||
| 961 | time_init_gtod(); | ||
| 962 | #endif | ||
| 963 | } | 964 | } |
| 964 | 965 | ||
| 965 | /* | 966 | /* |
| @@ -981,9 +982,9 @@ __cpuinit int unsynchronized_tsc(void) | |||
| 981 | } | 982 | } |
| 982 | 983 | ||
| 983 | /* | 984 | /* |
| 984 | * Decide after all CPUs are booted what mode gettimeofday should use. | 985 | * Decide what mode gettimeofday should use. |
| 985 | */ | 986 | */ |
| 986 | void __init time_init_gtod(void) | 987 | __init static char *time_init_gtod(void) |
| 987 | { | 988 | { |
| 988 | char *timetype; | 989 | char *timetype; |
| 989 | 990 | ||
| @@ -1011,8 +1012,7 @@ void __init time_init_gtod(void) | |||
| 1011 | timetype = hpet_use_timer ? "HPET/TSC" : "PIT/TSC"; | 1012 | timetype = hpet_use_timer ? "HPET/TSC" : "PIT/TSC"; |
| 1012 | vxtime.mode = VXTIME_TSC; | 1013 | vxtime.mode = VXTIME_TSC; |
| 1013 | } | 1014 | } |
| 1014 | 1015 | return timetype; | |
| 1015 | printk(KERN_INFO "time.c: Using %s based timekeeping.\n", timetype); | ||
| 1016 | } | 1016 | } |
| 1017 | 1017 | ||
| 1018 | __setup("report_lost_ticks", time_setup); | 1018 | __setup("report_lost_ticks", time_setup); |
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 74fae2daf87e..c8dbe38c81c8 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
| @@ -239,7 +239,6 @@ enum cfqq_state_flags { | |||
| 239 | CFQ_CFQQ_FLAG_fifo_expire, | 239 | CFQ_CFQQ_FLAG_fifo_expire, |
| 240 | CFQ_CFQQ_FLAG_idle_window, | 240 | CFQ_CFQQ_FLAG_idle_window, |
| 241 | CFQ_CFQQ_FLAG_prio_changed, | 241 | CFQ_CFQQ_FLAG_prio_changed, |
| 242 | CFQ_CFQQ_FLAG_expired, | ||
| 243 | }; | 242 | }; |
| 244 | 243 | ||
| 245 | #define CFQ_CFQQ_FNS(name) \ | 244 | #define CFQ_CFQQ_FNS(name) \ |
| @@ -264,7 +263,6 @@ CFQ_CFQQ_FNS(must_dispatch); | |||
| 264 | CFQ_CFQQ_FNS(fifo_expire); | 263 | CFQ_CFQQ_FNS(fifo_expire); |
| 265 | CFQ_CFQQ_FNS(idle_window); | 264 | CFQ_CFQQ_FNS(idle_window); |
| 266 | CFQ_CFQQ_FNS(prio_changed); | 265 | CFQ_CFQQ_FNS(prio_changed); |
| 267 | CFQ_CFQQ_FNS(expired); | ||
| 268 | #undef CFQ_CFQQ_FNS | 266 | #undef CFQ_CFQQ_FNS |
| 269 | 267 | ||
| 270 | enum cfq_rq_state_flags { | 268 | enum cfq_rq_state_flags { |
| @@ -336,7 +334,7 @@ static struct request *cfq_find_rq_hash(struct cfq_data *cfqd, sector_t offset) | |||
| 336 | */ | 334 | */ |
| 337 | static inline void cfq_schedule_dispatch(struct cfq_data *cfqd) | 335 | static inline void cfq_schedule_dispatch(struct cfq_data *cfqd) |
| 338 | { | 336 | { |
| 339 | if (!cfqd->rq_in_driver && cfqd->busy_queues) | 337 | if (cfqd->busy_queues) |
| 340 | kblockd_schedule_work(&cfqd->unplug_work); | 338 | kblockd_schedule_work(&cfqd->unplug_work); |
| 341 | } | 339 | } |
| 342 | 340 | ||
| @@ -736,13 +734,63 @@ __cfq_set_active_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq) | |||
| 736 | cfqq->slice_left = 0; | 734 | cfqq->slice_left = 0; |
| 737 | cfq_clear_cfqq_must_alloc_slice(cfqq); | 735 | cfq_clear_cfqq_must_alloc_slice(cfqq); |
| 738 | cfq_clear_cfqq_fifo_expire(cfqq); | 736 | cfq_clear_cfqq_fifo_expire(cfqq); |
| 739 | cfq_clear_cfqq_expired(cfqq); | ||
| 740 | } | 737 | } |
| 741 | 738 | ||
| 742 | cfqd->active_queue = cfqq; | 739 | cfqd->active_queue = cfqq; |
| 743 | } | 740 | } |
| 744 | 741 | ||
| 745 | /* | 742 | /* |
| 743 | * current cfqq expired its slice (or was too idle), select new one | ||
| 744 | */ | ||
| 745 | static void | ||
| 746 | __cfq_slice_expired(struct cfq_data *cfqd, struct cfq_queue *cfqq, | ||
| 747 | int preempted) | ||
| 748 | { | ||
| 749 | unsigned long now = jiffies; | ||
| 750 | |||
| 751 | if (cfq_cfqq_wait_request(cfqq)) | ||
| 752 | del_timer(&cfqd->idle_slice_timer); | ||
| 753 | |||
| 754 | if (!preempted && !cfq_cfqq_dispatched(cfqq)) { | ||
| 755 | cfqq->service_last = now; | ||
| 756 | cfq_schedule_dispatch(cfqd); | ||
| 757 | } | ||
| 758 | |||
| 759 | cfq_clear_cfqq_must_dispatch(cfqq); | ||
| 760 | cfq_clear_cfqq_wait_request(cfqq); | ||
| 761 | |||
| 762 | /* | ||
| 763 | * store what was left of this slice, if the queue idled out | ||
| 764 | * or was preempted | ||
| 765 | */ | ||
| 766 | if (time_after(cfqq->slice_end, now)) | ||
| 767 | cfqq->slice_left = cfqq->slice_end - now; | ||
| 768 | else | ||
| 769 | cfqq->slice_left = 0; | ||
| 770 | |||
| 771 | if (cfq_cfqq_on_rr(cfqq)) | ||
| 772 | cfq_resort_rr_list(cfqq, preempted); | ||
| 773 | |||
| 774 | if (cfqq == cfqd->active_queue) | ||
| 775 | cfqd->active_queue = NULL; | ||
| 776 | |||
| 777 | if (cfqd->active_cic) { | ||
| 778 | put_io_context(cfqd->active_cic->ioc); | ||
| 779 | cfqd->active_cic = NULL; | ||
| 780 | } | ||
| 781 | |||
| 782 | cfqd->dispatch_slice = 0; | ||
| 783 | } | ||
| 784 | |||
| 785 | static inline void cfq_slice_expired(struct cfq_data *cfqd, int preempted) | ||
| 786 | { | ||
| 787 | struct cfq_queue *cfqq = cfqd->active_queue; | ||
| 788 | |||
| 789 | if (cfqq) | ||
| 790 | __cfq_slice_expired(cfqd, cfqq, preempted); | ||
| 791 | } | ||
| 792 | |||
| 793 | /* | ||
| 746 | * 0 | 794 | * 0 |
| 747 | * 0,1 | 795 | * 0,1 |
| 748 | * 0,1,2 | 796 | * 0,1,2 |
| @@ -801,16 +849,7 @@ static int cfq_get_next_prio_level(struct cfq_data *cfqd) | |||
| 801 | 849 | ||
| 802 | static struct cfq_queue *cfq_set_active_queue(struct cfq_data *cfqd) | 850 | static struct cfq_queue *cfq_set_active_queue(struct cfq_data *cfqd) |
| 803 | { | 851 | { |
| 804 | struct cfq_queue *cfqq; | 852 | struct cfq_queue *cfqq = NULL; |
| 805 | |||
| 806 | /* | ||
| 807 | * if current queue is expired but not done with its requests yet, | ||
| 808 | * wait for that to happen | ||
| 809 | */ | ||
| 810 | if ((cfqq = cfqd->active_queue) != NULL) { | ||
| 811 | if (cfq_cfqq_expired(cfqq) && cfq_cfqq_dispatched(cfqq)) | ||
| 812 | return NULL; | ||
| 813 | } | ||
| 814 | 853 | ||
| 815 | /* | 854 | /* |
| 816 | * if current list is non-empty, grab first entry. if it is empty, | 855 | * if current list is non-empty, grab first entry. if it is empty, |
| @@ -837,66 +876,11 @@ static struct cfq_queue *cfq_set_active_queue(struct cfq_data *cfqd) | |||
| 837 | return cfqq; | 876 | return cfqq; |
| 838 | } | 877 | } |
| 839 | 878 | ||
| 840 | /* | ||
| 841 | * current cfqq expired its slice (or was too idle), select new one | ||
| 842 | */ | ||
| 843 | static void | ||
| 844 | __cfq_slice_expired(struct cfq_data *cfqd, struct cfq_queue *cfqq, | ||
| 845 | int preempted) | ||
| 846 | { | ||
| 847 | unsigned long now = jiffies; | ||
| 848 | |||
| 849 | if (cfq_cfqq_wait_request(cfqq)) | ||
| 850 | del_timer(&cfqd->idle_slice_timer); | ||
| 851 | |||
| 852 | if (!preempted && !cfq_cfqq_dispatched(cfqq)) | ||
| 853 | cfqq->service_last = now; | ||
| 854 | |||
| 855 | cfq_clear_cfqq_must_dispatch(cfqq); | ||
| 856 | cfq_clear_cfqq_wait_request(cfqq); | ||
| 857 | |||
| 858 | /* | ||
| 859 | * store what was left of this slice, if the queue idled out | ||
| 860 | * or was preempted | ||
| 861 | */ | ||
| 862 | if (time_after(cfqq->slice_end, now)) | ||
| 863 | cfqq->slice_left = cfqq->slice_end - now; | ||
| 864 | else | ||
| 865 | cfqq->slice_left = 0; | ||
| 866 | |||
| 867 | if (cfq_cfqq_on_rr(cfqq)) | ||
| 868 | cfq_resort_rr_list(cfqq, preempted); | ||
| 869 | |||
| 870 | if (cfqq == cfqd->active_queue) | ||
| 871 | cfqd->active_queue = NULL; | ||
| 872 | |||
| 873 | if (cfqd->active_cic) { | ||
| 874 | put_io_context(cfqd->active_cic->ioc); | ||
| 875 | cfqd->active_cic = NULL; | ||
| 876 | } | ||
| 877 | |||
| 878 | cfqd->dispatch_slice = 0; | ||
| 879 | } | ||
| 880 | |||
| 881 | static inline void cfq_slice_expired(struct cfq_data *cfqd, int preempted) | ||
| 882 | { | ||
| 883 | struct cfq_queue *cfqq = cfqd->active_queue; | ||
| 884 | |||
| 885 | if (cfqq) { | ||
| 886 | /* | ||
| 887 | * use deferred expiry, if there are requests in progress as | ||
| 888 | * not to disturb the slice of the next queue | ||
| 889 | */ | ||
| 890 | if (cfq_cfqq_dispatched(cfqq)) | ||
| 891 | cfq_mark_cfqq_expired(cfqq); | ||
| 892 | else | ||
| 893 | __cfq_slice_expired(cfqd, cfqq, preempted); | ||
| 894 | } | ||
| 895 | } | ||
| 896 | |||
| 897 | static int cfq_arm_slice_timer(struct cfq_data *cfqd, struct cfq_queue *cfqq) | 879 | static int cfq_arm_slice_timer(struct cfq_data *cfqd, struct cfq_queue *cfqq) |
| 898 | 880 | ||
| 899 | { | 881 | { |
| 882 | unsigned long sl; | ||
| 883 | |||
| 900 | WARN_ON(!RB_EMPTY(&cfqq->sort_list)); | 884 | WARN_ON(!RB_EMPTY(&cfqq->sort_list)); |
| 901 | WARN_ON(cfqq != cfqd->active_queue); | 885 | WARN_ON(cfqq != cfqd->active_queue); |
| 902 | 886 | ||
| @@ -916,13 +900,8 @@ static int cfq_arm_slice_timer(struct cfq_data *cfqd, struct cfq_queue *cfqq) | |||
| 916 | cfq_mark_cfqq_must_dispatch(cfqq); | 900 | cfq_mark_cfqq_must_dispatch(cfqq); |
| 917 | cfq_mark_cfqq_wait_request(cfqq); | 901 | cfq_mark_cfqq_wait_request(cfqq); |
| 918 | 902 | ||
| 919 | if (!timer_pending(&cfqd->idle_slice_timer)) { | 903 | sl = min(cfqq->slice_end - 1, (unsigned long) cfqd->cfq_slice_idle); |
| 920 | unsigned long slice_left = min(cfqq->slice_end - 1, (unsigned long) cfqd->cfq_slice_idle); | 904 | mod_timer(&cfqd->idle_slice_timer, jiffies + sl); |
| 921 | |||
| 922 | cfqd->idle_slice_timer.expires = jiffies + slice_left; | ||
| 923 | add_timer(&cfqd->idle_slice_timer); | ||
| 924 | } | ||
| 925 | |||
| 926 | return 1; | 905 | return 1; |
| 927 | } | 906 | } |
| 928 | 907 | ||
| @@ -1006,9 +985,6 @@ static struct cfq_queue *cfq_select_queue(struct cfq_data *cfqd) | |||
| 1006 | if (!cfqq) | 985 | if (!cfqq) |
| 1007 | goto new_queue; | 986 | goto new_queue; |
| 1008 | 987 | ||
| 1009 | if (cfq_cfqq_expired(cfqq)) | ||
| 1010 | goto new_queue; | ||
| 1011 | |||
| 1012 | /* | 988 | /* |
| 1013 | * slice has expired | 989 | * slice has expired |
| 1014 | */ | 990 | */ |
| @@ -1181,10 +1157,8 @@ static void cfq_put_queue(struct cfq_queue *cfqq) | |||
| 1181 | BUG_ON(cfqq->allocated[READ] + cfqq->allocated[WRITE]); | 1157 | BUG_ON(cfqq->allocated[READ] + cfqq->allocated[WRITE]); |
| 1182 | BUG_ON(cfq_cfqq_on_rr(cfqq)); | 1158 | BUG_ON(cfq_cfqq_on_rr(cfqq)); |
| 1183 | 1159 | ||
| 1184 | if (unlikely(cfqd->active_queue == cfqq)) { | 1160 | if (unlikely(cfqd->active_queue == cfqq)) |
| 1185 | __cfq_slice_expired(cfqd, cfqq, 0); | 1161 | __cfq_slice_expired(cfqd, cfqq, 0); |
| 1186 | cfq_schedule_dispatch(cfqd); | ||
| 1187 | } | ||
| 1188 | 1162 | ||
| 1189 | cfq_put_cfqd(cfqq->cfqd); | 1163 | cfq_put_cfqd(cfqq->cfqd); |
| 1190 | 1164 | ||
| @@ -1245,10 +1219,8 @@ static void cfq_exit_single_io_context(struct cfq_io_context *cic) | |||
| 1245 | 1219 | ||
| 1246 | spin_lock(q->queue_lock); | 1220 | spin_lock(q->queue_lock); |
| 1247 | 1221 | ||
| 1248 | if (unlikely(cic->cfqq == cfqd->active_queue)) { | 1222 | if (unlikely(cic->cfqq == cfqd->active_queue)) |
| 1249 | __cfq_slice_expired(cfqd, cic->cfqq, 0); | 1223 | __cfq_slice_expired(cfqd, cic->cfqq, 0); |
| 1250 | cfq_schedule_dispatch(cfqd); | ||
| 1251 | } | ||
| 1252 | 1224 | ||
| 1253 | cfq_put_queue(cic->cfqq); | 1225 | cfq_put_queue(cic->cfqq); |
| 1254 | cic->cfqq = NULL; | 1226 | cic->cfqq = NULL; |
| @@ -1715,10 +1687,7 @@ static void cfq_completed_request(request_queue_t *q, struct request *rq) | |||
| 1715 | cfqq->service_last = now; | 1687 | cfqq->service_last = now; |
| 1716 | cfq_resort_rr_list(cfqq, 0); | 1688 | cfq_resort_rr_list(cfqq, 0); |
| 1717 | } | 1689 | } |
| 1718 | if (cfq_cfqq_expired(cfqq)) { | 1690 | cfq_schedule_dispatch(cfqd); |
| 1719 | __cfq_slice_expired(cfqd, cfqq, 0); | ||
| 1720 | cfq_schedule_dispatch(cfqd); | ||
| 1721 | } | ||
| 1722 | } | 1691 | } |
| 1723 | 1692 | ||
| 1724 | if (cfq_crq_is_sync(crq)) | 1693 | if (cfq_crq_is_sync(crq)) |
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 0cce28c4025b..33e2ca847a26 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -247,7 +247,7 @@ config ACPI_CUSTOM_DSDT_FILE | |||
| 247 | Enter the full path name to the file wich includes the AmlCode declaration. | 247 | Enter the full path name to the file wich includes the AmlCode declaration. |
| 248 | 248 | ||
| 249 | config ACPI_BLACKLIST_YEAR | 249 | config ACPI_BLACKLIST_YEAR |
| 250 | int "Disable ACPI for systems before Jan 1st this year" if X86 | 250 | int "Disable ACPI for systems before Jan 1st this year" if X86_32 |
| 251 | default 0 | 251 | default 0 |
| 252 | help | 252 | help |
| 253 | enter a 4-digit year, eg. 2001 to disable ACPI by default | 253 | enter a 4-digit year, eg. 2001 to disable ACPI by default |
| @@ -285,9 +285,8 @@ config ACPI_SYSTEM | |||
| 285 | dump your ACPI DSDT table using /proc/acpi/dsdt. | 285 | dump your ACPI DSDT table using /proc/acpi/dsdt. |
| 286 | 286 | ||
| 287 | config X86_PM_TIMER | 287 | config X86_PM_TIMER |
| 288 | bool "Power Management Timer Support" | 288 | bool "Power Management Timer Support" if EMBEDDED |
| 289 | depends on X86 | 289 | depends on X86 |
| 290 | depends on !X86_64 | ||
| 291 | default y | 290 | default y |
| 292 | help | 291 | help |
| 293 | The Power Management Timer is available on all ACPI-capable, | 292 | The Power Management Timer is available on all ACPI-capable, |
| @@ -298,9 +297,8 @@ config X86_PM_TIMER | |||
| 298 | voltage scaling, unlike the commonly used Time Stamp Counter | 297 | voltage scaling, unlike the commonly used Time Stamp Counter |
| 299 | (TSC) timing source. | 298 | (TSC) timing source. |
| 300 | 299 | ||
| 301 | So, if you see messages like 'Losing too many ticks!' in the | 300 | You should nearly always say Y here because many modern |
| 302 | kernel logs, and/or you are using this on a notebook which | 301 | systems require this timer. |
| 303 | does not yet have an HPET, you should say "Y" here. | ||
| 304 | 302 | ||
| 305 | config ACPI_CONTAINER | 303 | config ACPI_CONTAINER |
| 306 | tristate "ACPI0004,PNP0A05 and PNP0A06 Container Driver (EXPERIMENTAL)" | 304 | tristate "ACPI0004,PNP0A05 and PNP0A06 Container Driver (EXPERIMENTAL)" |
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index 1994a92d4733..f65b2e14a485 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c | |||
| @@ -335,6 +335,8 @@ static int hvc_open(struct tty_struct *tty, struct file * filp) | |||
| 335 | } /* else count == 0 */ | 335 | } /* else count == 0 */ |
| 336 | 336 | ||
| 337 | tty->driver_data = hp; | 337 | tty->driver_data = hp; |
| 338 | tty->low_latency = 1; /* Makes flushes to ldisc synchronous. */ | ||
| 339 | |||
| 338 | hp->tty = tty; | 340 | hp->tty = tty; |
| 339 | /* Save for request_irq outside of spin_lock. */ | 341 | /* Save for request_irq outside of spin_lock. */ |
| 340 | irq = hp->irq; | 342 | irq = hp->irq; |
| @@ -633,9 +635,6 @@ static int hvc_poll(struct hvc_struct *hp) | |||
| 633 | tty_insert_flip_char(tty, buf[i], 0); | 635 | tty_insert_flip_char(tty, buf[i], 0); |
| 634 | } | 636 | } |
| 635 | 637 | ||
| 636 | if (count) | ||
| 637 | tty_schedule_flip(tty); | ||
| 638 | |||
| 639 | /* | 638 | /* |
| 640 | * Account for the total amount read in one loop, and if above | 639 | * Account for the total amount read in one loop, and if above |
| 641 | * 64 bytes, we do a quick schedule loop to let the tty grok | 640 | * 64 bytes, we do a quick schedule loop to let the tty grok |
| @@ -656,6 +655,9 @@ static int hvc_poll(struct hvc_struct *hp) | |||
| 656 | bail: | 655 | bail: |
| 657 | spin_unlock_irqrestore(&hp->lock, flags); | 656 | spin_unlock_irqrestore(&hp->lock, flags); |
| 658 | 657 | ||
| 658 | if (read_total) | ||
| 659 | tty_flip_buffer_push(tty); | ||
| 660 | |||
| 659 | return poll_mask; | 661 | return poll_mask; |
| 660 | } | 662 | } |
| 661 | 663 | ||
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index 649677b5dc36..5fdf18515433 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c | |||
| @@ -13,11 +13,12 @@ | |||
| 13 | * | 13 | * |
| 14 | * (C) 2000,2001,2002,2003,2004 Omnikey AG | 14 | * (C) 2000,2001,2002,2003,2004 Omnikey AG |
| 15 | * | 15 | * |
| 16 | * (C) 2005 Harald Welte <laforge@gnumonks.org> | 16 | * (C) 2005-2006 Harald Welte <laforge@gnumonks.org> |
| 17 | * - Adhere to Kernel CodingStyle | 17 | * - Adhere to Kernel CodingStyle |
| 18 | * - Port to 2.6.13 "new" style PCMCIA | 18 | * - Port to 2.6.13 "new" style PCMCIA |
| 19 | * - Check for copy_{from,to}_user return values | 19 | * - Check for copy_{from,to}_user return values |
| 20 | * - Use nonseekable_open() | 20 | * - Use nonseekable_open() |
| 21 | * - add class interface for udev device creation | ||
| 21 | * | 22 | * |
| 22 | * All rights reserved. Licensed under dual BSD/GPL license. | 23 | * All rights reserved. Licensed under dual BSD/GPL license. |
| 23 | */ | 24 | */ |
| @@ -56,7 +57,7 @@ module_param(pc_debug, int, 0600); | |||
| 56 | #else | 57 | #else |
| 57 | #define DEBUGP(n, rdr, x, args...) | 58 | #define DEBUGP(n, rdr, x, args...) |
| 58 | #endif | 59 | #endif |
| 59 | static char *version = "cm4000_cs.c v2.4.0gm5 - All bugs added by Harald Welte"; | 60 | static char *version = "cm4000_cs.c v2.4.0gm6 - All bugs added by Harald Welte"; |
| 60 | 61 | ||
| 61 | #define T_1SEC (HZ) | 62 | #define T_1SEC (HZ) |
| 62 | #define T_10MSEC msecs_to_jiffies(10) | 63 | #define T_10MSEC msecs_to_jiffies(10) |
| @@ -156,6 +157,7 @@ struct cm4000_dev { | |||
| 156 | /*queue*/ 4*sizeof(wait_queue_head_t)) | 157 | /*queue*/ 4*sizeof(wait_queue_head_t)) |
| 157 | 158 | ||
| 158 | static dev_link_t *dev_table[CM4000_MAX_DEV]; | 159 | static dev_link_t *dev_table[CM4000_MAX_DEV]; |
| 160 | static struct class *cmm_class; | ||
| 159 | 161 | ||
| 160 | /* This table doesn't use spaces after the comma between fields and thus | 162 | /* This table doesn't use spaces after the comma between fields and thus |
| 161 | * violates CodingStyle. However, I don't really think wrapping it around will | 163 | * violates CodingStyle. However, I don't really think wrapping it around will |
| @@ -1937,6 +1939,9 @@ static int cm4000_attach(struct pcmcia_device *p_dev) | |||
| 1937 | link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; | 1939 | link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; |
| 1938 | cm4000_config(link, i); | 1940 | cm4000_config(link, i); |
| 1939 | 1941 | ||
| 1942 | class_device_create(cmm_class, NULL, MKDEV(major, i), NULL, | ||
| 1943 | "cmm%d", i); | ||
| 1944 | |||
| 1940 | return 0; | 1945 | return 0; |
| 1941 | } | 1946 | } |
| 1942 | 1947 | ||
| @@ -1962,6 +1967,8 @@ static void cm4000_detach(struct pcmcia_device *p_dev) | |||
| 1962 | dev_table[devno] = NULL; | 1967 | dev_table[devno] = NULL; |
| 1963 | kfree(dev); | 1968 | kfree(dev); |
| 1964 | 1969 | ||
| 1970 | class_device_destroy(cmm_class, MKDEV(major, devno)); | ||
| 1971 | |||
| 1965 | return; | 1972 | return; |
| 1966 | } | 1973 | } |
| 1967 | 1974 | ||
| @@ -1995,8 +2002,18 @@ static struct pcmcia_driver cm4000_driver = { | |||
| 1995 | 2002 | ||
| 1996 | static int __init cmm_init(void) | 2003 | static int __init cmm_init(void) |
| 1997 | { | 2004 | { |
| 2005 | int rc; | ||
| 2006 | |||
| 1998 | printk(KERN_INFO "%s\n", version); | 2007 | printk(KERN_INFO "%s\n", version); |
| 1999 | pcmcia_register_driver(&cm4000_driver); | 2008 | |
| 2009 | cmm_class = class_create(THIS_MODULE, "cardman_4000"); | ||
| 2010 | if (!cmm_class) | ||
| 2011 | return -1; | ||
| 2012 | |||
| 2013 | rc = pcmcia_register_driver(&cm4000_driver); | ||
| 2014 | if (rc < 0) | ||
| 2015 | return rc; | ||
| 2016 | |||
| 2000 | major = register_chrdev(0, DEVICE_NAME, &cm4000_fops); | 2017 | major = register_chrdev(0, DEVICE_NAME, &cm4000_fops); |
| 2001 | if (major < 0) { | 2018 | if (major < 0) { |
| 2002 | printk(KERN_WARNING MODULE_NAME | 2019 | printk(KERN_WARNING MODULE_NAME |
| @@ -2012,6 +2029,7 @@ static void __exit cmm_exit(void) | |||
| 2012 | printk(KERN_INFO MODULE_NAME ": unloading\n"); | 2029 | printk(KERN_INFO MODULE_NAME ": unloading\n"); |
| 2013 | pcmcia_unregister_driver(&cm4000_driver); | 2030 | pcmcia_unregister_driver(&cm4000_driver); |
| 2014 | unregister_chrdev(major, DEVICE_NAME); | 2031 | unregister_chrdev(major, DEVICE_NAME); |
| 2032 | class_destroy(cmm_class); | ||
| 2015 | }; | 2033 | }; |
| 2016 | 2034 | ||
| 2017 | module_init(cmm_init); | 2035 | module_init(cmm_init); |
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c index 46eb371bf17e..466e33bab029 100644 --- a/drivers/char/pcmcia/cm4040_cs.c +++ b/drivers/char/pcmcia/cm4040_cs.c | |||
| @@ -3,12 +3,13 @@ | |||
| 3 | * | 3 | * |
| 4 | * (c) 2000-2004 Omnikey AG (http://www.omnikey.com/) | 4 | * (c) 2000-2004 Omnikey AG (http://www.omnikey.com/) |
| 5 | * | 5 | * |
| 6 | * (C) 2005 Harald Welte <laforge@gnumonks.org> | 6 | * (C) 2005-2006 Harald Welte <laforge@gnumonks.org> |
| 7 | * - add support for poll() | 7 | * - add support for poll() |
| 8 | * - driver cleanup | 8 | * - driver cleanup |
| 9 | * - add waitqueues | 9 | * - add waitqueues |
| 10 | * - adhere to linux kernel coding style and policies | 10 | * - adhere to linux kernel coding style and policies |
| 11 | * - support 2.6.13 "new style" pcmcia interface | 11 | * - support 2.6.13 "new style" pcmcia interface |
| 12 | * - add class interface for udev device creation | ||
| 12 | * | 13 | * |
| 13 | * The device basically is a USB CCID compliant device that has been | 14 | * The device basically is a USB CCID compliant device that has been |
| 14 | * attached to an I/O-Mapped FIFO. | 15 | * attached to an I/O-Mapped FIFO. |
| @@ -53,7 +54,7 @@ module_param(pc_debug, int, 0600); | |||
| 53 | #endif | 54 | #endif |
| 54 | 55 | ||
| 55 | static char *version = | 56 | static char *version = |
| 56 | "OMNIKEY CardMan 4040 v1.1.0gm4 - All bugs added by Harald Welte"; | 57 | "OMNIKEY CardMan 4040 v1.1.0gm5 - All bugs added by Harald Welte"; |
| 57 | 58 | ||
| 58 | #define CCID_DRIVER_BULK_DEFAULT_TIMEOUT (150*HZ) | 59 | #define CCID_DRIVER_BULK_DEFAULT_TIMEOUT (150*HZ) |
| 59 | #define CCID_DRIVER_ASYNC_POWERUP_TIMEOUT (35*HZ) | 60 | #define CCID_DRIVER_ASYNC_POWERUP_TIMEOUT (35*HZ) |
| @@ -67,6 +68,7 @@ static char *version = | |||
| 67 | static void reader_release(dev_link_t *link); | 68 | static void reader_release(dev_link_t *link); |
| 68 | 69 | ||
| 69 | static int major; | 70 | static int major; |
| 71 | static struct class *cmx_class; | ||
| 70 | 72 | ||
| 71 | #define BS_READABLE 0x01 | 73 | #define BS_READABLE 0x01 |
| 72 | #define BS_WRITABLE 0x02 | 74 | #define BS_WRITABLE 0x02 |
| @@ -696,6 +698,9 @@ static int reader_attach(struct pcmcia_device *p_dev) | |||
| 696 | link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; | 698 | link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; |
| 697 | reader_config(link, i); | 699 | reader_config(link, i); |
| 698 | 700 | ||
| 701 | class_device_create(cmx_class, NULL, MKDEV(major, i), NULL, | ||
| 702 | "cmx%d", i); | ||
| 703 | |||
| 699 | return 0; | 704 | return 0; |
| 700 | } | 705 | } |
| 701 | 706 | ||
| @@ -721,6 +726,8 @@ static void reader_detach(struct pcmcia_device *p_dev) | |||
| 721 | dev_table[devno] = NULL; | 726 | dev_table[devno] = NULL; |
| 722 | kfree(dev); | 727 | kfree(dev); |
| 723 | 728 | ||
| 729 | class_device_destroy(cmx_class, MKDEV(major, devno)); | ||
| 730 | |||
| 724 | return; | 731 | return; |
| 725 | } | 732 | } |
| 726 | 733 | ||
| @@ -755,8 +762,17 @@ static struct pcmcia_driver reader_driver = { | |||
| 755 | 762 | ||
| 756 | static int __init cm4040_init(void) | 763 | static int __init cm4040_init(void) |
| 757 | { | 764 | { |
| 765 | int rc; | ||
| 766 | |||
| 758 | printk(KERN_INFO "%s\n", version); | 767 | printk(KERN_INFO "%s\n", version); |
| 759 | pcmcia_register_driver(&reader_driver); | 768 | cmx_class = class_create(THIS_MODULE, "cardman_4040"); |
| 769 | if (!cmx_class) | ||
| 770 | return -1; | ||
| 771 | |||
| 772 | rc = pcmcia_register_driver(&reader_driver); | ||
| 773 | if (rc < 0) | ||
| 774 | return rc; | ||
| 775 | |||
| 760 | major = register_chrdev(0, DEVICE_NAME, &reader_fops); | 776 | major = register_chrdev(0, DEVICE_NAME, &reader_fops); |
| 761 | if (major < 0) { | 777 | if (major < 0) { |
| 762 | printk(KERN_WARNING MODULE_NAME | 778 | printk(KERN_WARNING MODULE_NAME |
| @@ -771,6 +787,7 @@ static void __exit cm4040_exit(void) | |||
| 771 | printk(KERN_INFO MODULE_NAME ": unloading\n"); | 787 | printk(KERN_INFO MODULE_NAME ": unloading\n"); |
| 772 | pcmcia_unregister_driver(&reader_driver); | 788 | pcmcia_unregister_driver(&reader_driver); |
| 773 | unregister_chrdev(major, DEVICE_NAME); | 789 | unregister_chrdev(major, DEVICE_NAME); |
| 790 | class_destroy(cmx_class); | ||
| 774 | } | 791 | } |
| 775 | 792 | ||
| 776 | module_init(cm4040_init); | 793 | module_init(cm4040_init); |
diff --git a/drivers/char/sx.c b/drivers/char/sx.c index c2490e270f1f..a6b4f02bdceb 100644 --- a/drivers/char/sx.c +++ b/drivers/char/sx.c | |||
| @@ -1095,17 +1095,17 @@ static inline void sx_receive_chars (struct sx_port *port) | |||
| 1095 | 1095 | ||
| 1096 | sx_dprintk (SX_DEBUG_RECEIVE, "rxop=%d, c = %d.\n", rx_op, c); | 1096 | sx_dprintk (SX_DEBUG_RECEIVE, "rxop=%d, c = %d.\n", rx_op, c); |
| 1097 | 1097 | ||
| 1098 | /* Don't copy past the end of the hardware receive buffer */ | ||
| 1099 | if (rx_op + c > 0x100) c = 0x100 - rx_op; | ||
| 1100 | |||
| 1101 | sx_dprintk (SX_DEBUG_RECEIVE, "c = %d.\n", c); | ||
| 1102 | |||
| 1098 | /* Don't copy more bytes than there is room for in the buffer */ | 1103 | /* Don't copy more bytes than there is room for in the buffer */ |
| 1099 | 1104 | ||
| 1100 | c = tty_prepare_flip_string(tty, &rp, c); | 1105 | c = tty_prepare_flip_string(tty, &rp, c); |
| 1101 | 1106 | ||
| 1102 | sx_dprintk (SX_DEBUG_RECEIVE, "c = %d.\n", c); | 1107 | sx_dprintk (SX_DEBUG_RECEIVE, "c = %d.\n", c); |
| 1103 | 1108 | ||
| 1104 | /* Don't copy past the end of the hardware receive buffer */ | ||
| 1105 | if (rx_op + c > 0x100) c = 0x100 - rx_op; | ||
| 1106 | |||
| 1107 | sx_dprintk (SX_DEBUG_RECEIVE, "c = %d.\n", c); | ||
| 1108 | |||
| 1109 | /* If for one reason or another, we can't copy more data, we're done! */ | 1109 | /* If for one reason or another, we can't copy more data, we're done! */ |
| 1110 | if (c == 0) break; | 1110 | if (c == 0) break; |
| 1111 | 1111 | ||
| @@ -2173,15 +2173,17 @@ static int probe_si (struct sx_board *board) | |||
| 2173 | if ( IS_SI1_BOARD(board)) { | 2173 | if ( IS_SI1_BOARD(board)) { |
| 2174 | /* This should be an SI1 board, which has this | 2174 | /* This should be an SI1 board, which has this |
| 2175 | location writable... */ | 2175 | location writable... */ |
| 2176 | if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10) | 2176 | if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10) { |
| 2177 | func_exit (); | 2177 | func_exit (); |
| 2178 | return 0; | 2178 | return 0; |
| 2179 | } | ||
| 2179 | } else { | 2180 | } else { |
| 2180 | /* This should be an SI2 board, which has the bottom | 2181 | /* This should be an SI2 board, which has the bottom |
| 2181 | 3 bits non-writable... */ | 2182 | 3 bits non-writable... */ |
| 2182 | if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10) | 2183 | if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10) { |
| 2183 | func_exit (); | 2184 | func_exit (); |
| 2184 | return 0; | 2185 | return 0; |
| 2186 | } | ||
| 2185 | } | 2187 | } |
| 2186 | 2188 | ||
| 2187 | /* Now we're pretty much convinced that there is an SI board here, | 2189 | /* Now we're pretty much convinced that there is an SI board here, |
| @@ -2192,15 +2194,17 @@ static int probe_si (struct sx_board *board) | |||
| 2192 | if ( IS_SI1_BOARD(board)) { | 2194 | if ( IS_SI1_BOARD(board)) { |
| 2193 | /* This should be an SI1 board, which has this | 2195 | /* This should be an SI1 board, which has this |
| 2194 | location writable... */ | 2196 | location writable... */ |
| 2195 | if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10) | 2197 | if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10) { |
| 2196 | func_exit(); | 2198 | func_exit(); |
| 2197 | return 0; | 2199 | return 0; |
| 2200 | } | ||
| 2198 | } else { | 2201 | } else { |
| 2199 | /* This should be an SI2 board, which has the bottom | 2202 | /* This should be an SI2 board, which has the bottom |
| 2200 | 3 bits non-writable... */ | 2203 | 3 bits non-writable... */ |
| 2201 | if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10) | 2204 | if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10) { |
| 2202 | func_exit (); | 2205 | func_exit (); |
| 2203 | return 0; | 2206 | return 0; |
| 2207 | } | ||
| 2204 | } | 2208 | } |
| 2205 | 2209 | ||
| 2206 | printheader (); | 2210 | printheader (); |
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c index a85a60a93deb..b046390cd256 100644 --- a/drivers/char/synclink_gt.c +++ b/drivers/char/synclink_gt.c | |||
| @@ -306,7 +306,7 @@ struct slgt_info { | |||
| 306 | int tx_active; | 306 | int tx_active; |
| 307 | 307 | ||
| 308 | unsigned char signals; /* serial signal states */ | 308 | unsigned char signals; /* serial signal states */ |
| 309 | unsigned int init_error; /* initialization error */ | 309 | int init_error; /* initialization error */ |
| 310 | 310 | ||
| 311 | unsigned char *tx_buf; | 311 | unsigned char *tx_buf; |
| 312 | int tx_count; | 312 | int tx_count; |
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index e9bba94fc898..53d3d066554e 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
| @@ -303,7 +303,7 @@ static struct tty_buffer *tty_buffer_find(struct tty_struct *tty, size_t size) | |||
| 303 | t->commit = 0; | 303 | t->commit = 0; |
| 304 | t->read = 0; | 304 | t->read = 0; |
| 305 | /* DEBUG ONLY */ | 305 | /* DEBUG ONLY */ |
| 306 | memset(t->data, '*', size); | 306 | /* memset(t->data, '*', size); */ |
| 307 | /* printk("Flip recycle %p\n", t); */ | 307 | /* printk("Flip recycle %p\n", t); */ |
| 308 | return t; | 308 | return t; |
| 309 | } | 309 | } |
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index 4c2af9020905..6213bd3caee5 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c | |||
| @@ -445,6 +445,7 @@ static struct pcmcia_device_id ide_ids[] = { | |||
| 445 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), | 445 | PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), |
| 446 | PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), | 446 | PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), |
| 447 | PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), | 447 | PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), |
| 448 | PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), | ||
| 448 | PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), | 449 | PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), |
| 449 | PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209), | 450 | PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209), |
| 450 | PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e), | 451 | PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e), |
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index c2c776fbda01..eca92eb475a1 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
| @@ -137,15 +137,15 @@ MODULE_PARM_DESC(exclusive_login, "Exclusive login to sbp2 device (default = 1)" | |||
| 137 | /* | 137 | /* |
| 138 | * SCSI inquiry hack for really badly behaved sbp2 devices. Turn this on | 138 | * SCSI inquiry hack for really badly behaved sbp2 devices. Turn this on |
| 139 | * if your sbp2 device is not properly handling the SCSI inquiry command. | 139 | * if your sbp2 device is not properly handling the SCSI inquiry command. |
| 140 | * This hack makes the inquiry look more like a typical MS Windows | 140 | * This hack makes the inquiry look more like a typical MS Windows inquiry |
| 141 | * inquiry. | 141 | * by enforcing 36 byte inquiry and avoiding access to mode_sense page 8. |
| 142 | * | 142 | * |
| 143 | * If force_inquiry_hack=1 is required for your device to work, | 143 | * If force_inquiry_hack=1 is required for your device to work, |
| 144 | * please submit the logged sbp2_firmware_revision value of this device to | 144 | * please submit the logged sbp2_firmware_revision value of this device to |
| 145 | * the linux1394-devel mailing list. | 145 | * the linux1394-devel mailing list. |
| 146 | */ | 146 | */ |
| 147 | static int force_inquiry_hack; | 147 | static int force_inquiry_hack; |
| 148 | module_param(force_inquiry_hack, int, 0444); | 148 | module_param(force_inquiry_hack, int, 0644); |
| 149 | MODULE_PARM_DESC(force_inquiry_hack, "Force SCSI inquiry hack (default = 0)"); | 149 | MODULE_PARM_DESC(force_inquiry_hack, "Force SCSI inquiry hack (default = 0)"); |
| 150 | 150 | ||
| 151 | /* | 151 | /* |
| @@ -264,18 +264,17 @@ static struct hpsb_protocol_driver sbp2_driver = { | |||
| 264 | }, | 264 | }, |
| 265 | }; | 265 | }; |
| 266 | 266 | ||
| 267 | 267 | /* | |
| 268 | /* List of device firmware's that require a forced 36 byte inquiry. */ | 268 | * List of device firmwares that require the inquiry hack. |
| 269 | * Yields a few false positives but did not break other devices so far. | ||
| 270 | */ | ||
| 269 | static u32 sbp2_broken_inquiry_list[] = { | 271 | static u32 sbp2_broken_inquiry_list[] = { |
| 270 | 0x00002800, /* Stefan Richter <richtest@bauwesen.tu-cottbus.de> */ | 272 | 0x00002800, /* Stefan Richter <stefanr@s5r6.in-berlin.de> */ |
| 271 | /* DViCO Momobay CX-1 */ | 273 | /* DViCO Momobay CX-1 */ |
| 272 | 0x00000200 /* Andreas Plesch <plesch@fas.harvard.edu> */ | 274 | 0x00000200 /* Andreas Plesch <plesch@fas.harvard.edu> */ |
| 273 | /* QPS Fire DVDBurner */ | 275 | /* QPS Fire DVDBurner */ |
| 274 | }; | 276 | }; |
| 275 | 277 | ||
| 276 | #define NUM_BROKEN_INQUIRY_DEVS \ | ||
| 277 | (sizeof(sbp2_broken_inquiry_list)/sizeof(*sbp2_broken_inquiry_list)) | ||
| 278 | |||
| 279 | /************************************** | 278 | /************************************** |
| 280 | * General utility functions | 279 | * General utility functions |
| 281 | **************************************/ | 280 | **************************************/ |
| @@ -643,9 +642,15 @@ static int sbp2_remove(struct device *dev) | |||
| 643 | if (!scsi_id) | 642 | if (!scsi_id) |
| 644 | return 0; | 643 | return 0; |
| 645 | 644 | ||
| 646 | /* Trigger shutdown functions in scsi's highlevel. */ | 645 | if (scsi_id->scsi_host) { |
| 647 | if (scsi_id->scsi_host) | 646 | /* Get rid of enqueued commands if there is no chance to |
| 647 | * send them. */ | ||
| 648 | if (!sbp2util_node_is_available(scsi_id)) | ||
| 649 | sbp2scsi_complete_all_commands(scsi_id, DID_NO_CONNECT); | ||
| 650 | /* scsi_remove_device() will trigger shutdown functions of SCSI | ||
| 651 | * highlevel drivers which would deadlock if blocked. */ | ||
| 648 | scsi_unblock_requests(scsi_id->scsi_host); | 652 | scsi_unblock_requests(scsi_id->scsi_host); |
| 653 | } | ||
| 649 | sdev = scsi_id->sdev; | 654 | sdev = scsi_id->sdev; |
| 650 | if (sdev) { | 655 | if (sdev) { |
| 651 | scsi_id->sdev = NULL; | 656 | scsi_id->sdev = NULL; |
| @@ -742,11 +747,6 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud | |||
| 742 | hi->host = ud->ne->host; | 747 | hi->host = ud->ne->host; |
| 743 | INIT_LIST_HEAD(&hi->scsi_ids); | 748 | INIT_LIST_HEAD(&hi->scsi_ids); |
| 744 | 749 | ||
| 745 | /* Register our sbp2 status address space... */ | ||
| 746 | hpsb_register_addrspace(&sbp2_highlevel, ud->ne->host, &sbp2_ops, | ||
| 747 | SBP2_STATUS_FIFO_ADDRESS, | ||
| 748 | SBP2_STATUS_FIFO_ADDRESS + | ||
| 749 | SBP2_STATUS_FIFO_ENTRY_TO_OFFSET(SBP2_MAX_UDS_PER_NODE+1)); | ||
| 750 | #ifdef CONFIG_IEEE1394_SBP2_PHYS_DMA | 750 | #ifdef CONFIG_IEEE1394_SBP2_PHYS_DMA |
| 751 | /* Handle data movement if physical dma is not | 751 | /* Handle data movement if physical dma is not |
| 752 | * enabled/supportedon host controller */ | 752 | * enabled/supportedon host controller */ |
| @@ -759,6 +759,18 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud | |||
| 759 | 759 | ||
| 760 | list_add_tail(&scsi_id->scsi_list, &hi->scsi_ids); | 760 | list_add_tail(&scsi_id->scsi_list, &hi->scsi_ids); |
| 761 | 761 | ||
| 762 | /* Register the status FIFO address range. We could use the same FIFO | ||
| 763 | * for targets at different nodes. However we need different FIFOs per | ||
| 764 | * target in order to support multi-unit devices. */ | ||
| 765 | scsi_id->status_fifo_addr = hpsb_allocate_and_register_addrspace( | ||
| 766 | &sbp2_highlevel, ud->ne->host, &sbp2_ops, | ||
| 767 | sizeof(struct sbp2_status_block), sizeof(quadlet_t), | ||
| 768 | ~0ULL, ~0ULL); | ||
| 769 | if (!scsi_id->status_fifo_addr) { | ||
| 770 | SBP2_ERR("failed to allocate status FIFO address range"); | ||
| 771 | goto failed_alloc; | ||
| 772 | } | ||
| 773 | |||
| 762 | /* Register our host with the SCSI stack. */ | 774 | /* Register our host with the SCSI stack. */ |
| 763 | scsi_host = scsi_host_alloc(&scsi_driver_template, | 775 | scsi_host = scsi_host_alloc(&scsi_driver_template, |
| 764 | sizeof(unsigned long)); | 776 | sizeof(unsigned long)); |
| @@ -997,6 +1009,10 @@ static void sbp2_remove_device(struct scsi_id_instance_data *scsi_id) | |||
| 997 | SBP2_DMA_FREE("single query logins data"); | 1009 | SBP2_DMA_FREE("single query logins data"); |
| 998 | } | 1010 | } |
| 999 | 1011 | ||
| 1012 | if (scsi_id->status_fifo_addr) | ||
| 1013 | hpsb_unregister_addrspace(&sbp2_highlevel, hi->host, | ||
| 1014 | scsi_id->status_fifo_addr); | ||
| 1015 | |||
| 1000 | scsi_id->ud->device.driver_data = NULL; | 1016 | scsi_id->ud->device.driver_data = NULL; |
| 1001 | 1017 | ||
| 1002 | SBP2_DEBUG("SBP-2 device removed, SCSI ID = %d", scsi_id->ud->id); | 1018 | SBP2_DEBUG("SBP-2 device removed, SCSI ID = %d", scsi_id->ud->id); |
| @@ -1075,11 +1091,10 @@ static int sbp2_query_logins(struct scsi_id_instance_data *scsi_id) | |||
| 1075 | ORB_SET_QUERY_LOGINS_RESP_LENGTH(sizeof(struct sbp2_query_logins_response)); | 1091 | ORB_SET_QUERY_LOGINS_RESP_LENGTH(sizeof(struct sbp2_query_logins_response)); |
| 1076 | SBP2_DEBUG("sbp2_query_logins: reserved_resp_length initialized"); | 1092 | SBP2_DEBUG("sbp2_query_logins: reserved_resp_length initialized"); |
| 1077 | 1093 | ||
| 1078 | scsi_id->query_logins_orb->status_FIFO_lo = SBP2_STATUS_FIFO_ADDRESS_LO + | 1094 | scsi_id->query_logins_orb->status_fifo_hi = |
| 1079 | SBP2_STATUS_FIFO_ENTRY_TO_OFFSET(scsi_id->ud->id); | 1095 | ORB_SET_STATUS_FIFO_HI(scsi_id->status_fifo_addr, hi->host->node_id); |
| 1080 | scsi_id->query_logins_orb->status_FIFO_hi = (ORB_SET_NODE_ID(hi->host->node_id) | | 1096 | scsi_id->query_logins_orb->status_fifo_lo = |
| 1081 | SBP2_STATUS_FIFO_ADDRESS_HI); | 1097 | ORB_SET_STATUS_FIFO_LO(scsi_id->status_fifo_addr); |
| 1082 | SBP2_DEBUG("sbp2_query_logins: status FIFO initialized"); | ||
| 1083 | 1098 | ||
| 1084 | sbp2util_cpu_to_be32_buffer(scsi_id->query_logins_orb, sizeof(struct sbp2_query_logins_orb)); | 1099 | sbp2util_cpu_to_be32_buffer(scsi_id->query_logins_orb, sizeof(struct sbp2_query_logins_orb)); |
| 1085 | 1100 | ||
| @@ -1184,11 +1199,10 @@ static int sbp2_login_device(struct scsi_id_instance_data *scsi_id) | |||
| 1184 | ORB_SET_LOGIN_RESP_LENGTH(sizeof(struct sbp2_login_response)); | 1199 | ORB_SET_LOGIN_RESP_LENGTH(sizeof(struct sbp2_login_response)); |
| 1185 | SBP2_DEBUG("sbp2_login_device: passwd_resp_lengths initialized"); | 1200 | SBP2_DEBUG("sbp2_login_device: passwd_resp_lengths initialized"); |
| 1186 | 1201 | ||
| 1187 | scsi_id->login_orb->status_FIFO_lo = SBP2_STATUS_FIFO_ADDRESS_LO + | 1202 | scsi_id->login_orb->status_fifo_hi = |
| 1188 | SBP2_STATUS_FIFO_ENTRY_TO_OFFSET(scsi_id->ud->id); | 1203 | ORB_SET_STATUS_FIFO_HI(scsi_id->status_fifo_addr, hi->host->node_id); |
| 1189 | scsi_id->login_orb->status_FIFO_hi = (ORB_SET_NODE_ID(hi->host->node_id) | | 1204 | scsi_id->login_orb->status_fifo_lo = |
| 1190 | SBP2_STATUS_FIFO_ADDRESS_HI); | 1205 | ORB_SET_STATUS_FIFO_LO(scsi_id->status_fifo_addr); |
| 1191 | SBP2_DEBUG("sbp2_login_device: status FIFO initialized"); | ||
| 1192 | 1206 | ||
| 1193 | /* | 1207 | /* |
| 1194 | * Byte swap ORB if necessary | 1208 | * Byte swap ORB if necessary |
| @@ -1301,10 +1315,10 @@ static int sbp2_logout_device(struct scsi_id_instance_data *scsi_id) | |||
| 1301 | scsi_id->logout_orb->login_ID_misc |= ORB_SET_NOTIFY(1); | 1315 | scsi_id->logout_orb->login_ID_misc |= ORB_SET_NOTIFY(1); |
| 1302 | 1316 | ||
| 1303 | scsi_id->logout_orb->reserved5 = 0x0; | 1317 | scsi_id->logout_orb->reserved5 = 0x0; |
| 1304 | scsi_id->logout_orb->status_FIFO_lo = SBP2_STATUS_FIFO_ADDRESS_LO + | 1318 | scsi_id->logout_orb->status_fifo_hi = |
| 1305 | SBP2_STATUS_FIFO_ENTRY_TO_OFFSET(scsi_id->ud->id); | 1319 | ORB_SET_STATUS_FIFO_HI(scsi_id->status_fifo_addr, hi->host->node_id); |
| 1306 | scsi_id->logout_orb->status_FIFO_hi = (ORB_SET_NODE_ID(hi->host->node_id) | | 1320 | scsi_id->logout_orb->status_fifo_lo = |
| 1307 | SBP2_STATUS_FIFO_ADDRESS_HI); | 1321 | ORB_SET_STATUS_FIFO_LO(scsi_id->status_fifo_addr); |
| 1308 | 1322 | ||
| 1309 | /* | 1323 | /* |
| 1310 | * Byte swap ORB if necessary | 1324 | * Byte swap ORB if necessary |
| @@ -1366,10 +1380,10 @@ static int sbp2_reconnect_device(struct scsi_id_instance_data *scsi_id) | |||
| 1366 | scsi_id->reconnect_orb->login_ID_misc |= ORB_SET_NOTIFY(1); | 1380 | scsi_id->reconnect_orb->login_ID_misc |= ORB_SET_NOTIFY(1); |
| 1367 | 1381 | ||
| 1368 | scsi_id->reconnect_orb->reserved5 = 0x0; | 1382 | scsi_id->reconnect_orb->reserved5 = 0x0; |
| 1369 | scsi_id->reconnect_orb->status_FIFO_lo = SBP2_STATUS_FIFO_ADDRESS_LO + | 1383 | scsi_id->reconnect_orb->status_fifo_hi = |
| 1370 | SBP2_STATUS_FIFO_ENTRY_TO_OFFSET(scsi_id->ud->id); | 1384 | ORB_SET_STATUS_FIFO_HI(scsi_id->status_fifo_addr, hi->host->node_id); |
| 1371 | scsi_id->reconnect_orb->status_FIFO_hi = | 1385 | scsi_id->reconnect_orb->status_fifo_lo = |
| 1372 | (ORB_SET_NODE_ID(hi->host->node_id) | SBP2_STATUS_FIFO_ADDRESS_HI); | 1386 | ORB_SET_STATUS_FIFO_LO(scsi_id->status_fifo_addr); |
| 1373 | 1387 | ||
| 1374 | /* | 1388 | /* |
| 1375 | * Byte swap ORB if necessary | 1389 | * Byte swap ORB if necessary |
| @@ -1560,7 +1574,7 @@ static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id, | |||
| 1560 | /* Check for a blacklisted set of devices that require us to force | 1574 | /* Check for a blacklisted set of devices that require us to force |
| 1561 | * a 36 byte host inquiry. This can be overriden as a module param | 1575 | * a 36 byte host inquiry. This can be overriden as a module param |
| 1562 | * (to force all hosts). */ | 1576 | * (to force all hosts). */ |
| 1563 | for (i = 0; i < NUM_BROKEN_INQUIRY_DEVS; i++) { | 1577 | for (i = 0; i < ARRAY_SIZE(sbp2_broken_inquiry_list); i++) { |
| 1564 | if ((firmware_revision & 0xffff00) == | 1578 | if ((firmware_revision & 0xffff00) == |
| 1565 | sbp2_broken_inquiry_list[i]) { | 1579 | sbp2_broken_inquiry_list[i]) { |
| 1566 | SBP2_WARN("Node " NODE_BUS_FMT ": Using 36byte inquiry workaround", | 1580 | SBP2_WARN("Node " NODE_BUS_FMT ": Using 36byte inquiry workaround", |
| @@ -2007,18 +2021,6 @@ static int sbp2_send_command(struct scsi_id_instance_data *scsi_id, | |||
| 2007 | } | 2021 | } |
| 2008 | 2022 | ||
| 2009 | /* | 2023 | /* |
| 2010 | * The scsi stack sends down a request_bufflen which does not match the | ||
| 2011 | * length field in the scsi cdb. This causes some sbp2 devices to | ||
| 2012 | * reject this inquiry command. Fix the request_bufflen. | ||
| 2013 | */ | ||
| 2014 | if (*cmd == INQUIRY) { | ||
| 2015 | if (force_inquiry_hack || scsi_id->workarounds & SBP2_BREAKAGE_INQUIRY_HACK) | ||
| 2016 | request_bufflen = cmd[4] = 0x24; | ||
| 2017 | else | ||
| 2018 | request_bufflen = cmd[4]; | ||
| 2019 | } | ||
| 2020 | |||
| 2021 | /* | ||
| 2022 | * Now actually fill in the comamnd orb and sbp2 s/g list | 2024 | * Now actually fill in the comamnd orb and sbp2 s/g list |
| 2023 | */ | 2025 | */ |
| 2024 | sbp2_create_command_orb(scsi_id, command, cmd, SCpnt->use_sg, | 2026 | sbp2_create_command_orb(scsi_id, command, cmd, SCpnt->use_sg, |
| @@ -2106,7 +2108,6 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid, int dest | |||
| 2106 | { | 2108 | { |
| 2107 | struct sbp2scsi_host_info *hi; | 2109 | struct sbp2scsi_host_info *hi; |
| 2108 | struct scsi_id_instance_data *scsi_id = NULL, *scsi_id_tmp; | 2110 | struct scsi_id_instance_data *scsi_id = NULL, *scsi_id_tmp; |
| 2109 | u32 id; | ||
| 2110 | struct scsi_cmnd *SCpnt = NULL; | 2111 | struct scsi_cmnd *SCpnt = NULL; |
| 2111 | u32 scsi_status = SBP2_SCSI_STATUS_GOOD; | 2112 | u32 scsi_status = SBP2_SCSI_STATUS_GOOD; |
| 2112 | struct sbp2_command_info *command; | 2113 | struct sbp2_command_info *command; |
| @@ -2129,12 +2130,12 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid, int dest | |||
| 2129 | } | 2130 | } |
| 2130 | 2131 | ||
| 2131 | /* | 2132 | /* |
| 2132 | * Find our scsi_id structure by looking at the status fifo address written to by | 2133 | * Find our scsi_id structure by looking at the status fifo address |
| 2133 | * the sbp2 device. | 2134 | * written to by the sbp2 device. |
| 2134 | */ | 2135 | */ |
| 2135 | id = SBP2_STATUS_FIFO_OFFSET_TO_ENTRY((u32)(addr - SBP2_STATUS_FIFO_ADDRESS)); | ||
| 2136 | list_for_each_entry(scsi_id_tmp, &hi->scsi_ids, scsi_list) { | 2136 | list_for_each_entry(scsi_id_tmp, &hi->scsi_ids, scsi_list) { |
| 2137 | if (scsi_id_tmp->ne->nodeid == nodeid && scsi_id_tmp->ud->id == id) { | 2137 | if (scsi_id_tmp->ne->nodeid == nodeid && |
| 2138 | scsi_id_tmp->status_fifo_addr == addr) { | ||
| 2138 | scsi_id = scsi_id_tmp; | 2139 | scsi_id = scsi_id_tmp; |
| 2139 | break; | 2140 | break; |
| 2140 | } | 2141 | } |
| @@ -2475,7 +2476,16 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id, | |||
| 2475 | 2476 | ||
| 2476 | static int sbp2scsi_slave_alloc(struct scsi_device *sdev) | 2477 | static int sbp2scsi_slave_alloc(struct scsi_device *sdev) |
| 2477 | { | 2478 | { |
| 2478 | ((struct scsi_id_instance_data *)sdev->host->hostdata[0])->sdev = sdev; | 2479 | struct scsi_id_instance_data *scsi_id = |
| 2480 | (struct scsi_id_instance_data *)sdev->host->hostdata[0]; | ||
| 2481 | |||
| 2482 | scsi_id->sdev = sdev; | ||
| 2483 | |||
| 2484 | if (force_inquiry_hack || | ||
| 2485 | scsi_id->workarounds & SBP2_BREAKAGE_INQUIRY_HACK) { | ||
| 2486 | sdev->inquiry_len = 36; | ||
| 2487 | sdev->skip_ms_page_8 = 1; | ||
| 2488 | } | ||
| 2479 | return 0; | 2489 | return 0; |
| 2480 | } | 2490 | } |
| 2481 | 2491 | ||
diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h index 900ea1d25e71..e2d357a9ea3a 100644 --- a/drivers/ieee1394/sbp2.h +++ b/drivers/ieee1394/sbp2.h | |||
| @@ -33,15 +33,17 @@ | |||
| 33 | #define ORB_DIRECTION_NO_DATA_TRANSFER 0x2 | 33 | #define ORB_DIRECTION_NO_DATA_TRANSFER 0x2 |
| 34 | 34 | ||
| 35 | #define ORB_SET_NULL_PTR(value) ((value & 0x1) << 31) | 35 | #define ORB_SET_NULL_PTR(value) ((value & 0x1) << 31) |
| 36 | #define ORB_SET_NOTIFY(value) ((value & 0x1) << 31) | 36 | #define ORB_SET_NOTIFY(value) ((value & 0x1) << 31) |
| 37 | #define ORB_SET_RQ_FMT(value) ((value & 0x3) << 29) /* unused ? */ | 37 | #define ORB_SET_RQ_FMT(value) ((value & 0x3) << 29) /* unused ? */ |
| 38 | #define ORB_SET_NODE_ID(value) ((value & 0xffff) << 16) | 38 | #define ORB_SET_NODE_ID(value) ((value & 0xffff) << 16) |
| 39 | #define ORB_SET_DATA_SIZE(value) (value & 0xffff) | 39 | #define ORB_SET_STATUS_FIFO_HI(value, id) (value >> 32 | ORB_SET_NODE_ID(id)) |
| 40 | #define ORB_SET_PAGE_SIZE(value) ((value & 0x7) << 16) | 40 | #define ORB_SET_STATUS_FIFO_LO(value) (value & 0xffffffff) |
| 41 | #define ORB_SET_PAGE_TABLE_PRESENT(value) ((value & 0x1) << 19) | 41 | #define ORB_SET_DATA_SIZE(value) (value & 0xffff) |
| 42 | #define ORB_SET_MAX_PAYLOAD(value) ((value & 0xf) << 20) | 42 | #define ORB_SET_PAGE_SIZE(value) ((value & 0x7) << 16) |
| 43 | #define ORB_SET_SPEED(value) ((value & 0x7) << 24) | 43 | #define ORB_SET_PAGE_TABLE_PRESENT(value) ((value & 0x1) << 19) |
| 44 | #define ORB_SET_DIRECTION(value) ((value & 0x1) << 27) | 44 | #define ORB_SET_MAX_PAYLOAD(value) ((value & 0xf) << 20) |
| 45 | #define ORB_SET_SPEED(value) ((value & 0x7) << 24) | ||
| 46 | #define ORB_SET_DIRECTION(value) ((value & 0x1) << 27) | ||
| 45 | 47 | ||
| 46 | struct sbp2_command_orb { | 48 | struct sbp2_command_orb { |
| 47 | volatile u32 next_ORB_hi; | 49 | volatile u32 next_ORB_hi; |
| @@ -76,8 +78,8 @@ struct sbp2_login_orb { | |||
| 76 | u32 login_response_lo; | 78 | u32 login_response_lo; |
| 77 | u32 lun_misc; | 79 | u32 lun_misc; |
| 78 | u32 passwd_resp_lengths; | 80 | u32 passwd_resp_lengths; |
| 79 | u32 status_FIFO_hi; | 81 | u32 status_fifo_hi; |
| 80 | u32 status_FIFO_lo; | 82 | u32 status_fifo_lo; |
| 81 | }; | 83 | }; |
| 82 | 84 | ||
| 83 | #define RESPONSE_GET_LOGIN_ID(value) (value & 0xffff) | 85 | #define RESPONSE_GET_LOGIN_ID(value) (value & 0xffff) |
| @@ -102,8 +104,8 @@ struct sbp2_query_logins_orb { | |||
| 102 | u32 query_response_lo; | 104 | u32 query_response_lo; |
| 103 | u32 lun_misc; | 105 | u32 lun_misc; |
| 104 | u32 reserved_resp_length; | 106 | u32 reserved_resp_length; |
| 105 | u32 status_FIFO_hi; | 107 | u32 status_fifo_hi; |
| 106 | u32 status_FIFO_lo; | 108 | u32 status_fifo_lo; |
| 107 | }; | 109 | }; |
| 108 | 110 | ||
| 109 | #define RESPONSE_GET_MAX_LOGINS(value) (value & 0xffff) | 111 | #define RESPONSE_GET_MAX_LOGINS(value) (value & 0xffff) |
| @@ -123,8 +125,8 @@ struct sbp2_reconnect_orb { | |||
| 123 | u32 reserved4; | 125 | u32 reserved4; |
| 124 | u32 login_ID_misc; | 126 | u32 login_ID_misc; |
| 125 | u32 reserved5; | 127 | u32 reserved5; |
| 126 | u32 status_FIFO_hi; | 128 | u32 status_fifo_hi; |
| 127 | u32 status_FIFO_lo; | 129 | u32 status_fifo_lo; |
| 128 | }; | 130 | }; |
| 129 | 131 | ||
| 130 | struct sbp2_logout_orb { | 132 | struct sbp2_logout_orb { |
| @@ -134,8 +136,8 @@ struct sbp2_logout_orb { | |||
| 134 | u32 reserved4; | 136 | u32 reserved4; |
| 135 | u32 login_ID_misc; | 137 | u32 login_ID_misc; |
| 136 | u32 reserved5; | 138 | u32 reserved5; |
| 137 | u32 status_FIFO_hi; | 139 | u32 status_fifo_hi; |
| 138 | u32 status_FIFO_lo; | 140 | u32 status_fifo_lo; |
| 139 | }; | 141 | }; |
| 140 | 142 | ||
| 141 | #define PAGE_TABLE_SET_SEGMENT_BASE_HI(value) (value & 0xffff) | 143 | #define PAGE_TABLE_SET_SEGMENT_BASE_HI(value) (value & 0xffff) |
| @@ -195,30 +197,6 @@ struct sbp2_status_block { | |||
| 195 | * Miscellaneous SBP2 related config rom defines | 197 | * Miscellaneous SBP2 related config rom defines |
| 196 | */ | 198 | */ |
| 197 | 199 | ||
| 198 | /* The status fifo address definition below is used as a base for each | ||
| 199 | * node, which a chunk seperately assigned to each unit directory in the | ||
| 200 | * node. For example, 0xfffe00000000ULL is used for the first sbp2 device | ||
| 201 | * detected on node 0, 0xfffe00000020ULL for the next sbp2 device on node | ||
| 202 | * 0, and so on. | ||
| 203 | * | ||
| 204 | * Note: We could use a single status fifo address for all sbp2 devices, | ||
| 205 | * and figure out which sbp2 device the status belongs to by looking at | ||
| 206 | * the source node id of the status write... but, using separate addresses | ||
| 207 | * for each sbp2 unit directory allows for better code and the ability to | ||
| 208 | * support multiple luns within a single 1394 node. | ||
| 209 | * | ||
| 210 | * Also note that we choose the address range below as it is a region | ||
| 211 | * specified for write posting, where the ohci controller will | ||
| 212 | * automatically send an ack_complete when the status is written by the | ||
| 213 | * sbp2 device... saving a split transaction. =) | ||
| 214 | */ | ||
| 215 | #define SBP2_STATUS_FIFO_ADDRESS 0xfffe00000000ULL | ||
| 216 | #define SBP2_STATUS_FIFO_ADDRESS_HI 0xfffe | ||
| 217 | #define SBP2_STATUS_FIFO_ADDRESS_LO 0x0 | ||
| 218 | |||
| 219 | #define SBP2_STATUS_FIFO_ENTRY_TO_OFFSET(entry) ((entry) << 5) | ||
| 220 | #define SBP2_STATUS_FIFO_OFFSET_TO_ENTRY(offset) ((offset) >> 5) | ||
| 221 | |||
| 222 | #define SBP2_UNIT_DIRECTORY_OFFSET_KEY 0xd1 | 200 | #define SBP2_UNIT_DIRECTORY_OFFSET_KEY 0xd1 |
| 223 | #define SBP2_CSR_OFFSET_KEY 0x54 | 201 | #define SBP2_CSR_OFFSET_KEY 0x54 |
| 224 | #define SBP2_UNIT_SPEC_ID_KEY 0x12 | 202 | #define SBP2_UNIT_SPEC_ID_KEY 0x12 |
| @@ -258,7 +236,6 @@ struct sbp2_status_block { | |||
| 258 | */ | 236 | */ |
| 259 | 237 | ||
| 260 | #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 | 238 | #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 |
| 261 | #define SBP2_MAX_UDS_PER_NODE 16 /* Maximum scsi devices per node */ | ||
| 262 | #define SBP2_MAX_SECTORS 255 /* Max sectors supported */ | 239 | #define SBP2_MAX_SECTORS 255 /* Max sectors supported */ |
| 263 | #define SBP2_MAX_CMDS 8 /* This should be safe */ | 240 | #define SBP2_MAX_CMDS 8 /* This should be safe */ |
| 264 | 241 | ||
| @@ -338,6 +315,11 @@ struct scsi_id_instance_data { | |||
| 338 | u32 sbp2_firmware_revision; | 315 | u32 sbp2_firmware_revision; |
| 339 | 316 | ||
| 340 | /* | 317 | /* |
| 318 | * Address for the device to write status blocks to | ||
| 319 | */ | ||
| 320 | u64 status_fifo_addr; | ||
| 321 | |||
| 322 | /* | ||
| 341 | * Variable used for logins, reconnects, logouts, query logins | 323 | * Variable used for logins, reconnects, logouts, query logins |
| 342 | */ | 324 | */ |
| 343 | atomic_t sbp2_login_complete; | 325 | atomic_t sbp2_login_complete; |
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c index 39fb88309e8e..216dbbf1dc8e 100644 --- a/drivers/ieee1394/video1394.c +++ b/drivers/ieee1394/video1394.c | |||
| @@ -744,7 +744,7 @@ static int __video1394_ioctl(struct file *file, | |||
| 744 | if (i == ISO_CHANNELS) { | 744 | if (i == ISO_CHANNELS) { |
| 745 | PRINT(KERN_ERR, ohci->host->id, | 745 | PRINT(KERN_ERR, ohci->host->id, |
| 746 | "No free channel found"); | 746 | "No free channel found"); |
| 747 | return EAGAIN; | 747 | return -EAGAIN; |
| 748 | } | 748 | } |
| 749 | if (!(ohci->ISO_channel_usage & mask)) { | 749 | if (!(ohci->ISO_channel_usage & mask)) { |
| 750 | v.channel = i; | 750 | v.channel = i; |
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index e9adeb9d172f..745ca1f67b14 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c | |||
| @@ -849,10 +849,16 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent) | |||
| 849 | 849 | ||
| 850 | static void free_dev(struct mapped_device *md) | 850 | static void free_dev(struct mapped_device *md) |
| 851 | { | 851 | { |
| 852 | free_minor(md->disk->first_minor); | 852 | unsigned int minor = md->disk->first_minor; |
| 853 | |||
| 854 | if (md->suspended_bdev) { | ||
| 855 | thaw_bdev(md->suspended_bdev, NULL); | ||
| 856 | bdput(md->suspended_bdev); | ||
| 857 | } | ||
| 853 | mempool_destroy(md->tio_pool); | 858 | mempool_destroy(md->tio_pool); |
| 854 | mempool_destroy(md->io_pool); | 859 | mempool_destroy(md->io_pool); |
| 855 | del_gendisk(md->disk); | 860 | del_gendisk(md->disk); |
| 861 | free_minor(minor); | ||
| 856 | put_disk(md->disk); | 862 | put_disk(md->disk); |
| 857 | blk_put_queue(md->queue); | 863 | blk_put_queue(md->queue); |
| 858 | kfree(md); | 864 | kfree(md); |
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index ded2c33f5b85..1c074d63ff3a 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c | |||
| @@ -408,6 +408,7 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary) | |||
| 408 | cfi->chips[i].buffer_write_time = 1<<cfi->cfiq->BufWriteTimeoutTyp; | 408 | cfi->chips[i].buffer_write_time = 1<<cfi->cfiq->BufWriteTimeoutTyp; |
| 409 | cfi->chips[i].erase_time = 1<<cfi->cfiq->BlockEraseTimeoutTyp; | 409 | cfi->chips[i].erase_time = 1<<cfi->cfiq->BlockEraseTimeoutTyp; |
| 410 | cfi->chips[i].ref_point_counter = 0; | 410 | cfi->chips[i].ref_point_counter = 0; |
| 411 | init_waitqueue_head(&(cfi->chips[i].wq)); | ||
| 411 | } | 412 | } |
| 412 | 413 | ||
| 413 | map->fldrv = &cfi_intelext_chipdrv; | 414 | map->fldrv = &cfi_intelext_chipdrv; |
diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c index 7b7ca5ab5ae4..8815c8dbef2d 100644 --- a/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * $Id: redboot.c,v 1.18 2005/11/07 11:14:21 gleixner Exp $ | 2 | * $Id: redboot.c,v 1.19 2005/12/01 10:03:51 dwmw2 Exp $ |
| 3 | * | 3 | * |
| 4 | * Parse RedBoot-style Flash Image System (FIS) tables and | 4 | * Parse RedBoot-style Flash Image System (FIS) tables and |
| 5 | * produce a Linux partition array to match. | 5 | * produce a Linux partition array to match. |
| @@ -89,8 +89,32 @@ static int parse_redboot_partitions(struct mtd_info *master, | |||
| 89 | i = numslots; | 89 | i = numslots; |
| 90 | break; | 90 | break; |
| 91 | } | 91 | } |
| 92 | if (!memcmp(buf[i].name, "FIS directory", 14)) | 92 | if (!memcmp(buf[i].name, "FIS directory", 14)) { |
| 93 | /* This is apparently the FIS directory entry for the | ||
| 94 | * FIS directory itself. The FIS directory size is | ||
| 95 | * one erase block; if the buf[i].size field is | ||
| 96 | * swab32(erasesize) then we know we are looking at | ||
| 97 | * a byte swapped FIS directory - swap all the entries! | ||
| 98 | * (NOTE: this is 'size' not 'data_length'; size is | ||
| 99 | * the full size of the entry.) | ||
| 100 | */ | ||
| 101 | if (swab32(buf[i].size) == master->erasesize) { | ||
| 102 | int j; | ||
| 103 | for (j = 0; j < numslots && buf[j].name[0] != 0xff; ++j) { | ||
| 104 | /* The unsigned long fields were written with the | ||
| 105 | * wrong byte sex, name and pad have no byte sex. | ||
| 106 | */ | ||
| 107 | swab32s(&buf[j].flash_base); | ||
| 108 | swab32s(&buf[j].mem_base); | ||
| 109 | swab32s(&buf[j].size); | ||
| 110 | swab32s(&buf[j].entry_point); | ||
| 111 | swab32s(&buf[j].data_length); | ||
| 112 | swab32s(&buf[j].desc_cksum); | ||
| 113 | swab32s(&buf[j].file_cksum); | ||
| 114 | } | ||
| 115 | } | ||
| 93 | break; | 116 | break; |
| 117 | } | ||
| 94 | } | 118 | } |
| 95 | if (i == numslots) { | 119 | if (i == numslots) { |
| 96 | /* Didn't find it */ | 120 | /* Didn't find it */ |
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index f822cd3025ff..dd410496aadb 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c | |||
| @@ -1118,13 +1118,18 @@ err_out: | |||
| 1118 | return -ENOMEM; | 1118 | return -ENOMEM; |
| 1119 | } | 1119 | } |
| 1120 | 1120 | ||
| 1121 | static void cp_init_rings_index (struct cp_private *cp) | ||
| 1122 | { | ||
| 1123 | cp->rx_tail = 0; | ||
| 1124 | cp->tx_head = cp->tx_tail = 0; | ||
| 1125 | } | ||
| 1126 | |||
| 1121 | static int cp_init_rings (struct cp_private *cp) | 1127 | static int cp_init_rings (struct cp_private *cp) |
| 1122 | { | 1128 | { |
| 1123 | memset(cp->tx_ring, 0, sizeof(struct cp_desc) * CP_TX_RING_SIZE); | 1129 | memset(cp->tx_ring, 0, sizeof(struct cp_desc) * CP_TX_RING_SIZE); |
| 1124 | cp->tx_ring[CP_TX_RING_SIZE - 1].opts1 = cpu_to_le32(RingEnd); | 1130 | cp->tx_ring[CP_TX_RING_SIZE - 1].opts1 = cpu_to_le32(RingEnd); |
| 1125 | 1131 | ||
| 1126 | cp->rx_tail = 0; | 1132 | cp_init_rings_index(cp); |
| 1127 | cp->tx_head = cp->tx_tail = 0; | ||
| 1128 | 1133 | ||
| 1129 | return cp_refill_rx (cp); | 1134 | return cp_refill_rx (cp); |
| 1130 | } | 1135 | } |
| @@ -1886,30 +1891,30 @@ static int cp_suspend (struct pci_dev *pdev, pm_message_t state) | |||
| 1886 | 1891 | ||
| 1887 | spin_unlock_irqrestore (&cp->lock, flags); | 1892 | spin_unlock_irqrestore (&cp->lock, flags); |
| 1888 | 1893 | ||
| 1889 | if (cp->pdev && cp->wol_enabled) { | 1894 | pci_save_state(pdev); |
| 1890 | pci_save_state (cp->pdev); | 1895 | pci_enable_wake(pdev, pci_choose_state(pdev, state), cp->wol_enabled); |
| 1891 | cp_set_d3_state (cp); | 1896 | pci_set_power_state(pdev, pci_choose_state(pdev, state)); |
| 1892 | } | ||
| 1893 | 1897 | ||
| 1894 | return 0; | 1898 | return 0; |
| 1895 | } | 1899 | } |
| 1896 | 1900 | ||
| 1897 | static int cp_resume (struct pci_dev *pdev) | 1901 | static int cp_resume (struct pci_dev *pdev) |
| 1898 | { | 1902 | { |
| 1899 | struct net_device *dev; | 1903 | struct net_device *dev = pci_get_drvdata (pdev); |
| 1900 | struct cp_private *cp; | 1904 | struct cp_private *cp = netdev_priv(dev); |
| 1901 | unsigned long flags; | 1905 | unsigned long flags; |
| 1902 | 1906 | ||
| 1903 | dev = pci_get_drvdata (pdev); | 1907 | if (!netif_running(dev)) |
| 1904 | cp = netdev_priv(dev); | 1908 | return 0; |
| 1905 | 1909 | ||
| 1906 | netif_device_attach (dev); | 1910 | netif_device_attach (dev); |
| 1907 | 1911 | ||
| 1908 | if (cp->pdev && cp->wol_enabled) { | 1912 | pci_set_power_state(pdev, PCI_D0); |
| 1909 | pci_set_power_state (cp->pdev, PCI_D0); | 1913 | pci_restore_state(pdev); |
| 1910 | pci_restore_state (cp->pdev); | 1914 | pci_enable_wake(pdev, PCI_D0, 0); |
| 1911 | } | 1915 | |
| 1912 | 1916 | /* FIXME: sh*t may happen if the Rx ring buffer is depleted */ | |
| 1917 | cp_init_rings_index (cp); | ||
| 1913 | cp_init_hw (cp); | 1918 | cp_init_hw (cp); |
| 1914 | netif_start_queue (dev); | 1919 | netif_start_queue (dev); |
| 1915 | 1920 | ||
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index 27c77306193b..99baf0e099fc 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h | |||
| @@ -225,9 +225,6 @@ struct e1000_rx_ring { | |||
| 225 | struct e1000_ps_page *ps_page; | 225 | struct e1000_ps_page *ps_page; |
| 226 | struct e1000_ps_page_dma *ps_page_dma; | 226 | struct e1000_ps_page_dma *ps_page_dma; |
| 227 | 227 | ||
| 228 | struct sk_buff *rx_skb_top; | ||
| 229 | struct sk_buff *rx_skb_prev; | ||
| 230 | |||
| 231 | /* cpu for rx queue */ | 228 | /* cpu for rx queue */ |
| 232 | int cpu; | 229 | int cpu; |
| 233 | 230 | ||
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 31e332935e5a..5b7d0f425af2 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
| @@ -103,7 +103,7 @@ static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver"; | |||
| 103 | #else | 103 | #else |
| 104 | #define DRIVERNAPI "-NAPI" | 104 | #define DRIVERNAPI "-NAPI" |
| 105 | #endif | 105 | #endif |
| 106 | #define DRV_VERSION "6.3.9-k2"DRIVERNAPI | 106 | #define DRV_VERSION "6.3.9-k4"DRIVERNAPI |
| 107 | char e1000_driver_version[] = DRV_VERSION; | 107 | char e1000_driver_version[] = DRV_VERSION; |
| 108 | static char e1000_copyright[] = "Copyright (c) 1999-2005 Intel Corporation."; | 108 | static char e1000_copyright[] = "Copyright (c) 1999-2005 Intel Corporation."; |
| 109 | 109 | ||
| @@ -1635,8 +1635,6 @@ setup_rx_desc_die: | |||
| 1635 | 1635 | ||
| 1636 | rxdr->next_to_clean = 0; | 1636 | rxdr->next_to_clean = 0; |
| 1637 | rxdr->next_to_use = 0; | 1637 | rxdr->next_to_use = 0; |
| 1638 | rxdr->rx_skb_top = NULL; | ||
| 1639 | rxdr->rx_skb_prev = NULL; | ||
| 1640 | 1638 | ||
| 1641 | return 0; | 1639 | return 0; |
| 1642 | } | 1640 | } |
| @@ -1713,8 +1711,23 @@ e1000_setup_rctl(struct e1000_adapter *adapter) | |||
| 1713 | rctl |= adapter->rx_buffer_len << 0x11; | 1711 | rctl |= adapter->rx_buffer_len << 0x11; |
| 1714 | } else { | 1712 | } else { |
| 1715 | rctl &= ~E1000_RCTL_SZ_4096; | 1713 | rctl &= ~E1000_RCTL_SZ_4096; |
| 1716 | rctl &= ~E1000_RCTL_BSEX; | 1714 | rctl |= E1000_RCTL_BSEX; |
| 1717 | rctl |= E1000_RCTL_SZ_2048; | 1715 | switch (adapter->rx_buffer_len) { |
| 1716 | case E1000_RXBUFFER_2048: | ||
| 1717 | default: | ||
| 1718 | rctl |= E1000_RCTL_SZ_2048; | ||
| 1719 | rctl &= ~E1000_RCTL_BSEX; | ||
| 1720 | break; | ||
| 1721 | case E1000_RXBUFFER_4096: | ||
| 1722 | rctl |= E1000_RCTL_SZ_4096; | ||
| 1723 | break; | ||
| 1724 | case E1000_RXBUFFER_8192: | ||
| 1725 | rctl |= E1000_RCTL_SZ_8192; | ||
| 1726 | break; | ||
| 1727 | case E1000_RXBUFFER_16384: | ||
| 1728 | rctl |= E1000_RCTL_SZ_16384; | ||
| 1729 | break; | ||
| 1730 | } | ||
| 1718 | } | 1731 | } |
| 1719 | 1732 | ||
| 1720 | #ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT | 1733 | #ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT |
| @@ -2107,16 +2120,6 @@ e1000_clean_rx_ring(struct e1000_adapter *adapter, | |||
| 2107 | } | 2120 | } |
| 2108 | } | 2121 | } |
| 2109 | 2122 | ||
| 2110 | /* there also may be some cached data in our adapter */ | ||
| 2111 | if (rx_ring->rx_skb_top) { | ||
| 2112 | dev_kfree_skb(rx_ring->rx_skb_top); | ||
| 2113 | |||
| 2114 | /* rx_skb_prev will be wiped out by rx_skb_top */ | ||
| 2115 | rx_ring->rx_skb_top = NULL; | ||
| 2116 | rx_ring->rx_skb_prev = NULL; | ||
| 2117 | } | ||
| 2118 | |||
| 2119 | |||
| 2120 | size = sizeof(struct e1000_buffer) * rx_ring->count; | 2123 | size = sizeof(struct e1000_buffer) * rx_ring->count; |
| 2121 | memset(rx_ring->buffer_info, 0, size); | 2124 | memset(rx_ring->buffer_info, 0, size); |
| 2122 | size = sizeof(struct e1000_ps_page) * rx_ring->count; | 2125 | size = sizeof(struct e1000_ps_page) * rx_ring->count; |
| @@ -3106,24 +3109,27 @@ e1000_change_mtu(struct net_device *netdev, int new_mtu) | |||
| 3106 | break; | 3109 | break; |
| 3107 | } | 3110 | } |
| 3108 | 3111 | ||
| 3109 | /* since the driver code now supports splitting a packet across | 3112 | |
| 3110 | * multiple descriptors, most of the fifo related limitations on | ||
| 3111 | * jumbo frame traffic have gone away. | ||
| 3112 | * simply use 2k descriptors for everything. | ||
| 3113 | * | ||
| 3114 | * NOTE: dev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN | ||
| 3115 | * means we reserve 2 more, this pushes us to allocate from the next | ||
| 3116 | * larger slab size | ||
| 3117 | * i.e. RXBUFFER_2048 --> size-4096 slab */ | ||
| 3118 | |||
| 3119 | /* recent hardware supports 1KB granularity */ | ||
| 3120 | if (adapter->hw.mac_type > e1000_82547_rev_2) { | 3113 | if (adapter->hw.mac_type > e1000_82547_rev_2) { |
| 3121 | adapter->rx_buffer_len = | 3114 | adapter->rx_buffer_len = max_frame; |
| 3122 | ((max_frame < E1000_RXBUFFER_2048) ? | ||
| 3123 | max_frame : E1000_RXBUFFER_2048); | ||
| 3124 | E1000_ROUNDUP(adapter->rx_buffer_len, 1024); | 3115 | E1000_ROUNDUP(adapter->rx_buffer_len, 1024); |
| 3125 | } else | 3116 | } else { |
| 3126 | adapter->rx_buffer_len = E1000_RXBUFFER_2048; | 3117 | if(unlikely((adapter->hw.mac_type < e1000_82543) && |
| 3118 | (max_frame > MAXIMUM_ETHERNET_FRAME_SIZE))) { | ||
| 3119 | DPRINTK(PROBE, ERR, "Jumbo Frames not supported " | ||
| 3120 | "on 82542\n"); | ||
| 3121 | return -EINVAL; | ||
| 3122 | } else { | ||
| 3123 | if(max_frame <= E1000_RXBUFFER_2048) | ||
| 3124 | adapter->rx_buffer_len = E1000_RXBUFFER_2048; | ||
| 3125 | else if(max_frame <= E1000_RXBUFFER_4096) | ||
| 3126 | adapter->rx_buffer_len = E1000_RXBUFFER_4096; | ||
| 3127 | else if(max_frame <= E1000_RXBUFFER_8192) | ||
| 3128 | adapter->rx_buffer_len = E1000_RXBUFFER_8192; | ||
| 3129 | else if(max_frame <= E1000_RXBUFFER_16384) | ||
| 3130 | adapter->rx_buffer_len = E1000_RXBUFFER_16384; | ||
| 3131 | } | ||
| 3132 | } | ||
| 3127 | 3133 | ||
| 3128 | netdev->mtu = new_mtu; | 3134 | netdev->mtu = new_mtu; |
| 3129 | 3135 | ||
| @@ -3620,7 +3626,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter, | |||
| 3620 | uint8_t last_byte; | 3626 | uint8_t last_byte; |
| 3621 | unsigned int i; | 3627 | unsigned int i; |
| 3622 | int cleaned_count = 0; | 3628 | int cleaned_count = 0; |
| 3623 | boolean_t cleaned = FALSE, multi_descriptor = FALSE; | 3629 | boolean_t cleaned = FALSE; |
| 3624 | 3630 | ||
| 3625 | i = rx_ring->next_to_clean; | 3631 | i = rx_ring->next_to_clean; |
| 3626 | rx_desc = E1000_RX_DESC(*rx_ring, i); | 3632 | rx_desc = E1000_RX_DESC(*rx_ring, i); |
| @@ -3652,43 +3658,12 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter, | |||
| 3652 | 3658 | ||
| 3653 | length = le16_to_cpu(rx_desc->length); | 3659 | length = le16_to_cpu(rx_desc->length); |
| 3654 | 3660 | ||
| 3655 | skb_put(skb, length); | 3661 | if (unlikely(!(status & E1000_RXD_STAT_EOP))) { |
| 3656 | 3662 | /* All receives must fit into a single buffer */ | |
| 3657 | if (!(status & E1000_RXD_STAT_EOP)) { | 3663 | E1000_DBG("%s: Receive packet consumed multiple" |
| 3658 | if (!rx_ring->rx_skb_top) { | 3664 | " buffers\n", netdev->name); |
| 3659 | rx_ring->rx_skb_top = skb; | 3665 | dev_kfree_skb_irq(skb); |
| 3660 | rx_ring->rx_skb_top->len = length; | ||
| 3661 | rx_ring->rx_skb_prev = skb; | ||
| 3662 | } else { | ||
| 3663 | if (skb_shinfo(rx_ring->rx_skb_top)->frag_list) { | ||
| 3664 | rx_ring->rx_skb_prev->next = skb; | ||
| 3665 | skb->prev = rx_ring->rx_skb_prev; | ||
| 3666 | } else { | ||
| 3667 | skb_shinfo(rx_ring->rx_skb_top)->frag_list = skb; | ||
| 3668 | } | ||
| 3669 | rx_ring->rx_skb_prev = skb; | ||
| 3670 | rx_ring->rx_skb_top->data_len += length; | ||
| 3671 | } | ||
| 3672 | goto next_desc; | 3666 | goto next_desc; |
| 3673 | } else { | ||
| 3674 | if (rx_ring->rx_skb_top) { | ||
| 3675 | if (skb_shinfo(rx_ring->rx_skb_top) | ||
| 3676 | ->frag_list) { | ||
| 3677 | rx_ring->rx_skb_prev->next = skb; | ||
| 3678 | skb->prev = rx_ring->rx_skb_prev; | ||
| 3679 | } else | ||
| 3680 | skb_shinfo(rx_ring->rx_skb_top) | ||
| 3681 | ->frag_list = skb; | ||
| 3682 | |||
| 3683 | rx_ring->rx_skb_top->data_len += length; | ||
| 3684 | rx_ring->rx_skb_top->len += | ||
| 3685 | rx_ring->rx_skb_top->data_len; | ||
| 3686 | |||
| 3687 | skb = rx_ring->rx_skb_top; | ||
| 3688 | multi_descriptor = TRUE; | ||
| 3689 | rx_ring->rx_skb_top = NULL; | ||
| 3690 | rx_ring->rx_skb_prev = NULL; | ||
| 3691 | } | ||
| 3692 | } | 3667 | } |
| 3693 | 3668 | ||
| 3694 | if (unlikely(rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK)) { | 3669 | if (unlikely(rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK)) { |
| @@ -3712,10 +3687,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter, | |||
| 3712 | * performance for small packets with large amounts | 3687 | * performance for small packets with large amounts |
| 3713 | * of reassembly being done in the stack */ | 3688 | * of reassembly being done in the stack */ |
| 3714 | #define E1000_CB_LENGTH 256 | 3689 | #define E1000_CB_LENGTH 256 |
| 3715 | if ((length < E1000_CB_LENGTH) && | 3690 | if (length < E1000_CB_LENGTH) { |
| 3716 | !rx_ring->rx_skb_top && | ||
| 3717 | /* or maybe (status & E1000_RXD_STAT_EOP) && */ | ||
| 3718 | !multi_descriptor) { | ||
| 3719 | struct sk_buff *new_skb = | 3691 | struct sk_buff *new_skb = |
| 3720 | dev_alloc_skb(length + NET_IP_ALIGN); | 3692 | dev_alloc_skb(length + NET_IP_ALIGN); |
| 3721 | if (new_skb) { | 3693 | if (new_skb) { |
| @@ -3729,7 +3701,8 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter, | |||
| 3729 | skb = new_skb; | 3701 | skb = new_skb; |
| 3730 | skb_put(skb, length); | 3702 | skb_put(skb, length); |
| 3731 | } | 3703 | } |
| 3732 | } | 3704 | } else |
| 3705 | skb_put(skb, length); | ||
| 3733 | 3706 | ||
| 3734 | /* end copybreak code */ | 3707 | /* end copybreak code */ |
| 3735 | 3708 | ||
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index 1b699259b4ec..31fb2d75dc44 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c | |||
| @@ -57,7 +57,7 @@ struct ifb_private { | |||
| 57 | struct sk_buff_head tq; | 57 | struct sk_buff_head tq; |
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | static int numifbs = 1; | 60 | static int numifbs = 2; |
| 61 | 61 | ||
| 62 | static void ri_tasklet(unsigned long dev); | 62 | static void ri_tasklet(unsigned long dev); |
| 63 | static int ifb_xmit(struct sk_buff *skb, struct net_device *dev); | 63 | static int ifb_xmit(struct sk_buff *skb, struct net_device *dev); |
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 01ddfc8cce3f..aa5581369399 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
| @@ -806,6 +806,7 @@ static struct pcmcia_device_id axnet_ids[] = { | |||
| 806 | PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0309), | 806 | PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0309), |
| 807 | PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1106), | 807 | PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1106), |
| 808 | PCMCIA_DEVICE_MANF_CARD(0x8a01, 0xc1ab), | 808 | PCMCIA_DEVICE_MANF_CARD(0x8a01, 0xc1ab), |
| 809 | PCMCIA_DEVICE_PROD_ID12("AmbiCom,Inc.", "Fast Ethernet PC Card(AMB8110)", 0x49b020a7, 0x119cc9fc), | ||
| 809 | PCMCIA_DEVICE_PROD_ID124("Fast Ethernet", "16-bit PC Card", "AX88190", 0xb4be14e3, 0x9a12eb6a, 0xab9be5ef), | 810 | PCMCIA_DEVICE_PROD_ID124("Fast Ethernet", "16-bit PC Card", "AX88190", 0xb4be14e3, 0x9a12eb6a, 0xab9be5ef), |
| 810 | PCMCIA_DEVICE_PROD_ID12("ASIX", "AX88190", 0x0959823b, 0xab9be5ef), | 811 | PCMCIA_DEVICE_PROD_ID12("ASIX", "AX88190", 0x0959823b, 0xab9be5ef), |
| 811 | PCMCIA_DEVICE_PROD_ID12("Billionton", "LNA-100B", 0x552ab682, 0xbc3b87e1), | 812 | PCMCIA_DEVICE_PROD_ID12("Billionton", "LNA-100B", 0x552ab682, 0xbc3b87e1), |
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 6e1018448eea..8cc0d0bbdf50 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
| @@ -287,6 +287,20 @@ enum RTL8169_register_content { | |||
| 287 | TxInterFrameGapShift = 24, | 287 | TxInterFrameGapShift = 24, |
| 288 | TxDMAShift = 8, /* DMA burst value (0-7) is shift this many bits */ | 288 | TxDMAShift = 8, /* DMA burst value (0-7) is shift this many bits */ |
| 289 | 289 | ||
| 290 | /* Config1 register p.24 */ | ||
| 291 | PMEnable = (1 << 0), /* Power Management Enable */ | ||
| 292 | |||
| 293 | /* Config3 register p.25 */ | ||
| 294 | MagicPacket = (1 << 5), /* Wake up when receives a Magic Packet */ | ||
| 295 | LinkUp = (1 << 4), /* Wake up when the cable connection is re-established */ | ||
| 296 | |||
| 297 | /* Config5 register p.27 */ | ||
| 298 | BWF = (1 << 6), /* Accept Broadcast wakeup frame */ | ||
| 299 | MWF = (1 << 5), /* Accept Multicast wakeup frame */ | ||
| 300 | UWF = (1 << 4), /* Accept Unicast wakeup frame */ | ||
| 301 | LanWake = (1 << 1), /* LanWake enable/disable */ | ||
| 302 | PMEStatus = (1 << 0), /* PME status can be reset by PCI RST# */ | ||
| 303 | |||
| 290 | /* TBICSR p.28 */ | 304 | /* TBICSR p.28 */ |
| 291 | TBIReset = 0x80000000, | 305 | TBIReset = 0x80000000, |
| 292 | TBILoopback = 0x40000000, | 306 | TBILoopback = 0x40000000, |
| @@ -433,6 +447,7 @@ struct rtl8169_private { | |||
| 433 | unsigned int (*phy_reset_pending)(void __iomem *); | 447 | unsigned int (*phy_reset_pending)(void __iomem *); |
| 434 | unsigned int (*link_ok)(void __iomem *); | 448 | unsigned int (*link_ok)(void __iomem *); |
| 435 | struct work_struct task; | 449 | struct work_struct task; |
| 450 | unsigned wol_enabled : 1; | ||
| 436 | }; | 451 | }; |
| 437 | 452 | ||
| 438 | MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>"); | 453 | MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>"); |
| @@ -607,6 +622,80 @@ static void rtl8169_link_option(int idx, u8 *autoneg, u16 *speed, u8 *duplex) | |||
| 607 | *duplex = p->duplex; | 622 | *duplex = p->duplex; |
| 608 | } | 623 | } |
| 609 | 624 | ||
| 625 | static void rtl8169_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) | ||
| 626 | { | ||
| 627 | struct rtl8169_private *tp = netdev_priv(dev); | ||
| 628 | void __iomem *ioaddr = tp->mmio_addr; | ||
| 629 | u8 options; | ||
| 630 | |||
| 631 | wol->wolopts = 0; | ||
| 632 | |||
| 633 | #define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST) | ||
| 634 | wol->supported = WAKE_ANY; | ||
| 635 | |||
| 636 | spin_lock_irq(&tp->lock); | ||
| 637 | |||
| 638 | options = RTL_R8(Config1); | ||
| 639 | if (!(options & PMEnable)) | ||
| 640 | goto out_unlock; | ||
| 641 | |||
| 642 | options = RTL_R8(Config3); | ||
| 643 | if (options & LinkUp) | ||
| 644 | wol->wolopts |= WAKE_PHY; | ||
| 645 | if (options & MagicPacket) | ||
| 646 | wol->wolopts |= WAKE_MAGIC; | ||
| 647 | |||
| 648 | options = RTL_R8(Config5); | ||
| 649 | if (options & UWF) | ||
| 650 | wol->wolopts |= WAKE_UCAST; | ||
| 651 | if (options & BWF) | ||
| 652 | wol->wolopts |= WAKE_BCAST; | ||
| 653 | if (options & MWF) | ||
| 654 | wol->wolopts |= WAKE_MCAST; | ||
| 655 | |||
| 656 | out_unlock: | ||
| 657 | spin_unlock_irq(&tp->lock); | ||
| 658 | } | ||
| 659 | |||
| 660 | static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) | ||
| 661 | { | ||
| 662 | struct rtl8169_private *tp = netdev_priv(dev); | ||
| 663 | void __iomem *ioaddr = tp->mmio_addr; | ||
| 664 | int i; | ||
| 665 | static struct { | ||
| 666 | u32 opt; | ||
| 667 | u16 reg; | ||
| 668 | u8 mask; | ||
| 669 | } cfg[] = { | ||
| 670 | { WAKE_ANY, Config1, PMEnable }, | ||
| 671 | { WAKE_PHY, Config3, LinkUp }, | ||
| 672 | { WAKE_MAGIC, Config3, MagicPacket }, | ||
| 673 | { WAKE_UCAST, Config5, UWF }, | ||
| 674 | { WAKE_BCAST, Config5, BWF }, | ||
| 675 | { WAKE_MCAST, Config5, MWF }, | ||
| 676 | { WAKE_ANY, Config5, LanWake } | ||
| 677 | }; | ||
| 678 | |||
| 679 | spin_lock_irq(&tp->lock); | ||
| 680 | |||
| 681 | RTL_W8(Cfg9346, Cfg9346_Unlock); | ||
| 682 | |||
| 683 | for (i = 0; i < ARRAY_SIZE(cfg); i++) { | ||
| 684 | u8 options = RTL_R8(cfg[i].reg) & ~cfg[i].mask; | ||
| 685 | if (wol->wolopts & cfg[i].opt) | ||
| 686 | options |= cfg[i].mask; | ||
| 687 | RTL_W8(cfg[i].reg, options); | ||
| 688 | } | ||
| 689 | |||
| 690 | RTL_W8(Cfg9346, Cfg9346_Lock); | ||
| 691 | |||
| 692 | tp->wol_enabled = (wol->wolopts) ? 1 : 0; | ||
| 693 | |||
| 694 | spin_unlock_irq(&tp->lock); | ||
| 695 | |||
| 696 | return 0; | ||
| 697 | } | ||
| 698 | |||
| 610 | static void rtl8169_get_drvinfo(struct net_device *dev, | 699 | static void rtl8169_get_drvinfo(struct net_device *dev, |
| 611 | struct ethtool_drvinfo *info) | 700 | struct ethtool_drvinfo *info) |
| 612 | { | 701 | { |
| @@ -1025,6 +1114,8 @@ static struct ethtool_ops rtl8169_ethtool_ops = { | |||
| 1025 | .get_tso = ethtool_op_get_tso, | 1114 | .get_tso = ethtool_op_get_tso, |
| 1026 | .set_tso = ethtool_op_set_tso, | 1115 | .set_tso = ethtool_op_set_tso, |
| 1027 | .get_regs = rtl8169_get_regs, | 1116 | .get_regs = rtl8169_get_regs, |
| 1117 | .get_wol = rtl8169_get_wol, | ||
| 1118 | .set_wol = rtl8169_set_wol, | ||
| 1028 | .get_strings = rtl8169_get_strings, | 1119 | .get_strings = rtl8169_get_strings, |
| 1029 | .get_stats_count = rtl8169_get_stats_count, | 1120 | .get_stats_count = rtl8169_get_stats_count, |
| 1030 | .get_ethtool_stats = rtl8169_get_ethtool_stats, | 1121 | .get_ethtool_stats = rtl8169_get_ethtool_stats, |
| @@ -1442,6 +1533,11 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out, | |||
| 1442 | } | 1533 | } |
| 1443 | tp->chipset = i; | 1534 | tp->chipset = i; |
| 1444 | 1535 | ||
| 1536 | RTL_W8(Cfg9346, Cfg9346_Unlock); | ||
| 1537 | RTL_W8(Config1, RTL_R8(Config1) | PMEnable); | ||
| 1538 | RTL_W8(Config5, RTL_R8(Config5) & PMEStatus); | ||
| 1539 | RTL_W8(Cfg9346, Cfg9346_Lock); | ||
| 1540 | |||
| 1445 | *ioaddr_out = ioaddr; | 1541 | *ioaddr_out = ioaddr; |
| 1446 | *dev_out = dev; | 1542 | *dev_out = dev; |
| 1447 | out: | 1543 | out: |
| @@ -1612,49 +1708,6 @@ rtl8169_remove_one(struct pci_dev *pdev) | |||
| 1612 | pci_set_drvdata(pdev, NULL); | 1708 | pci_set_drvdata(pdev, NULL); |
| 1613 | } | 1709 | } |
| 1614 | 1710 | ||
| 1615 | #ifdef CONFIG_PM | ||
| 1616 | |||
| 1617 | static int rtl8169_suspend(struct pci_dev *pdev, pm_message_t state) | ||
| 1618 | { | ||
| 1619 | struct net_device *dev = pci_get_drvdata(pdev); | ||
| 1620 | struct rtl8169_private *tp = netdev_priv(dev); | ||
| 1621 | void __iomem *ioaddr = tp->mmio_addr; | ||
| 1622 | unsigned long flags; | ||
| 1623 | |||
| 1624 | if (!netif_running(dev)) | ||
| 1625 | return 0; | ||
| 1626 | |||
| 1627 | netif_device_detach(dev); | ||
| 1628 | netif_stop_queue(dev); | ||
| 1629 | spin_lock_irqsave(&tp->lock, flags); | ||
| 1630 | |||
| 1631 | /* Disable interrupts, stop Rx and Tx */ | ||
| 1632 | RTL_W16(IntrMask, 0); | ||
| 1633 | RTL_W8(ChipCmd, 0); | ||
| 1634 | |||
| 1635 | /* Update the error counts. */ | ||
| 1636 | tp->stats.rx_missed_errors += RTL_R32(RxMissed); | ||
| 1637 | RTL_W32(RxMissed, 0); | ||
| 1638 | spin_unlock_irqrestore(&tp->lock, flags); | ||
| 1639 | |||
| 1640 | return 0; | ||
| 1641 | } | ||
| 1642 | |||
| 1643 | static int rtl8169_resume(struct pci_dev *pdev) | ||
| 1644 | { | ||
| 1645 | struct net_device *dev = pci_get_drvdata(pdev); | ||
| 1646 | |||
| 1647 | if (!netif_running(dev)) | ||
| 1648 | return 0; | ||
| 1649 | |||
| 1650 | netif_device_attach(dev); | ||
| 1651 | rtl8169_hw_start(dev); | ||
| 1652 | |||
| 1653 | return 0; | ||
| 1654 | } | ||
| 1655 | |||
| 1656 | #endif /* CONFIG_PM */ | ||
| 1657 | |||
| 1658 | static void rtl8169_set_rxbufsize(struct rtl8169_private *tp, | 1711 | static void rtl8169_set_rxbufsize(struct rtl8169_private *tp, |
| 1659 | struct net_device *dev) | 1712 | struct net_device *dev) |
| 1660 | { | 1713 | { |
| @@ -2700,6 +2753,56 @@ static struct net_device_stats *rtl8169_get_stats(struct net_device *dev) | |||
| 2700 | return &tp->stats; | 2753 | return &tp->stats; |
| 2701 | } | 2754 | } |
| 2702 | 2755 | ||
| 2756 | #ifdef CONFIG_PM | ||
| 2757 | |||
| 2758 | static int rtl8169_suspend(struct pci_dev *pdev, pm_message_t state) | ||
| 2759 | { | ||
| 2760 | struct net_device *dev = pci_get_drvdata(pdev); | ||
| 2761 | struct rtl8169_private *tp = netdev_priv(dev); | ||
| 2762 | void __iomem *ioaddr = tp->mmio_addr; | ||
| 2763 | |||
| 2764 | if (!netif_running(dev)) | ||
| 2765 | goto out; | ||
| 2766 | |||
| 2767 | netif_device_detach(dev); | ||
| 2768 | netif_stop_queue(dev); | ||
| 2769 | |||
| 2770 | spin_lock_irq(&tp->lock); | ||
| 2771 | |||
| 2772 | rtl8169_asic_down(ioaddr); | ||
| 2773 | |||
| 2774 | tp->stats.rx_missed_errors += RTL_R32(RxMissed); | ||
| 2775 | RTL_W32(RxMissed, 0); | ||
| 2776 | |||
| 2777 | spin_unlock_irq(&tp->lock); | ||
| 2778 | |||
| 2779 | pci_save_state(pdev); | ||
| 2780 | pci_enable_wake(pdev, pci_choose_state(pdev, state), tp->wol_enabled); | ||
| 2781 | pci_set_power_state(pdev, pci_choose_state(pdev, state)); | ||
| 2782 | out: | ||
| 2783 | return 0; | ||
| 2784 | } | ||
| 2785 | |||
| 2786 | static int rtl8169_resume(struct pci_dev *pdev) | ||
| 2787 | { | ||
| 2788 | struct net_device *dev = pci_get_drvdata(pdev); | ||
| 2789 | |||
| 2790 | if (!netif_running(dev)) | ||
| 2791 | goto out; | ||
| 2792 | |||
| 2793 | netif_device_attach(dev); | ||
| 2794 | |||
| 2795 | pci_set_power_state(pdev, PCI_D0); | ||
| 2796 | pci_restore_state(pdev); | ||
| 2797 | pci_enable_wake(pdev, PCI_D0, 0); | ||
| 2798 | |||
| 2799 | rtl8169_schedule_work(dev, rtl8169_reset_task); | ||
| 2800 | out: | ||
| 2801 | return 0; | ||
| 2802 | } | ||
| 2803 | |||
| 2804 | #endif /* CONFIG_PM */ | ||
| 2805 | |||
| 2703 | static struct pci_driver rtl8169_pci_driver = { | 2806 | static struct pci_driver rtl8169_pci_driver = { |
| 2704 | .name = MODULENAME, | 2807 | .name = MODULENAME, |
| 2705 | .id_table = rtl8169_pci_tbl, | 2808 | .id_table = rtl8169_pci_tbl, |
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 3d95fa20cd88..7a952fe60be2 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
| @@ -540,7 +540,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev, | |||
| 540 | printk("%2.2x.\n", net_dev->dev_addr[i]); | 540 | printk("%2.2x.\n", net_dev->dev_addr[i]); |
| 541 | 541 | ||
| 542 | /* Detect Wake on Lan support */ | 542 | /* Detect Wake on Lan support */ |
| 543 | ret = inl(CFGPMC & PMESP); | 543 | ret = (inl(net_dev->base_addr + CFGPMC) & PMESP) >> 27; |
| 544 | if (netif_msg_probe(sis_priv) && (ret & PME_D3C) == 0) | 544 | if (netif_msg_probe(sis_priv) && (ret & PME_D3C) == 0) |
| 545 | printk(KERN_INFO "%s: Wake on LAN only available from suspend to RAM.", net_dev->name); | 545 | printk(KERN_INFO "%s: Wake on LAN only available from suspend to RAM.", net_dev->name); |
| 546 | 546 | ||
| @@ -2040,7 +2040,7 @@ static int sis900_set_wol(struct net_device *net_dev, struct ethtool_wolinfo *wo | |||
| 2040 | 2040 | ||
| 2041 | if (wol->wolopts == 0) { | 2041 | if (wol->wolopts == 0) { |
| 2042 | pci_read_config_dword(sis_priv->pci_dev, CFGPMCSR, &cfgpmcsr); | 2042 | pci_read_config_dword(sis_priv->pci_dev, CFGPMCSR, &cfgpmcsr); |
| 2043 | cfgpmcsr |= ~PME_EN; | 2043 | cfgpmcsr &= ~PME_EN; |
| 2044 | pci_write_config_dword(sis_priv->pci_dev, CFGPMCSR, cfgpmcsr); | 2044 | pci_write_config_dword(sis_priv->pci_dev, CFGPMCSR, cfgpmcsr); |
| 2045 | outl(pmctrl_bits, pmctrl_addr); | 2045 | outl(pmctrl_bits, pmctrl_addr); |
| 2046 | if (netif_msg_wol(sis_priv)) | 2046 | if (netif_msg_wol(sis_priv)) |
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 67fb19b8fde9..25e028b7ce48 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
| @@ -879,13 +879,12 @@ static int __xm_phy_read(struct skge_hw *hw, int port, u16 reg, u16 *val) | |||
| 879 | int i; | 879 | int i; |
| 880 | 880 | ||
| 881 | xm_write16(hw, port, XM_PHY_ADDR, reg | hw->phy_addr); | 881 | xm_write16(hw, port, XM_PHY_ADDR, reg | hw->phy_addr); |
| 882 | xm_read16(hw, port, XM_PHY_DATA); | 882 | *val = xm_read16(hw, port, XM_PHY_DATA); |
| 883 | 883 | ||
| 884 | /* Need to wait for external PHY */ | ||
| 885 | for (i = 0; i < PHY_RETRIES; i++) { | 884 | for (i = 0; i < PHY_RETRIES; i++) { |
| 886 | udelay(1); | ||
| 887 | if (xm_read16(hw, port, XM_MMU_CMD) & XM_MMU_PHY_RDY) | 885 | if (xm_read16(hw, port, XM_MMU_CMD) & XM_MMU_PHY_RDY) |
| 888 | goto ready; | 886 | goto ready; |
| 887 | udelay(1); | ||
| 889 | } | 888 | } |
| 890 | 889 | ||
| 891 | return -ETIMEDOUT; | 890 | return -ETIMEDOUT; |
| @@ -918,7 +917,12 @@ static int xm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val) | |||
| 918 | 917 | ||
| 919 | ready: | 918 | ready: |
| 920 | xm_write16(hw, port, XM_PHY_DATA, val); | 919 | xm_write16(hw, port, XM_PHY_DATA, val); |
| 921 | return 0; | 920 | for (i = 0; i < PHY_RETRIES; i++) { |
| 921 | if (!(xm_read16(hw, port, XM_MMU_CMD) & XM_MMU_PHY_BUSY)) | ||
| 922 | return 0; | ||
| 923 | udelay(1); | ||
| 924 | } | ||
| 925 | return -ETIMEDOUT; | ||
| 922 | } | 926 | } |
| 923 | 927 | ||
| 924 | static void genesis_init(struct skge_hw *hw) | 928 | static void genesis_init(struct skge_hw *hw) |
| @@ -1168,13 +1172,17 @@ static void genesis_mac_init(struct skge_hw *hw, int port) | |||
| 1168 | u32 r; | 1172 | u32 r; |
| 1169 | const u8 zero[6] = { 0 }; | 1173 | const u8 zero[6] = { 0 }; |
| 1170 | 1174 | ||
| 1171 | /* Clear MIB counters */ | 1175 | for (i = 0; i < 10; i++) { |
| 1172 | xm_write16(hw, port, XM_STAT_CMD, | 1176 | skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), |
| 1173 | XM_SC_CLR_RXC | XM_SC_CLR_TXC); | 1177 | MFF_SET_MAC_RST); |
| 1174 | /* Clear two times according to Errata #3 */ | 1178 | if (skge_read16(hw, SK_REG(port, TX_MFF_CTRL1)) & MFF_SET_MAC_RST) |
| 1175 | xm_write16(hw, port, XM_STAT_CMD, | 1179 | goto reset_ok; |
| 1176 | XM_SC_CLR_RXC | XM_SC_CLR_TXC); | 1180 | udelay(1); |
| 1181 | } | ||
| 1182 | |||
| 1183 | printk(KERN_WARNING PFX "%s: genesis reset failed\n", dev->name); | ||
| 1177 | 1184 | ||
| 1185 | reset_ok: | ||
| 1178 | /* Unreset the XMAC. */ | 1186 | /* Unreset the XMAC. */ |
| 1179 | skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_CLR_MAC_RST); | 1187 | skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_CLR_MAC_RST); |
| 1180 | 1188 | ||
| @@ -1191,7 +1199,7 @@ static void genesis_mac_init(struct skge_hw *hw, int port) | |||
| 1191 | r |= GP_DIR_2|GP_IO_2; | 1199 | r |= GP_DIR_2|GP_IO_2; |
| 1192 | 1200 | ||
| 1193 | skge_write32(hw, B2_GP_IO, r); | 1201 | skge_write32(hw, B2_GP_IO, r); |
| 1194 | skge_read32(hw, B2_GP_IO); | 1202 | |
| 1195 | 1203 | ||
| 1196 | /* Enable GMII interface */ | 1204 | /* Enable GMII interface */ |
| 1197 | xm_write16(hw, port, XM_HW_CFG, XM_HW_GMII_MD); | 1205 | xm_write16(hw, port, XM_HW_CFG, XM_HW_GMII_MD); |
| @@ -1205,6 +1213,13 @@ static void genesis_mac_init(struct skge_hw *hw, int port) | |||
| 1205 | for (i = 1; i < 16; i++) | 1213 | for (i = 1; i < 16; i++) |
| 1206 | xm_outaddr(hw, port, XM_EXM(i), zero); | 1214 | xm_outaddr(hw, port, XM_EXM(i), zero); |
| 1207 | 1215 | ||
| 1216 | /* Clear MIB counters */ | ||
| 1217 | xm_write16(hw, port, XM_STAT_CMD, | ||
| 1218 | XM_SC_CLR_RXC | XM_SC_CLR_TXC); | ||
| 1219 | /* Clear two times according to Errata #3 */ | ||
| 1220 | xm_write16(hw, port, XM_STAT_CMD, | ||
| 1221 | XM_SC_CLR_RXC | XM_SC_CLR_TXC); | ||
| 1222 | |||
| 1208 | /* configure Rx High Water Mark (XM_RX_HI_WM) */ | 1223 | /* configure Rx High Water Mark (XM_RX_HI_WM) */ |
| 1209 | xm_write16(hw, port, XM_RX_HI_WM, 1450); | 1224 | xm_write16(hw, port, XM_RX_HI_WM, 1450); |
| 1210 | 1225 | ||
| @@ -2170,8 +2185,10 @@ static int skge_up(struct net_device *dev) | |||
| 2170 | skge->tx_avail = skge->tx_ring.count - 1; | 2185 | skge->tx_avail = skge->tx_ring.count - 1; |
| 2171 | 2186 | ||
| 2172 | /* Enable IRQ from port */ | 2187 | /* Enable IRQ from port */ |
| 2188 | spin_lock_irq(&hw->hw_lock); | ||
| 2173 | hw->intr_mask |= portirqmask[port]; | 2189 | hw->intr_mask |= portirqmask[port]; |
| 2174 | skge_write32(hw, B0_IMSK, hw->intr_mask); | 2190 | skge_write32(hw, B0_IMSK, hw->intr_mask); |
| 2191 | spin_unlock_irq(&hw->hw_lock); | ||
| 2175 | 2192 | ||
| 2176 | /* Initialize MAC */ | 2193 | /* Initialize MAC */ |
| 2177 | spin_lock_bh(&hw->phy_lock); | 2194 | spin_lock_bh(&hw->phy_lock); |
| @@ -2229,8 +2246,10 @@ static int skge_down(struct net_device *dev) | |||
| 2229 | else | 2246 | else |
| 2230 | yukon_stop(skge); | 2247 | yukon_stop(skge); |
| 2231 | 2248 | ||
| 2249 | spin_lock_irq(&hw->hw_lock); | ||
| 2232 | hw->intr_mask &= ~portirqmask[skge->port]; | 2250 | hw->intr_mask &= ~portirqmask[skge->port]; |
| 2233 | skge_write32(hw, B0_IMSK, hw->intr_mask); | 2251 | skge_write32(hw, B0_IMSK, hw->intr_mask); |
| 2252 | spin_unlock_irq(&hw->hw_lock); | ||
| 2234 | 2253 | ||
| 2235 | /* Stop transmitter */ | 2254 | /* Stop transmitter */ |
| 2236 | skge_write8(hw, Q_ADDR(txqaddr[port], Q_CSR), CSR_STOP); | 2255 | skge_write8(hw, Q_ADDR(txqaddr[port], Q_CSR), CSR_STOP); |
| @@ -2678,8 +2697,7 @@ static int skge_poll(struct net_device *dev, int *budget) | |||
| 2678 | 2697 | ||
| 2679 | /* restart receiver */ | 2698 | /* restart receiver */ |
| 2680 | wmb(); | 2699 | wmb(); |
| 2681 | skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR), | 2700 | skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR), CSR_START); |
| 2682 | CSR_START | CSR_IRQ_CL_F); | ||
| 2683 | 2701 | ||
| 2684 | *budget -= work_done; | 2702 | *budget -= work_done; |
| 2685 | dev->quota -= work_done; | 2703 | dev->quota -= work_done; |
| @@ -2687,10 +2705,11 @@ static int skge_poll(struct net_device *dev, int *budget) | |||
| 2687 | if (work_done >= to_do) | 2705 | if (work_done >= to_do) |
| 2688 | return 1; /* not done */ | 2706 | return 1; /* not done */ |
| 2689 | 2707 | ||
| 2690 | netif_rx_complete(dev); | 2708 | spin_lock_irq(&hw->hw_lock); |
| 2691 | hw->intr_mask |= portirqmask[skge->port]; | 2709 | __netif_rx_complete(dev); |
| 2692 | skge_write32(hw, B0_IMSK, hw->intr_mask); | 2710 | hw->intr_mask |= portirqmask[skge->port]; |
| 2693 | skge_read32(hw, B0_IMSK); | 2711 | skge_write32(hw, B0_IMSK, hw->intr_mask); |
| 2712 | spin_unlock_irq(&hw->hw_lock); | ||
| 2694 | 2713 | ||
| 2695 | return 0; | 2714 | return 0; |
| 2696 | } | 2715 | } |
| @@ -2850,18 +2869,10 @@ static void skge_extirq(unsigned long data) | |||
| 2850 | } | 2869 | } |
| 2851 | spin_unlock(&hw->phy_lock); | 2870 | spin_unlock(&hw->phy_lock); |
| 2852 | 2871 | ||
| 2853 | local_irq_disable(); | 2872 | spin_lock_irq(&hw->hw_lock); |
| 2854 | hw->intr_mask |= IS_EXT_REG; | 2873 | hw->intr_mask |= IS_EXT_REG; |
| 2855 | skge_write32(hw, B0_IMSK, hw->intr_mask); | 2874 | skge_write32(hw, B0_IMSK, hw->intr_mask); |
| 2856 | local_irq_enable(); | 2875 | spin_unlock_irq(&hw->hw_lock); |
| 2857 | } | ||
| 2858 | |||
| 2859 | static inline void skge_wakeup(struct net_device *dev) | ||
| 2860 | { | ||
| 2861 | struct skge_port *skge = netdev_priv(dev); | ||
| 2862 | |||
| 2863 | prefetch(skge->rx_ring.to_clean); | ||
| 2864 | netif_rx_schedule(dev); | ||
| 2865 | } | 2876 | } |
| 2866 | 2877 | ||
| 2867 | static irqreturn_t skge_intr(int irq, void *dev_id, struct pt_regs *regs) | 2878 | static irqreturn_t skge_intr(int irq, void *dev_id, struct pt_regs *regs) |
| @@ -2872,15 +2883,17 @@ static irqreturn_t skge_intr(int irq, void *dev_id, struct pt_regs *regs) | |||
| 2872 | if (status == 0 || status == ~0) /* hotplug or shared irq */ | 2883 | if (status == 0 || status == ~0) /* hotplug or shared irq */ |
| 2873 | return IRQ_NONE; | 2884 | return IRQ_NONE; |
| 2874 | 2885 | ||
| 2875 | status &= hw->intr_mask; | 2886 | spin_lock(&hw->hw_lock); |
| 2876 | if (status & IS_R1_F) { | 2887 | if (status & IS_R1_F) { |
| 2888 | skge_write8(hw, Q_ADDR(Q_R1, Q_CSR), CSR_IRQ_CL_F); | ||
| 2877 | hw->intr_mask &= ~IS_R1_F; | 2889 | hw->intr_mask &= ~IS_R1_F; |
| 2878 | skge_wakeup(hw->dev[0]); | 2890 | netif_rx_schedule(hw->dev[0]); |
| 2879 | } | 2891 | } |
| 2880 | 2892 | ||
| 2881 | if (status & IS_R2_F) { | 2893 | if (status & IS_R2_F) { |
| 2894 | skge_write8(hw, Q_ADDR(Q_R2, Q_CSR), CSR_IRQ_CL_F); | ||
| 2882 | hw->intr_mask &= ~IS_R2_F; | 2895 | hw->intr_mask &= ~IS_R2_F; |
| 2883 | skge_wakeup(hw->dev[1]); | 2896 | netif_rx_schedule(hw->dev[1]); |
| 2884 | } | 2897 | } |
| 2885 | 2898 | ||
| 2886 | if (status & IS_XA1_F) | 2899 | if (status & IS_XA1_F) |
| @@ -2922,6 +2935,7 @@ static irqreturn_t skge_intr(int irq, void *dev_id, struct pt_regs *regs) | |||
| 2922 | } | 2935 | } |
| 2923 | 2936 | ||
| 2924 | skge_write32(hw, B0_IMSK, hw->intr_mask); | 2937 | skge_write32(hw, B0_IMSK, hw->intr_mask); |
| 2938 | spin_unlock(&hw->hw_lock); | ||
| 2925 | 2939 | ||
| 2926 | return IRQ_HANDLED; | 2940 | return IRQ_HANDLED; |
| 2927 | } | 2941 | } |
| @@ -3290,6 +3304,7 @@ static int __devinit skge_probe(struct pci_dev *pdev, | |||
| 3290 | 3304 | ||
| 3291 | hw->pdev = pdev; | 3305 | hw->pdev = pdev; |
| 3292 | spin_lock_init(&hw->phy_lock); | 3306 | spin_lock_init(&hw->phy_lock); |
| 3307 | spin_lock_init(&hw->hw_lock); | ||
| 3293 | tasklet_init(&hw->ext_tasklet, skge_extirq, (unsigned long) hw); | 3308 | tasklet_init(&hw->ext_tasklet, skge_extirq, (unsigned long) hw); |
| 3294 | 3309 | ||
| 3295 | hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000); | 3310 | hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000); |
diff --git a/drivers/net/skge.h b/drivers/net/skge.h index 2efdacc290e5..941f12a333b6 100644 --- a/drivers/net/skge.h +++ b/drivers/net/skge.h | |||
| @@ -2402,6 +2402,7 @@ struct skge_hw { | |||
| 2402 | 2402 | ||
| 2403 | struct tasklet_struct ext_tasklet; | 2403 | struct tasklet_struct ext_tasklet; |
| 2404 | spinlock_t phy_lock; | 2404 | spinlock_t phy_lock; |
| 2405 | spinlock_t hw_lock; | ||
| 2405 | }; | 2406 | }; |
| 2406 | 2407 | ||
| 2407 | enum { | 2408 | enum { |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index bfeba5b9cd7a..72c1630977d6 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -96,10 +96,6 @@ static int copybreak __read_mostly = 256; | |||
| 96 | module_param(copybreak, int, 0); | 96 | module_param(copybreak, int, 0); |
| 97 | MODULE_PARM_DESC(copybreak, "Receive copy threshold"); | 97 | MODULE_PARM_DESC(copybreak, "Receive copy threshold"); |
| 98 | 98 | ||
| 99 | static int disable_msi = 0; | ||
| 100 | module_param(disable_msi, int, 0); | ||
| 101 | MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)"); | ||
| 102 | |||
| 103 | static const struct pci_device_id sky2_id_table[] = { | 99 | static const struct pci_device_id sky2_id_table[] = { |
| 104 | { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, | 100 | { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, |
| 105 | { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, | 101 | { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, |
| @@ -195,11 +191,11 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) | |||
| 195 | pr_debug("sky2_set_power_state %d\n", state); | 191 | pr_debug("sky2_set_power_state %d\n", state); |
| 196 | sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON); | 192 | sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON); |
| 197 | 193 | ||
| 198 | pci_read_config_word(hw->pdev, hw->pm_cap + PCI_PM_PMC, &power_control); | 194 | power_control = sky2_pci_read16(hw, hw->pm_cap + PCI_PM_PMC); |
| 199 | vaux = (sky2_read16(hw, B0_CTST) & Y2_VAUX_AVAIL) && | 195 | vaux = (sky2_read16(hw, B0_CTST) & Y2_VAUX_AVAIL) && |
| 200 | (power_control & PCI_PM_CAP_PME_D3cold); | 196 | (power_control & PCI_PM_CAP_PME_D3cold); |
| 201 | 197 | ||
| 202 | pci_read_config_word(hw->pdev, hw->pm_cap + PCI_PM_CTRL, &power_control); | 198 | power_control = sky2_pci_read16(hw, hw->pm_cap + PCI_PM_CTRL); |
| 203 | 199 | ||
| 204 | power_control |= PCI_PM_CTRL_PME_STATUS; | 200 | power_control |= PCI_PM_CTRL_PME_STATUS; |
| 205 | power_control &= ~(PCI_PM_CTRL_STATE_MASK); | 201 | power_control &= ~(PCI_PM_CTRL_STATE_MASK); |
| @@ -223,7 +219,7 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) | |||
| 223 | sky2_write8(hw, B2_Y2_CLK_GATE, 0); | 219 | sky2_write8(hw, B2_Y2_CLK_GATE, 0); |
| 224 | 220 | ||
| 225 | /* Turn off phy power saving */ | 221 | /* Turn off phy power saving */ |
| 226 | pci_read_config_dword(hw->pdev, PCI_DEV_REG1, ®1); | 222 | reg1 = sky2_pci_read32(hw, PCI_DEV_REG1); |
| 227 | reg1 &= ~(PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD); | 223 | reg1 &= ~(PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD); |
| 228 | 224 | ||
| 229 | /* looks like this XL is back asswards .. */ | 225 | /* looks like this XL is back asswards .. */ |
| @@ -232,18 +228,28 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) | |||
| 232 | if (hw->ports > 1) | 228 | if (hw->ports > 1) |
| 233 | reg1 |= PCI_Y2_PHY2_COMA; | 229 | reg1 |= PCI_Y2_PHY2_COMA; |
| 234 | } | 230 | } |
| 235 | pci_write_config_dword(hw->pdev, PCI_DEV_REG1, reg1); | 231 | |
| 232 | if (hw->chip_id == CHIP_ID_YUKON_EC_U) { | ||
| 233 | sky2_pci_write32(hw, PCI_DEV_REG3, 0); | ||
| 234 | reg1 = sky2_pci_read32(hw, PCI_DEV_REG4); | ||
| 235 | reg1 &= P_ASPM_CONTROL_MSK; | ||
| 236 | sky2_pci_write32(hw, PCI_DEV_REG4, reg1); | ||
| 237 | sky2_pci_write32(hw, PCI_DEV_REG5, 0); | ||
| 238 | } | ||
| 239 | |||
| 240 | sky2_pci_write32(hw, PCI_DEV_REG1, reg1); | ||
| 241 | |||
| 236 | break; | 242 | break; |
| 237 | 243 | ||
| 238 | case PCI_D3hot: | 244 | case PCI_D3hot: |
| 239 | case PCI_D3cold: | 245 | case PCI_D3cold: |
| 240 | /* Turn on phy power saving */ | 246 | /* Turn on phy power saving */ |
| 241 | pci_read_config_dword(hw->pdev, PCI_DEV_REG1, ®1); | 247 | reg1 = sky2_pci_read32(hw, PCI_DEV_REG1); |
| 242 | if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1) | 248 | if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1) |
| 243 | reg1 &= ~(PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD); | 249 | reg1 &= ~(PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD); |
| 244 | else | 250 | else |
| 245 | reg1 |= (PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD); | 251 | reg1 |= (PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD); |
| 246 | pci_write_config_dword(hw->pdev, PCI_DEV_REG1, reg1); | 252 | sky2_pci_write32(hw, PCI_DEV_REG1, reg1); |
| 247 | 253 | ||
| 248 | if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1) | 254 | if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1) |
| 249 | sky2_write8(hw, B2_Y2_CLK_GATE, 0); | 255 | sky2_write8(hw, B2_Y2_CLK_GATE, 0); |
| @@ -265,7 +271,7 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) | |||
| 265 | ret = -1; | 271 | ret = -1; |
| 266 | } | 272 | } |
| 267 | 273 | ||
| 268 | pci_write_config_byte(hw->pdev, hw->pm_cap + PCI_PM_CTRL, power_control); | 274 | sky2_pci_write16(hw, hw->pm_cap + PCI_PM_CTRL, power_control); |
| 269 | sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF); | 275 | sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF); |
| 270 | return ret; | 276 | return ret; |
| 271 | } | 277 | } |
| @@ -463,16 +469,31 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port) | |||
| 463 | ledover |= PHY_M_LED_MO_RX(MO_LED_OFF); | 469 | ledover |= PHY_M_LED_MO_RX(MO_LED_OFF); |
| 464 | } | 470 | } |
| 465 | 471 | ||
| 466 | gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl); | 472 | if (hw->chip_id == CHIP_ID_YUKON_EC_U && hw->chip_rev >= 2) { |
| 473 | /* apply fixes in PHY AFE */ | ||
| 474 | gm_phy_write(hw, port, 22, 255); | ||
| 475 | /* increase differential signal amplitude in 10BASE-T */ | ||
| 476 | gm_phy_write(hw, port, 24, 0xaa99); | ||
| 477 | gm_phy_write(hw, port, 23, 0x2011); | ||
| 467 | 478 | ||
| 468 | if (sky2->autoneg == AUTONEG_DISABLE || sky2->speed == SPEED_100) { | 479 | /* fix for IEEE A/B Symmetry failure in 1000BASE-T */ |
| 469 | /* turn on 100 Mbps LED (LED_LINK100) */ | 480 | gm_phy_write(hw, port, 24, 0xa204); |
| 470 | ledover |= PHY_M_LED_MO_100(MO_LED_ON); | 481 | gm_phy_write(hw, port, 23, 0x2002); |
| 471 | } | ||
| 472 | 482 | ||
| 473 | if (ledover) | 483 | /* set page register to 0 */ |
| 474 | gm_phy_write(hw, port, PHY_MARV_LED_OVER, ledover); | 484 | gm_phy_write(hw, port, 22, 0); |
| 485 | } else { | ||
| 486 | gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl); | ||
| 487 | |||
| 488 | if (sky2->autoneg == AUTONEG_DISABLE || sky2->speed == SPEED_100) { | ||
| 489 | /* turn on 100 Mbps LED (LED_LINK100) */ | ||
| 490 | ledover |= PHY_M_LED_MO_100(MO_LED_ON); | ||
| 491 | } | ||
| 492 | |||
| 493 | if (ledover) | ||
| 494 | gm_phy_write(hw, port, PHY_MARV_LED_OVER, ledover); | ||
| 475 | 495 | ||
| 496 | } | ||
| 476 | /* Enable phy interrupt on auto-negotiation complete (or link up) */ | 497 | /* Enable phy interrupt on auto-negotiation complete (or link up) */ |
| 477 | if (sky2->autoneg == AUTONEG_ENABLE) | 498 | if (sky2->autoneg == AUTONEG_ENABLE) |
| 478 | gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_IS_AN_COMPL); | 499 | gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_IS_AN_COMPL); |
| @@ -953,6 +974,12 @@ static int sky2_rx_start(struct sky2_port *sky2) | |||
| 953 | 974 | ||
| 954 | sky2->rx_put = sky2->rx_next = 0; | 975 | sky2->rx_put = sky2->rx_next = 0; |
| 955 | sky2_qset(hw, rxq); | 976 | sky2_qset(hw, rxq); |
| 977 | |||
| 978 | if (hw->chip_id == CHIP_ID_YUKON_EC_U && hw->chip_rev >= 2) { | ||
| 979 | /* MAC Rx RAM Read is controlled by hardware */ | ||
| 980 | sky2_write32(hw, Q_ADDR(rxq, Q_F), F_M_RX_RAM_DIS); | ||
| 981 | } | ||
| 982 | |||
| 956 | sky2_prefetch_init(hw, rxq, sky2->rx_le_map, RX_LE_SIZE - 1); | 983 | sky2_prefetch_init(hw, rxq, sky2->rx_le_map, RX_LE_SIZE - 1); |
| 957 | 984 | ||
| 958 | rx_set_checksum(sky2); | 985 | rx_set_checksum(sky2); |
| @@ -1035,9 +1062,10 @@ static int sky2_up(struct net_device *dev) | |||
| 1035 | RB_RST_SET); | 1062 | RB_RST_SET); |
| 1036 | 1063 | ||
| 1037 | sky2_qset(hw, txqaddr[port]); | 1064 | sky2_qset(hw, txqaddr[port]); |
| 1038 | if (hw->chip_id == CHIP_ID_YUKON_EC_U) | ||
| 1039 | sky2_write16(hw, Q_ADDR(txqaddr[port], Q_AL), 0x1a0); | ||
| 1040 | 1065 | ||
| 1066 | /* Set almost empty threshold */ | ||
| 1067 | if (hw->chip_id == CHIP_ID_YUKON_EC_U && hw->chip_rev == 1) | ||
| 1068 | sky2_write16(hw, Q_ADDR(txqaddr[port], Q_AL), 0x1a0); | ||
| 1041 | 1069 | ||
| 1042 | sky2_prefetch_init(hw, txqaddr[port], sky2->tx_le_map, | 1070 | sky2_prefetch_init(hw, txqaddr[port], sky2->tx_le_map, |
| 1043 | TX_RING_SIZE - 1); | 1071 | TX_RING_SIZE - 1); |
| @@ -1047,8 +1075,10 @@ static int sky2_up(struct net_device *dev) | |||
| 1047 | goto err_out; | 1075 | goto err_out; |
| 1048 | 1076 | ||
| 1049 | /* Enable interrupts from phy/mac for port */ | 1077 | /* Enable interrupts from phy/mac for port */ |
| 1078 | spin_lock_irq(&hw->hw_lock); | ||
| 1050 | hw->intr_mask |= (port == 0) ? Y2_IS_PORT_1 : Y2_IS_PORT_2; | 1079 | hw->intr_mask |= (port == 0) ? Y2_IS_PORT_1 : Y2_IS_PORT_2; |
| 1051 | sky2_write32(hw, B0_IMSK, hw->intr_mask); | 1080 | sky2_write32(hw, B0_IMSK, hw->intr_mask); |
| 1081 | spin_unlock_irq(&hw->hw_lock); | ||
| 1052 | return 0; | 1082 | return 0; |
| 1053 | 1083 | ||
| 1054 | err_out: | 1084 | err_out: |
| @@ -1348,10 +1378,10 @@ static int sky2_down(struct net_device *dev) | |||
| 1348 | netif_stop_queue(dev); | 1378 | netif_stop_queue(dev); |
| 1349 | 1379 | ||
| 1350 | /* Disable port IRQ */ | 1380 | /* Disable port IRQ */ |
| 1351 | local_irq_disable(); | 1381 | spin_lock_irq(&hw->hw_lock); |
| 1352 | hw->intr_mask &= ~((sky2->port == 0) ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2); | 1382 | hw->intr_mask &= ~((sky2->port == 0) ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2); |
| 1353 | sky2_write32(hw, B0_IMSK, hw->intr_mask); | 1383 | sky2_write32(hw, B0_IMSK, hw->intr_mask); |
| 1354 | local_irq_enable(); | 1384 | spin_unlock_irq(&hw->hw_lock); |
| 1355 | 1385 | ||
| 1356 | flush_scheduled_work(); | 1386 | flush_scheduled_work(); |
| 1357 | 1387 | ||
| @@ -1633,10 +1663,10 @@ static void sky2_phy_task(void *arg) | |||
| 1633 | out: | 1663 | out: |
| 1634 | up(&sky2->phy_sema); | 1664 | up(&sky2->phy_sema); |
| 1635 | 1665 | ||
| 1636 | local_irq_disable(); | 1666 | spin_lock_irq(&hw->hw_lock); |
| 1637 | hw->intr_mask |= (sky2->port == 0) ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2; | 1667 | hw->intr_mask |= (sky2->port == 0) ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2; |
| 1638 | sky2_write32(hw, B0_IMSK, hw->intr_mask); | 1668 | sky2_write32(hw, B0_IMSK, hw->intr_mask); |
| 1639 | local_irq_enable(); | 1669 | spin_unlock_irq(&hw->hw_lock); |
| 1640 | } | 1670 | } |
| 1641 | 1671 | ||
| 1642 | 1672 | ||
| @@ -1863,6 +1893,17 @@ static int sky2_poll(struct net_device *dev0, int *budget) | |||
| 1863 | 1893 | ||
| 1864 | sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ); | 1894 | sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ); |
| 1865 | 1895 | ||
| 1896 | /* | ||
| 1897 | * Kick the STAT_LEV_TIMER_CTRL timer. | ||
| 1898 | * This fixes my hangs on Yukon-EC (0xb6) rev 1. | ||
| 1899 | * The if clause is there to start the timer only if it has been | ||
| 1900 | * configured correctly and not been disabled via ethtool. | ||
| 1901 | */ | ||
| 1902 | if (sky2_read8(hw, STAT_LEV_TIMER_CTRL) == TIM_START) { | ||
| 1903 | sky2_write8(hw, STAT_LEV_TIMER_CTRL, TIM_STOP); | ||
| 1904 | sky2_write8(hw, STAT_LEV_TIMER_CTRL, TIM_START); | ||
| 1905 | } | ||
| 1906 | |||
| 1866 | hwidx = sky2_read16(hw, STAT_PUT_IDX); | 1907 | hwidx = sky2_read16(hw, STAT_PUT_IDX); |
| 1867 | BUG_ON(hwidx >= STATUS_RING_SIZE); | 1908 | BUG_ON(hwidx >= STATUS_RING_SIZE); |
| 1868 | rmb(); | 1909 | rmb(); |
| @@ -1945,16 +1986,19 @@ exit_loop: | |||
| 1945 | sky2_tx_check(hw, 0, tx_done[0]); | 1986 | sky2_tx_check(hw, 0, tx_done[0]); |
| 1946 | sky2_tx_check(hw, 1, tx_done[1]); | 1987 | sky2_tx_check(hw, 1, tx_done[1]); |
| 1947 | 1988 | ||
| 1989 | if (sky2_read8(hw, STAT_TX_TIMER_CTRL) == TIM_START) { | ||
| 1990 | sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP); | ||
| 1991 | sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START); | ||
| 1992 | } | ||
| 1993 | |||
| 1948 | if (likely(work_done < to_do)) { | 1994 | if (likely(work_done < to_do)) { |
| 1949 | /* need to restart TX timer */ | 1995 | spin_lock_irq(&hw->hw_lock); |
| 1950 | if (is_ec_a1(hw)) { | 1996 | __netif_rx_complete(dev0); |
| 1951 | sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP); | ||
| 1952 | sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START); | ||
| 1953 | } | ||
| 1954 | 1997 | ||
| 1955 | netif_rx_complete(dev0); | ||
| 1956 | hw->intr_mask |= Y2_IS_STAT_BMU; | 1998 | hw->intr_mask |= Y2_IS_STAT_BMU; |
| 1957 | sky2_write32(hw, B0_IMSK, hw->intr_mask); | 1999 | sky2_write32(hw, B0_IMSK, hw->intr_mask); |
| 2000 | spin_unlock_irq(&hw->hw_lock); | ||
| 2001 | |||
| 1958 | return 0; | 2002 | return 0; |
| 1959 | } else { | 2003 | } else { |
| 1960 | *budget -= work_done; | 2004 | *budget -= work_done; |
| @@ -2017,13 +2061,13 @@ static void sky2_hw_intr(struct sky2_hw *hw) | |||
| 2017 | if (status & (Y2_IS_MST_ERR | Y2_IS_IRQ_STAT)) { | 2061 | if (status & (Y2_IS_MST_ERR | Y2_IS_IRQ_STAT)) { |
| 2018 | u16 pci_err; | 2062 | u16 pci_err; |
| 2019 | 2063 | ||
| 2020 | pci_read_config_word(hw->pdev, PCI_STATUS, &pci_err); | 2064 | pci_err = sky2_pci_read16(hw, PCI_STATUS); |
| 2021 | if (net_ratelimit()) | 2065 | if (net_ratelimit()) |
| 2022 | printk(KERN_ERR PFX "%s: pci hw error (0x%x)\n", | 2066 | printk(KERN_ERR PFX "%s: pci hw error (0x%x)\n", |
| 2023 | pci_name(hw->pdev), pci_err); | 2067 | pci_name(hw->pdev), pci_err); |
| 2024 | 2068 | ||
| 2025 | sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON); | 2069 | sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON); |
| 2026 | pci_write_config_word(hw->pdev, PCI_STATUS, | 2070 | sky2_pci_write16(hw, PCI_STATUS, |
| 2027 | pci_err | PCI_STATUS_ERROR_BITS); | 2071 | pci_err | PCI_STATUS_ERROR_BITS); |
| 2028 | sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF); | 2072 | sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF); |
| 2029 | } | 2073 | } |
| @@ -2032,7 +2076,7 @@ static void sky2_hw_intr(struct sky2_hw *hw) | |||
| 2032 | /* PCI-Express uncorrectable Error occurred */ | 2076 | /* PCI-Express uncorrectable Error occurred */ |
| 2033 | u32 pex_err; | 2077 | u32 pex_err; |
| 2034 | 2078 | ||
| 2035 | pci_read_config_dword(hw->pdev, PEX_UNC_ERR_STAT, &pex_err); | 2079 | pex_err = sky2_pci_read32(hw, PEX_UNC_ERR_STAT); |
| 2036 | 2080 | ||
| 2037 | if (net_ratelimit()) | 2081 | if (net_ratelimit()) |
| 2038 | printk(KERN_ERR PFX "%s: pci express error (0x%x)\n", | 2082 | printk(KERN_ERR PFX "%s: pci express error (0x%x)\n", |
| @@ -2040,7 +2084,7 @@ static void sky2_hw_intr(struct sky2_hw *hw) | |||
| 2040 | 2084 | ||
| 2041 | /* clear the interrupt */ | 2085 | /* clear the interrupt */ |
| 2042 | sky2_write32(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON); | 2086 | sky2_write32(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON); |
| 2043 | pci_write_config_dword(hw->pdev, PEX_UNC_ERR_STAT, | 2087 | sky2_pci_write32(hw, PEX_UNC_ERR_STAT, |
| 2044 | 0xffffffffUL); | 2088 | 0xffffffffUL); |
| 2045 | sky2_write32(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF); | 2089 | sky2_write32(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF); |
| 2046 | 2090 | ||
| @@ -2086,6 +2130,7 @@ static void sky2_phy_intr(struct sky2_hw *hw, unsigned port) | |||
| 2086 | 2130 | ||
| 2087 | hw->intr_mask &= ~(port == 0 ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2); | 2131 | hw->intr_mask &= ~(port == 0 ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2); |
| 2088 | sky2_write32(hw, B0_IMSK, hw->intr_mask); | 2132 | sky2_write32(hw, B0_IMSK, hw->intr_mask); |
| 2133 | |||
| 2089 | schedule_work(&sky2->phy_task); | 2134 | schedule_work(&sky2->phy_task); |
| 2090 | } | 2135 | } |
| 2091 | 2136 | ||
| @@ -2099,6 +2144,7 @@ static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs) | |||
| 2099 | if (status == 0 || status == ~0) | 2144 | if (status == 0 || status == ~0) |
| 2100 | return IRQ_NONE; | 2145 | return IRQ_NONE; |
| 2101 | 2146 | ||
| 2147 | spin_lock(&hw->hw_lock); | ||
| 2102 | if (status & Y2_IS_HW_ERR) | 2148 | if (status & Y2_IS_HW_ERR) |
| 2103 | sky2_hw_intr(hw); | 2149 | sky2_hw_intr(hw); |
| 2104 | 2150 | ||
| @@ -2127,7 +2173,7 @@ static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs) | |||
| 2127 | 2173 | ||
| 2128 | sky2_write32(hw, B0_Y2_SP_ICR, 2); | 2174 | sky2_write32(hw, B0_Y2_SP_ICR, 2); |
| 2129 | 2175 | ||
| 2130 | sky2_read32(hw, B0_IMSK); | 2176 | spin_unlock(&hw->hw_lock); |
| 2131 | 2177 | ||
| 2132 | return IRQ_HANDLED; | 2178 | return IRQ_HANDLED; |
| 2133 | } | 2179 | } |
| @@ -2170,7 +2216,7 @@ static int sky2_reset(struct sky2_hw *hw) | |||
| 2170 | { | 2216 | { |
| 2171 | u16 status; | 2217 | u16 status; |
| 2172 | u8 t8, pmd_type; | 2218 | u8 t8, pmd_type; |
| 2173 | int i, err; | 2219 | int i; |
| 2174 | 2220 | ||
| 2175 | sky2_write8(hw, B0_CTST, CS_RST_CLR); | 2221 | sky2_write8(hw, B0_CTST, CS_RST_CLR); |
| 2176 | 2222 | ||
| @@ -2192,25 +2238,18 @@ static int sky2_reset(struct sky2_hw *hw) | |||
| 2192 | sky2_write8(hw, B0_CTST, CS_RST_CLR); | 2238 | sky2_write8(hw, B0_CTST, CS_RST_CLR); |
| 2193 | 2239 | ||
| 2194 | /* clear PCI errors, if any */ | 2240 | /* clear PCI errors, if any */ |
| 2195 | err = pci_read_config_word(hw->pdev, PCI_STATUS, &status); | 2241 | status = sky2_pci_read16(hw, PCI_STATUS); |
| 2196 | if (err) | ||
| 2197 | goto pci_err; | ||
| 2198 | 2242 | ||
| 2199 | sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON); | 2243 | sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON); |
| 2200 | err = pci_write_config_word(hw->pdev, PCI_STATUS, | 2244 | sky2_pci_write16(hw, PCI_STATUS, status | PCI_STATUS_ERROR_BITS); |
| 2201 | status | PCI_STATUS_ERROR_BITS); | 2245 | |
| 2202 | if (err) | ||
| 2203 | goto pci_err; | ||
| 2204 | 2246 | ||
| 2205 | sky2_write8(hw, B0_CTST, CS_MRST_CLR); | 2247 | sky2_write8(hw, B0_CTST, CS_MRST_CLR); |
| 2206 | 2248 | ||
| 2207 | /* clear any PEX errors */ | 2249 | /* clear any PEX errors */ |
| 2208 | if (pci_find_capability(hw->pdev, PCI_CAP_ID_EXP)) { | 2250 | if (pci_find_capability(hw->pdev, PCI_CAP_ID_EXP)) |
| 2209 | err = pci_write_config_dword(hw->pdev, PEX_UNC_ERR_STAT, | 2251 | sky2_pci_write32(hw, PEX_UNC_ERR_STAT, 0xffffffffUL); |
| 2210 | 0xffffffffUL); | 2252 | |
| 2211 | if (err) | ||
| 2212 | goto pci_err; | ||
| 2213 | } | ||
| 2214 | 2253 | ||
| 2215 | pmd_type = sky2_read8(hw, B2_PMD_TYP); | 2254 | pmd_type = sky2_read8(hw, B2_PMD_TYP); |
| 2216 | hw->copper = !(pmd_type == 'L' || pmd_type == 'S'); | 2255 | hw->copper = !(pmd_type == 'L' || pmd_type == 'S'); |
| @@ -2309,8 +2348,7 @@ static int sky2_reset(struct sky2_hw *hw) | |||
| 2309 | sky2_write8(hw, STAT_FIFO_ISR_WM, 16); | 2348 | sky2_write8(hw, STAT_FIFO_ISR_WM, 16); |
| 2310 | 2349 | ||
| 2311 | sky2_write32(hw, STAT_TX_TIMER_INI, sky2_us2clk(hw, 1000)); | 2350 | sky2_write32(hw, STAT_TX_TIMER_INI, sky2_us2clk(hw, 1000)); |
| 2312 | sky2_write32(hw, STAT_LEV_TIMER_INI, sky2_us2clk(hw, 100)); | 2351 | sky2_write32(hw, STAT_ISR_TIMER_INI, sky2_us2clk(hw, 7)); |
| 2313 | sky2_write32(hw, STAT_ISR_TIMER_INI, sky2_us2clk(hw, 20)); | ||
| 2314 | } | 2352 | } |
| 2315 | 2353 | ||
| 2316 | /* enable status unit */ | 2354 | /* enable status unit */ |
| @@ -2321,14 +2359,6 @@ static int sky2_reset(struct sky2_hw *hw) | |||
| 2321 | sky2_write8(hw, STAT_ISR_TIMER_CTRL, TIM_START); | 2359 | sky2_write8(hw, STAT_ISR_TIMER_CTRL, TIM_START); |
| 2322 | 2360 | ||
| 2323 | return 0; | 2361 | return 0; |
| 2324 | |||
| 2325 | pci_err: | ||
| 2326 | /* This is to catch a BIOS bug workaround where | ||
| 2327 | * mmconfig table doesn't have other buses. | ||
| 2328 | */ | ||
| 2329 | printk(KERN_ERR PFX "%s: can't access PCI config space\n", | ||
| 2330 | pci_name(hw->pdev)); | ||
| 2331 | return err; | ||
| 2332 | } | 2362 | } |
| 2333 | 2363 | ||
| 2334 | static u32 sky2_supported_modes(const struct sky2_hw *hw) | 2364 | static u32 sky2_supported_modes(const struct sky2_hw *hw) |
| @@ -2852,11 +2882,11 @@ static int sky2_set_coalesce(struct net_device *dev, | |||
| 2852 | (ecmd->rx_coalesce_usecs_irq < tmin || ecmd->rx_coalesce_usecs_irq > tmax)) | 2882 | (ecmd->rx_coalesce_usecs_irq < tmin || ecmd->rx_coalesce_usecs_irq > tmax)) |
| 2853 | return -EINVAL; | 2883 | return -EINVAL; |
| 2854 | 2884 | ||
| 2855 | if (ecmd->tx_max_coalesced_frames > 0xffff) | 2885 | if (ecmd->tx_max_coalesced_frames >= TX_RING_SIZE-1) |
| 2856 | return -EINVAL; | 2886 | return -EINVAL; |
| 2857 | if (ecmd->rx_max_coalesced_frames > 0xff) | 2887 | if (ecmd->rx_max_coalesced_frames > RX_MAX_PENDING) |
| 2858 | return -EINVAL; | 2888 | return -EINVAL; |
| 2859 | if (ecmd->rx_max_coalesced_frames_irq > 0xff) | 2889 | if (ecmd->rx_max_coalesced_frames_irq >RX_MAX_PENDING) |
| 2860 | return -EINVAL; | 2890 | return -EINVAL; |
| 2861 | 2891 | ||
| 2862 | if (ecmd->tx_coalesce_usecs == 0) | 2892 | if (ecmd->tx_coalesce_usecs == 0) |
| @@ -3092,61 +3122,6 @@ static void __devinit sky2_show_addr(struct net_device *dev) | |||
| 3092 | dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); | 3122 | dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); |
| 3093 | } | 3123 | } |
| 3094 | 3124 | ||
| 3095 | /* Handle software interrupt used during MSI test */ | ||
| 3096 | static irqreturn_t __devinit sky2_test_intr(int irq, void *dev_id, | ||
| 3097 | struct pt_regs *regs) | ||
| 3098 | { | ||
| 3099 | struct sky2_hw *hw = dev_id; | ||
| 3100 | u32 status = sky2_read32(hw, B0_Y2_SP_ISRC2); | ||
| 3101 | |||
| 3102 | if (status == 0) | ||
| 3103 | return IRQ_NONE; | ||
| 3104 | |||
| 3105 | if (status & Y2_IS_IRQ_SW) { | ||
| 3106 | sky2_write8(hw, B0_CTST, CS_CL_SW_IRQ); | ||
| 3107 | hw->msi = 1; | ||
| 3108 | } | ||
| 3109 | sky2_write32(hw, B0_Y2_SP_ICR, 2); | ||
| 3110 | |||
| 3111 | sky2_read32(hw, B0_IMSK); | ||
| 3112 | return IRQ_HANDLED; | ||
| 3113 | } | ||
| 3114 | |||
| 3115 | /* Test interrupt path by forcing a a software IRQ */ | ||
| 3116 | static int __devinit sky2_test_msi(struct sky2_hw *hw) | ||
| 3117 | { | ||
| 3118 | struct pci_dev *pdev = hw->pdev; | ||
| 3119 | int i, err; | ||
| 3120 | |||
| 3121 | sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW); | ||
| 3122 | |||
| 3123 | err = request_irq(pdev->irq, sky2_test_intr, SA_SHIRQ, DRV_NAME, hw); | ||
| 3124 | if (err) { | ||
| 3125 | printk(KERN_ERR PFX "%s: cannot assign irq %d\n", | ||
| 3126 | pci_name(pdev), pdev->irq); | ||
| 3127 | return err; | ||
| 3128 | } | ||
| 3129 | |||
| 3130 | sky2_write8(hw, B0_CTST, CS_ST_SW_IRQ); | ||
| 3131 | wmb(); | ||
| 3132 | |||
| 3133 | for (i = 0; i < 10; i++) { | ||
| 3134 | barrier(); | ||
| 3135 | if (hw->msi) | ||
| 3136 | goto found; | ||
| 3137 | mdelay(1); | ||
| 3138 | } | ||
| 3139 | |||
| 3140 | err = -EOPNOTSUPP; | ||
| 3141 | sky2_write8(hw, B0_CTST, CS_CL_SW_IRQ); | ||
| 3142 | found: | ||
| 3143 | sky2_write32(hw, B0_IMSK, 0); | ||
| 3144 | |||
| 3145 | free_irq(pdev->irq, hw); | ||
| 3146 | |||
| 3147 | return err; | ||
| 3148 | } | ||
| 3149 | |||
| 3150 | static int __devinit sky2_probe(struct pci_dev *pdev, | 3125 | static int __devinit sky2_probe(struct pci_dev *pdev, |
| 3151 | const struct pci_device_id *ent) | 3126 | const struct pci_device_id *ent) |
| 3152 | { | 3127 | { |
| @@ -3198,17 +3173,6 @@ static int __devinit sky2_probe(struct pci_dev *pdev, | |||
| 3198 | } | 3173 | } |
| 3199 | } | 3174 | } |
| 3200 | 3175 | ||
| 3201 | #ifdef __BIG_ENDIAN | ||
| 3202 | /* byte swap descriptors in hardware */ | ||
| 3203 | { | ||
| 3204 | u32 reg; | ||
| 3205 | |||
| 3206 | pci_read_config_dword(pdev, PCI_DEV_REG2, ®); | ||
| 3207 | reg |= PCI_REV_DESC; | ||
| 3208 | pci_write_config_dword(pdev, PCI_DEV_REG2, reg); | ||
| 3209 | } | ||
| 3210 | #endif | ||
| 3211 | |||
| 3212 | err = -ENOMEM; | 3176 | err = -ENOMEM; |
| 3213 | hw = kzalloc(sizeof(*hw), GFP_KERNEL); | 3177 | hw = kzalloc(sizeof(*hw), GFP_KERNEL); |
| 3214 | if (!hw) { | 3178 | if (!hw) { |
| @@ -3226,6 +3190,18 @@ static int __devinit sky2_probe(struct pci_dev *pdev, | |||
| 3226 | goto err_out_free_hw; | 3190 | goto err_out_free_hw; |
| 3227 | } | 3191 | } |
| 3228 | hw->pm_cap = pm_cap; | 3192 | hw->pm_cap = pm_cap; |
| 3193 | spin_lock_init(&hw->hw_lock); | ||
| 3194 | |||
| 3195 | #ifdef __BIG_ENDIAN | ||
| 3196 | /* byte swap descriptors in hardware */ | ||
| 3197 | { | ||
| 3198 | u32 reg; | ||
| 3199 | |||
| 3200 | reg = sky2_pci_read32(hw, PCI_DEV_REG2); | ||
| 3201 | reg |= PCI_REV_DESC; | ||
| 3202 | sky2_pci_write32(hw, PCI_DEV_REG2, reg); | ||
| 3203 | } | ||
| 3204 | #endif | ||
| 3229 | 3205 | ||
| 3230 | /* ring for status responses */ | 3206 | /* ring for status responses */ |
| 3231 | hw->st_le = pci_alloc_consistent(hw->pdev, STATUS_LE_BYTES, | 3207 | hw->st_le = pci_alloc_consistent(hw->pdev, STATUS_LE_BYTES, |
| @@ -3267,20 +3243,6 @@ static int __devinit sky2_probe(struct pci_dev *pdev, | |||
| 3267 | } | 3243 | } |
| 3268 | } | 3244 | } |
| 3269 | 3245 | ||
| 3270 | if (!disable_msi && pci_enable_msi(pdev) == 0) { | ||
| 3271 | err = sky2_test_msi(hw); | ||
| 3272 | if (err == -EOPNOTSUPP) { | ||
| 3273 | /* MSI test failed, go back to INTx mode */ | ||
| 3274 | printk(KERN_WARNING PFX "%s: No interrupt was generated using MSI, " | ||
| 3275 | "switching to INTx mode. Please report this failure to " | ||
| 3276 | "the PCI maintainer and include system chipset information.\n", | ||
| 3277 | pci_name(pdev)); | ||
| 3278 | pci_disable_msi(pdev); | ||
| 3279 | } | ||
| 3280 | else if (err) | ||
| 3281 | goto err_out_unregister; | ||
| 3282 | } | ||
| 3283 | |||
| 3284 | err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ | SA_SAMPLE_RANDOM, | 3246 | err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ | SA_SAMPLE_RANDOM, |
| 3285 | DRV_NAME, hw); | 3247 | DRV_NAME, hw); |
| 3286 | if (err) { | 3248 | if (err) { |
| @@ -3297,8 +3259,6 @@ static int __devinit sky2_probe(struct pci_dev *pdev, | |||
| 3297 | return 0; | 3259 | return 0; |
| 3298 | 3260 | ||
| 3299 | err_out_unregister: | 3261 | err_out_unregister: |
| 3300 | if (hw->msi) | ||
| 3301 | pci_disable_msi(pdev); | ||
| 3302 | if (dev1) { | 3262 | if (dev1) { |
| 3303 | unregister_netdev(dev1); | 3263 | unregister_netdev(dev1); |
| 3304 | free_netdev(dev1); | 3264 | free_netdev(dev1); |
| @@ -3341,8 +3301,6 @@ static void __devexit sky2_remove(struct pci_dev *pdev) | |||
| 3341 | sky2_read8(hw, B0_CTST); | 3301 | sky2_read8(hw, B0_CTST); |
| 3342 | 3302 | ||
| 3343 | free_irq(pdev->irq, hw); | 3303 | free_irq(pdev->irq, hw); |
| 3344 | if (hw->msi) | ||
| 3345 | pci_disable_msi(pdev); | ||
| 3346 | pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma); | 3304 | pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma); |
| 3347 | pci_release_regions(pdev); | 3305 | pci_release_regions(pdev); |
| 3348 | pci_disable_device(pdev); | 3306 | pci_disable_device(pdev); |
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index fd12c289a238..dce955c76f3c 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h | |||
| @@ -5,14 +5,22 @@ | |||
| 5 | #define _SKY2_H | 5 | #define _SKY2_H |
| 6 | 6 | ||
| 7 | /* PCI config registers */ | 7 | /* PCI config registers */ |
| 8 | #define PCI_DEV_REG1 0x40 | 8 | enum { |
| 9 | #define PCI_DEV_REG2 0x44 | 9 | PCI_DEV_REG1 = 0x40, |
| 10 | #define PCI_DEV_STATUS 0x7c | 10 | PCI_DEV_REG2 = 0x44, |
| 11 | #define PCI_OS_PCI_X (1<<26) | 11 | PCI_DEV_STATUS = 0x7c, |
| 12 | PCI_DEV_REG3 = 0x80, | ||
| 13 | PCI_DEV_REG4 = 0x84, | ||
| 14 | PCI_DEV_REG5 = 0x88, | ||
| 15 | }; | ||
| 12 | 16 | ||
| 13 | #define PEX_LNK_STAT 0xf2 | 17 | enum { |
| 14 | #define PEX_UNC_ERR_STAT 0x104 | 18 | PEX_DEV_CAP = 0xe4, |
| 15 | #define PEX_DEV_CTRL 0xe8 | 19 | PEX_DEV_CTRL = 0xe8, |
| 20 | PEX_DEV_STA = 0xea, | ||
| 21 | PEX_LNK_STAT = 0xf2, | ||
| 22 | PEX_UNC_ERR_STAT= 0x104, | ||
| 23 | }; | ||
| 16 | 24 | ||
| 17 | /* Yukon-2 */ | 25 | /* Yukon-2 */ |
| 18 | enum pci_dev_reg_1 { | 26 | enum pci_dev_reg_1 { |
| @@ -37,6 +45,25 @@ enum pci_dev_reg_2 { | |||
| 37 | PCI_USEDATA64 = 1<<0, /* Use 64Bit Data bus ext */ | 45 | PCI_USEDATA64 = 1<<0, /* Use 64Bit Data bus ext */ |
| 38 | }; | 46 | }; |
| 39 | 47 | ||
| 48 | /* PCI_OUR_REG_4 32 bit Our Register 4 (Yukon-ECU only) */ | ||
| 49 | enum pci_dev_reg_4 { | ||
| 50 | /* (Link Training & Status State Machine) */ | ||
| 51 | P_TIMER_VALUE_MSK = 0xffL<<16, /* Bit 23..16: Timer Value Mask */ | ||
| 52 | /* (Active State Power Management) */ | ||
| 53 | P_FORCE_ASPM_REQUEST = 1<<15, /* Force ASPM Request (A1 only) */ | ||
| 54 | P_ASPM_GPHY_LINK_DOWN = 1<<14, /* GPHY Link Down (A1 only) */ | ||
| 55 | P_ASPM_INT_FIFO_EMPTY = 1<<13, /* Internal FIFO Empty (A1 only) */ | ||
| 56 | P_ASPM_CLKRUN_REQUEST = 1<<12, /* CLKRUN Request (A1 only) */ | ||
| 57 | |||
| 58 | P_ASPM_FORCE_CLKREQ_ENA = 1<<4, /* Force CLKREQ Enable (A1b only) */ | ||
| 59 | P_ASPM_CLKREQ_PAD_CTL = 1<<3, /* CLKREQ PAD Control (A1 only) */ | ||
| 60 | P_ASPM_A1_MODE_SELECT = 1<<2, /* A1 Mode Select (A1 only) */ | ||
| 61 | P_CLK_GATE_PEX_UNIT_ENA = 1<<1, /* Enable Gate PEX Unit Clock */ | ||
| 62 | P_CLK_GATE_ROOT_COR_ENA = 1<<0, /* Enable Gate Root Core Clock */ | ||
| 63 | P_ASPM_CONTROL_MSK = P_FORCE_ASPM_REQUEST | P_ASPM_GPHY_LINK_DOWN | ||
| 64 | | P_ASPM_CLKRUN_REQUEST | P_ASPM_INT_FIFO_EMPTY, | ||
| 65 | }; | ||
| 66 | |||
| 40 | 67 | ||
| 41 | #define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \ | 68 | #define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \ |
| 42 | PCI_STATUS_SIG_SYSTEM_ERROR | \ | 69 | PCI_STATUS_SIG_SYSTEM_ERROR | \ |
| @@ -507,6 +534,16 @@ enum { | |||
| 507 | }; | 534 | }; |
| 508 | #define Q_ADDR(reg, offs) (B8_Q_REGS + (reg) + (offs)) | 535 | #define Q_ADDR(reg, offs) (B8_Q_REGS + (reg) + (offs)) |
| 509 | 536 | ||
| 537 | /* Q_F 32 bit Flag Register */ | ||
| 538 | enum { | ||
| 539 | F_ALM_FULL = 1<<27, /* Rx FIFO: almost full */ | ||
| 540 | F_EMPTY = 1<<27, /* Tx FIFO: empty flag */ | ||
| 541 | F_FIFO_EOF = 1<<26, /* Tag (EOF Flag) bit in FIFO */ | ||
| 542 | F_WM_REACHED = 1<<25, /* Watermark reached */ | ||
| 543 | F_M_RX_RAM_DIS = 1<<24, /* MAC Rx RAM Read Port disable */ | ||
| 544 | F_FIFO_LEVEL = 0x1fL<<16, /* Bit 23..16: # of Qwords in FIFO */ | ||
| 545 | F_WATER_MARK = 0x0007ffL, /* Bit 10.. 0: Watermark */ | ||
| 546 | }; | ||
| 510 | 547 | ||
| 511 | /* Queue Prefetch Unit Offsets, use Y2_QADDR() to address (Yukon-2 only)*/ | 548 | /* Queue Prefetch Unit Offsets, use Y2_QADDR() to address (Yukon-2 only)*/ |
| 512 | enum { | 549 | enum { |
| @@ -909,10 +946,12 @@ enum { | |||
| 909 | PHY_BCOM_ID1_C0 = 0x6044, | 946 | PHY_BCOM_ID1_C0 = 0x6044, |
| 910 | PHY_BCOM_ID1_C5 = 0x6047, | 947 | PHY_BCOM_ID1_C5 = 0x6047, |
| 911 | 948 | ||
| 912 | PHY_MARV_ID1_B0 = 0x0C23, /* Yukon (PHY 88E1011) */ | 949 | PHY_MARV_ID1_B0 = 0x0C23, /* Yukon (PHY 88E1011) */ |
| 913 | PHY_MARV_ID1_B2 = 0x0C25, /* Yukon-Plus (PHY 88E1011) */ | 950 | PHY_MARV_ID1_B2 = 0x0C25, /* Yukon-Plus (PHY 88E1011) */ |
| 914 | PHY_MARV_ID1_C2 = 0x0CC2, /* Yukon-EC (PHY 88E1111) */ | 951 | PHY_MARV_ID1_C2 = 0x0CC2, /* Yukon-EC (PHY 88E1111) */ |
| 915 | PHY_MARV_ID1_Y2 = 0x0C91, /* Yukon-2 (PHY 88E1112) */ | 952 | PHY_MARV_ID1_Y2 = 0x0C91, /* Yukon-2 (PHY 88E1112) */ |
| 953 | PHY_MARV_ID1_FE = 0x0C83, /* Yukon-FE (PHY 88E3082 Rev.A1) */ | ||
| 954 | PHY_MARV_ID1_ECU= 0x0CB0, /* Yukon-ECU (PHY 88E1149 Rev.B2?) */ | ||
| 916 | }; | 955 | }; |
| 917 | 956 | ||
| 918 | /* Advertisement register bits */ | 957 | /* Advertisement register bits */ |
| @@ -1837,11 +1876,11 @@ struct sky2_port { | |||
| 1837 | struct sky2_hw { | 1876 | struct sky2_hw { |
| 1838 | void __iomem *regs; | 1877 | void __iomem *regs; |
| 1839 | struct pci_dev *pdev; | 1878 | struct pci_dev *pdev; |
| 1840 | u32 intr_mask; | ||
| 1841 | struct net_device *dev[2]; | 1879 | struct net_device *dev[2]; |
| 1880 | spinlock_t hw_lock; | ||
| 1881 | u32 intr_mask; | ||
| 1842 | 1882 | ||
| 1843 | int pm_cap; | 1883 | int pm_cap; |
| 1844 | int msi; | ||
| 1845 | u8 chip_id; | 1884 | u8 chip_id; |
| 1846 | u8 chip_rev; | 1885 | u8 chip_rev; |
| 1847 | u8 copper; | 1886 | u8 copper; |
| @@ -1912,4 +1951,25 @@ static inline void gma_set_addr(struct sky2_hw *hw, unsigned port, unsigned reg, | |||
| 1912 | gma_write16(hw, port, reg+4,(u16) addr[2] | ((u16) addr[3] << 8)); | 1951 | gma_write16(hw, port, reg+4,(u16) addr[2] | ((u16) addr[3] << 8)); |
| 1913 | gma_write16(hw, port, reg+8,(u16) addr[4] | ((u16) addr[5] << 8)); | 1952 | gma_write16(hw, port, reg+8,(u16) addr[4] | ((u16) addr[5] << 8)); |
| 1914 | } | 1953 | } |
| 1954 | |||
| 1955 | /* PCI config space access */ | ||
| 1956 | static inline u32 sky2_pci_read32(const struct sky2_hw *hw, unsigned reg) | ||
| 1957 | { | ||
| 1958 | return sky2_read32(hw, Y2_CFG_SPC + reg); | ||
| 1959 | } | ||
| 1960 | |||
| 1961 | static inline u16 sky2_pci_read16(const struct sky2_hw *hw, unsigned reg) | ||
| 1962 | { | ||
| 1963 | return sky2_read16(hw, Y2_CFG_SPC + reg); | ||
| 1964 | } | ||
| 1965 | |||
| 1966 | static inline void sky2_pci_write32(struct sky2_hw *hw, unsigned reg, u32 val) | ||
| 1967 | { | ||
| 1968 | sky2_write32(hw, Y2_CFG_SPC + reg, val); | ||
| 1969 | } | ||
| 1970 | |||
| 1971 | static inline void sky2_pci_write16(struct sky2_hw *hw, unsigned reg, u16 val) | ||
| 1972 | { | ||
| 1973 | sky2_write16(hw, Y2_CFG_SPC + reg, val); | ||
| 1974 | } | ||
| 1915 | #endif | 1975 | #endif |
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index e7dc653d5bd6..e8e92c853e89 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -9408,6 +9408,15 @@ static int __devinit tg3_is_sun_570X(struct tg3 *tp) | |||
| 9408 | return 0; | 9408 | return 0; |
| 9409 | if (venid == PCI_VENDOR_ID_SUN) | 9409 | if (venid == PCI_VENDOR_ID_SUN) |
| 9410 | return 1; | 9410 | return 1; |
| 9411 | |||
| 9412 | /* TG3 chips onboard the SunBlade-2500 don't have the | ||
| 9413 | * subsystem-vendor-id set to PCI_VENDOR_ID_SUN but they | ||
| 9414 | * are distinguishable from non-Sun variants by being | ||
| 9415 | * named "network" by the firmware. Non-Sun cards will | ||
| 9416 | * show up as being named "ethernet". | ||
| 9417 | */ | ||
| 9418 | if (!strcmp(pcp->prom_name, "network")) | ||
| 9419 | return 1; | ||
| 9411 | } | 9420 | } |
| 9412 | return 0; | 9421 | return 0; |
| 9413 | } | 9422 | } |
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index c2506b56a186..12076f8f942c 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c | |||
| @@ -536,6 +536,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev, | |||
| 536 | u16 device_id; | 536 | u16 device_id; |
| 537 | int reg, rc = -ENODEV; | 537 | int reg, rc = -ENODEV; |
| 538 | 538 | ||
| 539 | #ifdef CONFIG_PCI | ||
| 539 | if (pdev) { | 540 | if (pdev) { |
| 540 | rc = pci_enable_device(pdev); | 541 | rc = pci_enable_device(pdev); |
| 541 | if (rc) | 542 | if (rc) |
| @@ -547,6 +548,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev, | |||
| 547 | goto err_out; | 548 | goto err_out; |
| 548 | } | 549 | } |
| 549 | } | 550 | } |
| 551 | #endif /* CONFIG_PCI */ | ||
| 550 | 552 | ||
| 551 | dev = alloc_etherdev(sizeof(TLanPrivateInfo)); | 553 | dev = alloc_etherdev(sizeof(TLanPrivateInfo)); |
| 552 | if (dev == NULL) { | 554 | if (dev == NULL) { |
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index c2d5907dc8e0..ed1f837c8fda 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
| @@ -1106,6 +1106,9 @@ static void velocity_free_rd_ring(struct velocity_info *vptr) | |||
| 1106 | 1106 | ||
| 1107 | for (i = 0; i < vptr->options.numrx; i++) { | 1107 | for (i = 0; i < vptr->options.numrx; i++) { |
| 1108 | struct velocity_rd_info *rd_info = &(vptr->rd_info[i]); | 1108 | struct velocity_rd_info *rd_info = &(vptr->rd_info[i]); |
| 1109 | struct rx_desc *rd = vptr->rd_ring + i; | ||
| 1110 | |||
| 1111 | memset(rd, 0, sizeof(*rd)); | ||
| 1109 | 1112 | ||
| 1110 | if (!rd_info->skb) | 1113 | if (!rd_info->skb) |
| 1111 | continue; | 1114 | continue; |
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index 8bc0b528548f..f8f4503475f9 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c | |||
| @@ -877,7 +877,6 @@ static struct pcmcia_device_id hostap_cs_ids[] = { | |||
| 877 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), | 877 | PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), |
| 878 | PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000), | 878 | PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000), |
| 879 | PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002), | 879 | PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002), |
| 880 | PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), | ||
| 881 | PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002), | 880 | PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002), |
| 882 | PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b), | 881 | PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b), |
| 883 | PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612), | 882 | PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612), |
| @@ -891,6 +890,10 @@ static struct pcmcia_device_id hostap_cs_ids[] = { | |||
| 891 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), | 890 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), |
| 892 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), | 891 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), |
| 893 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), | 892 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), |
| 893 | PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "INTERSIL", | ||
| 894 | 0x74c5e40d), | ||
| 895 | PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil", | ||
| 896 | 0x4b801a17), | ||
| 894 | PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", | 897 | PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", |
| 895 | 0x7a954bd9, 0x74be00c6), | 898 | 0x7a954bd9, 0x74be00c6), |
| 896 | PCMCIA_DEVICE_PROD_ID1234( | 899 | PCMCIA_DEVICE_PROD_ID1234( |
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 0a424a4e8187..54ad93daca3c 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
| @@ -352,11 +352,20 @@ static void pcmcia_release_dev(struct device *dev) | |||
| 352 | kfree(p_dev); | 352 | kfree(p_dev); |
| 353 | } | 353 | } |
| 354 | 354 | ||
| 355 | static void pcmcia_add_pseudo_device(struct pcmcia_socket *s) | ||
| 356 | { | ||
| 357 | if (!s->pcmcia_state.device_add_pending) { | ||
| 358 | s->pcmcia_state.device_add_pending = 1; | ||
| 359 | schedule_work(&s->device_add); | ||
| 360 | } | ||
| 361 | return; | ||
| 362 | } | ||
| 355 | 363 | ||
| 356 | static int pcmcia_device_probe(struct device * dev) | 364 | static int pcmcia_device_probe(struct device * dev) |
| 357 | { | 365 | { |
| 358 | struct pcmcia_device *p_dev; | 366 | struct pcmcia_device *p_dev; |
| 359 | struct pcmcia_driver *p_drv; | 367 | struct pcmcia_driver *p_drv; |
| 368 | struct pcmcia_device_id *did; | ||
| 360 | struct pcmcia_socket *s; | 369 | struct pcmcia_socket *s; |
| 361 | int ret = 0; | 370 | int ret = 0; |
| 362 | 371 | ||
| @@ -392,6 +401,19 @@ static int pcmcia_device_probe(struct device * dev) | |||
| 392 | } | 401 | } |
| 393 | 402 | ||
| 394 | ret = p_drv->probe(p_dev); | 403 | ret = p_drv->probe(p_dev); |
| 404 | if (ret) | ||
| 405 | goto put_module; | ||
| 406 | |||
| 407 | /* handle pseudo multifunction devices: | ||
| 408 | * there are at most two pseudo multifunction devices. | ||
| 409 | * if we're matching against the first, schedule a | ||
| 410 | * call which will then check whether there are two | ||
| 411 | * pseudo devices, and if not, add the second one. | ||
| 412 | */ | ||
| 413 | did = (struct pcmcia_device_id *) p_dev->dev.driver_data; | ||
| 414 | if ((did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) && | ||
| 415 | (p_dev->socket->device_count == 1) && (p_dev->device_no == 0)) | ||
| 416 | pcmcia_add_pseudo_device(p_dev->socket); | ||
| 395 | 417 | ||
| 396 | put_module: | 418 | put_module: |
| 397 | if (ret) | 419 | if (ret) |
| @@ -660,15 +682,6 @@ static void pcmcia_delayed_add_pseudo_device(void *data) | |||
| 660 | s->pcmcia_state.device_add_pending = 0; | 682 | s->pcmcia_state.device_add_pending = 0; |
| 661 | } | 683 | } |
| 662 | 684 | ||
| 663 | static inline void pcmcia_add_pseudo_device(struct pcmcia_socket *s) | ||
| 664 | { | ||
| 665 | if (!s->pcmcia_state.device_add_pending) { | ||
| 666 | s->pcmcia_state.device_add_pending = 1; | ||
| 667 | schedule_work(&s->device_add); | ||
| 668 | } | ||
| 669 | return; | ||
| 670 | } | ||
| 671 | |||
| 672 | static int pcmcia_requery(struct device *dev, void * _data) | 685 | static int pcmcia_requery(struct device *dev, void * _data) |
| 673 | { | 686 | { |
| 674 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); | 687 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); |
| @@ -755,15 +768,6 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev, | |||
| 755 | } | 768 | } |
| 756 | 769 | ||
| 757 | if (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) { | 770 | if (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) { |
| 758 | /* handle pseudo multifunction devices: | ||
| 759 | * there are at most two pseudo multifunction devices. | ||
| 760 | * if we're matching against the first, schedule a | ||
| 761 | * call which will then check whether there are two | ||
| 762 | * pseudo devices, and if not, add the second one. | ||
| 763 | */ | ||
| 764 | if (dev->device_no == 0) | ||
| 765 | pcmcia_add_pseudo_device(dev->socket); | ||
| 766 | |||
| 767 | if (dev->device_no != did->device_no) | 771 | if (dev->device_no != did->device_no) |
| 768 | return 0; | 772 | return 0; |
| 769 | } | 773 | } |
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index aaa568a3806e..b68eef251614 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c | |||
| @@ -303,13 +303,11 @@ found: | |||
| 303 | down_write(&dev->dev.bus->subsys.rwsem); | 303 | down_write(&dev->dev.bus->subsys.rwsem); |
| 304 | dev->card_link = clink; | 304 | dev->card_link = clink; |
| 305 | dev->dev.driver = &drv->link.driver; | 305 | dev->dev.driver = &drv->link.driver; |
| 306 | if (drv->link.driver.probe) { | 306 | if (pnp_bus_type.probe(&dev->dev)) { |
| 307 | if (drv->link.driver.probe(&dev->dev)) { | 307 | dev->dev.driver = NULL; |
| 308 | dev->dev.driver = NULL; | 308 | dev->card_link = NULL; |
| 309 | dev->card_link = NULL; | 309 | up_write(&dev->dev.bus->subsys.rwsem); |
| 310 | up_write(&dev->dev.bus->subsys.rwsem); | 310 | return NULL; |
| 311 | return NULL; | ||
| 312 | } | ||
| 313 | } | 311 | } |
| 314 | device_bind_driver(&dev->dev); | 312 | device_bind_driver(&dev->dev); |
| 315 | up_write(&dev->dev.bus->subsys.rwsem); | 313 | up_write(&dev->dev.bus->subsys.rwsem); |
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c index cb2ee25f213f..531a1f9ceb51 100644 --- a/drivers/scsi/aha152x.c +++ b/drivers/scsi/aha152x.c | |||
| @@ -1260,16 +1260,15 @@ static void free_hard_reset_SCs(struct Scsi_Host *shpnt, Scsi_Cmnd **SCs) | |||
| 1260 | * Reset the bus | 1260 | * Reset the bus |
| 1261 | * | 1261 | * |
| 1262 | */ | 1262 | */ |
| 1263 | static int aha152x_bus_reset(Scsi_Cmnd *SCpnt) | 1263 | static int aha152x_bus_reset_host(struct Scsi_Host *shpnt) |
| 1264 | { | 1264 | { |
| 1265 | struct Scsi_Host *shpnt = SCpnt->device->host; | ||
| 1266 | unsigned long flags; | 1265 | unsigned long flags; |
| 1267 | 1266 | ||
| 1268 | DO_LOCK(flags); | 1267 | DO_LOCK(flags); |
| 1269 | 1268 | ||
| 1270 | #if defined(AHA152X_DEBUG) | 1269 | #if defined(AHA152X_DEBUG) |
| 1271 | if(HOSTDATA(shpnt)->debug & debug_eh) { | 1270 | if(HOSTDATA(shpnt)->debug & debug_eh) { |
| 1272 | printk(DEBUG_LEAD "aha152x_bus_reset(%p)", CMDINFO(SCpnt), SCpnt); | 1271 | printk(KERN_DEBUG "scsi%d: bus reset", shpnt->host_no); |
| 1273 | show_queues(shpnt); | 1272 | show_queues(shpnt); |
| 1274 | } | 1273 | } |
| 1275 | #endif | 1274 | #endif |
| @@ -1277,14 +1276,14 @@ static int aha152x_bus_reset(Scsi_Cmnd *SCpnt) | |||
| 1277 | free_hard_reset_SCs(shpnt, &ISSUE_SC); | 1276 | free_hard_reset_SCs(shpnt, &ISSUE_SC); |
| 1278 | free_hard_reset_SCs(shpnt, &DISCONNECTED_SC); | 1277 | free_hard_reset_SCs(shpnt, &DISCONNECTED_SC); |
| 1279 | 1278 | ||
| 1280 | DPRINTK(debug_eh, DEBUG_LEAD "resetting bus\n", CMDINFO(SCpnt)); | 1279 | DPRINTK(debug_eh, KERN_DEBUG "scsi%d: resetting bus\n", shpnt->host_no); |
| 1281 | 1280 | ||
| 1282 | SETPORT(SCSISEQ, SCSIRSTO); | 1281 | SETPORT(SCSISEQ, SCSIRSTO); |
| 1283 | mdelay(256); | 1282 | mdelay(256); |
| 1284 | SETPORT(SCSISEQ, 0); | 1283 | SETPORT(SCSISEQ, 0); |
| 1285 | mdelay(DELAY); | 1284 | mdelay(DELAY); |
| 1286 | 1285 | ||
| 1287 | DPRINTK(debug_eh, DEBUG_LEAD "bus resetted\n", CMDINFO(SCpnt)); | 1286 | DPRINTK(debug_eh, KERN_DEBUG "scsi%d: bus resetted\n", shpnt->host_no); |
| 1288 | 1287 | ||
| 1289 | setup_expected_interrupts(shpnt); | 1288 | setup_expected_interrupts(shpnt); |
| 1290 | if(HOSTDATA(shpnt)->commands==0) | 1289 | if(HOSTDATA(shpnt)->commands==0) |
| @@ -1295,6 +1294,14 @@ static int aha152x_bus_reset(Scsi_Cmnd *SCpnt) | |||
| 1295 | return SUCCESS; | 1294 | return SUCCESS; |
| 1296 | } | 1295 | } |
| 1297 | 1296 | ||
| 1297 | /* | ||
| 1298 | * Reset the bus | ||
| 1299 | * | ||
| 1300 | */ | ||
| 1301 | static int aha152x_bus_reset(Scsi_Cmnd *SCpnt) | ||
| 1302 | { | ||
| 1303 | return aha152x_bus_reset_host(SCpnt->device->host); | ||
| 1304 | } | ||
| 1298 | 1305 | ||
| 1299 | /* | 1306 | /* |
| 1300 | * Restore default values to the AIC-6260 registers and reset the fifos | 1307 | * Restore default values to the AIC-6260 registers and reset the fifos |
| @@ -1337,23 +1344,28 @@ static void reset_ports(struct Scsi_Host *shpnt) | |||
| 1337 | * Reset the host (bus and controller) | 1344 | * Reset the host (bus and controller) |
| 1338 | * | 1345 | * |
| 1339 | */ | 1346 | */ |
| 1340 | int aha152x_host_reset(Scsi_Cmnd * SCpnt) | 1347 | int aha152x_host_reset_host(struct Scsi_Host *shpnt) |
| 1341 | { | 1348 | { |
| 1342 | #if defined(AHA152X_DEBUG) | 1349 | DPRINTK(debug_eh, KERN_DEBUG "scsi%d: host reset\n", shpnt->host_no); |
| 1343 | struct Scsi_Host *shpnt = SCpnt->device->host; | ||
| 1344 | #endif | ||
| 1345 | |||
| 1346 | DPRINTK(debug_eh, DEBUG_LEAD "aha152x_host_reset(%p)\n", CMDINFO(SCpnt), SCpnt); | ||
| 1347 | 1350 | ||
| 1348 | aha152x_bus_reset(SCpnt); | 1351 | aha152x_bus_reset_host(shpnt); |
| 1349 | 1352 | ||
| 1350 | DPRINTK(debug_eh, DEBUG_LEAD "resetting ports\n", CMDINFO(SCpnt)); | 1353 | DPRINTK(debug_eh, KERN_DEBUG "scsi%d: resetting ports\n", shpnt->host_no); |
| 1351 | reset_ports(SCpnt->device->host); | 1354 | reset_ports(shpnt); |
| 1352 | 1355 | ||
| 1353 | return SUCCESS; | 1356 | return SUCCESS; |
| 1354 | } | 1357 | } |
| 1355 | 1358 | ||
| 1356 | /* | 1359 | /* |
| 1360 | * Reset the host (bus and controller) | ||
| 1361 | * | ||
| 1362 | */ | ||
| 1363 | static int aha152x_host_reset(Scsi_Cmnd *SCpnt) | ||
| 1364 | { | ||
| 1365 | return aha152x_host_reset_host(SCpnt->device->host); | ||
| 1366 | } | ||
| 1367 | |||
| 1368 | /* | ||
| 1357 | * Return the "logical geometry" | 1369 | * Return the "logical geometry" |
| 1358 | * | 1370 | * |
| 1359 | */ | 1371 | */ |
| @@ -1431,22 +1443,18 @@ static void run(void) | |||
| 1431 | { | 1443 | { |
| 1432 | int i; | 1444 | int i; |
| 1433 | for (i = 0; i<ARRAY_SIZE(aha152x_host); i++) { | 1445 | for (i = 0; i<ARRAY_SIZE(aha152x_host); i++) { |
| 1434 | struct Scsi_Host *shpnt = aha152x_host[i]; | 1446 | is_complete(aha152x_host[i]); |
| 1435 | if (shpnt && HOSTDATA(shpnt)->service) { | ||
| 1436 | HOSTDATA(shpnt)->service=0; | ||
| 1437 | is_complete(shpnt); | ||
| 1438 | } | ||
| 1439 | } | 1447 | } |
| 1440 | } | 1448 | } |
| 1441 | 1449 | ||
| 1442 | /* | 1450 | /* |
| 1443 | * Interrupts handler | 1451 | * Interrupt handler |
| 1444 | * | 1452 | * |
| 1445 | */ | 1453 | */ |
| 1446 | |||
| 1447 | static irqreturn_t intr(int irqno, void *dev_id, struct pt_regs *regs) | 1454 | static irqreturn_t intr(int irqno, void *dev_id, struct pt_regs *regs) |
| 1448 | { | 1455 | { |
| 1449 | struct Scsi_Host *shpnt = lookup_irq(irqno); | 1456 | struct Scsi_Host *shpnt = lookup_irq(irqno); |
| 1457 | unsigned long flags; | ||
| 1450 | unsigned char rev, dmacntrl0; | 1458 | unsigned char rev, dmacntrl0; |
| 1451 | 1459 | ||
| 1452 | if (!shpnt) { | 1460 | if (!shpnt) { |
| @@ -1472,23 +1480,23 @@ static irqreturn_t intr(int irqno, void *dev_id, struct pt_regs *regs) | |||
| 1472 | if ((rev == 0xFF) && (dmacntrl0 == 0xFF)) | 1480 | if ((rev == 0xFF) && (dmacntrl0 == 0xFF)) |
| 1473 | return IRQ_NONE; | 1481 | return IRQ_NONE; |
| 1474 | 1482 | ||
| 1483 | if( TESTLO(DMASTAT, INTSTAT) ) | ||
| 1484 | return IRQ_NONE; | ||
| 1485 | |||
| 1475 | /* no more interrupts from the controller, while we're busy. | 1486 | /* no more interrupts from the controller, while we're busy. |
| 1476 | INTEN is restored by the BH handler */ | 1487 | INTEN is restored by the BH handler */ |
| 1477 | CLRBITS(DMACNTRL0, INTEN); | 1488 | CLRBITS(DMACNTRL0, INTEN); |
| 1478 | 1489 | ||
| 1479 | #if 0 | 1490 | DO_LOCK(flags); |
| 1480 | /* check if there is already something to be | 1491 | if( HOSTDATA(shpnt)->service==0 ) { |
| 1481 | serviced; should not happen */ | 1492 | HOSTDATA(shpnt)->service=1; |
| 1482 | if(HOSTDATA(shpnt)->service) { | 1493 | |
| 1483 | printk(KERN_ERR "aha152x%d: lost interrupt (%d)\n", HOSTNO, HOSTDATA(shpnt)->service); | 1494 | /* Poke the BH handler */ |
| 1484 | show_queues(shpnt); | 1495 | INIT_WORK(&aha152x_tq, (void *) run, NULL); |
| 1496 | schedule_work(&aha152x_tq); | ||
| 1485 | } | 1497 | } |
| 1486 | #endif | 1498 | DO_UNLOCK(flags); |
| 1487 | 1499 | ||
| 1488 | /* Poke the BH handler */ | ||
| 1489 | HOSTDATA(shpnt)->service++; | ||
| 1490 | INIT_WORK(&aha152x_tq, (void *) run, NULL); | ||
| 1491 | schedule_work(&aha152x_tq); | ||
| 1492 | return IRQ_HANDLED; | 1500 | return IRQ_HANDLED; |
| 1493 | } | 1501 | } |
| 1494 | 1502 | ||
| @@ -2527,7 +2535,18 @@ static void is_complete(struct Scsi_Host *shpnt) | |||
| 2527 | unsigned long flags; | 2535 | unsigned long flags; |
| 2528 | int pending; | 2536 | int pending; |
| 2529 | 2537 | ||
| 2538 | if(!shpnt) | ||
| 2539 | return; | ||
| 2540 | |||
| 2530 | DO_LOCK(flags); | 2541 | DO_LOCK(flags); |
| 2542 | |||
| 2543 | if( HOSTDATA(shpnt)->service==0 ) { | ||
| 2544 | DO_UNLOCK(flags); | ||
| 2545 | return; | ||
| 2546 | } | ||
| 2547 | |||
| 2548 | HOSTDATA(shpnt)->service = 0; | ||
| 2549 | |||
| 2531 | if(HOSTDATA(shpnt)->in_intr) { | 2550 | if(HOSTDATA(shpnt)->in_intr) { |
| 2532 | DO_UNLOCK(flags); | 2551 | DO_UNLOCK(flags); |
| 2533 | /* aha152x_error never returns.. */ | 2552 | /* aha152x_error never returns.. */ |
diff --git a/drivers/scsi/aha152x.h b/drivers/scsi/aha152x.h index d277613af29b..d2add24d02a3 100644 --- a/drivers/scsi/aha152x.h +++ b/drivers/scsi/aha152x.h | |||
| @@ -332,6 +332,6 @@ struct aha152x_setup { | |||
| 332 | 332 | ||
| 333 | struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *); | 333 | struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *); |
| 334 | void aha152x_release(struct Scsi_Host *); | 334 | void aha152x_release(struct Scsi_Host *); |
| 335 | int aha152x_host_reset(Scsi_Cmnd *); | 335 | int aha152x_host_reset_host(struct Scsi_Host *); |
| 336 | 336 | ||
| 337 | #endif /* _AHA152X_H */ | 337 | #endif /* _AHA152X_H */ |
diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c index 23728d1c980c..fcd304e11c26 100644 --- a/drivers/scsi/jazz_esp.c +++ b/drivers/scsi/jazz_esp.c | |||
| @@ -65,27 +65,6 @@ static int jazz_esp_release(struct Scsi_Host *shost) | |||
| 65 | return 0; | 65 | return 0; |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | static struct scsi_host_template driver_template = { | ||
| 69 | .proc_name = "jazz_esp", | ||
| 70 | .proc_info = &esp_proc_info, | ||
| 71 | .name = "ESP 100/100a/200", | ||
| 72 | .detect = jazz_esp_detect, | ||
| 73 | .slave_alloc = esp_slave_alloc, | ||
| 74 | .slave_destroy = esp_slave_destroy, | ||
| 75 | .release = jazz_esp_release, | ||
| 76 | .info = esp_info, | ||
| 77 | .queuecommand = esp_queue, | ||
| 78 | .eh_abort_handler = esp_abort, | ||
| 79 | .eh_bus_reset_handler = esp_reset, | ||
| 80 | .can_queue = 7, | ||
| 81 | .this_id = 7, | ||
| 82 | .sg_tablesize = SG_ALL, | ||
| 83 | .cmd_per_lun = 1, | ||
| 84 | .use_clustering = DISABLE_CLUSTERING, | ||
| 85 | }; | ||
| 86 | |||
| 87 | #include "scsi_module.c" | ||
| 88 | |||
| 89 | /***************************************************************** Detection */ | 68 | /***************************************************************** Detection */ |
| 90 | static int jazz_esp_detect(struct scsi_host_template *tpnt) | 69 | static int jazz_esp_detect(struct scsi_host_template *tpnt) |
| 91 | { | 70 | { |
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 5f1d7580218d..4f91b0dc572b 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c | |||
| @@ -82,6 +82,10 @@ int atapi_enabled = 0; | |||
| 82 | module_param(atapi_enabled, int, 0444); | 82 | module_param(atapi_enabled, int, 0444); |
| 83 | MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)"); | 83 | MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)"); |
| 84 | 84 | ||
| 85 | int libata_fua = 0; | ||
| 86 | module_param_named(fua, libata_fua, int, 0444); | ||
| 87 | MODULE_PARM_DESC(fua, "FUA support (0=off, 1=on)"); | ||
| 88 | |||
| 85 | MODULE_AUTHOR("Jeff Garzik"); | 89 | MODULE_AUTHOR("Jeff Garzik"); |
| 86 | MODULE_DESCRIPTION("Library module for ATA devices"); | 90 | MODULE_DESCRIPTION("Library module for ATA devices"); |
| 87 | MODULE_LICENSE("GPL"); | 91 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 07b1e7cc61df..59503c9ccac9 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c | |||
| @@ -1708,6 +1708,8 @@ static int ata_dev_supports_fua(u16 *id) | |||
| 1708 | { | 1708 | { |
| 1709 | unsigned char model[41], fw[9]; | 1709 | unsigned char model[41], fw[9]; |
| 1710 | 1710 | ||
| 1711 | if (!libata_fua) | ||
| 1712 | return 0; | ||
| 1711 | if (!ata_id_has_fua(id)) | 1713 | if (!ata_id_has_fua(id)) |
| 1712 | return 0; | 1714 | return 0; |
| 1713 | 1715 | ||
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h index e03ce48b7b4b..fddaf479a544 100644 --- a/drivers/scsi/libata.h +++ b/drivers/scsi/libata.h | |||
| @@ -41,6 +41,7 @@ struct ata_scsi_args { | |||
| 41 | 41 | ||
| 42 | /* libata-core.c */ | 42 | /* libata-core.c */ |
| 43 | extern int atapi_enabled; | 43 | extern int atapi_enabled; |
| 44 | extern int libata_fua; | ||
| 44 | extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, | 45 | extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, |
| 45 | struct ata_device *dev); | 46 | struct ata_device *dev); |
| 46 | extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc); | 47 | extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc); |
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index 7de267e14458..4f39dd01936d 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
| @@ -793,6 +793,20 @@ megasas_queue_command(struct scsi_cmnd *scmd, void (*done) (struct scsi_cmnd *)) | |||
| 793 | return 0; | 793 | return 0; |
| 794 | } | 794 | } |
| 795 | 795 | ||
| 796 | static int megasas_slave_configure(struct scsi_device *sdev) | ||
| 797 | { | ||
| 798 | /* | ||
| 799 | * Don't export physical disk devices to the disk driver. | ||
| 800 | * | ||
| 801 | * FIXME: Currently we don't export them to the midlayer at all. | ||
| 802 | * That will be fixed once LSI engineers have audited the | ||
| 803 | * firmware for possible issues. | ||
| 804 | */ | ||
| 805 | if (sdev->channel < MEGASAS_MAX_PD_CHANNELS && sdev->type == TYPE_DISK) | ||
| 806 | return -ENXIO; | ||
| 807 | return 0; | ||
| 808 | } | ||
| 809 | |||
| 796 | /** | 810 | /** |
| 797 | * megasas_wait_for_outstanding - Wait for all outstanding cmds | 811 | * megasas_wait_for_outstanding - Wait for all outstanding cmds |
| 798 | * @instance: Adapter soft state | 812 | * @instance: Adapter soft state |
| @@ -943,6 +957,7 @@ static struct scsi_host_template megasas_template = { | |||
| 943 | .module = THIS_MODULE, | 957 | .module = THIS_MODULE, |
| 944 | .name = "LSI Logic SAS based MegaRAID driver", | 958 | .name = "LSI Logic SAS based MegaRAID driver", |
| 945 | .proc_name = "megaraid_sas", | 959 | .proc_name = "megaraid_sas", |
| 960 | .slave_configure = megasas_slave_configure, | ||
| 946 | .queuecommand = megasas_queue_command, | 961 | .queuecommand = megasas_queue_command, |
| 947 | .eh_device_reset_handler = megasas_reset_device, | 962 | .eh_device_reset_handler = megasas_reset_device, |
| 948 | .eh_bus_reset_handler = megasas_reset_bus_host, | 963 | .eh_bus_reset_handler = megasas_reset_bus_host, |
| @@ -1071,20 +1086,6 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd, | |||
| 1071 | break; | 1086 | break; |
| 1072 | } | 1087 | } |
| 1073 | 1088 | ||
| 1074 | /* | ||
| 1075 | * Don't export physical disk devices to mid-layer. | ||
| 1076 | */ | ||
| 1077 | if (!MEGASAS_IS_LOGICAL(cmd->scmd) && | ||
| 1078 | (hdr->cmd_status == MFI_STAT_OK) && | ||
| 1079 | (cmd->scmd->cmnd[0] == INQUIRY)) { | ||
| 1080 | |||
| 1081 | if (((*(u8 *) cmd->scmd->request_buffer) & 0x1F) == | ||
| 1082 | TYPE_DISK) { | ||
| 1083 | cmd->scmd->result = DID_BAD_TARGET << 16; | ||
| 1084 | exception = 1; | ||
| 1085 | } | ||
| 1086 | } | ||
| 1087 | |||
| 1088 | case MFI_CMD_LD_READ: | 1089 | case MFI_CMD_LD_READ: |
| 1089 | case MFI_CMD_LD_WRITE: | 1090 | case MFI_CMD_LD_WRITE: |
| 1090 | 1091 | ||
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c index 0c9edb7051f4..5609847e254a 100644 --- a/drivers/scsi/pcmcia/aha152x_stub.c +++ b/drivers/scsi/pcmcia/aha152x_stub.c | |||
| @@ -275,10 +275,8 @@ static int aha152x_resume(struct pcmcia_device *dev) | |||
| 275 | 275 | ||
| 276 | link->state &= ~DEV_SUSPEND; | 276 | link->state &= ~DEV_SUSPEND; |
| 277 | if (link->state & DEV_CONFIG) { | 277 | if (link->state & DEV_CONFIG) { |
| 278 | Scsi_Cmnd tmp; | ||
| 279 | pcmcia_request_configuration(link->handle, &link->conf); | 278 | pcmcia_request_configuration(link->handle, &link->conf); |
| 280 | tmp.device->host = info->host; | 279 | aha152x_host_reset_host(info->host); |
| 281 | aha152x_host_reset(&tmp); | ||
| 282 | } | 280 | } |
| 283 | 281 | ||
| 284 | return 0; | 282 | return 0; |
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c index 17f74d3c10e7..9face3c6aa21 100644 --- a/drivers/scsi/sata_sil.c +++ b/drivers/scsi/sata_sil.c | |||
| @@ -49,11 +49,13 @@ | |||
| 49 | #define DRV_VERSION "0.9" | 49 | #define DRV_VERSION "0.9" |
| 50 | 50 | ||
| 51 | enum { | 51 | enum { |
| 52 | SIL_FLAG_RERR_ON_DMA_ACT = (1 << 29), | ||
| 52 | SIL_FLAG_MOD15WRITE = (1 << 30), | 53 | SIL_FLAG_MOD15WRITE = (1 << 30), |
| 53 | 54 | ||
| 54 | sil_3112 = 0, | 55 | sil_3112 = 0, |
| 55 | sil_3112_m15w = 1, | 56 | sil_3112_m15w = 1, |
| 56 | sil_3114 = 2, | 57 | sil_3512 = 2, |
| 58 | sil_3114 = 3, | ||
| 57 | 59 | ||
| 58 | SIL_FIFO_R0 = 0x40, | 60 | SIL_FIFO_R0 = 0x40, |
| 59 | SIL_FIFO_W0 = 0x41, | 61 | SIL_FIFO_W0 = 0x41, |
| @@ -90,7 +92,7 @@ static void sil_post_set_mode (struct ata_port *ap); | |||
| 90 | static const struct pci_device_id sil_pci_tbl[] = { | 92 | static const struct pci_device_id sil_pci_tbl[] = { |
| 91 | { 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w }, | 93 | { 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w }, |
| 92 | { 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w }, | 94 | { 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w }, |
| 93 | { 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 }, | 95 | { 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3512 }, |
| 94 | { 0x1095, 0x3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3114 }, | 96 | { 0x1095, 0x3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3114 }, |
| 95 | { 0x1002, 0x436e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w }, | 97 | { 0x1002, 0x436e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w }, |
| 96 | { 0x1002, 0x4379, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w }, | 98 | { 0x1002, 0x4379, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w }, |
| @@ -185,7 +187,8 @@ static const struct ata_port_info sil_port_info[] = { | |||
| 185 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 187 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
| 186 | .udma_mask = 0x3f, /* udma0-5 */ | 188 | .udma_mask = 0x3f, /* udma0-5 */ |
| 187 | .port_ops = &sil_ops, | 189 | .port_ops = &sil_ops, |
| 188 | }, /* sil_3112_15w - keep it sync'd w/ sil_3112 */ | 190 | }, |
| 191 | /* sil_3112_15w - keep it sync'd w/ sil_3112 */ | ||
| 189 | { | 192 | { |
| 190 | .sht = &sil_sht, | 193 | .sht = &sil_sht, |
| 191 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 194 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
| @@ -195,11 +198,24 @@ static const struct ata_port_info sil_port_info[] = { | |||
| 195 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 198 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
| 196 | .udma_mask = 0x3f, /* udma0-5 */ | 199 | .udma_mask = 0x3f, /* udma0-5 */ |
| 197 | .port_ops = &sil_ops, | 200 | .port_ops = &sil_ops, |
| 198 | }, /* sil_3114 */ | 201 | }, |
| 202 | /* sil_3512 */ | ||
| 199 | { | 203 | { |
| 200 | .sht = &sil_sht, | 204 | .sht = &sil_sht, |
| 201 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 205 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
| 202 | ATA_FLAG_SRST | ATA_FLAG_MMIO, | 206 | ATA_FLAG_SRST | ATA_FLAG_MMIO | |
| 207 | SIL_FLAG_RERR_ON_DMA_ACT, | ||
| 208 | .pio_mask = 0x1f, /* pio0-4 */ | ||
| 209 | .mwdma_mask = 0x07, /* mwdma0-2 */ | ||
| 210 | .udma_mask = 0x3f, /* udma0-5 */ | ||
| 211 | .port_ops = &sil_ops, | ||
| 212 | }, | ||
| 213 | /* sil_3114 */ | ||
| 214 | { | ||
| 215 | .sht = &sil_sht, | ||
| 216 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | ||
| 217 | ATA_FLAG_SRST | ATA_FLAG_MMIO | | ||
| 218 | SIL_FLAG_RERR_ON_DMA_ACT, | ||
| 203 | .pio_mask = 0x1f, /* pio0-4 */ | 219 | .pio_mask = 0x1f, /* pio0-4 */ |
| 204 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 220 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
| 205 | .udma_mask = 0x3f, /* udma0-5 */ | 221 | .udma_mask = 0x3f, /* udma0-5 */ |
| @@ -216,12 +232,13 @@ static const struct { | |||
| 216 | unsigned long scr; /* SATA control register block */ | 232 | unsigned long scr; /* SATA control register block */ |
| 217 | unsigned long sien; /* SATA Interrupt Enable register */ | 233 | unsigned long sien; /* SATA Interrupt Enable register */ |
| 218 | unsigned long xfer_mode;/* data transfer mode register */ | 234 | unsigned long xfer_mode;/* data transfer mode register */ |
| 235 | unsigned long sfis_cfg; /* SATA FIS reception config register */ | ||
| 219 | } sil_port[] = { | 236 | } sil_port[] = { |
| 220 | /* port 0 ... */ | 237 | /* port 0 ... */ |
| 221 | { 0x80, 0x8A, 0x00, 0x100, 0x148, 0xb4 }, | 238 | { 0x80, 0x8A, 0x00, 0x100, 0x148, 0xb4, 0x14c }, |
| 222 | { 0xC0, 0xCA, 0x08, 0x180, 0x1c8, 0xf4 }, | 239 | { 0xC0, 0xCA, 0x08, 0x180, 0x1c8, 0xf4, 0x1cc }, |
| 223 | { 0x280, 0x28A, 0x200, 0x300, 0x348, 0x2b4 }, | 240 | { 0x280, 0x28A, 0x200, 0x300, 0x348, 0x2b4, 0x34c }, |
| 224 | { 0x2C0, 0x2CA, 0x208, 0x380, 0x3c8, 0x2f4 }, | 241 | { 0x2C0, 0x2CA, 0x208, 0x380, 0x3c8, 0x2f4, 0x3cc }, |
| 225 | /* ... port 3 */ | 242 | /* ... port 3 */ |
| 226 | }; | 243 | }; |
| 227 | 244 | ||
| @@ -471,6 +488,23 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 471 | dev_printk(KERN_WARNING, &pdev->dev, | 488 | dev_printk(KERN_WARNING, &pdev->dev, |
| 472 | "cache line size not set. Driver may not function\n"); | 489 | "cache line size not set. Driver may not function\n"); |
| 473 | 490 | ||
| 491 | /* Apply R_ERR on DMA activate FIS errata workaround */ | ||
| 492 | if (probe_ent->host_flags & SIL_FLAG_RERR_ON_DMA_ACT) { | ||
| 493 | int cnt; | ||
| 494 | |||
| 495 | for (i = 0, cnt = 0; i < probe_ent->n_ports; i++) { | ||
| 496 | tmp = readl(mmio_base + sil_port[i].sfis_cfg); | ||
| 497 | if ((tmp & 0x3) != 0x01) | ||
| 498 | continue; | ||
| 499 | if (!cnt) | ||
| 500 | dev_printk(KERN_INFO, &pdev->dev, | ||
| 501 | "Applying R_ERR on DMA activate " | ||
| 502 | "FIS errata fix\n"); | ||
| 503 | writel(tmp & ~0x3, mmio_base + sil_port[i].sfis_cfg); | ||
| 504 | cnt++; | ||
| 505 | } | ||
| 506 | } | ||
| 507 | |||
| 474 | if (ent->driver_data == sil_3114) { | 508 | if (ent->driver_data == sil_3114) { |
| 475 | irq_mask = SIL_MASK_4PORT; | 509 | irq_mask = SIL_MASK_4PORT; |
| 476 | 510 | ||
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 5cc97b721661..ff82ccfbb106 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
| @@ -1308,7 +1308,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd) | |||
| 1308 | * the request was not marked fast fail. Note that above, | 1308 | * the request was not marked fast fail. Note that above, |
| 1309 | * even if the request is marked fast fail, we still requeue | 1309 | * even if the request is marked fast fail, we still requeue |
| 1310 | * for queue congestion conditions (QUEUE_FULL or BUSY) */ | 1310 | * for queue congestion conditions (QUEUE_FULL or BUSY) */ |
| 1311 | if ((++scmd->retries) < scmd->allowed | 1311 | if ((++scmd->retries) <= scmd->allowed |
| 1312 | && !blk_noretry_request(scmd->request)) { | 1312 | && !blk_noretry_request(scmd->request)) { |
| 1313 | return NEEDS_RETRY; | 1313 | return NEEDS_RETRY; |
| 1314 | } else { | 1314 | } else { |
| @@ -1433,7 +1433,7 @@ static void scsi_eh_flush_done_q(struct list_head *done_q) | |||
| 1433 | list_del_init(&scmd->eh_entry); | 1433 | list_del_init(&scmd->eh_entry); |
| 1434 | if (scsi_device_online(scmd->device) && | 1434 | if (scsi_device_online(scmd->device) && |
| 1435 | !blk_noretry_request(scmd->request) && | 1435 | !blk_noretry_request(scmd->request) && |
| 1436 | (++scmd->retries < scmd->allowed)) { | 1436 | (++scmd->retries <= scmd->allowed)) { |
| 1437 | SCSI_LOG_ERROR_RECOVERY(3, printk("%s: flush" | 1437 | SCSI_LOG_ERROR_RECOVERY(3, printk("%s: flush" |
| 1438 | " retry cmd: %p\n", | 1438 | " retry cmd: %p\n", |
| 1439 | current->comm, | 1439 | current->comm, |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 4362dcde74af..701a328f7beb 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
| @@ -1498,7 +1498,7 @@ static void scsi_kill_request(struct request *req, request_queue_t *q) | |||
| 1498 | static void scsi_softirq_done(struct request *rq) | 1498 | static void scsi_softirq_done(struct request *rq) |
| 1499 | { | 1499 | { |
| 1500 | struct scsi_cmnd *cmd = rq->completion_data; | 1500 | struct scsi_cmnd *cmd = rq->completion_data; |
| 1501 | unsigned long wait_for = cmd->allowed * cmd->timeout_per_command; | 1501 | unsigned long wait_for = (cmd->allowed + 1) * cmd->timeout_per_command; |
| 1502 | int disposition; | 1502 | int disposition; |
| 1503 | 1503 | ||
| 1504 | INIT_LIST_HEAD(&cmd->eh_entry); | 1504 | INIT_LIST_HEAD(&cmd->eh_entry); |
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 5acb83ca5ae5..f9ecc3dea7df 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
| @@ -752,8 +752,20 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags) | |||
| 752 | 752 | ||
| 753 | transport_configure_device(&sdev->sdev_gendev); | 753 | transport_configure_device(&sdev->sdev_gendev); |
| 754 | 754 | ||
| 755 | if (sdev->host->hostt->slave_configure) | 755 | if (sdev->host->hostt->slave_configure) { |
| 756 | sdev->host->hostt->slave_configure(sdev); | 756 | int ret = sdev->host->hostt->slave_configure(sdev); |
| 757 | if (ret) { | ||
| 758 | /* | ||
| 759 | * if LLDD reports slave not present, don't clutter | ||
| 760 | * console with alloc failure messages | ||
| 761 | */ | ||
| 762 | if (ret != -ENXIO) { | ||
| 763 | sdev_printk(KERN_ERR, sdev, | ||
| 764 | "failed to configure device\n"); | ||
| 765 | } | ||
| 766 | return SCSI_SCAN_NO_RESPONSE; | ||
| 767 | } | ||
| 768 | } | ||
| 757 | 769 | ||
| 758 | /* | 770 | /* |
| 759 | * Ok, the device is now all set up, we can | 771 | * Ok, the device is now all set up, we can |
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index f2c9acf11bd0..929032e370db 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c | |||
| @@ -1498,8 +1498,7 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel, | |||
| 1498 | } | 1498 | } |
| 1499 | 1499 | ||
| 1500 | /* Search the bindings array */ | 1500 | /* Search the bindings array */ |
| 1501 | if (likely((ids->roles & FC_RPORT_ROLE_FCP_TARGET) && | 1501 | if (fc_host_tgtid_bind_type(shost) != FC_TGTID_BIND_NONE) { |
| 1502 | (fc_host_tgtid_bind_type(shost) != FC_TGTID_BIND_NONE))) { | ||
| 1503 | 1502 | ||
| 1504 | /* search for a matching consistent binding */ | 1503 | /* search for a matching consistent binding */ |
| 1505 | 1504 | ||
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 930db398d107..9d9872347f56 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -89,6 +89,11 @@ | |||
| 89 | #define SD_MAX_RETRIES 5 | 89 | #define SD_MAX_RETRIES 5 |
| 90 | #define SD_PASSTHROUGH_RETRIES 1 | 90 | #define SD_PASSTHROUGH_RETRIES 1 |
| 91 | 91 | ||
| 92 | /* | ||
| 93 | * Size of the initial data buffer for mode and read capacity data | ||
| 94 | */ | ||
| 95 | #define SD_BUF_SIZE 512 | ||
| 96 | |||
| 92 | static void scsi_disk_release(struct kref *kref); | 97 | static void scsi_disk_release(struct kref *kref); |
| 93 | 98 | ||
| 94 | struct scsi_disk { | 99 | struct scsi_disk { |
| @@ -1239,7 +1244,7 @@ sd_do_mode_sense(struct scsi_device *sdp, int dbd, int modepage, | |||
| 1239 | 1244 | ||
| 1240 | /* | 1245 | /* |
| 1241 | * read write protect setting, if possible - called only in sd_revalidate_disk() | 1246 | * read write protect setting, if possible - called only in sd_revalidate_disk() |
| 1242 | * called with buffer of length 512 | 1247 | * called with buffer of length SD_BUF_SIZE |
| 1243 | */ | 1248 | */ |
| 1244 | static void | 1249 | static void |
| 1245 | sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname, | 1250 | sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname, |
| @@ -1297,7 +1302,7 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname, | |||
| 1297 | 1302 | ||
| 1298 | /* | 1303 | /* |
| 1299 | * sd_read_cache_type - called only from sd_revalidate_disk() | 1304 | * sd_read_cache_type - called only from sd_revalidate_disk() |
| 1300 | * called with buffer of length 512 | 1305 | * called with buffer of length SD_BUF_SIZE |
| 1301 | */ | 1306 | */ |
| 1302 | static void | 1307 | static void |
| 1303 | sd_read_cache_type(struct scsi_disk *sdkp, char *diskname, | 1308 | sd_read_cache_type(struct scsi_disk *sdkp, char *diskname, |
| @@ -1342,6 +1347,8 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname, | |||
| 1342 | 1347 | ||
| 1343 | /* Take headers and block descriptors into account */ | 1348 | /* Take headers and block descriptors into account */ |
| 1344 | len += data.header_length + data.block_descriptor_length; | 1349 | len += data.header_length + data.block_descriptor_length; |
| 1350 | if (len > SD_BUF_SIZE) | ||
| 1351 | goto bad_sense; | ||
| 1345 | 1352 | ||
| 1346 | /* Get the data */ | 1353 | /* Get the data */ |
| 1347 | res = sd_do_mode_sense(sdp, dbd, modepage, buffer, len, &data, &sshdr); | 1354 | res = sd_do_mode_sense(sdp, dbd, modepage, buffer, len, &data, &sshdr); |
| @@ -1354,6 +1361,12 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname, | |||
| 1354 | int ct = 0; | 1361 | int ct = 0; |
| 1355 | int offset = data.header_length + data.block_descriptor_length; | 1362 | int offset = data.header_length + data.block_descriptor_length; |
| 1356 | 1363 | ||
| 1364 | if (offset >= SD_BUF_SIZE - 2) { | ||
| 1365 | printk(KERN_ERR "%s: malformed MODE SENSE response", | ||
| 1366 | diskname); | ||
| 1367 | goto defaults; | ||
| 1368 | } | ||
| 1369 | |||
| 1357 | if ((buffer[offset] & 0x3f) != modepage) { | 1370 | if ((buffer[offset] & 0x3f) != modepage) { |
| 1358 | printk(KERN_ERR "%s: got wrong page\n", diskname); | 1371 | printk(KERN_ERR "%s: got wrong page\n", diskname); |
| 1359 | goto defaults; | 1372 | goto defaults; |
| @@ -1398,6 +1411,7 @@ defaults: | |||
| 1398 | diskname); | 1411 | diskname); |
| 1399 | sdkp->WCE = 0; | 1412 | sdkp->WCE = 0; |
| 1400 | sdkp->RCD = 0; | 1413 | sdkp->RCD = 0; |
| 1414 | sdkp->DPOFUA = 0; | ||
| 1401 | } | 1415 | } |
| 1402 | 1416 | ||
| 1403 | /** | 1417 | /** |
| @@ -1421,7 +1435,7 @@ static int sd_revalidate_disk(struct gendisk *disk) | |||
| 1421 | if (!scsi_device_online(sdp)) | 1435 | if (!scsi_device_online(sdp)) |
| 1422 | goto out; | 1436 | goto out; |
| 1423 | 1437 | ||
| 1424 | buffer = kmalloc(512, GFP_KERNEL | __GFP_DMA); | 1438 | buffer = kmalloc(SD_BUF_SIZE, GFP_KERNEL | __GFP_DMA); |
| 1425 | if (!buffer) { | 1439 | if (!buffer) { |
| 1426 | printk(KERN_WARNING "(sd_revalidate_disk:) Memory allocation " | 1440 | printk(KERN_WARNING "(sd_revalidate_disk:) Memory allocation " |
| 1427 | "failure.\n"); | 1441 | "failure.\n"); |
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 2a547538d444..5a0a19322d01 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
| @@ -2162,7 +2162,7 @@ sg_link_reserve(Sg_fd * sfp, Sg_request * srp, int size) | |||
| 2162 | 2162 | ||
| 2163 | srp->res_used = 1; | 2163 | srp->res_used = 1; |
| 2164 | SCSI_LOG_TIMEOUT(4, printk("sg_link_reserve: size=%d\n", size)); | 2164 | SCSI_LOG_TIMEOUT(4, printk("sg_link_reserve: size=%d\n", size)); |
| 2165 | rem = size = (size + 1) & (~1); /* round to even for aha1542 */ | 2165 | rem = size; |
| 2166 | 2166 | ||
| 2167 | for (k = 0; k < rsv_schp->k_use_sg; ++k, ++sg) { | 2167 | for (k = 0; k < rsv_schp->k_use_sg; ++k, ++sg) { |
| 2168 | num = sg->length; | 2168 | num = sg->length; |
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c index f4854c33f48d..2627000ca653 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.c +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c | |||
| @@ -919,6 +919,8 @@ static int sym_prepare_setting(struct Scsi_Host *shost, struct sym_hcb *np, stru | |||
| 919 | 919 | ||
| 920 | tp->usrflags |= (SYM_DISC_ENABLED | SYM_TAGS_ENABLED); | 920 | tp->usrflags |= (SYM_DISC_ENABLED | SYM_TAGS_ENABLED); |
| 921 | tp->usrtags = SYM_SETUP_MAX_TAG; | 921 | tp->usrtags = SYM_SETUP_MAX_TAG; |
| 922 | tp->usr_width = np->maxwide; | ||
| 923 | tp->usr_period = 9; | ||
| 922 | 924 | ||
| 923 | sym_nvram_setup_target(tp, i, nvram); | 925 | sym_nvram_setup_target(tp, i, nvram); |
| 924 | 926 | ||
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 244e8ff11977..7aca22c9976d 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
| @@ -2326,6 +2326,12 @@ static struct uart_driver serial8250_reg = { | |||
| 2326 | .cons = SERIAL8250_CONSOLE, | 2326 | .cons = SERIAL8250_CONSOLE, |
| 2327 | }; | 2327 | }; |
| 2328 | 2328 | ||
| 2329 | /* | ||
| 2330 | * early_serial_setup - early registration for 8250 ports | ||
| 2331 | * | ||
| 2332 | * Setup an 8250 port structure prior to console initialisation. Use | ||
| 2333 | * after console initialisation will cause undefined behaviour. | ||
| 2334 | */ | ||
| 2329 | int __init early_serial_setup(struct uart_port *port) | 2335 | int __init early_serial_setup(struct uart_port *port) |
| 2330 | { | 2336 | { |
| 2331 | if (port->line >= ARRAY_SIZE(serial8250_ports)) | 2337 | if (port->line >= ARRAY_SIZE(serial8250_ports)) |
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 308704566948..4e453fa966ae 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c | |||
| @@ -299,13 +299,10 @@ static void sunsu_start_tx(struct uart_port *port) | |||
| 299 | static void sunsu_stop_rx(struct uart_port *port) | 299 | static void sunsu_stop_rx(struct uart_port *port) |
| 300 | { | 300 | { |
| 301 | struct uart_sunsu_port *up = (struct uart_sunsu_port *) port; | 301 | struct uart_sunsu_port *up = (struct uart_sunsu_port *) port; |
| 302 | unsigned long flags; | ||
| 303 | 302 | ||
| 304 | spin_lock_irqsave(&up->port.lock, flags); | ||
| 305 | up->ier &= ~UART_IER_RLSI; | 303 | up->ier &= ~UART_IER_RLSI; |
| 306 | up->port.read_status_mask &= ~UART_LSR_DR; | 304 | up->port.read_status_mask &= ~UART_LSR_DR; |
| 307 | serial_out(up, UART_IER, up->ier); | 305 | serial_out(up, UART_IER, up->ier); |
| 308 | spin_unlock_irqrestore(&up->port.lock, flags); | ||
| 309 | } | 306 | } |
| 310 | 307 | ||
| 311 | static void sunsu_enable_ms(struct uart_port *port) | 308 | static void sunsu_enable_ms(struct uart_port *port) |
diff --git a/drivers/sn/Kconfig b/drivers/sn/Kconfig index d95265b187a3..a34731625877 100644 --- a/drivers/sn/Kconfig +++ b/drivers/sn/Kconfig | |||
| @@ -3,10 +3,11 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | menu "SN Devices" | 5 | menu "SN Devices" |
| 6 | depends on SGI_SN | ||
| 6 | 7 | ||
| 7 | config SGI_IOC4 | 8 | config SGI_IOC4 |
| 8 | tristate "SGI IOC4 Base IO support" | 9 | tristate "SGI IOC4 Base IO support" |
| 9 | depends on (IA64_GENERIC || IA64_SGI_SN2) && MMTIMER | 10 | depends on MMTIMER |
| 10 | default m | 11 | default m |
| 11 | ---help--- | 12 | ---help--- |
| 12 | This option enables basic support for the SGI IOC4-based Base IO | 13 | This option enables basic support for the SGI IOC4-based Base IO |
| @@ -19,7 +20,6 @@ config SGI_IOC4 | |||
| 19 | 20 | ||
| 20 | config SGI_IOC3 | 21 | config SGI_IOC3 |
| 21 | tristate "SGI IOC3 Base IO support" | 22 | tristate "SGI IOC3 Base IO support" |
| 22 | depends on (IA64_GENERIC || IA64_SGI_SN2) | ||
| 23 | default m | 23 | default m |
| 24 | ---help--- | 24 | ---help--- |
| 25 | This option enables basic support for the SGI IOC3-based Base IO | 25 | This option enables basic support for the SGI IOC3-based Base IO |
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c index 12357e1fa558..93449a1a0065 100644 --- a/drivers/sn/ioc3.c +++ b/drivers/sn/ioc3.c | |||
| @@ -62,7 +62,7 @@ static int nic_reset(struct ioc3_driver_data *idd) | |||
| 62 | return presence; | 62 | return presence; |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | static inline int nic_read_bit(struct ioc3_driver_data *idd) | 65 | static int nic_read_bit(struct ioc3_driver_data *idd) |
| 66 | { | 66 | { |
| 67 | int result; | 67 | int result; |
| 68 | unsigned long flags; | 68 | unsigned long flags; |
| @@ -77,7 +77,7 @@ static inline int nic_read_bit(struct ioc3_driver_data *idd) | |||
| 77 | return result; | 77 | return result; |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | static inline void nic_write_bit(struct ioc3_driver_data *idd, int bit) | 80 | static void nic_write_bit(struct ioc3_driver_data *idd, int bit) |
| 81 | { | 81 | { |
| 82 | if (bit) | 82 | if (bit) |
| 83 | writel(mcr_pack(6, 110), &idd->vma->mcr); | 83 | writel(mcr_pack(6, 110), &idd->vma->mcr); |
| @@ -371,8 +371,7 @@ static void probe_nic(struct ioc3_driver_data *idd) | |||
| 371 | 371 | ||
| 372 | /* Interrupts */ | 372 | /* Interrupts */ |
| 373 | 373 | ||
| 374 | static inline void | 374 | static void write_ireg(struct ioc3_driver_data *idd, uint32_t val, int which) |
| 375 | write_ireg(struct ioc3_driver_data *idd, uint32_t val, int which) | ||
| 376 | { | 375 | { |
| 377 | unsigned long flags; | 376 | unsigned long flags; |
| 378 | 377 | ||
| @@ -735,14 +734,12 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
| 735 | } | 734 | } |
| 736 | 735 | ||
| 737 | /* Add this IOC3 to all submodules */ | 736 | /* Add this IOC3 to all submodules */ |
| 738 | read_lock(&ioc3_submodules_lock); | ||
| 739 | for(id=0;id<IOC3_MAX_SUBMODULES;id++) | 737 | for(id=0;id<IOC3_MAX_SUBMODULES;id++) |
| 740 | if(ioc3_submodules[id] && ioc3_submodules[id]->probe) { | 738 | if(ioc3_submodules[id] && ioc3_submodules[id]->probe) { |
| 741 | idd->active[id] = 1; | 739 | idd->active[id] = 1; |
| 742 | idd->active[id] = !ioc3_submodules[id]->probe | 740 | idd->active[id] = !ioc3_submodules[id]->probe |
| 743 | (ioc3_submodules[id], idd); | 741 | (ioc3_submodules[id], idd); |
| 744 | } | 742 | } |
| 745 | read_unlock(&ioc3_submodules_lock); | ||
| 746 | 743 | ||
| 747 | printk(KERN_INFO "IOC3 Master Driver loaded for %s\n", pci_name(pdev)); | 744 | printk(KERN_INFO "IOC3 Master Driver loaded for %s\n", pci_name(pdev)); |
| 748 | 745 | ||
| @@ -767,7 +764,6 @@ static void ioc3_remove(struct pci_dev *pdev) | |||
| 767 | idd = pci_get_drvdata(pdev); | 764 | idd = pci_get_drvdata(pdev); |
| 768 | 765 | ||
| 769 | /* Remove this IOC3 from all submodules */ | 766 | /* Remove this IOC3 from all submodules */ |
| 770 | read_lock(&ioc3_submodules_lock); | ||
| 771 | for(id=0;id<IOC3_MAX_SUBMODULES;id++) | 767 | for(id=0;id<IOC3_MAX_SUBMODULES;id++) |
| 772 | if(idd->active[id]) { | 768 | if(idd->active[id]) { |
| 773 | if(ioc3_submodules[id] && ioc3_submodules[id]->remove) | 769 | if(ioc3_submodules[id] && ioc3_submodules[id]->remove) |
| @@ -781,7 +777,6 @@ static void ioc3_remove(struct pci_dev *pdev) | |||
| 781 | pci_name(pdev)); | 777 | pci_name(pdev)); |
| 782 | idd->active[id] = 0; | 778 | idd->active[id] = 0; |
| 783 | } | 779 | } |
| 784 | read_unlock(&ioc3_submodules_lock); | ||
| 785 | 780 | ||
| 786 | /* Clear and disable all IRQs */ | 781 | /* Clear and disable all IRQs */ |
| 787 | write_ireg(idd, ~0, IOC3_W_IEC); | 782 | write_ireg(idd, ~0, IOC3_W_IEC); |
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c index e02fea5a5433..1a362c5e7f3d 100644 --- a/drivers/usb/gadget/lh7a40x_udc.c +++ b/drivers/usb/gadget/lh7a40x_udc.c | |||
| @@ -1062,11 +1062,11 @@ static int lh7a40x_ep_enable(struct usb_ep *_ep, | |||
| 1062 | ep->pio_irqs = 0; | 1062 | ep->pio_irqs = 0; |
| 1063 | ep->ep.maxpacket = le16_to_cpu(desc->wMaxPacketSize); | 1063 | ep->ep.maxpacket = le16_to_cpu(desc->wMaxPacketSize); |
| 1064 | 1064 | ||
| 1065 | spin_unlock_irqrestore(&ep->dev->lock, flags); | ||
| 1066 | |||
| 1065 | /* Reset halt state (does flush) */ | 1067 | /* Reset halt state (does flush) */ |
| 1066 | lh7a40x_set_halt(_ep, 0); | 1068 | lh7a40x_set_halt(_ep, 0); |
| 1067 | 1069 | ||
| 1068 | spin_unlock_irqrestore(&ep->dev->lock, flags); | ||
| 1069 | |||
| 1070 | DEBUG("%s: enabled %s\n", __FUNCTION__, _ep->name); | 1070 | DEBUG("%s: enabled %s\n", __FUNCTION__, _ep->name); |
| 1071 | return 0; | 1071 | return 0; |
| 1072 | } | 1072 | } |
| @@ -1775,6 +1775,7 @@ static void lh7a40x_ep0_setup(struct lh7a40x_udc *dev, u32 csr) | |||
| 1775 | break; | 1775 | break; |
| 1776 | 1776 | ||
| 1777 | qep = &dev->ep[ep_num]; | 1777 | qep = &dev->ep[ep_num]; |
| 1778 | spin_unlock(&dev->lock); | ||
| 1778 | if (ctrl.bRequest == USB_REQ_SET_FEATURE) { | 1779 | if (ctrl.bRequest == USB_REQ_SET_FEATURE) { |
| 1779 | DEBUG_SETUP("SET_FEATURE (%d)\n", | 1780 | DEBUG_SETUP("SET_FEATURE (%d)\n", |
| 1780 | ep_num); | 1781 | ep_num); |
| @@ -1784,6 +1785,7 @@ static void lh7a40x_ep0_setup(struct lh7a40x_udc *dev, u32 csr) | |||
| 1784 | ep_num); | 1785 | ep_num); |
| 1785 | lh7a40x_set_halt(&qep->ep, 0); | 1786 | lh7a40x_set_halt(&qep->ep, 0); |
| 1786 | } | 1787 | } |
| 1788 | spin_lock(&dev->lock); | ||
| 1787 | usb_set_index(0); | 1789 | usb_set_index(0); |
| 1788 | 1790 | ||
| 1789 | /* Reply with a ZLP on next IN token */ | 1791 | /* Reply with a ZLP on next IN token */ |
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c index 9689efeb364c..6d6eaad73968 100644 --- a/drivers/usb/gadget/rndis.c +++ b/drivers/usb/gadget/rndis.c | |||
| @@ -853,11 +853,14 @@ static int rndis_query_response (int configNr, rndis_query_msg_type *buf) | |||
| 853 | // DEBUG("%s: OID = %08X\n", __FUNCTION__, cpu_to_le32(buf->OID)); | 853 | // DEBUG("%s: OID = %08X\n", __FUNCTION__, cpu_to_le32(buf->OID)); |
| 854 | if (!rndis_per_dev_params [configNr].dev) return -ENOTSUPP; | 854 | if (!rndis_per_dev_params [configNr].dev) return -ENOTSUPP; |
| 855 | 855 | ||
| 856 | /* | 856 | /* |
| 857 | * we need more memory: | 857 | * we need more memory: |
| 858 | * oid_supported_list is the largest answer | 858 | * gen_ndis_query_resp expects enough space for |
| 859 | * rndis_query_cmplt_type followed by data. | ||
| 860 | * oid_supported_list is the largest data reply | ||
| 859 | */ | 861 | */ |
| 860 | r = rndis_add_response (configNr, sizeof (oid_supported_list)); | 862 | r = rndis_add_response (configNr, |
| 863 | sizeof (oid_supported_list) + sizeof(rndis_query_cmplt_type)); | ||
| 861 | if (!r) | 864 | if (!r) |
| 862 | return -ENOMEM; | 865 | return -ENOMEM; |
| 863 | resp = (rndis_query_cmplt_type *) r->buf; | 866 | resp = (rndis_query_cmplt_type *) r->buf; |
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c index 118288d94423..9e81c26313f9 100644 --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c | |||
| @@ -260,12 +260,13 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) | |||
| 260 | offset + EHCI_USBLEGCTLSTS, | 260 | offset + EHCI_USBLEGCTLSTS, |
| 261 | val | EHCI_USBLEGCTLSTS_SOOE); | 261 | val | EHCI_USBLEGCTLSTS_SOOE); |
| 262 | #endif | 262 | #endif |
| 263 | } | ||
| 264 | 263 | ||
| 265 | /* always say Linux will own the hardware | 264 | /* some systems get upset if this semaphore is |
| 266 | * by setting EHCI_USBLEGSUP_OS. | 265 | * set for any other reason than forcing a BIOS |
| 267 | */ | 266 | * handoff.. |
| 268 | pci_write_config_byte(pdev, offset + 3, 1); | 267 | */ |
| 268 | pci_write_config_byte(pdev, offset + 3, 1); | ||
| 269 | } | ||
| 269 | 270 | ||
| 270 | /* if boot firmware now owns EHCI, spin till | 271 | /* if boot firmware now owns EHCI, spin till |
| 271 | * it hands it over. | 272 | * it hands it over. |
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index 772478086bd3..07a012f88772 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
| @@ -1407,6 +1407,7 @@ void hid_init_reports(struct hid_device *hid) | |||
| 1407 | #define USB_VENDOR_ID_WISEGROUP 0x0925 | 1407 | #define USB_VENDOR_ID_WISEGROUP 0x0925 |
| 1408 | #define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101 | 1408 | #define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101 |
| 1409 | #define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104 | 1409 | #define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104 |
| 1410 | #define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866 | ||
| 1410 | 1411 | ||
| 1411 | #define USB_VENDOR_ID_CODEMERCS 0x07c0 | 1412 | #define USB_VENDOR_ID_CODEMERCS 0x07c0 |
| 1412 | #define USB_DEVICE_ID_CODEMERCS_IOW40 0x1500 | 1413 | #define USB_DEVICE_ID_CODEMERCS_IOW40 0x1500 |
| @@ -1577,6 +1578,7 @@ static const struct hid_blacklist { | |||
| 1577 | { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET}, | 1578 | { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET}, |
| 1578 | { USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET }, | 1579 | { USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET }, |
| 1579 | { USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET }, | 1580 | { USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET }, |
| 1581 | { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, | ||
| 1580 | 1582 | ||
| 1581 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_POWERMOUSE, HID_QUIRK_2WHEEL_POWERMOUSE }, | 1583 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_POWERMOUSE, HID_QUIRK_2WHEEL_POWERMOUSE }, |
| 1582 | { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 }, | 1584 | { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 }, |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index f2b4ca8692d8..c145e1ed8429 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -469,8 +469,14 @@ static struct usb_device_id id_table_combined [] = { | |||
| 469 | { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) }, | 469 | { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) }, |
| 470 | { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) }, | 470 | { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) }, |
| 471 | { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) }, | 471 | { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) }, |
| 472 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_KW_PID) }, | ||
| 473 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_YS_PID) }, | ||
| 472 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y6_PID) }, | 474 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y6_PID) }, |
| 473 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y8_PID) }, | 475 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y8_PID) }, |
| 476 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_IC_PID) }, | ||
| 477 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_DB9_PID) }, | ||
| 478 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_RS232_PID) }, | ||
| 479 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y9_PID) }, | ||
| 474 | { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_VCP_PID) }, | 480 | { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_VCP_PID) }, |
| 475 | { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_D2XX_PID) }, | 481 | { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_D2XX_PID) }, |
| 476 | { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) }, | 482 | { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) }, |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index ca40f16370f1..bdef3b8c731f 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
| @@ -333,10 +333,18 @@ | |||
| 333 | 333 | ||
| 334 | /* | 334 | /* |
| 335 | * microHAM product IDs (http://www.microham.com). | 335 | * microHAM product IDs (http://www.microham.com). |
| 336 | * Submitted by Justin Burket (KL1RL) <zorton@jtan.com>. | 336 | * Submitted by Justin Burket (KL1RL) <zorton@jtan.com> |
| 337 | * and Mike Studer (K6EEP) <k6eep@hamsoftware.org>. | ||
| 338 | * Ian Abbott <abbotti@mev.co.uk> added a few more from the driver INF file. | ||
| 337 | */ | 339 | */ |
| 340 | #define FTDI_MHAM_KW_PID 0xEEE8 /* USB-KW interface */ | ||
| 341 | #define FTDI_MHAM_YS_PID 0xEEE9 /* USB-YS interface */ | ||
| 338 | #define FTDI_MHAM_Y6_PID 0xEEEA /* USB-Y6 interface */ | 342 | #define FTDI_MHAM_Y6_PID 0xEEEA /* USB-Y6 interface */ |
| 339 | #define FTDI_MHAM_Y8_PID 0xEEEB /* USB-Y8 interface */ | 343 | #define FTDI_MHAM_Y8_PID 0xEEEB /* USB-Y8 interface */ |
| 344 | #define FTDI_MHAM_IC_PID 0xEEEC /* USB-IC interface */ | ||
| 345 | #define FTDI_MHAM_DB9_PID 0xEEED /* USB-DB9 interface */ | ||
| 346 | #define FTDI_MHAM_RS232_PID 0xEEEE /* USB-RS232 interface */ | ||
| 347 | #define FTDI_MHAM_Y9_PID 0xEEEF /* USB-Y9 interface */ | ||
| 340 | 348 | ||
| 341 | /* | 349 | /* |
| 342 | * Active Robots product ids. | 350 | * Active Robots product ids. |
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c index bce3d55affd8..11a48d874752 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c | |||
| @@ -69,6 +69,8 @@ static struct usb_device_id id_table [] = { | |||
| 69 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, | 69 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, |
| 70 | { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO600_ID), | 70 | { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO600_ID), |
| 71 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, | 71 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, |
| 72 | { USB_DEVICE(GSPDA_VENDOR_ID, GSPDA_XPLORE_M68_ID), | ||
| 73 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, | ||
| 72 | { USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID), | 74 | { USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID), |
| 73 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, | 75 | .driver_info = (kernel_ulong_t)&palm_os_4_probe }, |
| 74 | { USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID), | 76 | { USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID), |
| @@ -139,6 +141,7 @@ static struct usb_device_id id_table_combined [] = { | |||
| 139 | { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_VISOR_ID) }, | 141 | { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_VISOR_ID) }, |
| 140 | { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO_ID) }, | 142 | { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO_ID) }, |
| 141 | { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO600_ID) }, | 143 | { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO600_ID) }, |
| 144 | { USB_DEVICE(GSPDA_VENDOR_ID, GSPDA_XPLORE_M68_ID) }, | ||
| 142 | { USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID) }, | 145 | { USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID) }, |
| 143 | { USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID) }, | 146 | { USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID) }, |
| 144 | { USB_DEVICE(PALM_VENDOR_ID, PALM_M515_ID) }, | 147 | { USB_DEVICE(PALM_VENDOR_ID, PALM_M515_ID) }, |
diff --git a/drivers/usb/serial/visor.h b/drivers/usb/serial/visor.h index b84d1cb4c693..765118d83fb6 100644 --- a/drivers/usb/serial/visor.h +++ b/drivers/usb/serial/visor.h | |||
| @@ -36,6 +36,9 @@ | |||
| 36 | #define PALM_ZIRE_ID 0x0070 | 36 | #define PALM_ZIRE_ID 0x0070 |
| 37 | #define PALM_M100_ID 0x0080 | 37 | #define PALM_M100_ID 0x0080 |
| 38 | 38 | ||
| 39 | #define GSPDA_VENDOR_ID 0x115e | ||
| 40 | #define GSPDA_XPLORE_M68_ID 0xf100 | ||
| 41 | |||
| 39 | #define SONY_VENDOR_ID 0x054C | 42 | #define SONY_VENDOR_ID 0x054C |
| 40 | #define SONY_CLIE_3_5_ID 0x0038 | 43 | #define SONY_CLIE_3_5_ID 0x0038 |
| 41 | #define SONY_CLIE_4_0_ID 0x0066 | 44 | #define SONY_CLIE_4_0_ID 0x0066 |
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index e71c5ca1a07b..31ca92056c27 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -753,6 +753,13 @@ UNUSUAL_DEV( 0x0693, 0x0005, 0x0100, 0x0100, | |||
| 753 | "Flashgate", | 753 | "Flashgate", |
| 754 | US_SC_SCSI, US_PR_BULK, NULL, 0 ), | 754 | US_SC_SCSI, US_PR_BULK, NULL, 0 ), |
| 755 | 755 | ||
| 756 | /* Reported by David Hamilton <niftimusmaximus@lycos.com> */ | ||
| 757 | UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x0001, | ||
| 758 | "Thomson Multimedia Inc.", | ||
| 759 | "RCA RD1080 MP3 Player", | ||
| 760 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 761 | US_FL_FIX_CAPACITY ), | ||
| 762 | |||
| 756 | UNUSUAL_DEV( 0x0781, 0x0001, 0x0200, 0x0200, | 763 | UNUSUAL_DEV( 0x0781, 0x0001, 0x0200, 0x0200, |
| 757 | "Sandisk", | 764 | "Sandisk", |
| 758 | "ImageMate SDDR-05a", | 765 | "ImageMate SDDR-05a", |
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index e64ed16bd42f..f5079c78ba4e 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -520,7 +520,7 @@ config FB_GBE | |||
| 520 | config FB_GBE_MEM | 520 | config FB_GBE_MEM |
| 521 | int "Video memory size in MB" | 521 | int "Video memory size in MB" |
| 522 | depends on FB_GBE | 522 | depends on FB_GBE |
| 523 | default 8 | 523 | default 4 |
| 524 | help | 524 | help |
| 525 | This is the amount of memory reserved for the framebuffer, | 525 | This is the amount of memory reserved for the framebuffer, |
| 526 | which can be any value between 1MB and 8MB. | 526 | which can be any value between 1MB and 8MB. |
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c index 69f75547865d..c924d81f7978 100644 --- a/drivers/video/asiliantfb.c +++ b/drivers/video/asiliantfb.c | |||
| @@ -322,32 +322,29 @@ static int asiliantfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, | |||
| 322 | writeb(green, mmio_base + 0x791); | 322 | writeb(green, mmio_base + 0x791); |
| 323 | writeb(blue, mmio_base + 0x791); | 323 | writeb(blue, mmio_base + 0x791); |
| 324 | 324 | ||
| 325 | switch(p->var.bits_per_pixel) { | 325 | if (regno < 16) { |
| 326 | case 15: | 326 | switch(p->var.red.offset) { |
| 327 | if (regno < 16) { | 327 | case 10: /* RGB 555 */ |
| 328 | ((u32 *)(p->pseudo_palette))[regno] = | 328 | ((u32 *)(p->pseudo_palette))[regno] = |
| 329 | ((red & 0xf8) << 7) | | 329 | ((red & 0xf8) << 7) | |
| 330 | ((green & 0xf8) << 2) | | 330 | ((green & 0xf8) << 2) | |
| 331 | ((blue & 0xf8) >> 3); | 331 | ((blue & 0xf8) >> 3); |
| 332 | } | 332 | break; |
| 333 | break; | 333 | case 11: /* RGB 565 */ |
| 334 | case 16: | ||
| 335 | if (regno < 16) { | ||
| 336 | ((u32 *)(p->pseudo_palette))[regno] = | 334 | ((u32 *)(p->pseudo_palette))[regno] = |
| 337 | ((red & 0xf8) << 8) | | 335 | ((red & 0xf8) << 8) | |
| 338 | ((green & 0xfc) << 3) | | 336 | ((green & 0xfc) << 3) | |
| 339 | ((blue & 0xf8) >> 3); | 337 | ((blue & 0xf8) >> 3); |
| 340 | } | 338 | break; |
| 341 | break; | 339 | case 16: /* RGB 888 */ |
| 342 | case 24: | ||
| 343 | if (regno < 24) { | ||
| 344 | ((u32 *)(p->pseudo_palette))[regno] = | 340 | ((u32 *)(p->pseudo_palette))[regno] = |
| 345 | (red << 16) | | 341 | (red << 16) | |
| 346 | (green << 8) | | 342 | (green << 8) | |
| 347 | (blue); | 343 | (blue); |
| 344 | break; | ||
| 348 | } | 345 | } |
| 349 | break; | ||
| 350 | } | 346 | } |
| 347 | |||
| 351 | return 0; | 348 | return 0; |
| 352 | } | 349 | } |
| 353 | 350 | ||
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c index 2406899f1207..3d04b2def0f1 100644 --- a/drivers/video/au1100fb.c +++ b/drivers/video/au1100fb.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <linux/interrupt.h> | 49 | #include <linux/interrupt.h> |
| 50 | #include <linux/ctype.h> | 50 | #include <linux/ctype.h> |
| 51 | #include <linux/dma-mapping.h> | 51 | #include <linux/dma-mapping.h> |
| 52 | #include <linux/platform_device.h> | ||
| 52 | 53 | ||
| 53 | #include <asm/mach-au1x00/au1000.h> | 54 | #include <asm/mach-au1x00/au1000.h> |
| 54 | 55 | ||
| @@ -406,7 +407,7 @@ int au1100fb_fb_mmap(struct fb_info *fbi, struct vm_area_struct *vma) | |||
| 406 | 407 | ||
| 407 | vma->vm_flags |= VM_IO; | 408 | vma->vm_flags |= VM_IO; |
| 408 | 409 | ||
| 409 | if (io_remap_page_range(vma, vma->vm_start, off, | 410 | if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT, |
| 410 | vma->vm_end - vma->vm_start, | 411 | vma->vm_end - vma->vm_start, |
| 411 | vma->vm_page_prot)) { | 412 | vma->vm_page_prot)) { |
| 412 | return -EAGAIN; | 413 | return -EAGAIN; |
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index 12d9329d1408..5a86978537d2 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c | |||
| @@ -509,57 +509,60 @@ static int vgacon_doresize(struct vc_data *c, | |||
| 509 | { | 509 | { |
| 510 | unsigned long flags; | 510 | unsigned long flags; |
| 511 | unsigned int scanlines = height * c->vc_font.height; | 511 | unsigned int scanlines = height * c->vc_font.height; |
| 512 | u8 scanlines_lo, r7, vsync_end, mode, max_scan; | 512 | u8 scanlines_lo = 0, r7 = 0, vsync_end = 0, mode, max_scan; |
| 513 | 513 | ||
| 514 | spin_lock_irqsave(&vga_lock, flags); | 514 | spin_lock_irqsave(&vga_lock, flags); |
| 515 | 515 | ||
| 516 | outb_p(VGA_CRTC_MAX_SCAN, vga_video_port_reg); | ||
| 517 | max_scan = inb_p(vga_video_port_val); | ||
| 518 | |||
| 519 | if (max_scan & 0x80) | ||
| 520 | scanlines <<= 1; | ||
| 521 | |||
| 522 | vgacon_xres = width * VGA_FONTWIDTH; | 516 | vgacon_xres = width * VGA_FONTWIDTH; |
| 523 | vgacon_yres = height * c->vc_font.height; | 517 | vgacon_yres = height * c->vc_font.height; |
| 524 | outb_p(VGA_CRTC_MODE, vga_video_port_reg); | 518 | if (vga_video_type >= VIDEO_TYPE_VGAC) { |
| 525 | mode = inb_p(vga_video_port_val); | 519 | outb_p(VGA_CRTC_MAX_SCAN, vga_video_port_reg); |
| 520 | max_scan = inb_p(vga_video_port_val); | ||
| 526 | 521 | ||
| 527 | if (mode & 0x04) | 522 | if (max_scan & 0x80) |
| 528 | scanlines >>= 1; | 523 | scanlines <<= 1; |
| 529 | 524 | ||
| 530 | scanlines -= 1; | 525 | outb_p(VGA_CRTC_MODE, vga_video_port_reg); |
| 531 | scanlines_lo = scanlines & 0xff; | 526 | mode = inb_p(vga_video_port_val); |
| 532 | 527 | ||
| 533 | outb_p(VGA_CRTC_OVERFLOW, vga_video_port_reg); | 528 | if (mode & 0x04) |
| 534 | r7 = inb_p(vga_video_port_val) & ~0x42; | 529 | scanlines >>= 1; |
| 535 | 530 | ||
| 536 | if (scanlines & 0x100) | 531 | scanlines -= 1; |
| 537 | r7 |= 0x02; | 532 | scanlines_lo = scanlines & 0xff; |
| 538 | if (scanlines & 0x200) | ||
| 539 | r7 |= 0x40; | ||
| 540 | 533 | ||
| 541 | /* deprotect registers */ | 534 | outb_p(VGA_CRTC_OVERFLOW, vga_video_port_reg); |
| 542 | outb_p(VGA_CRTC_V_SYNC_END, vga_video_port_reg); | 535 | r7 = inb_p(vga_video_port_val) & ~0x42; |
| 543 | vsync_end = inb_p(vga_video_port_val); | 536 | |
| 544 | outb_p(VGA_CRTC_V_SYNC_END, vga_video_port_reg); | 537 | if (scanlines & 0x100) |
| 545 | outb_p(vsync_end & ~0x80, vga_video_port_val); | 538 | r7 |= 0x02; |
| 539 | if (scanlines & 0x200) | ||
| 540 | r7 |= 0x40; | ||
| 541 | |||
| 542 | /* deprotect registers */ | ||
| 543 | outb_p(VGA_CRTC_V_SYNC_END, vga_video_port_reg); | ||
| 544 | vsync_end = inb_p(vga_video_port_val); | ||
| 545 | outb_p(VGA_CRTC_V_SYNC_END, vga_video_port_reg); | ||
| 546 | outb_p(vsync_end & ~0x80, vga_video_port_val); | ||
| 547 | } | ||
| 546 | 548 | ||
| 547 | outb_p(VGA_CRTC_H_DISP, vga_video_port_reg); | 549 | outb_p(VGA_CRTC_H_DISP, vga_video_port_reg); |
| 548 | outb_p(width - 1, vga_video_port_val); | 550 | outb_p(width - 1, vga_video_port_val); |
| 549 | outb_p(VGA_CRTC_OFFSET, vga_video_port_reg); | 551 | outb_p(VGA_CRTC_OFFSET, vga_video_port_reg); |
| 550 | outb_p(width >> 1, vga_video_port_val); | 552 | outb_p(width >> 1, vga_video_port_val); |
| 551 | 553 | ||
| 552 | outb_p(VGA_CRTC_V_DISP_END, vga_video_port_reg); | 554 | if (vga_video_type >= VIDEO_TYPE_VGAC) { |
| 553 | outb_p(scanlines_lo, vga_video_port_val); | 555 | outb_p(VGA_CRTC_V_DISP_END, vga_video_port_reg); |
| 554 | outb_p(VGA_CRTC_OVERFLOW, vga_video_port_reg); | 556 | outb_p(scanlines_lo, vga_video_port_val); |
| 555 | outb_p(r7,vga_video_port_val); | 557 | outb_p(VGA_CRTC_OVERFLOW, vga_video_port_reg); |
| 558 | outb_p(r7,vga_video_port_val); | ||
| 556 | 559 | ||
| 557 | /* reprotect registers */ | 560 | /* reprotect registers */ |
| 558 | outb_p(VGA_CRTC_V_SYNC_END, vga_video_port_reg); | 561 | outb_p(VGA_CRTC_V_SYNC_END, vga_video_port_reg); |
| 559 | outb_p(vsync_end, vga_video_port_val); | 562 | outb_p(vsync_end, vga_video_port_val); |
| 563 | } | ||
| 560 | 564 | ||
| 561 | spin_unlock_irqrestore(&vga_lock, flags); | 565 | spin_unlock_irqrestore(&vga_lock, flags); |
| 562 | |||
| 563 | return 0; | 566 | return 0; |
| 564 | } | 567 | } |
| 565 | 568 | ||
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c index c9a7cdf6d543..5e25b9860196 100644 --- a/drivers/video/gbefb.c +++ b/drivers/video/gbefb.c | |||
| @@ -656,12 +656,15 @@ static int gbefb_set_par(struct fb_info *info) | |||
| 656 | switch (bytesPerPixel) { | 656 | switch (bytesPerPixel) { |
| 657 | case 1: | 657 | case 1: |
| 658 | SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_I8); | 658 | SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_I8); |
| 659 | info->fix.visual = FB_VISUAL_PSEUDOCOLOR; | ||
| 659 | break; | 660 | break; |
| 660 | case 2: | 661 | case 2: |
| 661 | SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_ARGB5); | 662 | SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_ARGB5); |
| 663 | info->fix.visual = FB_VISUAL_TRUECOLOR; | ||
| 662 | break; | 664 | break; |
| 663 | case 4: | 665 | case 4: |
| 664 | SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_RGB8); | 666 | SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_RGB8); |
| 667 | info->fix.visual = FB_VISUAL_TRUECOLOR; | ||
| 665 | break; | 668 | break; |
| 666 | } | 669 | } |
| 667 | SET_GBE_FIELD(WID, BUF, val, GBE_BMODE_BOTH); | 670 | SET_GBE_FIELD(WID, BUF, val, GBE_BMODE_BOTH); |
diff --git a/fs/9p/fid.c b/fs/9p/fid.c index eda449778fa5..c4d13bf904d2 100644 --- a/fs/9p/fid.c +++ b/fs/9p/fid.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * V9FS FID Management | 2 | * V9FS FID Management |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2005 by Eric Van Hensbergen <ericvh@gmail.com> | 4 | * Copyright (C) 2005, 2006 by Eric Van Hensbergen <ericvh@gmail.com> |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
| 7 | * it under the terms of the GNU General Public License as published by | 7 | * it under the terms of the GNU General Public License as published by |
| @@ -40,7 +40,7 @@ | |||
| 40 | * | 40 | * |
| 41 | */ | 41 | */ |
| 42 | 42 | ||
| 43 | static int v9fs_fid_insert(struct v9fs_fid *fid, struct dentry *dentry) | 43 | int v9fs_fid_insert(struct v9fs_fid *fid, struct dentry *dentry) |
| 44 | { | 44 | { |
| 45 | struct list_head *fid_list = (struct list_head *)dentry->d_fsdata; | 45 | struct list_head *fid_list = (struct list_head *)dentry->d_fsdata; |
| 46 | dprintk(DEBUG_9P, "fid %d (%p) dentry %s (%p)\n", fid->fid, fid, | 46 | dprintk(DEBUG_9P, "fid %d (%p) dentry %s (%p)\n", fid->fid, fid, |
| @@ -57,7 +57,6 @@ static int v9fs_fid_insert(struct v9fs_fid *fid, struct dentry *dentry) | |||
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | fid->uid = current->uid; | 59 | fid->uid = current->uid; |
| 60 | fid->pid = current->pid; | ||
| 61 | list_add(&fid->list, fid_list); | 60 | list_add(&fid->list, fid_list); |
| 62 | return 0; | 61 | return 0; |
| 63 | } | 62 | } |
| @@ -68,14 +67,11 @@ static int v9fs_fid_insert(struct v9fs_fid *fid, struct dentry *dentry) | |||
| 68 | * | 67 | * |
| 69 | */ | 68 | */ |
| 70 | 69 | ||
| 71 | struct v9fs_fid *v9fs_fid_create(struct dentry *dentry, | 70 | struct v9fs_fid *v9fs_fid_create(struct v9fs_session_info *v9ses, int fid) |
| 72 | struct v9fs_session_info *v9ses, int fid, int create) | ||
| 73 | { | 71 | { |
| 74 | struct v9fs_fid *new; | 72 | struct v9fs_fid *new; |
| 75 | 73 | ||
| 76 | dprintk(DEBUG_9P, "fid create dentry %p, fid %d, create %d\n", | 74 | dprintk(DEBUG_9P, "fid create fid %d\n", fid); |
| 77 | dentry, fid, create); | ||
| 78 | |||
| 79 | new = kmalloc(sizeof(struct v9fs_fid), GFP_KERNEL); | 75 | new = kmalloc(sizeof(struct v9fs_fid), GFP_KERNEL); |
| 80 | if (new == NULL) { | 76 | if (new == NULL) { |
| 81 | dprintk(DEBUG_ERROR, "Out of Memory\n"); | 77 | dprintk(DEBUG_ERROR, "Out of Memory\n"); |
| @@ -85,19 +81,13 @@ struct v9fs_fid *v9fs_fid_create(struct dentry *dentry, | |||
| 85 | new->fid = fid; | 81 | new->fid = fid; |
| 86 | new->v9ses = v9ses; | 82 | new->v9ses = v9ses; |
| 87 | new->fidopen = 0; | 83 | new->fidopen = 0; |
| 88 | new->fidcreate = create; | ||
| 89 | new->fidclunked = 0; | 84 | new->fidclunked = 0; |
| 90 | new->iounit = 0; | 85 | new->iounit = 0; |
| 91 | new->rdir_pos = 0; | 86 | new->rdir_pos = 0; |
| 92 | new->rdir_fcall = NULL; | 87 | new->rdir_fcall = NULL; |
| 88 | INIT_LIST_HEAD(&new->list); | ||
| 93 | 89 | ||
| 94 | if (v9fs_fid_insert(new, dentry) == 0) | 90 | return new; |
| 95 | return new; | ||
| 96 | else { | ||
| 97 | dprintk(DEBUG_ERROR, "Problems inserting to dentry\n"); | ||
| 98 | kfree(new); | ||
| 99 | return NULL; | ||
| 100 | } | ||
| 101 | } | 91 | } |
| 102 | 92 | ||
| 103 | /** | 93 | /** |
| @@ -113,140 +103,29 @@ void v9fs_fid_destroy(struct v9fs_fid *fid) | |||
| 113 | } | 103 | } |
| 114 | 104 | ||
| 115 | /** | 105 | /** |
| 116 | * v9fs_fid_walk_up - walks from the process current directory | ||
| 117 | * up to the specified dentry. | ||
| 118 | */ | ||
| 119 | static struct v9fs_fid *v9fs_fid_walk_up(struct dentry *dentry) | ||
| 120 | { | ||
| 121 | int fidnum, cfidnum, err; | ||
| 122 | struct v9fs_fid *cfid; | ||
| 123 | struct dentry *cde; | ||
| 124 | struct v9fs_session_info *v9ses; | ||
| 125 | |||
| 126 | v9ses = v9fs_inode2v9ses(current->fs->pwd->d_inode); | ||
| 127 | cfid = v9fs_fid_lookup(current->fs->pwd); | ||
| 128 | if (cfid == NULL) { | ||
| 129 | dprintk(DEBUG_ERROR, "process cwd doesn't have a fid\n"); | ||
| 130 | return ERR_PTR(-ENOENT); | ||
| 131 | } | ||
| 132 | |||
| 133 | cfidnum = cfid->fid; | ||
| 134 | cde = current->fs->pwd; | ||
| 135 | /* TODO: take advantage of multiwalk */ | ||
| 136 | |||
| 137 | fidnum = v9fs_get_idpool(&v9ses->fidpool); | ||
| 138 | if (fidnum < 0) { | ||
| 139 | dprintk(DEBUG_ERROR, "could not get a new fid num\n"); | ||
| 140 | err = -ENOENT; | ||
| 141 | goto clunk_fid; | ||
| 142 | } | ||
| 143 | |||
| 144 | while (cde != dentry) { | ||
| 145 | if (cde == cde->d_parent) { | ||
| 146 | dprintk(DEBUG_ERROR, "can't find dentry\n"); | ||
| 147 | err = -ENOENT; | ||
| 148 | goto clunk_fid; | ||
| 149 | } | ||
| 150 | |||
| 151 | err = v9fs_t_walk(v9ses, cfidnum, fidnum, "..", NULL); | ||
| 152 | if (err < 0) { | ||
| 153 | dprintk(DEBUG_ERROR, "problem walking to parent\n"); | ||
| 154 | goto clunk_fid; | ||
| 155 | } | ||
| 156 | |||
| 157 | cfidnum = fidnum; | ||
| 158 | cde = cde->d_parent; | ||
| 159 | } | ||
| 160 | |||
| 161 | return v9fs_fid_create(dentry, v9ses, fidnum, 0); | ||
| 162 | |||
| 163 | clunk_fid: | ||
| 164 | v9fs_t_clunk(v9ses, fidnum); | ||
| 165 | return ERR_PTR(err); | ||
| 166 | } | ||
| 167 | |||
| 168 | /** | ||
| 169 | * v9fs_fid_lookup - retrieve the right fid from a particular dentry | 106 | * v9fs_fid_lookup - retrieve the right fid from a particular dentry |
| 170 | * @dentry: dentry to look for fid in | 107 | * @dentry: dentry to look for fid in |
| 171 | * @type: intent of lookup (operation or traversal) | 108 | * @type: intent of lookup (operation or traversal) |
| 172 | * | 109 | * |
| 173 | * search list of fids associated with a dentry for a fid with a matching | 110 | * find a fid in the dentry |
| 174 | * thread id or uid. If that fails, look up the dentry's parents to see if you | 111 | * |
| 175 | * can find a matching fid. | 112 | * TODO: only match fids that have the same uid as current user |
| 176 | * | 113 | * |
| 177 | */ | 114 | */ |
| 178 | 115 | ||
| 179 | struct v9fs_fid *v9fs_fid_lookup(struct dentry *dentry) | 116 | struct v9fs_fid *v9fs_fid_lookup(struct dentry *dentry) |
| 180 | { | 117 | { |
| 181 | struct list_head *fid_list = (struct list_head *)dentry->d_fsdata; | 118 | struct list_head *fid_list = (struct list_head *)dentry->d_fsdata; |
| 182 | struct v9fs_fid *current_fid = NULL; | ||
| 183 | struct v9fs_fid *temp = NULL; | ||
| 184 | struct v9fs_fid *return_fid = NULL; | 119 | struct v9fs_fid *return_fid = NULL; |
| 185 | 120 | ||
| 186 | dprintk(DEBUG_9P, " dentry: %s (%p)\n", dentry->d_iname, dentry); | 121 | dprintk(DEBUG_9P, " dentry: %s (%p)\n", dentry->d_iname, dentry); |
| 187 | 122 | ||
| 188 | if (fid_list) { | 123 | if (fid_list) |
| 189 | list_for_each_entry_safe(current_fid, temp, fid_list, list) { | 124 | return_fid = list_entry(fid_list->next, struct v9fs_fid, list); |
| 190 | if (!current_fid->fidcreate) { | ||
| 191 | return_fid = current_fid; | ||
| 192 | break; | ||
| 193 | } | ||
| 194 | } | ||
| 195 | |||
| 196 | if (!return_fid) | ||
| 197 | return_fid = current_fid; | ||
| 198 | } | ||
| 199 | |||
| 200 | /* we are at the root but didn't match */ | ||
| 201 | if ((!return_fid) && (dentry->d_parent == dentry)) { | ||
| 202 | /* TODO: clone attach with new uid */ | ||
| 203 | return_fid = current_fid; | ||
| 204 | } | ||
| 205 | 125 | ||
| 206 | if (!return_fid) { | 126 | if (!return_fid) { |
| 207 | struct dentry *par = current->fs->pwd->d_parent; | 127 | dprintk(DEBUG_ERROR, "Couldn't find a fid in dentry\n"); |
| 208 | int count = 1; | ||
| 209 | while (par != NULL) { | ||
| 210 | if (par == dentry) | ||
| 211 | break; | ||
| 212 | count++; | ||
| 213 | if (par == par->d_parent) { | ||
| 214 | dprintk(DEBUG_ERROR, | ||
| 215 | "got to root without finding dentry\n"); | ||
| 216 | break; | ||
| 217 | } | ||
| 218 | par = par->d_parent; | ||
| 219 | } | ||
| 220 | |||
| 221 | /* XXX - there may be some duplication we can get rid of */ | ||
| 222 | if (par == dentry) { | ||
| 223 | return_fid = v9fs_fid_walk_up(dentry); | ||
| 224 | if (IS_ERR(return_fid)) | ||
| 225 | return_fid = NULL; | ||
| 226 | } | ||
| 227 | } | 128 | } |
| 228 | 129 | ||
| 229 | return return_fid; | 130 | return return_fid; |
| 230 | } | 131 | } |
| 231 | |||
| 232 | struct v9fs_fid *v9fs_fid_get_created(struct dentry *dentry) | ||
| 233 | { | ||
| 234 | struct list_head *fid_list; | ||
| 235 | struct v9fs_fid *fid, *ftmp, *ret; | ||
| 236 | |||
| 237 | dprintk(DEBUG_9P, " dentry: %s (%p)\n", dentry->d_iname, dentry); | ||
| 238 | fid_list = (struct list_head *)dentry->d_fsdata; | ||
| 239 | ret = NULL; | ||
| 240 | if (fid_list) { | ||
| 241 | list_for_each_entry_safe(fid, ftmp, fid_list, list) { | ||
| 242 | if (fid->fidcreate && fid->pid == current->pid) { | ||
| 243 | list_del(&fid->list); | ||
| 244 | ret = fid; | ||
| 245 | break; | ||
| 246 | } | ||
| 247 | } | ||
| 248 | } | ||
| 249 | |||
| 250 | dprintk(DEBUG_9P, "return %p\n", ret); | ||
| 251 | return ret; | ||
| 252 | } | ||
diff --git a/fs/9p/fid.h b/fs/9p/fid.h index 84c673a44c83..1fc2dd08d75a 100644 --- a/fs/9p/fid.h +++ b/fs/9p/fid.h | |||
| @@ -33,7 +33,6 @@ struct v9fs_fid { | |||
| 33 | 33 | ||
| 34 | u32 fid; | 34 | u32 fid; |
| 35 | unsigned char fidopen; /* set when fid is opened */ | 35 | unsigned char fidopen; /* set when fid is opened */ |
| 36 | unsigned char fidcreate; /* set when fid was just created */ | ||
| 37 | unsigned char fidclunked; /* set when fid has already been clunked */ | 36 | unsigned char fidclunked; /* set when fid has already been clunked */ |
| 38 | 37 | ||
| 39 | struct v9fs_qid qid; | 38 | struct v9fs_qid qid; |
| @@ -45,7 +44,6 @@ struct v9fs_fid { | |||
| 45 | struct v9fs_fcall *rdir_fcall; | 44 | struct v9fs_fcall *rdir_fcall; |
| 46 | 45 | ||
| 47 | /* management stuff */ | 46 | /* management stuff */ |
| 48 | pid_t pid; /* thread associated with this fid */ | ||
| 49 | uid_t uid; /* user associated with this fid */ | 47 | uid_t uid; /* user associated with this fid */ |
| 50 | 48 | ||
| 51 | /* private data */ | 49 | /* private data */ |
| @@ -56,5 +54,5 @@ struct v9fs_fid { | |||
| 56 | struct v9fs_fid *v9fs_fid_lookup(struct dentry *dentry); | 54 | struct v9fs_fid *v9fs_fid_lookup(struct dentry *dentry); |
| 57 | struct v9fs_fid *v9fs_fid_get_created(struct dentry *); | 55 | struct v9fs_fid *v9fs_fid_get_created(struct dentry *); |
| 58 | void v9fs_fid_destroy(struct v9fs_fid *fid); | 56 | void v9fs_fid_destroy(struct v9fs_fid *fid); |
| 59 | struct v9fs_fid *v9fs_fid_create(struct dentry *, | 57 | struct v9fs_fid *v9fs_fid_create(struct v9fs_session_info *, int fid); |
| 60 | struct v9fs_session_info *v9ses, int fid, int create); | 58 | int v9fs_fid_insert(struct v9fs_fid *fid, struct dentry *dentry); |
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c index ef3386549140..61352491ba36 100644 --- a/fs/9p/v9fs.c +++ b/fs/9p/v9fs.c | |||
| @@ -397,6 +397,7 @@ v9fs_session_init(struct v9fs_session_info *v9ses, | |||
| 397 | } | 397 | } |
| 398 | 398 | ||
| 399 | if (v9ses->afid != ~0) { | 399 | if (v9ses->afid != ~0) { |
| 400 | dprintk(DEBUG_ERROR, "afid not equal to ~0\n"); | ||
| 400 | if (v9fs_t_clunk(v9ses, v9ses->afid)) | 401 | if (v9fs_t_clunk(v9ses, v9ses->afid)) |
| 401 | dprintk(DEBUG_ERROR, "clunk failed\n"); | 402 | dprintk(DEBUG_ERROR, "clunk failed\n"); |
| 402 | } | 403 | } |
diff --git a/fs/9p/v9fs_vfs.h b/fs/9p/v9fs_vfs.h index 69cf2905dc90..a759278acaae 100644 --- a/fs/9p/v9fs_vfs.h +++ b/fs/9p/v9fs_vfs.h | |||
| @@ -51,3 +51,4 @@ int v9fs_dir_release(struct inode *inode, struct file *filp); | |||
| 51 | int v9fs_file_open(struct inode *inode, struct file *file); | 51 | int v9fs_file_open(struct inode *inode, struct file *file); |
| 52 | void v9fs_inode2stat(struct inode *inode, struct v9fs_stat *stat); | 52 | void v9fs_inode2stat(struct inode *inode, struct v9fs_stat *stat); |
| 53 | void v9fs_dentry_release(struct dentry *); | 53 | void v9fs_dentry_release(struct dentry *); |
| 54 | int v9fs_uflags2omode(int uflags); | ||
diff --git a/fs/9p/vfs_dentry.c b/fs/9p/vfs_dentry.c index 2dd806dac9f1..12c9cc926b71 100644 --- a/fs/9p/vfs_dentry.c +++ b/fs/9p/vfs_dentry.c | |||
| @@ -43,47 +43,18 @@ | |||
| 43 | #include "fid.h" | 43 | #include "fid.h" |
| 44 | 44 | ||
| 45 | /** | 45 | /** |
| 46 | * v9fs_dentry_validate - VFS dcache hook to validate cache | 46 | * v9fs_dentry_delete - called when dentry refcount equals 0 |
| 47 | * @dentry: dentry that is being validated | 47 | * @dentry: dentry in question |
| 48 | * @nd: path data | ||
| 49 | * | 48 | * |
| 50 | * dcache really shouldn't be used for 9P2000 as at all due to | 49 | * By returning 1 here we should remove cacheing of unused |
| 51 | * potential attached semantics to directory traversal (walk). | 50 | * dentry components. |
| 52 | * | ||
| 53 | * FUTURE: look into how to use dcache to allow multi-stage | ||
| 54 | * walks in Plan 9 & potential for better dcache operation which | ||
| 55 | * would remain valid for Plan 9 semantics. Older versions | ||
| 56 | * had validation via stat for those interested. However, since | ||
| 57 | * stat has the same approximate overhead as walk there really | ||
| 58 | * is no difference. The only improvement would be from a | ||
| 59 | * time-decay cache like NFS has and that undermines the | ||
| 60 | * synchronous nature of 9P2000. | ||
| 61 | * | 51 | * |
| 62 | */ | 52 | */ |
| 63 | 53 | ||
| 64 | static int v9fs_dentry_validate(struct dentry *dentry, struct nameidata *nd) | 54 | int v9fs_dentry_delete(struct dentry *dentry) |
| 65 | { | 55 | { |
| 66 | struct dentry *dc = current->fs->pwd; | 56 | dprintk(DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry); |
| 67 | 57 | return 1; | |
| 68 | dprintk(DEBUG_VFS, "dentry: %s (%p)\n", dentry->d_iname, dentry); | ||
| 69 | if (v9fs_fid_lookup(dentry)) { | ||
| 70 | dprintk(DEBUG_VFS, "VALID\n"); | ||
| 71 | return 1; | ||
| 72 | } | ||
| 73 | |||
| 74 | while (dc != NULL) { | ||
| 75 | if (dc == dentry) { | ||
| 76 | dprintk(DEBUG_VFS, "VALID\n"); | ||
| 77 | return 1; | ||
| 78 | } | ||
| 79 | if (dc == dc->d_parent) | ||
| 80 | break; | ||
| 81 | |||
| 82 | dc = dc->d_parent; | ||
| 83 | } | ||
| 84 | |||
| 85 | dprintk(DEBUG_VFS, "INVALID\n"); | ||
| 86 | return 0; | ||
| 87 | } | 58 | } |
| 88 | 59 | ||
| 89 | /** | 60 | /** |
| @@ -118,6 +89,6 @@ void v9fs_dentry_release(struct dentry *dentry) | |||
| 118 | } | 89 | } |
| 119 | 90 | ||
| 120 | struct dentry_operations v9fs_dentry_operations = { | 91 | struct dentry_operations v9fs_dentry_operations = { |
| 121 | .d_revalidate = v9fs_dentry_validate, | 92 | .d_delete = v9fs_dentry_delete, |
| 122 | .d_release = v9fs_dentry_release, | 93 | .d_release = v9fs_dentry_release, |
| 123 | }; | 94 | }; |
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index c7e14d917215..de3a129698da 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c | |||
| @@ -53,94 +53,70 @@ | |||
| 53 | int v9fs_file_open(struct inode *inode, struct file *file) | 53 | int v9fs_file_open(struct inode *inode, struct file *file) |
| 54 | { | 54 | { |
| 55 | struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); | 55 | struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode); |
| 56 | struct v9fs_fid *v9fid, *fid; | 56 | struct v9fs_fid *vfid; |
| 57 | struct v9fs_fcall *fcall = NULL; | 57 | struct v9fs_fcall *fcall = NULL; |
| 58 | int open_mode = 0; | 58 | int omode; |
| 59 | unsigned int iounit = 0; | 59 | int fid = V9FS_NOFID; |
| 60 | int newfid = -1; | 60 | int err; |
| 61 | long result = -1; | ||
| 62 | 61 | ||
| 63 | dprintk(DEBUG_VFS, "inode: %p file: %p \n", inode, file); | 62 | dprintk(DEBUG_VFS, "inode: %p file: %p \n", inode, file); |
| 64 | 63 | ||
| 65 | v9fid = v9fs_fid_get_created(file->f_dentry); | 64 | vfid = v9fs_fid_lookup(file->f_dentry); |
| 66 | if (!v9fid) | 65 | if (!vfid) { |
| 67 | v9fid = v9fs_fid_lookup(file->f_dentry); | ||
| 68 | |||
| 69 | if (!v9fid) { | ||
| 70 | dprintk(DEBUG_ERROR, "Couldn't resolve fid from dentry\n"); | 66 | dprintk(DEBUG_ERROR, "Couldn't resolve fid from dentry\n"); |
| 71 | return -EBADF; | 67 | return -EBADF; |
| 72 | } | 68 | } |
| 73 | 69 | ||
| 74 | if (!v9fid->fidcreate) { | 70 | fid = v9fs_get_idpool(&v9ses->fidpool); |
| 75 | fid = kmalloc(sizeof(struct v9fs_fid), GFP_KERNEL); | 71 | if (fid < 0) { |
| 76 | if (fid == NULL) { | ||
| 77 | dprintk(DEBUG_ERROR, "Out of Memory\n"); | ||
| 78 | return -ENOMEM; | ||
| 79 | } | ||
| 80 | |||
| 81 | fid->fidopen = 0; | ||
| 82 | fid->fidcreate = 0; | ||
| 83 | fid->fidclunked = 0; | ||
| 84 | fid->iounit = 0; | ||
| 85 | fid->v9ses = v9ses; | ||
| 86 | |||
| 87 | newfid = v9fs_get_idpool(&v9ses->fidpool); | ||
| 88 | if (newfid < 0) { | ||
| 89 | eprintk(KERN_WARNING, "newfid fails!\n"); | 72 | eprintk(KERN_WARNING, "newfid fails!\n"); |
| 90 | return -ENOSPC; | 73 | return -ENOSPC; |
| 91 | } | 74 | } |
| 92 | 75 | ||
| 93 | result = | 76 | err = v9fs_t_walk(v9ses, vfid->fid, fid, NULL, NULL); |
| 94 | v9fs_t_walk(v9ses, v9fid->fid, newfid, NULL, NULL); | 77 | if (err < 0) { |
| 95 | |||
| 96 | if (result < 0) { | ||
| 97 | v9fs_put_idpool(newfid, &v9ses->fidpool); | ||
| 98 | dprintk(DEBUG_ERROR, "rewalk didn't work\n"); | 78 | dprintk(DEBUG_ERROR, "rewalk didn't work\n"); |
| 99 | return -EBADF; | 79 | goto put_fid; |
| 80 | } | ||
| 81 | |||
| 82 | vfid = kmalloc(sizeof(struct v9fs_fid), GFP_KERNEL); | ||
| 83 | if (vfid == NULL) { | ||
| 84 | dprintk(DEBUG_ERROR, "out of memory\n"); | ||
| 85 | goto clunk_fid; | ||
| 100 | } | 86 | } |
| 101 | 87 | ||
| 102 | fid->fid = newfid; | ||
| 103 | v9fid = fid; | ||
| 104 | /* TODO: do special things for O_EXCL, O_NOFOLLOW, O_SYNC */ | 88 | /* TODO: do special things for O_EXCL, O_NOFOLLOW, O_SYNC */ |
| 105 | /* translate open mode appropriately */ | 89 | /* translate open mode appropriately */ |
| 106 | open_mode = file->f_flags & 0x3; | 90 | omode = v9fs_uflags2omode(file->f_flags); |
| 91 | err = v9fs_t_open(v9ses, fid, omode, &fcall); | ||
| 92 | if (err < 0) { | ||
| 93 | PRINT_FCALL_ERROR("open failed", fcall); | ||
| 94 | goto destroy_vfid; | ||
| 95 | } | ||
| 107 | 96 | ||
| 108 | if (file->f_flags & O_EXCL) | 97 | file->private_data = vfid; |
| 109 | open_mode |= V9FS_OEXCL; | 98 | vfid->fid = fid; |
| 99 | vfid->fidopen = 1; | ||
| 100 | vfid->fidclunked = 0; | ||
| 101 | vfid->iounit = fcall->params.ropen.iounit; | ||
| 102 | vfid->rdir_pos = 0; | ||
| 103 | vfid->rdir_fcall = NULL; | ||
| 104 | vfid->filp = file; | ||
| 105 | kfree(fcall); | ||
| 110 | 106 | ||
| 111 | if (v9ses->extended) { | 107 | return 0; |
| 112 | if (file->f_flags & O_TRUNC) | ||
| 113 | open_mode |= V9FS_OTRUNC; | ||
| 114 | 108 | ||
| 115 | if (file->f_flags & O_APPEND) | 109 | destroy_vfid: |
| 116 | open_mode |= V9FS_OAPPEND; | 110 | v9fs_fid_destroy(vfid); |
| 117 | } | ||
| 118 | 111 | ||
| 119 | result = v9fs_t_open(v9ses, newfid, open_mode, &fcall); | 112 | clunk_fid: |
| 120 | if (result < 0) { | 113 | v9fs_t_clunk(v9ses, fid); |
| 121 | PRINT_FCALL_ERROR("open failed", fcall); | ||
| 122 | kfree(fcall); | ||
| 123 | return result; | ||
| 124 | } | ||
| 125 | 114 | ||
| 126 | iounit = fcall->params.ropen.iounit; | 115 | put_fid: |
| 116 | v9fs_put_idpool(fid, &v9ses->fidpool); | ||
| 127 | kfree(fcall); | 117 | kfree(fcall); |
| 128 | } else { | ||
| 129 | /* create case */ | ||
| 130 | newfid = v9fid->fid; | ||
| 131 | iounit = v9fid->iounit; | ||
| 132 | v9fid->fidcreate = 0; | ||
| 133 | } | ||
| 134 | |||
| 135 | file->private_data = v9fid; | ||
| 136 | |||
| 137 | v9fid->rdir_pos = 0; | ||
| 138 | v9fid->rdir_fcall = NULL; | ||
| 139 | v9fid->fidopen = 1; | ||
| 140 | v9fid->filp = file; | ||
| 141 | v9fid->iounit = iounit; | ||
| 142 | 118 | ||
| 143 | return 0; | 119 | return err; |
| 144 | } | 120 | } |
| 145 | 121 | ||
| 146 | /** | 122 | /** |
| @@ -289,9 +265,7 @@ v9fs_file_write(struct file *filp, const char __user * data, | |||
| 289 | total += result; | 265 | total += result; |
| 290 | } while (count); | 266 | } while (count); |
| 291 | 267 | ||
| 292 | if(inode->i_mapping->nrpages) | ||
| 293 | invalidate_inode_pages2(inode->i_mapping); | 268 | invalidate_inode_pages2(inode->i_mapping); |
| 294 | |||
| 295 | return total; | 269 | return total; |
| 296 | } | 270 | } |
| 297 | 271 | ||
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index 63e5b0398e8b..dce729d42869 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c | |||
| @@ -125,6 +125,38 @@ static int p9mode2unixmode(struct v9fs_session_info *v9ses, int mode) | |||
| 125 | return res; | 125 | return res; |
| 126 | } | 126 | } |
| 127 | 127 | ||
| 128 | int v9fs_uflags2omode(int uflags) | ||
| 129 | { | ||
| 130 | int ret; | ||
| 131 | |||
| 132 | ret = 0; | ||
| 133 | switch (uflags&3) { | ||
| 134 | default: | ||
| 135 | case O_RDONLY: | ||
| 136 | ret = V9FS_OREAD; | ||
| 137 | break; | ||
| 138 | |||
| 139 | case O_WRONLY: | ||
| 140 | ret = V9FS_OWRITE; | ||
| 141 | break; | ||
| 142 | |||
| 143 | case O_RDWR: | ||
| 144 | ret = V9FS_ORDWR; | ||
| 145 | break; | ||
| 146 | } | ||
| 147 | |||
| 148 | if (uflags & O_EXCL) | ||
| 149 | ret |= V9FS_OEXCL; | ||
| 150 | |||
| 151 | if (uflags & O_TRUNC) | ||
| 152 | ret |= V9FS_OTRUNC; | ||
| 153 | |||
| 154 | if (uflags & O_APPEND) | ||
| 155 | ret |= V9FS_OAPPEND; | ||
| 156 | |||
| 157 | return ret; | ||
| 158 | } | ||
| 159 | |||
| 128 | /** | 160 | /** |
| 129 | * v9fs_blank_wstat - helper function to setup a 9P stat structure | 161 | * v9fs_blank_wstat - helper function to setup a 9P stat structure |
| 130 | * @v9ses: 9P session info (for determining extended mode) | 162 | * @v9ses: 9P session info (for determining extended mode) |
| @@ -163,7 +195,7 @@ v9fs_blank_wstat(struct v9fs_wstat *wstat) | |||
| 163 | 195 | ||
| 164 | struct inode *v9fs_get_inode(struct super_block *sb, int mode) | 196 | struct inode *v9fs_get_inode(struct super_block *sb, int mode) |
| 165 | { | 197 | { |
| 166 | struct inode *inode = NULL; | 198 | struct inode *inode; |
| 167 | struct v9fs_session_info *v9ses = sb->s_fs_info; | 199 | struct v9fs_session_info *v9ses = sb->s_fs_info; |
| 168 | 200 | ||
| 169 | dprintk(DEBUG_VFS, "super block: %p mode: %o\n", sb, mode); | 201 | dprintk(DEBUG_VFS, "super block: %p mode: %o\n", sb, mode); |
| @@ -222,171 +254,135 @@ struct inode *v9fs_get_inode(struct super_block *sb, int mode) | |||
| 222 | return inode; | 254 | return inode; |
| 223 | } | 255 | } |
| 224 | 256 | ||
| 225 | /** | ||
| 226 | * v9fs_create - helper function to create files and directories | ||
| 227 | * @dir: directory inode file is being created in | ||
| 228 | * @file_dentry: dentry file is being created in | ||
| 229 | * @perm: permissions file is being created with | ||
| 230 | * @open_mode: resulting open mode for file | ||
| 231 | * | ||
| 232 | */ | ||
| 233 | |||
| 234 | static int | 257 | static int |
| 235 | v9fs_create(struct inode *dir, | 258 | v9fs_create(struct v9fs_session_info *v9ses, u32 pfid, char *name, |
| 236 | struct dentry *file_dentry, | 259 | u32 perm, u8 mode, u32 *fidp, struct v9fs_qid *qid, u32 *iounit) |
| 237 | unsigned int perm, unsigned int open_mode) | ||
| 238 | { | 260 | { |
| 239 | struct v9fs_session_info *v9ses = v9fs_inode2v9ses(dir); | 261 | u32 fid; |
| 240 | struct super_block *sb = dir->i_sb; | ||
| 241 | struct v9fs_fid *dirfid = | ||
| 242 | v9fs_fid_lookup(file_dentry->d_parent); | ||
| 243 | struct v9fs_fid *fid = NULL; | ||
| 244 | struct inode *file_inode = NULL; | ||
| 245 | struct v9fs_fcall *fcall = NULL; | ||
| 246 | struct v9fs_qid qid; | ||
| 247 | int dirfidnum = -1; | ||
| 248 | long newfid = -1; | ||
| 249 | int result = 0; | ||
| 250 | unsigned int iounit = 0; | ||
| 251 | int wfidno = -1; | ||
| 252 | int err; | 262 | int err; |
| 263 | struct v9fs_fcall *fcall; | ||
| 253 | 264 | ||
| 254 | perm = unixmode2p9mode(v9ses, perm); | 265 | fid = v9fs_get_idpool(&v9ses->fidpool); |
| 255 | 266 | if (fid < 0) { | |
| 256 | dprintk(DEBUG_VFS, "dir: %p dentry: %p perm: %o mode: %o\n", dir, | ||
| 257 | file_dentry, perm, open_mode); | ||
| 258 | |||
| 259 | if (!dirfid) | ||
| 260 | return -EBADF; | ||
| 261 | |||
| 262 | dirfidnum = dirfid->fid; | ||
| 263 | if (dirfidnum < 0) { | ||
| 264 | dprintk(DEBUG_ERROR, "No fid for the directory #%lu\n", | ||
| 265 | dir->i_ino); | ||
| 266 | return -EBADF; | ||
| 267 | } | ||
| 268 | |||
| 269 | if (file_dentry->d_inode) { | ||
| 270 | dprintk(DEBUG_ERROR, | ||
| 271 | "Odd. There is an inode for dir %lu, name :%s:\n", | ||
| 272 | dir->i_ino, file_dentry->d_name.name); | ||
| 273 | return -EEXIST; | ||
| 274 | } | ||
| 275 | |||
| 276 | newfid = v9fs_get_idpool(&v9ses->fidpool); | ||
| 277 | if (newfid < 0) { | ||
| 278 | eprintk(KERN_WARNING, "no free fids available\n"); | 267 | eprintk(KERN_WARNING, "no free fids available\n"); |
| 279 | return -ENOSPC; | 268 | err = -ENOSPC; |
| 269 | goto error; | ||
| 280 | } | 270 | } |
| 281 | 271 | ||
| 282 | result = v9fs_t_walk(v9ses, dirfidnum, newfid, NULL, &fcall); | 272 | err = v9fs_t_walk(v9ses, pfid, fid, NULL, &fcall); |
| 283 | if (result < 0) { | 273 | if (err < 0) { |
| 284 | PRINT_FCALL_ERROR("clone error", fcall); | 274 | PRINT_FCALL_ERROR("clone error", fcall); |
| 285 | v9fs_put_idpool(newfid, &v9ses->fidpool); | 275 | goto error; |
| 286 | newfid = -1; | ||
| 287 | goto CleanUpFid; | ||
| 288 | } | 276 | } |
| 289 | |||
| 290 | kfree(fcall); | 277 | kfree(fcall); |
| 291 | fcall = NULL; | ||
| 292 | 278 | ||
| 293 | result = v9fs_t_create(v9ses, newfid, (char *)file_dentry->d_name.name, | 279 | err = v9fs_t_create(v9ses, fid, name, perm, mode, &fcall); |
| 294 | perm, open_mode, &fcall); | 280 | if (err < 0) { |
| 295 | if (result < 0) { | ||
| 296 | PRINT_FCALL_ERROR("create fails", fcall); | 281 | PRINT_FCALL_ERROR("create fails", fcall); |
| 297 | goto CleanUpFid; | 282 | goto error; |
| 298 | } | 283 | } |
| 299 | 284 | ||
| 300 | iounit = fcall->params.rcreate.iounit; | 285 | if (iounit) |
| 301 | qid = fcall->params.rcreate.qid; | 286 | *iounit = fcall->params.rcreate.iounit; |
| 287 | |||
| 288 | if (qid) | ||
| 289 | *qid = fcall->params.rcreate.qid; | ||
| 290 | |||
| 291 | if (fidp) | ||
| 292 | *fidp = fid; | ||
| 293 | |||
| 302 | kfree(fcall); | 294 | kfree(fcall); |
| 303 | fcall = NULL; | 295 | return 0; |
| 304 | 296 | ||
| 305 | if (!(perm&V9FS_DMDIR)) { | 297 | error: |
| 306 | fid = v9fs_fid_create(file_dentry, v9ses, newfid, 1); | 298 | if (fid >= 0) |
| 307 | dprintk(DEBUG_VFS, "fid %p %d\n", fid, fid->fidcreate); | 299 | v9fs_put_idpool(fid, &v9ses->fidpool); |
| 308 | if (!fid) { | ||
| 309 | result = -ENOMEM; | ||
| 310 | goto CleanUpFid; | ||
| 311 | } | ||
| 312 | 300 | ||
| 313 | fid->qid = qid; | 301 | kfree(fcall); |
| 314 | fid->iounit = iounit; | 302 | return err; |
| 315 | } else { | 303 | } |
| 316 | err = v9fs_t_clunk(v9ses, newfid); | 304 | |
| 317 | newfid = -1; | 305 | static struct v9fs_fid* |
| 318 | if (err < 0) | 306 | v9fs_clone_walk(struct v9fs_session_info *v9ses, u32 fid, struct dentry *dentry) |
| 319 | dprintk(DEBUG_ERROR, "clunk for mkdir failed: %d\n", err); | 307 | { |
| 320 | } | 308 | int err; |
| 309 | u32 nfid; | ||
| 310 | struct v9fs_fid *ret; | ||
| 311 | struct v9fs_fcall *fcall; | ||
| 321 | 312 | ||
| 322 | /* walk to the newly created file and put the fid in the dentry */ | 313 | nfid = v9fs_get_idpool(&v9ses->fidpool); |
| 323 | wfidno = v9fs_get_idpool(&v9ses->fidpool); | 314 | if (nfid < 0) { |
| 324 | if (wfidno < 0) { | ||
| 325 | eprintk(KERN_WARNING, "no free fids available\n"); | 315 | eprintk(KERN_WARNING, "no free fids available\n"); |
| 326 | return -ENOSPC; | 316 | err = -ENOSPC; |
| 317 | goto error; | ||
| 327 | } | 318 | } |
| 328 | 319 | ||
| 329 | result = v9fs_t_walk(v9ses, dirfidnum, wfidno, | 320 | err = v9fs_t_walk(v9ses, fid, nfid, (char *) dentry->d_name.name, |
| 330 | (char *) file_dentry->d_name.name, &fcall); | 321 | &fcall); |
| 331 | if (result < 0) { | 322 | |
| 332 | PRINT_FCALL_ERROR("clone error", fcall); | 323 | if (err < 0) { |
| 333 | v9fs_put_idpool(wfidno, &v9ses->fidpool); | 324 | PRINT_FCALL_ERROR("walk error", fcall); |
| 334 | wfidno = -1; | 325 | v9fs_put_idpool(nfid, &v9ses->fidpool); |
| 335 | goto CleanUpFid; | 326 | goto error; |
| 336 | } | 327 | } |
| 328 | |||
| 337 | kfree(fcall); | 329 | kfree(fcall); |
| 338 | fcall = NULL; | 330 | fcall = NULL; |
| 331 | ret = v9fs_fid_create(v9ses, nfid); | ||
| 332 | if (!ret) { | ||
| 333 | err = -ENOMEM; | ||
| 334 | goto clunk_fid; | ||
| 335 | } | ||
| 339 | 336 | ||
| 340 | if (!v9fs_fid_create(file_dentry, v9ses, wfidno, 0)) { | 337 | err = v9fs_fid_insert(ret, dentry); |
| 341 | v9fs_put_idpool(wfidno, &v9ses->fidpool); | 338 | if (err < 0) { |
| 342 | 339 | v9fs_fid_destroy(ret); | |
| 343 | goto CleanUpFid; | 340 | goto clunk_fid; |
| 344 | } | 341 | } |
| 345 | 342 | ||
| 346 | if ((perm & V9FS_DMSYMLINK) || (perm & V9FS_DMLINK) || | 343 | return ret; |
| 347 | (perm & V9FS_DMNAMEDPIPE) || (perm & V9FS_DMSOCKET) || | ||
| 348 | (perm & V9FS_DMDEVICE)) | ||
| 349 | return 0; | ||
| 350 | 344 | ||
| 351 | result = v9fs_t_stat(v9ses, wfidno, &fcall); | 345 | clunk_fid: |
| 352 | if (result < 0) { | 346 | v9fs_t_clunk(v9ses, nfid); |
| 353 | PRINT_FCALL_ERROR("stat error", fcall); | 347 | |
| 354 | goto CleanUpFid; | 348 | error: |
| 355 | } | 349 | kfree(fcall); |
| 350 | return ERR_PTR(err); | ||
| 351 | } | ||
| 356 | 352 | ||
| 353 | struct inode * | ||
| 354 | v9fs_inode_from_fid(struct v9fs_session_info *v9ses, u32 fid, | ||
| 355 | struct super_block *sb) | ||
| 356 | { | ||
| 357 | int err, umode; | ||
| 358 | struct inode *ret; | ||
| 359 | struct v9fs_fcall *fcall; | ||
| 357 | 360 | ||
| 358 | file_inode = v9fs_get_inode(sb, | 361 | ret = NULL; |
| 359 | p9mode2unixmode(v9ses, fcall->params.rstat.stat.mode)); | 362 | err = v9fs_t_stat(v9ses, fid, &fcall); |
| 363 | if (err) { | ||
| 364 | PRINT_FCALL_ERROR("stat error", fcall); | ||
| 365 | goto error; | ||
| 366 | } | ||
| 360 | 367 | ||
| 361 | if ((!file_inode) || IS_ERR(file_inode)) { | 368 | umode = p9mode2unixmode(v9ses, fcall->params.rstat.stat.mode); |
| 362 | dprintk(DEBUG_ERROR, "create inode failed\n"); | 369 | ret = v9fs_get_inode(sb, umode); |
| 363 | result = -EBADF; | 370 | if (IS_ERR(ret)) { |
| 364 | goto CleanUpFid; | 371 | err = PTR_ERR(ret); |
| 372 | ret = NULL; | ||
| 373 | goto error; | ||
| 365 | } | 374 | } |
| 366 | 375 | ||
| 367 | v9fs_stat2inode(&fcall->params.rstat.stat, file_inode, sb); | 376 | v9fs_stat2inode(&fcall->params.rstat.stat, ret, sb); |
| 368 | kfree(fcall); | 377 | kfree(fcall); |
| 369 | fcall = NULL; | 378 | return ret; |
| 370 | file_dentry->d_op = &v9fs_dentry_operations; | ||
| 371 | d_instantiate(file_dentry, file_inode); | ||
| 372 | |||
| 373 | return 0; | ||
| 374 | 379 | ||
| 375 | CleanUpFid: | 380 | error: |
| 376 | kfree(fcall); | 381 | kfree(fcall); |
| 377 | fcall = NULL; | 382 | if (ret) |
| 383 | iput(ret); | ||
| 378 | 384 | ||
| 379 | if (newfid >= 0) { | 385 | return ERR_PTR(err); |
| 380 | err = v9fs_t_clunk(v9ses, newfid); | ||
| 381 | if (err < 0) | ||
| 382 | dprintk(DEBUG_ERROR, "clunk failed: %d\n", err); | ||
| 383 | } | ||
| 384 | if (wfidno >= 0) { | ||
| 385 | err = v9fs_t_clunk(v9ses, wfidno); | ||
| 386 | if (err < 0) | ||
| 387 | dprintk(DEBUG_ERROR, "clunk failed: %d\n", err); | ||
| 388 | } | ||
| 389 | return result; | ||
| 390 | } | 386 | } |
| 391 | 387 | ||
| 392 | /** | 388 | /** |
| @@ -440,20 +436,97 @@ static int v9fs_remove(struct inode *dir, struct dentry *file, int rmdir) | |||
| 440 | return result; | 436 | return result; |
| 441 | } | 437 | } |
| 442 | 438 | ||
| 439 | static int | ||
| 440 | v9fs_open_created(struct inode *inode, struct file *file) | ||
| 441 | { | ||
| 442 | return 0; | ||
| 443 | } | ||
| 444 | |||
| 443 | /** | 445 | /** |
| 444 | * v9fs_vfs_create - VFS hook to create files | 446 | * v9fs_vfs_create - VFS hook to create files |
| 445 | * @inode: directory inode that is being deleted | 447 | * @inode: directory inode that is being deleted |
| 446 | * @dentry: dentry that is being deleted | 448 | * @dentry: dentry that is being deleted |
| 447 | * @perm: create permissions | 449 | * @mode: create permissions |
| 448 | * @nd: path information | 450 | * @nd: path information |
| 449 | * | 451 | * |
| 450 | */ | 452 | */ |
| 451 | 453 | ||
| 452 | static int | 454 | static int |
| 453 | v9fs_vfs_create(struct inode *inode, struct dentry *dentry, int perm, | 455 | v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode, |
| 454 | struct nameidata *nd) | 456 | struct nameidata *nd) |
| 455 | { | 457 | { |
| 456 | return v9fs_create(inode, dentry, perm, O_RDWR); | 458 | int err; |
| 459 | u32 fid, perm, iounit; | ||
| 460 | int flags; | ||
| 461 | struct v9fs_session_info *v9ses; | ||
| 462 | struct v9fs_fid *dfid, *vfid, *ffid; | ||
| 463 | struct inode *inode; | ||
| 464 | struct v9fs_qid qid; | ||
| 465 | struct file *filp; | ||
| 466 | |||
| 467 | inode = NULL; | ||
| 468 | vfid = NULL; | ||
| 469 | v9ses = v9fs_inode2v9ses(dir); | ||
| 470 | dfid = v9fs_fid_lookup(dentry->d_parent); | ||
| 471 | perm = unixmode2p9mode(v9ses, mode); | ||
| 472 | |||
| 473 | if (nd && nd->flags & LOOKUP_OPEN) | ||
| 474 | flags = nd->intent.open.flags - 1; | ||
| 475 | else | ||
| 476 | flags = O_RDWR; | ||
| 477 | |||
| 478 | err = v9fs_create(v9ses, dfid->fid, (char *) dentry->d_name.name, | ||
| 479 | perm, v9fs_uflags2omode(flags), &fid, &qid, &iounit); | ||
| 480 | |||
| 481 | if (err) | ||
| 482 | goto error; | ||
| 483 | |||
| 484 | vfid = v9fs_clone_walk(v9ses, dfid->fid, dentry); | ||
| 485 | if (IS_ERR(vfid)) { | ||
| 486 | err = PTR_ERR(vfid); | ||
| 487 | vfid = NULL; | ||
| 488 | goto error; | ||
| 489 | } | ||
| 490 | |||
| 491 | inode = v9fs_inode_from_fid(v9ses, vfid->fid, dir->i_sb); | ||
| 492 | if (IS_ERR(inode)) { | ||
| 493 | err = PTR_ERR(inode); | ||
| 494 | inode = NULL; | ||
| 495 | goto error; | ||
| 496 | } | ||
| 497 | |||
| 498 | dentry->d_op = &v9fs_dentry_operations; | ||
| 499 | d_instantiate(dentry, inode); | ||
| 500 | |||
| 501 | if (nd && nd->flags & LOOKUP_OPEN) { | ||
| 502 | ffid = v9fs_fid_create(v9ses, fid); | ||
| 503 | if (!ffid) | ||
| 504 | return -ENOMEM; | ||
| 505 | |||
| 506 | filp = lookup_instantiate_filp(nd, dentry, v9fs_open_created); | ||
| 507 | if (IS_ERR(filp)) { | ||
| 508 | v9fs_fid_destroy(ffid); | ||
| 509 | return PTR_ERR(filp); | ||
| 510 | } | ||
| 511 | |||
| 512 | ffid->rdir_pos = 0; | ||
| 513 | ffid->rdir_fcall = NULL; | ||
| 514 | ffid->fidopen = 1; | ||
| 515 | ffid->iounit = iounit; | ||
| 516 | ffid->filp = filp; | ||
| 517 | filp->private_data = ffid; | ||
| 518 | } | ||
| 519 | |||
| 520 | return 0; | ||
| 521 | |||
| 522 | error: | ||
| 523 | if (vfid) | ||
| 524 | v9fs_fid_destroy(vfid); | ||
| 525 | |||
| 526 | if (inode) | ||
| 527 | iput(inode); | ||
| 528 | |||
| 529 | return err; | ||
| 457 | } | 530 | } |
| 458 | 531 | ||
| 459 | /** | 532 | /** |
| @@ -464,9 +537,57 @@ v9fs_vfs_create(struct inode *inode, struct dentry *dentry, int perm, | |||
| 464 | * | 537 | * |
| 465 | */ | 538 | */ |
| 466 | 539 | ||
| 467 | static int v9fs_vfs_mkdir(struct inode *inode, struct dentry *dentry, int mode) | 540 | static int v9fs_vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) |
| 468 | { | 541 | { |
| 469 | return v9fs_create(inode, dentry, mode | S_IFDIR, O_RDONLY); | 542 | int err; |
| 543 | u32 fid, perm; | ||
| 544 | struct v9fs_session_info *v9ses; | ||
| 545 | struct v9fs_fid *dfid, *vfid; | ||
| 546 | struct inode *inode; | ||
| 547 | |||
| 548 | inode = NULL; | ||
| 549 | vfid = NULL; | ||
| 550 | v9ses = v9fs_inode2v9ses(dir); | ||
| 551 | dfid = v9fs_fid_lookup(dentry->d_parent); | ||
| 552 | perm = unixmode2p9mode(v9ses, mode | S_IFDIR); | ||
| 553 | |||
| 554 | err = v9fs_create(v9ses, dfid->fid, (char *) dentry->d_name.name, | ||
| 555 | perm, V9FS_OREAD, &fid, NULL, NULL); | ||
| 556 | |||
| 557 | if (err) { | ||
| 558 | dprintk(DEBUG_ERROR, "create error %d\n", err); | ||
| 559 | goto error; | ||
| 560 | } | ||
| 561 | |||
| 562 | err = v9fs_t_clunk(v9ses, fid); | ||
| 563 | if (err) { | ||
| 564 | dprintk(DEBUG_ERROR, "clunk error %d\n", err); | ||
| 565 | goto error; | ||
| 566 | } | ||
| 567 | |||
| 568 | vfid = v9fs_clone_walk(v9ses, dfid->fid, dentry); | ||
| 569 | if (IS_ERR(vfid)) { | ||
| 570 | err = PTR_ERR(vfid); | ||
| 571 | vfid = NULL; | ||
| 572 | goto error; | ||
| 573 | } | ||
| 574 | |||
| 575 | inode = v9fs_inode_from_fid(v9ses, vfid->fid, dir->i_sb); | ||
| 576 | if (IS_ERR(inode)) { | ||
| 577 | err = PTR_ERR(inode); | ||
| 578 | inode = NULL; | ||
| 579 | goto error; | ||
| 580 | } | ||
| 581 | |||
| 582 | dentry->d_op = &v9fs_dentry_operations; | ||
| 583 | d_instantiate(dentry, inode); | ||
| 584 | return 0; | ||
| 585 | |||
| 586 | error: | ||
| 587 | if (vfid) | ||
| 588 | v9fs_fid_destroy(vfid); | ||
| 589 | |||
| 590 | return err; | ||
| 470 | } | 591 | } |
| 471 | 592 | ||
| 472 | /** | 593 | /** |
| @@ -516,9 +637,8 @@ static struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry, | |||
| 516 | return ERR_PTR(-ENOSPC); | 637 | return ERR_PTR(-ENOSPC); |
| 517 | } | 638 | } |
| 518 | 639 | ||
| 519 | result = | 640 | result = v9fs_t_walk(v9ses, dirfidnum, newfid, |
| 520 | v9fs_t_walk(v9ses, dirfidnum, newfid, (char *)dentry->d_name.name, | 641 | (char *)dentry->d_name.name, NULL); |
| 521 | NULL); | ||
| 522 | if (result < 0) { | 642 | if (result < 0) { |
| 523 | v9fs_put_idpool(newfid, &v9ses->fidpool); | 643 | v9fs_put_idpool(newfid, &v9ses->fidpool); |
| 524 | if (result == -ENOENT) { | 644 | if (result == -ENOENT) { |
| @@ -551,13 +671,17 @@ static struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry, | |||
| 551 | 671 | ||
| 552 | inode->i_ino = v9fs_qid2ino(&fcall->params.rstat.stat.qid); | 672 | inode->i_ino = v9fs_qid2ino(&fcall->params.rstat.stat.qid); |
| 553 | 673 | ||
| 554 | fid = v9fs_fid_create(dentry, v9ses, newfid, 0); | 674 | fid = v9fs_fid_create(v9ses, newfid); |
| 555 | if (fid == NULL) { | 675 | if (fid == NULL) { |
| 556 | dprintk(DEBUG_ERROR, "couldn't insert\n"); | 676 | dprintk(DEBUG_ERROR, "couldn't insert\n"); |
| 557 | result = -ENOMEM; | 677 | result = -ENOMEM; |
| 558 | goto FreeFcall; | 678 | goto FreeFcall; |
| 559 | } | 679 | } |
| 560 | 680 | ||
| 681 | result = v9fs_fid_insert(fid, dentry); | ||
| 682 | if (result < 0) | ||
| 683 | goto FreeFcall; | ||
| 684 | |||
| 561 | fid->qid = fcall->params.rstat.stat.qid; | 685 | fid->qid = fcall->params.rstat.stat.qid; |
| 562 | 686 | ||
| 563 | dentry->d_op = &v9fs_dentry_operations; | 687 | dentry->d_op = &v9fs_dentry_operations; |
| @@ -886,8 +1010,8 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen) | |||
| 886 | } | 1010 | } |
| 887 | 1011 | ||
| 888 | /* copy extension buffer into buffer */ | 1012 | /* copy extension buffer into buffer */ |
| 889 | if (fcall->params.rstat.stat.extension.len+1 < buflen) | 1013 | if (fcall->params.rstat.stat.extension.len < buflen) |
| 890 | buflen = fcall->params.rstat.stat.extension.len + 1; | 1014 | buflen = fcall->params.rstat.stat.extension.len; |
| 891 | 1015 | ||
| 892 | memcpy(buffer, fcall->params.rstat.stat.extension.str, buflen - 1); | 1016 | memcpy(buffer, fcall->params.rstat.stat.extension.str, buflen - 1); |
| 893 | buffer[buflen-1] = 0; | 1017 | buffer[buflen-1] = 0; |
| @@ -951,7 +1075,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd) | |||
| 951 | if (!link) | 1075 | if (!link) |
| 952 | link = ERR_PTR(-ENOMEM); | 1076 | link = ERR_PTR(-ENOMEM); |
| 953 | else { | 1077 | else { |
| 954 | len = v9fs_readlink(dentry, link, PATH_MAX); | 1078 | len = v9fs_readlink(dentry, link, strlen(link)); |
| 955 | 1079 | ||
| 956 | if (len < 0) { | 1080 | if (len < 0) { |
| 957 | __putname(link); | 1081 | __putname(link); |
| @@ -983,53 +1107,75 @@ static void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void | |||
| 983 | static int v9fs_vfs_mkspecial(struct inode *dir, struct dentry *dentry, | 1107 | static int v9fs_vfs_mkspecial(struct inode *dir, struct dentry *dentry, |
| 984 | int mode, const char *extension) | 1108 | int mode, const char *extension) |
| 985 | { | 1109 | { |
| 986 | int err, retval; | 1110 | int err; |
| 1111 | u32 fid, perm; | ||
| 987 | struct v9fs_session_info *v9ses; | 1112 | struct v9fs_session_info *v9ses; |
| 1113 | struct v9fs_fid *dfid, *vfid; | ||
| 1114 | struct inode *inode; | ||
| 988 | struct v9fs_fcall *fcall; | 1115 | struct v9fs_fcall *fcall; |
| 989 | struct v9fs_fid *fid; | ||
| 990 | struct v9fs_wstat wstat; | 1116 | struct v9fs_wstat wstat; |
| 991 | 1117 | ||
| 992 | v9ses = v9fs_inode2v9ses(dir); | ||
| 993 | retval = -EPERM; | ||
| 994 | fcall = NULL; | 1118 | fcall = NULL; |
| 1119 | inode = NULL; | ||
| 1120 | vfid = NULL; | ||
| 1121 | v9ses = v9fs_inode2v9ses(dir); | ||
| 1122 | dfid = v9fs_fid_lookup(dentry->d_parent); | ||
| 1123 | perm = unixmode2p9mode(v9ses, mode); | ||
| 995 | 1124 | ||
| 996 | if (!v9ses->extended) { | 1125 | if (!v9ses->extended) { |
| 997 | dprintk(DEBUG_ERROR, "not extended\n"); | 1126 | dprintk(DEBUG_ERROR, "not extended\n"); |
| 998 | goto free_mem; | 1127 | return -EPERM; |
| 999 | } | 1128 | } |
| 1000 | 1129 | ||
| 1001 | /* issue a create */ | 1130 | err = v9fs_create(v9ses, dfid->fid, (char *) dentry->d_name.name, |
| 1002 | retval = v9fs_create(dir, dentry, mode, 0); | 1131 | perm, V9FS_OREAD, &fid, NULL, NULL); |
| 1003 | if (retval != 0) | ||
| 1004 | goto free_mem; | ||
| 1005 | 1132 | ||
| 1006 | fid = v9fs_fid_get_created(dentry); | 1133 | if (err) |
| 1007 | if (!fid) { | 1134 | goto error; |
| 1008 | dprintk(DEBUG_ERROR, "couldn't resolve fid from dentry\n"); | 1135 | |
| 1009 | goto free_mem; | 1136 | err = v9fs_t_clunk(v9ses, fid); |
| 1137 | if (err) | ||
| 1138 | goto error; | ||
| 1139 | |||
| 1140 | vfid = v9fs_clone_walk(v9ses, dfid->fid, dentry); | ||
| 1141 | if (IS_ERR(vfid)) { | ||
| 1142 | err = PTR_ERR(vfid); | ||
| 1143 | vfid = NULL; | ||
| 1144 | goto error; | ||
| 1145 | } | ||
| 1146 | |||
| 1147 | inode = v9fs_inode_from_fid(v9ses, vfid->fid, dir->i_sb); | ||
| 1148 | if (IS_ERR(inode)) { | ||
| 1149 | err = PTR_ERR(inode); | ||
| 1150 | inode = NULL; | ||
| 1151 | goto error; | ||
| 1010 | } | 1152 | } |
| 1011 | 1153 | ||
| 1012 | /* issue a Twstat */ | 1154 | /* issue a Twstat */ |
| 1013 | v9fs_blank_wstat(&wstat); | 1155 | v9fs_blank_wstat(&wstat); |
| 1014 | wstat.muid = v9ses->name; | 1156 | wstat.muid = v9ses->name; |
| 1015 | wstat.extension = (char *) extension; | 1157 | wstat.extension = (char *) extension; |
| 1016 | retval = v9fs_t_wstat(v9ses, fid->fid, &wstat, &fcall); | 1158 | err = v9fs_t_wstat(v9ses, vfid->fid, &wstat, &fcall); |
| 1017 | if (retval < 0) { | ||
| 1018 | PRINT_FCALL_ERROR("wstat error", fcall); | ||
| 1019 | goto free_mem; | ||
| 1020 | } | ||
| 1021 | |||
| 1022 | err = v9fs_t_clunk(v9ses, fid->fid); | ||
| 1023 | if (err < 0) { | 1159 | if (err < 0) { |
| 1024 | dprintk(DEBUG_ERROR, "clunk failed: %d\n", err); | 1160 | PRINT_FCALL_ERROR("wstat error", fcall); |
| 1025 | goto free_mem; | 1161 | goto error; |
| 1026 | } | 1162 | } |
| 1027 | 1163 | ||
| 1028 | d_drop(dentry); /* FID - will this also clunk? */ | 1164 | kfree(fcall); |
| 1165 | dentry->d_op = &v9fs_dentry_operations; | ||
| 1166 | d_instantiate(dentry, inode); | ||
| 1167 | return 0; | ||
| 1029 | 1168 | ||
| 1030 | free_mem: | 1169 | error: |
| 1031 | kfree(fcall); | 1170 | kfree(fcall); |
| 1032 | return retval; | 1171 | if (vfid) |
| 1172 | v9fs_fid_destroy(vfid); | ||
| 1173 | |||
| 1174 | if (inode) | ||
| 1175 | iput(inode); | ||
| 1176 | |||
| 1177 | return err; | ||
| 1178 | |||
| 1033 | } | 1179 | } |
| 1034 | 1180 | ||
| 1035 | /** | 1181 | /** |
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c index 2c4fa75be025..cdf787ee08de 100644 --- a/fs/9p/vfs_super.c +++ b/fs/9p/vfs_super.c | |||
| @@ -146,7 +146,6 @@ static struct super_block *v9fs_get_sb(struct file_system_type | |||
| 146 | inode->i_gid = gid; | 146 | inode->i_gid = gid; |
| 147 | 147 | ||
| 148 | root = d_alloc_root(inode); | 148 | root = d_alloc_root(inode); |
| 149 | |||
| 150 | if (!root) { | 149 | if (!root) { |
| 151 | retval = -ENOMEM; | 150 | retval = -ENOMEM; |
| 152 | goto put_back_sb; | 151 | goto put_back_sb; |
| @@ -157,16 +156,22 @@ static struct super_block *v9fs_get_sb(struct file_system_type | |||
| 157 | stat_result = v9fs_t_stat(v9ses, newfid, &fcall); | 156 | stat_result = v9fs_t_stat(v9ses, newfid, &fcall); |
| 158 | if (stat_result < 0) { | 157 | if (stat_result < 0) { |
| 159 | dprintk(DEBUG_ERROR, "stat error\n"); | 158 | dprintk(DEBUG_ERROR, "stat error\n"); |
| 159 | kfree(fcall); | ||
| 160 | v9fs_t_clunk(v9ses, newfid); | 160 | v9fs_t_clunk(v9ses, newfid); |
| 161 | v9fs_put_idpool(newfid, &v9ses->fidpool); | ||
| 162 | } else { | 161 | } else { |
| 163 | /* Setup the Root Inode */ | 162 | /* Setup the Root Inode */ |
| 164 | root_fid = v9fs_fid_create(root, v9ses, newfid, 0); | 163 | root_fid = v9fs_fid_create(v9ses, newfid); |
| 165 | if (root_fid == NULL) { | 164 | if (root_fid == NULL) { |
| 166 | retval = -ENOMEM; | 165 | retval = -ENOMEM; |
| 167 | goto put_back_sb; | 166 | goto put_back_sb; |
| 168 | } | 167 | } |
| 169 | 168 | ||
| 169 | retval = v9fs_fid_insert(root_fid, root); | ||
| 170 | if (retval < 0) { | ||
| 171 | kfree(fcall); | ||
| 172 | goto put_back_sb; | ||
| 173 | } | ||
| 174 | |||
| 170 | root_fid->qid = fcall->params.rstat.stat.qid; | 175 | root_fid->qid = fcall->params.rstat.stat.qid; |
| 171 | root->d_inode->i_ino = | 176 | root->d_inode->i_ino = |
| 172 | v9fs_qid2ino(&fcall->params.rstat.stat.qid); | 177 | v9fs_qid2ino(&fcall->params.rstat.stat.qid); |
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 1b117a441298..c2eac2a50bd2 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
| @@ -938,6 +938,11 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs) | |||
| 938 | kfree(elf_interpreter); | 938 | kfree(elf_interpreter); |
| 939 | } else { | 939 | } else { |
| 940 | elf_entry = loc->elf_ex.e_entry; | 940 | elf_entry = loc->elf_ex.e_entry; |
| 941 | if (BAD_ADDR(elf_entry)) { | ||
| 942 | send_sig(SIGSEGV, current, 0); | ||
| 943 | retval = -ENOEXEC; /* Nobody gets to see this, but.. */ | ||
| 944 | goto out_free_dentry; | ||
| 945 | } | ||
| 941 | } | 946 | } |
| 942 | 947 | ||
| 943 | kfree(elf_phdata); | 948 | kfree(elf_phdata); |
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 057e60217fc5..537ac70edfe5 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -2531,18 +2531,9 @@ static int rtc_ioctl(unsigned fd, unsigned cmd, unsigned long arg) | |||
| 2531 | val32 = kval; | 2531 | val32 = kval; |
| 2532 | return put_user(val32, (unsigned int __user *)arg); | 2532 | return put_user(val32, (unsigned int __user *)arg); |
| 2533 | case RTC_IRQP_SET32: | 2533 | case RTC_IRQP_SET32: |
| 2534 | return sys_ioctl(fd, RTC_IRQP_SET, arg); | ||
| 2534 | case RTC_EPOCH_SET32: | 2535 | case RTC_EPOCH_SET32: |
| 2535 | ret = get_user(val32, (unsigned int __user *)arg); | 2536 | return sys_ioctl(fd, RTC_EPOCH_SET, arg); |
| 2536 | if (ret) | ||
| 2537 | return ret; | ||
| 2538 | kval = val32; | ||
| 2539 | |||
| 2540 | set_fs(KERNEL_DS); | ||
| 2541 | ret = sys_ioctl(fd, (cmd == RTC_IRQP_SET32) ? | ||
| 2542 | RTC_IRQP_SET : RTC_EPOCH_SET, | ||
| 2543 | (unsigned long)&kval); | ||
| 2544 | set_fs(oldfs); | ||
| 2545 | return ret; | ||
| 2546 | default: | 2537 | default: |
| 2547 | /* unreached */ | 2538 | /* unreached */ |
| 2548 | return -ENOIOCTLCMD; | 2539 | return -ENOIOCTLCMD; |
| @@ -885,6 +885,12 @@ int flush_old_exec(struct linux_binprm * bprm) | |||
| 885 | current->flags &= ~PF_RANDOMIZE; | 885 | current->flags &= ~PF_RANDOMIZE; |
| 886 | flush_thread(); | 886 | flush_thread(); |
| 887 | 887 | ||
| 888 | /* Set the new mm task size. We have to do that late because it may | ||
| 889 | * depend on TIF_32BIT which is only updated in flush_thread() on | ||
| 890 | * some architectures like powerpc | ||
| 891 | */ | ||
| 892 | current->mm->task_size = TASK_SIZE; | ||
| 893 | |||
| 888 | if (bprm->e_uid != current->euid || bprm->e_gid != current->egid || | 894 | if (bprm->e_uid != current->euid || bprm->e_gid != current->egid || |
| 889 | file_permission(bprm->file, MAY_READ) || | 895 | file_permission(bprm->file, MAY_READ) || |
| 890 | (bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP)) { | 896 | (bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP)) { |
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 21fd59c7bc24..c72a8a97935c 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c | |||
| @@ -111,6 +111,8 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd) | |||
| 111 | 111 | ||
| 112 | /* Doesn't hurt to "reset" the validity timeout */ | 112 | /* Doesn't hurt to "reset" the validity timeout */ |
| 113 | fuse_invalidate_entry_cache(entry); | 113 | fuse_invalidate_entry_cache(entry); |
| 114 | |||
| 115 | /* For negative dentries, always do a fresh lookup */ | ||
| 114 | if (!inode) | 116 | if (!inode) |
| 115 | return 0; | 117 | return 0; |
| 116 | 118 | ||
| @@ -122,6 +124,9 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd) | |||
| 122 | fuse_lookup_init(req, entry->d_parent->d_inode, entry, &outarg); | 124 | fuse_lookup_init(req, entry->d_parent->d_inode, entry, &outarg); |
| 123 | request_send(fc, req); | 125 | request_send(fc, req); |
| 124 | err = req->out.h.error; | 126 | err = req->out.h.error; |
| 127 | /* Zero nodeid is same as -ENOENT */ | ||
| 128 | if (!err && !outarg.nodeid) | ||
| 129 | err = -ENOENT; | ||
| 125 | if (!err) { | 130 | if (!err) { |
| 126 | struct fuse_inode *fi = get_fuse_inode(inode); | 131 | struct fuse_inode *fi = get_fuse_inode(inode); |
| 127 | if (outarg.nodeid != get_node_id(inode)) { | 132 | if (outarg.nodeid != get_node_id(inode)) { |
| @@ -190,8 +195,9 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry, | |||
| 190 | fuse_lookup_init(req, dir, entry, &outarg); | 195 | fuse_lookup_init(req, dir, entry, &outarg); |
| 191 | request_send(fc, req); | 196 | request_send(fc, req); |
| 192 | err = req->out.h.error; | 197 | err = req->out.h.error; |
| 193 | if (!err && ((outarg.nodeid && invalid_nodeid(outarg.nodeid)) || | 198 | /* Zero nodeid is same as -ENOENT, but with valid timeout */ |
| 194 | !valid_mode(outarg.attr.mode))) | 199 | if (!err && outarg.nodeid && |
| 200 | (invalid_nodeid(outarg.nodeid) || !valid_mode(outarg.attr.mode))) | ||
| 195 | err = -EIO; | 201 | err = -EIO; |
| 196 | if (!err && outarg.nodeid) { | 202 | if (!err && outarg.nodeid) { |
| 197 | inode = fuse_iget(dir->i_sb, outarg.nodeid, outarg.generation, | 203 | inode = fuse_iget(dir->i_sb, outarg.nodeid, outarg.generation, |
diff --git a/fs/namei.c b/fs/namei.c index e28de846c591..557dcf395ca1 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
| @@ -2224,13 +2224,17 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_de | |||
| 2224 | * and other special files. --ADM | 2224 | * and other special files. --ADM |
| 2225 | */ | 2225 | */ |
| 2226 | asmlinkage long sys_linkat(int olddfd, const char __user *oldname, | 2226 | asmlinkage long sys_linkat(int olddfd, const char __user *oldname, |
| 2227 | int newdfd, const char __user *newname) | 2227 | int newdfd, const char __user *newname, |
| 2228 | int flags) | ||
| 2228 | { | 2229 | { |
| 2229 | struct dentry *new_dentry; | 2230 | struct dentry *new_dentry; |
| 2230 | struct nameidata nd, old_nd; | 2231 | struct nameidata nd, old_nd; |
| 2231 | int error; | 2232 | int error; |
| 2232 | char * to; | 2233 | char * to; |
| 2233 | 2234 | ||
| 2235 | if (flags != 0) | ||
| 2236 | return -EINVAL; | ||
| 2237 | |||
| 2234 | to = getname(newname); | 2238 | to = getname(newname); |
| 2235 | if (IS_ERR(to)) | 2239 | if (IS_ERR(to)) |
| 2236 | return PTR_ERR(to); | 2240 | return PTR_ERR(to); |
| @@ -2263,7 +2267,7 @@ exit: | |||
| 2263 | 2267 | ||
| 2264 | asmlinkage long sys_link(const char __user *oldname, const char __user *newname) | 2268 | asmlinkage long sys_link(const char __user *oldname, const char __user *newname) |
| 2265 | { | 2269 | { |
| 2266 | return sys_linkat(AT_FDCWD, oldname, AT_FDCWD, newname); | 2270 | return sys_linkat(AT_FDCWD, oldname, AT_FDCWD, newname, 0); |
| 2267 | } | 2271 | } |
| 2268 | 2272 | ||
| 2269 | /* | 2273 | /* |
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog index 02f44094bda9..9d8ffa89e2c2 100644 --- a/fs/ntfs/ChangeLog +++ b/fs/ntfs/ChangeLog | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | ToDo/Notes: | 1 | ToDo/Notes: |
| 2 | - Find and fix bugs. | 2 | - Find and fix bugs. |
| 3 | - The only places in the kernel where a file is resized are | 3 | - The only places in the kernel where a file is resized are |
| 4 | ntfs_file_write*() and ntfs_truncate() for both of which i_sem is | 4 | ntfs_file_write*() and ntfs_truncate() for both of which i_mutex is |
| 5 | held. Just have to be careful in read-/writepage and other helpers | 5 | held. Just have to be careful in read-/writepage and other helpers |
| 6 | not running under i_sem that we play nice... Also need to be careful | 6 | not running under i_mutex that we play nice. Also need to be careful |
| 7 | with initialized_size extension in ntfs_file_write*() and writepage. | 7 | with initialized_size extension in ntfs_file_write*() and writepage. |
| 8 | UPDATE: The only things that need to be checked are the compressed | 8 | UPDATE: The only things that need to be checked are the compressed |
| 9 | write and the other attribute resize/write cases like index | 9 | write and the other attribute resize/write cases like index |
| @@ -19,6 +19,24 @@ ToDo/Notes: | |||
| 19 | - Enable the code for setting the NT4 compatibility flag when we start | 19 | - Enable the code for setting the NT4 compatibility flag when we start |
| 20 | making NTFS 1.2 specific modifications. | 20 | making NTFS 1.2 specific modifications. |
| 21 | 21 | ||
| 22 | 2.1.26 - Minor bug fixes and updates. | ||
| 23 | |||
| 24 | - Fix a potential overflow in file.c where a cast to s64 was missing in | ||
| 25 | a left shift of a page index. | ||
| 26 | - The struct inode has had its i_sem semaphore changed to a mutex named | ||
| 27 | i_mutex. | ||
| 28 | - We have struct kmem_cache now so use it instead of the typedef | ||
| 29 | kmem_cache_t. (Pekka Enberg) | ||
| 30 | - Implement support for sector sizes above 512 bytes (up to the maximum | ||
| 31 | supported by NTFS which is 4096 bytes). | ||
| 32 | - Do more detailed reporting of why we cannot mount read-write by | ||
| 33 | special casing the VOLUME_MODIFIED_BY_CHKDSK flag. | ||
| 34 | - Miscellaneous updates to layout.h. | ||
| 35 | - Cope with attribute list attribute having invalid flags. Windows | ||
| 36 | copes with this and even chkdsk does not detect or fix this so we | ||
| 37 | have to cope with it, too. Thanks to Pawel Kot for reporting the | ||
| 38 | problem. | ||
| 39 | |||
| 22 | 2.1.25 - (Almost) fully implement write(2) and truncate(2). | 40 | 2.1.25 - (Almost) fully implement write(2) and truncate(2). |
| 23 | 41 | ||
| 24 | - Change ntfs_map_runlist_nolock(), ntfs_attr_find_vcn_nolock() and | 42 | - Change ntfs_map_runlist_nolock(), ntfs_attr_find_vcn_nolock() and |
| @@ -373,7 +391,7 @@ ToDo/Notes: | |||
| 373 | single one of them had an mst error. (Thanks to Ken MacFerrin for | 391 | single one of them had an mst error. (Thanks to Ken MacFerrin for |
| 374 | the bug report.) | 392 | the bug report.) |
| 375 | - Fix error handling in fs/ntfs/quota.c::ntfs_mark_quotas_out_of_date() | 393 | - Fix error handling in fs/ntfs/quota.c::ntfs_mark_quotas_out_of_date() |
| 376 | where we failed to release i_sem on the $Quota/$Q attribute inode. | 394 | where we failed to release i_mutex on the $Quota/$Q attribute inode. |
| 377 | - Fix bug in handling of bad inodes in fs/ntfs/namei.c::ntfs_lookup(). | 395 | - Fix bug in handling of bad inodes in fs/ntfs/namei.c::ntfs_lookup(). |
| 378 | - Add mapping of unmapped buffers to all remaining code paths, i.e. | 396 | - Add mapping of unmapped buffers to all remaining code paths, i.e. |
| 379 | fs/ntfs/aops.c::ntfs_write_mst_block(), mft.c::ntfs_sync_mft_mirror(), | 397 | fs/ntfs/aops.c::ntfs_write_mst_block(), mft.c::ntfs_sync_mft_mirror(), |
| @@ -874,7 +892,7 @@ ToDo/Notes: | |||
| 874 | clusters. (Philipp Thomas) | 892 | clusters. (Philipp Thomas) |
| 875 | - attrib.c::load_attribute_list(): Fix bug when initialized_size is a | 893 | - attrib.c::load_attribute_list(): Fix bug when initialized_size is a |
| 876 | multiple of the block_size but not the cluster size. (Szabolcs | 894 | multiple of the block_size but not the cluster size. (Szabolcs |
| 877 | Szakacsits <szaka@sienet.hu>) | 895 | Szakacsits) |
| 878 | 896 | ||
| 879 | 2.1.2 - Important bug fixes aleviating the hangs in statfs. | 897 | 2.1.2 - Important bug fixes aleviating the hangs in statfs. |
| 880 | 898 | ||
| @@ -884,7 +902,7 @@ ToDo/Notes: | |||
| 884 | 902 | ||
| 885 | - Add handling for initialized_size != data_size in compressed files. | 903 | - Add handling for initialized_size != data_size in compressed files. |
| 886 | - Reduce function local stack usage from 0x3d4 bytes to just noise in | 904 | - Reduce function local stack usage from 0x3d4 bytes to just noise in |
| 887 | fs/ntfs/upcase.c. (Randy Dunlap <rdunlap@xenotime.net>) | 905 | fs/ntfs/upcase.c. (Randy Dunlap) |
| 888 | - Remove compiler warnings for newer gcc. | 906 | - Remove compiler warnings for newer gcc. |
| 889 | - Pages are no longer kmapped by mm/filemap.c::generic_file_write() | 907 | - Pages are no longer kmapped by mm/filemap.c::generic_file_write() |
| 890 | around calls to ->{prepare,commit}_write. Adapt NTFS appropriately | 908 | around calls to ->{prepare,commit}_write. Adapt NTFS appropriately |
| @@ -1201,11 +1219,11 @@ ToDo/Notes: | |||
| 1201 | the kernel. We probably want a kernel generic init_address_space() | 1219 | the kernel. We probably want a kernel generic init_address_space() |
| 1202 | function... | 1220 | function... |
| 1203 | - Drop BKL from ntfs_readdir() after consultation with Al Viro. The | 1221 | - Drop BKL from ntfs_readdir() after consultation with Al Viro. The |
| 1204 | only caller of ->readdir() is vfs_readdir() which holds i_sem during | 1222 | only caller of ->readdir() is vfs_readdir() which holds i_mutex |
| 1205 | the call, and i_sem is sufficient protection against changes in the | 1223 | during the call, and i_mutex is sufficient protection against changes |
| 1206 | directory inode (including ->i_size). | 1224 | in the directory inode (including ->i_size). |
| 1207 | - Use generic_file_llseek() for directories (as opposed to | 1225 | - Use generic_file_llseek() for directories (as opposed to |
| 1208 | default_llseek()) as this downs i_sem instead of the BKL which is | 1226 | default_llseek()) as this downs i_mutex instead of the BKL which is |
| 1209 | what we now need for exclusion against ->f_pos changes considering we | 1227 | what we now need for exclusion against ->f_pos changes considering we |
| 1210 | no longer take the BKL in ntfs_readdir(). | 1228 | no longer take the BKL in ntfs_readdir(). |
| 1211 | 1229 | ||
diff --git a/fs/ntfs/Makefile b/fs/ntfs/Makefile index d0d45d1c853a..d95fac7fdeb6 100644 --- a/fs/ntfs/Makefile +++ b/fs/ntfs/Makefile | |||
| @@ -6,7 +6,7 @@ ntfs-objs := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \ | |||
| 6 | index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \ | 6 | index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \ |
| 7 | unistr.o upcase.o | 7 | unistr.o upcase.o |
| 8 | 8 | ||
| 9 | EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.25\" | 9 | EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.26\" |
| 10 | 10 | ||
| 11 | ifeq ($(CONFIG_NTFS_DEBUG),y) | 11 | ifeq ($(CONFIG_NTFS_DEBUG),y) |
| 12 | EXTRA_CFLAGS += -DDEBUG | 12 | EXTRA_CFLAGS += -DDEBUG |
diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c index 1c0a4315876a..7e361da770b3 100644 --- a/fs/ntfs/aops.c +++ b/fs/ntfs/aops.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * aops.c - NTFS kernel address space operations and page cache handling. | 2 | * aops.c - NTFS kernel address space operations and page cache handling. |
| 3 | * Part of the Linux-NTFS project. | 3 | * Part of the Linux-NTFS project. |
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2005 Anton Altaparmakov | 5 | * Copyright (c) 2001-2006 Anton Altaparmakov |
| 6 | * Copyright (c) 2002 Richard Russon | 6 | * Copyright (c) 2002 Richard Russon |
| 7 | * | 7 | * |
| 8 | * This program/include file is free software; you can redistribute it and/or | 8 | * This program/include file is free software; you can redistribute it and/or |
| @@ -200,8 +200,8 @@ static int ntfs_read_block(struct page *page) | |||
| 200 | /* $MFT/$DATA must have its complete runlist in memory at all times. */ | 200 | /* $MFT/$DATA must have its complete runlist in memory at all times. */ |
| 201 | BUG_ON(!ni->runlist.rl && !ni->mft_no && !NInoAttr(ni)); | 201 | BUG_ON(!ni->runlist.rl && !ni->mft_no && !NInoAttr(ni)); |
| 202 | 202 | ||
| 203 | blocksize_bits = VFS_I(ni)->i_blkbits; | 203 | blocksize = vol->sb->s_blocksize; |
| 204 | blocksize = 1 << blocksize_bits; | 204 | blocksize_bits = vol->sb->s_blocksize_bits; |
| 205 | 205 | ||
| 206 | if (!page_has_buffers(page)) { | 206 | if (!page_has_buffers(page)) { |
| 207 | create_empty_buffers(page, blocksize, 0); | 207 | create_empty_buffers(page, blocksize, 0); |
| @@ -569,10 +569,8 @@ static int ntfs_write_block(struct page *page, struct writeback_control *wbc) | |||
| 569 | 569 | ||
| 570 | BUG_ON(!NInoNonResident(ni)); | 570 | BUG_ON(!NInoNonResident(ni)); |
| 571 | BUG_ON(NInoMstProtected(ni)); | 571 | BUG_ON(NInoMstProtected(ni)); |
| 572 | 572 | blocksize = vol->sb->s_blocksize; | |
| 573 | blocksize_bits = vi->i_blkbits; | 573 | blocksize_bits = vol->sb->s_blocksize_bits; |
| 574 | blocksize = 1 << blocksize_bits; | ||
| 575 | |||
| 576 | if (!page_has_buffers(page)) { | 574 | if (!page_has_buffers(page)) { |
| 577 | BUG_ON(!PageUptodate(page)); | 575 | BUG_ON(!PageUptodate(page)); |
| 578 | create_empty_buffers(page, blocksize, | 576 | create_empty_buffers(page, blocksize, |
| @@ -949,8 +947,8 @@ static int ntfs_write_mst_block(struct page *page, | |||
| 949 | */ | 947 | */ |
| 950 | BUG_ON(!(is_mft || S_ISDIR(vi->i_mode) || | 948 | BUG_ON(!(is_mft || S_ISDIR(vi->i_mode) || |
| 951 | (NInoAttr(ni) && ni->type == AT_INDEX_ALLOCATION))); | 949 | (NInoAttr(ni) && ni->type == AT_INDEX_ALLOCATION))); |
| 952 | bh_size_bits = vi->i_blkbits; | 950 | bh_size = vol->sb->s_blocksize; |
| 953 | bh_size = 1 << bh_size_bits; | 951 | bh_size_bits = vol->sb->s_blocksize_bits; |
| 954 | max_bhs = PAGE_CACHE_SIZE / bh_size; | 952 | max_bhs = PAGE_CACHE_SIZE / bh_size; |
| 955 | BUG_ON(!max_bhs); | 953 | BUG_ON(!max_bhs); |
| 956 | BUG_ON(max_bhs > MAX_BUF_PER_PAGE); | 954 | BUG_ON(max_bhs > MAX_BUF_PER_PAGE); |
| @@ -1596,7 +1594,7 @@ void mark_ntfs_record_dirty(struct page *page, const unsigned int ofs) { | |||
| 1596 | 1594 | ||
| 1597 | BUG_ON(!PageUptodate(page)); | 1595 | BUG_ON(!PageUptodate(page)); |
| 1598 | end = ofs + ni->itype.index.block_size; | 1596 | end = ofs + ni->itype.index.block_size; |
| 1599 | bh_size = 1 << VFS_I(ni)->i_blkbits; | 1597 | bh_size = VFS_I(ni)->i_sb->s_blocksize; |
| 1600 | spin_lock(&mapping->private_lock); | 1598 | spin_lock(&mapping->private_lock); |
| 1601 | if (unlikely(!page_has_buffers(page))) { | 1599 | if (unlikely(!page_has_buffers(page))) { |
| 1602 | spin_unlock(&mapping->private_lock); | 1600 | spin_unlock(&mapping->private_lock); |
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index fb413d3d8618..5027d3d1b3fe 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * file.c - NTFS kernel file operations. Part of the Linux-NTFS project. | 2 | * file.c - NTFS kernel file operations. Part of the Linux-NTFS project. |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2001-2005 Anton Altaparmakov | 4 | * Copyright (c) 2001-2006 Anton Altaparmakov |
| 5 | * | 5 | * |
| 6 | * This program/include file is free software; you can redistribute it and/or | 6 | * This program/include file is free software; you can redistribute it and/or |
| 7 | * modify it under the terms of the GNU General Public License as published | 7 | * modify it under the terms of the GNU General Public License as published |
| @@ -248,7 +248,7 @@ do_non_resident_extend: | |||
| 248 | * enough to make ntfs_writepage() work. | 248 | * enough to make ntfs_writepage() work. |
| 249 | */ | 249 | */ |
| 250 | write_lock_irqsave(&ni->size_lock, flags); | 250 | write_lock_irqsave(&ni->size_lock, flags); |
| 251 | ni->initialized_size = (index + 1) << PAGE_CACHE_SHIFT; | 251 | ni->initialized_size = (s64)(index + 1) << PAGE_CACHE_SHIFT; |
| 252 | if (ni->initialized_size > new_init_size) | 252 | if (ni->initialized_size > new_init_size) |
| 253 | ni->initialized_size = new_init_size; | 253 | ni->initialized_size = new_init_size; |
| 254 | write_unlock_irqrestore(&ni->size_lock, flags); | 254 | write_unlock_irqrestore(&ni->size_lock, flags); |
| @@ -529,8 +529,8 @@ static int ntfs_prepare_pages_for_non_resident_write(struct page **pages, | |||
| 529 | "index 0x%lx, nr_pages 0x%x, pos 0x%llx, bytes 0x%zx.", | 529 | "index 0x%lx, nr_pages 0x%x, pos 0x%llx, bytes 0x%zx.", |
| 530 | vi->i_ino, ni->type, pages[0]->index, nr_pages, | 530 | vi->i_ino, ni->type, pages[0]->index, nr_pages, |
| 531 | (long long)pos, bytes); | 531 | (long long)pos, bytes); |
| 532 | blocksize_bits = vi->i_blkbits; | 532 | blocksize = vol->sb->s_blocksize; |
| 533 | blocksize = 1 << blocksize_bits; | 533 | blocksize_bits = vol->sb->s_blocksize_bits; |
| 534 | u = 0; | 534 | u = 0; |
| 535 | do { | 535 | do { |
| 536 | struct page *page = pages[u]; | 536 | struct page *page = pages[u]; |
| @@ -1525,7 +1525,7 @@ static inline int ntfs_commit_pages_after_non_resident_write( | |||
| 1525 | 1525 | ||
| 1526 | vi = pages[0]->mapping->host; | 1526 | vi = pages[0]->mapping->host; |
| 1527 | ni = NTFS_I(vi); | 1527 | ni = NTFS_I(vi); |
| 1528 | blocksize = 1 << vi->i_blkbits; | 1528 | blocksize = vi->i_sb->s_blocksize; |
| 1529 | end = pos + bytes; | 1529 | end = pos + bytes; |
| 1530 | u = 0; | 1530 | u = 0; |
| 1531 | do { | 1531 | do { |
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index ea1bd3feea1b..55263b7de9c0 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c | |||
| @@ -677,13 +677,28 @@ static int ntfs_read_locked_inode(struct inode *vi) | |||
| 677 | ntfs_debug("Attribute list found in inode 0x%lx.", vi->i_ino); | 677 | ntfs_debug("Attribute list found in inode 0x%lx.", vi->i_ino); |
| 678 | NInoSetAttrList(ni); | 678 | NInoSetAttrList(ni); |
| 679 | a = ctx->attr; | 679 | a = ctx->attr; |
| 680 | if (a->flags & ATTR_IS_ENCRYPTED || | 680 | if (a->flags & ATTR_COMPRESSION_MASK) { |
| 681 | a->flags & ATTR_COMPRESSION_MASK || | ||
| 682 | a->flags & ATTR_IS_SPARSE) { | ||
| 683 | ntfs_error(vi->i_sb, "Attribute list attribute is " | 681 | ntfs_error(vi->i_sb, "Attribute list attribute is " |
| 684 | "compressed/encrypted/sparse."); | 682 | "compressed."); |
| 685 | goto unm_err_out; | 683 | goto unm_err_out; |
| 686 | } | 684 | } |
| 685 | if (a->flags & ATTR_IS_ENCRYPTED || | ||
| 686 | a->flags & ATTR_IS_SPARSE) { | ||
| 687 | if (a->non_resident) { | ||
| 688 | ntfs_error(vi->i_sb, "Non-resident attribute " | ||
| 689 | "list attribute is encrypted/" | ||
| 690 | "sparse."); | ||
| 691 | goto unm_err_out; | ||
| 692 | } | ||
| 693 | ntfs_warning(vi->i_sb, "Resident attribute list " | ||
| 694 | "attribute in inode 0x%lx is marked " | ||
| 695 | "encrypted/sparse which is not true. " | ||
| 696 | "However, Windows allows this and " | ||
| 697 | "chkdsk does not detect or correct it " | ||
| 698 | "so we will just ignore the invalid " | ||
| 699 | "flags and pretend they are not set.", | ||
| 700 | vi->i_ino); | ||
| 701 | } | ||
| 687 | /* Now allocate memory for the attribute list. */ | 702 | /* Now allocate memory for the attribute list. */ |
| 688 | ni->attr_list_size = (u32)ntfs_attr_size(a); | 703 | ni->attr_list_size = (u32)ntfs_attr_size(a); |
| 689 | ni->attr_list = ntfs_malloc_nofs(ni->attr_list_size); | 704 | ni->attr_list = ntfs_malloc_nofs(ni->attr_list_size); |
| @@ -1809,19 +1824,33 @@ int ntfs_read_inode_mount(struct inode *vi) | |||
| 1809 | } else /* if (!err) */ { | 1824 | } else /* if (!err) */ { |
| 1810 | ATTR_LIST_ENTRY *al_entry, *next_al_entry; | 1825 | ATTR_LIST_ENTRY *al_entry, *next_al_entry; |
| 1811 | u8 *al_end; | 1826 | u8 *al_end; |
| 1827 | static const char *es = " Not allowed. $MFT is corrupt. " | ||
| 1828 | "You should run chkdsk."; | ||
| 1812 | 1829 | ||
| 1813 | ntfs_debug("Attribute list attribute found in $MFT."); | 1830 | ntfs_debug("Attribute list attribute found in $MFT."); |
| 1814 | NInoSetAttrList(ni); | 1831 | NInoSetAttrList(ni); |
| 1815 | a = ctx->attr; | 1832 | a = ctx->attr; |
| 1816 | if (a->flags & ATTR_IS_ENCRYPTED || | 1833 | if (a->flags & ATTR_COMPRESSION_MASK) { |
| 1817 | a->flags & ATTR_COMPRESSION_MASK || | ||
| 1818 | a->flags & ATTR_IS_SPARSE) { | ||
| 1819 | ntfs_error(sb, "Attribute list attribute is " | 1834 | ntfs_error(sb, "Attribute list attribute is " |
| 1820 | "compressed/encrypted/sparse. Not " | 1835 | "compressed.%s", es); |
| 1821 | "allowed. $MFT is corrupt. You should " | ||
| 1822 | "run chkdsk."); | ||
| 1823 | goto put_err_out; | 1836 | goto put_err_out; |
| 1824 | } | 1837 | } |
| 1838 | if (a->flags & ATTR_IS_ENCRYPTED || | ||
| 1839 | a->flags & ATTR_IS_SPARSE) { | ||
| 1840 | if (a->non_resident) { | ||
| 1841 | ntfs_error(sb, "Non-resident attribute list " | ||
| 1842 | "attribute is encrypted/" | ||
| 1843 | "sparse.%s", es); | ||
| 1844 | goto put_err_out; | ||
| 1845 | } | ||
| 1846 | ntfs_warning(sb, "Resident attribute list attribute " | ||
| 1847 | "in $MFT system file is marked " | ||
| 1848 | "encrypted/sparse which is not true. " | ||
| 1849 | "However, Windows allows this and " | ||
| 1850 | "chkdsk does not detect or correct it " | ||
| 1851 | "so we will just ignore the invalid " | ||
| 1852 | "flags and pretend they are not set."); | ||
| 1853 | } | ||
| 1825 | /* Now allocate memory for the attribute list. */ | 1854 | /* Now allocate memory for the attribute list. */ |
| 1826 | ni->attr_list_size = (u32)ntfs_attr_size(a); | 1855 | ni->attr_list_size = (u32)ntfs_attr_size(a); |
| 1827 | ni->attr_list = ntfs_malloc_nofs(ni->attr_list_size); | 1856 | ni->attr_list = ntfs_malloc_nofs(ni->attr_list_size); |
diff --git a/fs/ntfs/layout.h b/fs/ntfs/layout.h index f5678d5d7919..bb408d4dcbb0 100644 --- a/fs/ntfs/layout.h +++ b/fs/ntfs/layout.h | |||
| @@ -838,15 +838,19 @@ enum { | |||
| 838 | F_A_DEVICE, F_A_DIRECTORY, F_A_SPARSE_FILE, F_A_REPARSE_POINT, | 838 | F_A_DEVICE, F_A_DIRECTORY, F_A_SPARSE_FILE, F_A_REPARSE_POINT, |
| 839 | F_A_COMPRESSED, and F_A_ENCRYPTED and preserves the rest. This mask | 839 | F_A_COMPRESSED, and F_A_ENCRYPTED and preserves the rest. This mask |
| 840 | is used to to obtain all flags that are valid for setting. */ | 840 | is used to to obtain all flags that are valid for setting. */ |
| 841 | |||
| 842 | /* | 841 | /* |
| 843 | * The following flags are only present in the FILE_NAME attribute (in | 842 | * The following flag is only present in the FILE_NAME attribute (in |
| 844 | * the field file_attributes). | 843 | * the field file_attributes). |
| 845 | */ | 844 | */ |
| 846 | FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT = const_cpu_to_le32(0x10000000), | 845 | FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT = const_cpu_to_le32(0x10000000), |
| 847 | /* Note, this is a copy of the corresponding bit from the mft record, | 846 | /* Note, this is a copy of the corresponding bit from the mft record, |
| 848 | telling us whether this is a directory or not, i.e. whether it has | 847 | telling us whether this is a directory or not, i.e. whether it has |
| 849 | an index root attribute or not. */ | 848 | an index root attribute or not. */ |
| 849 | /* | ||
| 850 | * The following flag is present both in the STANDARD_INFORMATION | ||
| 851 | * attribute and in the FILE_NAME attribute (in the field | ||
| 852 | * file_attributes). | ||
| 853 | */ | ||
| 850 | FILE_ATTR_DUP_VIEW_INDEX_PRESENT = const_cpu_to_le32(0x20000000), | 854 | FILE_ATTR_DUP_VIEW_INDEX_PRESENT = const_cpu_to_le32(0x20000000), |
| 851 | /* Note, this is a copy of the corresponding bit from the mft record, | 855 | /* Note, this is a copy of the corresponding bit from the mft record, |
| 852 | telling us whether this file has a view index present (eg. object id | 856 | telling us whether this file has a view index present (eg. object id |
| @@ -1071,9 +1075,15 @@ typedef struct { | |||
| 1071 | modified. */ | 1075 | modified. */ |
| 1072 | /* 20*/ sle64 last_access_time; /* Time this mft record was last | 1076 | /* 20*/ sle64 last_access_time; /* Time this mft record was last |
| 1073 | accessed. */ | 1077 | accessed. */ |
| 1074 | /* 28*/ sle64 allocated_size; /* Byte size of allocated space for the | 1078 | /* 28*/ sle64 allocated_size; /* Byte size of on-disk allocated space |
| 1075 | data attribute. NOTE: Is a multiple | 1079 | for the data attribute. So for |
| 1076 | of the cluster size. */ | 1080 | normal $DATA, this is the |
| 1081 | allocated_size from the unnamed | ||
| 1082 | $DATA attribute and for compressed | ||
| 1083 | and/or sparse $DATA, this is the | ||
| 1084 | compressed_size from the unnamed | ||
| 1085 | $DATA attribute. NOTE: This is a | ||
| 1086 | multiple of the cluster size. */ | ||
| 1077 | /* 30*/ sle64 data_size; /* Byte size of actual data in data | 1087 | /* 30*/ sle64 data_size; /* Byte size of actual data in data |
| 1078 | attribute. */ | 1088 | attribute. */ |
| 1079 | /* 38*/ FILE_ATTR_FLAGS file_attributes; /* Flags describing the file. */ | 1089 | /* 38*/ FILE_ATTR_FLAGS file_attributes; /* Flags describing the file. */ |
| @@ -1904,12 +1914,13 @@ enum { | |||
| 1904 | VOLUME_DELETE_USN_UNDERWAY = const_cpu_to_le16(0x0010), | 1914 | VOLUME_DELETE_USN_UNDERWAY = const_cpu_to_le16(0x0010), |
| 1905 | VOLUME_REPAIR_OBJECT_ID = const_cpu_to_le16(0x0020), | 1915 | VOLUME_REPAIR_OBJECT_ID = const_cpu_to_le16(0x0020), |
| 1906 | 1916 | ||
| 1917 | VOLUME_CHKDSK_UNDERWAY = const_cpu_to_le16(0x4000), | ||
| 1907 | VOLUME_MODIFIED_BY_CHKDSK = const_cpu_to_le16(0x8000), | 1918 | VOLUME_MODIFIED_BY_CHKDSK = const_cpu_to_le16(0x8000), |
| 1908 | 1919 | ||
| 1909 | VOLUME_FLAGS_MASK = const_cpu_to_le16(0x803f), | 1920 | VOLUME_FLAGS_MASK = const_cpu_to_le16(0xc03f), |
| 1910 | 1921 | ||
| 1911 | /* To make our life easier when checking if we must mount read-only. */ | 1922 | /* To make our life easier when checking if we must mount read-only. */ |
| 1912 | VOLUME_MUST_MOUNT_RO_MASK = const_cpu_to_le16(0x8027), | 1923 | VOLUME_MUST_MOUNT_RO_MASK = const_cpu_to_le16(0xc027), |
| 1913 | } __attribute__ ((__packed__)); | 1924 | } __attribute__ ((__packed__)); |
| 1914 | 1925 | ||
| 1915 | typedef le16 VOLUME_FLAGS; | 1926 | typedef le16 VOLUME_FLAGS; |
diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c index 0c65cbb8c5cf..6499aafc2258 100644 --- a/fs/ntfs/mft.c +++ b/fs/ntfs/mft.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /** | 1 | /** |
| 2 | * mft.c - NTFS kernel mft record operations. Part of the Linux-NTFS project. | 2 | * mft.c - NTFS kernel mft record operations. Part of the Linux-NTFS project. |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2001-2005 Anton Altaparmakov | 4 | * Copyright (c) 2001-2006 Anton Altaparmakov |
| 5 | * Copyright (c) 2002 Richard Russon | 5 | * Copyright (c) 2002 Richard Russon |
| 6 | * | 6 | * |
| 7 | * This program/include file is free software; you can redistribute it and/or | 7 | * This program/include file is free software; you can redistribute it and/or |
| @@ -473,7 +473,7 @@ int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no, | |||
| 473 | runlist_element *rl; | 473 | runlist_element *rl; |
| 474 | unsigned int block_start, block_end, m_start, m_end, page_ofs; | 474 | unsigned int block_start, block_end, m_start, m_end, page_ofs; |
| 475 | int i_bhs, nr_bhs, err = 0; | 475 | int i_bhs, nr_bhs, err = 0; |
| 476 | unsigned char blocksize_bits = vol->mftmirr_ino->i_blkbits; | 476 | unsigned char blocksize_bits = vol->sb->s_blocksize_bits; |
| 477 | 477 | ||
| 478 | ntfs_debug("Entering for inode 0x%lx.", mft_no); | 478 | ntfs_debug("Entering for inode 0x%lx.", mft_no); |
| 479 | BUG_ON(!max_bhs); | 479 | BUG_ON(!max_bhs); |
| @@ -672,8 +672,8 @@ int write_mft_record_nolock(ntfs_inode *ni, MFT_RECORD *m, int sync) | |||
| 672 | { | 672 | { |
| 673 | ntfs_volume *vol = ni->vol; | 673 | ntfs_volume *vol = ni->vol; |
| 674 | struct page *page = ni->page; | 674 | struct page *page = ni->page; |
| 675 | unsigned char blocksize_bits = vol->mft_ino->i_blkbits; | 675 | unsigned int blocksize = vol->sb->s_blocksize; |
| 676 | unsigned int blocksize = 1 << blocksize_bits; | 676 | unsigned char blocksize_bits = vol->sb->s_blocksize_bits; |
| 677 | int max_bhs = vol->mft_record_size / blocksize; | 677 | int max_bhs = vol->mft_record_size / blocksize; |
| 678 | struct buffer_head *bhs[max_bhs]; | 678 | struct buffer_head *bhs[max_bhs]; |
| 679 | struct buffer_head *bh, *head; | 679 | struct buffer_head *bh, *head; |
diff --git a/fs/ntfs/ntfs.h b/fs/ntfs/ntfs.h index 446b5014115c..653d2a5c4899 100644 --- a/fs/ntfs/ntfs.h +++ b/fs/ntfs/ntfs.h | |||
| @@ -50,11 +50,11 @@ typedef enum { | |||
| 50 | /* Global variables. */ | 50 | /* Global variables. */ |
| 51 | 51 | ||
| 52 | /* Slab caches (from super.c). */ | 52 | /* Slab caches (from super.c). */ |
| 53 | extern kmem_cache_t *ntfs_name_cache; | 53 | extern struct kmem_cache *ntfs_name_cache; |
| 54 | extern kmem_cache_t *ntfs_inode_cache; | 54 | extern struct kmem_cache *ntfs_inode_cache; |
| 55 | extern kmem_cache_t *ntfs_big_inode_cache; | 55 | extern struct kmem_cache *ntfs_big_inode_cache; |
| 56 | extern kmem_cache_t *ntfs_attr_ctx_cache; | 56 | extern struct kmem_cache *ntfs_attr_ctx_cache; |
| 57 | extern kmem_cache_t *ntfs_index_ctx_cache; | 57 | extern struct kmem_cache *ntfs_index_ctx_cache; |
| 58 | 58 | ||
| 59 | /* The various operations structs defined throughout the driver files. */ | 59 | /* The various operations structs defined throughout the driver files. */ |
| 60 | extern struct address_space_operations ntfs_aops; | 60 | extern struct address_space_operations ntfs_aops; |
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index c3a3f1a8310b..368a8ec10668 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * super.c - NTFS kernel super block handling. Part of the Linux-NTFS project. | 2 | * super.c - NTFS kernel super block handling. Part of the Linux-NTFS project. |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2001-2005 Anton Altaparmakov | 4 | * Copyright (c) 2001-2006 Anton Altaparmakov |
| 5 | * Copyright (c) 2001,2002 Richard Russon | 5 | * Copyright (c) 2001,2002 Richard Russon |
| 6 | * | 6 | * |
| 7 | * This program/include file is free software; you can redistribute it and/or | 7 | * This program/include file is free software; you can redistribute it and/or |
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/stddef.h> | 23 | #include <linux/stddef.h> |
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/string.h> | 26 | #include <linux/string.h> |
| 26 | #include <linux/spinlock.h> | 27 | #include <linux/spinlock.h> |
| 27 | #include <linux/blkdev.h> /* For bdev_hardsect_size(). */ | 28 | #include <linux/blkdev.h> /* For bdev_hardsect_size(). */ |
| @@ -471,9 +472,16 @@ static int ntfs_remount(struct super_block *sb, int *flags, char *opt) | |||
| 471 | ntfs_error(sb, "Volume is dirty and read-only%s", es); | 472 | ntfs_error(sb, "Volume is dirty and read-only%s", es); |
| 472 | return -EROFS; | 473 | return -EROFS; |
| 473 | } | 474 | } |
| 475 | if (vol->vol_flags & VOLUME_MODIFIED_BY_CHKDSK) { | ||
| 476 | ntfs_error(sb, "Volume has been modified by chkdsk " | ||
| 477 | "and is read-only%s", es); | ||
| 478 | return -EROFS; | ||
| 479 | } | ||
| 474 | if (vol->vol_flags & VOLUME_MUST_MOUNT_RO_MASK) { | 480 | if (vol->vol_flags & VOLUME_MUST_MOUNT_RO_MASK) { |
| 475 | ntfs_error(sb, "Volume has unsupported flags set and " | 481 | ntfs_error(sb, "Volume has unsupported flags set " |
| 476 | "is read-only%s", es); | 482 | "(0x%x) and is read-only%s", |
| 483 | (unsigned)le16_to_cpu(vol->vol_flags), | ||
| 484 | es); | ||
| 477 | return -EROFS; | 485 | return -EROFS; |
| 478 | } | 486 | } |
| 479 | if (ntfs_set_volume_flags(vol, VOLUME_IS_DIRTY)) { | 487 | if (ntfs_set_volume_flags(vol, VOLUME_IS_DIRTY)) { |
| @@ -641,7 +649,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb, | |||
| 641 | { | 649 | { |
| 642 | const char *read_err_str = "Unable to read %s boot sector."; | 650 | const char *read_err_str = "Unable to read %s boot sector."; |
| 643 | struct buffer_head *bh_primary, *bh_backup; | 651 | struct buffer_head *bh_primary, *bh_backup; |
| 644 | long nr_blocks = NTFS_SB(sb)->nr_blocks; | 652 | sector_t nr_blocks = NTFS_SB(sb)->nr_blocks; |
| 645 | 653 | ||
| 646 | /* Try to read primary boot sector. */ | 654 | /* Try to read primary boot sector. */ |
| 647 | if ((bh_primary = sb_bread(sb, 0))) { | 655 | if ((bh_primary = sb_bread(sb, 0))) { |
| @@ -688,13 +696,18 @@ hotfix_primary_boot_sector: | |||
| 688 | /* | 696 | /* |
| 689 | * If we managed to read sector zero and the volume is not | 697 | * If we managed to read sector zero and the volume is not |
| 690 | * read-only, copy the found, valid backup boot sector to the | 698 | * read-only, copy the found, valid backup boot sector to the |
| 691 | * primary boot sector. | 699 | * primary boot sector. Note we only copy the actual boot |
| 700 | * sector structure, not the actual whole device sector as that | ||
| 701 | * may be bigger and would potentially damage the $Boot system | ||
| 702 | * file (FIXME: Would be nice to know if the backup boot sector | ||
| 703 | * on a large sector device contains the whole boot loader or | ||
| 704 | * just the first 512 bytes). | ||
| 692 | */ | 705 | */ |
| 693 | if (!(sb->s_flags & MS_RDONLY)) { | 706 | if (!(sb->s_flags & MS_RDONLY)) { |
| 694 | ntfs_warning(sb, "Hot-fix: Recovering invalid primary " | 707 | ntfs_warning(sb, "Hot-fix: Recovering invalid primary " |
| 695 | "boot sector from backup copy."); | 708 | "boot sector from backup copy."); |
| 696 | memcpy(bh_primary->b_data, bh_backup->b_data, | 709 | memcpy(bh_primary->b_data, bh_backup->b_data, |
| 697 | sb->s_blocksize); | 710 | NTFS_BLOCK_SIZE); |
| 698 | mark_buffer_dirty(bh_primary); | 711 | mark_buffer_dirty(bh_primary); |
| 699 | sync_dirty_buffer(bh_primary); | 712 | sync_dirty_buffer(bh_primary); |
| 700 | if (buffer_uptodate(bh_primary)) { | 713 | if (buffer_uptodate(bh_primary)) { |
| @@ -733,9 +746,13 @@ static BOOL parse_ntfs_boot_sector(ntfs_volume *vol, const NTFS_BOOT_SECTOR *b) | |||
| 733 | vol->sector_size); | 746 | vol->sector_size); |
| 734 | ntfs_debug("vol->sector_size_bits = %i (0x%x)", vol->sector_size_bits, | 747 | ntfs_debug("vol->sector_size_bits = %i (0x%x)", vol->sector_size_bits, |
| 735 | vol->sector_size_bits); | 748 | vol->sector_size_bits); |
| 736 | if (vol->sector_size != vol->sb->s_blocksize) | 749 | if (vol->sector_size < vol->sb->s_blocksize) { |
| 737 | ntfs_warning(vol->sb, "The boot sector indicates a sector size " | 750 | ntfs_error(vol->sb, "Sector size (%i) is smaller than the " |
| 738 | "different from the device sector size."); | 751 | "device block size (%lu). This is not " |
| 752 | "supported. Sorry.", vol->sector_size, | ||
| 753 | vol->sb->s_blocksize); | ||
| 754 | return FALSE; | ||
| 755 | } | ||
| 739 | ntfs_debug("sectors_per_cluster = 0x%x", b->bpb.sectors_per_cluster); | 756 | ntfs_debug("sectors_per_cluster = 0x%x", b->bpb.sectors_per_cluster); |
| 740 | sectors_per_cluster_bits = ffs(b->bpb.sectors_per_cluster) - 1; | 757 | sectors_per_cluster_bits = ffs(b->bpb.sectors_per_cluster) - 1; |
| 741 | ntfs_debug("sectors_per_cluster_bits = 0x%x", | 758 | ntfs_debug("sectors_per_cluster_bits = 0x%x", |
| @@ -748,16 +765,11 @@ static BOOL parse_ntfs_boot_sector(ntfs_volume *vol, const NTFS_BOOT_SECTOR *b) | |||
| 748 | ntfs_debug("vol->cluster_size = %i (0x%x)", vol->cluster_size, | 765 | ntfs_debug("vol->cluster_size = %i (0x%x)", vol->cluster_size, |
| 749 | vol->cluster_size); | 766 | vol->cluster_size); |
| 750 | ntfs_debug("vol->cluster_size_mask = 0x%x", vol->cluster_size_mask); | 767 | ntfs_debug("vol->cluster_size_mask = 0x%x", vol->cluster_size_mask); |
| 751 | ntfs_debug("vol->cluster_size_bits = %i (0x%x)", | 768 | ntfs_debug("vol->cluster_size_bits = %i", vol->cluster_size_bits); |
| 752 | vol->cluster_size_bits, vol->cluster_size_bits); | 769 | if (vol->cluster_size < vol->sector_size) { |
| 753 | if (vol->sector_size > vol->cluster_size) { | 770 | ntfs_error(vol->sb, "Cluster size (%i) is smaller than the " |
| 754 | ntfs_error(vol->sb, "Sector sizes above the cluster size are " | 771 | "sector size (%i). This is not supported. " |
| 755 | "not supported. Sorry."); | 772 | "Sorry.", vol->cluster_size, vol->sector_size); |
| 756 | return FALSE; | ||
| 757 | } | ||
| 758 | if (vol->sb->s_blocksize > vol->cluster_size) { | ||
| 759 | ntfs_error(vol->sb, "Cluster sizes smaller than the device " | ||
| 760 | "sector size are not supported. Sorry."); | ||
| 761 | return FALSE; | 773 | return FALSE; |
| 762 | } | 774 | } |
| 763 | clusters_per_mft_record = b->clusters_per_mft_record; | 775 | clusters_per_mft_record = b->clusters_per_mft_record; |
| @@ -786,11 +798,18 @@ static BOOL parse_ntfs_boot_sector(ntfs_volume *vol, const NTFS_BOOT_SECTOR *b) | |||
| 786 | * we store $MFT/$DATA, the table of mft records in the page cache. | 798 | * we store $MFT/$DATA, the table of mft records in the page cache. |
| 787 | */ | 799 | */ |
| 788 | if (vol->mft_record_size > PAGE_CACHE_SIZE) { | 800 | if (vol->mft_record_size > PAGE_CACHE_SIZE) { |
| 789 | ntfs_error(vol->sb, "Mft record size %i (0x%x) exceeds the " | 801 | ntfs_error(vol->sb, "Mft record size (%i) exceeds the " |
| 790 | "page cache size on your system %lu (0x%lx). " | 802 | "PAGE_CACHE_SIZE on your system (%lu). " |
| 791 | "This is not supported. Sorry.", | 803 | "This is not supported. Sorry.", |
| 792 | vol->mft_record_size, vol->mft_record_size, | 804 | vol->mft_record_size, PAGE_CACHE_SIZE); |
| 793 | PAGE_CACHE_SIZE, PAGE_CACHE_SIZE); | 805 | return FALSE; |
| 806 | } | ||
| 807 | /* We cannot support mft record sizes below the sector size. */ | ||
| 808 | if (vol->mft_record_size < vol->sector_size) { | ||
| 809 | ntfs_error(vol->sb, "Mft record size (%i) is smaller than the " | ||
| 810 | "sector size (%i). This is not supported. " | ||
| 811 | "Sorry.", vol->mft_record_size, | ||
| 812 | vol->sector_size); | ||
| 794 | return FALSE; | 813 | return FALSE; |
| 795 | } | 814 | } |
| 796 | clusters_per_index_record = b->clusters_per_index_record; | 815 | clusters_per_index_record = b->clusters_per_index_record; |
| @@ -816,6 +835,14 @@ static BOOL parse_ntfs_boot_sector(ntfs_volume *vol, const NTFS_BOOT_SECTOR *b) | |||
| 816 | ntfs_debug("vol->index_record_size_bits = %i (0x%x)", | 835 | ntfs_debug("vol->index_record_size_bits = %i (0x%x)", |
| 817 | vol->index_record_size_bits, | 836 | vol->index_record_size_bits, |
| 818 | vol->index_record_size_bits); | 837 | vol->index_record_size_bits); |
| 838 | /* We cannot support index record sizes below the sector size. */ | ||
| 839 | if (vol->index_record_size < vol->sector_size) { | ||
| 840 | ntfs_error(vol->sb, "Index record size (%i) is smaller than " | ||
| 841 | "the sector size (%i). This is not " | ||
| 842 | "supported. Sorry.", vol->index_record_size, | ||
| 843 | vol->sector_size); | ||
| 844 | return FALSE; | ||
| 845 | } | ||
| 819 | /* | 846 | /* |
| 820 | * Get the size of the volume in clusters and check for 64-bit-ness. | 847 | * Get the size of the volume in clusters and check for 64-bit-ness. |
| 821 | * Windows currently only uses 32 bits to save the clusters so we do | 848 | * Windows currently only uses 32 bits to save the clusters so we do |
| @@ -845,15 +872,18 @@ static BOOL parse_ntfs_boot_sector(ntfs_volume *vol, const NTFS_BOOT_SECTOR *b) | |||
| 845 | } | 872 | } |
| 846 | ll = sle64_to_cpu(b->mft_lcn); | 873 | ll = sle64_to_cpu(b->mft_lcn); |
| 847 | if (ll >= vol->nr_clusters) { | 874 | if (ll >= vol->nr_clusters) { |
| 848 | ntfs_error(vol->sb, "MFT LCN is beyond end of volume. Weird."); | 875 | ntfs_error(vol->sb, "MFT LCN (%lli, 0x%llx) is beyond end of " |
| 876 | "volume. Weird.", (unsigned long long)ll, | ||
| 877 | (unsigned long long)ll); | ||
| 849 | return FALSE; | 878 | return FALSE; |
| 850 | } | 879 | } |
| 851 | vol->mft_lcn = ll; | 880 | vol->mft_lcn = ll; |
| 852 | ntfs_debug("vol->mft_lcn = 0x%llx", (long long)vol->mft_lcn); | 881 | ntfs_debug("vol->mft_lcn = 0x%llx", (long long)vol->mft_lcn); |
| 853 | ll = sle64_to_cpu(b->mftmirr_lcn); | 882 | ll = sle64_to_cpu(b->mftmirr_lcn); |
| 854 | if (ll >= vol->nr_clusters) { | 883 | if (ll >= vol->nr_clusters) { |
| 855 | ntfs_error(vol->sb, "MFTMirr LCN is beyond end of volume. " | 884 | ntfs_error(vol->sb, "MFTMirr LCN (%lli, 0x%llx) is beyond end " |
| 856 | "Weird."); | 885 | "of volume. Weird.", (unsigned long long)ll, |
| 886 | (unsigned long long)ll); | ||
| 857 | return FALSE; | 887 | return FALSE; |
| 858 | } | 888 | } |
| 859 | vol->mftmirr_lcn = ll; | 889 | vol->mftmirr_lcn = ll; |
| @@ -1822,11 +1852,24 @@ get_ctx_vol_failed: | |||
| 1822 | /* Make sure that no unsupported volume flags are set. */ | 1852 | /* Make sure that no unsupported volume flags are set. */ |
| 1823 | if (vol->vol_flags & VOLUME_MUST_MOUNT_RO_MASK) { | 1853 | if (vol->vol_flags & VOLUME_MUST_MOUNT_RO_MASK) { |
| 1824 | static const char *es1a = "Volume is dirty"; | 1854 | static const char *es1a = "Volume is dirty"; |
| 1825 | static const char *es1b = "Volume has unsupported flags set"; | 1855 | static const char *es1b = "Volume has been modified by chkdsk"; |
| 1826 | static const char *es2 = ". Run chkdsk and mount in Windows."; | 1856 | static const char *es1c = "Volume has unsupported flags set"; |
| 1827 | const char *es1; | 1857 | static const char *es2a = ". Run chkdsk and mount in Windows."; |
| 1828 | 1858 | static const char *es2b = ". Mount in Windows."; | |
| 1829 | es1 = vol->vol_flags & VOLUME_IS_DIRTY ? es1a : es1b; | 1859 | const char *es1, *es2; |
| 1860 | |||
| 1861 | es2 = es2a; | ||
| 1862 | if (vol->vol_flags & VOLUME_IS_DIRTY) | ||
| 1863 | es1 = es1a; | ||
| 1864 | else if (vol->vol_flags & VOLUME_MODIFIED_BY_CHKDSK) { | ||
| 1865 | es1 = es1b; | ||
| 1866 | es2 = es2b; | ||
| 1867 | } else { | ||
| 1868 | es1 = es1c; | ||
| 1869 | ntfs_warning(sb, "Unsupported volume flags 0x%x " | ||
| 1870 | "encountered.", | ||
| 1871 | (unsigned)le16_to_cpu(vol->vol_flags)); | ||
| 1872 | } | ||
| 1830 | /* If a read-write mount, convert it to a read-only mount. */ | 1873 | /* If a read-write mount, convert it to a read-only mount. */ |
| 1831 | if (!(sb->s_flags & MS_RDONLY)) { | 1874 | if (!(sb->s_flags & MS_RDONLY)) { |
| 1832 | if (!(vol->on_errors & (ON_ERRORS_REMOUNT_RO | | 1875 | if (!(vol->on_errors & (ON_ERRORS_REMOUNT_RO | |
| @@ -2685,7 +2728,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) | |||
| 2685 | ntfs_volume *vol; | 2728 | ntfs_volume *vol; |
| 2686 | struct buffer_head *bh; | 2729 | struct buffer_head *bh; |
| 2687 | struct inode *tmp_ino; | 2730 | struct inode *tmp_ino; |
| 2688 | int result; | 2731 | int blocksize, result; |
| 2689 | 2732 | ||
| 2690 | ntfs_debug("Entering."); | 2733 | ntfs_debug("Entering."); |
| 2691 | #ifndef NTFS_RW | 2734 | #ifndef NTFS_RW |
| @@ -2724,60 +2767,85 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) | |||
| 2724 | if (!parse_options(vol, (char*)opt)) | 2767 | if (!parse_options(vol, (char*)opt)) |
| 2725 | goto err_out_now; | 2768 | goto err_out_now; |
| 2726 | 2769 | ||
| 2770 | /* We support sector sizes up to the PAGE_CACHE_SIZE. */ | ||
| 2771 | if (bdev_hardsect_size(sb->s_bdev) > PAGE_CACHE_SIZE) { | ||
| 2772 | if (!silent) | ||
| 2773 | ntfs_error(sb, "Device has unsupported sector size " | ||
| 2774 | "(%i). The maximum supported sector " | ||
| 2775 | "size on this architecture is %lu " | ||
| 2776 | "bytes.", | ||
| 2777 | bdev_hardsect_size(sb->s_bdev), | ||
| 2778 | PAGE_CACHE_SIZE); | ||
| 2779 | goto err_out_now; | ||
| 2780 | } | ||
| 2727 | /* | 2781 | /* |
| 2728 | * TODO: Fail safety check. In the future we should really be able to | 2782 | * Setup the device access block size to NTFS_BLOCK_SIZE or the hard |
| 2729 | * cope with this being the case, but for now just bail out. | 2783 | * sector size, whichever is bigger. |
| 2730 | */ | 2784 | */ |
| 2731 | if (bdev_hardsect_size(sb->s_bdev) > NTFS_BLOCK_SIZE) { | 2785 | blocksize = sb_min_blocksize(sb, NTFS_BLOCK_SIZE); |
| 2786 | if (blocksize < NTFS_BLOCK_SIZE) { | ||
| 2732 | if (!silent) | 2787 | if (!silent) |
| 2733 | ntfs_error(sb, "Device has unsupported hardsect_size."); | 2788 | ntfs_error(sb, "Unable to set device block size."); |
| 2734 | goto err_out_now; | 2789 | goto err_out_now; |
| 2735 | } | 2790 | } |
| 2736 | 2791 | BUG_ON(blocksize != sb->s_blocksize); | |
| 2737 | /* Setup the device access block size to NTFS_BLOCK_SIZE. */ | 2792 | ntfs_debug("Set device block size to %i bytes (block size bits %i).", |
| 2738 | if (sb_set_blocksize(sb, NTFS_BLOCK_SIZE) != NTFS_BLOCK_SIZE) { | 2793 | blocksize, sb->s_blocksize_bits); |
| 2794 | /* Determine the size of the device in units of block_size bytes. */ | ||
| 2795 | if (!i_size_read(sb->s_bdev->bd_inode)) { | ||
| 2739 | if (!silent) | 2796 | if (!silent) |
| 2740 | ntfs_error(sb, "Unable to set block size."); | 2797 | ntfs_error(sb, "Unable to determine device size."); |
| 2741 | goto err_out_now; | 2798 | goto err_out_now; |
| 2742 | } | 2799 | } |
| 2743 | |||
| 2744 | /* Get the size of the device in units of NTFS_BLOCK_SIZE bytes. */ | ||
| 2745 | vol->nr_blocks = i_size_read(sb->s_bdev->bd_inode) >> | 2800 | vol->nr_blocks = i_size_read(sb->s_bdev->bd_inode) >> |
| 2746 | NTFS_BLOCK_SIZE_BITS; | 2801 | sb->s_blocksize_bits; |
| 2747 | |||
| 2748 | /* Read the boot sector and return unlocked buffer head to it. */ | 2802 | /* Read the boot sector and return unlocked buffer head to it. */ |
| 2749 | if (!(bh = read_ntfs_boot_sector(sb, silent))) { | 2803 | if (!(bh = read_ntfs_boot_sector(sb, silent))) { |
| 2750 | if (!silent) | 2804 | if (!silent) |
| 2751 | ntfs_error(sb, "Not an NTFS volume."); | 2805 | ntfs_error(sb, "Not an NTFS volume."); |
| 2752 | goto err_out_now; | 2806 | goto err_out_now; |
| 2753 | } | 2807 | } |
| 2754 | |||
| 2755 | /* | 2808 | /* |
| 2756 | * Extract the data from the boot sector and setup the ntfs super block | 2809 | * Extract the data from the boot sector and setup the ntfs volume |
| 2757 | * using it. | 2810 | * using it. |
| 2758 | */ | 2811 | */ |
| 2759 | result = parse_ntfs_boot_sector(vol, (NTFS_BOOT_SECTOR*)bh->b_data); | 2812 | result = parse_ntfs_boot_sector(vol, (NTFS_BOOT_SECTOR*)bh->b_data); |
| 2760 | |||
| 2761 | /* Initialize the cluster and mft allocators. */ | ||
| 2762 | ntfs_setup_allocators(vol); | ||
| 2763 | |||
| 2764 | brelse(bh); | 2813 | brelse(bh); |
| 2765 | |||
| 2766 | if (!result) { | 2814 | if (!result) { |
| 2767 | if (!silent) | 2815 | if (!silent) |
| 2768 | ntfs_error(sb, "Unsupported NTFS filesystem."); | 2816 | ntfs_error(sb, "Unsupported NTFS filesystem."); |
| 2769 | goto err_out_now; | 2817 | goto err_out_now; |
| 2770 | } | 2818 | } |
| 2771 | |||
| 2772 | /* | 2819 | /* |
| 2773 | * TODO: When we start coping with sector sizes different from | 2820 | * If the boot sector indicates a sector size bigger than the current |
| 2774 | * NTFS_BLOCK_SIZE, we now probably need to set the blocksize of the | 2821 | * device block size, switch the device block size to the sector size. |
| 2775 | * device (probably to NTFS_BLOCK_SIZE). | 2822 | * TODO: It may be possible to support this case even when the set |
| 2823 | * below fails, we would just be breaking up the i/o for each sector | ||
| 2824 | * into multiple blocks for i/o purposes but otherwise it should just | ||
| 2825 | * work. However it is safer to leave disabled until someone hits this | ||
| 2826 | * error message and then we can get them to try it without the setting | ||
| 2827 | * so we know for sure that it works. | ||
| 2776 | */ | 2828 | */ |
| 2777 | 2829 | if (vol->sector_size > blocksize) { | |
| 2830 | blocksize = sb_set_blocksize(sb, vol->sector_size); | ||
| 2831 | if (blocksize != vol->sector_size) { | ||
| 2832 | if (!silent) | ||
| 2833 | ntfs_error(sb, "Unable to set device block " | ||
| 2834 | "size to sector size (%i).", | ||
| 2835 | vol->sector_size); | ||
| 2836 | goto err_out_now; | ||
| 2837 | } | ||
| 2838 | BUG_ON(blocksize != sb->s_blocksize); | ||
| 2839 | vol->nr_blocks = i_size_read(sb->s_bdev->bd_inode) >> | ||
| 2840 | sb->s_blocksize_bits; | ||
| 2841 | ntfs_debug("Changed device block size to %i bytes (block size " | ||
| 2842 | "bits %i) to match volume sector size.", | ||
| 2843 | blocksize, sb->s_blocksize_bits); | ||
| 2844 | } | ||
| 2845 | /* Initialize the cluster and mft allocators. */ | ||
| 2846 | ntfs_setup_allocators(vol); | ||
| 2778 | /* Setup remaining fields in the super block. */ | 2847 | /* Setup remaining fields in the super block. */ |
| 2779 | sb->s_magic = NTFS_SB_MAGIC; | 2848 | sb->s_magic = NTFS_SB_MAGIC; |
| 2780 | |||
| 2781 | /* | 2849 | /* |
| 2782 | * Ntfs allows 63 bits for the file size, i.e. correct would be: | 2850 | * Ntfs allows 63 bits for the file size, i.e. correct would be: |
| 2783 | * sb->s_maxbytes = ~0ULL >> 1; | 2851 | * sb->s_maxbytes = ~0ULL >> 1; |
| @@ -2787,9 +2855,8 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) | |||
| 2787 | * without overflowing the index or to 2^63 - 1, whichever is smaller. | 2855 | * without overflowing the index or to 2^63 - 1, whichever is smaller. |
| 2788 | */ | 2856 | */ |
| 2789 | sb->s_maxbytes = MAX_LFS_FILESIZE; | 2857 | sb->s_maxbytes = MAX_LFS_FILESIZE; |
| 2790 | 2858 | /* Ntfs measures time in 100ns intervals. */ | |
| 2791 | sb->s_time_gran = 100; | 2859 | sb->s_time_gran = 100; |
| 2792 | |||
| 2793 | /* | 2860 | /* |
| 2794 | * Now load the metadata required for the page cache and our address | 2861 | * Now load the metadata required for the page cache and our address |
| 2795 | * space operations to function. We do this by setting up a specialised | 2862 | * space operations to function. We do this by setting up a specialised |
| @@ -2987,14 +3054,14 @@ err_out_now: | |||
| 2987 | * strings of the maximum length allowed by NTFS, which is NTFS_MAX_NAME_LEN | 3054 | * strings of the maximum length allowed by NTFS, which is NTFS_MAX_NAME_LEN |
| 2988 | * (255) Unicode characters + a terminating NULL Unicode character. | 3055 | * (255) Unicode characters + a terminating NULL Unicode character. |
| 2989 | */ | 3056 | */ |
| 2990 | kmem_cache_t *ntfs_name_cache; | 3057 | struct kmem_cache *ntfs_name_cache; |
| 2991 | 3058 | ||
| 2992 | /* Slab caches for efficient allocation/deallocation of inodes. */ | 3059 | /* Slab caches for efficient allocation/deallocation of inodes. */ |
| 2993 | kmem_cache_t *ntfs_inode_cache; | 3060 | struct kmem_cache *ntfs_inode_cache; |
| 2994 | kmem_cache_t *ntfs_big_inode_cache; | 3061 | struct kmem_cache *ntfs_big_inode_cache; |
| 2995 | 3062 | ||
| 2996 | /* Init once constructor for the inode slab cache. */ | 3063 | /* Init once constructor for the inode slab cache. */ |
| 2997 | static void ntfs_big_inode_init_once(void *foo, kmem_cache_t *cachep, | 3064 | static void ntfs_big_inode_init_once(void *foo, struct kmem_cache *cachep, |
| 2998 | unsigned long flags) | 3065 | unsigned long flags) |
| 2999 | { | 3066 | { |
| 3000 | ntfs_inode *ni = (ntfs_inode *)foo; | 3067 | ntfs_inode *ni = (ntfs_inode *)foo; |
| @@ -3008,8 +3075,8 @@ static void ntfs_big_inode_init_once(void *foo, kmem_cache_t *cachep, | |||
| 3008 | * Slab caches to optimize allocations and deallocations of attribute search | 3075 | * Slab caches to optimize allocations and deallocations of attribute search |
| 3009 | * contexts and index contexts, respectively. | 3076 | * contexts and index contexts, respectively. |
| 3010 | */ | 3077 | */ |
| 3011 | kmem_cache_t *ntfs_attr_ctx_cache; | 3078 | struct kmem_cache *ntfs_attr_ctx_cache; |
| 3012 | kmem_cache_t *ntfs_index_ctx_cache; | 3079 | struct kmem_cache *ntfs_index_ctx_cache; |
| 3013 | 3080 | ||
| 3014 | /* Driver wide semaphore. */ | 3081 | /* Driver wide semaphore. */ |
| 3015 | DECLARE_MUTEX(ntfs_lock); | 3082 | DECLARE_MUTEX(ntfs_lock); |
diff --git a/fs/ntfs/upcase.c b/fs/ntfs/upcase.c index 879cdf1d5bd3..9101807dc81a 100644 --- a/fs/ntfs/upcase.c +++ b/fs/ntfs/upcase.c | |||
| @@ -3,10 +3,7 @@ | |||
| 3 | * Part of the Linux-NTFS project. | 3 | * Part of the Linux-NTFS project. |
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001 Richard Russon <ntfs@flatcap.org> | 5 | * Copyright (c) 2001 Richard Russon <ntfs@flatcap.org> |
| 6 | * Copyright (c) 2001-2004 Anton Altaparmakov | 6 | * Copyright (c) 2001-2006 Anton Altaparmakov |
| 7 | * | ||
| 8 | * Modified for mkntfs inclusion 9 June 2001 by Anton Altaparmakov. | ||
| 9 | * Modified for kernel inclusion 10 September 2001 by Anton Altparmakov. | ||
| 10 | * | 7 | * |
| 11 | * This program is free software; you can redistribute it and/or modify it | 8 | * This program is free software; you can redistribute it and/or modify it |
| 12 | * under the terms of the GNU General Public License as published by the Free | 9 | * under the terms of the GNU General Public License as published by the Free |
| @@ -75,12 +72,13 @@ ntfschar *generate_default_upcase(void) | |||
| 75 | if (!uc) | 72 | if (!uc) |
| 76 | return uc; | 73 | return uc; |
| 77 | memset(uc, 0, default_upcase_len * sizeof(ntfschar)); | 74 | memset(uc, 0, default_upcase_len * sizeof(ntfschar)); |
| 75 | /* Generate the little endian Unicode upcase table used by ntfs. */ | ||
| 78 | for (i = 0; i < default_upcase_len; i++) | 76 | for (i = 0; i < default_upcase_len; i++) |
| 79 | uc[i] = cpu_to_le16(i); | 77 | uc[i] = cpu_to_le16(i); |
| 80 | for (r = 0; uc_run_table[r][0]; r++) | 78 | for (r = 0; uc_run_table[r][0]; r++) |
| 81 | for (i = uc_run_table[r][0]; i < uc_run_table[r][1]; i++) | 79 | for (i = uc_run_table[r][0]; i < uc_run_table[r][1]; i++) |
| 82 | uc[i] = cpu_to_le16((le16_to_cpu(uc[i]) + | 80 | uc[i] = cpu_to_le16(le16_to_cpu(uc[i]) + |
| 83 | uc_run_table[r][2])); | 81 | uc_run_table[r][2]); |
| 84 | for (r = 0; uc_dup_table[r][0]; r++) | 82 | for (r = 0; uc_dup_table[r][0]; r++) |
| 85 | for (i = uc_dup_table[r][0]; i < uc_dup_table[r][1]; i += 2) | 83 | for (i = uc_dup_table[r][0]; i < uc_dup_table[r][1]; i += 2) |
| 86 | uc[i + 1] = cpu_to_le16(le16_to_cpu(uc[i + 1]) - 1); | 84 | uc[i + 1] = cpu_to_le16(le16_to_cpu(uc[i + 1]) - 1); |
diff --git a/fs/ntfs/volume.h b/fs/ntfs/volume.h index 375cd20a9f61..406ab55dfb32 100644 --- a/fs/ntfs/volume.h +++ b/fs/ntfs/volume.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * volume.h - Defines for volume structures in NTFS Linux kernel driver. Part | 2 | * volume.h - Defines for volume structures in NTFS Linux kernel driver. Part |
| 3 | * of the Linux-NTFS project. | 3 | * of the Linux-NTFS project. |
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2001-2005 Anton Altaparmakov | 5 | * Copyright (c) 2001-2006 Anton Altaparmakov |
| 6 | * Copyright (c) 2002 Richard Russon | 6 | * Copyright (c) 2002 Richard Russon |
| 7 | * | 7 | * |
| 8 | * This program/include file is free software; you can redistribute it and/or | 8 | * This program/include file is free software; you can redistribute it and/or |
| @@ -41,10 +41,8 @@ typedef struct { | |||
| 41 | * structure has stabilized... (AIA) | 41 | * structure has stabilized... (AIA) |
| 42 | */ | 42 | */ |
| 43 | /* Device specifics. */ | 43 | /* Device specifics. */ |
| 44 | struct super_block *sb; /* Pointer back to the super_block, | 44 | struct super_block *sb; /* Pointer back to the super_block. */ |
| 45 | so we don't have to get the offset | 45 | LCN nr_blocks; /* Number of sb->s_blocksize bytes |
| 46 | every time. */ | ||
| 47 | LCN nr_blocks; /* Number of NTFS_BLOCK_SIZE bytes | ||
| 48 | sized blocks on the device. */ | 46 | sized blocks on the device. */ |
| 49 | /* Configuration provided by user at mount time. */ | 47 | /* Configuration provided by user at mount time. */ |
| 50 | unsigned long flags; /* Miscellaneous flags, see below. */ | 48 | unsigned long flags; /* Miscellaneous flags, see below. */ |
| @@ -141,8 +139,8 @@ typedef enum { | |||
| 141 | NV_ShowSystemFiles, /* 1: Return system files in ntfs_readdir(). */ | 139 | NV_ShowSystemFiles, /* 1: Return system files in ntfs_readdir(). */ |
| 142 | NV_CaseSensitive, /* 1: Treat file names as case sensitive and | 140 | NV_CaseSensitive, /* 1: Treat file names as case sensitive and |
| 143 | create filenames in the POSIX namespace. | 141 | create filenames in the POSIX namespace. |
| 144 | Otherwise be case insensitive and create | 142 | Otherwise be case insensitive but still |
| 145 | file names in WIN32 namespace. */ | 143 | create file names in POSIX namespace. */ |
| 146 | NV_LogFileEmpty, /* 1: $LogFile journal is empty. */ | 144 | NV_LogFileEmpty, /* 1: $LogFile journal is empty. */ |
| 147 | NV_QuotaOutOfDate, /* 1: $Quota is out of date. */ | 145 | NV_QuotaOutOfDate, /* 1: $Quota is out of date. */ |
| 148 | NV_UsnJrnlStamped, /* 1: $UsnJrnl has been stamped. */ | 146 | NV_UsnJrnlStamped, /* 1: $UsnJrnl has been stamped. */ |
| @@ -153,7 +151,7 @@ typedef enum { | |||
| 153 | * Macro tricks to expand the NVolFoo(), NVolSetFoo(), and NVolClearFoo() | 151 | * Macro tricks to expand the NVolFoo(), NVolSetFoo(), and NVolClearFoo() |
| 154 | * functions. | 152 | * functions. |
| 155 | */ | 153 | */ |
| 156 | #define NVOL_FNS(flag) \ | 154 | #define DEFINE_NVOL_BIT_OPS(flag) \ |
| 157 | static inline int NVol##flag(ntfs_volume *vol) \ | 155 | static inline int NVol##flag(ntfs_volume *vol) \ |
| 158 | { \ | 156 | { \ |
| 159 | return test_bit(NV_##flag, &(vol)->flags); \ | 157 | return test_bit(NV_##flag, &(vol)->flags); \ |
| @@ -168,12 +166,12 @@ static inline void NVolClear##flag(ntfs_volume *vol) \ | |||
| 168 | } | 166 | } |
| 169 | 167 | ||
| 170 | /* Emit the ntfs volume bitops functions. */ | 168 | /* Emit the ntfs volume bitops functions. */ |
| 171 | NVOL_FNS(Errors) | 169 | DEFINE_NVOL_BIT_OPS(Errors) |
| 172 | NVOL_FNS(ShowSystemFiles) | 170 | DEFINE_NVOL_BIT_OPS(ShowSystemFiles) |
| 173 | NVOL_FNS(CaseSensitive) | 171 | DEFINE_NVOL_BIT_OPS(CaseSensitive) |
| 174 | NVOL_FNS(LogFileEmpty) | 172 | DEFINE_NVOL_BIT_OPS(LogFileEmpty) |
| 175 | NVOL_FNS(QuotaOutOfDate) | 173 | DEFINE_NVOL_BIT_OPS(QuotaOutOfDate) |
| 176 | NVOL_FNS(UsnJrnlStamped) | 174 | DEFINE_NVOL_BIT_OPS(UsnJrnlStamped) |
| 177 | NVOL_FNS(SparseEnabled) | 175 | DEFINE_NVOL_BIT_OPS(SparseEnabled) |
| 178 | 176 | ||
| 179 | #endif /* _LINUX_NTFS_VOLUME_H */ | 177 | #endif /* _LINUX_NTFS_VOLUME_H */ |
diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c index fd741cea5705..636593bf4d17 100644 --- a/fs/ocfs2/cluster/masklog.c +++ b/fs/ocfs2/cluster/masklog.c | |||
| @@ -74,6 +74,7 @@ struct mlog_attribute { | |||
| 74 | #define define_mask(_name) { \ | 74 | #define define_mask(_name) { \ |
| 75 | .attr = { \ | 75 | .attr = { \ |
| 76 | .name = #_name, \ | 76 | .name = #_name, \ |
| 77 | .owner = THIS_MODULE, \ | ||
| 77 | .mode = S_IRUGO | S_IWUSR, \ | 78 | .mode = S_IRUGO | S_IWUSR, \ |
| 78 | }, \ | 79 | }, \ |
| 79 | .mask = ML_##_name, \ | 80 | .mask = ML_##_name, \ |
diff --git a/fs/ocfs2/cluster/masklog.h b/fs/ocfs2/cluster/masklog.h index e8c56a3d9c64..2cadc3009c83 100644 --- a/fs/ocfs2/cluster/masklog.h +++ b/fs/ocfs2/cluster/masklog.h | |||
| @@ -256,7 +256,7 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits; | |||
| 256 | } \ | 256 | } \ |
| 257 | } while (0) | 257 | } while (0) |
| 258 | 258 | ||
| 259 | #if (BITS_PER_LONG == 32) || defined(CONFIG_X86_64) | 259 | #if (BITS_PER_LONG == 32) || defined(CONFIG_X86_64) || (defined(CONFIG_UML_X86) && defined(CONFIG_64BIT)) |
| 260 | #define MLFi64 "lld" | 260 | #define MLFi64 "lld" |
| 261 | #define MLFu64 "llu" | 261 | #define MLFu64 "llu" |
| 262 | #define MLFx64 "llx" | 262 | #define MLFx64 "llx" |
diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c index cf7828f23361..e1fceb8aa32d 100644 --- a/fs/ocfs2/cluster/nodemanager.c +++ b/fs/ocfs2/cluster/nodemanager.c | |||
| @@ -756,7 +756,7 @@ static int __init init_o2nm(void) | |||
| 756 | if (!ocfs2_table_header) { | 756 | if (!ocfs2_table_header) { |
| 757 | printk(KERN_ERR "nodemanager: unable to register sysctl\n"); | 757 | printk(KERN_ERR "nodemanager: unable to register sysctl\n"); |
| 758 | ret = -ENOMEM; /* or something. */ | 758 | ret = -ENOMEM; /* or something. */ |
| 759 | goto out; | 759 | goto out_o2net; |
| 760 | } | 760 | } |
| 761 | 761 | ||
| 762 | ret = o2net_register_hb_callbacks(); | 762 | ret = o2net_register_hb_callbacks(); |
| @@ -780,6 +780,8 @@ out_callbacks: | |||
| 780 | o2net_unregister_hb_callbacks(); | 780 | o2net_unregister_hb_callbacks(); |
| 781 | out_sysctl: | 781 | out_sysctl: |
| 782 | unregister_sysctl_table(ocfs2_table_header); | 782 | unregister_sysctl_table(ocfs2_table_header); |
| 783 | out_o2net: | ||
| 784 | o2net_exit(); | ||
| 783 | out: | 785 | out: |
| 784 | return ret; | 786 | return ret; |
| 785 | } | 787 | } |
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index d22d4cf08db1..0f60cc0d3985 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c | |||
| @@ -1318,7 +1318,7 @@ static void o2net_start_connect(void *arg) | |||
| 1318 | { | 1318 | { |
| 1319 | struct o2net_node *nn = arg; | 1319 | struct o2net_node *nn = arg; |
| 1320 | struct o2net_sock_container *sc = NULL; | 1320 | struct o2net_sock_container *sc = NULL; |
| 1321 | struct o2nm_node *node = NULL; | 1321 | struct o2nm_node *node = NULL, *mynode = NULL; |
| 1322 | struct socket *sock = NULL; | 1322 | struct socket *sock = NULL; |
| 1323 | struct sockaddr_in myaddr = {0, }, remoteaddr = {0, }; | 1323 | struct sockaddr_in myaddr = {0, }, remoteaddr = {0, }; |
| 1324 | int ret = 0; | 1324 | int ret = 0; |
| @@ -1334,6 +1334,12 @@ static void o2net_start_connect(void *arg) | |||
| 1334 | goto out; | 1334 | goto out; |
| 1335 | } | 1335 | } |
| 1336 | 1336 | ||
| 1337 | mynode = o2nm_get_node_by_num(o2nm_this_node()); | ||
| 1338 | if (mynode == NULL) { | ||
| 1339 | ret = 0; | ||
| 1340 | goto out; | ||
| 1341 | } | ||
| 1342 | |||
| 1337 | spin_lock(&nn->nn_lock); | 1343 | spin_lock(&nn->nn_lock); |
| 1338 | /* see if we already have one pending or have given up */ | 1344 | /* see if we already have one pending or have given up */ |
| 1339 | if (nn->nn_sc || nn->nn_persistent_error) | 1345 | if (nn->nn_sc || nn->nn_persistent_error) |
| @@ -1361,12 +1367,14 @@ static void o2net_start_connect(void *arg) | |||
| 1361 | sock->sk->sk_allocation = GFP_ATOMIC; | 1367 | sock->sk->sk_allocation = GFP_ATOMIC; |
| 1362 | 1368 | ||
| 1363 | myaddr.sin_family = AF_INET; | 1369 | myaddr.sin_family = AF_INET; |
| 1370 | myaddr.sin_addr.s_addr = (__force u32)mynode->nd_ipv4_address; | ||
| 1364 | myaddr.sin_port = (__force u16)htons(0); /* any port */ | 1371 | myaddr.sin_port = (__force u16)htons(0); /* any port */ |
| 1365 | 1372 | ||
| 1366 | ret = sock->ops->bind(sock, (struct sockaddr *)&myaddr, | 1373 | ret = sock->ops->bind(sock, (struct sockaddr *)&myaddr, |
| 1367 | sizeof(myaddr)); | 1374 | sizeof(myaddr)); |
| 1368 | if (ret) { | 1375 | if (ret) { |
| 1369 | mlog(0, "bind failed: %d\n", ret); | 1376 | mlog(ML_ERROR, "bind failed with %d at address %u.%u.%u.%u\n", |
| 1377 | ret, NIPQUAD(mynode->nd_ipv4_address)); | ||
| 1370 | goto out; | 1378 | goto out; |
| 1371 | } | 1379 | } |
| 1372 | 1380 | ||
| @@ -1407,6 +1415,8 @@ out: | |||
| 1407 | sc_put(sc); | 1415 | sc_put(sc); |
| 1408 | if (node) | 1416 | if (node) |
| 1409 | o2nm_node_put(node); | 1417 | o2nm_node_put(node); |
| 1418 | if (mynode) | ||
| 1419 | o2nm_node_put(mynode); | ||
| 1410 | 1420 | ||
| 1411 | return; | 1421 | return; |
| 1412 | } | 1422 | } |
diff --git a/fs/ocfs2/cluster/tcp.h b/fs/ocfs2/cluster/tcp.h index a6f4585501c8..616ff2b8434a 100644 --- a/fs/ocfs2/cluster/tcp.h +++ b/fs/ocfs2/cluster/tcp.h | |||
| @@ -85,13 +85,10 @@ enum { | |||
| 85 | O2NET_DRIVER_READY, | 85 | O2NET_DRIVER_READY, |
| 86 | }; | 86 | }; |
| 87 | 87 | ||
| 88 | int o2net_init_tcp_sock(struct inode *inode); | ||
| 89 | int o2net_send_message(u32 msg_type, u32 key, void *data, u32 len, | 88 | int o2net_send_message(u32 msg_type, u32 key, void *data, u32 len, |
| 90 | u8 target_node, int *status); | 89 | u8 target_node, int *status); |
| 91 | int o2net_send_message_vec(u32 msg_type, u32 key, struct kvec *vec, | 90 | int o2net_send_message_vec(u32 msg_type, u32 key, struct kvec *vec, |
| 92 | size_t veclen, u8 target_node, int *status); | 91 | size_t veclen, u8 target_node, int *status); |
| 93 | int o2net_broadcast_message(u32 msg_type, u32 key, void *data, u32 len, | ||
| 94 | struct inode *group); | ||
| 95 | 92 | ||
| 96 | int o2net_register_handler(u32 msg_type, u32 key, u32 max_len, | 93 | int o2net_register_handler(u32 msg_type, u32 key, u32 max_len, |
| 97 | o2net_msg_handler_func *func, void *data, | 94 | o2net_msg_handler_func *func, void *data, |
| @@ -107,7 +104,5 @@ void o2net_disconnect_node(struct o2nm_node *node); | |||
| 107 | 104 | ||
| 108 | int o2net_init(void); | 105 | int o2net_init(void); |
| 109 | void o2net_exit(void); | 106 | void o2net_exit(void); |
| 110 | int o2net_proc_init(struct proc_dir_entry *parent); | ||
| 111 | void o2net_proc_exit(struct proc_dir_entry *parent); | ||
| 112 | 107 | ||
| 113 | #endif /* O2CLUSTER_TCP_H */ | 108 | #endif /* O2CLUSTER_TCP_H */ |
diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h index 23ceaa7127b4..9c772583744a 100644 --- a/fs/ocfs2/dlm/dlmcommon.h +++ b/fs/ocfs2/dlm/dlmcommon.h | |||
| @@ -37,9 +37,7 @@ | |||
| 37 | #define DLM_THREAD_SHUFFLE_INTERVAL 5 // flush everything every 5 passes | 37 | #define DLM_THREAD_SHUFFLE_INTERVAL 5 // flush everything every 5 passes |
| 38 | #define DLM_THREAD_MS 200 // flush at least every 200 ms | 38 | #define DLM_THREAD_MS 200 // flush at least every 200 ms |
| 39 | 39 | ||
| 40 | #define DLM_HASH_BITS 7 | 40 | #define DLM_HASH_BUCKETS (PAGE_SIZE / sizeof(struct hlist_head)) |
| 41 | #define DLM_HASH_SIZE (1 << DLM_HASH_BITS) | ||
| 42 | #define DLM_HASH_MASK (DLM_HASH_SIZE - 1) | ||
| 43 | 41 | ||
| 44 | enum dlm_ast_type { | 42 | enum dlm_ast_type { |
| 45 | DLM_AST = 0, | 43 | DLM_AST = 0, |
| @@ -87,7 +85,7 @@ enum dlm_ctxt_state { | |||
| 87 | struct dlm_ctxt | 85 | struct dlm_ctxt |
| 88 | { | 86 | { |
| 89 | struct list_head list; | 87 | struct list_head list; |
| 90 | struct list_head *resources; | 88 | struct hlist_head *lockres_hash; |
| 91 | struct list_head dirty_list; | 89 | struct list_head dirty_list; |
| 92 | struct list_head purge_list; | 90 | struct list_head purge_list; |
| 93 | struct list_head pending_asts; | 91 | struct list_head pending_asts; |
| @@ -217,7 +215,7 @@ struct dlm_lock_resource | |||
| 217 | { | 215 | { |
| 218 | /* WARNING: Please see the comment in dlm_init_lockres before | 216 | /* WARNING: Please see the comment in dlm_init_lockres before |
| 219 | * adding fields here. */ | 217 | * adding fields here. */ |
| 220 | struct list_head list; | 218 | struct hlist_node hash_node; |
| 221 | struct kref refs; | 219 | struct kref refs; |
| 222 | 220 | ||
| 223 | /* please keep these next 3 in this order | 221 | /* please keep these next 3 in this order |
diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c index f339fe27975a..54f61b76ab51 100644 --- a/fs/ocfs2/dlm/dlmdebug.c +++ b/fs/ocfs2/dlm/dlmdebug.c | |||
| @@ -117,8 +117,8 @@ EXPORT_SYMBOL_GPL(dlm_print_one_lock); | |||
| 117 | void dlm_dump_lock_resources(struct dlm_ctxt *dlm) | 117 | void dlm_dump_lock_resources(struct dlm_ctxt *dlm) |
| 118 | { | 118 | { |
| 119 | struct dlm_lock_resource *res; | 119 | struct dlm_lock_resource *res; |
| 120 | struct list_head *iter; | 120 | struct hlist_node *iter; |
| 121 | struct list_head *bucket; | 121 | struct hlist_head *bucket; |
| 122 | int i; | 122 | int i; |
| 123 | 123 | ||
| 124 | mlog(ML_NOTICE, "struct dlm_ctxt: %s, node=%u, key=%u\n", | 124 | mlog(ML_NOTICE, "struct dlm_ctxt: %s, node=%u, key=%u\n", |
| @@ -129,12 +129,10 @@ void dlm_dump_lock_resources(struct dlm_ctxt *dlm) | |||
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | spin_lock(&dlm->spinlock); | 131 | spin_lock(&dlm->spinlock); |
| 132 | for (i=0; i<DLM_HASH_SIZE; i++) { | 132 | for (i=0; i<DLM_HASH_BUCKETS; i++) { |
| 133 | bucket = &(dlm->resources[i]); | 133 | bucket = &(dlm->lockres_hash[i]); |
| 134 | list_for_each(iter, bucket) { | 134 | hlist_for_each_entry(res, iter, bucket, hash_node) |
| 135 | res = list_entry(iter, struct dlm_lock_resource, list); | ||
| 136 | dlm_print_one_lock_resource(res); | 135 | dlm_print_one_lock_resource(res); |
| 137 | } | ||
| 138 | } | 136 | } |
| 139 | spin_unlock(&dlm->spinlock); | 137 | spin_unlock(&dlm->spinlock); |
| 140 | } | 138 | } |
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index 6ee30837389c..8f3a9e3106fd 100644 --- a/fs/ocfs2/dlm/dlmdomain.c +++ b/fs/ocfs2/dlm/dlmdomain.c | |||
| @@ -77,26 +77,26 @@ static void dlm_unregister_domain_handlers(struct dlm_ctxt *dlm); | |||
| 77 | 77 | ||
| 78 | void __dlm_unhash_lockres(struct dlm_lock_resource *lockres) | 78 | void __dlm_unhash_lockres(struct dlm_lock_resource *lockres) |
| 79 | { | 79 | { |
| 80 | list_del_init(&lockres->list); | 80 | hlist_del_init(&lockres->hash_node); |
| 81 | dlm_lockres_put(lockres); | 81 | dlm_lockres_put(lockres); |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | void __dlm_insert_lockres(struct dlm_ctxt *dlm, | 84 | void __dlm_insert_lockres(struct dlm_ctxt *dlm, |
| 85 | struct dlm_lock_resource *res) | 85 | struct dlm_lock_resource *res) |
| 86 | { | 86 | { |
| 87 | struct list_head *bucket; | 87 | struct hlist_head *bucket; |
| 88 | struct qstr *q; | 88 | struct qstr *q; |
| 89 | 89 | ||
| 90 | assert_spin_locked(&dlm->spinlock); | 90 | assert_spin_locked(&dlm->spinlock); |
| 91 | 91 | ||
| 92 | q = &res->lockname; | 92 | q = &res->lockname; |
| 93 | q->hash = full_name_hash(q->name, q->len); | 93 | q->hash = full_name_hash(q->name, q->len); |
| 94 | bucket = &(dlm->resources[q->hash & DLM_HASH_MASK]); | 94 | bucket = &(dlm->lockres_hash[q->hash % DLM_HASH_BUCKETS]); |
| 95 | 95 | ||
| 96 | /* get a reference for our hashtable */ | 96 | /* get a reference for our hashtable */ |
| 97 | dlm_lockres_get(res); | 97 | dlm_lockres_get(res); |
| 98 | 98 | ||
| 99 | list_add_tail(&res->list, bucket); | 99 | hlist_add_head(&res->hash_node, bucket); |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | struct dlm_lock_resource * __dlm_lookup_lockres(struct dlm_ctxt *dlm, | 102 | struct dlm_lock_resource * __dlm_lookup_lockres(struct dlm_ctxt *dlm, |
| @@ -104,9 +104,9 @@ struct dlm_lock_resource * __dlm_lookup_lockres(struct dlm_ctxt *dlm, | |||
| 104 | unsigned int len) | 104 | unsigned int len) |
| 105 | { | 105 | { |
| 106 | unsigned int hash; | 106 | unsigned int hash; |
| 107 | struct list_head *iter; | 107 | struct hlist_node *iter; |
| 108 | struct dlm_lock_resource *tmpres=NULL; | 108 | struct dlm_lock_resource *tmpres=NULL; |
| 109 | struct list_head *bucket; | 109 | struct hlist_head *bucket; |
| 110 | 110 | ||
| 111 | mlog_entry("%.*s\n", len, name); | 111 | mlog_entry("%.*s\n", len, name); |
| 112 | 112 | ||
| @@ -114,11 +114,11 @@ struct dlm_lock_resource * __dlm_lookup_lockres(struct dlm_ctxt *dlm, | |||
| 114 | 114 | ||
| 115 | hash = full_name_hash(name, len); | 115 | hash = full_name_hash(name, len); |
| 116 | 116 | ||
| 117 | bucket = &(dlm->resources[hash & DLM_HASH_MASK]); | 117 | bucket = &(dlm->lockres_hash[hash % DLM_HASH_BUCKETS]); |
| 118 | 118 | ||
| 119 | /* check for pre-existing lock */ | 119 | /* check for pre-existing lock */ |
| 120 | list_for_each(iter, bucket) { | 120 | hlist_for_each(iter, bucket) { |
| 121 | tmpres = list_entry(iter, struct dlm_lock_resource, list); | 121 | tmpres = hlist_entry(iter, struct dlm_lock_resource, hash_node); |
| 122 | if (tmpres->lockname.len == len && | 122 | if (tmpres->lockname.len == len && |
| 123 | memcmp(tmpres->lockname.name, name, len) == 0) { | 123 | memcmp(tmpres->lockname.name, name, len) == 0) { |
| 124 | dlm_lockres_get(tmpres); | 124 | dlm_lockres_get(tmpres); |
| @@ -193,8 +193,8 @@ static int dlm_wait_on_domain_helper(const char *domain) | |||
| 193 | 193 | ||
| 194 | static void dlm_free_ctxt_mem(struct dlm_ctxt *dlm) | 194 | static void dlm_free_ctxt_mem(struct dlm_ctxt *dlm) |
| 195 | { | 195 | { |
| 196 | if (dlm->resources) | 196 | if (dlm->lockres_hash) |
| 197 | free_page((unsigned long) dlm->resources); | 197 | free_page((unsigned long) dlm->lockres_hash); |
| 198 | 198 | ||
| 199 | if (dlm->name) | 199 | if (dlm->name) |
| 200 | kfree(dlm->name); | 200 | kfree(dlm->name); |
| @@ -303,10 +303,10 @@ static void dlm_migrate_all_locks(struct dlm_ctxt *dlm) | |||
| 303 | mlog(0, "Migrating locks from domain %s\n", dlm->name); | 303 | mlog(0, "Migrating locks from domain %s\n", dlm->name); |
| 304 | restart: | 304 | restart: |
| 305 | spin_lock(&dlm->spinlock); | 305 | spin_lock(&dlm->spinlock); |
| 306 | for (i=0; i<DLM_HASH_SIZE; i++) { | 306 | for (i = 0; i < DLM_HASH_BUCKETS; i++) { |
| 307 | while (!list_empty(&dlm->resources[i])) { | 307 | while (!hlist_empty(&dlm->lockres_hash[i])) { |
| 308 | res = list_entry(dlm->resources[i].next, | 308 | res = hlist_entry(dlm->lockres_hash[i].first, |
| 309 | struct dlm_lock_resource, list); | 309 | struct dlm_lock_resource, hash_node); |
| 310 | /* need reference when manually grabbing lockres */ | 310 | /* need reference when manually grabbing lockres */ |
| 311 | dlm_lockres_get(res); | 311 | dlm_lockres_get(res); |
| 312 | /* this should unhash the lockres | 312 | /* this should unhash the lockres |
| @@ -1191,18 +1191,17 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain, | |||
| 1191 | goto leave; | 1191 | goto leave; |
| 1192 | } | 1192 | } |
| 1193 | 1193 | ||
| 1194 | dlm->resources = (struct list_head *) __get_free_page(GFP_KERNEL); | 1194 | dlm->lockres_hash = (struct hlist_head *) __get_free_page(GFP_KERNEL); |
| 1195 | if (!dlm->resources) { | 1195 | if (!dlm->lockres_hash) { |
| 1196 | mlog_errno(-ENOMEM); | 1196 | mlog_errno(-ENOMEM); |
| 1197 | kfree(dlm->name); | 1197 | kfree(dlm->name); |
| 1198 | kfree(dlm); | 1198 | kfree(dlm); |
| 1199 | dlm = NULL; | 1199 | dlm = NULL; |
| 1200 | goto leave; | 1200 | goto leave; |
| 1201 | } | 1201 | } |
| 1202 | memset(dlm->resources, 0, PAGE_SIZE); | ||
| 1203 | 1202 | ||
| 1204 | for (i=0; i<DLM_HASH_SIZE; i++) | 1203 | for (i=0; i<DLM_HASH_BUCKETS; i++) |
| 1205 | INIT_LIST_HEAD(&dlm->resources[i]); | 1204 | INIT_HLIST_HEAD(&dlm->lockres_hash[i]); |
| 1206 | 1205 | ||
| 1207 | strcpy(dlm->name, domain); | 1206 | strcpy(dlm->name, domain); |
| 1208 | dlm->key = key; | 1207 | dlm->key = key; |
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index 2e2e95e69499..847dd3cc4cf5 100644 --- a/fs/ocfs2/dlm/dlmmaster.c +++ b/fs/ocfs2/dlm/dlmmaster.c | |||
| @@ -564,7 +564,7 @@ static void dlm_lockres_release(struct kref *kref) | |||
| 564 | 564 | ||
| 565 | /* By the time we're ready to blow this guy away, we shouldn't | 565 | /* By the time we're ready to blow this guy away, we shouldn't |
| 566 | * be on any lists. */ | 566 | * be on any lists. */ |
| 567 | BUG_ON(!list_empty(&res->list)); | 567 | BUG_ON(!hlist_unhashed(&res->hash_node)); |
| 568 | BUG_ON(!list_empty(&res->granted)); | 568 | BUG_ON(!list_empty(&res->granted)); |
| 569 | BUG_ON(!list_empty(&res->converting)); | 569 | BUG_ON(!list_empty(&res->converting)); |
| 570 | BUG_ON(!list_empty(&res->blocked)); | 570 | BUG_ON(!list_empty(&res->blocked)); |
| @@ -605,7 +605,7 @@ static void dlm_init_lockres(struct dlm_ctxt *dlm, | |||
| 605 | 605 | ||
| 606 | init_waitqueue_head(&res->wq); | 606 | init_waitqueue_head(&res->wq); |
| 607 | spin_lock_init(&res->spinlock); | 607 | spin_lock_init(&res->spinlock); |
| 608 | INIT_LIST_HEAD(&res->list); | 608 | INIT_HLIST_NODE(&res->hash_node); |
| 609 | INIT_LIST_HEAD(&res->granted); | 609 | INIT_LIST_HEAD(&res->granted); |
| 610 | INIT_LIST_HEAD(&res->converting); | 610 | INIT_LIST_HEAD(&res->converting); |
| 611 | INIT_LIST_HEAD(&res->blocked); | 611 | INIT_LIST_HEAD(&res->blocked); |
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c index ed76bda1a534..1e232000f3f7 100644 --- a/fs/ocfs2/dlm/dlmrecovery.c +++ b/fs/ocfs2/dlm/dlmrecovery.c | |||
| @@ -1693,7 +1693,10 @@ static void dlm_finish_local_lockres_recovery(struct dlm_ctxt *dlm, | |||
| 1693 | u8 dead_node, u8 new_master) | 1693 | u8 dead_node, u8 new_master) |
| 1694 | { | 1694 | { |
| 1695 | int i; | 1695 | int i; |
| 1696 | struct list_head *iter, *iter2, *bucket; | 1696 | struct list_head *iter, *iter2; |
| 1697 | struct hlist_node *hash_iter; | ||
| 1698 | struct hlist_head *bucket; | ||
| 1699 | |||
| 1697 | struct dlm_lock_resource *res; | 1700 | struct dlm_lock_resource *res; |
| 1698 | 1701 | ||
| 1699 | mlog_entry_void(); | 1702 | mlog_entry_void(); |
| @@ -1717,10 +1720,9 @@ static void dlm_finish_local_lockres_recovery(struct dlm_ctxt *dlm, | |||
| 1717 | * for now we need to run the whole hash, clear | 1720 | * for now we need to run the whole hash, clear |
| 1718 | * the RECOVERING state and set the owner | 1721 | * the RECOVERING state and set the owner |
| 1719 | * if necessary */ | 1722 | * if necessary */ |
| 1720 | for (i=0; i<DLM_HASH_SIZE; i++) { | 1723 | for (i = 0; i < DLM_HASH_BUCKETS; i++) { |
| 1721 | bucket = &(dlm->resources[i]); | 1724 | bucket = &(dlm->lockres_hash[i]); |
| 1722 | list_for_each(iter, bucket) { | 1725 | hlist_for_each_entry(res, hash_iter, bucket, hash_node) { |
| 1723 | res = list_entry (iter, struct dlm_lock_resource, list); | ||
| 1724 | if (res->state & DLM_LOCK_RES_RECOVERING) { | 1726 | if (res->state & DLM_LOCK_RES_RECOVERING) { |
| 1725 | if (res->owner == dead_node) { | 1727 | if (res->owner == dead_node) { |
| 1726 | mlog(0, "(this=%u) res %.*s owner=%u " | 1728 | mlog(0, "(this=%u) res %.*s owner=%u " |
| @@ -1852,10 +1854,10 @@ static void dlm_free_dead_locks(struct dlm_ctxt *dlm, | |||
| 1852 | 1854 | ||
| 1853 | static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node) | 1855 | static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node) |
| 1854 | { | 1856 | { |
| 1855 | struct list_head *iter; | 1857 | struct hlist_node *iter; |
| 1856 | struct dlm_lock_resource *res; | 1858 | struct dlm_lock_resource *res; |
| 1857 | int i; | 1859 | int i; |
| 1858 | struct list_head *bucket; | 1860 | struct hlist_head *bucket; |
| 1859 | struct dlm_lock *lock; | 1861 | struct dlm_lock *lock; |
| 1860 | 1862 | ||
| 1861 | 1863 | ||
| @@ -1876,10 +1878,9 @@ static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node) | |||
| 1876 | * can be kicked again to see if any ASTs or BASTs | 1878 | * can be kicked again to see if any ASTs or BASTs |
| 1877 | * need to be fired as a result. | 1879 | * need to be fired as a result. |
| 1878 | */ | 1880 | */ |
| 1879 | for (i=0; i<DLM_HASH_SIZE; i++) { | 1881 | for (i = 0; i < DLM_HASH_BUCKETS; i++) { |
| 1880 | bucket = &(dlm->resources[i]); | 1882 | bucket = &(dlm->lockres_hash[i]); |
| 1881 | list_for_each(iter, bucket) { | 1883 | hlist_for_each_entry(res, iter, bucket, hash_node) { |
| 1882 | res = list_entry (iter, struct dlm_lock_resource, list); | ||
| 1883 | /* always prune any $RECOVERY entries for dead nodes, | 1884 | /* always prune any $RECOVERY entries for dead nodes, |
| 1884 | * otherwise hangs can occur during later recovery */ | 1885 | * otherwise hangs can occur during later recovery */ |
| 1885 | if (dlm_is_recovery_lock(res->lockname.name, | 1886 | if (dlm_is_recovery_lock(res->lockname.name, |
diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c index b6ba292e9544..e6f207eebab4 100644 --- a/fs/ocfs2/extent_map.c +++ b/fs/ocfs2/extent_map.c | |||
| @@ -181,6 +181,12 @@ static int ocfs2_extent_map_find_leaf(struct inode *inode, | |||
| 181 | ret = -EBADR; | 181 | ret = -EBADR; |
| 182 | if (rec_end > OCFS2_I(inode)->ip_clusters) { | 182 | if (rec_end > OCFS2_I(inode)->ip_clusters) { |
| 183 | mlog_errno(ret); | 183 | mlog_errno(ret); |
| 184 | ocfs2_error(inode->i_sb, | ||
| 185 | "Extent %d at e_blkno %"MLFu64" of inode %"MLFu64" goes past ip_clusters of %u\n", | ||
| 186 | i, | ||
| 187 | le64_to_cpu(rec->e_blkno), | ||
| 188 | OCFS2_I(inode)->ip_blkno, | ||
| 189 | OCFS2_I(inode)->ip_clusters); | ||
| 184 | goto out_free; | 190 | goto out_free; |
| 185 | } | 191 | } |
| 186 | 192 | ||
| @@ -226,6 +232,12 @@ static int ocfs2_extent_map_find_leaf(struct inode *inode, | |||
| 226 | ret = -EBADR; | 232 | ret = -EBADR; |
| 227 | if (blkno) { | 233 | if (blkno) { |
| 228 | mlog_errno(ret); | 234 | mlog_errno(ret); |
| 235 | ocfs2_error(inode->i_sb, | ||
| 236 | "Multiple extents for (cpos = %u, clusters = %u) on inode %"MLFu64"; e_blkno %"MLFu64" and rec %d at e_blkno %"MLFu64"\n", | ||
| 237 | cpos, clusters, | ||
| 238 | OCFS2_I(inode)->ip_blkno, | ||
| 239 | blkno, i, | ||
| 240 | le64_to_cpu(rec->e_blkno)); | ||
| 229 | goto out_free; | 241 | goto out_free; |
| 230 | } | 242 | } |
| 231 | 243 | ||
| @@ -238,6 +250,10 @@ static int ocfs2_extent_map_find_leaf(struct inode *inode, | |||
| 238 | */ | 250 | */ |
| 239 | ret = -EBADR; | 251 | ret = -EBADR; |
| 240 | if (!blkno) { | 252 | if (!blkno) { |
| 253 | ocfs2_error(inode->i_sb, | ||
| 254 | "No record found for (cpos = %u, clusters = %u) on inode %"MLFu64"\n", | ||
| 255 | cpos, clusters, | ||
| 256 | OCFS2_I(inode)->ip_blkno); | ||
| 241 | mlog_errno(ret); | 257 | mlog_errno(ret); |
| 242 | goto out_free; | 258 | goto out_free; |
| 243 | } | 259 | } |
| @@ -266,6 +282,20 @@ static int ocfs2_extent_map_find_leaf(struct inode *inode, | |||
| 266 | 282 | ||
| 267 | for (i = 0; i < le16_to_cpu(el->l_next_free_rec); i++) { | 283 | for (i = 0; i < le16_to_cpu(el->l_next_free_rec); i++) { |
| 268 | rec = &el->l_recs[i]; | 284 | rec = &el->l_recs[i]; |
| 285 | |||
| 286 | if ((le32_to_cpu(rec->e_cpos) + le32_to_cpu(rec->e_clusters)) > | ||
| 287 | OCFS2_I(inode)->ip_clusters) { | ||
| 288 | ret = -EBADR; | ||
| 289 | mlog_errno(ret); | ||
| 290 | ocfs2_error(inode->i_sb, | ||
| 291 | "Extent %d at e_blkno %"MLFu64" of inode %"MLFu64" goes past ip_clusters of %u\n", | ||
| 292 | i, | ||
| 293 | le64_to_cpu(rec->e_blkno), | ||
| 294 | OCFS2_I(inode)->ip_blkno, | ||
| 295 | OCFS2_I(inode)->ip_clusters); | ||
| 296 | return ret; | ||
| 297 | } | ||
| 298 | |||
| 269 | ret = ocfs2_extent_map_insert(inode, rec, | 299 | ret = ocfs2_extent_map_insert(inode, rec, |
| 270 | le16_to_cpu(el->l_tree_depth)); | 300 | le16_to_cpu(el->l_tree_depth)); |
| 271 | if (ret) { | 301 | if (ret) { |
| @@ -526,6 +556,10 @@ static int ocfs2_extent_map_insert(struct inode *inode, | |||
| 526 | OCFS2_I(inode)->ip_map.em_clusters) { | 556 | OCFS2_I(inode)->ip_map.em_clusters) { |
| 527 | ret = -EBADR; | 557 | ret = -EBADR; |
| 528 | mlog_errno(ret); | 558 | mlog_errno(ret); |
| 559 | ocfs2_error(inode->i_sb, | ||
| 560 | "Zero e_clusters on non-tail extent record at e_blkno %"MLFu64" on inode %"MLFu64"\n", | ||
| 561 | le64_to_cpu(rec->e_blkno), | ||
| 562 | OCFS2_I(inode)->ip_blkno); | ||
| 529 | return ret; | 563 | return ret; |
| 530 | } | 564 | } |
| 531 | 565 | ||
| @@ -588,12 +622,12 @@ static int ocfs2_extent_map_insert(struct inode *inode, | |||
| 588 | * Existing record in the extent map: | 622 | * Existing record in the extent map: |
| 589 | * | 623 | * |
| 590 | * cpos = 10, len = 10 | 624 | * cpos = 10, len = 10 |
| 591 | * |---------| | 625 | * |---------| |
| 592 | * | 626 | * |
| 593 | * New Record: | 627 | * New Record: |
| 594 | * | 628 | * |
| 595 | * cpos = 10, len = 20 | 629 | * cpos = 10, len = 20 |
| 596 | * |------------------| | 630 | * |------------------| |
| 597 | * | 631 | * |
| 598 | * The passed record is the new on-disk record. The new_clusters value | 632 | * The passed record is the new on-disk record. The new_clusters value |
| 599 | * is how many clusters were added to the file. If the append is a | 633 | * is how many clusters were added to the file. If the append is a |
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 1715bc90e705..8a4048b55fdc 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
| @@ -933,9 +933,6 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, | |||
| 933 | struct file *filp = iocb->ki_filp; | 933 | struct file *filp = iocb->ki_filp; |
| 934 | struct inode *inode = filp->f_dentry->d_inode; | 934 | struct inode *inode = filp->f_dentry->d_inode; |
| 935 | loff_t newsize, saved_pos; | 935 | loff_t newsize, saved_pos; |
| 936 | #ifdef OCFS2_ORACORE_WORKAROUNDS | ||
| 937 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); | ||
| 938 | #endif | ||
| 939 | 936 | ||
| 940 | mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", filp, buf, | 937 | mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", filp, buf, |
| 941 | (unsigned int)count, | 938 | (unsigned int)count, |
| @@ -951,14 +948,6 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, | |||
| 951 | return -EIO; | 948 | return -EIO; |
| 952 | } | 949 | } |
| 953 | 950 | ||
| 954 | #ifdef OCFS2_ORACORE_WORKAROUNDS | ||
| 955 | /* ugh, work around some applications which open everything O_DIRECT + | ||
| 956 | * O_APPEND and really don't mean to use O_DIRECT. */ | ||
| 957 | if (osb->s_mount_opt & OCFS2_MOUNT_COMPAT_OCFS && | ||
| 958 | (filp->f_flags & O_APPEND) && (filp->f_flags & O_DIRECT)) | ||
| 959 | filp->f_flags &= ~O_DIRECT; | ||
| 960 | #endif | ||
| 961 | |||
| 962 | mutex_lock(&inode->i_mutex); | 951 | mutex_lock(&inode->i_mutex); |
| 963 | /* to match setattr's i_mutex -> i_alloc_sem -> rw_lock ordering */ | 952 | /* to match setattr's i_mutex -> i_alloc_sem -> rw_lock ordering */ |
| 964 | if (filp->f_flags & O_DIRECT) { | 953 | if (filp->f_flags & O_DIRECT) { |
| @@ -1079,27 +1068,7 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, | |||
| 1079 | /* communicate with ocfs2_dio_end_io */ | 1068 | /* communicate with ocfs2_dio_end_io */ |
| 1080 | ocfs2_iocb_set_rw_locked(iocb); | 1069 | ocfs2_iocb_set_rw_locked(iocb); |
| 1081 | 1070 | ||
| 1082 | #ifdef OCFS2_ORACORE_WORKAROUNDS | 1071 | ret = generic_file_aio_write_nolock(iocb, &local_iov, 1, &iocb->ki_pos); |
| 1083 | if (osb->s_mount_opt & OCFS2_MOUNT_COMPAT_OCFS && | ||
| 1084 | filp->f_flags & O_DIRECT) { | ||
| 1085 | unsigned int saved_flags = filp->f_flags; | ||
| 1086 | int sector_size = 1 << osb->s_sectsize_bits; | ||
| 1087 | |||
| 1088 | if ((saved_pos & (sector_size - 1)) || | ||
| 1089 | (count & (sector_size - 1)) || | ||
| 1090 | ((unsigned long)buf & (sector_size - 1))) { | ||
| 1091 | filp->f_flags |= O_SYNC; | ||
| 1092 | filp->f_flags &= ~O_DIRECT; | ||
| 1093 | } | ||
| 1094 | |||
| 1095 | ret = generic_file_aio_write_nolock(iocb, &local_iov, 1, | ||
| 1096 | &iocb->ki_pos); | ||
| 1097 | |||
| 1098 | filp->f_flags = saved_flags; | ||
| 1099 | } else | ||
| 1100 | #endif | ||
| 1101 | ret = generic_file_aio_write_nolock(iocb, &local_iov, 1, | ||
| 1102 | &iocb->ki_pos); | ||
| 1103 | 1072 | ||
| 1104 | /* buffered aio wouldn't have proper lock coverage today */ | 1073 | /* buffered aio wouldn't have proper lock coverage today */ |
| 1105 | BUG_ON(ret == -EIOCBQUEUED && !(filp->f_flags & O_DIRECT)); | 1074 | BUG_ON(ret == -EIOCBQUEUED && !(filp->f_flags & O_DIRECT)); |
| @@ -1140,9 +1109,6 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb, | |||
| 1140 | int ret = 0, rw_level = -1, have_alloc_sem = 0; | 1109 | int ret = 0, rw_level = -1, have_alloc_sem = 0; |
| 1141 | struct file *filp = iocb->ki_filp; | 1110 | struct file *filp = iocb->ki_filp; |
| 1142 | struct inode *inode = filp->f_dentry->d_inode; | 1111 | struct inode *inode = filp->f_dentry->d_inode; |
| 1143 | #ifdef OCFS2_ORACORE_WORKAROUNDS | ||
| 1144 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); | ||
| 1145 | #endif | ||
| 1146 | 1112 | ||
| 1147 | mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", filp, buf, | 1113 | mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", filp, buf, |
| 1148 | (unsigned int)count, | 1114 | (unsigned int)count, |
| @@ -1155,21 +1121,6 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb, | |||
| 1155 | goto bail; | 1121 | goto bail; |
| 1156 | } | 1122 | } |
| 1157 | 1123 | ||
| 1158 | #ifdef OCFS2_ORACORE_WORKAROUNDS | ||
| 1159 | if (osb->s_mount_opt & OCFS2_MOUNT_COMPAT_OCFS) { | ||
| 1160 | if (filp->f_flags & O_DIRECT) { | ||
| 1161 | int sector_size = 1 << osb->s_sectsize_bits; | ||
| 1162 | |||
| 1163 | if ((pos & (sector_size - 1)) || | ||
| 1164 | (count & (sector_size - 1)) || | ||
| 1165 | ((unsigned long)buf & (sector_size - 1)) || | ||
| 1166 | (i_size_read(inode) & (sector_size -1))) { | ||
| 1167 | filp->f_flags &= ~O_DIRECT; | ||
| 1168 | } | ||
| 1169 | } | ||
| 1170 | } | ||
| 1171 | #endif | ||
| 1172 | |||
| 1173 | /* | 1124 | /* |
| 1174 | * buffered reads protect themselves in ->readpage(). O_DIRECT reads | 1125 | * buffered reads protect themselves in ->readpage(). O_DIRECT reads |
| 1175 | * need locks to protect pending reads from racing with truncate. | 1126 | * need locks to protect pending reads from racing with truncate. |
diff --git a/fs/ocfs2/heartbeat.c b/fs/ocfs2/heartbeat.c index 0bbd22f46c80..cbfd45a97a63 100644 --- a/fs/ocfs2/heartbeat.c +++ b/fs/ocfs2/heartbeat.c | |||
| @@ -67,6 +67,7 @@ void ocfs2_init_node_maps(struct ocfs2_super *osb) | |||
| 67 | ocfs2_node_map_init(&osb->mounted_map); | 67 | ocfs2_node_map_init(&osb->mounted_map); |
| 68 | ocfs2_node_map_init(&osb->recovery_map); | 68 | ocfs2_node_map_init(&osb->recovery_map); |
| 69 | ocfs2_node_map_init(&osb->umount_map); | 69 | ocfs2_node_map_init(&osb->umount_map); |
| 70 | ocfs2_node_map_init(&osb->osb_recovering_orphan_dirs); | ||
| 70 | } | 71 | } |
| 71 | 72 | ||
| 72 | static void ocfs2_do_node_down(int node_num, | 73 | static void ocfs2_do_node_down(int node_num, |
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 8122489c5762..315472a5c192 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include "dlmglue.h" | 41 | #include "dlmglue.h" |
| 42 | #include "extent_map.h" | 42 | #include "extent_map.h" |
| 43 | #include "file.h" | 43 | #include "file.h" |
| 44 | #include "heartbeat.h" | ||
| 44 | #include "inode.h" | 45 | #include "inode.h" |
| 45 | #include "journal.h" | 46 | #include "journal.h" |
| 46 | #include "namei.h" | 47 | #include "namei.h" |
| @@ -544,6 +545,42 @@ bail: | |||
| 544 | return status; | 545 | return status; |
| 545 | } | 546 | } |
| 546 | 547 | ||
| 548 | /* | ||
| 549 | * Serialize with orphan dir recovery. If the process doing | ||
| 550 | * recovery on this orphan dir does an iget() with the dir | ||
| 551 | * i_mutex held, we'll deadlock here. Instead we detect this | ||
| 552 | * and exit early - recovery will wipe this inode for us. | ||
| 553 | */ | ||
| 554 | static int ocfs2_check_orphan_recovery_state(struct ocfs2_super *osb, | ||
| 555 | int slot) | ||
| 556 | { | ||
| 557 | int ret = 0; | ||
| 558 | |||
| 559 | spin_lock(&osb->osb_lock); | ||
| 560 | if (ocfs2_node_map_test_bit(osb, &osb->osb_recovering_orphan_dirs, slot)) { | ||
| 561 | mlog(0, "Recovery is happening on orphan dir %d, will skip " | ||
| 562 | "this inode\n", slot); | ||
| 563 | ret = -EDEADLK; | ||
| 564 | goto out; | ||
| 565 | } | ||
| 566 | /* This signals to the orphan recovery process that it should | ||
| 567 | * wait for us to handle the wipe. */ | ||
| 568 | osb->osb_orphan_wipes[slot]++; | ||
| 569 | out: | ||
| 570 | spin_unlock(&osb->osb_lock); | ||
| 571 | return ret; | ||
| 572 | } | ||
| 573 | |||
| 574 | static void ocfs2_signal_wipe_completion(struct ocfs2_super *osb, | ||
| 575 | int slot) | ||
| 576 | { | ||
| 577 | spin_lock(&osb->osb_lock); | ||
| 578 | osb->osb_orphan_wipes[slot]--; | ||
| 579 | spin_unlock(&osb->osb_lock); | ||
| 580 | |||
| 581 | wake_up(&osb->osb_wipe_event); | ||
| 582 | } | ||
| 583 | |||
| 547 | static int ocfs2_wipe_inode(struct inode *inode, | 584 | static int ocfs2_wipe_inode(struct inode *inode, |
| 548 | struct buffer_head *di_bh) | 585 | struct buffer_head *di_bh) |
| 549 | { | 586 | { |
| @@ -555,6 +592,11 @@ static int ocfs2_wipe_inode(struct inode *inode, | |||
| 555 | /* We've already voted on this so it should be readonly - no | 592 | /* We've already voted on this so it should be readonly - no |
| 556 | * spinlock needed. */ | 593 | * spinlock needed. */ |
| 557 | orphaned_slot = OCFS2_I(inode)->ip_orphaned_slot; | 594 | orphaned_slot = OCFS2_I(inode)->ip_orphaned_slot; |
| 595 | |||
| 596 | status = ocfs2_check_orphan_recovery_state(osb, orphaned_slot); | ||
| 597 | if (status) | ||
| 598 | return status; | ||
| 599 | |||
| 558 | orphan_dir_inode = ocfs2_get_system_file_inode(osb, | 600 | orphan_dir_inode = ocfs2_get_system_file_inode(osb, |
| 559 | ORPHAN_DIR_SYSTEM_INODE, | 601 | ORPHAN_DIR_SYSTEM_INODE, |
| 560 | orphaned_slot); | 602 | orphaned_slot); |
| @@ -597,6 +639,7 @@ bail_unlock_dir: | |||
| 597 | brelse(orphan_dir_bh); | 639 | brelse(orphan_dir_bh); |
| 598 | bail: | 640 | bail: |
| 599 | iput(orphan_dir_inode); | 641 | iput(orphan_dir_inode); |
| 642 | ocfs2_signal_wipe_completion(osb, orphaned_slot); | ||
| 600 | 643 | ||
| 601 | return status; | 644 | return status; |
| 602 | } | 645 | } |
| @@ -822,7 +865,8 @@ void ocfs2_delete_inode(struct inode *inode) | |||
| 822 | 865 | ||
| 823 | status = ocfs2_wipe_inode(inode, di_bh); | 866 | status = ocfs2_wipe_inode(inode, di_bh); |
| 824 | if (status < 0) { | 867 | if (status < 0) { |
| 825 | mlog_errno(status); | 868 | if (status != -EDEADLK) |
| 869 | mlog_errno(status); | ||
| 826 | goto bail_unlock_inode; | 870 | goto bail_unlock_inode; |
| 827 | } | 871 | } |
| 828 | 872 | ||
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index d329c9df90ae..4be801f4559b 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c | |||
| @@ -1408,21 +1408,17 @@ bail: | |||
| 1408 | return status; | 1408 | return status; |
| 1409 | } | 1409 | } |
| 1410 | 1410 | ||
| 1411 | static int ocfs2_recover_orphans(struct ocfs2_super *osb, | 1411 | static int ocfs2_queue_orphans(struct ocfs2_super *osb, |
| 1412 | int slot) | 1412 | int slot, |
| 1413 | struct inode **head) | ||
| 1413 | { | 1414 | { |
| 1414 | int status = 0; | 1415 | int status; |
| 1415 | int have_disk_lock = 0; | ||
| 1416 | struct inode *inode = NULL; | ||
| 1417 | struct inode *iter; | ||
| 1418 | struct inode *orphan_dir_inode = NULL; | 1416 | struct inode *orphan_dir_inode = NULL; |
| 1417 | struct inode *iter; | ||
| 1419 | unsigned long offset, blk, local; | 1418 | unsigned long offset, blk, local; |
| 1420 | struct buffer_head *bh = NULL; | 1419 | struct buffer_head *bh = NULL; |
| 1421 | struct ocfs2_dir_entry *de; | 1420 | struct ocfs2_dir_entry *de; |
| 1422 | struct super_block *sb = osb->sb; | 1421 | struct super_block *sb = osb->sb; |
| 1423 | struct ocfs2_inode_info *oi; | ||
| 1424 | |||
| 1425 | mlog(0, "Recover inodes from orphan dir in slot %d\n", slot); | ||
| 1426 | 1422 | ||
| 1427 | orphan_dir_inode = ocfs2_get_system_file_inode(osb, | 1423 | orphan_dir_inode = ocfs2_get_system_file_inode(osb, |
| 1428 | ORPHAN_DIR_SYSTEM_INODE, | 1424 | ORPHAN_DIR_SYSTEM_INODE, |
| @@ -1430,17 +1426,15 @@ static int ocfs2_recover_orphans(struct ocfs2_super *osb, | |||
| 1430 | if (!orphan_dir_inode) { | 1426 | if (!orphan_dir_inode) { |
| 1431 | status = -ENOENT; | 1427 | status = -ENOENT; |
| 1432 | mlog_errno(status); | 1428 | mlog_errno(status); |
| 1433 | goto out; | 1429 | return status; |
| 1434 | } | 1430 | } |
| 1435 | 1431 | ||
| 1436 | mutex_lock(&orphan_dir_inode->i_mutex); | 1432 | mutex_lock(&orphan_dir_inode->i_mutex); |
| 1437 | status = ocfs2_meta_lock(orphan_dir_inode, NULL, NULL, 0); | 1433 | status = ocfs2_meta_lock(orphan_dir_inode, NULL, NULL, 0); |
| 1438 | if (status < 0) { | 1434 | if (status < 0) { |
| 1439 | mutex_unlock(&orphan_dir_inode->i_mutex); | ||
| 1440 | mlog_errno(status); | 1435 | mlog_errno(status); |
| 1441 | goto out; | 1436 | goto out; |
| 1442 | } | 1437 | } |
| 1443 | have_disk_lock = 1; | ||
| 1444 | 1438 | ||
| 1445 | offset = 0; | 1439 | offset = 0; |
| 1446 | iter = NULL; | 1440 | iter = NULL; |
| @@ -1451,11 +1445,10 @@ static int ocfs2_recover_orphans(struct ocfs2_super *osb, | |||
| 1451 | if (!bh) | 1445 | if (!bh) |
| 1452 | status = -EINVAL; | 1446 | status = -EINVAL; |
| 1453 | if (status < 0) { | 1447 | if (status < 0) { |
| 1454 | mutex_unlock(&orphan_dir_inode->i_mutex); | ||
| 1455 | if (bh) | 1448 | if (bh) |
| 1456 | brelse(bh); | 1449 | brelse(bh); |
| 1457 | mlog_errno(status); | 1450 | mlog_errno(status); |
| 1458 | goto out; | 1451 | goto out_unlock; |
| 1459 | } | 1452 | } |
| 1460 | 1453 | ||
| 1461 | local = 0; | 1454 | local = 0; |
| @@ -1465,11 +1458,10 @@ static int ocfs2_recover_orphans(struct ocfs2_super *osb, | |||
| 1465 | 1458 | ||
| 1466 | if (!ocfs2_check_dir_entry(orphan_dir_inode, | 1459 | if (!ocfs2_check_dir_entry(orphan_dir_inode, |
| 1467 | de, bh, local)) { | 1460 | de, bh, local)) { |
| 1468 | mutex_unlock(&orphan_dir_inode->i_mutex); | ||
| 1469 | status = -EINVAL; | 1461 | status = -EINVAL; |
| 1470 | mlog_errno(status); | 1462 | mlog_errno(status); |
| 1471 | brelse(bh); | 1463 | brelse(bh); |
| 1472 | goto out; | 1464 | goto out_unlock; |
| 1473 | } | 1465 | } |
| 1474 | 1466 | ||
| 1475 | local += le16_to_cpu(de->rec_len); | 1467 | local += le16_to_cpu(de->rec_len); |
| @@ -1504,18 +1496,95 @@ static int ocfs2_recover_orphans(struct ocfs2_super *osb, | |||
| 1504 | 1496 | ||
| 1505 | mlog(0, "queue orphan %"MLFu64"\n", | 1497 | mlog(0, "queue orphan %"MLFu64"\n", |
| 1506 | OCFS2_I(iter)->ip_blkno); | 1498 | OCFS2_I(iter)->ip_blkno); |
| 1507 | OCFS2_I(iter)->ip_next_orphan = inode; | 1499 | /* No locking is required for the next_orphan |
| 1508 | inode = iter; | 1500 | * queue as there is only ever a single |
| 1501 | * process doing orphan recovery. */ | ||
| 1502 | OCFS2_I(iter)->ip_next_orphan = *head; | ||
| 1503 | *head = iter; | ||
| 1509 | } | 1504 | } |
| 1510 | brelse(bh); | 1505 | brelse(bh); |
| 1511 | } | 1506 | } |
| 1512 | mutex_unlock(&orphan_dir_inode->i_mutex); | ||
| 1513 | 1507 | ||
| 1508 | out_unlock: | ||
| 1514 | ocfs2_meta_unlock(orphan_dir_inode, 0); | 1509 | ocfs2_meta_unlock(orphan_dir_inode, 0); |
| 1515 | have_disk_lock = 0; | 1510 | out: |
| 1516 | 1511 | mutex_unlock(&orphan_dir_inode->i_mutex); | |
| 1517 | iput(orphan_dir_inode); | 1512 | iput(orphan_dir_inode); |
| 1518 | orphan_dir_inode = NULL; | 1513 | return status; |
| 1514 | } | ||
| 1515 | |||
| 1516 | static int ocfs2_orphan_recovery_can_continue(struct ocfs2_super *osb, | ||
| 1517 | int slot) | ||
| 1518 | { | ||
| 1519 | int ret; | ||
| 1520 | |||
| 1521 | spin_lock(&osb->osb_lock); | ||
| 1522 | ret = !osb->osb_orphan_wipes[slot]; | ||
| 1523 | spin_unlock(&osb->osb_lock); | ||
| 1524 | return ret; | ||
| 1525 | } | ||
| 1526 | |||
| 1527 | static void ocfs2_mark_recovering_orphan_dir(struct ocfs2_super *osb, | ||
| 1528 | int slot) | ||
| 1529 | { | ||
| 1530 | spin_lock(&osb->osb_lock); | ||
| 1531 | /* Mark ourselves such that new processes in delete_inode() | ||
| 1532 | * know to quit early. */ | ||
| 1533 | ocfs2_node_map_set_bit(osb, &osb->osb_recovering_orphan_dirs, slot); | ||
| 1534 | while (osb->osb_orphan_wipes[slot]) { | ||
| 1535 | /* If any processes are already in the middle of an | ||
| 1536 | * orphan wipe on this dir, then we need to wait for | ||
| 1537 | * them. */ | ||
| 1538 | spin_unlock(&osb->osb_lock); | ||
| 1539 | wait_event_interruptible(osb->osb_wipe_event, | ||
| 1540 | ocfs2_orphan_recovery_can_continue(osb, slot)); | ||
| 1541 | spin_lock(&osb->osb_lock); | ||
| 1542 | } | ||
| 1543 | spin_unlock(&osb->osb_lock); | ||
| 1544 | } | ||
| 1545 | |||
| 1546 | static void ocfs2_clear_recovering_orphan_dir(struct ocfs2_super *osb, | ||
| 1547 | int slot) | ||
| 1548 | { | ||
| 1549 | ocfs2_node_map_clear_bit(osb, &osb->osb_recovering_orphan_dirs, slot); | ||
| 1550 | } | ||
| 1551 | |||
| 1552 | /* | ||
| 1553 | * Orphan recovery. Each mounted node has it's own orphan dir which we | ||
| 1554 | * must run during recovery. Our strategy here is to build a list of | ||
| 1555 | * the inodes in the orphan dir and iget/iput them. The VFS does | ||
| 1556 | * (most) of the rest of the work. | ||
| 1557 | * | ||
| 1558 | * Orphan recovery can happen at any time, not just mount so we have a | ||
| 1559 | * couple of extra considerations. | ||
| 1560 | * | ||
| 1561 | * - We grab as many inodes as we can under the orphan dir lock - | ||
| 1562 | * doing iget() outside the orphan dir risks getting a reference on | ||
| 1563 | * an invalid inode. | ||
| 1564 | * - We must be sure not to deadlock with other processes on the | ||
| 1565 | * system wanting to run delete_inode(). This can happen when they go | ||
| 1566 | * to lock the orphan dir and the orphan recovery process attempts to | ||
| 1567 | * iget() inside the orphan dir lock. This can be avoided by | ||
| 1568 | * advertising our state to ocfs2_delete_inode(). | ||
| 1569 | */ | ||
| 1570 | static int ocfs2_recover_orphans(struct ocfs2_super *osb, | ||
| 1571 | int slot) | ||
| 1572 | { | ||
| 1573 | int ret = 0; | ||
| 1574 | struct inode *inode = NULL; | ||
| 1575 | struct inode *iter; | ||
| 1576 | struct ocfs2_inode_info *oi; | ||
| 1577 | |||
| 1578 | mlog(0, "Recover inodes from orphan dir in slot %d\n", slot); | ||
| 1579 | |||
| 1580 | ocfs2_mark_recovering_orphan_dir(osb, slot); | ||
| 1581 | ret = ocfs2_queue_orphans(osb, slot, &inode); | ||
| 1582 | ocfs2_clear_recovering_orphan_dir(osb, slot); | ||
| 1583 | |||
| 1584 | /* Error here should be noted, but we want to continue with as | ||
| 1585 | * many queued inodes as we've got. */ | ||
| 1586 | if (ret) | ||
| 1587 | mlog_errno(ret); | ||
| 1519 | 1588 | ||
| 1520 | while (inode) { | 1589 | while (inode) { |
| 1521 | oi = OCFS2_I(inode); | 1590 | oi = OCFS2_I(inode); |
| @@ -1541,14 +1610,7 @@ static int ocfs2_recover_orphans(struct ocfs2_super *osb, | |||
| 1541 | inode = iter; | 1610 | inode = iter; |
| 1542 | } | 1611 | } |
| 1543 | 1612 | ||
| 1544 | out: | 1613 | return ret; |
| 1545 | if (have_disk_lock) | ||
| 1546 | ocfs2_meta_unlock(orphan_dir_inode, 0); | ||
| 1547 | |||
| 1548 | if (orphan_dir_inode) | ||
| 1549 | iput(orphan_dir_inode); | ||
| 1550 | |||
| 1551 | return status; | ||
| 1552 | } | 1614 | } |
| 1553 | 1615 | ||
| 1554 | static int ocfs2_wait_on_mount(struct ocfs2_super *osb) | 1616 | static int ocfs2_wait_on_mount(struct ocfs2_super *osb) |
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h index 8d8e4779df92..e89de9b6e491 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h | |||
| @@ -174,9 +174,6 @@ enum ocfs2_mount_options | |||
| 174 | OCFS2_MOUNT_NOINTR = 1 << 2, /* Don't catch signals */ | 174 | OCFS2_MOUNT_NOINTR = 1 << 2, /* Don't catch signals */ |
| 175 | OCFS2_MOUNT_ERRORS_PANIC = 1 << 3, /* Panic on errors */ | 175 | OCFS2_MOUNT_ERRORS_PANIC = 1 << 3, /* Panic on errors */ |
| 176 | OCFS2_MOUNT_DATA_WRITEBACK = 1 << 4, /* No data ordering */ | 176 | OCFS2_MOUNT_DATA_WRITEBACK = 1 << 4, /* No data ordering */ |
| 177 | #ifdef OCFS2_ORACORE_WORKAROUNDS | ||
| 178 | OCFS2_MOUNT_COMPAT_OCFS = 1 << 30, /* ocfs1 compatibility mode */ | ||
| 179 | #endif | ||
| 180 | }; | 177 | }; |
| 181 | 178 | ||
| 182 | #define OCFS2_OSB_SOFT_RO 0x0001 | 179 | #define OCFS2_OSB_SOFT_RO 0x0001 |
| @@ -290,6 +287,10 @@ struct ocfs2_super | |||
| 290 | struct inode *osb_tl_inode; | 287 | struct inode *osb_tl_inode; |
| 291 | struct buffer_head *osb_tl_bh; | 288 | struct buffer_head *osb_tl_bh; |
| 292 | struct work_struct osb_truncate_log_wq; | 289 | struct work_struct osb_truncate_log_wq; |
| 290 | |||
| 291 | struct ocfs2_node_map osb_recovering_orphan_dirs; | ||
| 292 | unsigned int *osb_orphan_wipes; | ||
| 293 | wait_queue_head_t osb_wipe_event; | ||
| 293 | }; | 294 | }; |
| 294 | 295 | ||
| 295 | #define OCFS2_SB(sb) ((struct ocfs2_super *)(sb)->s_fs_info) | 296 | #define OCFS2_SB(sb) ((struct ocfs2_super *)(sb)->s_fs_info) |
diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h index dfb8a5bedfc8..c5b1ac547c15 100644 --- a/fs/ocfs2/ocfs2_fs.h +++ b/fs/ocfs2/ocfs2_fs.h | |||
| @@ -138,7 +138,6 @@ | |||
| 138 | 138 | ||
| 139 | /* Journal limits (in bytes) */ | 139 | /* Journal limits (in bytes) */ |
| 140 | #define OCFS2_MIN_JOURNAL_SIZE (4 * 1024 * 1024) | 140 | #define OCFS2_MIN_JOURNAL_SIZE (4 * 1024 * 1024) |
| 141 | #define OCFS2_MAX_JOURNAL_SIZE (500 * 1024 * 1024) | ||
| 142 | 141 | ||
| 143 | struct ocfs2_system_inode_info { | 142 | struct ocfs2_system_inode_info { |
| 144 | char *si_name; | 143 | char *si_name; |
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 046824b6b625..8dd3aafec499 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
| @@ -1325,6 +1325,16 @@ static int ocfs2_initialize_super(struct super_block *sb, | |||
| 1325 | } | 1325 | } |
| 1326 | mlog(ML_NOTICE, "max_slots for this device: %u\n", osb->max_slots); | 1326 | mlog(ML_NOTICE, "max_slots for this device: %u\n", osb->max_slots); |
| 1327 | 1327 | ||
| 1328 | init_waitqueue_head(&osb->osb_wipe_event); | ||
| 1329 | osb->osb_orphan_wipes = kcalloc(osb->max_slots, | ||
| 1330 | sizeof(*osb->osb_orphan_wipes), | ||
| 1331 | GFP_KERNEL); | ||
| 1332 | if (!osb->osb_orphan_wipes) { | ||
| 1333 | status = -ENOMEM; | ||
| 1334 | mlog_errno(status); | ||
| 1335 | goto bail; | ||
| 1336 | } | ||
| 1337 | |||
| 1328 | osb->s_feature_compat = | 1338 | osb->s_feature_compat = |
| 1329 | le32_to_cpu(OCFS2_RAW_SB(di)->s_feature_compat); | 1339 | le32_to_cpu(OCFS2_RAW_SB(di)->s_feature_compat); |
| 1330 | osb->s_feature_ro_compat = | 1340 | osb->s_feature_ro_compat = |
| @@ -1638,6 +1648,7 @@ static void ocfs2_delete_osb(struct ocfs2_super *osb) | |||
| 1638 | if (osb->slot_info) | 1648 | if (osb->slot_info) |
| 1639 | ocfs2_free_slot_info(osb->slot_info); | 1649 | ocfs2_free_slot_info(osb->slot_info); |
| 1640 | 1650 | ||
| 1651 | kfree(osb->osb_orphan_wipes); | ||
| 1641 | /* FIXME | 1652 | /* FIXME |
| 1642 | * This belongs in journal shutdown, but because we have to | 1653 | * This belongs in journal shutdown, but because we have to |
| 1643 | * allocate osb->journal at the start of ocfs2_initalize_osb(), | 1654 | * allocate osb->journal at the start of ocfs2_initalize_osb(), |
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c index c66bd5e4c05c..cde5d48994ae 100644 --- a/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/fs.h> | 27 | #include <linux/fs.h> |
| 28 | #include <linux/pagemap.h> | 28 | #include <linux/pagemap.h> |
| 29 | #include <linux/highmem.h> | 29 | #include <linux/highmem.h> |
| 30 | #include <linux/time.h> | ||
| 30 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 31 | #include <linux/string.h> | 32 | #include <linux/string.h> |
| 32 | #include <linux/smp_lock.h> | 33 | #include <linux/smp_lock.h> |
| @@ -104,6 +105,7 @@ ramfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev) | |||
| 104 | d_instantiate(dentry, inode); | 105 | d_instantiate(dentry, inode); |
| 105 | dget(dentry); /* Extra count - pin the dentry in core */ | 106 | dget(dentry); /* Extra count - pin the dentry in core */ |
| 106 | error = 0; | 107 | error = 0; |
| 108 | dir->i_mtime = dir->i_ctime = CURRENT_TIME; | ||
| 107 | } | 109 | } |
| 108 | return error; | 110 | return error; |
| 109 | } | 111 | } |
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c index f3473176c83a..be12879bb179 100644 --- a/fs/reiserfs/file.c +++ b/fs/reiserfs/file.c | |||
| @@ -1464,13 +1464,11 @@ static ssize_t reiserfs_file_write(struct file *file, /* the file we are going t | |||
| 1464 | partially overwritten pages, if needed. And lock the pages, | 1464 | partially overwritten pages, if needed. And lock the pages, |
| 1465 | so that nobody else can access these until we are done. | 1465 | so that nobody else can access these until we are done. |
| 1466 | We get number of actual blocks needed as a result. */ | 1466 | We get number of actual blocks needed as a result. */ |
| 1467 | blocks_to_allocate = | 1467 | res = reiserfs_prepare_file_region_for_write(inode, pos, |
| 1468 | reiserfs_prepare_file_region_for_write(inode, pos, | 1468 | num_pages, |
| 1469 | num_pages, | 1469 | write_bytes, |
| 1470 | write_bytes, | 1470 | prepared_pages); |
| 1471 | prepared_pages); | 1471 | if (res < 0) { |
| 1472 | if (blocks_to_allocate < 0) { | ||
| 1473 | res = blocks_to_allocate; | ||
| 1474 | reiserfs_release_claimed_blocks(inode->i_sb, | 1472 | reiserfs_release_claimed_blocks(inode->i_sb, |
| 1475 | num_pages << | 1473 | num_pages << |
| 1476 | (PAGE_CACHE_SHIFT - | 1474 | (PAGE_CACHE_SHIFT - |
| @@ -1478,6 +1476,8 @@ static ssize_t reiserfs_file_write(struct file *file, /* the file we are going t | |||
| 1478 | break; | 1476 | break; |
| 1479 | } | 1477 | } |
| 1480 | 1478 | ||
| 1479 | blocks_to_allocate = res; | ||
| 1480 | |||
| 1481 | /* First we correct our estimate of how many blocks we need */ | 1481 | /* First we correct our estimate of how many blocks we need */ |
| 1482 | reiserfs_release_claimed_blocks(inode->i_sb, | 1482 | reiserfs_release_claimed_blocks(inode->i_sb, |
| 1483 | (num_pages << | 1483 | (num_pages << |
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index b33d67bba2fd..d60f6238c66a 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c | |||
| @@ -627,11 +627,6 @@ int reiserfs_get_block(struct inode *inode, sector_t block, | |||
| 627 | reiserfs_write_lock(inode->i_sb); | 627 | reiserfs_write_lock(inode->i_sb); |
| 628 | version = get_inode_item_key_version(inode); | 628 | version = get_inode_item_key_version(inode); |
| 629 | 629 | ||
| 630 | if (block < 0) { | ||
| 631 | reiserfs_write_unlock(inode->i_sb); | ||
| 632 | return -EIO; | ||
| 633 | } | ||
| 634 | |||
| 635 | if (!file_capable(inode, block)) { | 630 | if (!file_capable(inode, block)) { |
| 636 | reiserfs_write_unlock(inode->i_sb); | 631 | reiserfs_write_unlock(inode->i_sb); |
| 637 | return -EFBIG; | 632 | return -EFBIG; |
| @@ -934,12 +929,13 @@ int reiserfs_get_block(struct inode *inode, sector_t block, | |||
| 934 | //pos_in_item * inode->i_sb->s_blocksize, | 929 | //pos_in_item * inode->i_sb->s_blocksize, |
| 935 | TYPE_INDIRECT, 3); // key type is unimportant | 930 | TYPE_INDIRECT, 3); // key type is unimportant |
| 936 | 931 | ||
| 932 | RFALSE(cpu_key_k_offset(&tmp_key) > cpu_key_k_offset(&key), | ||
| 933 | "green-805: invalid offset"); | ||
| 937 | blocks_needed = | 934 | blocks_needed = |
| 938 | 1 + | 935 | 1 + |
| 939 | ((cpu_key_k_offset(&key) - | 936 | ((cpu_key_k_offset(&key) - |
| 940 | cpu_key_k_offset(&tmp_key)) >> inode->i_sb-> | 937 | cpu_key_k_offset(&tmp_key)) >> inode->i_sb-> |
| 941 | s_blocksize_bits); | 938 | s_blocksize_bits); |
| 942 | RFALSE(blocks_needed < 0, "green-805: invalid offset"); | ||
| 943 | 939 | ||
| 944 | if (blocks_needed == 1) { | 940 | if (blocks_needed == 1) { |
| 945 | un = &unf_single; | 941 | un = &unf_single; |
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index b7a179560ab4..5a9d2722fa0a 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
| @@ -2319,8 +2319,7 @@ static int journal_read(struct super_block *p_s_sb) | |||
| 2319 | return 1; | 2319 | return 1; |
| 2320 | } | 2320 | } |
| 2321 | jh = (struct reiserfs_journal_header *)(journal->j_header_bh->b_data); | 2321 | jh = (struct reiserfs_journal_header *)(journal->j_header_bh->b_data); |
| 2322 | if (le32_to_cpu(jh->j_first_unflushed_offset) >= 0 && | 2322 | if (le32_to_cpu(jh->j_first_unflushed_offset) < |
| 2323 | le32_to_cpu(jh->j_first_unflushed_offset) < | ||
| 2324 | SB_ONDISK_JOURNAL_SIZE(p_s_sb) | 2323 | SB_ONDISK_JOURNAL_SIZE(p_s_sb) |
| 2325 | && le32_to_cpu(jh->j_last_flush_trans_id) > 0) { | 2324 | && le32_to_cpu(jh->j_last_flush_trans_id) > 0) { |
| 2326 | oldest_start = | 2325 | oldest_start = |
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index 8f2beec526cf..74d8be87f983 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c | |||
| @@ -540,7 +540,7 @@ xfs_probe_cluster( | |||
| 540 | 540 | ||
| 541 | /* First sum forwards in this page */ | 541 | /* First sum forwards in this page */ |
| 542 | do { | 542 | do { |
| 543 | if (mapped != buffer_mapped(bh)) | 543 | if (!buffer_uptodate(bh) || (mapped != buffer_mapped(bh))) |
| 544 | return total; | 544 | return total; |
| 545 | total += bh->b_size; | 545 | total += bh->b_size; |
| 546 | } while ((bh = bh->b_this_page) != head); | 546 | } while ((bh = bh->b_this_page) != head); |
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c index 53a00fb217fa..7c0e39dc6189 100644 --- a/fs/xfs/quota/xfs_qm.c +++ b/fs/xfs/quota/xfs_qm.c | |||
| @@ -68,6 +68,9 @@ kmem_zone_t *qm_dqzone; | |||
| 68 | kmem_zone_t *qm_dqtrxzone; | 68 | kmem_zone_t *qm_dqtrxzone; |
| 69 | STATIC kmem_shaker_t xfs_qm_shaker; | 69 | STATIC kmem_shaker_t xfs_qm_shaker; |
| 70 | 70 | ||
| 71 | STATIC cred_t xfs_zerocr; | ||
| 72 | STATIC xfs_inode_t xfs_zeroino; | ||
| 73 | |||
| 71 | STATIC void xfs_qm_list_init(xfs_dqlist_t *, char *, int); | 74 | STATIC void xfs_qm_list_init(xfs_dqlist_t *, char *, int); |
| 72 | STATIC void xfs_qm_list_destroy(xfs_dqlist_t *); | 75 | STATIC void xfs_qm_list_destroy(xfs_dqlist_t *); |
| 73 | 76 | ||
| @@ -1393,8 +1396,6 @@ xfs_qm_qino_alloc( | |||
| 1393 | xfs_trans_t *tp; | 1396 | xfs_trans_t *tp; |
| 1394 | int error; | 1397 | int error; |
| 1395 | unsigned long s; | 1398 | unsigned long s; |
| 1396 | cred_t zerocr; | ||
| 1397 | xfs_inode_t zeroino; | ||
| 1398 | int committed; | 1399 | int committed; |
| 1399 | 1400 | ||
| 1400 | tp = xfs_trans_alloc(mp, XFS_TRANS_QM_QINOCREATE); | 1401 | tp = xfs_trans_alloc(mp, XFS_TRANS_QM_QINOCREATE); |
| @@ -1406,11 +1407,9 @@ xfs_qm_qino_alloc( | |||
| 1406 | xfs_trans_cancel(tp, 0); | 1407 | xfs_trans_cancel(tp, 0); |
| 1407 | return error; | 1408 | return error; |
| 1408 | } | 1409 | } |
| 1409 | memset(&zerocr, 0, sizeof(zerocr)); | ||
| 1410 | memset(&zeroino, 0, sizeof(zeroino)); | ||
| 1411 | 1410 | ||
| 1412 | if ((error = xfs_dir_ialloc(&tp, &zeroino, S_IFREG, 1, 0, | 1411 | if ((error = xfs_dir_ialloc(&tp, &xfs_zeroino, S_IFREG, 1, 0, |
| 1413 | &zerocr, 0, 1, ip, &committed))) { | 1412 | &xfs_zerocr, 0, 1, ip, &committed))) { |
| 1414 | xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES | | 1413 | xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES | |
| 1415 | XFS_TRANS_ABORT); | 1414 | XFS_TRANS_ABORT); |
| 1416 | return error; | 1415 | return error; |
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index 06fc061c50fc..5b413946b1c5 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c | |||
| @@ -130,7 +130,8 @@ xfs_growfs_rt_alloc( | |||
| 130 | /* | 130 | /* |
| 131 | * Lock the inode. | 131 | * Lock the inode. |
| 132 | */ | 132 | */ |
| 133 | if ((error = xfs_trans_iget(mp, tp, ino, 0, XFS_ILOCK_EXCL, &ip))) | 133 | if ((error = xfs_trans_iget(mp, tp, ino, 0, |
| 134 | XFS_ILOCK_EXCL, &ip))) | ||
| 134 | goto error_exit; | 135 | goto error_exit; |
| 135 | XFS_BMAP_INIT(&flist, &firstblock); | 136 | XFS_BMAP_INIT(&flist, &firstblock); |
| 136 | /* | 137 | /* |
| @@ -170,8 +171,8 @@ xfs_growfs_rt_alloc( | |||
| 170 | /* | 171 | /* |
| 171 | * Lock the bitmap inode. | 172 | * Lock the bitmap inode. |
| 172 | */ | 173 | */ |
| 173 | if ((error = xfs_trans_iget(mp, tp, ino, 0, XFS_ILOCK_EXCL, | 174 | if ((error = xfs_trans_iget(mp, tp, ino, 0, |
| 174 | &ip))) | 175 | XFS_ILOCK_EXCL, &ip))) |
| 175 | goto error_exit; | 176 | goto error_exit; |
| 176 | /* | 177 | /* |
| 177 | * Get a buffer for the block. | 178 | * Get a buffer for the block. |
| @@ -2023,8 +2024,8 @@ xfs_growfs_rt( | |||
| 2023 | /* | 2024 | /* |
| 2024 | * Lock out other callers by grabbing the bitmap inode lock. | 2025 | * Lock out other callers by grabbing the bitmap inode lock. |
| 2025 | */ | 2026 | */ |
| 2026 | if ((error = xfs_trans_iget(mp, tp, 0, mp->m_sb.sb_rbmino, | 2027 | if ((error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rbmino, 0, |
| 2027 | XFS_ILOCK_EXCL, &ip))) | 2028 | XFS_ILOCK_EXCL, &ip))) |
| 2028 | goto error_exit; | 2029 | goto error_exit; |
| 2029 | ASSERT(ip == mp->m_rbmip); | 2030 | ASSERT(ip == mp->m_rbmip); |
| 2030 | /* | 2031 | /* |
| @@ -2037,8 +2038,8 @@ xfs_growfs_rt( | |||
| 2037 | /* | 2038 | /* |
| 2038 | * Get the summary inode into the transaction. | 2039 | * Get the summary inode into the transaction. |
| 2039 | */ | 2040 | */ |
| 2040 | if ((error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rsumino, | 2041 | if ((error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rsumino, 0, |
| 2041 | 0, XFS_ILOCK_EXCL, &ip))) | 2042 | XFS_ILOCK_EXCL, &ip))) |
| 2042 | goto error_exit; | 2043 | goto error_exit; |
| 2043 | ASSERT(ip == mp->m_rsumip); | 2044 | ASSERT(ip == mp->m_rsumip); |
| 2044 | /* | 2045 | /* |
| @@ -2158,10 +2159,9 @@ xfs_rtallocate_extent( | |||
| 2158 | /* | 2159 | /* |
| 2159 | * Lock out other callers by grabbing the bitmap inode lock. | 2160 | * Lock out other callers by grabbing the bitmap inode lock. |
| 2160 | */ | 2161 | */ |
| 2161 | error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rbmino, 0, XFS_ILOCK_EXCL, &ip); | 2162 | if ((error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rbmino, 0, |
| 2162 | if (error) { | 2163 | XFS_ILOCK_EXCL, &ip))) |
| 2163 | return error; | 2164 | return error; |
| 2164 | } | ||
| 2165 | sumbp = NULL; | 2165 | sumbp = NULL; |
| 2166 | /* | 2166 | /* |
| 2167 | * Allocate by size, or near another block, or exactly at some block. | 2167 | * Allocate by size, or near another block, or exactly at some block. |
| @@ -2221,10 +2221,9 @@ xfs_rtfree_extent( | |||
| 2221 | /* | 2221 | /* |
| 2222 | * Synchronize by locking the bitmap inode. | 2222 | * Synchronize by locking the bitmap inode. |
| 2223 | */ | 2223 | */ |
| 2224 | error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rbmino, 0, XFS_ILOCK_EXCL, &ip); | 2224 | if ((error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rbmino, 0, |
| 2225 | if (error) { | 2225 | XFS_ILOCK_EXCL, &ip))) |
| 2226 | return error; | 2226 | return error; |
| 2227 | } | ||
| 2228 | #if defined(__KERNEL__) && defined(DEBUG) | 2227 | #if defined(__KERNEL__) && defined(DEBUG) |
| 2229 | /* | 2228 | /* |
| 2230 | * Check to see that this whole range is currently allocated. | 2229 | * Check to see that this whole range is currently allocated. |
| @@ -2365,8 +2364,8 @@ xfs_rtpick_extent( | |||
| 2365 | __uint64_t seq; /* sequence number of file creation */ | 2364 | __uint64_t seq; /* sequence number of file creation */ |
| 2366 | __uint64_t *seqp; /* pointer to seqno in inode */ | 2365 | __uint64_t *seqp; /* pointer to seqno in inode */ |
| 2367 | 2366 | ||
| 2368 | error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rbmino, 0, XFS_ILOCK_EXCL, &ip); | 2367 | if ((error = xfs_trans_iget(mp, tp, mp->m_sb.sb_rbmino, 0, |
| 2369 | if (error) | 2368 | XFS_ILOCK_EXCL, &ip))) |
| 2370 | return error; | 2369 | return error; |
| 2371 | ASSERT(ip == mp->m_rbmip); | 2370 | ASSERT(ip == mp->m_rbmip); |
| 2372 | seqp = (__uint64_t *)&ip->i_d.di_atime; | 2371 | seqp = (__uint64_t *)&ip->i_d.di_atime; |
diff --git a/include/asm-i386/desc.h b/include/asm-i386/desc.h index 494e73bca095..89b8b82c82b3 100644 --- a/include/asm-i386/desc.h +++ b/include/asm-i386/desc.h | |||
| @@ -24,11 +24,13 @@ struct Xgt_desc_struct { | |||
| 24 | unsigned short pad; | 24 | unsigned short pad; |
| 25 | } __attribute__ ((packed)); | 25 | } __attribute__ ((packed)); |
| 26 | 26 | ||
| 27 | extern struct Xgt_desc_struct idt_descr, cpu_gdt_descr[NR_CPUS]; | 27 | extern struct Xgt_desc_struct idt_descr; |
| 28 | DECLARE_PER_CPU(struct Xgt_desc_struct, cpu_gdt_descr); | ||
| 29 | |||
| 28 | 30 | ||
| 29 | static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu) | 31 | static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu) |
| 30 | { | 32 | { |
| 31 | return ((struct desc_struct *)cpu_gdt_descr[cpu].address); | 33 | return (struct desc_struct *)per_cpu(cpu_gdt_descr, cpu).address; |
| 32 | } | 34 | } |
| 33 | 35 | ||
| 34 | #define load_TR_desc() __asm__ __volatile__("ltr %w0"::"q" (GDT_ENTRY_TSS*8)) | 36 | #define load_TR_desc() __asm__ __volatile__("ltr %w0"::"q" (GDT_ENTRY_TSS*8)) |
diff --git a/include/asm-i386/kprobes.h b/include/asm-i386/kprobes.h index 27cac050a60e..a0d2d74a7dda 100644 --- a/include/asm-i386/kprobes.h +++ b/include/asm-i386/kprobes.h | |||
| @@ -27,6 +27,9 @@ | |||
| 27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 28 | #include <linux/ptrace.h> | 28 | #include <linux/ptrace.h> |
| 29 | 29 | ||
| 30 | #define __ARCH_WANT_KPROBES_INSN_SLOT | ||
| 31 | |||
| 32 | struct kprobe; | ||
| 30 | struct pt_regs; | 33 | struct pt_regs; |
| 31 | 34 | ||
| 32 | typedef u8 kprobe_opcode_t; | 35 | typedef u8 kprobe_opcode_t; |
| @@ -40,14 +43,14 @@ typedef u8 kprobe_opcode_t; | |||
| 40 | 43 | ||
| 41 | #define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)pentry | 44 | #define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)pentry |
| 42 | #define ARCH_SUPPORTS_KRETPROBES | 45 | #define ARCH_SUPPORTS_KRETPROBES |
| 43 | #define arch_remove_kprobe(p) do {} while (0) | ||
| 44 | 46 | ||
| 47 | void arch_remove_kprobe(struct kprobe *p); | ||
| 45 | void kretprobe_trampoline(void); | 48 | void kretprobe_trampoline(void); |
| 46 | 49 | ||
| 47 | /* Architecture specific copy of original instruction*/ | 50 | /* Architecture specific copy of original instruction*/ |
| 48 | struct arch_specific_insn { | 51 | struct arch_specific_insn { |
| 49 | /* copy of the original instruction */ | 52 | /* copy of the original instruction */ |
| 50 | kprobe_opcode_t insn[MAX_INSN_SIZE]; | 53 | kprobe_opcode_t *insn; |
| 51 | }; | 54 | }; |
| 52 | 55 | ||
| 53 | struct prev_kprobe { | 56 | struct prev_kprobe { |
diff --git a/include/asm-ia64/sn/arch.h b/include/asm-ia64/sn/arch.h index 91c31be87b13..16adc93d7a72 100644 --- a/include/asm-ia64/sn/arch.h +++ b/include/asm-ia64/sn/arch.h | |||
| @@ -31,7 +31,8 @@ | |||
| 31 | * to ACPI3.0, this limit will be removed. The notion of "compact nodes" | 31 | * to ACPI3.0, this limit will be removed. The notion of "compact nodes" |
| 32 | * should be deleted and TIOs should be included in MAX_NUMNODES. | 32 | * should be deleted and TIOs should be included in MAX_NUMNODES. |
| 33 | */ | 33 | */ |
| 34 | #define MAX_COMPACT_NODES 512 | 34 | #define MAX_TIO_NODES MAX_NUMNODES |
| 35 | #define MAX_COMPACT_NODES (MAX_NUMNODES + MAX_TIO_NODES) | ||
| 35 | 36 | ||
| 36 | /* | 37 | /* |
| 37 | * Maximum number of nodes in all partitions and in all coherency domains. | 38 | * Maximum number of nodes in all partitions and in all coherency domains. |
diff --git a/include/asm-m32r/uaccess.h b/include/asm-m32r/uaccess.h index 0da7c47d2f01..e8ae61956a51 100644 --- a/include/asm-m32r/uaccess.h +++ b/include/asm-m32r/uaccess.h | |||
| @@ -328,7 +328,7 @@ extern void __put_user_bad(void); | |||
| 328 | " .long 1b,4b\n" \ | 328 | " .long 1b,4b\n" \ |
| 329 | " .long 2b,4b\n" \ | 329 | " .long 2b,4b\n" \ |
| 330 | ".previous" \ | 330 | ".previous" \ |
| 331 | : "=r"(err) \ | 331 | : "=&r"(err) \ |
| 332 | : "r"(x), "r"(addr), "i"(-EFAULT), "0"(err) \ | 332 | : "r"(x), "r"(addr), "i"(-EFAULT), "0"(err) \ |
| 333 | : "r14", "memory") | 333 | : "r14", "memory") |
| 334 | 334 | ||
| @@ -353,7 +353,7 @@ extern void __put_user_bad(void); | |||
| 353 | " .long 1b,4b\n" \ | 353 | " .long 1b,4b\n" \ |
| 354 | " .long 2b,4b\n" \ | 354 | " .long 2b,4b\n" \ |
| 355 | ".previous" \ | 355 | ".previous" \ |
| 356 | : "=r"(err) \ | 356 | : "=&r"(err) \ |
| 357 | : "r"(x), "r"(addr), "i"(-EFAULT), "0"(err) \ | 357 | : "r"(x), "r"(addr), "i"(-EFAULT), "0"(err) \ |
| 358 | : "r14", "memory") | 358 | : "r14", "memory") |
| 359 | #else | 359 | #else |
| @@ -398,7 +398,7 @@ struct __large_struct { unsigned long buf[100]; }; | |||
| 398 | " .balign 4\n" \ | 398 | " .balign 4\n" \ |
| 399 | " .long 1b,3b\n" \ | 399 | " .long 1b,3b\n" \ |
| 400 | ".previous" \ | 400 | ".previous" \ |
| 401 | : "=r"(err) \ | 401 | : "=&r"(err) \ |
| 402 | : "r"(x), "r"(addr), "i"(-EFAULT), "0"(err) \ | 402 | : "r"(x), "r"(addr), "i"(-EFAULT), "0"(err) \ |
| 403 | : "r14", "memory") | 403 | : "r14", "memory") |
| 404 | 404 | ||
| @@ -442,7 +442,7 @@ do { \ | |||
| 442 | " .balign 4\n" \ | 442 | " .balign 4\n" \ |
| 443 | " .long 1b,3b\n" \ | 443 | " .long 1b,3b\n" \ |
| 444 | ".previous" \ | 444 | ".previous" \ |
| 445 | : "=r"(err), "=&r"(x) \ | 445 | : "=&r"(err), "=&r"(x) \ |
| 446 | : "r"(addr), "i"(-EFAULT), "0"(err) \ | 446 | : "r"(addr), "i"(-EFAULT), "0"(err) \ |
| 447 | : "r14", "memory") | 447 | : "r14", "memory") |
| 448 | 448 | ||
diff --git a/include/asm-mips/atomic.h b/include/asm-mips/atomic.h index 654b97d3e13a..2c8b853376c9 100644 --- a/include/asm-mips/atomic.h +++ b/include/asm-mips/atomic.h | |||
| @@ -250,7 +250,10 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) | |||
| 250 | " subu %0, %1, %3 \n" | 250 | " subu %0, %1, %3 \n" |
| 251 | " bltz %0, 1f \n" | 251 | " bltz %0, 1f \n" |
| 252 | " sc %0, %2 \n" | 252 | " sc %0, %2 \n" |
| 253 | " .set noreorder \n" | ||
| 253 | " beqzl %0, 1b \n" | 254 | " beqzl %0, 1b \n" |
| 255 | " subu %0, %1, %3 \n" | ||
| 256 | " .set reorder \n" | ||
| 254 | " sync \n" | 257 | " sync \n" |
| 255 | "1: \n" | 258 | "1: \n" |
| 256 | " .set mips0 \n" | 259 | " .set mips0 \n" |
| @@ -266,7 +269,10 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) | |||
| 266 | " subu %0, %1, %3 \n" | 269 | " subu %0, %1, %3 \n" |
| 267 | " bltz %0, 1f \n" | 270 | " bltz %0, 1f \n" |
| 268 | " sc %0, %2 \n" | 271 | " sc %0, %2 \n" |
| 272 | " .set noreorder \n" | ||
| 269 | " beqz %0, 1b \n" | 273 | " beqz %0, 1b \n" |
| 274 | " subu %0, %1, %3 \n" | ||
| 275 | " .set reorder \n" | ||
| 270 | " sync \n" | 276 | " sync \n" |
| 271 | "1: \n" | 277 | "1: \n" |
| 272 | " .set mips0 \n" | 278 | " .set mips0 \n" |
| @@ -598,7 +604,10 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) | |||
| 598 | " dsubu %0, %1, %3 \n" | 604 | " dsubu %0, %1, %3 \n" |
| 599 | " bltz %0, 1f \n" | 605 | " bltz %0, 1f \n" |
| 600 | " scd %0, %2 \n" | 606 | " scd %0, %2 \n" |
| 607 | " .set noreorder \n" | ||
| 601 | " beqzl %0, 1b \n" | 608 | " beqzl %0, 1b \n" |
| 609 | " dsubu %0, %1, %3 \n" | ||
| 610 | " .set reorder \n" | ||
| 602 | " sync \n" | 611 | " sync \n" |
| 603 | "1: \n" | 612 | "1: \n" |
| 604 | " .set mips0 \n" | 613 | " .set mips0 \n" |
| @@ -614,7 +623,10 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) | |||
| 614 | " dsubu %0, %1, %3 \n" | 623 | " dsubu %0, %1, %3 \n" |
| 615 | " bltz %0, 1f \n" | 624 | " bltz %0, 1f \n" |
| 616 | " scd %0, %2 \n" | 625 | " scd %0, %2 \n" |
| 626 | " .set noreorder \n" | ||
| 617 | " beqz %0, 1b \n" | 627 | " beqz %0, 1b \n" |
| 628 | " dsubu %0, %1, %3 \n" | ||
| 629 | " .set reorder \n" | ||
| 618 | " sync \n" | 630 | " sync \n" |
| 619 | "1: \n" | 631 | "1: \n" |
| 620 | " .set mips0 \n" | 632 | " .set mips0 \n" |
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h index 5a4c8a54b8f4..8c011aa61afa 100644 --- a/include/asm-mips/io.h +++ b/include/asm-mips/io.h | |||
| @@ -283,6 +283,24 @@ static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size, | |||
| 283 | __ioremap_mode((offset), (size), _CACHE_UNCACHED) | 283 | __ioremap_mode((offset), (size), _CACHE_UNCACHED) |
| 284 | 284 | ||
| 285 | /* | 285 | /* |
| 286 | * ioremap_cachable - map bus memory into CPU space | ||
| 287 | * @offset: bus address of the memory | ||
| 288 | * @size: size of the resource to map | ||
| 289 | * | ||
| 290 | * ioremap_nocache performs a platform specific sequence of operations to | ||
| 291 | * make bus memory CPU accessible via the readb/readw/readl/writeb/ | ||
| 292 | * writew/writel functions and the other mmio helpers. The returned | ||
| 293 | * address is not guaranteed to be usable directly as a virtual | ||
| 294 | * address. | ||
| 295 | * | ||
| 296 | * This version of ioremap ensures that the memory is marked cachable by | ||
| 297 | * the CPU. Also enables full write-combining. Useful for some | ||
| 298 | * memory-like regions on I/O busses. | ||
| 299 | */ | ||
| 300 | #define ioremap_cachable(offset, size) \ | ||
| 301 | __ioremap_mode((offset), (size), PAGE_CACHABLE_DEFAULT) | ||
| 302 | |||
| 303 | /* | ||
| 286 | * These two are MIPS specific ioremap variant. ioremap_cacheable_cow | 304 | * These two are MIPS specific ioremap variant. ioremap_cacheable_cow |
| 287 | * requests a cachable mapping, ioremap_uncached_accelerated requests a | 305 | * requests a cachable mapping, ioremap_uncached_accelerated requests a |
| 288 | * mapping using the uncached accelerated mode which isn't supported on | 306 | * mapping using the uncached accelerated mode which isn't supported on |
diff --git a/include/asm-mips/smp.h b/include/asm-mips/smp.h index 5618f1e12f40..75c6fe7c2126 100644 --- a/include/asm-mips/smp.h +++ b/include/asm-mips/smp.h | |||
| @@ -58,7 +58,9 @@ static inline int num_booting_cpus(void) | |||
| 58 | return cpus_weight(cpu_callout_map); | 58 | return cpus_weight(cpu_callout_map); |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | /* These are defined by the board-specific code. */ | 61 | /* |
| 62 | * These are defined by the board-specific code. | ||
| 63 | */ | ||
| 62 | 64 | ||
| 63 | /* | 65 | /* |
| 64 | * Cause the function described by call_data to be executed on the passed | 66 | * Cause the function described by call_data to be executed on the passed |
| @@ -79,7 +81,12 @@ extern void prom_boot_secondary(int cpu, struct task_struct *idle); | |||
| 79 | extern void prom_init_secondary(void); | 81 | extern void prom_init_secondary(void); |
| 80 | 82 | ||
| 81 | /* | 83 | /* |
| 82 | * Detect available CPUs, populate phys_cpu_present_map before smp_init | 84 | * Populate cpu_possible_map before smp_init, called from setup_arch. |
| 85 | */ | ||
| 86 | extern void plat_smp_setup(void); | ||
| 87 | |||
| 88 | /* | ||
| 89 | * Called after init_IRQ but before __cpu_up. | ||
| 83 | */ | 90 | */ |
| 84 | extern void prom_prepare_cpus(unsigned int max_cpus); | 91 | extern void prom_prepare_cpus(unsigned int max_cpus); |
| 85 | 92 | ||
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index e8e5d4143377..ddae9bae31af 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h | |||
| @@ -322,7 +322,7 @@ static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old, | |||
| 322 | #endif | 322 | #endif |
| 323 | "2: \n" | 323 | "2: \n" |
| 324 | " .set pop \n" | 324 | " .set pop \n" |
| 325 | : "=&r" (retval), "=m" (*m) | 325 | : "=&r" (retval), "=R" (*m) |
| 326 | : "R" (*m), "Jr" (old), "Jr" (new) | 326 | : "R" (*m), "Jr" (old), "Jr" (new) |
| 327 | : "memory"); | 327 | : "memory"); |
| 328 | } else if (cpu_has_llsc) { | 328 | } else if (cpu_has_llsc) { |
| @@ -342,7 +342,7 @@ static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old, | |||
| 342 | #endif | 342 | #endif |
| 343 | "2: \n" | 343 | "2: \n" |
| 344 | " .set pop \n" | 344 | " .set pop \n" |
| 345 | : "=&r" (retval), "=m" (*m) | 345 | : "=&r" (retval), "=R" (*m) |
| 346 | : "R" (*m), "Jr" (old), "Jr" (new) | 346 | : "R" (*m), "Jr" (old), "Jr" (new) |
| 347 | : "memory"); | 347 | : "memory"); |
| 348 | } else { | 348 | } else { |
| @@ -379,7 +379,7 @@ static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old, | |||
| 379 | #endif | 379 | #endif |
| 380 | "2: \n" | 380 | "2: \n" |
| 381 | " .set pop \n" | 381 | " .set pop \n" |
| 382 | : "=&r" (retval), "=m" (*m) | 382 | : "=&r" (retval), "=R" (*m) |
| 383 | : "R" (*m), "Jr" (old), "Jr" (new) | 383 | : "R" (*m), "Jr" (old), "Jr" (new) |
| 384 | : "memory"); | 384 | : "memory"); |
| 385 | } else if (cpu_has_llsc) { | 385 | } else if (cpu_has_llsc) { |
| @@ -397,7 +397,7 @@ static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old, | |||
| 397 | #endif | 397 | #endif |
| 398 | "2: \n" | 398 | "2: \n" |
| 399 | " .set pop \n" | 399 | " .set pop \n" |
| 400 | : "=&r" (retval), "=m" (*m) | 400 | : "=&r" (retval), "=R" (*m) |
| 401 | : "R" (*m), "Jr" (old), "Jr" (new) | 401 | : "R" (*m), "Jr" (old), "Jr" (new) |
| 402 | : "memory"); | 402 | : "memory"); |
| 403 | } else { | 403 | } else { |
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index 64210549f56b..90d005bb4d1c 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h | |||
| @@ -159,9 +159,11 @@ extern void do_cpu_ftr_fixups(unsigned long offset); | |||
| 159 | #endif | 159 | #endif |
| 160 | 160 | ||
| 161 | /* We need to mark all pages as being coherent if we're SMP or we | 161 | /* We need to mark all pages as being coherent if we're SMP or we |
| 162 | * have a 74[45]x and an MPC107 host bridge. | 162 | * have a 74[45]x and an MPC107 host bridge. Also 83xx requires |
| 163 | * it for PCI "streaming/prefetch" to work properly. | ||
| 163 | */ | 164 | */ |
| 164 | #if defined(CONFIG_SMP) || defined(CONFIG_MPC10X_BRIDGE) | 165 | #if defined(CONFIG_SMP) || defined(CONFIG_MPC10X_BRIDGE) \ |
| 166 | || defined(CONFIG_PPC_83xx) | ||
| 165 | #define CPU_FTR_COMMON CPU_FTR_NEED_COHERENT | 167 | #define CPU_FTR_COMMON CPU_FTR_NEED_COHERENT |
| 166 | #else | 168 | #else |
| 167 | #define CPU_FTR_COMMON 0 | 169 | #define CPU_FTR_COMMON 0 |
| @@ -277,7 +279,8 @@ enum { | |||
| 277 | CPU_FTRS_G2_LE = CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE | | 279 | CPU_FTRS_G2_LE = CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE | |
| 278 | CPU_FTR_USE_TB | CPU_FTR_MAYBE_CAN_NAP | CPU_FTR_HAS_HIGH_BATS, | 280 | CPU_FTR_USE_TB | CPU_FTR_MAYBE_CAN_NAP | CPU_FTR_HAS_HIGH_BATS, |
| 279 | CPU_FTRS_E300 = CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE | | 281 | CPU_FTRS_E300 = CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE | |
| 280 | CPU_FTR_USE_TB | CPU_FTR_MAYBE_CAN_NAP | CPU_FTR_HAS_HIGH_BATS, | 282 | CPU_FTR_USE_TB | CPU_FTR_MAYBE_CAN_NAP | CPU_FTR_HAS_HIGH_BATS | |
| 283 | CPU_FTR_COMMON, | ||
| 281 | CPU_FTRS_CLASSIC32 = CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | | 284 | CPU_FTRS_CLASSIC32 = CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | |
| 282 | CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE, | 285 | CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE, |
| 283 | CPU_FTRS_POWER3_32 = CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | | 286 | CPU_FTRS_POWER3_32 = CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | |
diff --git a/include/asm-powerpc/eeh.h b/include/asm-powerpc/eeh.h index b263fb2fa6e4..eb392032e19b 100644 --- a/include/asm-powerpc/eeh.h +++ b/include/asm-powerpc/eeh.h | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/string.h> | 27 | #include <linux/string.h> |
| 28 | 28 | ||
| 29 | struct pci_dev; | 29 | struct pci_dev; |
| 30 | struct pci_bus; | ||
| 30 | struct device_node; | 31 | struct device_node; |
| 31 | 32 | ||
| 32 | #ifdef CONFIG_EEH | 33 | #ifdef CONFIG_EEH |
| @@ -60,8 +61,9 @@ void __init pci_addr_cache_build(void); | |||
| 60 | * to finish the eeh setup for this device. | 61 | * to finish the eeh setup for this device. |
| 61 | */ | 62 | */ |
| 62 | void eeh_add_device_early(struct device_node *); | 63 | void eeh_add_device_early(struct device_node *); |
| 64 | void eeh_add_device_late(struct pci_dev *dev); | ||
| 63 | void eeh_add_device_tree_early(struct device_node *); | 65 | void eeh_add_device_tree_early(struct device_node *); |
| 64 | void eeh_add_device_late(struct pci_dev *); | 66 | void eeh_add_device_tree_late(struct pci_bus *); |
| 65 | 67 | ||
| 66 | /** | 68 | /** |
| 67 | * eeh_remove_device - undo EEH setup for the indicated pci device | 69 | * eeh_remove_device - undo EEH setup for the indicated pci device |
| @@ -116,12 +118,12 @@ static inline void pci_addr_cache_build(void) { } | |||
| 116 | 118 | ||
| 117 | static inline void eeh_add_device_early(struct device_node *dn) { } | 119 | static inline void eeh_add_device_early(struct device_node *dn) { } |
| 118 | 120 | ||
| 119 | static inline void eeh_add_device_late(struct pci_dev *dev) { } | ||
| 120 | |||
| 121 | static inline void eeh_remove_device(struct pci_dev *dev) { } | 121 | static inline void eeh_remove_device(struct pci_dev *dev) { } |
| 122 | 122 | ||
| 123 | static inline void eeh_add_device_tree_early(struct device_node *dn) { } | 123 | static inline void eeh_add_device_tree_early(struct device_node *dn) { } |
| 124 | 124 | ||
| 125 | static inline void eeh_add_device_tree_late(struct pci_bus *bus) { } | ||
| 126 | |||
| 125 | static inline void eeh_remove_bus_device(struct pci_dev *dev) { } | 127 | static inline void eeh_remove_bus_device(struct pci_dev *dev) { } |
| 126 | #define EEH_POSSIBLE_ERROR(val, type) (0) | 128 | #define EEH_POSSIBLE_ERROR(val, type) (0) |
| 127 | #define EEH_IO_ERROR_VALUE(size) (-1UL) | 129 | #define EEH_IO_ERROR_VALUE(size) (-1UL) |
diff --git a/include/asm-powerpc/mmu.h b/include/asm-powerpc/mmu.h index d096d9e76ad7..b0b9a3f8cdc2 100644 --- a/include/asm-powerpc/mmu.h +++ b/include/asm-powerpc/mmu.h | |||
| @@ -112,6 +112,7 @@ typedef struct { | |||
| 112 | } hpte_t; | 112 | } hpte_t; |
| 113 | 113 | ||
| 114 | extern hpte_t *htab_address; | 114 | extern hpte_t *htab_address; |
| 115 | extern unsigned long htab_size_bytes; | ||
| 115 | extern unsigned long htab_hash_mask; | 116 | extern unsigned long htab_hash_mask; |
| 116 | 117 | ||
| 117 | /* | 118 | /* |
diff --git a/include/asm-powerpc/reg.h b/include/asm-powerpc/reg.h index 12ecc9b9f285..72bfe3af0460 100644 --- a/include/asm-powerpc/reg.h +++ b/include/asm-powerpc/reg.h | |||
| @@ -615,27 +615,9 @@ | |||
| 615 | #define proc_trap() asm volatile("trap") | 615 | #define proc_trap() asm volatile("trap") |
| 616 | 616 | ||
| 617 | #ifdef CONFIG_PPC64 | 617 | #ifdef CONFIG_PPC64 |
| 618 | static inline void ppc64_runlatch_on(void) | 618 | |
| 619 | { | 619 | extern void ppc64_runlatch_on(void); |
| 620 | unsigned long ctrl; | 620 | extern void ppc64_runlatch_off(void); |
| 621 | |||
| 622 | if (cpu_has_feature(CPU_FTR_CTRL)) { | ||
| 623 | ctrl = mfspr(SPRN_CTRLF); | ||
| 624 | ctrl |= CTRL_RUNLATCH; | ||
| 625 | mtspr(SPRN_CTRLT, ctrl); | ||
| 626 | } | ||
| 627 | } | ||
| 628 | |||
| 629 | static inline void ppc64_runlatch_off(void) | ||
| 630 | { | ||
| 631 | unsigned long ctrl; | ||
| 632 | |||
| 633 | if (cpu_has_feature(CPU_FTR_CTRL)) { | ||
| 634 | ctrl = mfspr(SPRN_CTRLF); | ||
| 635 | ctrl &= ~CTRL_RUNLATCH; | ||
| 636 | mtspr(SPRN_CTRLT, ctrl); | ||
| 637 | } | ||
| 638 | } | ||
| 639 | 621 | ||
| 640 | extern unsigned long scom970_read(unsigned int address); | 622 | extern unsigned long scom970_read(unsigned int address); |
| 641 | extern void scom970_write(unsigned int address, unsigned long value); | 623 | extern void scom970_write(unsigned int address, unsigned long value); |
| @@ -645,15 +627,6 @@ extern void scom970_write(unsigned int address, unsigned long value); | |||
| 645 | #define __get_SP() ({unsigned long sp; \ | 627 | #define __get_SP() ({unsigned long sp; \ |
| 646 | asm volatile("mr %0,1": "=r" (sp)); sp;}) | 628 | asm volatile("mr %0,1": "=r" (sp)); sp;}) |
| 647 | 629 | ||
| 648 | #else /* __ASSEMBLY__ */ | ||
| 649 | |||
| 650 | #define RUNLATCH_ON(REG) \ | ||
| 651 | BEGIN_FTR_SECTION \ | ||
| 652 | mfspr (REG),SPRN_CTRLF; \ | ||
| 653 | ori (REG),(REG),CTRL_RUNLATCH; \ | ||
| 654 | mtspr SPRN_CTRLT,(REG); \ | ||
| 655 | END_FTR_SECTION_IFSET(CPU_FTR_CTRL) | ||
| 656 | |||
| 657 | #endif /* __ASSEMBLY__ */ | 630 | #endif /* __ASSEMBLY__ */ |
| 658 | #endif /* __KERNEL__ */ | 631 | #endif /* __KERNEL__ */ |
| 659 | #endif /* _ASM_POWERPC_REG_H */ | 632 | #endif /* _ASM_POWERPC_REG_H */ |
diff --git a/include/asm-powerpc/thread_info.h b/include/asm-powerpc/thread_info.h index c044ec16a879..237fc2b72974 100644 --- a/include/asm-powerpc/thread_info.h +++ b/include/asm-powerpc/thread_info.h | |||
| @@ -113,7 +113,7 @@ static inline struct thread_info *current_thread_info(void) | |||
| 113 | #define TIF_POLLING_NRFLAG 4 /* true if poll_idle() is polling | 113 | #define TIF_POLLING_NRFLAG 4 /* true if poll_idle() is polling |
| 114 | TIF_NEED_RESCHED */ | 114 | TIF_NEED_RESCHED */ |
| 115 | #define TIF_32BIT 5 /* 32 bit binary */ | 115 | #define TIF_32BIT 5 /* 32 bit binary */ |
| 116 | /* #define SPARE 6 */ | 116 | #define TIF_RUNLATCH 6 /* Is the runlatch enabled? */ |
| 117 | #define TIF_ABI_PENDING 7 /* 32/64 bit switch needed */ | 117 | #define TIF_ABI_PENDING 7 /* 32/64 bit switch needed */ |
| 118 | #define TIF_SYSCALL_AUDIT 8 /* syscall auditing active */ | 118 | #define TIF_SYSCALL_AUDIT 8 /* syscall auditing active */ |
| 119 | #define TIF_SINGLESTEP 9 /* singlestepping active */ | 119 | #define TIF_SINGLESTEP 9 /* singlestepping active */ |
| @@ -131,7 +131,7 @@ static inline struct thread_info *current_thread_info(void) | |||
| 131 | #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) | 131 | #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) |
| 132 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) | 132 | #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) |
| 133 | #define _TIF_32BIT (1<<TIF_32BIT) | 133 | #define _TIF_32BIT (1<<TIF_32BIT) |
| 134 | /* #define _SPARE (1<<SPARE) */ | 134 | #define _TIF_RUNLATCH (1<<TIF_RUNLATCH) |
| 135 | #define _TIF_ABI_PENDING (1<<TIF_ABI_PENDING) | 135 | #define _TIF_ABI_PENDING (1<<TIF_ABI_PENDING) |
| 136 | #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT) | 136 | #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT) |
| 137 | #define _TIF_SINGLESTEP (1<<TIF_SINGLESTEP) | 137 | #define _TIF_SINGLESTEP (1<<TIF_SINGLESTEP) |
diff --git a/include/asm-sparc64/futex.h b/include/asm-sparc64/futex.h index 6a332a9f099c..0caf60147e97 100644 --- a/include/asm-sparc64/futex.h +++ b/include/asm-sparc64/futex.h | |||
| @@ -1,6 +1,86 @@ | |||
| 1 | #ifndef _ASM_FUTEX_H | 1 | #ifndef _SPARC64_FUTEX_H |
| 2 | #define _ASM_FUTEX_H | 2 | #define _SPARC64_FUTEX_H |
| 3 | 3 | ||
| 4 | #include <asm-generic/futex.h> | 4 | #include <linux/futex.h> |
| 5 | #include <asm/errno.h> | ||
| 6 | #include <asm/system.h> | ||
| 7 | #include <asm/uaccess.h> | ||
| 5 | 8 | ||
| 6 | #endif | 9 | #define __futex_cas_op(insn, ret, oldval, uaddr, oparg) \ |
| 10 | __asm__ __volatile__( \ | ||
| 11 | "\n1: lduwa [%3] %%asi, %2\n" \ | ||
| 12 | " " insn "\n" \ | ||
| 13 | "2: casa [%3] %%asi, %2, %1\n" \ | ||
| 14 | " cmp %2, %1\n" \ | ||
| 15 | " bne,pn %%icc, 1b\n" \ | ||
| 16 | " mov 0, %0\n" \ | ||
| 17 | "3:\n" \ | ||
| 18 | " .section .fixup,#alloc,#execinstr\n" \ | ||
| 19 | " .align 4\n" \ | ||
| 20 | "4: ba 3b\n" \ | ||
| 21 | " mov %5, %0\n" \ | ||
| 22 | " .previous\n" \ | ||
| 23 | " .section __ex_table,#alloc\n" \ | ||
| 24 | " .align 4\n" \ | ||
| 25 | " .word 1b, 4b\n" \ | ||
| 26 | " .word 2b, 4b\n" \ | ||
| 27 | " .previous\n" \ | ||
| 28 | : "=&r" (ret), "=&r" (oldval), "=&r" (tem) \ | ||
| 29 | : "r" (uaddr), "r" (oparg), "i" (-EFAULT) \ | ||
| 30 | : "memory") | ||
| 31 | |||
| 32 | static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr) | ||
| 33 | { | ||
| 34 | int op = (encoded_op >> 28) & 7; | ||
| 35 | int cmp = (encoded_op >> 24) & 15; | ||
| 36 | int oparg = (encoded_op << 8) >> 20; | ||
| 37 | int cmparg = (encoded_op << 20) >> 20; | ||
| 38 | int oldval = 0, ret, tem; | ||
| 39 | |||
| 40 | if (unlikely(!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))) | ||
| 41 | return -EFAULT; | ||
| 42 | if (unlikely((((unsigned long) uaddr) & 0x3UL))) | ||
| 43 | return -EINVAL; | ||
| 44 | |||
| 45 | if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) | ||
| 46 | oparg = 1 << oparg; | ||
| 47 | |||
| 48 | inc_preempt_count(); | ||
| 49 | |||
| 50 | switch (op) { | ||
| 51 | case FUTEX_OP_SET: | ||
| 52 | __futex_cas_op("mov\t%4, %1", ret, oldval, uaddr, oparg); | ||
| 53 | break; | ||
| 54 | case FUTEX_OP_ADD: | ||
| 55 | __futex_cas_op("add\t%2, %4, %1", ret, oldval, uaddr, oparg); | ||
| 56 | break; | ||
| 57 | case FUTEX_OP_OR: | ||
| 58 | __futex_cas_op("or\t%2, %4, %1", ret, oldval, uaddr, oparg); | ||
| 59 | break; | ||
| 60 | case FUTEX_OP_ANDN: | ||
| 61 | __futex_cas_op("and\t%2, %4, %1", ret, oldval, uaddr, oparg); | ||
| 62 | break; | ||
| 63 | case FUTEX_OP_XOR: | ||
| 64 | __futex_cas_op("xor\t%2, %4, %1", ret, oldval, uaddr, oparg); | ||
| 65 | break; | ||
| 66 | default: | ||
| 67 | ret = -ENOSYS; | ||
| 68 | } | ||
| 69 | |||
| 70 | dec_preempt_count(); | ||
| 71 | |||
| 72 | if (!ret) { | ||
| 73 | switch (cmp) { | ||
| 74 | case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break; | ||
| 75 | case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break; | ||
| 76 | case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break; | ||
| 77 | case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break; | ||
| 78 | case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break; | ||
| 79 | case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break; | ||
| 80 | default: ret = -ENOSYS; | ||
| 81 | } | ||
| 82 | } | ||
| 83 | return ret; | ||
| 84 | } | ||
| 85 | |||
| 86 | #endif /* !(_SPARC64_FUTEX_H) */ | ||
diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h index 110a2de89123..473edb2603ec 100644 --- a/include/asm-sparc64/smp.h +++ b/include/asm-sparc64/smp.h | |||
| @@ -66,8 +66,14 @@ static __inline__ int hard_smp_processor_id(void) | |||
| 66 | 66 | ||
| 67 | #define raw_smp_processor_id() (current_thread_info()->cpu) | 67 | #define raw_smp_processor_id() (current_thread_info()->cpu) |
| 68 | 68 | ||
| 69 | extern void smp_setup_cpu_possible_map(void); | ||
| 70 | |||
| 69 | #endif /* !(__ASSEMBLY__) */ | 71 | #endif /* !(__ASSEMBLY__) */ |
| 70 | 72 | ||
| 73 | #else | ||
| 74 | |||
| 75 | #define smp_setup_cpu_possible_map() do { } while (0) | ||
| 76 | |||
| 71 | #endif /* !(CONFIG_SMP) */ | 77 | #endif /* !(CONFIG_SMP) */ |
| 72 | 78 | ||
| 73 | #define NO_PROC_ID 0xFF | 79 | #define NO_PROC_ID 0xFF |
diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h index fd03e15d7ea6..8a05af264d18 100644 --- a/include/asm-x86_64/pci.h +++ b/include/asm-x86_64/pci.h | |||
| @@ -19,8 +19,6 @@ extern unsigned int pcibios_assign_all_busses(void); | |||
| 19 | #endif | 19 | #endif |
| 20 | #define pcibios_scan_all_fns(a, b) 0 | 20 | #define pcibios_scan_all_fns(a, b) 0 |
| 21 | 21 | ||
| 22 | extern int no_iommu, force_iommu; | ||
| 23 | |||
| 24 | extern unsigned long pci_mem_start; | 22 | extern unsigned long pci_mem_start; |
| 25 | #define PCIBIOS_MIN_IO 0x1000 | 23 | #define PCIBIOS_MIN_IO 0x1000 |
| 26 | #define PCIBIOS_MIN_MEM (pci_mem_start) | 24 | #define PCIBIOS_MIN_MEM (pci_mem_start) |
diff --git a/include/asm-x86_64/pgtable.h b/include/asm-x86_64/pgtable.h index 8fbf4dd72115..715fd94cf577 100644 --- a/include/asm-x86_64/pgtable.h +++ b/include/asm-x86_64/pgtable.h | |||
| @@ -131,7 +131,7 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long | |||
| 131 | #define PGDIR_SIZE (1UL << PGDIR_SHIFT) | 131 | #define PGDIR_SIZE (1UL << PGDIR_SHIFT) |
| 132 | #define PGDIR_MASK (~(PGDIR_SIZE-1)) | 132 | #define PGDIR_MASK (~(PGDIR_SIZE-1)) |
| 133 | 133 | ||
| 134 | #define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE) | 134 | #define USER_PTRS_PER_PGD ((TASK_SIZE-1)/PGDIR_SIZE+1) |
| 135 | #define FIRST_USER_ADDRESS 0 | 135 | #define FIRST_USER_ADDRESS 0 |
| 136 | 136 | ||
| 137 | #ifndef __ASSEMBLY__ | 137 | #ifndef __ASSEMBLY__ |
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h index eca3f2d633db..3ba8fd45fcb3 100644 --- a/include/asm-x86_64/proto.h +++ b/include/asm-x86_64/proto.h | |||
| @@ -39,7 +39,6 @@ extern void config_acpi_tables(void); | |||
| 39 | extern void ia32_syscall(void); | 39 | extern void ia32_syscall(void); |
| 40 | extern void iommu_hole_init(void); | 40 | extern void iommu_hole_init(void); |
| 41 | 41 | ||
| 42 | extern void time_init_gtod(void); | ||
| 43 | extern int pmtimer_mark_offset(void); | 42 | extern int pmtimer_mark_offset(void); |
| 44 | extern void pmtimer_resume(void); | 43 | extern void pmtimer_resume(void); |
| 45 | extern void pmtimer_wait(unsigned); | 44 | extern void pmtimer_wait(unsigned); |
| @@ -134,6 +133,7 @@ extern int force_iommu; | |||
| 134 | 133 | ||
| 135 | extern int reboot_force; | 134 | extern int reboot_force; |
| 136 | extern int notsc_setup(char *); | 135 | extern int notsc_setup(char *); |
| 136 | extern int setup_additional_cpus(char *); | ||
| 137 | 137 | ||
| 138 | extern void smp_local_timer_interrupt(struct pt_regs * regs); | 138 | extern void smp_local_timer_interrupt(struct pt_regs * regs); |
| 139 | 139 | ||
diff --git a/include/linux/netfilter_bridge/ebt_log.h b/include/linux/netfilter_bridge/ebt_log.h index 358fbc84fb59..96e231ae7554 100644 --- a/include/linux/netfilter_bridge/ebt_log.h +++ b/include/linux/netfilter_bridge/ebt_log.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | #define EBT_LOG_IP 0x01 /* if the frame is made by ip, log the ip information */ | 4 | #define EBT_LOG_IP 0x01 /* if the frame is made by ip, log the ip information */ |
| 5 | #define EBT_LOG_ARP 0x02 | 5 | #define EBT_LOG_ARP 0x02 |
| 6 | #define EBT_LOG_NFLOG 0x04 | ||
| 6 | #define EBT_LOG_MASK (EBT_LOG_IP | EBT_LOG_ARP) | 7 | #define EBT_LOG_MASK (EBT_LOG_IP | EBT_LOG_ARP) |
| 7 | #define EBT_LOG_PREFIX_SIZE 30 | 8 | #define EBT_LOG_PREFIX_SIZE 30 |
| 8 | #define EBT_LOG_WATCHER "log" | 9 | #define EBT_LOG_WATCHER "log" |
diff --git a/include/linux/netfilter_ipv4/ipt_LOG.h b/include/linux/netfilter_ipv4/ipt_LOG.h index 22d16177319b..892f9a33fea8 100644 --- a/include/linux/netfilter_ipv4/ipt_LOG.h +++ b/include/linux/netfilter_ipv4/ipt_LOG.h | |||
| @@ -6,7 +6,8 @@ | |||
| 6 | #define IPT_LOG_TCPOPT 0x02 /* Log TCP options */ | 6 | #define IPT_LOG_TCPOPT 0x02 /* Log TCP options */ |
| 7 | #define IPT_LOG_IPOPT 0x04 /* Log IP options */ | 7 | #define IPT_LOG_IPOPT 0x04 /* Log IP options */ |
| 8 | #define IPT_LOG_UID 0x08 /* Log UID owning local socket */ | 8 | #define IPT_LOG_UID 0x08 /* Log UID owning local socket */ |
| 9 | #define IPT_LOG_MASK 0x0f | 9 | #define IPT_LOG_NFLOG 0x10 /* Log using nf_log backend */ |
| 10 | #define IPT_LOG_MASK 0x1f | ||
| 10 | 11 | ||
| 11 | struct ipt_log_info { | 12 | struct ipt_log_info { |
| 12 | unsigned char level; | 13 | unsigned char level; |
diff --git a/include/linux/netfilter_ipv6/ip6t_LOG.h b/include/linux/netfilter_ipv6/ip6t_LOG.h index 9008ff5c40ae..060c1a1c6c60 100644 --- a/include/linux/netfilter_ipv6/ip6t_LOG.h +++ b/include/linux/netfilter_ipv6/ip6t_LOG.h | |||
| @@ -6,7 +6,8 @@ | |||
| 6 | #define IP6T_LOG_TCPOPT 0x02 /* Log TCP options */ | 6 | #define IP6T_LOG_TCPOPT 0x02 /* Log TCP options */ |
| 7 | #define IP6T_LOG_IPOPT 0x04 /* Log IP options */ | 7 | #define IP6T_LOG_IPOPT 0x04 /* Log IP options */ |
| 8 | #define IP6T_LOG_UID 0x08 /* Log UID owning local socket */ | 8 | #define IP6T_LOG_UID 0x08 /* Log UID owning local socket */ |
| 9 | #define IP6T_LOG_MASK 0x0f | 9 | #define IP6T_LOG_NFLOG 0x10 /* Log using nf_log backend */ |
| 10 | #define IP6T_LOG_MASK 0x1f | ||
| 10 | 11 | ||
| 11 | struct ip6t_log_info { | 12 | struct ip6t_log_info { |
| 12 | unsigned char level; | 13 | unsigned char level; |
diff --git a/include/linux/sched.h b/include/linux/sched.h index b6f51e3a38ec..ff2e09c953b9 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -298,8 +298,9 @@ struct mm_struct { | |||
| 298 | unsigned long addr, unsigned long len, | 298 | unsigned long addr, unsigned long len, |
| 299 | unsigned long pgoff, unsigned long flags); | 299 | unsigned long pgoff, unsigned long flags); |
| 300 | void (*unmap_area) (struct mm_struct *mm, unsigned long addr); | 300 | void (*unmap_area) (struct mm_struct *mm, unsigned long addr); |
| 301 | unsigned long mmap_base; /* base of mmap area */ | 301 | unsigned long mmap_base; /* base of mmap area */ |
| 302 | unsigned long cached_hole_size; /* if non-zero, the largest hole below free_area_cache */ | 302 | unsigned long task_size; /* size of task vm space */ |
| 303 | unsigned long cached_hole_size; /* if non-zero, the largest hole below free_area_cache */ | ||
| 303 | unsigned long free_area_cache; /* first hole of size cached_hole_size or larger */ | 304 | unsigned long free_area_cache; /* first hole of size cached_hole_size or larger */ |
| 304 | pgd_t * pgd; | 305 | pgd_t * pgd; |
| 305 | atomic_t mm_users; /* How many users with user space? */ | 306 | atomic_t mm_users; /* How many users with user space? */ |
diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h index 6a2bb955844b..3c8a6aa77415 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h | |||
| @@ -247,10 +247,10 @@ | |||
| 247 | #define UART_CTR 0xFF | 247 | #define UART_CTR 0xFF |
| 248 | 248 | ||
| 249 | /* | 249 | /* |
| 250 | * The 16C950 Additional Control Reigster | 250 | * The 16C950 Additional Control Register |
| 251 | */ | 251 | */ |
| 252 | #define UART_ACR_RXDIS 0x01 /* Receiver disable */ | 252 | #define UART_ACR_RXDIS 0x01 /* Receiver disable */ |
| 253 | #define UART_ACR_TXDIS 0x02 /* Receiver disable */ | 253 | #define UART_ACR_TXDIS 0x02 /* Transmitter disable */ |
| 254 | #define UART_ACR_DSRFC 0x04 /* DSR Flow Control */ | 254 | #define UART_ACR_DSRFC 0x04 /* DSR Flow Control */ |
| 255 | #define UART_ACR_TLENB 0x20 /* 950 trigger levels enable */ | 255 | #define UART_ACR_TLENB 0x20 /* 950 trigger levels enable */ |
| 256 | #define UART_ACR_ICRRD 0x40 /* ICR Read enable */ | 256 | #define UART_ACR_ICRRD 0x40 /* ICR Read enable */ |
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index d73501ba7e44..b9ea44ac0ddb 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
| @@ -543,7 +543,7 @@ asmlinkage long sys_unlinkat(int dfd, const char __user * pathname, int flag); | |||
| 543 | asmlinkage long sys_symlinkat(const char __user * oldname, | 543 | asmlinkage long sys_symlinkat(const char __user * oldname, |
| 544 | int newdfd, const char __user * newname); | 544 | int newdfd, const char __user * newname); |
| 545 | asmlinkage long sys_linkat(int olddfd, const char __user *oldname, | 545 | asmlinkage long sys_linkat(int olddfd, const char __user *oldname, |
| 546 | int newdfd, const char __user *newname); | 546 | int newdfd, const char __user *newname, int flags); |
| 547 | asmlinkage long sys_renameat(int olddfd, const char __user * oldname, | 547 | asmlinkage long sys_renameat(int olddfd, const char __user * oldname, |
| 548 | int newdfd, const char __user * newname); | 548 | int newdfd, const char __user * newname); |
| 549 | asmlinkage long sys_futimesat(int dfd, char __user *filename, | 549 | asmlinkage long sys_futimesat(int dfd, char __user *filename, |
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 0e92bf7ec28e..bac61db26456 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
| @@ -147,6 +147,7 @@ enum | |||
| 147 | KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */ | 147 | KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */ |
| 148 | KERN_SPIN_RETRY=70, /* int: number of spinlock retries */ | 148 | KERN_SPIN_RETRY=70, /* int: number of spinlock retries */ |
| 149 | KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */ | 149 | KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */ |
| 150 | KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */ | ||
| 150 | }; | 151 | }; |
| 151 | 152 | ||
| 152 | 153 | ||
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index d6111a2f0a23..8d362c49b8a9 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
| @@ -233,7 +233,6 @@ struct xfrm_type | |||
| 233 | int (*init_state)(struct xfrm_state *x); | 233 | int (*init_state)(struct xfrm_state *x); |
| 234 | void (*destructor)(struct xfrm_state *); | 234 | void (*destructor)(struct xfrm_state *); |
| 235 | int (*input)(struct xfrm_state *, struct xfrm_decap_state *, struct sk_buff *skb); | 235 | int (*input)(struct xfrm_state *, struct xfrm_decap_state *, struct sk_buff *skb); |
| 236 | int (*post_input)(struct xfrm_state *, struct xfrm_decap_state *, struct sk_buff *skb); | ||
| 237 | int (*output)(struct xfrm_state *, struct sk_buff *pskb); | 236 | int (*output)(struct xfrm_state *, struct sk_buff *pskb); |
| 238 | /* Estimate maximal size of result of transformation of a dgram */ | 237 | /* Estimate maximal size of result of transformation of a dgram */ |
| 239 | u32 (*get_max_size)(struct xfrm_state *, int size); | 238 | u32 (*get_max_size)(struct xfrm_state *, int size); |
| @@ -403,6 +402,11 @@ unsigned xfrm_spi_hash(xfrm_address_t *addr, u32 spi, u8 proto, unsigned short f | |||
| 403 | 402 | ||
| 404 | extern void __xfrm_state_destroy(struct xfrm_state *); | 403 | extern void __xfrm_state_destroy(struct xfrm_state *); |
| 405 | 404 | ||
| 405 | static inline void __xfrm_state_put(struct xfrm_state *x) | ||
| 406 | { | ||
| 407 | atomic_dec(&x->refcnt); | ||
| 408 | } | ||
| 409 | |||
| 406 | static inline void xfrm_state_put(struct xfrm_state *x) | 410 | static inline void xfrm_state_put(struct xfrm_state *x) |
| 407 | { | 411 | { |
| 408 | if (atomic_dec_and_test(&x->refcnt)) | 412 | if (atomic_dec_and_test(&x->refcnt)) |
diff --git a/include/pcmcia/device_id.h b/include/pcmcia/device_id.h index 346d81ece287..e04e0b0d9a25 100644 --- a/include/pcmcia/device_id.h +++ b/include/pcmcia/device_id.h | |||
| @@ -72,6 +72,15 @@ | |||
| 72 | .prod_id = { (v1), (v2), (v3), (v4) }, \ | 72 | .prod_id = { (v1), (v2), (v3), (v4) }, \ |
| 73 | .prod_id_hash = { (vh1), (vh2), (vh3), (vh4) }, } | 73 | .prod_id_hash = { (vh1), (vh2), (vh3), (vh4) }, } |
| 74 | 74 | ||
| 75 | #define PCMCIA_DEVICE_MANF_CARD_PROD_ID1(manf, card, v1, vh1) { \ | ||
| 76 | .match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \ | ||
| 77 | PCMCIA_DEV_ID_MATCH_CARD_ID| \ | ||
| 78 | PCMCIA_DEV_ID_MATCH_PROD_ID1, \ | ||
| 79 | .manf_id = (manf), \ | ||
| 80 | .card_id = (card), \ | ||
| 81 | .prod_id = { (v1), NULL, NULL, NULL }, \ | ||
| 82 | .prod_id_hash = { (vh1), 0, 0, 0 }, } | ||
| 83 | |||
| 75 | 84 | ||
| 76 | /* multi-function devices */ | 85 | /* multi-function devices */ |
| 77 | 86 | ||
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index c05a2b7125e1..de2d9109194e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -124,6 +124,10 @@ extern int sysctl_hz_timer; | |||
| 124 | extern int acct_parm[]; | 124 | extern int acct_parm[]; |
| 125 | #endif | 125 | #endif |
| 126 | 126 | ||
| 127 | #ifdef CONFIG_IA64 | ||
| 128 | extern int no_unaligned_warning; | ||
| 129 | #endif | ||
| 130 | |||
| 127 | static int parse_table(int __user *, int, void __user *, size_t __user *, void __user *, size_t, | 131 | static int parse_table(int __user *, int, void __user *, size_t __user *, void __user *, size_t, |
| 128 | ctl_table *, void **); | 132 | ctl_table *, void **); |
| 129 | static int proc_doutsstring(ctl_table *table, int write, struct file *filp, | 133 | static int proc_doutsstring(ctl_table *table, int write, struct file *filp, |
| @@ -663,6 +667,16 @@ static ctl_table kern_table[] = { | |||
| 663 | .data = &acpi_video_flags, | 667 | .data = &acpi_video_flags, |
| 664 | .maxlen = sizeof (unsigned long), | 668 | .maxlen = sizeof (unsigned long), |
| 665 | .mode = 0644, | 669 | .mode = 0644, |
| 670 | .proc_handler = &proc_doulongvec_minmax, | ||
| 671 | }, | ||
| 672 | #endif | ||
| 673 | #ifdef CONFIG_IA64 | ||
| 674 | { | ||
| 675 | .ctl_name = KERN_IA64_UNALIGNED, | ||
| 676 | .procname = "ignore-unaligned-usertrap", | ||
| 677 | .data = &no_unaligned_warning, | ||
| 678 | .maxlen = sizeof (int), | ||
| 679 | .mode = 0644, | ||
| 666 | .proc_handler = &proc_dointvec, | 680 | .proc_handler = &proc_dointvec, |
| 667 | }, | 681 | }, |
| 668 | #endif | 682 | #endif |
diff --git a/kernel/timer.c b/kernel/timer.c index fe3a9a9f8328..fc6646fd5aab 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
| @@ -1351,10 +1351,10 @@ static inline u64 time_interpolator_get_cycles(unsigned int src) | |||
| 1351 | return x(); | 1351 | return x(); |
| 1352 | 1352 | ||
| 1353 | case TIME_SOURCE_MMIO64 : | 1353 | case TIME_SOURCE_MMIO64 : |
| 1354 | return readq((void __iomem *) time_interpolator->addr); | 1354 | return readq_relaxed((void __iomem *)time_interpolator->addr); |
| 1355 | 1355 | ||
| 1356 | case TIME_SOURCE_MMIO32 : | 1356 | case TIME_SOURCE_MMIO32 : |
| 1357 | return readl((void __iomem *) time_interpolator->addr); | 1357 | return readl_relaxed((void __iomem *)time_interpolator->addr); |
| 1358 | 1358 | ||
| 1359 | default: return get_cycles(); | 1359 | default: return get_cycles(); |
| 1360 | } | 1360 | } |
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 880831bd3003..1a210088ad80 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
| @@ -552,7 +552,7 @@ static void migrate_page_add(struct page *page, struct list_head *pagelist, | |||
| 552 | */ | 552 | */ |
| 553 | if ((flags & MPOL_MF_MOVE_ALL) || page_mapcount(page) == 1) { | 553 | if ((flags & MPOL_MF_MOVE_ALL) || page_mapcount(page) == 1) { |
| 554 | if (isolate_lru_page(page)) | 554 | if (isolate_lru_page(page)) |
| 555 | list_add(&page->lru, pagelist); | 555 | list_add_tail(&page->lru, pagelist); |
| 556 | } | 556 | } |
| 557 | } | 557 | } |
| 558 | 558 | ||
| @@ -569,6 +569,7 @@ static int migrate_pages_to(struct list_head *pagelist, | |||
| 569 | LIST_HEAD(moved); | 569 | LIST_HEAD(moved); |
| 570 | LIST_HEAD(failed); | 570 | LIST_HEAD(failed); |
| 571 | int err = 0; | 571 | int err = 0; |
| 572 | unsigned long offset = 0; | ||
| 572 | int nr_pages; | 573 | int nr_pages; |
| 573 | struct page *page; | 574 | struct page *page; |
| 574 | struct list_head *p; | 575 | struct list_head *p; |
| @@ -576,8 +577,21 @@ static int migrate_pages_to(struct list_head *pagelist, | |||
| 576 | redo: | 577 | redo: |
| 577 | nr_pages = 0; | 578 | nr_pages = 0; |
| 578 | list_for_each(p, pagelist) { | 579 | list_for_each(p, pagelist) { |
| 579 | if (vma) | 580 | if (vma) { |
| 580 | page = alloc_page_vma(GFP_HIGHUSER, vma, vma->vm_start); | 581 | /* |
| 582 | * The address passed to alloc_page_vma is used to | ||
| 583 | * generate the proper interleave behavior. We fake | ||
| 584 | * the address here by an increasing offset in order | ||
| 585 | * to get the proper distribution of pages. | ||
| 586 | * | ||
| 587 | * No decision has been made as to which page | ||
| 588 | * a certain old page is moved to so we cannot | ||
| 589 | * specify the correct address. | ||
| 590 | */ | ||
| 591 | page = alloc_page_vma(GFP_HIGHUSER, vma, | ||
| 592 | offset + vma->vm_start); | ||
| 593 | offset += PAGE_SIZE; | ||
| 594 | } | ||
| 581 | else | 595 | else |
| 582 | page = alloc_pages_node(dest, GFP_HIGHUSER, 0); | 596 | page = alloc_pages_node(dest, GFP_HIGHUSER, 0); |
| 583 | 597 | ||
| @@ -585,7 +599,7 @@ redo: | |||
| 585 | err = -ENOMEM; | 599 | err = -ENOMEM; |
| 586 | goto out; | 600 | goto out; |
| 587 | } | 601 | } |
| 588 | list_add(&page->lru, &newlist); | 602 | list_add_tail(&page->lru, &newlist); |
| 589 | nr_pages++; | 603 | nr_pages++; |
| 590 | if (nr_pages > MIGRATE_CHUNK_SIZE) | 604 | if (nr_pages > MIGRATE_CHUNK_SIZE) |
| 591 | break; | 605 | break; |
| @@ -940,7 +954,8 @@ asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode, | |||
| 940 | goto out; | 954 | goto out; |
| 941 | } | 955 | } |
| 942 | 956 | ||
| 943 | err = do_migrate_pages(mm, &old, &new, MPOL_MF_MOVE); | 957 | err = do_migrate_pages(mm, &old, &new, |
| 958 | capable(CAP_SYS_ADMIN) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE); | ||
| 944 | out: | 959 | out: |
| 945 | mmput(mm); | 960 | mmput(mm); |
| 946 | return err; | 961 | return err; |
| @@ -1778,7 +1793,8 @@ int show_numa_map(struct seq_file *m, void *v) | |||
| 1778 | if (!md) | 1793 | if (!md) |
| 1779 | return 0; | 1794 | return 0; |
| 1780 | 1795 | ||
| 1781 | check_pgd_range(vma, vma->vm_start, vma->vm_end, | 1796 | if (!is_vm_hugetlb_page(vma)) |
| 1797 | check_pgd_range(vma, vma->vm_start, vma->vm_end, | ||
| 1782 | &node_online_map, MPOL_MF_STATS, md); | 1798 | &node_online_map, MPOL_MF_STATS, md); |
| 1783 | 1799 | ||
| 1784 | if (md->pages) { | 1800 | if (md->pages) { |
diff --git a/mm/nommu.c b/mm/nommu.c index 99d21020ec9d..4951f4786f28 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
| @@ -53,7 +53,6 @@ DECLARE_RWSEM(nommu_vma_sem); | |||
| 53 | struct vm_operations_struct generic_file_vm_ops = { | 53 | struct vm_operations_struct generic_file_vm_ops = { |
| 54 | }; | 54 | }; |
| 55 | 55 | ||
| 56 | EXPORT_SYMBOL(vmalloc); | ||
| 57 | EXPORT_SYMBOL(vfree); | 56 | EXPORT_SYMBOL(vfree); |
| 58 | EXPORT_SYMBOL(vmalloc_to_page); | 57 | EXPORT_SYMBOL(vmalloc_to_page); |
| 59 | EXPORT_SYMBOL(vmalloc_32); | 58 | EXPORT_SYMBOL(vmalloc_32); |
| @@ -205,6 +204,13 @@ void *vmalloc(unsigned long size) | |||
| 205 | { | 204 | { |
| 206 | return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL); | 205 | return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL); |
| 207 | } | 206 | } |
| 207 | EXPORT_SYMBOL(vmalloc); | ||
| 208 | |||
| 209 | void *vmalloc_node(unsigned long size, int node) | ||
| 210 | { | ||
| 211 | return vmalloc(size); | ||
| 212 | } | ||
| 213 | EXPORT_SYMBOL(vmalloc_node); | ||
| 208 | 214 | ||
| 209 | /* | 215 | /* |
| 210 | * vmalloc_32 - allocate virtually continguos memory (32bit addressable) | 216 | * vmalloc_32 - allocate virtually continguos memory (32bit addressable) |
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 8123fad5a485..78747afad6b0 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
| @@ -302,7 +302,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order) | |||
| 302 | { | 302 | { |
| 303 | struct mm_struct *mm = NULL; | 303 | struct mm_struct *mm = NULL; |
| 304 | task_t *p; | 304 | task_t *p; |
| 305 | unsigned long points; | 305 | unsigned long points = 0; |
| 306 | 306 | ||
| 307 | if (printk_ratelimit()) { | 307 | if (printk_ratelimit()) { |
| 308 | printk("oom-killer: gfp_mask=0x%x, order=%d\n", | 308 | printk("oom-killer: gfp_mask=0x%x, order=%d\n", |
| @@ -355,6 +355,7 @@ retry: | |||
| 355 | } | 355 | } |
| 356 | 356 | ||
| 357 | out: | 357 | out: |
| 358 | read_unlock(&tasklist_lock); | ||
| 358 | cpuset_unlock(); | 359 | cpuset_unlock(); |
| 359 | if (mm) | 360 | if (mm) |
| 360 | mmput(mm); | 361 | mmput(mm); |
| @@ -364,5 +365,5 @@ out: | |||
| 364 | * retry to allocate memory unless "p" is current | 365 | * retry to allocate memory unless "p" is current |
| 365 | */ | 366 | */ |
| 366 | if (!test_thread_flag(TIF_MEMDIE)) | 367 | if (!test_thread_flag(TIF_MEMDIE)) |
| 367 | schedule_timeout_interruptible(1); | 368 | schedule_timeout_uninterruptible(1); |
| 368 | } | 369 | } |
| @@ -212,25 +212,33 @@ out: | |||
| 212 | * through real pte's pointing to valid pages and then releasing | 212 | * through real pte's pointing to valid pages and then releasing |
| 213 | * the page from the swap cache. | 213 | * the page from the swap cache. |
| 214 | * | 214 | * |
| 215 | * Must hold page lock on page. | 215 | * Must hold page lock on page and mmap_sem of one vma that contains |
| 216 | * the page. | ||
| 216 | */ | 217 | */ |
| 217 | void remove_from_swap(struct page *page) | 218 | void remove_from_swap(struct page *page) |
| 218 | { | 219 | { |
| 219 | struct anon_vma *anon_vma; | 220 | struct anon_vma *anon_vma; |
| 220 | struct vm_area_struct *vma; | 221 | struct vm_area_struct *vma; |
| 222 | unsigned long mapping; | ||
| 221 | 223 | ||
| 222 | if (!PageAnon(page) || !PageSwapCache(page)) | 224 | if (!PageSwapCache(page)) |
| 223 | return; | 225 | return; |
| 224 | 226 | ||
| 225 | anon_vma = page_lock_anon_vma(page); | 227 | mapping = (unsigned long)page->mapping; |
| 226 | if (!anon_vma) | 228 | |
| 229 | if (!mapping || (mapping & PAGE_MAPPING_ANON) == 0) | ||
| 227 | return; | 230 | return; |
| 228 | 231 | ||
| 232 | /* | ||
| 233 | * We hold the mmap_sem lock. So no need to call page_lock_anon_vma. | ||
| 234 | */ | ||
| 235 | anon_vma = (struct anon_vma *) (mapping - PAGE_MAPPING_ANON); | ||
| 236 | spin_lock(&anon_vma->lock); | ||
| 237 | |||
| 229 | list_for_each_entry(vma, &anon_vma->head, anon_vma_node) | 238 | list_for_each_entry(vma, &anon_vma->head, anon_vma_node) |
| 230 | remove_vma_swap(vma, page); | 239 | remove_vma_swap(vma, page); |
| 231 | 240 | ||
| 232 | spin_unlock(&anon_vma->lock); | 241 | spin_unlock(&anon_vma->lock); |
| 233 | |||
| 234 | delete_from_swap_cache(page); | 242 | delete_from_swap_cache(page); |
| 235 | } | 243 | } |
| 236 | EXPORT_SYMBOL(remove_from_swap); | 244 | EXPORT_SYMBOL(remove_from_swap); |
diff --git a/mm/vmscan.c b/mm/vmscan.c index 1838c15ca4fd..b0af7593d01e 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
| @@ -1908,7 +1908,12 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) | |||
| 1908 | sc.swap_cluster_max = SWAP_CLUSTER_MAX; | 1908 | sc.swap_cluster_max = SWAP_CLUSTER_MAX; |
| 1909 | 1909 | ||
| 1910 | cond_resched(); | 1910 | cond_resched(); |
| 1911 | p->flags |= PF_MEMALLOC; | 1911 | /* |
| 1912 | * We need to be able to allocate from the reserves for RECLAIM_SWAP | ||
| 1913 | * and we also need to be able to write out pages for RECLAIM_WRITE | ||
| 1914 | * and RECLAIM_SWAP. | ||
| 1915 | */ | ||
| 1916 | p->flags |= PF_MEMALLOC | PF_SWAPWRITE; | ||
| 1912 | reclaim_state.reclaimed_slab = 0; | 1917 | reclaim_state.reclaimed_slab = 0; |
| 1913 | p->reclaim_state = &reclaim_state; | 1918 | p->reclaim_state = &reclaim_state; |
| 1914 | 1919 | ||
| @@ -1932,11 +1937,10 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) | |||
| 1932 | * a long time. | 1937 | * a long time. |
| 1933 | */ | 1938 | */ |
| 1934 | shrink_slab(sc.nr_scanned, gfp_mask, order); | 1939 | shrink_slab(sc.nr_scanned, gfp_mask, order); |
| 1935 | sc.nr_reclaimed = 1; /* Avoid getting the off node timeout */ | ||
| 1936 | } | 1940 | } |
| 1937 | 1941 | ||
| 1938 | p->reclaim_state = NULL; | 1942 | p->reclaim_state = NULL; |
| 1939 | current->flags &= ~PF_MEMALLOC; | 1943 | current->flags &= ~(PF_MEMALLOC | PF_SWAPWRITE); |
| 1940 | 1944 | ||
| 1941 | if (sc.nr_reclaimed == 0) | 1945 | if (sc.nr_reclaimed == 0) |
| 1942 | zone->last_unsuccessful_zone_reclaim = jiffies; | 1946 | zone->last_unsuccessful_zone_reclaim = jiffies; |
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 6bb0c7eb1ef0..e060aad8624d 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
| @@ -90,6 +90,7 @@ static struct rtable __fake_rtable = { | |||
| 90 | .dev = &__fake_net_device, | 90 | .dev = &__fake_net_device, |
| 91 | .path = &__fake_rtable.u.dst, | 91 | .path = &__fake_rtable.u.dst, |
| 92 | .metrics = {[RTAX_MTU - 1] = 1500}, | 92 | .metrics = {[RTAX_MTU - 1] = 1500}, |
| 93 | .flags = DST_NOXFRM, | ||
| 93 | } | 94 | } |
| 94 | }, | 95 | }, |
| 95 | .rt_flags = 0, | 96 | .rt_flags = 0, |
diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c index 0128fbbe2328..288ff1d4ccc4 100644 --- a/net/bridge/netfilter/ebt_log.c +++ b/net/bridge/netfilter/ebt_log.c | |||
| @@ -166,7 +166,12 @@ static void ebt_log(const struct sk_buff *skb, unsigned int hooknr, | |||
| 166 | li.u.log.level = info->loglevel; | 166 | li.u.log.level = info->loglevel; |
| 167 | li.u.log.logflags = info->bitmask; | 167 | li.u.log.logflags = info->bitmask; |
| 168 | 168 | ||
| 169 | nf_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li, info->prefix); | 169 | if (info->bitmask & EBT_LOG_NFLOG) |
| 170 | nf_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li, | ||
| 171 | info->prefix); | ||
| 172 | else | ||
| 173 | ebt_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li, | ||
| 174 | info->prefix); | ||
| 170 | } | 175 | } |
| 171 | 176 | ||
| 172 | static struct ebt_watcher log = | 177 | static struct ebt_watcher log = |
diff --git a/net/core/request_sock.c b/net/core/request_sock.c index b8203de5ff07..98f0fc923f91 100644 --- a/net/core/request_sock.c +++ b/net/core/request_sock.c | |||
| @@ -52,7 +52,6 @@ int reqsk_queue_alloc(struct request_sock_queue *queue, | |||
| 52 | get_random_bytes(&lopt->hash_rnd, sizeof(lopt->hash_rnd)); | 52 | get_random_bytes(&lopt->hash_rnd, sizeof(lopt->hash_rnd)); |
| 53 | rwlock_init(&queue->syn_wait_lock); | 53 | rwlock_init(&queue->syn_wait_lock); |
| 54 | queue->rskq_accept_head = queue->rskq_accept_head = NULL; | 54 | queue->rskq_accept_head = queue->rskq_accept_head = NULL; |
| 55 | queue->rskq_defer_accept = 0; | ||
| 56 | lopt->nr_table_entries = nr_table_entries; | 55 | lopt->nr_table_entries = nr_table_entries; |
| 57 | 56 | ||
| 58 | write_lock_bh(&queue->syn_wait_lock); | 57 | write_lock_bh(&queue->syn_wait_lock); |
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 9890fd97e538..c971f14712ec 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c | |||
| @@ -95,6 +95,12 @@ int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, | |||
| 95 | saddr = dev->dev_addr; | 95 | saddr = dev->dev_addr; |
| 96 | memcpy(eth->h_source,saddr,dev->addr_len); | 96 | memcpy(eth->h_source,saddr,dev->addr_len); |
| 97 | 97 | ||
| 98 | if(daddr) | ||
| 99 | { | ||
| 100 | memcpy(eth->h_dest,daddr,dev->addr_len); | ||
| 101 | return ETH_HLEN; | ||
| 102 | } | ||
| 103 | |||
| 98 | /* | 104 | /* |
| 99 | * Anyway, the loopback-device should never use this function... | 105 | * Anyway, the loopback-device should never use this function... |
| 100 | */ | 106 | */ |
| @@ -105,12 +111,6 @@ int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, | |||
| 105 | return ETH_HLEN; | 111 | return ETH_HLEN; |
| 106 | } | 112 | } |
| 107 | 113 | ||
| 108 | if(daddr) | ||
| 109 | { | ||
| 110 | memcpy(eth->h_dest,daddr,dev->addr_len); | ||
| 111 | return ETH_HLEN; | ||
| 112 | } | ||
| 113 | |||
| 114 | return -ETH_HLEN; | 114 | return -ETH_HLEN; |
| 115 | } | 115 | } |
| 116 | 116 | ||
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index 960aa78cdb97..b410ab8bcf7a 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
| @@ -1301,7 +1301,7 @@ static void update_network(struct ieee80211_network *dst, | |||
| 1301 | /* dst->last_associate is not overwritten */ | 1301 | /* dst->last_associate is not overwritten */ |
| 1302 | } | 1302 | } |
| 1303 | 1303 | ||
| 1304 | static inline int is_beacon(int fc) | 1304 | static inline int is_beacon(__le16 fc) |
| 1305 | { | 1305 | { |
| 1306 | return (WLAN_FC_GET_STYPE(le16_to_cpu(fc)) == IEEE80211_STYPE_BEACON); | 1306 | return (WLAN_FC_GET_STYPE(le16_to_cpu(fc)) == IEEE80211_STYPE_BEACON); |
| 1307 | } | 1307 | } |
| @@ -1348,9 +1348,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device | |||
| 1348 | escape_essid(info_element->data, | 1348 | escape_essid(info_element->data, |
| 1349 | info_element->len), | 1349 | info_element->len), |
| 1350 | MAC_ARG(beacon->header.addr3), | 1350 | MAC_ARG(beacon->header.addr3), |
| 1351 | is_beacon(le16_to_cpu | 1351 | is_beacon(beacon->header.frame_ctl) ? |
| 1352 | (beacon->header. | ||
| 1353 | frame_ctl)) ? | ||
| 1354 | "BEACON" : "PROBE RESPONSE"); | 1352 | "BEACON" : "PROBE RESPONSE"); |
| 1355 | return; | 1353 | return; |
| 1356 | } | 1354 | } |
| @@ -1400,9 +1398,7 @@ static void ieee80211_process_probe_response(struct ieee80211_device | |||
| 1400 | escape_essid(network.ssid, | 1398 | escape_essid(network.ssid, |
| 1401 | network.ssid_len), | 1399 | network.ssid_len), |
| 1402 | MAC_ARG(network.bssid), | 1400 | MAC_ARG(network.bssid), |
| 1403 | is_beacon(le16_to_cpu | 1401 | is_beacon(beacon->header.frame_ctl) ? |
| 1404 | (beacon->header. | ||
| 1405 | frame_ctl)) ? | ||
| 1406 | "BEACON" : "PROBE RESPONSE"); | 1402 | "BEACON" : "PROBE RESPONSE"); |
| 1407 | #endif | 1403 | #endif |
| 1408 | memcpy(target, &network, sizeof(*target)); | 1404 | memcpy(target, &network, sizeof(*target)); |
| @@ -1412,16 +1408,14 @@ static void ieee80211_process_probe_response(struct ieee80211_device | |||
| 1412 | escape_essid(target->ssid, | 1408 | escape_essid(target->ssid, |
| 1413 | target->ssid_len), | 1409 | target->ssid_len), |
| 1414 | MAC_ARG(target->bssid), | 1410 | MAC_ARG(target->bssid), |
| 1415 | is_beacon(le16_to_cpu | 1411 | is_beacon(beacon->header.frame_ctl) ? |
| 1416 | (beacon->header. | ||
| 1417 | frame_ctl)) ? | ||
| 1418 | "BEACON" : "PROBE RESPONSE"); | 1412 | "BEACON" : "PROBE RESPONSE"); |
| 1419 | update_network(target, &network); | 1413 | update_network(target, &network); |
| 1420 | } | 1414 | } |
| 1421 | 1415 | ||
| 1422 | spin_unlock_irqrestore(&ieee->lock, flags); | 1416 | spin_unlock_irqrestore(&ieee->lock, flags); |
| 1423 | 1417 | ||
| 1424 | if (is_beacon(le16_to_cpu(beacon->header.frame_ctl))) { | 1418 | if (is_beacon(beacon->header.frame_ctl)) { |
| 1425 | if (ieee->handle_beacon != NULL) | 1419 | if (ieee->handle_beacon != NULL) |
| 1426 | ieee->handle_beacon(dev, beacon, &network); | 1420 | ieee->handle_beacon(dev, beacon, &network); |
| 1427 | } else { | 1421 | } else { |
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 73bfcae8af9c..09590f356086 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c | |||
| @@ -12,13 +12,6 @@ | |||
| 12 | #include <net/protocol.h> | 12 | #include <net/protocol.h> |
| 13 | #include <net/udp.h> | 13 | #include <net/udp.h> |
| 14 | 14 | ||
| 15 | /* decapsulation data for use when post-processing */ | ||
| 16 | struct esp_decap_data { | ||
| 17 | xfrm_address_t saddr; | ||
| 18 | __u16 sport; | ||
| 19 | __u8 proto; | ||
| 20 | }; | ||
| 21 | |||
| 22 | static int esp_output(struct xfrm_state *x, struct sk_buff *skb) | 15 | static int esp_output(struct xfrm_state *x, struct sk_buff *skb) |
| 23 | { | 16 | { |
| 24 | int err; | 17 | int err; |
| @@ -150,6 +143,10 @@ static int esp_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struc | |||
| 150 | int elen = skb->len - sizeof(struct ip_esp_hdr) - esp->conf.ivlen - alen; | 143 | int elen = skb->len - sizeof(struct ip_esp_hdr) - esp->conf.ivlen - alen; |
| 151 | int nfrags; | 144 | int nfrags; |
| 152 | int encap_len = 0; | 145 | int encap_len = 0; |
| 146 | u8 nexthdr[2]; | ||
| 147 | struct scatterlist *sg; | ||
| 148 | u8 workbuf[60]; | ||
| 149 | int padlen; | ||
| 153 | 150 | ||
| 154 | if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr))) | 151 | if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr))) |
| 155 | goto out; | 152 | goto out; |
| @@ -185,122 +182,82 @@ static int esp_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struc | |||
| 185 | if (esp->conf.ivlen) | 182 | if (esp->conf.ivlen) |
| 186 | crypto_cipher_set_iv(esp->conf.tfm, esph->enc_data, crypto_tfm_alg_ivsize(esp->conf.tfm)); | 183 | crypto_cipher_set_iv(esp->conf.tfm, esph->enc_data, crypto_tfm_alg_ivsize(esp->conf.tfm)); |
| 187 | 184 | ||
| 188 | { | 185 | sg = &esp->sgbuf[0]; |
| 189 | u8 nexthdr[2]; | ||
| 190 | struct scatterlist *sg = &esp->sgbuf[0]; | ||
| 191 | u8 workbuf[60]; | ||
| 192 | int padlen; | ||
| 193 | |||
| 194 | if (unlikely(nfrags > ESP_NUM_FAST_SG)) { | ||
| 195 | sg = kmalloc(sizeof(struct scatterlist)*nfrags, GFP_ATOMIC); | ||
| 196 | if (!sg) | ||
| 197 | goto out; | ||
| 198 | } | ||
| 199 | skb_to_sgvec(skb, sg, sizeof(struct ip_esp_hdr) + esp->conf.ivlen, elen); | ||
| 200 | crypto_cipher_decrypt(esp->conf.tfm, sg, sg, elen); | ||
| 201 | if (unlikely(sg != &esp->sgbuf[0])) | ||
| 202 | kfree(sg); | ||
| 203 | |||
| 204 | if (skb_copy_bits(skb, skb->len-alen-2, nexthdr, 2)) | ||
| 205 | BUG(); | ||
| 206 | 186 | ||
| 207 | padlen = nexthdr[0]; | 187 | if (unlikely(nfrags > ESP_NUM_FAST_SG)) { |
| 208 | if (padlen+2 >= elen) | 188 | sg = kmalloc(sizeof(struct scatterlist)*nfrags, GFP_ATOMIC); |
| 189 | if (!sg) | ||
| 209 | goto out; | 190 | goto out; |
| 210 | |||
| 211 | /* ... check padding bits here. Silly. :-) */ | ||
| 212 | |||
| 213 | if (x->encap && decap && decap->decap_type) { | ||
| 214 | struct esp_decap_data *encap_data; | ||
| 215 | struct udphdr *uh = (struct udphdr *) (iph+1); | ||
| 216 | |||
| 217 | encap_data = (struct esp_decap_data *) (decap->decap_data); | ||
| 218 | encap_data->proto = 0; | ||
| 219 | |||
| 220 | switch (decap->decap_type) { | ||
| 221 | case UDP_ENCAP_ESPINUDP: | ||
| 222 | case UDP_ENCAP_ESPINUDP_NON_IKE: | ||
| 223 | encap_data->proto = AF_INET; | ||
| 224 | encap_data->saddr.a4 = iph->saddr; | ||
| 225 | encap_data->sport = uh->source; | ||
| 226 | encap_len = (void*)esph - (void*)uh; | ||
| 227 | break; | ||
| 228 | |||
| 229 | default: | ||
| 230 | goto out; | ||
| 231 | } | ||
| 232 | } | ||
| 233 | |||
| 234 | iph->protocol = nexthdr[1]; | ||
| 235 | pskb_trim(skb, skb->len - alen - padlen - 2); | ||
| 236 | memcpy(workbuf, skb->nh.raw, iph->ihl*4); | ||
| 237 | skb->h.raw = skb_pull(skb, sizeof(struct ip_esp_hdr) + esp->conf.ivlen); | ||
| 238 | skb->nh.raw += encap_len + sizeof(struct ip_esp_hdr) + esp->conf.ivlen; | ||
| 239 | memcpy(skb->nh.raw, workbuf, iph->ihl*4); | ||
| 240 | skb->nh.iph->tot_len = htons(skb->len); | ||
| 241 | } | 191 | } |
| 192 | skb_to_sgvec(skb, sg, sizeof(struct ip_esp_hdr) + esp->conf.ivlen, elen); | ||
| 193 | crypto_cipher_decrypt(esp->conf.tfm, sg, sg, elen); | ||
| 194 | if (unlikely(sg != &esp->sgbuf[0])) | ||
| 195 | kfree(sg); | ||
| 242 | 196 | ||
| 243 | return 0; | 197 | if (skb_copy_bits(skb, skb->len-alen-2, nexthdr, 2)) |
| 198 | BUG(); | ||
| 244 | 199 | ||
| 245 | out: | 200 | padlen = nexthdr[0]; |
| 246 | return -EINVAL; | 201 | if (padlen+2 >= elen) |
| 247 | } | 202 | goto out; |
| 248 | 203 | ||
| 249 | static int esp_post_input(struct xfrm_state *x, struct xfrm_decap_state *decap, struct sk_buff *skb) | 204 | /* ... check padding bits here. Silly. :-) */ |
| 250 | { | ||
| 251 | |||
| 252 | if (x->encap) { | ||
| 253 | struct xfrm_encap_tmpl *encap; | ||
| 254 | struct esp_decap_data *decap_data; | ||
| 255 | 205 | ||
| 256 | encap = x->encap; | 206 | if (x->encap) { |
| 257 | decap_data = (struct esp_decap_data *)(decap->decap_data); | 207 | struct xfrm_encap_tmpl *encap = x->encap; |
| 208 | struct udphdr *uh; | ||
| 258 | 209 | ||
| 259 | /* first, make sure that the decap type == the encap type */ | ||
| 260 | if (encap->encap_type != decap->decap_type) | 210 | if (encap->encap_type != decap->decap_type) |
| 261 | return -EINVAL; | 211 | goto out; |
| 262 | 212 | ||
| 263 | switch (encap->encap_type) { | 213 | uh = (struct udphdr *)(iph + 1); |
| 264 | default: | 214 | encap_len = (void*)esph - (void*)uh; |
| 265 | case UDP_ENCAP_ESPINUDP: | 215 | |
| 266 | case UDP_ENCAP_ESPINUDP_NON_IKE: | 216 | /* |
| 267 | /* | 217 | * 1) if the NAT-T peer's IP or port changed then |
| 268 | * 1) if the NAT-T peer's IP or port changed then | 218 | * advertize the change to the keying daemon. |
| 269 | * advertize the change to the keying daemon. | 219 | * This is an inbound SA, so just compare |
| 270 | * This is an inbound SA, so just compare | 220 | * SRC ports. |
| 271 | * SRC ports. | 221 | */ |
| 272 | */ | 222 | if (iph->saddr != x->props.saddr.a4 || |
| 273 | if (decap_data->proto == AF_INET && | 223 | uh->source != encap->encap_sport) { |
| 274 | (decap_data->saddr.a4 != x->props.saddr.a4 || | 224 | xfrm_address_t ipaddr; |
| 275 | decap_data->sport != encap->encap_sport)) { | 225 | |
| 276 | xfrm_address_t ipaddr; | 226 | ipaddr.a4 = iph->saddr; |
| 277 | 227 | km_new_mapping(x, &ipaddr, uh->source); | |
| 278 | ipaddr.a4 = decap_data->saddr.a4; | 228 | |
| 279 | km_new_mapping(x, &ipaddr, decap_data->sport); | 229 | /* XXX: perhaps add an extra |
| 280 | 230 | * policy check here, to see | |
| 281 | /* XXX: perhaps add an extra | 231 | * if we should allow or |
| 282 | * policy check here, to see | 232 | * reject a packet from a |
| 283 | * if we should allow or | 233 | * different source |
| 284 | * reject a packet from a | 234 | * address/port. |
| 285 | * different source | ||
| 286 | * address/port. | ||
| 287 | */ | ||
| 288 | } | ||
| 289 | |||
| 290 | /* | ||
| 291 | * 2) ignore UDP/TCP checksums in case | ||
| 292 | * of NAT-T in Transport Mode, or | ||
| 293 | * perform other post-processing fixes | ||
| 294 | * as per * draft-ietf-ipsec-udp-encaps-06, | ||
| 295 | * section 3.1.2 | ||
| 296 | */ | 235 | */ |
| 297 | if (!x->props.mode) | ||
| 298 | skb->ip_summed = CHECKSUM_UNNECESSARY; | ||
| 299 | |||
| 300 | break; | ||
| 301 | } | 236 | } |
| 237 | |||
| 238 | /* | ||
| 239 | * 2) ignore UDP/TCP checksums in case | ||
| 240 | * of NAT-T in Transport Mode, or | ||
| 241 | * perform other post-processing fixes | ||
| 242 | * as per draft-ietf-ipsec-udp-encaps-06, | ||
| 243 | * section 3.1.2 | ||
| 244 | */ | ||
| 245 | if (!x->props.mode) | ||
| 246 | skb->ip_summed = CHECKSUM_UNNECESSARY; | ||
| 302 | } | 247 | } |
| 248 | |||
| 249 | iph->protocol = nexthdr[1]; | ||
| 250 | pskb_trim(skb, skb->len - alen - padlen - 2); | ||
| 251 | memcpy(workbuf, skb->nh.raw, iph->ihl*4); | ||
| 252 | skb->h.raw = skb_pull(skb, sizeof(struct ip_esp_hdr) + esp->conf.ivlen); | ||
| 253 | skb->nh.raw += encap_len + sizeof(struct ip_esp_hdr) + esp->conf.ivlen; | ||
| 254 | memcpy(skb->nh.raw, workbuf, iph->ihl*4); | ||
| 255 | skb->nh.iph->tot_len = htons(skb->len); | ||
| 256 | |||
| 303 | return 0; | 257 | return 0; |
| 258 | |||
| 259 | out: | ||
| 260 | return -EINVAL; | ||
| 304 | } | 261 | } |
| 305 | 262 | ||
| 306 | static u32 esp4_get_max_size(struct xfrm_state *x, int mtu) | 263 | static u32 esp4_get_max_size(struct xfrm_state *x, int mtu) |
| @@ -458,7 +415,6 @@ static struct xfrm_type esp_type = | |||
| 458 | .destructor = esp_destroy, | 415 | .destructor = esp_destroy, |
| 459 | .get_max_size = esp4_get_max_size, | 416 | .get_max_size = esp4_get_max_size, |
| 460 | .input = esp_input, | 417 | .input = esp_input, |
| 461 | .post_input = esp_post_input, | ||
| 462 | .output = esp_output | 418 | .output = esp_output |
| 463 | }; | 419 | }; |
| 464 | 420 | ||
| @@ -470,15 +426,6 @@ static struct net_protocol esp4_protocol = { | |||
| 470 | 426 | ||
| 471 | static int __init esp4_init(void) | 427 | static int __init esp4_init(void) |
| 472 | { | 428 | { |
| 473 | struct xfrm_decap_state decap; | ||
| 474 | |||
| 475 | if (sizeof(struct esp_decap_data) > | ||
| 476 | sizeof(decap.decap_data)) { | ||
| 477 | extern void decap_data_too_small(void); | ||
| 478 | |||
| 479 | decap_data_too_small(); | ||
| 480 | } | ||
| 481 | |||
| 482 | if (xfrm_register_type(&esp_type, AF_INET) < 0) { | 429 | if (xfrm_register_type(&esp_type, AF_INET) < 0) { |
| 483 | printk(KERN_INFO "ip esp init: can't add xfrm type\n"); | 430 | printk(KERN_INFO "ip esp init: can't add xfrm type\n"); |
| 484 | return -EAGAIN; | 431 | return -EAGAIN; |
diff --git a/net/ipv4/netfilter/ipt_LOG.c b/net/ipv4/netfilter/ipt_LOG.c index 6606ddb66a29..cc27545ff97f 100644 --- a/net/ipv4/netfilter/ipt_LOG.c +++ b/net/ipv4/netfilter/ipt_LOG.c | |||
| @@ -425,7 +425,12 @@ ipt_log_target(struct sk_buff **pskb, | |||
| 425 | li.u.log.level = loginfo->level; | 425 | li.u.log.level = loginfo->level; |
| 426 | li.u.log.logflags = loginfo->logflags; | 426 | li.u.log.logflags = loginfo->logflags; |
| 427 | 427 | ||
| 428 | nf_log_packet(PF_INET, hooknum, *pskb, in, out, &li, loginfo->prefix); | 428 | if (loginfo->logflags & IPT_LOG_NFLOG) |
| 429 | nf_log_packet(PF_INET, hooknum, *pskb, in, out, &li, | ||
| 430 | loginfo->prefix); | ||
| 431 | else | ||
| 432 | ipt_log_packet(PF_INET, hooknum, *pskb, in, out, &li, | ||
| 433 | loginfo->prefix); | ||
| 429 | 434 | ||
| 430 | return IPT_CONTINUE; | 435 | return IPT_CONTINUE; |
| 431 | } | 436 | } |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index d82c242ea704..fca5fe0cf94a 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
| @@ -835,7 +835,7 @@ static int rt_garbage_collect(void) | |||
| 835 | int r; | 835 | int r; |
| 836 | 836 | ||
| 837 | rthp = rt_remove_balanced_route( | 837 | rthp = rt_remove_balanced_route( |
| 838 | &rt_hash_table[i].chain, | 838 | &rt_hash_table[k].chain, |
| 839 | rth, | 839 | rth, |
| 840 | &r); | 840 | &r); |
| 841 | goal -= r; | 841 | goal -= r; |
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index 45f7ae58f2c0..f285bbf296e2 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c | |||
| @@ -35,6 +35,7 @@ __xfrm4_find_bundle(struct flowi *fl, struct xfrm_policy *policy) | |||
| 35 | if (xdst->u.rt.fl.oif == fl->oif && /*XXX*/ | 35 | if (xdst->u.rt.fl.oif == fl->oif && /*XXX*/ |
| 36 | xdst->u.rt.fl.fl4_dst == fl->fl4_dst && | 36 | xdst->u.rt.fl.fl4_dst == fl->fl4_dst && |
| 37 | xdst->u.rt.fl.fl4_src == fl->fl4_src && | 37 | xdst->u.rt.fl.fl4_src == fl->fl4_src && |
| 38 | xdst->u.rt.fl.fl4_tos == fl->fl4_tos && | ||
| 38 | xfrm_bundle_ok(xdst, fl, AF_INET)) { | 39 | xfrm_bundle_ok(xdst, fl, AF_INET)) { |
| 39 | dst_clone(dst); | 40 | dst_clone(dst); |
| 40 | break; | 41 | break; |
| @@ -61,7 +62,8 @@ __xfrm4_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int | |||
| 61 | .nl_u = { | 62 | .nl_u = { |
| 62 | .ip4_u = { | 63 | .ip4_u = { |
| 63 | .saddr = local, | 64 | .saddr = local, |
| 64 | .daddr = remote | 65 | .daddr = remote, |
| 66 | .tos = fl->fl4_tos | ||
| 65 | } | 67 | } |
| 66 | } | 68 | } |
| 67 | }; | 69 | }; |
| @@ -230,6 +232,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl) | |||
| 230 | fl->proto = iph->protocol; | 232 | fl->proto = iph->protocol; |
| 231 | fl->fl4_dst = iph->daddr; | 233 | fl->fl4_dst = iph->daddr; |
| 232 | fl->fl4_src = iph->saddr; | 234 | fl->fl4_src = iph->saddr; |
| 235 | fl->fl4_tos = iph->tos; | ||
| 233 | } | 236 | } |
| 234 | 237 | ||
| 235 | static inline int xfrm4_garbage_collect(void) | 238 | static inline int xfrm4_garbage_collect(void) |
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index efa3e72cfcfa..f999edd846a9 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
| @@ -494,6 +494,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) | |||
| 494 | struct net_device *dev; | 494 | struct net_device *dev; |
| 495 | struct sk_buff *frag; | 495 | struct sk_buff *frag; |
| 496 | struct rt6_info *rt = (struct rt6_info*)skb->dst; | 496 | struct rt6_info *rt = (struct rt6_info*)skb->dst; |
| 497 | struct ipv6_pinfo *np = skb->sk ? inet6_sk(skb->sk) : NULL; | ||
| 497 | struct ipv6hdr *tmp_hdr; | 498 | struct ipv6hdr *tmp_hdr; |
| 498 | struct frag_hdr *fh; | 499 | struct frag_hdr *fh; |
| 499 | unsigned int mtu, hlen, left, len; | 500 | unsigned int mtu, hlen, left, len; |
| @@ -505,7 +506,12 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) | |||
| 505 | hlen = ip6_find_1stfragopt(skb, &prevhdr); | 506 | hlen = ip6_find_1stfragopt(skb, &prevhdr); |
| 506 | nexthdr = *prevhdr; | 507 | nexthdr = *prevhdr; |
| 507 | 508 | ||
| 508 | mtu = dst_mtu(&rt->u.dst) - hlen - sizeof(struct frag_hdr); | 509 | mtu = dst_mtu(&rt->u.dst); |
| 510 | if (np && np->frag_size < mtu) { | ||
| 511 | if (np->frag_size) | ||
| 512 | mtu = np->frag_size; | ||
| 513 | } | ||
| 514 | mtu -= hlen + sizeof(struct frag_hdr); | ||
| 509 | 515 | ||
| 510 | if (skb_shinfo(skb)->frag_list) { | 516 | if (skb_shinfo(skb)->frag_list) { |
| 511 | int first_len = skb_pagelen(skb); | 517 | int first_len = skb_pagelen(skb); |
| @@ -882,7 +888,12 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, | |||
| 882 | inet->cork.fl = *fl; | 888 | inet->cork.fl = *fl; |
| 883 | np->cork.hop_limit = hlimit; | 889 | np->cork.hop_limit = hlimit; |
| 884 | np->cork.tclass = tclass; | 890 | np->cork.tclass = tclass; |
| 885 | inet->cork.fragsize = mtu = dst_mtu(rt->u.dst.path); | 891 | mtu = dst_mtu(rt->u.dst.path); |
| 892 | if (np && np->frag_size < mtu) { | ||
| 893 | if (np->frag_size) | ||
| 894 | mtu = np->frag_size; | ||
| 895 | } | ||
| 896 | inet->cork.fragsize = mtu; | ||
| 886 | if (dst_allfrag(rt->u.dst.path)) | 897 | if (dst_allfrag(rt->u.dst.path)) |
| 887 | inet->cork.flags |= IPCORK_ALLFRAG; | 898 | inet->cork.flags |= IPCORK_ALLFRAG; |
| 888 | inet->cork.length = 0; | 899 | inet->cork.length = 0; |
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index faea8a120ee2..48597538db3f 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
| @@ -884,6 +884,7 @@ ip6ip6_tnl_change(struct ip6_tnl *t, struct ip6_tnl_parm *p) | |||
| 884 | t->parms.encap_limit = p->encap_limit; | 884 | t->parms.encap_limit = p->encap_limit; |
| 885 | t->parms.flowinfo = p->flowinfo; | 885 | t->parms.flowinfo = p->flowinfo; |
| 886 | t->parms.link = p->link; | 886 | t->parms.link = p->link; |
| 887 | ip6_tnl_dst_reset(t); | ||
| 887 | ip6ip6_tnl_link_config(t); | 888 | ip6ip6_tnl_link_config(t); |
| 888 | return 0; | 889 | return 0; |
| 889 | } | 890 | } |
diff --git a/net/ipv6/netfilter/ip6t_LOG.c b/net/ipv6/netfilter/ip6t_LOG.c index 77c725832dec..6b930efa9fb9 100644 --- a/net/ipv6/netfilter/ip6t_LOG.c +++ b/net/ipv6/netfilter/ip6t_LOG.c | |||
| @@ -436,7 +436,12 @@ ip6t_log_target(struct sk_buff **pskb, | |||
| 436 | li.u.log.level = loginfo->level; | 436 | li.u.log.level = loginfo->level; |
| 437 | li.u.log.logflags = loginfo->logflags; | 437 | li.u.log.logflags = loginfo->logflags; |
| 438 | 438 | ||
| 439 | nf_log_packet(PF_INET6, hooknum, *pskb, in, out, &li, loginfo->prefix); | 439 | if (loginfo->logflags & IP6T_LOG_NFLOG) |
| 440 | nf_log_packet(PF_INET6, hooknum, *pskb, in, out, &li, | ||
| 441 | loginfo->prefix); | ||
| 442 | else | ||
| 443 | ip6t_log_packet(PF_INET6, hooknum, *pskb, in, out, &li, | ||
| 444 | loginfo->prefix); | ||
| 440 | 445 | ||
| 441 | return IP6T_CONTINUE; | 446 | return IP6T_CONTINUE; |
| 442 | } | 447 | } |
diff --git a/net/key/af_key.c b/net/key/af_key.c index ae86d237a456..b2d4d1dd2116 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
| @@ -1423,7 +1423,7 @@ static int pfkey_add(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, | |||
| 1423 | 1423 | ||
| 1424 | if (err < 0) { | 1424 | if (err < 0) { |
| 1425 | x->km.state = XFRM_STATE_DEAD; | 1425 | x->km.state = XFRM_STATE_DEAD; |
| 1426 | xfrm_state_put(x); | 1426 | __xfrm_state_put(x); |
| 1427 | goto out; | 1427 | goto out; |
| 1428 | } | 1428 | } |
| 1429 | 1429 | ||
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c index d3a4f30a7f22..d9f0d7ef103b 100644 --- a/net/netfilter/nf_queue.c +++ b/net/netfilter/nf_queue.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #include <linux/skbuff.h> | 6 | #include <linux/skbuff.h> |
| 7 | #include <linux/netfilter.h> | 7 | #include <linux/netfilter.h> |
| 8 | #include <linux/seq_file.h> | 8 | #include <linux/seq_file.h> |
| 9 | #include <linux/rcupdate.h> | ||
| 9 | #include <net/protocol.h> | 10 | #include <net/protocol.h> |
| 10 | 11 | ||
| 11 | #include "nf_internals.h" | 12 | #include "nf_internals.h" |
| @@ -16,7 +17,7 @@ | |||
| 16 | * for queueing and must reinject all packets it receives, no matter what. | 17 | * for queueing and must reinject all packets it receives, no matter what. |
| 17 | */ | 18 | */ |
| 18 | static struct nf_queue_handler *queue_handler[NPROTO]; | 19 | static struct nf_queue_handler *queue_handler[NPROTO]; |
| 19 | static struct nf_queue_rerouter *queue_rerouter; | 20 | static struct nf_queue_rerouter *queue_rerouter[NPROTO]; |
| 20 | 21 | ||
| 21 | static DEFINE_RWLOCK(queue_handler_lock); | 22 | static DEFINE_RWLOCK(queue_handler_lock); |
| 22 | 23 | ||
| @@ -64,7 +65,7 @@ int nf_register_queue_rerouter(int pf, struct nf_queue_rerouter *rer) | |||
| 64 | return -EINVAL; | 65 | return -EINVAL; |
| 65 | 66 | ||
| 66 | write_lock_bh(&queue_handler_lock); | 67 | write_lock_bh(&queue_handler_lock); |
| 67 | memcpy(&queue_rerouter[pf], rer, sizeof(queue_rerouter[pf])); | 68 | rcu_assign_pointer(queue_rerouter[pf], rer); |
| 68 | write_unlock_bh(&queue_handler_lock); | 69 | write_unlock_bh(&queue_handler_lock); |
| 69 | 70 | ||
| 70 | return 0; | 71 | return 0; |
| @@ -77,8 +78,9 @@ int nf_unregister_queue_rerouter(int pf) | |||
| 77 | return -EINVAL; | 78 | return -EINVAL; |
| 78 | 79 | ||
| 79 | write_lock_bh(&queue_handler_lock); | 80 | write_lock_bh(&queue_handler_lock); |
| 80 | memset(&queue_rerouter[pf], 0, sizeof(queue_rerouter[pf])); | 81 | rcu_assign_pointer(queue_rerouter[pf], NULL); |
| 81 | write_unlock_bh(&queue_handler_lock); | 82 | write_unlock_bh(&queue_handler_lock); |
| 83 | synchronize_rcu(); | ||
| 82 | return 0; | 84 | return 0; |
| 83 | } | 85 | } |
| 84 | EXPORT_SYMBOL_GPL(nf_unregister_queue_rerouter); | 86 | EXPORT_SYMBOL_GPL(nf_unregister_queue_rerouter); |
| @@ -114,16 +116,17 @@ int nf_queue(struct sk_buff **skb, | |||
| 114 | struct net_device *physindev = NULL; | 116 | struct net_device *physindev = NULL; |
| 115 | struct net_device *physoutdev = NULL; | 117 | struct net_device *physoutdev = NULL; |
| 116 | #endif | 118 | #endif |
| 119 | struct nf_queue_rerouter *rerouter; | ||
| 117 | 120 | ||
| 118 | /* QUEUE == DROP if noone is waiting, to be safe. */ | 121 | /* QUEUE == DROP if noone is waiting, to be safe. */ |
| 119 | read_lock(&queue_handler_lock); | 122 | read_lock(&queue_handler_lock); |
| 120 | if (!queue_handler[pf] || !queue_handler[pf]->outfn) { | 123 | if (!queue_handler[pf]) { |
| 121 | read_unlock(&queue_handler_lock); | 124 | read_unlock(&queue_handler_lock); |
| 122 | kfree_skb(*skb); | 125 | kfree_skb(*skb); |
| 123 | return 1; | 126 | return 1; |
| 124 | } | 127 | } |
| 125 | 128 | ||
| 126 | info = kmalloc(sizeof(*info)+queue_rerouter[pf].rer_size, GFP_ATOMIC); | 129 | info = kmalloc(sizeof(*info)+queue_rerouter[pf]->rer_size, GFP_ATOMIC); |
| 127 | if (!info) { | 130 | if (!info) { |
| 128 | if (net_ratelimit()) | 131 | if (net_ratelimit()) |
| 129 | printk(KERN_ERR "OOM queueing packet %p\n", | 132 | printk(KERN_ERR "OOM queueing packet %p\n", |
| @@ -155,15 +158,13 @@ int nf_queue(struct sk_buff **skb, | |||
| 155 | if (physoutdev) dev_hold(physoutdev); | 158 | if (physoutdev) dev_hold(physoutdev); |
| 156 | } | 159 | } |
| 157 | #endif | 160 | #endif |
| 158 | if (queue_rerouter[pf].save) | 161 | rerouter = rcu_dereference(queue_rerouter[pf]); |
| 159 | queue_rerouter[pf].save(*skb, info); | 162 | if (rerouter) |
| 163 | rerouter->save(*skb, info); | ||
| 160 | 164 | ||
| 161 | status = queue_handler[pf]->outfn(*skb, info, queuenum, | 165 | status = queue_handler[pf]->outfn(*skb, info, queuenum, |
| 162 | queue_handler[pf]->data); | 166 | queue_handler[pf]->data); |
| 163 | 167 | ||
| 164 | if (status >= 0 && queue_rerouter[pf].reroute) | ||
| 165 | status = queue_rerouter[pf].reroute(skb, info); | ||
| 166 | |||
| 167 | read_unlock(&queue_handler_lock); | 168 | read_unlock(&queue_handler_lock); |
| 168 | 169 | ||
| 169 | if (status < 0) { | 170 | if (status < 0) { |
| @@ -189,6 +190,7 @@ void nf_reinject(struct sk_buff *skb, struct nf_info *info, | |||
| 189 | { | 190 | { |
| 190 | struct list_head *elem = &info->elem->list; | 191 | struct list_head *elem = &info->elem->list; |
| 191 | struct list_head *i; | 192 | struct list_head *i; |
| 193 | struct nf_queue_rerouter *rerouter; | ||
| 192 | 194 | ||
| 193 | rcu_read_lock(); | 195 | rcu_read_lock(); |
| 194 | 196 | ||
| @@ -212,7 +214,7 @@ void nf_reinject(struct sk_buff *skb, struct nf_info *info, | |||
| 212 | break; | 214 | break; |
| 213 | } | 215 | } |
| 214 | 216 | ||
| 215 | if (elem == &nf_hooks[info->pf][info->hook]) { | 217 | if (i == &nf_hooks[info->pf][info->hook]) { |
| 216 | /* The module which sent it to userspace is gone. */ | 218 | /* The module which sent it to userspace is gone. */ |
| 217 | NFDEBUG("%s: module disappeared, dropping packet.\n", | 219 | NFDEBUG("%s: module disappeared, dropping packet.\n", |
| 218 | __FUNCTION__); | 220 | __FUNCTION__); |
| @@ -226,6 +228,12 @@ void nf_reinject(struct sk_buff *skb, struct nf_info *info, | |||
| 226 | } | 228 | } |
| 227 | 229 | ||
| 228 | if (verdict == NF_ACCEPT) { | 230 | if (verdict == NF_ACCEPT) { |
| 231 | rerouter = rcu_dereference(queue_rerouter[info->pf]); | ||
| 232 | if (rerouter && rerouter->reroute(&skb, info) < 0) | ||
| 233 | verdict = NF_DROP; | ||
| 234 | } | ||
| 235 | |||
| 236 | if (verdict == NF_ACCEPT) { | ||
| 229 | next_hook: | 237 | next_hook: |
| 230 | verdict = nf_iterate(&nf_hooks[info->pf][info->hook], | 238 | verdict = nf_iterate(&nf_hooks[info->pf][info->hook], |
| 231 | &skb, info->hook, | 239 | &skb, info->hook, |
| @@ -322,22 +330,12 @@ int __init netfilter_queue_init(void) | |||
| 322 | { | 330 | { |
| 323 | #ifdef CONFIG_PROC_FS | 331 | #ifdef CONFIG_PROC_FS |
| 324 | struct proc_dir_entry *pde; | 332 | struct proc_dir_entry *pde; |
| 325 | #endif | ||
| 326 | queue_rerouter = kmalloc(NPROTO * sizeof(struct nf_queue_rerouter), | ||
| 327 | GFP_KERNEL); | ||
| 328 | if (!queue_rerouter) | ||
| 329 | return -ENOMEM; | ||
| 330 | 333 | ||
| 331 | #ifdef CONFIG_PROC_FS | ||
| 332 | pde = create_proc_entry("nf_queue", S_IRUGO, proc_net_netfilter); | 334 | pde = create_proc_entry("nf_queue", S_IRUGO, proc_net_netfilter); |
| 333 | if (!pde) { | 335 | if (!pde) |
| 334 | kfree(queue_rerouter); | ||
| 335 | return -1; | 336 | return -1; |
| 336 | } | ||
| 337 | pde->proc_fops = &nfqueue_file_ops; | 337 | pde->proc_fops = &nfqueue_file_ops; |
| 338 | #endif | 338 | #endif |
| 339 | memset(queue_rerouter, 0, NPROTO * sizeof(struct nf_queue_rerouter)); | ||
| 340 | |||
| 341 | return 0; | 339 | return 0; |
| 342 | } | 340 | } |
| 343 | 341 | ||
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 5e6b05ac1260..ae62054a9fc4 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
| @@ -782,7 +782,7 @@ int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl, | |||
| 782 | int nx = 0; | 782 | int nx = 0; |
| 783 | int err; | 783 | int err; |
| 784 | u32 genid; | 784 | u32 genid; |
| 785 | u16 family = dst_orig->ops->family; | 785 | u16 family; |
| 786 | u8 dir = policy_to_flow_dir(XFRM_POLICY_OUT); | 786 | u8 dir = policy_to_flow_dir(XFRM_POLICY_OUT); |
| 787 | u32 sk_sid = security_sk_sid(sk, fl, dir); | 787 | u32 sk_sid = security_sk_sid(sk, fl, dir); |
| 788 | restart: | 788 | restart: |
| @@ -796,13 +796,14 @@ restart: | |||
| 796 | if ((dst_orig->flags & DST_NOXFRM) || !xfrm_policy_list[XFRM_POLICY_OUT]) | 796 | if ((dst_orig->flags & DST_NOXFRM) || !xfrm_policy_list[XFRM_POLICY_OUT]) |
| 797 | return 0; | 797 | return 0; |
| 798 | 798 | ||
| 799 | policy = flow_cache_lookup(fl, sk_sid, family, dir, | 799 | policy = flow_cache_lookup(fl, sk_sid, dst_orig->ops->family, |
| 800 | xfrm_policy_lookup); | 800 | dir, xfrm_policy_lookup); |
| 801 | } | 801 | } |
| 802 | 802 | ||
| 803 | if (!policy) | 803 | if (!policy) |
| 804 | return 0; | 804 | return 0; |
| 805 | 805 | ||
| 806 | family = dst_orig->ops->family; | ||
| 806 | policy->curlft.use_time = (unsigned long)xtime.tv_sec; | 807 | policy->curlft.use_time = (unsigned long)xtime.tv_sec; |
| 807 | 808 | ||
| 808 | switch (policy->action) { | 809 | switch (policy->action) { |
| @@ -995,13 +996,6 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, | |||
| 995 | struct sec_decap_state *xvec = &(skb->sp->x[i]); | 996 | struct sec_decap_state *xvec = &(skb->sp->x[i]); |
| 996 | if (!xfrm_selector_match(&xvec->xvec->sel, &fl, family)) | 997 | if (!xfrm_selector_match(&xvec->xvec->sel, &fl, family)) |
| 997 | return 0; | 998 | return 0; |
| 998 | |||
| 999 | /* If there is a post_input processor, try running it */ | ||
| 1000 | if (xvec->xvec->type->post_input && | ||
| 1001 | (xvec->xvec->type->post_input)(xvec->xvec, | ||
| 1002 | &(xvec->decap), | ||
| 1003 | skb) != 0) | ||
| 1004 | return 0; | ||
| 1005 | } | 999 | } |
| 1006 | } | 1000 | } |
| 1007 | 1001 | ||
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index e12d0be5f976..c656cbaf35e8 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
| @@ -220,14 +220,14 @@ static int __xfrm_state_delete(struct xfrm_state *x) | |||
| 220 | x->km.state = XFRM_STATE_DEAD; | 220 | x->km.state = XFRM_STATE_DEAD; |
| 221 | spin_lock(&xfrm_state_lock); | 221 | spin_lock(&xfrm_state_lock); |
| 222 | list_del(&x->bydst); | 222 | list_del(&x->bydst); |
| 223 | atomic_dec(&x->refcnt); | 223 | __xfrm_state_put(x); |
| 224 | if (x->id.spi) { | 224 | if (x->id.spi) { |
| 225 | list_del(&x->byspi); | 225 | list_del(&x->byspi); |
| 226 | atomic_dec(&x->refcnt); | 226 | __xfrm_state_put(x); |
| 227 | } | 227 | } |
| 228 | spin_unlock(&xfrm_state_lock); | 228 | spin_unlock(&xfrm_state_lock); |
| 229 | if (del_timer(&x->timer)) | 229 | if (del_timer(&x->timer)) |
| 230 | atomic_dec(&x->refcnt); | 230 | __xfrm_state_put(x); |
| 231 | 231 | ||
| 232 | /* The number two in this test is the reference | 232 | /* The number two in this test is the reference |
| 233 | * mentioned in the comment below plus the reference | 233 | * mentioned in the comment below plus the reference |
| @@ -243,7 +243,7 @@ static int __xfrm_state_delete(struct xfrm_state *x) | |||
| 243 | * The xfrm_state_alloc call gives a reference, and that | 243 | * The xfrm_state_alloc call gives a reference, and that |
| 244 | * is what we are dropping here. | 244 | * is what we are dropping here. |
| 245 | */ | 245 | */ |
| 246 | atomic_dec(&x->refcnt); | 246 | __xfrm_state_put(x); |
| 247 | err = 0; | 247 | err = 0; |
| 248 | } | 248 | } |
| 249 | 249 | ||
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index ac87a09ba83e..7de17559249a 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c | |||
| @@ -345,7 +345,7 @@ static int xfrm_add_sa(struct sk_buff *skb, struct nlmsghdr *nlh, void **xfrma) | |||
| 345 | 345 | ||
| 346 | if (err < 0) { | 346 | if (err < 0) { |
| 347 | x->km.state = XFRM_STATE_DEAD; | 347 | x->km.state = XFRM_STATE_DEAD; |
| 348 | xfrm_state_put(x); | 348 | __xfrm_state_put(x); |
| 349 | goto out; | 349 | goto out; |
| 350 | } | 350 | } |
| 351 | 351 | ||
diff --git a/sound/drivers/opl3/opl3_oss.c b/sound/drivers/opl3/opl3_oss.c index 31f1f2e25aa0..0345ae647681 100644 --- a/sound/drivers/opl3/opl3_oss.c +++ b/sound/drivers/opl3/opl3_oss.c | |||
| @@ -146,7 +146,7 @@ void snd_opl3_init_seq_oss(struct snd_opl3 *opl3, char *name) | |||
| 146 | void snd_opl3_free_seq_oss(struct snd_opl3 *opl3) | 146 | void snd_opl3_free_seq_oss(struct snd_opl3 *opl3) |
| 147 | { | 147 | { |
| 148 | if (opl3->oss_seq_dev) { | 148 | if (opl3->oss_seq_dev) { |
| 149 | snd_device_free(opl3->card, opl3->oss_seq_dev); | 149 | /* The instance should have been released in prior */ |
| 150 | opl3->oss_seq_dev = NULL; | 150 | opl3->oss_seq_dev = NULL; |
| 151 | } | 151 | } |
| 152 | } | 152 | } |
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index 4fa431040564..99a42138bea0 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c | |||
| @@ -414,7 +414,7 @@ static int __devinit snd_card_cs423x_pnpc(int dev, struct snd_card_cs4236 *acard | |||
| 414 | } | 414 | } |
| 415 | /* MPU initialization */ | 415 | /* MPU initialization */ |
| 416 | if (acard->mpu && mpu_port[dev] > 0) { | 416 | if (acard->mpu && mpu_port[dev] > 0) { |
| 417 | if (snd_cs423x_pnp_init_mpu(dev, acard->ctrl, cfg) < 0) | 417 | if (snd_cs423x_pnp_init_mpu(dev, acard->mpu, cfg) < 0) |
| 418 | goto error; | 418 | goto error; |
| 419 | } | 419 | } |
| 420 | kfree(cfg); | 420 | kfree(cfg); |