From e635f5a8ad8633fa0d637b0e41ae2da5a6f81cdc Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 26 Jul 2011 18:30:20 -0700 Subject: [PATCH] --- yaml --- r: 260723 b: refs/heads/master c: e371d46ae45488bcb112a99a7de462e9e3aa6764 h: refs/heads/master i: 260721: 7f51350ae82c1874c1318c82a36cf6ea02ade5bc 260719: 0f84f96cdeb6bb5871031352eb5989249b3efcf1 v: v3 --- [refs] | 2 +- trunk/.gitignore | 5 + .../ABI/obsolete/proc-pid-oom_adj | 2 +- .../ABI/testing/sysfs-bus-i2c-devices-fsa9480 | 21 + trunk/Documentation/ABI/testing/sysfs-module | 23 + trunk/Documentation/DMA-API-HOWTO.txt | 12 +- trunk/Documentation/SubmitChecklist | 4 +- trunk/Documentation/cgroups/memory.txt | 85 +- .../devicetree/bindings/arm/sirf.txt | 3 + .../devicetree/bindings/arm/xilinx.txt | 7 + .../devicetree/bindings/rtc/olpc-xo1-rtc.txt | 5 + trunk/Documentation/driver-model/device.txt | 2 +- trunk/Documentation/driver-model/overview.txt | 52 +- trunk/Documentation/fb/modedb.txt | 21 +- .../feature-removal-schedule.txt | 56 +- trunk/Documentation/filesystems/Locking | 24 +- trunk/Documentation/filesystems/debugfs.txt | 4 +- trunk/Documentation/filesystems/ext3.txt | 13 +- trunk/Documentation/filesystems/ext4.txt | 23 +- .../filesystems/nfs/nfs41-server.txt | 33 +- trunk/Documentation/filesystems/squashfs.txt | 4 +- trunk/Documentation/ioctl/ioctl-number.txt | 1 + trunk/Documentation/ja_JP/SubmittingPatches | 258 +- trunk/Documentation/kernel-parameters.txt | 14 +- trunk/Documentation/sysctl/kernel.txt | 22 + trunk/Documentation/usb/ehci.txt | 2 + trunk/Documentation/usb/gadget_hid.txt | 6 +- trunk/Documentation/zh_CN/email-clients.txt | 210 +- trunk/MAINTAINERS | 163 +- trunk/arch/alpha/include/asm/atomic.h | 12 +- trunk/arch/alpha/include/asm/bitops.h | 3 +- trunk/arch/alpha/include/asm/local.h | 2 +- trunk/arch/alpha/include/asm/ptrace.h | 1 - trunk/arch/alpha/kernel/perf_event.c | 2 +- trunk/arch/alpha/kernel/process.c | 1 - trunk/arch/alpha/kernel/smp.c | 2 +- trunk/arch/alpha/lib/dec_and_lock.c | 2 +- trunk/arch/arm/Kconfig | 40 +- trunk/arch/arm/Makefile | 3 + trunk/arch/arm/boot/dts/prima2-cb.dts | 416 + trunk/arch/arm/boot/dts/zynq-ep107.dts | 52 + trunk/arch/arm/common/gic.c | 6 - trunk/arch/arm/configs/mxs_defconfig | 2 + trunk/arch/arm/configs/u8500_defconfig | 32 +- trunk/arch/arm/include/asm/atomic.h | 10 +- trunk/arch/arm/include/asm/bitops.h | 5 +- trunk/arch/arm/include/asm/clkdev.h | 5 + trunk/arch/arm/include/asm/hardware/gic.h | 6 + trunk/arch/arm/include/asm/irq.h | 1 + trunk/arch/arm/include/asm/pci.h | 12 +- trunk/arch/arm/include/asm/vga.h | 5 +- trunk/arch/arm/kernel/irq.c | 19 +- trunk/arch/arm/kernel/smp.c | 2 +- trunk/arch/arm/kernel/traps.c | 2 +- trunk/arch/arm/lib/ecard.S | 1 - trunk/arch/arm/lib/io-readsw-armv3.S | 1 - trunk/arch/arm/lib/io-writesw-armv3.S | 1 - .../arch/arm/mach-at91/include/mach/clkdev.h | 7 - trunk/arch/arm/mach-at91/pm.c | 2 +- trunk/arch/arm/mach-bcmring/dma.c | 2 +- .../arm/mach-bcmring/include/mach/clkdev.h | 7 - .../arm/mach-bcmring/include/mach/hardware.h | 2 - trunk/arch/arm/mach-cns3xxx/cns3420vb.c | 3 +- trunk/arch/arm/mach-cns3xxx/core.c | 43 + trunk/arch/arm/mach-cns3xxx/core.h | 6 + .../arm/mach-cns3xxx/include/mach/hardware.h | 22 - trunk/arch/arm/mach-cns3xxx/include/mach/pm.h | 2 +- trunk/arch/arm/mach-cns3xxx/pcie.c | 3 + trunk/arch/arm/mach-cns3xxx/pm.c | 2 +- trunk/arch/arm/mach-davinci/board-da850-evm.c | 7 + trunk/arch/arm/mach-davinci/clock.c | 8 +- trunk/arch/arm/mach-davinci/clock.h | 1 + trunk/arch/arm/mach-davinci/da850.c | 10 + trunk/arch/arm/mach-davinci/devices-da8xx.c | 126 + .../arm/mach-davinci/include/mach/clkdev.h | 15 - .../arm/mach-davinci/include/mach/da8xx.h | 2 + .../arch/arm/mach-davinci/include/mach/psc.h | 3 +- trunk/arch/arm/mach-davinci/psc.c | 14 +- .../arm/mach-dove/include/mach/hardware.h | 7 - trunk/arch/arm/mach-dove/pcie.c | 3 + .../arm/mach-ep93xx/include/mach/clkdev.h | 11 - .../arm/mach-ep93xx/include/mach/hardware.h | 2 - trunk/arch/arm/mach-exynos4/Kconfig | 30 +- trunk/arch/arm/mach-exynos4/Makefile | 11 +- trunk/arch/arm/mach-exynos4/clock.c | 61 + trunk/arch/arm/mach-exynos4/cpu.c | 39 +- trunk/arch/arm/mach-exynos4/dev-audio.c | 2 + trunk/arch/arm/mach-exynos4/dev-dwmci.c | 82 + trunk/arch/arm/mach-exynos4/hotplug.c | 13 +- .../arm/mach-exynos4/include/mach/dwmci.h | 20 + .../mach-exynos4/include/mach/entry-macro.S | 11 +- .../arch/arm/mach-exynos4/include/mach/irqs.h | 196 +- .../arch/arm/mach-exynos4/include/mach/map.h | 19 +- .../arm/mach-exynos4/include/mach/pm-core.h | 10 + .../arch/arm/mach-exynos4/include/mach/pmu.h | 25 + .../mach-exynos4/include/mach/regs-audss.h | 18 + .../mach-exynos4/include/mach/regs-clock.h | 12 + .../arm/mach-exynos4/include/mach/regs-pmu.h | 1 + trunk/arch/arm/mach-exynos4/localtimer.c | 26 - trunk/arch/arm/mach-exynos4/mach-nuri.c | 753 +- trunk/arch/arm/mach-exynos4/mach-smdkc210.c | 70 + trunk/arch/arm/mach-exynos4/mach-smdkv310.c | 3 + .../arm/mach-exynos4/mach-universal_c210.c | 121 + trunk/arch/arm/mach-exynos4/mct.c | 2 +- trunk/arch/arm/mach-exynos4/platsmp.c | 57 +- trunk/arch/arm/mach-exynos4/pm.c | 273 +- trunk/arch/arm/mach-exynos4/pmu.c | 175 + trunk/arch/arm/mach-exynos4/setup-fimd0.c | 43 + trunk/arch/arm/mach-exynos4/time.c | 301 - trunk/arch/arm/mach-footbridge/dc21285.c | 3 + .../mach-footbridge/include/mach/hardware.h | 5 - trunk/arch/arm/mach-imx/Kconfig | 1 + trunk/arch/arm/mach-imx/mach-mx27_3ds.c | 93 +- trunk/arch/arm/mach-imx/mm-imx21.c | 3 + trunk/arch/arm/mach-imx/mm-imx25.c | 25 + trunk/arch/arm/mach-imx/mm-imx27.c | 3 + trunk/arch/arm/mach-imx/mm-imx31.c | 27 + trunk/arch/arm/mach-imx/mm-imx35.c | 47 + .../mach-integrator/include/mach/hardware.h | 7 - trunk/arch/arm/mach-integrator/pci_v3.c | 5 + .../arm/mach-iop13xx/include/mach/hardware.h | 7 - trunk/arch/arm/mach-iop13xx/pci.c | 5 +- .../arm/mach-iop32x/include/mach/hardware.h | 3 - .../arm/mach-iop33x/include/mach/hardware.h | 3 - .../arm/mach-ixp2000/include/mach/hardware.h | 8 - trunk/arch/arm/mach-ixp2000/pci.c | 5 + .../arm/mach-ixp23xx/include/mach/hardware.h | 4 - trunk/arch/arm/mach-ixp23xx/pci.c | 5 + trunk/arch/arm/mach-ixp4xx/common-pci.c | 5 + .../arm/mach-ixp4xx/include/mach/hardware.h | 5 - .../arm/mach-kirkwood/include/mach/hardware.h | 7 - trunk/arch/arm/mach-kirkwood/pcie.c | 3 + .../arm/mach-ks8695/include/mach/hardware.h | 9 - trunk/arch/arm/mach-ks8695/pci.c | 3 + trunk/arch/arm/mach-lpc32xx/clock.c | 2 +- trunk/arch/arm/mach-lpc32xx/common.c | 42 + trunk/arch/arm/mach-lpc32xx/common.h | 2 + .../arm/mach-lpc32xx/include/mach/clkdev.h | 25 - trunk/arch/arm/mach-mmp/Kconfig | 7 + trunk/arch/arm/mach-mmp/Makefile | 1 + trunk/arch/arm/mach-mmp/clock.c | 15 + trunk/arch/arm/mach-mmp/clock.h | 1 + trunk/arch/arm/mach-mmp/gplugd.c | 189 + trunk/arch/arm/mach-mmp/include/mach/clkdev.h | 7 - .../arm/mach-mmp/include/mach/mfp-gplugd.h | 52 + .../arm/mach-mmp/include/mach/mfp-pxa168.h | 19 + trunk/arch/arm/mach-mmp/include/mach/pxa168.h | 8 + .../arm/mach-mmp/include/mach/regs-apmu.h | 1 + trunk/arch/arm/mach-mmp/pxa168.c | 6 + trunk/arch/arm/mach-mmp/ttc_dkb.c | 31 +- .../arm/mach-mv78xx0/include/mach/hardware.h | 7 - trunk/arch/arm/mach-mv78xx0/pcie.c | 3 + trunk/arch/arm/mach-mx5/Kconfig | 14 + trunk/arch/arm/mach-mx5/Makefile | 2 + trunk/arch/arm/mach-mx5/board-mx51_babbage.c | 22 +- trunk/arch/arm/mach-mx5/board-mx53_ard.c | 254 + trunk/arch/arm/mach-mx5/board-mx53_evk.c | 17 + trunk/arch/arm/mach-mx5/board-mx53_loco.c | 35 +- trunk/arch/arm/mach-mx5/clock-mx51-mx53.c | 18 + trunk/arch/arm/mach-mx5/crm_regs.h | 2 + trunk/arch/arm/mach-mx5/devices-imx53.h | 8 + trunk/arch/arm/mach-mx5/mm.c | 44 + trunk/arch/arm/mach-mx5/pm-imx5.c | 73 + trunk/arch/arm/mach-mxs/Kconfig | 2 + trunk/arch/arm/mach-mxs/include/mach/clkdev.h | 7 - trunk/arch/arm/mach-mxs/mach-mx28evk.c | 21 + trunk/arch/arm/mach-mxs/mach-tx28.c | 6 + .../arm/mach-nomadik/include/mach/clkdev.h | 7 - .../arm/mach-nuc93x/include/mach/clkdev.h | 7 - .../arch/arm/mach-omap1/include/mach/clkdev.h | 5 - trunk/arch/arm/mach-omap1/pm.c | 2 +- trunk/arch/arm/mach-omap2/Kconfig | 6 +- trunk/arch/arm/mach-omap2/board-4430sdp.c | 203 +- trunk/arch/arm/mach-omap2/board-cm-t35.c | 95 +- trunk/arch/arm/mach-omap2/board-omap3beagle.c | 78 +- trunk/arch/arm/mach-omap2/board-overo.c | 1 - .../arm/mach-omap2/board-rx51-peripherals.c | 141 +- .../arm/mach-omap2/board-zoom-debugboard.c | 9 + .../arm/mach-omap2/board-zoom-peripherals.c | 10 +- trunk/arch/arm/mach-omap2/clock.c | 28 +- trunk/arch/arm/mach-omap2/clock.h | 3 + trunk/arch/arm/mach-omap2/clock2420_data.c | 22 +- trunk/arch/arm/mach-omap2/clock2430_data.c | 32 +- trunk/arch/arm/mach-omap2/clock3xxx_data.c | 44 +- trunk/arch/arm/mach-omap2/clock44xx_data.c | 263 +- trunk/arch/arm/mach-omap2/clockdomain.c | 210 +- trunk/arch/arm/mach-omap2/clockdomain.h | 11 + .../arm/mach-omap2/clockdomain2xxx_3xxx.c | 6 +- trunk/arch/arm/mach-omap2/clockdomain44xx.c | 13 +- .../arm/mach-omap2/clockdomains44xx_data.c | 2 +- trunk/arch/arm/mach-omap2/cm-regbits-44xx.h | 36 + trunk/arch/arm/mach-omap2/cm44xx.h | 8 +- trunk/arch/arm/mach-omap2/cminst44xx.c | 150 +- trunk/arch/arm/mach-omap2/cminst44xx.h | 10 +- trunk/arch/arm/mach-omap2/devices.c | 3 +- trunk/arch/arm/mach-omap2/hsmmc.c | 7 +- trunk/arch/arm/mach-omap2/i2c.c | 68 + trunk/arch/arm/mach-omap2/id.c | 53 +- .../arch/arm/mach-omap2/include/mach/clkdev.h | 5 - trunk/arch/arm/mach-omap2/iommu2.c | 4 +- trunk/arch/arm/mach-omap2/omap-iommu.c | 2 +- trunk/arch/arm/mach-omap2/omap_hwmod.c | 261 +- .../arm/mach-omap2/omap_hwmod_2420_data.c | 9 +- .../arm/mach-omap2/omap_hwmod_2430_data.c | 7 + .../arm/mach-omap2/omap_hwmod_3xxx_data.c | 18 +- .../arm/mach-omap2/omap_hwmod_44xx_data.c | 491 +- trunk/arch/arm/mach-omap2/pm.c | 6 +- .../arm/mach-omap2/powerdomains44xx_data.c | 9 +- trunk/arch/arm/mach-omap2/prcm.c | 2 +- trunk/arch/arm/mach-omap2/prm-regbits-44xx.h | 8 + trunk/arch/arm/mach-omap2/prm44xx.c | 145 +- trunk/arch/arm/mach-omap2/prm44xx.h | 10 - trunk/arch/arm/mach-omap2/prminst44xx.c | 112 +- trunk/arch/arm/mach-omap2/prminst44xx.h | 12 +- trunk/arch/arm/mach-omap2/twl-common.c | 10 +- trunk/arch/arm/mach-omap2/usb-musb.c | 10 - .../arm/mach-orion5x/include/mach/hardware.h | 7 - trunk/arch/arm/mach-orion5x/pci.c | 2 + .../arm/mach-pnx4008/include/mach/clkdev.h | 7 - trunk/arch/arm/mach-prima2/Makefile | 7 + trunk/arch/arm/mach-prima2/Makefile.boot | 3 + trunk/arch/arm/mach-prima2/clock.c | 509 + trunk/arch/arm/mach-prima2/common.h | 26 + .../arm/mach-prima2/include/mach/clkdev.h | 15 + .../mach-prima2/include/mach/debug-macro.S | 29 + .../mach-prima2/include/mach/entry-macro.S | 29 + .../arm/mach-prima2/include/mach/hardware.h | 15 + trunk/arch/arm/mach-prima2/include/mach/io.h | 16 + .../arch/arm/mach-prima2/include/mach/irqs.h | 17 + trunk/arch/arm/mach-prima2/include/mach/map.h | 16 + .../arm/mach-prima2/include/mach/memory.h | 21 + .../arm/mach-prima2/include/mach/system.h | 29 + .../arch/arm/mach-prima2/include/mach/timex.h | 14 + .../arch/arm/mach-prima2/include/mach/uart.h | 23 + .../arm/mach-prima2/include/mach/uncompress.h | 40 + .../arm/mach-prima2/include/mach/vmalloc.h | 16 + trunk/arch/arm/mach-prima2/irq.c | 71 + trunk/arch/arm/mach-prima2/l2x0.c | 59 + trunk/arch/arm/mach-prima2/lluart.c | 25 + trunk/arch/arm/mach-prima2/prima2.c | 41 + trunk/arch/arm/mach-prima2/rstc.c | 69 + trunk/arch/arm/mach-prima2/timer.c | 217 + trunk/arch/arm/mach-pxa/balloon3.c | 1 + trunk/arch/arm/mach-pxa/capc7117.c | 1 + trunk/arch/arm/mach-pxa/clock.c | 15 + trunk/arch/arm/mach-pxa/clock.h | 1 + trunk/arch/arm/mach-pxa/cm-x2xx-pci.c | 3 + trunk/arch/arm/mach-pxa/cm-x2xx.c | 5 +- trunk/arch/arm/mach-pxa/cm-x300.c | 1 + trunk/arch/arm/mach-pxa/colibri-pxa270.c | 2 + trunk/arch/arm/mach-pxa/colibri-pxa300.c | 1 + trunk/arch/arm/mach-pxa/colibri-pxa320.c | 4 +- trunk/arch/arm/mach-pxa/corgi.c | 3 + trunk/arch/arm/mach-pxa/csb726.c | 4 +- trunk/arch/arm/mach-pxa/em-x270.c | 2 + trunk/arch/arm/mach-pxa/eseries.c | 6 + trunk/arch/arm/mach-pxa/ezx.c | 6 + trunk/arch/arm/mach-pxa/generic.h | 13 - trunk/arch/arm/mach-pxa/gumstix.c | 1 + trunk/arch/arm/mach-pxa/h5000.c | 2 + trunk/arch/arm/mach-pxa/himalaya.c | 4 +- trunk/arch/arm/mach-pxa/hx4700.c | 1 + trunk/arch/arm/mach-pxa/icontrol.c | 1 + trunk/arch/arm/mach-pxa/idp.c | 1 + trunk/arch/arm/mach-pxa/include/mach/clkdev.h | 7 - .../arch/arm/mach-pxa/include/mach/hardware.h | 3 - trunk/arch/arm/mach-pxa/include/mach/irqs.h | 12 + trunk/arch/arm/mach-pxa/include/mach/pxa25x.h | 9 + trunk/arch/arm/mach-pxa/include/mach/pxa27x.h | 5 + trunk/arch/arm/mach-pxa/include/mach/pxa300.h | 3 +- trunk/arch/arm/mach-pxa/include/mach/pxa320.h | 3 +- trunk/arch/arm/mach-pxa/include/mach/pxa3xx.h | 14 + trunk/arch/arm/mach-pxa/include/mach/pxa930.h | 3 +- .../arm/mach-pxa/include/mach/regs-intc.h | 30 - trunk/arch/arm/mach-pxa/irq.c | 36 +- trunk/arch/arm/mach-pxa/littleton.c | 1 + trunk/arch/arm/mach-pxa/lpd270.c | 1 + trunk/arch/arm/mach-pxa/lubbock.c | 1 + trunk/arch/arm/mach-pxa/magician.c | 1 + trunk/arch/arm/mach-pxa/mainstone.c | 1 + trunk/arch/arm/mach-pxa/mioa701.c | 1 + trunk/arch/arm/mach-pxa/mp900.c | 1 + trunk/arch/arm/mach-pxa/palmld.c | 1 + trunk/arch/arm/mach-pxa/palmt5.c | 1 + trunk/arch/arm/mach-pxa/palmtc.c | 4 +- trunk/arch/arm/mach-pxa/palmte2.c | 3 +- trunk/arch/arm/mach-pxa/palmtreo.c | 2 + trunk/arch/arm/mach-pxa/palmtx.c | 1 + trunk/arch/arm/mach-pxa/palmz72.c | 1 + trunk/arch/arm/mach-pxa/pcm027.c | 1 + trunk/arch/arm/mach-pxa/poodle.c | 1 + trunk/arch/arm/mach-pxa/pxa3xx.c | 5 +- trunk/arch/arm/mach-pxa/pxa95x.c | 1 - trunk/arch/arm/mach-pxa/raumfeld.c | 8 +- trunk/arch/arm/mach-pxa/saar.c | 1 + trunk/arch/arm/mach-pxa/saarb.c | 1 + trunk/arch/arm/mach-pxa/spitz.c | 3 + trunk/arch/arm/mach-pxa/stargate2.c | 2 + trunk/arch/arm/mach-pxa/tavorevb.c | 1 + trunk/arch/arm/mach-pxa/tavorevb3.c | 1 + trunk/arch/arm/mach-pxa/tosa.c | 1 + trunk/arch/arm/mach-pxa/trizeps4.c | 2 + trunk/arch/arm/mach-pxa/viper.c | 1 + trunk/arch/arm/mach-pxa/vpac270.c | 1 + trunk/arch/arm/mach-pxa/xcep.c | 4 +- trunk/arch/arm/mach-pxa/z2.c | 18 + trunk/arch/arm/mach-pxa/zeus.c | 4 +- trunk/arch/arm/mach-pxa/zylonite.c | 3 +- .../arm/mach-s3c2410/include/mach/pm-core.h | 3 + trunk/arch/arm/mach-s3c2440/clock.c | 2 +- trunk/arch/arm/mach-s3c2440/s3c2442.c | 2 +- trunk/arch/arm/mach-s3c2440/s3c244x-clock.c | 2 +- trunk/arch/arm/mach-s3c64xx/Kconfig | 23 + trunk/arch/arm/mach-s3c64xx/Makefile | 1 + .../arch/arm/mach-s3c64xx/include/mach/irqs.h | 5 +- .../arm/mach-s3c64xx/include/mach/pm-core.h | 19 +- trunk/arch/arm/mach-s3c64xx/irq.c | 12 +- trunk/arch/arm/mach-s3c64xx/mach-crag6410.c | 774 + trunk/arch/arm/mach-s5p64x0/Makefile | 2 +- .../arch/arm/mach-s5p64x0/include/mach/irqs.h | 2 + .../arm/mach-s5p64x0/include/mach/regs-gpio.h | 10 + trunk/arch/arm/mach-s5p64x0/irq-eint.c | 152 + trunk/arch/arm/mach-s5pv210/Kconfig | 1 + trunk/arch/arm/mach-s5pv210/clock.c | 7 + trunk/arch/arm/mach-s5pv210/cpu.c | 2 +- trunk/arch/arm/mach-s5pv210/dev-audio.c | 2 + .../arch/arm/mach-s5pv210/include/mach/map.h | 3 + .../arm/mach-s5pv210/include/mach/pm-core.h | 3 + .../mach-s5pv210/include/mach/regs-audss.h | 18 + trunk/arch/arm/mach-s5pv210/mach-goni.c | 10 + trunk/arch/arm/mach-s5pv210/mach-smdkv210.c | 1 + .../arm/mach-sa1100/include/mach/hardware.h | 8 - trunk/arch/arm/mach-sa1100/pci-nanoengine.c | 3 + .../arm/mach-shark/include/mach/hardware.h | 6 - trunk/arch/arm/mach-shark/pci.c | 12 +- .../arm/mach-spear3xx/include/mach/clkdev.h | 19 - .../arm/mach-spear6xx/include/mach/clkdev.h | 19 - trunk/arch/arm/mach-tegra/board-harmony.c | 22 - .../arch/arm/mach-tegra/board-paz00-pinmux.c | 10 +- trunk/arch/arm/mach-tegra/board-paz00.c | 31 +- trunk/arch/arm/mach-tegra/board-paz00.h | 10 +- trunk/arch/arm/mach-tegra/board-seaboard.c | 26 +- .../arm/mach-tegra/board-trimslice-pinmux.c | 7 +- trunk/arch/arm/mach-tegra/board-trimslice.c | 56 + trunk/arch/arm/mach-tegra/board-trimslice.h | 3 + trunk/arch/arm/mach-tegra/devices.c | 53 +- .../arm/mach-tegra/include/mach/barriers.h | 30 - .../arch/arm/mach-tegra/include/mach/system.h | 1 - trunk/arch/arm/mach-tegra/io.c | 1 - trunk/arch/arm/mach-tegra/pcie.c | 2 + trunk/arch/arm/mach-tegra/platsmp.c | 3 +- trunk/arch/arm/mach-tegra/tegra2_clocks.c | 4 +- trunk/arch/arm/mach-u300/spi.c | 4 +- trunk/arch/arm/mach-u300/timer.c | 33 +- trunk/arch/arm/mach-ux500/Kconfig | 15 +- trunk/arch/arm/mach-ux500/board-mop500-pins.c | 43 + .../arm/mach-ux500/board-mop500-regulators.c | 9 +- trunk/arch/arm/mach-ux500/board-mop500-sdi.c | 61 +- .../arm/mach-ux500/board-mop500-u8500uib.c | 24 +- trunk/arch/arm/mach-ux500/board-mop500-uib.c | 2 +- trunk/arch/arm/mach-ux500/board-mop500.c | 154 +- trunk/arch/arm/mach-ux500/board-mop500.h | 5 + trunk/arch/arm/mach-ux500/board-u5500.c | 84 +- trunk/arch/arm/mach-ux500/clock.c | 48 + trunk/arch/arm/mach-ux500/cpu-db5500.c | 1 + .../arch/arm/mach-ux500/include/mach/clkdev.h | 7 - .../arm/mach-ux500/include/mach/uncompress.h | 3 +- trunk/arch/arm/mach-ux500/usb.c | 1 + .../mach-versatile/include/mach/hardware.h | 6 - trunk/arch/arm/mach-versatile/pci.c | 3 + .../arm/mach-w90x900/include/mach/clkdev.h | 7 - trunk/arch/arm/mach-zynq/Makefile | 6 + trunk/arch/arm/mach-zynq/Makefile.boot | 3 + trunk/arch/arm/mach-zynq/board_dt.c | 0 trunk/arch/arm/mach-zynq/common.c | 118 + .../mach/hardware.h => mach-zynq/common.h} | 20 +- .../arch/arm/mach-zynq/include/mach/clkdev.h | 32 + .../arm/mach-zynq/include/mach/debug-macro.S | 36 + .../arm/mach-zynq/include/mach/entry-macro.S | 30 + .../arm/mach-zynq/include/mach/hardware.h | 18 + trunk/arch/arm/mach-zynq/include/mach/io.h | 33 + trunk/arch/arm/mach-zynq/include/mach/irqs.h | 21 + .../arch/arm/mach-zynq/include/mach/memory.h | 22 + .../include/mach/system.h} | 22 +- trunk/arch/arm/mach-zynq/include/mach/timex.h | 23 + trunk/arch/arm/mach-zynq/include/mach/uart.h | 25 + .../arm/mach-zynq/include/mach/uncompress.h | 51 + .../arch/arm/mach-zynq/include/mach/vmalloc.h | 20 + .../arm/mach-zynq/include/mach/zynq_soc.h | 48 + trunk/arch/arm/mach-zynq/timer.c | 298 + trunk/arch/arm/mm/Kconfig | 3 +- trunk/arch/arm/mm/iomap.c | 12 + trunk/arch/arm/mm/proc-xsc3.S | 1 - trunk/arch/arm/plat-iop/pci.c | 3 + trunk/arch/arm/plat-mxc/devices.c | 16 +- .../arm/plat-mxc/devices/platform-imx-dma.c | 204 +- .../arm/plat-mxc/devices/platform-imx-i2c.c | 3 +- .../plat-mxc/devices/platform-imx-keypad.c | 5 + .../arm/plat-mxc/devices/platform-imx-ssi.c | 10 + .../arm/plat-mxc/devices/platform-imx-uart.c | 2 + trunk/arch/arm/plat-mxc/include/mach/clkdev.h | 7 - .../plat-mxc/include/mach/devices-common.h | 6 + trunk/arch/arm/plat-mxc/include/mach/mx53.h | 28 +- trunk/arch/arm/plat-mxc/include/mach/sdma.h | 6 +- .../arm/plat-mxc/include/mach/uncompress.h | 1 + trunk/arch/arm/plat-mxc/irq-common.c | 13 +- trunk/arch/arm/plat-mxc/tzic.c | 97 +- trunk/arch/arm/plat-omap/clock.c | 39 + trunk/arch/arm/plat-omap/dmtimer.c | 4 +- .../arch/arm/plat-omap/include/plat/clkdev.h | 13 - .../arm/plat-omap/include/plat/clkdev_omap.h | 1 + trunk/arch/arm/plat-omap/include/plat/clock.h | 2 + trunk/arch/arm/plat-omap/include/plat/cpu.h | 35 +- trunk/arch/arm/plat-omap/include/plat/i2c.h | 6 +- trunk/arch/arm/plat-omap/include/plat/irqs.h | 12 +- .../arm/plat-omap/include/plat/omap4-keypad.h | 3 +- .../arm/plat-omap/include/plat/omap_hwmod.h | 15 +- .../arm/plat-omap/include/plat/uncompress.h | 1 + trunk/arch/arm/plat-omap/iovmm.c | 6 +- trunk/arch/arm/plat-omap/mcbsp.c | 27 + trunk/arch/arm/plat-omap/omap_device.c | 85 +- trunk/arch/arm/plat-s5p/Kconfig | 11 + trunk/arch/arm/plat-s5p/Makefile | 3 +- trunk/arch/arm/plat-s5p/dev-fimd0.c | 67 + trunk/arch/arm/plat-s5p/dev-mfc.c | 123 + .../arch/arm/plat-s5p/include/plat/map-s5p.h | 5 +- trunk/arch/arm/plat-s5p/include/plat/mfc.h | 27 + trunk/arch/arm/plat-samsung/adc.c | 84 +- trunk/arch/arm/plat-samsung/dev-asocdma.c | 10 + .../arm/plat-samsung/include/plat/audio.h | 1 + .../arch/arm/plat-samsung/include/plat/devs.h | 6 + .../arm/plat-samsung/include/plat/fb-core.h | 15 + trunk/arch/arm/plat-samsung/include/plat/fb.h | 15 + .../arm/plat-samsung/include/plat/regs-adc.h | 1 + trunk/arch/arm/plat-samsung/irq-uart.c | 7 + trunk/arch/arm/plat-samsung/pm.c | 2 + .../arch/arm/plat-spear/include/plat/clkdev.h | 20 - trunk/arch/arm/plat-tcc/include/mach/clkdev.h | 7 - trunk/arch/avr32/include/asm/atomic.h | 60 +- trunk/arch/avr32/include/asm/ptrace.h | 2 - trunk/arch/blackfin/include/asm/atomic.h | 8 +- trunk/arch/blackfin/include/asm/dma.h | 2 +- trunk/arch/blackfin/include/asm/ipipe.h | 2 +- trunk/arch/blackfin/include/asm/ptrace.h | 1 - trunk/arch/blackfin/include/asm/spinlock.h | 2 +- trunk/arch/blackfin/kernel/ftrace.c | 2 +- trunk/arch/blackfin/kernel/ipipe.c | 2 +- trunk/arch/blackfin/kernel/nmi.c | 2 +- trunk/arch/blackfin/mach-common/smp.c | 2 +- trunk/arch/cris/arch-v32/drivers/cryptocop.c | 2 +- trunk/arch/cris/arch-v32/kernel/smp.c | 2 +- trunk/arch/cris/arch-v32/mach-a3/pinmux.c | 10 +- .../cris/include/arch-v10/arch/processor.h | 1 - .../arch/cris/include/arch-v10/arch/ptrace.h | 1 - .../cris/include/arch-v32/arch/processor.h | 1 - .../arch/cris/include/arch-v32/arch/ptrace.h | 1 - trunk/arch/cris/include/asm/atomic.h | 6 +- trunk/arch/cris/include/asm/bitops.h | 5 +- trunk/arch/cris/kernel/process.c | 2 +- trunk/arch/frv/include/asm/atomic.h | 6 +- trunk/arch/frv/include/asm/bitops.h | 3 +- trunk/arch/frv/include/asm/hardirq.h | 2 +- trunk/arch/frv/include/asm/processor.h | 1 - trunk/arch/frv/include/asm/ptrace.h | 1 - trunk/arch/frv/kernel/irq.c | 2 +- trunk/arch/frv/kernel/process.c | 5 +- trunk/arch/h8300/include/asm/atomic.h | 6 +- trunk/arch/h8300/include/asm/posix_types.h | 2 +- trunk/arch/h8300/include/asm/processor.h | 2 - trunk/arch/h8300/include/asm/ptrace.h | 1 - trunk/arch/ia64/include/asm/atomic.h | 6 +- trunk/arch/ia64/include/asm/bitops.h | 3 +- trunk/arch/ia64/include/asm/processor.h | 2 +- trunk/arch/ia64/include/asm/ptrace.h | 1 - trunk/arch/ia64/include/asm/spinlock.h | 2 +- trunk/arch/ia64/kernel/smp.c | 2 +- trunk/arch/ia64/kernel/smpboot.c | 2 +- trunk/arch/ia64/kernel/uncached.c | 2 +- trunk/arch/m32r/include/asm/atomic.h | 10 +- trunk/arch/m32r/include/asm/mmu_context.h | 2 +- trunk/arch/m32r/include/asm/processor.h | 1 - trunk/arch/m32r/include/asm/ptrace.h | 2 - trunk/arch/m32r/include/asm/spinlock.h | 2 +- trunk/arch/m32r/kernel/smp.c | 2 +- trunk/arch/m32r/kernel/traps.c | 2 +- trunk/arch/m68k/Kconfig | 4 + trunk/arch/m68k/Kconfig.nommu | 3 + trunk/arch/m68k/Makefile_no | 2 +- trunk/arch/m68k/include/asm/atomic.h | 13 +- trunk/arch/m68k/include/asm/bitops.h | 531 +- trunk/arch/m68k/include/asm/bitops_mm.h | 501 - trunk/arch/m68k/include/asm/bitops_no.h | 333 - trunk/arch/m68k/include/asm/delay.h | 97 +- trunk/arch/m68k/include/asm/delay_mm.h | 57 - trunk/arch/m68k/include/asm/delay_no.h | 76 - trunk/arch/m68k/include/asm/entry_no.h | 12 +- trunk/arch/m68k/include/asm/hardirq.h | 35 +- trunk/arch/m68k/include/asm/hardirq_mm.h | 16 - trunk/arch/m68k/include/asm/hardirq_no.h | 19 - trunk/arch/m68k/include/asm/irq.h | 11 +- trunk/arch/m68k/include/asm/machdep.h | 1 - trunk/arch/m68k/include/asm/module.h | 31 +- trunk/arch/m68k/include/asm/posix_types.h | 2 +- trunk/arch/m68k/include/asm/processor.h | 4 - trunk/arch/m68k/include/asm/ptrace.h | 1 - trunk/arch/m68k/include/asm/signal.h | 15 +- trunk/arch/m68k/include/asm/system.h | 194 +- trunk/arch/m68k/include/asm/system_mm.h | 193 - trunk/arch/m68k/include/asm/system_no.h | 153 - trunk/arch/m68k/include/asm/traps.h | 1 - trunk/arch/m68k/kernel/irq.c | 10 + trunk/arch/m68k/kernel/module.c | 130 +- trunk/arch/m68k/kernel/module_mm.c | 128 - trunk/arch/m68k/kernel/module_no.c | 92 - trunk/arch/m68k/kernel/process_mm.c | 2 +- trunk/arch/m68k/kernel/process_no.c | 2 +- trunk/arch/m68k/kernel/traps_no.c | 4 - trunk/arch/m68k/lib/Makefile | 2 +- trunk/arch/m68k/lib/delay.c | 21 - trunk/arch/m68k/mm/init_no.c | 11 +- trunk/arch/m68k/platform/5206/config.c | 6 + trunk/arch/m68k/platform/5206e/Makefile | 18 - trunk/arch/m68k/platform/5206e/config.c | 127 - trunk/arch/m68k/platform/5206e/gpio.c | 49 - trunk/arch/m68k/platform/5272/intc.c | 2 - trunk/arch/m68k/platform/68328/entry.S | 15 +- trunk/arch/m68k/platform/68328/ints.c | 10 +- trunk/arch/m68k/platform/68360/entry.S | 15 +- trunk/arch/m68k/platform/68360/ints.c | 11 +- trunk/arch/m68k/platform/coldfire/entry.S | 24 +- trunk/arch/m68k/platform/coldfire/intc-2.c | 2 - trunk/arch/m68k/platform/coldfire/intc-simr.c | 2 - trunk/arch/m68k/platform/coldfire/intc.c | 1 - trunk/arch/m68k/platform/coldfire/vectors.c | 10 +- .../microblaze/include/asm/mmu_context_mm.h | 2 +- .../arch/microblaze/include/asm/pci-bridge.h | 64 +- trunk/arch/microblaze/include/asm/prom.h | 2 +- trunk/arch/microblaze/include/asm/ptrace.h | 2 - trunk/arch/mips/Kbuild.platforms | 1 + trunk/arch/mips/Makefile | 12 - trunk/arch/mips/ar7/clock.c | 2 +- trunk/arch/mips/ar7/platform.c | 2 +- trunk/arch/mips/ar7/prom.c | 2 +- trunk/arch/mips/include/asm/atomic.h | 17 +- trunk/arch/mips/include/asm/fixmap.h | 10 +- trunk/arch/mips/include/asm/gt64120.h | 2 - trunk/arch/mips/include/asm/hw_irq.h | 2 +- trunk/arch/mips/include/asm/irq.h | 1 - trunk/arch/mips/include/asm/local.h | 2 +- .../include/asm/mach-bcm63xx/bcm63xx_regs.h | 1 - .../mips/include/asm/mach-bcm63xx/spaces.h | 17 + .../include/asm/mach-generic/dma-coherence.h | 1 - .../mips/include/asm/mach-generic/spaces.h | 4 + .../include/asm/mach-ip27/dma-coherence.h | 1 - .../include/asm/mach-jazz/dma-coherence.h | 1 - .../include/asm/mach-loongson/dma-coherence.h | 1 - .../asm/mach-malta/cpu-feature-overrides.h | 2 + .../asm/mach-mipssim/cpu-feature-overrides.h | 2 + .../asm/mach-powertv/cpu-feature-overrides.h | 59 + .../include/asm/mach-powertv/dma-coherence.h | 1 - .../mips/include/asm/mach-tx39xx/spaces.h | 17 + .../mips/include/asm/mach-tx49xx/spaces.h | 17 + trunk/arch/mips/include/asm/pgtable.h | 1 + trunk/arch/mips/include/asm/smp-ops.h | 43 +- trunk/arch/mips/include/asm/smp.h | 2 +- trunk/arch/mips/include/asm/smtc.h | 1 + trunk/arch/mips/include/asm/uasm.h | 2 + trunk/arch/mips/include/asm/unistd.h | 21 +- trunk/arch/mips/kernel/cpu-probe.c | 1 - trunk/arch/mips/kernel/irq.c | 2 +- trunk/arch/mips/kernel/irq_cpu.c | 14 +- trunk/arch/mips/kernel/mips-mt.c | 2 +- trunk/arch/mips/kernel/perf_event.c | 2 - trunk/arch/mips/kernel/process.c | 1 - trunk/arch/mips/kernel/rtlx.c | 2 +- trunk/arch/mips/kernel/scall32-o32.S | 1 + trunk/arch/mips/kernel/scall64-64.S | 1 + trunk/arch/mips/kernel/scall64-n32.S | 1 + trunk/arch/mips/kernel/scall64-o32.S | 1 + trunk/arch/mips/kernel/smp-cmp.c | 2 +- trunk/arch/mips/kernel/smp-mt.c | 2 +- trunk/arch/mips/kernel/smp.c | 2 +- trunk/arch/mips/kernel/smtc-proc.c | 2 +- trunk/arch/mips/kernel/smtc.c | 2 +- trunk/arch/mips/kernel/sync-r4k.c | 2 +- trunk/arch/mips/kernel/vpe.c | 2 +- trunk/arch/mips/lantiq/clk.c | 13 + .../arch/mips/loongson/lemote-2f/ec_kb3310b.c | 2 - trunk/arch/mips/mipssim/sim_setup.c | 18 +- trunk/arch/mips/mipssim/sim_smtc.c | 2 +- trunk/arch/mips/mm/c-r4k.c | 4 + trunk/arch/mips/mm/dma-default.c | 114 +- trunk/arch/mips/mm/init.c | 8 +- trunk/arch/mips/mm/mmap.c | 193 +- trunk/arch/mips/mm/pgtable-32.c | 2 +- trunk/arch/mips/mm/pgtable-64.c | 2 +- trunk/arch/mips/mm/tlbex.c | 292 +- trunk/arch/mips/mti-malta/malta-init.c | 14 +- trunk/arch/mips/mti-malta/malta-smtc.c | 2 +- trunk/arch/mips/netlogic/Platform | 11 + trunk/arch/mips/netlogic/xlr/irq.c | 2 +- trunk/arch/mips/netlogic/xlr/smp.c | 13 +- trunk/arch/mips/nxp/pnx8550/common/setup.c | 2 - trunk/arch/mips/pci/ops-nile4.c | 1 - .../arch/mips/pmc-sierra/msp71xx/msp_setup.c | 8 +- trunk/arch/mips/pnx8550/common/setup.c | 2 - trunk/arch/mips/rb532/devices.c | 24 +- trunk/arch/mips/sgi-ip27/ip27-nmi.c | 2 +- trunk/arch/mips/sibyte/sb1250/irq.c | 8 + trunk/arch/mn10300/include/asm/atomic.h | 7 +- trunk/arch/mn10300/include/asm/bitops.h | 7 +- trunk/arch/mn10300/include/asm/mmu_context.h | 2 +- trunk/arch/mn10300/include/asm/processor.h | 1 - trunk/arch/mn10300/include/asm/ptrace.h | 1 - trunk/arch/mn10300/include/asm/spinlock.h | 2 +- trunk/arch/mn10300/include/asm/system.h | 2 +- trunk/arch/mn10300/kernel/mn10300-watchdog.c | 2 +- trunk/arch/mn10300/kernel/traps.c | 2 +- trunk/arch/mn10300/mm/misalignment.c | 2 +- trunk/arch/mn10300/proc-mn2ws0050/proc-init.c | 2 +- trunk/arch/parisc/include/asm/atomic.h | 16 +- trunk/arch/parisc/include/asm/bitops.h | 11 +- trunk/arch/parisc/include/asm/mmu_context.h | 2 +- trunk/arch/parisc/include/asm/ptrace.h | 1 - trunk/arch/parisc/kernel/parisc_ksyms.c | 2 +- trunk/arch/parisc/kernel/smp.c | 2 +- trunk/arch/parisc/kernel/traps.c | 2 +- trunk/arch/parisc/lib/bitops.c | 2 +- trunk/arch/powerpc/Kconfig | 3 +- trunk/arch/powerpc/Kconfig.debug | 15 + trunk/arch/powerpc/Makefile | 2 +- trunk/arch/powerpc/boot/dts/canyonlands.dts | 5 + trunk/arch/powerpc/boot/dts/glacier.dts | 8 +- trunk/arch/powerpc/boot/dts/mpc8568mds.dts | 2 + trunk/arch/powerpc/boot/dts/p1010rdb.dts | 280 + trunk/arch/powerpc/boot/dts/p1010si.dtsi | 376 + trunk/arch/powerpc/boot/dts/p1022ds.dts | 2 - trunk/arch/powerpc/boot/dts/p1023rds.dts | 546 + trunk/arch/powerpc/boot/dts/p2040rdb.dts | 166 + trunk/arch/powerpc/boot/dts/p2040si.dtsi | 623 + trunk/arch/powerpc/boot/dts/p3041ds.dts | 214 + trunk/arch/powerpc/boot/dts/p3041si.dtsi | 660 + trunk/arch/powerpc/boot/dts/p4080ds.dts | 533 +- trunk/arch/powerpc/boot/dts/p4080si.dtsi | 661 + trunk/arch/powerpc/boot/dts/p5020ds.dts | 215 + trunk/arch/powerpc/boot/dts/p5020si.dtsi | 652 + trunk/arch/powerpc/boot/dts/sequoia.dts | 12 + trunk/arch/powerpc/boot/dts/socrates.dts | 2 + trunk/arch/powerpc/boot/dts/taishan.dts | 4 +- trunk/arch/powerpc/boot/dts/tqm8540.dts | 42 + .../powerpc/boot/dts/tqm8548-bigflash.dts | 2 + trunk/arch/powerpc/boot/dts/tqm8548.dts | 2 + trunk/arch/powerpc/boot/dts/tqm8560.dts | 2 + trunk/arch/powerpc/boot/dts/xpedite5200.dts | 2 + .../powerpc/boot/dts/xpedite5200_xmon.dts | 2 + trunk/arch/powerpc/boot/treeboot-iss4xx.c | 23 +- .../powerpc/configs/44x/iss476-smp_defconfig | 6 +- .../powerpc/configs/85xx/p1023rds_defconfig | 173 + .../configs/86xx/mpc8610_hpcd_defconfig | 5 + .../powerpc/configs/corenet32_smp_defconfig | 187 + ..._smp_defconfig => corenet64_smp_defconfig} | 0 trunk/arch/powerpc/configs/mpc85xx_defconfig | 12 +- .../powerpc/configs/mpc85xx_smp_defconfig | 10 +- trunk/arch/powerpc/configs/ppc64_defconfig | 16 +- trunk/arch/powerpc/configs/pseries_defconfig | 3 + trunk/arch/powerpc/include/asm/atomic.h | 19 +- trunk/arch/powerpc/include/asm/bitops.h | 5 +- trunk/arch/powerpc/include/asm/dbell.h | 2 +- trunk/arch/powerpc/include/asm/ehv_pic.h | 40 + trunk/arch/powerpc/include/asm/emulated_ops.h | 2 +- trunk/arch/powerpc/include/asm/epapr_hcalls.h | 502 + .../arch/powerpc/include/asm/exception-64e.h | 52 +- trunk/arch/powerpc/include/asm/fsl_hcalls.h | 655 + trunk/arch/powerpc/include/asm/hvsi.h | 94 + trunk/arch/powerpc/include/asm/irq.h | 4 +- trunk/arch/powerpc/include/asm/jump_label.h | 47 + trunk/arch/powerpc/include/asm/local.h | 2 +- trunk/arch/powerpc/include/asm/mmu.h | 12 +- .../powerpc/include/asm/pSeries_reconfig.h | 2 +- trunk/arch/powerpc/include/asm/paca.h | 7 +- trunk/arch/powerpc/include/asm/pci-bridge.h | 50 +- trunk/arch/powerpc/include/asm/pci.h | 2 +- .../arch/powerpc/include/asm/pgtable-ppc64.h | 3 +- trunk/arch/powerpc/include/asm/processor.h | 5 + trunk/arch/powerpc/include/asm/prom.h | 2 +- trunk/arch/powerpc/include/asm/reg.h | 4 +- trunk/arch/powerpc/include/asm/setup.h | 4 + trunk/arch/powerpc/include/asm/smp.h | 3 +- trunk/arch/powerpc/include/asm/system.h | 1 - trunk/arch/powerpc/include/asm/udbg.h | 1 + trunk/arch/powerpc/kernel/Makefile | 1 + trunk/arch/powerpc/kernel/asm-offsets.c | 3 + trunk/arch/powerpc/kernel/crash.c | 6 +- trunk/arch/powerpc/kernel/dma.c | 4 +- trunk/arch/powerpc/kernel/exceptions-64e.S | 22 +- trunk/arch/powerpc/kernel/head_44x.S | 42 +- trunk/arch/powerpc/kernel/head_64.S | 2 +- trunk/arch/powerpc/kernel/head_booke.h | 42 +- trunk/arch/powerpc/kernel/head_fsl_booke.S | 49 +- trunk/arch/powerpc/kernel/idle_e500.S | 12 + trunk/arch/powerpc/kernel/irq.c | 50 +- trunk/arch/powerpc/kernel/jump_label.c | 23 + trunk/arch/powerpc/kernel/misc_64.S | 4 +- trunk/arch/powerpc/kernel/mpc7450-pmu.c | 2 +- trunk/arch/powerpc/kernel/of_platform.c | 2 +- trunk/arch/powerpc/kernel/pci-common.c | 40 +- trunk/arch/powerpc/kernel/pci_32.c | 21 +- trunk/arch/powerpc/kernel/pci_64.c | 4 +- trunk/arch/powerpc/kernel/perf_event.c | 2 +- trunk/arch/powerpc/kernel/power4-pmu.c | 2 +- trunk/arch/powerpc/kernel/power5+-pmu.c | 2 +- trunk/arch/powerpc/kernel/power5-pmu.c | 2 +- trunk/arch/powerpc/kernel/power6-pmu.c | 2 +- trunk/arch/powerpc/kernel/power7-pmu.c | 2 +- trunk/arch/powerpc/kernel/ppc970-pmu.c | 2 +- trunk/arch/powerpc/kernel/ppc_ksyms.c | 2 +- trunk/arch/powerpc/kernel/process.c | 4 +- trunk/arch/powerpc/kernel/prom.c | 16 +- trunk/arch/powerpc/kernel/rtas.c | 3 +- trunk/arch/powerpc/kernel/rtas_flash.c | 1 + trunk/arch/powerpc/kernel/rtas_pci.c | 2 +- trunk/arch/powerpc/kernel/rtasd.c | 2 +- trunk/arch/powerpc/kernel/setup-common.c | 27 +- trunk/arch/powerpc/kernel/setup_32.c | 4 +- trunk/arch/powerpc/kernel/setup_64.c | 6 +- trunk/arch/powerpc/kernel/smp-tbsync.c | 2 +- trunk/arch/powerpc/kernel/smp.c | 32 +- trunk/arch/powerpc/kernel/udbg.c | 5 + trunk/arch/powerpc/mm/44x_mmu.c | 13 +- trunk/arch/powerpc/mm/init_32.c | 32 - trunk/arch/powerpc/mm/init_64.c | 16 - trunk/arch/powerpc/mm/mem.c | 35 +- trunk/arch/powerpc/mm/tlb_hash32.c | 4 + trunk/arch/powerpc/mm/tlb_low_64e.S | 206 + trunk/arch/powerpc/mm/tlb_nohash.c | 64 +- trunk/arch/powerpc/platforms/40x/ep405.c | 2 +- .../powerpc/platforms/40x/ppc40x_simple.c | 2 +- trunk/arch/powerpc/platforms/40x/walnut.c | 2 +- .../arch/powerpc/platforms/44x/canyonlands.c | 2 +- trunk/arch/powerpc/platforms/44x/ebony.c | 2 +- .../powerpc/platforms/44x/ppc44x_simple.c | 2 +- trunk/arch/powerpc/platforms/44x/sam440ep.c | 2 +- .../arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +- trunk/arch/powerpc/platforms/82xx/pq2.c | 2 +- trunk/arch/powerpc/platforms/83xx/km83xx.c | 2 +- .../arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 +- .../arch/powerpc/platforms/83xx/mpc834x_itx.c | 2 +- .../arch/powerpc/platforms/83xx/mpc834x_mds.c | 2 +- .../arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 +- trunk/arch/powerpc/platforms/83xx/sbc834x.c | 2 +- trunk/arch/powerpc/platforms/85xx/Kconfig | 31 + trunk/arch/powerpc/platforms/85xx/Makefile | 3 + .../arch/powerpc/platforms/85xx/corenet_ds.c | 41 +- .../arch/powerpc/platforms/85xx/mpc85xx_cds.c | 2 +- .../arch/powerpc/platforms/85xx/mpc85xx_ds.c | 3 +- .../arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +- .../arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 5 +- trunk/arch/powerpc/platforms/85xx/p1010rdb.c | 122 + trunk/arch/powerpc/platforms/85xx/p1022_ds.c | 18 +- trunk/arch/powerpc/platforms/85xx/p1023_rds.c | 162 + trunk/arch/powerpc/platforms/85xx/p2040_rdb.c | 88 + trunk/arch/powerpc/platforms/85xx/p3041_ds.c | 28 +- trunk/arch/powerpc/platforms/85xx/p4080_ds.c | 38 +- trunk/arch/powerpc/platforms/85xx/p5020_ds.c | 32 +- trunk/arch/powerpc/platforms/85xx/sbc8548.c | 2 +- trunk/arch/powerpc/platforms/85xx/smp.c | 30 +- .../powerpc/platforms/86xx/mpc8610_hpcd.c | 107 +- trunk/arch/powerpc/platforms/Kconfig | 6 +- trunk/arch/powerpc/platforms/Kconfig.cputype | 2 +- .../platforms/cell/cpufreq_spudemand.c | 2 +- trunk/arch/powerpc/platforms/cell/smp.c | 2 +- .../powerpc/platforms/cell/spufs/context.c | 2 +- trunk/arch/powerpc/platforms/chrp/pci.c | 2 +- trunk/arch/powerpc/platforms/chrp/smp.c | 2 +- trunk/arch/powerpc/platforms/iseries/smp.c | 4 +- trunk/arch/powerpc/platforms/maple/setup.c | 41 +- .../powerpc/platforms/powermac/backlight.c | 2 +- trunk/arch/powerpc/platforms/powermac/pci.c | 6 +- trunk/arch/powerpc/platforms/powermac/setup.c | 3 - trunk/arch/powerpc/platforms/powermac/smp.c | 4 +- trunk/arch/powerpc/platforms/pseries/dlpar.c | 10 +- trunk/arch/powerpc/platforms/pseries/eeh.c | 2 +- .../powerpc/platforms/pseries/eeh_cache.c | 2 +- .../powerpc/platforms/pseries/hotplug-cpu.c | 10 +- .../platforms/pseries/hotplug-memory.c | 16 +- .../powerpc/platforms/pseries/hvconsole.c | 2 +- trunk/arch/powerpc/platforms/pseries/lpar.c | 191 - .../arch/powerpc/platforms/pseries/pseries.h | 3 +- .../arch/powerpc/platforms/pseries/reconfig.c | 28 +- trunk/arch/powerpc/platforms/pseries/setup.c | 5 +- trunk/arch/powerpc/platforms/pseries/smp.c | 4 +- trunk/arch/powerpc/platforms/wsp/smp.c | 2 +- trunk/arch/powerpc/sysdev/Makefile | 1 + trunk/arch/powerpc/sysdev/ehv_pic.c | 302 + trunk/arch/powerpc/sysdev/fsl_pci.c | 87 +- trunk/arch/powerpc/sysdev/fsl_soc.c | 29 +- trunk/arch/powerpc/sysdev/fsl_soc.h | 3 + trunk/arch/powerpc/sysdev/grackle.c | 2 +- trunk/arch/powerpc/sysdev/mpic.c | 38 +- trunk/arch/powerpc/sysdev/ppc4xx_pci.c | 149 +- trunk/arch/powerpc/sysdev/tsi108_dev.c | 2 +- trunk/arch/s390/include/asm/atomic.h | 7 +- trunk/arch/s390/include/asm/bitops.h | 5 +- trunk/arch/s390/include/asm/ptrace.h | 1 - trunk/arch/s390/kernel/dis.c | 2 +- trunk/arch/s390/kernel/traps.c | 2 +- trunk/arch/sh/include/asm/atomic.h | 12 +- trunk/arch/sh/include/asm/hw_irq.h | 2 +- trunk/arch/sh/include/asm/ptrace.h | 2 - trunk/arch/sh/include/asm/smp.h | 2 +- trunk/arch/sh/kernel/idle.c | 2 +- trunk/arch/sh/kernel/smp.c | 2 +- trunk/arch/sh/kernel/traps_64.c | 2 +- trunk/arch/sh/kernel/unwinder.c | 2 +- trunk/arch/sparc/Kconfig | 5 +- trunk/arch/sparc/include/asm/atomic_32.h | 4 +- trunk/arch/sparc/include/asm/atomic_64.h | 6 +- trunk/arch/sparc/include/asm/bitops_64.h | 5 +- trunk/arch/sparc/include/asm/pgalloc_64.h | 76 +- trunk/arch/sparc/include/asm/pgtable_64.h | 15 +- trunk/arch/sparc/include/asm/prom.h | 2 +- trunk/arch/sparc/include/asm/ptrace.h | 2 - trunk/arch/sparc/include/asm/smp_32.h | 2 +- trunk/arch/sparc/include/asm/smp_64.h | 2 +- trunk/arch/sparc/kernel/irq_64.c | 2 +- trunk/arch/sparc/kernel/leon_smp.c | 2 +- trunk/arch/sparc/kernel/perf_event.c | 2 +- trunk/arch/sparc/kernel/smp_32.c | 2 +- trunk/arch/sparc/kernel/smp_64.c | 2 +- trunk/arch/sparc/lib/atomic32.c | 2 +- trunk/arch/sparc/mm/Makefile | 2 +- trunk/arch/sparc/mm/gup.c | 181 + trunk/arch/sparc/mm/tsb.c | 11 + trunk/arch/tile/configs/tilegx_defconfig | 1 - trunk/arch/tile/include/asm/atomic.h | 14 - trunk/arch/tile/include/asm/atomic_32.h | 14 +- trunk/arch/tile/include/asm/atomic_64.h | 6 +- trunk/arch/tile/include/asm/bitops_32.h | 2 +- trunk/arch/tile/include/asm/bitops_64.h | 7 +- trunk/arch/tile/include/asm/ptrace.h | 2 - trunk/arch/tile/include/asm/spinlock_32.h | 2 +- trunk/arch/tile/kernel/intvec_32.S | 2 +- trunk/arch/tile/lib/atomic_32.c | 2 +- trunk/arch/tile/lib/atomic_asm_32.S | 2 +- trunk/arch/um/Kconfig.x86 | 2 + trunk/arch/um/drivers/chan_kern.c | 3 +- trunk/arch/um/drivers/cow_user.c | 6 +- trunk/arch/um/drivers/harddog_user.c | 2 +- trunk/arch/um/drivers/line.c | 3 +- trunk/arch/um/drivers/net_kern.c | 12 + trunk/arch/um/drivers/net_user.c | 5 +- trunk/arch/um/drivers/slip_user.c | 3 +- trunk/arch/um/include/asm/delay.h | 10 +- trunk/arch/um/include/asm/ptrace-generic.h | 2 - trunk/arch/um/kernel/exec.c | 1 - trunk/arch/um/kernel/reboot.c | 3 +- trunk/arch/um/os-Linux/Makefile | 4 +- trunk/arch/um/os-Linux/elf_aux.c | 7 +- trunk/arch/um/os-Linux/helper.c | 4 +- trunk/arch/um/os-Linux/main.c | 4 + trunk/arch/um/os-Linux/mem.c | 6 +- trunk/arch/um/os-Linux/user_syms.c | 5 + trunk/arch/um/sys-i386/Makefile | 2 +- trunk/arch/um/sys-i386/asm/elf.h | 2 + trunk/arch/um/sys-i386/delay.c | 59 +- trunk/arch/um/sys-i386/mem.c | 62 + trunk/arch/um/sys-x86_64/Makefile | 4 +- trunk/arch/um/sys-x86_64/asm/elf.h | 10 + trunk/arch/um/sys-x86_64/delay.c | 54 +- trunk/arch/um/sys-x86_64/mem.c | 32 +- .../um/sys-x86_64/shared/sysdep/vm-flags.h | 26 +- trunk/arch/um/sys-x86_64/vdso/Makefile | 90 + trunk/arch/um/sys-x86_64/vdso/checkundef.sh | 10 + trunk/arch/um/sys-x86_64/vdso/um_vdso.c | 71 + .../arch/um/sys-x86_64/vdso/vdso-layout.lds.S | 64 + trunk/arch/um/sys-x86_64/vdso/vdso-note.S | 12 + trunk/arch/um/sys-x86_64/vdso/vdso.S | 10 + trunk/arch/um/sys-x86_64/vdso/vdso.lds.S | 32 + trunk/arch/um/sys-x86_64/vdso/vma.c | 74 + trunk/arch/x86/Kconfig | 43 +- trunk/arch/x86/ia32/sys_ia32.c | 2 +- trunk/arch/x86/include/asm/apic.h | 2 +- trunk/arch/x86/include/asm/atomic.h | 10 +- trunk/arch/x86/include/asm/atomic64_32.h | 2 +- trunk/arch/x86/include/asm/atomic64_64.h | 2 +- trunk/arch/x86/include/asm/bitops.h | 5 +- trunk/arch/x86/include/asm/hw_irq.h | 2 +- trunk/arch/x86/include/asm/kdebug.h | 1 - trunk/arch/x86/include/asm/local.h | 2 +- trunk/arch/x86/include/asm/mce.h | 2 +- trunk/arch/x86/include/asm/mmu_context.h | 2 +- trunk/arch/x86/include/asm/olpc.h | 51 +- trunk/arch/x86/include/asm/prom.h | 2 +- trunk/arch/x86/include/asm/spinlock.h | 2 +- trunk/arch/x86/include/asm/thread_info.h | 2 +- trunk/arch/x86/kernel/amd_gart_64.c | 2 +- trunk/arch/x86/kernel/apic/apic.c | 2 +- trunk/arch/x86/kernel/apic/es7000_32.c | 2 +- trunk/arch/x86/kernel/cpu/common.c | 2 +- trunk/arch/x86/kernel/i8259.c | 2 +- trunk/arch/x86/kernel/irqinit.c | 2 +- trunk/arch/x86/kernel/traps.c | 2 +- trunk/arch/x86/kvm/lapic.c | 2 +- trunk/arch/x86/kvm/timer.c | 2 +- trunk/arch/x86/lib/atomic64_32.c | 2 +- trunk/arch/x86/mm/mmio-mod.c | 2 +- trunk/arch/x86/platform/olpc/Makefile | 5 +- trunk/arch/x86/platform/olpc/olpc-xo1-pm.c | 215 + trunk/arch/x86/platform/olpc/olpc-xo1-rtc.c | 81 + trunk/arch/x86/platform/olpc/olpc-xo1-sci.c | 614 + trunk/arch/x86/platform/olpc/olpc-xo1.c | 146 - trunk/arch/x86/platform/olpc/olpc-xo15-sci.c | 168 + trunk/arch/x86/platform/olpc/olpc.c | 95 + trunk/arch/x86/platform/olpc/olpc_dt.c | 103 + trunk/arch/x86/platform/olpc/xo1-wakeup.S | 124 + trunk/arch/xtensa/include/asm/atomic.h | 10 +- trunk/arch/xtensa/include/asm/bitops.h | 14 +- trunk/arch/xtensa/include/asm/posix_types.h | 2 +- trunk/arch/xtensa/include/asm/ptrace.h | 1 - trunk/arch/xtensa/include/asm/uaccess.h | 1 + trunk/arch/xtensa/kernel/process.c | 2 +- trunk/arch/xtensa/kernel/ptrace.c | 3 + trunk/block/blk-core.c | 28 +- trunk/crypto/af_alg.c | 2 +- trunk/crypto/proc.c | 2 +- trunk/crypto/rng.c | 2 +- trunk/drivers/Kconfig | 2 + trunk/drivers/Makefile | 3 + trunk/drivers/acpi/video.c | 7 +- trunk/drivers/ata/sata_dwc_460ex.c | 3 +- trunk/drivers/atm/ambassador.c | 2 +- trunk/drivers/atm/atmtcp.c | 2 +- trunk/drivers/atm/eni.c | 2 +- trunk/drivers/atm/eni.h | 2 +- trunk/drivers/atm/firestream.c | 2 +- trunk/drivers/atm/fore200e.c | 2 +- trunk/drivers/atm/horizon.c | 2 +- trunk/drivers/atm/idt77252.c | 2 +- trunk/drivers/atm/iphase.c | 2 +- trunk/drivers/atm/nicstar.c | 2 +- trunk/drivers/atm/suni.c | 2 +- trunk/drivers/atm/uPD98402.c | 2 +- trunk/drivers/atm/zatm.c | 2 +- trunk/drivers/base/Kconfig | 64 +- trunk/drivers/base/memory.c | 2 +- trunk/drivers/base/platform.c | 21 + trunk/drivers/base/power/opp.c | 2 +- trunk/drivers/base/power/sysfs.c | 2 +- trunk/drivers/block/cciss_scsi.c | 2 +- trunk/drivers/block/rbd.c | 46 +- trunk/drivers/char/ipmi/ipmi_watchdog.c | 2 +- trunk/drivers/char/mspec.c | 2 +- trunk/drivers/char/ramoops.c | 92 +- trunk/drivers/clk/Kconfig | 3 + trunk/drivers/connector/cn_proc.c | 4 +- trunk/drivers/cpufreq/Kconfig | 5 + trunk/drivers/cpufreq/Kconfig.powerpc | 7 + trunk/drivers/cpufreq/Makefile | 4 + trunk/drivers/cpufreq/cpufreq.c | 20 + trunk/drivers/cpufreq/maple-cpufreq.c | 309 + trunk/drivers/dma/imx-sdma.c | 6 +- trunk/drivers/edac/edac_stub.c | 2 +- trunk/drivers/edac/mpc85xx_edac.c | 4 +- trunk/drivers/eisa/pci_eisa.c | 4 +- trunk/drivers/firewire/core-card.c | 2 +- trunk/drivers/firewire/core-device.c | 2 +- trunk/drivers/firewire/core-topology.c | 2 +- trunk/drivers/firewire/core.h | 2 +- trunk/drivers/firewire/nosy.c | 2 +- trunk/drivers/firmware/google/gsmi.c | 19 +- trunk/drivers/firmware/sigma.c | 3 + trunk/drivers/gpu/drm/drm_crtc_helper.c | 5 + trunk/drivers/gpu/drm/drm_edid.c | 4 +- trunk/drivers/gpu/drm/drm_gem.c | 47 +- trunk/drivers/gpu/drm/drm_modes.c | 87 +- trunk/drivers/gpu/drm/drm_platform.c | 5 +- trunk/drivers/gpu/drm/drm_scatter.c | 10 +- trunk/drivers/gpu/drm/i915/i915_debugfs.c | 41 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 4 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 69 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 46 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 191 +- trunk/drivers/gpu/drm/i915/i915_gem_gtt.c | 39 +- trunk/drivers/gpu/drm/i915/i915_irq.c | 13 +- trunk/drivers/gpu/drm/i915/i915_reg.h | 6 +- trunk/drivers/gpu/drm/i915/i915_suspend.c | 8 +- trunk/drivers/gpu/drm/i915/intel_bios.c | 142 +- trunk/drivers/gpu/drm/i915/intel_display.c | 699 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 17 +- trunk/drivers/gpu/drm/i915/intel_drv.h | 9 + trunk/drivers/gpu/drm/i915/intel_hdmi.c | 8 +- trunk/drivers/gpu/drm/i915/intel_opregion.c | 15 +- trunk/drivers/gpu/drm/i915/intel_overlay.c | 6 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +- trunk/drivers/gpu/drm/i915/intel_tv.c | 46 +- trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 50 +- trunk/drivers/gpu/drm/nouveau/nouveau_bo.c | 232 +- .../drivers/gpu/drm/nouveau/nouveau_channel.c | 167 +- .../gpu/drm/nouveau/nouveau_connector.c | 34 +- trunk/drivers/gpu/drm/nouveau/nouveau_dma.c | 7 +- trunk/drivers/gpu/drm/nouveau/nouveau_drv.c | 23 +- trunk/drivers/gpu/drm/nouveau/nouveau_drv.h | 78 +- trunk/drivers/gpu/drm/nouveau/nouveau_fb.h | 1 + trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c | 15 +- trunk/drivers/gpu/drm/nouveau/nouveau_fence.c | 31 +- trunk/drivers/gpu/drm/nouveau/nouveau_gem.c | 148 +- trunk/drivers/gpu/drm/nouveau/nouveau_irq.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_mem.c | 119 +- trunk/drivers/gpu/drm/nouveau/nouveau_mm.c | 11 +- trunk/drivers/gpu/drm/nouveau/nouveau_mm.h | 1 + .../gpu/drm/nouveau/nouveau_notifier.c | 20 +- .../drivers/gpu/drm/nouveau/nouveau_object.c | 98 +- trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c | 4 +- trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 114 +- trunk/drivers/gpu/drm/nouveau/nouveau_temp.c | 15 +- trunk/drivers/gpu/drm/nouveau/nouveau_vm.c | 21 +- trunk/drivers/gpu/drm/nouveau/nouveau_vm.h | 2 + trunk/drivers/gpu/drm/nouveau/nv04_crtc.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv04_graph.c | 22 +- trunk/drivers/gpu/drm/nouveau/nv04_instmem.c | 28 +- trunk/drivers/gpu/drm/nouveau/nv10_graph.c | 15 +- trunk/drivers/gpu/drm/nouveau/nv20_graph.c | 13 +- trunk/drivers/gpu/drm/nouveau/nv40_graph.c | 112 +- trunk/drivers/gpu/drm/nouveau/nv40_mpeg.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_crtc.c | 10 +- trunk/drivers/gpu/drm/nouveau/nv50_display.c | 6 +- trunk/drivers/gpu/drm/nouveau/nv50_evo.c | 10 +- trunk/drivers/gpu/drm/nouveau/nv50_fbcon.c | 10 +- trunk/drivers/gpu/drm/nouveau/nv50_graph.c | 9 +- trunk/drivers/gpu/drm/nouveau/nv50_instmem.c | 8 +- trunk/drivers/gpu/drm/nouveau/nv50_mpeg.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_sor.c | 2 + trunk/drivers/gpu/drm/nouveau/nv50_vm.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_vram.c | 41 +- trunk/drivers/gpu/drm/nouveau/nv84_crypt.c | 2 +- trunk/drivers/gpu/drm/nouveau/nva3_copy.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_copy.c | 8 +- trunk/drivers/gpu/drm/nouveau/nvc0_fb.c | 68 +- trunk/drivers/gpu/drm/nouveau/nvc0_fbcon.c | 14 +- trunk/drivers/gpu/drm/nouveau/nvc0_fifo.c | 4 +- trunk/drivers/gpu/drm/nouveau/nvc0_graph.c | 270 +- trunk/drivers/gpu/drm/nouveau/nvc0_graph.fuc | 400 + trunk/drivers/gpu/drm/nouveau/nvc0_graph.h | 24 +- trunk/drivers/gpu/drm/nouveau/nvc0_grctx.c | 239 +- trunk/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc | 474 + .../drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h | 483 + trunk/drivers/gpu/drm/nouveau/nvc0_grhub.fuc | 808 + .../drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h | 838 + trunk/drivers/gpu/drm/nouveau/nvc0_instmem.c | 14 +- trunk/drivers/gpu/drm/nouveau/nvc0_vm.c | 6 +- trunk/drivers/gpu/drm/nouveau/nvc0_vram.c | 14 +- trunk/drivers/gpu/drm/radeon/atombios_crtc.c | 5 +- trunk/drivers/gpu/drm/radeon/atombios_dp.c | 22 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 7 +- trunk/drivers/gpu/drm/radeon/evergreen_cs.c | 57 +- trunk/drivers/gpu/drm/radeon/evergreend.h | 2 + trunk/drivers/gpu/drm/radeon/ni.c | 1 + trunk/drivers/gpu/drm/radeon/r600.c | 15 +- trunk/drivers/gpu/drm/radeon/r600_cp.c | 23 +- trunk/drivers/gpu/drm/radeon/r600_cs.c | 9 + trunk/drivers/gpu/drm/radeon/radeon.h | 27 +- trunk/drivers/gpu/drm/radeon/radeon_asic.c | 14 +- trunk/drivers/gpu/drm/radeon/radeon_clocks.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_combios.c | 3 +- trunk/drivers/gpu/drm/radeon/radeon_cp.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_display.c | 42 +- trunk/drivers/gpu/drm/radeon/radeon_drv.c | 5 +- trunk/drivers/gpu/drm/radeon/radeon_fence.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_kms.c | 15 +- trunk/drivers/gpu/drm/radeon/radeon_mem.c | 3 +- trunk/drivers/gpu/drm/radeon/radeon_pm.c | 3 + trunk/drivers/gpu/drm/radeon/radeon_reg.h | 2 +- trunk/drivers/gpu/drm/radeon/reg_srcs/cayman | 2 + .../drivers/gpu/drm/radeon/reg_srcs/evergreen | 3 + trunk/drivers/gpu/drm/radeon/reg_srcs/r600 | 1 + trunk/drivers/gpu/drm/radeon/rs600.c | 2 +- trunk/drivers/gpu/drm/radeon/rv770.c | 1 + trunk/drivers/gpu/drm/ttm/ttm_bo.c | 2 +- trunk/drivers/gpu/drm/ttm/ttm_lock.c | 2 +- trunk/drivers/gpu/drm/ttm/ttm_object.c | 2 +- trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c | 18 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 3 +- .../drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 8 +- trunk/drivers/gpu/vga/vgaarb.c | 3 +- trunk/drivers/hwmon/sht15.c | 2 +- trunk/drivers/i2c/busses/i2c-eg20t.c | 41 +- trunk/drivers/i2c/busses/i2c-tegra.c | 17 +- trunk/drivers/infiniband/hw/cxgb4/mem.c | 2 +- trunk/drivers/infiniband/hw/ehca/ehca_tools.h | 2 +- trunk/drivers/infiniband/hw/nes/nes_cm.c | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib.h | 2 +- trunk/drivers/infiniband/ulp/srp/ib_srp.c | 2 +- trunk/drivers/input/misc/Kconfig | 13 +- trunk/drivers/input/misc/Makefile | 1 + trunk/drivers/input/misc/twl4030-vibra.c | 12 +- trunk/drivers/input/misc/twl6040-vibra.c | 423 + trunk/drivers/isdn/gigaset/gigaset.h | 2 +- trunk/drivers/leds/Kconfig | 1 + trunk/drivers/leds/leds-lm3530.c | 67 +- trunk/drivers/leds/leds-lp5521.c | 4 +- trunk/drivers/leds/leds-sunfire.c | 12 +- trunk/drivers/md/dm-crypt.c | 2 +- trunk/drivers/md/dm-kcopyd.c | 2 +- trunk/drivers/md/dm-mpath.c | 2 +- trunk/drivers/md/dm-queue-length.c | 2 +- trunk/drivers/md/dm-table.c | 2 +- trunk/drivers/media/video/hdpvr/hdpvr-core.c | 2 +- trunk/drivers/media/video/tlg2300/pd-dvb.c | 2 +- trunk/drivers/media/video/uvc/uvc_ctrl.c | 2 +- trunk/drivers/media/video/uvc/uvc_queue.c | 2 +- trunk/drivers/media/video/uvc/uvc_v4l2.c | 2 +- trunk/drivers/media/video/uvc/uvc_video.c | 2 +- trunk/drivers/message/i2o/i2o_scsi.c | 2 +- trunk/drivers/mfd/Kconfig | 8 +- trunk/drivers/mfd/Makefile | 3 +- trunk/drivers/mfd/twl-core.c | 13 +- trunk/drivers/mfd/twl4030-audio.c | 277 + trunk/drivers/mfd/twl4030-codec.c | 277 - trunk/drivers/mfd/twl6040-core.c | 620 + trunk/drivers/mfd/twl6040-irq.c | 191 + trunk/drivers/misc/Kconfig | 12 +- trunk/drivers/misc/Makefile | 3 +- trunk/drivers/misc/eeprom/Kconfig | 25 + trunk/drivers/misc/eeprom/Makefile | 2 + trunk/drivers/misc/eeprom/digsy_mtc_eeprom.c | 85 + trunk/drivers/misc/eeprom/eeprom_93xx46.c | 410 + trunk/drivers/misc/fsa9480.c | 557 + trunk/drivers/misc/pch_phub.c | 9 +- trunk/drivers/misc/phantom.c | 2 +- trunk/drivers/misc/pti.c | 105 +- trunk/drivers/misc/vmw_balloon.c | 31 +- trunk/drivers/mmc/core/core.c | 1 + trunk/drivers/mmc/host/tmio_mmc.h | 1 + trunk/drivers/net/atlx/atl1.c | 2 +- trunk/drivers/net/atlx/atl2.c | 2 +- trunk/drivers/net/atlx/atl2.h | 2 +- trunk/drivers/net/cassini.c | 2 +- trunk/drivers/net/cpmac.c | 2 +- trunk/drivers/net/cxgb3/cxgb3_offload.c | 2 +- trunk/drivers/net/cxgb3/l2t.h | 2 +- trunk/drivers/net/cxgb3/t3cdev.h | 2 +- trunk/drivers/net/cxgb4/cxgb4_uld.h | 2 +- trunk/drivers/net/cxgb4/l2t.h | 2 +- trunk/drivers/net/hamradio/6pack.c | 2 +- trunk/drivers/net/hamradio/dmascc.c | 2 +- trunk/drivers/net/ibmveth.c | 2 +- trunk/drivers/net/phy/phy.c | 2 +- trunk/drivers/net/ppp_generic.c | 2 +- trunk/drivers/net/wimax/i2400m/i2400m.h | 2 +- .../net/wireless/b43legacy/b43legacy.h | 2 +- trunk/drivers/net/wireless/b43legacy/dma.h | 2 +- trunk/drivers/of/platform.c | 4 +- trunk/drivers/oprofile/oprofile_stats.h | 2 +- trunk/drivers/parport/parport_pc.c | 54 - trunk/drivers/parport/parport_serial.c | 229 +- trunk/drivers/pci/hotplug/cpci_hotplug_core.c | 2 +- trunk/drivers/pci/xen-pcifront.c | 2 +- trunk/drivers/pnp/pnpacpi/rsparser.c | 52 +- trunk/drivers/rtc/Kconfig | 14 +- trunk/drivers/rtc/Makefile | 1 + trunk/drivers/rtc/interface.c | 55 +- trunk/drivers/rtc/rtc-mpc5121.c | 81 +- trunk/drivers/rtc/rtc-pm8xxx.c | 550 + trunk/drivers/rtc/rtc-s3c.c | 27 +- trunk/drivers/rtc/rtc-tegra.c | 2 +- trunk/drivers/rtc/rtc-twl.c | 2 +- trunk/drivers/s390/block/dasd_eer.c | 2 +- trunk/drivers/s390/char/sclp_quiesce.c | 2 +- trunk/drivers/s390/char/vmlogrdr.c | 2 +- trunk/drivers/s390/cio/device.h | 2 +- trunk/drivers/s390/cio/qdio_main.c | 2 +- trunk/drivers/s390/cio/qdio_thinint.c | 2 +- trunk/drivers/s390/crypto/ap_bus.c | 2 +- trunk/drivers/s390/crypto/zcrypt_api.c | 2 +- trunk/drivers/s390/crypto/zcrypt_cex2a.c | 2 +- trunk/drivers/s390/crypto/zcrypt_mono.c | 2 +- trunk/drivers/s390/crypto/zcrypt_pcica.c | 2 +- trunk/drivers/s390/crypto/zcrypt_pcicc.c | 2 +- trunk/drivers/s390/crypto/zcrypt_pcixcc.c | 2 +- trunk/drivers/s390/net/fsm.h | 2 +- trunk/drivers/s390/scsi/zfcp_scsi.c | 2 +- trunk/drivers/sbus/char/display7seg.c | 2 +- trunk/drivers/scsi/dpt/dpti_i2o.h | 2 +- trunk/drivers/scsi/hpsa.c | 2 +- trunk/drivers/scsi/pm8001/pm8001_sas.h | 2 +- trunk/drivers/staging/Kconfig | 10 - trunk/drivers/staging/Makefile | 5 - trunk/drivers/staging/altera-stapl/Kconfig | 2 - trunk/drivers/staging/altera-stapl/Makefile | 2 +- trunk/drivers/staging/altera-stapl/altera.c | 33 +- trunk/drivers/staging/ath6kl/TODO | 2 +- .../staging/ath6kl/os/linux/ar6000_drv.c | 56 +- .../staging/ath6kl/os/linux/cfg80211.c | 211 +- .../ath6kl/os/linux/include/ar6000_drv.h | 19 +- .../ath6kl/os/linux/include/cfg80211.h | 11 + .../ath6kl/os/linux/include/config_linux.h | 2 - .../ath6kl/os/linux/include/ieee80211_ioctl.h | 2 - .../ath6kl/os/linux/include/osapi_linux.h | 1 - trunk/drivers/staging/ath6kl/wmi/wmi.c | 6 +- trunk/drivers/staging/bcm/Debug.h | 2 +- trunk/drivers/staging/bcm/InterfaceRx.c | 4 +- trunk/drivers/staging/bcm/Macros.h | 4 +- trunk/drivers/staging/bcm/Misc.c | 10 +- trunk/drivers/staging/bcm/PHSModule.c | 24 +- trunk/drivers/staging/bcm/PHSModule.h | 2 +- trunk/drivers/staging/bcm/headers.h | 1 - trunk/drivers/staging/bcm/sort.c | 77 +- trunk/drivers/staging/brcm80211/Makefile | 4 +- trunk/drivers/staging/brcm80211/README | 65 +- trunk/drivers/staging/brcm80211/TODO | 12 +- .../staging/brcm80211/brcmfmac/Makefile | 27 +- .../drivers/staging/brcm80211/brcmfmac/README | 2 - .../staging/brcm80211/brcmfmac/aiutils.c | 1 - .../staging/brcm80211/brcmfmac/bcmcdc.h | 98 - .../staging/brcm80211/brcmfmac/bcmchip.h | 9 +- .../staging/brcm80211/brcmfmac/bcmsdbus.h | 113 - .../staging/brcm80211/brcmfmac/bcmsdh.c | 631 +- .../staging/brcm80211/brcmfmac/bcmsdh_linux.c | 386 - .../staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 925 +- .../staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h | 134 - .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 235 - .../drivers/staging/brcm80211/brcmfmac/dhd.h | 970 +- .../staging/brcm80211/brcmfmac/dhd_bus.h | 76 +- .../staging/brcm80211/brcmfmac/dhd_cdc.c | 348 +- .../staging/brcm80211/brcmfmac/dhd_common.c | 1606 +- .../brcm80211/brcmfmac/dhd_custom_gpio.c | 158 - .../staging/brcm80211/brcmfmac/dhd_dbg.h | 105 +- .../staging/brcm80211/brcmfmac/dhd_linux.c | 2236 +-- .../brcm80211/brcmfmac/dhd_linux_sched.c | 25 - .../staging/brcm80211/brcmfmac/dhd_proto.h | 63 +- .../staging/brcm80211/brcmfmac/dhd_sdio.c | 4745 +++--- .../staging/brcm80211/brcmfmac/dhdioctl.h | 100 - .../staging/brcm80211/brcmfmac/dngl_stats.h | 32 - .../brcm80211/brcmfmac/hndrte_armtrap.h | 75 - .../staging/brcm80211/brcmfmac/hndrte_cons.h | 62 - .../staging/brcm80211/brcmfmac/msgtrace.h | 61 - .../staging/brcm80211/brcmfmac/sdio_host.h | 347 + .../staging/brcm80211/brcmfmac/sdioh.h | 63 - .../staging/brcm80211/brcmfmac/sdiovar.h | 38 - .../staging/brcm80211/brcmfmac/wl_cfg80211.c | 2480 ++- .../staging/brcm80211/brcmfmac/wl_cfg80211.h | 207 +- .../staging/brcm80211/brcmfmac/wl_iw.c | 3689 ----- .../staging/brcm80211/brcmfmac/wl_iw.h | 142 - .../staging/brcm80211/brcmsmac/Makefile | 45 +- .../staging/brcm80211/brcmsmac/aiutils.c | 717 +- .../staging/brcm80211/brcmsmac/aiutils.h | 230 +- .../brcmsmac/{wlc_alloc.c => alloc.c} | 153 +- .../brcmsmac/{wlc_alloc.h => alloc.h} | 5 +- .../brcmsmac/{wlc_ampdu.c => ampdu.c} | 410 +- .../brcmsmac/{wlc_types.h => ampdu.h} | 31 +- .../brcmsmac/{wlc_antsel.c => antsel.c} | 113 +- .../brcmsmac/{wlc_antsel.h => antsel.h} | 16 +- .../staging/brcm80211/brcmsmac/bcmotp.c | 936 -- .../staging/brcm80211/brcmsmac/bcmsrom.c | 714 - .../brcm80211/brcmsmac/{wlc_bmac.c => bmac.c} | 1112 +- .../drivers/staging/brcm80211/brcmsmac/bmac.h | 174 + .../brcmsmac/{wlc_channel.c => channel.c} | 594 +- .../brcmsmac/{wlc_channel.h => channel.h} | 82 +- .../drivers/staging/brcm80211/brcmsmac/d11.h | 160 +- .../brcm80211/brcmsmac/{hnddma.c => dma.c} | 563 +- .../{include/hnddma.h => brcmsmac/dma.h} | 146 +- .../brcmsmac/{wl_mac80211.c => mac80211_if.c} | 822 +- .../brcmsmac/{wl_mac80211.h => mac80211_if.h} | 75 +- .../brcm80211/brcmsmac/{wlc_main.c => main.c} | 4289 ++--- .../brcm80211/brcmsmac/{wlc_main.h => main.h} | 794 +- .../staging/brcm80211/brcmsmac/nicpci.c | 672 +- .../staging/brcm80211/brcmsmac/nicpci.h | 85 + .../staging/brcm80211/brcmsmac/nvram.c | 215 - .../drivers/staging/brcm80211/brcmsmac/otp.c | 544 + .../{include/bcmotp.h => brcmsmac/otp.h} | 13 +- .../brcmsmac/phy/{wlc_phy_cmn.c => phy_cmn.c} | 718 +- .../staging/brcm80211/brcmsmac/phy/phy_hal.h | 294 + .../brcmsmac/phy/{wlc_phy_int.h => phy_int.h} | 467 +- .../brcmsmac/phy/{wlc_phy_lcn.c => phy_lcn.c} | 584 +- .../brcmsmac/phy/{wlc_phy_lcn.h => phy_lcn.h} | 12 +- .../brcmsmac/phy/{wlc_phy_n.c => phy_n.c} | 1031 +- .../phy/{wlc_phy_qmath.c => phy_qmath.c} | 4 +- .../phy/{wlc_phy_qmath.h => phy_qmath.h} | 8 +- .../phy/{wlc_phy_radio.h => phy_radio.h} | 6 +- .../brcm80211/brcmsmac/phy/phy_version.h | 36 - .../phy/{wlc_phyreg_n.h => phyreg_n.h} | 14 +- .../phy/{wlc_phytbl_lcn.c => phytbl_lcn.c} | 53 +- .../phy/{wlc_phytbl_lcn.h => phytbl_lcn.h} | 35 +- .../phy/{wlc_phytbl_n.c => phytbl_n.c} | 53 +- .../phy/{wlc_phytbl_n.h => phytbl_n.h} | 21 +- .../brcm80211/brcmsmac/phy/wlc_phy_hal.h | 256 - .../staging/brcm80211/brcmsmac/phy_shim.c | 218 + .../staging/brcm80211/brcmsmac/phy_shim.h | 164 + .../drivers/staging/brcm80211/brcmsmac/pmu.c | 474 + .../brcm80211/brcmsmac/{wlc_pmu.h => pmu.h} | 44 +- .../brcm80211/brcmsmac/{wlc_pub.h => pub.h} | 427 +- .../brcm80211/brcmsmac/{wlc_rate.c => rate.c} | 207 +- .../brcm80211/brcmsmac/{wlc_rate.h => rate.h} | 116 +- .../brcm80211/brcmsmac/{wlc_scb.h => scb.h} | 31 +- .../brcmsmac/{bcmsrom_tbl.h => srom.c} | 890 +- .../{include/bcmsrom.h => brcmsmac/srom.h} | 12 +- .../brcm80211/brcmsmac/{wlc_stf.c => stf.c} | 204 +- .../drivers/staging/brcm80211/brcmsmac/stf.h | 42 + .../staging/brcm80211/brcmsmac/types.h | 398 + .../{wl_ucode_loader.c => ucode_loader.c} | 80 +- .../brcmsmac/{wl_ucode.h => ucode_loader.h} | 15 +- .../staging/brcm80211/brcmsmac/wl_dbg.h | 92 - .../staging/brcm80211/brcmsmac/wl_export.h | 47 - .../staging/brcm80211/brcmsmac/wlc_ampdu.h | 29 - .../staging/brcm80211/brcmsmac/wlc_bmac.h | 178 - .../staging/brcm80211/brcmsmac/wlc_bsscfg.h | 135 - .../staging/brcm80211/brcmsmac/wlc_cfg.h | 280 - .../staging/brcm80211/brcmsmac/wlc_key.h | 140 - .../staging/brcm80211/brcmsmac/wlc_phy_shim.c | 243 - .../staging/brcm80211/brcmsmac/wlc_phy_shim.h | 112 - .../staging/brcm80211/brcmsmac/wlc_pmu.c | 1929 --- .../staging/brcm80211/brcmsmac/wlc_stf.h | 38 - .../brcm80211/{util => brcmutil}/Makefile | 6 +- .../{util/bcmutils.c => brcmutil/utils.c} | 153 +- .../{util/bcmwifi.c => brcmutil/wifi.c} | 20 +- .../drivers/staging/brcm80211/include/aidmp.h | 374 - .../staging/brcm80211/include/bcmdefs.h | 150 - .../staging/brcm80211/include/bcmdevs.h | 124 - .../staging/brcm80211/include/bcmnvram.h | 153 - .../staging/brcm80211/include/bcmsdh.h | 205 - .../staging/brcm80211/include/bcmsdpcm.h | 208 - .../staging/brcm80211/include/bcmsrom_fmt.h | 367 - .../staging/brcm80211/include/bcmutils.h | 500 - .../staging/brcm80211/include/brcm_hw_ids.h | 59 + .../staging/brcm80211/include/brcmu_utils.h | 301 + .../include/{bcmwifi.h => brcmu_wifi.h} | 126 +- .../staging/brcm80211/include/chipcommon.h | 281 + .../drivers/staging/brcm80211/include/defs.h | 112 + .../staging/brcm80211/include/hndsoc.h | 199 - .../staging/brcm80211/include/nicpci.h | 79 - .../staging/brcm80211/include/pci_core.h | 122 - .../staging/brcm80211/include/pcicfg.h | 50 - .../staging/brcm80211/include/pcie_core.h | 299 - .../staging/brcm80211/include/proto/802.11.h | 200 - .../staging/brcm80211/include/proto/bcmeth.h | 44 - .../brcm80211/include/proto/bcmevent.h | 207 - .../staging/brcm80211/include/sbchipc.h | 1588 -- .../staging/brcm80211/include/sbconfig.h | 272 - .../staging/brcm80211/include/sbhnddma.h | 315 - .../staging/brcm80211/include/sbsdio.h | 152 - .../staging/brcm80211/include/sbsdpcmdev.h | 281 - .../drivers/staging/brcm80211/include/sdio.h | 552 - trunk/drivers/staging/brcm80211/include/soc.h | 95 + .../staging/brcm80211/include/wlioctl.h | 1365 -- trunk/drivers/staging/comedi/Kconfig | 10 + trunk/drivers/staging/comedi/comedi.h | 6 +- trunk/drivers/staging/comedi/comedi_fops.c | 18 +- trunk/drivers/staging/comedi/comedidev.h | 3 - trunk/drivers/staging/comedi/drivers.c | 4 + trunk/drivers/staging/comedi/drivers/Makefile | 1 + .../comedi/drivers/addi-data/addi_common.c | 2 +- .../staging/comedi/drivers/adl_pci9118.c | 1 + .../staging/comedi/drivers/adv_pci1723.c | 2 +- .../drivers/staging/comedi/drivers/das1800.c | 28 +- trunk/drivers/staging/comedi/drivers/dt282x.c | 1 + .../staging/comedi/drivers/dyna_pci10xx.c | 462 + .../staging/comedi/drivers/ni_at_a2150.c | 1 + .../staging/comedi/drivers/ni_daq_700.c | 10 +- .../drivers/staging/comedi/drivers/ni_labpc.c | 37 +- trunk/drivers/staging/comedi/drivers/pcl812.c | 1 + trunk/drivers/staging/comedi/drivers/pcl816.c | 1 + trunk/drivers/staging/comedi/drivers/pcl818.c | 1 + trunk/drivers/staging/comedi/drivers/rtd520.c | 22 +- .../staging/comedi/drivers/serial2002.c | 45 +- .../drivers/staging/comedi/drivers/unioxx5.c | 46 +- trunk/drivers/staging/comedi/drivers/usbdux.c | 7 +- trunk/drivers/staging/cs5535_gpio/Kconfig | 11 - trunk/drivers/staging/cs5535_gpio/Makefile | 1 - trunk/drivers/staging/cs5535_gpio/TODO | 6 - .../drivers/staging/cs5535_gpio/cs5535_gpio.c | 260 - trunk/drivers/staging/cxd2099/cxd2099.c | 1 - .../staging/cxt1e1/sbecom_inline_linux.h | 1 - trunk/drivers/staging/dt3155v4l/Kconfig | 10 +- trunk/drivers/staging/dt3155v4l/dt3155v4l.c | 486 +- trunk/drivers/staging/dt3155v4l/dt3155v4l.h | 22 +- trunk/drivers/staging/easycap/Kconfig | 32 +- trunk/drivers/staging/easycap/Makefile | 4 +- trunk/drivers/staging/easycap/README | 28 +- trunk/drivers/staging/easycap/easycap.h | 46 - trunk/drivers/staging/easycap/easycap_ioctl.c | 17 +- trunk/drivers/staging/easycap/easycap_main.c | 156 +- .../staging/easycap/easycap_settings.c | 2 +- trunk/drivers/staging/easycap/easycap_sound.c | 35 - .../staging/easycap/easycap_sound_oss.c | 954 -- trunk/drivers/staging/echo/echo.c | 11 +- .../staging/et131x/et1310_address_map.h | 323 +- trunk/drivers/staging/et131x/et1310_mac.c | 265 +- trunk/drivers/staging/et131x/et1310_phy.c | 33 +- trunk/drivers/staging/et131x/et1310_phy.h | 169 +- trunk/drivers/staging/et131x/et1310_pm.c | 4 +- trunk/drivers/staging/et131x/et1310_rx.c | 214 +- trunk/drivers/staging/et131x/et1310_tx.c | 12 +- trunk/drivers/staging/et131x/et131x.h | 4 +- trunk/drivers/staging/et131x/et131x_adapter.h | 21 +- trunk/drivers/staging/et131x/et131x_defs.h | 1 - trunk/drivers/staging/et131x/et131x_initpci.c | 34 +- trunk/drivers/staging/et131x/et131x_isr.c | 20 +- trunk/drivers/staging/et131x/et131x_netdev.c | 139 +- .../staging/ft1000/ft1000-pcmcia/ft1000.conf | 14 - .../staging/ft1000/ft1000-pcmcia/ft1000.h | 480 +- .../staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 190 +- .../staging/ft1000/ft1000-pcmcia/ft1000_dev.h | 66 - .../ft1000/ft1000-pcmcia/ft1000_dnld.c | 561 +- .../staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 224 +- .../ft1000/ft1000-pcmcia/ft1000_proc.c | 26 +- .../staging/ft1000/ft1000-usb/ft1000_ioctl.h | 32 - .../staging/ft1000/ft1000-usb/ft1000_usb.h | 413 +- trunk/drivers/staging/ft1000/ft1000.h | 252 + trunk/drivers/staging/generic_serial/Kconfig | 45 - trunk/drivers/staging/generic_serial/Makefile | 6 - trunk/drivers/staging/generic_serial/TODO | 6 - .../staging/generic_serial/generic_serial.c | 844 - .../staging/generic_serial/rio/Makefile | 12 - .../staging/generic_serial/rio/board.h | 132 - .../staging/generic_serial/rio/cirrus.h | 210 - .../staging/generic_serial/rio/cmdblk.h | 53 - .../staging/generic_serial/rio/cmdpkt.h | 177 - .../staging/generic_serial/rio/daemon.h | 307 - .../staging/generic_serial/rio/errors.h | 98 - .../drivers/staging/generic_serial/rio/func.h | 143 - .../drivers/staging/generic_serial/rio/host.h | 123 - .../drivers/staging/generic_serial/rio/link.h | 96 - .../staging/generic_serial/rio/linux_compat.h | 77 - .../drivers/staging/generic_serial/rio/map.h | 98 - .../staging/generic_serial/rio/param.h | 55 - .../staging/generic_serial/rio/parmmap.h | 81 - .../drivers/staging/generic_serial/rio/pci.h | 72 - .../drivers/staging/generic_serial/rio/phb.h | 142 - .../drivers/staging/generic_serial/rio/pkt.h | 77 - .../drivers/staging/generic_serial/rio/port.h | 179 - .../staging/generic_serial/rio/protsts.h | 110 - .../drivers/staging/generic_serial/rio/rio.h | 208 - .../staging/generic_serial/rio/rio_linux.c | 1204 -- .../staging/generic_serial/rio/rio_linux.h | 197 - .../staging/generic_serial/rio/rioboard.h | 275 - .../staging/generic_serial/rio/rioboot.c | 1113 -- .../staging/generic_serial/rio/riocmd.c | 939 -- .../staging/generic_serial/rio/rioctrl.c | 1504 -- .../staging/generic_serial/rio/riodrvr.h | 138 - .../staging/generic_serial/rio/rioinfo.h | 92 - .../staging/generic_serial/rio/rioinit.c | 421 - .../staging/generic_serial/rio/riointr.c | 645 - .../staging/generic_serial/rio/rioioctl.h | 57 - .../staging/generic_serial/rio/rioparam.c | 663 - .../staging/generic_serial/rio/rioroute.c | 1039 -- .../staging/generic_serial/rio/riospace.h | 154 - .../staging/generic_serial/rio/riotable.c | 941 -- .../staging/generic_serial/rio/riotty.c | 654 - .../staging/generic_serial/rio/route.h | 101 - .../drivers/staging/generic_serial/rio/rup.h | 69 - .../staging/generic_serial/rio/unixrup.h | 51 - .../staging/generic_serial/ser_a2232.c | 831 - .../staging/generic_serial/ser_a2232.h | 202 - .../staging/generic_serial/ser_a2232fw.ax | 529 - .../staging/generic_serial/ser_a2232fw.h | 306 - trunk/drivers/staging/generic_serial/sx.c | 2894 ---- trunk/drivers/staging/generic_serial/sx.h | 201 - .../drivers/staging/generic_serial/sxboards.h | 206 - .../drivers/staging/generic_serial/sxwindow.h | 393 - .../drivers/staging/generic_serial/vme_scc.c | 1145 -- trunk/drivers/staging/gma500/Kconfig | 27 +- trunk/drivers/staging/gma500/Makefile | 48 +- trunk/drivers/staging/gma500/TODO | 29 +- .../staging/gma500/{psb_2d.c => accel_2d.c} | 298 +- trunk/drivers/staging/gma500/backlight.c | 49 + trunk/drivers/staging/gma500/cdv_device.c | 351 + trunk/drivers/staging/gma500/cdv_device.h | 36 + trunk/drivers/staging/gma500/cdv_intel_crt.c | 326 + .../staging/gma500/cdv_intel_display.c | 1508 ++ trunk/drivers/staging/gma500/cdv_intel_hdmi.c | 376 + trunk/drivers/staging/gma500/cdv_intel_lvds.c | 721 + trunk/drivers/staging/gma500/displays/hdmi.h | 33 + .../drivers/staging/gma500/displays/pyr_cmd.h | 34 + .../drivers/staging/gma500/displays/pyr_vid.h | 34 + .../drivers/staging/gma500/displays/tmd_cmd.h | 34 + .../drivers/staging/gma500/displays/tmd_vid.h | 34 + .../drivers/staging/gma500/displays/tpo_cmd.h | 35 + .../drivers/staging/gma500/displays/tpo_vid.h | 33 + .../gma500/{psb_fb.c => framebuffer.c} | 530 +- .../gma500/{psb_fb.h => framebuffer.h} | 11 +- .../staging/gma500/{psb_gem.c => gem.c} | 165 +- trunk/drivers/staging/gma500/gem_glue.c | 110 + trunk/drivers/staging/gma500/gem_glue.h | 4 + .../staging/gma500/{psb_gtt.c => gtt.c} | 247 +- .../staging/gma500/{psb_gtt.h => gtt.h} | 14 +- .../gma500/{psb_intel_bios.c => intel_bios.c} | 25 +- .../gma500/{psb_intel_bios.h => intel_bios.h} | 0 .../gma500/{psb_intel_i2c.c => intel_i2c.c} | 0 ...{psb_intel_opregion.c => intel_opregion.c} | 28 +- trunk/drivers/staging/gma500/mdfld_device.c | 714 + trunk/drivers/staging/gma500/mdfld_dsi_dbi.c | 760 + trunk/drivers/staging/gma500/mdfld_dsi_dbi.h | 176 + .../staging/gma500/mdfld_dsi_dbi_dpu.c | 778 + .../staging/gma500/mdfld_dsi_dbi_dpu.h | 154 + trunk/drivers/staging/gma500/mdfld_dsi_dpi.c | 800 + trunk/drivers/staging/gma500/mdfld_dsi_dpi.h | 78 + .../drivers/staging/gma500/mdfld_dsi_output.c | 1011 ++ .../drivers/staging/gma500/mdfld_dsi_output.h | 138 + .../staging/gma500/mdfld_dsi_pkg_sender.c | 1484 ++ .../staging/gma500/mdfld_dsi_pkg_sender.h | 184 + .../staging/gma500/mdfld_intel_display.c | 1402 ++ trunk/drivers/staging/gma500/mdfld_msic.h | 31 + trunk/drivers/staging/gma500/mdfld_output.c | 170 + trunk/drivers/staging/gma500/mdfld_output.h | 41 + trunk/drivers/staging/gma500/mdfld_pyr_cmd.c | 558 + trunk/drivers/staging/gma500/mdfld_tmd_vid.c | 206 + trunk/drivers/staging/gma500/mdfld_tpo_cmd.c | 509 + trunk/drivers/staging/gma500/mdfld_tpo_vid.c | 140 + trunk/drivers/staging/gma500/medfield.h | 270 + trunk/drivers/staging/gma500/mid_bios.c | 269 + trunk/drivers/staging/gma500/mid_bios.h | 21 + .../staging/gma500/{psb_mmu.c => mmu.c} | 0 trunk/drivers/staging/gma500/mrst.h | 73 +- trunk/drivers/staging/gma500/mrst_crtc.c | 31 +- trunk/drivers/staging/gma500/mrst_device.c | 634 + trunk/drivers/staging/gma500/mrst_hdmi.c | 852 + trunk/drivers/staging/gma500/mrst_hdmi_i2c.c | 327 + trunk/drivers/staging/gma500/mrst_lvds.c | 92 +- .../gma500/{psb_powermgmt.c => power.c} | 237 +- .../gma500/{psb_powermgmt.h => power.h} | 6 +- trunk/drivers/staging/gma500/psb_bl.c | 227 - trunk/drivers/staging/gma500/psb_device.c | 353 + trunk/drivers/staging/gma500/psb_drm.h | 152 +- trunk/drivers/staging/gma500/psb_drv.c | 456 +- trunk/drivers/staging/gma500/psb_drv.h | 494 +- .../staging/gma500/psb_intel_display.c | 171 +- .../staging/gma500/psb_intel_display.h | 3 + trunk/drivers/staging/gma500/psb_intel_drv.h | 24 +- trunk/drivers/staging/gma500/psb_intel_lvds.c | 148 +- trunk/drivers/staging/gma500/psb_intel_reg.h | 1144 +- trunk/drivers/staging/gma500/psb_intel_sdvo.c | 35 +- .../staging/gma500/psb_intel_sdvo_regs.h | 14 +- trunk/drivers/staging/gma500/psb_irq.c | 99 +- trunk/drivers/staging/gma500/psb_irq.h | 8 +- trunk/drivers/staging/gma500/psb_lid.c | 6 +- trunk/drivers/staging/gma500/psb_reg.h | 842 +- trunk/drivers/staging/hv/blkvsc_drv.c | 42 +- trunk/drivers/staging/hv/channel.c | 113 +- trunk/drivers/staging/hv/channel_mgmt.c | 8 +- trunk/drivers/staging/hv/connection.c | 52 +- trunk/drivers/staging/hv/hv.c | 4 +- trunk/drivers/staging/hv/hv_mouse.c | 1 - trunk/drivers/staging/hv/hv_timesource.c | 1 - trunk/drivers/staging/hv/hyperv.h | 86 +- trunk/drivers/staging/hv/hyperv_net.h | 14 +- trunk/drivers/staging/hv/hyperv_vmbus.h | 2 - trunk/drivers/staging/hv/netvsc.c | 173 +- trunk/drivers/staging/hv/netvsc_drv.c | 60 +- trunk/drivers/staging/hv/ring_buffer.c | 6 +- trunk/drivers/staging/hv/rndis_filter.c | 59 +- trunk/drivers/staging/hv/storvsc.c | 8 +- trunk/drivers/staging/hv/storvsc_drv.c | 88 +- trunk/drivers/staging/hv/vmbus_drv.c | 136 +- .../iio/Documentation/sysfs-bus-iio-light | 8 + trunk/drivers/staging/iio/accel/adis16201.h | 12 +- .../staging/iio/accel/adis16201_core.c | 133 +- .../staging/iio/accel/adis16201_ring.c | 8 +- .../staging/iio/accel/adis16201_trigger.c | 11 +- trunk/drivers/staging/iio/accel/adis16203.h | 12 +- .../staging/iio/accel/adis16203_core.c | 85 +- .../staging/iio/accel/adis16203_ring.c | 8 +- .../staging/iio/accel/adis16203_trigger.c | 17 +- trunk/drivers/staging/iio/accel/adis16204.h | 12 +- .../staging/iio/accel/adis16204_core.c | 84 +- .../staging/iio/accel/adis16204_ring.c | 8 +- .../staging/iio/accel/adis16204_trigger.c | 11 +- trunk/drivers/staging/iio/accel/adis16209.h | 12 +- .../staging/iio/accel/adis16209_core.c | 82 +- .../staging/iio/accel/adis16209_ring.c | 8 +- .../staging/iio/accel/adis16209_trigger.c | 17 +- trunk/drivers/staging/iio/accel/adis16220.h | 14 +- .../staging/iio/accel/adis16220_core.c | 105 +- trunk/drivers/staging/iio/accel/adis16240.h | 14 +- .../staging/iio/accel/adis16240_core.c | 82 +- .../staging/iio/accel/adis16240_ring.c | 8 +- .../staging/iio/accel/adis16240_trigger.c | 17 +- trunk/drivers/staging/iio/accel/kxsd9.c | 102 +- .../staging/iio/accel/lis3l02dq_core.c | 2 +- trunk/drivers/staging/iio/accel/sca3000.h | 1 - .../drivers/staging/iio/accel/sca3000_core.c | 100 +- .../drivers/staging/iio/accel/sca3000_ring.c | 14 +- trunk/drivers/staging/iio/adc/Kconfig | 14 + trunk/drivers/staging/iio/adc/Makefile | 1 + trunk/drivers/staging/iio/adc/ad7150.c | 91 +- trunk/drivers/staging/iio/adc/ad7152.c | 73 +- trunk/drivers/staging/iio/adc/ad7291.c | 86 +- trunk/drivers/staging/iio/adc/ad7314.c | 48 +- trunk/drivers/staging/iio/adc/ad7476.h | 5 +- trunk/drivers/staging/iio/adc/ad7476_core.c | 84 +- trunk/drivers/staging/iio/adc/ad7476_ring.c | 10 +- trunk/drivers/staging/iio/adc/ad7745.c | 79 +- trunk/drivers/staging/iio/adc/ad7793.c | 987 ++ trunk/drivers/staging/iio/adc/ad7793.h | 107 + trunk/drivers/staging/iio/adc/ad7816.c | 74 +- trunk/drivers/staging/iio/adc/ad7887_core.c | 3 +- trunk/drivers/staging/iio/adc/ad7887_ring.c | 6 +- trunk/drivers/staging/iio/adc/ad799x_core.c | 13 +- trunk/drivers/staging/iio/adc/ad799x_ring.c | 4 +- trunk/drivers/staging/iio/adc/adt7310.c | 94 +- trunk/drivers/staging/iio/adc/adt7410.c | 86 +- trunk/drivers/staging/iio/adc/adt75.c | 123 +- trunk/drivers/staging/iio/adc/max1363_core.c | 20 +- trunk/drivers/staging/iio/addac/adt7316.c | 224 +- trunk/drivers/staging/iio/dac/Kconfig | 11 + trunk/drivers/staging/iio/dac/Makefile | 1 + trunk/drivers/staging/iio/dac/ad5446.c | 82 +- trunk/drivers/staging/iio/dac/ad5446.h | 2 - trunk/drivers/staging/iio/dac/ad5504.c | 89 +- trunk/drivers/staging/iio/dac/ad5504.h | 2 - trunk/drivers/staging/iio/dac/ad5624r.h | 1 - trunk/drivers/staging/iio/dac/ad5624r_spi.c | 84 +- trunk/drivers/staging/iio/dac/ad5686.c | 497 + trunk/drivers/staging/iio/dac/ad5791.c | 112 +- trunk/drivers/staging/iio/dac/ad5791.h | 2 - trunk/drivers/staging/iio/dac/max517.c | 40 +- trunk/drivers/staging/iio/dds/ad5930.c | 37 +- trunk/drivers/staging/iio/dds/ad9832.c | 69 +- trunk/drivers/staging/iio/dds/ad9832.h | 2 - trunk/drivers/staging/iio/dds/ad9834.c | 81 +- trunk/drivers/staging/iio/dds/ad9834.h | 2 - trunk/drivers/staging/iio/dds/ad9850.c | 37 +- trunk/drivers/staging/iio/dds/ad9852.c | 38 +- trunk/drivers/staging/iio/dds/ad9910.c | 36 +- trunk/drivers/staging/iio/dds/ad9951.c | 36 +- .../drivers/staging/iio/gyro/adis16060_core.c | 59 +- .../drivers/staging/iio/gyro/adis16080_core.c | 48 +- .../drivers/staging/iio/gyro/adis16130_core.c | 50 +- trunk/drivers/staging/iio/gyro/adis16260.h | 18 +- .../drivers/staging/iio/gyro/adis16260_core.c | 100 +- .../drivers/staging/iio/gyro/adis16260_ring.c | 9 +- .../staging/iio/gyro/adis16260_trigger.c | 15 +- trunk/drivers/staging/iio/gyro/adxrs450.h | 13 +- .../drivers/staging/iio/gyro/adxrs450_core.c | 71 +- trunk/drivers/staging/iio/iio.h | 16 + trunk/drivers/staging/iio/imu/adis16400.h | 3 + .../drivers/staging/iio/imu/adis16400_core.c | 50 +- trunk/drivers/staging/iio/industrialio-core.c | 47 +- .../staging/iio/industrialio-trigger.c | 20 +- trunk/drivers/staging/iio/kfifo_buf.c | 2 - trunk/drivers/staging/iio/light/Kconfig | 2 +- trunk/drivers/staging/iio/light/isl29018.c | 197 +- trunk/drivers/staging/iio/light/tsl2563.c | 125 +- .../drivers/staging/iio/magnetometer/ak8975.c | 91 +- .../staging/iio/magnetometer/hmc5843.c | 50 +- trunk/drivers/staging/iio/meter/ade7753.c | 83 +- trunk/drivers/staging/iio/meter/ade7753.h | 10 +- trunk/drivers/staging/iio/meter/ade7754.c | 80 +- trunk/drivers/staging/iio/meter/ade7754.h | 12 +- trunk/drivers/staging/iio/meter/ade7759.c | 80 +- trunk/drivers/staging/iio/meter/ade7759.h | 12 +- trunk/drivers/staging/iio/meter/ade7854-i2c.c | 39 +- trunk/drivers/staging/iio/meter/ade7854-spi.c | 40 +- trunk/drivers/staging/iio/meter/ade7854.c | 76 +- trunk/drivers/staging/iio/meter/ade7854.h | 36 +- trunk/drivers/staging/iio/resolver/Kconfig | 27 - trunk/drivers/staging/iio/resolver/ad2s120x.c | 196 +- trunk/drivers/staging/iio/resolver/ad2s1210.c | 856 +- trunk/drivers/staging/iio/resolver/ad2s1210.h | 17 + trunk/drivers/staging/iio/resolver/ad2s90.c | 48 +- trunk/drivers/staging/iio/trigger.h | 52 +- .../staging/iio/trigger/iio-trig-gpio.c | 2 +- trunk/drivers/staging/intel_sst/intel_sst.c | 5 +- .../intel_sst/intel_sst_app_interface.c | 4 +- .../staging/intel_sst/intel_sst_common.h | 2 + .../intel_sst/intel_sst_drv_interface.c | 10 + .../staging/intel_sst/intelmid_v2_control.c | 2 +- trunk/drivers/staging/keucr/Kconfig | 6 +- trunk/drivers/staging/keucr/Makefile | 2 - trunk/drivers/staging/keucr/init.c | 71 +- trunk/drivers/staging/keucr/init.h | 773 - trunk/drivers/staging/keucr/ms.c | 1034 -- trunk/drivers/staging/keucr/ms.h | 401 - trunk/drivers/staging/keucr/msscsi.c | 344 - trunk/drivers/staging/keucr/transport.c | 4 +- trunk/drivers/staging/keucr/transport.h | 46 - trunk/drivers/staging/keucr/usb.c | 5 +- trunk/drivers/staging/keucr/usb.h | 3 +- trunk/drivers/staging/lirc/lirc_bt829.c | 4 +- trunk/drivers/staging/lirc/lirc_parallel.c | 6 +- trunk/drivers/staging/lirc/lirc_ttusbir.c | 1 - trunk/drivers/staging/lirc/lirc_zilog.c | 2 - trunk/drivers/staging/mei/init.c | 149 +- trunk/drivers/staging/mei/interface.c | 9 +- trunk/drivers/staging/mei/interrupt.c | 47 +- trunk/drivers/staging/mei/iorw.c | 32 +- trunk/drivers/staging/mei/main.c | 39 +- trunk/drivers/staging/mei/mei_dev.h | 123 +- trunk/drivers/staging/mei/wd.c | 18 +- trunk/drivers/staging/msm/Kconfig | 124 - trunk/drivers/staging/msm/Makefile | 88 - trunk/drivers/staging/msm/TODO | 3 - trunk/drivers/staging/msm/ebi2_l2f.c | 569 - trunk/drivers/staging/msm/ebi2_lcd.c | 250 - trunk/drivers/staging/msm/ebi2_tmd20.c | 1122 -- trunk/drivers/staging/msm/hdmi_sii9022.c | 248 - trunk/drivers/staging/msm/lcdc.c | 239 - trunk/drivers/staging/msm/lcdc_external.c | 54 - trunk/drivers/staging/msm/lcdc_gordon.c | 446 - trunk/drivers/staging/msm/lcdc_panel.c | 88 - trunk/drivers/staging/msm/lcdc_prism.c | 64 - .../drivers/staging/msm/lcdc_sharp_wvga_pt.c | 290 - trunk/drivers/staging/msm/lcdc_st15.c | 237 - .../staging/msm/lcdc_toshiba_wvga_pt.c | 374 - trunk/drivers/staging/msm/logo.c | 98 - trunk/drivers/staging/msm/mddi.c | 375 - trunk/drivers/staging/msm/mddi_ext.c | 320 - trunk/drivers/staging/msm/mddi_ext_lcd.c | 91 - trunk/drivers/staging/msm/mddi_prism.c | 114 - trunk/drivers/staging/msm/mddi_sharp.c | 892 -- trunk/drivers/staging/msm/mddi_toshiba.c | 1741 -- trunk/drivers/staging/msm/mddi_toshiba.h | 36 - trunk/drivers/staging/msm/mddi_toshiba_vga.c | 136 - .../staging/msm/mddi_toshiba_wvga_pt.c | 64 - trunk/drivers/staging/msm/mddihost.c | 377 - trunk/drivers/staging/msm/mddihost.h | 207 - trunk/drivers/staging/msm/mddihost_e.c | 63 - trunk/drivers/staging/msm/mddihosti.c | 2239 --- trunk/drivers/staging/msm/mddihosti.h | 531 - trunk/drivers/staging/msm/mdp.c | 1113 -- trunk/drivers/staging/msm/mdp.h | 679 - trunk/drivers/staging/msm/mdp4.h | 336 - trunk/drivers/staging/msm/mdp4_debugfs.c | 175 - trunk/drivers/staging/msm/mdp4_overlay.c | 1259 -- trunk/drivers/staging/msm/mdp4_overlay_lcdc.c | 313 - trunk/drivers/staging/msm/mdp4_overlay_mddi.c | 254 - trunk/drivers/staging/msm/mdp4_util.c | 1686 -- trunk/drivers/staging/msm/mdp_cursor.c | 104 - trunk/drivers/staging/msm/mdp_dma.c | 561 - trunk/drivers/staging/msm/mdp_dma_lcdc.c | 379 - trunk/drivers/staging/msm/mdp_dma_s.c | 139 - trunk/drivers/staging/msm/mdp_dma_tv.c | 142 - trunk/drivers/staging/msm/mdp_hw_init.c | 720 - trunk/drivers/staging/msm/mdp_ppp.c | 1502 -- trunk/drivers/staging/msm/mdp_ppp_dq.c | 347 - trunk/drivers/staging/msm/mdp_ppp_dq.h | 69 - trunk/drivers/staging/msm/mdp_ppp_v20.c | 2486 --- trunk/drivers/staging/msm/mdp_ppp_v31.c | 828 - trunk/drivers/staging/msm/mdp_vsync.c | 389 - trunk/drivers/staging/msm/memory.c | 214 - trunk/drivers/staging/msm/memory_ll.h | 61 - trunk/drivers/staging/msm/msm_fb.c | 2354 --- trunk/drivers/staging/msm/msm_fb.h | 158 - trunk/drivers/staging/msm/msm_fb_bl.c | 79 - trunk/drivers/staging/msm/msm_fb_def.h | 181 - trunk/drivers/staging/msm/msm_fb_panel.c | 136 - trunk/drivers/staging/msm/msm_fb_panel.h | 129 - trunk/drivers/staging/msm/msm_mdp.h | 245 - trunk/drivers/staging/msm/staging-devices.c | 312 - trunk/drivers/staging/msm/tv_ntsc.c | 163 - trunk/drivers/staging/msm/tv_pal.c | 213 - trunk/drivers/staging/msm/tvenc.c | 296 - trunk/drivers/staging/msm/tvenc.h | 101 - trunk/drivers/staging/octeon/ethernet-mdio.c | 27 +- trunk/drivers/staging/octeon/ethernet-rgmii.c | 33 +- trunk/drivers/staging/octeon/ethernet-rx.c | 26 +- trunk/drivers/staging/octeon/ethernet-sgmii.c | 14 +- trunk/drivers/staging/octeon/ethernet-tx.c | 13 +- trunk/drivers/staging/octeon/ethernet-util.h | 4 - trunk/drivers/staging/octeon/ethernet-xaui.c | 22 +- trunk/drivers/staging/panel/panel.c | 1 - .../staging/rtl8187se/ieee80211/ieee80211.h | 1 - .../rtl8187se/ieee80211/ieee80211_crypt.c | 1 - .../ieee80211/ieee80211_crypt_ccmp.c | 1 - .../ieee80211/ieee80211_crypt_tkip.c | 1 - .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 1 - .../rtl8187se/ieee80211/ieee80211_module.c | 1 - .../rtl8187se/ieee80211/ieee80211_softmac.c | 8 +- .../rtl8187se/ieee80211/ieee80211_tx.c | 2 +- trunk/drivers/staging/rtl8192e/dot11d.h | 23 +- .../staging/rtl8192e/ieee80211/ieee80211.h | 1 - .../rtl8192e/ieee80211/ieee80211_crypt.c | 1 - .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 1 - .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 1 - .../rtl8192e/ieee80211/ieee80211_crypt_wep.c | 1 - .../rtl8192e/ieee80211/ieee80211_module.c | 1 - .../staging/rtl8192e/ieee80211/ieee80211_rx.c | 1 - .../rtl8192e/ieee80211/ieee80211_softmac.c | 3 +- .../staging/rtl8192e/ieee80211/ieee80211_tx.c | 3 +- trunk/drivers/staging/rtl8192e/r8192E.h | 1 - trunk/drivers/staging/rtl8192e/r8192E_core.c | 6 + .../staging/rtl8192u/ieee80211/ieee80211.h | 1 - .../rtl8192u/ieee80211/ieee80211_crypt.c | 1 - .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 1 - .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 1 - .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 1 - .../rtl8192u/ieee80211/ieee80211_module.c | 1 - .../staging/rtl8192u/ieee80211/ieee80211_rx.c | 1 - .../rtl8192u/ieee80211/ieee80211_softmac.c | 7 +- .../staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +- trunk/drivers/staging/rtl8192u/r8192U.h | 1 - trunk/drivers/staging/rtl8192u/r8192U_core.c | 4 - trunk/drivers/staging/rtl8712/ieee80211.h | 31 +- trunk/drivers/staging/rtl8712/osdep_service.h | 6 +- trunk/drivers/staging/rtl8712/rtl8712_hal.h | 2 +- trunk/drivers/staging/rtl8712/wifi.h | 7 +- trunk/drivers/staging/rts_pstor/ms.c | 3 +- trunk/drivers/staging/rts_pstor/rtsx.h | 1 - trunk/drivers/staging/rts_pstor/rtsx_chip.c | 6 +- trunk/drivers/staging/rts_pstor/sd.c | 64 +- trunk/drivers/staging/rts_pstor/sd.h | 5 + trunk/drivers/staging/sep/sep_driver.c | 6 +- trunk/drivers/staging/sep/sep_driver_config.h | 2 +- trunk/drivers/staging/solo6x10/solo6x10.h | 2 +- trunk/drivers/staging/speakup/main.c | 1 - trunk/drivers/staging/speakup/speakup.h | 1 - trunk/drivers/staging/speakup/speakup_soft.c | 9 +- trunk/drivers/staging/spectra/lld_nand.c | 18 +- trunk/drivers/staging/ste_rmi4/Makefile | 1 + .../ste_rmi4/board-mop500-u8500uib-rmi4.c | 32 + .../staging/ste_rmi4/synaptics_i2c_rmi4.c | 43 +- .../staging/ste_rmi4/synaptics_i2c_rmi4.h | 2 - .../tidspbridge/include/dspbridge/host_os.h | 3 +- trunk/drivers/staging/tm6000/tm6000-alsa.c | 8 +- trunk/drivers/staging/tm6000/tm6000-cards.c | 7 +- trunk/drivers/staging/tm6000/tm6000-dvb.c | 10 +- trunk/drivers/staging/tm6000/tm6000-i2c.c | 2 +- trunk/drivers/staging/tm6000/tm6000-input.c | 3 +- trunk/drivers/staging/tm6000/tm6000-video.c | 43 +- trunk/drivers/staging/tm6000/tm6000.h | 3 +- trunk/drivers/staging/tty/Kconfig | 87 - trunk/drivers/staging/tty/Makefile | 7 - trunk/drivers/staging/tty/TODO | 6 - trunk/drivers/staging/tty/cd1865.h | 263 - trunk/drivers/staging/tty/digi1.h | 100 - trunk/drivers/staging/tty/digiFep1.h | 136 - trunk/drivers/staging/tty/digiPCI.h | 42 - trunk/drivers/staging/tty/epca.c | 2784 ---- trunk/drivers/staging/tty/epca.h | 158 - trunk/drivers/staging/tty/epcaconfig.h | 7 - trunk/drivers/staging/tty/ip2/Makefile | 8 - trunk/drivers/staging/tty/ip2/i2cmd.c | 210 - trunk/drivers/staging/tty/ip2/i2cmd.h | 630 - trunk/drivers/staging/tty/ip2/i2ellis.c | 1403 -- trunk/drivers/staging/tty/ip2/i2ellis.h | 566 - trunk/drivers/staging/tty/ip2/i2hw.h | 652 - trunk/drivers/staging/tty/ip2/i2lib.c | 2214 --- trunk/drivers/staging/tty/ip2/i2lib.h | 351 - trunk/drivers/staging/tty/ip2/i2pack.h | 364 - trunk/drivers/staging/tty/ip2/ip2.h | 107 - trunk/drivers/staging/tty/ip2/ip2ioctl.h | 35 - trunk/drivers/staging/tty/ip2/ip2main.c | 3234 ---- trunk/drivers/staging/tty/ip2/ip2trace.h | 42 - trunk/drivers/staging/tty/ip2/ip2types.h | 57 - trunk/drivers/staging/tty/istallion.c | 4507 ------ trunk/drivers/staging/tty/riscom8.c | 1560 -- trunk/drivers/staging/tty/riscom8.h | 91 - trunk/drivers/staging/tty/riscom8_reg.h | 254 - trunk/drivers/staging/tty/serial167.c | 2489 --- trunk/drivers/staging/tty/specialix.c | 2368 --- trunk/drivers/staging/tty/specialix_io8.h | 140 - trunk/drivers/staging/tty/stallion.c | 4651 ------ trunk/drivers/staging/usbip/README | 1 + trunk/drivers/staging/usbip/stub.h | 4 +- trunk/drivers/staging/usbip/stub_dev.c | 55 +- trunk/drivers/staging/usbip/stub_main.c | 193 +- trunk/drivers/staging/usbip/stub_rx.c | 6 +- trunk/drivers/staging/usbip/stub_tx.c | 15 +- trunk/drivers/staging/usbip/usbip_common.c | 35 +- trunk/drivers/staging/usbip/usbip_common.h | 238 +- trunk/drivers/staging/usbip/userspace/AUTHORS | 1 + .../staging/usbip/userspace/Makefile.am | 9 +- trunk/drivers/staging/usbip/userspace/README | 298 +- .../staging/usbip/userspace/cleanup.sh | 10 +- .../staging/usbip/userspace/configure.ac | 26 +- .../usbip/userspace/libsrc/Makefile.am | 8 +- .../usbip/userspace/libsrc/stub_driver.c | 391 - .../usbip/userspace/libsrc/stub_driver.h | 36 - .../staging/usbip/userspace/libsrc/usbip.h | 19 - .../usbip/userspace/libsrc/usbip_common.c | 28 +- .../usbip/userspace/libsrc/usbip_common.h | 138 +- .../userspace/libsrc/usbip_host_driver.c | 401 + .../userspace/libsrc/usbip_host_driver.h | 48 + .../usbip/userspace/libsrc/vhci_driver.c | 167 +- .../usbip/userspace/libsrc/vhci_driver.h | 32 +- .../staging/usbip/userspace/src/Makefile.am | 17 +- .../staging/usbip/userspace/src/bind-driver.c | 643 - .../staging/usbip/userspace/src/usbip.c | 817 +- .../staging/usbip/userspace/src/usbip.h | 39 + .../usbip/userspace/src/usbip_attach.c | 228 + .../staging/usbip/userspace/src/usbip_bind.c | 277 + .../usbip/userspace/src/usbip_detach.c | 103 + .../staging/usbip/userspace/src/usbip_list.c | 303 + .../usbip/userspace/src/usbip_network.c | 198 +- .../usbip/userspace/src/usbip_network.h | 94 +- .../usbip/userspace/src/usbip_unbind.c | 186 + .../staging/usbip/userspace/src/usbipd.c | 705 +- .../staging/usbip/userspace/src/utils.c | 283 +- .../staging/usbip/userspace/src/utils.h | 55 +- trunk/drivers/staging/usbip/userspace/usb.ids | 13209 ---------------- trunk/drivers/staging/usbip/vhci.h | 11 +- trunk/drivers/staging/usbip/vhci_hcd.c | 59 +- trunk/drivers/staging/usbip/vhci_rx.c | 2 - trunk/drivers/staging/usbip/vhci_sysfs.c | 6 +- .../staging/vme/boards/vme_vmivme7805.c | 4 +- .../staging/vme/bridges/vme_ca91cx42.c | 19 +- .../drivers/staging/vme/bridges/vme_tsi148.c | 2 +- trunk/drivers/staging/vme/devices/vme_user.c | 53 +- trunk/drivers/staging/vme/devices/vme_user.h | 6 + trunk/drivers/staging/vme/vme.h | 2 +- trunk/drivers/staging/westbridge/Kconfig | 53 - trunk/drivers/staging/westbridge/TODO | 7 - .../staging/westbridge/astoria/Kconfig | 9 - .../staging/westbridge/astoria/Makefile | 11 - .../staging/westbridge/astoria/api/Makefile | 14 - .../westbridge/astoria/api/src/cyasdma.c | 1107 -- .../westbridge/astoria/api/src/cyasintr.c | 143 - .../westbridge/astoria/api/src/cyaslep2pep.c | 358 - .../westbridge/astoria/api/src/cyaslowlevel.c | 1264 -- .../westbridge/astoria/api/src/cyasmisc.c | 3488 ---- .../westbridge/astoria/api/src/cyasmtp.c | 1136 -- .../westbridge/astoria/api/src/cyasstorage.c | 4125 ----- .../westbridge/astoria/api/src/cyasusb.c | 3740 ----- .../arch/arm/mach-omap2/cyashalomap_kernel.c | 2441 --- .../include/mach/westbridge/cyashaldef.h | 55 - .../cyashalomap_kernel.h | 319 - .../westbridge-omap3-pnand-hal/cyasmemmap.h | 558 - .../cyasomapdev_kernel.h | 72 - .../staging/westbridge/astoria/block/Kconfig | 9 - .../staging/westbridge/astoria/block/Makefile | 11 - .../astoria/block/cyasblkdev_block.c | 1631 -- .../astoria/block/cyasblkdev_queue.c | 417 - .../astoria/block/cyasblkdev_queue.h | 64 - .../staging/westbridge/astoria/device/Kconfig | 9 - .../westbridge/astoria/device/Makefile | 23 - .../westbridge/astoria/device/cyasdevice.c | 409 - .../staging/westbridge/astoria/gadget/Kconfig | 9 - .../westbridge/astoria/gadget/Makefile | 11 - .../westbridge/astoria/gadget/cyasgadget.c | 2177 --- .../westbridge/astoria/gadget/cyasgadget.h | 193 - .../astoria/gadget/cyasgadget_ioctl.h | 99 - .../include/linux/westbridge/cyanerr.h | 418 - .../include/linux/westbridge/cyanmedia.h | 59 - .../include/linux/westbridge/cyanmisc.h | 614 - .../include/linux/westbridge/cyanregs.h | 180 - .../include/linux/westbridge/cyansdkversion.h | 30 - .../include/linux/westbridge/cyanstorage.h | 419 - .../include/linux/westbridge/cyantioch.h | 35 - .../include/linux/westbridge/cyantypes.h | 31 - .../include/linux/westbridge/cyanusb.h | 619 - .../include/linux/westbridge/cyas_cplus_end.h | 11 - .../linux/westbridge/cyas_cplus_start.h | 11 - .../include/linux/westbridge/cyascast.h | 35 - .../include/linux/westbridge/cyasdevice.h | 1057 -- .../include/linux/westbridge/cyasdma.h | 375 - .../include/linux/westbridge/cyaserr.h | 1094 -- .../include/linux/westbridge/cyashal.h | 108 - .../include/linux/westbridge/cyashalcb.h | 44 - .../include/linux/westbridge/cyashaldoc.h | 800 - .../include/linux/westbridge/cyasintr.h | 104 - .../include/linux/westbridge/cyaslep2pep.h | 36 - .../include/linux/westbridge/cyaslowlevel.h | 366 - .../include/linux/westbridge/cyasmedia.h | 54 - .../include/linux/westbridge/cyasmisc.h | 1549 -- .../include/linux/westbridge/cyasmisc_dep.h | 53 - .../include/linux/westbridge/cyasmtp.h | 646 - .../include/linux/westbridge/cyasprotocol.h | 3838 ----- .../include/linux/westbridge/cyasregs.h | 201 - .../include/linux/westbridge/cyasstorage.h | 2759 ---- .../linux/westbridge/cyasstorage_dep.h | 309 - .../include/linux/westbridge/cyastoria.h | 36 - .../linux/westbridge/cyastsdkversion.h | 30 - .../include/linux/westbridge/cyastypes.h | 71 - .../include/linux/westbridge/cyasusb.h | 1862 --- .../include/linux/westbridge/cyasusb_dep.h | 224 - trunk/drivers/staging/winbond/mds_s.h | 2 +- .../drivers/staging/winbond/phy_calibration.c | 462 +- trunk/drivers/staging/winbond/wb35reg_s.h | 2 +- .../drivers/staging/wlags49_h2/wl_internal.h | 1 - trunk/drivers/staging/wlags49_h2/wl_version.h | 1 - trunk/drivers/staging/wlan-ng/prism2fw.c | 4 +- trunk/drivers/staging/wlan-ng/prism2sta.c | 1 - trunk/drivers/staging/xgifb/XGI_main_26.c | 1 - trunk/drivers/staging/xgifb/vb_ext.c | 1 - trunk/drivers/staging/xgifb/vb_init.c | 1 - trunk/drivers/staging/xgifb/vb_setmode.c | 1 - trunk/drivers/staging/zcache/tmem.c | 100 +- trunk/drivers/staging/zcache/tmem.h | 23 +- trunk/drivers/staging/zcache/zcache.c | 517 +- trunk/drivers/staging/zram/zram_drv.c | 457 +- trunk/drivers/staging/zram/zram_drv.h | 9 +- trunk/drivers/tty/bfin_jtag_comm.c | 2 +- trunk/drivers/tty/hvc/Kconfig | 5 + trunk/drivers/tty/hvc/Makefile | 3 +- trunk/drivers/tty/hvc/hvc_console.c | 70 +- trunk/drivers/tty/hvc/hvc_console.h | 4 + trunk/drivers/tty/hvc/hvc_vio.c | 408 +- trunk/drivers/tty/hvc/hvsi.c | 129 +- trunk/drivers/tty/hvc/hvsi_lib.c | 426 + trunk/drivers/tty/moxa.c | 5 +- trunk/drivers/tty/mxser.c | 4 +- trunk/drivers/tty/n_gsm.c | 401 +- trunk/drivers/tty/n_tty.c | 2 +- trunk/drivers/tty/rocket.c | 2 +- trunk/drivers/tty/serial/8250.c | 4 +- trunk/drivers/tty/serial/8250_pci.c | 183 +- trunk/drivers/tty/serial/Kconfig | 2 +- trunk/drivers/tty/serial/dz.c | 2 +- trunk/drivers/tty/serial/pch_uart.c | 11 +- trunk/drivers/tty/serial/s5pv210.c | 4 + trunk/drivers/tty/serial/samsung.c | 27 +- trunk/drivers/tty/serial/sb1250-duart.c | 2 +- trunk/drivers/tty/serial/zs.c | 2 +- trunk/drivers/tty/tty_io.c | 4 +- trunk/drivers/uio/uio_pdrv_genirq.c | 43 + trunk/drivers/usb/atm/ueagle-atm.c | 38 +- trunk/drivers/usb/atm/usbatm.c | 4 +- trunk/drivers/usb/class/usblp.c | 7 +- trunk/drivers/usb/core/hcd.c | 17 +- trunk/drivers/usb/gadget/Kconfig | 313 +- trunk/drivers/usb/gadget/Makefile | 2 + trunk/drivers/usb/gadget/amd5536udc.c | 18 +- trunk/drivers/usb/gadget/at91_udc.c | 20 +- trunk/drivers/usb/gadget/atmel_usba_udc.c | 26 +- trunk/drivers/usb/gadget/audio.c | 1 + trunk/drivers/usb/gadget/cdc2.c | 1 + trunk/drivers/usb/gadget/ci13xxx_msm.c | 1 + trunk/drivers/usb/gadget/ci13xxx_udc.c | 62 +- trunk/drivers/usb/gadget/composite.c | 363 +- trunk/drivers/usb/gadget/config.c | 25 - trunk/drivers/usb/gadget/dbgp.c | 10 +- trunk/drivers/usb/gadget/dummy_hcd.c | 1162 +- trunk/drivers/usb/gadget/epautoconf.c | 132 +- trunk/drivers/usb/gadget/ether.c | 1 + trunk/drivers/usb/gadget/f_acm.c | 50 +- trunk/drivers/usb/gadget/f_audio.c | 7 +- trunk/drivers/usb/gadget/f_ecm.c | 152 +- trunk/drivers/usb/gadget/f_eem.c | 90 +- trunk/drivers/usb/gadget/f_fs.c | 3 +- trunk/drivers/usb/gadget/f_hid.c | 22 +- trunk/drivers/usb/gadget/f_loopback.c | 72 +- trunk/drivers/usb/gadget/f_mass_storage.c | 33 +- trunk/drivers/usb/gadget/f_ncm.c | 58 +- trunk/drivers/usb/gadget/f_obex.c | 32 +- trunk/drivers/usb/gadget/f_phonet.c | 17 +- trunk/drivers/usb/gadget/f_rndis.c | 153 +- trunk/drivers/usb/gadget/f_serial.c | 32 +- trunk/drivers/usb/gadget/f_sourcesink.c | 71 +- trunk/drivers/usb/gadget/f_subset.c | 95 +- trunk/drivers/usb/gadget/f_uvc.c | 8 +- trunk/drivers/usb/gadget/file_storage.c | 15 +- trunk/drivers/usb/gadget/fsl_qe_udc.c | 20 +- trunk/drivers/usb/gadget/fsl_udc_core.c | 20 +- trunk/drivers/usb/gadget/fusb300_udc.c | 111 +- trunk/drivers/usb/gadget/g_ffs.c | 1 + trunk/drivers/usb/gadget/gadget_chips.h | 178 +- trunk/drivers/usb/gadget/gmidi.c | 9 +- trunk/drivers/usb/gadget/goku_udc.c | 19 +- trunk/drivers/usb/gadget/hid.c | 1 + trunk/drivers/usb/gadget/imx_udc.c | 20 +- trunk/drivers/usb/gadget/inode.c | 11 +- trunk/drivers/usb/gadget/langwell_udc.c | 32 +- trunk/drivers/usb/gadget/m66592-udc.c | 62 +- trunk/drivers/usb/gadget/m66592-udc.h | 40 +- trunk/drivers/usb/gadget/mass_storage.c | 1 + trunk/drivers/usb/gadget/multi.c | 1 + trunk/drivers/usb/gadget/mv_udc_core.c | 21 +- trunk/drivers/usb/gadget/ncm.c | 1 + trunk/drivers/usb/gadget/net2272.c | 2752 ++++ trunk/drivers/usb/gadget/net2272.h | 601 + trunk/drivers/usb/gadget/net2280.c | 74 +- trunk/drivers/usb/gadget/nokia.c | 1 + trunk/drivers/usb/gadget/omap_udc.c | 22 +- trunk/drivers/usb/gadget/pch_udc.c | 16 +- trunk/drivers/usb/gadget/printer.c | 40 +- trunk/drivers/usb/gadget/pxa25x_udc.c | 19 +- trunk/drivers/usb/gadget/pxa27x_udc.c | 23 +- trunk/drivers/usb/gadget/r8a66597-udc.c | 71 +- trunk/drivers/usb/gadget/r8a66597-udc.h | 2 +- trunk/drivers/usb/gadget/s3c-hsotg.c | 19 +- trunk/drivers/usb/gadget/s3c-hsudc.c | 17 +- trunk/drivers/usb/gadget/s3c2410_udc.c | 60 +- trunk/drivers/usb/gadget/serial.c | 1 + trunk/drivers/usb/gadget/storage_common.c | 2 +- trunk/drivers/usb/gadget/u_ether.c | 24 +- trunk/drivers/usb/gadget/u_ether.h | 4 - trunk/drivers/usb/gadget/u_serial.c | 4 +- trunk/drivers/usb/gadget/u_serial.h | 2 - trunk/drivers/usb/gadget/udc-core.c | 484 + trunk/drivers/usb/gadget/uvc_queue.c | 2 +- trunk/drivers/usb/gadget/webcam.c | 1 + trunk/drivers/usb/gadget/zero.c | 1 + trunk/drivers/usb/host/ehci-hcd.c | 21 +- trunk/drivers/usb/host/ehci-hub.c | 78 +- trunk/drivers/usb/host/ehci-msm.c | 20 +- trunk/drivers/usb/host/ehci-q.c | 85 +- trunk/drivers/usb/host/ehci-s5p.c | 95 + trunk/drivers/usb/host/ehci-sched.c | 17 +- trunk/drivers/usb/host/ehci-sysfs.c | 190 + trunk/drivers/usb/host/ehci.h | 6 +- trunk/drivers/usb/host/ohci-sh.c | 2 +- trunk/drivers/usb/host/pci-quirks.c | 56 +- trunk/drivers/usb/host/r8a66597-hcd.c | 6 +- trunk/drivers/usb/host/r8a66597.h | 38 +- trunk/drivers/usb/host/xhci-dbg.c | 22 +- trunk/drivers/usb/host/xhci-mem.c | 26 +- trunk/drivers/usb/host/xhci-ring.c | 42 +- trunk/drivers/usb/host/xhci.c | 10 +- trunk/drivers/usb/host/xhci.h | 7 + trunk/drivers/usb/image/microtek.c | 2 +- trunk/drivers/usb/misc/appledisplay.c | 2 +- trunk/drivers/usb/mon/mon_text.c | 9 +- trunk/drivers/usb/musb/Kconfig | 75 +- trunk/drivers/usb/musb/Makefile | 4 +- trunk/drivers/usb/musb/am35x.c | 4 - trunk/drivers/usb/musb/blackfin.h | 2 +- trunk/drivers/usb/musb/da8xx.c | 12 +- trunk/drivers/usb/musb/davinci.c | 5 - trunk/drivers/usb/musb/musb_core.c | 133 +- trunk/drivers/usb/musb/musb_core.h | 70 +- trunk/drivers/usb/musb/musb_gadget.c | 102 +- trunk/drivers/usb/musb/musb_gadget_ep0.c | 4 - trunk/drivers/usb/musb/musb_host.h | 4 - trunk/drivers/usb/musb/musb_virthub.c | 6 - trunk/drivers/usb/musb/omap2430.c | 15 +- trunk/drivers/usb/musb/tusb6010.c | 26 +- trunk/drivers/usb/otg/twl6030-usb.c | 30 +- trunk/drivers/usb/renesas_usbhs/Kconfig | 13 +- trunk/drivers/usb/renesas_usbhs/Makefile | 2 +- trunk/drivers/usb/renesas_usbhs/common.c | 34 +- trunk/drivers/usb/renesas_usbhs/common.h | 44 + trunk/drivers/usb/renesas_usbhs/fifo.c | 1016 ++ trunk/drivers/usb/renesas_usbhs/fifo.h | 104 + trunk/drivers/usb/renesas_usbhs/mod_gadget.c | 840 +- trunk/drivers/usb/renesas_usbhs/pipe.c | 298 +- trunk/drivers/usb/renesas_usbhs/pipe.h | 47 +- trunk/drivers/usb/serial/garmin_gps.c | 2 +- trunk/drivers/usb/serial/pl2303.c | 27 +- trunk/drivers/usb/serial/pl2303.h | 4 + trunk/drivers/usb/storage/Kconfig | 8 +- trunk/drivers/usb/storage/ene_ub6250.c | 2003 ++- trunk/drivers/usb/storage/realtek_cr.c | 490 +- trunk/drivers/usb/wusbcore/cbaf.c | 4 +- trunk/drivers/usb/wusbcore/wa-rpipe.c | 2 +- trunk/drivers/usb/wusbcore/wa-xfer.c | 7 +- trunk/drivers/vhost/vhost.h | 2 +- trunk/drivers/video/backlight/Kconfig | 8 + trunk/drivers/video/backlight/Makefile | 1 + trunk/drivers/video/backlight/adp8860_bl.c | 3 +- trunk/drivers/video/backlight/ams369fg06.c | 646 + trunk/drivers/video/backlight/ld9040.c | 17 +- trunk/drivers/video/backlight/s6e63m0.c | 11 +- trunk/drivers/video/sh_mobile_lcdcfb.c | 2 +- trunk/drivers/video/vermilion/vermilion.h | 2 +- trunk/drivers/virt/Kconfig | 32 + trunk/drivers/virt/Makefile | 5 + trunk/drivers/virt/fsl_hypervisor.c | 938 ++ trunk/drivers/w1/masters/matrox_w1.c | 2 +- trunk/drivers/w1/slaves/w1_therm.c | 9 + trunk/drivers/w1/w1.c | 2 +- trunk/drivers/w1/w1_family.h | 3 +- trunk/drivers/watchdog/intel_scu_watchdog.c | 2 +- trunk/drivers/watchdog/sbc7240_wdt.c | 2 +- trunk/drivers/xen/Kconfig | 30 + trunk/drivers/xen/balloon.c | 139 +- trunk/fs/Makefile | 1 - trunk/fs/block_dev.c | 16 +- trunk/fs/btrfs/delayed-inode.h | 2 +- trunk/fs/btrfs/extent_io.c | 2 - trunk/fs/ceph/debugfs.c | 2 +- trunk/fs/ceph/dir.c | 116 +- trunk/fs/ceph/export.c | 24 +- trunk/fs/ceph/file.c | 61 +- trunk/fs/ceph/inode.c | 48 +- trunk/fs/ceph/ioctl.c | 15 +- trunk/fs/ceph/ioctl.h | 1 + trunk/fs/ceph/mds_client.c | 56 +- trunk/fs/ceph/mds_client.h | 3 +- trunk/fs/ceph/snap.c | 25 +- trunk/fs/ceph/super.c | 7 +- trunk/fs/ceph/super.h | 20 +- trunk/fs/ceph/xattr.c | 8 +- trunk/fs/cifs/cifsencrypt.c | 110 +- trunk/fs/cifs/cifsglob.h | 2 +- trunk/fs/cifs/dir.c | 5 - trunk/fs/cifs/link.c | 8 +- trunk/fs/cifs/readdir.c | 427 +- trunk/fs/cifs/smbencrypt.c | 8 +- trunk/fs/compat.c | 246 - trunk/fs/direct-io.c | 2 +- trunk/fs/dlm/plock.c | 10 +- trunk/fs/eventpoll.c | 2 +- trunk/fs/exec.c | 60 +- trunk/fs/ext2/xattr.c | 10 +- trunk/fs/ext3/balloc.c | 38 +- trunk/fs/ext3/file.c | 1 - trunk/fs/ext3/fsync.c | 11 +- trunk/fs/ext3/ialloc.c | 4 + trunk/fs/ext3/inode.c | 193 +- trunk/fs/ext3/ioctl.c | 4 +- trunk/fs/ext3/namei.c | 7 +- trunk/fs/ext3/super.c | 13 + trunk/fs/ext3/xattr.c | 12 +- trunk/fs/ext4/inode.c | 4 +- trunk/fs/file_table.c | 2 +- trunk/fs/fs-writeback.c | 373 +- trunk/fs/fuse/file.c | 2 +- trunk/fs/gfs2/main.c | 2 +- trunk/fs/hugetlbfs/inode.c | 2 +- trunk/fs/inode.c | 5 +- trunk/fs/jbd/checkpoint.c | 37 +- trunk/fs/jbd/commit.c | 57 +- trunk/fs/jbd/journal.c | 99 +- trunk/fs/jbd/transaction.c | 83 +- trunk/fs/lockd/svclock.c | 8 +- trunk/fs/locks.c | 75 +- trunk/fs/namei.c | 4 +- trunk/fs/nfs/cache_lib.h | 2 +- trunk/fs/nfs/direct.c | 2 +- trunk/fs/nfs/write.c | 3 +- trunk/fs/nfsctl.c | 100 - trunk/fs/nfsd/Kconfig | 12 - trunk/fs/nfsd/cache.h | 2 +- trunk/fs/nfsd/export.c | 418 - trunk/fs/nfsd/lockd.c | 2 - trunk/fs/nfsd/nfs4proc.c | 58 +- trunk/fs/nfsd/nfs4state.c | 265 +- trunk/fs/nfsd/nfs4xdr.c | 144 +- trunk/fs/nfsd/nfscache.c | 3 +- trunk/fs/nfsd/nfsctl.c | 343 - trunk/fs/nfsd/nfssvc.c | 33 +- trunk/fs/nfsd/state.h | 1 + trunk/fs/nfsd/xdr4.h | 30 +- trunk/fs/notify/group.c | 2 +- trunk/fs/notify/inode_mark.c | 2 +- trunk/fs/notify/mark.c | 2 +- trunk/fs/notify/notification.c | 2 +- trunk/fs/notify/vfsmount_mark.c | 2 +- trunk/fs/ntfs/inode.h | 2 +- trunk/fs/posix_acl.c | 2 +- trunk/fs/proc/base.c | 23 +- trunk/fs/proc/inode.c | 2 +- trunk/fs/proc/meminfo.c | 2 +- trunk/fs/reiserfs/bitmap.c | 8 +- trunk/fs/reiserfs/resize.c | 6 +- trunk/fs/splice.c | 4 +- trunk/fs/squashfs/Kconfig | 14 +- trunk/fs/squashfs/Makefile | 3 +- trunk/fs/squashfs/decompressor.c | 6 + trunk/fs/squashfs/decompressor.h | 4 + trunk/fs/squashfs/squashfs.h | 3 - trunk/include/acpi/platform/aclinux.h | 2 +- trunk/include/acpi/video.h | 2 + trunk/include/asm-generic/atomic.h | 59 +- .../asm-generic/bitops/ext2-atomic-setbit.h | 11 + .../include/asm-generic/bitops/ext2-atomic.h | 4 + trunk/include/asm-generic/local.h | 2 +- trunk/include/asm-generic/local64.h | 2 +- trunk/include/asm-generic/pci-bridge.h | 62 + trunk/include/asm-generic/system.h | 2 - trunk/include/drm/drmP.h | 11 +- trunk/include/drm/radeon_drm.h | 1 + trunk/include/drm/ttm/ttm_bo_api.h | 3 - trunk/include/drm/ttm/ttm_bo_driver.h | 6 +- trunk/include/drm/ttm/ttm_lock.h | 2 +- trunk/include/drm/ttm/ttm_memory.h | 2 +- trunk/include/drm/ttm/ttm_object.h | 4 +- trunk/include/drm/ttm/ttm_page_alloc.h | 2 +- trunk/include/linux/Kbuild | 1 + trunk/include/linux/aio.h | 2 +- trunk/include/linux/atmdev.h | 2 +- trunk/include/linux/atomic.h | 28 + trunk/include/linux/backing-dev.h | 10 +- trunk/include/linux/bit_spinlock.h | 2 +- trunk/include/linux/bitmap.h | 1 + trunk/include/linux/buffer_head.h | 2 +- trunk/include/linux/ceph/messenger.h | 1 + trunk/include/linux/compat.h | 9 - trunk/include/linux/configfs.h | 2 +- trunk/include/linux/connector.h | 2 +- trunk/include/linux/cpu.h | 33 + trunk/include/linux/cpufreq.h | 5 + trunk/include/linux/cpumask.h | 14 + trunk/include/linux/cred.h | 2 +- trunk/include/linux/crypto.h | 2 +- trunk/include/linux/cs5535.h | 60 + trunk/include/linux/ctype.h | 9 + trunk/include/linux/dcache.h | 2 +- trunk/include/linux/debug_locks.h | 2 +- trunk/include/linux/device.h | 2 +- trunk/include/linux/dma-mapping.h | 21 - trunk/include/linux/edac.h | 2 +- trunk/include/linux/eeprom_93xx46.h | 18 + trunk/include/linux/ext2_fs.h | 1 + trunk/include/linux/ext3_fs.h | 7 +- trunk/include/linux/fault-inject.h | 21 +- trunk/include/linux/fdtable.h | 2 +- trunk/include/linux/filter.h | 2 +- trunk/include/linux/firewire.h | 2 +- trunk/include/linux/fs.h | 12 +- trunk/include/linux/fsl_hypervisor.h | 241 + trunk/include/linux/fsnotify_backend.h | 2 +- trunk/include/linux/gsmmux.h | 11 + trunk/include/linux/hugetlb.h | 3 + trunk/include/linux/i2c-omap.h | 27 + trunk/include/linux/i2c/twl.h | 25 +- trunk/include/linux/interrupt.h | 2 +- trunk/include/linux/ioport.h | 30 + trunk/include/linux/ipc_namespace.h | 7 + trunk/include/linux/jbd.h | 1 - trunk/include/linux/journal-head.h | 2 +- trunk/include/linux/jump_label.h | 2 +- trunk/include/linux/kdb.h | 2 +- trunk/include/linux/kernel.h | 46 +- trunk/include/linux/key.h | 2 +- trunk/include/linux/kgdb.h | 2 +- trunk/include/linux/kobject.h | 2 +- trunk/include/linux/led-lm3530.h | 5 + trunk/include/linux/memcontrol.h | 26 +- trunk/include/linux/memory_hotplug.h | 11 +- .../linux/mfd/pm8xxx/rtc.h} | 20 +- .../mfd/{twl4030-codec.h => twl4030-audio.h} | 16 +- trunk/include/linux/mfd/twl6040.h | 228 + trunk/include/linux/mlx4/device.h | 2 +- trunk/include/linux/mm.h | 19 +- trunk/include/linux/mman.h | 2 +- trunk/include/linux/mmzone.h | 8 +- trunk/include/linux/mount.h | 2 +- trunk/include/linux/mutex.h | 2 +- trunk/include/linux/netdevice.h | 38 +- trunk/include/linux/nfs_fs_sb.h | 2 +- trunk/include/linux/nfsd/export.h | 2 - trunk/include/linux/nodemask.h | 13 + trunk/include/linux/notifier.h | 82 +- trunk/include/linux/oom.h | 4 - trunk/include/linux/oprofile.h | 2 +- trunk/include/linux/page-flags.h | 4 +- trunk/include/linux/pagemap.h | 12 +- trunk/include/linux/pci.h | 2 +- trunk/include/linux/pci_ids.h | 4 + trunk/include/linux/perf_event.h | 2 +- trunk/include/linux/phy.h | 2 +- trunk/include/linux/platform_data/fsa9480.h | 27 + trunk/include/linux/platform_device.h | 1 + trunk/include/linux/poison.h | 6 + trunk/include/linux/proc_fs.h | 2 +- trunk/include/linux/pti.h | 3 +- trunk/include/linux/quota.h | 10 +- trunk/include/linux/ramoops.h | 2 + trunk/include/linux/reboot.h | 5 + trunk/include/linux/reiserfs_fs.h | 2 + trunk/include/linux/rwsem.h | 2 +- trunk/include/linux/sem.h | 2 +- trunk/include/linux/shm.h | 4 + trunk/include/linux/skbuff.h | 2 +- trunk/include/linux/sonet.h | 2 +- trunk/include/linux/spinlock.h | 2 +- trunk/include/linux/splice.h | 2 + trunk/include/linux/sunrpc/auth.h | 2 +- trunk/include/linux/sunrpc/cache.h | 11 +- trunk/include/linux/sunrpc/svc.h | 1 + trunk/include/linux/sunrpc/timer.h | 2 +- trunk/include/linux/suspend.h | 8 + trunk/include/linux/swap.h | 19 +- trunk/include/linux/sysfs.h | 2 +- trunk/include/linux/tty.h | 37 +- trunk/include/linux/usb/composite.h | 32 +- trunk/include/linux/usb/gadget.h | 88 +- trunk/include/linux/usb/m66592.h | 2 + trunk/include/linux/usb/r8a66597.h | 8 +- trunk/include/linux/usb/renesas_usbhs.h | 17 + trunk/include/linux/vmstat.h | 2 +- trunk/include/linux/vt.h | 7 + trunk/include/linux/vt_kern.h | 2 +- trunk/include/linux/workqueue.h | 2 +- trunk/include/linux/writeback.h | 55 +- trunk/include/net/ax25.h | 2 +- trunk/include/net/cipso_ipv4.h | 2 +- trunk/include/net/flow.h | 2 +- trunk/include/net/inet_hashtables.h | 2 +- trunk/include/net/inet_timewait_sock.h | 2 +- trunk/include/net/inetpeer.h | 2 +- trunk/include/net/ip_vs.h | 2 +- trunk/include/net/lib80211.h | 2 +- trunk/include/net/llc.h | 2 +- trunk/include/net/neighbour.h | 2 +- trunk/include/net/net_namespace.h | 2 +- trunk/include/net/netfilter/nf_conntrack.h | 2 +- trunk/include/net/netlabel.h | 2 +- trunk/include/net/netns/conntrack.h | 2 +- trunk/include/net/sctp/structs.h | 2 +- trunk/include/pcmcia/ds.h | 2 +- trunk/include/rdma/ib_sa.h | 2 +- trunk/include/rdma/ib_verbs.h | 2 +- trunk/include/rxrpc/types.h | 2 +- trunk/include/scsi/scsi_device.h | 2 +- trunk/include/trace/events/btrfs.h | 6 +- trunk/include/trace/events/ext3.h | 864 + trunk/include/trace/events/ext4.h | 6 +- trunk/include/trace/events/jbd.h | 203 + trunk/include/trace/events/writeback.h | 183 +- trunk/include/xen/balloon.h | 4 + trunk/init/Kconfig | 4 +- trunk/init/calibrate.c | 11 +- trunk/ipc/ipc_sysctl.c | 36 + trunk/ipc/mqueue.c | 125 +- trunk/ipc/sem.c | 13 +- trunk/ipc/shm.c | 97 +- trunk/kernel/Makefile | 5 +- trunk/kernel/audit.c | 2 +- trunk/kernel/auditsc.c | 2 +- trunk/kernel/cgroup.c | 2 +- trunk/kernel/configs.c | 4 +- trunk/kernel/cpuset.c | 10 +- trunk/kernel/debug/debug_core.c | 2 +- trunk/kernel/exit.c | 1 + trunk/kernel/fork.c | 87 +- trunk/kernel/futex.c | 4 +- trunk/kernel/gcov/Kconfig | 2 +- trunk/kernel/irq/devres.c | 2 +- trunk/kernel/notifier.c | 31 - trunk/kernel/panic.c | 2 + trunk/kernel/rcupdate.c | 2 +- trunk/kernel/rcutorture.c | 2 +- trunk/kernel/rcutree_trace.c | 2 +- trunk/kernel/rwsem.c | 2 +- trunk/kernel/stop_machine.c | 2 +- trunk/kernel/sys.c | 32 +- trunk/kernel/taskstats.c | 2 +- trunk/kernel/trace/trace.h | 2 +- trunk/kernel/trace/trace_mmiotrace.c | 2 +- trunk/lib/atomic64.c | 2 +- trunk/lib/atomic64_test.c | 2 +- trunk/lib/bitmap.c | 2 +- trunk/lib/cpumask.c | 4 +- trunk/lib/crc32.c | 2 +- trunk/lib/dec_and_lock.c | 2 +- trunk/lib/devres.c | 2 +- trunk/lib/fault-inject.c | 144 +- trunk/lib/kstrtox.c | 5 - trunk/lib/lcm.c | 1 + trunk/lib/vsprintf.c | 23 +- trunk/mm/backing-dev.c | 83 +- trunk/mm/dmapool.c | 2 +- trunk/mm/failslab.c | 31 +- trunk/mm/filemap.c | 20 +- trunk/mm/huge_memory.c | 6 +- trunk/mm/hugetlb.c | 41 +- trunk/mm/init-mm.c | 2 +- trunk/mm/kmemleak.c | 2 +- trunk/mm/memblock.c | 8 +- trunk/mm/memcontrol.c | 573 +- trunk/mm/memory.c | 125 +- trunk/mm/memory_hotplug.c | 68 +- trunk/mm/mempolicy.c | 16 + trunk/mm/mmap.c | 34 +- trunk/mm/nommu.c | 34 +- trunk/mm/oom_kill.c | 2 +- trunk/mm/page-writeback.c | 291 +- trunk/mm/page_alloc.c | 109 +- trunk/mm/page_cgroup.c | 10 +- trunk/mm/pagewalk.c | 49 +- trunk/mm/rmap.c | 4 +- trunk/mm/shmem.c | 552 +- trunk/mm/slob.c | 2 +- trunk/mm/sparse.c | 2 +- trunk/mm/thrash.c | 17 +- trunk/mm/truncate.c | 143 +- trunk/mm/vmalloc.c | 2 +- trunk/mm/vmscan.c | 79 +- trunk/net/atm/atm_misc.c | 2 +- trunk/net/atm/clip.c | 2 +- trunk/net/atm/common.c | 2 +- trunk/net/atm/lec.c | 2 +- trunk/net/atm/proc.c | 2 +- trunk/net/bridge/br_fdb.c | 2 +- trunk/net/ceph/messenger.c | 12 +- trunk/net/ceph/osd_client.c | 6 + trunk/net/core/flow.c | 2 +- trunk/net/decnet/dn_fib.c | 2 +- trunk/net/decnet/dn_neigh.c | 2 +- trunk/net/decnet/dn_table.c | 2 +- trunk/net/decnet/dn_timer.c | 2 +- trunk/net/ipv4/cipso_ipv4.c | 2 +- trunk/net/ipv4/raw.c | 2 +- trunk/net/ipv6/ip6_tunnel.c | 2 +- trunk/net/iucv/iucv.c | 2 +- trunk/net/l2tp/l2tp_core.c | 2 +- trunk/net/l2tp/l2tp_ppp.c | 2 +- trunk/net/netfilter/nfnetlink_log.c | 2 +- trunk/net/netfilter/nfnetlink_queue.c | 2 +- trunk/net/netlabel/netlabel_cipso_v4.c | 2 +- trunk/net/netlabel/netlabel_kapi.c | 2 +- trunk/net/netlabel/netlabel_mgmt.c | 2 +- trunk/net/netlabel/netlabel_mgmt.h | 2 +- trunk/net/netlabel/netlabel_unlabeled.c | 2 +- trunk/net/rds/page.c | 1 + trunk/net/sunrpc/auth_gss/gss_krb5_mech.c | 7 + trunk/net/sunrpc/auth_gss/gss_mech_switch.c | 32 +- trunk/net/sunrpc/svc_xprt.c | 11 +- trunk/net/sunrpc/svcauth_unix.c | 79 +- trunk/net/sunrpc/svcsock.c | 2 + trunk/net/sunrpc/xprtrdma/xprt_rdma.h | 2 +- trunk/net/tipc/core.h | 2 +- trunk/scripts/Kbuild.include | 4 + trunk/scripts/Makefile.lib | 40 +- trunk/scripts/Makefile.modpost | 2 +- trunk/scripts/checkpatch.pl | 656 +- trunk/scripts/dtc/Makefile | 28 +- trunk/scripts/dtc/dtc-lexer.lex.c_shipped | 59 +- trunk/scripts/dtc/dtc-parser.tab.c_shipped | 116 +- trunk/scripts/dtc/dtc-parser.tab.h_shipped | 11 +- trunk/scripts/genksyms/.gitignore | 7 +- trunk/scripts/genksyms/Makefile | 48 +- trunk/scripts/genksyms/genksyms.c | 2 +- trunk/scripts/genksyms/keywords.gperf | 3 + ...ords.c_shipped => keywords.hash.c_shipped} | 96 +- trunk/scripts/genksyms/lex.l | 4 +- .../{lex.c_shipped => lex.lex.c_shipped} | 359 +- .../{parse.c_shipped => parse.tab.c_shipped} | 198 +- .../{parse.h_shipped => parse.tab.h_shipped} | 7 +- trunk/scripts/get_maintainer.pl | 9 +- trunk/scripts/headers_install.pl | 1 + trunk/scripts/kconfig/.gitignore | 2 +- trunk/scripts/kconfig/Makefile | 34 +- trunk/scripts/kconfig/lkc.h | 2 - trunk/scripts/kconfig/zconf.gperf | 2 +- trunk/scripts/kconfig/zconf.hash.c_shipped | 273 +- trunk/scripts/kconfig/zconf.l | 8 +- ...ex.zconf.c_shipped => zconf.lex.c_shipped} | 26 +- trunk/scripts/kconfig/zconf.tab.c_shipped | 68 +- trunk/scripts/kconfig/zconf.y | 18 +- trunk/scripts/mkmakefile | 9 +- trunk/scripts/package/Makefile | 8 +- trunk/security/selinux/hooks.c | 2 +- trunk/security/selinux/xfrm.c | 2 +- trunk/sound/pci/echoaudio/darla20.c | 2 +- trunk/sound/pci/echoaudio/darla24.c | 2 +- trunk/sound/pci/echoaudio/echo3g.c | 2 +- trunk/sound/pci/echoaudio/gina20.c | 2 +- trunk/sound/pci/echoaudio/gina24.c | 2 +- trunk/sound/pci/echoaudio/indigo.c | 2 +- trunk/sound/pci/echoaudio/indigodj.c | 2 +- trunk/sound/pci/echoaudio/indigodjx.c | 2 +- trunk/sound/pci/echoaudio/indigoio.c | 2 +- trunk/sound/pci/echoaudio/indigoiox.c | 2 +- trunk/sound/pci/echoaudio/layla20.c | 2 +- trunk/sound/pci/echoaudio/layla24.c | 2 +- trunk/sound/pci/echoaudio/mia.c | 2 +- trunk/sound/pci/echoaudio/mona.c | 2 +- trunk/sound/pci/lx6464es/lx6464es.h | 2 +- trunk/sound/soc/codecs/Kconfig | 3 +- trunk/sound/soc/codecs/twl4030.c | 22 +- trunk/sound/soc/codecs/twl6040.c | 733 +- trunk/sound/soc/codecs/twl6040.h | 119 +- trunk/sound/soc/omap/sdp3430.c | 2 +- trunk/sound/soc/omap/sdp4430.c | 52 +- trunk/sound/soc/omap/zoom2.c | 2 +- trunk/sound/sparc/dbri.c | 2 +- trunk/tools/testing/ktest/ktest.pl | 970 +- trunk/tools/testing/ktest/sample.conf | 142 +- 2550 files changed, 103865 insertions(+), 206120 deletions(-) create mode 100644 trunk/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480 create mode 100644 trunk/Documentation/devicetree/bindings/arm/sirf.txt create mode 100644 trunk/Documentation/devicetree/bindings/arm/xilinx.txt create mode 100644 trunk/Documentation/devicetree/bindings/rtc/olpc-xo1-rtc.txt create mode 100644 trunk/arch/arm/boot/dts/prima2-cb.dts create mode 100644 trunk/arch/arm/boot/dts/zynq-ep107.dts delete mode 100644 trunk/arch/arm/mach-at91/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-bcmring/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-cns3xxx/include/mach/hardware.h delete mode 100644 trunk/arch/arm/mach-davinci/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-ep93xx/include/mach/clkdev.h create mode 100644 trunk/arch/arm/mach-exynos4/dev-dwmci.c create mode 100644 trunk/arch/arm/mach-exynos4/include/mach/dwmci.h create mode 100644 trunk/arch/arm/mach-exynos4/include/mach/pmu.h create mode 100644 trunk/arch/arm/mach-exynos4/include/mach/regs-audss.h delete mode 100644 trunk/arch/arm/mach-exynos4/localtimer.c create mode 100644 trunk/arch/arm/mach-exynos4/pmu.c create mode 100644 trunk/arch/arm/mach-exynos4/setup-fimd0.c delete mode 100644 trunk/arch/arm/mach-exynos4/time.c delete mode 100644 trunk/arch/arm/mach-lpc32xx/include/mach/clkdev.h create mode 100644 trunk/arch/arm/mach-mmp/gplugd.c delete mode 100644 trunk/arch/arm/mach-mmp/include/mach/clkdev.h create mode 100644 trunk/arch/arm/mach-mmp/include/mach/mfp-gplugd.h create mode 100644 trunk/arch/arm/mach-mx5/board-mx53_ard.c create mode 100644 trunk/arch/arm/mach-mx5/pm-imx5.c delete mode 100644 trunk/arch/arm/mach-mxs/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-nomadik/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-nuc93x/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-omap1/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-omap2/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-pnx4008/include/mach/clkdev.h create mode 100644 trunk/arch/arm/mach-prima2/Makefile create mode 100644 trunk/arch/arm/mach-prima2/Makefile.boot create mode 100644 trunk/arch/arm/mach-prima2/clock.c create mode 100644 trunk/arch/arm/mach-prima2/common.h create mode 100644 trunk/arch/arm/mach-prima2/include/mach/clkdev.h create mode 100644 trunk/arch/arm/mach-prima2/include/mach/debug-macro.S create mode 100644 trunk/arch/arm/mach-prima2/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-prima2/include/mach/hardware.h create mode 100644 trunk/arch/arm/mach-prima2/include/mach/io.h create mode 100644 trunk/arch/arm/mach-prima2/include/mach/irqs.h create mode 100644 trunk/arch/arm/mach-prima2/include/mach/map.h create mode 100644 trunk/arch/arm/mach-prima2/include/mach/memory.h create mode 100644 trunk/arch/arm/mach-prima2/include/mach/system.h create mode 100644 trunk/arch/arm/mach-prima2/include/mach/timex.h create mode 100644 trunk/arch/arm/mach-prima2/include/mach/uart.h create mode 100644 trunk/arch/arm/mach-prima2/include/mach/uncompress.h create mode 100644 trunk/arch/arm/mach-prima2/include/mach/vmalloc.h create mode 100644 trunk/arch/arm/mach-prima2/irq.c create mode 100644 trunk/arch/arm/mach-prima2/l2x0.c create mode 100644 trunk/arch/arm/mach-prima2/lluart.c create mode 100644 trunk/arch/arm/mach-prima2/prima2.c create mode 100644 trunk/arch/arm/mach-prima2/rstc.c create mode 100644 trunk/arch/arm/mach-prima2/timer.c delete mode 100644 trunk/arch/arm/mach-pxa/include/mach/clkdev.h create mode 100644 trunk/arch/arm/mach-pxa/include/mach/pxa3xx.h delete mode 100644 trunk/arch/arm/mach-pxa/include/mach/regs-intc.h create mode 100644 trunk/arch/arm/mach-s3c64xx/mach-crag6410.c create mode 100644 trunk/arch/arm/mach-s5p64x0/irq-eint.c create mode 100644 trunk/arch/arm/mach-s5pv210/include/mach/regs-audss.h delete mode 100644 trunk/arch/arm/mach-spear3xx/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-spear6xx/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-tegra/include/mach/barriers.h delete mode 100644 trunk/arch/arm/mach-ux500/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-w90x900/include/mach/clkdev.h create mode 100644 trunk/arch/arm/mach-zynq/Makefile create mode 100644 trunk/arch/arm/mach-zynq/Makefile.boot create mode 100644 trunk/arch/arm/mach-zynq/board_dt.c create mode 100644 trunk/arch/arm/mach-zynq/common.c rename trunk/arch/arm/{mach-tegra/include/mach/hardware.h => mach-zynq/common.h} (58%) create mode 100644 trunk/arch/arm/mach-zynq/include/mach/clkdev.h create mode 100644 trunk/arch/arm/mach-zynq/include/mach/debug-macro.S create mode 100644 trunk/arch/arm/mach-zynq/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-zynq/include/mach/hardware.h create mode 100644 trunk/arch/arm/mach-zynq/include/mach/io.h create mode 100644 trunk/arch/arm/mach-zynq/include/mach/irqs.h create mode 100644 trunk/arch/arm/mach-zynq/include/mach/memory.h rename trunk/arch/arm/{mach-tegra/include/mach/clkdev.h => mach-zynq/include/mach/system.h} (61%) create mode 100644 trunk/arch/arm/mach-zynq/include/mach/timex.h create mode 100644 trunk/arch/arm/mach-zynq/include/mach/uart.h create mode 100644 trunk/arch/arm/mach-zynq/include/mach/uncompress.h create mode 100644 trunk/arch/arm/mach-zynq/include/mach/vmalloc.h create mode 100644 trunk/arch/arm/mach-zynq/include/mach/zynq_soc.h create mode 100644 trunk/arch/arm/mach-zynq/timer.c delete mode 100644 trunk/arch/arm/plat-mxc/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/plat-omap/include/plat/clkdev.h create mode 100644 trunk/arch/arm/plat-s5p/dev-fimd0.c create mode 100644 trunk/arch/arm/plat-s5p/dev-mfc.c create mode 100644 trunk/arch/arm/plat-s5p/include/plat/mfc.h delete mode 100644 trunk/arch/arm/plat-spear/include/plat/clkdev.h delete mode 100644 trunk/arch/arm/plat-tcc/include/mach/clkdev.h delete mode 100644 trunk/arch/m68k/include/asm/bitops_mm.h delete mode 100644 trunk/arch/m68k/include/asm/bitops_no.h delete mode 100644 trunk/arch/m68k/include/asm/delay_mm.h delete mode 100644 trunk/arch/m68k/include/asm/delay_no.h delete mode 100644 trunk/arch/m68k/include/asm/hardirq_mm.h delete mode 100644 trunk/arch/m68k/include/asm/hardirq_no.h delete mode 100644 trunk/arch/m68k/include/asm/system_mm.h delete mode 100644 trunk/arch/m68k/include/asm/system_no.h delete mode 100644 trunk/arch/m68k/kernel/module_mm.c delete mode 100644 trunk/arch/m68k/kernel/module_no.c delete mode 100644 trunk/arch/m68k/lib/delay.c delete mode 100644 trunk/arch/m68k/platform/5206e/Makefile delete mode 100644 trunk/arch/m68k/platform/5206e/config.c delete mode 100644 trunk/arch/m68k/platform/5206e/gpio.c create mode 100644 trunk/arch/mips/include/asm/mach-bcm63xx/spaces.h create mode 100644 trunk/arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h create mode 100644 trunk/arch/mips/include/asm/mach-tx39xx/spaces.h create mode 100644 trunk/arch/mips/include/asm/mach-tx49xx/spaces.h create mode 100644 trunk/arch/mips/netlogic/Platform create mode 100644 trunk/arch/powerpc/boot/dts/p1010rdb.dts create mode 100644 trunk/arch/powerpc/boot/dts/p1010si.dtsi create mode 100644 trunk/arch/powerpc/boot/dts/p1023rds.dts create mode 100644 trunk/arch/powerpc/boot/dts/p2040rdb.dts create mode 100644 trunk/arch/powerpc/boot/dts/p2040si.dtsi create mode 100644 trunk/arch/powerpc/boot/dts/p3041ds.dts create mode 100644 trunk/arch/powerpc/boot/dts/p3041si.dtsi create mode 100644 trunk/arch/powerpc/boot/dts/p4080si.dtsi create mode 100644 trunk/arch/powerpc/boot/dts/p5020ds.dts create mode 100644 trunk/arch/powerpc/boot/dts/p5020si.dtsi create mode 100644 trunk/arch/powerpc/configs/85xx/p1023rds_defconfig create mode 100644 trunk/arch/powerpc/configs/corenet32_smp_defconfig rename trunk/arch/powerpc/configs/{e55xx_smp_defconfig => corenet64_smp_defconfig} (100%) create mode 100644 trunk/arch/powerpc/include/asm/ehv_pic.h create mode 100644 trunk/arch/powerpc/include/asm/epapr_hcalls.h create mode 100644 trunk/arch/powerpc/include/asm/fsl_hcalls.h create mode 100644 trunk/arch/powerpc/include/asm/hvsi.h create mode 100644 trunk/arch/powerpc/include/asm/jump_label.h create mode 100644 trunk/arch/powerpc/kernel/jump_label.c create mode 100644 trunk/arch/powerpc/platforms/85xx/p1010rdb.c create mode 100644 trunk/arch/powerpc/platforms/85xx/p1023_rds.c create mode 100644 trunk/arch/powerpc/platforms/85xx/p2040_rdb.c create mode 100644 trunk/arch/powerpc/sysdev/ehv_pic.c create mode 100644 trunk/arch/sparc/mm/gup.c create mode 100644 trunk/arch/um/sys-i386/mem.c create mode 100644 trunk/arch/um/sys-x86_64/vdso/Makefile create mode 100644 trunk/arch/um/sys-x86_64/vdso/checkundef.sh create mode 100644 trunk/arch/um/sys-x86_64/vdso/um_vdso.c create mode 100644 trunk/arch/um/sys-x86_64/vdso/vdso-layout.lds.S create mode 100644 trunk/arch/um/sys-x86_64/vdso/vdso-note.S create mode 100644 trunk/arch/um/sys-x86_64/vdso/vdso.S create mode 100644 trunk/arch/um/sys-x86_64/vdso/vdso.lds.S create mode 100644 trunk/arch/um/sys-x86_64/vdso/vma.c create mode 100644 trunk/arch/x86/platform/olpc/olpc-xo1-pm.c create mode 100644 trunk/arch/x86/platform/olpc/olpc-xo1-rtc.c create mode 100644 trunk/arch/x86/platform/olpc/olpc-xo1-sci.c delete mode 100644 trunk/arch/x86/platform/olpc/olpc-xo1.c create mode 100644 trunk/arch/x86/platform/olpc/olpc-xo15-sci.c create mode 100644 trunk/arch/x86/platform/olpc/xo1-wakeup.S create mode 100644 trunk/drivers/cpufreq/Kconfig.powerpc create mode 100644 trunk/drivers/cpufreq/maple-cpufreq.c create mode 100644 trunk/drivers/gpu/drm/nouveau/nvc0_graph.fuc create mode 100644 trunk/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc create mode 100644 trunk/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h create mode 100644 trunk/drivers/gpu/drm/nouveau/nvc0_grhub.fuc create mode 100644 trunk/drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h create mode 100644 trunk/drivers/input/misc/twl6040-vibra.c create mode 100644 trunk/drivers/mfd/twl4030-audio.c delete mode 100644 trunk/drivers/mfd/twl4030-codec.c create mode 100644 trunk/drivers/mfd/twl6040-core.c create mode 100644 trunk/drivers/mfd/twl6040-irq.c create mode 100644 trunk/drivers/misc/eeprom/digsy_mtc_eeprom.c create mode 100644 trunk/drivers/misc/eeprom/eeprom_93xx46.c create mode 100644 trunk/drivers/misc/fsa9480.c create mode 100644 trunk/drivers/rtc/rtc-pm8xxx.c delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/README delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/aiutils.c delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/bcmcdc.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux_sched.c delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/dhdioctl.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/dngl_stats.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/hndrte_armtrap.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/hndrte_cons.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/msgtrace.h create mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/sdio_host.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/sdioh.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/sdiovar.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c delete mode 100644 trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.h rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_alloc.c => alloc.c} (51%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_alloc.h => alloc.h} (83%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_ampdu.c => ampdu.c} (77%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_types.h => ampdu.h} (56%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_antsel.c => antsel.c} (73%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_antsel.h => antsel.h} (67%) delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/bcmotp.c delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/bcmsrom.c rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_bmac.c => bmac.c} (73%) create mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/bmac.h rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_channel.c => channel.c} (69%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_channel.h => channel.h} (57%) rename trunk/drivers/staging/brcm80211/brcmsmac/{hnddma.c => dma.c} (70%) rename trunk/drivers/staging/brcm80211/{include/hnddma.h => brcmsmac/dma.h} (61%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wl_mac80211.c => mac80211_if.c} (67%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wl_mac80211.h => mac80211_if.h} (50%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_main.c => main.c} (56%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_main.h => main.h} (52%) create mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/nicpci.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/nvram.c create mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/otp.c rename trunk/drivers/staging/brcm80211/{include/bcmotp.h => brcmsmac/otp.h} (85%) rename trunk/drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_cmn.c => phy_cmn.c} (78%) create mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h rename trunk/drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_int.h => phy_int.h} (66%) rename trunk/drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_lcn.c => phy_lcn.c} (89%) rename trunk/drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_lcn.h => phy_lcn.h} (94%) rename trunk/drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_n.c => phy_n.c} (97%) rename trunk/drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_qmath.c => phy_qmath.c} (99%) rename trunk/drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_qmath.h => phy_qmath.h} (91%) rename trunk/drivers/staging/brcm80211/brcmsmac/phy/{wlc_phy_radio.h => phy_radio.h} (99%) delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_version.h rename trunk/drivers/staging/brcm80211/brcmsmac/phy/{wlc_phyreg_n.h => phyreg_n.h} (96%) rename trunk/drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_lcn.c => phytbl_lcn.c} (96%) rename trunk/drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_lcn.h => phytbl_lcn.h} (50%) rename trunk/drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_n.c => phytbl_n.c} (99%) rename trunk/drivers/staging/brcm80211/brcmsmac/phy/{wlc_phytbl_n.h => phytbl_n.h} (67%) delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h create mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/phy_shim.c create mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/phy_shim.h create mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/pmu.c rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_pmu.h => pmu.h} (53%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_pub.h => pub.h} (58%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_rate.c => rate.c} (76%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_rate.h => rate.h} (70%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_scb.h => scb.h} (84%) rename trunk/drivers/staging/brcm80211/brcmsmac/{bcmsrom_tbl.h => srom.c} (54%) rename trunk/drivers/staging/brcm80211/{include/bcmsrom.h => brcmsmac/srom.h} (82%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wlc_stf.c => stf.c} (70%) create mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/stf.h create mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/types.h rename trunk/drivers/staging/brcm80211/brcmsmac/{wl_ucode_loader.c => ucode_loader.c} (50%) rename trunk/drivers/staging/brcm80211/brcmsmac/{wl_ucode.h => ucode_loader.h} (78%) delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/wl_dbg.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/wl_export.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/wlc_cfg.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/wlc_key.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c delete mode 100644 trunk/drivers/staging/brcm80211/brcmsmac/wlc_stf.h rename trunk/drivers/staging/brcm80211/{util => brcmutil}/Makefile (94%) rename trunk/drivers/staging/brcm80211/{util/bcmutils.c => brcmutil/utils.c} (82%) rename trunk/drivers/staging/brcm80211/{util/bcmwifi.c => brcmutil/wifi.c} (91%) delete mode 100644 trunk/drivers/staging/brcm80211/include/aidmp.h delete mode 100644 trunk/drivers/staging/brcm80211/include/bcmdefs.h delete mode 100644 trunk/drivers/staging/brcm80211/include/bcmdevs.h delete mode 100644 trunk/drivers/staging/brcm80211/include/bcmnvram.h delete mode 100644 trunk/drivers/staging/brcm80211/include/bcmsdh.h delete mode 100644 trunk/drivers/staging/brcm80211/include/bcmsdpcm.h delete mode 100644 trunk/drivers/staging/brcm80211/include/bcmsrom_fmt.h delete mode 100644 trunk/drivers/staging/brcm80211/include/bcmutils.h create mode 100644 trunk/drivers/staging/brcm80211/include/brcm_hw_ids.h create mode 100644 trunk/drivers/staging/brcm80211/include/brcmu_utils.h rename trunk/drivers/staging/brcm80211/include/{bcmwifi.h => brcmu_wifi.h} (65%) create mode 100644 trunk/drivers/staging/brcm80211/include/chipcommon.h create mode 100644 trunk/drivers/staging/brcm80211/include/defs.h delete mode 100644 trunk/drivers/staging/brcm80211/include/hndsoc.h delete mode 100644 trunk/drivers/staging/brcm80211/include/nicpci.h delete mode 100644 trunk/drivers/staging/brcm80211/include/pci_core.h delete mode 100644 trunk/drivers/staging/brcm80211/include/pcicfg.h delete mode 100644 trunk/drivers/staging/brcm80211/include/pcie_core.h delete mode 100644 trunk/drivers/staging/brcm80211/include/proto/802.11.h delete mode 100644 trunk/drivers/staging/brcm80211/include/proto/bcmeth.h delete mode 100644 trunk/drivers/staging/brcm80211/include/proto/bcmevent.h delete mode 100644 trunk/drivers/staging/brcm80211/include/sbchipc.h delete mode 100644 trunk/drivers/staging/brcm80211/include/sbconfig.h delete mode 100644 trunk/drivers/staging/brcm80211/include/sbhnddma.h delete mode 100644 trunk/drivers/staging/brcm80211/include/sbsdio.h delete mode 100644 trunk/drivers/staging/brcm80211/include/sbsdpcmdev.h delete mode 100644 trunk/drivers/staging/brcm80211/include/sdio.h create mode 100644 trunk/drivers/staging/brcm80211/include/soc.h delete mode 100644 trunk/drivers/staging/brcm80211/include/wlioctl.h create mode 100644 trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c delete mode 100644 trunk/drivers/staging/cs5535_gpio/Kconfig delete mode 100644 trunk/drivers/staging/cs5535_gpio/Makefile delete mode 100644 trunk/drivers/staging/cs5535_gpio/TODO delete mode 100644 trunk/drivers/staging/cs5535_gpio/cs5535_gpio.c delete mode 100644 trunk/drivers/staging/easycap/easycap_sound_oss.c delete mode 100644 trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000.conf delete mode 100644 trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h create mode 100644 trunk/drivers/staging/ft1000/ft1000.h delete mode 100644 trunk/drivers/staging/generic_serial/Kconfig delete mode 100644 trunk/drivers/staging/generic_serial/Makefile delete mode 100644 trunk/drivers/staging/generic_serial/TODO delete mode 100644 trunk/drivers/staging/generic_serial/generic_serial.c delete mode 100644 trunk/drivers/staging/generic_serial/rio/Makefile delete mode 100644 trunk/drivers/staging/generic_serial/rio/board.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/cirrus.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/cmdblk.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/cmdpkt.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/daemon.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/errors.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/func.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/host.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/link.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/linux_compat.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/map.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/param.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/parmmap.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/pci.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/phb.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/pkt.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/port.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/protsts.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/rio.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/rio_linux.c delete mode 100644 trunk/drivers/staging/generic_serial/rio/rio_linux.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/rioboard.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/rioboot.c delete mode 100644 trunk/drivers/staging/generic_serial/rio/riocmd.c delete mode 100644 trunk/drivers/staging/generic_serial/rio/rioctrl.c delete mode 100644 trunk/drivers/staging/generic_serial/rio/riodrvr.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/rioinfo.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/rioinit.c delete mode 100644 trunk/drivers/staging/generic_serial/rio/riointr.c delete mode 100644 trunk/drivers/staging/generic_serial/rio/rioioctl.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/rioparam.c delete mode 100644 trunk/drivers/staging/generic_serial/rio/rioroute.c delete mode 100644 trunk/drivers/staging/generic_serial/rio/riospace.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/riotable.c delete mode 100644 trunk/drivers/staging/generic_serial/rio/riotty.c delete mode 100644 trunk/drivers/staging/generic_serial/rio/route.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/rup.h delete mode 100644 trunk/drivers/staging/generic_serial/rio/unixrup.h delete mode 100644 trunk/drivers/staging/generic_serial/ser_a2232.c delete mode 100644 trunk/drivers/staging/generic_serial/ser_a2232.h delete mode 100644 trunk/drivers/staging/generic_serial/ser_a2232fw.ax delete mode 100644 trunk/drivers/staging/generic_serial/ser_a2232fw.h delete mode 100644 trunk/drivers/staging/generic_serial/sx.c delete mode 100644 trunk/drivers/staging/generic_serial/sx.h delete mode 100644 trunk/drivers/staging/generic_serial/sxboards.h delete mode 100644 trunk/drivers/staging/generic_serial/sxwindow.h delete mode 100644 trunk/drivers/staging/generic_serial/vme_scc.c rename trunk/drivers/staging/gma500/{psb_2d.c => accel_2d.c} (61%) create mode 100644 trunk/drivers/staging/gma500/backlight.c create mode 100644 trunk/drivers/staging/gma500/cdv_device.c create mode 100644 trunk/drivers/staging/gma500/cdv_device.h create mode 100644 trunk/drivers/staging/gma500/cdv_intel_crt.c create mode 100644 trunk/drivers/staging/gma500/cdv_intel_display.c create mode 100644 trunk/drivers/staging/gma500/cdv_intel_hdmi.c create mode 100644 trunk/drivers/staging/gma500/cdv_intel_lvds.c create mode 100644 trunk/drivers/staging/gma500/displays/hdmi.h create mode 100644 trunk/drivers/staging/gma500/displays/pyr_cmd.h create mode 100644 trunk/drivers/staging/gma500/displays/pyr_vid.h create mode 100644 trunk/drivers/staging/gma500/displays/tmd_cmd.h create mode 100644 trunk/drivers/staging/gma500/displays/tmd_vid.h create mode 100644 trunk/drivers/staging/gma500/displays/tpo_cmd.h create mode 100644 trunk/drivers/staging/gma500/displays/tpo_vid.h rename trunk/drivers/staging/gma500/{psb_fb.c => framebuffer.c} (67%) rename trunk/drivers/staging/gma500/{psb_fb.h => framebuffer.h} (86%) rename trunk/drivers/staging/gma500/{psb_gem.c => gem.c} (69%) create mode 100644 trunk/drivers/staging/gma500/gem_glue.c create mode 100644 trunk/drivers/staging/gma500/gem_glue.h rename trunk/drivers/staging/gma500/{psb_gtt.c => gtt.c} (69%) rename trunk/drivers/staging/gma500/{psb_gtt.h => gtt.h} (85%) rename trunk/drivers/staging/gma500/{psb_intel_bios.c => intel_bios.c} (95%) rename trunk/drivers/staging/gma500/{psb_intel_bios.h => intel_bios.h} (100%) rename trunk/drivers/staging/gma500/{psb_intel_i2c.c => intel_i2c.c} (100%) rename trunk/drivers/staging/gma500/{psb_intel_opregion.c => intel_opregion.c} (79%) create mode 100644 trunk/drivers/staging/gma500/mdfld_device.c create mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_dbi.c create mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_dbi.h create mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_dbi_dpu.c create mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_dbi_dpu.h create mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_dpi.c create mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_dpi.h create mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_output.c create mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_output.h create mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_pkg_sender.c create mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_pkg_sender.h create mode 100644 trunk/drivers/staging/gma500/mdfld_intel_display.c create mode 100644 trunk/drivers/staging/gma500/mdfld_msic.h create mode 100644 trunk/drivers/staging/gma500/mdfld_output.c create mode 100644 trunk/drivers/staging/gma500/mdfld_output.h create mode 100644 trunk/drivers/staging/gma500/mdfld_pyr_cmd.c create mode 100644 trunk/drivers/staging/gma500/mdfld_tmd_vid.c create mode 100644 trunk/drivers/staging/gma500/mdfld_tpo_cmd.c create mode 100644 trunk/drivers/staging/gma500/mdfld_tpo_vid.c create mode 100644 trunk/drivers/staging/gma500/medfield.h create mode 100644 trunk/drivers/staging/gma500/mid_bios.c create mode 100644 trunk/drivers/staging/gma500/mid_bios.h rename trunk/drivers/staging/gma500/{psb_mmu.c => mmu.c} (100%) create mode 100644 trunk/drivers/staging/gma500/mrst_device.c create mode 100644 trunk/drivers/staging/gma500/mrst_hdmi.c create mode 100644 trunk/drivers/staging/gma500/mrst_hdmi_i2c.c rename trunk/drivers/staging/gma500/{psb_powermgmt.c => power.c} (59%) rename trunk/drivers/staging/gma500/{psb_powermgmt.h => power.h} (94%) delete mode 100644 trunk/drivers/staging/gma500/psb_bl.c create mode 100644 trunk/drivers/staging/gma500/psb_device.c create mode 100644 trunk/drivers/staging/iio/adc/ad7793.c create mode 100644 trunk/drivers/staging/iio/adc/ad7793.h create mode 100644 trunk/drivers/staging/iio/dac/ad5686.c create mode 100644 trunk/drivers/staging/iio/resolver/ad2s1210.h delete mode 100644 trunk/drivers/staging/keucr/ms.c delete mode 100644 trunk/drivers/staging/keucr/ms.h delete mode 100644 trunk/drivers/staging/keucr/msscsi.c delete mode 100644 trunk/drivers/staging/msm/Kconfig delete mode 100644 trunk/drivers/staging/msm/Makefile delete mode 100644 trunk/drivers/staging/msm/TODO delete mode 100644 trunk/drivers/staging/msm/ebi2_l2f.c delete mode 100644 trunk/drivers/staging/msm/ebi2_lcd.c delete mode 100644 trunk/drivers/staging/msm/ebi2_tmd20.c delete mode 100644 trunk/drivers/staging/msm/hdmi_sii9022.c delete mode 100644 trunk/drivers/staging/msm/lcdc.c delete mode 100644 trunk/drivers/staging/msm/lcdc_external.c delete mode 100644 trunk/drivers/staging/msm/lcdc_gordon.c delete mode 100644 trunk/drivers/staging/msm/lcdc_panel.c delete mode 100644 trunk/drivers/staging/msm/lcdc_prism.c delete mode 100644 trunk/drivers/staging/msm/lcdc_sharp_wvga_pt.c delete mode 100644 trunk/drivers/staging/msm/lcdc_st15.c delete mode 100644 trunk/drivers/staging/msm/lcdc_toshiba_wvga_pt.c delete mode 100644 trunk/drivers/staging/msm/logo.c delete mode 100644 trunk/drivers/staging/msm/mddi.c delete mode 100644 trunk/drivers/staging/msm/mddi_ext.c delete mode 100644 trunk/drivers/staging/msm/mddi_ext_lcd.c delete mode 100644 trunk/drivers/staging/msm/mddi_prism.c delete mode 100644 trunk/drivers/staging/msm/mddi_sharp.c delete mode 100644 trunk/drivers/staging/msm/mddi_toshiba.c delete mode 100644 trunk/drivers/staging/msm/mddi_toshiba.h delete mode 100644 trunk/drivers/staging/msm/mddi_toshiba_vga.c delete mode 100644 trunk/drivers/staging/msm/mddi_toshiba_wvga_pt.c delete mode 100644 trunk/drivers/staging/msm/mddihost.c delete mode 100644 trunk/drivers/staging/msm/mddihost.h delete mode 100644 trunk/drivers/staging/msm/mddihost_e.c delete mode 100644 trunk/drivers/staging/msm/mddihosti.c delete mode 100644 trunk/drivers/staging/msm/mddihosti.h delete mode 100644 trunk/drivers/staging/msm/mdp.c delete mode 100644 trunk/drivers/staging/msm/mdp.h delete mode 100644 trunk/drivers/staging/msm/mdp4.h delete mode 100644 trunk/drivers/staging/msm/mdp4_debugfs.c delete mode 100644 trunk/drivers/staging/msm/mdp4_overlay.c delete mode 100644 trunk/drivers/staging/msm/mdp4_overlay_lcdc.c delete mode 100644 trunk/drivers/staging/msm/mdp4_overlay_mddi.c delete mode 100644 trunk/drivers/staging/msm/mdp4_util.c delete mode 100644 trunk/drivers/staging/msm/mdp_cursor.c delete mode 100644 trunk/drivers/staging/msm/mdp_dma.c delete mode 100644 trunk/drivers/staging/msm/mdp_dma_lcdc.c delete mode 100644 trunk/drivers/staging/msm/mdp_dma_s.c delete mode 100644 trunk/drivers/staging/msm/mdp_dma_tv.c delete mode 100644 trunk/drivers/staging/msm/mdp_hw_init.c delete mode 100644 trunk/drivers/staging/msm/mdp_ppp.c delete mode 100644 trunk/drivers/staging/msm/mdp_ppp_dq.c delete mode 100644 trunk/drivers/staging/msm/mdp_ppp_dq.h delete mode 100644 trunk/drivers/staging/msm/mdp_ppp_v20.c delete mode 100644 trunk/drivers/staging/msm/mdp_ppp_v31.c delete mode 100644 trunk/drivers/staging/msm/mdp_vsync.c delete mode 100644 trunk/drivers/staging/msm/memory.c delete mode 100644 trunk/drivers/staging/msm/memory_ll.h delete mode 100644 trunk/drivers/staging/msm/msm_fb.c delete mode 100644 trunk/drivers/staging/msm/msm_fb.h delete mode 100644 trunk/drivers/staging/msm/msm_fb_bl.c delete mode 100644 trunk/drivers/staging/msm/msm_fb_def.h delete mode 100644 trunk/drivers/staging/msm/msm_fb_panel.c delete mode 100644 trunk/drivers/staging/msm/msm_fb_panel.h delete mode 100644 trunk/drivers/staging/msm/msm_mdp.h delete mode 100644 trunk/drivers/staging/msm/staging-devices.c delete mode 100644 trunk/drivers/staging/msm/tv_ntsc.c delete mode 100644 trunk/drivers/staging/msm/tv_pal.c delete mode 100644 trunk/drivers/staging/msm/tvenc.c delete mode 100644 trunk/drivers/staging/msm/tvenc.h create mode 100644 trunk/drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c delete mode 100644 trunk/drivers/staging/tty/Kconfig delete mode 100644 trunk/drivers/staging/tty/Makefile delete mode 100644 trunk/drivers/staging/tty/TODO delete mode 100644 trunk/drivers/staging/tty/cd1865.h delete mode 100644 trunk/drivers/staging/tty/digi1.h delete mode 100644 trunk/drivers/staging/tty/digiFep1.h delete mode 100644 trunk/drivers/staging/tty/digiPCI.h delete mode 100644 trunk/drivers/staging/tty/epca.c delete mode 100644 trunk/drivers/staging/tty/epca.h delete mode 100644 trunk/drivers/staging/tty/epcaconfig.h delete mode 100644 trunk/drivers/staging/tty/ip2/Makefile delete mode 100644 trunk/drivers/staging/tty/ip2/i2cmd.c delete mode 100644 trunk/drivers/staging/tty/ip2/i2cmd.h delete mode 100644 trunk/drivers/staging/tty/ip2/i2ellis.c delete mode 100644 trunk/drivers/staging/tty/ip2/i2ellis.h delete mode 100644 trunk/drivers/staging/tty/ip2/i2hw.h delete mode 100644 trunk/drivers/staging/tty/ip2/i2lib.c delete mode 100644 trunk/drivers/staging/tty/ip2/i2lib.h delete mode 100644 trunk/drivers/staging/tty/ip2/i2pack.h delete mode 100644 trunk/drivers/staging/tty/ip2/ip2.h delete mode 100644 trunk/drivers/staging/tty/ip2/ip2ioctl.h delete mode 100644 trunk/drivers/staging/tty/ip2/ip2main.c delete mode 100644 trunk/drivers/staging/tty/ip2/ip2trace.h delete mode 100644 trunk/drivers/staging/tty/ip2/ip2types.h delete mode 100644 trunk/drivers/staging/tty/istallion.c delete mode 100644 trunk/drivers/staging/tty/riscom8.c delete mode 100644 trunk/drivers/staging/tty/riscom8.h delete mode 100644 trunk/drivers/staging/tty/riscom8_reg.h delete mode 100644 trunk/drivers/staging/tty/serial167.c delete mode 100644 trunk/drivers/staging/tty/specialix.c delete mode 100644 trunk/drivers/staging/tty/specialix_io8.h delete mode 100644 trunk/drivers/staging/tty/stallion.c delete mode 100644 trunk/drivers/staging/usbip/userspace/libsrc/stub_driver.c delete mode 100644 trunk/drivers/staging/usbip/userspace/libsrc/stub_driver.h delete mode 100644 trunk/drivers/staging/usbip/userspace/libsrc/usbip.h create mode 100644 trunk/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c create mode 100644 trunk/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.h delete mode 100644 trunk/drivers/staging/usbip/userspace/src/bind-driver.c create mode 100644 trunk/drivers/staging/usbip/userspace/src/usbip.h create mode 100644 trunk/drivers/staging/usbip/userspace/src/usbip_attach.c create mode 100644 trunk/drivers/staging/usbip/userspace/src/usbip_bind.c create mode 100644 trunk/drivers/staging/usbip/userspace/src/usbip_detach.c create mode 100644 trunk/drivers/staging/usbip/userspace/src/usbip_list.c create mode 100644 trunk/drivers/staging/usbip/userspace/src/usbip_unbind.c delete mode 100644 trunk/drivers/staging/usbip/userspace/usb.ids delete mode 100644 trunk/drivers/staging/westbridge/Kconfig delete mode 100644 trunk/drivers/staging/westbridge/TODO delete mode 100644 trunk/drivers/staging/westbridge/astoria/Kconfig delete mode 100644 trunk/drivers/staging/westbridge/astoria/Makefile delete mode 100644 trunk/drivers/staging/westbridge/astoria/api/Makefile delete mode 100644 trunk/drivers/staging/westbridge/astoria/api/src/cyasdma.c delete mode 100644 trunk/drivers/staging/westbridge/astoria/api/src/cyasintr.c delete mode 100644 trunk/drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c delete mode 100644 trunk/drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c delete mode 100644 trunk/drivers/staging/westbridge/astoria/api/src/cyasmisc.c delete mode 100644 trunk/drivers/staging/westbridge/astoria/api/src/cyasmtp.c delete mode 100644 trunk/drivers/staging/westbridge/astoria/api/src/cyasstorage.c delete mode 100644 trunk/drivers/staging/westbridge/astoria/api/src/cyasusb.c delete mode 100644 trunk/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c delete mode 100644 trunk/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/cyashaldef.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasomapdev_kernel.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/block/Kconfig delete mode 100644 trunk/drivers/staging/westbridge/astoria/block/Makefile delete mode 100644 trunk/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c delete mode 100644 trunk/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c delete mode 100644 trunk/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/device/Kconfig delete mode 100644 trunk/drivers/staging/westbridge/astoria/device/Makefile delete mode 100644 trunk/drivers/staging/westbridge/astoria/device/cyasdevice.c delete mode 100644 trunk/drivers/staging/westbridge/astoria/gadget/Kconfig delete mode 100644 trunk/drivers/staging/westbridge/astoria/gadget/Makefile delete mode 100644 trunk/drivers/staging/westbridge/astoria/gadget/cyasgadget.c delete mode 100644 trunk/drivers/staging/westbridge/astoria/gadget/cyasgadget.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/gadget/cyasgadget_ioctl.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyanerr.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyanmedia.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyanmisc.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyanregs.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyansdkversion.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyanstorage.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyantioch.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyantypes.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyanusb.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyas_cplus_end.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyas_cplus_start.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyascast.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashal.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashalcb.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyaslep2pep.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyaslowlevel.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmedia.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc_dep.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmtp.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasregs.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage_dep.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyastoria.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyastsdkversion.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyastypes.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h delete mode 100644 trunk/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb_dep.h create mode 100644 trunk/drivers/tty/hvc/hvsi_lib.c create mode 100644 trunk/drivers/usb/gadget/net2272.c create mode 100644 trunk/drivers/usb/gadget/net2272.h create mode 100644 trunk/drivers/usb/gadget/udc-core.c create mode 100644 trunk/drivers/usb/host/ehci-sysfs.c create mode 100644 trunk/drivers/usb/renesas_usbhs/fifo.c create mode 100644 trunk/drivers/usb/renesas_usbhs/fifo.h create mode 100644 trunk/drivers/video/backlight/ams369fg06.c create mode 100644 trunk/drivers/virt/Kconfig create mode 100644 trunk/drivers/virt/Makefile create mode 100644 trunk/drivers/virt/fsl_hypervisor.c delete mode 100644 trunk/fs/nfsctl.c create mode 100644 trunk/include/asm-generic/bitops/ext2-atomic-setbit.h create mode 100644 trunk/include/asm-generic/pci-bridge.h create mode 100644 trunk/include/linux/eeprom_93xx46.h create mode 100644 trunk/include/linux/fsl_hypervisor.h rename trunk/{arch/arm/mach-msm/include/mach/clkdev.h => include/linux/mfd/pm8xxx/rtc.h} (55%) rename trunk/include/linux/mfd/{twl4030-codec.h => twl4030-audio.h} (96%) create mode 100644 trunk/include/linux/mfd/twl6040.h create mode 100644 trunk/include/linux/platform_data/fsa9480.h create mode 100644 trunk/include/trace/events/ext3.h create mode 100644 trunk/include/trace/events/jbd.h rename trunk/scripts/genksyms/{keywords.c_shipped => keywords.hash.c_shipped} (94%) rename trunk/scripts/genksyms/{lex.c_shipped => lex.lex.c_shipped} (89%) rename trunk/scripts/genksyms/{parse.c_shipped => parse.tab.c_shipped} (92%) rename trunk/scripts/genksyms/{parse.h_shipped => parse.tab.h_shipped} (96%) rename trunk/scripts/kconfig/{lex.zconf.c_shipped => zconf.lex.c_shipped} (98%) diff --git a/[refs] b/[refs] index 877914d4fcaa..3a73d69cc76a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e57712ebebbb9db7d8dcef216437b3171ddcf115 +refs/heads/master: e371d46ae45488bcb112a99a7de462e9e3aa6764 diff --git a/trunk/.gitignore b/trunk/.gitignore index 9dacde0a4b2d..57af07cf7e68 100644 --- a/trunk/.gitignore +++ b/trunk/.gitignore @@ -45,6 +45,11 @@ modules.builtin /Module.markers /Module.symvers +# +# Debian directory (make deb-pkg) +# +/debian/ + # # git files that we don't want to ignore even it they are dot-files # diff --git a/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj b/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj index cf63f264ce0f..9a3cb88ade47 100644 --- a/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj +++ b/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj @@ -14,7 +14,7 @@ Why: /proc//oom_adj allows userspace to influence the oom killer's A much more powerful interface, /proc//oom_score_adj, was introduced with the oom killer rewrite that allows users to increase or - decrease the badness() score linearly. This interface will replace + decrease the badness score linearly. This interface will replace /proc//oom_adj. A warning will be emitted to the kernel log if an application uses this diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480 b/trunk/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480 new file mode 100644 index 000000000000..9de269bb0ae5 --- /dev/null +++ b/trunk/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480 @@ -0,0 +1,21 @@ +What: /sys/bus/i2c/devices/.../device +Date: February 2011 +Contact: Minkyu Kang +Description: + show what device is attached + NONE - no device + USB - USB device is attached + UART - UART is attached + CHARGER - Charger is attaced + JIG - JIG is attached + +What: /sys/bus/i2c/devices/.../switch +Date: February 2011 +Contact: Minkyu Kang +Description: + show or set the state of manual switch + VAUDIO - switch to VAUDIO path + UART - switch to UART path + AUDIO - switch to AUDIO path + DHOST - switch to DHOST path + AUTO - switch automatically by device diff --git a/trunk/Documentation/ABI/testing/sysfs-module b/trunk/Documentation/ABI/testing/sysfs-module index cfcec3bffc0a..9489ea8e294c 100644 --- a/trunk/Documentation/ABI/testing/sysfs-module +++ b/trunk/Documentation/ABI/testing/sysfs-module @@ -10,3 +10,26 @@ KernelVersion: 2.6.35 Contact: masa-korg@dsn.okisemi.com Description: Write/read Option ROM data. + +What: /sys/module/ehci_hcd/drivers/.../uframe_periodic_max +Date: July 2011 +KernelVersion: 3.1 +Contact: Kirill Smelkov +Description: Maximum time allowed for periodic transfers per microframe (μs) + + [ USB 2.0 sets maximum allowed time for periodic transfers per + microframe to be 80%, that is 100 microseconds out of 125 + microseconds (full microframe). + + However there are cases, when 80% max isochronous bandwidth is + too limiting. For example two video streams could require 110 + microseconds of isochronous bandwidth per microframe to work + together. ] + + Through this setting it is possible to raise the limit so that + the host controller would allow allocating more than 100 + microseconds of periodic bandwidth per microframe. + + Beware, non-standard modes are usually not thoroughly tested by + hardware designers, and the hardware can malfunction when this + setting differ from default 100. diff --git a/trunk/Documentation/DMA-API-HOWTO.txt b/trunk/Documentation/DMA-API-HOWTO.txt index d568bc235bc0..a0b6250add79 100644 --- a/trunk/Documentation/DMA-API-HOWTO.txt +++ b/trunk/Documentation/DMA-API-HOWTO.txt @@ -613,13 +613,13 @@ to use the dma_sync_*() interfaces. pass_to_upper_layers(cp->rx_buf); make_and_setup_new_rx_buf(cp); } else { - /* Just sync the buffer and give it back - * to the card. + /* CPU should not write to + * DMA_FROM_DEVICE-mapped area, + * so dma_sync_single_for_device() is + * not needed here. It would be required + * for DMA_BIDIRECTIONAL mapping if + * the memory was modified. */ - dma_sync_single_for_device(&cp->dev, - cp->rx_dma, - cp->rx_len, - DMA_FROM_DEVICE); give_rx_buf_to_card(cp); } } diff --git a/trunk/Documentation/SubmitChecklist b/trunk/Documentation/SubmitChecklist index 7b13be41c085..dc0e33210d7e 100644 --- a/trunk/Documentation/SubmitChecklist +++ b/trunk/Documentation/SubmitChecklist @@ -53,8 +53,8 @@ kernel patches. 12: Has been tested with CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT, CONFIG_DEBUG_SLAB, CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES, - CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_ATOMIC_SLEEP all simultaneously - enabled. + CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_ATOMIC_SLEEP, CONFIG_PROVE_RCU + and CONFIG_DEBUG_OBJECTS_RCU_HEAD all simultaneously enabled. 13: Has been build- and runtime tested with and without CONFIG_SMP and CONFIG_PREEMPT. diff --git a/trunk/Documentation/cgroups/memory.txt b/trunk/Documentation/cgroups/memory.txt index 06eb6d957c83..6f3c598971fc 100644 --- a/trunk/Documentation/cgroups/memory.txt +++ b/trunk/Documentation/cgroups/memory.txt @@ -380,7 +380,7 @@ will be charged as a new owner of it. 5.2 stat file -memory.stat file includes following statistics +5.2.1 memory.stat file includes following statistics # per-memory cgroup local status cache - # of bytes of page cache memory. @@ -438,6 +438,89 @@ Note: file_mapped is accounted only when the memory cgroup is owner of page cache.) +5.2.2 memory.vmscan_stat + +memory.vmscan_stat includes statistics information for memory scanning and +freeing, reclaiming. The statistics shows memory scanning information since +memory cgroup creation and can be reset to 0 by writing 0 as + + #echo 0 > ../memory.vmscan_stat + +This file contains following statistics. + +[param]_[file_or_anon]_pages_by_[reason]_[under_heararchy] +[param]_elapsed_ns_by_[reason]_[under_hierarchy] + +For example, + + scanned_file_pages_by_limit indicates the number of scanned + file pages at vmscan. + +Now, 3 parameters are supported + + scanned - the number of pages scanned by vmscan + rotated - the number of pages activated at vmscan + freed - the number of pages freed by vmscan + +If "rotated" is high against scanned/freed, the memcg seems busy. + +Now, 2 reason are supported + + limit - the memory cgroup's limit + system - global memory pressure + softlimit + (global memory pressure not under softlimit is not handled now) + +When under_hierarchy is added in the tail, the number indicates the +total memcg scan of its children and itself. + +elapsed_ns is a elapsed time in nanosecond. This may include sleep time +and not indicates CPU usage. So, please take this as just showing +latency. + +Here is an example. + +# cat /cgroup/memory/A/memory.vmscan_stat +scanned_pages_by_limit 9471864 +scanned_anon_pages_by_limit 6640629 +scanned_file_pages_by_limit 2831235 +rotated_pages_by_limit 4243974 +rotated_anon_pages_by_limit 3971968 +rotated_file_pages_by_limit 272006 +freed_pages_by_limit 2318492 +freed_anon_pages_by_limit 962052 +freed_file_pages_by_limit 1356440 +elapsed_ns_by_limit 351386416101 +scanned_pages_by_system 0 +scanned_anon_pages_by_system 0 +scanned_file_pages_by_system 0 +rotated_pages_by_system 0 +rotated_anon_pages_by_system 0 +rotated_file_pages_by_system 0 +freed_pages_by_system 0 +freed_anon_pages_by_system 0 +freed_file_pages_by_system 0 +elapsed_ns_by_system 0 +scanned_pages_by_limit_under_hierarchy 9471864 +scanned_anon_pages_by_limit_under_hierarchy 6640629 +scanned_file_pages_by_limit_under_hierarchy 2831235 +rotated_pages_by_limit_under_hierarchy 4243974 +rotated_anon_pages_by_limit_under_hierarchy 3971968 +rotated_file_pages_by_limit_under_hierarchy 272006 +freed_pages_by_limit_under_hierarchy 2318492 +freed_anon_pages_by_limit_under_hierarchy 962052 +freed_file_pages_by_limit_under_hierarchy 1356440 +elapsed_ns_by_limit_under_hierarchy 351386416101 +scanned_pages_by_system_under_hierarchy 0 +scanned_anon_pages_by_system_under_hierarchy 0 +scanned_file_pages_by_system_under_hierarchy 0 +rotated_pages_by_system_under_hierarchy 0 +rotated_anon_pages_by_system_under_hierarchy 0 +rotated_file_pages_by_system_under_hierarchy 0 +freed_pages_by_system_under_hierarchy 0 +freed_anon_pages_by_system_under_hierarchy 0 +freed_file_pages_by_system_under_hierarchy 0 +elapsed_ns_by_system_under_hierarchy 0 + 5.3 swappiness Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only. diff --git a/trunk/Documentation/devicetree/bindings/arm/sirf.txt b/trunk/Documentation/devicetree/bindings/arm/sirf.txt new file mode 100644 index 000000000000..6b07f65b32de --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/arm/sirf.txt @@ -0,0 +1,3 @@ +prima2 "cb" evalutation board +Required root node properties: + - compatible = "sirf,prima2-cb", "sirf,prima2"; diff --git a/trunk/Documentation/devicetree/bindings/arm/xilinx.txt b/trunk/Documentation/devicetree/bindings/arm/xilinx.txt new file mode 100644 index 000000000000..6f1ed830b4f7 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/arm/xilinx.txt @@ -0,0 +1,7 @@ +Xilinx Zynq EP107 Emulation Platform board + +This board is an emulation platform for the Zynq product which is +based on an ARM Cortex A9 processor. + +Required root node properties: + - compatible = "xlnx,zynq-ep107"; diff --git a/trunk/Documentation/devicetree/bindings/rtc/olpc-xo1-rtc.txt b/trunk/Documentation/devicetree/bindings/rtc/olpc-xo1-rtc.txt new file mode 100644 index 000000000000..a2891ceb6344 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/rtc/olpc-xo1-rtc.txt @@ -0,0 +1,5 @@ +OLPC XO-1 RTC +~~~~~~~~~~~~~ + +Required properties: + - compatible : "olpc,xo1-rtc" diff --git a/trunk/Documentation/driver-model/device.txt b/trunk/Documentation/driver-model/device.txt index b2ff42685bcb..bdefe728a737 100644 --- a/trunk/Documentation/driver-model/device.txt +++ b/trunk/Documentation/driver-model/device.txt @@ -104,4 +104,4 @@ Then in the module init function is would do: And assuming 'dev' is the struct device passed into the probe hook, the driver probe function would do something like: - create_device(&mydriver_class, dev, chrdev, &private_data, "my_name"); + device_create(&mydriver_class, dev, chrdev, &private_data, "my_name"); diff --git a/trunk/Documentation/driver-model/overview.txt b/trunk/Documentation/driver-model/overview.txt index 07236ed968da..6a8f9a8075d8 100644 --- a/trunk/Documentation/driver-model/overview.txt +++ b/trunk/Documentation/driver-model/overview.txt @@ -30,7 +30,7 @@ management, and hot plug. In particular, the model dictated by Intel and Microsoft (namely ACPI) ensures that almost every device on almost any bus on an x86-compatible system can work within this paradigm. Of course, not every bus is able to support all such operations, although most -buses support a most of those operations. +buses support most of those operations. Downstream Access @@ -46,25 +46,29 @@ struct pci_dev now looks like this: struct pci_dev { ... - struct device dev; + struct device dev; /* Generic device interface */ + ... }; -Note first that it is statically allocated. This means only one allocation on -device discovery. Note also that it is at the _end_ of struct pci_dev. This is -to make people think about what they're doing when switching between the bus -driver and the global driver; and to prevent against mindless casts between -the two. +Note first that the struct device dev within the struct pci_dev is +statically allocated. This means only one allocation on device discovery. + +Note also that that struct device dev is not necessarily defined at the +front of the pci_dev structure. This is to make people think about what +they're doing when switching between the bus driver and the global driver, +and to discourage meaningless and incorrect casts between the two. The PCI bus layer freely accesses the fields of struct device. It knows about the structure of struct pci_dev, and it should know the structure of struct device. Individual PCI device drivers that have been converted to the current driver model generally do not and should not touch the fields of struct device, -unless there is a strong compelling reason to do so. +unless there is a compelling reason to do so. -This abstraction is prevention of unnecessary pain during transitional phases. -If the name of the field changes or is removed, then every downstream driver -will break. On the other hand, if only the bus layer (and not the device -layer) accesses struct device, it is only that layer that needs to change. +The above abstraction prevents unnecessary pain during transitional phases. +If it were not done this way, then when a field was renamed or removed, every +downstream driver would break. On the other hand, if only the bus layer +(and not the device layer) accesses the struct device, it is only the bus +layer that needs to change. User Interface @@ -73,15 +77,27 @@ User Interface By virtue of having a complete hierarchical view of all the devices in the system, exporting a complete hierarchical view to userspace becomes relatively easy. This has been accomplished by implementing a special purpose virtual -file system named sysfs. It is hence possible for the user to mount the -whole sysfs filesystem anywhere in userspace. +file system named sysfs. + +Almost all mainstream Linux distros mount this filesystem automatically; you +can see some variation of the following in the output of the "mount" command: + +$ mount +... +none on /sys type sysfs (rw,noexec,nosuid,nodev) +... +$ + +The auto-mounting of sysfs is typically accomplished by an entry similar to +the following in the /etc/fstab file: + +none /sys sysfs defaults 0 0 -This can be done permanently by providing the following entry into the -/etc/fstab (under the provision that the mount point does exist, of course): +or something similar in the /lib/init/fstab file on Debian-based systems: -none /sys sysfs defaults 0 0 +none /sys sysfs nodev,noexec,nosuid 0 0 -Or by hand on the command line: +If sysfs is not automatically mounted, you can always do it manually with: # mount -t sysfs sysfs /sys diff --git a/trunk/Documentation/fb/modedb.txt b/trunk/Documentation/fb/modedb.txt index ec4dee75a354..16aa08453911 100644 --- a/trunk/Documentation/fb/modedb.txt +++ b/trunk/Documentation/fb/modedb.txt @@ -20,7 +20,7 @@ in a video= option, fbmem considers that to be a global video mode option. Valid mode specifiers (mode_option argument): - x[M][R][-][@][i][m] + x[M][R][-][@][i][m][eDd] [-][@] with , , and decimal numbers and a string. @@ -36,6 +36,21 @@ pixels and 1.8% of yres). Sample usage: 1024x768M@60m - CVT timing with margins +DRM drivers also add options to enable or disable outputs: + +'e' will force the display to be enabled, i.e. it will override the detection +if a display is connected. 'D' will force the display to be enabled and use +digital output. This is useful for outputs that have both analog and digital +signals (e.g. HDMI and DVI-I). For other outputs it behaves like 'e'. If 'd' +is specified the output is disabled. + +You can additionally specify which output the options matches to. +To force the VGA output to be enabled and drive a specific mode say: + video=VGA-1:1280x1024@60me + +Specifying the option multiple times for different ports is possible, e.g.: + video=LVDS-1:d video=HDMI-1:D + ***** oOo ***** oOo ***** oOo ***** oOo ***** oOo ***** oOo ***** oOo ***** What is the VESA(TM) Coordinated Video Timings (CVT)? @@ -132,5 +147,5 @@ There may be more modes. tridentfb - Trident (Cyber)blade chipset frame buffer vt8623fb - VIA 8623 frame buffer -BTW, only a few drivers use this at the moment. Others are to follow -(feel free to send patches). +BTW, only a few fb drivers use this at the moment. Others are to follow +(feel free to send patches). The DRM drivers also support this. diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index c8616f741746..dfd6a9f4a583 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -184,7 +184,7 @@ Why: /proc//oom_adj allows userspace to influence the oom killer's A much more powerful interface, /proc//oom_score_adj, was introduced with the oom killer rewrite that allows users to increase or - decrease the badness() score linearly. This interface will replace + decrease the badness score linearly. This interface will replace /proc//oom_adj. A warning will be emitted to the kernel log if an application uses this @@ -193,20 +193,6 @@ Why: /proc//oom_adj allows userspace to influence the oom killer's --------------------------- -What: CS5535/CS5536 obsolete GPIO driver -When: June 2011 -Files: drivers/staging/cs5535_gpio/* -Check: drivers/staging/cs5535_gpio/cs5535_gpio.c -Why: A newer driver replaces this; it is drivers/gpio/cs5535-gpio.c, and - integrates with the Linux GPIO subsystem. The old driver has been - moved to staging, and will be removed altogether around 3.0. - Please test the new driver, and ensure that the functionality you - need and any bugfixes from the old driver are available in the new - one. -Who: Andres Salomon - --------------------------- - What: remove EXPORT_SYMBOL(kernel_thread) When: August 2006 Files: arch/*/kernel/*_ksyms.c @@ -474,13 +460,6 @@ Who: FUJITA Tomonori ---------------------------- -What: DMA_xxBIT_MASK macros -When: Jun 2011 -Why: DMA_xxBIT_MASK macros were replaced with DMA_BIT_MASK() macros. -Who: FUJITA Tomonori - ----------------------------- - What: iwlwifi disable_hw_scan module parameters When: 3.0 Why: Hareware scan is the prefer method for iwlwifi devices for @@ -491,16 +470,6 @@ Who: Wey-Yi Guy ---------------------------- -What: access to nfsd auth cache through sys_nfsservctl or '.' files - in the 'nfsd' filesystem. -When: 3.0 -Why: This is a legacy interface which have been replaced by a more - dynamic cache. Continuing to maintain this interface is an - unnecessary burden. -Who: NeilBrown - ----------------------------- - What: Legacy, non-standard chassis intrusion detection interface. When: June 2011 Why: The adm9240, w83792d and w83793 hardware monitoring drivers have @@ -518,22 +487,6 @@ Files: net/netfilter/xt_connlimit.c ---------------------------- -What: noswapaccount kernel command line parameter -When: 3.0 -Why: The original implementation of memsw feature enabled by - CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount - kernel parameter (introduced in 2.6.29-rc1). Later on, this decision - turned out to be not ideal because we cannot have the feature compiled - in and disabled by default and let only interested to enable it - (e.g. general distribution kernels might need it). Therefore we have - added swapaccount[=0|1] parameter (introduced in 2.6.37) which provides - the both possibilities. If we remove noswapaccount we will have - less command line parameters with the same functionality and we - can also cleanup the parameter handling a bit (). -Who: Michal Hocko - ----------------------------- - What: ipt_addrtype match include file When: 2012 Why: superseded by xt_addrtype @@ -595,3 +548,10 @@ Why: Just opening a V4L device should not change the state of the hardware Who: Hans Verkuil ---------------------------- + +What: g_file_storage driver +When: 3.8 +Why: This driver has been superseded by g_mass_storage. +Who: Alan Stern + +---------------------------- diff --git a/trunk/Documentation/filesystems/Locking b/trunk/Documentation/filesystems/Locking index 7e4699146fe1..653380793a6c 100644 --- a/trunk/Documentation/filesystems/Locking +++ b/trunk/Documentation/filesystems/Locking @@ -338,21 +338,21 @@ fl_release_private: maybe no ----------------------- lock_manager_operations --------------------------- prototypes: - int (*fl_compare_owner)(struct file_lock *, struct file_lock *); - void (*fl_notify)(struct file_lock *); /* unblock callback */ - int (*fl_grant)(struct file_lock *, struct file_lock *, int); - void (*fl_release_private)(struct file_lock *); - void (*fl_break)(struct file_lock *); /* break_lease callback */ - int (*fl_change)(struct file_lock **, int); + int (*lm_compare_owner)(struct file_lock *, struct file_lock *); + void (*lm_notify)(struct file_lock *); /* unblock callback */ + int (*lm_grant)(struct file_lock *, struct file_lock *, int); + void (*lm_release_private)(struct file_lock *); + void (*lm_break)(struct file_lock *); /* break_lease callback */ + int (*lm_change)(struct file_lock **, int); locking rules: file_lock_lock may block -fl_compare_owner: yes no -fl_notify: yes no -fl_grant: no no -fl_release_private: maybe no -fl_break: yes no -fl_change yes no +lm_compare_owner: yes no +lm_notify: yes no +lm_grant: no no +lm_release_private: maybe no +lm_break: yes no +lm_change yes no --------------------------- buffer_head ----------------------------------- prototypes: diff --git a/trunk/Documentation/filesystems/debugfs.txt b/trunk/Documentation/filesystems/debugfs.txt index ed52af60c2d8..742cc06e138f 100644 --- a/trunk/Documentation/filesystems/debugfs.txt +++ b/trunk/Documentation/filesystems/debugfs.txt @@ -73,8 +73,8 @@ the following functions can be used instead: struct dentry *parent, u16 *value); struct dentry *debugfs_create_x32(const char *name, mode_t mode, struct dentry *parent, u32 *value); - -Note that there is no debugfs_create_x64(). + struct dentry *debugfs_create_x64(const char *name, mode_t mode, + struct dentry *parent, u64 *value); These functions are useful as long as the developer knows the size of the value to be exported. Some types can have different widths on different diff --git a/trunk/Documentation/filesystems/ext3.txt b/trunk/Documentation/filesystems/ext3.txt index 272f80d5f966..22f3a0eda1d2 100644 --- a/trunk/Documentation/filesystems/ext3.txt +++ b/trunk/Documentation/filesystems/ext3.txt @@ -147,15 +147,6 @@ grpjquota= during journal replay. They replace the above package for more details (http://sourceforge.net/projects/linuxquota). -bh (*) ext3 associates buffer heads to data pages to -nobh (a) cache disk block mapping information - (b) link pages into transaction to provide - ordering guarantees. - "bh" option forces use of buffer heads. - "nobh" option tries to avoid associating buffer - heads (supported only for "writeback" mode). - - Specification ============= Ext3 shares all disk implementation with the ext2 filesystem, and adds @@ -227,5 +218,5 @@ kernel source: programs: http://e2fsprogs.sourceforge.net/ http://ext2resize.sourceforge.net -useful links: http://www.ibm.com/developerworks/library/l-fs7.html - http://www.ibm.com/developerworks/library/l-fs8.html +useful links: http://www.ibm.com/developerworks/library/l-fs7/index.html + http://www.ibm.com/developerworks/library/l-fs8/index.html diff --git a/trunk/Documentation/filesystems/ext4.txt b/trunk/Documentation/filesystems/ext4.txt index 3ae9bc94352a..232a575a0c48 100644 --- a/trunk/Documentation/filesystems/ext4.txt +++ b/trunk/Documentation/filesystems/ext4.txt @@ -68,12 +68,12 @@ Note: More extensive information for getting started with ext4 can be '-o barriers=[0|1]' mount option for both ext3 and ext4 filesystems for a fair comparison. When tuning ext3 for best benchmark numbers, it is often worthwhile to try changing the data journaling mode; '-o - data=writeback,nobh' can be faster for some workloads. (Note - however that running mounted with data=writeback can potentially - leave stale data exposed in recently written files in case of an - unclean shutdown, which could be a security exposure in some - situations.) Configuring the filesystem with a large journal can - also be helpful for metadata-intensive workloads. + data=writeback' can be faster for some workloads. (Note however that + running mounted with data=writeback can potentially leave stale data + exposed in recently written files in case of an unclean shutdown, + which could be a security exposure in some situations.) Configuring + the filesystem with a large journal can also be helpful for + metadata-intensive workloads. 2. Features =========== @@ -272,14 +272,6 @@ grpjquota= during journal replay. They replace the above package for more details (http://sourceforge.net/projects/linuxquota). -bh (*) ext4 associates buffer heads to data pages to -nobh (a) cache disk block mapping information - (b) link pages into transaction to provide - ordering guarantees. - "bh" option forces use of buffer heads. - "nobh" option tries to avoid associating buffer - heads (supported only for "writeback" mode). - stripe=n Number of filesystem blocks that mballoc will try to use for allocation size and alignment. For RAID5/6 systems this should be the number of data @@ -393,8 +385,7 @@ dioread_nolock locking. If the dioread_nolock option is specified write and convert the extent to initialized after IO completes. This approach allows ext4 code to avoid using inode mutex, which improves scalability on high - speed storages. However this does not work with nobh - option and the mount will fail. Nor does it work with + speed storages. However this does not work with data journaling and dioread_nolock option will be ignored with kernel warning. Note that dioread_nolock code path is only used for extent-based files. diff --git a/trunk/Documentation/filesystems/nfs/nfs41-server.txt b/trunk/Documentation/filesystems/nfs/nfs41-server.txt index 04884914a1c8..092fad92a3f0 100644 --- a/trunk/Documentation/filesystems/nfs/nfs41-server.txt +++ b/trunk/Documentation/filesystems/nfs/nfs41-server.txt @@ -39,27 +39,17 @@ interoperability problems with future clients. Known issues: from a linux client are possible, but we aren't really conformant with the spec (for example, we don't use kerberos on the backchannel correctly). - - no trunking support: no clients currently take advantage of - trunking, but this is a mandatory feature, and its use is - recommended to clients in a number of places. (E.g. to ensure - timely renewal in case an existing connection's retry timeouts - have gotten too long; see section 8.3 of the RFC.) - Therefore, lack of this feature may cause future clients to - fail. - Incomplete backchannel support: incomplete backchannel gss support and no support for BACKCHANNEL_CTL mean that callbacks (hence delegations and layouts) may not be available and clients confused by the incomplete implementation may fail. - - Server reboot recovery is unsupported; if the server reboots, - clients may fail. - We do not support SSV, which provides security for shared client-server state (thus preventing unauthorized tampering with locks and opens, for example). It is mandatory for servers to support this, though no clients use it yet. - Mandatory operations which we do not support, such as - DESTROY_CLIENTID, FREE_STATEID, SECINFO_NO_NAME, and - TEST_STATEID, are not currently used by clients, but will be + DESTROY_CLIENTID, are not currently used by clients, but will be (and the spec recommends their uses in common cases), and clients should not be expected to know how to recover from the case where they are not supported. This will eventually cause @@ -69,8 +59,9 @@ In addition, some limitations are inherited from the current NFSv4 implementation: - Incomplete delegation enforcement: if a file is renamed or - unlinked, a client holding a delegation may continue to - indefinitely allow opens of the file under the old name. + unlinked by a local process, a client holding a delegation may + continue to indefinitely allow opens of the file under the old + name. The table below, taken from the NFSv4.1 document, lists the operations that are mandatory to implement (REQ), optional @@ -99,7 +90,7 @@ Operations +----------------------+------------+--------------+----------------+ | ACCESS | REQ | | Section 18.1 | NS | BACKCHANNEL_CTL | REQ | | Section 18.33 | -NS | BIND_CONN_TO_SESSION | REQ | | Section 18.34 | +I | BIND_CONN_TO_SESSION | REQ | | Section 18.34 | | CLOSE | REQ | | Section 18.2 | | COMMIT | REQ | | Section 18.3 | | CREATE | REQ | | Section 18.4 | @@ -111,7 +102,7 @@ NS*| DELEGPURGE | OPT | FDELG (REQ) | Section 18.5 | NS | DESTROY_CLIENTID | REQ | | Section 18.50 | I | DESTROY_SESSION | REQ | | Section 18.37 | I | EXCHANGE_ID | REQ | | Section 18.35 | -NS | FREE_STATEID | REQ | | Section 18.38 | +I | FREE_STATEID | REQ | | Section 18.38 | | GETATTR | REQ | | Section 18.7 | P | GETDEVICEINFO | OPT | pNFS (REQ) | Section 18.40 | P | GETDEVICELIST | OPT | pNFS (OPT) | Section 18.41 | @@ -145,14 +136,14 @@ NS*| OPENATTR | OPT | | Section 18.17 | | RESTOREFH | REQ | | Section 18.27 | | SAVEFH | REQ | | Section 18.28 | | SECINFO | REQ | | Section 18.29 | -NS | SECINFO_NO_NAME | REC | pNFS files | Section 18.45, | +I | SECINFO_NO_NAME | REC | pNFS files | Section 18.45, | | | | layout (REQ) | Section 13.12 | I | SEQUENCE | REQ | | Section 18.46 | | SETATTR | REQ | | Section 18.30 | | SETCLIENTID | MNI | | N/A | | SETCLIENTID_CONFIRM | MNI | | N/A | NS | SET_SSV | REQ | | Section 18.47 | -NS | TEST_STATEID | REQ | | Section 18.48 | +I | TEST_STATEID | REQ | | Section 18.48 | | VERIFY | REQ | | Section 18.31 | NS*| WANT_DELEGATION | OPT | FDELG (OPT) | Section 18.49 | | WRITE | REQ | | Section 18.32 | @@ -206,12 +197,6 @@ CREATE_SESSION: SEQUENCE: * no support for dynamic slot table renegotiation (optional) -nfsv4.1 COMPOUND rules: -The following cases aren't supported yet: -* Enforcing of NFS4ERR_NOT_ONLY_OP for: BIND_CONN_TO_SESSION, CREATE_SESSION, - DESTROY_CLIENTID, DESTROY_SESSION, EXCHANGE_ID. -* DESTROY_SESSION MUST be the final operation in the COMPOUND request. - Nonstandard compound limitations: * No support for a sessions fore channel RPC compound that requires both a ca_maxrequestsize request and a ca_maxresponsesize reply, so we may @@ -219,3 +204,5 @@ Nonstandard compound limitations: negotiation. * No more than one IO operation (read, write, readdir) allowed per compound. + +See also http://wiki.linux-nfs.org/wiki/index.php/Server_4.0_and_4.1_issues. diff --git a/trunk/Documentation/filesystems/squashfs.txt b/trunk/Documentation/filesystems/squashfs.txt index d4d41465a0b1..7db3ebda5a4c 100644 --- a/trunk/Documentation/filesystems/squashfs.txt +++ b/trunk/Documentation/filesystems/squashfs.txt @@ -2,7 +2,7 @@ SQUASHFS 4.0 FILESYSTEM ======================= Squashfs is a compressed read-only filesystem for Linux. -It uses zlib/lzo compression to compress files, inodes and directories. +It uses zlib/lzo/xz compression to compress files, inodes and directories. Inodes in the system are very small and all blocks are packed to minimise data overhead. Block sizes greater than 4K are supported up to a maximum of 1Mbytes (default block size 128K). @@ -55,6 +55,8 @@ create populated squashfs filesystems. This and other squashfs utilities can be obtained from http://www.squashfs.org. Usage instructions can be obtained from this site also. +The squashfs-tools development tree is now located on kernel.org + git://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git 3. SQUASHFS FILESYSTEM DESIGN ----------------------------- diff --git a/trunk/Documentation/ioctl/ioctl-number.txt b/trunk/Documentation/ioctl/ioctl-number.txt index 3a46e360496d..72ba8d51dbc1 100644 --- a/trunk/Documentation/ioctl/ioctl-number.txt +++ b/trunk/Documentation/ioctl/ioctl-number.txt @@ -301,6 +301,7 @@ Code Seq#(hex) Include File Comments 0xAE all linux/kvm.h Kernel-based Virtual Machine +0xAF 00-1F linux/fsl_hypervisor.h Freescale hypervisor 0xB0 all RATIO devices in development: 0xB1 00-1F PPPoX diff --git a/trunk/Documentation/ja_JP/SubmittingPatches b/trunk/Documentation/ja_JP/SubmittingPatches index f107c834d242..97f78dd0c085 100644 --- a/trunk/Documentation/ja_JP/SubmittingPatches +++ b/trunk/Documentation/ja_JP/SubmittingPatches @@ -11,16 +11,18 @@ for non English (read: Japanese) speakers and is not intended as a fork. So if you have any comments or updates of this file, please try to update the original English file first. -Last Updated: 2007/10/24 +Last Updated: 2011/06/09 + ================================== ã“ã‚Œã¯ã€ -linux-2.6.23/Documentation/SubmittingPatches ã®å’Œè¨³ +linux-2.6.39/Documentation/SubmittingPatches ã®å’Œè¨³ ã§ã™ã€‚ 翻訳団体： JF プロジェクト < http://www.linux.or.jp/JF/ > -翻訳日： 2007/10/17 +翻訳日： 2011/06/09 翻訳者： Keiichi Kii 校正者： Masanari Kobayashi ã•ã‚“ Matsukura ã•ã‚“ + Takeshi Hamasaki ã•ã‚“ ================================== Linux カーãƒãƒ«ã«å¤‰æ›´ã‚’加ãˆã‚‹ãŸã‚ã® Howto @@ -97,7 +99,7 @@ Quilt: http://savannah.nongnu.org/projects/quilt Andrew Morton's patch scripts: -http://userweb.kernel.org/~akpm/stuff/tpp.txt +http://userweb.kernel.org/~akpm/stuff/patch-scripts.tar.gz ã“ã®ãƒªãƒ³ã‚¯ã®å…ˆã®ã‚¹ã‚¯ãƒªãƒ—トã®ä»£ã‚ã‚Šã¨ã—ã¦ã€quilt ãŒãƒ‘ッãƒãƒžãƒã‚¸ãƒ¡ãƒ³ãƒˆ ツールã¨ã—ã¦æŽ¨å¥¨ã•ã‚Œã¦ã„ã¾ã™(上ã®ãƒªãƒ³ã‚¯ã‚’見ã¦ãã ã•ã„)。 @@ -109,9 +111,25 @@ http://userweb.kernel.org/~akpm/stuff/tpp.txt 「ドライãƒãƒ¼ X ã«å¯¾ã™ã‚‹ãƒã‚°ãƒ•ã‚£ãƒƒã‚¯ã‚¹ã€ã‚ã‚‹ã„ã¯ã€Œã“ã®ãƒ‘ッãƒã¯ã‚µãƒ–シス テム X ã«å¯¾ã™ã‚‹æ›´æ–°ã‚’å«ã‚“ã§ã„ã¾ã™ã€‚ã©ã†ã‹å–り入れã¦ãã ã•ã„。ã€ãªã©ã§ã™ã€‚ +パッãƒã®èª¬æ˜Žã‚’ Linux カーãƒãƒ«ã®ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ãƒžãƒã‚¸ãƒ¡ãƒ³ãƒˆã‚·ã‚¹ãƒ†ãƒ ã€Œ git ã€ã® +コミットログã¨ã—ã¦ç°¡å˜ã«å¼•ç”¨ã§ãã‚‹å½¢ã§æ›¸ã‘ã°ã€ãƒ¡ãƒ³ãƒ†ãƒŠã‹ã‚‰æ„Ÿè¬ã•ã‚Œã‚‹ã§ã—ょã†ã€‚ +以下㮠#15 を見ã¦ãã ã•ã„。 + 説明ãŒé•·ããªã‚Šã ã—ãŸã®ã§ã‚ã‚Œã°ã€ãŠãらããã‚Œã¯ãƒ‘ッãƒã‚’分ã‘ã‚‹å¿…è¦ãŒã‚ã‚‹ ã¨ã„ã†å…†å€™ã§ã™ã€‚次㮠#3 を見ã¦ãã ã•ã„。 +パッãƒ(シリーズ)ã‚’(å†)投稿ã™ã‚‹æ™‚ã€å分ãªãƒ‘ッãƒã®èª¬æ˜Žã¨ãã®ãƒ‘ッãƒãŒå¿…è¦ãªç†ç”±ã‚’ +パッãƒã«å«ã‚ã¦ãã ã•ã„。ãŸã ã€Œã“ã‚Œã¯ãƒ‘ッãƒ(シリーズ)ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ Nã€ã¨ã ã‘ +書ã‹ãªã„ã§ãã ã•ã„。ãã—ã¦ã€ãƒ‘ッãƒã‚’マージã™ã‚‹äººã«ãƒ‘ッãƒã®èª¬æ˜Žã‚’探ã•ã›ãれを +パッãƒã«è¿½è¨˜ã•ã›ã‚‹ãŸã‚ã€éŽåŽ»ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッãƒã‚„ãã®ãƒ‘ッãƒã® URL ã‚’å‚ç…§ã™ã‚‹ +手間をã‹ã‘ã•ã›ãªã„ã§ãã ã•ã„。 +ã¤ã¾ã‚Šã€ãƒ‘ッãƒã‚·ãƒªãƒ¼ã‚ºã¨ãã®èª¬æ˜Žã¯ä¸€ç·’ã«ã‚ã‚‹ã¹ãã§ã™ã€‚ã“ã‚Œã¯ãƒ‘ッãƒã‚’マージã™ã‚‹ +人ã€ãƒ¬ãƒ“ューã™ã‚‹äººã€ã©ã¡ã‚‰ã®ãŸã‚ã«ã‚‚ãªã‚Šã¾ã™ã€‚レビューã™ã‚‹äººã®ä¸­ã«ã¯ã€ãŠãらã +éŽåŽ»ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッãƒã‚’å—ã‘å–ã£ã¦ã‚‚ã„ãªã„人ãŒã„ã¾ã™ã€‚ + +登録済ã¿ã®ãƒã‚°ã‚¨ãƒ³ãƒˆãƒªã‚’修正ã™ã‚‹ãƒ‘ッãƒã§ã‚ã‚Œã°ã€ãã®ãƒã‚°ã‚¨ãƒ³ãƒˆãƒªã‚’示ã™ãƒã‚° ID +ã‚„ URL を明記ã—ã¦ãã ã•ã„。 + 3) パッãƒã®åˆ†å‰² æ„味ã®ã‚ã‚‹ã²ã¨ã¾ã¨ã¾ã‚Šã”ã¨ã«å¤‰æ›´ã‚’個々ã®ãƒ‘ッãƒãƒ•ã‚¡ã‚¤ãƒ«ã«åˆ†ã‘ã¦ãã ã•ã„。 @@ -141,7 +159,7 @@ http://userweb.kernel.org/~akpm/stuff/tpp.txt æ‹’å¦ã•ã‚Œã‚‹ã§ã—ょã†ã€‚ ã‚ãªãŸã¯ãƒ‘ッãƒã‚’投稿ã™ã‚‹å‰ã«æœ€ä½Žé™ãƒ‘ッãƒã‚¹ã‚¿ã‚¤ãƒ«ãƒã‚§ãƒƒã‚«ãƒ¼ -( scripts/patchcheck.pl )を利用ã—ã¦ãƒ‘ッãƒã‚’ãƒã‚§ãƒƒã‚¯ã™ã¹ãã§ã™ã€‚ +( scripts/checkpatch.pl )を利用ã—ã¦ãƒ‘ッãƒã‚’ãƒã‚§ãƒƒã‚¯ã™ã¹ãã§ã™ã€‚ ã‚‚ã—パッãƒã«é•åãŒã®ã“ã£ã¦ã„ã‚‹ãªã‚‰ã°ã€ãれらã®å…¨ã¦ã«ã¤ã„ã¦ã‚ãªãŸã¯æ­£å½“㪠ç†ç”±ã‚’示ã›ã‚‹ã‚ˆã†ã«ã—ã¦ãŠãå¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ @@ -192,13 +210,13 @@ VGER.KERNEL.ORG ã§ãƒ›ã‚¹ãƒ†ã‚£ãƒ³ã‚°ã•ã‚Œã¦ã„るメーリングリスト㮠情報ãŒãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã®ä¸­ã«å…¥ã£ã¦ãるよã†ã«ã€å¤‰æ›´ãŒèµ·ããŸã¨ã„ㆠ通知をé€ã£ã¦ãã ã•ã„。 -ãŸã¨ãˆã€ãƒ¡ãƒ³ãƒ†ãƒŠãŒ #4 ã§åå¿œãŒãªã‹ã£ãŸã¨ã—ã¦ã‚‚ã€ãƒ¡ãƒ³ãƒ†ãƒŠã®ã‚³ãƒ¼ãƒ‰ã«å¤‰æ›´ã‚’ +ãŸã¨ãˆã€ãƒ¡ãƒ³ãƒ†ãƒŠãŒ #5 ã§åå¿œãŒãªã‹ã£ãŸã¨ã—ã¦ã‚‚ã€ãƒ¡ãƒ³ãƒ†ãƒŠã®ã‚³ãƒ¼ãƒ‰ã«å¤‰æ›´ã‚’ 加ãˆãŸã¨ãã«ã¯ã€ã„ã¤ã‚‚メンテナ㫠CC ã™ã‚‹ã®ã‚’忘れãªã„よã†ã«ã—ã¦ãã ã•ã„。 -å°ã•ãªãƒ‘ッãƒã§ã‚ã‚Œã°ã€Adrian Bunk ãŒç®¡ç†ã—ã¦ã„ã‚‹ Trivial Patch Monkey -(ã¡ã‚‡ã£ã¨ã—ãŸãƒ‘ッãƒã‚’集ã‚ã¦ã„ã‚‹)ã« CC ã—ã¦ã‚‚ã„ã„ -ã§ã™ã€‚ã¡ã‚‡ã£ã¨ã—ãŸãƒ‘ッãƒã¨ã¯ä»¥ä¸‹ã®ãƒ«ãƒ¼ãƒ«ã®ã©ã‚Œã‹1ã¤ã‚’満ãŸã—ã¦ã„ãªã‘ -ã‚Œã°ãªã‚Šã¾ã›ã‚“。 +å°ã•ãªãƒ‘ッãƒã§ã‚ã‚Œã°ã€Trivial Patch Monkey(ã¡ã‚‡ã£ã¨ã—ãŸãƒ‘ッãƒã‚’集ã‚ã¦ã„ã‚‹) +ã« CC ã—ã¦ã‚‚ã„ã„ã§ã™ã€‚ãã®ç¾ç®¡ç†è€…ã«ã¤ã„ã¦ã¯ MAINTAINERS +ファイルを見ã¦ãã ã•ã„。ã¡ã‚‡ã£ã¨ã—ãŸãƒ‘ッãƒã¨ã¯ä»¥ä¸‹ã®ãƒ«ãƒ¼ãƒ«ã®ã©ã‚Œã‹1ã¤ã‚’満ãŸã—㦠+ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。 ・ドキュメントã®ã‚¹ãƒšãƒ«ãƒŸã‚¹ã®ä¿®æ­£ ・grep(1) コマンドã«ã‚ˆã‚‹æ¤œç´¢ã‚’困難ã«ã—ã¦ã„るスペルã®ä¿®æ­£ ・コンパイル時ã®è­¦å‘Šã®ä¿®æ­£(無駄ãªè­¦å‘ŠãŒæ•£ä¹±ã™ã‚‹ã“ã¨ã¯å¥½ã¾ã—ããªã„㟠@@ -210,7 +228,6 @@ VGER.KERNEL.ORG ã§ãƒ›ã‚¹ãƒ†ã‚£ãƒ³ã‚°ã•ã‚Œã¦ã„るメーリングリスト㮠・移æ¤æ€§ã®ãªã„コードã‹ã‚‰ç§»æ¤æ€§ã®ã‚るコードã¸ã®ç½®ãæ›ãˆ(å°ã•ã„範囲㧠ã‚ã‚Œã°ã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒãƒ£ç‰¹æœ‰ã®ã“ã¨ã§ã‚‚ä»–ã®äººãŒã‚³ãƒ”ーã§ãã¾ã™) ・作者やメンテナã«ã‚ˆã‚‹ä¿®æ­£(ã™ãªã‚ã¡ patch monkey ã®å†è»¢é€ãƒ¢ãƒ¼ãƒ‰) -EMAIL: 7) MIME やリンクや圧縮ファイルや添付ファイルã§ã¯ãªãプレインテキストã®ã¿ @@ -233,26 +250,15 @@ MIME å½¢å¼ã®æ·»ä»˜ãƒ•ã‚¡ã‚¤ãƒ«ã¯ Linus ã«æ‰‹é–“ã‚’å–らã›ã‚‹ã“ã¨ã«ãª 例外：ãŠä½¿ã„ã®é›»å­ãƒ¡ãƒ¼ãƒ«ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆãŒãƒ‘ッãƒã‚’ã‚ã¡ã‚ƒãã¡ã‚ƒã«ã™ã‚‹ã®ã§ ã‚ã‚Œã°ã€èª°ã‹ãŒ MIME å½¢å¼ã®ãƒ‘ッãƒã‚’å†é€ã™ã‚‹ã‚ˆã†æ±‚ã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 -警告： Mozilla ã®ã‚ˆã†ãªç‰¹å®šã®é›»å­ãƒ¡ãƒ¼ãƒ«ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã¯é›»å­ãƒ¡ãƒ¼ãƒ«ã® -ヘッダã«ä»¥ä¸‹ã®ã‚‚ã®ã‚’付加ã—ã¦é€ã‚Šã¾ã™ã€‚ ----- message header ---- -Content-Type: text/plain; charset=us-ascii; format=flowed ----- message header ---- -å•é¡Œã¯ã€ã€Œ format=flowed ã€ãŒä»˜ã„ãŸé›»å­ãƒ¡ãƒ¼ãƒ«ã‚’特定ã®å—ä¿¡å´ã®é›»å­ãƒ¡ãƒ¼ãƒ« -クライアントãŒã‚¿ãƒ–をスペースã«ç½®ãæ›ãˆã‚‹ã¨ã„ã†ã‚ˆã†ãªå¤‰æ›´ã‚’ã™ã‚‹ã“ã¨ã§ã™ã€‚ -ã—ãŸãŒã£ã¦é€ã‚‰ã‚Œã¦ããŸãƒ‘ッãƒã¯å£Šã‚Œã¦ã„るよã†ã«è¦‹ãˆã‚‹ã§ã—ょã†ã€‚ - -ã“れを修正ã™ã‚‹ã«ã¯ã€mozilla ã® defaults/pref/mailnews.js ファイルを -以下ã®ã‚ˆã†ã«ä¿®æ­£ã—ã¾ã™ã€‚ -pref("mailnews.send_plaintext_flowed", false); // RFC 2646======= -pref("mailnews.display.disable_format_flowed_support", true); +余計ãªå¤‰æ›´ã‚’加ãˆãšã«ã‚ãªãŸã®ãƒ‘ッãƒã‚’é€ä¿¡ã™ã‚‹ãŸã‚ã®é›»å­ãƒ¡ãƒ¼ãƒ«ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã®è¨­å®š +ã®ãƒ’ントã«ã¤ã„ã¦ã¯ Documentation/email-clients.txt ã‚’å‚ç…§ã—ã¦ãã ã•ã„。 8) é›»å­ãƒ¡ãƒ¼ãƒ«ã®ã‚µã‚¤ã‚º パッãƒã‚’ Linus ã¸é€ã‚‹ã¨ãã¯å¸¸ã« #7 ã®æ‰‹é †ã«å¾“ã£ã¦ãã ã•ã„。 大ããªãƒ‘ッãƒã¯ãƒ¡ãƒ¼ãƒªãƒ³ã‚°ãƒªã‚¹ãƒˆã‚„メンテナã«ã¨ã£ã¦ä¸è¦ªåˆ‡ã§ã™ã€‚パッãƒãŒ -未圧縮㧠40KB を超ãˆã‚‹ã‚ˆã†ã§ã‚ã‚‹ãªã‚‰ã€ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆä¸Šã®ã‚¢ã‚¯ã‚»ã‚¹å¯èƒ½ãª +未圧縮㧠300KB を超ãˆã‚‹ã‚ˆã†ã§ã‚ã‚‹ãªã‚‰ã€ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆä¸Šã®ã‚¢ã‚¯ã‚»ã‚¹å¯èƒ½ãª サーãƒã«ä¿å­˜ã—ã€ä¿å­˜å ´æ‰€ã‚’示㙠URL ã‚’ä¼ãˆã‚‹ã»ã†ãŒé©åˆ‡ã§ã™ã€‚ 9) カーãƒãƒ«ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®æ˜Žè¨˜ @@ -324,7 +330,7 @@ Linus ã‚„ LKML ã¸ã®å¤§é‡ã®é›»å­ãƒ¡ãƒ¼ãƒ«ã®ãŸã‚ã«ã€ã‚µãƒ–ジェクト (c) 本寄与ã¯(a)ã€(b)ã€(c)を証明ã™ã‚‹ç¬¬3者ã‹ã‚‰ç§ã¸ç›´æŽ¥æä¾›ã•ã‚ŒãŸ ã‚‚ã®ã§ã‚ã‚Šã€ç§ã¯ãã‚Œã«å¤‰æ›´ã‚’加ãˆã¦ã„ãªã„。 - (d) ç§ã¯ã“ã®ãƒ—ロジェクトã¨æœ¬å¯„与ãŒå…¬ã®ã‚‚ã®ã§ã‚ã‚‹ã“ã¨ã«ç†è§£åŠã³åŒæ„ã™ + (d) ç§ã¯ã“ã®ãƒ—ロジェクトã¨æœ¬å¯„与ãŒå…¬ã®ã‚‚ã®ã§ã‚ã‚‹ã“ã¨ã«ç†è§£åŠã³åŒæ„㙠る。åŒæ™‚ã«ã€é–¢ä¸Žã—ãŸè¨˜éŒ²(投稿ã®éš›ã®å…¨ã¦ã®å€‹äººæƒ…報㨠sign-off ã‚’ å«ã‚€)ãŒç„¡æœŸé™ã«ä¿å…¨ã•ã‚Œã‚‹ã“ã¨ã¨ã€å½“該プロジェクトåˆã¯é–¢é€£ã™ã‚‹ オープンソースライセンスã«æ²¿ã£ãŸå½¢ã§å†é…布ã•ã‚Œã‚‹ã“ã¨ã«ç†è§£åŠã³ @@ -340,7 +346,51 @@ Linus ã‚„ LKML ã¸ã®å¤§é‡ã®é›»å­ãƒ¡ãƒ¼ãƒ«ã®ãŸã‚ã«ã€ã‚µãƒ–ジェクト 無視ã•ã‚Œã¾ã™ãŒã€ã‚ãªãŸã¯ãã®ã‚¿ã‚°ã‚’社内ã®æ‰‹ç¶šãã«åˆ©ç”¨ã—ãŸã‚Šã€sign-off ã«ç‰¹åˆ¥ ãªæƒ…報を示ã—ãŸã‚Šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ -13) ã„㤠Acked-by: を使ã†ã®ã‹ +ã‚ãªãŸãŒã‚µãƒ–システムã¾ãŸã¯ãƒ–ランãƒã®ãƒ¡ãƒ³ãƒ†ãƒŠã§ã‚ã‚Œã°ã€å—ã‘å–ã£ãŸãƒ‘ッãƒã‚’自身㮠+ツリーã«ãƒžãƒ¼ã‚¸ã™ã‚‹ãŸã‚ã«ã€ã‚ãšã‹ã«å¤‰æ›´ãŒå¿…è¦ã¨ãªã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ãªãœãªã‚‰ +ã‚ãªãŸã®ãƒ„リーã®ä¸­ã®ã‚³ãƒ¼ãƒ‰ã¨æŠ•ç¨¿è€…ã®ãƒ„リーã®ä¸­ã®ã‚³ãƒ¼ãƒ‰ã¯åŒä¸€ã§ã¯ãªã„ãŸã‚ã§ã™ã€‚ +ã‚‚ã—ã€ã‚ãªãŸãŒåŽ³å¯†ã«ä¸Šè¨˜ãƒ«ãƒ¼ãƒ«(c)ã«ã“ã ã‚ã‚‹ã®ã§ã‚ã‚Œã°ã€æŠ•ç¨¿è€…ã«å†åº¦å·®åˆ†ã‚’ +ã¨ã‚‹ã‚ˆã†ä¾é ¼ã™ã¹ãã§ã™ã€‚ã—ã‹ã—ã€ã“ã‚Œã¯æ™‚é–“ã¨ã‚¨ãƒãƒ«ã‚®ãƒ¼ã‚’éžç”Ÿç”£çš„ã«æµªè²»ã™ã‚‹ +ã“ã¨ã«ãªã‚Šã¾ã™ã€‚ルール(b)ã¯ã‚ãªãŸã«ã‚³ãƒ¼ãƒ‰ã‚’修正ã™ã‚‹æ¨©åˆ©ã‚’与ãˆã¦ãã‚Œã¾ã™ã€‚ +ã—ã‹ã—ã€æŠ•ç¨¿è€…ã®ã‚³ãƒ¼ãƒ‰ã‚’修正ã—ã€ãã®ä¿®æ­£ã«ã‚ˆã‚‹ãƒã‚°ã‚’投稿者ã«æŠ¼ã—付ã‘ã¦ã—ã¾ã† +ã“ã¨ã¯ã¨ã¦ã‚‚失礼ãªã“ã¨ã§ã™ã€‚ã“ã®å•é¡Œã‚’解決ã™ã‚‹ãŸã‚ã«ã€æœ«å°¾ã®æŠ•ç¨¿è€…ã® +Signed-off-by ã¨ã‚ãªãŸãŒãã®æœ«å°¾ã«è¿½åŠ ã™ã‚‹ Signed-off-by ã®é–“ã«ã€ä¿®æ­£ã‚’ +加ãˆãŸã“ã¨ã‚’示ã™1行を追加ã™ã‚‹ã“ã¨ãŒæŽ¨å¥¨ã•ã‚Œã¦ã„ã¾ã™ã€‚ +(ãã®1è¡Œã®æ›¸ãæ–¹ã«)決ã¾ã‚Šã¯ã‚ã‚Šã¾ã›ã‚“ãŒã€å¤§æ‹¬å¼§ã®ä¸­ã«é›»å­ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚„æ°å +ã¨ä¿®æ­£å†…容を記載ã™ã‚‹ã‚„ã‚Šæ–¹ã¯ç›®ã«ã¤ãã‚„ã™ãã€æœ€çµ‚段階ã§ã®å¤‰æ›´ã®è²¬ä»»ãŒã‚ãªãŸã« +ã‚ã‚‹ã“ã¨ã‚’明確ã«ã™ã‚‹ã®ã«å分ãªæ–¹æ³•ã®ã‚ˆã†ã§ã™ã€‚例ãˆã°ã€ + + 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 + +ã‚ãªãŸãŒå®‰å®šç‰ˆã®ãƒ–ランãƒã‚’管ç†ã—ã¦ãŠã‚Šã€ä½œæˆè€…ã®ã‚¯ãƒ¬ã‚¸ãƒƒãƒˆã€å¤‰æ›´ã®è¿½è·¡ã€ +修正ã®ãƒžãƒ¼ã‚¸ã€ã¨åŒæ™‚ã«è‹¦æƒ…ã‹ã‚‰ã®æŠ•ç¨¿è€…ã®ä¿è­·ã‚’è¡Œã„ãŸã„å ´åˆã€ã“ã®æ…£ç¿’ã¯ç‰¹ã« +有用ã¨ãªã‚Šã¾ã™ã€‚ã„ã‹ãªã‚‹äº‹æƒ…ãŒã‚ã£ã¦ã‚‚ãƒã‚§ãƒ³ã‚¸ãƒ­ã‚°ã«å‡ºã¦ãる作æˆè€…ã® +アイデンティティ情報(From ヘッダ)ã¯å¤‰æ›´ã§ããªã„ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。 + +ãƒãƒƒã‚¯ãƒãƒ¼ãƒˆã™ã‚‹äººã®ãŸã‚ã®ç‰¹åˆ¥ãªæ³¨æ„事項。追跡を容易ã«è¡Œã†ãŸã‚ã«ã€ã‚³ãƒŸãƒƒãƒˆ +メッセージã®ãƒˆãƒƒãƒ—(サブジェクト行ã®ã™ã後)ã«ãƒ‘ッãƒã®èµ·æºã‚’示ã™æƒ…報を記述ã™ã‚‹ +ã“ã¨ã¯ä¸€èˆ¬çš„ã§æœ‰ç”¨ãªæ…£ç¿’ã§ã™ã€‚例ãˆã°ã€ã“れ㯠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 + +ãã—ã¦ã€ã“れ㯠2.4 ツリーã§ã®ä¸€ä¾‹ã§ã™ã€‚ + + Date: Tue May 13 22:12:27 2008 +0200 + + wireless, airo: waitbusy() won't delay + + [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a] + +ã©ã‚“ãªå½¢å¼ã§ã‚ã‚Œã€ã“ã®æƒ…å ±ã¯ã‚ãªãŸã®ãƒ„リーを追跡ã™ã‚‹äººã‚„ã‚ãªãŸã®ãƒ„リーã®ãƒã‚°ã‚’ +解決ã—よã†ã¨ã—ã¦ã„る人ã«ã¨ã£ã¦ä¾¡å€¤ã®ã‚る支æ´ã¨ãªã‚Šã¾ã™ã€‚ + +13) ã„㤠Acked-by: 㨠Cc: を使ã†ã®ã‹ 「 Signed-off-by: ã€ã‚¿ã‚°ã¯ãã®ç½²å者ãŒãƒ‘ッãƒã®é–‹ç™ºã«é–¢ã‚ã£ã¦ã„ãŸã“ã¨ã‚„パッムã®ä¼æ’­ãƒ‘スã«ã„ãŸã“ã¨ã‚’示ã—ã¦ã„ã¾ã™ã€‚ @@ -354,7 +404,7 @@ Linus ã‚„ LKML ã¸ã®å¤§é‡ã®é›»å­ãƒ¡ãƒ¼ãƒ«ã®ãŸã‚ã«ã€ã‚µãƒ–ジェクト Acked-by: 㯠Signed-off-by: ã®ã‚ˆã†ã«å…¬å¼ãªã‚¿ã‚°ã§ã¯ã‚ã‚Šã¾ã›ã‚“。ãã‚Œã¯ãƒ¡ãƒ³ãƒ†ãƒŠãŒ å°‘ãªãã¨ã‚‚パッãƒã‚’レビューã—ã€åŒæ„を示ã—ã¦ã„ã‚‹ã¨ã„ã†è¨˜éŒ²ã§ã™ã€‚ãã®ã‚ˆã†ãª -ã“ã¨ã‹ã‚‰ãƒ‘ッãƒã®çµ±åˆè€…ãŒãƒ¡ãƒ³ãƒ†ãƒŠã®ã€Œã†ã‚“ã€è‰¯ã„ã¨æ€ã†ã‚ˆã€ã¨ã„ã†ç™ºè¨€ã‚’ +ã“ã¨ã‹ã‚‰ãƒ‘ッãƒã‚’マージã™ã‚‹äººãŒãƒ¡ãƒ³ãƒ†ãƒŠã®ã€Œã†ã‚“ã€è‰¯ã„ã¨æ€ã†ã‚ˆã€ã¨ã„ã†ç™ºè¨€ã‚’ Acked-by: ã¸ç½®ãæ›ãˆã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ Acked-by: ãŒå¿…ãšã—もパッãƒå…¨ä½“ã®æ‰¿èªã‚’示ã—ã¦ã„ã‚‹ã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“。例ãˆã°ã€ @@ -364,7 +414,62 @@ Acked-by: ãŒå¿…ãšã—もパッãƒå…¨ä½“ã®æ‰¿èªã‚’示ã—ã¦ã„ã‚‹ã‚ã‘ã§ã¯ ã“ã®ç‚¹ã¯ã€ã”自分ã§åˆ¤æ–­ã—ã¦ãã ã•ã„。(ãã® Acked-by: ãŒ)ç–‘ã‚ã—ã„å ´åˆã¯ã€ メーリングリストアーカイブã®ä¸­ã®å¤§å…ƒã®è­°è«–ã‚’å‚ç…§ã™ã¹ãã§ã™ã€‚ -14) 標準的ãªãƒ‘ッãƒã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ +パッãƒã«ã‚³ãƒ¡ãƒ³ãƒˆã™ã‚‹æ©Ÿä¼šã‚’æŒã£ã¦ã„ãŸãŒã€ãã®æ™‚ã«ã‚³ãƒ¡ãƒ³ãƒˆã—ãªã‹ã£ãŸäººãŒã„ã‚Œã°ã€ +ãã®äººã‚’指ã™ã€ŒCc:ã€ã‚¿ã‚°ã‚’ä»»æ„ã§è¿½åŠ ã—ã¦ã‚‚ã‹ã¾ã„ã¾ã›ã‚“。ã“ã‚Œã¯æŒ‡å®šã•ã‚ŒãŸäººã‹ã‚‰ã® +明確ãªã‚¢ã‚¯ã‚·ãƒ§ãƒ³ãªã—ã«ä»˜ä¸Žã§ãる唯一ã®ã‚¿ã‚°ã§ã™ã€‚ +ã“ã®ã‚¿ã‚°ã¯ãƒ‘ッãƒã«é–¢å¿ƒãŒã‚ã‚‹ã¨æ€ã‚れる人é”ãŒãã®ãƒ‘ッãƒã®è­°è«–ã«å«ã¾ã‚Œã¦ã„ãŸã“㨠+を明文化ã—ã¾ã™ã€‚ + +14) Reported-by 㨠Tested-by: 㨠Reviewed-by: ã®åˆ©ç”¨ + +ä»–ã®èª°ã‹ã«ã‚ˆã£ã¦å ±å‘Šã•ã‚ŒãŸå•é¡Œã‚’修正ã™ã‚‹ãƒ‘ッãƒã§ã‚ã‚Œã°ã€å•é¡Œå ±å‘Šè€…ã¨ã„ã†å¯„与を +クレジットã™ã‚‹ãŸã‚ã«ã€Reported-by: タグを追加ã™ã‚‹ã“ã¨ã‚’検討ã—ã¦ãã ã•ã„。 +ã“ã¾ã‚ã«ãƒã‚°å ±å‘Šè€…をクレジットã—ã¦ã„ãã“ã¨ã§ã€ã†ã¾ãã„ã‘ã°ãã®äººãŸã¡ãŒå°†æ¥å†ã³ +コミュニティã®åŠ›ã¨ãªã£ã¦ãれるã§ã—ょã†ã€‚ +ãŸã ã—ã€å ±å‘Šè€…ã®è¨±å¯ç„¡ãã“ã®ã‚¿ã‚°ã‚’追加ã—ãªã„よã†ã«æ³¨æ„ã—ã¦ãã ã•ã„。特ã«ã€ +å•é¡ŒãŒå…¬ã®å ´ã§å ±å‘Šã•ã‚Œã¦ã„ãªã‹ã£ãŸã®ã§ã‚ã‚Œã°ã€‚ + +Tested-by: ã‚¿ã‚°ã¯ã‚¿ã‚°ã§æŒ‡å®šã•ã‚ŒãŸäººã«ã‚ˆã£ã¦(ã‚る環境下ã§)パッãƒã®ãƒ†ã‚¹ãƒˆã«æˆåŠŸ +ã—ã¦ã„ã‚‹ã“ã¨ã‚’示ã—ã¾ã™ã€‚ã“ã®ã‚¿ã‚°ã¯ãƒ¡ãƒ³ãƒ†ãƒŠã«ãƒ†ã‚¹ãƒˆãŒå®Ÿæ–½æ¸ˆã¿ã§ã‚ã‚‹ã“ã¨ã‚’ +知らã›ã€å°†æ¥ã®é–¢é€£ãƒ‘ッãƒã®ãƒ†ã‚¹ãƒˆå”力者を見ã¤ã‘る方法をæä¾›ã—ã€ãƒ†ã‚¹ãƒˆå®Ÿæ–½è€…ã« +対ã™ã‚‹ã‚¯ãƒ¬ã‚¸ãƒƒãƒˆã‚’ä¿è¨¼ã—ã¾ã™ã€‚ + +Reviewed-by: ã‚¿ã‚°ã¯ã€ãã‚Œã¨ã¯ç•°ãªã‚Šã€ä¸‹è¨˜ã®ãƒ¬ãƒ“ューア宣言ã®ä¸‹ã«ãƒ¬ãƒ“ューã•ã‚Œã€ +å—ã‘入れå¯èƒ½ã¨ã¿ãªã•ã‚ŒãŸãƒ‘ッãƒã§ã‚ã‚‹ã“ã¨ã‚’示ã—ã¾ã™ã€‚ + + レビューアã«ã‚ˆã‚‹ç›£ç£å®£è¨€ + + ç§ã¯ Reviewed-by: ã‚¿ã‚°ã‚’æ示ã™ã‚‹ã“ã¨ã«ã‚ˆã£ã¦ã€ä»¥ä¸‹ã®ã“ã¨ã‚’明言ã™ã‚‹ã€‚ + + (a) ç§ã¯ãƒ¡ã‚¤ãƒ³ãƒ©ã‚¤ãƒ³ã‚«ãƒ¼ãƒãƒ«ã¸ã®çµ±åˆã«å‘ã‘ã€ãã®å¦¥å½“性åŠã³ã€Œå³å¿œæ€§ + (訳注)ã€ã‚’検証ã—ã€æŠ€è¡“çš„å´é¢ã‹ã‚‰ãƒ‘ッãƒã‚’レビュー済ã¿ã§ã‚る。 + + 訳注: + 「å³å¿œæ€§ã€ã®åŽŸæ–‡ã¯ "readiness"。 + パッãƒãŒå分ãªå“質をæŒã£ã¦ãŠã‚Šã€ãƒ¡ã‚¤ãƒ³ãƒ©ã‚¤ãƒ³ã‚«ãƒ¼ãƒãƒ«ã¸ã®çµ±åˆã‚’å³åº§ã« + è¡Œã†ã“ã¨ãŒã§ãる状態ã§ã‚ã‚‹ã‹ã©ã†ã‹ã‚’ "readiness" ã¨ã„ã†å˜èªžã§è¡¨ç¾ + ã—ã¦ã„る。 + + (b) パッãƒã«é–¢ã™ã‚‹ã‚らゆるå•é¡Œã€æ‡¸å¿µã€ã‚ã‚‹ã„ã¯ã€ç–‘å•ã¯æŠ•ç¨¿è€…ã¸ä¼é”済㿠+ ã§ã‚る。ç§ã¯ãれらã®ã‚³ãƒ¡ãƒ³ãƒˆã«å¯¾ã™ã‚‹æŠ•ç¨¿è€…ã®è¿”ç­”ã«æº€è¶³ã—ã¦ã„る。 + + (c) 投稿ã«ä¼´ã„改良ã•ã‚Œã‚‹ã‚³ãƒ¼ãƒ‰ãŒã‚る一方ã§ã€ç¾æ™‚点ã§ã€ç§ã¯(1)ãれ㌠+ カーãƒãƒ«ã«ã¨ã£ã¦ä¾¡å€¤ã®ã‚る変更ã§ã‚ã‚‹ã“ã¨ã€ãã—ã¦ã€(2)çµ±åˆã«éš›ã—㦠+ è­°è«–ã«ãªã‚Šå¾—るよã†ãªå•é¡Œã¯ãªã„ã‚‚ã®ã¨ç¢ºä¿¡ã—ã¦ã„る。 + + (d) ç§ã¯ãƒ‘ッãƒã‚’レビューã—é©åˆ‡ã§ã‚ã‚‹ã¨ç¢ºä¿¡ã—ã¦ã„る一方ã§ã€ã‚らゆる + 状æ³ã«ãŠã„ã¦ãã®å®£è¨€ã—ãŸç›®çš„や機能ãŒæ­£ã—ã実ç¾ã™ã‚‹ã“ã¨ã«é–¢ã—ã¦ã€ + ã„ã‹ãªã‚‹ä¿è¨¼ã‚‚ã—ãªã„(特ã«ã©ã“ã‹ã§æ˜Žç¤ºã—ãªã„é™ã‚Š)。 + +Reviewd-by ã‚¿ã‚°ã¯ãã®ãƒ‘ッãƒãŒã‚«ãƒ¼ãƒãƒ«ã«å¯¾ã—ã¦é©åˆ‡ãªä¿®æ­£ã§ã‚ã£ã¦ã€æ·±åˆ»ãªæŠ€è¡“çš„ +å•é¡Œã‚’残ã—ã¦ã„ãªã„ã¨ã„ã†æ„見ã®å®£è¨€ã§ã™ã€‚興味ã®ã‚るレビューアã¯èª°ã§ã‚‚(レビュー +作業を終ãˆãŸã‚‰)パッãƒã«å¯¾ã—㦠Reviewed-by ã‚¿ã‚°ã‚’æ示ã§ãã¾ã™ã€‚ã“ã®ã‚¿ã‚°ã¯ +レビューアã®å¯„与をクレジットã™ã‚‹åƒãã€ãƒ¬ãƒ“ューã®é€²æ—ã®åº¦åˆã„をメンテナ㫠+知らã›ã‚‹åƒãã‚’æŒã¡ã¾ã™ã€‚ãã®ãƒ‘ッãƒã®é ˜åŸŸã«è©³ã—ãã€ãã—ã¦ã€ã—ã£ã‹ã‚Šã¨ã—㟠+レビューを実施ã—ãŸãƒ¬ãƒ“ューアã«ã‚ˆã£ã¦æä¾›ã•ã‚Œã‚‹æ™‚ã€Reviewed-by: ã‚¿ã‚°ãŒã‚ãªãŸã® +パッãƒã‚’カーãƒãƒ«ã«ãƒžãƒ¼ã‚¸ã™ã‚‹å¯èƒ½æ€§ã‚’高ã‚ã‚‹ã§ã—ょã†ã€‚ + +15) 標準的ãªãƒ‘ッãƒã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ 標準的ãªãƒ‘ッãƒã®ã‚µãƒ–ジェクトã¯ä»¥ä¸‹ã®ã¨ãŠã‚Šã§ã™ã€‚ @@ -396,18 +501,37 @@ Acked-by: ãŒå¿…ãšã—もパッãƒå…¨ä½“ã®æ‰¿èªã‚’示ã—ã¦ã„ã‚‹ã‚ã‘ã§ã¯ é›»å­ãƒ¡ãƒ¼ãƒ«ã®ã‚µãƒ–ジェクト内ã®ã‚µãƒ–システム表記ã¯ã€ãƒ‘ッãƒãŒé©ç”¨ã•ã‚Œã‚‹ 分野ã¾ãŸã¯ã‚µãƒ–システムを識別ã§ãるよã†ã«ã™ã¹ãã§ã™ã€‚ -é›»å­ãƒ¡ãƒ¼ãƒ«ã®ã‚µãƒ–ジェクトã®ã€Œæ¦‚è¦ã®è¨€ã„回ã—ã€ã¯ãã®ãƒ‘ッãƒã®æ¦‚è¦ã‚’正確 -ã«è¡¨ç¾ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。「概è¦ã®è¨€ã„回ã—ã€ã‚’ファイルåã«ã—ã¦ã¯ã„ -ã‘ã¾ã›ã‚“。一連ã®ãƒ‘ッãƒä¸­ã§ãã‚Œãžã‚Œã®ãƒ‘ッãƒã¯åŒã˜ã€Œæ¦‚è¦ã®è¨€ã„回ã—ã€ã‚’ -使ã£ã¦ã¯ã„ã‘ã¾ã›ã‚“(「一連ã®ãƒ‘ッãƒã€ã¨ã¯é †åºä»˜ã‘られãŸé–¢é€£ã®ã‚る複数㮠+é›»å­ãƒ¡ãƒ¼ãƒ«ã®ã‚µãƒ–ジェクトã®ã€Œsummary phraseã€ã¯ãã®ãƒ‘ッãƒã®æ¦‚è¦ã‚’正確 +ã«è¡¨ç¾ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。「summary phraseã€ã‚’ファイルåã«ã—ã¦ã¯ã„ +ã‘ã¾ã›ã‚“。パッãƒã‚·ãƒªãƒ¼ã‚ºä¸­ã§ãã‚Œãžã‚Œã®ãƒ‘ッãƒã¯åŒã˜ã€Œsummary phraseã€ã‚’ +使ã£ã¦ã¯ã„ã‘ã¾ã›ã‚“(「パッãƒã‚·ãƒªãƒ¼ã‚ºã€ã¨ã¯é †åºä»˜ã‘られãŸé–¢é€£ã®ã‚る複数㮠パッãƒç¾¤ã§ã™)。 -ã‚ãªãŸã®é›»å­ãƒ¡ãƒ¼ãƒ«ã®ã€Œæ¦‚è¦ã®è¨€ã„回ã—ã€ãŒãã®ãƒ‘ッãƒã«ã¨ã£ã¦ä¸–ç•Œã§å”¯ -一ã®è­˜åˆ¥å­ã«ãªã‚‹ã‚ˆã†ã«å¿ƒãŒã‘ã¦ãã ã•ã„。「概è¦ã®è¨€ã„回ã—ã€ã¯ git ã® -ãƒã‚§ãƒ³ã‚¸ãƒ­ã‚°ã®ä¸­ã¸ãšã£ã¨ä¼æ’­ã—ã¦ã„ãã¾ã™ã€‚「概è¦ã®è¨€ã„回ã—ã€ã¯ã€é–‹ -発者ãŒå¾Œã§ãƒ‘ッãƒã‚’å‚ç…§ã™ã‚‹ãŸã‚ã«è­°è«–ã®ä¸­ã§åˆ©ç”¨ã™ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 -人々ã¯ãã®ãƒ‘ッãƒã«é–¢é€£ã—ãŸè­°è«–を読むãŸã‚ã«ã€Œæ¦‚è¦ã®è¨€ã„回ã—ã€ã‚’使ã£ã¦ -google ã§æ¤œç´¢ã—ãŸãŒã‚‹ã§ã—ょã†ã€‚ +ã‚ãªãŸã®é›»å­ãƒ¡ãƒ¼ãƒ«ã®ã€Œsummary phraseã€ãŒãã®ãƒ‘ッãƒã«ã¨ã£ã¦ä¸–ç•Œã§å”¯ä¸€ã®è­˜åˆ¥å­ã« +ãªã‚‹ã‚ˆã†ã«å¿ƒãŒã‘ã¦ãã ã•ã„。「summary phraseã€ã¯ git ã®ãƒã‚§ãƒ³ã‚¸ãƒ­ã‚°ã®ä¸­ã¸ +ãšã£ã¨ä¼æ’­ã—ã¦ã„ãã¾ã™ã€‚「summary phraseã€ã¯ã€é–‹ç™ºè€…ãŒå¾Œã§ãƒ‘ッãƒã‚’å‚ç…§ã™ã‚‹ +ãŸã‚ã«è­°è«–ã®ä¸­ã§åˆ©ç”¨ã™ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 +人々ã¯ãã®ãƒ‘ッãƒã«é–¢é€£ã—ãŸè­°è«–を読むãŸã‚ã«ã€Œsummary phraseã€ã‚’使ã£ã¦ google 㧠+検索ã—ãŸãŒã‚‹ã§ã—ょã†ã€‚ãã‚Œã¯ã¾ãŸ2ã€3ヶ月ã‚ã¨ã§ã€äººã€…ãŒã€Œgitkã€ã‚„ +「git log --onelineã€ã®ã‚ˆã†ãªãƒ„ールを使用ã—ã¦ä½•åƒã‚‚ã®ãƒ‘ッãƒã«ç›®ã‚’通ã™æ™‚〠+唯一目ã«ã¨ã¾ã‚‹æƒ…å ±ã¨ãªã‚‹ã§ã—ょã†ã€‚ + +ã“れらã®ç†ç”±ã®ãŸã‚ã€ã€Œsummary phraseã€ã¯ãªãœãƒ‘ッãƒãŒå¿…è¦ã§ã‚ã‚‹ã‹ã€ãƒ‘ッãƒãŒä½•ã‚’ +変更ã™ã‚‹ã‹ã®2ã¤ã®æƒ…報をã›ã„ãœã„70〜75文字ã§è¡¨ç¾ã—ã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。 +「summary phraseã€ã¯ç°¡æ½”ã§ã‚り説明的ã§ã‚る表ç¾ã‚’目指ã—ã¤ã¤ã€ã†ã¾ã +ã¾ã¨ã‚られã¦ã„る概è¦ã¨ãªã‚‹ã¹ãã§ã™ã€‚ + +「summary phraseã€ã¯ã€ŒSubject: [PATCH tag] ã€ã®ã‚ˆã†ã«ã€ +大括弧ã§é–‰ã˜ã‚‰ã‚ŒãŸã‚¿ã‚°ã‚’接頭辞ã¨ã—ã¦ä»˜åŠ ã—ã¦ã‚‚ã‹ã¾ã„ã¾ã›ã‚“。ã“ã®ã‚¿ã‚°ã¯ +「summary phraseã€ã®ä¸€éƒ¨ã¨ã¯è€ƒãˆã¾ã›ã‚“ãŒã€ãƒ‘ッãƒã‚’ã©ã®ã‚ˆã†ã«å–り扱ã†ã¹ãã‹ã‚’ +表ç¾ã—ã¾ã™ã€‚ +一般的ã«ã¯ã€Œv1, v2, v3ã€ã®ã‚ˆã†ãªãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報を表ã™ã‚¿ã‚°(éŽåŽ»ã®ãƒ‘ッãƒã«å¯¾ã™ã‚‹ +コメントをå映ã™ã‚‹ãŸã‚ã«è¤‡æ•°ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒ‘ッãƒãŒæŠ•ç¨¿ã•ã‚Œã¦ã„ã‚‹ã®ã§ã‚ã‚Œã°)〠+「RFCã€ã®ã‚ˆã†ãªã‚³ãƒ¡ãƒ³ãƒˆã‚’è¦æ±‚ã™ã‚‹ã‚¿ã‚°ãŒæŒ™ã’られã¾ã™ã€‚パッãƒã‚·ãƒªãƒ¼ã‚ºã¨ã—ã¦4ã¤ã® +パッãƒãŒã‚ã‚Œã°ã€å€‹ã€…ã®ãƒ‘ッãƒã«ã€Œ1/4, 2/4, 3/4, 4/4ã€ã®ã‚ˆã†ã«ç•ªå·ã‚’付ã‘ã¦ã‚‚ +ã‹ã¾ã„ã¾ã›ã‚“。ã“ã‚Œã¯é–‹ç™ºè€…ãŒãƒ‘ッãƒã‚’é©ç”¨ã™ã‚‹é †ç•ªã‚’確実ã«æŠŠæ¡ã™ã‚‹ãŸã‚ã§ã™ã€‚ +ãã—ã¦ã€é–‹ç™ºè€…ãŒãƒ‘ッãƒã‚·ãƒªãƒ¼ã‚ºã®ä¸­ã®ã™ã¹ã¦ã®ãƒ‘ッãƒã‚’もらã•ãšãƒ¬ãƒ“ュー或ã„㯠+é©ç”¨ã™ã‚‹ã®ã‚’ä¿è¨¼ã™ã‚‹ãŸã‚ã§ã™ã€‚ サブジェクトã®ä¾‹ã‚’二㤠@@ -426,7 +550,12 @@ google ã§æ¤œç´¢ã—ãŸãŒã‚‹ã§ã—ょã†ã€‚ 説明本体ã¯ç„¡æœŸé™ã®ã‚½ãƒ¼ã‚¹ã®ãƒã‚§ãƒ³ã‚¸ãƒ­ã‚°ã«ã‚³ãƒŸãƒƒãƒˆã•ã‚Œã¾ã™ã€‚ãªã®ã§ã€èª¬æ˜Ž 本体ã¯ãã®ãƒ‘ッãƒã«è‡³ã£ãŸè­°è«–ã®è©³ç´°ã‚’忘れã¦ã„ã‚‹ã‚る程度ã®æŠ€é‡ã‚’æŒã£ã¦ã„る人 -ãŒãã®è©³ç´°ã‚’æ€ã„出ã™ã“ã¨ãŒã§ãã‚‹ã‚‚ã®ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。 +ãŒãã®è©³ç´°ã‚’æ€ã„出ã™ã“ã¨ãŒã§ãã‚‹ã‚‚ã®ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。パッãƒãŒå¯¾å‡¦ã™ã‚‹ +障害ã®ç—‡çŠ¶(カーãƒãƒ«ãƒ­ã‚°ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚„ oops メッセージ等)を記載ã™ã‚‹ã“ã¨ã¯å•é¡Œã« +対処å¯èƒ½ãªãƒ‘ッãƒã‚’求ã‚ã¦ã‚³ãƒŸãƒƒãƒˆãƒ­ã‚°ã‚’検索ã™ã‚‹äººã€…ã«ã¨ã£ã¦ç‰¹ã«æœ‰ç”¨ã§ã™ã€‚ +パッãƒãŒã‚³ãƒ³ãƒ‘イルå•é¡Œã‚’解決ã™ã‚‹ã®ã§ã‚ã‚Œã°ã€ãã®ãƒ‘ッãƒã‚’探ã—ã¦ã„る人ãŒè¦‹ã¤ã‘ã‚‹ +ã“ã¨ãŒã§ãる情報ã ã‘ã§å分ã§ã‚ã‚Šã€ã‚³ãƒ³ãƒ‘イル時ã®å…¨ã¦ã®ã‚¨ãƒ©ãƒ¼ã‚’å«ã‚ã‚‹å¿…è¦ã¯ +ã‚ã‚Šã¾ã›ã‚“。「summary phraseã€ã¨åŒæ§˜ã«ã€ç°¡æ½”ã§ã‚り説明的ã§ã‚ã‚‹ã“ã¨ãŒé‡è¦ã§ã™ã€‚ 「 --- ã€ãƒžãƒ¼ã‚«ãƒ¼è¡Œã¯ãƒ‘ッãƒå‡¦ç†ãƒ„ールã«å¯¾ã—ã¦ã€ãƒã‚§ãƒ³ã‚¸ãƒ­ã‚°ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®çµ‚端 部分をèªè­˜ã•ã›ã‚‹ã¨ã„ã†é‡è¦ãªå½¹ç›®ã‚’æžœãŸã—ã¾ã™ã€‚ @@ -436,14 +565,46 @@ google ã§æ¤œç´¢ã—ãŸãŒã‚‹ã§ã—ょã†ã€‚ 追加ã•ã‚Œä½•è¡Œæ¶ˆã•ã‚ŒãŸã‹ã‚’示ã™ã‚‚ã®ã§ã™ã€‚diffstat コマンドã¯ç‰¹ã«å¤§ããªãƒ‘ッãƒã« ãŠã„ã¦å½¹ç«‹ã¡ã¾ã™ã€‚ãã®æ™‚点ã§ã ã‘åˆã¯ãƒ¡ãƒ³ãƒ†ãƒŠã«ã¨ã£ã¦ã®ã¿é–¢ä¿‚ã®ã‚るコメント ã¯ç„¡æœŸé™ã«ä¿å­˜ã•ã‚Œã‚‹ãƒã‚§ãƒ³ã‚¸ãƒ­ã‚°ã«ã¨ã£ã¦é©åˆ‡ã§ã¯ã‚ã‚Šã¾ã›ã‚“。ãã®ãŸã‚ã€ã“ã® -よã†ãªã‚³ãƒ¡ãƒ³ãƒˆã‚‚マーカー行ã®å¾Œã«æ›¸ã‹ã‚Œã‚‹ã¹ãã§ã™ã€‚ファイルåã¯ã‚«ãƒ¼ãƒãƒ«ã‚½ãƒ¼ -スツリーã®ãƒˆãƒƒãƒ—ディレクトリã‹ã‚‰ã®è¡¨è¨˜ã§ãƒªã‚¹ãƒˆã•ã‚Œã‚‹ãŸã‚ã€æ¨ªæ–¹å‘ã®ã‚¹ãƒšãƒ¼ã‚¹ -ã‚’ã¨ã‚ŠéŽãŽãªã„よã†ã«ã€diffstat コマンドã«ã‚ªãƒ—ション「 -p 1 -w 70 ã€ã‚’指定㗠-ã¦ãã ã•ã„(インデントをå«ã‚ã¦ã¡ã‚‡ã†ã©80列ã«åˆã†ã§ã—ょã†)。 +よã†ãªã‚³ãƒ¡ãƒ³ãƒˆã‚‚マーカー行ã®å¾Œã«æ›¸ã‹ã‚Œã‚‹ã¹ãã§ã™ã€‚ +ã“ã®ã‚ˆã†ãªã‚³ãƒ¡ãƒ³ãƒˆã®è‰¯ã„例ã¨ã—ã¦ã€v1 㨠v2 ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³é–“ã§ä½•ãŒå¤‰æ›´ã•ã‚ŒãŸã‹ã‚’ +表ã™ã€Œãƒ‘ッãƒã®å¤‰æ›´å±¥æ­´ã€ãŒæŒ™ã’られã¾ã™ã€‚ + +「 --- ã€ãƒžãƒ¼ã‚«ãƒ¼è¡Œã®å¾Œã« diffstat コマンドã®çµæžœã‚’å«ã‚ã‚‹ã®ã§ã‚ã‚Œã°ã€ãƒ•ã‚¡ã‚¤ãƒ« +åã¯ã‚«ãƒ¼ãƒãƒ«ã‚½ãƒ¼ã‚¹ãƒ„リーã®ãƒˆãƒƒãƒ—ディレクトリã‹ã‚‰ã®è¡¨è¨˜ã§åˆ—記ã•ã‚Œã‚‹ãŸã‚ã€æ¨ªæ–¹å‘ +ã®ã‚¹ãƒšãƒ¼ã‚¹ã‚’ã¨ã‚ŠéŽãŽãªã„よã†ã«ã€diffstat コマンドã«ã‚ªãƒ—ション「 -p 1 -w 70 〠+を指定ã—ã¦ãã ã•ã„(インデントをå«ã‚ã¦ã¡ã‚‡ã†ã©80列ã«åˆã†ã§ã—ょã†)。 é©åˆ‡ãªãƒ‘ッãƒã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã®è©³ç´°ã«ã¤ã„ã¦ã¯ã‚»ã‚¯ã‚·ãƒ§ãƒ³3ã®å‚考文献をå‚ç…§ã—㦠ãã ã•ã„。 +16) 「git pullã€è¦æ±‚ã®é€ã‚Šæ–¹(Linus ã®é›»å­ãƒ¡ãƒ¼ãƒ«ã‹ã‚‰) + +é–“é•ã£ãŸãƒ–ランãƒã‹ã‚‰å¼•ã£å¼µã‚‹ã®ã‚’防ããŸã‚ã«ã€git リãƒã‚¸ãƒˆãƒªã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã¨ +ブランãƒåã‚’åŒã˜è¡Œã«1è¡Œã§è¨˜è¼‰ã—ã¦ãã ã•ã„。ãã†ã™ã‚‹ã“ã¨ã§ã€3回ã®é€£ç¶šã‚¯ãƒªãƒƒã‚¯ +ã§å…¨ã¦é¸æŠžã§ãã¾ã™ã€‚ + +æ­£ã—ã„å½¢å¼ã¯ä¸‹è¨˜ã®é€šã‚Šã§ã™ã€‚ + + "Please pull from + + git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus + + to get these changes:" + +ãã®çµæžœã€ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’自分自身ã§ã‚¿ã‚¤ãƒ”ングã—ã¦é–“é•ãˆã‚‹ã“ã¨ã¯ãªããªã‚Šã¾ã™(実際ã«ã€ +何度ã‹é–“é•ã£ãŸãƒ–ランãƒã‹ã‚‰å¼•ã£å¼µã£ã¦ãã¦ã—ã¾ã„ã€ãã®æ™‚ã« diffstat ã®çµæžœã‚’ +検証ã—ã¦é–“é•ã£ã¦ã„ã‚‹ã“ã¨ã«æ°—ã¥ã„ãŸã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ã©ã“ã‹ã‚‰ä½•ã‚’引ã£å¼µã‚‹ã¹ãã‹ã‚’ +「探ã—ãŸã‚Šã€ã€æ­£ã—ã„ブランãƒåã‹ã©ã†ã‹ã‚’é‡ã­ã¦ãƒã‚§ãƒƒã‚¯ã—ãŸã‚Šã™ã‚‹å¿…è¦ãŒ +ãªããªã‚Œã°ã‚ˆã‚Šå¿«é©ã«ãªã‚‹ã§ã—ょã†)。 + +diffstat ã®çµæžœã‚’生æˆã™ã‚‹ãŸã‚ã«ã€Œ git diff -M --stat --summary ã€ã‚’使ã£ã¦ +ãã ã•ã„。-M オプションã¯ãƒ•ã‚¡ã‚¤ãƒ«åã®å¤‰æ›´ã‚’検知ã§ãã€--summary オプション㯠+æ–°è¦ãƒ•ã‚¡ã‚¤ãƒ«ã€å‰Šé™¤ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã€åå‰ãŒå¤‰æ›´ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®æ¦‚è¦ã‚’生æˆã—ã¾ã™ã€‚ + +-M オプション(ファイルåã®å¤‰æ›´æ¤œçŸ¥)を指定ã™ã‚‹ã¨ã€diffstat ã®çµæžœã¯ã‹ãªã‚Š +ç•°ãªã£ã¦ãã¾ã™ã€‚git ã¯å¤§è¦æ¨¡ãªå¤‰æ›´(追加ã¨å‰Šé™¤ã®ãƒšã‚¢)をファイルåã®å¤‰æ›´ã¨ +判断ã™ã‚‹ãŸã‚ã§ã™ã€‚ + ------------------------------------ セクション2 - ヒントã¨TIPSã¨å°æŠ€ ------------------------------------ @@ -459,7 +620,7 @@ google ã§æ¤œç´¢ã—ãŸãŒã‚‹ã§ã—ょã†ã€‚ も逸脱ã—ã¦ã„ã‚‹ã¨ã€ãƒ¬ãƒ“ューやコメントãªã—ã«å—ã‘å–ã£ã¦ã‚‚らãˆãªã„ã‹ã‚‚ã— ã‚Œã¾ã›ã‚“。 -唯一ã®ç‰¹ç­†ã™ã¹ã例外ã¯ã€ã‚³ãƒ¼ãƒ‰ã‚’ã‚るファイルã‹ã‚‰åˆ¥ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«ç§»å‹• +特筆ã™ã¹ã例外ã¯ã€ã‚³ãƒ¼ãƒ‰ã‚’ã‚るファイルã‹ã‚‰åˆ¥ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«ç§»å‹• ã™ã‚‹ã¨ãã§ã™ã€‚ã“ã®å ´åˆã€ã‚³ãƒ¼ãƒ‰ã‚’移動ã™ã‚‹ãƒ‘ッãƒã§ã¯ã€ç§»å‹•ã•ã‚Œã‚‹ã‚³ãƒ¼ãƒ‰ ã«é–¢ã—ã¦ç§»å‹•ä»¥å¤–ã®å¤‰æ›´ã‚’一切加ãˆã‚‹ã¹ãã§ã¯ã‚ã‚Šã¾ã›ã‚“。ã“ã‚Œã«ã‚ˆã‚Šã€ コードã®ç§»å‹•ã¨ã‚ãªãŸãŒè¡Œã£ãŸã‚³ãƒ¼ãƒ‰ã®ä¿®æ­£ã‚’明確ã«åŒºåˆ¥ã§ãるよã†ã«ãª @@ -553,4 +714,11 @@ Kernel Documentation/CodingStyle: Linus Torvalds's mail on the canonical patch format: + +Andi Kleen, "On submitting kernel patches" + Some strategies to get difficult or controversial changes in. + http://halobates.de/on-submitting-patches.pdf + -- + + diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 40cc653984ee..4ca93898fbd3 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -1846,7 +1846,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. See Documentation/sound/oss/oss-parameters.txt panic= [KNL] Kernel behaviour on panic: delay - seconds before rebooting + timeout > 0: seconds before rebooting + timeout = 0: wait forever + timeout < 0: reboot immediately Format: parkbd.port= [HW] Parallel port number the keyboard adapter is @@ -2526,6 +2528,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ,,,,,,, See also Documentation/input/joystick-parport.txt + udbg-immortal [PPC] When debugging early kernel crashes that + happen after console_init() and before a proper + console driver takes over, this boot options might + help "seeing" what's going on. + uhash_entries= [KNL,NET] Set number of hash buckets for UDP/UDP-Lite connections @@ -2540,6 +2547,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. unknown_nmi_panic [X86] Cause panic on unknown NMI. + usbcore.authorized_default= + [USB] Default USB device authorization: + (default -1 = authorized except for wireless USB, + 0 = not authorized, 1 = authorized) + usbcore.autosuspend= [USB] The autosuspend time delay (in seconds) used for newly-detected USB devices (default 2). This diff --git a/trunk/Documentation/sysctl/kernel.txt b/trunk/Documentation/sysctl/kernel.txt index 1c7fb0a94e28..704e474a93df 100644 --- a/trunk/Documentation/sysctl/kernel.txt +++ b/trunk/Documentation/sysctl/kernel.txt @@ -61,6 +61,7 @@ show up in /proc/sys/kernel: - rtsig-nr - sem - sg-big-buff [ generic SCSI device (sg) ] +- shm_rmid_forced - shmall - shmmax [ sysv ipc ] - shmmni @@ -518,6 +519,27 @@ kernel. This value defaults to SHMMAX. ============================================================== +shm_rmid_forced: + +Linux lets you set resource limits, including how much memory one +process can consume, via setrlimit(2). Unfortunately, shared memory +segments are allowed to exist without association with any process, and +thus might not be counted against any resource limits. If enabled, +shared memory segments are automatically destroyed when their attach +count becomes zero after a detach or a process termination. It will +also destroy segments that were created, but never attached to, on exit +from the process. The only use left for IPC_RMID is to immediately +destroy an unattached segment. Of course, this breaks the way things are +defined, so some applications might stop working. Note that this +feature will do you no good unless you also configure your resource +limits (in particular, RLIMIT_AS and RLIMIT_NPROC). Most systems don't +need this. + +Note that if you change this from 0 to 1, already created segments +without users and with a dead originative process will be destroyed. + +============================================================== + softlockup_thresh: This value can be used to lower the softlockup tolerance threshold. The diff --git a/trunk/Documentation/usb/ehci.txt b/trunk/Documentation/usb/ehci.txt index 9dcafa7d930d..160bd6c3ab7b 100644 --- a/trunk/Documentation/usb/ehci.txt +++ b/trunk/Documentation/usb/ehci.txt @@ -210,3 +210,5 @@ TBD: Interrupt and ISO transfer performance issues. Those periodic transfers are fully scheduled, so the main issue is likely to be how to trigger "high bandwidth" modes. +TBD: More than standard 80% periodic bandwidth allocation is possible +through sysfs uframe_periodic_max parameter. Describe that. diff --git a/trunk/Documentation/usb/gadget_hid.txt b/trunk/Documentation/usb/gadget_hid.txt index f4a51f567427..12696c2e43fb 100644 --- a/trunk/Documentation/usb/gadget_hid.txt +++ b/trunk/Documentation/usb/gadget_hid.txt @@ -81,8 +81,8 @@ Send and receive HID reports to do this. hid_gadget_test is a small interactive program to test the HID - gadget driver. To use, point it at a hidg device and set the - device type (keyboard / mouse / joystick) - E.G.: + gadget driver. To use, point it at a hidg device and set the + device type (keyboard / mouse / joystick) - E.G.: # hid_gadget_test /dev/hidg0 keyboard @@ -97,7 +97,7 @@ Send and receive HID reports HID gadget. Another interesting example is the caps lock test. Type - -–caps-lock and hit return. A report is then sent by the + --caps-lock and hit return. A report is then sent by the gadget and you should receive the host answer, corresponding to the caps lock LED status. diff --git a/trunk/Documentation/zh_CN/email-clients.txt b/trunk/Documentation/zh_CN/email-clients.txt index 5d65e323d060..b9a1a3e6c78d 100644 --- a/trunk/Documentation/zh_CN/email-clients.txt +++ b/trunk/Documentation/zh_CN/email-clients.txt @@ -1,4 +1,4 @@ -锘?Chinese translated version of Documentation/email-clients.txt +Chinese translated version of Documentation/email-clients.txt If you have any comment or update to the content, please contact the original document maintainer directly. However, if you have a problem @@ -8,203 +8,203 @@ or if there is a problem with the translation. Chinese maintainer: Harry Wei --------------------------------------------------------------------- -Documentation/email-clients.txt ???涓????缈æ˜?? +Documentation/email-clients.txt 的中文翻译 -æ¿¡??????å® ??ç’烘????å­˜?版???????????瀹癸??璇风?å­˜?ヨ??绯诲?????妗ｇ??ç¼å­˜?よ?????æ¿¡????æµ£?浣跨?ㄨ?辨?? -浜ゆ???????ä¼´?剧??ç’‡?é”›?涔????浠ュ??涓???????ç¼å­˜?よ??姹???┿??æ¿¡???????缈æ˜????å­˜?é¢???????舵?????缈? -ç’‡?瀛???ã„©??棰?é”›?璇疯??绯讳腑??????ç¼å­˜?よ????? +如果想评论或更新本文的内容，请直接è”系原文档的维护者。如果你使用英文 +交æµæœ‰å›°éš¾çš„è¯ï¼Œä¹Ÿå¯ä»¥å‘中文版维护者求助。如果本翻译更新ä¸åŠæ—¶æˆ–者翻 +译存在问题，请è”系中文版维护者。 -涓???????ç¼å­˜?よ??é”›? ç’惧??æ¿ž? Harry Wei -涓???????缈æ˜?????é”›? ç’惧??æ¿ž? Harry Wei -涓?????????¤?????é”›? Yinglin Luan +中文版维护者： è´¾å¨å¨ Harry Wei +中文版翻译者： è´¾å¨å¨ Harry Wei +中文版校译者： Yinglin Luan Xiaochen Wang yaxinsn -浠ヤ??涓烘?ｆ?? +以下为正文 --------------------------------------------------------------------- -Linux???æµ è·º?㈡?风?????缃?淇℃?? +Linux邮件客户端é…ç½®ä¿¡æ¯ ====================================================================== -?????????缃? +普通é…ç½® ---------------------------------------------------------------------- -Linux?????歌ˉ涓???????æ©????浠惰?????浜ょ??é”›????濂芥??ç›ãƒ¤??æµ£?涓洪??浠朵????????宓?????????????浜?ç¼å­˜?よ?? -??ユ?å •??浠讹??æµ£???????æµ å‰?????瀹规?ç…Ž??æ´?璇ユ??"text/plain"?????惰??é”›????浠朵????????涓?ç’§???????é”›? -???涓鸿??æµ¼?浣胯ˉ涓????寮???ã„©?ã„¥????ㄨ??ç’鸿??绋?涓???????寰???ä¼´?俱?? +Linux内核补ä¸æ˜¯é€šè¿‡é‚®ä»¶è¢«æ交的，最好把补ä¸ä½œä¸ºé‚®ä»¶ä½“的内嵌文本。有些维护者 +接收附件，但是附件的内容格å¼åº”该是"text/plain"。然而，附件一般是ä¸èµžæˆçš„， +因为这会使补ä¸çš„引用部分在评论过程中å˜çš„很困难。 -??ㄦ?ュ?????Linux?????歌ˉ涓???????æµ è·º?㈡?风????ã„¥?????ç›ãƒ¤????è·º??璇ュ??浜?????????????æ¿®???舵?????渚?æ¿¡?é”›? -æµ ?æµ ?涓???芥?ç‘°?????????????ã‚…?惰〃绗???????绌烘?ç¡·???????虫????ㄦ??涓?ç›????寮?澶存?????ç¼?ç俱?? +用æ¥å‘é€Linux内核补ä¸çš„邮件客户端在å‘é€è¡¥ä¸æ—¶åº”该处于文本的原始状æ€ã€‚例如， +他们ä¸èƒ½æ”¹å˜æˆ–者删除制表符或者空格，甚至是在æ¯ä¸€è¡Œçš„开头或者结尾。 -涓?ç‘•????æ©?"format=flowed"妯″????????ç›ãƒ¤?????æ©???蜂??寮?璧蜂?????棰????浠ュ?????瀹崇?????ç›???? +ä¸è¦é€šè¿‡"format=flowed"模å¼å‘é€è¡¥ä¸ã€‚这样会引起ä¸å¯é¢„期以åŠæœ‰å®³çš„断行。 -涓?ç‘•?ç’â•€????????æµ è·º?㈡?风??æ©?ç›??????ㄦ?㈣?????æ©???蜂??æµ¼???æ‘??æµ£????ç›ãƒ¤????? +ä¸è¦è®©ä½ çš„邮件客户端进行自动æ¢è¡Œã€‚这样也会破åä½ çš„è¡¥ä¸ã€‚ -???æµ è·º?㈡?风??涓???芥?ç‘°???????????瀛?ç»—????缂??????ç‘°?????ç‘•??????????ç›ãƒ¤???????芥??ASCII??????UTF-8缂??????ç‘°??é”›? -æ¿¡????æµ£?浣跨??UTF-8缂??????ç‘°???????????浠讹????ｄ??æµ£?ç?æµ¼???åž®??涓?浜??????è—‰????????瀛?ç»—???????棰???? +邮件客户端ä¸èƒ½æ”¹å˜æ–‡æœ¬çš„字符集编ç æ–¹å¼ã€‚è¦å‘é€çš„è¡¥ä¸åªèƒ½æ˜¯ASCII或者UTF-8ç¼–ç æ–¹å¼ï¼Œ +如果你使用UTF-8ç¼–ç æ–¹å¼å‘é€é‚®ä»¶ï¼Œé‚£ä¹ˆä½ å°†ä¼šé¿å…一些å¯èƒ½å‘生的字符集问题。 -???æµ è·º?㈡?风??æ´?璇ュ舰???骞朵??æ·‡???? References: ?????? In-Reply-To: ???棰?é”›???ｄ?? -???浠惰??棰?çå˜??æµ¼?涓??????? +邮件客户端应该形æˆå¹¶ä¸”ä¿æŒ References: 或者 In-Reply-To: 标题，那么 +邮件è¯é¢˜å°±ä¸ä¼šä¸­æ–­ã€‚ -澶???å‰??甯?(?????????ç’寸??甯?)???甯é•????ç•Œ?ㄤ??ç›ãƒ¤??é”›????涓哄?惰〃绗?æµ¼?æž????涓虹┖??笺??浣跨??xclipboard, xclip -??????xcutsel涔?ç’稿??浠ワ??æµ£???????濂芥??ç’‡?涓?涓?????????åž®??浣跨?ã„¥????å‰??甯???? +å¤åˆ¶ç²˜å¸–(或者剪贴粘帖)通常ä¸èƒ½ç”¨äºŽè¡¥ä¸ï¼Œå› ä¸ºåˆ¶è¡¨ç¬¦ä¼šè½¬æ¢ä¸ºç©ºæ ¼ã€‚使用xclipboard, xclip +或者xcutsel也许å¯ä»¥ï¼Œä½†æ˜¯æœ€å¥½æµ‹è¯•ä¸€ä¸‹æˆ–者é¿å…使用å¤åˆ¶ç²˜å¸–。 -涓?ç‘•???ㄤ娇???PGP/GPG缃æ’????????浠朵腑??????ç›ãƒ¤?????æ©???蜂??浣垮??寰?澶???????涓???借?诲??????????ㄤ??æµ£????ç›ãƒ¤????? -é”›?æ©?涓????棰?æ´?璇ユ?????浠ヤ慨澶????é”›? +ä¸è¦åœ¨ä½¿ç”¨PGP/GPGç½²å的邮件中包å«è¡¥ä¸ã€‚这样会使得很多脚本ä¸èƒ½è¯»å–和适用于你的补ä¸ã€‚ +（这个问题应该是å¯ä»¥ä¿®å¤çš„） -??ㄧ???????æ??æµ è·º??ç›ã„¥?????ç›ãƒ¤??涔????é”›?ç¼????宸åž?????涓?涓?ç›ãƒ¤?????涓?涓???????涓绘??é”›?æ·‡?瀛???ユ?è·º?扮?? -???浠讹??ç?ç›ãƒ¤?????'patch'??戒护???涓?é”›?æ¿¡??????????浜?é”›????ç¼??????æ??æµ è·º??ç›ã„¥???????? +在给内核邮件列表å‘é€è¡¥ä¸ä¹‹å‰ï¼Œç»™è‡ªå·±å‘é€ä¸€ä¸ªè¡¥ä¸æ˜¯ä¸ªä¸é”™çš„主æ„，ä¿å­˜æŽ¥æ”¶åˆ°çš„ +邮件，将补ä¸ç”¨'patch'命令打上，如果æˆåŠŸäº†ï¼Œå†ç»™å†…核邮件列表å‘é€ã€‚ -涓?浜????æµ è·º?㈡?风?????绀? +一些邮件客户端æ示 ---------------------------------------------------------------------- -æ©????ç¼???è½°??浜?ç’‡?ç¼????MUA???缃????绀猴?????浠ョ?ㄤ??ç¼?Linux?????稿?????ç›ãƒ¤?????æ©?浜?骞朵???????虫?? -?????????æž?æµ è·º?????缃???è¤????? +这里给出一些详细的MUAé…ç½®æ示，å¯ä»¥ç”¨äºŽç»™Linux内核å‘é€è¡¥ä¸ã€‚这些并ä¸æ„味是 +所有的软件包é…置总结。 -璇存??é”›? -TUI = 浠ユ?????涓哄?虹???????ㄦ?锋?ュ?? -GUI = ??惧舰?????㈢?ㄦ?锋?ュ?? +说明： +TUI = ä»¥æ–‡æœ¬ä¸ºåŸºç¡€çš„ç”¨æˆ·æŽ¥å£ +GUI = 图形界é¢ç”¨æˆ·æŽ¥å£ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Alpine (TUI) -???缃????椤癸?? -???"Sending Preferences"??ã„¥??é”›? +é…置选项： +在"Sending Preferences"部分： -- "Do Not Send Flowed Text"蹇?椤诲????? -- "Strip Whitespace Before Sending"蹇?椤诲?抽?? +- "Do Not Send Flowed Text"å¿…é¡»å¼€å¯ +- "Strip Whitespace Before Sending"必须关闭 -褰???????浠舵?讹????????æ´?璇ユ?惧?ㄨˉ涓?æµ¼???虹?扮????版?癸????è·º?????涓?CTRL-Rç¼???????é”›?浣挎??瀹???? -ç›ãƒ¤?????æµ è·º????ュ?ä¼´??浠朵腑??? +当写邮件时，光标应该放在补ä¸ä¼šå‡ºçŽ°çš„地方，然åŽæŒ‰ä¸‹CTRL-R组åˆé”®ï¼Œä½¿æŒ‡å®šçš„ +è¡¥ä¸æ–‡ä»¶åµŒå…¥åˆ°é‚®ä»¶ä¸­ã€‚ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Evolution (GUI) -涓?浜?寮????????????????浣跨?ã„¥????????ç›ãƒ¤?? +一些开å‘者æˆåŠŸçš„使用它å‘é€è¡¥ä¸ -褰??????â•…??æµ å •??椤癸??Preformat - æµ ?Format->Heading->Preformatted (Ctrl-7)??????宸ュ?锋?? +当选择邮件选项：Preformat + 从Format->Heading->Preformatted (Ctrl-7)æˆ–è€…å·¥å…·æ  -??è·º??浣跨??é”›? - Insert->Text File... (Alt-n x)?????ヨˉ涓????浠躲?? +然åŽä½¿ç”¨ï¼š + Insert->Text File... (Alt-n x)æ’入补ä¸æ–‡ä»¶ã€‚ -æµ£?æ©????æµ ?"diff -Nru old.c new.c | xclip"é”›???????Preformaté”›???è·º??浣跨?ㄤ腑??æ’®??æ©?ç›?ç»®?甯???? +你还å¯ä»¥"diff -Nru old.c new.c | xclip"，选择Preformat，然åŽä½¿ç”¨ä¸­é—´é”®è¿›è¡Œç²˜å¸–。 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Kmail (GUI) -涓?浜?寮????????????????浣跨?ã„¥????????ç›ãƒ¤????? +一些开å‘者æˆåŠŸçš„使用它å‘é€è¡¥ä¸ã€‚ -榛?ç’よ?剧疆涓?涓?HTML??ç…Ž??????????????é”›?涓?ç‘•??????ã„¥????? +默认设置ä¸ä¸ºHTMLæ ¼å¼æ˜¯åˆé€‚çš„ï¼›ä¸è¦å¯ç”¨å®ƒã€‚ -褰?涔????涓?ç????æµ å‰????è·º??é”›???ã„©??椤逛?????涓?ç‘•??????â•„????ㄦ?㈣????????涓????缂虹?ç‘°æ°¨???æµ£???ã„©??浠朵腑æˆ???ョ??浠讳???????? -??戒??æµ¼?çš??????ㄦ?㈣??é”›????å§ã‚„??蹇?椤诲?ã„¥?????ç›ãƒ¤??涔?????????ㄦ?㈣????????ç» ?????????规??ç辨???????ㄨ????ㄦ?㈣????ヤ功??????浠讹?? -??è·º?????瀹?æ·‡?瀛?涓鸿??绋裤??涓????æµ£???ㄨ??绋夸腑???娆℃??寮?瀹?é”›?瀹?宸茬????ã„©?ㄨ????ㄦ?㈣??浜?é”›???ｄ??æµ£???????浠惰?ç•Œ?舵病??? -?????â•„????ㄦ?㈣??é”›?æµ£????æ©?涓?æµ¼?澶åž?诲凡???????????ㄦ?㈣????? +当书写一å°é‚®ä»¶çš„时候，在选项下é¢ä¸è¦é€‰æ‹©è‡ªåŠ¨æ¢è¡Œã€‚唯一的缺点就是你在邮件中输入的任何文本 +都ä¸ä¼šè¢«è‡ªåŠ¨æ¢è¡Œï¼Œå› æ­¤ä½ å¿…须在å‘é€è¡¥ä¸ä¹‹å‰æ‰‹åŠ¨æ¢è¡Œã€‚最简å•çš„方法就是å¯ç”¨è‡ªåŠ¨æ¢è¡Œæ¥ä¹¦å†™é‚®ä»¶ï¼Œ +然åŽæŠŠå®ƒä¿å­˜ä¸ºè‰ç¨¿ã€‚一旦你在è‰ç¨¿ä¸­å†æ¬¡æ‰“开它，它已ç»å…¨éƒ¨è‡ªåŠ¨æ¢è¡Œäº†ï¼Œé‚£ä¹ˆä½ çš„邮件虽然没有 +选择自动æ¢è¡Œï¼Œä½†æ˜¯è¿˜ä¸ä¼šå¤±åŽ»å·²æœ‰çš„自动æ¢è¡Œã€‚ -??ã„©??æµ å‰??æ´????é”›??????ヨˉ涓?涔????é”›???å¥??甯哥?ㄧ??ç›ãƒ¤??瀹????ç»—?é”›?涓?涓?æ©?瀛????(---)??? +在邮件的底部，æ’入补ä¸ä¹‹å‰ï¼Œæ”¾ä¸Šå¸¸ç”¨çš„è¡¥ä¸å®šç•Œç¬¦ï¼šä¸‰ä¸ªè¿žå­—å·(---)。 -??è·º?????"Message"????????＄??é”›??????â•‚????ユ??浠讹????ョ????????æµ£????ç›ãƒ¤?????浠躲??æ©????涓?涓?棰?澶???????椤癸??æµ£????æµ ? -???æ©?瀹????缃?æµ£???????浠跺缓绔?宸ュ?锋????????é”›?æ©????浠ュ甫涓?"insert file"??炬????? +然åŽåœ¨"Message"èœå•æ¡ç›®ï¼Œé€‰æ‹©æ’入文件，接ç€é€‰å–ä½ çš„è¡¥ä¸æ–‡ä»¶ã€‚还有一个é¢å¤–的选项，你å¯ä»¥ +通过它é…置你的邮件建立工具æ èœå•ï¼Œè¿˜å¯ä»¥å¸¦ä¸Š"insert file"图标。 -æµ£????浠ュ????ã„¥?ä¼´??æ©?GPG???ç’ä¼´??浠讹??æµ£???????宓?ç›ãƒ¤?????濂戒??ç‘•?浣跨??GPG???ç’æ¿??æµ ????æµ£?涓哄??宓??????????绛惧??ç›ãƒ¤??é”›? -褰?æµ ?GPG涓???????7æµ£?缂??????朵??浣夸??æµ ?????????æ‘??澶??????? +ä½ å¯ä»¥å®‰å…¨åœ°é€šè¿‡GPG标记附件，但是内嵌补ä¸æœ€å¥½ä¸è¦ä½¿ç”¨GPG标记它们。作为内嵌文本的签å‘è¡¥ä¸ï¼Œ +当从GPG中æå–7ä½ç¼–ç æ—¶ä¼šä½¿ä»–们å˜çš„更加å¤æ‚。 -æ¿¡????æµ£????ç‘•?浠ラ??æµ å‰??褰㈠????????ç›ãƒ¤??é”›???ｄ??çåž?抽????ç‘°?å©š??浠讹????è·º?????涓?çž???Ñ??ç»????"Suggest automatic -display"é”›?æ©???å³°??宓????浠舵?æ‘?规??ç’â•„?æ˜???????般?? +如果你éžè¦ä»¥é™„件的形å¼å‘é€è¡¥ä¸ï¼Œé‚£ä¹ˆå°±å³é”®ç‚¹å‡»é™„件，然åŽé€‰ä¸­å±žæ€§ï¼Œçªå‡º"Suggest automatic +display"，这样内嵌附件更容易让读者看到。 -褰?æµ£?ç‘•?æ·‡?瀛?ç?ç‘•?????????????宓???????ç›ãƒ¤??é”›?æµ£????浠ヤ??娑???????ç›ã„§????奸????â•?????ç›ãƒ¤????????浠讹????è·º????冲?å©š????? -"save as"???æµ£????浠ヤ娇??ㄤ??涓?娌℃????å­˜?圭????????ç›ãƒ¤????????浠讹??æ¿¡????瀹????浠ユ?ｇ‘???褰㈠??ç¼???????褰?æµ£?å§ï½‡????ã„¥?? -???宸辩??ç»???ｄ??涓?瀵????é”›???ｆ?舵病??????椤瑰??浠ヤ??瀛????æµ ?--宸茬?????涓?涓?æ©???风??bugçš?姹???ュ?é¢??kmail???bugzilla -骞朵??甯????æ©?ç?æµ¼?çš?澶??????????浠舵??浠ュ?????瀵规??涓???ㄦ?å³°??璇诲???????????çš?æ·‡?瀛????é”›????浠ュ?????æµ£???虫?????æµ è·º????è·º?æ¿?朵????版?癸?? -æµ£?涓?寰?涓????æµ ?æµ ????????????逛负ç¼?????????ç¿ ?????璇汇?? +当你è¦ä¿å­˜å°†è¦å‘é€çš„内嵌文本补ä¸ï¼Œä½ å¯ä»¥ä»Žæ¶ˆæ¯åˆ—表窗格选择包å«è¡¥ä¸çš„邮件，然åŽå³å‡»é€‰æ‹© +"save as"。你å¯ä»¥ä½¿ç”¨ä¸€ä¸ªæ²¡æœ‰æ›´æ”¹çš„包å«è¡¥ä¸çš„邮件，如果它是以正确的形å¼ç»„æˆã€‚当你正真在它 +自己的窗å£ä¹‹ä¸‹å¯Ÿçœ‹ï¼Œé‚£æ—¶æ²¡æœ‰é€‰é¡¹å¯ä»¥ä¿å­˜é‚®ä»¶--å·²ç»æœ‰ä¸€ä¸ªè¿™æ ·çš„bug被汇报到了kmailçš„bugzilla +并且希望这将会被处ç†ã€‚邮件是以åªé’ˆå¯¹æŸä¸ªç”¨æˆ·å¯è¯»å†™çš„æƒé™è¢«ä¿å­˜çš„，所以如果你想把邮件å¤åˆ¶åˆ°å…¶ä»–地方， +ä½ ä¸å¾—ä¸æŠŠä»–们的æƒé™æ”¹ä¸ºç»„或者整体å¯è¯»ã€‚ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Lotus Notes (GUI) -涓?ç‘•?浣跨?ã„¥????? +ä¸è¦ä½¿ç”¨å®ƒã€‚ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Mutt (TUI) -寰?澶?Linux寮????浜哄??浣跨??mutt瀹㈡?风??é”›????浠ヨ?????瀹????瀹?宸ヤ????????甯告??浜???? +很多Linuxå¼€å‘人员使用mutt客户端，所以è¯æ˜Žå®ƒè‚¯å®šå·¥ä½œçš„éžå¸¸æ¼‚亮。 -Mutt涓????甯?缂?æˆ????é”›????浠ヤ??绠′??浣跨?ㄤ??涔?缂?æˆ???ã„©?戒??æ´?璇ュ甫????????ㄦ??ç›????澶у????扮??æˆ???ã„©?藉甫??? -涓?涓?"insert file"???椤癸??瀹????浠ラ??æ©?涓???ç‘°?????æµ è·º??瀹圭????ç‘°???????ユ??浠躲?? +Muttä¸è‡ªå¸¦ç¼–辑器，所以ä¸ç®¡ä½ ä½¿ç”¨ä»€ä¹ˆç¼–辑器都ä¸åº”该带有自动断行。大多数编辑器都带有 +一个"insert file"选项，它å¯ä»¥é€šè¿‡ä¸æ”¹å˜æ–‡ä»¶å†…容的方å¼æ’入文件。 -'vim'æµ£?涓?mutt???缂?æˆ????é”›? +'vim'作为mutt的编辑器： set editor="vi" - æ¿¡????浣跨??xclipé”›???æ’?ヤ互涓???戒护 + 如果使用xclip，敲入以下命令 :set paste - ???涓????涔??????????shift-insert??????浣跨?? + 按中键之å‰æˆ–者shift-insert或者使用 :r filename -æ¿¡??????å® ?????ç›ãƒ¤??æµ£?涓哄??宓?????????? -(a)ttach宸ヤ?????寰?æ¿‚æ–¤??涓?甯????"set paste"??? +如果想è¦æŠŠè¡¥ä¸ä½œä¸ºå†…嵌文本。 +(a)ttach工作的很好，ä¸å¸¦æœ‰"set paste"。 -???缃????椤癸?? -瀹?æ´?璇ヤ互榛?ç’よ?剧疆???褰㈠??宸ヤ????? -??惰??é”›????"send_charset"ç’剧疆涓?"us-ascii::utf-8"涔????涓?涓?涓???????涓绘????? +é…置选项： +它应该以默认设置的形å¼å·¥ä½œã€‚ +然而，把"send_charset"设置为"us-ascii::utf-8"也是一个ä¸é”™çš„主æ„。 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Pine (TUI) -Pineæ©???绘??涓?浜?绌烘?ç…Ž????????棰?é”›?æµ£????æ©?浜???æ¿?ã„¥??璇ラ?借??æ·‡?澶?浜???? +Pine过去有一些空格删å‡é—®é¢˜ï¼Œä½†æ˜¯è¿™äº›çŽ°åœ¨åº”该都被修å¤äº†ã€‚ -æ¿¡???????浠ワ??璇蜂娇???alpine(pine???ç¼Ñ„?胯??) +如果å¯ä»¥ï¼Œè¯·ä½¿ç”¨alpine(pine的继承者) -???缃????椤癸?? -- ???æ©?????????????ç‘•?娑???ゆ??绋??????? -- "no-strip-whitespace-before-send"???椤逛????????ç‘•??????? +é…置选项： +- 最近的版本需è¦æ¶ˆé™¤æµç¨‹æ–‡æœ¬ +- "no-strip-whitespace-before-send"选项也是需è¦çš„。 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Sylpheed (GUI) -- ???宓??????????浠ュ??æ¿‚ç•Œ??宸ヤ??é”›???????浣跨?ã„©??浠讹????? -- ???ç’é•å¨‡??ã„¥????ㄧ??缂?æˆ???ã„£?? -- 瀵逛?????褰?æˆ?澶???å •??甯告????? -- æ¿¡???????æ©?non-SSLæ©???ワ?????娉?浣跨??TLS SMTP????????? -- ??ㄧ?????ç»???ｄ腑???涓?涓?寰??????ㄧ??ruler bar??? -- ç¼???æ¿?????涓?娣诲????æ¿??çå˜??æµ¼?å§ï½‡â€˜???浜?瑙ｆ?剧ãš?????? +- 内嵌文本å¯ä»¥å¾ˆå¥½çš„工作（或者使用附件）。 +- å…许使用外部的编辑器。 +- 对于目录较多时éžå¸¸æ…¢ã€‚ +- 如果通过non-SSL连接，无法使用TLS SMTP授æƒã€‚ +- 在组æˆçª—å£ä¸­æœ‰ä¸€ä¸ªå¾ˆæœ‰ç”¨çš„ruler bar。 +- 给地å€æœ¬ä¸­æ·»åŠ åœ°å€å°±ä¸ä¼šæ­£ç¡®çš„了解显示å。 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Thunderbird (GUI) -榛?ç’ゆ????å…¸??é”›?thunderbird寰?瀹规??????????????é”›?æµ£????æ©????涓?浜???规?????浠ュ己??è·º?????寰???æ‘ソ??? +默认情况下，thunderbird很容易æŸå文本，但是还有一些方法å¯ä»¥å¼ºåˆ¶å®ƒå˜å¾—更好。 -- ??ㄧ?ㄦ?å³°????ç–¯?剧疆???é”›?ç¼???????瀵诲??é”›?涓?ç‘•???????"Compose messages in HTML format"??? +- 在用户å¸å·è®¾ç½®é‡Œï¼Œç»„æˆå’Œå¯»å€ï¼Œä¸è¦é€‰æ‹©"Compose messages in HTML format"。 -- 缂?æˆ?æµ£????Thunderbird???缃?ç’剧疆??ヤ娇瀹?涓?ç‘•????ç›?浣跨??é”›?user_pref("mailnews.wraplength", 0); +- 编辑你的Thunderbirdé…置设置æ¥ä½¿å®ƒä¸è¦æ‹†è¡Œä½¿ç”¨ï¼šuser_pref("mailnews.wraplength", 0); -- 缂?æˆ?æµ£????Thunderbird???缃?ç’剧疆锛?浣垮??涓?ç‘•?浣跨??"format=flowed"??ç…Ž??é”›?user_pref("mailnews. +- 编辑你的Thunderbirdé…置设置，使它ä¸è¦ä½¿ç”¨"format=flowed"æ ¼å¼ï¼šuser_pref("mailnews. send_plaintext_flowed", false); -- æµ£????ç‘•?æµ£?Thunderbird???涓洪???????ç…Ž????ç‘°??é”›? - æ¿¡????榛?ç’ゆ????å…¸??æµ£?涔??????????HTML??ç…Ž??é”›???ｄ?????寰???俱??æµ ?æµ ?æµ ????棰???????涓????妗?涓???????"Preformat"??ç…Ž????? - æ¿¡????榛?ç’ゆ????å…¸??æµ£?涔??????????????????ç…Ž??é”›?æµ£?涓?寰????瀹???逛负HTML??ç…Ž??é”›?æµ ?æµ ?æµ£?涓轰??娆℃?Ñ…??é”›???ヤ功?????扮??娑????é”›? - ??è·º??寮哄?朵娇瀹??????版???????ç…Ž??é”›???????瀹?çå˜?????ç›????ç‘•?瀹???æ¿??é”›???ã„¥??淇＄????炬??涓?浣跨??shift?????ヤ娇瀹????涓?HTML - ??ç…Ž??é”›???è·º?????棰???????涓????妗?涓???????"Preformat"??ç…Ž????? +- 你需è¦ä½¿Thunderbirdå˜ä¸ºé¢„先格å¼æ–¹å¼ï¼š + 如果默认情况下你书写的是HTMLæ ¼å¼ï¼Œé‚£ä¸æ˜¯å¾ˆéš¾ã€‚仅仅从标题æ çš„下拉框中选择"Preformat"æ ¼å¼ã€‚ + 如果默认情况下你书写的是文本格å¼ï¼Œä½ ä¸å¾—把它改为HTMLæ ¼å¼ï¼ˆä»…仅作为一次性的）æ¥ä¹¦å†™æ–°çš„消æ¯ï¼Œ + 然åŽå¼ºåˆ¶ä½¿å®ƒå›žåˆ°æ–‡æœ¬æ ¼å¼ï¼Œå¦åˆ™å®ƒå°±ä¼šæ‹†è¡Œã€‚è¦å®žçŽ°å®ƒï¼Œåœ¨å†™ä¿¡çš„图标上使用shifté”®æ¥ä½¿å®ƒå˜ä¸ºHTML + æ ¼å¼ï¼Œç„¶åŽæ ‡é¢˜æ çš„下拉框中选择"Preformat"æ ¼å¼ã€‚ -- ???ç’é•å¨‡??ã„¥????ㄧ??缂?æˆ????é”›? - ???瀵?Thunderbird???ç›ãƒ¤?????ç» ?????????规??ç辨??浣跨?ㄤ??涓?"external editor"??â•??é”›???è·º??浣跨?ㄤ????????娆㈢?? - $EDITOR??ヨ?诲???????????骞惰ˉ涓???版?????涓????ç‘•?瀹???æ¿??é”›????浠ヤ??æžè—‰è‹Ÿæ¶“?瀹?ç‘?æ©?涓???â•??é”›???è·º??娣诲??涓?涓?浣跨?ã„¥????? - ??????View->Toolbars->Customize...??????褰?æµ£?涔????淇℃???????è·º??æµ ?æµ ???ç‘°?诲??çåž??浠ヤ????? +- å…许使用外部的编辑器： + 针对Thunderbird打补ä¸æœ€ç®€å•çš„方法就是使用一个"external editor"扩展，然åŽä½¿ç”¨ä½ æœ€å–œæ¬¢çš„ + $EDITORæ¥è¯»å–或者åˆå¹¶è¡¥ä¸åˆ°æ–‡æœ¬ä¸­ã€‚è¦å®žçŽ°å®ƒï¼Œå¯ä»¥ä¸‹è½½å¹¶ä¸”安装这个扩展，然åŽæ·»åŠ ä¸€ä¸ªä½¿ç”¨å®ƒçš„ + 按键View->Toolbars->Customize...最åŽå½“你书写信æ¯çš„时候仅仅点击它就å¯ä»¥äº†ã€‚ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ TkRat (GUI) -???浠ヤ娇??ã„¥?????浣跨??"Insert file..."??????澶???ㄧ??缂?æˆ???ã„£?? +å¯ä»¥ä½¿ç”¨å®ƒã€‚使用"Insert file..."或者外部的编辑器。 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Gmail (Web GUI) -涓?ç‘•?浣跨?ã„¥????????ç›ãƒ¤????? +ä¸è¦ä½¿ç”¨å®ƒå‘é€è¡¥ä¸ã€‚ -Gmail缃?椤é›?㈡?风???????ã„¥?版????惰〃绗?æž????涓虹┖??笺?? +Gmail网页客户端自动地把制表符转æ¢ä¸ºç©ºæ ¼ã€‚ -??ç•Œ?è·º?惰〃绗?æž????涓虹┖??奸??棰????浠ヨ??澶???ㄧ??æˆ???ㄨВ??ç­¹???????è·º??æ©?æµ¼?浣跨?ã„¥??æž???㈣?????姣?ç›???????涓?78涓?瀛?ç»—???? +虽然制表符转æ¢ä¸ºç©ºæ ¼é—®é¢˜å¯ä»¥è¢«å¤–部编辑器解决，åŒæ—¶å®ƒè¿˜ä¼šä½¿ç”¨å›žè½¦æ¢è¡ŒæŠŠæ¯è¡Œæ‹†åˆ†ä¸º78个字符。 -???涓?涓????棰????Gmailæ©?æµ¼????浠讳??涓????ASCII???瀛?ç»—????淇℃????逛负base64缂???????瀹????涓?ç‘—åž®????????娆ф床浜虹?????瀛???? +å¦ä¸€ä¸ªé—®é¢˜æ˜¯Gmail还会把任何ä¸æ˜¯ASCII的字符的信æ¯æ”¹ä¸ºbase64ç¼–ç ã€‚它把东西å˜çš„åƒæ¬§æ´²äººçš„å字。 ### diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 91e5cc7db8c8..7b2e9e85e427 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -734,6 +734,12 @@ T: git git://git.berlios.de/gemini-board S: Maintained F: arch/arm/mach-gemini/ +ARM/CSR SIRFPRIMA2 MACHINE SUPPORT +M: Barry Song +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +S: Maintained +F: arch/arm/mach-prima2/ + ARM/EBSA110 MACHINE SUPPORT M: Russell King L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -1546,9 +1552,10 @@ F: drivers/net/tg3.* BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER M: Brett Rudley M: Henry Ptasinski -M: Dowan Kim M: Roland Vossen M: Arend van Spriel +M: Franky (Zhenhui) Lin +M: Kan Yan L: linux-wireless@vger.kernel.org S: Supported F: drivers/staging/brcm80211/ @@ -3012,7 +3019,7 @@ F: kernel/hrtimer.c F: kernel/time/clockevents.c F: kernel/time/tick*.* F: kernel/time/timer_*.c -F: include/linux/clockevents.h +F: include/linux/clockchips.h F: include/linux/hrtimer.h HIGH-SPEED SCC DRIVER FOR AX.25 @@ -3895,7 +3902,7 @@ F: arch/powerpc/platforms/512x/ F: arch/powerpc/platforms/52xx/ LINUX FOR POWERPC EMBEDDED PPC4XX -M: Josh Boyer +M: Josh Boyer M: Matt Porter W: http://www.penguinppc.org/ L: linuxppc-dev@lists.ozlabs.org @@ -3927,6 +3934,7 @@ W: http://www.penguinppc.org/ L: linuxppc-dev@lists.ozlabs.org S: Maintained F: arch/powerpc/platforms/83xx/ +F: arch/powerpc/platforms/85xx/ LINUX FOR POWERPC PA SEMI PWRFICIENT M: Olof Johansson @@ -4215,9 +4223,10 @@ F: drivers/usb/image/microtek.* MIPS M: Ralf Baechle -W: http://www.linux-mips.org/ L: linux-mips@linux-mips.org +W: http://www.linux-mips.org/ T: git git://git.linux-mips.org/pub/scm/linux.git +Q: http://patchwork.linux-mips.org/project/linux-mips/list/ S: Supported F: Documentation/mips/ F: arch/mips/ @@ -6091,6 +6100,145 @@ L: devel@driverdev.osuosl.org S: Maintained F: drivers/staging/ +STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS +M: Henk de Groot +S: Odd Fixes +F: drivers/staging/wlags49_h2/ +F: drivers/staging/wlags49_h25/ + +STAGING - ASUS OLED +M: Jakub Schmidtke +S: Odd Fixes +F: drivers/staging/asus_oled/ + +STAGING - ATHEROS ATH6KL WIRELESS DRIVER +M: Luis R. Rodriguez +M: Naveen Singh +S: Odd Fixes +F: drivers/staging/ath6kl/ + +STAGING - COMEDI +M: Ian Abbott +M: Mori Hess +S: Odd Fixes +F: drivers/staging/comedi/ + +STAGING - CRYSTAL HD VIDEO DECODER +M: Naren Sankar +M: Jarod Wilson +M: Scott Davilla +M: Manu Abraham +S: Odd Fixes +F: drivers/staging/crystalhd/ + +STAGING - CYPRESS WESTBRIDGE SUPPORT +M: David Cross +S: Odd Fixes +F: drivers/staging/westbridge/ + +STAGING - ECHO CANCELLER +M: Steve Underwood +M: David Rowe +S: Odd Fixes +F: drivers/staging/echo/ + +STAGING - FLARION FT1000 DRIVERS +M: Marek Belisko +S: Odd Fixes +F: drivers/staging/ft1000/ + +STAGING - FRONTIER TRANZPORT AND ALPHATRACK +M: David Täht +S: Odd Fixes +F: drivers/staging/frontier/ + +STAGING - HYPER-V (MICROSOFT) +M: Hank Janssen +M: Haiyang Zhang +S: Odd Fixes +F: drivers/staging/hv/ + +STAGING - INDUSTRIAL IO +M: Jonathan Cameron +L: linux-iio@vger.kernel.org +S: Odd Fixes +F: drivers/staging/iio/ + +STAGING - LIRC (LINUX INFRARED REMOTE CONTROL) DRIVERS +M: Jarod Wilson +W: http://www.lirc.org/ +S: Odd Fixes +F: drivers/staging/lirc/ + +STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON) +M: Andres Salomon +M: Chris Ball +M: Jon Nettleton +W: http://wiki.laptop.org/go/DCON +S: Odd Fixes +F: drivers/staging/olpc_dcon/ + +STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER +M: Willy Tarreau +S: Odd Fixes +F: drivers/staging/panel/ + +STAGING - REALTEK RTL8712U DRIVERS +M: Larry Finger +M: Florian Schilhabel . +S: Odd Fixes +F: drivers/staging/rtl8712/ + +STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER +M: Teddy Wang +S: Odd Fixes +F: drivers/staging/sm7xx/ + +STAGING - SOFTLOGIC 6x10 MPEG CODEC +M: Ben Collins +S: Odd Fixes +F: drivers/staging/solo6x10/ + +STAGING - SPEAKUP CONSOLE SPEECH DRIVER +M: William Hubbs +M: Chris Brannon +M: Kirk Reiser +M: Samuel Thibault +L: speakup@braille.uwo.ca +W: http://www.linux-speakup.org/ +S: Odd Fixes +F: drivers/staging/speakup/ + +STAGING - TI DSP BRIDGE DRIVERS +M: Omar Ramirez Luna +S: Odd Fixes +F: drivers/staging/tidspbridge/ + +STAGING - TRIDENT TVMASTER TMxxxx USB VIDEO CAPTURE DRIVERS +L: linux-media@vger.kernel.org +S: Odd Fixes +F: drivers/staging/tm6000/ + +STAGING - USB ENE SM/MS CARD READER DRIVER +M: Al Cho +S: Odd Fixes +F: drivers/staging/keucr/ + +STAGING - VIA VT665X DRIVERS +M: Forest Bond +S: Odd Fixes +F: drivers/staging/vt665?/ + +STAGING - WINBOND IS89C35 WLAN USB DRIVER +M: Pavel Machek +S: Odd Fixes +F: drivers/staging/winbond/ + +STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER +M: Arnaud Patard +S: Odd Fixes +F: drivers/staging/xgifb/ + STARFIRE/DURALAN NETWORK DRIVER M: Ion Badulescu S: Odd Fixes @@ -6593,13 +6741,6 @@ W: http://pegasus2.sourceforge.net/ S: Maintained F: drivers/net/usb/rtl8150.c -USB SE401 DRIVER -L: linux-usb@vger.kernel.org -W: http://www.chello.nl/~j.vreeken/se401/ -S: Orphan -F: Documentation/video4linux/se401.txt -F: drivers/staging/se401/ - USB SERIAL BELKIN F5U103 DRIVER M: William Greathouse L: linux-usb@vger.kernel.org diff --git a/trunk/arch/alpha/include/asm/atomic.h b/trunk/arch/alpha/include/asm/atomic.h index e756d04b6cd5..640f909ddd41 100644 --- a/trunk/arch/alpha/include/asm/atomic.h +++ b/trunk/arch/alpha/include/asm/atomic.h @@ -176,15 +176,15 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v) #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) /** - * atomic_add_unless - add unless the number is a given value + * __atomic_add_unless - add unless the number is a given value * @v: pointer of type atomic_t * @a: the amount to add to v... * @u: ...unless v is equal to u. * * Atomically adds @a to @v, so long as it was not @u. - * Returns non-zero if @v was not @u, and zero otherwise. + * Returns the old value of @v. */ -static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) +static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u) { int c, old; c = atomic_read(v); @@ -196,10 +196,9 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) break; c = old; } - return c != (u); + return c; } -#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) /** * atomic64_add_unless - add unless the number is a given value @@ -208,7 +207,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) * @u: ...unless v is equal to u. * * Atomically adds @a to @v, so long as it was not @u. - * Returns non-zero if @v was not @u, and zero otherwise. + * Returns the old value of @v. */ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) { @@ -256,5 +255,4 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) #define smp_mb__before_atomic_inc() smp_mb() #define smp_mb__after_atomic_inc() smp_mb() -#include #endif /* _ALPHA_ATOMIC_H */ diff --git a/trunk/arch/alpha/include/asm/bitops.h b/trunk/arch/alpha/include/asm/bitops.h index 85b815215776..a19ba5efea4c 100644 --- a/trunk/arch/alpha/include/asm/bitops.h +++ b/trunk/arch/alpha/include/asm/bitops.h @@ -456,8 +456,7 @@ sched_find_first_bit(const unsigned long b[2]) #include -#define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a) -#define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a) +#include #endif /* __KERNEL__ */ diff --git a/trunk/arch/alpha/include/asm/local.h b/trunk/arch/alpha/include/asm/local.h index b9e3e3318371..9c94b8456043 100644 --- a/trunk/arch/alpha/include/asm/local.h +++ b/trunk/arch/alpha/include/asm/local.h @@ -2,7 +2,7 @@ #define _ALPHA_LOCAL_H #include -#include +#include typedef struct { diff --git a/trunk/arch/alpha/include/asm/ptrace.h b/trunk/arch/alpha/include/asm/ptrace.h index 65cf3e28e2f4..fd698a174f26 100644 --- a/trunk/arch/alpha/include/asm/ptrace.h +++ b/trunk/arch/alpha/include/asm/ptrace.h @@ -72,7 +72,6 @@ struct switch_stack { #define user_mode(regs) (((regs)->ps & 8) != 0) #define instruction_pointer(regs) ((regs)->pc) #define profile_pc(regs) instruction_pointer(regs) -extern void show_regs(struct pt_regs *); #define task_pt_regs(task) \ ((struct pt_regs *) (task_stack_page(task) + 2*PAGE_SIZE) - 1) diff --git a/trunk/arch/alpha/kernel/perf_event.c b/trunk/arch/alpha/kernel/perf_event.c index 8e47709160f8..8143cd7cdbfb 100644 --- a/trunk/arch/alpha/kernel/perf_event.c +++ b/trunk/arch/alpha/kernel/perf_event.c @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/trunk/arch/alpha/kernel/process.c b/trunk/arch/alpha/kernel/process.c index 838eac128409..89bbe5b41145 100644 --- a/trunk/arch/alpha/kernel/process.c +++ b/trunk/arch/alpha/kernel/process.c @@ -200,7 +200,6 @@ show_regs(struct pt_regs *regs) void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp) { - set_fs(USER_DS); regs->pc = pc; regs->ps = 8; wrusp(sp); diff --git a/trunk/arch/alpha/kernel/smp.c b/trunk/arch/alpha/kernel/smp.c index d739703608fc..4087a569b43b 100644 --- a/trunk/arch/alpha/kernel/smp.c +++ b/trunk/arch/alpha/kernel/smp.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/trunk/arch/alpha/lib/dec_and_lock.c b/trunk/arch/alpha/lib/dec_and_lock.c index 0f5520d2f45f..f9f5fe830e9f 100644 --- a/trunk/arch/alpha/lib/dec_and_lock.c +++ b/trunk/arch/alpha/lib/dec_and_lock.c @@ -6,7 +6,7 @@ */ #include -#include +#include asm (".text \n\ .global _atomic_dec_and_lock \n\ diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 9cb1f4bd7618..09ebf0ba64fa 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -242,6 +242,7 @@ config ARCH_INTEGRATOR select ARM_AMBA select ARCH_HAS_CPUFREQ select CLKDEV_LOOKUP + select HAVE_MACH_CLKDEV select ICST select GENERIC_CLOCKEVENTS select PLAT_VERSATILE @@ -253,6 +254,7 @@ config ARCH_REALVIEW bool "ARM Ltd. RealView family" select ARM_AMBA select CLKDEV_LOOKUP + select HAVE_MACH_CLKDEV select ICST select GENERIC_CLOCKEVENTS select ARCH_WANT_OPTIONAL_GPIOLIB @@ -268,6 +270,7 @@ config ARCH_VERSATILE select ARM_AMBA select ARM_VIC select CLKDEV_LOOKUP + select HAVE_MACH_CLKDEV select ICST select GENERIC_CLOCKEVENTS select ARCH_WANT_OPTIONAL_GPIOLIB @@ -284,6 +287,7 @@ config ARCH_VEXPRESS select ARM_AMBA select ARM_TIMER_SP804 select CLKDEV_LOOKUP + select HAVE_MACH_CLKDEV select GENERIC_CLOCKEVENTS select HAVE_CLK select HAVE_PATA_PLATFORM @@ -324,7 +328,7 @@ config ARCH_CLPS711X config ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" - select CPU_V6 + select CPU_V6K select GENERIC_CLOCKEVENTS select ARM_GIC select MIGHT_HAVE_PCI @@ -340,6 +344,19 @@ config ARCH_GEMINI help Support for the Cortina Systems Gemini family SoCs +config ARCH_PRIMA2 + bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" + select CPU_V7 + select GENERIC_TIME + select NO_IOPORT + select GENERIC_CLOCKEVENTS + select CLKDEV_LOOKUP + select GENERIC_IRQ_CHIP + select USE_OF + select ZONE_DMA + help + Support for CSR SiRFSoC ARM Cortex A9 Platform + config ARCH_EBSA110 bool "EBSA-110" select CPU_SA110 @@ -379,6 +396,7 @@ config ARCH_MXC select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP select CLKSRC_MMIO + select GENERIC_IRQ_CHIP select HAVE_SCHED_CLOCK help Support for Freescale MXC/iMX-based family of processors @@ -586,7 +604,6 @@ config ARCH_TEGRA select GENERIC_GPIO select HAVE_CLK select HAVE_SCHED_CLOCK - select ARCH_HAS_BARRIERS if CACHE_L2X0 select ARCH_HAS_CPUFREQ help This enables support for NVIDIA Tegra based systems (Tegra APX, @@ -613,6 +630,8 @@ config ARCH_PXA select TICK_ONESHOT select PLAT_PXA select SPARSE_IRQ + select AUTO_ZRELADDR + select MULTI_IRQ_HANDLER help Support for Intel/Marvell's PXA2xx/PXA3xx processor line. @@ -633,6 +652,7 @@ config ARCH_SHMOBILE bool "Renesas SH-Mobile / R-Mobile" select HAVE_CLK select CLKDEV_LOOKUP + select HAVE_MACH_CLKDEV select GENERIC_CLOCKEVENTS select NO_IOPORT select SPARSE_IRQ @@ -750,6 +770,7 @@ config ARCH_S5PV210 bool "Samsung S5PV210/S5PC110" select CPU_V7 select ARCH_SPARSEMEM_ENABLE + select ARCH_HAS_HOLES_MEMORYMODEL select GENERIC_GPIO select HAVE_CLK select CLKDEV_LOOKUP @@ -768,6 +789,7 @@ config ARCH_EXYNOS4 bool "Samsung EXYNOS4" select CPU_V7 select ARCH_SPARSEMEM_ENABLE + select ARCH_HAS_HOLES_MEMORYMODEL select GENERIC_GPIO select HAVE_CLK select CLKDEV_LOOKUP @@ -812,6 +834,7 @@ config ARCH_U300 select ARM_VIC select GENERIC_CLOCKEVENTS select CLKDEV_LOOKUP + select HAVE_MACH_CLKDEV select GENERIC_GPIO help Support for ST-Ericsson U300 series mobile platforms. @@ -884,6 +907,19 @@ config ARCH_VT8500 select HAVE_PWM help Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. + +config ARCH_ZYNQ + bool "Xilinx Zynq ARM Cortex A9 Platform" + select CPU_V7 + select GENERIC_TIME + select GENERIC_CLOCKEVENTS + select CLKDEV_LOOKUP + select ARM_GIC + select ARM_AMBA + select ICST + select USE_OF + help + Support for Xilinx Zynq ARM Cortex A9 Platform endchoice # diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile index 206c34ecb9e3..3a4a04b33d0f 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -168,6 +168,7 @@ machine-$(CONFIG_ARCH_OMAP3) := omap2 machine-$(CONFIG_ARCH_OMAP4) := omap2 machine-$(CONFIG_ARCH_ORION5X) := orion5x machine-$(CONFIG_ARCH_PNX4008) := pnx4008 +machine-$(CONFIG_ARCH_PRIMA2) := prima2 machine-$(CONFIG_ARCH_PXA) := pxa machine-$(CONFIG_ARCH_REALVIEW) := realview machine-$(CONFIG_ARCH_RPC) := rpc @@ -194,6 +195,7 @@ machine-$(CONFIG_MACH_SPEAR300) := spear3xx machine-$(CONFIG_MACH_SPEAR310) := spear3xx machine-$(CONFIG_MACH_SPEAR320) := spear3xx machine-$(CONFIG_MACH_SPEAR600) := spear6xx +machine-$(CONFIG_ARCH_ZYNQ) := zynq # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. @@ -201,6 +203,7 @@ plat-$(CONFIG_ARCH_MXC) := mxc plat-$(CONFIG_ARCH_OMAP) := omap plat-$(CONFIG_ARCH_S3C64XX) := samsung plat-$(CONFIG_ARCH_TCC_926) := tcc +plat-$(CONFIG_ARCH_ZYNQ) := versatile plat-$(CONFIG_PLAT_IOP) := iop plat-$(CONFIG_PLAT_NOMADIK) := nomadik plat-$(CONFIG_PLAT_ORION) := orion diff --git a/trunk/arch/arm/boot/dts/prima2-cb.dts b/trunk/arch/arm/boot/dts/prima2-cb.dts new file mode 100644 index 000000000000..6fecc88065b2 --- /dev/null +++ b/trunk/arch/arm/boot/dts/prima2-cb.dts @@ -0,0 +1,416 @@ +/dts-v1/; +/ { + model = "SiRF Prima2 eVB"; + compatible = "sirf,prima2-cb", "sirf,prima2"; + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + + memory { + reg = <0x00000000 0x20000000>; + }; + + chosen { + bootargs = "mem=512M real_root=/dev/mmcblk0p2 console=ttyS0 panel=1 bootsplash=true bpp=16 androidboot.console=ttyS1"; + linux,stdout-path = &uart1; + }; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0 { + reg = <0x0>; + d-cache-line-size = <32>; + i-cache-line-size = <32>; + d-cache-size = <32768>; + i-cache-size = <32768>; + /* from bootloader */ + timebase-frequency = <0>; + bus-frequency = <0>; + clock-frequency = <0>; + }; + }; + + axi { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x40000000 0x40000000 0x80000000>; + + l2-cache-controller@80040000 { + compatible = "arm,pl310-cache"; + reg = <0x80040000 0x1000>; + interrupts = <59>; + }; + + intc: interrupt-controller@80020000 { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "sirf,prima2-intc"; + reg = <0x80020000 0x1000>; + }; + + sys-iobg { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x88000000 0x88000000 0x40000>; + + clock-controller@88000000 { + compatible = "sirf,prima2-clkc"; + reg = <0x88000000 0x1000>; + interrupts = <3>; + }; + + reset-controller@88010000 { + compatible = "sirf,prima2-rstc"; + reg = <0x88010000 0x1000>; + }; + }; + + mem-iobg { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x90000000 0x90000000 0x10000>; + + memory-controller@90000000 { + compatible = "sirf,prima2-memc"; + reg = <0x90000000 0x10000>; + interrupts = <27>; + }; + }; + + disp-iobg { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x90010000 0x90010000 0x30000>; + + display@90010000 { + compatible = "sirf,prima2-lcd"; + reg = <0x90010000 0x20000>; + interrupts = <30>; + }; + + vpp@90020000 { + compatible = "sirf,prima2-vpp"; + reg = <0x90020000 0x10000>; + interrupts = <31>; + }; + }; + + graphics-iobg { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x98000000 0x98000000 0x8000000>; + + graphics@98000000 { + compatible = "powervr,sgx531"; + reg = <0x98000000 0x8000000>; + interrupts = <6>; + }; + }; + + multimedia-iobg { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0xa0000000 0xa0000000 0x8000000>; + + multimedia@a0000000 { + compatible = "sirf,prima2-video-codec"; + reg = <0xa0000000 0x8000000>; + interrupts = <5>; + }; + }; + + dsp-iobg { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0xa8000000 0xa8000000 0x2000000>; + + dspif@a8000000 { + compatible = "sirf,prima2-dspif"; + reg = <0xa8000000 0x10000>; + interrupts = <9>; + }; + + gps@a8010000 { + compatible = "sirf,prima2-gps"; + reg = <0xa8010000 0x10000>; + interrupts = <7>; + }; + + dsp@a9000000 { + compatible = "sirf,prima2-dsp"; + reg = <0xa9000000 0x1000000>; + interrupts = <8>; + }; + }; + + peri-iobg { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0xb0000000 0xb0000000 0x180000>; + + timer@b0020000 { + compatible = "sirf,prima2-tick"; + reg = <0xb0020000 0x1000>; + interrupts = <0>; + }; + + nand@b0030000 { + compatible = "sirf,prima2-nand"; + reg = <0xb0030000 0x10000>; + interrupts = <41>; + }; + + audio@b0040000 { + compatible = "sirf,prima2-audio"; + reg = <0xb0040000 0x10000>; + interrupts = <35>; + }; + + uart0: uart@b0050000 { + cell-index = <0>; + compatible = "sirf,prima2-uart"; + reg = <0xb0050000 0x10000>; + interrupts = <17>; + }; + + uart1: uart@b0060000 { + cell-index = <1>; + compatible = "sirf,prima2-uart"; + reg = <0xb0060000 0x10000>; + interrupts = <18>; + }; + + uart2: uart@b0070000 { + cell-index = <2>; + compatible = "sirf,prima2-uart"; + reg = <0xb0070000 0x10000>; + interrupts = <19>; + }; + + usp0: usp@b0080000 { + cell-index = <0>; + compatible = "sirf,prima2-usp"; + reg = <0xb0080000 0x10000>; + interrupts = <20>; + }; + + usp1: usp@b0090000 { + cell-index = <1>; + compatible = "sirf,prima2-usp"; + reg = <0xb0090000 0x10000>; + interrupts = <21>; + }; + + usp2: usp@b00a0000 { + cell-index = <2>; + compatible = "sirf,prima2-usp"; + reg = <0xb00a0000 0x10000>; + interrupts = <22>; + }; + + dmac0: dma-controller@b00b0000 { + cell-index = <0>; + compatible = "sirf,prima2-dmac"; + reg = <0xb00b0000 0x10000>; + interrupts = <12>; + }; + + dmac1: dma-controller@b0160000 { + cell-index = <1>; + compatible = "sirf,prima2-dmac"; + reg = <0xb0160000 0x10000>; + interrupts = <13>; + }; + + vip@b00C0000 { + compatible = "sirf,prima2-vip"; + reg = <0xb00C0000 0x10000>; + }; + + spi0: spi@b00d0000 { + cell-index = <0>; + compatible = "sirf,prima2-spi"; + reg = <0xb00d0000 0x10000>; + interrupts = <15>; + }; + + spi1: spi@b0170000 { + cell-index = <1>; + compatible = "sirf,prima2-spi"; + reg = <0xb0170000 0x10000>; + interrupts = <16>; + }; + + i2c0: i2c@b00e0000 { + cell-index = <0>; + compatible = "sirf,prima2-i2c"; + reg = <0xb00e0000 0x10000>; + interrupts = <24>; + }; + + i2c1: i2c@b00f0000 { + cell-index = <1>; + compatible = "sirf,prima2-i2c"; + reg = <0xb00f0000 0x10000>; + interrupts = <25>; + }; + + tsc@b0110000 { + compatible = "sirf,prima2-tsc"; + reg = <0xb0110000 0x10000>; + interrupts = <33>; + }; + + gpio: gpio-controller@b0120000 { + #gpio-cells = <2>; + #interrupt-cells = <2>; + compatible = "sirf,prima2-gpio"; + reg = <0xb0120000 0x10000>; + gpio-controller; + interrupt-controller; + }; + + pwm@b0130000 { + compatible = "sirf,prima2-pwm"; + reg = <0xb0130000 0x10000>; + }; + + efusesys@b0140000 { + compatible = "sirf,prima2-efuse"; + reg = <0xb0140000 0x10000>; + }; + + pulsec@b0150000 { + compatible = "sirf,prima2-pulsec"; + reg = <0xb0150000 0x10000>; + interrupts = <48>; + }; + + pci-iobg { + compatible = "sirf,prima2-pciiobg", "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x56000000 0x56000000 0x1b00000>; + + sd0: sdhci@56000000 { + cell-index = <0>; + compatible = "sirf,prima2-sdhc"; + reg = <0x56000000 0x100000>; + interrupts = <38>; + }; + + sd1: sdhci@56100000 { + cell-index = <1>; + compatible = "sirf,prima2-sdhc"; + reg = <0x56100000 0x100000>; + interrupts = <38>; + }; + + sd2: sdhci@56200000 { + cell-index = <2>; + compatible = "sirf,prima2-sdhc"; + reg = <0x56200000 0x100000>; + interrupts = <23>; + }; + + sd3: sdhci@56300000 { + cell-index = <3>; + compatible = "sirf,prima2-sdhc"; + reg = <0x56300000 0x100000>; + interrupts = <23>; + }; + + sd4: sdhci@56400000 { + cell-index = <4>; + compatible = "sirf,prima2-sdhc"; + reg = <0x56400000 0x100000>; + interrupts = <39>; + }; + + sd5: sdhci@56500000 { + cell-index = <5>; + compatible = "sirf,prima2-sdhc"; + reg = <0x56500000 0x100000>; + interrupts = <39>; + }; + + pci-copy@57900000 { + compatible = "sirf,prima2-pcicp"; + reg = <0x57900000 0x100000>; + interrupts = <40>; + }; + + rom-interface@57a00000 { + compatible = "sirf,prima2-romif"; + reg = <0x57a00000 0x100000>; + }; + }; + }; + + rtc-iobg { + compatible = "sirf,prima2-rtciobg", "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x80030000 0x10000>; + + gpsrtc@1000 { + compatible = "sirf,prima2-gpsrtc"; + reg = <0x1000 0x1000>; + interrupts = <55 56 57>; + }; + + sysrtc@2000 { + compatible = "sirf,prima2-sysrtc"; + reg = <0x2000 0x1000>; + interrupts = <52 53 54>; + }; + + pwrc@3000 { + compatible = "sirf,prima2-pwrc"; + reg = <0x3000 0x1000>; + interrupts = <32>; + }; + }; + + uus-iobg { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0xb8000000 0xb8000000 0x40000>; + + usb0: usb@b00e0000 { + compatible = "chipidea,ci13611a-prima2"; + reg = <0xb8000000 0x10000>; + interrupts = <10>; + }; + + usb1: usb@b00f0000 { + compatible = "chipidea,ci13611a-prima2"; + reg = <0xb8010000 0x10000>; + interrupts = <11>; + }; + + sata@b00f0000 { + compatible = "synopsys,dwc-ahsata"; + reg = <0xb8020000 0x10000>; + interrupts = <37>; + }; + + security@b00f0000 { + compatible = "sirf,prima2-security"; + reg = <0xb8030000 0x10000>; + interrupts = <42>; + }; + }; + }; +}; diff --git a/trunk/arch/arm/boot/dts/zynq-ep107.dts b/trunk/arch/arm/boot/dts/zynq-ep107.dts new file mode 100644 index 000000000000..37ca192fb193 --- /dev/null +++ b/trunk/arch/arm/boot/dts/zynq-ep107.dts @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2011 Xilinx + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; +/ { + model = "Xilinx Zynq EP107"; + compatible = "xlnx,zynq-ep107"; + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + + memory { + device_type = "memory"; + reg = <0x0 0x10000000>; + }; + + chosen { + bootargs = "console=ttyPS0,9600 root=/dev/ram rw initrd=0x800000,8M earlyprintk"; + linux,stdout-path = &uart0; + }; + + amba { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + intc: interrupt-controller@f8f01000 { + interrupt-controller; + compatible = "arm,gic"; + reg = <0xF8F01000 0x1000>; + #interrupt-cells = <2>; + }; + + uart0: uart@e0000000 { + compatible = "xlnx,xuartps"; + reg = <0xE0000000 0x1000>; + interrupts = <59 0>; + clock = <50000000>; + }; + }; +}; diff --git a/trunk/arch/arm/common/gic.c b/trunk/arch/arm/common/gic.c index 7bdd91766d65..3227ca952a12 100644 --- a/trunk/arch/arm/common/gic.c +++ b/trunk/arch/arm/common/gic.c @@ -38,12 +38,6 @@ static DEFINE_SPINLOCK(irq_controller_lock); /* Address of GIC 0 CPU interface */ void __iomem *gic_cpu_base_addr __read_mostly; -struct gic_chip_data { - unsigned int irq_offset; - void __iomem *dist_base; - void __iomem *cpu_base; -}; - /* * Supported arch specific GIC irq extension. * Default make them NULL. diff --git a/trunk/arch/arm/configs/mxs_defconfig b/trunk/arch/arm/configs/mxs_defconfig index 5a6ff7c605df..db2cb7d180dc 100644 --- a/trunk/arch/arm/configs/mxs_defconfig +++ b/trunk/arch/arm/configs/mxs_defconfig @@ -22,6 +22,8 @@ CONFIG_BLK_DEV_INTEGRITY=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_MXS=y +CONFIG_MACH_MX23EVK=y +CONFIG_MACH_MX28EVK=y CONFIG_MACH_STMP378X_DEVB=y CONFIG_MACH_TX28=y # CONFIG_ARM_THUMB is not set diff --git a/trunk/arch/arm/configs/u8500_defconfig b/trunk/arch/arm/configs/u8500_defconfig index a5cce242a775..97d31a4663da 100644 --- a/trunk/arch/arm/configs/u8500_defconfig +++ b/trunk/arch/arm/configs/u8500_defconfig @@ -11,12 +11,12 @@ CONFIG_ARCH_U8500=y CONFIG_UX500_SOC_DB5500=y CONFIG_UX500_SOC_DB8500=y CONFIG_MACH_U8500=y +CONFIG_MACH_SNOWBALL=y CONFIG_MACH_U5500=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_SMP=y CONFIG_NR_CPUS=2 -CONFIG_HOTPLUG_CPU=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_CMDLINE="root=/dev/ram0 console=ttyAMA2,115200n8" @@ -25,8 +25,13 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_VFP=y CONFIG_NEON=y CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_NETFILTER=y CONFIG_PHONET=y -CONFIG_PHONET_PIPECTRLR=y # CONFIG_WIRELESS is not set CONFIG_CAIF=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" @@ -35,6 +40,13 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 CONFIG_MISC_DEVICES=y CONFIG_AB8500_PWM=y CONFIG_SENSORS_BH1780=y +CONFIG_NETDEVICES=y +CONFIG_SMSC_PHY=y +CONFIG_NET_ETHERNET=y +CONFIG_SMSC911X=y +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +# CONFIG_WLAN is not set # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y # CONFIG_KEYBOARD_ATKBD is not set @@ -49,9 +61,9 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AB8500_PONKEY=y # CONFIG_SERIO is not set CONFIG_VT_HW_CONSOLE_BINDING=y +# CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -# CONFIG_LEGACY_PTYS is not set CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_NOMADIK=y CONFIG_I2C=y @@ -64,14 +76,19 @@ CONFIG_GPIO_TC3589X=y CONFIG_MFD_STMPE=y CONFIG_MFD_TC3589X=y CONFIG_AB8500_CORE=y -CONFIG_REGULATOR=y CONFIG_REGULATOR_AB8500=y # CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set +CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_GADGET_MUSB_HDRC=y +CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_GADGET=y +CONFIG_AB8500_USB=y CONFIG_MMC=y +CONFIG_MMC_CLKGATE=y CONFIG_MMC_ARMMMCI=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y +CONFIG_LEDS_LM3530=y CONFIG_LEDS_LP5521=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_AB8500=y @@ -79,7 +96,6 @@ CONFIG_RTC_DRV_PL031=y CONFIG_DMADEVICES=y CONFIG_STE_DMA40=y CONFIG_STAGING=y -# CONFIG_STAGING_EXCLUDE_BUILD is not set CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y @@ -91,6 +107,8 @@ CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_CONFIGFS_FS=m # CONFIG_MISC_FILESYSTEMS is not set +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_MAGIC_SYSRQ=y @@ -99,7 +117,5 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_PREEMPT is not set CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_FTRACE is not set CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y diff --git a/trunk/arch/arm/include/asm/atomic.h b/trunk/arch/arm/include/asm/atomic.h index 7e79503ab89b..86976d034382 100644 --- a/trunk/arch/arm/include/asm/atomic.h +++ b/trunk/arch/arm/include/asm/atomic.h @@ -208,16 +208,15 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) -static inline int atomic_add_unless(atomic_t *v, int a, int u) +static inline int __atomic_add_unless(atomic_t *v, int a, int u) { int c, old; c = atomic_read(v); while (c != u && (old = atomic_cmpxchg((v), c, c + a)) != c) c = old; - return c != u; + return c; } -#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) #define atomic_inc(v) atomic_add(1, v) #define atomic_dec(v) atomic_sub(1, v) @@ -460,9 +459,6 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u) #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0) #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL) -#else /* !CONFIG_GENERIC_ATOMIC64 */ -#include -#endif -#include +#endif /* !CONFIG_GENERIC_ATOMIC64 */ #endif #endif diff --git a/trunk/arch/arm/include/asm/bitops.h b/trunk/arch/arm/include/asm/bitops.h index f4280593dfa3..f7419ef9c8f9 100644 --- a/trunk/arch/arm/include/asm/bitops.h +++ b/trunk/arch/arm/include/asm/bitops.h @@ -310,10 +310,7 @@ static inline int find_next_bit_le(const void *p, int size, int offset) /* * Ext2 is defined to use little-endian byte ordering. */ -#define ext2_set_bit_atomic(lock, nr, p) \ - test_and_set_bit_le(nr, p) -#define ext2_clear_bit_atomic(lock, nr, p) \ - test_and_clear_bit_le(nr, p) +#include #endif /* __KERNEL__ */ diff --git a/trunk/arch/arm/include/asm/clkdev.h b/trunk/arch/arm/include/asm/clkdev.h index 765d33222369..80751c15c300 100644 --- a/trunk/arch/arm/include/asm/clkdev.h +++ b/trunk/arch/arm/include/asm/clkdev.h @@ -14,7 +14,12 @@ #include +#ifdef CONFIG_HAVE_MACH_CLKDEV #include +#else +#define __clk_get(clk) ({ 1; }) +#define __clk_put(clk) do { } while (0) +#endif static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) { diff --git a/trunk/arch/arm/include/asm/hardware/gic.h b/trunk/arch/arm/include/asm/hardware/gic.h index 0691f9dcc500..435d3f86c708 100644 --- a/trunk/arch/arm/include/asm/hardware/gic.h +++ b/trunk/arch/arm/include/asm/hardware/gic.h @@ -41,6 +41,12 @@ void gic_secondary_init(unsigned int); void gic_cascade_irq(unsigned int gic_nr, unsigned int irq); void gic_raise_softirq(const struct cpumask *mask, unsigned int irq); void gic_enable_ppi(unsigned int); + +struct gic_chip_data { + unsigned int irq_offset; + void __iomem *dist_base; + void __iomem *cpu_base; +}; #endif #endif diff --git a/trunk/arch/arm/include/asm/irq.h b/trunk/arch/arm/include/asm/irq.h index 2721a5814cb9..5a526afb5f18 100644 --- a/trunk/arch/arm/include/asm/irq.h +++ b/trunk/arch/arm/include/asm/irq.h @@ -23,6 +23,7 @@ struct pt_regs; extern void migrate_irqs(void); extern void asm_do_IRQ(unsigned int, struct pt_regs *); +void handle_IRQ(unsigned int, struct pt_regs *); void init_IRQ(void); #endif diff --git a/trunk/arch/arm/include/asm/pci.h b/trunk/arch/arm/include/asm/pci.h index 92e2a833693d..2b1f245db0c6 100644 --- a/trunk/arch/arm/include/asm/pci.h +++ b/trunk/arch/arm/include/asm/pci.h @@ -3,9 +3,19 @@ #ifdef __KERNEL__ #include +#include #include /* for pci_sys_data */ -#include /* for PCIBIOS_MIN_* */ + +extern unsigned long pcibios_min_io; +#define PCIBIOS_MIN_IO pcibios_min_io +extern unsigned long pcibios_min_mem; +#define PCIBIOS_MIN_MEM pcibios_min_mem + +static inline int pcibios_assign_all_busses(void) +{ + return pci_has_flag(PCI_REASSIGN_ALL_RSRC); +} #ifdef CONFIG_PCI_DOMAINS static inline int pci_domain_nr(struct pci_bus *bus) diff --git a/trunk/arch/arm/include/asm/vga.h b/trunk/arch/arm/include/asm/vga.h index 250a4dd00630..91f40217bfa5 100644 --- a/trunk/arch/arm/include/asm/vga.h +++ b/trunk/arch/arm/include/asm/vga.h @@ -2,9 +2,10 @@ #define ASMARM_VGA_H #include -#include -#define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x)) +extern unsigned long vga_base; + +#define VGA_MAP_MEM(x,s) (vga_base + (x)) #define vga_readb(x) (*((volatile unsigned char *)x)) #define vga_writeb(x,y) (*((volatile unsigned char *)y) = (x)) diff --git a/trunk/arch/arm/kernel/irq.c b/trunk/arch/arm/kernel/irq.c index 0f928a131af8..de3dcab8610b 100644 --- a/trunk/arch/arm/kernel/irq.c +++ b/trunk/arch/arm/kernel/irq.c @@ -67,12 +67,12 @@ int arch_show_interrupts(struct seq_file *p, int prec) } /* - * do_IRQ handles all hardware IRQ's. Decoded IRQs should not - * come via this function. Instead, they should provide their - * own 'handler' + * handle_IRQ handles all hardware IRQ's. Decoded IRQs should + * not come via this function. Instead, they should provide their + * own 'handler'. Used by platform code implementing C-based 1st + * level decoding. */ -asmlinkage void __exception_irq_entry -asm_do_IRQ(unsigned int irq, struct pt_regs *regs) +void handle_IRQ(unsigned int irq, struct pt_regs *regs) { struct pt_regs *old_regs = set_irq_regs(regs); @@ -97,6 +97,15 @@ asm_do_IRQ(unsigned int irq, struct pt_regs *regs) set_irq_regs(old_regs); } +/* + * asm_do_IRQ is the interface to be used from assembly code. + */ +asmlinkage void __exception_irq_entry +asm_do_IRQ(unsigned int irq, struct pt_regs *regs) +{ + handle_IRQ(irq, regs); +} + void set_irq_flags(unsigned int irq, unsigned int iflags) { unsigned long clr = 0, set = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN; diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c index 167e3cbe1f2f..d88ff0230e82 100644 --- a/trunk/arch/arm/kernel/smp.c +++ b/trunk/arch/arm/kernel/smp.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/kernel/traps.c b/trunk/arch/arm/kernel/traps.c index 2d3436e9f71f..bc9f9da782cb 100644 --- a/trunk/arch/arm/kernel/traps.c +++ b/trunk/arch/arm/kernel/traps.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/lib/ecard.S b/trunk/arch/arm/lib/ecard.S index 8678eb2b7a60..e6057fa851bb 100644 --- a/trunk/arch/arm/lib/ecard.S +++ b/trunk/arch/arm/lib/ecard.S @@ -12,7 +12,6 @@ */ #include #include -#include #define CPSR2SPSR(rt) \ mrs rt, cpsr; \ diff --git a/trunk/arch/arm/lib/io-readsw-armv3.S b/trunk/arch/arm/lib/io-readsw-armv3.S index 9aaf7c72065d..88487c8c4f23 100644 --- a/trunk/arch/arm/lib/io-readsw-armv3.S +++ b/trunk/arch/arm/lib/io-readsw-armv3.S @@ -9,7 +9,6 @@ */ #include #include -#include .Linsw_bad_alignment: adr r0, .Linsw_bad_align_msg diff --git a/trunk/arch/arm/lib/io-writesw-armv3.S b/trunk/arch/arm/lib/io-writesw-armv3.S index cd34503e424d..49b800419e32 100644 --- a/trunk/arch/arm/lib/io-writesw-armv3.S +++ b/trunk/arch/arm/lib/io-writesw-armv3.S @@ -9,7 +9,6 @@ */ #include #include -#include .Loutsw_bad_alignment: adr r0, .Loutsw_bad_align_msg diff --git a/trunk/arch/arm/mach-at91/include/mach/clkdev.h b/trunk/arch/arm/mach-at91/include/mach/clkdev.h deleted file mode 100644 index 04b37a89801c..000000000000 --- a/trunk/arch/arm/mach-at91/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/trunk/arch/arm/mach-at91/pm.c b/trunk/arch/arm/mach-at91/pm.c index ea53f4d9b283..4159eca78945 100644 --- a/trunk/arch/arm/mach-at91/pm.c +++ b/trunk/arch/arm/mach-at91/pm.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/trunk/arch/arm/mach-bcmring/dma.c b/trunk/arch/arm/mach-bcmring/dma.c index 9f2a948e0e72..0ca00050666a 100644 --- a/trunk/arch/arm/mach-bcmring/dma.c +++ b/trunk/arch/arm/mach-bcmring/dma.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include /* I don't quite understand why dc4 fails when this is set to 1 and DMA is enabled */ diff --git a/trunk/arch/arm/mach-bcmring/include/mach/clkdev.h b/trunk/arch/arm/mach-bcmring/include/mach/clkdev.h deleted file mode 100644 index 04b37a89801c..000000000000 --- a/trunk/arch/arm/mach-bcmring/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/trunk/arch/arm/mach-bcmring/include/mach/hardware.h b/trunk/arch/arm/mach-bcmring/include/mach/hardware.h index 8bf3564fba50..ed78aabb8e9f 100644 --- a/trunk/arch/arm/mach-bcmring/include/mach/hardware.h +++ b/trunk/arch/arm/mach-bcmring/include/mach/hardware.h @@ -36,8 +36,6 @@ #define RAM_SIZE (CFG_GLOBAL_RAM_SIZE-CFG_GLOBAL_RAM_SIZE_RESERVED) #define RAM_BASE PAGE_OFFSET -#define pcibios_assign_all_busses() 1 - /* Macros to make managing spinlocks a bit more controlled in terms of naming. */ /* See reg_gpio.h, reg_irq.h, arch.c, gpio.c for example usage. */ #if defined(__KERNEL__) diff --git a/trunk/arch/arm/mach-cns3xxx/cns3420vb.c b/trunk/arch/arm/mach-cns3xxx/cns3420vb.c index 08e5c8759502..3e7d1496cb47 100644 --- a/trunk/arch/arm/mach-cns3xxx/cns3420vb.c +++ b/trunk/arch/arm/mach-cns3xxx/cns3420vb.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include "core.h" @@ -170,6 +169,8 @@ static struct platform_device *cns3420_pdevs[] __initdata = { static void __init cns3420_init(void) { + cns3xxx_l2x0_init(); + platform_add_devices(cns3420_pdevs, ARRAY_SIZE(cns3420_pdevs)); cns3xxx_ahci_init(); diff --git a/trunk/arch/arm/mach-cns3xxx/core.c b/trunk/arch/arm/mach-cns3xxx/core.c index da30078a80c1..941a308e1253 100644 --- a/trunk/arch/arm/mach-cns3xxx/core.c +++ b/trunk/arch/arm/mach-cns3xxx/core.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include "core.h" @@ -244,3 +245,45 @@ static void __init cns3xxx_timer_init(void) struct sys_timer cns3xxx_timer = { .init = cns3xxx_timer_init, }; + +#ifdef CONFIG_CACHE_L2X0 + +void __init cns3xxx_l2x0_init(void) +{ + void __iomem *base = ioremap(CNS3XXX_L2C_BASE, SZ_4K); + u32 val; + + if (WARN_ON(!base)) + return; + + /* + * Tag RAM Control register + * + * bit[10:8] - 1 cycle of write accesses latency + * bit[6:4] - 1 cycle of read accesses latency + * bit[3:0] - 1 cycle of setup latency + * + * 1 cycle of latency for setup, read and write accesses + */ + val = readl(base + L2X0_TAG_LATENCY_CTRL); + val &= 0xfffff888; + writel(val, base + L2X0_TAG_LATENCY_CTRL); + + /* + * Data RAM Control register + * + * bit[10:8] - 1 cycles of write accesses latency + * bit[6:4] - 1 cycles of read accesses latency + * bit[3:0] - 1 cycle of setup latency + * + * 1 cycle of latency for setup, read and write accesses + */ + val = readl(base + L2X0_DATA_LATENCY_CTRL); + val &= 0xfffff888; + writel(val, base + L2X0_DATA_LATENCY_CTRL); + + /* 32 KiB, 8-way, parity disable */ + l2x0_init(base, 0x00540000, 0xfe000fff); +} + +#endif /* CONFIG_CACHE_L2X0 */ diff --git a/trunk/arch/arm/mach-cns3xxx/core.h b/trunk/arch/arm/mach-cns3xxx/core.h index ffeb3a8b73ba..fcd225343c61 100644 --- a/trunk/arch/arm/mach-cns3xxx/core.h +++ b/trunk/arch/arm/mach-cns3xxx/core.h @@ -13,6 +13,12 @@ extern struct sys_timer cns3xxx_timer; +#ifdef CONFIG_CACHE_L2X0 +void __init cns3xxx_l2x0_init(void); +#else +static inline void cns3xxx_l2x0_init(void) {} +#endif /* CONFIG_CACHE_L2X0 */ + void __init cns3xxx_map_io(void); void __init cns3xxx_init_irq(void); void cns3xxx_power_off(void); diff --git a/trunk/arch/arm/mach-cns3xxx/include/mach/hardware.h b/trunk/arch/arm/mach-cns3xxx/include/mach/hardware.h deleted file mode 100644 index 57e09836f9d7..000000000000 --- a/trunk/arch/arm/mach-cns3xxx/include/mach/hardware.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file contains the hardware definitions of the Cavium Networks boards. - * - * Copyright 2003 ARM Limited. - * Copyright 2008 Cavium Networks - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, Version 2, as - * published by the Free Software Foundation. - */ - -#ifndef __MACH_HARDWARE_H -#define __MACH_HARDWARE_H - -#include - -/* macro to get at IO space when running virtually */ -#define PCIBIOS_MIN_IO 0x00000000 -#define PCIBIOS_MIN_MEM 0x00000000 -#define pcibios_assign_all_busses() 1 - -#endif diff --git a/trunk/arch/arm/mach-cns3xxx/include/mach/pm.h b/trunk/arch/arm/mach-cns3xxx/include/mach/pm.h index 6eae7f764d1d..c2588cc991d1 100644 --- a/trunk/arch/arm/mach-cns3xxx/include/mach/pm.h +++ b/trunk/arch/arm/mach-cns3xxx/include/mach/pm.h @@ -11,7 +11,7 @@ #ifndef __CNS3XXX_PM_H #define __CNS3XXX_PM_H -#include +#include void cns3xxx_pwr_clk_en(unsigned int block); void cns3xxx_pwr_clk_dis(unsigned int block); diff --git a/trunk/arch/arm/mach-cns3xxx/pcie.c b/trunk/arch/arm/mach-cns3xxx/pcie.c index 78defd71a829..a4ec080908b8 100644 --- a/trunk/arch/arm/mach-cns3xxx/pcie.c +++ b/trunk/arch/arm/mach-cns3xxx/pcie.c @@ -369,6 +369,9 @@ static int __init cns3xxx_pcie_init(void) { int i; + pcibios_min_io = 0; + pcibios_min_mem = 0; + hook_fault_code(16 + 6, cns3xxx_pcie_abort_handler, SIGBUS, 0, "imprecise external abort"); diff --git a/trunk/arch/arm/mach-cns3xxx/pm.c b/trunk/arch/arm/mach-cns3xxx/pm.c index 5e579552aa54..0c04678615ce 100644 --- a/trunk/arch/arm/mach-cns3xxx/pm.c +++ b/trunk/arch/arm/mach-cns3xxx/pm.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/mach-davinci/board-da850-evm.c b/trunk/arch/arm/mach-davinci/board-da850-evm.c index 29671ef07152..bd5394537c88 100644 --- a/trunk/arch/arm/mach-davinci/board-da850-evm.c +++ b/trunk/arch/arm/mach-davinci/board-da850-evm.c @@ -1117,6 +1117,8 @@ static __init int da850_evm_init_cpufreq(void) static __init int da850_evm_init_cpufreq(void) { return 0; } #endif +#define DA850EVM_SATA_REFCLKPN_RATE (100 * 1000 * 1000) + static __init void da850_evm_init(void) { int ret; @@ -1237,6 +1239,11 @@ static __init void da850_evm_init(void) if (ret) pr_warning("da850_evm_init: spi 1 registration failed: %d\n", ret); + + ret = da850_register_sata(DA850EVM_SATA_REFCLKPN_RATE); + if (ret) + pr_warning("da850_evm_init: sata registration failed: %d\n", + ret); } #ifdef CONFIG_SERIAL_8250_CONSOLE diff --git a/trunk/arch/arm/mach-davinci/clock.c b/trunk/arch/arm/mach-davinci/clock.c index ae653194b645..00861139101d 100644 --- a/trunk/arch/arm/mach-davinci/clock.c +++ b/trunk/arch/arm/mach-davinci/clock.c @@ -44,7 +44,7 @@ static void __clk_enable(struct clk *clk) __clk_enable(clk->parent); if (clk->usecount++ == 0 && (clk->flags & CLK_PSC)) davinci_psc_config(psc_domain(clk), clk->gpsc, clk->lpsc, - PSC_STATE_ENABLE); + true, clk->flags); } static void __clk_disable(struct clk *clk) @@ -54,8 +54,7 @@ static void __clk_disable(struct clk *clk) if (--clk->usecount == 0 && !(clk->flags & CLK_PLL) && (clk->flags & CLK_PSC)) davinci_psc_config(psc_domain(clk), clk->gpsc, clk->lpsc, - (clk->flags & PSC_SWRSTDISABLE) ? - PSC_STATE_SWRSTDISABLE : PSC_STATE_DISABLE); + false, clk->flags); if (clk->parent) __clk_disable(clk->parent); } @@ -239,8 +238,7 @@ static int __init clk_disable_unused(void) pr_debug("Clocks: disable unused %s\n", ck->name); davinci_psc_config(psc_domain(ck), ck->gpsc, ck->lpsc, - (ck->flags & PSC_SWRSTDISABLE) ? - PSC_STATE_SWRSTDISABLE : PSC_STATE_DISABLE); + false, ck->flags); } spin_unlock_irq(&clockfw_lock); diff --git a/trunk/arch/arm/mach-davinci/clock.h b/trunk/arch/arm/mach-davinci/clock.h index 50b2482e0ba2..a705f367a84d 100644 --- a/trunk/arch/arm/mach-davinci/clock.h +++ b/trunk/arch/arm/mach-davinci/clock.h @@ -111,6 +111,7 @@ struct clk { #define CLK_PLL BIT(4) /* PLL-derived clock */ #define PRE_PLL BIT(5) /* source is before PLL mult/div */ #define PSC_SWRSTDISABLE BIT(6) /* Disable state is SwRstDisable */ +#define PSC_FORCE BIT(7) /* Force module state transtition */ #define CLK(dev, con, ck) \ { \ diff --git a/trunk/arch/arm/mach-davinci/da850.c b/trunk/arch/arm/mach-davinci/da850.c index 133aac405853..935dbed5c541 100644 --- a/trunk/arch/arm/mach-davinci/da850.c +++ b/trunk/arch/arm/mach-davinci/da850.c @@ -58,6 +58,7 @@ static struct pll_data pll0_data = { static struct clk ref_clk = { .name = "ref_clk", .rate = DA850_REF_FREQ, + .set_rate = davinci_simple_set_rate, }; static struct clk pll0_clk = { @@ -373,6 +374,14 @@ static struct clk spi1_clk = { .flags = DA850_CLK_ASYNC3, }; +static struct clk sata_clk = { + .name = "sata", + .parent = &pll0_sysclk2, + .lpsc = DA850_LPSC1_SATA, + .gpsc = 1, + .flags = PSC_FORCE, +}; + static struct clk_lookup da850_clks[] = { CLK(NULL, "ref", &ref_clk), CLK(NULL, "pll0", &pll0_clk), @@ -419,6 +428,7 @@ static struct clk_lookup da850_clks[] = { CLK(NULL, "usb20", &usb20_clk), CLK("spi_davinci.0", NULL, &spi0_clk), CLK("spi_davinci.1", NULL, &spi1_clk), + CLK("ahci", NULL, &sata_clk), CLK(NULL, NULL, NULL), }; diff --git a/trunk/arch/arm/mach-davinci/devices-da8xx.c b/trunk/arch/arm/mach-davinci/devices-da8xx.c index fc4e98ea7543..2f7e719636f1 100644 --- a/trunk/arch/arm/mach-davinci/devices-da8xx.c +++ b/trunk/arch/arm/mach-davinci/devices-da8xx.c @@ -14,6 +14,8 @@ #include #include #include +#include +#include #include #include @@ -33,6 +35,7 @@ #define DA8XX_SPI0_BASE 0x01c41000 #define DA830_SPI1_BASE 0x01e12000 #define DA8XX_LCD_CNTRL_BASE 0x01e13000 +#define DA850_SATA_BASE 0x01e18000 #define DA850_MMCSD1_BASE 0x01e1b000 #define DA8XX_EMAC_CPPI_PORT_BASE 0x01e20000 #define DA8XX_EMAC_CPGMACSS_BASE 0x01e22000 @@ -842,3 +845,126 @@ int __init da8xx_register_spi(int instance, struct spi_board_info *info, return platform_device_register(&da8xx_spi_device[instance]); } + +#ifdef CONFIG_ARCH_DAVINCI_DA850 + +static struct resource da850_sata_resources[] = { + { + .start = DA850_SATA_BASE, + .end = DA850_SATA_BASE + 0x1fff, + .flags = IORESOURCE_MEM, + }, + { + .start = IRQ_DA850_SATAINT, + .flags = IORESOURCE_IRQ, + }, +}; + +/* SATA PHY Control Register offset from AHCI base */ +#define SATA_P0PHYCR_REG 0x178 + +#define SATA_PHY_MPY(x) ((x) << 0) +#define SATA_PHY_LOS(x) ((x) << 6) +#define SATA_PHY_RXCDR(x) ((x) << 10) +#define SATA_PHY_RXEQ(x) ((x) << 13) +#define SATA_PHY_TXSWING(x) ((x) << 19) +#define SATA_PHY_ENPLL(x) ((x) << 31) + +static struct clk *da850_sata_clk; +static unsigned long da850_sata_refclkpn; + +/* Supported DA850 SATA crystal frequencies */ +#define KHZ_TO_HZ(freq) ((freq) * 1000) +static unsigned long da850_sata_xtal[] = { + KHZ_TO_HZ(300000), + KHZ_TO_HZ(250000), + 0, /* Reserved */ + KHZ_TO_HZ(187500), + KHZ_TO_HZ(150000), + KHZ_TO_HZ(125000), + KHZ_TO_HZ(120000), + KHZ_TO_HZ(100000), + KHZ_TO_HZ(75000), + KHZ_TO_HZ(60000), +}; + +static int da850_sata_init(struct device *dev, void __iomem *addr) +{ + int i, ret; + unsigned int val; + + da850_sata_clk = clk_get(dev, NULL); + if (IS_ERR(da850_sata_clk)) + return PTR_ERR(da850_sata_clk); + + ret = clk_enable(da850_sata_clk); + if (ret) + goto err0; + + /* Enable SATA clock receiver */ + val = __raw_readl(DA8XX_SYSCFG1_VIRT(DA8XX_PWRDN_REG)); + val &= ~BIT(0); + __raw_writel(val, DA8XX_SYSCFG1_VIRT(DA8XX_PWRDN_REG)); + + /* Get the multiplier needed for 1.5GHz PLL output */ + for (i = 0; i < ARRAY_SIZE(da850_sata_xtal); i++) + if (da850_sata_xtal[i] == da850_sata_refclkpn) + break; + + if (i == ARRAY_SIZE(da850_sata_xtal)) { + ret = -EINVAL; + goto err1; + } + + val = SATA_PHY_MPY(i + 1) | + SATA_PHY_LOS(1) | + SATA_PHY_RXCDR(4) | + SATA_PHY_RXEQ(1) | + SATA_PHY_TXSWING(3) | + SATA_PHY_ENPLL(1); + + __raw_writel(val, addr + SATA_P0PHYCR_REG); + + return 0; + +err1: + clk_disable(da850_sata_clk); +err0: + clk_put(da850_sata_clk); + return ret; +} + +static void da850_sata_exit(struct device *dev) +{ + clk_disable(da850_sata_clk); + clk_put(da850_sata_clk); +} + +static struct ahci_platform_data da850_sata_pdata = { + .init = da850_sata_init, + .exit = da850_sata_exit, +}; + +static u64 da850_sata_dmamask = DMA_BIT_MASK(32); + +static struct platform_device da850_sata_device = { + .name = "ahci", + .id = -1, + .dev = { + .platform_data = &da850_sata_pdata, + .dma_mask = &da850_sata_dmamask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, + .num_resources = ARRAY_SIZE(da850_sata_resources), + .resource = da850_sata_resources, +}; + +int __init da850_register_sata(unsigned long refclkpn) +{ + da850_sata_refclkpn = refclkpn; + if (!da850_sata_refclkpn) + return -EINVAL; + + return platform_device_register(&da850_sata_device); +} +#endif diff --git a/trunk/arch/arm/mach-davinci/include/mach/clkdev.h b/trunk/arch/arm/mach-davinci/include/mach/clkdev.h deleted file mode 100644 index 14a504887189..000000000000 --- a/trunk/arch/arm/mach-davinci/include/mach/clkdev.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef __MACH_CLKDEV_H -#define __MACH_CLKDEV_H - -struct clk; - -static inline int __clk_get(struct clk *clk) -{ - return 1; -} - -static inline void __clk_put(struct clk *clk) -{ -} - -#endif diff --git a/trunk/arch/arm/mach-davinci/include/mach/da8xx.h b/trunk/arch/arm/mach-davinci/include/mach/da8xx.h index ad64da713fc8..eaca7d8b9d68 100644 --- a/trunk/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/trunk/arch/arm/mach-davinci/include/mach/da8xx.h @@ -57,6 +57,7 @@ extern unsigned int da850_max_speed; #define DA8XX_SYSCFG1_BASE (IO_PHYS + 0x22C000) #define DA8XX_SYSCFG1_VIRT(x) (da8xx_syscfg1_base + (x)) #define DA8XX_DEEPSLEEP_REG 0x8 +#define DA8XX_PWRDN_REG 0x18 #define DA8XX_PSC0_BASE 0x01c10000 #define DA8XX_PLL0_BASE 0x01c11000 @@ -89,6 +90,7 @@ int da850_register_cpufreq(char *async_clk); int da8xx_register_cpuidle(void); void __iomem * __init da8xx_get_mem_ctlr(void); int da850_register_pm(struct platform_device *pdev); +int __init da850_register_sata(unsigned long refclkpn); extern struct platform_device da8xx_serial_device; extern struct emac_platform_data da8xx_emac_pdata; diff --git a/trunk/arch/arm/mach-davinci/include/mach/psc.h b/trunk/arch/arm/mach-davinci/include/mach/psc.h index 1110fdd77ba4..47fd0bc3d3e7 100644 --- a/trunk/arch/arm/mach-davinci/include/mach/psc.h +++ b/trunk/arch/arm/mach-davinci/include/mach/psc.h @@ -244,12 +244,13 @@ #define PSC_STATE_ENABLE 3 #define MDSTAT_STATE_MASK 0x1f +#define MDCTL_FORCE BIT(31) #ifndef __ASSEMBLER__ extern int davinci_psc_is_clk_active(unsigned int ctlr, unsigned int id); extern void davinci_psc_config(unsigned int domain, unsigned int ctlr, - unsigned int id, u32 next_state); + unsigned int id, bool enable, u32 flags); #endif diff --git a/trunk/arch/arm/mach-davinci/psc.c b/trunk/arch/arm/mach-davinci/psc.c index a41580400701..1fb6bdff38c1 100644 --- a/trunk/arch/arm/mach-davinci/psc.c +++ b/trunk/arch/arm/mach-davinci/psc.c @@ -25,6 +25,8 @@ #include #include +#include "clock.h" + /* Return nonzero iff the domain's clock is active */ int __init davinci_psc_is_clk_active(unsigned int ctlr, unsigned int id) { @@ -48,11 +50,12 @@ int __init davinci_psc_is_clk_active(unsigned int ctlr, unsigned int id) /* Enable or disable a PSC domain */ void davinci_psc_config(unsigned int domain, unsigned int ctlr, - unsigned int id, u32 next_state) + unsigned int id, bool enable, u32 flags) { u32 epcpr, ptcmd, ptstat, pdstat, pdctl1, mdstat, mdctl; void __iomem *psc_base; struct davinci_soc_info *soc_info = &davinci_soc_info; + u32 next_state = PSC_STATE_ENABLE; if (!soc_info->psc_bases || (ctlr >= soc_info->psc_bases_num)) { pr_warning("PSC: Bad psc data: 0x%x[%d]\n", @@ -62,9 +65,18 @@ void davinci_psc_config(unsigned int domain, unsigned int ctlr, psc_base = ioremap(soc_info->psc_bases[ctlr], SZ_4K); + if (!enable) { + if (flags & PSC_SWRSTDISABLE) + next_state = PSC_STATE_SWRSTDISABLE; + else + next_state = PSC_STATE_DISABLE; + } + mdctl = __raw_readl(psc_base + MDCTL + 4 * id); mdctl &= ~MDSTAT_STATE_MASK; mdctl |= next_state; + if (flags & PSC_FORCE) + mdctl |= MDCTL_FORCE; __raw_writel(mdctl, psc_base + MDCTL + 4 * id); pdstat = __raw_readl(psc_base + PDSTAT); diff --git a/trunk/arch/arm/mach-dove/include/mach/hardware.h b/trunk/arch/arm/mach-dove/include/mach/hardware.h index 32b0826e7873..f1368b9a8ece 100644 --- a/trunk/arch/arm/mach-dove/include/mach/hardware.h +++ b/trunk/arch/arm/mach-dove/include/mach/hardware.h @@ -11,13 +11,6 @@ #include "dove.h" -#define pcibios_assign_all_busses() 1 - -#define PCIBIOS_MIN_IO 0x1000 -#define PCIBIOS_MIN_MEM 0x01000000 -#define PCIMEM_BASE DOVE_PCIE0_MEM_PHYS_BASE - - /* Macros below are required for compatibility with PXA AC'97 driver. */ #define __REG(x) (*((volatile u32 *)((x) - DOVE_SB_REGS_PHYS_BASE + \ DOVE_SB_REGS_VIRT_BASE))) diff --git a/trunk/arch/arm/mach-dove/pcie.c b/trunk/arch/arm/mach-dove/pcie.c index 502d1ca2f4b7..c2f1c4767f21 100644 --- a/trunk/arch/arm/mach-dove/pcie.c +++ b/trunk/arch/arm/mach-dove/pcie.c @@ -11,6 +11,7 @@ #include #include #include +#include