From 608aa7bd2f74083124c5f5bd091781c13b6f2727 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 13 Oct 2008 14:03:59 -0700 Subject: [PATCH] --- yaml --- r: 114109 b: refs/heads/master c: cf2fa66055d718ae13e62451bb546505f63906a2 h: refs/heads/master i: 114107: 5a643cd1ac096f8444714a434971ec01768ded54 v: v3 --- [refs] | 2 +- trunk/Documentation/00-INDEX | 2 - trunk/Documentation/blackfin/kgdb.txt | 155 -- .../feature-removal-schedule.txt | 8 - trunk/Documentation/filesystems/ext4.txt | 5 + trunk/Documentation/filesystems/proc.txt | 7 - trunk/Documentation/kernel-parameters.txt | 26 +- .../alsa/DocBook/writing-an-alsa-driver.tmpl | 3 +- trunk/Documentation/sparc/sbus_drivers.txt | 309 --- trunk/Documentation/timers/00-INDEX | 10 + trunk/Documentation/{ => timers}/hpet.txt | 43 +- trunk/MAINTAINERS | 916 ++++---- trunk/arch/Kconfig | 14 + trunk/arch/alpha/Kconfig | 4 +- trunk/arch/alpha/include/asm/statfs.h | 4 + trunk/arch/arm/Kconfig | 4 +- trunk/arch/arm/include/asm/statfs.h | 34 +- trunk/arch/arm/kernel/dma.c | 17 - .../arm/mach-orion5x/include/mach/orion5x.h | 2 + trunk/arch/arm/plat-omap/devices.c | 21 +- trunk/arch/avr32/boards/atngw100/setup.c | 19 +- trunk/arch/avr32/boards/atstk1000/atstk1002.c | 23 +- trunk/arch/avr32/boards/atstk1000/atstk1003.c | 15 +- trunk/arch/avr32/boards/atstk1000/atstk1004.c | 18 +- trunk/arch/avr32/include/asm/a.out.h | 20 - trunk/arch/avr32/include/asm/atmel-mci.h | 32 +- trunk/arch/avr32/include/asm/byteorder.h | 22 +- trunk/arch/avr32/include/asm/io.h | 8 + trunk/arch/avr32/kernel/process.c | 3 +- trunk/arch/avr32/kernel/setup.c | 19 + trunk/arch/avr32/mach-at32ap/at32ap700x.c | 460 ++-- trunk/arch/avr32/mach-at32ap/clock.c | 52 +- trunk/arch/avr32/mach-at32ap/clock.h | 8 +- .../mach-at32ap/include/mach/at32ap700x.h | 128 ++ .../avr32/mach-at32ap/include/mach/board.h | 2 +- .../arch/avr32/mach-at32ap/include/mach/io.h | 3 +- .../avr32/mach-at32ap/include/mach/portmux.h | 5 +- trunk/arch/avr32/mach-at32ap/pdc.c | 3 +- trunk/arch/avr32/mach-at32ap/pio.c | 63 +- trunk/arch/avr32/oprofile/Makefile | 2 +- trunk/arch/avr32/oprofile/backtrace.c | 81 + trunk/arch/avr32/oprofile/op_model_avr32.c | 4 + trunk/arch/blackfin/Kconfig | 75 +- trunk/arch/blackfin/Kconfig.debug | 55 + trunk/arch/blackfin/Makefile | 1 + .../blackfin/configs/BF526-EZBRD_defconfig | 1427 ++++++++++++ trunk/arch/blackfin/configs/H8606_defconfig | 36 +- trunk/arch/blackfin/include/asm/a.out.h | 19 - trunk/arch/blackfin/include/asm/bfin-global.h | 5 +- trunk/arch/blackfin/include/asm/bfrom.h | 85 + trunk/arch/blackfin/include/asm/cacheflush.h | 2 - trunk/arch/blackfin/include/asm/cplb.h | 8 +- trunk/arch/blackfin/include/asm/cplbinit.h | 16 +- trunk/arch/blackfin/include/asm/cpumask.h | 6 - trunk/arch/blackfin/include/asm/dma-mapping.h | 11 + trunk/arch/blackfin/include/asm/kgdb.h | 21 +- trunk/arch/blackfin/include/asm/mmu_context.h | 79 +- trunk/arch/blackfin/include/asm/processor.h | 6 + trunk/arch/blackfin/include/asm/ptrace.h | 2 + trunk/arch/blackfin/include/asm/traps.h | 5 +- trunk/arch/blackfin/kernel/asm-offsets.c | 1 + trunk/arch/blackfin/kernel/bfin_dma_5xx.c | 13 +- trunk/arch/blackfin/kernel/bfin_gpio.c | 9 +- .../arch/blackfin/kernel/cplb-mpu/cplbinit.c | 12 +- trunk/arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 14 +- .../blackfin/kernel/cplb-nompu/cplbinit.c | 6 +- trunk/arch/blackfin/kernel/early_printk.c | 12 + trunk/arch/blackfin/kernel/kgdb.c | 711 ++++-- trunk/arch/blackfin/kernel/ptrace.c | 215 +- trunk/arch/blackfin/kernel/reboot.c | 18 +- trunk/arch/blackfin/kernel/setup.c | 97 +- trunk/arch/blackfin/kernel/traps.c | 367 +-- trunk/arch/blackfin/mach-bf527/boards/Kconfig | 5 + .../arch/blackfin/mach-bf527/boards/Makefile | 1 + .../blackfin/mach-bf527/boards/cm_bf527.c | 17 +- trunk/arch/blackfin/mach-bf527/boards/ezbrd.c | 734 ++++++ trunk/arch/blackfin/mach-bf527/boards/ezkit.c | 53 +- trunk/arch/blackfin/mach-bf527/head.S | 3 + .../mach-bf527/include/mach/anomaly.h | 160 +- .../blackfin/mach-bf527/include/mach/bf527.h | 21 +- .../mach-bf527/include/mach/bfin_serial_5xx.h | 6 +- .../mach-bf527/include/mach/defBF52x_base.h | 27 + .../mach-bf527/include/mach/portmux.h | 4 + trunk/arch/blackfin/mach-bf533/boards/H8606.c | 34 +- trunk/arch/blackfin/mach-bf533/head.S | 3 + .../mach-bf533/include/mach/anomaly.h | 49 +- .../blackfin/mach-bf533/include/mach/bf533.h | 12 +- .../mach-bf533/include/mach/bfin_serial_5xx.h | 6 +- trunk/arch/blackfin/mach-bf537/boards/stamp.c | 85 +- trunk/arch/blackfin/mach-bf537/head.S | 3 + .../mach-bf537/include/mach/anomaly.h | 2 + .../blackfin/mach-bf537/include/mach/bf537.h | 12 +- .../mach-bf537/include/mach/bfin_serial_5xx.h | 6 +- .../blackfin/mach-bf548/boards/cm_bf548.c | 22 +- trunk/arch/blackfin/mach-bf548/boards/ezkit.c | 58 +- trunk/arch/blackfin/mach-bf548/head.S | 52 +- .../mach-bf548/include/mach/anomaly.h | 93 +- .../blackfin/mach-bf548/include/mach/bf548.h | 25 +- .../mach-bf548/include/mach/bfin_serial_5xx.h | 6 +- .../mach-bf548/include/mach/mem_map.h | 14 +- trunk/arch/blackfin/mach-bf561/head.S | 3 + .../mach-bf561/include/mach/anomaly.h | 2 + .../blackfin/mach-bf561/include/mach/bf561.h | 8 +- .../mach-bf561/include/mach/bfin_serial_5xx.h | 6 +- .../mach-bf561/include/mach/mem_map.h | 18 +- trunk/arch/blackfin/mach-common/entry.S | 219 +- trunk/arch/blackfin/mach-common/head.S | 52 +- trunk/arch/blackfin/mach-common/interrupt.S | 11 +- .../arch/blackfin/mach-common/ints-priority.c | 25 +- trunk/arch/blackfin/mm/Makefile | 2 +- trunk/arch/blackfin/mm/isram-driver.c | 201 ++ .../mm/{blackfin_sram.c => sram-alloc.c} | 31 +- trunk/arch/cris/arch-v10/boot/tools/build.c | 1 - trunk/arch/h8300/Kconfig | 3 - trunk/arch/h8300/include/asm/a.out.h | 20 - trunk/arch/h8300/kernel/process.c | 1 - trunk/arch/ia64/include/asm/a.out.h | 32 - trunk/arch/ia64/include/asm/siginfo.h | 5 - trunk/arch/ia64/include/asm/statfs.h | 52 +- trunk/arch/ia64/mm/init.c | 1 - trunk/arch/m32r/Kconfig | 3 - trunk/arch/m68k/Kconfig | 4 +- trunk/arch/m68knommu/Kconfig | 3 - trunk/arch/m68knommu/include/asm/a.out.h | 1 - trunk/arch/m68knommu/kernel/process.c | 1 - trunk/arch/m68knommu/kernel/traps.c | 1 - trunk/arch/mips/include/asm/a.out.h | 35 - trunk/arch/mips/kernel/process.c | 1 - trunk/arch/mips/kernel/syscall.c | 1 - trunk/arch/mn10300/Kconfig | 3 - trunk/arch/parisc/Kconfig | 3 - trunk/arch/powerpc/include/asm/a.out.h | 20 - trunk/arch/powerpc/include/asm/siginfo.h | 5 - trunk/arch/powerpc/include/asm/statfs.h | 54 - trunk/arch/powerpc/kernel/softemu8xx.c | 1 - trunk/arch/powerpc/kernel/traps.c | 1 - .../arch/powerpc/platforms/cell/spufs/inode.c | 2 +- trunk/arch/powerpc/platforms/chrp/setup.c | 1 - trunk/arch/powerpc/platforms/maple/setup.c | 1 - trunk/arch/powerpc/platforms/powermac/setup.c | 1 - trunk/arch/powerpc/platforms/pseries/setup.c | 1 - trunk/arch/s390/hypfs/inode.c | 2 +- trunk/arch/s390/include/asm/statfs.h | 11 +- trunk/arch/sparc/Kconfig | 26 +- trunk/arch/sparc/include/asm/Kbuild | 4 - trunk/arch/sparc/include/asm/asmmacro.h | 5 - trunk/arch/sparc/include/asm/bpp.h | 73 - trunk/arch/sparc/include/asm/bugs.h | 7 - trunk/arch/sparc/include/asm/cpudata_64.h | 1 - trunk/arch/sparc/include/asm/dma-mapping_32.h | 59 +- trunk/arch/sparc/include/asm/dma.h | 141 +- trunk/arch/sparc/include/asm/dma_32.h | 288 --- trunk/arch/sparc/include/asm/dma_64.h | 205 -- trunk/arch/sparc/include/asm/ebus.h | 8 - trunk/arch/sparc/include/asm/ebus_32.h | 99 - trunk/arch/sparc/include/asm/ebus_64.h | 95 - trunk/arch/sparc/include/asm/ebus_dma.h | 35 + trunk/arch/sparc/include/asm/elf_32.h | 7 +- trunk/arch/sparc/include/asm/fhc.h | 43 +- trunk/arch/sparc/include/asm/floppy_32.h | 16 +- trunk/arch/sparc/include/asm/floppy_64.h | 130 +- trunk/arch/sparc/include/asm/gpio.h | 36 + trunk/arch/sparc/include/asm/io-unit.h | 4 - trunk/arch/sparc/include/asm/io_32.h | 19 +- trunk/arch/sparc/include/asm/io_64.h | 22 +- trunk/arch/sparc/include/asm/iommu_64.h | 3 + trunk/arch/sparc/include/asm/irq_64.h | 1 - trunk/arch/sparc/include/asm/mc146818rtc_64.h | 10 +- trunk/arch/sparc/include/asm/memctrl.h | 9 + trunk/arch/sparc/include/asm/mostek.h | 8 - trunk/arch/sparc/include/asm/mostek_32.h | 171 -- trunk/arch/sparc/include/asm/mostek_64.h | 143 -- trunk/arch/sparc/include/asm/obio.h | 11 - trunk/arch/sparc/include/asm/of_device.h | 2 + trunk/arch/sparc/include/asm/of_platform.h | 3 - trunk/arch/sparc/include/asm/oplib_32.h | 1 - trunk/arch/sparc/include/asm/page_32.h | 5 +- trunk/arch/sparc/include/asm/page_64.h | 2 + trunk/arch/sparc/include/asm/parport.h | 4 +- trunk/arch/sparc/include/asm/pci_32.h | 2 + trunk/arch/sparc/include/asm/pgtable_32.h | 4 - trunk/arch/sparc/include/asm/pgtable_64.h | 2 + trunk/arch/sparc/include/asm/prom.h | 12 + trunk/arch/sparc/include/asm/ptrace_64.h | 3 + trunk/arch/sparc/include/asm/reboot.h | 6 - trunk/arch/sparc/include/asm/rtc.h | 26 - trunk/arch/sparc/include/asm/sbus.h | 8 - trunk/arch/sparc/include/asm/sbus_32.h | 153 -- trunk/arch/sparc/include/asm/sbus_64.h | 190 -- trunk/arch/sparc/include/asm/serial.h | 6 + trunk/arch/sparc/include/asm/spinlock_32.h | 2 - trunk/arch/sparc/include/asm/spinlock_64.h | 2 - trunk/arch/sparc/include/asm/sstate.h | 13 - trunk/arch/sparc/include/asm/starfire.h | 1 - trunk/arch/sparc/include/asm/statfs.h | 8 +- trunk/arch/sparc/include/asm/statfs_32.h | 6 - trunk/arch/sparc/include/asm/statfs_64.h | 54 - trunk/arch/sparc/include/asm/sun4paddr.h | 56 - trunk/arch/sparc/include/asm/sun4prom.h | 83 - trunk/arch/sparc/include/asm/system_32.h | 9 +- trunk/arch/sparc/include/asm/system_64.h | 6 +- trunk/arch/sparc/include/asm/thread_info_32.h | 4 - trunk/arch/sparc/include/asm/timer_32.h | 87 - trunk/arch/sparc/include/asm/vac-ops.h | 7 - trunk/arch/sparc/include/asm/vfc_ioctls.h | 58 - trunk/arch/sparc/include/asm/visasm.h | 1 + trunk/arch/sparc/kernel/Makefile | 4 +- trunk/arch/sparc/kernel/apc.c | 72 +- trunk/arch/sparc/kernel/auxio.c | 6 +- trunk/arch/sparc/kernel/devices.c | 2 +- trunk/arch/sparc/kernel/dma.c | 227 ++ trunk/arch/sparc/kernel/dma.h | 14 + trunk/arch/sparc/kernel/ebus.c | 393 ---- trunk/arch/sparc/kernel/entry.S | 94 +- trunk/arch/sparc/kernel/head.S | 28 +- trunk/arch/sparc/kernel/idprom.c | 7 - trunk/arch/sparc/kernel/ioport.c | 227 +- trunk/arch/sparc/kernel/irq.h | 6 - trunk/arch/sparc/kernel/of_device.c | 74 +- trunk/arch/sparc/kernel/pcic.c | 15 +- trunk/arch/sparc/kernel/pmc.c | 59 +- trunk/arch/sparc/kernel/process.c | 2 +- trunk/arch/sparc/kernel/prom.c | 7 +- trunk/arch/sparc/kernel/setup.c | 32 +- trunk/arch/sparc/kernel/sparc_ksyms.c | 25 - trunk/arch/sparc/kernel/sun4c_irq.c | 156 +- trunk/arch/sparc/kernel/sun4d_irq.c | 286 +-- trunk/arch/sparc/kernel/sun4d_smp.c | 13 +- trunk/arch/sparc/kernel/sun4m_irq.c | 495 +++-- trunk/arch/sparc/kernel/sun4m_smp.c | 5 +- trunk/arch/sparc/kernel/sun4setup.c | 75 - trunk/arch/sparc/kernel/sys_sparc.c | 8 +- trunk/arch/sparc/kernel/tick14.c | 47 - trunk/arch/sparc/kernel/time.c | 382 +--- trunk/arch/sparc/kernel/traps.c | 17 - trunk/arch/sparc/mm/Makefile | 9 +- trunk/arch/sparc/mm/btfixup.c | 6 +- trunk/arch/sparc/mm/fault.c | 2 +- trunk/arch/sparc/mm/init.c | 14 +- trunk/arch/sparc/mm/io-unit.c | 136 +- trunk/arch/sparc/mm/iommu.c | 113 +- trunk/arch/sparc/mm/nosrmmu.c | 59 - trunk/arch/sparc/mm/srmmu.c | 1 - trunk/arch/sparc/mm/sun4c.c | 204 +- trunk/arch/sparc/prom/Makefile | 2 - trunk/arch/sparc/prom/bootstr.c | 4 - trunk/arch/sparc/prom/console.c | 3 - trunk/arch/sparc/prom/init.c | 12 - trunk/arch/sparc/prom/memory.c | 14 - trunk/arch/sparc/prom/ranges.c | 1 - trunk/arch/sparc/prom/sun4prom.c | 161 -- trunk/arch/sparc64/Kconfig | 23 + trunk/arch/sparc64/Makefile | 2 +- trunk/arch/sparc64/kernel/Makefile | 9 +- trunk/arch/sparc64/kernel/auxio.c | 2 +- trunk/arch/sparc64/kernel/central.c | 617 ++---- trunk/arch/sparc64/kernel/chmc.c | 817 +++++-- trunk/arch/sparc64/kernel/cpu.c | 208 +- trunk/arch/sparc64/kernel/ds.c | 4 +- trunk/arch/sparc64/kernel/ebus.c | 299 +-- trunk/arch/sparc64/kernel/entry.h | 7 +- trunk/arch/sparc64/kernel/head.S | 1 + trunk/arch/sparc64/kernel/hvapi.c | 3 - trunk/arch/sparc64/kernel/hvcalls.S | 354 +-- trunk/arch/sparc64/kernel/irq.c | 1 - trunk/arch/sparc64/kernel/of_device.c | 62 +- trunk/arch/sparc64/kernel/pci.c | 172 +- trunk/arch/sparc64/kernel/pci_common.c | 8 +- trunk/arch/sparc64/kernel/pci_fire.c | 254 +-- trunk/arch/sparc64/kernel/pci_impl.h | 27 +- trunk/arch/sparc64/kernel/pci_msi.c | 18 +- trunk/arch/sparc64/kernel/pci_psycho.c | 750 ++----- trunk/arch/sparc64/kernel/pci_sabre.c | 507 ++--- trunk/arch/sparc64/kernel/pci_schizo.c | 368 +-- trunk/arch/sparc64/kernel/pci_sun4v.c | 197 +- trunk/arch/sparc64/kernel/pci_sun4v_asm.S | 99 +- trunk/arch/sparc64/kernel/power.c | 55 +- trunk/arch/sparc64/kernel/process.c | 35 - trunk/arch/sparc64/kernel/prom.c | 91 +- trunk/arch/sparc64/kernel/psycho_common.c | 470 ++++ trunk/arch/sparc64/kernel/psycho_common.h | 48 + trunk/arch/sparc64/kernel/ptrace.c | 38 +- trunk/arch/sparc64/kernel/reboot.c | 53 + trunk/arch/sparc64/kernel/sbus.c | 166 +- trunk/arch/sparc64/kernel/smp.c | 4 + trunk/arch/sparc64/kernel/sparc64_ksyms.c | 23 +- trunk/arch/sparc64/kernel/sstate.c | 67 +- trunk/arch/sparc64/kernel/starfire.c | 5 - trunk/arch/sparc64/kernel/sys_sparc32.c | 8 - trunk/arch/sparc64/kernel/syscalls.S | 20 +- trunk/arch/sparc64/kernel/systbls.S | 2 +- trunk/arch/sparc64/kernel/time.c | 1187 ++-------- trunk/arch/sparc64/kernel/traps.c | 69 +- trunk/arch/sparc64/kernel/vio.c | 8 +- trunk/arch/sparc64/kernel/visemul.c | 12 +- trunk/arch/sparc64/mm/fault.c | 37 - trunk/arch/sparc64/mm/init.c | 84 +- trunk/arch/sparc64/mm/init.h | 49 + trunk/arch/sparc64/mm/tlb.c | 2 +- trunk/arch/um/Kconfig.i386 | 8 +- trunk/arch/um/Kconfig.x86_64 | 3 - trunk/arch/um/drivers/line.c | 2 + trunk/arch/x86/Kconfig | 96 +- trunk/arch/x86/Kconfig.cpu | 93 +- trunk/arch/x86/Kconfig.debug | 13 + trunk/arch/x86/Makefile_32.cpu | 6 +- trunk/arch/x86/boot/Makefile | 5 +- trunk/arch/x86/boot/compressed/Makefile | 8 +- trunk/arch/x86/boot/edd.c | 7 +- trunk/arch/x86/boot/video-vesa.c | 2 +- trunk/arch/x86/configs/i386_defconfig | 2 - trunk/arch/x86/configs/x86_64_defconfig | 2 - trunk/arch/x86/ia32/ia32_signal.c | 68 +- trunk/arch/x86/ia32/ia32entry.S | 26 +- trunk/arch/x86/kernel/Makefile | 12 +- trunk/arch/x86/kernel/acpi/boot.c | 12 +- trunk/arch/x86/kernel/alternative.c | 2 +- trunk/arch/x86/kernel/amd_iommu_init.c | 4 +- trunk/arch/x86/kernel/apic_32.c | 4 + trunk/arch/x86/kernel/apic_64.c | 4 + trunk/arch/x86/kernel/cpu/common.c | 56 +- trunk/arch/x86/kernel/doublefault_32.c | 2 +- trunk/arch/x86/kernel/dumpstack_32.c | 447 ++++ trunk/arch/x86/kernel/dumpstack_64.c | 573 +++++ trunk/arch/x86/kernel/early-quirks.c | 48 + trunk/arch/x86/kernel/early_printk.c | 748 ++++++- trunk/arch/x86/kernel/entry_32.S | 22 +- trunk/arch/x86/kernel/entry_64.S | 15 +- trunk/arch/x86/kernel/es7000_32.c | 28 +- trunk/arch/x86/kernel/genx2apic_uv_x.c | 23 +- trunk/arch/x86/kernel/head.c | 1 + trunk/arch/x86/kernel/hpet.c | 6 +- trunk/arch/x86/kernel/i387.c | 14 + trunk/arch/x86/kernel/io_apic_64.c | 4 +- trunk/arch/x86/kernel/irqinit_64.c | 43 +- trunk/arch/x86/kernel/ldt.c | 9 +- trunk/arch/x86/kernel/microcode.c | 853 ------- trunk/arch/x86/kernel/microcode_amd.c | 435 ++++ trunk/arch/x86/kernel/microcode_core.c | 508 +++++ trunk/arch/x86/kernel/microcode_intel.c | 480 ++++ trunk/arch/x86/kernel/paravirt-spinlocks.c | 37 + trunk/arch/x86/kernel/paravirt.c | 27 +- trunk/arch/x86/kernel/process_32.c | 43 +- trunk/arch/x86/kernel/process_64.c | 33 +- trunk/arch/x86/kernel/ptrace.c | 44 +- trunk/arch/x86/kernel/quirks.c | 41 +- trunk/arch/x86/kernel/setup.c | 206 +- trunk/arch/x86/kernel/signal_32.c | 222 +- trunk/arch/x86/kernel/signal_64.c | 207 +- trunk/arch/x86/kernel/smp.c | 6 +- trunk/arch/x86/kernel/smpboot.c | 164 +- trunk/arch/x86/kernel/time_32.c | 7 +- trunk/arch/x86/kernel/time_64.c | 23 +- trunk/arch/x86/kernel/tlb_32.c | 8 + trunk/arch/x86/kernel/{traps_32.c => traps.c} | 895 +++----- trunk/arch/x86/kernel/traps_64.c | 1214 ---------- trunk/arch/x86/kernel/vmlinux_64.lds.S | 2 +- trunk/arch/x86/kernel/xsave.c | 33 +- trunk/arch/x86/mach-generic/es7000.c | 20 +- trunk/arch/x86/mm/Makefile | 6 +- trunk/arch/x86/mm/fault.c | 19 +- trunk/arch/x86/mm/gup.c | 10 +- trunk/arch/x86/mm/init_32.c | 5 +- trunk/arch/x86/mm/init_64.c | 12 +- trunk/arch/x86/mm/ioremap.c | 170 +- .../arch/x86/mm/{discontig_32.c => numa_32.c} | 0 trunk/arch/x86/mm/srat_64.c | 2 +- trunk/arch/x86/oprofile/Makefile | 2 +- trunk/arch/x86/oprofile/nmi_int.c | 27 +- trunk/arch/x86/oprofile/op_model_amd.c | 543 +++++ trunk/arch/x86/oprofile/op_model_athlon.c | 190 -- trunk/arch/x86/oprofile/op_x86_model.h | 4 +- trunk/arch/x86/pci/fixup.c | 28 + trunk/arch/x86/xen/Kconfig | 12 +- trunk/arch/x86/xen/Makefile | 12 +- trunk/arch/x86/xen/debugfs.c | 123 ++ trunk/arch/x86/xen/debugfs.h | 10 + trunk/arch/x86/xen/enlighten.c | 252 +-- trunk/arch/x86/xen/irq.c | 143 ++ trunk/arch/x86/xen/mmu.c | 314 ++- trunk/arch/x86/xen/mmu.h | 3 - trunk/arch/x86/xen/multicalls.c | 115 +- trunk/arch/x86/xen/smp.c | 245 +- trunk/arch/x86/xen/spinlock.c | 428 ++++ trunk/arch/x86/xen/time.c | 12 +- trunk/arch/x86/xen/xen-asm_32.S | 2 +- trunk/arch/x86/xen/xen-asm_64.S | 22 +- trunk/arch/x86/xen/xen-ops.h | 8 + trunk/drivers/acpi/Kconfig | 2 +- trunk/drivers/acpi/glue.c | 3 +- trunk/drivers/ata/Kconfig | 1 - trunk/drivers/atm/fore200e.c | 410 ++-- trunk/drivers/atm/fore200e.h | 7 +- trunk/drivers/block/sunvdc.c | 4 +- trunk/drivers/block/xen-blkfront.c | 2 +- trunk/drivers/bluetooth/hci_ldisc.c | 2 +- trunk/drivers/char/Kconfig | 4 +- trunk/drivers/char/Makefile | 2 +- trunk/drivers/char/amiserial.c | 6 - trunk/drivers/char/applicom.c | 6 +- trunk/drivers/char/cyclades.c | 21 +- trunk/drivers/char/epca.c | 5 +- trunk/drivers/char/generic_serial.c | 21 - trunk/drivers/char/hpet.c | 159 +- trunk/drivers/char/hvc_console.c | 4 +- trunk/drivers/char/hvc_xen.c | 6 +- trunk/drivers/char/hw_random/n2-drv.c | 2 +- trunk/drivers/char/ip2/Makefile | 2 +- trunk/drivers/char/ip2/i2ellis.c | 32 - trunk/drivers/char/ip2/i2ellis.h | 2 - trunk/drivers/char/ip2/ip2base.c | 108 - trunk/drivers/char/ip2/ip2main.c | 550 ++--- trunk/drivers/char/isicom.c | 61 +- trunk/drivers/char/istallion.c | 113 +- trunk/drivers/char/moxa.c | 61 +- trunk/drivers/char/mxser.c | 193 +- trunk/drivers/char/n_hdlc.c | 2 +- trunk/drivers/char/n_r3964.c | 8 +- trunk/drivers/char/n_tty.c | 125 +- trunk/drivers/char/nozomi.c | 5 +- trunk/drivers/char/pcmcia/ipwireless/tty.c | 19 +- trunk/drivers/char/pty.c | 335 ++- trunk/drivers/char/rtc.c | 30 +- trunk/drivers/char/stallion.c | 139 +- trunk/drivers/char/sx.c | 4 +- trunk/drivers/char/tpm/tpm.c | 96 +- trunk/drivers/char/tpm/tpm.h | 3 +- trunk/drivers/char/tpm/tpm_tis.c | 14 +- trunk/drivers/char/tty_audit.c | 2 +- trunk/drivers/char/tty_buffer.c | 511 +++++ trunk/drivers/char/tty_io.c | 1380 ++++-------- trunk/drivers/char/tty_ioctl.c | 212 +- trunk/drivers/char/tty_port.c | 96 + trunk/drivers/char/vt.c | 84 +- trunk/drivers/char/vt_ioctl.c | 2 + trunk/drivers/hwmon/Kconfig | 7 + trunk/drivers/hwmon/Makefile | 1 + trunk/drivers/hwmon/ultra45_env.c | 320 +++ trunk/drivers/infiniband/ulp/srp/ib_srp.c | 2 +- trunk/drivers/input/misc/sparcspkr.c | 4 +- trunk/drivers/input/serio/i8042-sparcio.h | 2 +- trunk/drivers/input/xen-kbdfront.c | 4 +- trunk/drivers/isdn/capi/capi.c | 2 +- trunk/drivers/isdn/gigaset/ser-gigaset.c | 27 +- trunk/drivers/leds/Kconfig | 8 + trunk/drivers/leds/Makefile | 1 + trunk/drivers/leds/leds-sunfire.c | 273 +++ trunk/drivers/media/video/cafe_ccic.c | 13 +- trunk/drivers/mmc/Kconfig | 9 +- trunk/drivers/mmc/card/Kconfig | 3 +- trunk/drivers/mmc/card/block.c | 46 +- trunk/drivers/mmc/card/queue.c | 23 +- trunk/drivers/mmc/core/mmc_ops.c | 8 +- trunk/drivers/mmc/core/sdio.c | 52 +- trunk/drivers/mmc/core/sdio_irq.c | 16 +- trunk/drivers/mmc/host/Kconfig | 30 +- trunk/drivers/mmc/host/atmel-mci-regs.h | 6 +- trunk/drivers/mmc/host/atmel-mci.c | 1352 ++++++++---- trunk/drivers/mmc/host/mmc_spi.c | 32 +- trunk/drivers/mmc/host/sdhci-pci.c | 5 +- trunk/drivers/mmc/host/sdhci.c | 46 +- trunk/drivers/mmc/host/sdhci.h | 2 + trunk/drivers/mtd/maps/sun_uflash.c | 75 +- trunk/drivers/mtd/nand/cafe_nand.c | 6 +- trunk/drivers/net/au1000_eth.c | 27 +- trunk/drivers/net/bfin_mac.c | 26 +- trunk/drivers/net/e1000/e1000_main.c | 5 + trunk/drivers/net/jme.c | 1 - trunk/drivers/net/myri_sbus.c | 196 +- trunk/drivers/net/myri_sbus.h | 2 +- trunk/drivers/net/niu.c | 2 +- trunk/drivers/net/qlge/qlge_ethtool.c | 1 - trunk/drivers/net/qlge/qlge_main.c | 1 - trunk/drivers/net/r8169.c | 3 +- trunk/drivers/net/sky2.c | 19 +- trunk/drivers/net/smc911x.c | 9 +- trunk/drivers/net/smc911x.h | 14 +- trunk/drivers/net/sunbmac.c | 204 +- trunk/drivers/net/sunbmac.h | 4 +- trunk/drivers/net/sunhme.c | 322 ++- trunk/drivers/net/sunhme.h | 7 +- trunk/drivers/net/sunlance.c | 180 +- trunk/drivers/net/sunqe.c | 162 +- trunk/drivers/net/sunqe.h | 4 +- trunk/drivers/net/sunvnet.c | 4 +- trunk/drivers/net/tc35815.c | 2 +- trunk/drivers/net/wan/Kconfig | 2 +- trunk/drivers/net/xen-netfront.c | 6 +- trunk/drivers/oprofile/buffer_sync.c | 209 +- trunk/drivers/oprofile/cpu_buffer.c | 74 +- trunk/drivers/oprofile/cpu_buffer.h | 2 + trunk/drivers/parport/parport_sunbpp.c | 49 +- trunk/drivers/power/Kconfig | 2 +- trunk/drivers/rtc/Kconfig | 32 +- trunk/drivers/rtc/Makefile | 3 + trunk/drivers/rtc/rtc-bq4802.c | 230 ++ trunk/drivers/rtc/rtc-cmos.c | 5 +- trunk/drivers/rtc/rtc-m48t59.c | 68 +- trunk/drivers/rtc/rtc-starfire.c | 120 + trunk/drivers/rtc/rtc-sun4v.c | 153 ++ trunk/drivers/s390/char/fs3270.c | 17 +- trunk/drivers/sbus/Makefile | 4 - trunk/drivers/sbus/char/Kconfig | 29 +- trunk/drivers/sbus/char/Makefile | 6 - trunk/drivers/sbus/char/bbc_envctrl.c | 121 +- trunk/drivers/sbus/char/bbc_i2c.c | 267 +-- trunk/drivers/sbus/char/bbc_i2c.h | 75 +- trunk/drivers/sbus/char/bpp.c | 1055 --------- trunk/drivers/sbus/char/cpwatchdog.c | 858 ------- trunk/drivers/sbus/char/display7seg.c | 251 ++- trunk/drivers/sbus/char/envctrl.c | 147 +- trunk/drivers/sbus/char/flash.c | 130 +- trunk/drivers/sbus/char/rtc.c | 275 --- trunk/drivers/sbus/char/uctrl.c | 216 +- trunk/drivers/sbus/char/vfc.h | 171 -- trunk/drivers/sbus/char/vfc_dev.c | 736 ------ trunk/drivers/sbus/char/vfc_i2c.c | 335 --- trunk/drivers/sbus/char/vfc_i2c.h | 44 - trunk/drivers/sbus/dvma.c | 136 -- trunk/drivers/sbus/sbus.c | 316 --- trunk/drivers/scsi/esp_scsi.h | 3 +- trunk/drivers/scsi/qlogicpti.c | 146 +- trunk/drivers/scsi/qlogicpti.h | 2 +- trunk/drivers/scsi/sun_esp.c | 267 +-- trunk/drivers/serial/8250.c | 52 +- trunk/drivers/serial/8250_pci.c | 4 +- trunk/drivers/serial/Kconfig | 17 +- trunk/drivers/serial/Makefile | 16 +- trunk/drivers/serial/bfin_5xx.c | 123 +- trunk/drivers/serial/crisv10.c | 5 +- trunk/drivers/serial/mcfserial.c | 1965 ----------------- trunk/drivers/serial/mcfserial.h | 74 - trunk/drivers/serial/serial_core.c | 12 +- trunk/drivers/serial/sunhv.c | 2 +- trunk/drivers/serial/sunsab.c | 2 +- trunk/drivers/serial/sunsu.c | 2 +- trunk/drivers/serial/sunzilog.c | 2 +- trunk/drivers/usb/core/inode.c | 2 +- trunk/drivers/usb/host/ehci.h | 138 +- trunk/drivers/usb/serial/aircable.c | 15 +- trunk/drivers/usb/serial/belkin_sa.c | 3 +- trunk/drivers/usb/serial/console.c | 8 +- trunk/drivers/usb/serial/cyberjack.c | 3 +- trunk/drivers/usb/serial/cypress_m8.c | 5 +- trunk/drivers/usb/serial/digi_acceleport.c | 19 +- trunk/drivers/usb/serial/empeg.c | 8 +- trunk/drivers/usb/serial/ftdi_sio.c | 25 +- trunk/drivers/usb/serial/garmin_gps.c | 3 +- trunk/drivers/usb/serial/generic.c | 3 +- trunk/drivers/usb/serial/io_edgeport.c | 43 +- trunk/drivers/usb/serial/io_ti.c | 26 +- trunk/drivers/usb/serial/ipaq.c | 3 +- trunk/drivers/usb/serial/ipw.c | 3 +- trunk/drivers/usb/serial/ir-usb.c | 3 +- trunk/drivers/usb/serial/iuu_phoenix.c | 3 +- trunk/drivers/usb/serial/keyspan.c | 77 +- trunk/drivers/usb/serial/keyspan_pda.c | 16 +- trunk/drivers/usb/serial/kl5kusb105.c | 3 +- trunk/drivers/usb/serial/kobil_sct.c | 3 +- trunk/drivers/usb/serial/mct_u232.c | 6 +- trunk/drivers/usb/serial/mos7720.c | 36 +- trunk/drivers/usb/serial/mos7840.c | 7 +- trunk/drivers/usb/serial/navman.c | 3 +- trunk/drivers/usb/serial/omninet.c | 10 +- trunk/drivers/usb/serial/option.c | 18 +- trunk/drivers/usb/serial/oti6858.c | 7 +- trunk/drivers/usb/serial/pl2303.c | 15 +- trunk/drivers/usb/serial/safe_serial.c | 11 +- trunk/drivers/usb/serial/sierra.c | 16 +- trunk/drivers/usb/serial/spcp8x5.c | 3 +- trunk/drivers/usb/serial/ti_usb_3410_5052.c | 44 +- trunk/drivers/usb/serial/usb-serial.c | 24 +- trunk/drivers/usb/serial/visor.c | 18 +- trunk/drivers/usb/serial/whiteheat.c | 8 +- trunk/drivers/video/Kconfig | 2 - trunk/drivers/video/backlight/mbp_nvidia_bl.c | 4 +- trunk/drivers/video/bw2.c | 2 +- trunk/drivers/video/cg14.c | 2 +- trunk/drivers/video/cg3.c | 2 +- trunk/drivers/video/cg6.c | 38 +- trunk/drivers/video/console/Kconfig | 16 - trunk/drivers/video/ffb.c | 2 +- trunk/drivers/video/leo.c | 96 +- trunk/drivers/video/p9100.c | 2 +- trunk/drivers/video/tcx.c | 2 +- trunk/drivers/video/xen-fbfront.c | 4 +- trunk/drivers/watchdog/Kconfig | 43 + trunk/drivers/watchdog/Makefile | 7 + trunk/drivers/watchdog/at91sam9_wdt.c | 328 +++ trunk/drivers/watchdog/cpwd.c | 695 ++++++ trunk/drivers/watchdog/it87_wdt.c | 725 ++++++ trunk/drivers/watchdog/omap_wdt.c | 337 ++- trunk/drivers/watchdog/omap_wdt.h | 28 +- trunk/drivers/watchdog/orion5x_wdt.c | 245 ++ .../char/riowatchdog.c => watchdog/riowd.c} | 236 +- trunk/drivers/watchdog/w83697ug_wdt.c | 392 ++++ trunk/drivers/xen/Makefile | 1 + trunk/drivers/xen/balloon.c | 175 +- trunk/drivers/xen/cpu_hotplug.c | 90 + trunk/drivers/xen/events.c | 40 +- trunk/drivers/xen/grant-table.c | 2 +- trunk/drivers/xen/xenbus/xenbus_probe.c | 8 +- trunk/fs/9p/v9fs.c | 2 +- trunk/fs/Kconfig | 4 +- trunk/fs/Kconfig.binfmt | 6 +- trunk/fs/adfs/super.c | 2 +- trunk/fs/affs/super.c | 2 +- trunk/fs/afs/super.c | 2 +- trunk/fs/autofs/inode.c | 2 +- trunk/fs/autofs4/inode.c | 2 +- trunk/fs/befs/linuxvfs.c | 2 +- trunk/fs/cifs/misc.c | 2 - trunk/fs/debugfs/inode.c | 3 +- trunk/fs/devpts/inode.c | 68 +- trunk/fs/dquot.c | 6 +- trunk/fs/ecryptfs/main.c | 2 +- trunk/fs/efs/super.c | 2 - trunk/fs/ext2/super.c | 2 +- trunk/fs/ext3/super.c | 2 +- trunk/fs/ext4/ext4.h | 2 + trunk/fs/ext4/ioctl.c | 12 +- trunk/fs/ext4/super.c | 43 +- trunk/fs/fat/inode.c | 6 +- trunk/fs/fuse/inode.c | 2 +- trunk/fs/gfs2/mount.c | 2 +- trunk/fs/hfs/super.c | 2 +- trunk/fs/hfsplus/options.c | 2 +- trunk/fs/hpfs/super.c | 2 +- trunk/fs/hugetlbfs/inode.c | 2 +- trunk/fs/ioctl.c | 4 + trunk/fs/isofs/inode.c | 2 +- trunk/fs/jbd2/checkpoint.c | 49 +- trunk/fs/jbd2/commit.c | 10 +- trunk/fs/jbd2/journal.c | 28 +- trunk/fs/jbd2/recovery.c | 7 +- trunk/fs/jfs/super.c | 2 +- trunk/fs/nfs/nfsroot.c | 2 +- trunk/fs/nfs/super.c | 6 +- trunk/fs/ocfs2/super.c | 2 +- trunk/fs/omfs/inode.c | 2 +- trunk/fs/open.c | 3 +- trunk/fs/proc/Kconfig | 10 + trunk/fs/proc/array.c | 7 - trunk/fs/proc/base.c | 21 +- trunk/fs/proc/inode.c | 2 +- trunk/fs/proc/internal.h | 2 - trunk/fs/proc/proc_misc.c | 1 - trunk/fs/proc/proc_sysctl.c | 6 +- trunk/fs/proc/task_mmu.c | 16 +- trunk/fs/proc/task_nommu.c | 5 - trunk/fs/proc/vmcore.c | 6 - trunk/fs/ubifs/super.c | 2 +- trunk/fs/udf/super.c | 2 +- trunk/fs/ufs/super.c | 4 +- trunk/fs/xfs/linux-2.6/xfs_super.c | 2 +- trunk/include/asm-cris/a.out.h | 26 - trunk/include/asm-generic/siginfo.h | 2 + trunk/include/asm-generic/statfs.h | 65 +- trunk/include/asm-m32r/a.out.h | 20 - trunk/include/asm-parisc/a.out.h | 20 - trunk/include/asm-parisc/siginfo.h | 5 - trunk/include/asm-parisc/statfs.h | 55 +- trunk/include/asm-x86/bios_ebda.h | 17 + trunk/include/asm-x86/boot.h | 2 - trunk/include/asm-x86/desc.h | 29 +- trunk/include/asm-x86/es7000/mpparse.h | 1 + trunk/include/asm-x86/fixmap_32.h | 4 +- trunk/include/asm-x86/fixmap_64.h | 12 +- trunk/include/asm-x86/io.h | 15 +- trunk/include/asm-x86/io_64.h | 3 - trunk/include/asm-x86/ioctls.h | 6 + trunk/include/asm-x86/irqflags.h | 21 - trunk/include/asm-x86/kdebug.h | 3 +- trunk/include/asm-x86/kprobes.h | 9 - .../include/asm-x86/mach-default/mach_traps.h | 6 - trunk/include/asm-x86/microcode.h | 47 + trunk/include/asm-x86/mmzone_64.h | 3 +- trunk/include/asm-x86/module.h | 2 - trunk/include/asm-x86/nmi.h | 4 - trunk/include/asm-x86/page.h | 8 +- trunk/include/asm-x86/page_32.h | 13 +- trunk/include/asm-x86/paravirt.h | 20 + trunk/include/asm-x86/pgtable.h | 16 +- trunk/include/asm-x86/processor.h | 35 - trunk/include/asm-x86/ptrace.h | 6 +- trunk/include/asm-x86/segment.h | 6 - trunk/include/asm-x86/smp.h | 40 +- trunk/include/asm-x86/spinlock.h | 67 +- trunk/include/asm-x86/statfs.h | 61 +- trunk/include/asm-x86/system.h | 5 +- trunk/include/asm-x86/tlbflush.h | 10 + trunk/include/asm-x86/traps.h | 85 +- trunk/include/asm-x86/xen/hypervisor.h | 14 +- trunk/include/asm-xtensa/a.out.h | 29 - trunk/include/linux/devpts_fs.h | 31 +- trunk/include/linux/dmi.h | 41 +- trunk/include/linux/elf.h | 1 + trunk/include/linux/hpet.h | 14 +- trunk/include/linux/jbd2.h | 5 +- trunk/include/linux/kernel.h | 2 +- trunk/include/linux/key.h | 1 + trunk/include/linux/magic.h | 4 + trunk/include/linux/mm.h | 13 +- trunk/include/linux/mm_types.h | 10 +- trunk/include/linux/mmc/host.h | 2 +- trunk/include/linux/mmdebug.h | 18 + trunk/include/linux/mod_devicetable.h | 47 + trunk/include/linux/oprofile.h | 2 + trunk/include/linux/parser.h | 2 +- trunk/include/linux/pci_ids.h | 4 +- trunk/include/linux/rtc/m48t59.h | 47 +- trunk/include/linux/sched.h | 6 +- trunk/include/linux/serial.h | 16 + trunk/include/linux/serial_core.h | 2 +- trunk/include/linux/termios.h | 15 + trunk/include/linux/tty.h | 45 +- trunk/include/linux/tty_driver.h | 56 +- trunk/include/linux/usb/ehci_def.h | 160 ++ trunk/include/linux/vt_kern.h | 2 +- trunk/include/net/cipso_ipv4.h | 55 +- trunk/include/net/netlabel.h | 51 +- trunk/include/sound/core.h | 3 - trunk/include/sound/memalloc.h | 2 - trunk/include/sound/soc-dapm.h | 1 + trunk/include/xen/balloon.h | 61 - trunk/include/xen/events.h | 2 + trunk/init/Kconfig | 10 - trunk/kernel/acct.c | 2 +- trunk/kernel/auditsc.c | 9 +- trunk/kernel/fork.c | 5 +- trunk/kernel/printk.c | 16 - trunk/kernel/sched_debug.c | 2 - trunk/kernel/sys.c | 4 +- trunk/kernel/sysctl.c | 19 +- trunk/lib/Kconfig.debug | 9 + trunk/lib/cmdline.c | 2 +- trunk/lib/parser.c | 2 +- trunk/mm/shmem.c | 4 +- trunk/mm/vmalloc.c | 7 + trunk/net/9p/client.c | 2 +- trunk/net/9p/trans_fd.c | 2 +- trunk/net/core/skb_dma_map.c | 2 +- trunk/net/ipv4/cipso_ipv4.c | 656 ++++-- trunk/net/ipv4/ip_gre.c | 2 +- trunk/net/ipv4/ip_options.c | 2 +- trunk/net/mac80211/rx.c | 5 +- trunk/net/netfilter/ipvs/Kconfig | 4 +- trunk/net/netfilter/nf_tproxy_core.c | 1 - trunk/net/netlabel/Makefile | 3 +- trunk/net/netlabel/netlabel_addrlist.c | 388 ++++ trunk/net/netlabel/netlabel_addrlist.h | 189 ++ trunk/net/netlabel/netlabel_cipso_v4.c | 136 +- trunk/net/netlabel/netlabel_cipso_v4.h | 10 +- trunk/net/netlabel/netlabel_domainhash.c | 393 +++- trunk/net/netlabel/netlabel_domainhash.h | 40 +- trunk/net/netlabel/netlabel_kapi.c | 272 ++- trunk/net/netlabel/netlabel_mgmt.c | 410 +++- trunk/net/netlabel/netlabel_mgmt.h | 59 +- trunk/net/netlabel/netlabel_unlabeled.c | 456 ++-- trunk/net/wireless/core.c | 1 - trunk/scripts/Kbuild.include | 4 +- trunk/scripts/mod/file2alias.c | 57 + trunk/security/inode.c | 3 +- trunk/security/selinux/hooks.c | 234 +- trunk/security/selinux/include/netlabel.h | 44 +- trunk/security/selinux/include/objsec.h | 9 +- trunk/security/selinux/netlabel.c | 280 ++- trunk/security/selinux/ss/services.c | 13 +- trunk/security/smack/smack_lsm.c | 5 +- trunk/security/smack/smackfs.c | 4 +- trunk/sound/core/memalloc.c | 48 +- trunk/sound/oss/ac97_codec.c | 2 +- trunk/sound/pci/ac97/ac97_patch.c | 2 +- trunk/sound/pci/hda/patch_sigmatel.c | 50 +- trunk/sound/soc/at91/Kconfig | 17 - trunk/sound/soc/at91/Makefile | 5 - trunk/sound/soc/at91/at91-ssc.c | 2 +- trunk/sound/soc/at91/eti_b1_wm8731.c | 349 --- trunk/sound/soc/blackfin/Kconfig | 16 + trunk/sound/soc/blackfin/Makefile | 3 +- trunk/sound/soc/blackfin/bf5xx-ac97-pcm.c | 42 +- trunk/sound/soc/blackfin/bf5xx-ac97.c | 1 - trunk/sound/soc/blackfin/bf5xx-ad73311.c | 240 ++ trunk/sound/soc/blackfin/bf5xx-i2s.c | 47 +- trunk/sound/soc/blackfin/bf5xx-sport.h | 2 + trunk/sound/soc/codecs/Kconfig | 11 +- trunk/sound/soc/codecs/Makefile | 4 + trunk/sound/soc/codecs/ac97.c | 3 +- trunk/sound/soc/codecs/ad1980.c | 1 - trunk/sound/soc/codecs/ad73311.c | 107 + trunk/sound/soc/codecs/ad73311.h | 90 + trunk/sound/soc/codecs/ak4535.c | 1 - trunk/sound/soc/codecs/ssm2602.c | 1 - trunk/sound/soc/codecs/tlv320aic23.c | 714 ++++++ trunk/sound/soc/codecs/tlv320aic23.h | 122 + trunk/sound/soc/codecs/tlv320aic3x.c | 5 +- trunk/sound/soc/codecs/uda1380.c | 1 - trunk/sound/soc/codecs/wm8510.c | 111 +- trunk/sound/soc/codecs/wm8510.h | 1 + trunk/sound/soc/codecs/wm8580.c | 2 - trunk/sound/soc/codecs/wm8731.c | 1 - trunk/sound/soc/codecs/wm8750.c | 1 - trunk/sound/soc/codecs/wm8753.c | 75 +- trunk/sound/soc/codecs/wm8753.h | 4 +- trunk/sound/soc/codecs/wm8900.c | 1 - trunk/sound/soc/codecs/wm8903.c | 4 +- trunk/sound/soc/codecs/wm8971.c | 1 - trunk/sound/soc/codecs/wm8990.c | 1 - trunk/sound/soc/codecs/wm9712.c | 3 +- trunk/sound/soc/codecs/wm9713.c | 3 +- trunk/sound/soc/omap/Kconfig | 8 + trunk/sound/soc/omap/Makefile | 2 + trunk/sound/soc/omap/n810.c | 6 +- trunk/sound/soc/omap/omap-mcbsp.c | 181 +- trunk/sound/soc/omap/omap-mcbsp.h | 16 +- trunk/sound/soc/omap/omap-pcm.c | 4 +- trunk/sound/soc/omap/osk5912.c | 232 ++ trunk/sound/soc/pxa/corgi.c | 6 +- trunk/sound/soc/pxa/em-x270.c | 2 +- trunk/sound/soc/pxa/poodle.c | 6 +- trunk/sound/soc/pxa/pxa2xx-i2s.c | 4 +- trunk/sound/soc/pxa/spitz.c | 16 +- trunk/sound/soc/pxa/tosa.c | 6 +- trunk/sound/soc/s3c24xx/neo1973_wm8753.c | 72 +- trunk/sound/soc/soc-core.c | 5 +- trunk/sound/soc/soc-dapm.c | 25 +- trunk/sound/sparc/amd7930.c | 85 +- trunk/sound/sparc/cs4231.c | 199 +- trunk/sound/sparc/dbri.c | 89 +- 829 files changed, 33253 insertions(+), 29193 deletions(-) delete mode 100644 trunk/Documentation/blackfin/kgdb.txt delete mode 100644 trunk/Documentation/sparc/sbus_drivers.txt create mode 100644 trunk/Documentation/timers/00-INDEX rename trunk/Documentation/{ => timers}/hpet.txt (81%) delete mode 100644 trunk/arch/avr32/include/asm/a.out.h create mode 100644 trunk/arch/avr32/oprofile/backtrace.c create mode 100644 trunk/arch/blackfin/configs/BF526-EZBRD_defconfig delete mode 100644 trunk/arch/blackfin/include/asm/a.out.h create mode 100644 trunk/arch/blackfin/include/asm/bfrom.h delete mode 100644 trunk/arch/blackfin/include/asm/cpumask.h create mode 100644 trunk/arch/blackfin/mach-bf527/boards/ezbrd.c create mode 100644 trunk/arch/blackfin/mm/isram-driver.c rename trunk/arch/blackfin/mm/{blackfin_sram.c => sram-alloc.c} (96%) delete mode 100644 trunk/arch/h8300/include/asm/a.out.h delete mode 100644 trunk/arch/ia64/include/asm/a.out.h delete mode 100644 trunk/arch/m68knommu/include/asm/a.out.h delete mode 100644 trunk/arch/mips/include/asm/a.out.h delete mode 100644 trunk/arch/powerpc/include/asm/a.out.h delete mode 100644 trunk/arch/sparc/include/asm/bpp.h delete mode 100644 trunk/arch/sparc/include/asm/dma_32.h delete mode 100644 trunk/arch/sparc/include/asm/dma_64.h delete mode 100644 trunk/arch/sparc/include/asm/ebus.h delete mode 100644 trunk/arch/sparc/include/asm/ebus_32.h delete mode 100644 trunk/arch/sparc/include/asm/ebus_64.h create mode 100644 trunk/arch/sparc/include/asm/ebus_dma.h create mode 100644 trunk/arch/sparc/include/asm/gpio.h create mode 100644 trunk/arch/sparc/include/asm/memctrl.h delete mode 100644 trunk/arch/sparc/include/asm/mostek.h delete mode 100644 trunk/arch/sparc/include/asm/mostek_32.h delete mode 100644 trunk/arch/sparc/include/asm/mostek_64.h delete mode 100644 trunk/arch/sparc/include/asm/reboot.h delete mode 100644 trunk/arch/sparc/include/asm/rtc.h delete mode 100644 trunk/arch/sparc/include/asm/sbus.h delete mode 100644 trunk/arch/sparc/include/asm/sbus_32.h delete mode 100644 trunk/arch/sparc/include/asm/sbus_64.h create mode 100644 trunk/arch/sparc/include/asm/serial.h delete mode 100644 trunk/arch/sparc/include/asm/sstate.h delete mode 100644 trunk/arch/sparc/include/asm/statfs_32.h delete mode 100644 trunk/arch/sparc/include/asm/statfs_64.h delete mode 100644 trunk/arch/sparc/include/asm/sun4paddr.h delete mode 100644 trunk/arch/sparc/include/asm/sun4prom.h delete mode 100644 trunk/arch/sparc/include/asm/vfc_ioctls.h create mode 100644 trunk/arch/sparc/kernel/dma.c create mode 100644 trunk/arch/sparc/kernel/dma.h delete mode 100644 trunk/arch/sparc/kernel/ebus.c delete mode 100644 trunk/arch/sparc/kernel/sun4setup.c delete mode 100644 trunk/arch/sparc/mm/nosrmmu.c delete mode 100644 trunk/arch/sparc/prom/sun4prom.c create mode 100644 trunk/arch/sparc64/kernel/psycho_common.c create mode 100644 trunk/arch/sparc64/kernel/psycho_common.h create mode 100644 trunk/arch/sparc64/kernel/reboot.c create mode 100644 trunk/arch/sparc64/mm/init.h create mode 100644 trunk/arch/x86/kernel/dumpstack_32.c create mode 100644 trunk/arch/x86/kernel/dumpstack_64.c delete mode 100644 trunk/arch/x86/kernel/microcode.c create mode 100644 trunk/arch/x86/kernel/microcode_amd.c create mode 100644 trunk/arch/x86/kernel/microcode_core.c create mode 100644 trunk/arch/x86/kernel/microcode_intel.c create mode 100644 trunk/arch/x86/kernel/paravirt-spinlocks.c rename trunk/arch/x86/kernel/{traps_32.c => traps.c} (57%) delete mode 100644 trunk/arch/x86/kernel/traps_64.c rename trunk/arch/x86/mm/{discontig_32.c => numa_32.c} (100%) create mode 100644 trunk/arch/x86/oprofile/op_model_amd.c delete mode 100644 trunk/arch/x86/oprofile/op_model_athlon.c create mode 100644 trunk/arch/x86/xen/debugfs.c create mode 100644 trunk/arch/x86/xen/debugfs.h create mode 100644 trunk/arch/x86/xen/irq.c create mode 100644 trunk/arch/x86/xen/spinlock.c delete mode 100644 trunk/drivers/char/ip2/ip2base.c create mode 100644 trunk/drivers/char/tty_buffer.c create mode 100644 trunk/drivers/char/tty_port.c create mode 100644 trunk/drivers/hwmon/ultra45_env.c create mode 100644 trunk/drivers/leds/leds-sunfire.c create mode 100644 trunk/drivers/rtc/rtc-bq4802.c create mode 100644 trunk/drivers/rtc/rtc-starfire.c create mode 100644 trunk/drivers/rtc/rtc-sun4v.c delete mode 100644 trunk/drivers/sbus/char/bpp.c delete mode 100644 trunk/drivers/sbus/char/cpwatchdog.c delete mode 100644 trunk/drivers/sbus/char/rtc.c delete mode 100644 trunk/drivers/sbus/char/vfc.h delete mode 100644 trunk/drivers/sbus/char/vfc_dev.c delete mode 100644 trunk/drivers/sbus/char/vfc_i2c.c delete mode 100644 trunk/drivers/sbus/char/vfc_i2c.h delete mode 100644 trunk/drivers/sbus/dvma.c delete mode 100644 trunk/drivers/sbus/sbus.c delete mode 100644 trunk/drivers/serial/mcfserial.c delete mode 100644 trunk/drivers/serial/mcfserial.h create mode 100644 trunk/drivers/watchdog/at91sam9_wdt.c create mode 100644 trunk/drivers/watchdog/cpwd.c create mode 100644 trunk/drivers/watchdog/it87_wdt.c create mode 100644 trunk/drivers/watchdog/orion5x_wdt.c rename trunk/drivers/{sbus/char/riowatchdog.c => watchdog/riowd.c} (51%) create mode 100644 trunk/drivers/watchdog/w83697ug_wdt.c create mode 100644 trunk/drivers/xen/cpu_hotplug.c delete mode 100644 trunk/include/asm-cris/a.out.h delete mode 100644 trunk/include/asm-m32r/a.out.h delete mode 100644 trunk/include/asm-parisc/a.out.h create mode 100644 trunk/include/asm-x86/microcode.h delete mode 100644 trunk/include/asm-xtensa/a.out.h create mode 100644 trunk/include/linux/mmdebug.h create mode 100644 trunk/include/linux/usb/ehci_def.h delete mode 100644 trunk/include/xen/balloon.h create mode 100644 trunk/net/netlabel/netlabel_addrlist.c create mode 100644 trunk/net/netlabel/netlabel_addrlist.h delete mode 100644 trunk/sound/soc/at91/eti_b1_wm8731.c create mode 100644 trunk/sound/soc/blackfin/bf5xx-ad73311.c create mode 100644 trunk/sound/soc/codecs/ad73311.c create mode 100644 trunk/sound/soc/codecs/ad73311.h create mode 100644 trunk/sound/soc/codecs/tlv320aic23.c create mode 100644 trunk/sound/soc/codecs/tlv320aic23.h create mode 100644 trunk/sound/soc/omap/osk5912.c diff --git a/[refs] b/[refs] index a3a8f1d69723..9cc187af1671 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57f51dbc45f65f7ee1e8c8f77200bb8000e3e271 +refs/heads/master: cf2fa66055d718ae13e62451bb546505f63906a2 diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX index 73060819ed99..438277800103 100644 --- a/trunk/Documentation/00-INDEX +++ b/trunk/Documentation/00-INDEX @@ -159,8 +159,6 @@ hayes-esp.txt - info on using the Hayes ESP serial driver. highuid.txt - notes on the change from 16 bit to 32 bit user/group IDs. -hpet.txt - - High Precision Event Timer Driver for Linux. timers/ - info on the timer related topics hw_random.txt diff --git a/trunk/Documentation/blackfin/kgdb.txt b/trunk/Documentation/blackfin/kgdb.txt deleted file mode 100644 index 84f6a484ae9a..000000000000 --- a/trunk/Documentation/blackfin/kgdb.txt +++ /dev/null @@ -1,155 +0,0 @@ - A Simple Guide to Configure KGDB - - Sonic Zhang - Aug. 24th 2006 - - -This KGDB patch enables the kernel developer to do source level debugging on -the kernel for the Blackfin architecture. The debugging works over either the -ethernet interface or one of the uarts. Both software breakpoints and -hardware breakpoints are supported in this version. -http://docs.blackfin.uclinux.org/doku.php?id=kgdb - - -2 known issues: -1. This bug: - http://blackfin.uclinux.org/tracker/index.php?func=detail&aid=544&group_id=18&atid=145 - The GDB client for Blackfin uClinux causes incorrect values of local - variables to be displayed when the user breaks the running of kernel in GDB. -2. Because of a hardware bug in Blackfin 533 v1.0.3: - 05000067 - Watchpoints (Hardware Breakpoints) are not supported - Hardware breakpoints cannot be set properly. - - -Debug over Ethernet: - -1. Compile and install the cross platform version of gdb for blackfin, which - can be found at $(BINROOT)/bfin-elf-gdb. - -2. Apply this patch to the 2.6.x kernel. Select the menuconfig option under - "Kernel hacking" -> "Kernel debugging" -> "KGDB: kernel debug with remote gdb". - With this selected, option "Full Symbolic/Source Debugging support" and - "Compile the kernel with frame pointers" are also selected. - -3. Select option "KGDB: connect over (Ethernet)". Add "kgdboe=@target-IP/,@host-IP/" to - the option "Compiled-in Kernel Boot Parameter" under "Kernel hacking". - -4. Connect minicom to the serial port and boot the kernel image. - -5. Configure the IP "/> ifconfig eth0 target-IP" - -6. Start GDB client "bfin-elf-gdb vmlinux". - -7. Connect to the target "(gdb) target remote udp:target-IP:6443". - -8. Set software breakpoint "(gdb) break sys_open". - -9. Continue "(gdb) c". - -10. Run ls in the target console "/> ls". - -11. Breakpoint hits. "Breakpoint 1: sys_open(..." - -12. Display local variables and function paramters. - (*) This operation gives wrong results, see known issue 1. - -13. Single stepping "(gdb) si". - -14. Remove breakpoint 1. "(gdb) del 1" - -15. Set hardware breakpoint "(gdb) hbreak sys_open". - -16. Continue "(gdb) c". - -17. Run ls in the target console "/> ls". - -18. Hardware breakpoint hits. "Breakpoint 1: sys_open(...". - (*) This hardware breakpoint will not be hit, see known issue 2. - -19. Continue "(gdb) c". - -20. Interrupt the target in GDB "Ctrl+C". - -21. Detach from the target "(gdb) detach". - -22. Exit GDB "(gdb) quit". - - -Debug over the UART: - -1. Compile and install the cross platform version of gdb for blackfin, which - can be found at $(BINROOT)/bfin-elf-gdb. - -2. Apply this patch to the 2.6.x kernel. Select the menuconfig option under - "Kernel hacking" -> "Kernel debugging" -> "KGDB: kernel debug with remote gdb". - With this selected, option "Full Symbolic/Source Debugging support" and - "Compile the kernel with frame pointers" are also selected. - -3. Select option "KGDB: connect over (UART)". Set "KGDB: UART port number" to be - a different one from the console. Don't forget to change the mode of - blackfin serial driver to PIO. Otherwise kgdb works incorrectly on UART. - -4. If you want connect to kgdb when the kernel boots, enable - "KGDB: Wait for gdb connection early" - -5. Compile kernel. - -6. Connect minicom to the serial port of the console and boot the kernel image. - -7. Start GDB client "bfin-elf-gdb vmlinux". - -8. Set the baud rate in GDB "(gdb) set remotebaud 57600". - -9. Connect to the target on the second serial port "(gdb) target remote /dev/ttyS1". - -10. Set software breakpoint "(gdb) break sys_open". - -11. Continue "(gdb) c". - -12. Run ls in the target console "/> ls". - -13. A breakpoint is hit. "Breakpoint 1: sys_open(..." - -14. All other operations are the same as that in KGDB over Ethernet. - - -Debug over the same UART as console: - -1. Compile and install the cross platform version of gdb for blackfin, which - can be found at $(BINROOT)/bfin-elf-gdb. - -2. Apply this patch to the 2.6.x kernel. Select the menuconfig option under - "Kernel hacking" -> "Kernel debugging" -> "KGDB: kernel debug with remote gdb". - With this selected, option "Full Symbolic/Source Debugging support" and - "Compile the kernel with frame pointers" are also selected. - -3. Select option "KGDB: connect over UART". Set "KGDB: UART port number" to console. - Don't forget to change the mode of blackfin serial driver to PIO. - Otherwise kgdb works incorrectly on UART. - -4. If you want connect to kgdb when the kernel boots, enable - "KGDB: Wait for gdb connection early" - -5. Connect minicom to the serial port and boot the kernel image. - -6. (Optional) Ask target to wait for gdb connection by entering Ctrl+A. In minicom, you should enter Ctrl+A+A. - -7. Start GDB client "bfin-elf-gdb vmlinux". - -8. Set the baud rate in GDB "(gdb) set remotebaud 57600". - -9. Connect to the target "(gdb) target remote /dev/ttyS0". - -10. Set software breakpoint "(gdb) break sys_open". - -11. Continue "(gdb) c". Then enter Ctrl+C twice to stop GDB connection. - -12. Run ls in the target console "/> ls". Dummy string can be seen on the console. - -13. Then connect the gdb to target again. "(gdb) target remote /dev/ttyS0". - Now you will find a breakpoint is hit. "Breakpoint 1: sys_open(..." - -14. All other operations are the same as that in KGDB over Ethernet. The only - difference is that after continue command in GDB, please stop GDB - connection by 2 "Ctrl+C"s and connect again after breakpoints are hit or - Ctrl+A is entered. diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 3d2d0c29f027..cc8093c15cf5 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -287,14 +287,6 @@ Who: Glauber Costa --------------------------- -What: old style serial driver for ColdFire (CONFIG_SERIAL_COLDFIRE) -When: 2.6.28 -Why: This driver still uses the old interface and has been replaced - by CONFIG_SERIAL_MCF. -Who: Sebastian Siewior - ---------------------------- - What: /sys/o2cb symlink When: January 2010 Why: /sys/fs/o2cb is the proper location for this information - /sys/o2cb diff --git a/trunk/Documentation/filesystems/ext4.txt b/trunk/Documentation/filesystems/ext4.txt index 74484e696405..eb154ef36c2a 100644 --- a/trunk/Documentation/filesystems/ext4.txt +++ b/trunk/Documentation/filesystems/ext4.txt @@ -223,6 +223,11 @@ errors=remount-ro(*) Remount the filesystem read-only on an error. errors=continue Keep going on a filesystem error. errors=panic Panic and halt the machine if an error occurs. +data_err=ignore(*) Just print an error message if an error occurs + in a file data buffer in ordered mode. +data_err=abort Abort the journal if an error occurs in a file + data buffer in ordered mode. + grpid Give objects the same group ID as their creator. bsdgroups diff --git a/trunk/Documentation/filesystems/proc.txt b/trunk/Documentation/filesystems/proc.txt index d831d24d2a6c..b488edad743c 100644 --- a/trunk/Documentation/filesystems/proc.txt +++ b/trunk/Documentation/filesystems/proc.txt @@ -1331,13 +1331,6 @@ determine whether or not they are still functioning properly. Because the NMI watchdog shares registers with oprofile, by disabling the NMI watchdog, oprofile may have more registers to utilize. -maps_protect ------------- - -Enables/Disables the protection of the per-process proc entries "maps" and -"smaps". When enabled, the contents of these files are visible only to -readers that are allowed to ptrace() the given process. - msgmni ------ diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 25efbaf1f59b..2443f5bb4364 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -658,11 +658,12 @@ and is between 256 and 4096 characters. It is defined in the file earlyprintk= [X86-32,X86-64,SH,BLACKFIN] earlyprintk=vga earlyprintk=serial[,ttySn[,baudrate]] + earlyprintk=dbgp Append ",keep" to not disable it when the real console takes over. - Only vga or serial at a time, not both. + Only vga or serial or usb debug port at a time. Currently only ttyS0 and ttyS1 are supported. @@ -1231,6 +1232,29 @@ and is between 256 and 4096 characters. It is defined in the file or memmap=0x10000$0x18690000 + memory_corruption_check=0/1 [X86] + Some BIOSes seem to corrupt the first 64k of + memory when doing things like suspend/resume. + Setting this option will scan the memory + looking for corruption. Enabling this will + both detect corruption and prevent the kernel + from using the memory being corrupted. + However, its intended as a diagnostic tool; if + repeatable BIOS-originated corruption always + affects the same memory, you can use memmap= + to prevent the kernel from using that memory. + + memory_corruption_check_size=size [X86] + By default it checks for corruption in the low + 64k, making this memory unavailable for normal + use. Use this parameter to scan for + corruption in more or less memory. + + memory_corruption_check_period=seconds [X86] + By default it checks for corruption every 60 + seconds. Use this parameter to check at some + other rate. 0 disables periodic checking. + memtest= [KNL,X86] Enable memtest Format: range: 0,4 : pattern number diff --git a/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl index b54cb5048dfa..87a7c07ab658 100644 --- a/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl +++ b/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl @@ -5073,8 +5073,7 @@ struct _snd_pcm_runtime { with SNDRV_DMA_TYPE_CONTINUOUS type and the snd_dma_continuous_data(GFP_KERNEL) device pointer, where GFP_KERNEL is the kernel allocation flag to - use. For the SBUS, SNDRV_DMA_TYPE_SBUS and - snd_dma_sbus_data(sbus_dev) are used instead. + use. For the PCI scatter-gather buffers, use SNDRV_DMA_TYPE_DEV_SG with snd_dma_pci_data(pci) diff --git a/trunk/Documentation/sparc/sbus_drivers.txt b/trunk/Documentation/sparc/sbus_drivers.txt deleted file mode 100644 index eb1e28ad8822..000000000000 --- a/trunk/Documentation/sparc/sbus_drivers.txt +++ /dev/null @@ -1,309 +0,0 @@ - - Writing SBUS Drivers - - David S. Miller (davem@redhat.com) - - The SBUS driver interfaces of the Linux kernel have been -revamped completely for 2.4.x for several reasons. Foremost were -performance and complexity concerns. This document details these -new interfaces and how they are used to write an SBUS device driver. - - SBUS drivers need to include to get access -to functions and structures described here. - - Probing and Detection - - Each SBUS device inside the machine is described by a -structure called "struct sbus_dev". Likewise, each SBUS bus -found in the system is described by a "struct sbus_bus". For -each SBUS bus, the devices underneath are hung in a tree-like -fashion off of the bus structure. - - The SBUS device structure contains enough information -for you to implement your device probing algorithm and obtain -the bits necessary to run your device. The most commonly -used members of this structure, and their typical usage, -will be detailed below. - - Here is a piece of skeleton code for performing a device -probe in an SBUS driver under Linux: - - static int __devinit mydevice_probe_one(struct sbus_dev *sdev) - { - struct mysdevice *mp = kzalloc(sizeof(*mp), GFP_KERNEL); - - if (!mp) - return -ENODEV; - - ... - dev_set_drvdata(&sdev->ofdev.dev, mp); - return 0; - ... - } - - static int __devinit mydevice_probe(struct of_device *dev, - const struct of_device_id *match) - { - struct sbus_dev *sdev = to_sbus_device(&dev->dev); - - return mydevice_probe_one(sdev); - } - - static int __devexit mydevice_remove(struct of_device *dev) - { - struct sbus_dev *sdev = to_sbus_device(&dev->dev); - struct mydevice *mp = dev_get_drvdata(&dev->dev); - - return mydevice_remove_one(sdev, mp); - } - - static struct of_device_id mydevice_match[] = { - { - .name = "mydevice", - }, - {}, - }; - - MODULE_DEVICE_TABLE(of, mydevice_match); - - static struct of_platform_driver mydevice_driver = { - .match_table = mydevice_match, - .probe = mydevice_probe, - .remove = __devexit_p(mydevice_remove), - .driver = { - .name = "mydevice", - }, - }; - - static int __init mydevice_init(void) - { - return of_register_driver(&mydevice_driver, &sbus_bus_type); - } - - static void __exit mydevice_exit(void) - { - of_unregister_driver(&mydevice_driver); - } - - module_init(mydevice_init); - module_exit(mydevice_exit); - - The mydevice_match table is a series of entries which -describes what SBUS devices your driver is meant for. In the -simplest case you specify a string for the 'name' field. Every -SBUS device with a 'name' property matching your string will -be passed one-by-one to your .probe method. - - You should store away your device private state structure -pointer in the drvdata area so that you can retrieve it later on -in your .remove method. - - Any memory allocated, registers mapped, IRQs registered, -etc. must be undone by your .remove method so that all resources -of your device are released by the time it returns. - - You should _NOT_ use the for_each_sbus(), for_each_sbusdev(), -and for_all_sbusdev() interfaces. They are deprecated, will be -removed, and no new driver should reference them ever. - - Mapping and Accessing I/O Registers - - Each SBUS device structure contains an array of descriptors -which describe each register set. We abuse struct resource for that. -They each correspond to the "reg" properties provided by the OBP firmware. - - Before you can access your device's registers you must map -them. And later if you wish to shutdown your driver (for module -unload or similar) you must unmap them. You must treat them as -a resource, which you allocate (map) before using and free up -(unmap) when you are done with it. - - The mapping information is stored in an opaque value -typed as an "unsigned long". This is the type of the return value -of the mapping interface, and the arguments to the unmapping -interface. Let's say you want to map the first set of registers. -Perhaps part of your driver software state structure looks like: - - struct mydevice { - unsigned long control_regs; - ... - struct sbus_dev *sdev; - ... - }; - - At initialization time you then use the sbus_ioremap -interface to map in your registers, like so: - - static void init_one_mydevice(struct sbus_dev *sdev) - { - struct mydevice *mp; - ... - - mp->control_regs = sbus_ioremap(&sdev->resource[0], 0, - CONTROL_REGS_SIZE, "mydevice regs"); - if (!mp->control_regs) { - /* Failure, cleanup and return. */ - } - } - - Second argument to sbus_ioremap is an offset for -cranky devices with broken OBP PROM. The sbus_ioremap uses only -a start address and flags from the resource structure. -Therefore it is possible to use the same resource to map -several sets of registers or even to fabricate a resource -structure if driver gets physical address from some private place. -This practice is discouraged though. Use whatever OBP PROM -provided to you. - - And here is how you might unmap these registers later at -driver shutdown or module unload time, using the sbus_iounmap -interface: - - static void mydevice_unmap_regs(struct mydevice *mp) - { - sbus_iounmap(mp->control_regs, CONTROL_REGS_SIZE); - } - - Finally, to actually access your registers there are 6 -interface routines at your disposal. Accesses are byte (8 bit), -word (16 bit), or longword (32 bit) sized. Here they are: - - u8 sbus_readb(unsigned long reg) /* read byte */ - u16 sbus_readw(unsigned long reg) /* read word */ - u32 sbus_readl(unsigned long reg) /* read longword */ - void sbus_writeb(u8 value, unsigned long reg) /* write byte */ - void sbus_writew(u16 value, unsigned long reg) /* write word */ - void sbus_writel(u32 value, unsigned long reg) /* write longword */ - - So, let's say your device has a control register of some sort -at offset zero. The following might implement resetting your device: - - #define CONTROL 0x00UL - - #define CONTROL_RESET 0x00000001 /* Reset hardware */ - - static void mydevice_reset(struct mydevice *mp) - { - sbus_writel(CONTROL_RESET, mp->regs + CONTROL); - } - - Or perhaps there is a data port register at an offset of -16 bytes which allows you to read bytes from a fifo in the device: - - #define DATA 0x10UL - - static u8 mydevice_get_byte(struct mydevice *mp) - { - return sbus_readb(mp->regs + DATA); - } - - It's pretty straightforward, and clueful readers may have -noticed that these interfaces mimick the PCI interfaces of the -Linux kernel. This was not by accident. - - WARNING: - - DO NOT try to treat these opaque register mapping - values as a memory mapped pointer to some structure - which you can dereference. - - It may be memory mapped, it may not be. In fact it - could be a physical address, or it could be the time - of day xor'd with 0xdeadbeef. :-) - - Whatever it is, it's an implementation detail. The - interface was done this way to shield the driver - author from such complexities. - - Doing DVMA - - SBUS devices can perform DMA transactions in a way similar -to PCI but dissimilar to ISA, e.g. DMA masters supply address. -In contrast to PCI, however, that address (a bus address) is -translated by IOMMU before a memory access is performed and therefore -it is virtual. Sun calls this procedure DVMA. - - Linux supports two styles of using SBUS DVMA: "consistent memory" -and "streaming DVMA". CPU view of consistent memory chunk is, well, -consistent with a view of a device. Think of it as an uncached memory. -Typically this way of doing DVMA is not very fast and drivers use it -mostly for control blocks or queues. On some CPUs we cannot flush or -invalidate individual pages or cache lines and doing explicit flushing -over ever little byte in every control block would be wasteful. - -Streaming DVMA is a preferred way to transfer large amounts of data. -This process works in the following way: -1. a CPU stops accessing a certain part of memory, - flushes its caches covering that memory; -2. a device does DVMA accesses, then posts an interrupt; -3. CPU invalidates its caches and starts to access the memory. - -A single streaming DVMA operation can touch several discontiguous -regions of a virtual bus address space. This is called a scatter-gather -DVMA. - -[TBD: Why do not we neither Solaris attempt to map disjoint pages -into a single virtual chunk with the help of IOMMU, so that non SG -DVMA masters would do SG? It'd be very helpful for RAID.] - - In order to perform a consistent DVMA a driver does something -like the following: - - char *mem; /* Address in the CPU space */ - u32 busa; /* Address in the SBus space */ - - mem = (char *) sbus_alloc_consistent(sdev, MYMEMSIZE, &busa); - - Then mem is used when CPU accesses this memory and u32 -is fed to the device so that it can do DVMA. This is typically -done with an sbus_writel() into some device register. - - Do not forget to free the DVMA resources once you are done: - - sbus_free_consistent(sdev, MYMEMSIZE, mem, busa); - - Streaming DVMA is more interesting. First you allocate some -memory suitable for it or pin down some user pages. Then it all works -like this: - - char *mem = argumen1; - unsigned int size = argument2; - u32 busa; /* Address in the SBus space */ - - *mem = 1; /* CPU can access */ - busa = sbus_map_single(sdev, mem, size); - if (busa == 0) ....... - - /* Tell the device to use busa here */ - /* CPU cannot access the memory without sbus_dma_sync_single() */ - - sbus_unmap_single(sdev, busa, size); - if (*mem == 0) .... /* CPU can access again */ - - It is possible to retain mappings and ask the device to -access data again and again without calling sbus_unmap_single. -However, CPU caches must be invalidated with sbus_dma_sync_single -before such access. - -[TBD but what about writeback caches here... do we have any?] - - There is an equivalent set of functions doing the same thing -only with several memory segments at once for devices capable of -scatter-gather transfers. Use the Source, Luke. - - Examples - - drivers/net/sunhme.c - This is a complicated driver which illustrates many concepts -discussed above and plus it handles both PCI and SBUS boards. - - drivers/scsi/esp.c - Check it out for scatter-gather DVMA. - - drivers/sbus/char/bpp.c - A non-DVMA device. - - drivers/net/sunlance.c - Lance driver abuses consistent mappings for data transfer. -It is a nifty trick which we do not particularly recommend... -Just check it out and know that it's legal. diff --git a/trunk/Documentation/timers/00-INDEX b/trunk/Documentation/timers/00-INDEX new file mode 100644 index 000000000000..397dc35e1323 --- /dev/null +++ b/trunk/Documentation/timers/00-INDEX @@ -0,0 +1,10 @@ +00-INDEX + - this file +highres.txt + - High resolution timers and dynamic ticks design notes +hpet.txt + - High Precision Event Timer Driver for Linux +hrtimers.txt + - subsystem for high-resolution kernel timers +timer_stats.txt + - timer usage statistics diff --git a/trunk/Documentation/hpet.txt b/trunk/Documentation/timers/hpet.txt similarity index 81% rename from trunk/Documentation/hpet.txt rename to trunk/Documentation/timers/hpet.txt index 6ad52d9dad6c..e7c09abcfab4 100644 --- a/trunk/Documentation/hpet.txt +++ b/trunk/Documentation/timers/hpet.txt @@ -1,21 +1,32 @@ High Precision Event Timer Driver for Linux -The High Precision Event Timer (HPET) hardware is the future replacement -for the 8254 and Real Time Clock (RTC) periodic timer functionality. -Each HPET can have up to 32 timers. It is possible to configure the -first two timers as legacy replacements for 8254 and RTC periodic timers. -A specification done by Intel and Microsoft can be found at -. +The High Precision Event Timer (HPET) hardware follows a specification +by Intel and Microsoft which can be found at + + http://www.intel.com/technology/architecture/hpetspec.htm + +Each HPET has one fixed-rate counter (at 10+ MHz, hence "High Precision") +and up to 32 comparators. Normally three or more comparators are provided, +each of which can generate oneshot interupts and at least one of which has +additional hardware to support periodic interrupts. The comparators are +also called "timers", which can be misleading since usually timers are +independent of each other ... these share a counter, complicating resets. + +HPET devices can support two interrupt routing modes. In one mode, the +comparators are additional interrupt sources with no particular system +role. Many x86 BIOS writers don't route HPET interrupts at all, which +prevents use of that mode. They support the other "legacy replacement" +mode where the first two comparators block interrupts from 8254 timers +and from the RTC. The driver supports detection of HPET driver allocation and initialization of the HPET before the driver module_init routine is called. This enables platform code which uses timer 0 or 1 as the main timer to intercept HPET initialization. An example of this initialization can be found in -arch/i386/kernel/time_hpet.c. +arch/x86/kernel/hpet.c. -The driver provides two APIs which are very similar to the API found in -the rtc.c driver. There is a user space API and a kernel space API. -An example user space program is provided below. +The driver provides a userspace API which resembles the API found in the +RTC driver framework. An example user space program is provided below. #include #include @@ -286,15 +297,3 @@ out: return; } - -The kernel API has three interfaces exported from the driver: - - hpet_register(struct hpet_task *tp, int periodic) - hpet_unregister(struct hpet_task *tp) - hpet_control(struct hpet_task *tp, unsigned int cmd, unsigned long arg) - -The kernel module using this interface fills in the ht_func and ht_data -members of the hpet_task structure before calling hpet_register. -hpet_control simply vectors to the hpet_ioctl routine and has the same -commands and respective arguments as the user API. hpet_unregister -is used to terminate usage of the HPET timer reserved by hpet_register. diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 587f418ed00d..988b0a852890 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -72,6 +72,7 @@ M: Mail patches to L: Mailing list that is relevant to this area W: Web-page with status/info T: SCM tree type and location. Type is one of: git, hg, quilt. +F: Applicable files and/or directories S: Status, one of the following: Supported: Someone is actually paid to look after this. @@ -102,14 +103,14 @@ M: dave@thedillows.org L: netdev@vger.kernel.org S: Maintained -3W-XXXX ATA-RAID CONTROLLER DRIVER +3W-9XXX SATA-RAID CONTROLLER DRIVER P: Adam Radford M: linuxraid@amcc.com L: linux-scsi@vger.kernel.org W: http://www.amcc.com S: Supported -3W-9XXX SATA-RAID CONTROLLER DRIVER +3W-XXXX ATA-RAID CONTROLLER DRIVER P: Adam Radford M: linuxraid@amcc.com L: linux-scsi@vger.kernel.org @@ -163,16 +164,11 @@ M: A2232@gmx.net L: linux-m68k@lists.linux-m68k.org S: Maintained -AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN -P: David Howells -M: dhowells@redhat.com -L: linux-afs@lists.infradead.org -S: Supported - -AIO -P: Benjamin LaHaise -M: bcrl@kvack.org -L: linux-aio@kvack.org +AACRAID SCSI RAID DRIVER +P: Adaptec OEM Raid Solutions +M: aacraid@adaptec.com +L: linux-scsi@vger.kernel.org +W: http://www.adaptec.com/ S: Supported ABIT UGURU 1,2 HARDWARE MONITOR DRIVER @@ -193,27 +189,6 @@ M: jes@trained-monkey.org L: linux-acenic@sunsite.dk S: Maintained -IPS SCSI RAID DRIVER -P: Adaptec OEM Raid Solutions -M: aacraid@adaptec.com -L: linux-scsi@vger.kernel.org -W: http://www.adaptec.com/ -S: Maintained - -DPT_I2O SCSI RAID DRIVER -P: Adaptec OEM Raid Solutions -M: aacraid@adaptec.com -L: linux-scsi@vger.kernel.org -W: http://www.adaptec.com/ -S: Maintained - -AACRAID SCSI RAID DRIVER -P: Adaptec OEM Raid Solutions -M: aacraid@adaptec.com -L: linux-scsi@vger.kernel.org -W: http://www.adaptec.com/ -S: Supported - ACER WMI LAPTOP EXTRAS P: Carlos Corbacho M: carlos@strangeworlds.co.uk @@ -327,6 +302,12 @@ P: Roman Zippel M: zippel@linux-m68k.org S: Maintained +AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN +P: David Howells +M: dhowells@redhat.com +L: linux-afs@lists.infradead.org +S: Supported + AGPGART DRIVER P: David Airlie M: airlied@linux.ie @@ -345,6 +326,12 @@ M: hare@suse.de L: linux-scsi@vger.kernel.org S: Maintained +AIO +P: Benjamin LaHaise +M: bcrl@kvack.org +L: linux-aio@kvack.org +S: Supported + ALCATEL SPEEDTOUCH USB DRIVER P: Duncan Sands M: duncan.sands@free.fr @@ -390,6 +377,11 @@ L: iommu@lists.linux-foundation.org T: git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git S: Supported +AMD MICROCODE UPDATE SUPPORT +P: Peter Oruba +M: peter.oruba@amd.com +S: Supported + AMS (Apple Motion Sensor) DRIVER P: Stelian Pop M: stelian@popies.net @@ -732,7 +724,7 @@ L: linux-kernel@vger.kernel.org W: http://sourceforge.net/projects/xscaleiop S: Supported -ATA OVER ETHERNET DRIVER +ATA OVER ETHERNET (AOE) DRIVER P: Ed L. Cashin M: ecashin@coraid.com W: http://www.coraid.com/support/linux @@ -865,11 +857,48 @@ L: linux-hams@vger.kernel.org W: http://www.linux-ax25.org/ S: Maintained +B43 WIRELESS DRIVER +P: Michael Buesch +M: mb@bu3sch.de +P: Stefano Brivio +M: stefano.brivio@polimi.it +L: linux-wireless@vger.kernel.org +W: http://linuxwireless.org/en/users/Drivers/b43 +S: Maintained + +B43LEGACY WIRELESS DRIVER +P: Larry Finger +M: Larry.Finger@lwfinger.net +P: Stefano Brivio +M: stefano.brivio@polimi.it +L: linux-wireless@vger.kernel.org +W: http://linuxwireless.org/en/users/Drivers/b43 +S: Maintained + BACKLIGHT CLASS/SUBSYSTEM P: Richard Purdie M: rpurdie@rpsys.net S: Maintained +BAYCOM/HDLCDRV DRIVERS FOR AX.25 +P: Thomas Sailer +M: t.sailer@alumni.ethz.ch +L: linux-hams@vger.kernel.org +W: http://www.baycom.org/~tom/ham/ham.html +S: Maintained + +BEFS FILE SYSTEM +P: Sergey S. Kostyliov +M: rathamahata@php4.ru +L: linux-kernel@vger.kernel.org +S: Maintained + +BFS FILE SYSTEM +P: Tigran A. Aivazian +M: tigran@aivazian.fsnet.co.uk +L: linux-kernel@vger.kernel.org +S: Maintained + BLACKFIN ARCHITECTURE P: Bryan Wu M: cooloney@kernel.org @@ -905,43 +934,6 @@ L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) W: http://blackfin.uclinux.org S: Supported -BAYCOM/HDLCDRV DRIVERS FOR AX.25 -P: Thomas Sailer -M: t.sailer@alumni.ethz.ch -L: linux-hams@vger.kernel.org -W: http://www.baycom.org/~tom/ham/ham.html -S: Maintained - -B43 WIRELESS DRIVER -P: Michael Buesch -M: mb@bu3sch.de -P: Stefano Brivio -M: stefano.brivio@polimi.it -L: linux-wireless@vger.kernel.org -W: http://linuxwireless.org/en/users/Drivers/b43 -S: Maintained - -B43LEGACY WIRELESS DRIVER -P: Larry Finger -M: Larry.Finger@lwfinger.net -P: Stefano Brivio -M: stefano.brivio@polimi.it -L: linux-wireless@vger.kernel.org -W: http://linuxwireless.org/en/users/Drivers/b43 -S: Maintained - -BEFS FILE SYSTEM -P: Sergey S. Kostyliov -M: rathamahata@php4.ru -L: linux-kernel@vger.kernel.org -S: Maintained - -BFS FILE SYSTEM -P: Tigran A. Aivazian -M: tigran@aivazian.fsnet.co.uk -L: linux-kernel@vger.kernel.org -S: Maintained - BLACKFIN I2C TWI DRIVER P: Sonic Zhang M: sonic.zhang@analog.com @@ -1035,15 +1027,6 @@ M: corbet@lwn.net L: video4linux-list@redhat.com S: Maintained -CAN NETWORK LAYER -P: Urs Thuermann -M: urs.thuermann@volkswagen.de -P: Oliver Hartkopp -M: oliver.hartkopp@volkswagen.de -L: socketcan-core@lists.berlios.de (subscribers-only) -W: http://developer.berlios.de/projects/socketcan/ -S: Maintained - CALGARY x86-64 IOMMU P: Muli Ben-Yehuda M: muli@il.ibm.com @@ -1053,6 +1036,15 @@ L: linux-kernel@vger.kernel.org L: discuss@x86-64.org S: Maintained +CAN NETWORK LAYER +P: Urs Thuermann +M: urs.thuermann@volkswagen.de +P: Oliver Hartkopp +M: oliver.hartkopp@volkswagen.de +L: socketcan-core@lists.berlios.de (subscribers-only) +W: http://developer.berlios.de/projects/socketcan/ +S: Maintained + CELL BROADBAND ENGINE ARCHITECTURE P: Arnd Bergmann M: arnd@arndb.de @@ -1061,13 +1053,6 @@ L: cbe-oss-dev@ozlabs.org W: http://www.ibm.com/developerworks/power/cell/ S: Supported -CISCO 10G ETHERNET DRIVER -P: Scott Feldman -M: scofeldm@cisco.com -P: Joe Eykholt -M: jeykholt@cisco.com -S: Supported - CFAG12864B LCD DRIVER P: Miguel Ojeda Sandonis M: miguel.ojeda.sandonis@gmail.com @@ -1099,19 +1084,11 @@ P: Joel Schopp M: jschopp@austin.ibm.com S: Supported -COMMON INTERNET FILE SYSTEM (CIFS) -P: Steve French -M: sfrench@samba.org -L: linux-cifs-client@lists.samba.org -L: samba-technical@lists.samba.org -W: http://linux-cifs.samba.org/ -T: git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git -S: Supported - -CONFIGFS -P: Joel Becker -M: joel.becker@oracle.com -L: linux-kernel@vger.kernel.org +CISCO 10G ETHERNET DRIVER +P: Scott Feldman +M: scofeldm@cisco.com +P: Joe Eykholt +M: jeykholt@cisco.com S: Supported CIRRUS LOGIC EP93XX ETHERNET DRIVER @@ -1147,6 +1124,15 @@ L: codalist@coda.cs.cmu.edu W: http://www.coda.cs.cmu.edu/ S: Maintained +COMMON INTERNET FILE SYSTEM (CIFS) +P: Steve French +M: sfrench@samba.org +L: linux-cifs-client@lists.samba.org +L: samba-technical@lists.samba.org +W: http://linux-cifs.samba.org/ +T: git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git +S: Supported + COMPACTPCI HOTPLUG CORE P: Scott Murray M: scottm@somanetworks.com @@ -1186,6 +1172,12 @@ L: accessrunner-general@lists.sourceforge.net W: http://accessrunner.sourceforge.net/ S: Maintained +CONFIGFS +P: Joel Becker +M: joel.becker@oracle.com +L: linux-kernel@vger.kernel.org +S: Supported + CONTROL GROUPS (CGROUPS) P: Paul Menage M: menage@google.com @@ -1309,6 +1301,20 @@ W: http://www.qsl.net/dl1bke/ L: linux-hams@vger.kernel.org S: Maintained +DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER +P: Tobias Ringstrom +M: tori@unhappy.mine.nu +L: netdev@vger.kernel.org +S: Maintained + +DC390/AM53C974 SCSI driver +P: Kurt Garloff +M: garloff@suse.de +W: http://www.garloff.de/kurt/linux/dc390/ +P: Guennadi Liakhovetski +M: g.liakhovetski@gmx.de +S: Maintained + DC395x SCSI driver P: Oliver Neukum M: oliver@neukum.name @@ -1321,14 +1327,6 @@ L: dc395x@twibble.org L: http://lists.twibble.org/mailman/listinfo/dc395x/ S: Maintained -DC390/AM53C974 SCSI driver -P: Kurt Garloff -M: garloff@suse.de -W: http://www.garloff.de/kurt/linux/dc390/ -P: Guennadi Liakhovetski -M: g.liakhovetski@gmx.de -S: Maintained - DCCP PROTOCOL P: Arnaldo Carvalho de Melo M: acme@ghostprotocols.net @@ -1359,12 +1357,6 @@ P: Doug Warzecha M: Douglas_Warzecha@dell.com S: Maintained -DEVICE-MAPPER (LVM) -P: Alasdair Kergon -L: dm-devel@redhat.com -W: http://sources.redhat.com/dm -S: Maintained - DEVICE NUMBER REGISTRY P: Torben Mathiasen M: device@lanana.org @@ -1372,6 +1364,12 @@ W: http://lanana.org/docs/device-list/index.html L: linux-kernel@vger.kernel.org S: Maintained +DEVICE-MAPPER (LVM) +P: Alasdair Kergon +L: dm-devel@redhat.com +W: http://sources.redhat.com/dm +S: Maintained + DIGI INTL. EPCA DRIVER P: Digi International, Inc M: Eng.Linux@digi.com @@ -1379,7 +1377,7 @@ L: Eng.Linux@digi.com W: http://www.digi.com S: Orphan -DIRECTORY NOTIFICATION +DIRECTORY NOTIFICATION (DNOTIFY) P: Stephen Rothwell M: sfr@canb.auug.org.au L: linux-kernel@vger.kernel.org @@ -1393,13 +1391,13 @@ W: http://www.win.tue.nl/~aeb/linux/zip/zip-1.html W: http://www.win.tue.nl/~aeb/partitions/partition_types-1.html S: Maintained -DISKQUOTA: +DISKQUOTA P: Jan Kara M: jack@suse.cz L: linux-kernel@vger.kernel.org S: Maintained -DISTRIBUTED LOCK MANAGER +DISTRIBUTED LOCK MANAGER (DLM) P: Christine Caulfield M: ccaulfie@redhat.com P: David Teigland @@ -1409,12 +1407,6 @@ W: http://sources.redhat.com/cluster/ T: git kernel.org:/pub/scm/linux/kernel/git/teigland/dlm.git S: Supported -DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER -P: Tobias Ringstrom -M: tori@unhappy.mine.nu -L: netdev@vger.kernel.org -S: Maintained - DMA GENERIC OFFLOAD ENGINE SUBSYSTEM P: Maciej Sosnowski M: maciej.sosnowski@intel.com @@ -1454,6 +1446,13 @@ M: jrv@vanzandt.mv.com L: blinux-list@redhat.com S: Maintained +DPT_I2O SCSI RAID DRIVER +P: Adaptec OEM Raid Solutions +M: aacraid@adaptec.com +L: linux-scsi@vger.kernel.org +W: http://www.adaptec.com/ +S: Maintained + DRIVER CORE, KOBJECTS, AND SYSFS P: Greg Kroah-Hartman M: gregkh@suse.de @@ -1602,7 +1601,7 @@ EFS FILESYSTEM W: http://aeschi.ch.eu.org/efs/ S: Orphan -EHCA (IBM GX bus InfiniBand adapter) DRIVER: +EHCA (IBM GX bus InfiniBand adapter) DRIVER P: Hoang-Nam Nguyen M: hnguyen@de.ibm.com P: Christoph Raisch @@ -1682,26 +1681,62 @@ P: Akinobu Mita M: akinobu.mita@gmail.com S: Supported -FRAMEBUFFER LAYER -P: Antonino Daplas -M: adaplas@gmail.com -L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) -W: http://linux-fbdev.sourceforge.net/ +FILE LOCKING (flock() and fcntl()/lockf()) +P: Matthew Wilcox +M: matthew@wil.cx +L: linux-fsdevel@vger.kernel.org S: Maintained -FREESCALE DMA DRIVER -P: Li Yang -M: leoli@freescale.com -P: Zhang Wei -M: zw@zh-kernel.org -L: linuxppc-embedded@ozlabs.org -L: linux-kernel@vger.kernel.org +FILESYSTEMS (VFS and infrastructure) +P: Alexander Viro +M: viro@zeniv.linux.org.uk +L: linux-fsdevel@vger.kernel.org S: Maintained -FREESCALE I2C CPM DRIVER -P: Jochen Friedrich -M: jochen@scram.de -L: linuxppc-dev@ozlabs.org +FIREWIRE SUBSYSTEM (drivers/firewire, ) +P: Kristian Hoegsberg, Stefan Richter +M: krh@redhat.com, stefanr@s5r6.in-berlin.de +L: linux1394-devel@lists.sourceforge.net +W: http://www.linux1394.org/ +T: git kernel.org:/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git +S: Maintained + +FIRMWARE LOADER (request_firmware) +L: linux-kernel@vger.kernel.org +S: Orphan + +FPU EMULATOR +P: Bill Metzenthen +M: billm@suburbia.net +W: http://suburbia.net/~billm/floating-point/emulator/ +S: Maintained + +FRAME RELAY DLCI/FRAD (Sangoma drivers too) +P: Mike McLagan +M: mike.mclagan@linux.org +L: netdev@vger.kernel.org +S: Maintained + +FRAMEBUFFER LAYER +P: Antonino Daplas +M: adaplas@gmail.com +L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) +W: http://linux-fbdev.sourceforge.net/ +S: Maintained + +FREESCALE DMA DRIVER +P: Li Yang +M: leoli@freescale.com +P: Zhang Wei +M: zw@zh-kernel.org +L: linuxppc-embedded@ozlabs.org +L: linux-kernel@vger.kernel.org +S: Maintained + +FREESCALE I2C CPM DRIVER +P: Jochen Friedrich +M: jochen@scram.de +L: linuxppc-dev@ozlabs.org L: i2c@lm-sensors.org S: Maintained @@ -1747,42 +1782,6 @@ L: alsa-devel@alsa-project.org L: linuxppc-dev@ozlabs.org S: Supported -FILE LOCKING (flock() and fcntl()/lockf()) -P: Matthew Wilcox -M: matthew@wil.cx -L: linux-fsdevel@vger.kernel.org -S: Maintained - -FILESYSTEMS (VFS and infrastructure) -P: Alexander Viro -M: viro@zeniv.linux.org.uk -L: linux-fsdevel@vger.kernel.org -S: Maintained - -FIREWIRE SUBSYSTEM (drivers/firewire, ) -P: Kristian Hoegsberg, Stefan Richter -M: krh@redhat.com, stefanr@s5r6.in-berlin.de -L: linux1394-devel@lists.sourceforge.net -W: http://www.linux1394.org/ -T: git kernel.org:/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git -S: Maintained - -FIRMWARE LOADER (request_firmware) -L: linux-kernel@vger.kernel.org -S: Orphan - -FPU EMULATOR -P: Bill Metzenthen -M: billm@suburbia.net -W: http://suburbia.net/~billm/floating-point/emulator/ -S: Maintained - -FRAME RELAY DLCI/FRAD (Sangoma drivers too) -P: Mike McLagan -M: mike.mclagan@linux.org -L: netdev@vger.kernel.org -S: Maintained - FREEVXFS FILESYSTEM P: Christoph Hellwig M: hch@infradead.org @@ -1854,6 +1853,13 @@ L: gigaset307x-common@lists.sourceforge.net W: http://gigaset307x.sourceforge.net/ S: Maintained +HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER +P: Robert Love +M: rlove@rlove.org +M: linux-kernel@vger.kernel.org +W: http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/ +S: Maintained + HARDWARE MONITORING L: lm-sensors@lm-sensors.org W: http://www.lm-sensors.org/ @@ -1862,13 +1868,6 @@ S: Orphan HARDWARE RANDOM NUMBER GENERATOR CORE S: Orphan -HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER -P: Robert Love -M: rlove@rlove.org -M: linux-kernel@vger.kernel.org -W: http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/ -S: Maintained - HARMONY SOUND DRIVER P: Kyle McMartin M: kyle@mcmartin.ca @@ -1882,6 +1881,24 @@ L: linux-kernel@vger.kernel.org W: http://www.nyx.net/~arobinso S: Maintained +HEWLETT-PACKARD FIBRE CHANNEL 64-bit/66MHz PCI non-intelligent HBA +P: Chirag Kantharia +M: chirag.kantharia@hp.com +L: iss_storagedev@hp.com +S: Maintained + +HEWLETT-PACKARD SMART2 RAID DRIVER +P: Chirag Kantharia +M: chirag.kantharia@hp.com +L: iss_storagedev@hp.com +S: Maintained + +HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss) +P: Mike Miller +M: mike.miller@hp.com +L: iss_storagedev@hp.com +S: Supported + HFS FILESYSTEM P: Roman Zippel M: zippel@linux-m68k.org @@ -1895,6 +1912,14 @@ L: linux-nvidia@lists.surfsouth.com W: http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml S: Maintained +HIBERNATION (aka Software Suspend, aka swsusp) +P: Pavel Machek +M: pavel@suse.cz +P: Rafael J. Wysocki +M: rjw@sisk.pl +L: linux-pm@lists.linux-foundation.org +S: Supported + HID CORE LAYER P: Jiri Kosina M: jkosina@suse.cz @@ -1927,24 +1952,6 @@ M: jes@trained-monkey.org L: linux-hippi@sunsite.dk S: Maintained -HEWLETT-PACKARD FIBRE CHANNEL 64-bit/66MHz PCI non-intelligent HBA -P: Chirag Kantharia -M: chirag.kantharia@hp.com -L: iss_storagedev@hp.com -S: Maintained - -HEWLETT-PACKARD SMART2 RAID DRIVER -P: Chirag Kantharia -M: chirag.kantharia@hp.com -L: iss_storagedev@hp.com -S: Maintained - -HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss) -P: Mike Miller -M: mike.miller@hp.com -L: iss_storagedev@hp.com -S: Supported - HOST AP DRIVER P: Jouni Malinen M: j@w1.fi @@ -1953,16 +1960,16 @@ L: linux-wireless@vger.kernel.org W: http://hostap.epitest.fi/ S: Maintained -HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series -P: Jaroslav Kysela -M: perex@perex.cz -S: Maintained - HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER P: Carlos Corbacho M: carlos@strangeworlds.co.uk S: Odd Fixes +HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series +P: Jaroslav Kysela +M: perex@perex.cz +S: Maintained + HPET: High Precision Event Timers driver (drivers/char/hpet.c) P: Clemens Ladisch M: clemens@ladisch.de @@ -2042,14 +2049,6 @@ W: http://www.ia64-linux.org/ T: git kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git S: Maintained -SN-IA64 (Itanium) SUB-PLATFORM -P: Jes Sorensen -M: jes@sgi.com -L: linux-altix@sgi.com -L: linux-ia64@vger.kernel.org -W: http://www.sgi.com/altix -S: Maintained - IBM MCA SCSI SUBSYSTEM DRIVER P: Michael Lang M: langa2@kph.uni-mainz.de @@ -2133,14 +2132,6 @@ W: http://www.openib.org/ T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git S: Supported -INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS -P: Dmitry Torokhov -M: dmitry.torokhov@gmail.com -M: dtor@mail.ru -L: linux-input@vger.kernel.org -T: git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git -S: Maintained - INOTIFY P: John McCutchan M: ttb@tentacle.dhs.org @@ -2149,6 +2140,14 @@ M: rml@novell.com L: linux-kernel@vger.kernel.org S: Maintained +INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS +P: Dmitry Torokhov +M: dmitry.torokhov@gmail.com +M: dtor@mail.ru +L: linux-input@vger.kernel.org +T: git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git +S: Maintained + INTEL FRAMEBUFFER DRIVER (excluding 810 and 815) P: Sylvain Meyer M: sylvain.meyer@worldonline.fr @@ -2253,7 +2252,7 @@ M: pfg@sgi.com L: linux-mips@linux-mips.org S: Maintained -IP MASQUERADING: +IP MASQUERADING P: Juanjo Ciarlante M: jjciarla@raiz.uncu.edu.ar S: Maintained @@ -2268,7 +2267,7 @@ M: jesse@icplus.com.tw L: netdev@vger.kernel.org S: Maintained -IPATH DRIVER: +IPATH DRIVER P: Ralph Campbell M: infinipath@qlogic.com L: general@lists.openfabrics.org @@ -2282,13 +2281,25 @@ L: openipmi-developer@lists.sourceforge.net W: http://openipmi.sourceforge.net/ S: Supported -IPX NETWORK LAYER -P: Arnaldo Carvalho de Melo -M: acme@ghostprotocols.net +IPS SCSI RAID DRIVER +P: Adaptec OEM Raid Solutions +M: aacraid@adaptec.com +L: linux-scsi@vger.kernel.org +W: http://www.adaptec.com/ +S: Maintained + +IPVS +P: Wensong Zhang +M: wensong@linux-vs.org +P: Simon Horman +M: horms@verge.net.au +P: Julian Anastasov +M: ja@ssi.bg L: netdev@vger.kernel.org +L: lvs-devel@vger.kernel.org S: Maintained -IPWIRELES DRIVER +IPWIRELESS DRIVER P: Jiri Kosina M: jkosina@suse.cz P: David Sterba @@ -2296,6 +2307,12 @@ M: dsterba@suse.cz S: Maintained T: git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git +IPX NETWORK LAYER +P: Arnaldo Carvalho de Melo +M: acme@ghostprotocols.net +L: netdev@vger.kernel.org +S: Maintained + IRDA SUBSYSTEM P: Samuel Ortiz M: samuel@sortiz.org @@ -2303,6 +2320,11 @@ L: irda-users@lists.sourceforge.net (subscribers-only) W: http://irda.sourceforge.net/ S: Maintained +ISAPNP +P: Jaroslav Kysela +M: perex@perex.cz +S: Maintained + ISCSI P: Mike Christie M: michaelc@cs.wisc.edu @@ -2311,11 +2333,6 @@ W: www.open-iscsi.org T: git kernel.org:/pub/scm/linux/kernel/mnc/linux-2.6-iscsi.git S: Maintained -ISAPNP -P: Jaroslav Kysela -M: perex@perex.cz -S: Maintained - ISDN SUBSYSTEM P: Karsten Keil M: kkeil@suse.de @@ -2340,6 +2357,14 @@ L: video4linux-list@redhat.com W: http://www.ivtvdriver.org S: Maintained +JFS FILESYSTEM +P: Dave Kleikamp +M: shaggy@austin.ibm.com +L: jfs-discussion@lists.sourceforge.net +W: http://jfs.sourceforge.net/ +T: git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git +S: Supported + JME NETWORK DRIVER P: Guo-Fu Tseng M: cooldavid@cooldavid.org @@ -2353,24 +2378,6 @@ L: linux-mtd@lists.infradead.org W: http://www.linux-mtd.infradead.org/doc/jffs2.html S: Maintained -UBI FILE SYSTEM (UBIFS) -P: Artem Bityutskiy -M: dedekind@infradead.org -P: Adrian Hunter -M: ext-adrian.hunter@nokia.com -L: linux-mtd@lists.infradead.org -T: git git://git.infradead.org/~dedekind/ubifs-2.6.git -W: http://www.linux-mtd.infradead.org/doc/ubifs.html -S: Maintained - -JFS FILESYSTEM -P: Dave Kleikamp -M: shaggy@austin.ibm.com -L: jfs-discussion@lists.sourceforge.net -W: http://jfs.sourceforge.net/ -T: git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git -S: Supported - JOURNALLING LAYER FOR BLOCK DEVICES (JBD) P: Stephen Tweedie, Andrew Morton M: sct@redhat.com, akpm@linux-foundation.org @@ -2607,11 +2614,6 @@ W: http://www.pasemi.com/ L: linuxppc-dev@ozlabs.org S: Supported -LLC (802.2) -P: Arnaldo Carvalho de Melo -M: acme@ghostprotocols.net -S: Maintained - LINUX SECURITY MODULE (LSM) FRAMEWORK P: Chris Wright M: chrisw@sous-sol.org @@ -2619,6 +2621,11 @@ L: linux-security-module@vger.kernel.org T: git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git S: Supported +LLC (802.2) +P: Arnaldo Carvalho de Melo +M: acme@ghostprotocols.net +S: Maintained + LM83 HARDWARE MONITOR DRIVER P: Jean Delvare M: khali@linux-fr.org @@ -2719,14 +2726,6 @@ M: kaber@trash.net L: netdev@vger.kernel.org S: Maintained -MARVELL YUKON / SYSKONNECT DRIVER -P: Mirko Lindner -M: mlindner@syskonnect.de -P: Ralph Roesler -M: rroesler@syskonnect.de -W: http://www.syskonnect.com -S: Supported - MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7 P: Michael Kerrisk M: mtk.manpages@gmail.com @@ -2746,6 +2745,14 @@ M: buytenh@marvell.com L: netdev@vger.kernel.org S: Supported +MARVELL YUKON / SYSKONNECT DRIVER +P: Mirko Lindner +M: mlindner@syskonnect.de +P: Ralph Roesler +M: rroesler@syskonnect.de +W: http://www.syskonnect.com +S: Supported + MATROX FRAMEBUFFER DRIVER P: Petr Vandrovec M: vandrove@vc.cvut.cz @@ -2782,15 +2789,6 @@ L: linux-mm@kvack.org L: linux-kernel@vger.kernel.org S: Maintained -MEI MN10300/AM33 PORT -P: David Howells -M: dhowells@redhat.com -P: Koichi Yasutake -M: yasutake.koichi@jp.panasonic.com -L: linux-am33-list@redhat.com (moderated for non-subscribers) -W: ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/ -S: Maintained - MEMORY TECHNOLOGY DEVICES (MTD) P: David Woodhouse M: dwmw2@infradead.org @@ -2799,14 +2797,6 @@ L: linux-mtd@lists.infradead.org T: git git://git.infradead.org/mtd-2.6.git S: Maintained -UNSORTED BLOCK IMAGES (UBI) -P: Artem Bityutskiy -M: dedekind@infradead.org -W: http://www.linux-mtd.infradead.org/ -L: linux-mtd@lists.infradead.org -T: git git://git.infradead.org/~dedekind/ubi-2.6.git -S: Maintained - MICROTEK X6 SCANNER P: Oliver Neukum M: oliver@neukum.name @@ -3038,17 +3028,6 @@ L: netdev@vger.kernel.org W: http://www.netxen.com S: Supported -IPVS -P: Wensong Zhang -M: wensong@linux-vs.org -P: Simon Horman -M: horms@verge.net.au -P: Julian Anastasov -M: ja@ssi.bg -L: netdev@vger.kernel.org -L: lvs-devel@vger.kernel.org -S: Maintained - NFS, SUNRPC, AND LOCKD CLIENTS P: Trond Myklebust M: Trond.Myklebust@netapp.com @@ -3094,22 +3073,6 @@ M: adaplas@gmail.com L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) S: Maintained -OPENCORES I2C BUS DRIVER -P: Peter Korsgaard -M: jacmet@sunsite.dk -L: i2c@lm-sensors.org -S: Maintained - -ORACLE CLUSTER FILESYSTEM 2 (OCFS2) -P: Mark Fasheh -M: mfasheh@suse.com -P: Joel Becker -M: joel.becker@oracle.com -L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers) -W: http://oss.oracle.com/projects/ocfs2/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git -S: Supported - OMFS FILESYSTEM P: Bob Copeland M: me@bobcopeland.com @@ -3145,12 +3108,28 @@ L: osst-users@lists.sourceforge.net L: linux-scsi@vger.kernel.org S: Maintained +OPENCORES I2C BUS DRIVER +P: Peter Korsgaard +M: jacmet@sunsite.dk +L: i2c@lm-sensors.org +S: Maintained + OPROFILE P: Robert Richter M: robert.richter@amd.com L: oprofile-list@lists.sf.net S: Maintained +ORACLE CLUSTER FILESYSTEM 2 (OCFS2) +P: Mark Fasheh +M: mfasheh@suse.com +P: Joel Becker +M: joel.becker@oracle.com +L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers) +W: http://oss.oracle.com/projects/ocfs2/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git +S: Supported + ORINOCO DRIVER P: Pavel Roskin M: proski@gnu.org @@ -3162,6 +3141,14 @@ L: orinoco-devel@lists.sourceforge.net W: http://www.nongnu.org/orinoco/ S: Maintained +P54 WIRELESS DRIVER +P: Michael Wu +M: flamingice@sourmilk.net +L: linux-wireless@vger.kernel.org +W: http://prism54.org +T: git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git +S: Maintained + PA SEMI ETHERNET DRIVER P: Olof Johansson M: olof@lixom.net @@ -3174,29 +3161,19 @@ M: olof@lixom.net L: i2c@lm-sensors.org S: Maintained +PANASONIC MN10300/AM33 PORT +P: David Howells +M: dhowells@redhat.com +P: Koichi Yasutake +M: yasutake.koichi@jp.panasonic.com +L: linux-am33-list@redhat.com (moderated for non-subscribers) +W: ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/ +S: Maintained + PARALLEL PORT SUPPORT L: linux-parport@lists.infradead.org (subscribers-only) S: Orphan -PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES -P: Tim Waugh -M: tim@cyberelk.net -L: linux-parport@lists.infradead.org (subscribers-only) -W: http://www.torque.net/linux-pp.html -S: Maintained - -PARISC ARCHITECTURE -P: Kyle McMartin -M: kyle@mcmartin.ca -P: Matthew Wilcox -M: matthew@wil.cx -P: Grant Grundler -M: grundler@parisc-linux.org -L: linux-parisc@vger.kernel.org -W: http://www.parisc-linux.org/ -T: git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git -S: Maintained - PARAVIRT_OPS INTERFACE P: Jeremy Fitzhardinge M: jeremy@xensource.com @@ -3210,6 +3187,25 @@ L: virtualization@lists.osdl.org L: linux-kernel@vger.kernel.org S: Supported +PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES +P: Tim Waugh +M: tim@cyberelk.net +L: linux-parport@lists.infradead.org (subscribers-only) +W: http://www.torque.net/linux-pp.html +S: Maintained + +PARISC ARCHITECTURE +P: Kyle McMartin +M: kyle@mcmartin.ca +P: Matthew Wilcox +M: matthew@wil.cx +P: Grant Grundler +M: grundler@parisc-linux.org +L: linux-parisc@vger.kernel.org +W: http://www.parisc-linux.org/ +T: git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git +S: Maintained + PC87360 HARDWARE MONITORING DRIVER P: Jim Cromie M: jim.cromie@gmail.com @@ -3339,14 +3335,6 @@ L: kpreempt-tech@lists.sourceforge.net W: ftp://ftp.kernel.org/pub/linux/kernel/people/rml/preempt-kernel S: Supported -P54 WIRELESS DRIVER -P: Michael Wu -M: flamingice@sourmilk.net -L: linux-wireless@vger.kernel.org -W: http://prism54.org -T: git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git -S: Maintained - PRISM54 WIRELESS DRIVER P: Luis R. Rodriguez M: mcgrof@gmail.com @@ -3437,13 +3425,7 @@ M: paulus@samba.org L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) S: Maintained -RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER -P: Corey Thomas -M: coreythomas@charter.net -L: linux-wireless@vger.kernel.org -S: Maintained - -RALINK RT2X00 WLAN DRIVER +RALINK RT2X00 WIRELESS LAN DRIVER P: rt2x00 project L: linux-wireless@vger.kernel.org L: rt2400-devel@lists.sourceforge.net @@ -3468,6 +3450,18 @@ M: mporter@kernel.crashing.org L: linux-kernel@vger.kernel.org S: Maintained +RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER +P: Corey Thomas +M: coreythomas@charter.net +L: linux-wireless@vger.kernel.org +S: Maintained + +RCUTORTURE MODULE +P: Josh Triplett +M: josh@freedesktop.org +L: linux-kernel@vger.kernel.org +S: Maintained + RDC R-321X SoC P: Florian Fainelli M: florian.fainelli@telecomint.eu @@ -3487,12 +3481,6 @@ W: http://www.rdrop.com/users/paulmck/rclock/ L: linux-kernel@vger.kernel.org S: Supported -RCUTORTURE MODULE -P: Josh Triplett -M: josh@freedesktop.org -L: linux-kernel@vger.kernel.org -S: Maintained - REAL TIME CLOCK DRIVER P: Paul Gortmaker M: p_gortmaker@yahoo.com @@ -3516,6 +3504,9 @@ L: netdev@vger.kernel.org S: Maintained F: net/rfkill +RISCOM8 DRIVER +S: Orphan + ROCKETPORT DRIVER P: Comtrol Corp. W: http://www.comtrol.com @@ -3528,9 +3519,6 @@ L: linux-hams@vger.kernel.org W: http://www.linux-ax25.org/ S: Maintained -RISCOM8 DRIVER -S: Orphan - RTL818X WIRELESS DRIVER P: Michael Wu M: flamingice@sourmilk.net @@ -3670,6 +3658,12 @@ M: saschasommer@freenet.de L: sdricohcs-devel@lists.sourceforge.net (subscribers-only) S: Maintained +SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER +P: Pierre Ossman +M: drzeus-sdhci@drzeus.cx +L: sdhci-devel@list.drzeus.cx +S: Maintained + SECURITY CONTACT P: Security Officers M: security@kernel.org @@ -3693,19 +3687,13 @@ P: Jiri Slaby M: jirislaby@gmail.com S: Maintained -SERIAL ATA (SATA) SUBSYSTEM: +SERIAL ATA (SATA) SUBSYSTEM P: Jeff Garzik M: jgarzik@pobox.com L: linux-ide@vger.kernel.org T: git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git S: Supported -SGI SN-IA64 (Altix) SERIAL CONSOLE DRIVER -P: Pat Gefre -M: pfg@sgi.com -L: linux-ia64@vger.kernel.org -S: Supported - SFC NETWORK DRIVER P: Steve Hodgson P: Ben Hutchings @@ -3713,6 +3701,17 @@ P: Robert Stonehouse M: linux-net-drivers@solarflare.com S: Supported +SGI GRU DRIVER +P: Jack Steiner +M: steiner@sgi.com +S: Maintained + +SGI SN-IA64 (Altix) SERIAL CONSOLE DRIVER +P: Pat Gefre +M: pfg@sgi.com +L: linux-ia64@vger.kernel.org +S: Supported + SGI VISUAL WORKSTATION 320 AND 540 P: Andrey Panin M: pazke@donpac.ru @@ -3720,16 +3719,24 @@ L: linux-visws-devel@lists.sf.net W: http://linux-visws.sf.net S: Maintained for 2.6. -SGI GRU DRIVER -P: Jack Steiner -M: steiner@sgi.com -S: Maintained - SGI XP/XPC/XPNET DRIVER P: Dean Nelson M: dcn@sgi.com S: Maintained +SHARP LH SUPPORT (LH7952X & LH7A40X) +P: Marc Singer +M: elf@buici.com +W: http://projects.buici.com/arm +L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) +S: Maintained + +SHPC HOTPLUG DRIVER +P: Kristen Carlson Accardi +M: kristen.c.accardi@intel.com +L: linux-pci@vger.kernel.org +S: Supported + SIMTEC EB110ATX (Chalice CATS) P: Ben Dooks P: Vincent Sanders @@ -3775,6 +3782,12 @@ M: thomas@winischhofer.net W: http://www.winischhofer.at/linuxsisusbvga.shtml S: Maintained +SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS +P: Stephen Hemminger +M: shemminger@linux-foundation.org +L: netdev@vger.kernel.org +S: Maintained + SLAB ALLOCATOR P: Christoph Lameter M: cl@linux-foundation.org @@ -3801,12 +3814,25 @@ P: Ben Nizette M: bn@niasdigital.com S: Maintained +SN-IA64 (Itanium) SUB-PLATFORM +P: Jes Sorensen +M: jes@sgi.com +L: linux-altix@sgi.com +L: linux-ia64@vger.kernel.org +W: http://www.sgi.com/altix +S: Maintained + SOC-CAMERA V4L2 SUBSYSTEM P: Guennadi Liakhovetski M: g.liakhovetski@gmx.de L: video4linux-list@redhat.com S: Maintained +SOEKRIS NET48XX LED SUPPORT +P: Chris Boot +M: bootc@bootc.net +S: Maintained + SOFTWARE RAID (Multiple Disks) SUPPORT P: Ingo Molnar M: mingo@redhat.com @@ -3815,24 +3841,6 @@ M: neilb@suse.de L: linux-raid@vger.kernel.org S: Supported -HIBERNATION (aka Software Suspend, aka swsusp): -P: Pavel Machek -M: pavel@suse.cz -P: Rafael J. Wysocki -M: rjw@sisk.pl -L: linux-pm@lists.linux-foundation.org -S: Supported - -SUSPEND TO RAM: -P: Len Brown -M: len.brown@intel.com -P: Pavel Machek -M: pavel@suse.cz -P: Rafael J. Wysocki -M: rjw@sisk.pl -L: linux-pm@lists.linux-foundation.org -S: Supported - SONIC NETWORK DRIVER P: Thomas Bogendoerfer M: tsbogend@alpha.franken.de @@ -3877,59 +3885,7 @@ L: alsa-devel@alsa-project.org (subscribers-only) W: http://alsa-project.org/main/index.php/ASoC S: Supported -SPI SUBSYSTEM -P: David Brownell -M: dbrownell@users.sourceforge.net -L: spi-devel-general@lists.sourceforge.net -S: Maintained - -SPU FILE SYSTEM -P: Jeremy Kerr -M: jk@ozlabs.org -L: linuxppc-dev@ozlabs.org -L: cbe-oss-dev@ozlabs.org -W: http://www.ibm.com/developerworks/power/cell/ -S: Supported - -STABLE BRANCH: -P: Greg Kroah-Hartman -M: greg@kroah.com -P: Chris Wright -M: chrisw@sous-sol.org -L: stable@kernel.org -S: Maintained - -SHARP LH SUPPORT (LH7952X & LH7A40X) -P: Marc Singer -M: elf@buici.com -W: http://projects.buici.com/arm -L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) -S: Maintained - -SHPC HOTPLUG DRIVER -P: Kristen Carlson Accardi -M: kristen.c.accardi@intel.com -L: linux-pci@vger.kernel.org -S: Supported - -SECURE DIGITAL HOST CONTROLLER INTERFACE DRIVER -P: Pierre Ossman -M: drzeus-sdhci@drzeus.cx -L: sdhci-devel@list.drzeus.cx -S: Maintained - -SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS -P: Stephen Hemminger -M: shemminger@linux-foundation.org -L: netdev@vger.kernel.org -S: Maintained - -SOEKRIS NET48XX LED SUPPORT -P: Chris Boot -M: bootc@bootc.net -S: Maintained - -SPARC (sparc32): +SPARC (sparc32) P: William L. Irwin M: wli@holomorphy.com L: sparclinux@vger.kernel.org @@ -3941,6 +3897,12 @@ M: R.E.Wolff@BitWizard.nl L: linux-kernel@vger.kernel.org ? S: Supported +SPI SUBSYSTEM +P: David Brownell +M: dbrownell@users.sourceforge.net +L: spi-devel-general@lists.sourceforge.net +S: Maintained + SPIDERNET NETWORK DRIVER for CELL P: Ishizaki Kou M: kou.ishizaki@toshiba.co.jp @@ -3949,12 +3911,28 @@ M: jens@de.ibm.com L: netdev@vger.kernel.org S: Supported +SPU FILE SYSTEM +P: Jeremy Kerr +M: jk@ozlabs.org +L: linuxppc-dev@ozlabs.org +L: cbe-oss-dev@ozlabs.org +W: http://www.ibm.com/developerworks/power/cell/ +S: Supported + SRM (Alpha) environment access P: Jan-Benedict Glaw M: jbglaw@lug-owl.de L: linux-kernel@vger.kernel.org S: Maintained +STABLE BRANCH: +P: Greg Kroah-Hartman +M: greg@kroah.com +P: Chris Wright +M: chrisw@sous-sol.org +L: stable@kernel.org +S: Maintained + STARFIRE/DURALAN NETWORK DRIVER P: Ion Badulescu M: ionut@cs.columbia.edu @@ -3970,6 +3948,12 @@ M: laredo@gnu.org W: http://www.stradis.com/ S: Maintained +SUN3/3X +P: Sam Creasey +M: sammy@sammy.net +W: http://sammy.net/sun3/ +S: Maintained + SUPERH P: Paul Mundt M: lethal@linux-sh.org @@ -3978,11 +3962,15 @@ W: http://www.linux-sh.org T: git kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git S: Supported -SUN3/3X -P: Sam Creasey -M: sammy@sammy.net -W: http://sammy.net/sun3/ -S: Maintained +SUSPEND TO RAM +P: Len Brown +M: len.brown@intel.com +P: Pavel Machek +M: pavel@suse.cz +P: Rafael J. Wysocki +M: rjw@sisk.pl +L: linux-pm@lists.linux-foundation.org +S: Supported SVGA HANDLING P: Martin Mares @@ -4028,7 +4016,7 @@ P: Mark Gross M: mark.gross@intel.com S: Supported -TENSILICA XTENSA PORT (xtensa): +TENSILICA XTENSA PORT (xtensa) P: Chris Zankel M: chris@zankel.net S: Maintained @@ -4142,6 +4130,16 @@ M: ballabio_dario@emc.com L: linux-scsi@vger.kernel.org S: Maintained +UBI FILE SYSTEM (UBIFS) +P: Artem Bityutskiy +M: dedekind@infradead.org +P: Adrian Hunter +M: ext-adrian.hunter@nokia.com +L: linux-mtd@lists.infradead.org +T: git git://git.infradead.org/~dedekind/ubifs-2.6.git +W: http://www.linux-mtd.infradead.org/doc/ubifs.html +S: Maintained + UCLINUX (AND M68KNOMMU) P: Greg Ungerer M: gerg@uclinux.org @@ -4167,7 +4165,7 @@ M: dushistov@mail.ru L: linux-kernel@vger.kernel.org S: Maintained -UltraSPARC (sparc64): +UltraSPARC (sparc64) P: David S. Miller M: davem@davemloft.net L: sparclinux@vger.kernel.org @@ -4181,6 +4179,14 @@ L: linux-kernel@vger.kernel.org W: http://www.kernel.dk S: Maintained +UNSORTED BLOCK IMAGES (UBI) +P: Artem Bityutskiy +M: dedekind@infradead.org +W: http://www.linux-mtd.infradead.org/ +L: linux-mtd@lists.infradead.org +T: git git://git.infradead.org/~dedekind/ubi-2.6.git +S: Maintained + USB ACM DRIVER P: Oliver Neukum M: oliver@neukum.name @@ -4450,7 +4456,7 @@ L: video4linux-list@redhat.com W: http://royale.zerezo.com/zr364xx/ S: Maintained -USER-MODE LINUX +USER-MODE LINUX (UML) P: Jeff Dike M: jdike@addtoit.com L: user-mode-linux-devel@lists.sourceforge.net @@ -4474,7 +4480,7 @@ W: http://kernel.org/~kzak/util-linux-ng/ T: git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git S: Maintained -VFAT/FAT/MSDOS FILESYSTEM: +VFAT/FAT/MSDOS FILESYSTEM P: OGAWA Hirofumi M: hirofumi@mail.parknet.co.jp L: linux-kernel@vger.kernel.org @@ -4497,7 +4503,7 @@ M: romieu@fr.zoreil.com L: netdev@vger.kernel.org S: Maintained -VIDEO FOR LINUX +VIDEO FOR LINUX (V4L) P: Mauro Carvalho Chehab M: mchehab@infradead.org M: v4l-dvb-maintainer@linuxtv.org @@ -4603,6 +4609,17 @@ M: eis@baty.hanse.de L: linux-x25@vger.kernel.org S: Maintained +X86 ARCHITECTURE (32-BIT AND 64-BIT) +P: Thomas Gleixner +M: tglx@linutronix.de +P: Ingo Molnar +M: mingo@redhat.com +P: H. Peter Anvin +M: hpa@zytor.com +L: linux-kernel@vger.kernel.org +T: git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git +S: Maintained + XEN HYPERVISOR INTERFACE P: Jeremy Fitzhardinge M: jeremy@xensource.com @@ -4634,17 +4651,6 @@ M: jacmet@sunsite.dk L: linux-serial@vger.kernel.org S: Maintained -X86 ARCHITECTURE (32-BIT AND 64-BIT) -P: Thomas Gleixner -M: tglx@linutronix.de -P: Ingo Molnar -M: mingo@redhat.com -P: H. Peter Anvin -M: hpa@zytor.com -L: linux-kernel@vger.kernel.org -T: git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git -S: Maintained - YAM DRIVER FOR AX.25 P: Jean-Paul Roubelat M: jpr@f6fbb.org diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig index 364c6dadde0a..0267babe5eb9 100644 --- a/trunk/arch/Kconfig +++ b/trunk/arch/Kconfig @@ -13,6 +13,20 @@ config OPROFILE If unsure, say N. +config OPROFILE_IBS + bool "OProfile AMD IBS support (EXPERIMENTAL)" + default n + depends on OPROFILE && SMP && X86 + help + Instruction-Based Sampling (IBS) is a new profiling + technique that provides rich, precise program performance + information. IBS is introduced by AMD Family10h processors + (AMD Opteron Quad-Core processor “Barcelona”) to overcome + the limitations of conventional performance counter + sampling. + + If unsure, say N. + config HAVE_OPROFILE def_bool n diff --git a/trunk/arch/alpha/Kconfig b/trunk/arch/alpha/Kconfig index 1bec55d63ef6..ee35226c44e9 100644 --- a/trunk/arch/alpha/Kconfig +++ b/trunk/arch/alpha/Kconfig @@ -5,6 +5,7 @@ config ALPHA bool default y + select HAVE_AOUT select HAVE_IDE select HAVE_OPROFILE help @@ -68,9 +69,6 @@ config AUTO_IRQ_AFFINITY depends on SMP default y -config ARCH_SUPPORTS_AOUT - def_bool y - source "init/Kconfig" diff --git a/trunk/arch/alpha/include/asm/statfs.h b/trunk/arch/alpha/include/asm/statfs.h index ad15830baefe..de35cd438a10 100644 --- a/trunk/arch/alpha/include/asm/statfs.h +++ b/trunk/arch/alpha/include/asm/statfs.h @@ -1,6 +1,10 @@ #ifndef _ALPHA_STATFS_H #define _ALPHA_STATFS_H +/* Alpha is the only 64-bit platform with 32-bit statfs. And doesn't + even seem to implement statfs64 */ +#define __statfs_word __u32 + #include #endif diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index efeed65b4a66..4853f9df37bd 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -8,6 +8,7 @@ mainmenu "Linux Kernel Configuration" config ARM bool default y + select HAVE_AOUT select HAVE_IDE select RTC_LIB select SYS_SUPPORTS_APM_EMULATION @@ -140,9 +141,6 @@ config GENERIC_CALIBRATE_DELAY bool default y -config ARCH_SUPPORTS_AOUT - def_bool y - config ARCH_MAY_HAVE_PC_FDC bool diff --git a/trunk/arch/arm/include/asm/statfs.h b/trunk/arch/arm/include/asm/statfs.h index a02e6a8c3d70..079447c05ba7 100644 --- a/trunk/arch/arm/include/asm/statfs.h +++ b/trunk/arch/arm/include/asm/statfs.h @@ -1,42 +1,12 @@ #ifndef _ASMARM_STATFS_H #define _ASMARM_STATFS_H -#ifndef __KERNEL_STRICT_NAMES -# include -typedef __kernel_fsid_t fsid_t; -#endif - -struct statfs { - __u32 f_type; - __u32 f_bsize; - __u32 f_blocks; - __u32 f_bfree; - __u32 f_bavail; - __u32 f_files; - __u32 f_ffree; - __kernel_fsid_t f_fsid; - __u32 f_namelen; - __u32 f_frsize; - __u32 f_spare[5]; -}; - /* * With EABI there is 4 bytes of padding added to this structure. * Let's pack it so the padding goes away to simplify dual ABI support. * Note that user space does NOT have to pack this structure. */ -struct statfs64 { - __u32 f_type; - __u32 f_bsize; - __u64 f_blocks; - __u64 f_bfree; - __u64 f_bavail; - __u64 f_files; - __u64 f_ffree; - __kernel_fsid_t f_fsid; - __u32 f_namelen; - __u32 f_frsize; - __u32 f_spare[5]; -} __attribute__ ((packed,aligned(4))); +#define ARCH_PACK_STATFS64 __attribute__((packed,aligned(4))) +#include #endif diff --git a/trunk/arch/arm/kernel/dma.c b/trunk/arch/arm/kernel/dma.c index ba99a2035523..d006085ed7e7 100644 --- a/trunk/arch/arm/kernel/dma.c +++ b/trunk/arch/arm/kernel/dma.c @@ -25,23 +25,6 @@ EXPORT_SYMBOL(dma_spin_lock); static dma_t dma_chan[MAX_DMA_CHANNELS]; -/* - * Get dma list for /proc/dma - */ -int get_dma_list(char *buf) -{ - dma_t *dma; - char *p = buf; - int i; - - for (i = 0, dma = dma_chan; i < MAX_DMA_CHANNELS; i++, dma++) - if (dma->lock) - p += sprintf(p, "%2d: %14s %s\n", i, - dma->d_ops->type, dma->device_id); - - return p - buf; -} - /* * Request DMA channel * diff --git a/trunk/arch/arm/mach-orion5x/include/mach/orion5x.h b/trunk/arch/arm/mach-orion5x/include/mach/orion5x.h index e67c843baa02..9f5ce1ce5840 100644 --- a/trunk/arch/arm/mach-orion5x/include/mach/orion5x.h +++ b/trunk/arch/arm/mach-orion5x/include/mach/orion5x.h @@ -157,9 +157,11 @@ #define CPU_CONF ORION5X_BRIDGE_REG(0x100) #define CPU_CTRL ORION5X_BRIDGE_REG(0x104) #define CPU_RESET_MASK ORION5X_BRIDGE_REG(0x108) +#define WDT_RESET 0x0002 #define CPU_SOFT_RESET ORION5X_BRIDGE_REG(0x10c) #define POWER_MNG_CTRL_REG ORION5X_BRIDGE_REG(0x11C) #define BRIDGE_CAUSE ORION5X_BRIDGE_REG(0x110) +#define WDT_INT_REQ 0x0008 #define BRIDGE_MASK ORION5X_BRIDGE_REG(0x114) #define BRIDGE_INT_TIMER0 0x0002 #define BRIDGE_INT_TIMER1 0x0004 diff --git a/trunk/arch/arm/plat-omap/devices.c b/trunk/arch/arm/plat-omap/devices.c index a716ecd1db27..97187fa0ae52 100644 --- a/trunk/arch/arm/plat-omap/devices.c +++ b/trunk/arch/arm/plat-omap/devices.c @@ -441,16 +441,8 @@ static inline void omap_init_uwire(void) {} #if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE) -#ifdef CONFIG_ARCH_OMAP24XX -#define OMAP_WDT_BASE 0x48022000 -#else -#define OMAP_WDT_BASE 0xfffeb000 -#endif - static struct resource wdt_resources[] = { { - .start = OMAP_WDT_BASE, - .end = OMAP_WDT_BASE + 0x4f, .flags = IORESOURCE_MEM, }, }; @@ -464,6 +456,19 @@ static struct platform_device omap_wdt_device = { static void omap_init_wdt(void) { + if (cpu_is_omap16xx()) + wdt_resources[0].start = 0xfffeb000; + else if (cpu_is_omap2420()) + wdt_resources[0].start = 0x48022000; /* WDT2 */ + else if (cpu_is_omap2430()) + wdt_resources[0].start = 0x49016000; /* WDT2 */ + else if (cpu_is_omap343x()) + wdt_resources[0].start = 0x48314000; /* WDT2 */ + else + return; + + wdt_resources[0].end = wdt_resources[0].start + 0x4f; + (void) platform_device_register(&omap_wdt_device); } #else diff --git a/trunk/arch/avr32/boards/atngw100/setup.c b/trunk/arch/avr32/boards/atngw100/setup.c index b8286f1ce854..6c54580a66df 100644 --- a/trunk/arch/avr32/boards/atngw100/setup.c +++ b/trunk/arch/avr32/boards/atngw100/setup.c @@ -9,6 +9,7 @@ */ #include #include +#include #include #include #include @@ -53,8 +54,11 @@ static struct spi_board_info spi0_board_info[] __initdata = { }; static struct mci_platform_data __initdata mci0_data = { - .detect_pin = GPIO_PIN_PC(25), - .wp_pin = GPIO_PIN_PE(0), + .slot[0] = { + .bus_width = 4, + .detect_pin = GPIO_PIN_PC(25), + .wp_pin = GPIO_PIN_PE(0), + }, }; /* @@ -190,7 +194,7 @@ static int __init atngw100_init(void) * PB28/EXTINT3 doesn't; it should be SMBALERT# (for PMBus), * but it's not available off-board. */ - at32_select_periph(GPIO_PIN_PB(28), 0, AT32_GPIOF_PULLUP); + at32_select_periph(GPIO_PIOB_BASE, 1 << 28, 0, AT32_GPIOF_PULLUP); at32_select_gpio(i2c_gpio_data.sda_pin, AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH); at32_select_gpio(i2c_gpio_data.scl_pin, @@ -204,6 +208,15 @@ postcore_initcall(atngw100_init); static int __init atngw100_arch_init(void) { + /* PB30 is the otherwise unused jumper on the mainboard, with an + * external pullup; the jumper grounds it. Use it however you + * like, including letting U-Boot or Linux tweak boot sequences. + */ + at32_select_gpio(GPIO_PIN_PB(30), 0); + gpio_request(GPIO_PIN_PB(30), "j15"); + gpio_direction_input(GPIO_PIN_PB(30)); + gpio_export(GPIO_PIN_PB(30), false); + /* set_irq_type() after the arch_initcall for EIC has run, and * before the I2C subsystem could try using this IRQ. */ diff --git a/trunk/arch/avr32/boards/atstk1000/atstk1002.c b/trunk/arch/avr32/boards/atstk1000/atstk1002.c index dfc3443e23aa..29e5b51a7fd2 100644 --- a/trunk/arch/avr32/boards/atstk1000/atstk1002.c +++ b/trunk/arch/avr32/boards/atstk1000/atstk1002.c @@ -232,7 +232,7 @@ static void __init atstk1002_setup_extdac(void) goto err_set_clk; } - at32_select_periph(GPIO_PIN_PA(30), GPIO_PERIPH_A, 0); + at32_select_periph(GPIO_PIOA_BASE, (1 << 30), GPIO_PERIPH_A, 0); at73c213_data.dac_clk = gclk; err_set_clk: @@ -264,16 +264,20 @@ void __init setup_board(void) #ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM +static struct mci_platform_data __initdata mci0_data = { + .slot[0] = { + .bus_width = 4, + /* MMC card detect requires MACB0 *NOT* be used */ #ifdef CONFIG_BOARD_ATSTK1002_SW6_CUSTOM -static struct mci_platform_data __initdata mci0_data = { - .detect_pin = GPIO_PIN_PC(14), /* gpio30/sdcd */ - .wp_pin = GPIO_PIN_PC(15), /* gpio31/sdwp */ -}; -#define MCI_PDATA &mci0_data + .detect_pin = GPIO_PIN_PC(14), /* gpio30/sdcd */ + .wp_pin = GPIO_PIN_PC(15), /* gpio31/sdwp */ #else -#define MCI_PDATA NULL + .detect_pin = -ENODEV, + .wp_pin = -ENODEV, #endif /* SW6 for sd{cd,wp} routing */ + }, +}; #endif /* SW2 for MMC signal routing */ @@ -326,13 +330,14 @@ static int __init atstk1002_init(void) at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info)); #endif #ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM - at32_add_device_mci(0, MCI_PDATA); + at32_add_device_mci(0, &mci0_data); #endif #ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM set_hw_addr(at32_add_device_eth(1, ð_data[1])); #else at32_add_device_lcdc(0, &atstk1000_lcdc_data, - fbmem_start, fbmem_size, 0); + fbmem_start, fbmem_size, + ATMEL_LCDC_PRI_24BIT | ATMEL_LCDC_PRI_CONTROL); #endif at32_add_device_usba(0, NULL); #ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM diff --git a/trunk/arch/avr32/boards/atstk1000/atstk1003.c b/trunk/arch/avr32/boards/atstk1000/atstk1003.c index 0cf664174c17..be089d7f37eb 100644 --- a/trunk/arch/avr32/boards/atstk1000/atstk1003.c +++ b/trunk/arch/avr32/boards/atstk1000/atstk1003.c @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -66,6 +67,16 @@ static struct spi_board_info spi1_board_info[] __initdata = { { } }; #endif +#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM +static struct mci_platform_data __initdata mci0_data = { + .slot[0] = { + .bus_width = 4, + .detect_pin = -ENODEV, + .wp_pin = -ENODEV, + }, +}; +#endif + #ifdef CONFIG_BOARD_ATSTK1000_EXTDAC static void __init atstk1003_setup_extdac(void) { @@ -84,7 +95,7 @@ static void __init atstk1003_setup_extdac(void) goto err_set_clk; } - at32_select_periph(GPIO_PIN_PA(30), GPIO_PERIPH_A, 0); + at32_select_periph(GPIO_PIOA_BASE, (1 << 30), GPIO_PERIPH_A, 0); at73c213_data.dac_clk = gclk; err_set_clk: @@ -154,7 +165,7 @@ static int __init atstk1003_init(void) at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info)); #endif #ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM - at32_add_device_mci(0, NULL); + at32_add_device_mci(0, &mci0_data); #endif at32_add_device_usba(0, NULL); #ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM diff --git a/trunk/arch/avr32/boards/atstk1000/atstk1004.c b/trunk/arch/avr32/boards/atstk1000/atstk1004.c index 50a5273e5916..248ef237c167 100644 --- a/trunk/arch/avr32/boards/atstk1000/atstk1004.c +++ b/trunk/arch/avr32/boards/atstk1000/atstk1004.c @@ -21,6 +21,7 @@ #include