From 3dba690d034f3256ba9b81d2d92c9841a78af9a3 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sat, 10 Nov 2012 18:32:51 -0500 Subject: [PATCH] --- yaml --- r: 340726 b: refs/heads/master c: d4185bbf62a5d8d777ee445db1581beb17882a07 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/.gitignore | 6 - trunk/Documentation/00-INDEX | 4 +- trunk/Documentation/DocBook/media/Makefile | 76 +- .../devicetree/bindings/arm/atmel-at91.txt | 2 +- .../bindings/input/touchscreen/egalax-ts.txt | 19 + .../pinctrl/nvidia,tegra20-pinmux.txt | 2 +- .../pinctrl/nvidia,tegra30-pinmux.txt | 2 +- trunk/Documentation/firmware_class/README | 26 +- trunk/Documentation/hwmon/coretemp | 1 + trunk/Documentation/hwmon/fam15h_power | 2 +- trunk/Documentation/hwmon/submitting-patches | 3 +- trunk/Documentation/zh_CN/IRQ.txt | 39 + trunk/Documentation/zh_CN/arm64/booting.txt | 156 +++ trunk/Documentation/zh_CN/arm64/memory.txt | 93 ++ trunk/MAINTAINERS | 28 +- trunk/Makefile | 13 +- trunk/arch/alpha/include/asm/thread_info.h | 80 +- trunk/arch/alpha/kernel/osf_sys.c | 25 +- trunk/arch/alpha/kernel/process.c | 2 +- trunk/arch/alpha/kernel/traps.c | 6 +- trunk/arch/arm/Kconfig | 9 +- trunk/arch/arm/Makefile | 13 +- trunk/arch/arm/boot/Makefile | 10 +- trunk/arch/arm/boot/dts/Makefile | 2 + .../arm/boot/dts/at91sam9g20ek_common.dtsi | 4 +- trunk/arch/arm/boot/dts/dbx5x0.dtsi | 17 +- trunk/arch/arm/boot/dts/dove.dtsi | 49 +- trunk/arch/arm/boot/dts/exynos4210-trats.dts | 6 +- trunk/arch/arm/boot/dts/imx23.dtsi | 1 + trunk/arch/arm/boot/dts/imx28.dtsi | 1 + trunk/arch/arm/boot/dts/imx6q-arm2.dts | 10 +- trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi | 18 +- trunk/arch/arm/boot/dts/omap3.dtsi | 4 +- trunk/arch/arm/boot/dts/wm8505.dtsi | 4 +- trunk/arch/arm/configs/imx_v6_v7_defconfig | 2 + trunk/arch/arm/configs/mvebu_defconfig | 10 +- trunk/arch/arm/configs/versatile_defconfig | 1 + trunk/arch/arm/include/asm/flat.h | 2 +- trunk/arch/arm/include/asm/uaccess.h | 4 +- trunk/arch/arm/include/asm/xen/interface.h | 12 +- trunk/arch/arm/include/asm/xen/page.h | 13 +- trunk/arch/arm/include/debug/8250_32.S | 27 + trunk/arch/arm/include/debug/picoxcell.S | 18 +- trunk/arch/arm/include/debug/socfpga.S | 5 + trunk/arch/arm/kernel/irq.c | 2 + trunk/arch/arm/kernel/kprobes-test-arm.c | 4 + trunk/arch/arm/kernel/machine_kexec.c | 7 +- trunk/arch/arm/kernel/perf_event.c | 4 + trunk/arch/arm/kernel/smp.c | 14 +- trunk/arch/arm/kernel/smp_twd.c | 4 +- trunk/arch/arm/lib/delay.c | 1 + trunk/arch/arm/mach-at91/Kconfig | 10 +- trunk/arch/arm/mach-at91/at91rm9200.c | 2 +- trunk/arch/arm/mach-at91/at91rm9200_devices.c | 4 +- trunk/arch/arm/mach-at91/at91sam9260.c | 4 +- .../arch/arm/mach-at91/at91sam9260_devices.c | 4 +- trunk/arch/arm/mach-at91/at91sam9261.c | 4 +- .../arch/arm/mach-at91/at91sam9261_devices.c | 4 +- trunk/arch/arm/mach-at91/at91sam9263.c | 2 +- .../arch/arm/mach-at91/at91sam9263_devices.c | 4 +- trunk/arch/arm/mach-at91/at91sam9rl_devices.c | 4 +- trunk/arch/arm/mach-at91/at91x40.c | 2 +- trunk/arch/arm/mach-at91/board-neocore926.c | 2 +- trunk/arch/arm/mach-at91/board-sam9261ek.c | 2 +- trunk/arch/arm/mach-at91/board-sam9263ek.c | 2 +- trunk/arch/arm/mach-at91/generic.h | 3 +- trunk/arch/arm/mach-at91/irq.c | 9 +- trunk/arch/arm/mach-at91/setup.c | 4 +- trunk/arch/arm/mach-dove/common.c | 8 +- trunk/arch/arm/mach-dove/pcie.c | 5 + trunk/arch/arm/mach-exynos/common.c | 5 + trunk/arch/arm/mach-exynos/mach-exynos4-dt.c | 1 + trunk/arch/arm/mach-imx/clk-busy.c | 2 +- trunk/arch/arm/mach-imx/clk-imx25.c | 4 +- trunk/arch/arm/mach-imx/clk-imx27.c | 4 +- trunk/arch/arm/mach-imx/mm-imx3.c | 5 +- trunk/arch/arm/mach-kirkwood/board-dt.c | 2 - trunk/arch/arm/mach-kirkwood/common.c | 4 +- trunk/arch/arm/mach-omap1/board-ams-delta.c | 12 + trunk/arch/arm/mach-omap2/Kconfig | 1 - trunk/arch/arm/mach-omap2/board-omap3beagle.c | 22 +- trunk/arch/arm/mach-omap2/clock33xx_data.c | 2 + trunk/arch/arm/mach-omap2/clock44xx_data.c | 2 +- trunk/arch/arm/mach-omap2/clockdomain.c | 15 +- trunk/arch/arm/mach-omap2/devices.c | 2 +- trunk/arch/arm/mach-omap2/gpmc.c | 24 +- trunk/arch/arm/mach-omap2/mux34xx.c | 8 +- trunk/arch/arm/mach-omap2/pm.h | 1 + trunk/arch/arm/mach-omap2/pm34xx.c | 30 +- trunk/arch/arm/mach-omap2/serial.c | 5 + trunk/arch/arm/mach-omap2/timer.c | 2 +- trunk/arch/arm/mach-s3c24xx/clock-s3c2440.c | 2 +- trunk/arch/arm/mach-s3c24xx/s3c2416.c | 2 + trunk/arch/arm/mach-s3c24xx/s3c2443.c | 4 + trunk/arch/arm/mach-s5p64x0/common.c | 3 + trunk/arch/arm/mach-s5pc100/common.c | 3 + trunk/arch/arm/mach-s5pv210/common.c | 3 + .../arm/mach-shmobile/board-armadillo800eva.c | 2 +- trunk/arch/arm/mach-shmobile/clock-r8a7779.c | 22 +- trunk/arch/arm/mach-shmobile/setup-r8a7779.c | 2 +- .../include/mach/spear1310_misc_regs.h | 0 .../include/mach/spear1340_misc_regs.h | 0 trunk/arch/arm/mach-tegra/board-dt-tegra20.c | 2 +- trunk/arch/arm/mach-tegra/board-dt-tegra30.c | 2 +- trunk/arch/arm/mach-tegra/board.h | 2 +- .../arch/arm/mach-tegra/tegra20_clocks_data.c | 1 + trunk/arch/arm/mach-tegra/tegra30_clocks.c | 2 +- .../arch/arm/mach-tegra/tegra30_clocks_data.c | 1 + trunk/arch/arm/mach-tegra/timer.c | 2 +- trunk/arch/arm/mach-ux500/cpu.c | 1 + trunk/arch/arm/mm/alignment.c | 4 +- trunk/arch/arm/mm/dma-mapping.c | 2 +- trunk/arch/arm/mm/vmregion.h | 1 - .../arm/plat-mxc/devices/platform-mxc-mmc.c | 2 +- trunk/arch/arm/plat-omap/Kconfig | 1 + trunk/arch/arm/plat-omap/debug-devices.c | 1 + .../arm/plat-omap/include/plat/omap-serial.h | 4 +- .../arm/plat-samsung/include/plat/spi-core.h | 30 + trunk/arch/arm/tools/Makefile | 2 +- trunk/arch/arm/xen/grant-table.c | 2 +- trunk/arch/arm/xen/hypercall.S | 14 +- trunk/arch/arm64/Kconfig | 1 + trunk/arch/arm64/include/asm/Kbuild | 1 - trunk/arch/arm64/include/asm/linkage.h | 7 + trunk/arch/arm64/include/asm/processor.h | 10 - trunk/arch/arm64/include/uapi/asm/ptrace.h | 3 +- trunk/arch/arm64/kernel/ptrace.c | 73 +- trunk/arch/arm64/kernel/setup.c | 12 + trunk/arch/arm64/kernel/smp.c | 1 - trunk/arch/arm64/kernel/vdso.c | 20 +- trunk/arch/frv/Kconfig | 1 + trunk/arch/frv/boot/Makefile | 10 +- trunk/arch/frv/include/asm/unistd.h | 1 - trunk/arch/frv/kernel/entry.S | 28 +- trunk/arch/frv/kernel/process.c | 5 +- trunk/arch/frv/mb93090-mb00/pci-dma-nommu.c | 1 + trunk/arch/hexagon/include/asm/Kbuild | 3 - trunk/arch/hexagon/include/asm/atomic.h | 2 +- trunk/arch/hexagon/include/asm/barrier.h | 2 +- trunk/arch/hexagon/include/asm/bitops.h | 2 +- trunk/arch/hexagon/include/asm/cache.h | 2 +- trunk/arch/hexagon/include/asm/cacheflush.h | 2 +- trunk/arch/hexagon/include/asm/checksum.h | 2 +- trunk/arch/hexagon/include/asm/cmpxchg.h | 2 +- trunk/arch/hexagon/include/asm/delay.h | 2 +- trunk/arch/hexagon/include/asm/dma-mapping.h | 2 +- trunk/arch/hexagon/include/asm/dma.h | 2 +- trunk/arch/hexagon/include/asm/elf.h | 2 +- trunk/arch/hexagon/include/asm/exec.h | 2 +- trunk/arch/hexagon/include/asm/fixmap.h | 2 +- trunk/arch/hexagon/include/asm/hexagon_vm.h | 2 +- trunk/arch/hexagon/include/asm/intrinsics.h | 2 +- trunk/arch/hexagon/include/asm/io.h | 2 +- trunk/arch/hexagon/include/asm/irq.h | 2 +- trunk/arch/hexagon/include/asm/irqflags.h | 2 +- trunk/arch/hexagon/include/asm/kgdb.h | 2 +- trunk/arch/hexagon/include/asm/linkage.h | 2 +- trunk/arch/hexagon/include/asm/mem-layout.h | 2 +- trunk/arch/hexagon/include/asm/mmu.h | 2 +- trunk/arch/hexagon/include/asm/mmu_context.h | 2 +- trunk/arch/hexagon/include/asm/module.h | 2 +- trunk/arch/hexagon/include/asm/page.h | 2 +- trunk/arch/hexagon/include/asm/perf_event.h | 2 +- trunk/arch/hexagon/include/asm/pgalloc.h | 2 +- trunk/arch/hexagon/include/asm/pgtable.h | 2 +- trunk/arch/hexagon/include/asm/processor.h | 2 +- trunk/arch/hexagon/include/asm/smp.h | 2 +- trunk/arch/hexagon/include/asm/spinlock.h | 2 +- .../arch/hexagon/include/asm/spinlock_types.h | 2 +- trunk/arch/hexagon/include/asm/string.h | 2 +- trunk/arch/hexagon/include/asm/suspend.h | 2 +- trunk/arch/hexagon/include/asm/switch_to.h | 2 +- trunk/arch/hexagon/include/asm/syscall.h | 2 +- trunk/arch/hexagon/include/asm/thread_info.h | 2 +- trunk/arch/hexagon/include/asm/time.h | 2 +- trunk/arch/hexagon/include/asm/timer-regs.h | 2 +- trunk/arch/hexagon/include/asm/timex.h | 2 +- trunk/arch/hexagon/include/asm/tlb.h | 2 +- trunk/arch/hexagon/include/asm/tlbflush.h | 2 +- trunk/arch/hexagon/include/asm/traps.h | 2 +- trunk/arch/hexagon/include/asm/uaccess.h | 2 +- trunk/arch/hexagon/include/asm/vdso.h | 2 +- trunk/arch/hexagon/include/asm/vm_fault.h | 2 +- trunk/arch/hexagon/include/asm/vm_mmu.h | 2 +- trunk/arch/hexagon/include/uapi/asm/Kbuild | 12 + .../include/{ => uapi}/asm/bitsperlong.h | 2 +- .../include/{ => uapi}/asm/byteorder.h | 2 +- .../hexagon/include/{ => uapi}/asm/kvm_para.h | 0 .../hexagon/include/{ => uapi}/asm/param.h | 2 +- .../hexagon/include/{ => uapi}/asm/ptrace.h | 2 +- .../include/{ => uapi}/asm/registers.h | 17 +- .../hexagon/include/{ => uapi}/asm/setup.h | 2 +- .../include/{ => uapi}/asm/sigcontext.h | 2 +- .../hexagon/include/{ => uapi}/asm/signal.h | 2 +- .../hexagon/include/{ => uapi}/asm/swab.h | 2 +- .../hexagon/include/{ => uapi}/asm/unistd.h | 2 +- .../hexagon/include/{ => uapi}/asm/user.h | 18 - trunk/arch/hexagon/kernel/asm-offsets.c | 2 +- trunk/arch/hexagon/kernel/dma.c | 2 +- trunk/arch/hexagon/kernel/head.S | 2 +- trunk/arch/hexagon/kernel/hexagon_ksyms.c | 2 +- trunk/arch/hexagon/kernel/irq_cpu.c | 2 +- trunk/arch/hexagon/kernel/kgdb.c | 2 +- trunk/arch/hexagon/kernel/module.c | 2 +- trunk/arch/hexagon/kernel/process.c | 2 +- trunk/arch/hexagon/kernel/ptrace.c | 2 +- trunk/arch/hexagon/kernel/reset.c | 2 +- trunk/arch/hexagon/kernel/setup.c | 2 +- trunk/arch/hexagon/kernel/signal.c | 2 +- trunk/arch/hexagon/kernel/smp.c | 2 +- trunk/arch/hexagon/kernel/stacktrace.c | 2 +- trunk/arch/hexagon/kernel/syscall.c | 2 +- trunk/arch/hexagon/kernel/syscalltab.c | 2 +- trunk/arch/hexagon/kernel/time.c | 2 +- trunk/arch/hexagon/kernel/topology.c | 2 +- trunk/arch/hexagon/kernel/trampoline.S | 2 +- trunk/arch/hexagon/kernel/traps.c | 2 +- trunk/arch/hexagon/kernel/vdso.c | 2 +- trunk/arch/hexagon/kernel/vm_entry.S | 2 +- trunk/arch/hexagon/kernel/vm_events.c | 2 +- trunk/arch/hexagon/kernel/vm_init_segtable.S | 2 +- trunk/arch/hexagon/kernel/vm_ops.S | 2 +- trunk/arch/hexagon/kernel/vm_switch.S | 2 +- trunk/arch/hexagon/kernel/vm_vectors.S | 2 +- trunk/arch/hexagon/kernel/vmlinux.lds.S | 2 +- trunk/arch/hexagon/lib/checksum.c | 2 +- trunk/arch/hexagon/lib/io.c | 2 +- trunk/arch/hexagon/lib/memcpy.S | 2 +- trunk/arch/hexagon/lib/memset.S | 2 +- trunk/arch/hexagon/mm/cache.c | 2 +- trunk/arch/hexagon/mm/copy_from_user.S | 2 +- trunk/arch/hexagon/mm/copy_to_user.S | 2 +- trunk/arch/hexagon/mm/copy_user_template.S | 2 +- trunk/arch/hexagon/mm/init.c | 2 +- trunk/arch/hexagon/mm/ioremap.c | 2 +- trunk/arch/hexagon/mm/pgalloc.c | 2 +- trunk/arch/hexagon/mm/strnlen_user.S | 2 +- trunk/arch/hexagon/mm/uaccess.c | 2 +- trunk/arch/hexagon/mm/vm_fault.c | 2 +- trunk/arch/hexagon/mm/vm_tlb.c | 2 +- trunk/arch/ia64/include/asm/Kbuild | 1 + trunk/arch/ia64/include/asm/kvm_para.h | 34 - trunk/arch/m68k/include/asm/Kbuild | 2 - trunk/arch/m68k/include/asm/ptrace.h | 75 +- trunk/arch/m68k/include/asm/setup.h | 82 +- trunk/arch/m68k/include/asm/signal.h | 118 +-- trunk/arch/m68k/include/asm/termios.h | 44 +- trunk/arch/m68k/include/asm/unistd.h | 356 +------ trunk/arch/m68k/include/uapi/asm/Kbuild | 23 + .../arch/m68k/include/{ => uapi}/asm/a.out.h | 0 .../arch/m68k/include/{ => uapi}/asm/auxvec.h | 0 .../m68k/include/{ => uapi}/asm/byteorder.h | 0 .../m68k/include/{ => uapi}/asm/cachectl.h | 0 .../arch/m68k/include/{ => uapi}/asm/fcntl.h | 0 .../arch/m68k/include/{ => uapi}/asm/ioctls.h | 0 .../arch/m68k/include/{ => uapi}/asm/msgbuf.h | 0 .../arch/m68k/include/{ => uapi}/asm/param.h | 0 trunk/arch/m68k/include/{ => uapi}/asm/poll.h | 0 .../m68k/include/{ => uapi}/asm/posix_types.h | 0 trunk/arch/m68k/include/uapi/asm/ptrace.h | 79 ++ .../arch/m68k/include/{ => uapi}/asm/sembuf.h | 0 trunk/arch/m68k/include/uapi/asm/setup.h | 103 ++ .../arch/m68k/include/{ => uapi}/asm/shmbuf.h | 0 .../m68k/include/{ => uapi}/asm/sigcontext.h | 0 trunk/arch/m68k/include/uapi/asm/signal.h | 118 +++ .../arch/m68k/include/{ => uapi}/asm/socket.h | 0 .../m68k/include/{ => uapi}/asm/sockios.h | 0 trunk/arch/m68k/include/{ => uapi}/asm/stat.h | 0 trunk/arch/m68k/include/{ => uapi}/asm/swab.h | 0 .../m68k/include/{ => uapi}/asm/termbits.h | 0 trunk/arch/m68k/include/uapi/asm/termios.h | 44 + trunk/arch/m68k/include/uapi/asm/unistd.h | 357 +++++++ trunk/arch/m68k/kernel/syscalltable.S | 1 + trunk/arch/mips/include/asm/delay.h | 6 +- trunk/arch/mips/include/asm/pgtable-64.h | 15 +- trunk/arch/mips/jz4740/serial.h | 3 + trunk/arch/mips/kernel/smp-cmp.c | 2 +- trunk/arch/mips/lib/delay.c | 6 +- trunk/arch/mips/lib/dump_tlb.c | 4 +- trunk/arch/mips/mm/tlb-r4k.c | 1 + trunk/arch/mips/mm/tlbex.c | 56 +- trunk/arch/parisc/include/asm/Kbuild | 9 +- trunk/arch/parisc/include/asm/auxvec.h | 4 - trunk/arch/parisc/include/asm/compat_signal.h | 2 - trunk/arch/parisc/include/asm/cputime.h | 6 - trunk/arch/parisc/include/asm/device.h | 7 - trunk/arch/parisc/include/asm/div64.h | 1 - .../parisc/include/asm/emergency-restart.h | 6 - trunk/arch/parisc/include/asm/hw_irq.h | 8 - trunk/arch/parisc/include/asm/irq_regs.h | 1 - trunk/arch/parisc/include/asm/kdebug.h | 1 - trunk/arch/parisc/include/asm/kvm_para.h | 1 - trunk/arch/parisc/include/asm/local.h | 1 - trunk/arch/parisc/include/asm/local64.h | 1 - trunk/arch/parisc/include/asm/mutex.h | 9 - trunk/arch/parisc/include/asm/param.h | 1 - trunk/arch/parisc/include/asm/pdc.h | 423 +------- trunk/arch/parisc/include/asm/percpu.h | 7 - trunk/arch/parisc/include/asm/poll.h | 1 - trunk/arch/parisc/include/asm/ptrace.h | 46 +- trunk/arch/parisc/include/asm/real.h | 5 - trunk/arch/parisc/include/asm/segment.h | 6 - trunk/arch/parisc/include/asm/signal.h | 113 +- trunk/arch/parisc/include/asm/termios.h | 41 +- trunk/arch/parisc/include/asm/topology.h | 6 - trunk/arch/parisc/include/asm/unistd.h | 835 +-------------- trunk/arch/parisc/include/asm/user.h | 5 - trunk/arch/parisc/include/asm/vga.h | 6 - trunk/arch/parisc/include/asm/xor.h | 1 - trunk/arch/parisc/include/uapi/asm/Kbuild | 28 + .../include/{ => uapi}/asm/bitsperlong.h | 0 .../parisc/include/{ => uapi}/asm/byteorder.h | 0 .../parisc/include/{ => uapi}/asm/errno.h | 0 .../parisc/include/{ => uapi}/asm/fcntl.h | 0 .../parisc/include/{ => uapi}/asm/ioctl.h | 0 .../parisc/include/{ => uapi}/asm/ioctls.h | 0 .../parisc/include/{ => uapi}/asm/ipcbuf.h | 0 .../arch/parisc/include/{ => uapi}/asm/mman.h | 0 .../parisc/include/{ => uapi}/asm/msgbuf.h | 0 trunk/arch/parisc/include/uapi/asm/pdc.h | 427 ++++++++ .../include/{ => uapi}/asm/posix_types.h | 0 trunk/arch/parisc/include/uapi/asm/ptrace.h | 47 + .../parisc/include/{ => uapi}/asm/resource.h | 0 .../parisc/include/{ => uapi}/asm/sembuf.h | 0 .../parisc/include/{ => uapi}/asm/setup.h | 0 .../parisc/include/{ => uapi}/asm/shmbuf.h | 0 .../include/{ => uapi}/asm/sigcontext.h | 0 .../parisc/include/{ => uapi}/asm/siginfo.h | 0 trunk/arch/parisc/include/uapi/asm/signal.h | 118 +++ .../parisc/include/{ => uapi}/asm/socket.h | 0 .../parisc/include/{ => uapi}/asm/sockios.h | 0 .../arch/parisc/include/{ => uapi}/asm/stat.h | 0 .../parisc/include/{ => uapi}/asm/statfs.h | 0 .../arch/parisc/include/{ => uapi}/asm/swab.h | 0 .../parisc/include/{ => uapi}/asm/termbits.h | 0 trunk/arch/parisc/include/uapi/asm/termios.h | 43 + .../parisc/include/{ => uapi}/asm/types.h | 0 trunk/arch/parisc/include/uapi/asm/unistd.h | 837 +++++++++++++++ .../arch/powerpc/include/asm/kvm_book3s_32.h | 1 + trunk/arch/powerpc/include/asm/processor.h | 4 +- trunk/arch/powerpc/kernel/sysfs.c | 2 +- trunk/arch/powerpc/kvm/book3s_32_mmu_host.c | 4 +- trunk/arch/powerpc/perf/core-book3s.c | 2 +- .../platforms/pseries/processor_idle.c | 62 +- trunk/arch/s390/Kconfig | 1 + trunk/arch/s390/boot/compressed/vmlinux.lds.S | 2 +- trunk/arch/s390/include/asm/perf_event.h | 2 +- trunk/arch/s390/include/uapi/asm/Kbuild | 2 - trunk/arch/s390/include/uapi/asm/chpid.h | 10 +- trunk/arch/s390/include/uapi/asm/kvm_para.h | 11 + trunk/arch/s390/kernel/cache.c | 9 +- trunk/arch/s390/kernel/head_kdump.S | 10 +- trunk/arch/s390/kernel/perf_cpum_cf.c | 6 +- trunk/arch/s390/kernel/vmlinux.lds.S | 2 +- trunk/arch/tile/Makefile | 4 + trunk/arch/tile/kernel/module.c | 10 - trunk/arch/x86/crypto/aesni-intel_glue.c | 9 +- trunk/arch/x86/include/asm/efi.h | 6 +- trunk/arch/x86/include/asm/xen/hypervisor.h | 1 - trunk/arch/x86/include/asm/xen/interface.h | 4 +- trunk/arch/x86/kernel/apic/io_apic.c | 3 + trunk/arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +- trunk/arch/x86/kernel/cpu/mcheck/mce.c | 6 - trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c | 10 +- trunk/arch/x86/kernel/cpu/perf_event.c | 16 +- .../x86/kernel/cpu/perf_event_intel_uncore.c | 48 +- trunk/arch/x86/kernel/cpu/perf_event_knc.c | 93 +- trunk/arch/x86/kernel/cpu/perf_event_p6.c | 127 ++- trunk/arch/x86/kernel/e820.c | 3 + trunk/arch/x86/kernel/entry_32.S | 8 +- trunk/arch/x86/kernel/entry_64.S | 2 +- trunk/arch/x86/kernel/kvm.c | 3 + trunk/arch/x86/kernel/reboot.c | 8 - trunk/arch/x86/kernel/setup.c | 30 +- trunk/arch/x86/kernel/signal.c | 4 +- trunk/arch/x86/kernel/uprobes.c | 16 +- trunk/arch/x86/kvm/lapic.c | 2 +- trunk/arch/x86/kvm/mmu.c | 3 +- trunk/arch/x86/kvm/x86.c | 60 +- trunk/arch/x86/mm/init.c | 58 +- trunk/arch/x86/mm/init_64.c | 7 +- trunk/arch/x86/oprofile/nmi_int.c | 2 +- trunk/arch/x86/platform/efi/efi.c | 47 +- trunk/arch/x86/platform/efi/efi_64.c | 7 +- trunk/arch/x86/realmode/rm/wakeup_asm.S | 15 +- trunk/arch/x86/xen/enlighten.c | 2 - trunk/arch/x86/xen/mmu.c | 21 +- trunk/arch/xtensa/Kconfig | 2 + .../arch/xtensa/boot/boot-redboot/bootstrap.S | 8 +- trunk/arch/xtensa/include/asm/Kbuild | 28 +- trunk/arch/xtensa/include/asm/atomic.h | 12 +- trunk/arch/xtensa/include/asm/bitsperlong.h | 1 - trunk/arch/xtensa/include/asm/bug.h | 18 - trunk/arch/xtensa/include/asm/cacheflush.h | 2 +- trunk/arch/xtensa/include/asm/cmpxchg.h | 4 +- trunk/arch/xtensa/include/asm/coprocessor.h | 5 +- trunk/arch/xtensa/include/asm/cputime.h | 6 - trunk/arch/xtensa/include/asm/delay.h | 2 +- trunk/arch/xtensa/include/asm/device.h | 7 - trunk/arch/xtensa/include/asm/div64.h | 16 - .../xtensa/include/asm/emergency-restart.h | 6 - trunk/arch/xtensa/include/asm/errno.h | 16 - trunk/arch/xtensa/include/asm/fcntl.h | 1 - trunk/arch/xtensa/include/asm/futex.h | 1 - trunk/arch/xtensa/include/asm/hardirq.h | 16 - trunk/arch/xtensa/include/asm/io.h | 4 + trunk/arch/xtensa/include/asm/ioctl.h | 1 - trunk/arch/xtensa/include/asm/irq_regs.h | 1 - trunk/arch/xtensa/include/asm/irqflags.h | 4 +- trunk/arch/xtensa/include/asm/kdebug.h | 1 - trunk/arch/xtensa/include/asm/kmap_types.h | 6 - trunk/arch/xtensa/include/asm/kvm_para.h | 1 - trunk/arch/xtensa/include/asm/local.h | 16 - trunk/arch/xtensa/include/asm/local64.h | 1 - trunk/arch/xtensa/include/asm/mmu_context.h | 4 +- trunk/arch/xtensa/include/asm/param.h | 20 +- trunk/arch/xtensa/include/asm/percpu.h | 16 - trunk/arch/xtensa/include/asm/processor.h | 4 +- trunk/arch/xtensa/include/asm/ptrace.h | 66 +- trunk/arch/xtensa/include/asm/regs.h | 55 +- trunk/arch/xtensa/include/asm/resource.h | 16 - trunk/arch/xtensa/include/asm/scatterlist.h | 16 - trunk/arch/xtensa/include/asm/sections.h | 16 - trunk/arch/xtensa/include/asm/siginfo.h | 16 - trunk/arch/xtensa/include/asm/signal.h | 134 +-- trunk/arch/xtensa/include/asm/statfs.h | 17 - trunk/arch/xtensa/include/asm/syscall.h | 2 +- trunk/arch/xtensa/include/asm/termios.h | 105 -- trunk/arch/xtensa/include/asm/timex.h | 8 +- trunk/arch/xtensa/include/asm/tlbflush.h | 8 +- trunk/arch/xtensa/include/asm/topology.h | 16 - trunk/arch/xtensa/include/asm/types.h | 15 +- trunk/arch/xtensa/include/asm/unistd.h | 711 +------------ trunk/arch/xtensa/include/asm/xor.h | 16 - trunk/arch/xtensa/include/uapi/asm/Kbuild | 22 + .../xtensa/include/{ => uapi}/asm/auxvec.h | 0 .../xtensa/include/{ => uapi}/asm/byteorder.h | 0 .../xtensa/include/{ => uapi}/asm/ioctls.h | 0 .../xtensa/include/{ => uapi}/asm/ipcbuf.h | 0 .../arch/xtensa/include/{ => uapi}/asm/mman.h | 0 .../xtensa/include/{ => uapi}/asm/msgbuf.h | 0 trunk/arch/xtensa/include/uapi/asm/param.h | 30 + .../arch/xtensa/include/{ => uapi}/asm/poll.h | 0 .../include/{ => uapi}/asm/posix_types.h | 0 trunk/arch/xtensa/include/uapi/asm/ptrace.h | 77 ++ .../xtensa/include/{ => uapi}/asm/sembuf.h | 0 .../xtensa/include/{ => uapi}/asm/setup.h | 0 .../xtensa/include/{ => uapi}/asm/shmbuf.h | 0 .../include/{ => uapi}/asm/sigcontext.h | 0 trunk/arch/xtensa/include/uapi/asm/signal.h | 148 +++ .../xtensa/include/{ => uapi}/asm/socket.h | 0 .../xtensa/include/{ => uapi}/asm/sockios.h | 0 .../arch/xtensa/include/{ => uapi}/asm/stat.h | 0 .../arch/xtensa/include/{ => uapi}/asm/swab.h | 0 .../xtensa/include/{ => uapi}/asm/termbits.h | 0 trunk/arch/xtensa/include/uapi/asm/types.h | 28 + trunk/arch/xtensa/include/uapi/asm/unistd.h | 754 +++++++++++++ trunk/arch/xtensa/kernel/align.S | 38 +- trunk/arch/xtensa/kernel/coprocessor.S | 20 +- trunk/arch/xtensa/kernel/entry.S | 311 +++--- trunk/arch/xtensa/kernel/head.S | 36 +- trunk/arch/xtensa/kernel/irq.c | 6 +- trunk/arch/xtensa/kernel/process.c | 147 ++- trunk/arch/xtensa/kernel/setup.c | 4 +- trunk/arch/xtensa/kernel/syscall.c | 8 +- trunk/arch/xtensa/kernel/traps.c | 22 +- trunk/arch/xtensa/kernel/vectors.S | 44 +- trunk/arch/xtensa/kernel/xtensa_ksyms.c | 1 - trunk/arch/xtensa/lib/memcopy.S | 309 +++++- trunk/arch/xtensa/mm/fault.c | 3 +- trunk/arch/xtensa/platforms/iss/console.c | 9 +- .../platforms/iss/include/platform/simcall.h | 9 +- trunk/arch/xtensa/platforms/iss/setup.c | 10 +- trunk/arch/xtensa/platforms/xt2000/setup.c | 10 +- trunk/block/Kconfig | 2 +- trunk/block/blk-cgroup.c | 10 + trunk/block/blk-core.c | 3 +- trunk/drivers/acpi/glue.c | 1 + trunk/drivers/acpi/processor_driver.c | 1 + trunk/drivers/base/Kconfig | 2 +- trunk/drivers/base/dma-coherent.c | 5 +- trunk/drivers/base/dma-contiguous.c | 5 +- trunk/drivers/base/firmware_class.c | 266 +++-- trunk/drivers/base/power/domain.c | 5 +- trunk/drivers/base/regmap/Kconfig | 2 +- trunk/drivers/bcma/main.c | 5 +- trunk/drivers/block/Kconfig | 15 +- trunk/drivers/block/cciss.c | 1 - trunk/drivers/block/floppy.c | 90 +- trunk/drivers/block/loop.c | 17 +- trunk/drivers/block/mtip32xx/mtip32xx.c | 19 +- trunk/drivers/block/mtip32xx/mtip32xx.h | 3 + trunk/drivers/block/xen-blkback/common.h | 4 +- trunk/drivers/block/xen-blkback/xenbus.c | 9 +- trunk/drivers/char/sonypi.c | 2 +- trunk/drivers/cpufreq/cpufreq_stats.c | 1 + trunk/drivers/cpufreq/powernow-k8.c | 11 +- trunk/drivers/dma/Kconfig | 11 + trunk/drivers/dma/dw_dmac_regs.h | 18 +- trunk/drivers/dma/imx-dma.c | 4 +- trunk/drivers/dma/sirf-dma.c | 4 +- trunk/drivers/edac/amd64_edac.c | 11 +- trunk/drivers/extcon/extcon-adc-jack.c | 10 +- trunk/drivers/extcon/extcon-class.c | 142 +-- trunk/drivers/extcon/extcon-gpio.c | 1 - trunk/drivers/extcon/extcon-max77693.c | 46 +- trunk/drivers/extcon/extcon-max8997.c | 6 +- trunk/drivers/firmware/memmap.c | 4 +- trunk/drivers/gpio/gpio-74x164.c | 2 +- trunk/drivers/gpio/gpio-mvebu.c | 7 +- trunk/drivers/gpio/gpio-omap.c | 35 + trunk/drivers/gpio/gpio-timberdale.c | 4 +- trunk/drivers/gpio/gpiolib.c | 10 +- trunk/drivers/gpu/drm/drm_fb_cma_helper.c | 4 +- trunk/drivers/gpu/drm/drm_info.c | 2 - trunk/drivers/gpu/drm/drm_platform.c | 1 - trunk/drivers/gpu/drm/i915/i915_drv.c | 13 + trunk/drivers/gpu/drm/i915/i915_drv.h | 1 + trunk/drivers/gpu/drm/i915/i915_gem.c | 7 +- trunk/drivers/gpu/drm/i915/intel_crt.c | 15 +- trunk/drivers/gpu/drm/i915/intel_display.c | 32 + trunk/drivers/gpu/drm/i915/intel_dp.c | 15 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 8 + trunk/drivers/gpu/drm/i915/intel_sdvo.c | 14 +- .../gpu/drm/nouveau/core/core/gpuobj.c | 5 + trunk/drivers/gpu/drm/nouveau/core/core/mm.c | 11 +- .../gpu/drm/nouveau/core/include/core/mm.h | 1 - .../gpu/drm/nouveau/core/subdev/bios/base.c | 30 +- .../gpu/drm/nouveau/core/subdev/bios/pll.c | 10 +- .../gpu/drm/nouveau/core/subdev/fb/nv50.c | 11 +- .../gpu/drm/nouveau/core/subdev/i2c/base.c | 2 +- .../gpu/drm/nouveau/core/subdev/vm/nv41.c | 3 +- .../gpu/drm/nouveau/core/subdev/vm/nv44.c | 3 +- .../drivers/gpu/drm/nouveau/nouveau_display.c | 50 +- trunk/drivers/gpu/drm/nouveau/nouveau_drm.c | 36 +- trunk/drivers/gpu/drm/nouveau/nouveau_drm.h | 2 + trunk/drivers/gpu/drm/nouveau/nouveau_irq.c | 16 +- trunk/drivers/gpu/drm/nouveau/nv04_dac.c | 16 +- trunk/drivers/gpu/drm/nouveau/nv04_dfp.c | 14 +- trunk/drivers/gpu/drm/nouveau/nv04_tv.c | 9 +- .../gpu/drm/radeon/atombios_encoders.c | 5 +- trunk/drivers/gpu/drm/radeon/evergreen_cs.c | 1 + trunk/drivers/gpu/drm/radeon/ni.c | 45 +- trunk/drivers/gpu/drm/radeon/nid.h | 1 + .../gpu/drm/radeon/radeon_atpx_handler.c | 6 +- trunk/drivers/gpu/drm/radeon/radeon_device.c | 60 +- trunk/drivers/gpu/drm/radeon/radeon_gart.c | 22 +- trunk/drivers/gpu/drm/radeon/radeon_gem.c | 18 +- .../gpu/drm/radeon/radeon_legacy_encoders.c | 5 +- trunk/drivers/gpu/drm/radeon/radeon_object.c | 19 - trunk/drivers/gpu/drm/radeon/si.c | 47 +- .../drivers/gpu/drm/shmobile/shmob_drm_drv.c | 12 +- trunk/drivers/gpu/drm/ttm/ttm_bo.c | 24 +- trunk/drivers/hid/hid-apple.c | 6 + trunk/drivers/hid/hid-core.c | 6 + trunk/drivers/hid/hid-ids.h | 3 + trunk/drivers/hid/hid-microsoft.c | 18 +- trunk/drivers/hid/hid-multitouch.c | 5 +- trunk/drivers/hv/channel.c | 24 +- trunk/drivers/hwmon/coretemp.c | 7 +- trunk/drivers/hwmon/fam15h_power.c | 4 +- trunk/drivers/hwmon/gpio-fan.c | 2 + trunk/drivers/hwmon/pmbus/Kconfig | 2 +- trunk/drivers/i2c/Makefile | 1 + trunk/drivers/i2c/busses/Kconfig | 1 - trunk/drivers/i2c/busses/Makefile | 1 - trunk/drivers/i2c/busses/i2c-i801.c | 11 +- trunk/drivers/i2c/{busses => }/i2c-stub.c | 66 +- trunk/drivers/iio/Kconfig | 1 - trunk/drivers/iio/Makefile | 1 - trunk/drivers/infiniband/hw/cxgb4/mem.c | 2 +- trunk/drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +- trunk/drivers/infiniband/hw/mlx4/mad.c | 85 +- trunk/drivers/infiniband/hw/mlx4/mcg.c | 18 +- trunk/drivers/input/evdev.c | 3 +- trunk/drivers/input/joydev.c | 3 +- trunk/drivers/input/keyboard/Kconfig | 1 + trunk/drivers/input/keyboard/pxa27x_keypad.c | 3 + trunk/drivers/input/misc/xen-kbdfront.c | 5 +- trunk/drivers/input/mouse/bcm5974.c | 21 + trunk/drivers/input/mousedev.c | 3 +- trunk/drivers/input/tablet/wacom_sys.c | 51 +- trunk/drivers/input/tablet/wacom_wac.c | 91 +- trunk/drivers/input/tablet/wacom_wac.h | 5 + trunk/drivers/input/touchscreen/Kconfig | 2 +- trunk/drivers/input/touchscreen/egalax_ts.c | 23 +- trunk/drivers/input/touchscreen/tsc40.c | 1 - trunk/drivers/iommu/amd_iommu_init.c | 39 +- trunk/drivers/iommu/tegra-smmu.c | 2 +- trunk/drivers/isdn/Kconfig | 2 +- trunk/drivers/isdn/gigaset/bas-gigaset.c | 19 +- trunk/drivers/isdn/i4l/Kconfig | 2 +- trunk/drivers/isdn/i4l/isdn_common.c | 4 - trunk/drivers/md/faulty.c | 5 +- trunk/drivers/md/raid1.c | 2 +- trunk/drivers/md/raid10.c | 15 +- trunk/drivers/media/Kconfig | 18 +- trunk/drivers/net/bonding/bond_sysfs.c | 4 +- trunk/drivers/net/can/flexcan.c | 19 +- trunk/drivers/net/can/sja1000/peak_pci.c | 13 +- .../ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 2 +- .../net/ethernet/broadcom/bnx2x/bnx2x_link.c | 162 ++- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 13 +- .../net/ethernet/chelsio/cxgb4/cxgb4.h | 19 + .../net/ethernet/chelsio/cxgb4/cxgb4_main.c | 39 +- .../net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 + .../net/ethernet/chelsio/cxgb4/t4_hw.c | 6 +- .../drivers/net/ethernet/freescale/gianfar.c | 5 +- .../net/ethernet/freescale/gianfar_ptp.c | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 3 + trunk/drivers/net/ethernet/jme.c | 8 +- trunk/drivers/net/ethernet/marvell/skge.c | 2 +- .../net/ethernet/mellanox/mlx4/en_tx.c | 3 +- trunk/drivers/net/ethernet/mellanox/mlx4/eq.c | 24 +- .../drivers/net/ethernet/mellanox/mlx4/main.c | 5 +- .../ethernet/mellanox/mlx4/resource_tracker.c | 6 - trunk/drivers/net/ethernet/micrel/ksz884x.c | 4 +- trunk/drivers/net/ethernet/nxp/lpc_eth.c | 1 + .../ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 116 +- trunk/drivers/net/ethernet/qlogic/qla3xxx.c | 9 +- trunk/drivers/net/ethernet/realtek/r8169.c | 5 + trunk/drivers/net/ethernet/ti/Kconfig | 2 +- trunk/drivers/net/ethernet/tile/tilegx.c | 35 +- .../net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- trunk/drivers/net/phy/mdio-bitbang.c | 1 + trunk/drivers/net/usb/cdc_eem.c | 3 +- trunk/drivers/net/usb/cdc_ether.c | 41 +- trunk/drivers/net/usb/qmi_wwan.c | 14 + trunk/drivers/net/usb/smsc95xx.c | 1 + trunk/drivers/net/usb/usbnet.c | 11 +- trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 65 +- trunk/drivers/net/vxlan.c | 2 +- .../wireless/ath/ath9k/ar9003_2p2_initvals.h | 164 +-- .../drivers/net/wireless/ath/ath9k/hif_usb.c | 1 + trunk/drivers/net/wireless/ath/ath9k/xmit.c | 10 +- trunk/drivers/net/wireless/b43/main.c | 4 + trunk/drivers/net/wireless/b43legacy/pio.c | 2 +- .../net/wireless/brcm80211/brcmfmac/usb.c | 2 +- .../wireless/brcm80211/brcmfmac/wl_cfg80211.c | 70 +- trunk/drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- .../net/wireless/iwlwifi/dvm/devices.c | 39 +- trunk/drivers/net/wireless/mwifiex/cfg80211.c | 7 +- trunk/drivers/net/wireless/mwifiex/scan.c | 13 +- trunk/drivers/net/wireless/rt2x00/rt2500usb.c | 1 + trunk/drivers/net/wireless/rt2x00/rt2800lib.c | 2 +- trunk/drivers/net/wireless/rt2x00/rt2800usb.c | 1 + trunk/drivers/net/wireless/rt2x00/rt73usb.c | 1 + trunk/drivers/net/wireless/rtlwifi/usb.c | 2 +- trunk/drivers/of/address.c | 24 +- trunk/drivers/of/irq.c | 8 +- trunk/drivers/of/platform.c | 2 +- trunk/drivers/pcmcia/pxa2xx_sharpsl.c | 2 +- trunk/drivers/pinctrl/core.c | 4 +- trunk/drivers/pinctrl/pinconf.c | 4 - trunk/drivers/pinctrl/pinctrl-nomadik.c | 6 +- trunk/drivers/pinctrl/pinctrl-tegra.c | 2 +- trunk/drivers/pinctrl/pinctrl-tegra30.c | 24 +- trunk/drivers/rtc/rtc-imxdi.c | 2 + trunk/drivers/s390/cio/css.c | 7 +- trunk/drivers/s390/cio/idset.c | 26 +- trunk/drivers/s390/cio/idset.h | 3 +- trunk/drivers/scsi/arm/fas216.c | 2 +- trunk/drivers/scsi/arm/oak.c | 1 + trunk/drivers/scsi/qla2xxx/qla_mid.c | 3 + trunk/drivers/scsi/qla2xxx/qla_target.c | 25 +- trunk/drivers/scsi/qla2xxx/qla_target.h | 1 + trunk/drivers/scsi/qla2xxx/tcm_qla2xxx.c | 77 +- trunk/drivers/scsi/qla2xxx/tcm_qla2xxx.h | 2 + trunk/drivers/spi/spi-mxs.c | 3 +- trunk/drivers/spi/spi-pl022.c | 3 - trunk/drivers/spi/spi-rspi.c | 56 +- trunk/drivers/spi/spi-s3c64xx.c | 6 +- trunk/drivers/staging/android/binder.c | 30 +- .../drivers/staging/comedi/drivers/8255_pci.c | 2 + .../staging/comedi/drivers/amplc_dio200.c | 2 + .../staging/comedi/drivers/amplc_pc236.c | 5 +- .../staging/comedi/drivers/amplc_pc263.c | 2 + trunk/drivers/staging/comedi/drivers/das08.c | 2 + .../staging/comedi/drivers/ni_daq_700.c | 2 +- .../drivers/staging/comedi/drivers/ni_labpc.c | 2 + trunk/drivers/staging/dgrp/dgrp_mon_ops.c | 1 + trunk/drivers/staging/dgrp/dgrp_specproc.c | 7 + trunk/drivers/staging/dgrp/dgrp_tty.c | 10 + .../staging/iio/accel/adis16201_core.c | 24 +- .../staging/iio/accel/adis16203_core.c | 20 +- .../staging/iio/accel/adis16204_core.c | 22 +- .../staging/iio/accel/adis16209_core.c | 18 +- .../staging/iio/accel/adis16220_core.c | 19 +- .../staging/iio/accel/adis16240_core.c | 23 +- .../drivers/staging/iio/gyro/adis16260_core.c | 29 +- trunk/drivers/staging/iio/imu/adis16400.h | 2 + .../drivers/staging/iio/imu/adis16400_core.c | 70 +- trunk/drivers/staging/ipack/bridges/tpci200.c | 1 + trunk/drivers/staging/omapdrm/omap_gem.c | 4 +- trunk/drivers/staging/ramster/Kconfig | 1 + .../staging/tidspbridge/core/tiomap3430.c | 37 +- trunk/drivers/staging/tidspbridge/hw/hw_mmu.c | 115 +- trunk/drivers/staging/tidspbridge/hw/hw_mmu.h | 31 +- .../tidspbridge/include/dspbridge/cfgdefs.h | 4 +- .../tidspbridge/include/dspbridge/host_os.h | 4 +- trunk/drivers/staging/tidspbridge/rmgr/drv.c | 8 +- trunk/drivers/staging/tidspbridge/rmgr/node.c | 21 +- trunk/drivers/staging/zram/zram_drv.c | 12 +- trunk/drivers/target/iscsi/iscsi_target.c | 4 +- .../drivers/target/iscsi/iscsi_target_core.h | 1 + .../drivers/target/iscsi/iscsi_target_login.c | 1 + .../drivers/target/iscsi/iscsi_target_util.c | 22 +- .../drivers/target/iscsi/iscsi_target_util.h | 1 + trunk/drivers/target/target_core_configfs.c | 3 +- trunk/drivers/target/target_core_device.c | 18 +- trunk/drivers/target/target_core_sbc.c | 18 + trunk/drivers/target/target_core_spc.c | 2 + trunk/drivers/target/target_core_tmr.c | 6 +- trunk/drivers/target/target_core_transport.c | 1 - trunk/drivers/tty/serial/8250/8250_hp300.c | 20 +- trunk/drivers/tty/serial/Kconfig | 4 +- trunk/drivers/tty/serial/omap-serial.c | 12 +- trunk/drivers/tty/serial/sccnxp.c | 1 + trunk/drivers/usb/class/cdc-acm.c | 22 +- trunk/drivers/usb/core/devio.c | 1 + trunk/drivers/usb/core/driver.c | 4 + trunk/drivers/usb/core/hub.c | 43 +- trunk/drivers/usb/dwc3/core.c | 4 + trunk/drivers/usb/dwc3/gadget.c | 2 +- trunk/drivers/usb/gadget/Kconfig | 1 + trunk/drivers/usb/gadget/lpc32xx_udc.c | 4 +- trunk/drivers/usb/gadget/net2272.c | 4 +- trunk/drivers/usb/gadget/u_ether.c | 3 +- trunk/drivers/usb/host/ehci-fsl.c | 2 +- trunk/drivers/usb/host/ehci-orion.c | 2 +- trunk/drivers/usb/host/ehci-vt8500.c | 10 + trunk/drivers/usb/host/pci-quirks.c | 9 +- trunk/drivers/usb/host/uhci-platform.c | 9 + trunk/drivers/usb/host/xhci-dbg.c | 2 - trunk/drivers/usb/host/xhci-hub.c | 9 +- trunk/drivers/usb/host/xhci-ring.c | 11 + trunk/drivers/usb/host/xhci.c | 11 +- trunk/drivers/usb/misc/ezusb.c | 1 + trunk/drivers/usb/musb/am35x.c | 6 + trunk/drivers/usb/musb/musb_dsps.c | 8 +- trunk/drivers/usb/renesas_usbhs/fifo.c | 1 + trunk/drivers/usb/renesas_usbhs/mod.c | 6 +- trunk/drivers/usb/renesas_usbhs/mod_host.c | 5 + trunk/drivers/usb/renesas_usbhs/pipe.h | 2 +- trunk/drivers/usb/serial/ark3116.c | 26 +- trunk/drivers/usb/serial/belkin_sa.c | 31 +- trunk/drivers/usb/serial/ch341.c | 23 +- trunk/drivers/usb/serial/cp210x.c | 40 +- trunk/drivers/usb/serial/cyberjack.c | 49 +- trunk/drivers/usb/serial/cypress_m8.c | 75 +- trunk/drivers/usb/serial/digi_acceleport.c | 117 ++- trunk/drivers/usb/serial/f81232.c | 43 +- trunk/drivers/usb/serial/garmin_gps.c | 24 +- trunk/drivers/usb/serial/io_edgeport.c | 54 +- trunk/drivers/usb/serial/io_tables.h | 8 + trunk/drivers/usb/serial/io_ti.c | 91 +- trunk/drivers/usb/serial/ipw.c | 7 +- trunk/drivers/usb/serial/iuu_phoenix.c | 76 +- trunk/drivers/usb/serial/keyspan.c | 181 ++-- trunk/drivers/usb/serial/keyspan.h | 8 + trunk/drivers/usb/serial/keyspan_pda.c | 30 +- trunk/drivers/usb/serial/kl5kusb105.c | 68 +- trunk/drivers/usb/serial/kobil_sct.c | 23 +- trunk/drivers/usb/serial/mct_u232.c | 59 +- trunk/drivers/usb/serial/metro-usb.c | 65 +- trunk/drivers/usb/serial/mos7720.c | 62 +- trunk/drivers/usb/serial/mos7840.c | 495 ++++----- trunk/drivers/usb/serial/omninet.c | 36 +- trunk/drivers/usb/serial/opticon.c | 11 +- trunk/drivers/usb/serial/option.c | 107 +- trunk/drivers/usb/serial/oti6858.c | 68 +- trunk/drivers/usb/serial/pl2303.c | 90 +- trunk/drivers/usb/serial/qcserial.c | 33 +- trunk/drivers/usb/serial/quatech2.c | 135 ++- trunk/drivers/usb/serial/sierra.c | 133 +-- trunk/drivers/usb/serial/spcp8x5.c | 46 +- trunk/drivers/usb/serial/ssu100.c | 34 +- trunk/drivers/usb/serial/ti_usb_3410_5052.c | 88 +- trunk/drivers/usb/serial/usb-wwan.h | 2 +- trunk/drivers/usb/serial/usb_wwan.c | 124 +-- trunk/drivers/usb/serial/whiteheat.c | 60 +- trunk/drivers/usb/storage/unusual_devs.h | 6 + trunk/drivers/vhost/net.c | 3 +- trunk/drivers/video/backlight/Kconfig | 3 +- trunk/drivers/video/backlight/lm3639_bl.c | 4 +- trunk/drivers/video/xen-fbfront.c | 5 +- trunk/drivers/xen/Kconfig | 2 + trunk/drivers/xen/balloon.c | 3 +- trunk/drivers/xen/dbgp.c | 2 + trunk/drivers/xen/events.c | 4 + trunk/drivers/xen/gntdev.c | 36 +- trunk/drivers/xen/grant-table.c | 8 +- trunk/drivers/xen/sys-hypervisor.c | 4 +- trunk/drivers/xen/xen-pciback/vpci.c | 14 +- .../drivers/xen/xenbus/xenbus_dev_frontend.c | 2 +- trunk/drivers/xen/xenbus/xenbus_xs.c | 4 +- trunk/fs/bio.c | 6 +- trunk/fs/block_dev.c | 37 +- trunk/fs/btrfs/backref.c | 28 +- trunk/fs/btrfs/backref.h | 4 + trunk/fs/btrfs/ctree.c | 70 +- trunk/fs/btrfs/ctree.h | 3 + trunk/fs/btrfs/extent_io.c | 4 +- trunk/fs/btrfs/inode.c | 7 +- trunk/fs/btrfs/ioctl.c | 6 +- trunk/fs/btrfs/qgroup.c | 17 +- trunk/fs/btrfs/send.c | 156 +-- trunk/fs/btrfs/transaction.c | 2 +- trunk/fs/btrfs/volumes.c | 7 + trunk/fs/ceph/export.c | 2 + trunk/fs/char_dev.c | 18 +- trunk/fs/compat_ioctl.c | 2 + trunk/fs/exec.c | 3 +- trunk/fs/ext4/balloc.c | 8 +- trunk/fs/ext4/bitmap.c | 6 +- trunk/fs/ext4/ext4.h | 7 +- trunk/fs/ext4/ext4_jbd2.c | 8 +- trunk/fs/ext4/extents.c | 60 +- trunk/fs/ext4/ialloc.c | 23 +- trunk/fs/ext4/mballoc.c | 14 +- trunk/fs/ext4/resize.c | 3 +- trunk/fs/ext4/super.c | 9 +- trunk/fs/file.c | 4 +- trunk/fs/jfs/jfs_discard.c | 16 +- trunk/fs/lockd/clntxdr.c | 2 +- trunk/fs/lockd/mon.c | 57 +- trunk/fs/lockd/svcproc.c | 3 +- trunk/fs/namei.c | 4 +- trunk/fs/nfs/callback.c | 2 +- trunk/fs/nfs/nfs4filelayout.c | 21 +- trunk/fs/nfs/nfs4filelayout.h | 1 - trunk/fs/nfs/nfs4filelayoutdev.c | 22 - trunk/fs/nfs/nfs4getroot.c | 1 + trunk/fs/nfs/objlayout/objio_osd.c | 6 +- trunk/fs/nfs/pnfs.h | 1 + trunk/fs/proc/internal.h | 4 + trunk/fs/proc/stat.c | 14 +- trunk/fs/proc/task_mmu.c | 50 +- trunk/fs/sysfs/dir.c | 16 +- trunk/fs/xattr.c | 2 +- trunk/include/drm/drm_pciids.h | 3 + trunk/include/linux/coredump.h | 1 + trunk/include/linux/dvb/Kbuild | 8 - trunk/include/linux/dvb/dmx.h | 130 +-- trunk/include/linux/dvb/video.h | 249 +---- trunk/include/linux/dynamic_debug.h | 2 +- trunk/include/linux/extcon.h | 2 +- trunk/include/linux/hashtable.h | 192 ++++ trunk/include/linux/hsi/Kbuild | 1 - trunk/include/linux/iio/iio.h | 16 + trunk/include/linux/kvm_host.h | 15 +- trunk/include/linux/memblock.h | 1 + trunk/include/linux/mfd/max77693.h | 13 + trunk/include/linux/of.h | 7 + trunk/include/linux/of_address.h | 4 +- trunk/include/linux/of_irq.h | 4 +- trunk/include/linux/percpu-rwsem.h | 28 +- trunk/include/linux/perf_event.h | 10 +- trunk/include/linux/pid_namespace.h | 8 +- trunk/include/linux/ptp_clock_kernel.h | 3 +- trunk/include/linux/raid/Kbuild | 2 - trunk/include/linux/raid/md_u.h | 141 +-- trunk/include/linux/ratelimit.h | 27 +- trunk/include/linux/rbtree_augmented.h | 1 + trunk/include/linux/spi/tsc2005.h | 2 - trunk/include/linux/tcp.h | 3 +- trunk/include/linux/uprobes.h | 11 - trunk/include/linux/usb.h | 11 - trunk/include/linux/usb/Kbuild | 10 - trunk/include/linux/usb/audio.h | 524 +-------- trunk/include/linux/usb/ch9.h | 960 +---------------- trunk/include/linux/usb/functionfs.h | 167 +-- trunk/include/net/cfg80211.h | 10 + trunk/include/sound/core.h | 3 + trunk/include/trace/events/xen.h | 8 + trunk/include/uapi/linux/dvb/Kbuild | 8 + trunk/include/{ => uapi}/linux/dvb/audio.h | 0 trunk/include/{ => uapi}/linux/dvb/ca.h | 0 trunk/include/uapi/linux/dvb/dmx.h | 155 +++ trunk/include/{ => uapi}/linux/dvb/frontend.h | 0 trunk/include/{ => uapi}/linux/dvb/net.h | 0 trunk/include/{ => uapi}/linux/dvb/osd.h | 0 trunk/include/{ => uapi}/linux/dvb/version.h | 0 trunk/include/uapi/linux/dvb/video.h | 274 +++++ trunk/include/uapi/linux/hsi/Kbuild | 1 + trunk/include/{ => uapi}/linux/hsi/hsi_char.h | 0 trunk/include/uapi/linux/raid/Kbuild | 2 + trunk/include/{ => uapi}/linux/raid/md_p.h | 0 trunk/include/uapi/linux/raid/md_u.h | 155 +++ trunk/include/uapi/linux/tcp.h | 1 + trunk/include/uapi/linux/usb/Kbuild | 10 + trunk/include/uapi/linux/usb/audio.h | 545 ++++++++++ trunk/include/{ => uapi}/linux/usb/cdc.h | 0 trunk/include/{ => uapi}/linux/usb/ch11.h | 0 trunk/include/uapi/linux/usb/ch9.h | 993 ++++++++++++++++++ trunk/include/uapi/linux/usb/functionfs.h | 169 +++ .../include/{ => uapi}/linux/usb/g_printer.h | 0 trunk/include/{ => uapi}/linux/usb/gadgetfs.h | 0 trunk/include/{ => uapi}/linux/usb/midi.h | 0 trunk/include/{ => uapi}/linux/usb/tmc.h | 0 trunk/include/{ => uapi}/linux/usb/video.h | 0 trunk/include/xen/grant_table.h | 2 +- trunk/include/xen/interface/grant_table.h | 2 +- trunk/include/xen/interface/memory.h | 24 +- trunk/init/main.c | 2 + trunk/kernel/Makefile | 6 +- trunk/kernel/cgroup.c | 41 +- trunk/kernel/events/uprobes.c | 345 +++--- trunk/kernel/module-internal.h | 3 +- trunk/kernel/module.c | 26 +- trunk/kernel/module_signing.c | 24 +- trunk/kernel/pid_namespace.c | 33 +- trunk/kernel/sys.c | 12 +- trunk/kernel/trace/ring_buffer.c | 4 + trunk/kernel/workqueue.c | 2 +- trunk/lib/dma-debug.c | 4 +- trunk/lib/genalloc.c | 2 +- trunk/mm/compaction.c | 2 +- trunk/mm/fremap.c | 2 +- trunk/mm/memblock.c | 24 + trunk/mm/mmu_notifier.c | 26 +- trunk/mm/page_alloc.c | 6 +- trunk/mm/rmap.c | 20 +- trunk/mm/slob.c | 6 +- trunk/net/bluetooth/smp.c | 6 +- trunk/net/ceph/messenger.c | 6 +- trunk/net/core/dev.c | 2 +- trunk/net/core/rtnetlink.c | 3 +- trunk/net/core/skbuff.c | 6 +- trunk/net/ipv4/inet_diag.c | 5 +- trunk/net/ipv4/netfilter/iptable_nat.c | 4 +- trunk/net/ipv4/tcp.c | 2 + trunk/net/ipv4/tcp_illinois.c | 8 +- trunk/net/ipv4/tcp_input.c | 16 +- trunk/net/ipv4/tcp_ipv4.c | 1 + trunk/net/ipv4/tcp_metrics.c | 2 +- trunk/net/ipv4/tcp_minisocks.c | 1 + trunk/net/ipv4/tcp_timer.c | 4 +- trunk/net/ipv6/ip6_gre.c | 8 +- trunk/net/ipv6/ndisc.c | 3 +- trunk/net/ipv6/netfilter/ip6table_nat.c | 4 +- trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 4 +- trunk/net/ipv6/route.c | 4 +- trunk/net/irda/ircomm/ircomm_tty.c | 2 + trunk/net/l2tp/l2tp_eth.c | 1 + trunk/net/mac80211/ibss.c | 2 +- trunk/net/mac80211/iface.c | 2 +- trunk/net/mac80211/mlme.c | 35 +- trunk/net/mac80211/rx.c | 74 +- trunk/net/mac80211/sta_info.c | 4 +- trunk/net/mac80211/util.c | 46 +- trunk/net/mac80211/wpa.c | 14 +- trunk/net/netfilter/nf_conntrack_h323_main.c | 3 +- trunk/net/sched/sch_qfq.c | 109 +- trunk/net/sctp/socket.c | 2 +- trunk/net/sunrpc/cache.c | 4 +- trunk/net/sunrpc/xprtsock.c | 41 +- trunk/net/tipc/handler.c | 1 - trunk/net/wireless/core.c | 3 +- trunk/net/wireless/mlme.c | 12 +- trunk/net/wireless/reg.c | 5 +- trunk/net/wireless/util.c | 14 +- trunk/scripts/Makefile.modinst | 2 +- trunk/scripts/Makefile.modpost | 77 +- trunk/scripts/dtc/dtc.h | 44 +- trunk/scripts/sign-file | 498 +++++++-- trunk/scripts/x509keyid | 268 ----- trunk/security/apparmor/policy.c | 24 +- trunk/security/device_cgroup.c | 87 +- trunk/sound/core/compress_offload.c | 9 +- trunk/sound/core/control.c | 5 + trunk/sound/core/hwdep.c | 12 +- trunk/sound/core/init.c | 50 +- trunk/sound/core/oss/mixer_oss.c | 10 +- trunk/sound/core/oss/pcm_oss.c | 6 + trunk/sound/core/pcm.c | 13 +- trunk/sound/core/pcm_native.c | 33 +- trunk/sound/core/rawmidi.c | 26 +- trunk/sound/core/sound.c | 11 +- trunk/sound/core/sound_oss.c | 10 +- trunk/sound/isa/opti9xx/miro.c | 1 - trunk/sound/pci/ac97/ac97_codec.c | 2 + trunk/sound/pci/als300.c | 4 + trunk/sound/pci/emu10k1/emu10k1_main.c | 9 + trunk/sound/pci/hda/hda_intel.c | 42 +- trunk/sound/pci/hda/patch_realtek.c | 24 +- trunk/sound/pci/hda/patch_sigmatel.c | 2 + trunk/sound/pci/ice1712/ice1724.c | 7 +- trunk/sound/pci/rme9652/hdspm.c | 234 +++-- trunk/sound/soc/Makefile | 5 +- trunk/sound/soc/codecs/da9055.c | 22 +- trunk/sound/soc/codecs/twl6040.c | 8 +- trunk/sound/soc/codecs/wm2200.c | 3 +- trunk/sound/soc/codecs/wm8994.c | 18 +- trunk/sound/soc/codecs/wm8994.h | 1 + trunk/sound/soc/omap/ams-delta.c | 63 +- trunk/sound/soc/omap/omap-abe-twl6040.c | 2 +- trunk/sound/soc/omap/omap-dmic.c | 4 +- trunk/sound/soc/omap/omap-mcpdm.c | 9 +- trunk/sound/soc/omap/zoom2.c | 5 +- trunk/sound/soc/pxa/mmp-pcm.c | 2 +- trunk/sound/soc/samsung/bells.c | 4 +- trunk/sound/soc/sh/fsi.c | 15 +- trunk/sound/soc/soc-jack.c | 7 +- trunk/sound/soc/ux500/mop500.c | 17 + trunk/sound/soc/ux500/ux500_msp_i2s.c | 8 +- trunk/sound/usb/card.c | 12 +- trunk/sound/usb/card.h | 1 + trunk/sound/usb/mixer.c | 65 +- trunk/sound/usb/mixer_quirks.c | 58 +- trunk/sound/usb/pcm.c | 53 +- trunk/sound/usb/proc.c | 4 +- trunk/sound/usb/stream.c | 1 + trunk/sound/usb/usbaudio.h | 2 +- trunk/tools/lib/traceevent/event-parse.c | 9 +- trunk/tools/lib/traceevent/parse-filter.c | 15 + trunk/tools/perf/Makefile | 24 +- trunk/tools/perf/builtin-help.c | 2 +- trunk/tools/perf/builtin-trace.c | 18 +- trunk/tools/perf/perf.h | 2 +- trunk/tools/perf/ui/browsers/hists.c | 6 +- trunk/tools/perf/util/parse-events-test.c | 12 +- trunk/tools/perf/util/parse-events.c | 3 + trunk/tools/perf/util/setup.py | 2 + trunk/tools/perf/util/sort.c | 6 + trunk/tools/perf/util/thread.c | 1 - trunk/tools/testing/ktest/ktest.pl | 6 +- .../testing/selftests/epoll/test_epoll.c | 4 +- trunk/tools/vm/page-types.c | 2 +- trunk/usr/gen_init_cpio.c | 43 +- trunk/virt/kvm/kvm_main.c | 4 +- 1032 files changed, 14456 insertions(+), 11578 deletions(-) create mode 100644 trunk/Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt create mode 100644 trunk/Documentation/zh_CN/IRQ.txt create mode 100644 trunk/Documentation/zh_CN/arm64/booting.txt create mode 100644 trunk/Documentation/zh_CN/arm64/memory.txt create mode 100644 trunk/arch/arm/include/debug/8250_32.S delete mode 100644 trunk/arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h delete mode 100644 trunk/arch/arm/mach-spear13xx/include/mach/spear1340_misc_regs.h create mode 100644 trunk/arch/arm/plat-samsung/include/plat/spi-core.h create mode 100644 trunk/arch/arm64/include/asm/linkage.h rename trunk/arch/hexagon/include/{ => uapi}/asm/bitsperlong.h (92%) rename trunk/arch/hexagon/include/{ => uapi}/asm/byteorder.h (92%) rename trunk/arch/hexagon/include/{ => uapi}/asm/kvm_para.h (100%) rename trunk/arch/hexagon/include/{ => uapi}/asm/param.h (91%) rename trunk/arch/hexagon/include/{ => uapi}/asm/ptrace.h (94%) rename trunk/arch/hexagon/include/{ => uapi}/asm/registers.h (85%) rename trunk/arch/hexagon/include/{ => uapi}/asm/setup.h (92%) rename trunk/arch/hexagon/include/{ => uapi}/asm/sigcontext.h (93%) rename trunk/arch/hexagon/include/{ => uapi}/asm/signal.h (92%) rename trunk/arch/hexagon/include/{ => uapi}/asm/swab.h (91%) rename trunk/arch/hexagon/include/{ => uapi}/asm/unistd.h (93%) rename trunk/arch/hexagon/include/{ => uapi}/asm/user.h (63%) delete mode 100644 trunk/arch/ia64/include/asm/kvm_para.h rename trunk/arch/m68k/include/{ => uapi}/asm/a.out.h (100%) rename trunk/arch/m68k/include/{ => uapi}/asm/auxvec.h (100%) rename trunk/arch/m68k/include/{ => uapi}/asm/byteorder.h (100%) rename trunk/arch/m68k/include/{ => uapi}/asm/cachectl.h (100%) rename trunk/arch/m68k/include/{ => uapi}/asm/fcntl.h (100%) rename trunk/arch/m68k/include/{ => uapi}/asm/ioctls.h (100%) rename trunk/arch/m68k/include/{ => uapi}/asm/msgbuf.h (100%) rename trunk/arch/m68k/include/{ => uapi}/asm/param.h (100%) rename trunk/arch/m68k/include/{ => uapi}/asm/poll.h (100%) rename trunk/arch/m68k/include/{ => uapi}/asm/posix_types.h (100%) create mode 100644 trunk/arch/m68k/include/uapi/asm/ptrace.h rename trunk/arch/m68k/include/{ => uapi}/asm/sembuf.h (100%) create mode 100644 trunk/arch/m68k/include/uapi/asm/setup.h rename trunk/arch/m68k/include/{ => uapi}/asm/shmbuf.h (100%) rename trunk/arch/m68k/include/{ => uapi}/asm/sigcontext.h (100%) create mode 100644 trunk/arch/m68k/include/uapi/asm/signal.h rename trunk/arch/m68k/include/{ => uapi}/asm/socket.h (100%) rename trunk/arch/m68k/include/{ => uapi}/asm/sockios.h (100%) rename trunk/arch/m68k/include/{ => uapi}/asm/stat.h (100%) rename trunk/arch/m68k/include/{ => uapi}/asm/swab.h (100%) rename trunk/arch/m68k/include/{ => uapi}/asm/termbits.h (100%) create mode 100644 trunk/arch/m68k/include/uapi/asm/termios.h create mode 100644 trunk/arch/m68k/include/uapi/asm/unistd.h delete mode 100644 trunk/arch/parisc/include/asm/auxvec.h delete mode 100644 trunk/arch/parisc/include/asm/compat_signal.h delete mode 100644 trunk/arch/parisc/include/asm/cputime.h delete mode 100644 trunk/arch/parisc/include/asm/device.h delete mode 100644 trunk/arch/parisc/include/asm/div64.h delete mode 100644 trunk/arch/parisc/include/asm/emergency-restart.h delete mode 100644 trunk/arch/parisc/include/asm/hw_irq.h delete mode 100644 trunk/arch/parisc/include/asm/irq_regs.h delete mode 100644 trunk/arch/parisc/include/asm/kdebug.h delete mode 100644 trunk/arch/parisc/include/asm/kvm_para.h delete mode 100644 trunk/arch/parisc/include/asm/local.h delete mode 100644 trunk/arch/parisc/include/asm/local64.h delete mode 100644 trunk/arch/parisc/include/asm/mutex.h delete mode 100644 trunk/arch/parisc/include/asm/param.h delete mode 100644 trunk/arch/parisc/include/asm/percpu.h delete mode 100644 trunk/arch/parisc/include/asm/poll.h delete mode 100644 trunk/arch/parisc/include/asm/real.h delete mode 100644 trunk/arch/parisc/include/asm/segment.h delete mode 100644 trunk/arch/parisc/include/asm/topology.h delete mode 100644 trunk/arch/parisc/include/asm/user.h delete mode 100644 trunk/arch/parisc/include/asm/vga.h delete mode 100644 trunk/arch/parisc/include/asm/xor.h rename trunk/arch/parisc/include/{ => uapi}/asm/bitsperlong.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/byteorder.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/errno.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/fcntl.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/ioctl.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/ioctls.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/ipcbuf.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/mman.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/msgbuf.h (100%) create mode 100644 trunk/arch/parisc/include/uapi/asm/pdc.h rename trunk/arch/parisc/include/{ => uapi}/asm/posix_types.h (100%) create mode 100644 trunk/arch/parisc/include/uapi/asm/ptrace.h rename trunk/arch/parisc/include/{ => uapi}/asm/resource.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/sembuf.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/setup.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/shmbuf.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/sigcontext.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/siginfo.h (100%) create mode 100644 trunk/arch/parisc/include/uapi/asm/signal.h rename trunk/arch/parisc/include/{ => uapi}/asm/socket.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/sockios.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/stat.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/statfs.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/swab.h (100%) rename trunk/arch/parisc/include/{ => uapi}/asm/termbits.h (100%) create mode 100644 trunk/arch/parisc/include/uapi/asm/termios.h rename trunk/arch/parisc/include/{ => uapi}/asm/types.h (100%) create mode 100644 trunk/arch/parisc/include/uapi/asm/unistd.h create mode 100644 trunk/arch/s390/include/uapi/asm/kvm_para.h delete mode 100644 trunk/arch/xtensa/include/asm/bitsperlong.h delete mode 100644 trunk/arch/xtensa/include/asm/bug.h delete mode 100644 trunk/arch/xtensa/include/asm/cputime.h delete mode 100644 trunk/arch/xtensa/include/asm/device.h delete mode 100644 trunk/arch/xtensa/include/asm/div64.h delete mode 100644 trunk/arch/xtensa/include/asm/emergency-restart.h delete mode 100644 trunk/arch/xtensa/include/asm/errno.h delete mode 100644 trunk/arch/xtensa/include/asm/fcntl.h delete mode 100644 trunk/arch/xtensa/include/asm/futex.h delete mode 100644 trunk/arch/xtensa/include/asm/hardirq.h delete mode 100644 trunk/arch/xtensa/include/asm/ioctl.h delete mode 100644 trunk/arch/xtensa/include/asm/irq_regs.h delete mode 100644 trunk/arch/xtensa/include/asm/kdebug.h delete mode 100644 trunk/arch/xtensa/include/asm/kmap_types.h delete mode 100644 trunk/arch/xtensa/include/asm/kvm_para.h delete mode 100644 trunk/arch/xtensa/include/asm/local.h delete mode 100644 trunk/arch/xtensa/include/asm/local64.h delete mode 100644 trunk/arch/xtensa/include/asm/percpu.h delete mode 100644 trunk/arch/xtensa/include/asm/resource.h delete mode 100644 trunk/arch/xtensa/include/asm/scatterlist.h delete mode 100644 trunk/arch/xtensa/include/asm/sections.h delete mode 100644 trunk/arch/xtensa/include/asm/siginfo.h delete mode 100644 trunk/arch/xtensa/include/asm/statfs.h delete mode 100644 trunk/arch/xtensa/include/asm/termios.h delete mode 100644 trunk/arch/xtensa/include/asm/topology.h delete mode 100644 trunk/arch/xtensa/include/asm/xor.h rename trunk/arch/xtensa/include/{ => uapi}/asm/auxvec.h (100%) rename trunk/arch/xtensa/include/{ => uapi}/asm/byteorder.h (100%) rename trunk/arch/xtensa/include/{ => uapi}/asm/ioctls.h (100%) rename trunk/arch/xtensa/include/{ => uapi}/asm/ipcbuf.h (100%) rename trunk/arch/xtensa/include/{ => uapi}/asm/mman.h (100%) rename trunk/arch/xtensa/include/{ => uapi}/asm/msgbuf.h (100%) create mode 100644 trunk/arch/xtensa/include/uapi/asm/param.h rename trunk/arch/xtensa/include/{ => uapi}/asm/poll.h (100%) rename trunk/arch/xtensa/include/{ => uapi}/asm/posix_types.h (100%) create mode 100644 trunk/arch/xtensa/include/uapi/asm/ptrace.h rename trunk/arch/xtensa/include/{ => uapi}/asm/sembuf.h (100%) rename trunk/arch/xtensa/include/{ => uapi}/asm/setup.h (100%) rename trunk/arch/xtensa/include/{ => uapi}/asm/shmbuf.h (100%) rename trunk/arch/xtensa/include/{ => uapi}/asm/sigcontext.h (100%) create mode 100644 trunk/arch/xtensa/include/uapi/asm/signal.h rename trunk/arch/xtensa/include/{ => uapi}/asm/socket.h (100%) rename trunk/arch/xtensa/include/{ => uapi}/asm/sockios.h (100%) rename trunk/arch/xtensa/include/{ => uapi}/asm/stat.h (100%) rename trunk/arch/xtensa/include/{ => uapi}/asm/swab.h (100%) rename trunk/arch/xtensa/include/{ => uapi}/asm/termbits.h (100%) create mode 100644 trunk/arch/xtensa/include/uapi/asm/types.h create mode 100644 trunk/arch/xtensa/include/uapi/asm/unistd.h rename trunk/drivers/i2c/{busses => }/i2c-stub.c (75%) create mode 100644 trunk/include/linux/hashtable.h rename trunk/include/{ => uapi}/linux/dvb/audio.h (100%) rename trunk/include/{ => uapi}/linux/dvb/ca.h (100%) create mode 100644 trunk/include/uapi/linux/dvb/dmx.h rename trunk/include/{ => uapi}/linux/dvb/frontend.h (100%) rename trunk/include/{ => uapi}/linux/dvb/net.h (100%) rename trunk/include/{ => uapi}/linux/dvb/osd.h (100%) rename trunk/include/{ => uapi}/linux/dvb/version.h (100%) create mode 100644 trunk/include/uapi/linux/dvb/video.h rename trunk/include/{ => uapi}/linux/hsi/hsi_char.h (100%) rename trunk/include/{ => uapi}/linux/raid/md_p.h (100%) create mode 100644 trunk/include/uapi/linux/raid/md_u.h create mode 100644 trunk/include/uapi/linux/usb/audio.h rename trunk/include/{ => uapi}/linux/usb/cdc.h (100%) rename trunk/include/{ => uapi}/linux/usb/ch11.h (100%) create mode 100644 trunk/include/uapi/linux/usb/ch9.h create mode 100644 trunk/include/uapi/linux/usb/functionfs.h rename trunk/include/{ => uapi}/linux/usb/g_printer.h (100%) rename trunk/include/{ => uapi}/linux/usb/gadgetfs.h (100%) rename trunk/include/{ => uapi}/linux/usb/midi.h (100%) rename trunk/include/{ => uapi}/linux/usb/tmc.h (100%) rename trunk/include/{ => uapi}/linux/usb/video.h (100%) mode change 100644 => 100755 trunk/scripts/sign-file delete mode 100755 trunk/scripts/x509keyid diff --git a/[refs] b/[refs] index 4bf79cb74448..bf7938cee870 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c075b13098b399dc565b4d53f42047a8d40ed3ba +refs/heads/master: d4185bbf62a5d8d777ee445db1581beb17882a07 diff --git a/trunk/.gitignore b/trunk/.gitignore index 0f2f40f71915..92bd0e45dfa1 100644 --- a/trunk/.gitignore +++ b/trunk/.gitignore @@ -14,10 +14,6 @@ *.o.* *.a *.s -*.ko.unsigned -*.ko.stripped -*.ko.stripped.dig -*.ko.stripped.sig *.ko *.so *.so.dbg @@ -95,6 +91,4 @@ GTAGS extra_certificates signing_key.priv signing_key.x509 -signing_key.x509.keyid -signing_key.x509.signer x509.genkey diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX index f54273e2ac97..ceb1ff735469 100644 --- a/trunk/Documentation/00-INDEX +++ b/trunk/Documentation/00-INDEX @@ -210,6 +210,8 @@ local_ops.txt - semantics and behavior of local atomic operations. lockdep-design.txt - documentation on the runtime locking correctness validator. +lockup-watchdogs.txt + - info on soft and hard lockup detectors (aka nmi_watchdog). logo.gif - full colour GIF image of Linux logo (penguin - Tux). logo.txt @@ -240,8 +242,6 @@ netlabel/ - directory with information on the NetLabel subsystem. networking/ - directory with info on various aspects of networking with Linux. -nmi_watchdog.txt - - info on NMI watchdog for SMP systems. nommu-mmap.txt - documentation about no-mmu memory mapping support. numastat.txt diff --git a/trunk/Documentation/DocBook/media/Makefile b/trunk/Documentation/DocBook/media/Makefile index 9b7e4c557928..f9fd615427fb 100644 --- a/trunk/Documentation/DocBook/media/Makefile +++ b/trunk/Documentation/DocBook/media/Makefile @@ -56,15 +56,15 @@ FUNCS = \ write \ IOCTLS = \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/videodev2.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/audio.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/ca.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/dmx.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/frontend.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([A-Z][^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/net.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/video.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/media.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/v4l2-subdev.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/videodev2.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/audio.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/ca.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/dmx.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/frontend.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([A-Z][^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/net.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/video.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/media.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/v4l2-subdev.h) \ VIDIOC_SUBDEV_G_FRAME_INTERVAL \ VIDIOC_SUBDEV_S_FRAME_INTERVAL \ VIDIOC_SUBDEV_ENUM_MBUS_CODE \ @@ -74,32 +74,32 @@ IOCTLS = \ VIDIOC_SUBDEV_S_SELECTION \ TYPES = \ - $(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/linux/videodev2.h) \ - $(shell perl -ne 'print "$$1 " if /^}\s+([a-z0-9_]+_t)/' $(srctree)/include/linux/dvb/frontend.h) + $(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/uapi/linux/videodev2.h) \ + $(shell perl -ne 'print "$$1 " if /^}\s+([a-z0-9_]+_t)/' $(srctree)/include/uapi/linux/dvb/frontend.h) ENUMS = \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/audio.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/ca.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/dmx.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/frontend.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/net.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/video.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/media.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-mediabus.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-subdev.h) + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/videodev2.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/audio.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/ca.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/dmx.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/frontend.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/net.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/video.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/media.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-mediabus.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-subdev.h) STRUCTS = \ - $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \ - $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s\{]+)\s*/)' $(srctree)/include/linux/dvb/audio.h) \ - $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/ca.h) \ - $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/dmx.h) \ - $(shell perl -ne 'print "$$1 " if (!/dtv\_cmds\_h/ && /^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/frontend.h) \ - $(shell perl -ne 'print "$$1 " if (/^struct\s+([A-Z][^\s]+)\s+/)' $(srctree)/include/linux/dvb/net.h) \ - $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/video.h) \ - $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/media.h) \ - $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-subdev.h) \ - $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-mediabus.h) + $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/videodev2.h) \ + $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s\{]+)\s*/)' $(srctree)/include/uapi/linux/dvb/audio.h) \ + $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/ca.h) \ + $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/dmx.h) \ + $(shell perl -ne 'print "$$1 " if (!/dtv\_cmds\_h/ && /^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/frontend.h) \ + $(shell perl -ne 'print "$$1 " if (/^struct\s+([A-Z][^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/net.h) \ + $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/video.h) \ + $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/media.h) \ + $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-subdev.h) \ + $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-mediabus.h) ERRORS = \ E2BIG \ @@ -205,7 +205,7 @@ $(MEDIA_OBJ_DIR)/v4l2.xml: $(OBJIMGFILES) @(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/) @(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/) -$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml +$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) @( \ echo "") > $@ @@ -216,7 +216,7 @@ $(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/linux/videodev2.h $(MEDIA_O @( \ echo "") >> $@ -$(MEDIA_OBJ_DIR)/audio.h.xml: $(srctree)/include/linux/dvb/audio.h $(MEDIA_OBJ_DIR)/v4l2.xml +$(MEDIA_OBJ_DIR)/audio.h.xml: $(srctree)/include/uapi/linux/dvb/audio.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) @( \ echo "") > $@ @@ -227,7 +227,7 @@ $(MEDIA_OBJ_DIR)/audio.h.xml: $(srctree)/include/linux/dvb/audio.h $(MEDIA_OBJ_D @( \ echo "") >> $@ -$(MEDIA_OBJ_DIR)/ca.h.xml: $(srctree)/include/linux/dvb/ca.h $(MEDIA_OBJ_DIR)/v4l2.xml +$(MEDIA_OBJ_DIR)/ca.h.xml: $(srctree)/include/uapi/linux/dvb/ca.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) @( \ echo "") > $@ @@ -238,7 +238,7 @@ $(MEDIA_OBJ_DIR)/ca.h.xml: $(srctree)/include/linux/dvb/ca.h $(MEDIA_OBJ_DIR)/v4 @( \ echo "") >> $@ -$(MEDIA_OBJ_DIR)/dmx.h.xml: $(srctree)/include/linux/dvb/dmx.h $(MEDIA_OBJ_DIR)/v4l2.xml +$(MEDIA_OBJ_DIR)/dmx.h.xml: $(srctree)/include/uapi/linux/dvb/dmx.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) @( \ echo "") > $@ @@ -249,7 +249,7 @@ $(MEDIA_OBJ_DIR)/dmx.h.xml: $(srctree)/include/linux/dvb/dmx.h $(MEDIA_OBJ_DIR)/ @( \ echo "") >> $@ -$(MEDIA_OBJ_DIR)/frontend.h.xml: $(srctree)/include/linux/dvb/frontend.h $(MEDIA_OBJ_DIR)/v4l2.xml +$(MEDIA_OBJ_DIR)/frontend.h.xml: $(srctree)/include/uapi/linux/dvb/frontend.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) @( \ echo "") > $@ @@ -260,7 +260,7 @@ $(MEDIA_OBJ_DIR)/frontend.h.xml: $(srctree)/include/linux/dvb/frontend.h $(MEDIA @( \ echo "") >> $@ -$(MEDIA_OBJ_DIR)/net.h.xml: $(srctree)/include/linux/dvb/net.h $(MEDIA_OBJ_DIR)/v4l2.xml +$(MEDIA_OBJ_DIR)/net.h.xml: $(srctree)/include/uapi/linux/dvb/net.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) @( \ echo "") > $@ @@ -271,7 +271,7 @@ $(MEDIA_OBJ_DIR)/net.h.xml: $(srctree)/include/linux/dvb/net.h $(MEDIA_OBJ_DIR)/ @( \ echo "") >> $@ -$(MEDIA_OBJ_DIR)/video.h.xml: $(srctree)/include/linux/dvb/video.h $(MEDIA_OBJ_DIR)/v4l2.xml +$(MEDIA_OBJ_DIR)/video.h.xml: $(srctree)/include/uapi/linux/dvb/video.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) @( \ echo "") > $@ diff --git a/trunk/Documentation/devicetree/bindings/arm/atmel-at91.txt b/trunk/Documentation/devicetree/bindings/arm/atmel-at91.txt index ecc81e368715..d187e9f7cf1c 100644 --- a/trunk/Documentation/devicetree/bindings/arm/atmel-at91.txt +++ b/trunk/Documentation/devicetree/bindings/arm/atmel-at91.txt @@ -8,7 +8,7 @@ PIT Timer required properties: shared across all System Controller members. TC/TCLIB Timer required properties: -- compatible: Should be "atmel,-pit". +- compatible: Should be "atmel,-tcb". can be "at91rm9200" or "at91sam9x5" - reg: Should contain registers location and length - interrupts: Should contain all interrupts for the TC block diff --git a/trunk/Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt b/trunk/Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt new file mode 100644 index 000000000000..df70318a617f --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt @@ -0,0 +1,19 @@ +* EETI eGalax Multiple Touch Controller + +Required properties: +- compatible: must be "eeti,egalax_ts" +- reg: i2c slave address +- interrupt-parent: the phandle for the interrupt controller +- interrupts: touch controller interrupt +- wakeup-gpios: the gpio pin to be used for waking up the controller + as well as uased as irq pin + +Example: + + egalax_ts@04 { + compatible = "eeti,egalax_ts"; + reg = <0x04>; + interrupt-parent = <&gpio1>; + interrupts = <9 2>; + wakeup-gpios = <&gpio1 9 0>; + }; diff --git a/trunk/Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt b/trunk/Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt index c8e578263ce2..683fde93c4fb 100644 --- a/trunk/Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt +++ b/trunk/Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt @@ -93,7 +93,7 @@ Valid values for pin and group names are: With some exceptions, these support nvidia,high-speed-mode, nvidia,schmitt, nvidia,low-power-mode, nvidia,pull-down-strength, - nvidia,pull-up-strength, nvidia,slew_rate-rising, nvidia,slew_rate-falling. + nvidia,pull-up-strength, nvidia,slew-rate-rising, nvidia,slew-rate-falling. drive_ao1, drive_ao2, drive_at1, drive_at2, drive_cdev1, drive_cdev2, drive_csus, drive_dap1, drive_dap2, drive_dap3, drive_dap4, drive_dbg, diff --git a/trunk/Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt b/trunk/Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt index c275b70349c1..6f426ed7009e 100644 --- a/trunk/Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt +++ b/trunk/Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt @@ -83,7 +83,7 @@ Valid values for pin and group names are: drive groups: These all support nvidia,pull-down-strength, nvidia,pull-up-strength, - nvidia,slew_rate-rising, nvidia,slew_rate-falling. Most but not all + nvidia,slew-rate-rising, nvidia,slew-rate-falling. Most but not all support nvidia,high-speed-mode, nvidia,schmitt, nvidia,low-power-mode. ao1, ao2, at1, at2, at3, at4, at5, cdev1, cdev2, cec, crt, csus, dap1, diff --git a/trunk/Documentation/firmware_class/README b/trunk/Documentation/firmware_class/README index 7eceaff63f5f..815b711bcd85 100644 --- a/trunk/Documentation/firmware_class/README +++ b/trunk/Documentation/firmware_class/README @@ -18,32 +18,40 @@ High level behavior (mixed): ============================ - kernel(driver): calls request_firmware(&fw_entry, $FIRMWARE, device) - - userspace: + 1), kernel(driver): + - calls request_firmware(&fw_entry, $FIRMWARE, device) + - kernel searchs the fimware image with name $FIRMWARE directly + in the below search path of root filesystem: + "/lib/firmware/updates/" UTS_RELEASE, + "/lib/firmware/updates", + "/lib/firmware/" UTS_RELEASE, + "/lib/firmware" + - If found, goto 7), else goto 2) + + 2), userspace: - /sys/class/firmware/xxx/{loading,data} appear. - hotplug gets called with a firmware identifier in $FIRMWARE and the usual hotplug environment. - hotplug: echo 1 > /sys/class/firmware/xxx/loading - kernel: Discard any previous partial load. + 3), kernel: Discard any previous partial load. - userspace: + 4), userspace: - hotplug: cat appropriate_firmware_image > \ /sys/class/firmware/xxx/data - kernel: grows a buffer in PAGE_SIZE increments to hold the image as it + 5), kernel: grows a buffer in PAGE_SIZE increments to hold the image as it comes in. - userspace: + 6), userspace: - hotplug: echo 0 > /sys/class/firmware/xxx/loading - kernel: request_firmware() returns and the driver has the firmware + 7), kernel: request_firmware() returns and the driver has the firmware image in fw_entry->{data,size}. If something went wrong request_firmware() returns non-zero and fw_entry is set to NULL. - kernel(driver): Driver code calls release_firmware(fw_entry) releasing + 8), kernel(driver): Driver code calls release_firmware(fw_entry) releasing the firmware image and any related resource. High level behavior (driver code): diff --git a/trunk/Documentation/hwmon/coretemp b/trunk/Documentation/hwmon/coretemp index c86b50c03ea8..f17256f069ba 100644 --- a/trunk/Documentation/hwmon/coretemp +++ b/trunk/Documentation/hwmon/coretemp @@ -105,6 +105,7 @@ Process Processor TjMax(C) 330/230 125 E680/660/640/620 90 E680T/660T/640T/620T 110 + CE4170/4150/4110 110 45nm Core2 Processors Solo ULV SU3500/3300 100 diff --git a/trunk/Documentation/hwmon/fam15h_power b/trunk/Documentation/hwmon/fam15h_power index a92918e0bd69..80654813d04a 100644 --- a/trunk/Documentation/hwmon/fam15h_power +++ b/trunk/Documentation/hwmon/fam15h_power @@ -10,7 +10,7 @@ Supported chips: BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors (not yet published) -Author: Andreas Herrmann +Author: Andreas Herrmann Description ----------- diff --git a/trunk/Documentation/hwmon/submitting-patches b/trunk/Documentation/hwmon/submitting-patches index 790f774a3032..843751c41fea 100644 --- a/trunk/Documentation/hwmon/submitting-patches +++ b/trunk/Documentation/hwmon/submitting-patches @@ -60,8 +60,7 @@ increase the chances of your change being accepted. * Add the driver to Kconfig and Makefile in alphabetical order. -* Make sure that all dependencies are listed in Kconfig. For new drivers, it - is most likely prudent to add a dependency on EXPERIMENTAL. +* Make sure that all dependencies are listed in Kconfig. * Avoid forward declarations if you can. Rearrange the code if necessary. diff --git a/trunk/Documentation/zh_CN/IRQ.txt b/trunk/Documentation/zh_CN/IRQ.txt new file mode 100644 index 000000000000..956026d5cf82 --- /dev/null +++ b/trunk/Documentation/zh_CN/IRQ.txt @@ -0,0 +1,39 @@ +Chinese translated version of Documentation/IRQ.txt + +If you have any comment or update to the content, please contact the +original document maintainer directly. However, if you have a problem +communicating in English you can also ask the Chinese maintainer for +help. Contact the Chinese maintainer if this translation is outdated +or if there is a problem with the translation. + +Maintainer: Eric W. Biederman +Chinese maintainer: Fu Wei +--------------------------------------------------------------------- +Documentation/IRQ.txt 的中文翻译 + +如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文 +交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻 +译存在问题，请联系中文版维护者。 +英文版维护者： Eric W. Biederman +中文版维护者： 傅炜 Fu Wei +中文版翻译者： 傅炜 Fu Wei +中文版校译者： 傅炜 Fu Wei + + +以下为正文 +--------------------------------------------------------------------- +何为 IRQ? + +一个 IRQ 是来自某个设备的一个中断请求。目前，它们可以来自一个硬件引脚， +或来自一个数据包。多个设备可能连接到同个硬件引脚，从而共享一个 IRQ。 + +一个 IRQ 编号是用于告知硬件中断源的内核标识。通常情况下，这是一个 +全局 irq_desc 数组的索引，但是除了在 linux/interrupt.h 中的实现， +具体的细节是体系结构特定的。 + +一个 IRQ 编号是设备上某个可能的中断源的枚举。通常情况下，枚举的编号是 +该引脚在系统内中断控制器的所有输入引脚中的编号。对于 ISA 总线中的情况， +枚举的是在两个 i8259 中断控制器中 16 个输入引脚。 + +架构可以对 IRQ 编号指定额外的含义，在硬件涉及任何手工配置的情况下， +是被提倡的。ISA 的 IRQ 是一个分配这类额外含义的典型例子。 diff --git a/trunk/Documentation/zh_CN/arm64/booting.txt b/trunk/Documentation/zh_CN/arm64/booting.txt new file mode 100644 index 000000000000..28fa325b7461 --- /dev/null +++ b/trunk/Documentation/zh_CN/arm64/booting.txt @@ -0,0 +1,156 @@ +Chinese translated version of Documentation/arm64/booting.txt + +If you have any comment or update to the content, please contact the +original document maintainer directly. However, if you have a problem +communicating in English you can also ask the Chinese maintainer for +help. Contact the Chinese maintainer if this translation is outdated +or if there is a problem with the translation. + +Maintainer: Will Deacon +Chinese maintainer: Fu Wei +--------------------------------------------------------------------- +Documentation/arm64/booting.txt 的中文翻译 + +如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文 +交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻 +译存在问题，请联系中文版维护者。 + +英文版维护者： Will Deacon +中文版维护者： 傅炜 Fu Wei +中文版翻译者： 傅炜 Fu Wei +中文版校译者： 傅炜 Fu Wei + +以下为正文 +--------------------------------------------------------------------- + 启动 AArch64 Linux + ================== + +作者: Will Deacon +日期: 2012 年 09 月 07 日 + +本文档基于 Russell King 的 ARM 启动文档，且适用于所有公开发布的 +AArch64 Linux 内核代码。 + +AArch64 异常模型由多个异常级别（EL0 - EL3）组成，对于 EL0 和 EL1 +异常级有对应的安全和非安全模式。EL2 是系统管理级，且仅存在于 +非安全模式下。EL3 是最高特权级，且仅存在于安全模式下。 + +基于本文档的目的，我们将简单地使用‘引导装载程序’（‘boot loader’） +这个术语来定义在将控制权交给 Linux 内核前 CPU 上执行的所有软件。 +这可能包含安全监控和系统管理代码，或者它可能只是一些用于准备最小启动 +环境的指令。 + +基本上，引导装载程序（至少）应实现以下操作： + +1、设置和初始化 RAM +2、设置设备树数据 +3、解压内核映像 +4、调用内核映像 + + +1、设置和初始化 RAM +----------------- + +必要性: 强制 + +引导装载程序应该找到并初始化系统中所有内核用于保持系统变量数据的 RAM。 +这个操作的执行是设备依赖的。（它可能使用内部算法来自动定位和计算所有 +RAM，或可能使用对这个设备已知的 RAM 信息，还可能使用任何引导装载程序 +设计者想到的匹配方法。） + + +2、设置设备树数据 +--------------- + +必要性: 强制 + +设备树数据块（dtb）大小必须不大于 2 MB，且位于从内核映像起始算起第一个 +512MB 内的 2MB 边界上。这使得内核可以通过初始页表中的单个节描述符来 +映射此数据块。 + + +3、解压内核映像 +------------- + +必要性: 可选 + +AArch64 内核当前没有提供自解压代码，因此如果使用了压缩内核映像文件 +（比如 Image.gz），则需要通过引导装载程序（使用 gzip 等）来进行解压。 +若引导装载程序没有实现这个需求，就要使用非压缩内核映像文件。 + + +4、调用内核映像 +------------- + +必要性: 强制 + +已解压的内核映像包含一个 32 字节的头，内容如下： + + u32 magic = 0x14000008; /* 跳转到 stext, 小端 */ + u32 res0 = 0; /* 保留 */ + u64 text_offset; /* 映像装载偏移 */ + u64 res1 = 0; /* 保留 */ + u64 res2 = 0; /* 保留 */ + +映像必须位于系统 RAM 起始处的特定偏移（当前是 0x80000）。系统 RAM +的起始地址必须是以 2MB 对齐的。 + +在跳转入内核前，必须符合以下状态： + +- 停止所有 DMA 设备，这样内存数据就不会因为虚假网络包或磁盘数据而 + 被破坏。这可能可以节省你许多的调试时间。 + +- 主 CPU 通用寄存器设置 + x0 = 系统 RAM 中设备树数据块（dtb）的物理地址。 + x1 = 0 (保留，将来可能使用) + x2 = 0 (保留，将来可能使用) + x3 = 0 (保留，将来可能使用) + +- CPU 模式 + 所有形式的中断必须在 PSTATE.DAIF 中被屏蔽（Debug、SError、IRQ + 和 FIQ）。 + CPU 必须处于 EL2（推荐，可访问虚拟化扩展）或非安全 EL1 模式下。 + +- 高速缓存、MMU + MMU 必须关闭。 + 指令缓存开启或关闭都可以。 + 数据缓存必须关闭且无效。 + 外部高速缓存（如果存在）必须配置并禁用。 + +- 架构计时器 + CNTFRQ 必须设定为计时器的频率。 + 如果在 EL1 模式下进入内核，则 CNTHCTL_EL2 中的 EL1PCTEN (bit 0) + 必须置位。 + +- 一致性 + 通过内核启动的所有 CPU 在内核入口地址上必须处于相同的一致性域中。 + 这可能要根据具体实现来定义初始化过程，以使能每个CPU上对维护操作的 + 接收。 + +- 系统寄存器 + 在进入内核映像的异常级中，所有构架中可写的系统寄存器必须通过软件 + 在一个更高的异常级别下初始化，以防止在 未知 状态下运行。 + +引导装载程序必须在每个 CPU 处于以下状态时跳入内核入口： + +- 主 CPU 必须直接跳入内核映像的第一条指令。通过此 CPU 传递的设备树 + 数据块必须在每个 CPU 节点中包含以下内容： + + 1、‘enable-method’属性。目前，此字段支持的值仅为字符串“spin-table”。 + + 2、‘cpu-release-addr’标识一个 64-bit、初始化为零的内存位置。 + + 引导装载程序必须生成这些设备树属性，并在跳入内核入口之前将其插入 + 数据块。 + +- 任何辅助 CPU 必须在内存保留区（通过设备树中的 /memreserve/ 域传递 + 给内核）中自旋于内核之外，轮询它们的 cpu-release-addr 位置（必须 + 包含在保留区中）。可通过插入 wfe 指令来降低忙循环开销，而主 CPU 将 + 发出 sev 指令。当对 cpu-release-addr 所指位置的读取操作返回非零值 + 时，CPU 必须直接跳入此值所指向的地址。 + +- 辅助 CPU 通用寄存器设置 + x0 = 0 (保留，将来可能使用) + x1 = 0 (保留，将来可能使用) + x2 = 0 (保留，将来可能使用) + x3 = 0 (保留，将来可能使用) diff --git a/trunk/Documentation/zh_CN/arm64/memory.txt b/trunk/Documentation/zh_CN/arm64/memory.txt new file mode 100644 index 000000000000..83b519314706 --- /dev/null +++ b/trunk/Documentation/zh_CN/arm64/memory.txt @@ -0,0 +1,93 @@ +Chinese translated version of Documentation/arm64/memory.txt + +If you have any comment or update to the content, please contact the +original document maintainer directly. However, if you have a problem +communicating in English you can also ask the Chinese maintainer for +help. Contact the Chinese maintainer if this translation is outdated +or if there is a problem with the translation. + +Maintainer: Catalin Marinas +Chinese maintainer: Fu Wei +--------------------------------------------------------------------- +Documentation/arm64/memory.txt 的中文翻译 + +如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文 +交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻 +译存在问题，请联系中文版维护者。 + +英文版维护者： Catalin Marinas +中文版维护者： 傅炜 Fu Wei +中文版翻译者： 傅炜 Fu Wei +中文版校译者： 傅炜 Fu Wei + +以下为正文 +--------------------------------------------------------------------- + Linux 在 AArch64 中的内存布局 + =========================== + +作者: Catalin Marinas +日期: 2012 年 02 月 20 日 + +本文档描述 AArch64 Linux 内核所使用的虚拟内存布局。此构架可以实现 +页大小为 4KB 的 4 级转换表和页大小为 64KB 的 3 级转换表。 + +AArch64 Linux 使用页大小为 4KB 的 3 级转换表配置，对于用户和内核 +都有 39-bit (512GB) 的虚拟地址空间。对于页大小为 64KB的配置，仅 +使用 2 级转换表，但内存布局相同。 + +用户地址空间的 63:39 位为 0，而内核地址空间的相应位为 1。TTBRx 的 +选择由虚拟地址的 63 位给出。swapper_pg_dir 仅包含内核（全局）映射， +而用户 pgd 仅包含用户（非全局）映射。swapper_pgd_dir 地址被写入 +TTBR1 中，且从不写入 TTBR0。 + + +AArch64 Linux 内存布局： + +起始地址 结束地址 大小 用途 +----------------------------------------------------------------------- +0000000000000000 0000007fffffffff 512GB 用户空间 + +ffffff8000000000 ffffffbbfffcffff ~240GB vmalloc + +ffffffbbfffd0000 ffffffbcfffdffff 64KB [防护页] + +ffffffbbfffe0000 ffffffbcfffeffff 64KB PCI I/O 空间 + +ffffffbbffff0000 ffffffbcffffffff 64KB [防护页] + +ffffffbc00000000 ffffffbdffffffff 8GB vmemmap + +ffffffbe00000000 ffffffbffbffffff ~8GB [防护页，未来用于 vmmemap] + +ffffffbffc000000 ffffffbfffffffff 64MB 模块 + +ffffffc000000000 ffffffffffffffff 256GB 内存空间 + + +4KB 页大小的转换表查找： + ++--------+--------+--------+--------+--------+--------+--------+--------+ +|63 56|55 48|47 40|39 32|31 24|23 16|15 8|7 0| ++--------+--------+--------+--------+--------+--------+--------+--------+ + | | | | | | + | | | | | v + | | | | | [11:0] 页内偏移 + | | | | +-> [20:12] L3 索引 + | | | +-----------> [29:21] L2 索引 + | | +---------------------> [38:30] L1 索引 + | +-------------------------------> [47:39] L0 索引 (未使用) + +-------------------------------------------------> [63] TTBR0/1 + + +64KB 页大小的转换表查找： + ++--------+--------+--------+--------+--------+--------+--------+--------+ +|63 56|55 48|47 40|39 32|31 24|23 16|15 8|7 0| ++--------+--------+--------+--------+--------+--------+--------+--------+ + | | | | | + | | | | v + | | | | [15:0] 页内偏移 + | | | +----------> [28:16] L3 索引 + | | +--------------------------> [41:29] L2 索引 (仅使用 38:29 ) + | +-------------------------------> [47:42] L1 索引 (未使用) + +-------------------------------------------------> [63] TTBR0/1 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 2463a0a8d3e5..4b062ff7441c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -235,6 +235,7 @@ F: drivers/platform/x86/acer-wmi.c ACPI M: Len Brown +M: Rafael J. Wysocki L: linux-acpi@vger.kernel.org W: http://www.lesswatts.org/projects/acpi/ Q: http://patchwork.kernel.org/project/linux-acpi/list/ @@ -502,7 +503,7 @@ F: include/linux/altera_uart.h F: include/linux/altera_jtaguart.h AMD FAM15H PROCESSOR POWER MONITORING DRIVER -M: Andreas Herrmann +M: Andreas Herrmann L: lm-sensors@lm-sensors.org S: Maintained F: Documentation/hwmon/fam15h_power @@ -636,6 +637,13 @@ W: http://www.arm.linux.org.uk/ S: Maintained F: arch/arm/ +ARM SUB-ARCHITECTURES +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +S: MAINTAINED +F: arch/arm/mach-*/ +F: arch/arm/plat-*/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git + ARM PRIMECELL AACI PL041 DRIVER M: Russell King S: Maintained @@ -2801,6 +2809,7 @@ F: sound/usb/misc/ua101.c EXTENSIBLE FIRMWARE INTERFACE (EFI) M: Matt Fleming L: linux-efi@vger.kernel.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git S: Maintained F: Documentation/x86/efi-stub.txt F: arch/ia64/kernel/efi.c @@ -5062,7 +5071,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git S: Odd Fixes F: drivers/net/ F: include/linux/if_* -F: include/linux/*device.h +F: include/linux/netdevice.h +F: include/linux/arcdevice.h +F: include/linux/etherdevice.h +F: include/linux/fcdevice.h +F: include/linux/fddidevice.h +F: include/linux/hippidevice.h +F: include/linux/inetdevice.h NETXEN (1/10) GbE SUPPORT M: Sony Chacko @@ -5634,7 +5649,7 @@ S: Maintained F: drivers/pinctrl/spear/ PKTCDVD DRIVER -M: Peter Osterlund +M: Jiri Kosina S: Maintained F: drivers/block/pktcdvd.c F: include/linux/pktcdvd.h @@ -7748,6 +7763,13 @@ W: http://www.ideasonboard.org/uvc/ S: Maintained F: drivers/media/usb/uvc/ +USB WEBCAM GADGET +M: Laurent Pinchart +L: linux-usb@vger.kernel.org +S: Maintained +F: drivers/usb/gadget/*uvc*.c +F: drivers/usb/gadget/webcam.c + USB WIRELESS RNDIS DRIVER (rndis_wlan) M: Jussi Kivilinna L: linux-wireless@vger.kernel.org diff --git a/trunk/Makefile b/trunk/Makefile index 366d0ab0c5fe..42d0e56818ea 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc3 NAME = Terrified Chipmunk # *DOCUMENTATION* @@ -719,6 +719,17 @@ endif # INSTALL_MOD_STRIP export mod_strip_cmd +ifeq ($(CONFIG_MODULE_SIG),y) +MODSECKEY = ./signing_key.priv +MODPUBKEY = ./signing_key.x509 +export MODPUBKEY +mod_sign_cmd = perl $(srctree)/scripts/sign-file $(MODSECKEY) $(MODPUBKEY) +else +mod_sign_cmd = true +endif +export mod_sign_cmd + + ifeq ($(KBUILD_EXTMOD),) core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ diff --git a/trunk/arch/alpha/include/asm/thread_info.h b/trunk/arch/alpha/include/asm/thread_info.h index 4554ecbff7c6..1f8c72959fb6 100644 --- a/trunk/arch/alpha/include/asm/thread_info.h +++ b/trunk/arch/alpha/include/asm/thread_info.h @@ -7,6 +7,7 @@ #include #include #include +#include #endif #ifndef __ASSEMBLY__ @@ -21,6 +22,7 @@ struct thread_info { mm_segment_t addr_limit; /* thread address space */ unsigned cpu; /* current CPU */ int preempt_count; /* 0 => preemptable, <0 => BUG */ + unsigned int status; /* thread-synchronous flags */ int bpt_nsaved; unsigned long bpt_addr[2]; /* breakpoint handling */ @@ -63,8 +65,6 @@ register struct thread_info *__current_thread_info __asm__("$8"); * - these are process state flags and used from assembly * - pending work-to-be-done flags come first and must be assigned to be * within bits 0 to 7 to fit in and immediate operand. - * - ALPHA_UAC_SHIFT below must be kept consistent with the unaligned - * control flags. * * TIF_SYSCALL_TRACE is known to be 0 via blbs. */ @@ -72,18 +72,12 @@ register struct thread_info *__current_thread_info __asm__("$8"); #define TIF_NOTIFY_RESUME 1 /* callback before returning to user */ #define TIF_SIGPENDING 2 /* signal pending */ #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ -#define TIF_POLLING_NRFLAG 8 /* poll_idle is polling NEED_RESCHED */ #define TIF_DIE_IF_KERNEL 9 /* dik recursion lock */ -#define TIF_UAC_NOPRINT 10 /* ! Preserve sequence of following */ -#define TIF_UAC_NOFIX 11 /* ! flags as they match */ -#define TIF_UAC_SIGBUS 12 /* ! userspace part of 'osf_sysinfo' */ #define TIF_MEMDIE 13 /* is terminating due to OOM killer */ -#define TIF_RESTORE_SIGMASK 14 /* restore signal mask in do_signal */ #define _TIF_SYSCALL_TRACE (1<flags = ((task_thread_info(task)->flags & \ - ~ALPHA_UAC_MASK) \ - | (((value) << ALPHA_UAC_SHIFT) & (1<status & TS_POLLING) + +#ifndef __ASSEMBLY__ +#define HAVE_SET_RESTORE_SIGMASK 1 +static inline void set_restore_sigmask(void) +{ + struct thread_info *ti = current_thread_info(); + ti->status |= TS_RESTORE_SIGMASK; + WARN_ON(!test_bit(TIF_SIGPENDING, (unsigned long *)&ti->flags)); +} +static inline void clear_restore_sigmask(void) +{ + current_thread_info()->status &= ~TS_RESTORE_SIGMASK; +} +static inline bool test_restore_sigmask(void) +{ + return current_thread_info()->status & TS_RESTORE_SIGMASK; +} +static inline bool test_and_clear_restore_sigmask(void) +{ + struct thread_info *ti = current_thread_info(); + if (!(ti->status & TS_RESTORE_SIGMASK)) + return false; + ti->status &= ~TS_RESTORE_SIGMASK; + return true; +} +#endif + +#define SET_UNALIGN_CTL(task,value) ({ \ + __u32 status = task_thread_info(task)->status & ~UAC_BITMASK; \ + if (value & PR_UNALIGN_NOPRINT) \ + status |= TS_UAC_NOPRINT; \ + if (value & PR_UNALIGN_SIGBUS) \ + status |= TS_UAC_SIGBUS; \ + if (value & 4) /* alpha-specific */ \ + status |= TS_UAC_NOFIX; \ + task_thread_info(task)->status = status; \ 0; }) #define GET_UNALIGN_CTL(task,value) ({ \ - put_user((task_thread_info(task)->flags & (1 << TIF_UAC_NOPRINT))\ - >> ALPHA_UAC_SHIFT \ - | (task_thread_info(task)->flags & (1 << TIF_UAC_SIGBUS))\ - >> (ALPHA_UAC_SHIFT + 1) \ - | (task_thread_info(task)->flags & (1 << TIF_UAC_NOFIX))\ - >> (ALPHA_UAC_SHIFT - 1), \ - (int __user *)(value)); \ + __u32 status = task_thread_info(task)->status & ~UAC_BITMASK; \ + __u32 res = 0; \ + if (status & TS_UAC_NOPRINT) \ + res |= PR_UNALIGN_NOPRINT; \ + if (status & TS_UAC_SIGBUS) \ + res |= PR_UNALIGN_SIGBUS; \ + if (status & TS_UAC_NOFIX) \ + res |= 4; \ + put_user(res, (int __user *)(value)); \ }) -#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG) - #endif /* __KERNEL__ */ #endif /* _ALPHA_THREAD_INFO_H */ diff --git a/trunk/arch/alpha/kernel/osf_sys.c b/trunk/arch/alpha/kernel/osf_sys.c index 9eb090582cf1..1e6956a90608 100644 --- a/trunk/arch/alpha/kernel/osf_sys.c +++ b/trunk/arch/alpha/kernel/osf_sys.c @@ -793,8 +793,7 @@ SYSCALL_DEFINE5(osf_getsysinfo, unsigned long, op, void __user *, buffer, case GSI_UACPROC: if (nbytes < sizeof(unsigned int)) return -EINVAL; - w = (current_thread_info()->flags >> ALPHA_UAC_SHIFT) & - UAC_BITMASK; + w = current_thread_info()->status & UAC_BITMASK; if (put_user(w, (unsigned int __user *)buffer)) return -EFAULT; return 1; @@ -904,24 +903,20 @@ SYSCALL_DEFINE5(osf_setsysinfo, unsigned long, op, void __user *, buffer, break; case SSI_NVPAIRS: { - unsigned long v, w, i; - unsigned int old, new; + unsigned __user *p = buffer; + unsigned i; - for (i = 0; i < nbytes; ++i) { + for (i = 0, p = buffer; i < nbytes; ++i, p += 2) { + unsigned v, w, status; - if (get_user(v, 2*i + (unsigned int __user *)buffer)) - return -EFAULT; - if (get_user(w, 2*i + 1 + (unsigned int __user *)buffer)) + if (get_user(v, p) || get_user(w, p + 1)) return -EFAULT; switch (v) { case SSIN_UACPROC: - again: - old = current_thread_info()->flags; - new = old & ~(UAC_BITMASK << ALPHA_UAC_SHIFT); - new = new | (w & UAC_BITMASK) << ALPHA_UAC_SHIFT; - if (cmpxchg(¤t_thread_info()->flags, - old, new) != old) - goto again; + w &= UAC_BITMASK; + status = current_thread_info()->status; + status = (status & ~UAC_BITMASK) | w; + current_thread_info()->status = status; break; default: diff --git a/trunk/arch/alpha/kernel/process.c b/trunk/arch/alpha/kernel/process.c index 4054e0ffe2b2..51987dcf79b8 100644 --- a/trunk/arch/alpha/kernel/process.c +++ b/trunk/arch/alpha/kernel/process.c @@ -49,7 +49,7 @@ EXPORT_SYMBOL(pm_power_off); void cpu_idle(void) { - set_thread_flag(TIF_POLLING_NRFLAG); + current_thread_info()->status |= TS_POLLING; while (1) { /* FIXME -- EV6 and LCA45 know how to power down diff --git a/trunk/arch/alpha/kernel/traps.c b/trunk/arch/alpha/kernel/traps.c index 80d987c0e9aa..272666d006df 100644 --- a/trunk/arch/alpha/kernel/traps.c +++ b/trunk/arch/alpha/kernel/traps.c @@ -780,17 +780,17 @@ do_entUnaUser(void __user * va, unsigned long opcode, /* Check the UAC bits to decide what the user wants us to do with the unaliged access. */ - if (!test_thread_flag (TIF_UAC_NOPRINT)) { + if (!(current_thread_info()->status & TS_UAC_NOPRINT)) { if (__ratelimit(&ratelimit)) { printk("%s(%d): unaligned trap at %016lx: %p %lx %ld\n", current->comm, task_pid_nr(current), regs->pc - 4, va, opcode, reg); } } - if (test_thread_flag (TIF_UAC_SIGBUS)) + if ((current_thread_info()->status & TS_UAC_SIGBUS)) goto give_sigbus; /* Not sure why you'd want to use this, but... */ - if (test_thread_flag (TIF_UAC_NOFIX)) + if ((current_thread_info()->status & TS_UAC_NOFIX)) return; /* Don't bother reading ds in the access check since we already diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 73067efd4845..ade7e924bef5 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -1603,8 +1603,8 @@ config NR_CPUS default "4" config HOTPLUG_CPU - bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" - depends on SMP && HOTPLUG && EXPERIMENTAL + bool "Support for hot-pluggable CPUs" + depends on SMP && HOTPLUG help Say Y here to experiment with turning CPUs off and on. CPUs can be controlled through /sys/devices/system/cpu. @@ -1645,8 +1645,8 @@ config HZ default 100 config THUMB2_KERNEL - bool "Compile the kernel in Thumb-2 mode (EXPERIMENTAL)" - depends on CPU_V7 && !CPU_V6 && !CPU_V6K && EXPERIMENTAL + bool "Compile the kernel in Thumb-2 mode" + depends on CPU_V7 && !CPU_V6 && !CPU_V6K select AEABI select ARM_ASM_UNIFIED select ARM_UNWIND @@ -1850,6 +1850,7 @@ config XEN_DOM0 config XEN bool "Xen guest support on ARM (EXPERIMENTAL)" depends on EXPERIMENTAL && ARM && OF + depends on CPU_V7 && !CPU_V6 help Say Y if you want to run Linux in a Virtual Machine on Xen on ARM. diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile index f023e3acdfbd..5f914fca911b 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -21,8 +21,6 @@ endif OBJCOPYFLAGS :=-O binary -R .comment -S GZFLAGS :=-9 #KBUILD_CFLAGS +=-pipe -# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: -KBUILD_CFLAGS +=$(call cc-option,-marm,) # Never generate .eh_frame KBUILD_CFLAGS += $(call cc-option,-fno-dwarf2-cfi-asm) @@ -105,17 +103,20 @@ endif ifeq ($(CONFIG_THUMB2_KERNEL),y) AFLAGS_AUTOIT :=$(call as-option,-Wa$(comma)-mimplicit-it=always,-Wa$(comma)-mauto-it) AFLAGS_NOWARN :=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W) -CFLAGS_THUMB2 :=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN) -AFLAGS_THUMB2 :=$(CFLAGS_THUMB2) -Wa$(comma)-mthumb +CFLAGS_ISA :=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN) +AFLAGS_ISA :=$(CFLAGS_ISA) -Wa$(comma)-mthumb # Work around buggy relocation from gas if requested: ifeq ($(CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11),y) CFLAGS_MODULE +=-fno-optimize-sibling-calls endif +else +CFLAGS_ISA :=$(call cc-option,-marm,) +AFLAGS_ISA :=$(CFLAGS_ISA) endif # Need -Uarm for gcc < 3.x -KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_THUMB2) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm -KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_THUMB2) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float +KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm +KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float CHECKFLAGS += -D__arm__ diff --git a/trunk/arch/arm/boot/Makefile b/trunk/arch/arm/boot/Makefile index 3fdab016aa5c..f2aa09eb658e 100644 --- a/trunk/arch/arm/boot/Makefile +++ b/trunk/arch/arm/boot/Makefile @@ -33,7 +33,7 @@ ifeq ($(CONFIG_XIP_KERNEL),y) $(obj)/xipImage: vmlinux FORCE $(call if_changed,objcopy) - @echo ' Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))' + $(kecho) ' Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))' $(obj)/Image $(obj)/zImage: FORCE @echo 'Kernel configured for XIP (CONFIG_XIP_KERNEL=y)' @@ -48,14 +48,14 @@ $(obj)/xipImage: FORCE $(obj)/Image: vmlinux FORCE $(call if_changed,objcopy) - @echo ' Kernel: $@ is ready' + $(kecho) ' Kernel: $@ is ready' $(obj)/compressed/vmlinux: $(obj)/Image FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed $@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE $(call if_changed,objcopy) - @echo ' Kernel: $@ is ready' + $(kecho) ' Kernel: $@ is ready' endif @@ -90,7 +90,7 @@ fi $(obj)/uImage: $(obj)/zImage FORCE @$(check_for_multiple_loadaddr) $(call if_changed,uimage) - @echo ' Image $@ is ready' + $(kecho) ' Image $@ is ready' $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE $(Q)$(MAKE) $(build)=$(obj)/bootp $@ @@ -98,7 +98,7 @@ $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE $(obj)/bootpImage: $(obj)/bootp/bootp FORCE $(call if_changed,objcopy) - @echo ' Kernel: $@ is ready' + $(kecho) ' Kernel: $@ is ready' PHONY += initrd FORCE initrd: diff --git a/trunk/arch/arm/boot/dts/Makefile b/trunk/arch/arm/boot/dts/Makefile index c1ce813fcc4a..f37cf9fa5fa0 100644 --- a/trunk/arch/arm/boot/dts/Makefile +++ b/trunk/arch/arm/boot/dts/Makefile @@ -25,6 +25,8 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ exynos4210-trats.dtb \ exynos5250-smdk5250.dtb dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb +dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ + integratorcp.dtb dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ kirkwood-dns325.dtb \ diff --git a/trunk/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/trunk/arch/arm/boot/dts/at91sam9g20ek_common.dtsi index b06c0db273b1..e6391a4e6649 100644 --- a/trunk/arch/arm/boot/dts/at91sam9g20ek_common.dtsi +++ b/trunk/arch/arm/boot/dts/at91sam9g20ek_common.dtsi @@ -126,14 +126,14 @@ #size-cells = <0>; btn3 { - label = "Buttin 3"; + label = "Button 3"; gpios = <&pioA 30 1>; linux,code = <0x103>; gpio-key,wakeup; }; btn4 { - label = "Buttin 4"; + label = "Button 4"; gpios = <&pioA 31 1>; linux,code = <0x104>; gpio-key,wakeup; diff --git a/trunk/arch/arm/boot/dts/dbx5x0.dtsi b/trunk/arch/arm/boot/dts/dbx5x0.dtsi index 748ba7aa746c..4b0e0ca08f40 100644 --- a/trunk/arch/arm/boot/dts/dbx5x0.dtsi +++ b/trunk/arch/arm/boot/dts/dbx5x0.dtsi @@ -483,6 +483,8 @@ compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x80004000 0x1000>; interrupts = <0 21 0x4>; + arm,primecell-periphid = <0x180024>; + #address-cells = <1>; #size-cells = <0>; v-i2c-supply = <&db8500_vape_reg>; @@ -494,6 +496,8 @@ compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x80122000 0x1000>; interrupts = <0 22 0x4>; + arm,primecell-periphid = <0x180024>; + #address-cells = <1>; #size-cells = <0>; v-i2c-supply = <&db8500_vape_reg>; @@ -505,6 +509,8 @@ compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x80128000 0x1000>; interrupts = <0 55 0x4>; + arm,primecell-periphid = <0x180024>; + #address-cells = <1>; #size-cells = <0>; v-i2c-supply = <&db8500_vape_reg>; @@ -516,6 +522,8 @@ compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x80110000 0x1000>; interrupts = <0 12 0x4>; + arm,primecell-periphid = <0x180024>; + #address-cells = <1>; #size-cells = <0>; v-i2c-supply = <&db8500_vape_reg>; @@ -527,6 +535,8 @@ compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; reg = <0x8012a000 0x1000>; interrupts = <0 51 0x4>; + arm,primecell-periphid = <0x180024>; + #address-cells = <1>; #size-cells = <0>; v-i2c-supply = <&db8500_vape_reg>; @@ -573,33 +583,38 @@ interrupts = <0 60 0x4>; status = "disabled"; }; + sdi@80118000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80118000 0x1000>; interrupts = <0 50 0x4>; status = "disabled"; }; + sdi@80005000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80005000 0x1000>; interrupts = <0 41 0x4>; status = "disabled"; }; + sdi@80119000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80119000 0x1000>; interrupts = <0 59 0x4>; status = "disabled"; }; + sdi@80114000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80114000 0x1000>; interrupts = <0 99 0x4>; status = "disabled"; }; + sdi@80008000 { compatible = "arm,pl18x", "arm,primecell"; - reg = <0x80114000 0x1000>; + reg = <0x80008000 0x1000>; interrupts = <0 100 0x4>; status = "disabled"; }; diff --git a/trunk/arch/arm/boot/dts/dove.dtsi b/trunk/arch/arm/boot/dts/dove.dtsi index 96fb824b5e6e..5a00022383e7 100644 --- a/trunk/arch/arm/boot/dts/dove.dtsi +++ b/trunk/arch/arm/boot/dts/dove.dtsi @@ -4,21 +4,32 @@ compatible = "marvell,dove"; model = "Marvell Armada 88AP510 SoC"; - interrupt-parent = <&intc>; - - intc: interrupt-controller { - compatible = "marvell,orion-intc"; - interrupt-controller; - #interrupt-cells = <1>; - reg = <0xf1020204 0x04>, - <0xf1020214 0x04>; - }; - - mbus@f1000000 { + soc@f1000000 { compatible = "simple-bus"; - ranges = <0 0xf1000000 0x4000000>; #address-cells = <1>; #size-cells = <1>; + interrupt-parent = <&intc>; + + ranges = <0xc8000000 0xc8000000 0x0100000 /* CESA SRAM 1M */ + 0xe0000000 0xe0000000 0x8000000 /* PCIe0 Mem 128M */ + 0xe8000000 0xe8000000 0x8000000 /* PCIe1 Mem 128M */ + 0xf0000000 0xf0000000 0x0100000 /* ScratchPad 1M */ + 0x00000000 0xf1000000 0x1000000 /* SB/NB regs 16M */ + 0xf2000000 0xf2000000 0x0100000 /* PCIe0 I/O 1M */ + 0xf2100000 0xf2100000 0x0100000 /* PCIe0 I/O 1M */ + 0xf8000000 0xf8000000 0x8000000>; /* BootROM 128M */ + + l2: l2-cache { + compatible = "marvell,tauros2-cache"; + marvell,tauros2-cache-features = <0>; + }; + + intc: interrupt-controller { + compatible = "marvell,orion-intc"; + interrupt-controller; + #interrupt-cells = <1>; + reg = <0x20204 0x04>, <0x20214 0x04>; + }; uart0: serial@12000 { compatible = "ns16550a"; @@ -56,11 +67,6 @@ status = "disabled"; }; - wdt: wdt@20300 { - compatible = "marvell,orion-wdt"; - reg = <0x20300 0x28>; - }; - gpio0: gpio@d0400 { compatible = "marvell,orion-gpio"; #gpio-cells = <2>; @@ -139,5 +145,14 @@ nr-ports = <1>; status = "disabled"; }; + + crypto: crypto@30000 { + compatible = "marvell,orion-crypto"; + reg = <0x30000 0x10000>, + <0xc8000000 0x800>; + reg-names = "regs", "sram"; + interrupts = <31>; + status = "okay"; + }; }; }; diff --git a/trunk/arch/arm/boot/dts/exynos4210-trats.dts b/trunk/arch/arm/boot/dts/exynos4210-trats.dts index 73567b843e72..a21511c14071 100644 --- a/trunk/arch/arm/boot/dts/exynos4210-trats.dts +++ b/trunk/arch/arm/boot/dts/exynos4210-trats.dts @@ -20,8 +20,10 @@ compatible = "samsung,trats", "samsung,exynos4210"; memory { - reg = <0x40000000 0x20000000 - 0x60000000 0x20000000>; + reg = <0x40000000 0x10000000 + 0x50000000 0x10000000 + 0x60000000 0x10000000 + 0x70000000 0x10000000>; }; chosen { diff --git a/trunk/arch/arm/boot/dts/imx23.dtsi b/trunk/arch/arm/boot/dts/imx23.dtsi index 9ca4ca70c1bc..6d31aa383460 100644 --- a/trunk/arch/arm/boot/dts/imx23.dtsi +++ b/trunk/arch/arm/boot/dts/imx23.dtsi @@ -69,6 +69,7 @@ interrupts = <13>, <56>; interrupt-names = "gpmi-dma", "bch"; clocks = <&clks 34>; + clock-names = "gpmi_io"; fsl,gpmi-dma-channel = <4>; status = "disabled"; }; diff --git a/trunk/arch/arm/boot/dts/imx28.dtsi b/trunk/arch/arm/boot/dts/imx28.dtsi index e16d63155480..55c57ea6169e 100644 --- a/trunk/arch/arm/boot/dts/imx28.dtsi +++ b/trunk/arch/arm/boot/dts/imx28.dtsi @@ -85,6 +85,7 @@ interrupts = <88>, <41>; interrupt-names = "gpmi-dma", "bch"; clocks = <&clks 50>; + clock-names = "gpmi_io"; fsl,gpmi-dma-channel = <4>; status = "disabled"; }; diff --git a/trunk/arch/arm/boot/dts/imx6q-arm2.dts b/trunk/arch/arm/boot/dts/imx6q-arm2.dts index 15df4c105e89..5bfa02a3f85c 100644 --- a/trunk/arch/arm/boot/dts/imx6q-arm2.dts +++ b/trunk/arch/arm/boot/dts/imx6q-arm2.dts @@ -37,6 +37,13 @@ pinctrl_hog: hoggrp { fsl,pins = < 176 0x80000000 /* MX6Q_PAD_EIM_D25__GPIO_3_25 */ + >; + }; + }; + + arm2 { + pinctrl_usdhc3_arm2: usdhc3grp-arm2 { + fsl,pins = < 1363 0x80000000 /* MX6Q_PAD_NANDF_CS0__GPIO_6_11 */ 1369 0x80000000 /* MX6Q_PAD_NANDF_CS1__GPIO_6_14 */ >; @@ -58,7 +65,8 @@ wp-gpios = <&gpio6 14 0>; vmmc-supply = <®_3p3v>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc3_1>; + pinctrl-0 = <&pinctrl_usdhc3_1 + &pinctrl_usdhc3_arm2>; status = "okay"; }; diff --git a/trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi index 8ac51c08269d..8fea375c734d 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi +++ b/trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi @@ -48,17 +48,19 @@ #size-cells = <0>; button@1 { label = "Function Button"; - linux,code = <132>; + linux,code = <357>; gpios = <&gpio1 9 1>; }; button@2 { label = "Power-on Switch"; - linux,code = <116>; + linux,code = <0>; + linux,input-type = <5>; gpios = <&gpio1 10 1>; }; button@3 { label = "Power-auto Switch"; - linux,code = <142>; + linux,code = <1>; + linux,input-type = <5>; gpios = <&gpio1 11 1>; }; }; @@ -67,28 +69,28 @@ compatible = "gpio-leds"; led@1 { - label = "lschlv2:blue:func"; + label = "lsxl:blue:func"; gpios = <&gpio1 4 1>; }; led@2 { - label = "lschlv2:red:alarm"; + label = "lsxl:red:alarm"; gpios = <&gpio1 5 1>; }; led@3 { - label = "lschlv2:amber:info"; + label = "lsxl:amber:info"; gpios = <&gpio1 6 1>; }; led@4 { - label = "lschlv2:blue:power"; + label = "lsxl:blue:power"; gpios = <&gpio1 7 1>; linux,default-trigger = "default-on"; }; led@5 { - label = "lschlv2:red:func"; + label = "lsxl:red:func"; gpios = <&gpio1 16 1>; }; }; diff --git a/trunk/arch/arm/boot/dts/omap3.dtsi b/trunk/arch/arm/boot/dts/omap3.dtsi index f38ea8771b44..696e929d0304 100644 --- a/trunk/arch/arm/boot/dts/omap3.dtsi +++ b/trunk/arch/arm/boot/dts/omap3.dtsi @@ -257,7 +257,7 @@ interrupt-names = "common", "tx", "rx", "sidetone"; interrupt-parent = <&intc>; ti,buffer-size = <1280>; - ti,hwmods = "mcbsp2"; + ti,hwmods = "mcbsp2", "mcbsp2_sidetone"; }; mcbsp3: mcbsp@49024000 { @@ -272,7 +272,7 @@ interrupt-names = "common", "tx", "rx", "sidetone"; interrupt-parent = <&intc>; ti,buffer-size = <128>; - ti,hwmods = "mcbsp3"; + ti,hwmods = "mcbsp3", "mcbsp3_sidetone"; }; mcbsp4: mcbsp@49026000 { diff --git a/trunk/arch/arm/boot/dts/wm8505.dtsi b/trunk/arch/arm/boot/dts/wm8505.dtsi index b459691655ab..330f833ac3b0 100644 --- a/trunk/arch/arm/boot/dts/wm8505.dtsi +++ b/trunk/arch/arm/boot/dts/wm8505.dtsi @@ -71,13 +71,13 @@ ehci@d8007100 { compatible = "via,vt8500-ehci"; reg = <0xd8007100 0x200>; - interrupts = <43>; + interrupts = <1>; }; uhci@d8007300 { compatible = "platform-uhci"; reg = <0xd8007300 0x200>; - interrupts = <43>; + interrupts = <0>; }; fb@d8050800 { diff --git a/trunk/arch/arm/configs/imx_v6_v7_defconfig b/trunk/arch/arm/configs/imx_v6_v7_defconfig index 66aa7a6db884..394ded624e37 100644 --- a/trunk/arch/arm/configs/imx_v6_v7_defconfig +++ b/trunk/arch/arm/configs/imx_v6_v7_defconfig @@ -139,6 +139,7 @@ CONFIG_I2C_IMX=y CONFIG_SPI=y CONFIG_SPI_IMX=y CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_MC9S08DZ60=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_IMX2_WDT=y @@ -155,6 +156,7 @@ CONFIG_SOC_CAMERA=y CONFIG_SOC_CAMERA_OV2640=y CONFIG_VIDEO_MX3=y CONFIG_FB=y +CONFIG_LCD_PLATFORM=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_L4F00242T03=y diff --git a/trunk/arch/arm/configs/mvebu_defconfig b/trunk/arch/arm/configs/mvebu_defconfig index 7bcf850eddcd..3458752c4bb2 100644 --- a/trunk/arch/arm/configs/mvebu_defconfig +++ b/trunk/arch/arm/configs/mvebu_defconfig @@ -1,6 +1,6 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y -CONFIG_NO_HZ=y +CONFIG_IRQ_DOMAIN_DEBUG=y CONFIG_HIGH_RES_TIMERS=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y @@ -9,10 +9,12 @@ CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_ARCH_MVEBU=y -CONFIG_MACH_ARMADA_370_XP=y +CONFIG_MACH_ARMADA_370=y +CONFIG_MACH_ARMADA_XP=y +# CONFIG_CACHE_L2X0 is not set CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_USE_OF=y +# CONFIG_COMPACTION is not set CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y @@ -23,6 +25,8 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y +# CONFIG_USB_SUPPORT is not set +# CONFIG_IOMMU_SUPPORT is not set CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_FS_XATTR is not set diff --git a/trunk/arch/arm/configs/versatile_defconfig b/trunk/arch/arm/configs/versatile_defconfig index cdd4d2bd3962..2ba9e63d0f17 100644 --- a/trunk/arch/arm/configs/versatile_defconfig +++ b/trunk/arch/arm/configs/versatile_defconfig @@ -1,3 +1,4 @@ +CONFIG_ARCH_VERSATILE=y CONFIG_EXPERIMENTAL=y # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y diff --git a/trunk/arch/arm/include/asm/flat.h b/trunk/arch/arm/include/asm/flat.h index 59426a4595c9..e847d23351ed 100644 --- a/trunk/arch/arm/include/asm/flat.h +++ b/trunk/arch/arm/include/asm/flat.h @@ -8,7 +8,7 @@ #define flat_argvp_envp_on_stack() 1 #define flat_old_ram_flag(flags) (flags) #define flat_reloc_valid(reloc, size) ((reloc) <= (size)) -#define flat_get_addr_from_rp(rp, relval, flags, persistent) get_unaligned(rp) +#define flat_get_addr_from_rp(rp, relval, flags, persistent) ((void)persistent,get_unaligned(rp)) #define flat_put_addr_at_rp(rp, val, relval) put_unaligned(val,rp) #define flat_get_relocate_addr(rel) (rel) #define flat_set_persistent(relval, p) 0 diff --git a/trunk/arch/arm/include/asm/uaccess.h b/trunk/arch/arm/include/asm/uaccess.h index 77bd79f2ffdb..7e1f76027f66 100644 --- a/trunk/arch/arm/include/asm/uaccess.h +++ b/trunk/arch/arm/include/asm/uaccess.h @@ -200,8 +200,8 @@ extern int __put_user_8(void *, unsigned long long); #define USER_DS KERNEL_DS #define segment_eq(a,b) (1) -#define __addr_ok(addr) (1) -#define __range_ok(addr,size) (0) +#define __addr_ok(addr) ((void)(addr),1) +#define __range_ok(addr,size) ((void)(addr),0) #define get_fs() (KERNEL_DS) static inline void set_fs(mm_segment_t fs) diff --git a/trunk/arch/arm/include/asm/xen/interface.h b/trunk/arch/arm/include/asm/xen/interface.h index ae05e56dd17d..5000397134b4 100644 --- a/trunk/arch/arm/include/asm/xen/interface.h +++ b/trunk/arch/arm/include/asm/xen/interface.h @@ -29,16 +29,22 @@ #ifndef __ASSEMBLY__ /* Explicitly size integers that represent pfns in the interface with - * Xen so that we can have one ABI that works for 32 and 64 bit guests. */ + * Xen so that we can have one ABI that works for 32 and 64 bit guests. + * Note that this means that the xen_pfn_t type may be capable of + * representing pfn's which the guest cannot represent in its own pfn + * type. However since pfn space is controlled by the guest this is + * fine since it simply wouldn't be able to create any sure pfns in + * the first place. + */ typedef uint64_t xen_pfn_t; +#define PRI_xen_pfn "llx" typedef uint64_t xen_ulong_t; +#define PRI_xen_ulong "llx" /* Guest handles for primitive C types. */ __DEFINE_GUEST_HANDLE(uchar, unsigned char); __DEFINE_GUEST_HANDLE(uint, unsigned int); -__DEFINE_GUEST_HANDLE(ulong, unsigned long); DEFINE_GUEST_HANDLE(char); DEFINE_GUEST_HANDLE(int); -DEFINE_GUEST_HANDLE(long); DEFINE_GUEST_HANDLE(void); DEFINE_GUEST_HANDLE(uint64_t); DEFINE_GUEST_HANDLE(uint32_t); diff --git a/trunk/arch/arm/include/asm/xen/page.h b/trunk/arch/arm/include/asm/xen/page.h index 174202318dff..c6b9096cef95 100644 --- a/trunk/arch/arm/include/asm/xen/page.h +++ b/trunk/arch/arm/include/asm/xen/page.h @@ -10,7 +10,7 @@ #include #define pfn_to_mfn(pfn) (pfn) -#define phys_to_machine_mapping_valid (1) +#define phys_to_machine_mapping_valid(pfn) (1) #define mfn_to_pfn(mfn) (mfn) #define mfn_to_virt(m) (__va(mfn_to_pfn(m) << PAGE_SHIFT)) @@ -30,6 +30,8 @@ typedef struct xpaddr { #define XMADDR(x) ((xmaddr_t) { .maddr = (x) }) #define XPADDR(x) ((xpaddr_t) { .paddr = (x) }) +#define INVALID_P2M_ENTRY (~0UL) + static inline xmaddr_t phys_to_machine(xpaddr_t phys) { unsigned offset = phys.paddr & ~PAGE_MASK; @@ -74,9 +76,14 @@ static inline int m2p_remove_override(struct page *page, bool clear_pte) return 0; } +static inline bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn) +{ + BUG_ON(pfn != mfn && mfn != INVALID_P2M_ENTRY); + return true; +} + static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn) { - BUG(); - return false; + return __set_phys_to_machine(pfn, mfn); } #endif /* _ASM_ARM_XEN_PAGE_H */ diff --git a/trunk/arch/arm/include/debug/8250_32.S b/trunk/arch/arm/include/debug/8250_32.S new file mode 100644 index 000000000000..8db01eeabbb4 --- /dev/null +++ b/trunk/arch/arm/include/debug/8250_32.S @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2011 Picochip Ltd., Jamie Iles + * + * This program 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. + * + * Derived from arch/arm/mach-davinci/include/mach/debug-macro.S to use 32-bit + * accesses to the 8250. + */ + +#include + + .macro senduart,rd,rx + str \rd, [\rx, #UART_TX << UART_SHIFT] + .endm + + .macro busyuart,rd,rx +1002: ldr \rd, [\rx, #UART_LSR << UART_SHIFT] + and \rd, \rd, #UART_LSR_TEMT | UART_LSR_THRE + teq \rd, #UART_LSR_TEMT | UART_LSR_THRE + bne 1002b + .endm + + /* The UART's don't have any flow control IO's wired up. */ + .macro waituart,rd,rx + .endm diff --git a/trunk/arch/arm/include/debug/picoxcell.S b/trunk/arch/arm/include/debug/picoxcell.S index 7419deb1b948..bc1f07c49cd4 100644 --- a/trunk/arch/arm/include/debug/picoxcell.S +++ b/trunk/arch/arm/include/debug/picoxcell.S @@ -5,10 +5,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. * - * Derived from arch/arm/mach-davinci/include/mach/debug-macro.S to use 32-bit - * accesses to the 8250. */ -#include #define UART_SHIFT 2 #define PICOXCELL_UART1_BASE 0x80230000 @@ -19,17 +16,4 @@ ldr \rp, =PICOXCELL_UART1_BASE .endm - .macro senduart,rd,rx - str \rd, [\rx, #UART_TX << UART_SHIFT] - .endm - - .macro busyuart,rd,rx -1002: ldr \rd, [\rx, #UART_LSR << UART_SHIFT] - and \rd, \rd, #UART_LSR_TEMT | UART_LSR_THRE - teq \rd, #UART_LSR_TEMT | UART_LSR_THRE - bne 1002b - .endm - - /* The UART's don't have any flow control IO's wired up. */ - .macro waituart,rd,rx - .endm +#include "8250_32.S" diff --git a/trunk/arch/arm/include/debug/socfpga.S b/trunk/arch/arm/include/debug/socfpga.S index d6f26d23374f..966b2f994946 100644 --- a/trunk/arch/arm/include/debug/socfpga.S +++ b/trunk/arch/arm/include/debug/socfpga.S @@ -7,6 +7,9 @@ * published by the Free Software Foundation. */ +#define UART_SHIFT 2 +#define DEBUG_LL_UART_OFFSET 0x00002000 + .macro addruart, rp, rv, tmp mov \rp, #DEBUG_LL_UART_OFFSET orr \rp, \rp, #0x00c00000 @@ -14,3 +17,5 @@ orr \rp, \rp, #0xff000000 @ physical base .endm +#include "8250_32.S" + diff --git a/trunk/arch/arm/kernel/irq.c b/trunk/arch/arm/kernel/irq.c index 16cedb42c0c3..896165096d6a 100644 --- a/trunk/arch/arm/kernel/irq.c +++ b/trunk/arch/arm/kernel/irq.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -109,6 +110,7 @@ void set_irq_flags(unsigned int irq, unsigned int iflags) /* Order is clear bits in "clr" then set bits in "set" */ irq_modify_status(irq, clr, set & ~clr); } +EXPORT_SYMBOL_GPL(set_irq_flags); void __init init_IRQ(void) { diff --git a/trunk/arch/arm/kernel/kprobes-test-arm.c b/trunk/arch/arm/kernel/kprobes-test-arm.c index 38c1a3b103a0..839312905067 100644 --- a/trunk/arch/arm/kernel/kprobes-test-arm.c +++ b/trunk/arch/arm/kernel/kprobes-test-arm.c @@ -366,7 +366,9 @@ void kprobe_arm_test_cases(void) TEST_UNSUPPORTED(".word 0xe04f0392 @ umaal r0, pc, r2, r3") TEST_UNSUPPORTED(".word 0xe0500090 @ undef") TEST_UNSUPPORTED(".word 0xe05fff9f @ undef") +#endif +#if __LINUX_ARM_ARCH__ >= 7 TEST_RRR( "mls r0, r",1, VAL1,", r",2, VAL2,", r",3, VAL3,"") TEST_RRR( "mlshi r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"") TEST_RR( "mls lr, r",1, VAL2,", r",2, VAL3,", r13") @@ -456,6 +458,8 @@ void kprobe_arm_test_cases(void) TEST_UNSUPPORTED(".word 0xe1700090") /* Unallocated space */ #if __LINUX_ARM_ARCH__ >= 6 TEST_UNSUPPORTED("ldrex r2, [sp]") +#endif +#if (__LINUX_ARM_ARCH__ >= 7) || defined(CONFIG_CPU_32v6K) TEST_UNSUPPORTED("strexd r0, r2, r3, [sp]") TEST_UNSUPPORTED("ldrexd r2, r3, [sp]") TEST_UNSUPPORTED("strexb r0, r2, [sp]") diff --git a/trunk/arch/arm/kernel/machine_kexec.c b/trunk/arch/arm/kernel/machine_kexec.c index e29c3337ca81..8ef8c9337809 100644 --- a/trunk/arch/arm/kernel/machine_kexec.c +++ b/trunk/arch/arm/kernel/machine_kexec.c @@ -45,10 +45,9 @@ int machine_kexec_prepare(struct kimage *image) for (i = 0; i < image->nr_segments; i++) { current_segment = &image->segment[i]; - err = memblock_is_region_memory(current_segment->mem, - current_segment->memsz); - if (err) - return - EINVAL; + if (!memblock_is_region_memory(current_segment->mem, + current_segment->memsz)) + return -EINVAL; err = get_user(header, (__be32*)current_segment->buf); if (err) diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c index 93971b1a4f0b..53c0304b734a 100644 --- a/trunk/arch/arm/kernel/perf_event.c +++ b/trunk/arch/arm/kernel/perf_event.c @@ -96,6 +96,10 @@ armpmu_event_set_period(struct perf_event *event, s64 period = hwc->sample_period; int ret = 0; + /* The period may have been changed by PERF_EVENT_IOC_PERIOD */ + if (unlikely(period != hwc->last_period)) + left = period - (hwc->last_period - left); + if (unlikely(left <= -period)) { left = period; local64_set(&hwc->period_left, left); diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c index 8e20754dd31d..fbc8b2623d82 100644 --- a/trunk/arch/arm/kernel/smp.c +++ b/trunk/arch/arm/kernel/smp.c @@ -294,18 +294,24 @@ static void percpu_timer_setup(void); asmlinkage void __cpuinit secondary_start_kernel(void) { struct mm_struct *mm = &init_mm; - unsigned int cpu = smp_processor_id(); + unsigned int cpu; + + /* + * The identity mapping is uncached (strongly ordered), so + * switch away from it before attempting any exclusive accesses. + */ + cpu_switch_mm(mm->pgd, mm); + enter_lazy_tlb(mm, current); + local_flush_tlb_all(); /* * All kernel threads share the same mm context; grab a * reference and switch to it. */ + cpu = smp_processor_id(); atomic_inc(&mm->mm_count); current->active_mm = mm; cpumask_set_cpu(cpu, mm_cpumask(mm)); - cpu_switch_mm(mm->pgd, mm); - enter_lazy_tlb(mm, current); - local_flush_tlb_all(); printk("CPU%u: Booted secondary processor\n", cpu); diff --git a/trunk/arch/arm/kernel/smp_twd.c b/trunk/arch/arm/kernel/smp_twd.c index e1f906989bb8..b22d700fea27 100644 --- a/trunk/arch/arm/kernel/smp_twd.c +++ b/trunk/arch/arm/kernel/smp_twd.c @@ -42,10 +42,10 @@ static void twd_set_mode(enum clock_event_mode mode, switch (mode) { case CLOCK_EVT_MODE_PERIODIC: - /* timer load already set up */ ctrl = TWD_TIMER_CONTROL_ENABLE | TWD_TIMER_CONTROL_IT_ENABLE | TWD_TIMER_CONTROL_PERIODIC; - __raw_writel(twd_timer_rate / HZ, twd_base + TWD_TIMER_LOAD); + __raw_writel(DIV_ROUND_CLOSEST(twd_timer_rate, HZ), + twd_base + TWD_TIMER_LOAD); break; case CLOCK_EVT_MODE_ONESHOT: /* period set, and timer enabled in 'next_event' hook */ diff --git a/trunk/arch/arm/lib/delay.c b/trunk/arch/arm/lib/delay.c index 9d0a30032d7f..0dc53854a5d8 100644 --- a/trunk/arch/arm/lib/delay.c +++ b/trunk/arch/arm/lib/delay.c @@ -45,6 +45,7 @@ int read_current_timer(unsigned long *timer_val) *timer_val = delay_timer->read_current_timer(); return 0; } +EXPORT_SYMBOL_GPL(read_current_timer); static void __timer_delay(unsigned long cycles) { diff --git a/trunk/arch/arm/mach-at91/Kconfig b/trunk/arch/arm/mach-at91/Kconfig index 682abf13d0f4..92857683cb61 100644 --- a/trunk/arch/arm/mach-at91/Kconfig +++ b/trunk/arch/arm/mach-at91/Kconfig @@ -21,19 +21,13 @@ config SOC_AT91SAM9 bool select CPU_ARM926T select GENERIC_CLOCKEVENTS + select MULTI_IRQ_HANDLER + select SPARSE_IRQ menu "Atmel AT91 System-on-Chip" comment "Atmel AT91 Processor" -config SOC_AT91SAM9 - bool - select AT91_SAM9_SMC - select AT91_SAM9_TIME - select CPU_ARM926T - select MULTI_IRQ_HANDLER - select SPARSE_IRQ - config SOC_AT91RM9200 bool "AT91RM9200" select CPU_ARM920T diff --git a/trunk/arch/arm/mach-at91/at91rm9200.c b/trunk/arch/arm/mach-at91/at91rm9200.c index b4f0565aff63..5269825194a8 100644 --- a/trunk/arch/arm/mach-at91/at91rm9200.c +++ b/trunk/arch/arm/mach-at91/at91rm9200.c @@ -187,7 +187,7 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), - CLKDEV_CON_DEV_ID(NULL, "i2c-at91rm9200", &twi_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91rm9200.0", &twi_clk), /* fake hclk clock */ CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), CLKDEV_CON_ID("pioA", &pioA_clk), diff --git a/trunk/arch/arm/mach-at91/at91rm9200_devices.c b/trunk/arch/arm/mach-at91/at91rm9200_devices.c index a563189cdfc3..1e122bcd7845 100644 --- a/trunk/arch/arm/mach-at91/at91rm9200_devices.c +++ b/trunk/arch/arm/mach-at91/at91rm9200_devices.c @@ -479,7 +479,7 @@ static struct i2c_gpio_platform_data pdata = { static struct platform_device at91rm9200_twi_device = { .name = "i2c-gpio", - .id = -1, + .id = 0, .dev.platform_data = &pdata, }; @@ -512,7 +512,7 @@ static struct resource twi_resources[] = { static struct platform_device at91rm9200_twi_device = { .name = "i2c-at91rm9200", - .id = -1, + .id = 0, .resource = twi_resources, .num_resources = ARRAY_SIZE(twi_resources), }; diff --git a/trunk/arch/arm/mach-at91/at91sam9260.c b/trunk/arch/arm/mach-at91/at91sam9260.c index ad29f93f20ca..f8202615f4a8 100644 --- a/trunk/arch/arm/mach-at91/at91sam9260.c +++ b/trunk/arch/arm/mach-at91/at91sam9260.c @@ -211,8 +211,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk), - CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260", &twi_clk), - CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20", &twi_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260.0", &twi_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi_clk), /* more usart lookup table for DT entries */ CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck), CLKDEV_CON_DEV_ID("usart", "fffb0000.serial", &usart0_clk), diff --git a/trunk/arch/arm/mach-at91/at91sam9260_devices.c b/trunk/arch/arm/mach-at91/at91sam9260_devices.c index a76b8684f52d..aa1e58729885 100644 --- a/trunk/arch/arm/mach-at91/at91sam9260_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9260_devices.c @@ -389,7 +389,7 @@ static struct i2c_gpio_platform_data pdata = { static struct platform_device at91sam9260_twi_device = { .name = "i2c-gpio", - .id = -1, + .id = 0, .dev.platform_data = &pdata, }; @@ -421,7 +421,7 @@ static struct resource twi_resources[] = { }; static struct platform_device at91sam9260_twi_device = { - .id = -1, + .id = 0, .resource = twi_resources, .num_resources = ARRAY_SIZE(twi_resources), }; diff --git a/trunk/arch/arm/mach-at91/at91sam9261.c b/trunk/arch/arm/mach-at91/at91sam9261.c index 8d999eb1a137..04295c04b3e0 100644 --- a/trunk/arch/arm/mach-at91/at91sam9261.c +++ b/trunk/arch/arm/mach-at91/at91sam9261.c @@ -178,8 +178,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0), - CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9261", &twi_clk), - CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10", &twi_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9261.0", &twi_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10.0", &twi_clk), CLKDEV_CON_ID("pioA", &pioA_clk), CLKDEV_CON_ID("pioB", &pioB_clk), CLKDEV_CON_ID("pioC", &pioC_clk), diff --git a/trunk/arch/arm/mach-at91/at91sam9261_devices.c b/trunk/arch/arm/mach-at91/at91sam9261_devices.c index 9752f17efba9..b9487696b7be 100644 --- a/trunk/arch/arm/mach-at91/at91sam9261_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9261_devices.c @@ -285,7 +285,7 @@ static struct i2c_gpio_platform_data pdata = { static struct platform_device at91sam9261_twi_device = { .name = "i2c-gpio", - .id = -1, + .id = 0, .dev.platform_data = &pdata, }; @@ -317,7 +317,7 @@ static struct resource twi_resources[] = { }; static struct platform_device at91sam9261_twi_device = { - .id = -1, + .id = 0, .resource = twi_resources, .num_resources = ARRAY_SIZE(twi_resources), }; diff --git a/trunk/arch/arm/mach-at91/at91sam9263.c b/trunk/arch/arm/mach-at91/at91sam9263.c index 6a01d0360dfb..d6f9c23927c4 100644 --- a/trunk/arch/arm/mach-at91/at91sam9263.c +++ b/trunk/arch/arm/mach-at91/at91sam9263.c @@ -193,7 +193,7 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk), - CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260", &twi_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260.0", &twi_clk), /* fake hclk clock */ CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), CLKDEV_CON_ID("pioA", &pioA_clk), diff --git a/trunk/arch/arm/mach-at91/at91sam9263_devices.c b/trunk/arch/arm/mach-at91/at91sam9263_devices.c index 8dde220b42b6..cb85da2eccea 100644 --- a/trunk/arch/arm/mach-at91/at91sam9263_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9263_devices.c @@ -567,7 +567,7 @@ static struct i2c_gpio_platform_data pdata = { static struct platform_device at91sam9263_twi_device = { .name = "i2c-gpio", - .id = -1, + .id = 0, .dev.platform_data = &pdata, }; @@ -600,7 +600,7 @@ static struct resource twi_resources[] = { static struct platform_device at91sam9263_twi_device = { .name = "i2c-at91sam9260", - .id = -1, + .id = 0, .resource = twi_resources, .num_resources = ARRAY_SIZE(twi_resources), }; diff --git a/trunk/arch/arm/mach-at91/at91sam9rl_devices.c b/trunk/arch/arm/mach-at91/at91sam9rl_devices.c index d6ca0543ce8d..5047bdc92adf 100644 --- a/trunk/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9rl_devices.c @@ -314,7 +314,7 @@ static struct i2c_gpio_platform_data pdata = { static struct platform_device at91sam9rl_twi_device = { .name = "i2c-gpio", - .id = -1, + .id = 0, .dev.platform_data = &pdata, }; @@ -347,7 +347,7 @@ static struct resource twi_resources[] = { static struct platform_device at91sam9rl_twi_device = { .name = "i2c-at91sam9g20", - .id = -1, + .id = 0, .resource = twi_resources, .num_resources = ARRAY_SIZE(twi_resources), }; diff --git a/trunk/arch/arm/mach-at91/at91x40.c b/trunk/arch/arm/mach-at91/at91x40.c index 6bd7300a2bc5..bb7f54474b92 100644 --- a/trunk/arch/arm/mach-at91/at91x40.c +++ b/trunk/arch/arm/mach-at91/at91x40.c @@ -88,6 +88,6 @@ void __init at91x40_init_interrupts(unsigned int priority[NR_AIC_IRQS]) if (!priority) priority = at91x40_default_irq_priority; - at91_aic_init(priority); + at91_aic_init(priority, at91_extern_irq); } diff --git a/trunk/arch/arm/mach-at91/board-neocore926.c b/trunk/arch/arm/mach-at91/board-neocore926.c index 9cda3fd346ae..6960778af4c2 100644 --- a/trunk/arch/arm/mach-at91/board-neocore926.c +++ b/trunk/arch/arm/mach-at91/board-neocore926.c @@ -129,7 +129,7 @@ static struct spi_board_info neocore926_spi_devices[] = { .max_speed_hz = 125000 * 16, .bus_num = 0, .platform_data = &ads_info, - .irq = AT91SAM9263_ID_IRQ1, + .irq = NR_IRQS_LEGACY + AT91SAM9263_ID_IRQ1, }, #endif }; diff --git a/trunk/arch/arm/mach-at91/board-sam9261ek.c b/trunk/arch/arm/mach-at91/board-sam9261ek.c index 27b3af1a3047..a9167dd45f96 100644 --- a/trunk/arch/arm/mach-at91/board-sam9261ek.c +++ b/trunk/arch/arm/mach-at91/board-sam9261ek.c @@ -309,7 +309,7 @@ static struct spi_board_info ek_spi_devices[] = { .max_speed_hz = 125000 * 26, /* (max sample rate @ 3V) * (cmd + data + overhead) */ .bus_num = 0, .platform_data = &ads_info, - .irq = AT91SAM9261_ID_IRQ0, + .irq = NR_IRQS_LEGACY + AT91SAM9261_ID_IRQ0, .controller_data = (void *) AT91_PIN_PA28, /* CS pin */ }, #endif diff --git a/trunk/arch/arm/mach-at91/board-sam9263ek.c b/trunk/arch/arm/mach-at91/board-sam9263ek.c index 073e17403d98..b87dbe2be0d6 100644 --- a/trunk/arch/arm/mach-at91/board-sam9263ek.c +++ b/trunk/arch/arm/mach-at91/board-sam9263ek.c @@ -132,7 +132,7 @@ static struct spi_board_info ek_spi_devices[] = { .max_speed_hz = 125000 * 26, /* (max sample rate @ 3V) * (cmd + data + overhead) */ .bus_num = 0, .platform_data = &ads_info, - .irq = AT91SAM9263_ID_IRQ1, + .irq = NR_IRQS_LEGACY + AT91SAM9263_ID_IRQ1, }, #endif }; diff --git a/trunk/arch/arm/mach-at91/generic.h b/trunk/arch/arm/mach-at91/generic.h index f49650677653..b62f560e6c75 100644 --- a/trunk/arch/arm/mach-at91/generic.h +++ b/trunk/arch/arm/mach-at91/generic.h @@ -26,7 +26,8 @@ extern void __init at91_dt_initialize(void); extern void __init at91_init_irq_default(void); extern void __init at91_init_interrupts(unsigned int priority[]); extern void __init at91x40_init_interrupts(unsigned int priority[]); -extern void __init at91_aic_init(unsigned int priority[]); +extern void __init at91_aic_init(unsigned int priority[], + unsigned int ext_irq_mask); extern int __init at91_aic_of_init(struct device_node *node, struct device_node *parent); extern int __init at91_aic5_of_init(struct device_node *node, diff --git a/trunk/arch/arm/mach-at91/irq.c b/trunk/arch/arm/mach-at91/irq.c index 1e02c0e49dcc..febc2ee901a5 100644 --- a/trunk/arch/arm/mach-at91/irq.c +++ b/trunk/arch/arm/mach-at91/irq.c @@ -502,14 +502,19 @@ int __init at91_aic5_of_init(struct device_node *node, /* * Initialize the AIC interrupt controller. */ -void __init at91_aic_init(unsigned int *priority) +void __init at91_aic_init(unsigned int *priority, unsigned int ext_irq_mask) { unsigned int i; int irq_base; - if (at91_aic_pm_init()) + at91_extern_irq = kzalloc(BITS_TO_LONGS(n_irqs) + * sizeof(*at91_extern_irq), GFP_KERNEL); + + if (at91_aic_pm_init() || at91_extern_irq == NULL) panic("Unable to allocate bit maps\n"); + *at91_extern_irq = ext_irq_mask; + at91_aic_base = ioremap(AT91_AIC, 512); if (!at91_aic_base) panic("Unable to ioremap AIC registers\n"); diff --git a/trunk/arch/arm/mach-at91/setup.c b/trunk/arch/arm/mach-at91/setup.c index da9881b161e1..0b32c81730a5 100644 --- a/trunk/arch/arm/mach-at91/setup.c +++ b/trunk/arch/arm/mach-at91/setup.c @@ -47,7 +47,7 @@ void __init at91_init_irq_default(void) void __init at91_init_interrupts(unsigned int *priority) { /* Initialize the AIC interrupt controller */ - at91_aic_init(priority); + at91_aic_init(priority, at91_extern_irq); /* Enable GPIO interrupts */ at91_gpio_irq_setup(); @@ -151,7 +151,7 @@ static void __init soc_detect(u32 dbgu_base) } /* at91sam9g10 */ - if ((cidr & ~AT91_CIDR_EXT) == ARCH_ID_AT91SAM9G10) { + if ((socid & ~AT91_CIDR_EXT) == ARCH_ID_AT91SAM9G10) { at91_soc_initdata.type = AT91_SOC_SAM9G10; at91_boot_soc = at91sam9261_soc; } diff --git a/trunk/arch/arm/mach-dove/common.c b/trunk/arch/arm/mach-dove/common.c index b37bef1d5ffa..f723fe13d0f0 100644 --- a/trunk/arch/arm/mach-dove/common.c +++ b/trunk/arch/arm/mach-dove/common.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include "common.h" @@ -109,8 +110,8 @@ static void __init dove_clk_init(void) orion_clkdev_add(NULL, "orion-ehci.0", usb0); orion_clkdev_add(NULL, "orion-ehci.1", usb1); - orion_clkdev_add(NULL, "mv643xx_eth.0", ge); - orion_clkdev_add("0", "sata_mv.0", sata); + orion_clkdev_add(NULL, "mv643xx_eth_port.0", ge); + orion_clkdev_add(NULL, "sata_mv.0", sata); orion_clkdev_add("0", "pcie", pex0); orion_clkdev_add("1", "pcie", pex1); orion_clkdev_add(NULL, "sdhci-dove.0", sdio0); @@ -399,7 +400,7 @@ static void __init dove_dt_init(void) (dove_tclk + 499999) / 1000000); #ifdef CONFIG_CACHE_TAUROS2 - tauros2_init(); + tauros2_init(0); #endif dove_setup_cpu_mbus(); @@ -415,7 +416,6 @@ static void __init dove_dt_init(void) dove_ehci0_init(); dove_ehci1_init(); dove_pcie_init(1, 1); - dove_crypto_init(); of_platform_populate(NULL, of_default_bus_match_table, dove_auxdata_lookup, NULL); diff --git a/trunk/arch/arm/mach-dove/pcie.c b/trunk/arch/arm/mach-dove/pcie.c index bb15b26041cb..0ef4435b1657 100644 --- a/trunk/arch/arm/mach-dove/pcie.c +++ b/trunk/arch/arm/mach-dove/pcie.c @@ -10,6 +10,7 @@ #include #include +#include #include