From 6b6ec173e58296a4948ad755582351605ccf01ef Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Wed, 21 Nov 2007 02:53:14 +0100 Subject: [PATCH] --- yaml --- r: 74671 b: refs/heads/master c: cb43c54ca05c01533c45e4d3abfe8f99b7acf624 h: refs/heads/master i: 74669: 9e83391c3c2c5e49a681887f4a5102e159158a31 74667: a0a25ca139cc192a24162e72c54bcdcf02d70778 74663: f7f370ddd8032b666b14dfdfaa14f9f3f14f5e24 74655: 5c5013150217f43a9da7e09d77a1f050155ace5b v: v3 --- [refs] | 2 +- trunk/Documentation/00-INDEX | 2 - trunk/Documentation/DocBook/Makefile | 2 +- trunk/Documentation/DocBook/uio-howto.tmpl | 90 +- trunk/Documentation/lguest/lguest.c | 9 +- .../namespaces/compatibility-list.txt | 39 - trunk/Documentation/parport-lowlevel.txt | 4 - .../powerpc/booting-without-of.txt | 5 +- trunk/Documentation/thinkpad-acpi.txt | 73 +- trunk/Documentation/tty.txt | 8 - trunk/Documentation/usb/power-management.txt | 8 - trunk/Documentation/x86_64/uefi.txt | 29 - trunk/MAINTAINERS | 140 +- trunk/Makefile | 2 +- trunk/arch/alpha/kernel/pci-noop.c | 14 +- trunk/arch/arm/common/uengine.c | 6 +- trunk/arch/arm/kernel/entry-armv.S | 96 +- trunk/arch/arm/kernel/traps.c | 5 +- trunk/arch/arm/mach-at91/at91rm9200_devices.c | 41 +- .../arch/arm/mach-at91/at91sam9260_devices.c | 42 +- .../arch/arm/mach-at91/at91sam9261_devices.c | 42 +- .../arch/arm/mach-at91/at91sam9263_devices.c | 42 +- trunk/arch/arm/mach-at91/at91sam9rl_devices.c | 43 +- trunk/arch/arm/mach-at91/board-carmeva.c | 2 +- trunk/arch/arm/mach-at91/board-csb337.c | 11 +- trunk/arch/arm/mach-at91/board-csb637.c | 2 +- trunk/arch/arm/mach-at91/board-dk.c | 15 +- trunk/arch/arm/mach-at91/board-eb9200.c | 10 +- trunk/arch/arm/mach-at91/board-ek.c | 2 +- trunk/arch/arm/mach-at91/board-kafa.c | 2 +- trunk/arch/arm/mach-at91/board-kb9202.c | 2 +- trunk/arch/arm/mach-at91/board-picotux200.c | 2 +- trunk/arch/arm/mach-at91/board-sam9260ek.c | 2 +- trunk/arch/arm/mach-at91/board-sam9261ek.c | 18 +- trunk/arch/arm/mach-at91/board-sam9263ek.c | 2 +- trunk/arch/arm/mach-at91/board-sam9rlek.c | 2 +- trunk/arch/arm/mach-at91/clock.c | 9 +- trunk/arch/arm/mach-imx/irq.c | 51 +- trunk/arch/arm/mach-pxa/pxa27x.c | 2 +- trunk/arch/arm/mach-pxa/pxa320.c | 7 +- trunk/arch/arm/mach-pxa/ssp.c | 1 - trunk/arch/blackfin/Kconfig | 314 ++++- trunk/arch/blackfin/Kconfig.debug | 178 --- trunk/arch/blackfin/Makefile | 2 - .../blackfin/configs/BF527-EZKIT_defconfig | 27 +- .../blackfin/configs/BF533-EZKIT_defconfig | 41 +- .../blackfin/configs/BF533-STAMP_defconfig | 41 +- .../blackfin/configs/BF537-STAMP_defconfig | 83 +- .../blackfin/configs/BF548-EZKIT_defconfig | 30 +- .../blackfin/configs/BF561-EZKIT_defconfig | 49 +- trunk/arch/blackfin/configs/H8606_defconfig | 1160 ----------------- trunk/arch/blackfin/configs/PNAV-10_defconfig | 75 +- trunk/arch/blackfin/kernel/bfin_dma_5xx.c | 1 - trunk/arch/blackfin/kernel/bfin_ksyms.c | 7 +- trunk/arch/blackfin/kernel/cplbinit.c | 73 +- trunk/arch/blackfin/kernel/early_printk.c | 3 +- trunk/arch/blackfin/kernel/process.c | 66 + trunk/arch/blackfin/kernel/setup.c | 9 +- trunk/arch/blackfin/kernel/traps.c | 147 +-- trunk/arch/blackfin/lib/Makefile | 2 +- trunk/arch/blackfin/lib/ins.S | 19 - trunk/arch/blackfin/lib/strcmp.c | 11 +- trunk/arch/blackfin/lib/strcpy.c | 11 +- trunk/arch/blackfin/lib/strncmp.c | 11 +- trunk/arch/blackfin/lib/strncpy.c | 11 +- trunk/arch/blackfin/lib/udivdi3.S | 375 ++++++ trunk/arch/blackfin/mach-bf527/Kconfig | 2 - trunk/arch/blackfin/mach-bf527/boards/Kconfig | 12 - .../arch/blackfin/mach-bf527/boards/Makefile | 6 +- .../arch/blackfin/mach-bf527/boards/eth_mac.c | 50 + trunk/arch/blackfin/mach-bf527/boards/ezkit.c | 37 +- trunk/arch/blackfin/mach-bf533/Kconfig | 2 - trunk/arch/blackfin/mach-bf533/boards/H8606.c | 12 +- trunk/arch/blackfin/mach-bf533/boards/Kconfig | 34 - .../arch/blackfin/mach-bf533/boards/Makefile | 2 +- .../blackfin/mach-bf533/boards/cm_bf533.c | 4 +- trunk/arch/blackfin/mach-bf533/boards/ezkit.c | 4 +- .../mach-bf533/boards/generic_board.c | 4 + trunk/arch/blackfin/mach-bf533/boards/stamp.c | 4 +- trunk/arch/blackfin/mach-bf537/Kconfig | 2 - trunk/arch/blackfin/mach-bf537/boards/Kconfig | 29 - .../arch/blackfin/mach-bf537/boards/Makefile | 9 +- .../blackfin/mach-bf537/boards/cm_bf537.c | 11 +- .../arch/blackfin/mach-bf537/boards/eth_mac.c | 50 + .../mach-bf537/boards/generic_board.c | 13 +- .../arch/blackfin/mach-bf537/boards/pnav10.c | 15 +- trunk/arch/blackfin/mach-bf537/boards/stamp.c | 50 +- trunk/arch/blackfin/mach-bf548/Kconfig | 2 - trunk/arch/blackfin/mach-bf548/boards/Kconfig | 12 - .../arch/blackfin/mach-bf548/boards/Makefile | 2 +- trunk/arch/blackfin/mach-bf548/boards/ezkit.c | 20 +- trunk/arch/blackfin/mach-bf548/head.S | 21 - trunk/arch/blackfin/mach-bf561/Kconfig | 4 +- trunk/arch/blackfin/mach-bf561/boards/Kconfig | 27 - .../arch/blackfin/mach-bf561/boards/Makefile | 2 +- .../blackfin/mach-bf561/boards/cm_bf561.c | 4 +- trunk/arch/blackfin/mach-bf561/boards/ezkit.c | 29 - .../mach-bf561/boards/generic_board.c | 4 + trunk/arch/blackfin/mach-bf561/boards/tepla.c | 4 + trunk/arch/blackfin/mach-common/cplbinfo.c | 2 +- trunk/arch/blackfin/mach-common/cplbmgr.S | 25 +- trunk/arch/blackfin/mach-common/entry.S | 54 +- trunk/arch/blackfin/mach-common/interrupt.S | 1 + .../blackfin/mach-common/ints-priority-dc.c | 21 +- .../blackfin/mach-common/ints-priority-sc.c | 28 +- trunk/arch/blackfin/mach-common/irqpanic.c | 14 +- trunk/arch/blackfin/mm/blackfin_sram.c | 1 + trunk/arch/cris/arch-v10/drivers/Kconfig | 39 + trunk/arch/cris/arch-v32/drivers/Kconfig | 12 + trunk/arch/frv/kernel/break.S | 2 +- trunk/arch/frv/kernel/entry.S | 2 +- trunk/arch/frv/kernel/vmlinux.lds.S | 27 +- trunk/arch/frv/mm/tlb-miss.S | 2 +- trunk/arch/m32r/kernel/signal.c | 17 +- trunk/arch/m32r/kernel/syscall_table.S | 40 - trunk/arch/m68k/atari/atakeyb.c | 3 +- trunk/arch/mips/Kconfig | 37 - trunk/arch/mips/au1000/Kconfig | 1 - trunk/arch/mips/au1000/common/dbdma.c | 2 +- trunk/arch/mips/au1000/common/irq.c | 16 +- trunk/arch/mips/au1000/pb1200/irqmap.c | 2 +- trunk/arch/mips/kernel/Makefile | 2 - trunk/arch/mips/kernel/cevt-r4k.c | 14 +- trunk/arch/mips/kernel/csrc-r4k.c | 33 - trunk/arch/mips/kernel/setup.c | 31 +- trunk/arch/mips/kernel/smp-up.c | 67 - trunk/arch/mips/kernel/time.c | 112 +- trunk/arch/mips/kernel/vpe.c | 4 +- trunk/arch/mips/math-emu/ieee754.c | 2 - trunk/arch/mips/math-emu/ieee754dp.c | 2 - trunk/arch/mips/math-emu/ieee754sp.c | 2 - trunk/arch/mips/mipssim/sim_time.c | 6 +- trunk/arch/mips/mm/dma-default.c | 37 +- trunk/arch/mips/mm/init.c | 43 +- trunk/arch/mips/oprofile/op_model_mipsxx.c | 44 +- trunk/arch/mips/pci/pci-bcm1480.c | 6 +- trunk/arch/mips/pmc-sierra/Kconfig | 2 - trunk/arch/mips/sgi-ip22/ip22-eisa.c | 134 +- trunk/arch/mips/sgi-ip22/ip22-nvram.c | 40 +- trunk/arch/mips/sgi-ip22/ip22-setup.c | 19 + trunk/arch/mips/sgi-ip32/ip32-irq.c | 24 +- trunk/arch/mips/vr41xx/Kconfig | 6 - trunk/arch/powerpc/Kconfig | 5 - trunk/arch/powerpc/boot/dts/mpc832x_mds.dts | 16 +- trunk/arch/powerpc/boot/dts/mpc834x_mds.dts | 9 - trunk/arch/powerpc/boot/dts/mpc836x_mds.dts | 9 - trunk/arch/powerpc/boot/dts/mpc8544ds.dts | 20 +- trunk/arch/powerpc/boot/dts/mpc8572ds.dts | 108 +- trunk/arch/powerpc/boot/dts/mpc8641_hpcn.dts | 126 +- .../powerpc/configs/mpc832x_mds_defconfig | 48 +- .../powerpc/configs/mpc832x_rdb_defconfig | 41 +- .../powerpc/configs/mpc834x_itx_defconfig | 2 +- .../powerpc/configs/mpc834x_itxgp_defconfig | 88 +- .../powerpc/configs/mpc834x_mds_defconfig | 48 +- .../powerpc/configs/mpc836x_mds_defconfig | 48 +- .../arch/powerpc/configs/mpc8568mds_defconfig | 48 +- trunk/arch/powerpc/kernel/asm-offsets.c | 4 - trunk/arch/powerpc/kernel/rtas.c | 99 +- trunk/arch/powerpc/kernel/time.c | 5 +- trunk/arch/powerpc/kernel/vdso.c | 11 - trunk/arch/powerpc/kernel/vdso32/cacheflush.S | 41 +- trunk/arch/powerpc/kernel/vdso64/cacheflush.S | 41 +- trunk/arch/powerpc/mm/mem.c | 2 +- trunk/arch/powerpc/mm/mmu_decl.h | 2 +- trunk/arch/powerpc/mm/stab.c | 1 - trunk/arch/powerpc/platforms/40x/walnut.c | 3 +- trunk/arch/powerpc/platforms/44x/bamboo.c | 3 +- trunk/arch/powerpc/platforms/44x/ebony.c | 3 +- trunk/arch/powerpc/platforms/44x/sequoia.c | 3 +- .../arch/powerpc/platforms/83xx/mpc832x_mds.c | 31 +- .../arch/powerpc/platforms/83xx/mpc832x_rdb.c | 14 +- .../arch/powerpc/platforms/83xx/mpc834x_mds.c | 24 + .../arch/powerpc/platforms/83xx/mpc836x_mds.c | 55 +- trunk/arch/powerpc/platforms/83xx/usb.c | 8 +- .../arch/powerpc/platforms/cell/spufs/inode.c | 1 - .../powerpc/platforms/embedded6xx/prpmc2800.c | 1 - trunk/arch/powerpc/platforms/pasemi/setup.c | 2 +- trunk/arch/powerpc/platforms/pseries/Kconfig | 2 +- trunk/arch/powerpc/sysdev/uic.c | 18 +- trunk/arch/ppc/configs/ml300_defconfig | 2 +- trunk/arch/ppc/configs/ml403_defconfig | 2 +- trunk/arch/ppc/kernel/setup.c | 7 - trunk/arch/ppc/mm/init.c | 2 +- trunk/arch/ppc/mm/mmu_decl.h | 2 +- trunk/arch/ppc/platforms/4xx/yucca.c | 1 - trunk/arch/ppc/syslib/virtex_devices.c | 31 - trunk/arch/s390/appldata/appldata.h | 1 + trunk/arch/s390/appldata/appldata_base.c | 74 +- trunk/arch/s390/appldata/appldata_mem.c | 1 + trunk/arch/s390/appldata/appldata_net_sum.c | 1 + trunk/arch/s390/appldata/appldata_os.c | 1 + trunk/arch/s390/kernel/early.c | 2 +- trunk/arch/s390/kernel/entry.S | 122 +- trunk/arch/s390/kernel/entry64.S | 114 +- trunk/arch/s390/kernel/setup.c | 10 +- trunk/arch/s390/kernel/smp.c | 56 +- trunk/arch/s390/kernel/traps.c | 1 - trunk/arch/s390/mm/cmm.c | 3 + .../arch/sh/boards/renesas/rts7751r2d/setup.c | 2 - trunk/arch/sh/configs/r7780mp_defconfig | 287 ++-- trunk/arch/sh/configs/r7785rp_defconfig | 10 +- trunk/arch/sh/drivers/pci/ops-r7780rp.c | 4 +- trunk/arch/sh/drivers/pci/ops-se7780.c | 4 +- trunk/arch/sh/drivers/pci/pci-sh7780.h | 2 +- trunk/arch/sh/mm/fault.c | 33 +- trunk/arch/sparc/kernel/devices.c | 4 +- trunk/arch/sparc/kernel/pcic.c | 8 +- trunk/arch/sparc64/defconfig | 9 +- trunk/arch/sparc64/kernel/isa.c | 2 - trunk/arch/sparc64/kernel/ldc.c | 15 +- trunk/arch/sparc64/kernel/pci_sun4v.c | 4 - trunk/arch/sparc64/kernel/smp.c | 5 +- trunk/arch/um/Kconfig.i386 | 7 - trunk/arch/um/Makefile | 2 +- trunk/arch/um/Makefile-i386 | 5 + trunk/arch/um/drivers/chan_user.c | 11 +- trunk/arch/um/drivers/ubd_kern.c | 1 - trunk/arch/um/os-Linux/time.c | 55 +- trunk/arch/x86/Kconfig | 8 +- trunk/arch/x86/Makefile | 5 +- trunk/arch/x86/boot/header.S | 41 +- trunk/arch/x86/kernel/acpi/processor.c | 3 - trunk/arch/x86/kernel/acpi/sleep_64.c | 3 + trunk/arch/x86/kernel/acpi/wakeup_32.S | 4 + trunk/arch/x86/kernel/apic_32.c | 2 +- trunk/arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +- trunk/arch/x86/kernel/crash.c | 4 - trunk/arch/x86/kernel/head_32.S | 12 +- trunk/arch/x86/kernel/hpet.c | 14 - trunk/arch/x86/kernel/i386_ksyms_32.c | 2 - trunk/arch/x86/kernel/io_apic_32.c | 33 +- trunk/arch/x86/kernel/io_apic_64.c | 24 +- trunk/arch/x86/kernel/kprobes_64.c | 2 +- trunk/arch/x86/kernel/nmi_32.c | 12 +- trunk/arch/x86/kernel/nmi_64.c | 3 +- trunk/arch/x86/kernel/paravirt_32.c | 4 +- trunk/arch/x86/kernel/pci-dma_64.c | 2 +- trunk/arch/x86/kernel/reboot_32.c | 4 - trunk/arch/x86/kernel/reboot_64.c | 4 - trunk/arch/x86/kernel/topology.c | 5 +- trunk/arch/x86/kernel/traps_32.c | 7 - trunk/arch/x86/kernel/traps_64.c | 9 - trunk/arch/x86/lguest/Kconfig | 1 - trunk/arch/x86/mm/init_64.c | 2 +- trunk/arch/x86/pci/acpi.c | 2 +- trunk/arch/x86/pci/common.c | 16 - trunk/arch/x86/xen/mmu.c | 4 - trunk/block/blktrace.c | 9 +- trunk/block/genhd.c | 1 - trunk/block/ll_rw_blk.c | 23 + trunk/crypto/algapi.c | 6 +- trunk/crypto/authenc.c | 12 +- trunk/crypto/fcrypt.c | 88 +- trunk/drivers/acpi/Kconfig | 18 +- trunk/drivers/acpi/Makefile | 2 +- trunk/drivers/acpi/ac.c | 20 +- trunk/drivers/acpi/battery.c | 22 +- trunk/drivers/acpi/dispatcher/dsobject.c | 91 +- trunk/drivers/acpi/ec.c | 100 +- trunk/drivers/acpi/osl.c | 25 +- trunk/drivers/acpi/processor_core.c | 33 +- trunk/drivers/acpi/processor_idle.c | 112 +- trunk/drivers/acpi/processor_throttling.c | 318 +---- trunk/drivers/acpi/sbs.c | 43 +- trunk/drivers/acpi/tables/tbutils.c | 2 +- trunk/drivers/acpi/video.c | 155 +-- trunk/drivers/ata/ahci.c | 4 - trunk/drivers/ata/ata_piix.c | 121 +- trunk/drivers/ata/libata-core.c | 116 +- trunk/drivers/ata/libata-eh.c | 137 +- trunk/drivers/ata/libata-scsi.c | 38 +- trunk/drivers/ata/pata_ali.c | 20 - trunk/drivers/ata/pata_amd.c | 5 +- trunk/drivers/ata/pata_at32.c | 61 +- trunk/drivers/ata/pata_bf54x.c | 13 +- trunk/drivers/ata/pata_hpt37x.c | 2 +- trunk/drivers/ata/pata_isapnp.c | 11 +- trunk/drivers/ata/pata_jmicron.c | 9 +- trunk/drivers/ata/pata_sil680.c | 32 +- trunk/drivers/ata/pata_sis.c | 1 - trunk/drivers/ata/pata_via.c | 4 +- trunk/drivers/ata/sata_mv.c | 73 +- trunk/drivers/ata/sata_nv.c | 32 +- trunk/drivers/ata/sata_sil24.c | 26 +- trunk/drivers/atm/he.c | 10 +- trunk/drivers/base/core.c | 4 +- trunk/drivers/base/power/Makefile | 3 +- trunk/drivers/base/power/main.c | 8 +- trunk/drivers/base/power/power.h | 28 +- trunk/drivers/block/virtio_blk.c | 10 +- trunk/drivers/char/Kconfig | 2 +- trunk/drivers/char/apm-emulation.c | 15 +- trunk/drivers/char/cs5535_gpio.c | 5 - trunk/drivers/char/sonypi.c | 8 +- trunk/drivers/char/tpm/tpm_tis.c | 10 +- trunk/drivers/crypto/Kconfig | 2 +- trunk/drivers/dma/Kconfig | 8 +- trunk/drivers/hwmon/coretemp.c | 5 +- trunk/drivers/ide/Kconfig | 47 +- trunk/drivers/ide/Makefile | 2 +- trunk/drivers/ide/cris/ide-cris.c | 7 +- trunk/drivers/ide/ide-dma.c | 1 - trunk/drivers/ide/ide-iops.c | 13 +- trunk/drivers/ide/ide-probe.c | 32 +- trunk/drivers/ide/legacy/ali14xx.c | 7 +- trunk/drivers/ide/legacy/macide.c | 2 +- trunk/drivers/ide/legacy/q40ide.c | 2 +- trunk/drivers/ide/pci/aec62xx.c | 11 +- trunk/drivers/ide/pci/alim15x3.c | 5 - trunk/drivers/ide/pci/piix.c | 1 - trunk/drivers/ide/pci/siimage.c | 45 +- trunk/drivers/ide/pci/sis5513.c | 1 - trunk/drivers/ide/pci/trm290.c | 3 + trunk/drivers/ide/ppc/pmac.c | 2 +- trunk/drivers/infiniband/hw/ehca/ehca_av.c | 8 +- trunk/drivers/infiniband/hw/ehca/ehca_qp.c | 4 +- trunk/drivers/infiniband/hw/ipath/ipath_cq.c | 19 +- trunk/drivers/infiniband/hw/ipath/ipath_qp.c | 15 +- trunk/drivers/infiniband/hw/ipath/ipath_srq.c | 44 +- .../drivers/infiniband/hw/ipath/ipath_verbs.c | 8 +- .../drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 - .../drivers/infiniband/ulp/iser/iser_memory.c | 6 +- trunk/drivers/input/keyboard/Kconfig | 2 +- trunk/drivers/input/keyboard/gpio_keys.c | 38 +- trunk/drivers/input/serio/Kconfig | 2 +- trunk/drivers/input/serio/i8042-x86ia64io.h | 8 - trunk/drivers/input/touchscreen/ads7846.c | 13 +- trunk/drivers/isdn/hisax/hfcscard.c | 3 +- trunk/drivers/isdn/i4l/isdn_common.c | 5 +- trunk/drivers/isdn/i4l/isdn_net.c | 8 +- trunk/drivers/kvm/kvm_main.c | 3 +- trunk/drivers/kvm/svm.c | 1 - trunk/drivers/kvm/x86_emulate.c | 6 +- trunk/drivers/lguest/lguest_device.c | 2 - trunk/drivers/mfd/sm501.c | 2 +- trunk/drivers/misc/sony-laptop.c | 10 +- trunk/drivers/misc/thinkpad_acpi.c | 231 +--- trunk/drivers/misc/thinkpad_acpi.h | 4 +- trunk/drivers/mmc/card/block.c | 22 +- trunk/drivers/mmc/card/queue.c | 3 +- trunk/drivers/mmc/card/sdio_uart.c | 2 +- trunk/drivers/mmc/host/mmc_spi.c | 10 + trunk/drivers/mmc/host/tifm_sd.c | 18 +- trunk/drivers/net/Kconfig | 4 +- trunk/drivers/net/amd8111e.c | 6 - trunk/drivers/net/bfin_mac.c | 4 +- trunk/drivers/net/bfin_mac.h | 2 +- trunk/drivers/net/chelsio/cxgb2.c | 70 +- trunk/drivers/net/chelsio/pm3393.c | 112 +- trunk/drivers/net/chelsio/sge.c | 44 +- trunk/drivers/net/chelsio/sge.h | 3 +- trunk/drivers/net/e1000/e1000_main.c | 2 +- trunk/drivers/net/ehea/ehea.h | 2 +- trunk/drivers/net/ehea/ehea_main.c | 20 +- trunk/drivers/net/ehea/ehea_qmr.h | 4 +- trunk/drivers/net/fec_mpc52xx.c | 6 +- trunk/drivers/net/forcedeth.c | 38 +- trunk/drivers/net/gianfar.c | 2 +- trunk/drivers/net/ibm_newemac/core.c | 31 +- trunk/drivers/net/ibm_newemac/core.h | 1 - trunk/drivers/net/lib82596.c | 50 +- trunk/drivers/net/mlx4/qp.c | 2 +- trunk/drivers/net/myri10ge/myri10ge.c | 1 - trunk/drivers/net/pasemi_mac.c | 4 +- trunk/drivers/net/phy/marvell.c | 26 +- trunk/drivers/net/phy/mdio_bus.c | 9 +- trunk/drivers/net/phy/phy.c | 3 - trunk/drivers/net/phy/phy_device.c | 12 - trunk/drivers/net/plip.c | 4 +- trunk/drivers/net/s2io.c | 32 +- trunk/drivers/net/skge.c | 108 +- trunk/drivers/net/sky2.c | 127 +- trunk/drivers/net/sky2.h | 21 - trunk/drivers/net/smc911x.c | 21 +- trunk/drivers/net/smc911x.h | 2 +- trunk/drivers/net/smc91x.h | 2 +- trunk/drivers/net/sungem.c | 11 +- trunk/drivers/net/tulip/dmfe.c | 4 +- trunk/drivers/net/ucc_geth.c | 10 - trunk/drivers/net/usb/dm9601.c | 2 +- trunk/drivers/net/via-velocity.c | 11 +- trunk/drivers/net/virtio_net.c | 12 +- trunk/drivers/net/wireless/b43/main.c | 2 +- trunk/drivers/net/wireless/b43/phy.c | 2 +- trunk/drivers/net/wireless/b43legacy/dma.c | 2 +- trunk/drivers/net/wireless/b43legacy/main.c | 2 +- trunk/drivers/net/wireless/b43legacy/phy.c | 2 +- .../net/wireless/bcm43xx/bcm43xx_phy.c | 2 +- .../net/wireless/iwlwifi/iwl3945-base.c | 16 +- .../net/wireless/iwlwifi/iwl4965-base.c | 13 +- trunk/drivers/net/wireless/libertas/if_cs.c | 3 +- trunk/drivers/net/wireless/libertas/main.c | 4 + trunk/drivers/net/wireless/libertas/wext.c | 2 +- trunk/drivers/net/wireless/netwave_cs.c | 2 +- trunk/drivers/net/wireless/p54usb.c | 2 +- trunk/drivers/net/wireless/rt2x00/rt2500usb.c | 7 +- trunk/drivers/net/wireless/rt2x00/rt2x00.h | 7 +- trunk/drivers/net/wireless/rt2x00/rt2x00usb.c | 9 +- trunk/drivers/net/wireless/rt2x00/rt73usb.c | 4 +- trunk/drivers/pci/hotplug/acpiphp.h | 8 +- trunk/drivers/pci/hotplug/acpiphp_core.c | 29 +- trunk/drivers/pci/hotplug/acpiphp_glue.c | 36 +- trunk/drivers/pci/hotplug/acpiphp_ibm.c | 47 +- trunk/drivers/pci/hotplug/cpqphp_core.c | 41 +- trunk/drivers/pci/hotplug/cpqphp_ctrl.c | 96 +- trunk/drivers/pci/hotplug/fakephp.c | 14 +- trunk/drivers/pci/hotplug/pciehp_ctrl.c | 16 +- trunk/drivers/pci/hotplug/rpadlpar_core.c | 19 +- trunk/drivers/pci/hotplug/rpaphp_core.c | 15 +- trunk/drivers/pci/hotplug/rpaphp_pci.c | 1 - trunk/drivers/pci/hotplug/shpchp_ctrl.c | 16 +- trunk/drivers/pci/pci-sysfs.c | 4 +- trunk/drivers/pci/pcie/aer/aerdrv_core.c | 29 +- trunk/drivers/pci/pcie/portdrv_pci.c | 2 +- trunk/drivers/pnp/pnpacpi/rsparser.c | 39 +- trunk/drivers/pnp/resource.c | 4 +- trunk/drivers/ps3/Makefile | 4 +- .../ps3/{ps3-sys-manager.c => sys-manager.c} | 0 trunk/drivers/ps3/{ps3-vuart.c => vuart.c} | 0 trunk/drivers/rtc/Kconfig | 2 +- trunk/drivers/rtc/interface.c | 4 +- trunk/drivers/rtc/rtc-dev.c | 12 +- trunk/drivers/rtc/rtc-max6902.c | 12 +- trunk/drivers/s390/block/dcssblk.c | 4 +- trunk/drivers/s390/cio/css.c | 3 +- trunk/drivers/s390/cio/device_fsm.c | 2 +- trunk/drivers/s390/cio/device_id.c | 8 + trunk/drivers/s390/net/ctcmain.c | 44 +- trunk/drivers/s390/scsi/zfcp_erp.c | 18 +- trunk/drivers/scsi/aacraid/commsup.c | 8 +- trunk/drivers/scsi/aacraid/linit.c | 7 +- trunk/drivers/scsi/atari_scsi.c | 10 +- trunk/drivers/scsi/dtc.c | 5 +- trunk/drivers/scsi/g_NCR5380.c | 5 +- trunk/drivers/scsi/ide-scsi.c | 22 +- trunk/drivers/scsi/iscsi_tcp.c | 139 +- trunk/drivers/scsi/iscsi_tcp.h | 34 +- trunk/drivers/scsi/libiscsi.c | 3 + trunk/drivers/scsi/mac_scsi.c | 4 +- trunk/drivers/scsi/pas16.c | 5 +- trunk/drivers/scsi/qla1280.c | 387 +++--- trunk/drivers/scsi/sun3_scsi.c | 4 +- trunk/drivers/scsi/sun3_scsi_vme.c | 4 +- trunk/drivers/scsi/t128.c | 5 +- trunk/drivers/scsi/zorro7xx.c | 3 - trunk/drivers/serial/Kconfig | 2 +- trunk/drivers/serial/ip22zilog.c | 247 ++-- trunk/drivers/serial/pxa.c | 4 +- trunk/drivers/spi/Kconfig | 2 +- trunk/drivers/spi/at25.c | 7 - trunk/drivers/spi/atmel_spi.c | 2 +- trunk/drivers/spi/spi.c | 19 +- trunk/drivers/spi/spi_bfin5xx.c | 866 +++++------- trunk/drivers/spi/spi_s3c24xx_gpio.c | 21 +- trunk/drivers/usb/README | 6 +- trunk/drivers/usb/core/driver.c | 11 + trunk/drivers/usb/core/hcd.c | 3 +- trunk/drivers/usb/core/hub.c | 2 +- trunk/drivers/usb/core/message.c | 36 +- trunk/drivers/usb/core/sysfs.c | 6 - trunk/drivers/usb/core/usb.c | 25 - trunk/drivers/usb/gadget/omap_udc.c | 6 +- trunk/drivers/usb/gadget/s3c2410_udc.c | 16 +- trunk/drivers/usb/host/Kconfig | 2 +- trunk/drivers/usb/host/ehci-hcd.c | 5 +- trunk/drivers/usb/image/microtek.c | 2 +- trunk/drivers/usb/misc/adutux.c | 262 ++-- trunk/drivers/usb/misc/usbled.c | 4 +- trunk/drivers/usb/serial/generic.c | 5 +- trunk/drivers/usb/serial/keyspan.c | 32 +- trunk/drivers/usb/serial/mos7840.c | 2 +- trunk/drivers/usb/serial/pl2303.c | 1 - trunk/drivers/usb/serial/pl2303.h | 3 - trunk/drivers/usb/serial/sierra.c | 2 - trunk/drivers/usb/storage/scsiglue.c | 4 - trunk/drivers/usb/storage/unusual_devs.h | 17 +- trunk/drivers/video/Kconfig | 11 - trunk/drivers/video/Makefile | 1 - trunk/drivers/video/atmel_lcdfb.c | 4 - trunk/drivers/video/aty/radeon_base.c | 1 - trunk/drivers/video/console/Kconfig | 2 +- trunk/drivers/video/efifb.c | 232 ---- trunk/drivers/video/fb_ddc.c | 8 +- trunk/drivers/video/imacfb.c | 4 + trunk/drivers/video/ps3fb.c | 11 +- trunk/drivers/virtio/virtio.c | 13 - trunk/drivers/zorro/zorro-driver.c | 15 - trunk/fs/Kconfig | 9 - trunk/fs/aio.c | 7 +- trunk/fs/bfs/inode.c | 3 +- trunk/fs/cifs/CHANGES | 3 - trunk/fs/cifs/README | 27 +- trunk/fs/cifs/TODO | 2 +- trunk/fs/cifs/cifs_spnego.c | 20 +- trunk/fs/cifs/cifs_spnego.h | 1 - trunk/fs/cifs/cifsacl.c | 46 +- trunk/fs/cifs/cifsfs.c | 7 +- trunk/fs/cifs/cifsglob.h | 13 - trunk/fs/cifs/cifsproto.h | 17 +- trunk/fs/cifs/cifssmb.c | 97 +- trunk/fs/cifs/connect.c | 141 +- trunk/fs/cifs/file.c | 44 +- trunk/fs/cifs/inode.c | 26 +- trunk/fs/cifs/sess.c | 93 +- trunk/fs/cifs/transport.c | 91 +- trunk/fs/compat_ioctl.c | 6 - trunk/fs/exec.c | 6 - trunk/fs/ext2/ext2.h | 7 - trunk/fs/fuse/dir.c | 81 +- trunk/fs/fuse/file.c | 47 +- trunk/fs/fuse/fuse_i.h | 5 +- trunk/fs/fuse/inode.c | 4 +- trunk/fs/jbd/checkpoint.c | 12 +- trunk/fs/jbd/commit.c | 8 +- trunk/fs/jffs2/background.c | 2 +- trunk/fs/nfs/dir.c | 1 - trunk/fs/nfs/direct.c | 142 +- trunk/fs/nfs/getroot.c | 81 +- trunk/fs/nfs/super.c | 11 +- trunk/fs/nfs/write.c | 3 +- trunk/fs/ocfs2/aops.c | 2 +- trunk/fs/ocfs2/cluster/masklog.h | 2 +- trunk/fs/ocfs2/cluster/tcp.c | 20 +- trunk/fs/ocfs2/dcache.c | 20 +- trunk/fs/ocfs2/dlm/dlmmaster.c | 4 +- trunk/fs/ocfs2/file.c | 19 +- trunk/fs/ocfs2/inode.c | 6 +- trunk/fs/ocfs2/localalloc.c | 5 +- trunk/fs/ocfs2/super.c | 6 +- trunk/fs/proc/array.c | 4 +- trunk/fs/proc/base.c | 51 +- trunk/fs/proc/generic.c | 58 +- trunk/fs/proc/inode.c | 9 +- trunk/fs/proc/internal.h | 2 + trunk/fs/proc/proc_net.c | 86 +- trunk/fs/proc/root.c | 3 +- trunk/fs/reiserfs/procfs.c | 6 + trunk/fs/sysfs/file.c | 6 +- trunk/fs/ufs/dir.c | 2 +- trunk/fs/ufs/super.c | 4 +- trunk/include/acpi/processor.h | 1 + trunk/include/asm-arm/arch-at91/board.h | 3 +- trunk/include/asm-arm/arch-ixp23xx/irqs.h | 2 +- .../asm-arm/arch-omap/board-innovator.h | 2 +- trunk/include/asm-arm/arch-pxa/irqs.h | 20 +- trunk/include/asm-arm/arch-pxa/mfp-pxa300.h | 2 +- trunk/include/asm-arm/arch-pxa/mfp-pxa320.h | 2 +- trunk/include/asm-arm/arch-pxa/mfp.h | 18 +- trunk/include/asm-arm/arch-pxa/pxa-regs.h | 5 +- trunk/include/asm-arm/arch-s3c2410/spi-gpio.h | 2 - trunk/include/asm-blackfin/bfin-global.h | 5 +- trunk/include/asm-blackfin/bfin5xx_spi.h | 3 +- trunk/include/asm-blackfin/cplbinit.h | 33 +- trunk/include/asm-blackfin/delay.h | 66 +- trunk/include/asm-blackfin/io.h | 1 - trunk/include/asm-blackfin/mach-bf527/irq.h | 4 + .../include/asm-blackfin/mach-bf527/mem_map.h | 3 +- trunk/include/asm-blackfin/mach-bf533/irq.h | 4 + .../include/asm-blackfin/mach-bf533/mem_map.h | 4 +- .../include/asm-blackfin/mach-bf533/portmux.h | 2 +- trunk/include/asm-blackfin/mach-bf537/irq.h | 4 + .../include/asm-blackfin/mach-bf537/mem_map.h | 3 +- trunk/include/asm-blackfin/mach-bf548/bf548.h | 34 +- .../asm-blackfin/mach-bf548/defBF544.h | 2 +- .../asm-blackfin/mach-bf548/defBF548.h | 2 +- .../asm-blackfin/mach-bf548/defBF54x_base.h | 17 - trunk/include/asm-blackfin/mach-bf548/irq.h | 4 + .../include/asm-blackfin/mach-bf548/mem_map.h | 18 +- trunk/include/asm-blackfin/mach-bf561/bf561.h | 19 + .../asm-blackfin/mach-bf561/defBF561.h | 15 +- trunk/include/asm-blackfin/mach-bf561/irq.h | 4 + .../include/asm-blackfin/mach-bf561/mem_map.h | 7 +- .../asm-blackfin/mach-common/def_LPBlackfin.h | 8 +- trunk/include/asm-blackfin/page_offset.h | 2 +- trunk/include/asm-blackfin/string.h | 2 - trunk/include/asm-blackfin/traps.h | 96 +- trunk/include/asm-generic/resource.h | 2 +- trunk/include/asm-ia64/acpi.h | 1 - trunk/include/asm-m32r/thread_info.h | 11 +- trunk/include/asm-m32r/unistd.h | 66 +- trunk/include/asm-mips/8253pit.h | 10 + trunk/include/asm-mips/cpu-features.h | 6 +- trunk/include/asm-mips/dma.h | 1 - trunk/include/asm-mips/futex.h | 6 +- trunk/include/asm-mips/i8253.h | 2 - trunk/include/asm-mips/ip32/ip32_ints.h | 2 +- trunk/include/asm-mips/mach-au1x00/au1000.h | 21 +- trunk/include/asm-mips/system.h | 10 +- trunk/include/asm-mips/time.h | 16 +- trunk/include/asm-powerpc/page_32.h | 4 - trunk/include/asm-powerpc/pci-bridge.h | 5 +- trunk/include/asm-powerpc/vdso_datapage.h | 8 - trunk/include/asm-s390/system.h | 5 - trunk/include/asm-sh/cacheflush.h | 2 +- trunk/include/asm-x86/acpi.h | 27 - trunk/include/asm-x86/apic_32.h | 1 - trunk/include/asm-x86/hpet.h | 1 - trunk/include/linux/acpi.h | 5 - trunk/include/linux/cgroup_subsys.h | 7 - trunk/include/linux/cpuidle.h | 1 - trunk/include/linux/ext2_fs.h | 7 + trunk/include/linux/fuse.h | 5 - trunk/include/linux/inet_lro.h | 3 - trunk/include/linux/input.h | 5 - trunk/include/linux/jbd.h | 2 - trunk/include/linux/kd.h | 2 +- trunk/include/linux/libata.h | 5 +- trunk/include/linux/mm.h | 16 - trunk/include/linux/nfs_fs.h | 1 + trunk/include/linux/pci_ids.h | 4 - trunk/include/linux/phy.h | 3 - trunk/include/linux/pnp.h | 4 +- trunk/include/linux/proc_fs.h | 4 +- trunk/include/linux/rtc.h | 5 +- trunk/include/linux/scatterlist.h | 37 +- trunk/include/linux/sched.h | 4 - trunk/include/linux/screen_info.h | 2 - trunk/include/linux/serial_core.h | 2 +- trunk/include/linux/skbuff.h | 1 + trunk/include/linux/sunrpc/debug.h | 5 + trunk/include/linux/sunrpc/xprtsock.h | 6 + trunk/include/linux/sysctl.h | 6 + trunk/include/linux/thread_info.h | 17 +- trunk/include/linux/timex.h | 1 - trunk/include/linux/usb.h | 1 - trunk/include/linux/usbdevice_fs.h | 3 +- trunk/include/net/ieee80211.h | 8 - trunk/include/net/inet_hashtables.h | 3 +- trunk/include/net/ip_vs.h | 34 + trunk/include/net/sctp/constants.h | 9 +- trunk/include/net/sock.h | 3 - trunk/include/net/tcp.h | 3 - trunk/include/sound/version.h | 2 +- trunk/init/Kconfig | 9 +- trunk/ipc/mqueue.c | 6 +- trunk/kernel/Kconfig.instrumentation | 6 +- trunk/kernel/acct.c | 2 +- trunk/kernel/exit.c | 11 +- trunk/kernel/fork.c | 21 +- trunk/kernel/futex.c | 27 +- trunk/kernel/kallsyms.c | 7 +- trunk/kernel/lockdep.c | 29 +- trunk/kernel/module.c | 8 +- trunk/kernel/sched.c | 302 ++--- trunk/kernel/sched_debug.c | 10 +- trunk/kernel/sched_fair.c | 25 +- trunk/kernel/sched_rt.c | 1 - trunk/kernel/sched_stats.h | 3 +- trunk/kernel/sysctl.c | 4 - trunk/kernel/sysctl_check.c | 47 +- trunk/kernel/time/ntp.c | 9 +- trunk/kernel/time/tick-sched.c | 2 - trunk/kernel/user.c | 7 +- trunk/kernel/utsname_sysctl.c | 4 - trunk/lib/Kconfig.debug | 4 +- trunk/lib/hexdump.c | 3 +- trunk/lib/kobject.c | 4 +- trunk/lib/textsearch.c | 8 +- trunk/mm/backing-dev.c | 4 +- trunk/mm/filemap_xip.c | 2 +- trunk/mm/mmap.c | 15 +- trunk/mm/nommu.c | 3 - trunk/mm/page_alloc.c | 24 +- trunk/mm/rmap.c | 9 +- trunk/mm/shmem.c | 5 +- trunk/mm/slab.c | 5 +- trunk/mm/slob.c | 1 - trunk/mm/slub.c | 6 +- trunk/mm/sparse-vmemmap.c | 12 +- trunk/net/8021q/vlan_dev.c | 3 +- trunk/net/bridge/br.c | 4 +- trunk/net/bridge/br_input.c | 7 +- trunk/net/bridge/netfilter/ebt_among.c | 2 +- trunk/net/bridge/netfilter/ebtable_broute.c | 4 +- trunk/net/core/pktgen.c | 2 + trunk/net/core/skbuff.c | 31 +- trunk/net/dccp/ccids/lib/loss_interval.c | 2 +- trunk/net/decnet/dn_dev.c | 4 +- trunk/net/ieee80211/ieee80211_crypt_ccmp.c | 2 +- trunk/net/ieee80211/ieee80211_crypt_tkip.c | 4 +- trunk/net/ieee80211/ieee80211_tx.c | 3 +- trunk/net/ipv4/arp.c | 22 +- trunk/net/ipv4/inet_diag.c | 69 +- trunk/net/ipv4/inet_lro.c | 3 +- trunk/net/ipv4/ipvs/ip_vs_core.c | 2 +- trunk/net/ipv4/ipvs/ip_vs_ctl.c | 24 + trunk/net/ipv4/ipvs/ip_vs_lblc.c | 9 +- trunk/net/ipv4/ipvs/ip_vs_lblcr.c | 9 +- trunk/net/ipv4/ipvs/ip_vs_proto.c | 2 +- trunk/net/ipv4/ipvs/ip_vs_sched.c | 27 +- trunk/net/ipv4/netfilter/iptable_raw.c | 2 +- trunk/net/ipv4/netfilter/nf_nat_core.c | 5 +- trunk/net/ipv4/route.c | 8 +- trunk/net/ipv4/sysctl_net_ipv4.c | 2 +- trunk/net/ipv4/tcp_illinois.c | 2 +- trunk/net/ipv4/tcp_input.c | 17 +- trunk/net/ipv4/tcp_ipv4.c | 11 +- trunk/net/ipv4/tcp_output.c | 24 +- trunk/net/ipv6/addrconf.c | 13 +- trunk/net/ipv6/tcp_ipv6.c | 11 +- trunk/net/irda/ircomm/ircomm_tty.c | 2 +- trunk/net/irda/iriap.c | 2 +- trunk/net/irda/irlan/irlan_eth.c | 2 +- trunk/net/iucv/iucv.c | 107 +- trunk/net/key/af_key.c | 4 +- trunk/net/mac80211/ieee80211.c | 37 +- trunk/net/mac80211/ieee80211_sta.c | 2 +- trunk/net/mac80211/rx.c | 2 +- trunk/net/mac80211/wep.c | 3 +- trunk/net/netfilter/xt_CONNMARK.c | 10 +- trunk/net/netfilter/xt_CONNSECMARK.c | 10 +- trunk/net/netfilter/xt_TCPMSS.c | 4 +- trunk/net/rfkill/rfkill.c | 14 +- trunk/net/rose/rose_dev.c | 2 +- trunk/net/rxrpc/Kconfig | 1 - trunk/net/sctp/Kconfig | 6 +- trunk/net/sctp/auth.c | 4 +- trunk/net/sctp/sm_make_chunk.c | 25 +- trunk/net/sctp/sm_statefuns.c | 4 +- trunk/net/sunrpc/auth_gss/auth_gss.c | 4 +- trunk/net/sunrpc/auth_gss/gss_krb5_mech.c | 8 +- trunk/net/sunrpc/auth_gss/gss_krb5_seal.c | 1 - trunk/net/sunrpc/rpc_pipe.c | 2 +- trunk/net/sunrpc/xprt.c | 2 +- trunk/net/sunrpc/xprtrdma/transport.c | 10 +- trunk/net/sunrpc/xprtsock.c | 4 +- trunk/net/unix/af_unix.c | 9 +- trunk/net/wireless/wext.c | 2 +- trunk/net/xfrm/xfrm_policy.c | 1 - trunk/net/xfrm/xfrm_state.c | 2 +- trunk/net/xfrm/xfrm_user.c | 2 + trunk/scripts/checkpatch.pl | 395 ++---- trunk/security/commoncap.c | 9 - trunk/security/dummy.c | 2 +- trunk/security/selinux/selinuxfs.c | 65 +- trunk/sound/drivers/mpu401/mpu401_uart.c | 12 +- trunk/sound/drivers/portman2x4.c | 2 +- trunk/sound/pci/ca0106/ca0106_mixer.c | 18 +- trunk/sound/pci/ca0106/ca0106_proc.c | 4 +- trunk/sound/pci/cmipci.c | 5 +- trunk/sound/pci/emu10k1/emumixer.c | 65 +- trunk/sound/pci/emu10k1/p16v.c | 4 - trunk/sound/pci/hda/hda_codec.c | 40 +- trunk/sound/pci/hda/hda_local.h | 1 - trunk/sound/pci/hda/patch_analog.c | 8 - trunk/sound/pci/hda/patch_sigmatel.c | 57 +- trunk/sound/soc/codecs/cs4270.c | 3 +- trunk/sound/soc/s3c24xx/s3c2443-ac97.c | 2 +- 748 files changed, 7152 insertions(+), 10841 deletions(-) delete mode 100644 trunk/Documentation/namespaces/compatibility-list.txt delete mode 100644 trunk/Documentation/x86_64/uefi.txt delete mode 100644 trunk/arch/blackfin/Kconfig.debug delete mode 100644 trunk/arch/blackfin/configs/H8606_defconfig create mode 100644 trunk/arch/blackfin/lib/udivdi3.S delete mode 100644 trunk/arch/blackfin/mach-bf527/boards/Kconfig create mode 100644 trunk/arch/blackfin/mach-bf527/boards/eth_mac.c delete mode 100644 trunk/arch/blackfin/mach-bf533/boards/Kconfig delete mode 100644 trunk/arch/blackfin/mach-bf537/boards/Kconfig create mode 100644 trunk/arch/blackfin/mach-bf537/boards/eth_mac.c delete mode 100644 trunk/arch/blackfin/mach-bf548/boards/Kconfig delete mode 100644 trunk/arch/blackfin/mach-bf561/boards/Kconfig delete mode 100644 trunk/arch/mips/kernel/csrc-r4k.c delete mode 100644 trunk/arch/mips/kernel/smp-up.c rename trunk/drivers/ps3/{ps3-sys-manager.c => sys-manager.c} (100%) rename trunk/drivers/ps3/{ps3-vuart.c => vuart.c} (100%) delete mode 100644 trunk/drivers/video/efifb.c create mode 100644 trunk/include/asm-mips/8253pit.h diff --git a/[refs] b/[refs] index 01ad412f0951..ce4b7627ae72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce +refs/heads/master: cb43c54ca05c01533c45e4d3abfe8f99b7acf624 diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX index c3014df066c4..299615d821ac 100644 --- a/trunk/Documentation/00-INDEX +++ b/trunk/Documentation/00-INDEX @@ -262,8 +262,6 @@ mtrr.txt - how to use PPro Memory Type Range Registers to increase performance. mutex-design.txt - info on the generic mutex subsystem. -namespaces/ - - directory with various information about namespaces nbd.txt - info on a TCP implementation of a network block device. netlabel/ diff --git a/trunk/Documentation/DocBook/Makefile b/trunk/Documentation/DocBook/Makefile index 4953bc258729..054a7ecf64c6 100644 --- a/trunk/Documentation/DocBook/Makefile +++ b/trunk/Documentation/DocBook/Makefile @@ -11,7 +11,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \ procfs-guide.xml writing_usb_driver.xml \ kernel-api.xml filesystems.xml lsm.xml usb.xml \ gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ - genericirq.xml s390-drivers.xml uio-howto.xml + genericirq.xml s390-drivers.xml ### # The build process is as follows (targets): diff --git a/trunk/Documentation/DocBook/uio-howto.tmpl b/trunk/Documentation/DocBook/uio-howto.tmpl index fdd7f4f887b7..c119484258b8 100644 --- a/trunk/Documentation/DocBook/uio-howto.tmpl +++ b/trunk/Documentation/DocBook/uio-howto.tmpl @@ -29,12 +29,6 @@ - - 0.4 - 2007-11-26 - hjk - Removed section about uio_dummy. - 0.3 2007-04-29 @@ -100,26 +94,6 @@ interested in translating it, please email me user space. This simplifies development and reduces the risk of serious bugs within a kernel module. - - Please note that UIO is not an universal driver interface. Devices - that are already handled well by other kernel subsystems (like - networking or serial or USB) are no candidates for an UIO driver. - Hardware that is ideally suited for an UIO driver fulfills all of - the following: - - - - The device has memory that can be mapped. The device can be - controlled completely by writing to this memory. - - - The device usually generates interrupts. - - - The device does not fit into one of the standard kernel - subsystems. - - @@ -200,9 +174,8 @@ interested in translating it, please email me For cards that don't generate interrupts but need to be polled, there is the possibility to set up a timer that triggers the interrupt handler at configurable time intervals. - This interrupt simulation is done by calling - uio_event_notify() - from the timer's event handler. + See drivers/uio/uio_dummy.c for an + example of this technique. @@ -290,11 +263,63 @@ offset = N * getpagesize(); + + +Using uio_dummy + + Well, there is no real use for uio_dummy. Its only purpose is + to test most parts of the UIO system (everything except + hardware interrupts), and to serve as an example for the + kernel module that you will have to write yourself. + + + +What uio_dummy does + + The kernel module uio_dummy.ko creates a + device that uses a timer to generate periodic interrupts. The + interrupt handler does nothing but increment a counter. The + driver adds two custom attributes, count + and freq, that appear under + /sys/devices/platform/uio_dummy/. + + + + The attribute count can be read and + written. The associated file + /sys/devices/platform/uio_dummy/count + appears as a normal text file and contains the total number of + timer interrupts. If you look at it (e.g. using + cat), you'll notice it is slowly counting + up. + + + + The attribute freq can be read and written. + The content of + /sys/devices/platform/uio_dummy/freq + represents the number of system timer ticks between two timer + interrupts. The default value of freq is + the value of the kernel variable HZ, which + gives you an interval of one second. Lower values will + increase the frequency. Try the following: + + +cd /sys/devices/platform/uio_dummy/ +echo 100 > freq + + + Use cat count to see how the interrupt + frequency changes. + + + + Writing your own kernel module - Please have a look at uio_cif.c as an + Please have a look at uio_dummy.c as an example. The following paragraphs explain the different sections of this file. @@ -329,8 +354,9 @@ See the description below for details. interrupt, it's your modules task to determine the irq number during initialization. If you don't have a hardware generated interrupt but want to trigger the interrupt handler in some other way, set -irq to UIO_IRQ_CUSTOM. -If you had no interrupt at all, you could set +irq to UIO_IRQ_CUSTOM. The +uio_dummy module does this as it triggers the event mechanism in a timer +routine. If you had no interrupt at all, you could set irq to UIO_IRQ_NONE, though this rarely makes sense. diff --git a/trunk/Documentation/lguest/lguest.c b/trunk/Documentation/lguest/lguest.c index 9b0e322118b5..42008395534d 100644 --- a/trunk/Documentation/lguest/lguest.c +++ b/trunk/Documentation/lguest/lguest.c @@ -1040,11 +1040,6 @@ static void add_virtqueue(struct device *dev, unsigned int num_descs, / getpagesize(); p = get_pages(pages); - /* Initialize the virtqueue */ - vq->next = NULL; - vq->last_avail_idx = 0; - vq->dev = dev; - /* Initialize the configuration. */ vq->config.num = num_descs; vq->config.irq = devices.next_irq++; @@ -1062,6 +1057,9 @@ static void add_virtqueue(struct device *dev, unsigned int num_descs, for (i = &dev->vq; *i; i = &(*i)->next); *i = vq; + /* Link virtqueue back to device. */ + vq->dev = dev; + /* Set the routine to call when the Guest does something to this * virtqueue. */ vq->handle_output = handle_output; @@ -1095,7 +1093,6 @@ static struct device *new_device(const char *name, u16 type, int fd, dev->desc = new_dev_desc(type); dev->handle_input = handle_input; dev->name = name; - dev->vq = NULL; return dev; } diff --git a/trunk/Documentation/namespaces/compatibility-list.txt b/trunk/Documentation/namespaces/compatibility-list.txt deleted file mode 100644 index defc5589bfcd..000000000000 --- a/trunk/Documentation/namespaces/compatibility-list.txt +++ /dev/null @@ -1,39 +0,0 @@ - Namespaces compatibility list - -This document contains the information about the problems user -may have when creating tasks living in different namespaces. - -Here's the summary. This matrix shows the known problems, that -occur when tasks share some namespace (the columns) while living -in different other namespaces (the rows): - - UTS IPC VFS PID User Net -UTS X -IPC X 1 -VFS X -PID 1 1 X -User 2 2 X -Net X - -1. Both the IPC and the PID namespaces provide IDs to address - object inside the kernel. E.g. semaphore with IPCID or - process group with pid. - - In both cases, tasks shouldn't try exposing this ID to some - other task living in a different namespace via a shared filesystem - or IPC shmem/message. The fact is that this ID is only valid - within the namespace it was obtained in and may refer to some - other object in another namespace. - -2. Intentionally, two equal user IDs in different user namespaces - should not be equal from the VFS point of view. In other - words, user 10 in one user namespace shouldn't have the same - access permissions to files, belonging to user 10 in another - namespace. - - The same is true for the IPC namespaces being shared - two users - from different user namespaces should not access the same IPC objects - even having equal UIDs. - - But currently this is not so. - diff --git a/trunk/Documentation/parport-lowlevel.txt b/trunk/Documentation/parport-lowlevel.txt index 120eb20dbb09..265fcdcb8e5f 100644 --- a/trunk/Documentation/parport-lowlevel.txt +++ b/trunk/Documentation/parport-lowlevel.txt @@ -339,10 +339,6 @@ Use this function to register your device driver on a parallel port ('port'). Once you have done that, you will be able to use parport_claim and parport_release in order to use the port. -The ('name') argument is the name of the device that appears in /proc -filesystem. The string must be valid for the whole lifetime of the -device (until parport_unregister_device is called). - This function will register three callbacks into your driver: 'preempt', 'wakeup' and 'irq'. Each of these may be NULL in order to indicate that you do not want a callback. diff --git a/trunk/Documentation/powerpc/booting-without-of.txt b/trunk/Documentation/powerpc/booting-without-of.txt index e9a3cb1d6b06..ac1be25c1e25 100644 --- a/trunk/Documentation/powerpc/booting-without-of.txt +++ b/trunk/Documentation/powerpc/booting-without-of.txt @@ -1645,9 +1645,8 @@ platforms are moved over to use the flattened-device-tree model. MAC addresses passed by the firmware when no information other than indices is available to associate an address with a device. - phy-connection-type : a string naming the controller/PHY interface type, - i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id" (Internal - Delay), "rgmii-txid" (delay on TX only), "rgmii-rxid" (delay on RX only), - "tbi", or "rtbi". + i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "tbi", + or "rtbi". Example: ucc@2000 { diff --git a/trunk/Documentation/thinkpad-acpi.txt b/trunk/Documentation/thinkpad-acpi.txt index 10c041ca13c7..ec499265deca 100644 --- a/trunk/Documentation/thinkpad-acpi.txt +++ b/trunk/Documentation/thinkpad-acpi.txt @@ -1,7 +1,7 @@ ThinkPad ACPI Extras Driver - Version 0.17 - October 04th, 2007 + Version 0.16 + August 2nd, 2007 Borislav Deianov Henrique de Moraes Holschuh @@ -923,34 +923,19 @@ sysfs backlight device "thinkpad_screen" This feature allows software control of the LCD brightness on ThinkPad models which don't have a hardware brightness slider. -It has some limitations: the LCD backlight cannot be actually turned on or -off by this interface, and in many ThinkPad models, the "dim while on -battery" functionality will be enabled by the BIOS when this interface is -used, and cannot be controlled. - -On IBM (and some of the earlier Lenovo) ThinkPads, the backlight control -has eight brightness levels, ranging from 0 to 7. Some of the levels -may not be distinct. Later Lenovo models that implement the ACPI -display backlight brightness control methods have 16 levels, ranging -from 0 to 15. - -There are two interfaces to the firmware for direct brightness control, -EC and CMOS. To select which one should be used, use the -brightness_mode module parameter: brightness_mode=1 selects EC mode, -brightness_mode=2 selects CMOS mode, brightness_mode=3 selects both EC -and CMOS. The driver tries to autodetect which interface to use. - -When display backlight brightness controls are available through the -standard ACPI interface, it is best to use it instead of this direct -ThinkPad-specific interface. The driver will disable its native -backlight brightness control interface if it detects that the standard -ACPI interface is available in the ThinkPad. - -The brightness_enable module parameter can be used to control whether -the LCD brightness control feature will be enabled when available. -brightness_enable=0 forces it to be disabled. brightness_enable=1 -forces it to be enabled when available, even if the standard ACPI -interface is also available. +It has some limitations: the LCD backlight cannot be actually turned on or off +by this interface, and in many ThinkPad models, the "dim while on battery" +functionality will be enabled by the BIOS when this interface is used, and +cannot be controlled. + +The backlight control has eight levels, ranging from 0 to 7. Some of the +levels may not be distinct. + +There are two interfaces to the firmware for brightness control, EC and CMOS. +To select which one should be used, use the brightness_mode module parameter: +brightness_mode=1 selects EC mode, brightness_mode=2 selects CMOS mode, +brightness_mode=3 selects both EC and CMOS. The driver tries to autodetect +which interface to use. Procfs notes: @@ -962,11 +947,11 @@ Procfs notes: Sysfs notes: -The interface is implemented through the backlight sysfs class, which is -poorly documented at this time. +The interface is implemented through the backlight sysfs class, which is poorly +documented at this time. -Locate the thinkpad_screen device under /sys/class/backlight, and inside -it there will be the following attributes: +Locate the thinkpad_screen device under /sys/class/backlight, and inside it +there will be the following attributes: max_brightness: Reads the maximum brightness the hardware can be set to. @@ -976,19 +961,17 @@ it there will be the following attributes: Reads what brightness the screen is set to at this instant. brightness: - Writes request the driver to change brightness to the - given value. Reads will tell you what brightness the - driver is trying to set the display to when "power" is set - to zero and the display has not been dimmed by a kernel - power management event. + Writes request the driver to change brightness to the given + value. Reads will tell you what brightness the driver is trying + to set the display to when "power" is set to zero and the display + has not been dimmed by a kernel power management event. power: - power management mode, where 0 is "display on", and 1 to 3 - will dim the display backlight to brightness level 0 - because thinkpad-acpi cannot really turn the backlight - off. Kernel power management events can temporarily - increase the current power management level, i.e. they can - dim the display. + power management mode, where 0 is "display on", and 1 to 3 will + dim the display backlight to brightness level 0 because + thinkpad-acpi cannot really turn the backlight off. Kernel + power management events can temporarily increase the current + power management level, i.e. they can dim the display. Volume control -- /proc/acpi/ibm/volume diff --git a/trunk/Documentation/tty.txt b/trunk/Documentation/tty.txt index 8e65c4498c52..048a8762cfb5 100644 --- a/trunk/Documentation/tty.txt +++ b/trunk/Documentation/tty.txt @@ -132,14 +132,6 @@ set_termios() Notify the tty driver that the device's termios tty->termios. Previous settings should be passed in the "old" argument. - The API is defined such that the driver should return - the actual modes selected. This means that the - driver function is responsible for modifying any - bits in the request it cannot fulfill to indicate - the actual modes being used. A device with no - hardware capability for change (eg a USB dongle or - virtual port) can provide NULL for this method. - throttle() Notify the tty driver that input buffers for the line discipline are close to full, and it should somehow signal that no more characters should be diff --git a/trunk/Documentation/usb/power-management.txt b/trunk/Documentation/usb/power-management.txt index b2fc4d4a9917..97842deec471 100644 --- a/trunk/Documentation/usb/power-management.txt +++ b/trunk/Documentation/usb/power-management.txt @@ -278,14 +278,6 @@ optional. The methods' jobs are quite simple: (although the interfaces will be in the same altsettings as before the suspend). -If the device is disconnected or powered down while it is suspended, -the disconnect method will be called instead of the resume or -reset_resume method. This is also quite likely to happen when -waking up from hibernation, as many systems do not maintain suspend -current to the USB host controllers during hibernation. (It's -possible to work around the hibernation-forces-disconnect problem by -using the USB Persist facility.) - The reset_resume method is used by the USB Persist facility (see Documentation/usb/persist.txt) and it can also be used under certain circumstances when CONFIG_USB_PERSIST is not enabled. Currently, if a diff --git a/trunk/Documentation/x86_64/uefi.txt b/trunk/Documentation/x86_64/uefi.txt deleted file mode 100644 index 91a98edfb588..000000000000 --- a/trunk/Documentation/x86_64/uefi.txt +++ /dev/null @@ -1,29 +0,0 @@ -General note on [U]EFI x86_64 support -------------------------------------- - -The nomenclature EFI and UEFI are used interchangeably in this document. - -Although the tools below are _not_ needed for building the kernel, -the needed bootloader support and associated tools for x86_64 platforms -with EFI firmware and specifications are listed below. - -1. UEFI specification: http://www.uefi.org - -2. Booting Linux kernel on UEFI x86_64 platform requires bootloader - support. Elilo with x86_64 support can be used. - -3. x86_64 platform with EFI/UEFI firmware. - -Mechanics: ---------- -- Build the kernel with the following configuration. - CONFIG_FB_EFI=y - CONFIG_FRAMEBUFFER_CONSOLE=y -- Create a VFAT partition on the disk -- Copy the following to the VFAT partition: - elilo bootloader with x86_64 support, elilo configuration file, - kernel image built in first step and corresponding - initrd. Instructions on building elilo and its dependencies - can be found in the elilo sourceforge project. -- Boot to EFI shell and invoke elilo choosing the kernel image built - in first step. diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 3002cc811c10..cad0882754a6 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -323,7 +323,8 @@ S: Maintained ALCATEL SPEEDTOUCH USB DRIVER P: Duncan Sands M: duncan.sands@free.fr -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net W: http://www.linux-usb.org/SpeedTouch/ S: Maintained @@ -439,7 +440,7 @@ S: Maintained ARM/ATMEL AT91RM9200 ARM ARCHITECTURE P: Andrew Victor -M: linux@maxim.org.za +M: andrew@sanpeople.com L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) W: http://maxim.org.za/at91_26.html S: Maintained @@ -1042,7 +1043,7 @@ S: Maintained CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER P: Lennert Buytenhek M: kernel@wantstofly.org -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net S: Maintained CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER @@ -1551,7 +1552,7 @@ S: Maintained FREESCALE HIGHSPEED USB DEVICE DRIVER P: Li Yang M: leoli@freescale.com -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net L: linuxppc-dev@ozlabs.org S: Maintained @@ -1913,8 +1914,10 @@ L: linux1394-devel@lists.sourceforge.net S: Maintained IMS TWINTURBO FRAMEBUFFER DRIVER +P: Paul Mundt +M: lethal@chaoticdreams.org L: linux-fbdev-devel@lists.sourceforge.net (subscribers-only) -S: Orphan +S: Maintained INFINIBAND SUBSYSTEM P: Roland Dreier @@ -2110,14 +2113,6 @@ L: irda-users@lists.sourceforge.net (subscribers-only) W: http://irda.sourceforge.net/ S: Maintained -ISCSI -P: Mike Christie -M: michaelc@cs.wisc.edu -L: open-iscsi@googlegroups.com -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 @@ -2173,7 +2168,7 @@ S: Maintained KDUMP P: Vivek Goyal -M: vgoyal@redhat.com +M: vgoyal@in.ibm.com P: Haren Myneni M: hbabu@us.ibm.com L: kexec@lists.infradead.org @@ -2451,7 +2446,7 @@ M68K ON APPLE MACINTOSH P: Joshua Thompson M: funaho@jurai.org W: http://www.mac.linux-m68k.org/ -L: linux-m68k@lists.linux-m68k.org +L: linux-mac68k@mac.linux-m68k.org S: Maintained M68K ON HP9000/300 @@ -2598,6 +2593,13 @@ L: https://tango.0pointer.de/mailman/listinfo/s270-linux W: http://0pointer.de/lennart/tchibo.html S: Maintained +MTRR AND SIMILAR SUPPORT [i386] +P: Richard Gooch +M: rgooch@atnf.csiro.au +L: linux-kernel@vger.kernel.org +W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html +S: Maintained + MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM P: Pierre Ossman M: drzeus-mmc@drzeus.cx @@ -3634,12 +3636,18 @@ M: laredo@gnu.org W: http://www.stradis.com/ S: Maintained -SUPERH +SUPERH (sh) P: Paul Mundt M: lethal@linux-sh.org -L: linux-sh@vger.kernel.org +L: linuxsh-dev@lists.sourceforge.net (subscribers-only) +W: http://www.linux-sh.org +S: Maintained + +SUPERH64 (sh64) +P: Paul Mundt +M: lethal@linux-sh.org +L: linuxsh-shmedia-dev@lists.sourceforge.net W: http://www.linux-sh.org -T: git kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git S: Maintained SUN3/3X @@ -3725,7 +3733,7 @@ S: Maintained TLAN NETWORK DRIVER P: Samuel Chessman M: chessman@tux.org -L: tlan-devel@lists.sourceforge.net (subscribers-only) +L: tlan-devel@lists.sourceforge.net W: http://sourceforge.net/projects/tlan/ S: Maintained @@ -3810,20 +3818,22 @@ S: Maintained USB ACM DRIVER P: Oliver Neukum M: oliver@neukum.name -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net S: Maintained USB BLOCK DRIVER (UB ub) P: Pete Zaitcev M: zaitcev@redhat.com L: linux-kernel@vger.kernel.org -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net S: Supported USB CDC ETHERNET DRIVER P: Greg Kroah-Hartman M: greg@kroah.com -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net S: Maintained W: http://www.kroah.com/linux-usb/ @@ -3837,13 +3847,13 @@ S: Maintained USB EHCI DRIVER P: David Brownell M: dbrownell@users.sourceforge.net -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net S: Odd Fixes USB ET61X[12]51 DRIVER P: Luca Risolia M: luca.risolia@studio.unibo.it -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net L: video4linux-list@redhat.com W: http://www.linux-projects.org S: Maintained @@ -3851,33 +3861,41 @@ S: Maintained USB GADGET/PERIPHERAL SUBSYSTEM P: David Brownell M: dbrownell@users.sourceforge.net -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net W: http://www.linux-usb.org/gadget S: Maintained USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...) P: Jiri Kosina M: jkosina@suse.cz -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net T: git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git S: Maintained +USB HUB DRIVER +P: Johannes Erdfelt +M: johannes@erdfelt.com +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net +S: Maintained + USB ISP116X DRIVER P: Olav Kongas M: ok@artecdesign.ee -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net S: Maintained USB KAWASAKI LSI DRIVER P: Oliver Neukum M: oliver@neukum.name -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net S: Maintained USB MASS STORAGE DRIVER P: Matthew Dharm M: mdharm-usb@one-eyed-alien.net -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net L: usb-storage@lists.one-eyed-alien.net S: Maintained W: http://www.one-eyed-alien.net/~mdharm/linux-usb/ @@ -3885,26 +3903,28 @@ W: http://www.one-eyed-alien.net/~mdharm/linux-usb/ USB OHCI DRIVER P: David Brownell M: dbrownell@users.sourceforge.net -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net S: Odd Fixes USB OPTION-CARD DRIVER P: Matthias Urlichs M: smurf@smurf.noris.de -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net S: Maintained USB OV511 DRIVER P: Mark McClelland M: mmcclell@bigfoot.com -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net W: http://alpha.dyndns.org/ov511/ S: Maintained USB PEGASUS DRIVER P: Petko Manolov M: petkan@users.sourceforge.net -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net L: netdev@vger.kernel.org W: http://pegasus2.sourceforge.net/ S: Maintained @@ -3912,13 +3932,14 @@ S: Maintained USB PRINTER DRIVER (usblp) P: Pete Zaitcev M: zaitcev@redhat.com -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net S: Supported USB RTL8150 DRIVER P: Petko Manolov M: petkan@users.sourceforge.net -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net L: netdev@vger.kernel.org W: http://pegasus2.sourceforge.net/ S: Maintained @@ -3926,7 +3947,8 @@ S: Maintained USB SE401 DRIVER P: Jeroen Vreeken M: pe1rxq@amsat.org -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net W: http://www.chello.nl/~j.vreeken/se401/ S: Maintained @@ -3940,59 +3962,72 @@ USB SERIAL DIGI ACCELEPORT DRIVER P: Peter Berger and Al Borchers M: pberger@brimson.com M: alborchers@steinerpoint.com -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net S: Maintained USB SERIAL DRIVER P: Greg Kroah-Hartman M: gregkh@suse.de -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net S: Supported USB SERIAL BELKIN F5U103 DRIVER P: William Greathouse M: wgreathouse@smva.com -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net S: Maintained USB SERIAL CYPRESS M8 DRIVER P: Lonnie Mendez M: dignome@gmail.com -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net S: Maintained W: http://geocities.com/i0xox0i W: http://firstlight.net/cvs +USB SERIAL CYBERJACK PINPAD/E-COM DRIVER +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net +S: Maintained + USB AUERSWALD DRIVER P: Wolfgang Muees M: wolfgang@iksw-muees.de -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net S: Maintained USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER P: Gary Brubaker M: xavyer@ix.netcom.com -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net S: Maintained USB SERIAL KEYSPAN DRIVER P: Greg Kroah-Hartman M: greg@kroah.com -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net W: http://www.kroah.com/linux/ S: Maintained USB SERIAL WHITEHEAT DRIVER P: Support Department M: support@connecttech.com -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net W: http://www.connecttech.com S: Supported USB SN9C1xx DRIVER P: Luca Risolia M: luca.risolia@studio.unibo.it -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net L: video4linux-list@redhat.com W: http://www.linux-projects.org S: Maintained @@ -4000,7 +4035,8 @@ S: Maintained USB SUBSYSTEM P: Greg Kroah-Hartman M: gregkh@suse.de -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net W: http://www.linux-usb.org T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ S: Supported @@ -4008,7 +4044,8 @@ S: Supported USB UHCI DRIVER P: Alan Stern M: stern@rowland.harvard.edu -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net S: Maintained USB "USBNET" DRIVER FRAMEWORK @@ -4021,7 +4058,7 @@ S: Maintained USB W996[87]CF DRIVER P: Luca Risolia M: luca.risolia@studio.unibo.it -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net L: video4linux-list@redhat.com W: http://www.linux-projects.org S: Maintained @@ -4029,7 +4066,7 @@ S: Maintained USB ZC0301 DRIVER P: Luca Risolia M: luca.risolia@studio.unibo.it -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net L: video4linux-list@redhat.com W: http://www.linux-projects.org S: Maintained @@ -4037,14 +4074,15 @@ S: Maintained USB ZD1201 DRIVER P: Jeroen Vreeken M: pe1rxq@amsat.org -L: linux-usb@vger.kernel.org +L: linux-usb-users@lists.sourceforge.net +L: linux-usb-devel@lists.sourceforge.net W: http://linux-lc100020.sourceforge.net S: Maintained USB ZR364XX DRIVER P: Antoine Jacquet M: royale@zerezo.com -L: linux-usb@vger.kernel.org +L: linux-usb-devel@lists.sourceforge.net L: video4linux-list@redhat.com W: http://royale.zerezo.com/zr364xx/ S: Maintained diff --git a/trunk/Makefile b/trunk/Makefile index 92dc3cb5f43d..a65ffd27de6b 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 24 -EXTRAVERSION = -rc4 +EXTRAVERSION = -rc3 NAME = Arr Matey! A Hairy Bilge Rat! # *DOCUMENTATION* diff --git a/trunk/arch/alpha/kernel/pci-noop.c b/trunk/arch/alpha/kernel/pci-noop.c index 468b76ce66a1..174b729c504b 100644 --- a/trunk/arch/alpha/kernel/pci-noop.c +++ b/trunk/arch/alpha/kernel/pci-noop.c @@ -12,7 +12,6 @@ #include #include #include -#include #include "proto.h" @@ -173,19 +172,18 @@ dma_alloc_coherent(struct device *dev, size_t size, EXPORT_SYMBOL(dma_alloc_coherent); int -dma_map_sg(struct device *dev, struct scatterlist *sgl, int nents, +dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction direction) { int i; - struct scatterlist *sg; - for_each_sg(sgl, sg, nents, i) { + for (i = 0; i < nents; i++ ) { void *va; - BUG_ON(!sg_page(sg)); - va = sg_virt(sg); - sg_dma_address(sg) = (dma_addr_t)virt_to_bus(va); - sg_dma_len(sg) = sg->length; + BUG_ON(!sg[i].page); + va = page_address(sg[i].page) + sg[i].offset; + sg_dma_address(sg + i) = (dma_addr_t)virt_to_bus(va); + sg_dma_len(sg + i) = sg[i].length; } return nents; diff --git a/trunk/arch/arm/common/uengine.c b/trunk/arch/arm/common/uengine.c index 117cab30bd36..95c8508c29b7 100644 --- a/trunk/arch/arm/common/uengine.c +++ b/trunk/arch/arm/common/uengine.c @@ -374,8 +374,8 @@ static int set_initial_registers(int uengine, struct ixp2000_uengine_code *c) u8 *ucode; int i; - gpr_a = kzalloc(128 * sizeof(u32), GFP_KERNEL); - gpr_b = kzalloc(128 * sizeof(u32), GFP_KERNEL); + gpr_a = kmalloc(128 * sizeof(u32), GFP_KERNEL); + gpr_b = kmalloc(128 * sizeof(u32), GFP_KERNEL); ucode = kmalloc(513 * 5, GFP_KERNEL); if (gpr_a == NULL || gpr_b == NULL || ucode == NULL) { kfree(ucode); @@ -388,6 +388,8 @@ static int set_initial_registers(int uengine, struct ixp2000_uengine_code *c) if (c->uengine_parameters & IXP2000_UENGINE_4_CONTEXTS) per_ctx_regs = 32; + memset(gpr_a, 0, sizeof(gpr_a)); + memset(gpr_b, 0, sizeof(gpr_b)); for (i = 0; i < 256; i++) { struct ixp2000_reg_value *r = c->initial_reg_values + i; u32 *bank; diff --git a/trunk/arch/arm/kernel/entry-armv.S b/trunk/arch/arm/kernel/entry-armv.S index 29dec080a604..d645897652c2 100644 --- a/trunk/arch/arm/kernel/entry-armv.S +++ b/trunk/arch/arm/kernel/entry-armv.S @@ -339,6 +339,16 @@ __pabt_svc: str r1, [sp] @ save the "real" r0 copied @ from the exception stack +#if __LINUX_ARM_ARCH__ < 6 && !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG) +#ifndef CONFIG_MMU +#warning "NPTL on non MMU needs fixing" +#else + @ make sure our user space atomic helper is aborted + cmp r2, #TASK_SIZE + bichs r3, r3, #PSR_Z_BIT +#endif +#endif + @ @ We are now ready to fill in the remaining blanks on the stack: @ @@ -362,25 +372,9 @@ __pabt_svc: zero_fp .endm - .macro kuser_cmpxchg_check -#if __LINUX_ARM_ARCH__ < 6 && !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG) -#ifndef CONFIG_MMU -#warning "NPTL on non MMU needs fixing" -#else - @ Make sure our user space atomic helper is restarted - @ if it was interrupted in a critical region. Here we - @ perform a quick test inline since it should be false - @ 99.9999% of the time. The rest is done out of line. - cmp r2, #TASK_SIZE - blhs kuser_cmpxchg_fixup -#endif -#endif - .endm - .align 5 __dabt_usr: usr_entry - kuser_cmpxchg_check @ @ Call the processor-specific abort handler: @@ -410,7 +404,6 @@ __dabt_usr: .align 5 __irq_usr: usr_entry - kuser_cmpxchg_check #ifdef CONFIG_TRACE_IRQFLAGS bl trace_hardirqs_off @@ -453,9 +446,9 @@ __und_usr: @ @ r0 - instruction @ +1: ldrt r0, [r4] adr r9, ret_from_exception adr lr, __und_usr_unknown -1: ldrt r0, [r4] @ @ fallthrough to call_fpe @ @@ -676,7 +669,7 @@ __kuser_helper_start: * * Clobbered: * - * none + * the Z flag might be lost * * Definition and user space usage example: * @@ -737,6 +730,9 @@ __kuser_memory_barrier: @ 0xffff0fa0 * * - This routine already includes memory barriers as needed. * + * - A failure might be transient, i.e. it is possible, although unlikely, + * that "failure" be returned even if *ptr == oldval. + * * For example, a user space atomic_add implementation could look like this: * * #define atomic_add(ptr, val) \ @@ -773,62 +769,46 @@ __kuser_cmpxchg: @ 0xffff0fc0 #elif __LINUX_ARM_ARCH__ < 6 -#ifdef CONFIG_MMU - /* - * The only thing that can break atomicity in this cmpxchg - * implementation is either an IRQ or a data abort exception - * causing another process/thread to be scheduled in the middle - * of the critical sequence. To prevent this, code is added to - * the IRQ and data abort exception handlers to set the pc back - * to the beginning of the critical section if it is found to be - * within that critical section (see kuser_cmpxchg_fixup). + * Theory of operation: + * + * We set the Z flag before loading oldval. If ever an exception + * occurs we can not be sure the loaded value will still be the same + * when the exception returns, therefore the user exception handler + * will clear the Z flag whenever the interrupted user code was + * actually from the kernel address space (see the usr_entry macro). + * + * The post-increment on the str is used to prevent a race with an + * exception happening just after the str instruction which would + * clear the Z flag although the exchange was done. */ -1: ldr r3, [r2] @ load current val - subs r3, r3, r0 @ compare with oldval -2: streq r1, [r2] @ store newval if eq - rsbs r0, r3, #0 @ set return val and C flag - usr_ret lr - - .text -kuser_cmpxchg_fixup: - @ Called from kuser_cmpxchg_check macro. - @ r2 = address of interrupted insn (must be preserved). - @ sp = saved regs. r7 and r8 are clobbered. - @ 1b = first critical insn, 2b = last critical insn. - @ If r2 >= 1b and r2 <= 2b then saved pc_usr is set to 1b. - mov r7, #0xffff0fff - sub r7, r7, #(0xffff0fff - (0xffff0fc0 + (1b - __kuser_cmpxchg))) - subs r8, r2, r7 - rsbcss r8, r8, #(2b - 1b) - strcs r7, [sp, #S_PC] - mov pc, lr - .previous - +#ifdef CONFIG_MMU + teq ip, ip @ set Z flag + ldr ip, [r2] @ load current val + add r3, r2, #1 @ prepare store ptr + teqeq ip, r0 @ compare with oldval if still allowed + streq r1, [r3, #-1]! @ store newval if still allowed + subs r0, r2, r3 @ if r2 == r3 the str occured #else #warning "NPTL on non MMU needs fixing" mov r0, #-1 adds r0, r0, #0 - usr_ret lr #endif + usr_ret lr #else #ifdef CONFIG_SMP mcr p15, 0, r0, c7, c10, 5 @ dmb #endif -1: ldrex r3, [r2] + ldrex r3, [r2] subs r3, r3, r0 strexeq r3, r1, [r2] - teqeq r3, #1 - beq 1b rsbs r0, r3, #0 - /* beware -- each __kuser slot must be 8 instructions max */ #ifdef CONFIG_SMP - b __kuser_memory_barrier -#else - usr_ret lr + mcr p15, 0, r0, c7, c10, 5 @ dmb #endif + usr_ret lr #endif @@ -849,7 +829,7 @@ kuser_cmpxchg_fixup: * * Clobbered: * - * none + * the Z flag might be lost * * Definition and user space usage example: * diff --git a/trunk/arch/arm/kernel/traps.c b/trunk/arch/arm/kernel/traps.c index c34db4e868fa..4764bd9ccee8 100644 --- a/trunk/arch/arm/kernel/traps.c +++ b/trunk/arch/arm/kernel/traps.c @@ -327,7 +327,7 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) if ((instr & hook->instr_mask) == hook->instr_val && (regs->ARM_cpsr & hook->cpsr_mask) == hook->cpsr_val) { if (hook->fn(regs, instr) == 0) { - spin_unlock_irqrestore(&undef_lock, flags); + spin_unlock_irq(&undef_lock); return; } } @@ -509,7 +509,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) * existence. Don't ever use this from user code. */ case 0xfff0: - for (;;) { + { extern void do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs); unsigned long val; @@ -545,6 +545,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) up_read(&mm->mmap_sem); /* simulate a write access fault */ do_DataAbort(addr, 15 + (1 << 11), regs); + return -1; } #endif diff --git a/trunk/arch/arm/mach-at91/at91rm9200_devices.c b/trunk/arch/arm/mach-at91/at91rm9200_devices.c index 9296833f91cc..0417c165d50d 100644 --- a/trunk/arch/arm/mach-at91/at91rm9200_devices.c +++ b/trunk/arch/arm/mach-at91/at91rm9200_devices.c @@ -14,7 +14,6 @@ #include #include -#include #include #include @@ -436,40 +435,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) {} * TWI (i2c) * -------------------------------------------------------------------- */ -/* - * Prefer the GPIO code since the TWI controller isn't robust - * (gets overruns and underruns under load) and can only issue - * repeated STARTs in one scenario (the driver doesn't yet handle them). - */ -#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE) - -static struct i2c_gpio_platform_data pdata = { - .sda_pin = AT91_PIN_PA25, - .sda_is_open_drain = 1, - .scl_pin = AT91_PIN_PA26, - .scl_is_open_drain = 1, - .udelay = 2, /* ~100 kHz */ -}; - -static struct platform_device at91rm9200_twi_device = { - .name = "i2c-gpio", - .id = -1, - .dev.platform_data = &pdata, -}; - -void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) -{ - at91_set_GPIO_periph(AT91_PIN_PA25, 1); /* TWD (SDA) */ - at91_set_multi_drive(AT91_PIN_PA25, 1); - - at91_set_GPIO_periph(AT91_PIN_PA26, 1); /* TWCK (SCL) */ - at91_set_multi_drive(AT91_PIN_PA26, 1); - - i2c_register_board_info(0, devices, nr_devices); - platform_device_register(&at91rm9200_twi_device); -} - -#elif defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE) +#if defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE) static struct resource twi_resources[] = { [0] = { @@ -491,7 +457,7 @@ static struct platform_device at91rm9200_twi_device = { .num_resources = ARRAY_SIZE(twi_resources), }; -void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) +void __init at91_add_device_i2c(void) { /* pins used for TWI interface */ at91_set_A_periph(AT91_PIN_PA25, 0); /* TWD */ @@ -500,11 +466,10 @@ void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) at91_set_A_periph(AT91_PIN_PA26, 0); /* TWCK */ at91_set_multi_drive(AT91_PIN_PA26, 1); - i2c_register_board_info(0, devices, nr_devices); platform_device_register(&at91rm9200_twi_device); } #else -void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) {} +void __init at91_add_device_i2c(void) {} #endif diff --git a/trunk/arch/arm/mach-at91/at91sam9260_devices.c b/trunk/arch/arm/mach-at91/at91sam9260_devices.c index 3091bf47d8c9..ffd3154c1e54 100644 --- a/trunk/arch/arm/mach-at91/at91sam9260_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9260_devices.c @@ -13,7 +13,6 @@ #include #include -#include #include #include @@ -353,41 +352,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) {} * TWI (i2c) * -------------------------------------------------------------------- */ -/* - * Prefer the GPIO code since the TWI controller isn't robust - * (gets overruns and underruns under load) and can only issue - * repeated STARTs in one scenario (the driver doesn't yet handle them). - */ - -#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE) - -static struct i2c_gpio_platform_data pdata = { - .sda_pin = AT91_PIN_PA23, - .sda_is_open_drain = 1, - .scl_pin = AT91_PIN_PA24, - .scl_is_open_drain = 1, - .udelay = 2, /* ~100 kHz */ -}; - -static struct platform_device at91sam9260_twi_device = { - .name = "i2c-gpio", - .id = -1, - .dev.platform_data = &pdata, -}; - -void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) -{ - at91_set_GPIO_periph(AT91_PIN_PA23, 1); /* TWD (SDA) */ - at91_set_multi_drive(AT91_PIN_PA23, 1); - - at91_set_GPIO_periph(AT91_PIN_PA24, 1); /* TWCK (SCL) */ - at91_set_multi_drive(AT91_PIN_PA24, 1); - - i2c_register_board_info(0, devices, nr_devices); - platform_device_register(&at91sam9260_twi_device); -} - -#elif defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE) +#if defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE) static struct resource twi_resources[] = { [0] = { @@ -409,7 +374,7 @@ static struct platform_device at91sam9260_twi_device = { .num_resources = ARRAY_SIZE(twi_resources), }; -void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) +void __init at91_add_device_i2c(void) { /* pins used for TWI interface */ at91_set_A_periph(AT91_PIN_PA23, 0); /* TWD */ @@ -418,11 +383,10 @@ void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) at91_set_A_periph(AT91_PIN_PA24, 0); /* TWCK */ at91_set_multi_drive(AT91_PIN_PA24, 1); - i2c_register_board_info(0, devices, nr_devices); platform_device_register(&at91sam9260_twi_device); } #else -void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) {} +void __init at91_add_device_i2c(void) {} #endif diff --git a/trunk/arch/arm/mach-at91/at91sam9261_devices.c b/trunk/arch/arm/mach-at91/at91sam9261_devices.c index 64979a9023c2..3576595b4941 100644 --- a/trunk/arch/arm/mach-at91/at91sam9261_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9261_devices.c @@ -14,9 +14,7 @@ #include #include -#include -#include #include