From 00a2bb5357c5edcc6b30a7a1a29aea4100349ad3 Mon Sep 17 00:00:00 2001 From: Andrew Victor Date: Sat, 24 May 2008 17:06:45 +0100 Subject: [PATCH] --- yaml --- r: 100697 b: refs/heads/master c: e3ba22db09408baee721897fb1b50e16f071d916 h: refs/heads/master i: 100695: 49e58b6d05382caada8ff803833c34ecd635ff12 v: v3 --- [refs] | 2 +- trunk/.gitignore | 3 +- .../Documentation/ABI/testing/sysfs-class-bdi | 4 - .../Documentation/DocBook/kernel-locking.tmpl | 25 - trunk/Documentation/DocBook/kgdb.tmpl | 20 +- trunk/Documentation/SubmittingPatches | 46 - trunk/Documentation/cciss.txt | 5 - trunk/Documentation/cpu-freq/governors.txt | 8 + trunk/Documentation/cpusets.txt | 11 +- trunk/Documentation/filesystems/ext4.txt | 12 +- trunk/Documentation/filesystems/sysfs-pci.txt | 1 - trunk/Documentation/hwmon/ibmaem | 37 - trunk/Documentation/hwmon/sysfs-interface | 33 +- trunk/Documentation/kernel-doc-nano-HOWTO.txt | 99 - trunk/Documentation/kernel-docs.txt | 8 +- trunk/Documentation/kobject.txt | 2 +- trunk/Documentation/laptops/thinkpad-acpi.txt | 2 +- trunk/Documentation/lguest/lguest.c | 12 +- trunk/Documentation/networking/arcnet.txt | 2 +- trunk/Documentation/networking/bridge.txt | 2 +- trunk/Documentation/video4linux/CARDLIST.cx88 | 2 +- trunk/Documentation/video4linux/cx18.txt | 4 +- trunk/Documentation/vm/pagemap.txt | 77 - trunk/Kbuild | 3 +- trunk/MAINTAINERS | 207 +- trunk/Makefile | 7 +- trunk/arch/alpha/Makefile | 1 - trunk/arch/alpha/kernel/core_t2.c | 2 - trunk/arch/alpha/kernel/init_task.c | 1 + trunk/arch/alpha/kernel/pci.c | 17 - trunk/arch/alpha/kernel/traps.c | 3 +- trunk/arch/arm/Kconfig | 9 +- trunk/arch/arm/Makefile | 2 + trunk/arch/arm/boot/compressed/head-xscale.S | 4 + trunk/arch/arm/kernel/atags.c | 83 +- trunk/arch/arm/kernel/init_task.c | 1 + trunk/arch/arm/mach-at91/Kconfig | 6 + trunk/arch/arm/mach-at91/Makefile | 1 + trunk/arch/arm/mach-at91/at91x40.c | 18 +- trunk/arch/arm/mach-at91/board-yl-9200.c | 853 ++++---- trunk/arch/arm/mach-footbridge/Makefile | 2 + trunk/arch/arm/mach-footbridge/co285.c | 39 + trunk/arch/arm/mach-footbridge/common.c | 21 + trunk/arch/arm/mach-footbridge/ebsa285-leds.c | 2 +- trunk/arch/arm/mach-footbridge/time.c | 3 +- trunk/arch/arm/mach-integrator/impd1.c | 3 +- trunk/arch/arm/mach-integrator/pci_v3.c | 2 +- trunk/arch/arm/mach-omap1/board-palmte.c | 10 + trunk/arch/arm/mach-pxa/cm-x270.c | 2 +- trunk/arch/arm/mach-pxa/em-x270.c | 2 +- trunk/arch/arm/mach-pxa/spitz.c | 1 + trunk/arch/arm/mach-pxa/ssp.c | 2 +- trunk/arch/arm/mach-pxa/tosa.c | 4 +- trunk/arch/arm/mach-s3c2410/mach-bast.c | 2 +- trunk/arch/arm/mach-s3c2410/mach-vr1000.c | 4 +- trunk/arch/arm/mach-sa1100/collie.c | 42 +- trunk/arch/arm/plat-omap/clock.c | 1 - trunk/arch/arm/plat-s3c24xx/s3c244x.c | 1 - trunk/arch/arm/tools/mach-types | 126 +- trunk/arch/avr32/configs/atngw100_defconfig | 336 ++- trunk/arch/avr32/configs/atstk1002_defconfig | 241 +-- trunk/arch/avr32/configs/atstk1003_defconfig | 158 +- trunk/arch/avr32/configs/atstk1004_defconfig | 110 +- trunk/arch/avr32/kernel/avr32_ksyms.c | 4 - trunk/arch/avr32/kernel/init_task.c | 1 + trunk/arch/avr32/mach-at32ap/cpufreq.c | 3 +- trunk/arch/blackfin/Kconfig | 12 +- .../blackfin/configs/BF527-EZKIT_defconfig | 348 ++-- .../blackfin/configs/BF548-EZKIT_defconfig | 416 ++-- trunk/arch/blackfin/configs/IP0X_defconfig | 2 +- trunk/arch/blackfin/kernel/bfin_dma_5xx.c | 11 - trunk/arch/blackfin/kernel/bfin_gpio.c | 19 - trunk/arch/blackfin/kernel/bfin_ksyms.c | 2 - trunk/arch/blackfin/kernel/gptimers.c | 2 +- trunk/arch/blackfin/kernel/init_task.c | 1 + trunk/arch/blackfin/kernel/traps.c | 24 +- trunk/arch/blackfin/lib/checksum.c | 21 +- trunk/arch/blackfin/lib/ins.S | 21 +- trunk/arch/blackfin/lib/outs.S | 16 +- trunk/arch/blackfin/mach-bf527/boards/ezkit.c | 13 +- trunk/arch/blackfin/mach-bf533/boards/ezkit.c | 6 +- trunk/arch/blackfin/mach-bf533/boards/stamp.c | 34 +- .../arch/blackfin/mach-bf537/boards/Makefile | 2 +- trunk/arch/blackfin/mach-bf537/boards/led.S | 183 ++ trunk/arch/blackfin/mach-bf537/boards/stamp.c | 9 +- .../arch/blackfin/mach-bf548/boards/Makefile | 2 +- .../blackfin/mach-bf548/boards/cm_bf548.c | 2 +- trunk/arch/blackfin/mach-bf548/boards/ezkit.c | 10 +- trunk/arch/blackfin/mach-bf548/boards/led.S | 172 ++ trunk/arch/blackfin/mach-bf561/boards/ezkit.c | 9 +- trunk/arch/cris/kernel/process.c | 1 + trunk/arch/frv/kernel/cmode.S | 2 +- trunk/arch/frv/kernel/init_task.c | 1 + trunk/arch/frv/kernel/sleep.S | 2 +- trunk/arch/frv/mb93090-mb00/pci-dma-nommu.c | 2 +- trunk/arch/frv/mm/init.c | 3 - trunk/arch/h8300/kernel/init_task.c | 1 + trunk/arch/ia64/Makefile | 1 - trunk/arch/ia64/kernel/acpi.c | 9 +- trunk/arch/ia64/kernel/init_task.c | 1 + trunk/arch/ia64/kernel/iosapic.c | 2 + trunk/arch/ia64/kernel/ivt.S | 84 +- trunk/arch/ia64/kernel/minstate.h | 46 +- trunk/arch/ia64/kernel/patch.c | 23 - trunk/arch/ia64/kernel/perfmon.c | 10 +- trunk/arch/ia64/kernel/sal.c | 7 +- trunk/arch/ia64/kernel/setup.c | 14 +- trunk/arch/ia64/kernel/vmlinux.lds.S | 7 - trunk/arch/ia64/kvm/Makefile | 3 +- trunk/arch/ia64/kvm/memcpy.S | 1 - trunk/arch/ia64/kvm/memset.S | 1 - trunk/arch/ia64/kvm/mmio.c | 3 +- trunk/arch/ia64/sn/kernel/sn2/sn2_smp.c | 2 - trunk/arch/ia64/uv/kernel/setup.c | 12 - trunk/arch/m32r/kernel/init_task.c | 1 + trunk/arch/m68k/configs/amiga_defconfig | 6 +- trunk/arch/m68k/configs/apollo_defconfig | 6 +- trunk/arch/m68k/configs/atari_defconfig | 6 +- trunk/arch/m68k/configs/bvme6000_defconfig | 6 +- trunk/arch/m68k/configs/hp300_defconfig | 6 +- trunk/arch/m68k/configs/mac_defconfig | 6 +- trunk/arch/m68k/configs/multi_defconfig | 6 +- trunk/arch/m68k/configs/mvme147_defconfig | 6 +- trunk/arch/m68k/configs/mvme16x_defconfig | 6 +- trunk/arch/m68k/configs/q40_defconfig | 6 +- trunk/arch/m68k/configs/sun3_defconfig | 6 +- trunk/arch/m68k/configs/sun3x_defconfig | 6 +- trunk/arch/m68k/kernel/process.c | 1 + trunk/arch/m68k/lib/string.c | 6 - trunk/arch/m68knommu/kernel/init_task.c | 1 + .../arch/m68knommu/platform/coldfire/timers.c | 8 +- trunk/arch/mips/Makefile | 18 +- trunk/arch/mips/au1000/common/clocks.c | 1 - trunk/arch/mips/au1000/common/dbdma.c | 11 - trunk/arch/mips/au1000/common/platform.c | 4 +- .../arch/mips/configs/sb1250-swarm_defconfig | 676 +++--- trunk/arch/mips/configs/tb0219_defconfig | 192 +- trunk/arch/mips/configs/tb0226_defconfig | 192 +- trunk/arch/mips/configs/tb0287_defconfig | 207 +- trunk/arch/mips/fw/arc/identify.c | 5 - trunk/arch/mips/kernel/Makefile | 1 + trunk/arch/mips/kernel/init_task.c | 1 + trunk/arch/mips/kernel/smp.c | 2 - trunk/arch/mips/kernel/traps.c | 16 +- trunk/arch/mips/lasat/interrupt.c | 2 - trunk/arch/mips/lasat/lasat_board.c | 13 +- trunk/arch/mips/lasat/sysctl.c | 172 +- trunk/arch/mips/lasat/sysctl.h | 24 + trunk/arch/mips/mips-boards/generic/amon.c | 4 +- trunk/arch/mips/mips-boards/generic/time.c | 19 + trunk/arch/mips/mips-boards/malta/Makefile | 3 +- trunk/arch/mips/mm/c-r4k.c | 33 +- trunk/arch/mips/mm/init.c | 1 - trunk/arch/mips/mm/page.c | 10 +- trunk/arch/mips/mm/tlbex.c | 3 +- trunk/arch/mips/nxp/pnx8550/jbs/board_setup.c | 11 +- .../mips/nxp/pnx8550/stb810/board_setup.c | 10 +- trunk/arch/mips/pci/ops-bridge.c | 20 +- trunk/arch/mips/pci/pci-ip27.c | 8 - trunk/arch/mips/pci/pci-sb1250.c | 8 +- trunk/arch/mips/pci/pci-vr41xx.c | 14 +- trunk/arch/mips/sgi-ip27/ip27-init.c | 22 + trunk/arch/mips/sgi-ip27/ip27-memory.c | 117 +- trunk/arch/mips/sgi-ip27/ip27-smp.c | 5 +- trunk/arch/mips/sgi-ip27/ip27-timer.c | 27 +- trunk/arch/mips/sibyte/swarm/Makefile | 4 +- trunk/arch/mn10300/kernel/init_task.c | 1 + trunk/arch/mn10300/kernel/process.c | 1 + trunk/arch/mn10300/kernel/setup.c | 1 + trunk/arch/parisc/hpux/gate.S | 3 +- trunk/arch/parisc/hpux/wrappers.S | 3 +- trunk/arch/parisc/kernel/entry.S | 3 +- trunk/arch/parisc/kernel/head.S | 1 - trunk/arch/parisc/kernel/hpmc.S | 3 +- trunk/arch/parisc/kernel/init_task.c | 1 + trunk/arch/parisc/kernel/pacache.S | 3 +- trunk/arch/parisc/kernel/parisc_ksyms.c | 3 - trunk/arch/parisc/kernel/perf_asm.S | 2 +- trunk/arch/parisc/kernel/real2.S | 13 +- trunk/arch/parisc/kernel/signal32.c | 4 +- trunk/arch/parisc/kernel/syscall.S | 5 +- trunk/arch/parisc/kernel/vmlinux.lds.S | 1 - trunk/arch/parisc/lib/fixup.S | 3 +- trunk/arch/parisc/lib/lusercopy.S | 5 +- trunk/arch/parisc/mm/init.c | 1 - trunk/arch/powerpc/Makefile | 4 +- trunk/arch/powerpc/boot/.gitignore | 8 +- trunk/arch/powerpc/boot/4xx.c | 21 - trunk/arch/powerpc/boot/Makefile | 12 +- trunk/arch/powerpc/boot/crtsavres.S | 233 --- trunk/arch/powerpc/boot/dts/mpc8377_mds.dts | 18 +- trunk/arch/powerpc/boot/dts/mpc8377_rdb.dts | 8 +- trunk/arch/powerpc/boot/dts/mpc8378_rdb.dts | 8 +- trunk/arch/powerpc/boot/dts/mpc8379_rdb.dts | 8 +- trunk/arch/powerpc/boot/dts/mpc8548cds.dts | 4 +- trunk/arch/powerpc/boot/dts/mpc8610_hpcd.dts | 10 +- .../configs/83xx/mpc8313_rdb_defconfig | 155 +- .../configs/83xx/mpc8315_rdb_defconfig | 162 +- .../configs/83xx/mpc832x_mds_defconfig | 146 +- .../configs/83xx/mpc832x_rdb_defconfig | 150 +- .../configs/83xx/mpc834x_itx_defconfig | 157 +- .../configs/83xx/mpc834x_itxgp_defconfig | 150 +- .../configs/83xx/mpc834x_mds_defconfig | 146 +- .../configs/83xx/mpc836x_mds_defconfig | 146 +- .../configs/83xx/mpc837x_mds_defconfig | 146 +- .../configs/83xx/mpc837x_rdb_defconfig | 224 +- .../powerpc/configs/83xx/sbc834x_defconfig | 140 +- .../powerpc/configs/85xx/ksi8560_defconfig | 168 +- .../configs/85xx/mpc8540_ads_defconfig | 133 +- .../powerpc/configs/85xx/mpc8544_ds_defconfig | 210 +- .../configs/85xx/mpc8560_ads_defconfig | 135 +- .../powerpc/configs/85xx/mpc8568mds_defconfig | 150 +- .../powerpc/configs/85xx/mpc8572_ds_defconfig | 210 +- .../configs/85xx/mpc85xx_cds_defconfig | 137 +- .../powerpc/configs/85xx/sbc8548_defconfig | 131 +- .../powerpc/configs/85xx/sbc8560_defconfig | 135 +- .../powerpc/configs/85xx/stx_gp3_defconfig | 152 +- .../powerpc/configs/85xx/tqm8540_defconfig | 147 +- .../powerpc/configs/85xx/tqm8541_defconfig | 146 +- .../powerpc/configs/85xx/tqm8555_defconfig | 146 +- .../powerpc/configs/85xx/tqm8560_defconfig | 146 +- trunk/arch/powerpc/configs/adder875_defconfig | 52 +- trunk/arch/powerpc/configs/chrp32_defconfig | 164 +- trunk/arch/powerpc/configs/ep8248e_defconfig | 124 +- trunk/arch/powerpc/configs/ep88xc_defconfig | 47 +- trunk/arch/powerpc/configs/g5_defconfig | 178 +- trunk/arch/powerpc/configs/iseries_defconfig | 146 +- .../powerpc/configs/linkstation_defconfig | 172 +- .../powerpc/configs/mpc7448_hpc2_defconfig | 136 +- .../powerpc/configs/mpc8272_ads_defconfig | 126 +- trunk/arch/powerpc/configs/mpc83xx_defconfig | 151 +- trunk/arch/powerpc/configs/mpc85xx_defconfig | 230 +- .../powerpc/configs/mpc8610_hpcd_defconfig | 316 ++- .../powerpc/configs/mpc8641_hpcn_defconfig | 210 +- .../arch/powerpc/configs/mpc866_ads_defconfig | 128 +- .../arch/powerpc/configs/mpc885_ads_defconfig | 47 +- trunk/arch/powerpc/configs/pasemi_defconfig | 172 +- trunk/arch/powerpc/configs/pmac32_defconfig | 174 +- trunk/arch/powerpc/configs/ppc64_defconfig | 198 +- trunk/arch/powerpc/configs/pq2fads_defconfig | 133 +- .../arch/powerpc/configs/prpmc2800_defconfig | 153 +- trunk/arch/powerpc/configs/pseries_defconfig | 224 +- trunk/arch/powerpc/configs/sbc8641d_defconfig | 150 +- .../arch/powerpc/configs/storcenter_defconfig | 71 +- trunk/arch/powerpc/kernel/head_44x.S | 7 +- trunk/arch/powerpc/kernel/init_task.c | 1 + trunk/arch/powerpc/kernel/irq.c | 2 +- trunk/arch/powerpc/kernel/pci_64.c | 2 +- trunk/arch/powerpc/kernel/ppc_ksyms.c | 2 + trunk/arch/powerpc/kernel/prom_init_check.sh | 16 +- trunk/arch/powerpc/kernel/signal_64.c | 4 +- trunk/arch/powerpc/kernel/vdso.c | 2 +- trunk/arch/powerpc/kvm/44x_tlb.c | 9 +- trunk/arch/powerpc/kvm/booke_guest.c | 33 + trunk/arch/powerpc/kvm/emulate.c | 12 - trunk/arch/powerpc/lib/Makefile | 2 +- trunk/arch/powerpc/lib/crtsavres.S | 229 -- trunk/arch/powerpc/mm/hash_low_32.S | 2 + trunk/arch/powerpc/mm/hash_low_64.S | 4 - trunk/arch/powerpc/mm/mem.c | 3 +- trunk/arch/powerpc/mm/pgtable_32.c | 2 +- .../powerpc/platforms/52xx/mpc52xx_gpio.c | 14 +- trunk/arch/powerpc/platforms/85xx/Kconfig | 1 - .../powerpc/platforms/cell/celleb_scc_pciex.c | 5 +- trunk/arch/powerpc/platforms/cell/spu_base.c | 44 +- trunk/arch/powerpc/platforms/cell/spufs/run.c | 21 +- .../arch/powerpc/platforms/cell/spufs/sched.c | 19 +- trunk/arch/powerpc/platforms/ps3/mm.c | 3 - .../powerpc/platforms/pseries/eeh_driver.c | 11 +- trunk/arch/powerpc/platforms/pseries/nvram.c | 4 +- trunk/arch/powerpc/sysdev/fsl_soc.c | 2 +- trunk/arch/powerpc/sysdev/mpic.c | 20 +- trunk/arch/powerpc/xmon/xmon.c | 1 + trunk/arch/ppc/kernel/ppc_ksyms.c | 2 - trunk/arch/s390/Kconfig | 4 - trunk/arch/s390/appldata/appldata_base.c | 8 - trunk/arch/s390/defconfig | 11 +- trunk/arch/s390/kernel/dis.c | 2 +- trunk/arch/s390/kernel/init_task.c | 1 + trunk/arch/s390/kernel/smp.c | 4 +- trunk/arch/s390/kvm/diag.c | 2 +- trunk/arch/s390/kvm/interrupt.c | 7 +- trunk/arch/s390/kvm/kvm-s390.c | 13 +- trunk/arch/s390/mm/init.c | 49 +- trunk/arch/s390/mm/pgtable.c | 44 +- trunk/arch/s390/mm/vmem.c | 20 +- trunk/arch/sh/Kconfig | 1 + trunk/arch/sh/Kconfig.debug | 2 +- trunk/arch/sh/Makefile | 2 - .../arch/sh/boards/renesas/rts7751r2d/setup.c | 39 +- trunk/arch/sh/configs/migor_defconfig | 294 +-- trunk/arch/sh/configs/rsk7203_defconfig | 841 -------- trunk/arch/sh/configs/se7206_defconfig | 475 ++--- trunk/arch/sh/drivers/heartbeat.c | 2 +- trunk/arch/sh/kernel/cpu/irq/intc-sh5.c | 1 - trunk/arch/sh/kernel/cpu/sh4/probe.c | 1 - trunk/arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 2 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 49 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 9 +- trunk/arch/sh/kernel/entry-common.S | 12 +- trunk/arch/sh/kernel/head_32.S | 4 +- trunk/arch/sh/kernel/init_task.c | 1 + trunk/arch/sh/kernel/kgdb_stub.c | 11 +- trunk/arch/sh/kernel/module.c | 39 +- trunk/arch/sh/kernel/setup.c | 11 - trunk/arch/sh/kernel/traps.c | 10 +- trunk/arch/sh/lib/memcpy-sh4.S | 22 +- trunk/arch/sparc/Kconfig | 1 + trunk/arch/sparc/boot/Makefile | 1 + trunk/arch/sparc/boot/btfixupprep.c | 2 +- trunk/arch/sparc/boot/piggyback.c | 2 +- trunk/arch/sparc/kernel/ebus.c | 2 +- trunk/arch/sparc/kernel/etrap.S | 2 +- trunk/arch/sparc/kernel/head.S | 2 +- trunk/arch/sparc/kernel/idprom.c | 2 +- trunk/arch/sparc/kernel/init_task.c | 1 + trunk/arch/sparc/kernel/ioport.c | 2 +- trunk/arch/sparc/kernel/irq.c | 2 +- trunk/arch/sparc/kernel/led.c | 34 +- trunk/arch/sparc/kernel/muldiv.c | 2 +- trunk/arch/sparc/kernel/rtrap.S | 2 +- trunk/arch/sparc/kernel/setup.c | 2 +- trunk/arch/sparc/kernel/sparc_ksyms.c | 2 +- trunk/arch/sparc/kernel/sun4d_irq.c | 2 +- trunk/arch/sparc/kernel/trampoline.S | 2 +- trunk/arch/sparc/kernel/traps.c | 2 +- trunk/arch/sparc/kernel/unaligned.c | 2 +- trunk/arch/sparc/kernel/wof.S | 2 +- trunk/arch/sparc/kernel/wuf.S | 2 +- trunk/arch/sparc/lib/Makefile | 1 + trunk/arch/sparc/lib/ashldi3.S | 2 +- trunk/arch/sparc/lib/ashrdi3.S | 2 +- trunk/arch/sparc/lib/blockops.S | 2 +- trunk/arch/sparc/lib/locks.S | 2 +- trunk/arch/sparc/lib/lshrdi3.S | 1 + trunk/arch/sparc/lib/memscan.S | 2 +- trunk/arch/sparc/lib/mul.S | 2 +- trunk/arch/sparc/lib/rem.S | 2 +- trunk/arch/sparc/lib/rwsem.S | 2 +- trunk/arch/sparc/lib/sdiv.S | 2 +- trunk/arch/sparc/lib/strncmp.S | 2 +- trunk/arch/sparc/lib/udiv.S | 2 +- trunk/arch/sparc/lib/umul.S | 2 +- trunk/arch/sparc/lib/urem.S | 2 +- trunk/arch/sparc/math-emu/ashldi3.S | 2 +- trunk/arch/sparc/mm/Makefile | 1 + trunk/arch/sparc/mm/fault.c | 2 +- trunk/arch/sparc/mm/generic.c | 2 +- trunk/arch/sparc/mm/hypersparc.S | 2 +- trunk/arch/sparc/mm/init.c | 2 +- trunk/arch/sparc/mm/io-unit.c | 2 +- trunk/arch/sparc/mm/loadmmu.c | 2 +- trunk/arch/sparc/mm/nosrmmu.c | 2 +- trunk/arch/sparc/mm/nosun4c.c | 2 +- trunk/arch/sparc/mm/swift.S | 2 +- trunk/arch/sparc/mm/tsunami.S | 2 +- trunk/arch/sparc/mm/viking.S | 2 +- trunk/arch/sparc/prom/Makefile | 1 + trunk/arch/sparc/prom/bootstr.c | 2 +- trunk/arch/sparc/prom/console.c | 2 +- trunk/arch/sparc/prom/devmap.c | 2 +- trunk/arch/sparc/prom/devops.c | 2 +- trunk/arch/sparc/prom/init.c | 2 +- trunk/arch/sparc/prom/misc.c | 2 +- trunk/arch/sparc/prom/mp.c | 2 +- trunk/arch/sparc/prom/palloc.c | 2 +- trunk/arch/sparc/prom/ranges.c | 2 +- trunk/arch/sparc/prom/segment.c | 2 +- trunk/arch/sparc/prom/tree.c | 2 +- trunk/arch/sparc64/Makefile | 1 + trunk/arch/sparc64/boot/Makefile | 1 + trunk/arch/sparc64/boot/piggyback.c | 2 +- trunk/arch/sparc64/kernel/dtlb_prot.S | 2 +- trunk/arch/sparc64/kernel/ebus.c | 2 +- trunk/arch/sparc64/kernel/etrap.S | 2 +- trunk/arch/sparc64/kernel/idprom.c | 2 +- trunk/arch/sparc64/kernel/init_task.c | 1 + trunk/arch/sparc64/kernel/process.c | 153 +- trunk/arch/sparc64/kernel/rtrap.S | 3 +- trunk/arch/sparc64/kernel/sbus.c | 2 +- trunk/arch/sparc64/kernel/setup.c | 2 +- trunk/arch/sparc64/kernel/signal.c | 2 +- trunk/arch/sparc64/kernel/smp.c | 10 - trunk/arch/sparc64/kernel/stacktrace.c | 12 +- trunk/arch/sparc64/kernel/starfire.c | 2 +- trunk/arch/sparc64/kernel/sys32.S | 2 +- trunk/arch/sparc64/kernel/trampoline.S | 2 +- trunk/arch/sparc64/kernel/traps.c | 12 +- trunk/arch/sparc64/kernel/unaligned.c | 2 +- trunk/arch/sparc64/lib/PeeCeeI.c | 2 +- trunk/arch/sparc64/lib/VISsave.S | 2 +- trunk/arch/sparc64/lib/memcmp.S | 2 +- trunk/arch/sparc64/lib/memscan.S | 2 +- trunk/arch/sparc64/lib/strncmp.S | 2 +- trunk/arch/sparc64/lib/strncpy_from_user.S | 2 +- trunk/arch/sparc64/math-emu/math.c | 2 +- trunk/arch/sparc64/math-emu/sfp-util.h | 2 +- trunk/arch/sparc64/mm/Makefile | 1 + trunk/arch/sparc64/mm/fault.c | 2 +- trunk/arch/sparc64/mm/generic.c | 2 +- trunk/arch/sparc64/mm/init.c | 2 +- trunk/arch/sparc64/mm/ultra.S | 31 +- trunk/arch/sparc64/prom/Makefile | 1 + trunk/arch/sparc64/prom/bootstr.c | 2 +- trunk/arch/sparc64/prom/devops.c | 2 +- trunk/arch/sparc64/prom/init.c | 2 +- trunk/arch/sparc64/prom/misc.c | 2 +- trunk/arch/sparc64/prom/p1275.c | 2 +- trunk/arch/sparc64/prom/tree.c | 2 +- trunk/arch/um/Kconfig | 2 - trunk/arch/um/drivers/pcap_user.c | 2 +- trunk/arch/um/drivers/ubd_kern.c | 1 + trunk/arch/um/include/os.h | 2 +- trunk/arch/um/kernel/init_task.c | 1 + trunk/arch/um/kernel/ksyms.c | 5 - trunk/arch/um/kernel/um_arch.c | 2 +- trunk/arch/um/os-Linux/helper.c | 1 - trunk/arch/um/os-Linux/skas/process.c | 2 +- trunk/arch/um/os-Linux/start_up.c | 25 +- trunk/arch/um/os-Linux/sys-i386/registers.c | 5 +- trunk/arch/um/os-Linux/sys-i386/task_size.c | 31 +- trunk/arch/um/os-Linux/sys-x86_64/task_size.c | 2 +- trunk/arch/um/os-Linux/time.c | 7 - trunk/arch/um/sys-x86_64/ksyms.c | 10 +- trunk/arch/v850/kernel/init_task.c | 1 + trunk/arch/x86/Kconfig | 29 +- trunk/arch/x86/Kconfig.debug | 20 +- trunk/arch/x86/boot/a20.c | 3 +- trunk/arch/x86/boot/printf.c | 2 +- trunk/arch/x86/kernel/Makefile | 1 - trunk/arch/x86/kernel/acpi/boot.c | 16 +- trunk/arch/x86/kernel/apic_64.c | 2 +- trunk/arch/x86/kernel/cpu/cpufreq/longrun.c | 2 +- .../arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 15 +- trunk/arch/x86/kernel/entry_32.S | 1 - trunk/arch/x86/kernel/geode_32.c | 5 +- trunk/arch/x86/kernel/head_32.S | 2 +- trunk/arch/x86/kernel/i387.c | 44 +- trunk/arch/x86/kernel/init_task.c | 1 + trunk/arch/x86/kernel/io_apic_32.c | 12 +- trunk/arch/x86/kernel/kvmclock.c | 93 +- trunk/arch/x86/kernel/mfgpt_32.c | 2 - trunk/arch/x86/kernel/nmi_32.c | 9 +- trunk/arch/x86/kernel/pci-dma.c | 14 +- trunk/arch/x86/kernel/pci-gart_64.c | 31 +- trunk/arch/x86/kernel/process_32.c | 6 +- trunk/arch/x86/kernel/process_64.c | 6 +- trunk/arch/x86/kernel/pvclock.c | 141 -- trunk/arch/x86/kernel/rtc.c | 34 - trunk/arch/x86/kernel/setup_32.c | 10 +- trunk/arch/x86/kernel/smpboot.c | 5 +- trunk/arch/x86/kernel/traps_32.c | 1 - trunk/arch/x86/kernel/tsc_32.c | 23 +- trunk/arch/x86/kernel/tsc_64.c | 5 +- trunk/arch/x86/kvm/i8254.c | 25 +- trunk/arch/x86/kvm/irq.c | 6 - trunk/arch/x86/kvm/irq.h | 2 - trunk/arch/x86/kvm/lapic.c | 3 +- trunk/arch/x86/kvm/mmu.c | 24 +- trunk/arch/x86/kvm/paging_tmpl.h | 2 +- trunk/arch/x86/kvm/svm.c | 2 +- trunk/arch/x86/kvm/vmx.c | 22 +- trunk/arch/x86/kvm/x86.c | 93 +- trunk/arch/x86/kvm/x86_emulate.c | 10 +- trunk/arch/x86/lguest/boot.c | 5 +- trunk/arch/x86/lib/copy_user_64.S | 25 +- trunk/arch/x86/lib/copy_user_nocache_64.S | 25 +- trunk/arch/x86/lib/delay_32.c | 31 +- trunk/arch/x86/lib/delay_64.c | 30 +- trunk/arch/x86/math-emu/fpu_entry.c | 13 +- trunk/arch/x86/mm/fault.c | 5 - trunk/arch/x86/mm/init_64.c | 6 +- trunk/arch/x86/mm/ioremap.c | 5 +- trunk/arch/x86/mm/pat.c | 51 +- trunk/arch/x86/mm/srat_64.c | 27 + trunk/arch/x86/pci/common.c | 16 +- trunk/arch/x86/pci/init.c | 3 +- trunk/arch/x86/pci/irq.c | 7 - trunk/arch/x86/pci/olpc.c | 5 +- trunk/arch/x86/pci/pci.h | 2 +- trunk/arch/x86/vdso/vclock_gettime.c | 6 +- trunk/arch/x86/xen/Kconfig | 3 +- trunk/arch/x86/xen/enlighten.c | 56 +- trunk/arch/x86/xen/mmu.c | 77 +- trunk/arch/x86/xen/mmu.h | 24 +- trunk/arch/x86/xen/time.c | 145 +- trunk/arch/x86/xen/xen-head.S | 6 +- trunk/arch/xtensa/kernel/init_task.c | 1 + trunk/block/blk-core.c | 37 +- trunk/block/blktrace.c | 29 +- trunk/block/cfq-iosched.c | 36 +- trunk/block/elevator.c | 2 - trunk/block/genhd.c | 2 - trunk/crypto/cts.c | 6 - trunk/drivers/acpi/ac.c | 8 +- trunk/drivers/acpi/bay.c | 16 +- trunk/drivers/acpi/dispatcher/dsfield.c | 5 +- trunk/drivers/acpi/dispatcher/dsmethod.c | 2 +- trunk/drivers/acpi/dock.c | 2 +- trunk/drivers/acpi/ec.c | 2 +- trunk/drivers/acpi/executer/exconfig.c | 10 +- trunk/drivers/acpi/executer/exmutex.c | 4 +- trunk/drivers/acpi/glue.c | 6 - trunk/drivers/acpi/hardware/hwsleep.c | 8 +- trunk/drivers/acpi/numa.c | 31 +- trunk/drivers/acpi/parser/psargs.c | 4 +- trunk/drivers/acpi/processor_core.c | 1 + trunk/drivers/acpi/processor_idle.c | 13 +- trunk/drivers/acpi/sleep/proc.c | 6 - trunk/drivers/acpi/system.c | 15 +- trunk/drivers/acpi/tables/tbinstal.c | 25 +- trunk/drivers/acpi/tables/tbxface.c | 2 +- trunk/drivers/acpi/thermal.c | 11 +- trunk/drivers/acpi/utilities/utmisc.c | 2 +- trunk/drivers/acpi/video.c | 3 +- trunk/drivers/ata/Kconfig | 10 +- trunk/drivers/ata/ahci.c | 168 +- trunk/drivers/ata/ata_piix.c | 16 +- trunk/drivers/ata/libata-acpi.c | 150 +- trunk/drivers/ata/libata-core.c | 46 +- trunk/drivers/ata/libata-eh.c | 207 +- trunk/drivers/ata/libata-pmp.c | 51 +- trunk/drivers/ata/libata-scsi.c | 25 +- trunk/drivers/ata/libata-sff.c | 115 +- trunk/drivers/ata/libata.h | 2 +- trunk/drivers/ata/pata_ali.c | 10 +- trunk/drivers/ata/pata_amd.c | 14 +- trunk/drivers/ata/pata_at32.c | 2 + trunk/drivers/ata/pata_bf54x.c | 5 +- trunk/drivers/ata/pata_cypress.c | 8 +- trunk/drivers/ata/pata_icside.c | 2 +- trunk/drivers/ata/pata_legacy.c | 50 +- trunk/drivers/ata/pata_ns87410.c | 6 +- trunk/drivers/ata/pata_ns87415.c | 4 +- trunk/drivers/ata/pata_pcmcia.c | 2 - trunk/drivers/ata/pata_qdi.c | 16 +- trunk/drivers/ata/pata_rb532_cf.c | 4 +- trunk/drivers/ata/pata_scc.c | 5 +- trunk/drivers/ata/pata_sl82c105.c | 2 +- trunk/drivers/ata/pata_via.c | 14 +- trunk/drivers/ata/pata_winbond.c | 6 +- trunk/drivers/ata/sata_fsl.c | 224 +- trunk/drivers/ata/sata_mv.c | 279 ++- trunk/drivers/ata/sata_promise.c | 148 +- trunk/drivers/ata/sata_sil24.c | 11 - trunk/drivers/atm/eni.h | 1 + trunk/drivers/atm/fore200e.h | 1 + trunk/drivers/atm/fore200e_mkfirm.c | 2 + trunk/drivers/atm/he.c | 11 +- trunk/drivers/atm/he.h | 15 +- trunk/drivers/atm/idt77252.c | 7 + trunk/drivers/atm/idt77252.h | 4 + trunk/drivers/atm/iphase.c | 27 +- trunk/drivers/atm/iphase.h | 3 +- trunk/drivers/atm/nicstarmac.copyright | 2 +- trunk/drivers/base/core.c | 109 +- trunk/drivers/block/brd.c | 2 - trunk/drivers/block/cciss.c | 21 +- trunk/drivers/block/viodasd.c | 2 +- trunk/drivers/block/virtio_blk.c | 7 +- trunk/drivers/cdrom/viocd.c | 2 +- trunk/drivers/char/Kconfig | 12 +- trunk/drivers/char/agp/agp.h | 6 +- trunk/drivers/char/agp/alpha-agp.c | 4 +- trunk/drivers/char/agp/amd-k7-agp.c | 4 +- trunk/drivers/char/agp/amd64-agp.c | 4 +- trunk/drivers/char/agp/ati-agp.c | 8 +- trunk/drivers/char/agp/backend.c | 16 +- trunk/drivers/char/agp/compat_ioctl.c | 2 +- trunk/drivers/char/agp/efficeon-agp.c | 6 +- trunk/drivers/char/agp/frontend.c | 12 +- trunk/drivers/char/agp/generic.c | 35 +- trunk/drivers/char/agp/hp-agp.c | 6 +- trunk/drivers/char/agp/i460-agp.c | 2 +- trunk/drivers/char/agp/intel-agp.c | 239 +-- trunk/drivers/char/agp/nvidia-agp.c | 4 +- trunk/drivers/char/agp/parisc-agp.c | 6 +- trunk/drivers/char/agp/sgi-agp.c | 8 +- trunk/drivers/char/agp/sworks-agp.c | 6 +- trunk/drivers/char/agp/uninorth-agp.c | 10 +- trunk/drivers/char/agp/via-agp.c | 13 +- trunk/drivers/char/drm/ati_pcigart.c | 8 +- trunk/drivers/char/drm/drm.h | 19 +- trunk/drivers/char/drm/drmP.h | 91 +- trunk/drivers/char/drm/drm_drv.c | 7 +- trunk/drivers/char/drm/drm_fops.c | 7 +- trunk/drivers/char/drm/drm_irq.c | 381 +++- trunk/drivers/char/drm/drm_lock.c | 35 +- trunk/drivers/char/drm/drm_pciids.h | 17 +- trunk/drivers/char/drm/drm_sysfs.c | 2 + trunk/drivers/char/drm/i915_dma.c | 160 +- trunk/drivers/char/drm/i915_drm.h | 45 +- trunk/drivers/char/drm/i915_drv.c | 24 +- trunk/drivers/char/drm/i915_drv.h | 126 +- trunk/drivers/char/drm/i915_irq.c | 597 ++++-- trunk/drivers/char/drm/mga_drv.c | 7 +- trunk/drivers/char/drm/mga_drv.h | 6 +- trunk/drivers/char/drm/mga_irq.c | 69 +- trunk/drivers/char/drm/r128_drv.c | 7 +- trunk/drivers/char/drm/r128_drv.h | 9 +- trunk/drivers/char/drm/r128_irq.c | 55 +- trunk/drivers/char/drm/r300_cmdbuf.c | 117 +- trunk/drivers/char/drm/r300_reg.h | 242 +-- trunk/drivers/char/drm/radeon_cp.c | 1148 +++++++--- trunk/drivers/char/drm/radeon_drm.h | 8 - trunk/drivers/char/drm/radeon_drv.c | 8 +- trunk/drivers/char/drm/radeon_drv.h | 270 +-- trunk/drivers/char/drm/radeon_irq.c | 171 +- trunk/drivers/char/drm/radeon_microcode.h | 1844 ----------------- trunk/drivers/char/drm/radeon_state.c | 17 +- trunk/drivers/char/drm/via_drv.c | 6 +- trunk/drivers/char/drm/via_drv.h | 7 +- trunk/drivers/char/drm/via_irq.c | 81 +- trunk/drivers/char/generic_nvram.c | 2 +- trunk/drivers/char/hw_random/Kconfig | 9 - trunk/drivers/char/hw_random/Makefile | 1 - trunk/drivers/char/hw_random/intel-rng.c | 2 +- trunk/drivers/char/hw_random/virtio-rng.c | 155 -- trunk/drivers/char/ip2/Makefile | 4 +- trunk/drivers/char/ip2/ip2main.c | 23 + trunk/drivers/char/keyboard.c | 7 +- .../drivers/char/pcmcia/ipwireless/hardware.c | 20 +- trunk/drivers/char/sysrq.c | 1 - trunk/drivers/char/tty_ioctl.c | 7 + trunk/drivers/char/viocons.c | 2 +- trunk/drivers/char/viotape.c | 2 +- trunk/drivers/char/vt.c | 15 +- trunk/drivers/cpufreq/cpufreq.c | 10 +- trunk/drivers/cpufreq/freq_table.c | 5 - trunk/drivers/cpuidle/cpuidle.c | 40 +- trunk/drivers/dma/iop-adma.c | 6 +- trunk/drivers/edac/mpc85xx_edac.c | 3 + trunk/drivers/firewire/Kconfig | 32 +- trunk/drivers/firewire/fw-cdev.c | 23 +- trunk/drivers/firewire/fw-ohci.c | 110 +- trunk/drivers/firewire/fw-transaction.c | 52 +- trunk/drivers/firmware/edd.c | 2 +- trunk/drivers/gpio/gpiolib.c | 6 +- trunk/drivers/gpio/mcp23s08.c | 2 +- trunk/drivers/gpio/pca953x.c | 1 - trunk/drivers/hid/hid-debug.c | 2 + trunk/drivers/hid/hid-input.c | 7 +- trunk/drivers/hid/usbhid/hid-quirks.c | 49 +- trunk/drivers/hid/usbhid/usbkbd.c | 2 + trunk/drivers/hid/usbhid/usbmouse.c | 2 + trunk/drivers/hwmon/Kconfig | 14 - trunk/drivers/hwmon/Makefile | 1 - trunk/drivers/hwmon/abituguru3.c | 18 +- trunk/drivers/hwmon/adt7473.c | 3 - trunk/drivers/hwmon/hdaps.c | 2 - trunk/drivers/hwmon/i5k_amb.c | 39 +- trunk/drivers/hwmon/ibmaem.c | 1111 ---------- trunk/drivers/hwmon/lm75.c | 20 +- trunk/drivers/hwmon/lm85.c | 25 +- trunk/drivers/ide/Kconfig | 8 +- trunk/drivers/ide/arm/Makefile | 1 + trunk/drivers/ide/arm/bast-ide.c | 89 + trunk/drivers/ide/arm/ide_arm.c | 1 - trunk/drivers/ide/arm/palm_bk3710.c | 25 +- trunk/drivers/ide/ide-generic.c | 10 +- trunk/drivers/ide/ide-pnp.c | 1 - trunk/drivers/ide/ide-probe.c | 11 +- trunk/drivers/ide/ide-proc.c | 1 + trunk/drivers/ide/ide-taskfile.c | 6 +- trunk/drivers/ide/legacy/buddha.c | 2 - trunk/drivers/ide/legacy/falconide.c | 2 - trunk/drivers/ide/legacy/gayle.c | 6 - trunk/drivers/ide/legacy/ide-cs.c | 44 +- trunk/drivers/ide/legacy/macide.c | 2 - trunk/drivers/ide/legacy/q40ide.c | 2 - trunk/drivers/ide/pci/cmd640.c | 2 - trunk/drivers/ide/pci/delkin_cb.c | 28 +- trunk/drivers/ide/pci/opti621.c | 221 +- trunk/drivers/ide/pci/sis5513.c | 5 - trunk/drivers/ide/ppc/mpc8xx.c | 4 - trunk/drivers/ide/ppc/pmac.c | 60 +- trunk/drivers/ieee1394/Kconfig | 118 +- trunk/drivers/ieee1394/sbp2.c | 20 +- trunk/drivers/infiniband/core/mad.c | 4 +- trunk/drivers/infiniband/core/umem.c | 2 +- trunk/drivers/infiniband/core/user_mad.c | 14 +- trunk/drivers/infiniband/core/uverbs_main.c | 13 +- .../drivers/infiniband/hw/amso1100/c2_rnic.c | 3 +- trunk/drivers/infiniband/hw/cxgb3/iwch_qp.c | 2 +- trunk/drivers/infiniband/hw/ehca/ehca_reqs.c | 6 +- .../infiniband/hw/ipath/ipath_kernel.h | 5 - trunk/drivers/infiniband/hw/ipath/ipath_mad.c | 4 - .../drivers/infiniband/hw/ipath/ipath_sdma.c | 16 +- trunk/drivers/infiniband/hw/ipath/ipath_uc.c | 4 +- .../drivers/infiniband/hw/ipath/ipath_verbs.c | 3 +- trunk/drivers/infiniband/hw/mlx4/qp.c | 15 +- .../drivers/infiniband/hw/mthca/mthca_main.c | 14 +- .../infiniband/hw/mthca/mthca_memfree.c | 6 +- trunk/drivers/infiniband/hw/nes/nes_verbs.c | 4 +- .../infiniband/ulp/ipoib/ipoib_multicast.c | 6 - trunk/drivers/input/keyboard/aaed2000_kbd.c | 2 +- trunk/drivers/input/keyboard/atkbd.c | 2 - trunk/drivers/input/keyboard/corgikbd.c | 2 +- trunk/drivers/input/keyboard/jornada680_kbd.c | 2 +- trunk/drivers/input/keyboard/jornada720_kbd.c | 2 +- trunk/drivers/input/keyboard/pxa27x_keypad.c | 38 +- trunk/drivers/input/keyboard/spitzkbd.c | 2 +- trunk/drivers/input/misc/Kconfig | 1 + trunk/drivers/input/misc/apanel.c | 1 + trunk/drivers/input/mouse/appletouch.c | 49 +- trunk/drivers/input/serio/i8042-x86ia64io.h | 14 - trunk/drivers/input/serio/i8042.c | 41 +- trunk/drivers/input/tablet/gtco.c | 17 +- .../drivers/input/touchscreen/jornada720_ts.c | 2 +- trunk/drivers/input/touchscreen/wm9713.c | 22 - trunk/drivers/input/touchscreen/wm97xx-core.c | 25 +- trunk/drivers/isdn/capi/capiutil.c | 6 +- trunk/drivers/isdn/hardware/eicon/divasmain.c | 1 + trunk/drivers/isdn/hardware/eicon/divasproc.c | 4 +- trunk/drivers/isdn/hysdn/Kconfig | 2 +- trunk/drivers/isdn/hysdn/boardergo.c | 14 +- trunk/drivers/isdn/hysdn/hycapi.c | 6 +- trunk/drivers/isdn/hysdn/hysdn_procconf.c | 29 +- trunk/drivers/isdn/sc/ioctl.c | 1 - trunk/drivers/leds/led-class.c | 6 +- trunk/drivers/lguest/lguest_device.c | 25 +- trunk/drivers/lguest/x86/core.c | 15 +- trunk/drivers/macintosh/mediabay.c | 7 +- trunk/drivers/macintosh/smu.c | 5 +- trunk/drivers/macintosh/therm_adt746x.c | 13 +- trunk/drivers/md/bitmap.c | 17 +- trunk/drivers/md/md.c | 81 +- trunk/drivers/md/multipath.c | 3 +- trunk/drivers/md/raid1.c | 29 +- trunk/drivers/md/raid10.c | 14 +- trunk/drivers/md/raid5.c | 54 +- trunk/drivers/media/Makefile | 7 +- trunk/drivers/media/common/tuners/Kconfig | 1 - trunk/drivers/media/common/tuners/mxl5005s.c | 4 +- .../media/common/tuners/tda18271-common.c | 4 +- trunk/drivers/media/common/tuners/tda827x.c | 4 +- trunk/drivers/media/common/tuners/tea5761.c | 2 +- trunk/drivers/media/common/tuners/tuner-i2c.h | 8 - .../media/common/tuners/tuner-simple.c | 6 +- .../media/common/tuners/tuner-xc2028.c | 87 +- trunk/drivers/media/dvb/b2c2/flexcop-usb.c | 2 +- trunk/drivers/media/dvb/cinergyT2/cinergyT2.c | 46 +- trunk/drivers/media/dvb/dvb-core/dvb_net.c | 12 +- trunk/drivers/media/dvb/dvb-usb/Kconfig | 2 +- .../media/dvb/dvb-usb/dib0700_devices.c | 21 +- .../media/dvb/dvb-usb/dvb-usb-firmware.c | 2 +- trunk/drivers/media/dvb/dvb-usb/gp8psk.c | 10 +- trunk/drivers/media/dvb/dvb-usb/m920x.c | 7 +- trunk/drivers/media/dvb/frontends/dib0070.h | 15 +- trunk/drivers/media/dvb/frontends/dib7000p.h | 15 +- trunk/drivers/media/dvb/frontends/or51132.c | 6 +- trunk/drivers/media/dvb/ttpci/av7110.c | 9 +- trunk/drivers/media/dvb/ttpci/av7110_av.c | 34 +- .../media/dvb/ttusb-budget/dvb-ttusb-budget.c | 2 +- trunk/drivers/media/dvb/ttusb-dec/Kconfig | 2 +- trunk/drivers/media/dvb/ttusb-dec/ttusb_dec.c | 25 +- .../drivers/media/dvb/ttusb-dec/ttusbdecfe.c | 10 +- trunk/drivers/media/video/Kconfig | 2 +- trunk/drivers/media/video/au0828/Kconfig | 2 +- trunk/drivers/media/video/au0828/au0828-dvb.c | 6 + trunk/drivers/media/video/bt8xx/bttv-cards.c | 5 +- trunk/drivers/media/video/bt8xx/bttv-driver.c | 2 +- trunk/drivers/media/video/bt8xx/bttv-risc.c | 8 +- trunk/drivers/media/video/btcx-risc.c | 2 +- trunk/drivers/media/video/btcx-risc.h | 4 +- trunk/drivers/media/video/cx18/cx18-av-core.c | 81 +- trunk/drivers/media/video/cx18/cx18-cards.c | 4 +- .../drivers/media/video/cx18/cx18-controls.c | 6 +- trunk/drivers/media/video/cx18/cx18-driver.c | 26 +- trunk/drivers/media/video/cx18/cx18-driver.h | 9 +- trunk/drivers/media/video/cx18/cx18-fileops.c | 13 +- trunk/drivers/media/video/cx18/cx18-gpio.c | 33 +- trunk/drivers/media/video/cx18/cx18-ioctl.c | 12 +- trunk/drivers/media/video/cx18/cx18-irq.c | 12 +- trunk/drivers/media/video/cx18/cx18-mailbox.c | 8 +- trunk/drivers/media/video/cx18/cx18-streams.c | 37 +- .../media/video/cx23885/cx23885-core.c | 8 +- trunk/drivers/media/video/cx88/cx88-cards.c | 13 +- trunk/drivers/media/video/cx88/cx88-core.c | 8 +- .../drivers/media/video/em28xx/em28xx-video.c | 8 +- trunk/drivers/media/video/ivtv/ivtv-driver.h | 10 +- trunk/drivers/media/video/ivtv/ivtv-fileops.c | 2 +- trunk/drivers/media/video/ivtv/ivtv-irq.c | 8 +- trunk/drivers/media/video/ivtv/ivtv-queue.c | 2 +- trunk/drivers/media/video/ivtv/ivtv-streams.c | 30 +- trunk/drivers/media/video/ivtv/ivtv-version.h | 4 +- trunk/drivers/media/video/ivtv/ivtv-yuv.c | 2 +- trunk/drivers/media/video/ivtv/ivtv-yuv.h | 2 +- .../media/video/saa7134/saa7134-empress.c | 3 +- trunk/drivers/media/video/tuner-core.c | 60 +- .../media/video/usbvideo/quickcam_messenger.c | 2 +- trunk/drivers/media/video/videobuf-core.c | 3 +- trunk/drivers/media/video/zoran.h | 4 +- trunk/drivers/media/video/zoran_device.c | 2 +- trunk/drivers/media/video/zoran_driver.c | 10 +- trunk/drivers/message/fusion/mptfc.c | 2 + trunk/drivers/message/fusion/mptsas.c | 2 + trunk/drivers/message/fusion/mptscsih.c | 8 + trunk/drivers/mfd/Kconfig | 2 +- trunk/drivers/misc/fujitsu-laptop.c | 6 - trunk/drivers/misc/kgdbts.c | 33 +- trunk/drivers/misc/thinkpad_acpi.c | 496 +++-- trunk/drivers/mmc/card/Kconfig | 12 - trunk/drivers/mmc/card/Makefile | 1 - trunk/drivers/mmc/card/block.c | 2 +- trunk/drivers/mmc/card/mmc_test.c | 892 -------- trunk/drivers/mmc/host/Kconfig | 2 +- trunk/drivers/mmc/host/at91_mci.c | 5 +- trunk/drivers/mmc/host/omap.c | 12 +- trunk/drivers/mmc/host/wbsd.c | 21 +- trunk/drivers/mtd/devices/m25p80.c | 4 +- trunk/drivers/mtd/maps/ck804xrom.c | 18 +- trunk/drivers/mtd/maps/omap_nor.c | 2 +- trunk/drivers/mtd/nand/pxa3xx_nand.c | 2 +- trunk/drivers/mtd/onenand/generic.c | 2 +- trunk/drivers/mtd/redboot.c | 2 +- trunk/drivers/net/3c509.c | 17 +- trunk/drivers/net/7990.c | 6 +- trunk/drivers/net/Kconfig | 4 +- trunk/drivers/net/atlx/atl1.c | 21 +- trunk/drivers/net/au1000_eth.c | 7 +- trunk/drivers/net/bfin_mac.c | 1 + trunk/drivers/net/bnx2.c | 9 +- trunk/drivers/net/bnx2.h | 1 + trunk/drivers/net/bnx2x.c | 5 +- trunk/drivers/net/bnx2x.h | 3 +- trunk/drivers/net/bnx2x_init.h | 3 +- trunk/drivers/net/bonding/bond_sysfs.c | 12 +- trunk/drivers/net/cassini.c | 11 +- trunk/drivers/net/cpmac.c | 234 +-- trunk/drivers/net/cs89x0.c | 10 +- trunk/drivers/net/dm9000.c | 2 +- trunk/drivers/net/e1000e/netdev.c | 4 +- trunk/drivers/net/ehea/ehea_main.c | 24 +- trunk/drivers/net/enc28j60.c | 87 +- trunk/drivers/net/fec_mpc52xx.c | 2 +- trunk/drivers/net/forcedeth.c | 21 - trunk/drivers/net/fs_enet/fs_enet-main.c | 2 +- trunk/drivers/net/hamradio/baycom_epp.c | 2 +- trunk/drivers/net/hamradio/scc.c | 3 +- trunk/drivers/net/ibm_newemac/Kconfig | 1 - trunk/drivers/net/ipg.c | 4 +- trunk/drivers/net/irda/Kconfig | 1 - trunk/drivers/net/irda/irda-usb.c | 2 +- trunk/drivers/net/irda/irda-usb.h | 4 +- trunk/drivers/net/ixgbe/ixgbe_82598.c | 4 +- trunk/drivers/net/myri10ge/myri10ge.c | 4 +- trunk/drivers/net/netxen/netxen_nic.h | 18 +- trunk/drivers/net/netxen/netxen_nic_ethtool.c | 6 +- trunk/drivers/net/netxen/netxen_nic_hw.c | 112 +- trunk/drivers/net/netxen/netxen_nic_init.c | 46 +- trunk/drivers/net/netxen/netxen_nic_isr.c | 4 +- trunk/drivers/net/netxen/netxen_nic_main.c | 133 +- trunk/drivers/net/netxen/netxen_nic_niu.c | 22 +- trunk/drivers/net/pcmcia/fmvj18x_cs.c | 4 +- trunk/drivers/net/pcmcia/xirc2ps_cs.c | 12 +- trunk/drivers/net/pcnet32.c | 4 +- trunk/drivers/net/phy/Kconfig | 2 +- trunk/drivers/net/phy/phy_device.c | 1 - trunk/drivers/net/pppoe.c | 37 +- trunk/drivers/net/pppol2tp.c | 144 +- trunk/drivers/net/r6040.c | 2 +- trunk/drivers/net/s2io-regs.h | 2 +- trunk/drivers/net/s2io.c | 496 ++--- trunk/drivers/net/s2io.h | 22 +- trunk/drivers/net/sb1250-mac.c | 67 +- trunk/drivers/net/sc92031.c | 8 +- trunk/drivers/net/sfc/bitfield.h | 7 +- trunk/drivers/net/sfc/boards.c | 9 +- trunk/drivers/net/sfc/efx.c | 84 +- trunk/drivers/net/sfc/falcon.c | 91 +- trunk/drivers/net/sfc/falcon.h | 5 +- trunk/drivers/net/sfc/falcon_hwdefs.h | 4 +- trunk/drivers/net/sfc/falcon_io.h | 29 +- trunk/drivers/net/sfc/falcon_xmac.c | 12 +- trunk/drivers/net/sfc/net_driver.h | 44 +- trunk/drivers/net/sfc/rx.c | 48 +- trunk/drivers/net/sfc/selftest.c | 14 +- trunk/drivers/net/sfc/sfe4001.c | 14 +- trunk/drivers/net/sfc/tenxpress.c | 4 +- trunk/drivers/net/sfc/tx.c | 11 +- trunk/drivers/net/sfc/workarounds.h | 2 +- trunk/drivers/net/sfc/xfp_phy.c | 4 +- trunk/drivers/net/sky2.c | 32 +- trunk/drivers/net/smc911x.c | 24 +- trunk/drivers/net/smc91x.c | 17 +- trunk/drivers/net/smc91x.h | 8 +- trunk/drivers/net/sunhme.c | 4 +- trunk/drivers/net/tg3.c | 33 +- trunk/drivers/net/tokenring/3c359.h | 2 +- trunk/drivers/net/tokenring/olympic.h | 2 +- trunk/drivers/net/tulip/tulip_core.c | 12 +- trunk/drivers/net/tulip/uli526x.c | 16 +- trunk/drivers/net/tun.c | 15 - trunk/drivers/net/ucc_geth.c | 9 +- trunk/drivers/net/ucc_geth_ethtool.c | 3 +- trunk/drivers/net/usb/asix.c | 4 - trunk/drivers/net/usb/catc.c | 5 +- trunk/drivers/net/usb/cdc_subset.c | 2 +- trunk/drivers/net/usb/kaweth.c | 2 +- trunk/drivers/net/usb/rndis_host.c | 6 +- trunk/drivers/net/virtio_net.c | 91 +- trunk/drivers/net/wan/hdlc.c | 19 +- trunk/drivers/net/wan/hdlc_cisco.c | 82 +- trunk/drivers/net/wireless/airo.c | 3 +- trunk/drivers/net/wireless/ath5k/base.c | 2 - trunk/drivers/net/wireless/ath5k/hw.c | 6 +- trunk/drivers/net/wireless/b43/Kconfig | 2 +- trunk/drivers/net/wireless/b43/b43.h | 2 +- trunk/drivers/net/wireless/b43/dma.c | 65 +- trunk/drivers/net/wireless/b43/main.c | 86 +- trunk/drivers/net/wireless/b43legacy/Kconfig | 2 +- trunk/drivers/net/wireless/b43legacy/main.c | 17 +- trunk/drivers/net/wireless/hostap/hostap_cs.c | 1 - trunk/drivers/net/wireless/hostap/hostap_hw.c | 9 +- .../drivers/net/wireless/hostap/hostap_main.c | 8 +- trunk/drivers/net/wireless/ipw2200.c | 204 +- trunk/drivers/net/wireless/ipw2200.h | 6 +- .../net/wireless/iwlwifi/iwl-3945-led.c | 5 +- .../net/wireless/iwlwifi/iwl-4965-rs.c | 3 +- trunk/drivers/net/wireless/libertas/cmd.c | 5 +- trunk/drivers/net/wireless/libertas/debugfs.c | 4 +- trunk/drivers/net/wireless/libertas/ethtool.c | 27 +- trunk/drivers/net/wireless/libertas/main.c | 4 +- trunk/drivers/net/wireless/orinoco_cs.c | 1 - trunk/drivers/net/wireless/p54/p54usb.c | 1 - trunk/drivers/net/wireless/rndis_wlan.c | 65 +- trunk/drivers/net/wireless/rt2x00/Kconfig | 19 +- trunk/drivers/net/wireless/rt2x00/rt2x00.h | 5 - .../net/wireless/rt2x00/rt2x00config.c | 1 - trunk/drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +- trunk/drivers/net/wireless/rt2x00/rt2x00mac.c | 1 - trunk/drivers/net/wireless/rt2x00/rt2x00pci.c | 3 +- trunk/drivers/net/wireless/rt2x00/rt2x00usb.c | 6 - trunk/drivers/net/wireless/rt2x00/rt73usb.c | 1 - trunk/drivers/net/wireless/rtl8180_grf5101.c | 2 +- trunk/drivers/net/wireless/rtl8180_max2820.c | 5 +- trunk/drivers/net/wireless/rtl8180_sa2400.c | 2 +- trunk/drivers/net/wireless/rtl8187_dev.c | 14 +- trunk/drivers/net/wireless/zd1211rw/zd_mac.c | 4 +- trunk/drivers/net/wireless/zd1211rw/zd_usb.c | 2 +- trunk/drivers/net/xen-netfront.c | 6 +- trunk/drivers/of/of_i2c.c | 1 + trunk/drivers/pci/hotplug/pci_hotplug_core.c | 7 +- trunk/drivers/pci/hotplug/pciehp.h | 11 +- trunk/drivers/pci/hotplug/pciehp_core.c | 6 +- trunk/drivers/pci/hotplug/pciehp_ctrl.c | 36 +- trunk/drivers/pci/hotplug/pciehp_hpc.c | 129 +- trunk/drivers/pci/hotplug/rpadlpar_sysfs.c | 8 +- trunk/drivers/pci/hotplug/shpchp_core.c | 4 - trunk/drivers/pci/pci-driver.c | 2 +- trunk/drivers/pci/pci-sysfs.c | 85 +- trunk/drivers/pci/pcie/aspm.c | 20 - trunk/drivers/pcmcia/electra_cf.c | 1 - trunk/drivers/pnp/pnpacpi/rsparser.c | 46 +- trunk/drivers/pnp/quirks.c | 2 +- trunk/drivers/pnp/system.c | 2 +- trunk/drivers/power/power_supply_core.c | 6 +- trunk/drivers/power/power_supply_sysfs.c | 2 +- trunk/drivers/rtc/Kconfig | 19 - trunk/drivers/rtc/Makefile | 2 - trunk/drivers/rtc/rtc-at32ap700x.c | 7 +- trunk/drivers/rtc/rtc-cmos.c | 31 +- trunk/drivers/rtc/rtc-ds1374.c | 2 +- trunk/drivers/rtc/rtc-fm3130.c | 501 ----- trunk/drivers/rtc/rtc-ppc.c | 69 - trunk/drivers/s390/block/dasd.c | 28 +- trunk/drivers/s390/char/raw3270.c | 9 +- trunk/drivers/s390/char/sclp_config.c | 2 +- trunk/drivers/s390/char/sclp_vt220.c | 28 +- trunk/drivers/s390/char/tape.h | 3 - trunk/drivers/s390/char/tape_3590.c | 2 +- trunk/drivers/s390/char/tape_block.c | 4 +- trunk/drivers/s390/char/tape_core.c | 16 +- trunk/drivers/s390/char/vmlogrdr.c | 9 +- trunk/drivers/s390/cio/blacklist.c | 6 +- trunk/drivers/s390/cio/cio.c | 20 +- trunk/drivers/s390/kvm/kvm_virtio.c | 58 +- trunk/drivers/s390/net/qeth_core_main.c | 49 +- trunk/drivers/s390/net/qeth_core_offl.c | 6 +- trunk/drivers/s390/net/qeth_core_sys.c | 12 + trunk/drivers/s390/net/qeth_l2_main.c | 41 +- trunk/drivers/s390/net/qeth_l3_main.c | 75 +- trunk/drivers/s390/net/qeth_l3_sys.c | 24 + trunk/drivers/s390/s390mach.c | 1 - trunk/drivers/sbus/char/bpp.c | 6 +- trunk/drivers/scsi/3w-9xxx.c | 6 +- trunk/drivers/scsi/aha152x.c | 4 +- trunk/drivers/scsi/atp870u.c | 2 +- trunk/drivers/scsi/ch.c | 7 +- trunk/drivers/scsi/dpt/dptsig.h | 3 +- trunk/drivers/scsi/hosts.c | 9 +- trunk/drivers/scsi/hptiop.c | 12 +- trunk/drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- trunk/drivers/scsi/ibmvscsi/viosrp.h | 3 +- trunk/drivers/scsi/mac_esp.c | 2 +- trunk/drivers/scsi/osst.c | 3 +- trunk/drivers/scsi/qla1280.c | 2 +- trunk/drivers/scsi/qla2xxx/qla_attr.c | 13 +- trunk/drivers/scsi/qla2xxx/qla_def.h | 2 +- trunk/drivers/scsi/qla2xxx/qla_gbl.h | 3 - trunk/drivers/scsi/qla2xxx/qla_inline.h | 4 - trunk/drivers/scsi/qla2xxx/qla_isr.c | 63 +- trunk/drivers/scsi/qla2xxx/qla_mbx.c | 12 +- trunk/drivers/scsi/qla2xxx/qla_mid.c | 19 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 30 +- trunk/drivers/scsi/qla2xxx/qla_version.h | 2 +- trunk/drivers/scsi/scsi_sysfs.c | 7 +- trunk/drivers/scsi/sg.c | 11 +- trunk/drivers/scsi/sr.c | 3 - trunk/drivers/scsi/st.c | 12 +- trunk/drivers/serial/8250.c | 1 + trunk/drivers/serial/8250_pci.c | 7 +- trunk/drivers/serial/Kconfig | 2 +- trunk/drivers/serial/atmel_serial.c | 2 +- trunk/drivers/serial/bfin_5xx.c | 80 +- trunk/drivers/serial/sb1250-duart.c | 2 +- trunk/drivers/serial/serial_core.c | 15 +- trunk/drivers/serial/sh-sci.c | 8 +- trunk/drivers/serial/sunhv.c | 1 + trunk/drivers/serial/ucc_uart.c | 2 +- trunk/drivers/spi/spidev.c | 166 +- trunk/drivers/ssb/driver_pcicore.c | 4 +- trunk/drivers/ssb/main.c | 12 +- trunk/drivers/uio/uio.c | 7 +- trunk/drivers/usb/c67x00/c67x00-ll-hpi.c | 12 +- trunk/drivers/usb/class/Kconfig | 11 - trunk/drivers/usb/class/Makefile | 1 - trunk/drivers/usb/class/cdc-wdm.c | 740 ------- trunk/drivers/usb/core/generic.c | 5 + trunk/drivers/usb/core/hcd.c | 6 +- trunk/drivers/usb/core/hcd.h | 2 - trunk/drivers/usb/core/hub.c | 61 +- trunk/drivers/usb/core/quirks.c | 7 - trunk/drivers/usb/core/sysfs.c | 44 +- trunk/drivers/usb/gadget/fsl_usb2_udc.c | 2 - trunk/drivers/usb/gadget/pxa27x_udc.c | 3 +- trunk/drivers/usb/host/Kconfig | 8 +- trunk/drivers/usb/host/ehci-au1xxx.c | 1 - trunk/drivers/usb/host/ehci-fsl.c | 7 +- trunk/drivers/usb/host/ehci-hub.c | 16 +- trunk/drivers/usb/host/ehci-ixp4xx.c | 4 +- trunk/drivers/usb/host/ehci-orion.c | 10 +- trunk/drivers/usb/host/ehci-pci.c | 4 +- trunk/drivers/usb/host/ehci-ppc-of.c | 2 - trunk/drivers/usb/host/ehci-ppc-soc.c | 1 - trunk/drivers/usb/host/ehci-ps3.c | 1 - trunk/drivers/usb/host/ehci-sched.c | 67 +- trunk/drivers/usb/host/ehci.h | 5 +- trunk/drivers/usb/host/isp1760-hcd.c | 8 +- trunk/drivers/usb/host/isp1760-if.c | 4 +- trunk/drivers/usb/misc/Kconfig | 12 - trunk/drivers/usb/misc/Makefile | 1 - trunk/drivers/usb/misc/isight_firmware.c | 140 -- trunk/drivers/usb/misc/phidgetkit.c | 6 +- trunk/drivers/usb/misc/phidgetmotorcontrol.c | 7 +- trunk/drivers/usb/misc/phidgetservo.c | 6 +- trunk/drivers/usb/serial/ch341.c | 1 - trunk/drivers/usb/serial/ftdi_sio.c | 265 +-- trunk/drivers/usb/serial/ftdi_sio.h | 273 +-- trunk/drivers/usb/serial/option.c | 41 +- trunk/drivers/usb/serial/pl2303.c | 2 +- trunk/drivers/usb/serial/pl2303.h | 2 +- trunk/drivers/usb/storage/unusual_devs.h | 10 +- trunk/drivers/video/aty/atyfb_base.c | 2 +- trunk/drivers/video/aty/radeon_base.c | 4 +- trunk/drivers/video/cirrusfb.c | 6 +- trunk/drivers/video/console/fbcon.c | 4 +- trunk/drivers/video/display/display-sysfs.c | 10 +- trunk/drivers/video/fsl-diu-fb.c | 4 +- trunk/drivers/video/hgafb.c | 26 +- trunk/drivers/video/leo.c | 58 +- trunk/drivers/video/matrox/matroxfb_base.h | 2 +- trunk/drivers/video/modedb.c | 2 - trunk/drivers/video/pxafb.c | 7 +- trunk/drivers/video/s3c2410fb.c | 130 +- trunk/drivers/video/s3c2410fb.h | 20 +- trunk/drivers/video/sis/sis_main.c | 2 +- trunk/drivers/video/sm501fb.c | 8 +- trunk/drivers/virtio/virtio.c | 10 +- trunk/drivers/virtio/virtio_pci.c | 7 + trunk/drivers/virtio/virtio_ring.c | 8 + trunk/drivers/watchdog/Kconfig | 13 - trunk/drivers/watchdog/Makefile | 1 - trunk/drivers/watchdog/bfin_wdt.c | 111 +- trunk/drivers/watchdog/booke_wdt.c | 88 +- trunk/drivers/watchdog/geodewdt.c | 308 --- trunk/drivers/watchdog/hpwdt.c | 155 +- trunk/drivers/watchdog/iTCO_wdt.c | 14 +- trunk/drivers/watchdog/w83697hf_wdt.c | 38 +- trunk/drivers/xen/events.c | 2 +- trunk/fs/Kconfig.binfmt | 2 +- trunk/fs/afs/callback.c | 2 +- trunk/fs/afs/inode.c | 2 +- trunk/fs/afs/super.c | 2 +- trunk/fs/aio.c | 4 + trunk/fs/binfmt_elf.c | 12 +- trunk/fs/binfmt_elf_fdpic.c | 2 +- trunk/fs/binfmt_flat.c | 8 +- trunk/fs/block_dev.c | 8 +- trunk/fs/cifs/AUTHORS | 1 - trunk/fs/cifs/CHANGES | 10 +- trunk/fs/cifs/README | 5 - trunk/fs/cifs/TODO | 15 +- trunk/fs/cifs/asn1.c | 14 - trunk/fs/cifs/cifs_dfs_ref.c | 49 +- trunk/fs/cifs/cifs_fs_sb.h | 1 - trunk/fs/cifs/cifs_spnego.c | 3 - trunk/fs/cifs/cifsfs.c | 65 +- trunk/fs/cifs/cifsfs.h | 3 +- trunk/fs/cifs/cifsglob.h | 4 +- trunk/fs/cifs/cifspdu.h | 48 +- trunk/fs/cifs/cifsproto.h | 13 +- trunk/fs/cifs/cifssmb.c | 339 ++- trunk/fs/cifs/connect.c | 73 +- trunk/fs/cifs/dir.c | 34 +- trunk/fs/cifs/dns_resolve.c | 9 +- trunk/fs/cifs/file.c | 13 +- trunk/fs/cifs/inode.c | 567 +++-- trunk/fs/cifs/ioctl.c | 4 +- trunk/fs/cifs/link.c | 43 +- trunk/fs/cifs/misc.c | 3 +- trunk/fs/cifs/netmisc.c | 6 +- trunk/fs/cifs/ntlmssp.h | 4 +- trunk/fs/cifs/readdir.c | 84 +- trunk/fs/compat.c | 4 +- trunk/fs/dlm/lowcomms.c | 27 +- trunk/fs/dlm/netlink.c | 2 +- trunk/fs/dlm/plock.c | 2 +- trunk/fs/ecryptfs/crypto.c | 2 +- trunk/fs/ecryptfs/ecryptfs_kernel.h | 2 + trunk/fs/ecryptfs/miscdev.c | 26 +- trunk/fs/ecryptfs/read_write.c | 22 + trunk/fs/exec.c | 21 +- trunk/fs/ext3/resize.c | 3 +- trunk/fs/ext4/balloc.c | 71 +- trunk/fs/ext4/mballoc.c | 8 +- trunk/fs/ext4/resize.c | 6 +- trunk/fs/ext4/super.c | 36 +- trunk/fs/fat/file.c | 44 +- trunk/fs/file.c | 152 +- trunk/fs/fuse/inode.c | 11 +- trunk/fs/gfs2/bmap.c | 23 +- trunk/fs/gfs2/glops.c | 2 +- trunk/fs/gfs2/incore.h | 1 - trunk/fs/gfs2/inode.c | 10 +- trunk/fs/gfs2/meta_io.c | 6 +- trunk/fs/gfs2/ops_fstype.c | 4 +- trunk/fs/gfs2/ops_super.c | 16 +- trunk/fs/gfs2/rgrp.c | 4 +- trunk/fs/hppfs/Makefile | 5 +- trunk/fs/jbd2/commit.c | 1 - trunk/fs/jbd2/recovery.c | 12 +- trunk/fs/libfs.c | 18 - trunk/fs/namei.c | 12 +- trunk/fs/nfs/callback.c | 2 +- trunk/fs/nfs/callback_proc.c | 4 +- trunk/fs/nfs/callback_xdr.c | 40 +- trunk/fs/nfs/client.c | 8 +- trunk/fs/nfs/delegation.c | 4 +- trunk/fs/nfs/dir.c | 18 +- trunk/fs/nfs/file.c | 2 +- trunk/fs/nfs/inode.c | 14 +- trunk/fs/nfs/mount_clnt.c | 5 +- trunk/fs/nfs/namespace.c | 11 +- trunk/fs/nfs/nfs3proc.c | 6 +- trunk/fs/nfs/nfs4_fs.h | 1 + trunk/fs/nfs/nfs4namespace.c | 12 +- trunk/fs/nfs/nfs4proc.c | 38 +- trunk/fs/nfs/nfs4renewd.c | 10 +- trunk/fs/nfs/nfs4state.c | 8 +- trunk/fs/nfs/nfs4xdr.c | 100 +- trunk/fs/nfs/proc.c | 8 +- trunk/fs/nfs/read.c | 2 +- trunk/fs/nfs/super.c | 86 +- trunk/fs/nfs/write.c | 9 +- trunk/fs/nfsd/nfs4callback.c | 2 +- trunk/fs/ntfs/upcase.c | 5 +- trunk/fs/ocfs2/alloc.c | 4 +- trunk/fs/ocfs2/cluster/nodemanager.c | 74 +- trunk/fs/ocfs2/cluster/nodemanager.h | 4 + trunk/fs/ocfs2/cluster/tcp.c | 28 +- trunk/fs/ocfs2/cluster/tcp.h | 12 +- trunk/fs/ocfs2/cluster/tcp_internal.h | 32 - trunk/fs/ocfs2/dlm/dlmdebug.h | 12 +- trunk/fs/ocfs2/stack_o2cb.c | 41 +- trunk/fs/ocfs2/stack_user.c | 37 +- trunk/fs/ocfs2/stackglue.c | 119 +- trunk/fs/ocfs2/stackglue.h | 19 +- trunk/fs/proc/array.c | 2 +- trunk/fs/proc/base.c | 35 +- trunk/fs/proc/inode.c | 3 +- trunk/fs/proc/proc_misc.c | 8 +- trunk/fs/proc/task_mmu.c | 111 +- trunk/fs/select.c | 2 +- trunk/fs/splice.c | 17 +- trunk/fs/sysfs/dir.c | 6 +- trunk/fs/udf/udfdecl.h | 2 +- trunk/fs/xfs/linux-2.6/xfs_buf.c | 24 +- trunk/fs/xfs/linux-2.6/xfs_buf.h | 19 - trunk/fs/xfs/linux-2.6/xfs_file.c | 17 +- trunk/fs/xfs/linux-2.6/xfs_vnode.h | 8 + trunk/fs/xfs/xfs_inode.c | 9 +- trunk/fs/xfs/xfs_vnodeops.c | 112 +- trunk/fs/xfs/xfs_vnodeops.h | 3 +- trunk/include/acpi/processor.h | 1 - trunk/include/asm-alpha/core_mcpcia.h | 2 +- trunk/include/asm-alpha/core_t2.h | 14 +- trunk/include/asm-alpha/io.h | 6 +- trunk/include/asm-alpha/mmu_context.h | 6 +- trunk/include/asm-alpha/percpu.h | 74 +- trunk/include/asm-alpha/system.h | 10 +- trunk/include/asm-alpha/vga.h | 6 +- trunk/include/asm-arm/arch-at91/io.h | 2 + trunk/include/asm-arm/arch-ebsa285/hardware.h | 26 + trunk/include/asm-arm/arch-ebsa285/memory.h | 19 + trunk/include/asm-arm/arch-ebsa285/vmalloc.h | 4 + trunk/include/asm-arm/arch-ns9xxx/hardware.h | 4 +- .../include/asm-arm/arch-omap/board-palmte.h | 2 + trunk/include/asm-arm/arch-omap/clock.h | 5 - trunk/include/asm-arm/arch-omap/entry-macro.S | 1 - trunk/include/asm-arm/arch-omap/gpio.h | 1 + trunk/include/asm-arm/arch-omap/hardware.h | 1 + trunk/include/asm-arm/arch-pxa/mfp-pxa27x.h | 1 - trunk/include/asm-arm/arch-pxa/pxa2xx-gpio.h | 9 - trunk/include/asm-arm/arch-pxa/regs-lcd.h | 5 +- trunk/include/asm-arm/arch-sa1100/collie.h | 4 - trunk/include/asm-arm/kexec.h | 2 + trunk/include/asm-arm/page.h | 4 +- trunk/include/asm-arm/pgtable-nommu.h | 1 + trunk/include/asm-arm/spinlock.h | 2 +- trunk/include/asm-arm/system.h | 29 +- trunk/include/asm-blackfin/bfin-global.h | 11 +- trunk/include/asm-blackfin/checksum.h | 29 +- trunk/include/asm-blackfin/gpio.h | 1 + trunk/include/asm-blackfin/io.h | 2 - .../include/asm-blackfin/mach-bf527/anomaly.h | 5 +- .../asm-blackfin/mach-bf527/bfin_serial_5xx.h | 8 +- .../asm-blackfin/mach-bf527/blackfin.h | 8 +- .../include/asm-blackfin/mach-bf533/anomaly.h | 31 +- .../asm-blackfin/mach-bf533/bfin_serial_5xx.h | 8 +- .../include/asm-blackfin/mach-bf537/anomaly.h | 10 +- .../asm-blackfin/mach-bf537/bfin_serial_5xx.h | 8 +- .../include/asm-blackfin/mach-bf548/anomaly.h | 2 - .../asm-blackfin/mach-bf548/bfin_serial_5xx.h | 12 +- .../include/asm-blackfin/mach-bf561/anomaly.h | 2 +- .../asm-blackfin/mach-bf561/bfin_serial_5xx.h | 8 +- trunk/include/asm-blackfin/mach-bf561/dma.h | 8 +- trunk/include/asm-blackfin/serial.h | 5 - trunk/include/asm-frv/checksum.h | 2 +- trunk/include/asm-frv/mem-layout.h | 7 - trunk/include/asm-generic/gpio.h | 6 +- trunk/include/asm-h8300/cacheflush.h | 2 +- trunk/include/asm-ia64/kvm.h | 12 +- trunk/include/asm-ia64/patch.h | 1 - trunk/include/asm-ia64/ptrace.h | 2 +- trunk/include/asm-ia64/sections.h | 1 - trunk/include/asm-ia64/sn/simulator.h | 7 +- trunk/include/asm-m32r/uaccess.h | 2 +- trunk/include/asm-m68k/bitops.h | 45 +- trunk/include/asm-mips/cpu-info.h | 4 +- trunk/include/asm-mips/gic.h | 6 +- trunk/include/asm-mips/lasat/serial.h | 4 +- trunk/include/asm-mips/mach-au1x00/au1000.h | 3 +- .../asm-mips/mach-au1x00/au1xxx_dbdma.h | 1 - trunk/include/asm-mips/mipsregs.h | 3 - trunk/include/asm-mips/pgtable-bits.h | 2 + trunk/include/asm-mips/pgtable.h | 3 +- trunk/include/asm-mips/rtlx.h | 2 +- trunk/include/asm-mn10300/ipcbuf.h | 2 +- trunk/include/asm-parisc/checksum.h | 2 +- trunk/include/asm-powerpc/io.h | 12 +- trunk/include/asm-powerpc/kvm_ppc.h | 1 - trunk/include/asm-powerpc/mediabay.h | 12 +- trunk/include/asm-powerpc/mpic.h | 3 +- trunk/include/asm-powerpc/spu.h | 1 + trunk/include/asm-powerpc/spu_csa.h | 2 +- trunk/include/asm-powerpc/system.h | 2 +- trunk/include/asm-s390/system.h | 8 +- trunk/include/asm-s390/types.h | 6 - trunk/include/asm-sh/checksum_32.h | 2 +- trunk/include/asm-sh/kgdb.h | 14 + trunk/include/asm-sparc/asi.h | 1 + trunk/include/asm-sparc/auxio.h | 2 +- trunk/include/asm-sparc/bitops.h | 2 +- trunk/include/asm-sparc/btfixup.h | 2 +- trunk/include/asm-sparc/checksum.h | 1 + trunk/include/asm-sparc/clock.h | 2 +- trunk/include/asm-sparc/contregs.h | 1 + trunk/include/asm-sparc/cypress.h | 2 +- trunk/include/asm-sparc/delay.h | 2 +- trunk/include/asm-sparc/ebus.h | 2 +- trunk/include/asm-sparc/ecc.h | 2 +- trunk/include/asm-sparc/eeprom.h | 2 +- trunk/include/asm-sparc/elf.h | 1 + trunk/include/asm-sparc/fcntl.h | 1 + trunk/include/asm-sparc/head.h | 1 + trunk/include/asm-sparc/idprom.h | 2 +- trunk/include/asm-sparc/io.h | 3 + trunk/include/asm-sparc/ioctl.h | 1 + trunk/include/asm-sparc/kdebug.h | 2 +- trunk/include/asm-sparc/machines.h | 2 +- trunk/include/asm-sparc/mbus.h | 2 +- trunk/include/asm-sparc/memreg.h | 1 + trunk/include/asm-sparc/mman.h | 1 + trunk/include/asm-sparc/mostek.h | 2 +- trunk/include/asm-sparc/mpmbox.h | 2 +- trunk/include/asm-sparc/msi.h | 2 +- trunk/include/asm-sparc/mxcc.h | 2 +- trunk/include/asm-sparc/namei.h | 2 +- trunk/include/asm-sparc/obio.h | 2 +- trunk/include/asm-sparc/openprom.h | 1 + trunk/include/asm-sparc/oplib.h | 2 +- trunk/include/asm-sparc/page.h | 2 +- trunk/include/asm-sparc/param.h | 1 + trunk/include/asm-sparc/pbm.h | 2 +- trunk/include/asm-sparc/pcic.h | 2 +- trunk/include/asm-sparc/pgalloc.h | 1 + trunk/include/asm-sparc/pgtable.h | 1 + trunk/include/asm-sparc/pgtsrmmu.h | 2 +- trunk/include/asm-sparc/pgtsun4.h | 2 +- trunk/include/asm-sparc/pgtsun4c.h | 2 +- trunk/include/asm-sparc/psr.h | 2 +- trunk/include/asm-sparc/ptrace.h | 1 + trunk/include/asm-sparc/resource.h | 2 +- trunk/include/asm-sparc/ross.h | 2 +- trunk/include/asm-sparc/rtc.h | 3 +- trunk/include/asm-sparc/sbi.h | 2 +- trunk/include/asm-sparc/sbus.h | 2 +- trunk/include/asm-sparc/scatterlist.h | 1 + trunk/include/asm-sparc/shmparam.h | 1 + trunk/include/asm-sparc/sigcontext.h | 1 + trunk/include/asm-sparc/siginfo.h | 4 + trunk/include/asm-sparc/signal.h | 1 + trunk/include/asm-sparc/smpprim.h | 2 +- trunk/include/asm-sparc/socket.h | 1 + trunk/include/asm-sparc/stat.h | 1 + trunk/include/asm-sparc/statfs.h | 1 + trunk/include/asm-sparc/string.h | 2 +- trunk/include/asm-sparc/sun4paddr.h | 2 +- trunk/include/asm-sparc/sunbpp.h | 2 +- trunk/include/asm-sparc/sysen.h | 2 +- trunk/include/asm-sparc/termios.h | 1 + trunk/include/asm-sparc/timer.h | 2 +- trunk/include/asm-sparc/traps.h | 2 +- trunk/include/asm-sparc/tsunami.h | 2 +- trunk/include/asm-sparc/turbosparc.h | 2 +- trunk/include/asm-sparc/types.h | 1 + trunk/include/asm-sparc/uaccess.h | 2 +- trunk/include/asm-sparc/vac-ops.h | 1 + trunk/include/asm-sparc/vaddrs.h | 1 + trunk/include/asm-sparc/viking.h | 2 +- trunk/include/asm-sparc/winmacro.h | 2 +- trunk/include/asm-sparc64/apb.h | 2 +- trunk/include/asm-sparc64/asi.h | 1 + trunk/include/asm-sparc64/auxio.h | 2 +- trunk/include/asm-sparc64/bbc.h | 2 +- trunk/include/asm-sparc64/bitops.h | 2 +- trunk/include/asm-sparc64/chafsr.h | 1 + trunk/include/asm-sparc64/checksum.h | 1 + trunk/include/asm-sparc64/chmctrl.h | 1 + trunk/include/asm-sparc64/dcr.h | 1 + trunk/include/asm-sparc64/display7seg.h | 2 +- trunk/include/asm-sparc64/dma.h | 2 +- trunk/include/asm-sparc64/ebus.h | 2 +- trunk/include/asm-sparc64/elf.h | 1 + trunk/include/asm-sparc64/envctrl.h | 2 +- trunk/include/asm-sparc64/estate.h | 1 + trunk/include/asm-sparc64/fcntl.h | 1 + trunk/include/asm-sparc64/fhc.h | 2 +- trunk/include/asm-sparc64/head.h | 1 + trunk/include/asm-sparc64/ide.h | 2 +- trunk/include/asm-sparc64/idprom.h | 2 +- trunk/include/asm-sparc64/io.h | 66 +- trunk/include/asm-sparc64/ioctl.h | 1 + trunk/include/asm-sparc64/ioctls.h | 1 + trunk/include/asm-sparc64/lsu.h | 1 + trunk/include/asm-sparc64/mman.h | 1 + trunk/include/asm-sparc64/mmu_context.h | 1 + trunk/include/asm-sparc64/namei.h | 2 +- trunk/include/asm-sparc64/openprom.h | 1 + trunk/include/asm-sparc64/page.h | 2 + trunk/include/asm-sparc64/pgalloc.h | 1 + trunk/include/asm-sparc64/pgtable.h | 2 +- trunk/include/asm-sparc64/pil.h | 1 + trunk/include/asm-sparc64/processor.h | 2 +- trunk/include/asm-sparc64/psrcompat.h | 1 + trunk/include/asm-sparc64/pstate.h | 1 + trunk/include/asm-sparc64/ptrace.h | 25 - trunk/include/asm-sparc64/reg.h | 2 +- trunk/include/asm-sparc64/resource.h | 2 +- trunk/include/asm-sparc64/rtc.h | 3 +- trunk/include/asm-sparc64/rwsem.h | 2 +- trunk/include/asm-sparc64/scatterlist.h | 1 + trunk/include/asm-sparc64/shmparam.h | 1 + trunk/include/asm-sparc64/sigcontext.h | 1 + trunk/include/asm-sparc64/signal.h | 1 + trunk/include/asm-sparc64/smp.h | 5 +- trunk/include/asm-sparc64/socket.h | 1 + trunk/include/asm-sparc64/starfire.h | 2 +- trunk/include/asm-sparc64/stat.h | 1 + trunk/include/asm-sparc64/statfs.h | 1 + trunk/include/asm-sparc64/string.h | 2 +- trunk/include/asm-sparc64/sunbpp.h | 2 +- trunk/include/asm-sparc64/termios.h | 1 + trunk/include/asm-sparc64/ttable.h | 1 + trunk/include/asm-sparc64/types.h | 1 + trunk/include/asm-sparc64/uaccess.h | 1 + trunk/include/asm-sparc64/uctx.h | 2 +- trunk/include/asm-sparc64/utrap.h | 2 +- trunk/include/asm-sparc64/watchdog.h | 2 +- trunk/include/asm-um/mmu_context.h | 12 +- trunk/include/asm-v850/clinkage.h | 2 +- trunk/include/asm-x86/geode.h | 4 +- trunk/include/asm-x86/i387.h | 2 - trunk/include/asm-x86/kvm_host.h | 4 +- trunk/include/asm-x86/kvm_para.h | 18 + trunk/include/asm-x86/kvm_x86_emulate.h | 1 - trunk/include/asm-x86/page.h | 15 +- trunk/include/asm-x86/page_32.h | 3 +- trunk/include/asm-x86/pgtable-3level.h | 6 +- trunk/include/asm-x86/pgtable.h | 3 +- trunk/include/asm-x86/pgtable_32.h | 4 +- trunk/include/asm-x86/pgtable_64.h | 12 +- trunk/include/asm-x86/pvclock-abi.h | 42 - trunk/include/asm-x86/pvclock.h | 13 - trunk/include/asm-x86/tlbflush.h | 13 +- trunk/include/asm-x86/xen/page.h | 6 +- trunk/include/linux/Kbuild | 7 +- trunk/include/linux/a.out.h | 8 + trunk/include/linux/agp_backend.h | 16 +- trunk/include/linux/agpgart.h | 4 +- trunk/include/linux/atm.h | 7 +- trunk/include/linux/atm_tcp.h | 12 +- trunk/include/linux/binfmts.h | 1 - trunk/include/linux/bitrev.h | 1 - trunk/include/linux/blktrace_api.h | 26 - trunk/include/linux/bootmem.h | 2 +- trunk/include/linux/capability.h | 29 +- trunk/include/linux/cpuidle.h | 1 - trunk/include/linux/device.h | 15 - trunk/include/linux/fdtable.h | 1 - trunk/include/linux/fs.h | 5 +- trunk/include/linux/gpio.h | 3 - trunk/include/linux/hid.h | 3 +- trunk/include/linux/hiddev.h | 2 + trunk/include/linux/ide.h | 2 +- trunk/include/linux/if_tunnel.h | 2 +- trunk/include/linux/in_route.h | 12 +- trunk/include/linux/inetdevice.h | 1 + trunk/include/linux/init_task.h | 23 +- trunk/include/linux/input.h | 4 +- trunk/include/linux/ioport.h | 6 +- trunk/include/linux/ipv6.h | 4 +- trunk/include/linux/jbd2.h | 3 - trunk/include/linux/kvm_host.h | 3 +- trunk/include/linux/libata.h | 25 +- trunk/include/linux/math64.h | 21 - trunk/include/linux/memory_hotplug.h | 16 +- trunk/include/linux/mm.h | 17 +- trunk/include/linux/mman.h | 4 +- trunk/include/linux/mmzone.h | 2 +- trunk/include/linux/mod_devicetable.h | 3 +- trunk/include/linux/msdos_fs.h | 12 +- trunk/include/linux/msg.h | 4 +- trunk/include/linux/mtd/nand.h | 2 +- trunk/include/linux/netdevice.h | 3 - trunk/include/linux/netfilter.h | 2 +- .../include/linux/netfilter_arp/arp_tables.h | 2 +- .../include/linux/netfilter_ipv4/ip_tables.h | 2 +- .../include/linux/netfilter_ipv6/ip6_tables.h | 2 +- trunk/include/linux/page-flags.h | 24 - trunk/include/linux/pci.h | 1 - trunk/include/linux/pci_ids.h | 5 - trunk/include/linux/proc_fs.h | 4 +- trunk/include/linux/raid/bitmap.h | 1 + trunk/include/linux/raid/md.h | 2 - trunk/include/linux/raid/md_k.h | 7 +- trunk/include/linux/rtnetlink.h | 5 +- trunk/include/linux/sched.h | 16 +- trunk/include/linux/serial_core.h | 1 - trunk/include/linux/slab.h | 11 - trunk/include/linux/sm501.h | 4 +- trunk/include/linux/spi/mmc_spi.h | 2 - trunk/include/linux/ssb/ssb_driver_gige.h | 2 +- trunk/include/linux/sunrpc/svc_rdma.h | 12 +- trunk/include/linux/tcp.h | 9 +- trunk/include/linux/time.h | 16 +- trunk/include/linux/topology.h | 4 +- trunk/include/linux/tty.h | 2 +- trunk/include/linux/tty_driver.h | 5 +- trunk/include/linux/types.h | 4 +- trunk/include/linux/usb/cdc.h | 9 - trunk/include/linux/videodev2.h | 6 +- trunk/include/linux/virtio_blk.h | 9 +- trunk/include/linux/virtio_config.h | 6 +- trunk/include/linux/virtio_net.h | 2 +- trunk/include/linux/virtio_rng.h | 8 - trunk/include/linux/wm97xx.h | 1 - trunk/include/media/v4l2-dev.h | 1 + trunk/include/media/videobuf-core.h | 3 - trunk/include/net/addrconf.h | 22 - trunk/include/net/genetlink.h | 4 +- trunk/include/net/inet_sock.h | 10 - trunk/include/net/ipv6.h | 6 - trunk/include/net/mac80211.h | 25 +- trunk/include/net/ndisc.h | 4 - trunk/include/net/net_namespace.h | 11 - .../net/netfilter/nf_conntrack_extend.h | 1 - trunk/include/net/netlink.h | 31 +- trunk/include/net/request_sock.h | 4 +- trunk/include/net/sctp/structs.h | 17 +- trunk/include/net/tcp.h | 2 + trunk/include/net/transp_v6.h | 3 +- trunk/include/net/udp.h | 1 - trunk/include/rdma/ib_verbs.h | 1 + trunk/include/sound/ac97_codec.h | 1 - trunk/include/xen/interface/xen.h | 7 +- trunk/init/Kconfig | 1 - trunk/init/do_mounts_md.c | 1 + trunk/ipc/msg.c | 13 +- trunk/ipc/shm.c | 18 +- trunk/kernel/audit.c | 11 +- trunk/kernel/audit_tree.c | 5 +- trunk/kernel/capability.c | 111 +- trunk/kernel/cgroup.c | 2 +- trunk/kernel/cpuset.c | 20 +- trunk/kernel/exit.c | 7 +- trunk/kernel/fork.c | 130 ++ trunk/kernel/futex.c | 93 +- trunk/kernel/kgdb.c | 19 +- trunk/kernel/kprobes.c | 15 +- trunk/kernel/module.c | 18 +- trunk/kernel/rcupreempt.c | 2 + trunk/kernel/relay.c | 2 +- trunk/kernel/sched.c | 517 ++++- trunk/kernel/sched_clock.c | 18 +- trunk/kernel/sched_debug.c | 5 + trunk/kernel/sched_fair.c | 254 ++- trunk/kernel/sched_rt.c | 70 +- trunk/kernel/sched_stats.h | 7 - trunk/kernel/signal.c | 51 +- trunk/kernel/softlockup.c | 15 +- trunk/kernel/stop_machine.c | 7 +- trunk/kernel/sys.c | 6 +- trunk/kernel/sysctl.c | 5 +- trunk/lib/bitrev.c | 3 +- trunk/lib/div64.c | 10 - trunk/lib/lmb.c | 3 +- trunk/lib/radix-tree.c | 120 +- trunk/mm/backing-dev.c | 12 +- trunk/mm/bootmem.c | 6 +- trunk/mm/hugetlb.c | 2 +- trunk/mm/memory.c | 69 +- trunk/mm/migrate.c | 10 - trunk/mm/mmap.c | 12 +- trunk/mm/nommu.c | 21 +- trunk/mm/page_alloc.c | 42 +- trunk/mm/pagewalk.c | 42 +- trunk/mm/slab.c | 5 +- trunk/mm/slob.c | 5 +- trunk/mm/slub.c | 5 +- trunk/mm/swap.c | 4 +- trunk/mm/vmscan.c | 2 +- trunk/net/8021q/vlan.c | 28 +- trunk/net/8021q/vlan_dev.c | 2 - trunk/net/atm/br2684.c | 78 +- trunk/net/ax25/ax25_subr.c | 11 +- trunk/net/bluetooth/rfcomm/core.c | 2 +- trunk/net/bluetooth/rfcomm/tty.c | 13 +- trunk/net/core/dev.c | 46 +- trunk/net/core/neighbour.c | 9 +- trunk/net/core/net_namespace.c | 3 - trunk/net/core/pktgen.c | 4 - trunk/net/core/rtnetlink.c | 3 +- trunk/net/core/skbuff.c | 5 +- trunk/net/core/user_dma.c | 2 +- trunk/net/dccp/ackvec.c | 29 +- trunk/net/dccp/ccids/ccid3.c | 27 +- trunk/net/dccp/ccids/lib/tfrc.c | 8 + trunk/net/dccp/ccids/lib/tfrc.h | 25 +- trunk/net/dccp/ccids/lib/tfrc_equation.c | 8 +- trunk/net/dccp/ipv4.c | 7 +- trunk/net/dccp/ipv6.c | 1 + trunk/net/dccp/minisocks.c | 8 +- trunk/net/dccp/options.c | 4 +- trunk/net/dccp/output.c | 2 - trunk/net/dccp/probe.c | 2 +- trunk/net/ipv4/arp.c | 5 +- trunk/net/ipv4/devinet.c | 9 + trunk/net/ipv4/fib_frontend.c | 1 + trunk/net/ipv4/fib_semantics.c | 5 +- trunk/net/ipv4/inet_connection_sock.c | 11 +- trunk/net/ipv4/ip_gre.c | 146 +- trunk/net/ipv4/ipip.c | 130 +- trunk/net/ipv4/netfilter/nf_nat_core.c | 3 +- trunk/net/ipv4/netfilter/nf_nat_snmp_basic.c | 14 - trunk/net/ipv4/raw.c | 11 +- trunk/net/ipv4/route.c | 4 +- trunk/net/ipv4/syncookies.c | 3 +- trunk/net/ipv4/tcp.c | 27 +- trunk/net/ipv4/tcp_input.c | 80 +- trunk/net/ipv4/tcp_ipv4.c | 14 +- trunk/net/ipv4/tcp_minisocks.c | 32 +- trunk/net/ipv4/tcp_output.c | 12 +- trunk/net/ipv4/tcp_timer.c | 5 + trunk/net/ipv4/tunnel4.c | 2 +- trunk/net/ipv4/udp.c | 3 +- trunk/net/ipv4/xfrm4_mode_tunnel.c | 2 +- trunk/net/ipv6/addrconf.c | 142 +- trunk/net/ipv6/af_inet6.c | 2 +- trunk/net/ipv6/datagram.c | 50 +- trunk/net/ipv6/ip6_flowlabel.c | 2 +- trunk/net/ipv6/ip6_input.c | 9 - trunk/net/ipv6/ip6mr.c | 2 +- trunk/net/ipv6/ipv6_sockglue.c | 44 +- trunk/net/ipv6/ndisc.c | 8 +- trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 8 +- trunk/net/ipv6/raw.c | 13 +- trunk/net/ipv6/route.c | 26 +- trunk/net/ipv6/sit.c | 133 +- trunk/net/ipv6/syncookies.c | 1 + trunk/net/ipv6/tcp_ipv6.c | 1 + trunk/net/ipv6/tunnel6.c | 2 +- trunk/net/ipv6/udp.c | 8 +- trunk/net/irda/af_irda.c | 12 +- trunk/net/key/af_key.c | 5 +- trunk/net/llc/llc_sap.c | 10 +- trunk/net/mac80211/cfg.c | 4 +- trunk/net/mac80211/ieee80211_i.h | 2 +- trunk/net/mac80211/main.c | 3 +- trunk/net/mac80211/mlme.c | 74 +- trunk/net/mac80211/rx.c | 4 +- trunk/net/mac80211/tx.c | 13 +- trunk/net/mac80211/util.c | 41 +- trunk/net/mac80211/wext.c | 28 +- trunk/net/mac80211/wme.c | 2 +- trunk/net/netfilter/nf_conntrack_core.c | 3 +- trunk/net/netfilter/nf_conntrack_expect.c | 4 +- trunk/net/netfilter/nf_conntrack_extend.c | 9 +- trunk/net/netfilter/nf_conntrack_h323_main.c | 22 +- trunk/net/netfilter/nf_log.c | 4 + trunk/net/netfilter/xt_connlimit.c | 3 +- trunk/net/netlink/attr.c | 12 +- trunk/net/netlink/genetlink.c | 21 +- trunk/net/sched/cls_api.c | 2 +- trunk/net/sched/sch_dsmark.c | 6 +- trunk/net/sched/sch_gred.c | 3 +- trunk/net/sched/sch_hfsc.c | 2 +- trunk/net/sched/sch_htb.c | 23 +- trunk/net/sched/sch_red.c | 3 +- trunk/net/sctp/associola.c | 34 +- trunk/net/sctp/ipv6.c | 11 +- trunk/net/sctp/output.c | 2 +- trunk/net/sctp/outqueue.c | 120 +- trunk/net/sctp/protocol.c | 26 +- trunk/net/sctp/socket.c | 4 +- trunk/net/sctp/transport.c | 50 +- trunk/net/sunrpc/auth_generic.c | 8 +- trunk/net/sunrpc/svc_xprt.c | 23 + trunk/net/sunrpc/svcauth_unix.c | 4 +- trunk/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 102 +- trunk/net/sunrpc/xprtrdma/svc_rdma_sendto.c | 11 - .../net/sunrpc/xprtrdma/svc_rdma_transport.c | 290 ++- trunk/net/unix/af_unix.c | 79 +- trunk/net/wireless/nl80211.c | 12 +- trunk/net/xfrm/xfrm_algo.c | 4 +- trunk/net/xfrm/xfrm_user.c | 11 + trunk/scripts/Makefile.modpost | 6 - trunk/scripts/checkpatch.pl | 284 +-- trunk/scripts/decodecode | 0 trunk/scripts/kallsyms.c | 3 - trunk/scripts/kconfig/util.c | 2 +- trunk/scripts/kernel-doc | 4 +- trunk/scripts/mksysmap | 3 +- trunk/scripts/mod/modpost.c | 27 +- trunk/scripts/ver_linux | 5 +- trunk/security/device_cgroup.c | 36 +- trunk/security/dummy.c | 24 +- trunk/security/keys/internal.h | 1 + trunk/security/smack/smack_lsm.c | 12 - trunk/sound/Kconfig | 5 + trunk/sound/core/sound.c | 8 +- trunk/sound/drivers/Kconfig | 15 +- trunk/sound/drivers/pcsp/pcsp.c | 2 +- trunk/sound/drivers/pcsp/pcsp.h | 6 +- trunk/sound/drivers/pcsp/pcsp_lib.c | 58 +- trunk/sound/drivers/pcsp/pcsp_mixer.c | 3 +- trunk/sound/isa/sb/sb_mixer.c | 4 +- trunk/sound/oss/Kconfig | 4 +- trunk/sound/pci/ac97/ac97_patch.c | 48 +- trunk/sound/pci/aw2/aw2-alsa.c | 4 +- trunk/sound/pci/emu10k1/emu10k1_main.c | 15 +- trunk/sound/pci/hda/patch_analog.c | 51 +- trunk/sound/pci/hda/patch_cmedia.c | 1 - trunk/sound/pci/hda/patch_realtek.c | 54 +- trunk/sound/pci/hda/patch_sigmatel.c | 2 +- trunk/sound/pci/hda/patch_via.c | 20 - trunk/sound/pci/oxygen/oxygen_mixer.c | 12 +- trunk/sound/usb/caiaq/caiaq-device.c | 4 +- trunk/virt/kvm/ioapic.c | 52 +- trunk/virt/kvm/kvm_main.c | 29 +- 1703 files changed, 18665 insertions(+), 30945 deletions(-) delete mode 100644 trunk/Documentation/hwmon/ibmaem delete mode 100644 trunk/Documentation/vm/pagemap.txt create mode 100644 trunk/arch/arm/mach-footbridge/co285.c create mode 100644 trunk/arch/blackfin/mach-bf537/boards/led.S create mode 100644 trunk/arch/blackfin/mach-bf548/boards/led.S delete mode 100644 trunk/arch/ia64/kvm/memcpy.S delete mode 100644 trunk/arch/ia64/kvm/memset.S create mode 100644 trunk/arch/mips/lasat/sysctl.h delete mode 100644 trunk/arch/powerpc/boot/crtsavres.S delete mode 100644 trunk/arch/powerpc/lib/crtsavres.S delete mode 100644 trunk/arch/sh/configs/rsk7203_defconfig delete mode 100644 trunk/arch/x86/kernel/pvclock.c delete mode 100644 trunk/drivers/char/drm/radeon_microcode.h delete mode 100644 trunk/drivers/char/hw_random/virtio-rng.c delete mode 100644 trunk/drivers/hwmon/ibmaem.c create mode 100644 trunk/drivers/ide/arm/bast-ide.c delete mode 100644 trunk/drivers/mmc/card/mmc_test.c delete mode 100644 trunk/drivers/rtc/rtc-fm3130.c delete mode 100644 trunk/drivers/rtc/rtc-ppc.c delete mode 100644 trunk/drivers/usb/class/cdc-wdm.c delete mode 100644 trunk/drivers/usb/misc/isight_firmware.c delete mode 100644 trunk/drivers/watchdog/geodewdt.c delete mode 100644 trunk/include/asm-blackfin/serial.h delete mode 100644 trunk/include/asm-x86/pvclock-abi.h delete mode 100644 trunk/include/asm-x86/pvclock.h delete mode 100644 trunk/include/linux/virtio_rng.h mode change 100755 => 100644 trunk/scripts/decodecode diff --git a/[refs] b/[refs] index ee41a0cac852..79fdfb0ca4e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66ee156078697cdc013d46aed3b2fee445c325a1 +refs/heads/master: e3ba22db09408baee721897fb1b50e16f071d916 diff --git a/trunk/.gitignore b/trunk/.gitignore index 9bb1cb6d825d..090b293b8779 100644 --- a/trunk/.gitignore +++ b/trunk/.gitignore @@ -26,7 +26,6 @@ tags TAGS vmlinux* !vmlinux.lds.S -!vmlinux.lds.h System.map Module.markers Module.symvers @@ -53,8 +52,8 @@ series # cscope files cscope.* -ncscope.* *.orig +*.rej *~ \#*# diff --git a/trunk/Documentation/ABI/testing/sysfs-class-bdi b/trunk/Documentation/ABI/testing/sysfs-class-bdi index 5f500977b42f..5ac1e01bbd48 100644 --- a/trunk/Documentation/ABI/testing/sysfs-class-bdi +++ b/trunk/Documentation/ABI/testing/sysfs-class-bdi @@ -14,10 +14,6 @@ MAJOR:MINOR non-block filesystems which provide their own BDI, such as NFS and FUSE. -MAJOR:MINOR-fuseblk - - Value of st_dev on fuseblk filesystems. - default The default backing dev, used for non-block device backed diff --git a/trunk/Documentation/DocBook/kernel-locking.tmpl b/trunk/Documentation/DocBook/kernel-locking.tmpl index 2510763295d0..77c42f40be5d 100644 --- a/trunk/Documentation/DocBook/kernel-locking.tmpl +++ b/trunk/Documentation/DocBook/kernel-locking.tmpl @@ -703,31 +703,6 @@ - - The trylock Functions - - There are functions that try to acquire a lock only once and immediately - return a value telling about success or failure to acquire the lock. - They can be used if you need no access to the data protected with the lock - when some other thread is holding the lock. You should acquire the lock - later if you then need access to the data protected with the lock. - - - - spin_trylock() does not spin but returns non-zero if - it acquires the spinlock on the first try or 0 if not. This function can - be used in all contexts like spin_lock: you must have - disabled the contexts that might interrupt you and acquire the spin lock. - - - - mutex_trylock() does not suspend your task - but returns non-zero if it could lock the mutex on the first try - or 0 if not. This function cannot be safely used in hardware or software - interrupt contexts despite not sleeping. - - - Common Examples diff --git a/trunk/Documentation/DocBook/kgdb.tmpl b/trunk/Documentation/DocBook/kgdb.tmpl index e8acd1f03456..028a8444d95e 100644 --- a/trunk/Documentation/DocBook/kgdb.tmpl +++ b/trunk/Documentation/DocBook/kgdb.tmpl @@ -84,9 +84,10 @@ runs an instance of gdb against the vmlinux file which contains the symbols (not boot image such as bzImage, zImage, uImage...). In gdb the developer specifies the connection parameters and - connects to kgdb. The type of connection a developer makes with - gdb depends on the availability of kgdb I/O modules compiled as - builtin's or kernel modules in the test machine's kernel. + connects to kgdb. Depending on which kgdb I/O modules exist in + the kernel for a given architecture, it may be possible to debug + the test machine's kernel with the development machine using a + rs232 or ethernet connection. @@ -222,7 +223,7 @@ IMPORTANT NOTE: Using this option with kgdb over the console - (kgdboc) is not supported. + (kgdboc) or kgdb over ethernet (kgdboe) is not supported. @@ -248,11 +249,18 @@ (gdb) target remote /dev/ttyS0 - Example (kgdb to a terminal server on tcp port 2012): + Example (kgdb to a terminal server): % gdb ./vmlinux - (gdb) target remote 192.168.2.2:2012 + (gdb) target remote udp:192.168.2.2:6443 + + + Example (kgdb over ethernet): + + + % gdb ./vmlinux + (gdb) target remote udp:192.168.2.2:6443 Once connected, you can debug a kernel the way you would debug an diff --git a/trunk/Documentation/SubmittingPatches b/trunk/Documentation/SubmittingPatches index 118ca6e9404f..9c93a03ea33b 100644 --- a/trunk/Documentation/SubmittingPatches +++ b/trunk/Documentation/SubmittingPatches @@ -327,52 +327,6 @@ Some people also put extra tags at the end. They'll just be ignored for now, but you can do this to mark internal company procedures or just point out some special detail about the sign-off. -If you are a subsystem or branch maintainer, sometimes you need to slightly -modify patches you receive in order to merge them, because the code is not -exactly the same in your tree and the submitters'. If you stick strictly to -rule (c), you should ask the submitter to rediff, but this is a totally -counter-productive waste of time and energy. Rule (b) allows you to adjust -the code, but then it is very impolite to change one submitter's code and -make him endorse your bugs. To solve this problem, it is recommended that -you add a line between the last Signed-off-by header and yours, indicating -the nature of your changes. While there is nothing mandatory about this, it -seems like prepending the description with your mail and/or name, all -enclosed in square brackets, is noticeable enough to make it obvious that -you are responsible for last-minute changes. Example : - - Signed-off-by: Random J Developer - [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h] - Signed-off-by: Lucky K Maintainer - -This practise is particularly helpful if you maintain a stable branch and -want at the same time to credit the author, track changes, merge the fix, -and protect the submitter from complaints. Note that under no circumstances -can you change the author's identity (the From header), as it is the one -which appears in the changelog. - -Special note to back-porters: It seems to be a common and useful practise -to insert an indication of the origin of a patch at the top of the commit -message (just after the subject line) to facilitate tracking. For instance, -here's what we see in 2.6-stable : - - Date: Tue May 13 19:10:30 2008 +0000 - - SCSI: libiscsi regression in 2.6.25: fix nop timer handling - - commit 4cf1043593db6a337f10e006c23c69e5fc93e722 upstream - -And here's what appears in 2.4 : - - Date: Tue May 13 22:12:27 2008 +0200 - - wireless, airo: waitbusy() won't delay - - [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a] - -Whatever the format, this information provides a valuable help to people -tracking your trees, and to people trying to trouble-shoot bugs in your -tree. - 13) When to use Acked-by: and Cc: diff --git a/trunk/Documentation/cciss.txt b/trunk/Documentation/cciss.txt index 63e59b8847c5..e65736c6b8bc 100644 --- a/trunk/Documentation/cciss.txt +++ b/trunk/Documentation/cciss.txt @@ -21,11 +21,6 @@ This driver is known to work with the following cards: * SA E200 * SA E200i * SA E500 - * SA P212 - * SA P410 - * SA P410i - * SA P411 - * SA P812 Detecting drive failures: ------------------------- diff --git a/trunk/Documentation/cpu-freq/governors.txt b/trunk/Documentation/cpu-freq/governors.txt index dcec0564d040..6a9c55bd556b 100644 --- a/trunk/Documentation/cpu-freq/governors.txt +++ b/trunk/Documentation/cpu-freq/governors.txt @@ -129,6 +129,14 @@ to its default value of '80' it means that between the checking intervals the CPU needs to be on average more than 80% in use to then decide that the CPU frequency needs to be increased. +sampling_down_factor: this parameter controls the rate that the CPU +makes a decision on when to decrease the frequency. When set to its +default value of '5' it means that at 1/5 the sampling_rate the kernel +makes a decision to lower the frequency. Five "lower rate" decisions +have to be made in a row before the CPU frequency is actually lower. +If set to '1' then the frequency decreases as quickly as it increases, +if set to '2' it decreases at half the rate of the increase. + ignore_nice_load: this parameter takes a value of '0' or '1'. When set to '0' (its default), all processes are counted towards the 'cpu utilisation' value. When set to '1', the processes that are diff --git a/trunk/Documentation/cpusets.txt b/trunk/Documentation/cpusets.txt index 353504de3084..fb7b361e6eea 100644 --- a/trunk/Documentation/cpusets.txt +++ b/trunk/Documentation/cpusets.txt @@ -199,7 +199,7 @@ using the sched_setaffinity, mbind and set_mempolicy system calls. The following rules apply to each cpuset: - Its CPUs and Memory Nodes must be a subset of its parents. - - It can't be marked exclusive unless its parent is. + - It can only be marked exclusive if its parent is. - If its cpu or memory is exclusive, they may not overlap any sibling. These rules, and the natural hierarchy of cpusets, enable efficient @@ -345,7 +345,7 @@ is modified to perform an inline check for this PF_SPREAD_PAGE task flag, and if set, a call to a new routine cpuset_mem_spread_node() returns the node to prefer for the allocation. -Similarly, setting 'memory_spread_slab' turns on the flag +Similarly, setting 'memory_spread_cache' turns on the flag PF_SPREAD_SLAB, and appropriately marked slab caches will allocate pages from the node returned by cpuset_mem_spread_node(). @@ -542,7 +542,7 @@ otherwise initial value -1 that indicates the cpuset has no request. 2 : search cores in a package. 3 : search cpus in a node [= system wide on non-NUMA system] ( 4 : search nodes in a chunk of node [on NUMA system] ) - ( 5 : search system wide [on NUMA system] ) + ( 5~ : search system wide [on NUMA system]) This file is per-cpuset and affect the sched domain where the cpuset belongs to. Therefore if the flag 'sched_load_balance' of a cpuset @@ -709,10 +709,7 @@ Now you want to do something with this cpuset. In this directory you can find several files: # ls -cpu_exclusive memory_migrate mems tasks -cpus memory_pressure notify_on_release -mem_exclusive memory_spread_page sched_load_balance -mem_hardwall memory_spread_slab sched_relax_domain_level +cpus cpu_exclusive mems mem_exclusive mem_hardwall tasks Reading them will give you information about the state of this cpuset: the CPUs and Memory Nodes it can use, the processes that are using diff --git a/trunk/Documentation/filesystems/ext4.txt b/trunk/Documentation/filesystems/ext4.txt index 0c5086db8352..560f88dc7090 100644 --- a/trunk/Documentation/filesystems/ext4.txt +++ b/trunk/Documentation/filesystems/ext4.txt @@ -139,16 +139,8 @@ commit=nrsec (*) Ext4 can be told to sync all its data and metadata Setting it to very large values will improve performance. -barrier=<0|1(*)> This enables/disables the use of write barriers in - the jbd code. barrier=0 disables, barrier=1 enables. - This also requires an IO stack which can support - barriers, and if jbd gets an error on a barrier - write, it will disable again with a warning. - Write barriers enforce proper on-disk ordering - of journal commits, making volatile disk write caches - safe to use, at some performance penalty. If - your disks are battery-backed in one way or another, - disabling barriers may safely improve performance. +barrier=1 This enables/disables barriers. barrier=0 disables + it, barrier=1 enables it. orlov (*) This enables the new Orlov block allocator. It is enabled by default. diff --git a/trunk/Documentation/filesystems/sysfs-pci.txt b/trunk/Documentation/filesystems/sysfs-pci.txt index 68ef48839c04..5daa2aaec2c5 100644 --- a/trunk/Documentation/filesystems/sysfs-pci.txt +++ b/trunk/Documentation/filesystems/sysfs-pci.txt @@ -36,7 +36,6 @@ files, each with their own function. local_cpus nearby CPU mask (cpumask, ro) resource PCI resource host addresses (ascii, ro) resource0..N PCI resource N, if present (binary, mmap) - resource0_wc..N_wc PCI WC map resource N, if prefetchable (binary, mmap) rom PCI ROM resource, if present (binary, ro) subsystem_device PCI subsystem device (ascii, ro) subsystem_vendor PCI subsystem vendor (ascii, ro) diff --git a/trunk/Documentation/hwmon/ibmaem b/trunk/Documentation/hwmon/ibmaem deleted file mode 100644 index 2fefaf582a43..000000000000 --- a/trunk/Documentation/hwmon/ibmaem +++ /dev/null @@ -1,37 +0,0 @@ -Kernel driver ibmaem -====================== - -Supported systems: - * Any recent IBM System X server with Active Energy Manager support. - This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2, - x3950 M2, and certain HS2x/LS2x/QS2x blades. The IPMI host interface - driver ("ipmi-si") needs to be loaded for this driver to do anything. - Prefix: 'ibmaem' - Datasheet: Not available - -Author: Darrick J. Wong - -Description ------------ - -This driver implements sensor reading support for the energy and power -meters available on various IBM System X hardware through the BMC. All -sensor banks will be exported as platform devices; this driver can talk -to both v1 and v2 interfaces. This driver is completely separate from the -older ibmpex driver. - -The v1 AEM interface has a simple set of features to monitor energy use. -There is a register that displays an estimate of raw energy consumption -since the last BMC reset, and a power sensor that returns average power -use over a configurable interval. - -The v2 AEM interface is a bit more sophisticated, being able to present -a wider range of energy and power use registers, the power cap as -set by the AEM software, and temperature sensors. - -Special Features ----------------- - -The "power_cap" value displays the current system power cap, as set by -the Active Energy Manager software. Setting the power cap from the host -is not currently supported. diff --git a/trunk/Documentation/hwmon/sysfs-interface b/trunk/Documentation/hwmon/sysfs-interface index 2d845730d4e0..f4a8ebc1ef1a 100644 --- a/trunk/Documentation/hwmon/sysfs-interface +++ b/trunk/Documentation/hwmon/sysfs-interface @@ -2,12 +2,17 @@ Naming and data format standards for sysfs files ------------------------------------------------ The libsensors library offers an interface to the raw sensors data -through the sysfs interface. Since lm-sensors 3.0.0, libsensors is -completely chip-independent. It assumes that all the kernel drivers -implement the standard sysfs interface described in this document. -This makes adding or updating support for any given chip very easy, as -libsensors, and applications using it, do not need to be modified. -This is a major improvement compared to lm-sensors 2. +through the sysfs interface. See libsensors documentation and source for +further information. As of writing this document, libsensors +(from lm_sensors 2.8.3) is heavily chip-dependent. Adding or updating +support for any given chip requires modifying the library's code. +This is because libsensors was written for the procfs interface +older kernel modules were using, which wasn't standardized enough. +Recent versions of libsensors (from lm_sensors 2.8.2 and later) have +support for the sysfs interface, though. + +The new sysfs interface was designed to be as chip-independent as +possible. Note that motherboards vary widely in the connections to sensor chips. There is no standard that ensures, for example, that the second @@ -30,17 +35,19 @@ access this data in a simple and consistent way. That said, such programs will have to implement conversion, labeling and hiding of inputs. For this reason, it is still not recommended to bypass the library. +If you are developing a userspace application please send us feedback on +this standard. + +Note that this standard isn't completely established yet, so it is subject +to changes. If you are writing a new hardware monitoring driver those +features can't seem to fit in this interface, please contact us with your +extension proposal. Keep in mind that backward compatibility must be +preserved. + Each chip gets its own directory in the sysfs /sys/devices tree. To find all sensor chips, it is easier to follow the device symlinks from /sys/class/hwmon/hwmon*. -Up to lm-sensors 3.0.0, libsensors looks for hardware monitoring attributes -in the "physical" device directory. Since lm-sensors 3.0.1, attributes found -in the hwmon "class" device directory are also supported. Complex drivers -(e.g. drivers for multifunction chips) may want to use this possibility to -avoid namespace pollution. The only drawback will be that older versions of -libsensors won't support the driver in question. - All sysfs values are fixed point numbers. There is only one value per file, unlike the older /proc specification. diff --git a/trunk/Documentation/kernel-doc-nano-HOWTO.txt b/trunk/Documentation/kernel-doc-nano-HOWTO.txt index 0bd32748a467..2075c0658bf5 100644 --- a/trunk/Documentation/kernel-doc-nano-HOWTO.txt +++ b/trunk/Documentation/kernel-doc-nano-HOWTO.txt @@ -1,105 +1,6 @@ kernel-doc nano-HOWTO ===================== -How to format kernel-doc comments ---------------------------------- - -In order to provide embedded, 'C' friendly, easy to maintain, -but consistent and extractable documentation of the functions and -data structures in the Linux kernel, the Linux kernel has adopted -a consistent style for documenting functions and their parameters, -and structures and their members. - -The format for this documentation is called the kernel-doc format. -It is documented in this Documentation/kernel-doc-nano-HOWTO.txt file. - -This style embeds the documentation within the source files, using -a few simple conventions. The scripts/kernel-doc perl script, some -SGML templates in Documentation/DocBook, and other tools understand -these conventions, and are used to extract this embedded documentation -into various documents. - -In order to provide good documentation of kernel functions and data -structures, please use the following conventions to format your -kernel-doc comments in Linux kernel source. - -We definitely need kernel-doc formatted documentation for functions -that are exported to loadable modules using EXPORT_SYMBOL. - -We also look to provide kernel-doc formatted documentation for -functions externally visible to other kernel files (not marked -"static"). - -We also recommend providing kernel-doc formatted documentation -for private (file "static") routines, for consistency of kernel -source code layout. But this is lower priority and at the -discretion of the MAINTAINER of that kernel source file. - -Data structures visible in kernel include files should also be -documented using kernel-doc formatted comments. - -The opening comment mark "/**" is reserved for kernel-doc comments. -Only comments so marked will be considered by the kernel-doc scripts, -and any comment so marked must be in kernel-doc format. Do not use -"/**" to be begin a comment block unless the comment block contains -kernel-doc formatted comments. The closing comment marker for -kernel-doc comments can be either "*/" or "**/". - -Kernel-doc comments should be placed just before the function -or data structure being described. - -Example kernel-doc function comment: - -/** - * foobar() - short function description of foobar - * @arg1: Describe the first argument to foobar. - * @arg2: Describe the second argument to foobar. - * One can provide multiple line descriptions - * for arguments. - * - * A longer description, with more discussion of the function foobar() - * that might be useful to those using or modifying it. Begins with - * empty comment line, and may include additional embedded empty - * comment lines. - * - * The longer description can have multiple paragraphs. - **/ - -The first line, with the short description, must be on a single line. - -The @argument descriptions must begin on the very next line following -this opening short function description line, with no intervening -empty comment lines. - -Example kernel-doc data structure comment. - -/** - * struct blah - the basic blah structure - * @mem1: describe the first member of struct blah - * @mem2: describe the second member of struct blah, - * perhaps with more lines and words. - * - * Longer description of this structure. - **/ - -The kernel-doc function comments describe each parameter to the -function, in order, with the @name lines. - -The kernel-doc data structure comments describe each structure member -in the data structure, with the @name lines. - -The longer description formatting is "reflowed", losing your line -breaks. So presenting carefully formatted lists within these -descriptions won't work so well; derived documentation will lose -the formatting. - -See the section below "How to add extractable documentation to your -source files" for more details and notes on how to format kernel-doc -comments. - -Components of the kernel-doc system ------------------------------------ - Many places in the source tree have extractable documentation in the form of block comments above functions. The components of this system are: diff --git a/trunk/Documentation/kernel-docs.txt b/trunk/Documentation/kernel-docs.txt index 28cdc2af2131..5a4ef48224ae 100644 --- a/trunk/Documentation/kernel-docs.txt +++ b/trunk/Documentation/kernel-docs.txt @@ -715,14 +715,14 @@ * Name: "Gary's Encyclopedia - The Linux Kernel" Author: Gary (I suppose...). - URL: http://slencyclopedia.berlios.de/index.html - Keywords: linux, community, everything! + URL: http://www.lisoleg.net/cgi-bin/lisoleg.pl?view=kernel.htm + Keywords: links, not found here?. Description: Gary's Encyclopedia exists to allow the rapid finding of documentation and other information of interest to GNU/Linux users. It has about 4000 links to external pages in 150 major categories. This link is for kernel-specific links, documents, - sites... This list is now hosted by developer.Berlios.de, - but seems not to have been updated since sometime in 1999. + sites... Look there if you could not find here what you were + looking for. * Name: "The home page of Linux-MM" Author: The Linux-MM team. diff --git a/trunk/Documentation/kobject.txt b/trunk/Documentation/kobject.txt index 51a8021ee532..bf3256e04027 100644 --- a/trunk/Documentation/kobject.txt +++ b/trunk/Documentation/kobject.txt @@ -305,7 +305,7 @@ should not be manipulated by any other user. A kset keeps its children in a standard kernel linked list. Kobjects point back to their containing kset via their kset field. In almost all cases, -the kobjects belonging to a kset have that kset (or, strictly, its embedded +the kobjects belonging to a ket have that kset (or, strictly, its embedded kobject) in their parent. As a kset contains a kobject within it, it should always be dynamically diff --git a/trunk/Documentation/laptops/thinkpad-acpi.txt b/trunk/Documentation/laptops/thinkpad-acpi.txt index 64b3f146e4b0..01c6c3d8a7e3 100644 --- a/trunk/Documentation/laptops/thinkpad-acpi.txt +++ b/trunk/Documentation/laptops/thinkpad-acpi.txt @@ -503,7 +503,7 @@ generate input device EV_KEY events. In addition to the EV_KEY events, thinkpad-acpi may also issue EV_SW events for switches: -SW_RFKILL_ALL T60 and later hardare rfkill rocker switch +SW_RADIO T60 and later hardare rfkill rocker switch SW_TABLET_MODE Tablet ThinkPads HKEY events 0x5009 and 0x500A Non hot-key ACPI HKEY event map: diff --git a/trunk/Documentation/lguest/lguest.c b/trunk/Documentation/lguest/lguest.c index 82fafe0429fe..3be8ab2a886a 100644 --- a/trunk/Documentation/lguest/lguest.c +++ b/trunk/Documentation/lguest/lguest.c @@ -157,9 +157,6 @@ struct virtqueue /* The routine to call when the Guest pings us. */ void (*handle_output)(int fd, struct virtqueue *me); - - /* Outstanding buffers */ - unsigned int inflight; }; /* Remember the arguments to the program so we can "reboot" */ @@ -705,7 +702,6 @@ static unsigned get_vq_desc(struct virtqueue *vq, errx(1, "Looped descriptor"); } while ((i = next_desc(vq, i)) != vq->vring.num); - vq->inflight++; return head; } @@ -723,7 +719,6 @@ static void add_used(struct virtqueue *vq, unsigned int head, int len) /* Make sure buffer is written before we update index. */ wmb(); vq->vring.used->idx++; - vq->inflight--; } /* This actually sends the interrupt for this virtqueue */ @@ -731,9 +726,8 @@ static void trigger_irq(int fd, struct virtqueue *vq) { unsigned long buf[] = { LHREQ_IRQ, vq->config.irq }; - /* If they don't want an interrupt, don't send one, unless empty. */ - if ((vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT) - && vq->inflight) + /* If they don't want an interrupt, don't send one. */ + if (vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT) return; /* Send the Guest an interrupt tell them we used something up. */ @@ -1113,7 +1107,6 @@ static void add_virtqueue(struct device *dev, unsigned int num_descs, vq->next = NULL; vq->last_avail_idx = 0; vq->dev = dev; - vq->inflight = 0; /* Initialize the configuration. */ vq->config.num = num_descs; @@ -1375,7 +1368,6 @@ static void setup_tun_net(const char *arg) /* Tell Guest what MAC address to use. */ add_feature(dev, VIRTIO_NET_F_MAC); - add_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY); set_config(dev, sizeof(conf), &conf); /* We don't need the socket any more; setup is done. */ diff --git a/trunk/Documentation/networking/arcnet.txt b/trunk/Documentation/networking/arcnet.txt index 796012540386..770fc41a78e8 100644 --- a/trunk/Documentation/networking/arcnet.txt +++ b/trunk/Documentation/networking/arcnet.txt @@ -46,7 +46,7 @@ These are the ARCnet drivers for Linux. This new release (2.91) has been put together by David Woodhouse -, in an attempt to tidy up the driver after adding support +, in an attempt to tidy up the driver after adding support for yet another chipset. Now the generic support has been separated from the individual chipset drivers, and the source files aren't quite so packed with #ifdefs! I've changed this file a bit, but kept it in the first person from diff --git a/trunk/Documentation/networking/bridge.txt b/trunk/Documentation/networking/bridge.txt index bec69a8a1697..bdae2db4119c 100644 --- a/trunk/Documentation/networking/bridge.txt +++ b/trunk/Documentation/networking/bridge.txt @@ -1,6 +1,6 @@ In order to use the Ethernet bridging functionality, you'll need the userspace tools. These programs and documentation are available -at http://www.linux-foundation.org/en/Net:Bridge. The download page is +at http://bridge.sourceforge.net. The download page is http://prdownloads.sourceforge.net/bridge. If you still have questions, don't hesitate to post to the mailing list diff --git a/trunk/Documentation/video4linux/CARDLIST.cx88 b/trunk/Documentation/video4linux/CARDLIST.cx88 index 7cf5685d3645..543957346469 100644 --- a/trunk/Documentation/video4linux/CARDLIST.cx88 +++ b/trunk/Documentation/video4linux/CARDLIST.cx88 @@ -60,7 +60,7 @@ 59 -> DViCO FusionHDTV 5 PCI nano [18ac:d530] 60 -> Pinnacle Hybrid PCTV [12ab:1788] 61 -> Winfast TV2000 XP Global [107d:6f18] - 62 -> PowerColor RA330 [14f1:ea3d] + 62 -> PowerColor Real Angel 330 [14f1:ea3d] 63 -> Geniatech X8000-MT DVBT [14f1:8852] 64 -> DViCO FusionHDTV DVB-T PRO [18ac:db30] 65 -> DViCO FusionHDTV 7 Gold [18ac:d610] diff --git a/trunk/Documentation/video4linux/cx18.txt b/trunk/Documentation/video4linux/cx18.txt index 6842c262890f..077d56ec3f3d 100644 --- a/trunk/Documentation/video4linux/cx18.txt +++ b/trunk/Documentation/video4linux/cx18.txt @@ -1,9 +1,7 @@ Some notes regarding the cx18 driver for the Conexant CX23418 MPEG encoder chip: -1) The only hardware currently supported is the Hauppauge HVR-1600 - card and the Compro VideoMate H900 (note that this card only - supports analog input, it has no digital tuner!). +1) The only hardware currently supported is the Hauppauge HVR-1600. 2) Some people have problems getting the i2c bus to work. Cause unknown. The symptom is that the eeprom cannot be read and the card is diff --git a/trunk/Documentation/vm/pagemap.txt b/trunk/Documentation/vm/pagemap.txt deleted file mode 100644 index ce72c0fe6177..000000000000 --- a/trunk/Documentation/vm/pagemap.txt +++ /dev/null @@ -1,77 +0,0 @@ -pagemap, from the userspace perspective ---------------------------------------- - -pagemap is a new (as of 2.6.25) set of interfaces in the kernel that allow -userspace programs to examine the page tables and related information by -reading files in /proc. - -There are three components to pagemap: - - * /proc/pid/pagemap. This file lets a userspace process find out which - physical frame each virtual page is mapped to. It contains one 64-bit - value for each virtual page, containing the following data (from - fs/proc/task_mmu.c, above pagemap_read): - - * Bits 0-55 page frame number (PFN) if present - * Bits 0-4 swap type if swapped - * Bits 5-55 swap offset if swapped - * Bits 55-60 page shift (page size = 1<&1 | grep -iq emacs; then \ $(all-sources) | xargs $1 -a; \ $(all-kconfigs) | xargs $1 -a \ - --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'; \ + --regex='/^[ \t]*(menu|)config[ \t]+\([a-zA-Z0-9_]+\)/\2/'; \ $(all-defconfigs) | xargs -r $1 -a \ --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \ else \ diff --git a/trunk/arch/alpha/Makefile b/trunk/arch/alpha/Makefile index 4759fe751aa1..4e1a8e2c4541 100644 --- a/trunk/arch/alpha/Makefile +++ b/trunk/arch/alpha/Makefile @@ -13,7 +13,6 @@ NM := $(NM) -B LDFLAGS_vmlinux := -static -N #-relax CHECKFLAGS += -D__alpha__ -m64 cflags-y := -pipe -mno-fp-regs -ffixed-8 -msmall-data -cflags-y += $(call cc-option, -fno-jump-tables) cpuflags-$(CONFIG_ALPHA_EV4) := -mcpu=ev4 cpuflags-$(CONFIG_ALPHA_EV5) := -mcpu=ev5 diff --git a/trunk/arch/alpha/kernel/core_t2.c b/trunk/arch/alpha/kernel/core_t2.c index d9980d47ab81..c0750291b44a 100644 --- a/trunk/arch/alpha/kernel/core_t2.c +++ b/trunk/arch/alpha/kernel/core_t2.c @@ -74,8 +74,6 @@ # define DBG(args) #endif -DEFINE_SPINLOCK(t2_hae_lock); - static volatile unsigned int t2_mcheck_any_expected; static volatile unsigned int t2_mcheck_last_taken; diff --git a/trunk/arch/alpha/kernel/init_task.c b/trunk/arch/alpha/kernel/init_task.c index 1f762189fa64..835d09a7b332 100644 --- a/trunk/arch/alpha/kernel/init_task.c +++ b/trunk/arch/alpha/kernel/init_task.c @@ -9,6 +9,7 @@ static struct fs_struct init_fs = INIT_FS; +static struct files_struct init_files = INIT_FILES; static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); struct mm_struct init_mm = INIT_MM(init_mm); diff --git a/trunk/arch/alpha/kernel/pci.c b/trunk/arch/alpha/kernel/pci.c index 5cf45fc51343..36ab22a7ea12 100644 --- a/trunk/arch/alpha/kernel/pci.c +++ b/trunk/arch/alpha/kernel/pci.c @@ -71,23 +71,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_i static void __init quirk_cypress(struct pci_dev *dev) { - /* The Notorious Cy82C693 chip. */ - - /* The generic legacy mode IDE fixup in drivers/pci/probe.c - doesn't work correctly with the Cypress IDE controller as - it has non-standard register layout. Fix that. */ - if (dev->class >> 8 == PCI_CLASS_STORAGE_IDE) { - dev->resource[2].start = dev->resource[3].start = 0; - dev->resource[2].end = dev->resource[3].end = 0; - dev->resource[2].flags = dev->resource[3].flags = 0; - if (PCI_FUNC(dev->devfn) == 2) { - dev->resource[0].start = 0x170; - dev->resource[0].end = 0x177; - dev->resource[1].start = 0x376; - dev->resource[1].end = 0x376; - } - } - /* The Cypress bridge responds on the PCI bus in the address range 0xffff0000-0xffffffff (conventional x86 BIOS ROM). There is no way to turn this off. The bridge also supports several extended diff --git a/trunk/arch/alpha/kernel/traps.c b/trunk/arch/alpha/kernel/traps.c index c778779007fc..dc57790250d2 100644 --- a/trunk/arch/alpha/kernel/traps.c +++ b/trunk/arch/alpha/kernel/traps.c @@ -447,7 +447,7 @@ struct unaligned_stat { /* Macro for exception fixup code to access integer registers. */ -#define una_reg(r) (_regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)]) +#define una_reg(r) (regs->regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)]) asmlinkage void @@ -456,7 +456,6 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg, { long error, tmp1, tmp2, tmp3, tmp4; unsigned long pc = regs->pc - 4; - unsigned long *_regs = regs->regs; const struct exception_table_entry *fixup; unaligned[0].count++; diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 9773a3f730f3..b786e68914d4 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -232,6 +232,13 @@ config ARCH_CLPS711X help Support for Cirrus Logic 711x/721x based boards. +config ARCH_CO285 + bool "Co-EBSA285" + select FOOTBRIDGE + select FOOTBRIDGE_ADDIN + help + Support for Intel's EBSA285 companion chip. + config ARCH_EBSA110 bool "EBSA-110" select ISA @@ -782,7 +789,7 @@ source "mm/Kconfig" config LEDS bool "Timer and CPU usage LEDs" - depends on ARCH_CDB89712 || ARCH_EBSA110 || \ + depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \ ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \ ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile index 1c840639f828..e72db27e0ba0 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -100,6 +100,8 @@ textofs-y := 0x00008000 incdir-$(CONFIG_ARCH_CLPS7500) := cl7500 machine-$(CONFIG_FOOTBRIDGE) := footbridge incdir-$(CONFIG_FOOTBRIDGE) := ebsa285 + machine-$(CONFIG_ARCH_CO285) := footbridge + incdir-$(CONFIG_ARCH_CO285) := ebsa285 machine-$(CONFIG_ARCH_SHARK) := shark machine-$(CONFIG_ARCH_SA1100) := sa1100 ifeq ($(CONFIG_ARCH_SA1100),y) diff --git a/trunk/arch/arm/boot/compressed/head-xscale.S b/trunk/arch/arm/boot/compressed/head-xscale.S index dd3fbd6766e1..67ea99ef6521 100644 --- a/trunk/arch/arm/boot/compressed/head-xscale.S +++ b/trunk/arch/arm/boot/compressed/head-xscale.S @@ -33,6 +33,10 @@ __XScale_start: bic r0, r0, #0x1000 @ clear Icache mcr p15, 0, r0, c1, c0, 0 +#ifdef CONFIG_ARCH_COTULLA_IDP + mov r7, #MACH_TYPE_COTULLA_IDP +#endif + #ifdef CONFIG_ARCH_IXP2000 mov r1, #-1 mov r0, #0xd6000000 diff --git a/trunk/arch/arm/kernel/atags.c b/trunk/arch/arm/kernel/atags.c index 42a1a1415fa6..64c420805e6f 100644 --- a/trunk/arch/arm/kernel/atags.c +++ b/trunk/arch/arm/kernel/atags.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -6,8 +7,9 @@ struct buffer { size_t size; - char data[]; + char *data; }; +static struct buffer tags_buffer; static int read_buffer(char* page, char** start, off_t off, int count, @@ -27,57 +29,58 @@ read_buffer(char* page, char** start, off_t off, int count, return count; } -#define BOOT_PARAMS_SIZE 1536 -static char __initdata atags_copy[BOOT_PARAMS_SIZE]; -void __init save_atags(const struct tag *tags) -{ - memcpy(atags_copy, tags, sizeof(atags_copy)); -} - -static int __init init_atags_procfs(void) +static int +create_proc_entries(void) { - /* - * This cannot go into save_atags() because kmalloc and proc don't work - * yet when it is called. - */ - struct proc_dir_entry *tags_entry; - struct tag *tag = (struct tag *)atags_copy; - struct buffer *b; - size_t size; + struct proc_dir_entry* tags_entry; - if (tag->hdr.tag != ATAG_CORE) { - printk(KERN_INFO "No ATAGs?"); - return -EINVAL; - } + tags_entry = create_proc_read_entry("atags", 0400, NULL, read_buffer, &tags_buffer); + if (!tags_entry) + return -ENOMEM; - for (; tag->hdr.size; tag = tag_next(tag)) - ; + return 0; +} - /* include the terminating ATAG_NONE */ - size = (char *)tag - atags_copy + sizeof(struct tag_header); - WARN_ON(tag->hdr.tag != ATAG_NONE); +static char __initdata atags_copy_buf[KEXEC_BOOT_PARAMS_SIZE]; +static char __initdata *atags_copy; - b = kmalloc(sizeof(*b) + size, GFP_KERNEL); - if (!b) - goto nomem; +void __init save_atags(const struct tag *tags) +{ + atags_copy = atags_copy_buf; + memcpy(atags_copy, tags, KEXEC_BOOT_PARAMS_SIZE); +} - b->size = size; - memcpy(b->data, atags_copy, size); - tags_entry = create_proc_read_entry("atags", 0400, - NULL, read_buffer, b); +static int __init init_atags_procfs(void) +{ + struct tag *tag; + int error; - if (!tags_entry) - goto nomem; + if (!atags_copy) { + printk(KERN_WARNING "Exporting ATAGs: No saved tags found\n"); + return -EIO; + } - return 0; + for (tag = (struct tag *) atags_copy; tag->hdr.size; tag = tag_next(tag)) + ; -nomem: - kfree(b); - printk(KERN_ERR "Exporting ATAGs: not enough memory\n"); + tags_buffer.size = ((char *) tag - atags_copy) + sizeof(tag->hdr); + tags_buffer.data = kmalloc(tags_buffer.size, GFP_KERNEL); + if (tags_buffer.data == NULL) + return -ENOMEM; + memcpy(tags_buffer.data, atags_copy, tags_buffer.size); + + error = create_proc_entries(); + if (error) { + printk(KERN_ERR "Exporting ATAGs: not enough memory\n"); + kfree(tags_buffer.data); + tags_buffer.size = 0; + tags_buffer.data = NULL; + } - return -ENOMEM; + return error; } + arch_initcall(init_atags_procfs); diff --git a/trunk/arch/arm/kernel/init_task.c b/trunk/arch/arm/kernel/init_task.c index 8b8c9d38a761..bd4ef53bc6b9 100644 --- a/trunk/arch/arm/kernel/init_task.c +++ b/trunk/arch/arm/kernel/init_task.c @@ -13,6 +13,7 @@ #include static struct fs_struct init_fs = INIT_FS; +static struct files_struct init_files = INIT_FILES; static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); struct mm_struct init_mm = INIT_MM(init_mm); diff --git a/trunk/arch/arm/mach-at91/Kconfig b/trunk/arch/arm/mach-at91/Kconfig index 0fc07b6db749..3d549a9afe1d 100644 --- a/trunk/arch/arm/mach-at91/Kconfig +++ b/trunk/arch/arm/mach-at91/Kconfig @@ -126,6 +126,12 @@ config MACH_ECBAT91 Select this if you are using emQbit's ECB_AT91 board. +config MACH_YL9200 + bool "ucDragon YL-9200" + depends on ARCH_AT91RM9200 + help + Select this if you are using the ucDragon YL-9200 board. + endif # ---------------------------------------------------------- diff --git a/trunk/arch/arm/mach-at91/Makefile b/trunk/arch/arm/mach-at91/Makefile index 8d9bc0153b18..995be14b2c42 100644 --- a/trunk/arch/arm/mach-at91/Makefile +++ b/trunk/arch/arm/mach-at91/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o obj-$(CONFIG_MACH_KAFA) += board-kafa.o obj-$(CONFIG_MACH_PICOTUX2XX) += board-picotux200.o obj-$(CONFIG_MACH_ECBAT91) += board-ecbat91.o +obj-$(CONFIG_MACH_YL9200) += board-yl-9200.o # AT91SAM9260 board-specific support obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o diff --git a/trunk/arch/arm/mach-at91/at91x40.c b/trunk/arch/arm/mach-at91/at91x40.c index f44647738ee4..1de121fc55f4 100644 --- a/trunk/arch/arm/mach-at91/at91x40.c +++ b/trunk/arch/arm/mach-at91/at91x40.c @@ -16,32 +16,16 @@ #include #include #include -#include #include "generic.h" /* - * Export the clock functions for the AT91X40. Some external code common - * to all AT91 family parts relys on this, like the gpio and serial support. + * This is used in the gpio code, stub locally. */ int clk_enable(struct clk *clk) { return 0; } -void clk_disable(struct clk *clk) -{ -} - -unsigned long clk_get_rate(struct clk *clk) -{ - return AT91X40_MASTER_CLOCK; -} - -struct clk *clk_get(struct device *dev, const char *id) -{ - return NULL; -} - void __init at91x40_initialize(unsigned long main_clock) { at91_extern_irq = (1 << AT91X40_ID_IRQ0) | (1 << AT91X40_ID_IRQ1) diff --git a/trunk/arch/arm/mach-at91/board-yl-9200.c b/trunk/arch/arm/mach-at91/board-yl-9200.c index b5717108991d..7079050ab88d 100755 --- a/trunk/arch/arm/mach-at91/board-yl-9200.c +++ b/trunk/arch/arm/mach-at91/board-yl-9200.c @@ -1,11 +1,10 @@ /* * linux/arch/arm/mach-at91/board-yl-9200.c * - * Adapted from: - *various board files in - * /arch/arm/mach-at91 - * modifications to convert to YL-9200 platform - * Copyright (C) 2007 S.Birtles + * Adapted from various board files in arch/arm/mach-at91 + * + * Modifications for YL-9200 platform: + * Copyright (C) 2007 S. Birtles * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,13 +25,14 @@ #include #include #include +#include #include #include -/*#include */ #include #include +#include +#include -/*#include */ #include #include #include @@ -45,179 +45,108 @@ #include #include #include -#include -#include #include "generic.h" -#include -#define YL_9200_FLASH_BASE AT91_CHIPSELECT_0 -#define YL_9200_FLASH_SIZE 0x800000 -/* - * Serial port configuration. - * 0 .. 3 = USART0 .. USART3 - * 4 = DBGU - *atmel_usart.0: ttyS0 at MMIO 0xfefff200 (irq = 1) is a ATMEL_SERIAL - *atmel_usart.1: ttyS1 at MMIO 0xfffc0000 (irq = 6) is a ATMEL_SERIAL - *atmel_usart.2: ttyS2 at MMIO 0xfffc4000 (irq = 7) is a ATMEL_SERIAL - *atmel_usart.3: ttyS3 at MMIO 0xfffc8000 (irq = 8) is a ATMEL_SERIAL - *atmel_usart.4: ttyS4 at MMIO 0xfffcc000 (irq = 9) is a ATMEL_SERIAL - * on the YL-9200 we are sitting at the following - *ttyS0 at MMIO 0xfefff200 (irq = 1) is a AT91_SERIAL - *ttyS1 at MMIO 0xfefc4000 (irq = 7) is a AT91_SERIAL - */ +static void __init yl9200_map_io(void) +{ + /* Initialize processor: 18.432 MHz crystal */ + at91rm9200_initialize(18432000, AT91RM9200_PQFP); -/* extern void __init yl_9200_add_device_sounder(struct gpio_sounder *sounders, int nr);*/ + /* Setup the LEDs D2=PB17 (timer), D3=PB16 (cpu) */ + at91_init_leds(AT91_PIN_PB16, AT91_PIN_PB17); -static struct at91_uart_config __initdata yl_9200_uart_config = { - .console_tty = 0, /* ttyS0 */ - .nr_tty = 3, - .tty_map = { 4, 1, 0, -1, -1 } /* ttyS0, ..., ttyS4 */ -}; + /* DBGU on ttyS0. (Rx & Tx only) */ + at91_register_uart(0, 0, 0); -static void __init yl_9200_map_io(void) -{ - /* Initialize processor: 18.432 MHz crystal */ - /*Also initialises register clocks & gpio*/ - at91rm9200_initialize(18432000, AT91RM9200_PQFP); /*we have a 3 bank system*/ + /* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ + at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS + | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD + | ATMEL_UART_RI); - /* Setup the serial ports and console */ - at91_init_serial(&yl_9200_uart_config); + /* USART0 on ttyS2. (Rx & Tx only to JP3) */ + at91_register_uart(AT91RM9200_ID_US0, 2, 0); - /* Setup the LEDs D2=PB17,D3=PB16 */ - at91_init_leds(AT91_PIN_PB16,AT91_PIN_PB17); /*cpu-led,timer-led*/ + /* USART3 on ttyS3. (Rx, Tx, RTS - RS485 interface) */ + at91_register_uart(AT91RM9200_ID_US3, 3, ATMEL_UART_RTS); + + /* set serial console to ttyS0 (ie, DBGU) */ + at91_set_serial_console(0); } -static void __init yl_9200_init_irq(void) +static void __init yl9200_init_irq(void) { at91rm9200_init_interrupts(NULL); } -static struct at91_eth_data __initdata yl_9200_eth_data = { - .phy_irq_pin = AT91_PIN_PB28, - .is_rmii = 1, -}; -static struct at91_usbh_data __initdata yl_9200_usbh_data = { - .ports = 1, /* this should be 1 not 2 for the Yl9200*/ +/* + * LEDs + */ +static struct gpio_led yl9200_leds[] = { + { /* D2 */ + .name = "led2", + .gpio = AT91_PIN_PB17, + .active_low = 1, + .default_trigger = "timer", + }, + { /* D3 */ + .name = "led3", + .gpio = AT91_PIN_PB16, + .active_low = 1, + .default_trigger = "heartbeat", + }, + { /* D4 */ + .name = "led4", + .gpio = AT91_PIN_PB15, + .active_low = 1, + }, + { /* D5 */ + .name = "led5", + .gpio = AT91_PIN_PB8, + .active_low = 1, + } }; -static struct at91_udc_data __initdata yl_9200_udc_data = { -/*on sheet 7 Schemitic rev 1.0*/ - .pullup_pin = AT91_PIN_PC4, - .vbus_pin= AT91_PIN_PC5, - .pullup_active_low = 1, /*ACTIVE LOW!! due to PNP transistor on page 7*/ - -}; /* -static struct at91_cf_data __initdata yl_9200_cf_data = { -TODO S.BIRTLES - .det_pin = AT91_PIN_xxx, - .rst_pin = AT91_PIN_xxx, - .irq_pin = ... not connected - .vcc_pin = ... always powered - + * Ethernet + */ +static struct at91_eth_data __initdata yl9200_eth_data = { + .phy_irq_pin = AT91_PIN_PB28, + .is_rmii = 1, }; -*/ -static struct at91_mmc_data __initdata yl_9200_mmc_data = { - .det_pin = AT91_PIN_PB9, /*THIS LOOKS CORRECT SHEET7*/ -/* .wp_pin = ... not connected SHEET7*/ - .slot_b = 0, - .wire4 = 1, +/* + * USB Host + */ +static struct at91_usbh_data __initdata yl9200_usbh_data = { + .ports = 1, /* PQFP version of AT91RM9200 */ }; -/* -------------------------------------------------------------------- - * Touch screen - * -------------------------------------------------------------------- */ -#if defined(CONFIG_TOUCHSCREEN_ADS7846) || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) -static int ads7843_pendown_state(void) -{ - return !at91_get_gpio_value(AT91_PIN_PB11); /* Touchscreen PENIRQ */ -} - -static void __init at91_init_device_ts(void) -{ -/*IMPORTANT NOTE THE SPI INTERFACE IS ALREADY CONFIGURED BY XXX_DEVICES.C -THAT IS TO SAY THAT MISO,MOSI,SPCK AND CS are already configured -we only need to enable the other datapins which are: -PB10/RK1 BUSY -*/ -/* Touchscreen BUSY signal , pin,use pullup ( TODO not currently used in the ADS7843/6.c driver)*/ -at91_set_gpio_input(AT91_PIN_PB10, 1); -} - -#else -static void __init at91_init_device_ts(void) {} -#endif - -static struct ads7846_platform_data ads_info = { - .model = 7843, - .x_min = 150, - .x_max = 3830, - .y_min = 190, - .y_max = 3830, - .vref_delay_usecs = 100, -/* for a 8" touch screen*/ - //.x_plate_ohms = 603, //= 450, S.Birtles TODO - //.y_plate_ohms = 332, //= 250, S.Birtles TODO -/*for a 10.4" touch screen*/ - //.x_plate_ohms =611, - //.y_plate_ohms =325, - - .x_plate_ohms = 576, - .y_plate_ohms = 366, - // - .pressure_max = 15000, /*generally nonsense on the 7843*/ - /*number of times to send query to chip in a given run 0 equals one time (do not set to 0!! ,there is a bug in ADS 7846 code)*/ - .debounce_max = 1, - .debounce_rep = 0, - .debounce_tol = (~0), - .get_pendown_state = ads7843_pendown_state, -}; +/* + * USB Device + */ +static struct at91_udc_data __initdata yl9200_udc_data = { + .pullup_pin = AT91_PIN_PC4, + .vbus_pin = AT91_PIN_PC5, + .pullup_active_low = 1, /* Active Low due to PNP transistor (pg 7) */ -/*static struct canbus_platform_data can_info = { - .model = 2510, }; -*/ - -static struct spi_board_info yl_9200_spi_devices[] = { -/*this sticks it at: - /sys/devices/platform/atmel_spi.0/spi0.0 - /sys/bus/platform/devices/ -Documentation/spi IIRC*/ -#if defined(CONFIG_TOUCHSCREEN_ADS7846) || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) - /*(this IS correct 04-NOV-2007)*/ - { - .modalias = "ads7846", /* because the driver is called ads7846*/ - .chip_select = 0, /*THIS MUST BE AN INDEX INTO AN ARRAY OF pins */ -/*this is ONLY TO BE USED if chipselect above is not used, it passes a pin directly for the chip select*/ - /*.controller_data =AT91_PIN_PA3 ,*/ - .max_speed_hz = 5000*26, /*(4700 * 26)-125000 * 26, (max sample rate @ 3V) * (cmd + data + overhead) */ - .bus_num = 0, - .platform_data = &ads_info, - .irq = AT91_PIN_PB11, - }, -#endif -/*we need to put our CAN driver data here!!*/ -/*THIS IS ALL DUMMY DATA*/ -/* { - .modalias = "mcp2510", //DUMMY for MCP2510 chip - .chip_select = 1,*/ /*THIS MUST BE AN INDEX INTO AN ARRAY OF pins */ - /*this is ONLY TO BE USED if chipselect above is not used, it passes a pin directly for the chip select */ - /* .controller_data =AT91_PIN_PA4 , - .max_speed_hz = 25000 * 26, - .bus_num = 0, - .platform_data = &can_info, - .irq = AT91_PIN_PC0, - }, - */ - //max SPI chip needs to go here +/* + * MMC + */ +static struct at91_mmc_data __initdata yl9200_mmc_data = { + .det_pin = AT91_PIN_PB9, + // .wp_pin = ... not connected + .wire4 = 1, }; -static struct mtd_partition __initdata yl_9200_nand_partition[] = { +/* + * NAND Flash + */ +static struct mtd_partition __initdata yl9200_nand_partition[] = { { .name = "AT91 NAND partition 1, boot", .offset = 0, @@ -242,442 +171,434 @@ static struct mtd_partition __initdata yl_9200_nand_partition[] = { .name = "AT91 NAND partition 5, ext-fs", .offset = 32 * SZ_1M, .size = 32 * SZ_1M - }, + } }; static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) { - *num_partitions = ARRAY_SIZE(yl_9200_nand_partition); - return yl_9200_nand_partition; + *num_partitions = ARRAY_SIZE(yl9200_nand_partition); + return yl9200_nand_partition; } -static struct at91_nand_data __initdata yl_9200_nand_data = { - .ale= 6, - .cle= 7, - /*.det_pin = AT91_PIN_PCxx,*/ /*we don't have a det pin because NandFlash is fixed to board*/ - .rdy_pin = AT91_PIN_PC14, /*R/!B Sheet10*/ - .enable_pin = AT91_PIN_PC15, /*!CE Sheet10 */ +static struct at91_nand_data __initdata yl9200_nand_data = { + .ale = 6, + .cle = 7, + // .det_pin = ... not connected + .rdy_pin = AT91_PIN_PC14, /* R/!B (Sheet10) */ + .enable_pin = AT91_PIN_PC15, /* !CE (Sheet10) */ .partition_info = nand_partitions, }; - - /* -TODO S.Birtles -potentially a problem with the size above -physmap platform flash device: 00800000 at 10000000 -physmap-flash.0: Found 1 x16 devices at 0x0 in 16-bit bank -NOR chip too large to fit in mapping. Attempting to cope... - Intel/Sharp Extended Query Table at 0x0031 -Using buffer write method -cfi_cmdset_0001: Erase suspend on write enabled -Reducing visibility of 16384KiB chip to 8192KiB -*/ + * NOR Flash + */ +#define YL9200_FLASH_BASE AT91_CHIPSELECT_0 +#define YL9200_FLASH_SIZE 0x1000000 -static struct mtd_partition yl_9200_flash_partitions[] = { +static struct mtd_partition yl9200_flash_partitions[] = { + { + .name = "Bootloader", + .size = 0x00040000, + .offset = 0, + .mask_flags = MTD_WRITEABLE, /* force read-only */ + }, { - .name = "Bootloader", - .size = 0x00040000, - .offset = 0, - .mask_flags = MTD_WRITEABLE /* force read-only */ - },{ - .name = "Kernel", - .size = 0x001C0000, - .offset = 0x00040000, - },{ - .name = "Filesystem", - .size = MTDPART_SIZ_FULL, - .offset = 0x00200000 + .name = "Kernel", + .size = 0x001C0000, + .offset = 0x00040000, + }, + { + .name = "Filesystem", + .size = MTDPART_SIZ_FULL, + .offset = 0x00200000 } - }; -static struct physmap_flash_data yl_9200_flash_data = { - .width = 2, - .parts = yl_9200_flash_partitions, - .nr_parts = ARRAY_SIZE(yl_9200_flash_partitions), +static struct physmap_flash_data yl9200_flash_data = { + .width = 2, + .parts = yl9200_flash_partitions, + .nr_parts = ARRAY_SIZE(yl9200_flash_partitions), }; -static struct resource yl_9200_flash_resources[] = { -{ - .start = YL_9200_FLASH_BASE, - .end = YL_9200_FLASH_BASE + YL_9200_FLASH_SIZE - 1, - .flags = IORESOURCE_MEM, +static struct resource yl9200_flash_resources[] = { + { + .start = YL9200_FLASH_BASE, + .end = YL9200_FLASH_BASE + YL9200_FLASH_SIZE - 1, + .flags = IORESOURCE_MEM, } }; -static struct platform_device yl_9200_flash = { +static struct platform_device yl9200_flash = { .name = "physmap-flash", .id = 0, .dev = { - .platform_data = &yl_9200_flash_data, + .platform_data = &yl9200_flash_data, }, - .resource = yl_9200_flash_resources, - .num_resources = ARRAY_SIZE(yl_9200_flash_resources), + .resource = yl9200_flash_resources, + .num_resources = ARRAY_SIZE(yl9200_flash_resources), }; - -static struct gpio_led yl_9200_leds[] = { -/*D2 &D3 are passed directly in via at91_init_leds*/ - { - .name = "led4", /*D4*/ - .gpio = AT91_PIN_PB15, - .active_low = 1, - .default_trigger = "heartbeat", - /*.default_trigger = "timer",*/ - }, - { - .name = "led5", /*D5*/ - .gpio = AT91_PIN_PB8, - .active_low = 1, - .default_trigger = "heartbeat", - } -}; - -//static struct gpio_sounder yl_9200_sounder[] = {*/ -/*This is a simple speaker attached to a gpo line*/ - -// { -// .name = "Speaker", /*LS1*/ -// .gpio = AT91_PIN_PA22, -// .active_low = 0, -// .default_trigger = "heartbeat", - /*.default_trigger = "timer",*/ -// }, -//}; - - - -static struct i2c_board_info __initdata yl_9200_i2c_devices[] = { - { - /*TODO*/ - I2C_BOARD_INFO("CS4334", 0x00), +/* + * I2C (TWI) + */ +static struct i2c_board_info __initdata yl9200_i2c_devices[] = { + { /* EEPROM */ + I2C_BOARD_INFO("24c128", 0x50), } }; - - /* +/* * GPIO Buttons - */ +*/ #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) -static struct gpio_keys_button yl_9200_buttons[] = { +static struct gpio_keys_button yl9200_buttons[] = { { .gpio = AT91_PIN_PA24, - .code = BTN_2, + .code = BTN_2, .desc = "SW2", .active_low = 1, .wakeup = 1, }, { .gpio = AT91_PIN_PB1, - .code = BTN_3, + .code = BTN_3, .desc = "SW3", .active_low = 1, .wakeup = 1, }, { .gpio = AT91_PIN_PB2, - .code = BTN_4, + .code = BTN_4, .desc = "SW4", .active_low = 1, .wakeup = 1, }, { .gpio = AT91_PIN_PB6, - .code = BTN_5, + .code = BTN_5, .desc = "SW5", .active_low = 1, .wakeup = 1, - }, - + } }; -static struct gpio_keys_platform_data yl_9200_button_data = { - .buttons = yl_9200_buttons, - .nbuttons = ARRAY_SIZE(yl_9200_buttons), +static struct gpio_keys_platform_data yl9200_button_data = { + .buttons = yl9200_buttons, + .nbuttons = ARRAY_SIZE(yl9200_buttons), }; -static struct platform_device yl_9200_button_device = { +static struct platform_device yl9200_button_device = { .name = "gpio-keys", .id = -1, .num_resources = 0, .dev = { - .platform_data = &yl_9200_button_data, + .platform_data = &yl9200_button_data, } }; -static void __init yl_9200_add_device_buttons(void) +static void __init yl9200_add_device_buttons(void) { - //SW2 - at91_set_gpio_input(AT91_PIN_PA24, 0); + at91_set_gpio_input(AT91_PIN_PA24, 1); /* SW2 */ at91_set_deglitch(AT91_PIN_PA24, 1); - - //SW3 - at91_set_gpio_input(AT91_PIN_PB1, 0); + at91_set_gpio_input(AT91_PIN_PB1, 1); /* SW3 */ at91_set_deglitch(AT91_PIN_PB1, 1); - //SW4 - at91_set_gpio_input(AT91_PIN_PB2, 0); + at91_set_gpio_input(AT91_PIN_PB2, 1); /* SW4 */ at91_set_deglitch(AT91_PIN_PB2, 1); - - //SW5 - at91_set_gpio_input(AT91_PIN_PB6, 0); + at91_set_gpio_input(AT91_PIN_PB6, 1); /* SW5 */ at91_set_deglitch(AT91_PIN_PB6, 1); + /* Enable buttons (Sheet 5) */ + at91_set_gpio_output(AT91_PIN_PB7, 1); + + platform_device_register(&yl9200_button_device); +} +#else +static void __init yl9200_add_device_buttons(void) {} +#endif + +/* + * Touchscreen + */ +#if defined(CONFIG_TOUCHSCREEN_ADS7846) || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) +static int ads7843_pendown_state(void) +{ + return !at91_get_gpio_value(AT91_PIN_PB11); /* Touchscreen PENIRQ */ +} + +static struct ads7846_platform_data ads_info = { + .model = 7843, + .x_min = 150, + .x_max = 3830, + .y_min = 190, + .y_max = 3830, + .vref_delay_usecs = 100, + + /* For a 8" touch-screen */ + // .x_plate_ohms = 603, + // .y_plate_ohms = 332, + + /* For a 10.4" touch-screen */ + // .x_plate_ohms = 611, + // .y_plate_ohms = 325, + + .x_plate_ohms = 576, + .y_plate_ohms = 366, + + .pressure_max = 15000, /* generally nonsense on the 7843 */ + .debounce_max = 1, + .debounce_rep = 0, + .debounce_tol = (~0), + .get_pendown_state = ads7843_pendown_state, +}; - at91_set_gpio_output(AT91_PIN_PB7, 1); /* #TURN BUTTONS ON, SHEET 5 of schematics */ - platform_device_register(&yl_9200_button_device); +static void __init yl9200_add_device_ts(void) +{ + at91_set_gpio_input(AT91_PIN_PB11, 1); /* Touchscreen interrupt pin */ + at91_set_gpio_input(AT91_PIN_PB10, 1); /* Touchscreen BUSY signal - not used! */ } #else -static void __init yl_9200_add_device_buttons(void) {} +static void __init yl9200_add_device_ts(void) {} +#endif + +/* + * SPI devices + */ +static struct spi_board_info yl9200_spi_devices[] = { +#if defined(CONFIG_TOUCHSCREEN_ADS7846) || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) + { /* Touchscreen */ + .modalias = "ads7846", + .chip_select = 0, + .max_speed_hz = 5000 * 26, + .platform_data = &ads_info, + .irq = AT91_PIN_PB11, + }, #endif + { /* CAN */ + .modalias = "mcp2510", + .chip_select = 1, + .max_speed_hz = 25000 * 26, + .irq = AT91_PIN_PC0, + } +}; +/* + * LCD / VGA + * + * EPSON S1D13806 FB (discontinued chip) + * EPSON S1D13506 FB + */ #if defined(CONFIG_FB_S1D135XX) || defined(CONFIG_FB_S1D13XXX_MODULE) #include