From c40ad8b41879d004dea38c43f57b7966377b285f Mon Sep 17 00:00:00 2001 From: Stephane Chatty Date: Tue, 6 Apr 2010 22:22:58 +0200 Subject: [PATCH] --- yaml --- r: 190743 b: refs/heads/master c: 6549981bc54777c37eccf987e227aff47022ab7c h: refs/heads/master i: 190741: 588fcd7a143cd51a606716fbd77e546421985771 190739: c9afa9943ac1dc76c83ce9d09d3f2d2e1e0b9195 190735: e9bc723c42f67dda1c09a9617a7b16ad96386eae v: v3 --- [refs] | 2 +- trunk/Documentation/DocBook/libata.tmpl | 49 +- trunk/Documentation/DocBook/tracepoint.tmpl | 13 - trunk/Documentation/HOWTO | 2 +- trunk/Documentation/RCU/NMI-RCU.txt | 39 +- trunk/Documentation/RCU/checklist.txt | 7 +- trunk/Documentation/RCU/lockdep.txt | 28 +- trunk/Documentation/RCU/whatisRCU.txt | 6 - trunk/Documentation/block/biodoc.txt | 4 +- trunk/Documentation/cgroups/cgroups.txt | 3 +- .../fb/{efifb.txt => imacfb.txt} | 14 +- .../feature-removal-schedule.txt | 23 - trunk/Documentation/i2c/writing-clients | 5 - trunk/Documentation/input/elantech.txt | 8 +- .../input/multi-touch-protocol.txt | 23 +- trunk/Documentation/kernel-parameters.txt | 7 +- .../Documentation/networking/timestamping.txt | 76 +- trunk/Documentation/sound/alsa/HD-Audio.txt | 16 +- trunk/Documentation/spi/spidev_test.c | 2 +- trunk/Documentation/stable_kernel_rules.txt | 9 +- .../watchdog/src/watchdog-simple.c | 3 + .../watchdog/src/watchdog-test.c | 8 +- trunk/Documentation/watchdog/watchdog-api.txt | 5 +- trunk/MAINTAINERS | 40 +- trunk/Makefile | 4 +- trunk/arch/arm/Kconfig | 1 - trunk/arch/arm/boot/compressed/head.S | 12 +- trunk/arch/arm/configs/bcmring_defconfig | 126 +-- trunk/arch/arm/configs/imote2_defconfig | 172 +-- trunk/arch/arm/configs/n8x0_defconfig | 1 + trunk/arch/arm/configs/omap_zoom2_defconfig | 2 +- trunk/arch/arm/configs/omap_zoom3_defconfig | 2 +- trunk/arch/arm/configs/rx51_defconfig | 3 + trunk/arch/arm/include/asm/assembler.h | 12 +- trunk/arch/arm/include/asm/elf.h | 2 - trunk/arch/arm/include/asm/futex.h | 16 +- trunk/arch/arm/include/asm/highmem.h | 15 +- trunk/arch/arm/include/asm/kmap_types.h | 1 - trunk/arch/arm/include/asm/uaccess.h | 40 +- trunk/arch/arm/include/asm/ucontext.h | 23 +- trunk/arch/arm/include/asm/user.h | 12 +- trunk/arch/arm/kernel/entry-armv.S | 12 +- trunk/arch/arm/kernel/ftrace.c | 8 +- trunk/arch/arm/kernel/process.c | 8 +- trunk/arch/arm/kernel/signal.c | 93 +- trunk/arch/arm/kernel/smp.c | 6 - trunk/arch/arm/lib/backtrace.S | 4 +- trunk/arch/arm/lib/clear_user.S | 4 +- trunk/arch/arm/lib/copy_from_user.S | 4 +- trunk/arch/arm/lib/copy_to_user.S | 4 +- trunk/arch/arm/lib/csumpartialcopyuser.S | 4 +- trunk/arch/arm/lib/getuser.S | 4 +- trunk/arch/arm/lib/putuser.S | 4 +- trunk/arch/arm/lib/strncpy_from_user.S | 4 +- trunk/arch/arm/lib/strnlen_user.S | 4 +- trunk/arch/arm/lib/uaccess.S | 8 +- trunk/arch/arm/mach-at91/Makefile | 4 +- trunk/arch/arm/mach-at91/pm_slowclock.S | 16 +- trunk/arch/arm/mach-bcmring/dma.c | 13 +- trunk/arch/arm/mach-davinci/dm365.c | 1 + trunk/arch/arm/mach-davinci/dma.c | 3 +- .../arm/mach-davinci/include/mach/da8xx.h | 8 +- trunk/arch/arm/mach-davinci/time.c | 6 +- trunk/arch/arm/mach-ep93xx/gpio.c | 6 +- trunk/arch/arm/mach-mx3/Kconfig | 10 - trunk/arch/arm/mach-mx3/clock-imx31.c | 5 +- trunk/arch/arm/mach-mx3/devices.c | 19 +- trunk/arch/arm/mach-mx3/devices.h | 3 +- trunk/arch/arm/mach-mx3/mach-armadillo5x0.c | 166 --- trunk/arch/arm/mach-mx3/mach-mx31_3ds.c | 116 +- trunk/arch/arm/mach-mx3/mach-pcm037.c | 1 + trunk/arch/arm/mach-mx3/mx31lite-db.c | 2 +- trunk/arch/arm/mach-mx5/clock-mx51.c | 3 +- trunk/arch/arm/mach-mx5/cpu.c | 53 - trunk/arch/arm/mach-mx5/mm.c | 32 +- trunk/arch/arm/mach-omap1/timer32k.c | 15 + trunk/arch/arm/mach-omap2/Kconfig | 6 +- trunk/arch/arm/mach-omap2/board-3630sdp.c | 1 - trunk/arch/arm/mach-omap2/board-am3517evm.c | 4 +- trunk/arch/arm/mach-omap2/board-devkit8000.c | 39 +- trunk/arch/arm/mach-omap2/board-igep0020.c | 8 +- trunk/arch/arm/mach-omap2/board-n8x0.c | 18 +- trunk/arch/arm/mach-omap2/board-sdp-flash.c | 8 +- .../arm/mach-omap2/board-zoom-debugboard.c | 2 +- .../arm/mach-omap2/board-zoom-peripherals.c | 1 + trunk/arch/arm/mach-omap2/clock3xxx_data.c | 2 +- trunk/arch/arm/mach-omap2/clock44xx_data.c | 8 +- trunk/arch/arm/mach-omap2/clockdomain.c | 6 +- trunk/arch/arm/mach-omap2/devices.c | 2 +- trunk/arch/arm/mach-omap2/gpmc-nand.c | 3 - .../arm/mach-omap2/include/mach/entry-macro.S | 2 +- trunk/arch/arm/mach-omap2/omap-headsmp.S | 6 +- trunk/arch/arm/mach-omap2/omap44xx-smc.S | 2 +- trunk/arch/arm/mach-omap2/omap_hwmod.c | 3 - trunk/arch/arm/mach-omap2/powerdomain.c | 2 +- trunk/arch/arm/mach-omap2/prcm.c | 4 +- trunk/arch/arm/mach-omap2/serial.c | 35 +- .../arch/arm/mach-pxa/include/mach/colibri.h | 1 - .../arch/arm/mach-pxa/include/mach/hardware.h | 2 +- .../arch/arm/mach-pxa/include/mach/regs-u2d.h | 3 +- trunk/arch/arm/mach-pxa/raumfeld.c | 5 +- trunk/arch/arm/mach-pxa/spitz.c | 2 +- trunk/arch/arm/mach-pxa/viper.c | 5 +- trunk/arch/arm/mach-realview/core.c | 2 +- trunk/arch/arm/mach-sa1100/Kconfig | 4 +- trunk/arch/arm/mach-sa1100/cpu-sa1110.c | 3 - trunk/arch/arm/mm/alignment.c | 24 +- trunk/arch/arm/mm/copypage-v6.c | 9 +- trunk/arch/arm/mm/dma-mapping.c | 5 - trunk/arch/arm/mm/flush.c | 25 +- trunk/arch/arm/mm/highmem.c | 87 +- trunk/arch/arm/mm/init.c | 14 +- trunk/arch/arm/mm/mmu.c | 14 +- trunk/arch/arm/mm/proc-sa1100.S | 2 +- trunk/arch/arm/nwfpe/entry.S | 8 +- .../{board-mx31_3ds.h => board-mx31pdk.h} | 6 +- .../arm/plat-mxc/include/mach/dma-mx1-mx2.h | 8 +- trunk/arch/arm/plat-mxc/include/mach/mx51.h | 33 +- .../arm/plat-mxc/include/mach/uncompress.h | 4 - trunk/arch/arm/plat-omap/common.c | 22 +- trunk/arch/arm/plat-omap/dma.c | 9 - trunk/arch/arm/plat-omap/gpio.c | 6 +- trunk/arch/arm/plat-omap/include/plat/irqs.h | 2 + trunk/arch/arm/plat-omap/include/plat/mcbsp.h | 2 +- trunk/arch/arm/plat-omap/include/plat/nand.h | 7 - .../arm/plat-omap/include/plat/omap44xx.h | 2 +- .../arm/plat-omap/include/plat/omap_hwmod.h | 2 +- trunk/arch/arm/plat-omap/include/plat/usb.h | 2 +- trunk/arch/arm/plat-pxa/dma.c | 2 +- trunk/arch/arm/tools/mach-types | 57 +- trunk/arch/arm/vfp/vfpmodule.c | 31 +- trunk/arch/avr32/kernel/ptrace.c | 2 +- trunk/arch/frv/include/asm/segment.h | 6 +- trunk/arch/frv/include/asm/uaccess.h | 2 + trunk/arch/ia64/kvm/kvm-ia64.c | 9 +- trunk/arch/m68k/include/asm/atomic_mm.h | 8 +- trunk/arch/m68k/include/asm/mcfuart.h | 5 - trunk/arch/m68k/include/asm/sigcontext.h | 4 +- trunk/arch/m68knommu/Makefile | 2 +- trunk/arch/m68knommu/kernel/entry.S | 2 +- trunk/arch/m68knommu/platform/68360/ints.c | 1 + trunk/arch/microblaze/configs/mmu_defconfig | 58 +- trunk/arch/microblaze/configs/nommu_defconfig | 39 +- trunk/arch/microblaze/include/asm/cache.h | 2 +- trunk/arch/microblaze/include/asm/dma.h | 6 - .../arch/microblaze/include/asm/exceptions.h | 6 + trunk/arch/microblaze/include/asm/futex.h | 2 +- trunk/arch/microblaze/include/asm/io.h | 7 +- trunk/arch/microblaze/include/asm/page.h | 12 +- trunk/arch/microblaze/include/asm/pci.h | 8 + trunk/arch/microblaze/include/asm/pgalloc.h | 16 +- trunk/arch/microblaze/include/asm/pgtable.h | 35 +- trunk/arch/microblaze/kernel/asm-offsets.c | 1 - trunk/arch/microblaze/kernel/cpu/cache.c | 72 +- trunk/arch/microblaze/kernel/cpu/mb.c | 10 +- trunk/arch/microblaze/kernel/dma.c | 2 +- trunk/arch/microblaze/kernel/exceptions.c | 2 +- trunk/arch/microblaze/kernel/ftrace.c | 12 +- trunk/arch/microblaze/kernel/head.S | 3 +- trunk/arch/microblaze/kernel/irq.c | 3 +- trunk/arch/microblaze/kernel/misc.S | 36 + trunk/arch/microblaze/kernel/ptrace.c | 1 + trunk/arch/microblaze/kernel/traps.c | 34 + trunk/arch/microblaze/kernel/vmlinux.lds.S | 3 +- trunk/arch/microblaze/mm/consistent.c | 190 ++-- trunk/arch/microblaze/mm/fault.c | 13 +- trunk/arch/microblaze/mm/pgtable.c | 51 +- trunk/arch/microblaze/pci/pci-common.c | 17 +- trunk/arch/mips/Kconfig | 31 +- trunk/arch/mips/Makefile | 13 - .../mips/alchemy/devboards/db1200/setup.c | 50 +- trunk/arch/mips/ar7/platform.c | 3 +- .../arch/mips/bcm63xx/boards/board_bcm963xx.c | 231 ++-- trunk/arch/mips/bcm63xx/cpu.c | 5 - trunk/arch/mips/bcm63xx/dev-uart.c | 66 +- trunk/arch/mips/bcm63xx/gpio.c | 4 +- trunk/arch/mips/cavium-octeon/setup.c | 82 +- trunk/arch/mips/cavium-octeon/smp.c | 8 + trunk/arch/mips/configs/bcm63xx_defconfig | 418 ++----- trunk/arch/mips/configs/bigsur_defconfig | 680 ++++------- trunk/arch/mips/include/asm/abi.h | 6 +- trunk/arch/mips/include/asm/cmpxchg.h | 2 +- trunk/arch/mips/include/asm/elf.h | 5 - trunk/arch/mips/include/asm/fpu_emulator.h | 6 +- .../include/asm/mach-bcm63xx/bcm63xx_cpu.h | 15 - .../asm/mach-bcm63xx/bcm63xx_dev_uart.h | 6 - .../include/asm/mach-bcm63xx/bcm63xx_gpio.h | 4 - .../include/asm/mach-bcm63xx/board_bcm963xx.h | 2 - .../asm/mach-bcm63xx/cpu-feature-overrides.h | 2 +- .../mips/include/asm/mach-loongson/loongson.h | 2 +- trunk/arch/mips/include/asm/mach-sibyte/war.h | 6 +- trunk/arch/mips/include/asm/mmu.h | 5 +- trunk/arch/mips/include/asm/mmu_context.h | 2 +- trunk/arch/mips/include/asm/page.h | 6 +- trunk/arch/mips/include/asm/pgtable-64.h | 9 +- trunk/arch/mips/include/asm/processor.h | 11 +- trunk/arch/mips/include/asm/ptrace.h | 4 +- trunk/arch/mips/include/asm/stackframe.h | 19 - trunk/arch/mips/include/asm/uasm.h | 20 - trunk/arch/mips/include/asm/vdso.h | 29 - trunk/arch/mips/jazz/setup.c | 12 +- trunk/arch/mips/kernel/Makefile | 2 +- .../mips/kernel/cpufreq/loongson2_clock.c | 4 - trunk/arch/mips/kernel/process.c | 7 +- trunk/arch/mips/kernel/signal-common.h | 5 + trunk/arch/mips/kernel/signal.c | 86 +- trunk/arch/mips/kernel/signal32.c | 55 +- trunk/arch/mips/kernel/signal_n32.c | 26 +- trunk/arch/mips/kernel/smtc.c | 2 +- trunk/arch/mips/kernel/syscall.c | 6 +- trunk/arch/mips/kernel/traps.c | 18 +- trunk/arch/mips/kernel/vdso.c | 112 -- trunk/arch/mips/lib/delay.c | 4 +- trunk/arch/mips/lib/libgcc.h | 3 +- trunk/arch/mips/loongson/common/machtype.c | 2 +- trunk/arch/mips/loongson/common/mem.c | 4 +- trunk/arch/mips/loongson/common/reset.c | 20 +- trunk/arch/mips/loongson/common/setup.c | 15 +- trunk/arch/mips/loongson/lemote-2f/irq.c | 2 +- trunk/arch/mips/mm/cache.c | 2 +- trunk/arch/mips/mm/tlbex.c | 150 +-- trunk/arch/mips/mm/uasm.c | 23 +- trunk/arch/mips/nxp/pnx8550/common/reset.c | 2 - trunk/arch/mips/pci/ops-loongson2.c | 10 - trunk/arch/mips/pci/pci-sb1250.c | 3 +- trunk/arch/mips/sgi-ip22/ip22-berr.c | 2 +- trunk/arch/mips/sgi-ip22/ip28-berr.c | 2 +- trunk/arch/mips/sibyte/sb1250/setup.c | 15 - trunk/arch/mips/sibyte/swarm/setup.c | 17 +- .../powerpc/configs/83xx/asp8347_defconfig | 44 +- .../powerpc/configs/83xx/kmeter1_defconfig | 28 +- .../configs/83xx/mpc8313_rdb_defconfig | 49 +- .../configs/83xx/mpc8315_rdb_defconfig | 50 +- .../configs/83xx/mpc832x_mds_defconfig | 45 +- .../configs/83xx/mpc832x_rdb_defconfig | 49 +- .../configs/83xx/mpc834x_itx_defconfig | 44 +- .../configs/83xx/mpc834x_itxgp_defconfig | 43 +- .../configs/83xx/mpc834x_mds_defconfig | 46 +- .../configs/83xx/mpc836x_mds_defconfig | 45 +- .../configs/83xx/mpc836x_rdk_defconfig | 44 +- .../configs/83xx/mpc837x_mds_defconfig | 46 +- .../configs/83xx/mpc837x_rdb_defconfig | 51 +- .../powerpc/configs/83xx/sbc834x_defconfig | 44 +- .../powerpc/configs/85xx/ksi8560_defconfig | 23 +- .../configs/85xx/mpc8540_ads_defconfig | 25 +- .../configs/85xx/mpc8560_ads_defconfig | 34 +- .../configs/85xx/mpc85xx_cds_defconfig | 31 +- .../powerpc/configs/85xx/sbc8548_defconfig | 31 +- .../powerpc/configs/85xx/sbc8560_defconfig | 25 +- .../powerpc/configs/85xx/socrates_defconfig | 51 +- .../powerpc/configs/85xx/stx_gp3_defconfig | 51 +- .../powerpc/configs/85xx/tqm8540_defconfig | 48 +- .../powerpc/configs/85xx/tqm8541_defconfig | 54 +- .../powerpc/configs/85xx/tqm8548_defconfig | 47 +- .../powerpc/configs/85xx/tqm8555_defconfig | 54 +- .../powerpc/configs/85xx/tqm8560_defconfig | 54 +- .../configs/85xx/xes_mpc85xx_defconfig | 59 +- .../powerpc/configs/86xx/gef_ppc9a_defconfig | 102 +- .../powerpc/configs/86xx/gef_sbc310_defconfig | 53 +- .../powerpc/configs/86xx/gef_sbc610_defconfig | 96 +- .../configs/86xx/mpc8610_hpcd_defconfig | 34 +- .../configs/86xx/mpc8641_hpcn_defconfig | 48 +- .../powerpc/configs/86xx/sbc8641d_defconfig | 40 +- trunk/arch/powerpc/configs/adder875_defconfig | 18 +- trunk/arch/powerpc/configs/c2k_defconfig | 55 +- trunk/arch/powerpc/configs/ep8248e_defconfig | 20 +- trunk/arch/powerpc/configs/ep88xc_defconfig | 17 +- .../powerpc/configs/linkstation_defconfig | 48 +- trunk/arch/powerpc/configs/mgcoge_defconfig | 31 +- trunk/arch/powerpc/configs/mgsuvd_defconfig | 19 +- .../powerpc/configs/mpc7448_hpc2_defconfig | 26 +- .../powerpc/configs/mpc8272_ads_defconfig | 23 +- trunk/arch/powerpc/configs/mpc83xx_defconfig | 124 +- trunk/arch/powerpc/configs/mpc85xx_defconfig | 62 +- .../powerpc/configs/mpc85xx_smp_defconfig | 64 +- .../arch/powerpc/configs/mpc866_ads_defconfig | 20 +- trunk/arch/powerpc/configs/mpc86xx_defconfig | 57 +- .../arch/powerpc/configs/mpc885_ads_defconfig | 20 +- trunk/arch/powerpc/configs/pq2fads_defconfig | 22 +- .../arch/powerpc/configs/prpmc2800_defconfig | 52 +- trunk/arch/powerpc/configs/ps3_defconfig | 189 +--- .../arch/powerpc/configs/storcenter_defconfig | 33 +- trunk/arch/powerpc/include/asm/page.h | 15 +- trunk/arch/powerpc/kernel/prom_init.c | 3 +- trunk/arch/powerpc/kvm/book3s.c | 5 +- trunk/arch/powerpc/mm/fsl_booke_mmu.c | 9 +- trunk/arch/powerpc/mm/numa.c | 17 +- trunk/arch/powerpc/platforms/85xx/Kconfig | 4 +- trunk/arch/powerpc/platforms/86xx/Kconfig | 4 +- .../platforms/pseries/hotplug-memory.c | 7 - trunk/arch/powerpc/sysdev/cpm1.c | 14 +- trunk/arch/powerpc/sysdev/cpm2.c | 11 +- trunk/arch/s390/defconfig | 40 +- trunk/arch/s390/include/asm/pgtable.h | 6 +- trunk/arch/s390/include/asm/vdso.h | 1 - trunk/arch/s390/kernel/asm-offsets.c | 1 - trunk/arch/s390/kernel/early.c | 3 +- trunk/arch/s390/kernel/entry.S | 8 +- trunk/arch/s390/kernel/entry64.S | 8 +- trunk/arch/s390/kernel/swsusp_asm64.S | 3 - trunk/arch/s390/kernel/time.c | 1 - trunk/arch/s390/kernel/topology.c | 3 +- trunk/arch/s390/kernel/vdso32/clock_gettime.S | 12 +- trunk/arch/s390/kernel/vdso32/gettimeofday.S | 6 +- trunk/arch/s390/kernel/vdso64/clock_gettime.S | 4 +- trunk/arch/s390/kernel/vdso64/gettimeofday.S | 2 +- trunk/arch/s390/mm/vmem.c | 11 +- trunk/arch/sh/configs/rts7751r2d1_defconfig | 2 +- .../arch/sh/configs/rts7751r2dplus_defconfig | 2 +- trunk/arch/sh/drivers/pci/pci-sh7751.c | 5 +- .../sh/include/cpu-sh4/cpu/dma-register.h | 2 +- trunk/arch/sparc/Kconfig | 3 - trunk/arch/sparc/Kconfig.debug | 5 +- trunk/arch/sparc/include/asm/cpudata_64.h | 2 +- trunk/arch/sparc/include/asm/irqflags_64.h | 23 +- trunk/arch/sparc/include/asm/thread_info_64.h | 2 +- trunk/arch/sparc/kernel/Makefile | 10 +- trunk/arch/sparc/kernel/ftrace.c | 60 +- trunk/arch/sparc/kernel/irq_64.c | 31 +- trunk/arch/sparc/kernel/kgdb_64.c | 3 +- trunk/arch/sparc/kernel/kstack.h | 19 - trunk/arch/sparc/kernel/nmi.c | 10 +- trunk/arch/sparc/kernel/pci_common.c | 11 +- trunk/arch/sparc/kernel/pcr.c | 3 +- trunk/arch/sparc/kernel/rtrap_64.S | 12 +- trunk/arch/sparc/kernel/smp_64.c | 11 +- trunk/arch/sparc/kernel/time_64.c | 4 +- trunk/arch/sparc/kernel/traps_64.c | 26 +- trunk/arch/sparc/kernel/unaligned_64.c | 6 +- trunk/arch/sparc/kernel/vmlinux.lds.S | 5 - trunk/arch/sparc/lib/mcount.S | 159 +-- trunk/arch/um/drivers/line.c | 1 - trunk/arch/um/os-Linux/helper.c | 1 + trunk/arch/x86/Kconfig | 4 +- trunk/arch/x86/ia32/ia32entry.S | 2 +- trunk/arch/x86/include/asm/amd_iommu_types.h | 3 - trunk/arch/x86/include/asm/io.h | 1 - trunk/arch/x86/include/asm/lguest_hcall.h | 29 +- trunk/arch/x86/kernel/amd_iommu.c | 20 +- trunk/arch/x86/kernel/amd_iommu_init.c | 48 +- trunk/arch/x86/kernel/apb_timer.c | 2 +- trunk/arch/x86/kernel/aperture_64.c | 15 +- trunk/arch/x86/kernel/apic/apic.c | 2 - trunk/arch/x86/kernel/apic/io_apic.c | 3 - .../arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 3 +- trunk/arch/x86/kernel/cpu/intel.c | 21 - trunk/arch/x86/kernel/cpu/perf_event_intel.c | 1 - trunk/arch/x86/kernel/cpu/vmware.c | 2 - trunk/arch/x86/kernel/crash.c | 6 + trunk/arch/x86/kernel/dumpstack.h | 8 +- trunk/arch/x86/kernel/e820.c | 24 +- trunk/arch/x86/kernel/hpet.c | 9 +- trunk/arch/x86/kernel/mpparse.c | 4 +- trunk/arch/x86/kernel/pci-gart_64.c | 3 - trunk/arch/x86/kernel/process_64.c | 4 +- trunk/arch/x86/kernel/setup.c | 14 +- trunk/arch/x86/kvm/mmu.c | 11 +- trunk/arch/x86/kvm/svm.c | 25 +- trunk/arch/x86/kvm/vmx.c | 24 +- trunk/arch/x86/kvm/x86.c | 48 +- trunk/arch/x86/lguest/boot.c | 61 +- trunk/arch/x86/lguest/i386_head.S | 2 +- trunk/arch/x86/lib/rwsem_64.S | 2 +- trunk/arch/x86/mm/ioremap.c | 14 - trunk/arch/x86/mm/pgtable_32.c | 2 - trunk/arch/x86/pci/acpi.c | 84 +- trunk/arch/x86/pci/i386.c | 3 - trunk/arch/x86/power/hibernate_asm_32.S | 15 +- trunk/block/Kconfig | 3 +- trunk/block/blk-cgroup.c | 8 +- trunk/block/blk-settings.c | 11 +- trunk/block/blk-sysfs.c | 25 - trunk/block/blk-timeout.c | 12 +- trunk/block/cfq-iosched.c | 43 +- trunk/block/elevator.c | 2 +- trunk/crypto/async_tx/async_raid6_recov.c | 21 +- trunk/crypto/authenc.c | 16 +- trunk/drivers/Makefile | 2 +- trunk/drivers/acpi/acpi_pad.c | 2 +- trunk/drivers/acpi/acpica/evgpe.c | 19 +- trunk/drivers/acpi/acpica/exprep.c | 17 - trunk/drivers/acpi/battery.c | 6 +- trunk/drivers/acpi/bus.c | 2 +- trunk/drivers/acpi/dock.c | 7 +- trunk/drivers/acpi/ec.c | 35 +- trunk/drivers/acpi/hest.c | 4 - trunk/drivers/acpi/numa.c | 6 +- trunk/drivers/acpi/osl.c | 23 +- trunk/drivers/acpi/power_meter.c | 2 +- trunk/drivers/acpi/sbshc.c | 2 +- trunk/drivers/acpi/scan.c | 12 +- trunk/drivers/acpi/sleep.c | 144 --- trunk/drivers/acpi/video.c | 67 +- trunk/drivers/ata/libata-eh.c | 5 - trunk/drivers/ata/pata_pcmcia.c | 4 - trunk/drivers/base/memory.c | 2 +- trunk/drivers/base/node.c | 2 +- trunk/drivers/block/DAC960.c | 1 + trunk/drivers/block/cciss.c | 1 - trunk/drivers/block/drbd/drbd_actlog.c | 19 +- trunk/drivers/block/drbd/drbd_bitmap.c | 10 +- trunk/drivers/block/drbd/drbd_int.h | 12 +- trunk/drivers/block/drbd/drbd_main.c | 21 +- trunk/drivers/block/drbd/drbd_nl.c | 44 +- trunk/drivers/block/drbd/drbd_receiver.c | 37 +- trunk/drivers/block/drbd/drbd_worker.c | 20 +- trunk/drivers/block/loop.c | 2 - trunk/drivers/block/paride/pcd.c | 4 +- trunk/drivers/block/paride/pf.c | 4 +- trunk/drivers/block/paride/pt.c | 4 +- trunk/drivers/block/pktcdvd.c | 17 +- trunk/drivers/block/virtio_blk.c | 5 +- trunk/drivers/char/agp/intel-agp.c | 3 + trunk/drivers/char/amiserial.c | 4 +- trunk/drivers/char/hvc_console.c | 4 + trunk/drivers/char/isicom.c | 9 +- trunk/drivers/char/istallion.c | 2 - trunk/drivers/char/mem.c | 10 +- trunk/drivers/char/mxser.c | 9 +- trunk/drivers/char/pcmcia/cm4000_cs.c | 8 +- trunk/drivers/char/raw.c | 1 - trunk/drivers/char/riscom8.c | 1 - trunk/drivers/char/stallion.c | 7 +- trunk/drivers/char/virtio_console.c | 65 +- trunk/drivers/cpufreq/cpufreq.c | 19 +- trunk/drivers/cpufreq/cpufreq_conservative.c | 8 +- trunk/drivers/cpuidle/governors/menu.c | 9 +- trunk/drivers/dma/shdma.c | 27 +- trunk/drivers/dma/txx9dmac.c | 2 - trunk/drivers/edac/edac_mce_amd.c | 5 +- trunk/drivers/firewire/core-cdev.c | 23 +- trunk/drivers/firewire/core-iso.c | 14 +- trunk/drivers/firewire/ohci.c | 23 +- trunk/drivers/firmware/iscsi_ibft_find.c | 11 +- trunk/drivers/gpio/gpiolib.c | 3 +- trunk/drivers/gpio/pca953x.c | 14 +- trunk/drivers/gpio/pl061.c | 14 +- trunk/drivers/gpio/timbgpio.c | 12 +- trunk/drivers/gpu/drm/drm_edid.c | 2 - trunk/drivers/gpu/drm/drm_irq.c | 1 - trunk/drivers/gpu/drm/drm_memory.c | 2 +- trunk/drivers/gpu/drm/drm_stub.c | 4 +- trunk/drivers/gpu/drm/drm_sysfs.c | 21 +- trunk/drivers/gpu/drm/i915/i915_debugfs.c | 2 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 14 - trunk/drivers/gpu/drm/i915/i915_drv.c | 11 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 14 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 283 ++--- trunk/drivers/gpu/drm/i915/i915_gem_debug.c | 4 +- trunk/drivers/gpu/drm/i915/i915_gem_tiling.c | 32 +- trunk/drivers/gpu/drm/i915/i915_irq.c | 16 +- trunk/drivers/gpu/drm/i915/i915_opregion.c | 54 +- trunk/drivers/gpu/drm/i915/i915_reg.h | 13 +- trunk/drivers/gpu/drm/i915/intel_crt.c | 68 +- trunk/drivers/gpu/drm/i915/intel_display.c | 107 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 256 ++--- trunk/drivers/gpu/drm/i915/intel_drv.h | 18 +- trunk/drivers/gpu/drm/i915/intel_dvo.c | 92 +- trunk/drivers/gpu/drm/i915/intel_fb.c | 2 +- trunk/drivers/gpu/drm/i915/intel_hdmi.c | 86 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 81 +- trunk/drivers/gpu/drm/i915/intel_modes.c | 22 +- trunk/drivers/gpu/drm/i915/intel_overlay.c | 6 +- trunk/drivers/gpu/drm/i915/intel_sdvo.c | 731 ++++++------ trunk/drivers/gpu/drm/i915/intel_tv.c | 96 +- trunk/drivers/gpu/drm/nouveau/Makefile | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 127 ++- trunk/drivers/gpu/drm/nouveau/nouveau_bios.h | 4 +- trunk/drivers/gpu/drm/nouveau/nouveau_bo.c | 67 +- .../drivers/gpu/drm/nouveau/nouveau_channel.c | 2 + .../drivers/gpu/drm/nouveau/nouveau_debugfs.c | 5 +- trunk/drivers/gpu/drm/nouveau/nouveau_dp.c | 8 +- trunk/drivers/gpu/drm/nouveau/nouveau_drv.h | 40 +- .../drivers/gpu/drm/nouveau/nouveau_encoder.h | 1 - trunk/drivers/gpu/drm/nouveau/nouveau_gem.c | 55 +- trunk/drivers/gpu/drm/nouveau/nouveau_irq.c | 1 - trunk/drivers/gpu/drm/nouveau/nouveau_mem.c | 124 +- trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c | 18 - trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 14 +- trunk/drivers/gpu/drm/nouveau/nv40_fifo.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv40_graph.c | 21 - trunk/drivers/gpu/drm/nouveau/nv50_display.c | 22 +- trunk/drivers/gpu/drm/nouveau/nv50_display.h | 1 - trunk/drivers/gpu/drm/nouveau/nv50_fbcon.c | 13 +- trunk/drivers/gpu/drm/nouveau/nv50_gpio.c | 76 -- trunk/drivers/gpu/drm/nouveau/nv50_graph.c | 7 +- trunk/drivers/gpu/drm/nouveau/nv50_grctx.c | 19 +- trunk/drivers/gpu/drm/nouveau/nv50_instmem.c | 16 +- trunk/drivers/gpu/drm/nouveau/nv50_sor.c | 25 +- trunk/drivers/gpu/drm/radeon/atom.c | 17 +- trunk/drivers/gpu/drm/radeon/atombios.h | 2 +- trunk/drivers/gpu/drm/radeon/atombios_crtc.c | 4 - trunk/drivers/gpu/drm/radeon/r100.c | 23 +- trunk/drivers/gpu/drm/radeon/r100_track.h | 3 +- trunk/drivers/gpu/drm/radeon/r300.c | 23 +- trunk/drivers/gpu/drm/radeon/r300_cmdbuf.c | 2 +- trunk/drivers/gpu/drm/radeon/r420.c | 6 - trunk/drivers/gpu/drm/radeon/r600_audio.c | 2 +- trunk/drivers/gpu/drm/radeon/r600_hdmi.c | 9 - trunk/drivers/gpu/drm/radeon/radeon_agp.c | 10 +- .../drivers/gpu/drm/radeon/radeon_atombios.c | 15 +- trunk/drivers/gpu/drm/radeon/radeon_combios.c | 20 +- .../gpu/drm/radeon/radeon_connectors.c | 17 +- trunk/drivers/gpu/drm/radeon/radeon_cp.c | 17 +- trunk/drivers/gpu/drm/radeon/radeon_device.c | 53 +- trunk/drivers/gpu/drm/radeon/radeon_display.c | 8 +- trunk/drivers/gpu/drm/radeon/radeon_drv.c | 5 +- .../drivers/gpu/drm/radeon/radeon_encoders.c | 96 +- trunk/drivers/gpu/drm/radeon/radeon_family.h | 3 +- trunk/drivers/gpu/drm/radeon/radeon_kms.c | 6 +- .../gpu/drm/radeon/radeon_legacy_encoders.c | 70 +- trunk/drivers/gpu/drm/radeon/radeon_mode.h | 2 - trunk/drivers/gpu/drm/radeon/reg_srcs/r300 | 2 - trunk/drivers/gpu/drm/radeon/reg_srcs/r420 | 2 - trunk/drivers/gpu/drm/radeon/reg_srcs/rs600 | 2 - trunk/drivers/gpu/drm/radeon/reg_srcs/rv515 | 3 - trunk/drivers/gpu/drm/radeon/rs600.c | 2 +- trunk/drivers/gpu/drm/ttm/ttm_bo.c | 30 +- trunk/drivers/gpu/drm/ttm/ttm_lock.c | 5 +- trunk/drivers/gpu/drm/via/via_video.c | 2 +- trunk/drivers/gpu/vga/vga_switcheroo.c | 6 +- trunk/drivers/hid/hid-ntrig.c | 12 +- trunk/drivers/hwmon/applesmc.c | 18 - trunk/drivers/hwmon/asus_atk0110.c | 4 - trunk/drivers/hwmon/hp_accel.c | 4 - trunk/drivers/hwmon/it87.c | 32 +- trunk/drivers/hwmon/sht15.c | 13 +- trunk/drivers/i2c/busses/i2c-imx.c | 6 +- trunk/drivers/i2c/busses/i2c-octeon.c | 4 +- trunk/drivers/i2c/busses/i2c-omap.c | 10 +- trunk/drivers/i2c/busses/i2c-pnx.c | 8 - trunk/drivers/i2c/busses/i2c-stu300.c | 2 +- trunk/drivers/i2c/i2c-core.c | 63 +- trunk/drivers/ide/ide-atapi.c | 2 +- trunk/drivers/ide/ide-cs.c | 4 - trunk/drivers/ide/ide-dma.c | 1 - trunk/drivers/ide/ide-io.c | 2 +- trunk/drivers/ide/ide-taskfile.c | 6 +- trunk/drivers/infiniband/core/cm.c | 2 +- trunk/drivers/infiniband/core/cma.c | 1 - trunk/drivers/infiniband/hw/mlx4/mr.c | 2 +- trunk/drivers/infiniband/hw/nes/nes_verbs.c | 9 +- trunk/drivers/input/input.c | 9 +- trunk/drivers/input/joydev.c | 18 - trunk/drivers/input/keyboard/matrix_keypad.c | 4 +- trunk/drivers/input/misc/ati_remote.c | 14 +- trunk/drivers/input/mouse/bcm5974.c | 1 + trunk/drivers/input/mouse/elantech.c | 84 +- trunk/drivers/input/mouse/psmouse-base.c | 18 +- trunk/drivers/input/mouse/psmouse.h | 1 - trunk/drivers/input/mouse/synaptics.c | 35 +- trunk/drivers/input/mouse/synaptics.h | 4 - trunk/drivers/input/serio/i8042.c | 2 +- trunk/drivers/input/sparse-keymap.c | 52 +- trunk/drivers/input/tablet/wacom_sys.c | 12 +- trunk/drivers/input/tablet/wacom_wac.c | 163 +-- trunk/drivers/input/touchscreen/eeti_ts.c | 56 +- trunk/drivers/isdn/gigaset/bas-gigaset.c | 5 + trunk/drivers/isdn/gigaset/capi.c | 2 + trunk/drivers/isdn/gigaset/common.c | 2 + trunk/drivers/isdn/gigaset/gigaset.h | 3 +- trunk/drivers/isdn/gigaset/i4l.c | 1 + trunk/drivers/isdn/gigaset/interface.c | 1 + trunk/drivers/isdn/gigaset/proc.c | 1 + trunk/drivers/isdn/gigaset/ser-gigaset.c | 3 + trunk/drivers/isdn/gigaset/usb-gigaset.c | 4 + trunk/drivers/lguest/lguest_device.c | 4 +- trunk/drivers/lguest/x86/core.c | 12 - trunk/drivers/macintosh/windfarm_core.c | 1 - trunk/drivers/md/md.c | 10 +- trunk/drivers/md/raid5.c | 54 +- trunk/drivers/media/common/saa7146_fops.c | 11 +- trunk/drivers/media/common/saa7146_video.c | 8 +- trunk/drivers/media/dvb/frontends/stv090x.c | 4 - trunk/drivers/media/dvb/ttpci/budget.c | 3 + trunk/drivers/media/video/Kconfig | 4 +- trunk/drivers/media/video/Makefile | 2 + .../media/video/davinci/vpfe_capture.c | 38 +- trunk/drivers/media/video/gspca/sn9c20x.c | 2 +- trunk/drivers/media/video/gspca/spca508.c | 1 + trunk/drivers/media/video/gspca/spca561.c | 1 - .../media/video/gspca/stv06xx/stv06xx.c | 2 + trunk/drivers/media/video/hexium_gemini.c | 3 + trunk/drivers/media/video/hexium_orion.c | 4 + trunk/drivers/media/video/mx1_camera.c | 8 +- trunk/drivers/media/video/mxb.c | 17 +- trunk/drivers/media/video/omap24xxcam.c | 2 +- .../media/video/pvrusb2/pvrusb2-sysfs.c | 8 - trunk/drivers/media/video/pxa_camera.c | 11 +- .../media/video/sh_mobile_ceu_camera.c | 2 +- trunk/drivers/misc/Kconfig | 16 - trunk/drivers/misc/Makefile | 1 - trunk/drivers/misc/vmware_balloon.c | 832 -------------- trunk/drivers/mmc/host/omap_hsmmc.c | 9 +- trunk/drivers/mtd/Makefile | 2 +- trunk/drivers/mtd/internal.h | 17 + trunk/drivers/mtd/mtdbdi.c | 43 + trunk/drivers/mtd/mtdcore.c | 79 +- trunk/drivers/mtd/mtdsuper.c | 2 - trunk/drivers/mtd/nand/orion_nand.c | 8 +- trunk/drivers/net/8139too.c | 2 +- trunk/drivers/net/Makefile | 1 - trunk/drivers/net/arm/ep93xx_eth.c | 10 +- trunk/drivers/net/bnx2.c | 48 +- trunk/drivers/net/can/usb/ems_usb.c | 8 +- trunk/drivers/net/cnic.c | 10 +- trunk/drivers/net/cxgb3/ael1002.c | 2 +- trunk/drivers/net/cxgb3/cxgb3_main.c | 2 +- trunk/drivers/net/e100.c | 10 +- trunk/drivers/net/e1000e/82571.c | 20 +- trunk/drivers/net/e1000e/e1000.h | 5 +- trunk/drivers/net/e1000e/netdev.c | 75 +- trunk/drivers/net/fec.c | 2 +- trunk/drivers/net/forcedeth.c | 2 +- trunk/drivers/net/fsl_pq_mdio.c | 20 +- trunk/drivers/net/gianfar.c | 12 +- trunk/drivers/net/igb/igb_ethtool.c | 1 - trunk/drivers/net/igb/igb_main.c | 1 - trunk/drivers/net/ixgbe/ixgbe_82599.c | 62 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 22 +- trunk/drivers/net/ixgbe/ixgbe_type.h | 2 - trunk/drivers/net/ks8851.c | 12 +- trunk/drivers/net/myri10ge/myri10ge.c | 2 +- trunk/drivers/net/pcmcia/3c574_cs.c | 7 +- trunk/drivers/net/pcmcia/smc91c92_cs.c | 44 +- trunk/drivers/net/phy/Kconfig | 5 - trunk/drivers/net/phy/Makefile | 1 - trunk/drivers/net/phy/mdio-octeon.c | 10 - trunk/drivers/net/phy/micrel.c | 104 -- trunk/drivers/net/ppp_generic.c | 34 +- trunk/drivers/net/qlcnic/qlcnic_hw.c | 3 - trunk/drivers/net/r6040.c | 11 +- trunk/drivers/net/r8169.c | 54 +- trunk/drivers/net/sb1250-mac.c | 67 +- trunk/drivers/net/sfc/efx.c | 4 +- trunk/drivers/net/sfc/falcon.c | 4 +- trunk/drivers/net/sfc/falcon_boards.c | 13 +- trunk/drivers/net/sfc/nic.h | 2 +- trunk/drivers/net/sfc/siena.c | 13 +- trunk/drivers/net/stmmac/stmmac_main.c | 10 +- trunk/drivers/net/tg3.c | 1 - trunk/drivers/net/tun.c | 4 - trunk/drivers/net/usb/Kconfig | 21 - trunk/drivers/net/usb/Makefile | 2 - trunk/drivers/net/usb/cdc_ether.c | 1 - trunk/drivers/net/usb/dm9601.c | 2 +- trunk/drivers/net/usb/ipheth.c | 569 ---------- trunk/drivers/net/usb/kaweth.c | 1 - trunk/drivers/net/usb/sierra_net.c | 1004 ----------------- trunk/drivers/net/virtio_net.c | 2 - trunk/drivers/net/wan/hdlc_ppp.c | 6 - trunk/drivers/net/wireless/ath/ath9k/main.c | 3 +- trunk/drivers/net/wireless/iwlwifi/iwl-4965.c | 13 +- trunk/drivers/net/wireless/iwlwifi/iwl-6000.c | 4 +- .../drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 55 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 1 - .../drivers/net/wireless/iwlwifi/iwl-calib.c | 12 - trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 12 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.h | 7 +- trunk/drivers/net/wireless/iwlwifi/iwl-dev.h | 1 - .../drivers/net/wireless/iwlwifi/iwl-eeprom.h | 4 - trunk/drivers/net/wireless/iwlwifi/iwl-scan.c | 31 +- trunk/drivers/net/wireless/iwlwifi/iwl-tx.c | 107 +- trunk/drivers/net/wireless/p54/p54pci.c | 2 +- trunk/drivers/of/of_mdio.c | 2 +- trunk/drivers/pci/hotplug/rpadlpar_core.c | 3 - trunk/drivers/pci/hotplug/rpaphp_core.c | 3 - trunk/drivers/pci/pci.c | 6 +- trunk/drivers/pci/pcie/aer/aerdrv.c | 10 +- trunk/drivers/pci/probe.c | 23 +- trunk/drivers/pcmcia/cistpl.c | 9 +- trunk/drivers/pcmcia/cs.c | 16 +- trunk/drivers/pcmcia/db1xxx_ss.c | 12 +- trunk/drivers/pcmcia/ds.c | 77 +- trunk/drivers/pcmcia/pcmcia_ioctl.c | 7 +- trunk/drivers/pcmcia/pcmcia_resource.c | 10 +- trunk/drivers/pcmcia/rsrc_nonstatic.c | 47 +- trunk/drivers/platform/x86/Kconfig | 1 - trunk/drivers/platform/x86/asus-laptop.c | 8 +- trunk/drivers/platform/x86/dell-wmi.c | 3 +- trunk/drivers/platform/x86/eeepc-laptop.c | 3 +- trunk/drivers/platform/x86/eeepc-wmi.c | 333 +----- trunk/drivers/platform/x86/intel_menlow.c | 1 - trunk/drivers/pnp/pnpacpi/rsparser.c | 24 +- trunk/drivers/pnp/resource.c | 4 - trunk/drivers/regulator/max8925-regulator.c | 2 +- trunk/drivers/regulator/mc13783-regulator.c | 3 - trunk/drivers/rtc/rtc-mxc.c | 26 +- trunk/drivers/s390/block/dasd.c | 3 +- trunk/drivers/s390/block/dasd_3990_erp.c | 7 +- trunk/drivers/s390/char/sclp_async.c | 2 +- trunk/drivers/s390/char/zcore.c | 6 +- trunk/drivers/s390/cio/chsc.c | 29 +- trunk/drivers/s390/cio/chsc_sch.c | 2 +- trunk/drivers/s390/cio/cio.c | 18 +- trunk/drivers/s390/cio/css.c | 16 +- trunk/drivers/s390/cio/device_fsm.c | 2 +- trunk/drivers/s390/scsi/zfcp_fsf.c | 6 +- trunk/drivers/scsi/advansys.c | 50 +- trunk/drivers/scsi/be2iscsi/be_mgmt.c | 1 - trunk/drivers/scsi/bnx2i/bnx2i.h | 2 - trunk/drivers/scsi/bnx2i/bnx2i_init.c | 13 +- trunk/drivers/scsi/bnx2i/bnx2i_iscsi.c | 13 +- trunk/drivers/scsi/dpt_i2o.c | 15 +- trunk/drivers/scsi/ibmvscsi/ibmvscsi.c | 29 +- trunk/drivers/scsi/iscsi_tcp.c | 2 +- trunk/drivers/scsi/libiscsi.c | 2 +- trunk/drivers/scsi/libsas/sas_ata.c | 4 - trunk/drivers/scsi/libsas/sas_scsi_host.c | 4 - trunk/drivers/scsi/lpfc/lpfc_bsg.c | 4 +- trunk/drivers/scsi/qla2xxx/qla_attr.c | 1 - trunk/drivers/scsi/qla4xxx/ql4_mbx.c | 2 +- trunk/drivers/scsi/scsi_debug.c | 3 +- trunk/drivers/scsi/scsi_error.c | 15 +- trunk/drivers/scsi/sd.c | 3 +- trunk/drivers/scsi/wd7000.c | 2 +- trunk/drivers/serial/8250_pnp.c | 2 - trunk/drivers/serial/mcf.c | 6 +- trunk/drivers/serial/mpc52xx_uart.c | 33 + trunk/drivers/serial/pmac_zilog.c | 4 +- trunk/drivers/serial/serial_cs.c | 9 - trunk/drivers/serial/serial_ks8695.c | 1 - trunk/drivers/spi/omap2_mcspi.c | 5 +- trunk/drivers/spi/spi.c | 8 +- trunk/drivers/ssb/driver_pcicore.c | 29 + trunk/drivers/staging/dt3155/dt3155_drv.c | 18 +- trunk/drivers/staging/hv/Hv.c | 2 +- trunk/drivers/staging/hv/RndisFilter.c | 1 - trunk/drivers/staging/hv/netvsc_drv.c | 3 +- .../staging/iio/accel/lis3l02dq_core.c | 2 +- .../staging/iio/accel/lis3l02dq_ring.c | 3 - trunk/drivers/staging/iio/adc/max1363_core.c | 2 - trunk/drivers/staging/iio/industrialio-core.c | 3 +- trunk/drivers/staging/iio/light/tsl2563.c | 2 - trunk/drivers/staging/iio/ring_sw.c | 2 +- .../staging/octeon/cvmx-helper-board.c | 8 - trunk/drivers/staging/rt2860/usb_main_dev.c | 1 - trunk/drivers/staging/rtl8192su/r8192U_core.c | 3 - trunk/drivers/staging/usbip/usbip_event.c | 3 - .../drivers/staging/vme/bridges/vme_tsi148.c | 3 +- trunk/drivers/thermal/thermal_sys.c | 3 - trunk/drivers/usb/class/cdc-acm.c | 3 - trunk/drivers/usb/core/Kconfig | 2 +- trunk/drivers/usb/core/driver.c | 49 +- trunk/drivers/usb/core/generic.c | 2 +- trunk/drivers/usb/core/inode.c | 4 +- trunk/drivers/usb/core/usb.c | 20 +- trunk/drivers/usb/gadget/s3c-hsotg.c | 7 +- trunk/drivers/usb/host/ehci-hcd.c | 1 - trunk/drivers/usb/host/ehci-hub.c | 2 +- trunk/drivers/usb/host/ehci-mem.c | 2 +- trunk/drivers/usb/host/ehci-omap.c | 6 +- trunk/drivers/usb/host/ehci-sched.c | 40 +- trunk/drivers/usb/host/ehci.h | 5 +- trunk/drivers/usb/host/ohci-at91.c | 2 - trunk/drivers/usb/host/ohci-da8xx.c | 2 +- trunk/drivers/usb/host/ohci-hub.c | 2 +- trunk/drivers/usb/host/oxu210hp-hcd.c | 6 +- trunk/drivers/usb/host/sl811-hcd.c | 6 +- trunk/drivers/usb/host/xhci-mem.c | 65 -- trunk/drivers/usb/host/xhci.h | 4 - trunk/drivers/usb/misc/usbsevseg.c | 15 +- trunk/drivers/usb/musb/Kconfig | 2 +- trunk/drivers/usb/musb/Makefile | 2 +- trunk/drivers/usb/musb/blackfin.c | 8 +- trunk/drivers/usb/musb/davinci.c | 2 - trunk/drivers/usb/musb/musb_core.c | 77 +- trunk/drivers/usb/musb/musb_core.h | 2 +- trunk/drivers/usb/musb/musb_host.c | 1 - trunk/drivers/usb/musb/omap2430.c | 3 + trunk/drivers/usb/musb/tusb6010.c | 13 - trunk/drivers/usb/musb/tusb6010_omap.c | 22 +- trunk/drivers/usb/serial/option.c | 10 - trunk/drivers/usb/serial/pl2303.c | 2 - trunk/drivers/usb/serial/pl2303.h | 5 - trunk/drivers/usb/serial/qcaux.c | 10 - trunk/drivers/usb/serial/sierra.c | 1 - trunk/drivers/usb/serial/ti_usb_3410_5052.c | 26 +- trunk/drivers/usb/serial/ti_usb_3410_5052.h | 3 - trunk/drivers/usb/wusbcore/devconnect.c | 2 +- trunk/drivers/vhost/vhost.c | 4 - trunk/drivers/video/efifb.c | 3 - trunk/drivers/video/fsl-diu-fb.c | 1 - trunk/drivers/video/mb862xx/mb862xxfb_accel.c | 5 +- trunk/drivers/video/sh_mobile_lcdcfb.c | 27 +- trunk/drivers/video/vesafb.c | 26 +- trunk/drivers/virtio/virtio_balloon.c | 3 +- trunk/drivers/w1/masters/omap_hdq.c | 1 - trunk/drivers/w1/slaves/w1_therm.c | 5 +- trunk/drivers/watchdog/Kconfig | 17 +- trunk/drivers/watchdog/booke_wdt.c | 4 +- trunk/drivers/watchdog/ep93xx_wdt.c | 2 +- trunk/drivers/watchdog/hpwdt.c | 2 +- trunk/drivers/watchdog/iTCO_wdt.c | 99 +- trunk/drivers/watchdog/max63xx_wdt.c | 7 +- trunk/drivers/watchdog/pika_wdt.c | 2 +- trunk/drivers/watchdog/sb_wdog.c | 4 +- trunk/drivers/watchdog/sbc_fitpc2_wdt.c | 14 +- trunk/fs/9p/v9fs.c | 10 - trunk/fs/9p/v9fs.h | 2 - trunk/fs/9p/vfs_super.c | 1 - trunk/fs/afs/internal.h | 2 - trunk/fs/afs/mntpt.c | 24 +- trunk/fs/afs/super.c | 1 - trunk/fs/afs/volume.c | 7 - trunk/fs/binfmt_elf_fdpic.c | 7 + trunk/fs/binfmt_flat.c | 2 +- trunk/fs/bio.c | 4 +- trunk/fs/block_dev.c | 22 +- trunk/fs/btrfs/disk-io.c | 12 +- trunk/fs/btrfs/extent-tree.c | 20 +- trunk/fs/btrfs/volumes.c | 6 - trunk/fs/ceph/addr.c | 64 +- trunk/fs/ceph/auth.c | 1 - trunk/fs/ceph/auth_none.h | 2 - trunk/fs/ceph/auth_x.c | 32 +- trunk/fs/ceph/caps.c | 44 +- trunk/fs/ceph/dir.c | 16 +- trunk/fs/ceph/file.c | 3 +- trunk/fs/ceph/inode.c | 14 +- trunk/fs/ceph/messenger.c | 31 - trunk/fs/ceph/osdmap.c | 180 ++- trunk/fs/ceph/osdmap.h | 1 - trunk/fs/ceph/rados.h | 6 +- trunk/fs/ceph/snap.c | 50 +- trunk/fs/ceph/super.c | 7 +- trunk/fs/ceph/super.h | 4 +- trunk/fs/cifs/cifs_fs_sb.h | 3 - trunk/fs/cifs/cifsfs.c | 11 - trunk/fs/cifs/cifssmb.c | 34 +- trunk/fs/cifs/file.c | 28 +- trunk/fs/coda/inode.c | 8 - trunk/fs/compat_ioctl.c | 3 + trunk/fs/ecryptfs/crypto.c | 37 +- trunk/fs/ecryptfs/ecryptfs_kernel.h | 15 +- trunk/fs/ecryptfs/inode.c | 129 +-- trunk/fs/ecryptfs/main.c | 10 +- trunk/fs/ecryptfs/mmap.c | 38 +- trunk/fs/ecryptfs/super.c | 2 +- trunk/fs/exofs/exofs.h | 2 - trunk/fs/exofs/super.c | 8 - trunk/fs/ext2/symlink.c | 2 - trunk/fs/ext3/symlink.c | 2 - trunk/fs/ext4/extents.c | 1 - trunk/fs/ext4/inode.c | 3 +- trunk/fs/ext4/mballoc.c | 21 +- trunk/fs/fs-writeback.c | 133 +-- trunk/fs/fscache/stats.c | 4 +- trunk/fs/ioctl.c | 92 +- trunk/fs/jfs/inode.c | 2 +- trunk/fs/jfs/jfs_dmap.c | 16 +- trunk/fs/jfs/jfs_dmap.h | 6 +- trunk/fs/jfs/jfs_inode.h | 1 - trunk/fs/jfs/namei.c | 4 +- trunk/fs/jfs/resize.c | 6 +- trunk/fs/jfs/symlink.c | 14 +- trunk/fs/logfs/gc.c | 8 - trunk/fs/logfs/journal.c | 29 +- trunk/fs/logfs/logfs.h | 15 +- trunk/fs/logfs/readwrite.c | 75 +- trunk/fs/logfs/segment.c | 8 +- trunk/fs/logfs/super.c | 11 +- trunk/fs/ncpfs/inode.c | 8 - trunk/fs/nfs/client.c | 5 +- trunk/fs/nfs/delegation.c | 86 +- trunk/fs/nfs/dir.c | 6 +- trunk/fs/nfs/inode.c | 8 +- trunk/fs/nfs/nfs4proc.c | 12 +- trunk/fs/nfs/super.c | 3 +- trunk/fs/nfs/write.c | 95 +- trunk/fs/nfsd/nfs4xdr.c | 8 +- trunk/fs/nilfs2/alloc.c | 2 +- trunk/fs/nilfs2/btree.c | 2 +- trunk/fs/nilfs2/ioctl.c | 2 +- trunk/fs/nilfs2/super.c | 1 - trunk/fs/notify/inotify/Kconfig | 1 - trunk/fs/ocfs2/buffer_head_io.c | 2 - trunk/fs/ocfs2/dlm/dlmast.c | 5 +- trunk/fs/ocfs2/dlmfs/dlmfs.c | 14 +- trunk/fs/ocfs2/file.c | 32 +- trunk/fs/ocfs2/inode.c | 68 +- trunk/fs/ocfs2/inode.h | 2 - trunk/fs/ocfs2/namei.c | 58 +- trunk/fs/ocfs2/refcounttree.c | 3 - trunk/fs/proc/base.c | 2 +- trunk/fs/proc/task_mmu.c | 27 +- trunk/fs/quota/Kconfig | 8 - trunk/fs/quota/dquot.c | 28 +- trunk/fs/reiserfs/dir.c | 2 + trunk/fs/reiserfs/xattr.c | 19 +- trunk/fs/smbfs/inode.c | 8 - trunk/fs/squashfs/block.c | 5 +- trunk/fs/squashfs/super.c | 4 +- trunk/fs/squashfs/zlib_wrapper.c | 3 +- trunk/fs/super.c | 9 +- trunk/fs/sync.c | 3 +- trunk/fs/udf/balloc.c | 10 +- trunk/fs/udf/file.c | 2 +- trunk/fs/udf/inode.c | 2 +- trunk/fs/udf/namei.c | 9 +- trunk/fs/udf/udfdecl.h | 3 +- trunk/fs/xfs/linux-2.6/xfs_super.c | 5 - trunk/fs/xfs/linux-2.6/xfs_sync.c | 116 +- trunk/fs/xfs/linux-2.6/xfs_sync.h | 7 +- trunk/fs/xfs/quota/xfs_qm_syscalls.c | 3 +- trunk/fs/xfs/xfs_ag.h | 1 - trunk/fs/xfs/xfs_dfrag.c | 22 +- trunk/fs/xfs/xfs_log.c | 38 +- trunk/fs/xfs/xfs_mount.h | 1 - trunk/include/drm/drm_pciids.h | 1 - trunk/include/drm/ttm/ttm_bo_driver.h | 28 + trunk/include/linux/ata.h | 4 +- trunk/include/linux/backing-dev.h | 2 - trunk/include/linux/bitops.h | 3 + trunk/include/linux/blkdev.h | 35 +- trunk/include/linux/cgroup.h | 1 - trunk/include/linux/coda_psdev.h | 3 - trunk/include/linux/drbd.h | 2 +- trunk/include/linux/drbd_nl.h | 3 +- trunk/include/linux/firewire-cdev.h | 78 +- trunk/include/linux/firewire-constants.h | 29 +- trunk/include/linux/fs.h | 6 +- trunk/include/linux/genhd.h | 2 +- trunk/include/linux/i2c.h | 2 - trunk/include/linux/i2o.h | 1 + trunk/include/linux/ide.h | 1 - trunk/include/linux/input/matrix_keypad.h | 2 - trunk/include/linux/iscsi_ibft.h | 8 +- trunk/include/linux/kernel.h | 2 +- trunk/include/linux/kfifo.h | 3 +- trunk/include/linux/kvm_host.h | 7 +- trunk/include/linux/lcm.h | 8 - trunk/include/linux/mm.h | 4 +- trunk/include/linux/ncp_fs_sb.h | 2 - trunk/include/linux/nfs_fs.h | 1 - trunk/include/linux/nfs_fs_sb.h | 1 - trunk/include/linux/page_cgroup.h | 6 - trunk/include/linux/poison.h | 9 - trunk/include/linux/radix-tree.h | 7 - trunk/include/linux/rcupdate.h | 67 +- trunk/include/linux/regulator/consumer.h | 8 +- trunk/include/linux/slab.h | 1 - trunk/include/linux/smb_fs_sb.h | 3 - trunk/include/linux/usb.h | 18 +- trunk/include/linux/virtio_console.h | 23 + trunk/include/linux/writeback.h | 3 - trunk/include/media/saa7146_vv.h | 1 + trunk/include/net/sctp/command.h | 1 - trunk/include/net/sctp/sctp.h | 1 - trunk/include/net/sctp/structs.h | 1 - trunk/include/net/sock.h | 2 +- trunk/include/net/x25.h | 4 - trunk/include/pcmcia/ds.h | 7 +- trunk/include/pcmcia/ss.h | 8 +- trunk/include/sound/ak4113.h | 2 +- trunk/include/sound/soc-dai.h | 18 +- trunk/include/sound/soc.h | 1 - trunk/include/trace/events/block.h | 164 --- trunk/init/initramfs.c | 3 +- trunk/kernel/cgroup.c | 16 +- trunk/kernel/cgroup_freezer.c | 5 +- trunk/kernel/cred.c | 4 +- trunk/kernel/exit.c | 3 +- trunk/kernel/fork.c | 3 - trunk/kernel/irq/manage.c | 10 - trunk/kernel/perf_event.c | 2 +- trunk/kernel/power/user.c | 2 +- trunk/kernel/rcupdate.c | 18 - trunk/kernel/sched.c | 20 +- trunk/kernel/sched_debug.c | 2 - trunk/kernel/sys.c | 2 +- trunk/kernel/workqueue.c | 2 +- trunk/lib/Kconfig.debug | 2 +- trunk/lib/Makefile | 2 +- trunk/lib/decompress_unlzo.c | 22 +- trunk/lib/dma-debug.c | 2 +- trunk/lib/flex_array.c | 2 +- trunk/lib/lcm.c | 15 - trunk/lib/radix-tree.c | 12 +- trunk/lib/ratelimit.c | 11 +- trunk/lib/rwsem-spinlock.c | 14 +- trunk/lib/vsprintf.c | 11 +- trunk/mm/backing-dev.c | 37 - trunk/mm/bootmem.c | 17 +- trunk/mm/hugetlb.c | 5 +- trunk/mm/ksm.c | 12 +- trunk/mm/memcontrol.c | 43 +- trunk/mm/memory.c | 3 +- trunk/mm/mmap.c | 113 +- trunk/mm/pagewalk.c | 47 +- trunk/mm/readahead.c | 2 +- trunk/mm/rmap.c | 33 +- trunk/mm/slab.c | 13 +- trunk/mm/slub.c | 5 +- trunk/mm/util.c | 21 - trunk/mm/vmscan.c | 23 +- trunk/net/bluetooth/l2cap.c | 5 +- trunk/net/bridge/br_multicast.c | 10 +- trunk/net/can/raw.c | 2 +- trunk/net/core/dev.c | 8 +- trunk/net/core/rtnetlink.c | 5 +- trunk/net/ieee802154/af_ieee802154.c | 3 - trunk/net/ipv4/fib_trie.c | 4 +- trunk/net/ipv4/ip_output.c | 2 +- trunk/net/ipv4/udp.c | 4 +- trunk/net/ipv6/af_inet6.c | 2 +- trunk/net/ipv6/ip6_output.c | 4 +- trunk/net/ipv6/route.c | 2 +- trunk/net/ipv6/tcp_ipv6.c | 2 +- trunk/net/ipv6/udp.c | 4 +- trunk/net/ipv6/xfrm6_policy.c | 2 +- trunk/net/mac80211/agg-tx.c | 1 + trunk/net/mac80211/main.c | 4 +- trunk/net/mac80211/mesh.c | 3 + trunk/net/mac80211/mlme.c | 2 - trunk/net/mac80211/rx.c | 5 - trunk/net/mac80211/sta_info.c | 20 +- trunk/net/packet/af_packet.c | 2 + trunk/net/rds/rdma_transport.c | 2 +- trunk/net/sctp/associola.c | 6 +- trunk/net/sctp/endpointola.c | 1 - trunk/net/sctp/sm_make_chunk.c | 94 +- trunk/net/sctp/sm_sideeffect.c | 26 - trunk/net/sctp/sm_statefuns.c | 8 +- trunk/net/sctp/socket.c | 14 +- trunk/net/sunrpc/auth.c | 2 +- .../net/sunrpc/xprtrdma/svc_rdma_transport.c | 5 +- trunk/net/x25/af_x25.c | 68 +- trunk/net/x25/x25_facilities.c | 27 +- trunk/net/x25/x25_in.c | 15 +- trunk/security/inode.c | 4 +- trunk/security/keys/gc.c | 9 +- trunk/security/keys/keyring.c | 41 +- trunk/security/keys/request_key.c | 24 +- trunk/security/keys/user_defined.c | 3 +- trunk/security/selinux/ss/avtab.h | 2 +- trunk/sound/arm/aaci.c | 7 +- trunk/sound/core/timer.c | 5 +- trunk/sound/i2c/other/ak4113.c | 2 +- trunk/sound/isa/sb/es968.c | 2 +- trunk/sound/pci/echoaudio/echoaudio.c | 5 +- trunk/sound/pci/hda/hda_intel.c | 3 - trunk/sound/pci/hda/patch_analog.c | 17 +- trunk/sound/pci/hda/patch_cirrus.c | 2 +- trunk/sound/pci/hda/patch_conexant.c | 8 +- trunk/sound/pci/hda/patch_realtek.c | 336 ++---- trunk/sound/pci/hda/patch_sigmatel.c | 4 - trunk/sound/pci/hda/patch_via.c | 41 +- trunk/sound/pci/maestro3.c | 9 - trunk/sound/pci/mixart/mixart.c | 24 +- trunk/sound/soc/atmel/atmel-pcm.c | 2 +- trunk/sound/soc/atmel/atmel_ssc_dai.c | 6 +- trunk/sound/soc/codecs/ac97.c | 15 +- trunk/sound/soc/codecs/wm2000.c | 1 + trunk/sound/soc/codecs/wm8994.c | 58 +- trunk/sound/soc/codecs/wm_hubs.c | 83 +- trunk/sound/soc/codecs/wm_hubs.h | 1 - trunk/sound/soc/davinci/davinci-i2s.c | 3 +- trunk/sound/soc/davinci/davinci-mcasp.c | 3 +- trunk/sound/soc/davinci/davinci-pcm.c | 4 +- trunk/sound/soc/imx/imx-pcm-dma-mx2.c | 23 +- trunk/sound/soc/imx/imx-pcm-fiq.c | 55 +- trunk/sound/soc/imx/imx-ssi.c | 10 +- trunk/sound/soc/omap/omap-mcbsp.c | 4 +- trunk/sound/soc/omap/omap-mcpdm.c | 3 +- trunk/sound/soc/omap/omap-pcm.c | 21 +- trunk/sound/soc/pxa/pxa-ssp.c | 23 +- trunk/sound/soc/pxa/pxa2xx-ac97.c | 17 +- trunk/sound/soc/pxa/pxa2xx-i2s.c | 7 +- trunk/sound/soc/pxa/pxa2xx-pcm.c | 4 +- trunk/sound/soc/s3c24xx/s3c-ac97.c | 21 +- trunk/sound/soc/s3c24xx/s3c-dma.c | 4 +- trunk/sound/soc/s3c24xx/s3c-i2s-v2.c | 13 +- trunk/sound/soc/s3c24xx/s3c-pcm.c | 7 +- trunk/sound/soc/s3c24xx/s3c24xx-i2s.c | 19 +- trunk/sound/soc/s6000/s6000-i2s.c | 3 +- trunk/sound/soc/s6000/s6000-pcm.c | 40 +- trunk/sound/soc/soc-core.c | 3 +- trunk/sound/soc/txx9/txx9aclc-ac97.c | 1 - trunk/sound/soc/txx9/txx9aclc-generic.c | 1 - trunk/sound/usb/usbmidi.c | 24 +- trunk/tools/perf/builtin-kmem.c | 1 + trunk/virt/kvm/kvm_main.c | 17 +- 1083 files changed, 7533 insertions(+), 16271 deletions(-) rename trunk/Documentation/fb/{efifb.txt => imacfb.txt} (66%) rename trunk/arch/arm/plat-mxc/include/mach/{board-mx31_3ds.h => board-mx31pdk.h} (93%) delete mode 100644 trunk/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h delete mode 100644 trunk/arch/mips/include/asm/vdso.h delete mode 100644 trunk/arch/mips/kernel/vdso.c delete mode 100644 trunk/drivers/gpu/drm/nouveau/nv50_gpio.c delete mode 100644 trunk/drivers/misc/vmware_balloon.c create mode 100644 trunk/drivers/mtd/internal.h create mode 100644 trunk/drivers/mtd/mtdbdi.c delete mode 100644 trunk/drivers/net/phy/micrel.c delete mode 100644 trunk/drivers/net/usb/ipheth.c delete mode 100644 trunk/drivers/net/usb/sierra_net.c delete mode 100644 trunk/include/linux/lcm.h delete mode 100644 trunk/lib/lcm.c diff --git a/[refs] b/[refs] index da05fda03f71..c55ef048f5c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 +refs/heads/master: 6549981bc54777c37eccf987e227aff47022ab7c diff --git a/trunk/Documentation/DocBook/libata.tmpl b/trunk/Documentation/DocBook/libata.tmpl index ff3e5bec1c24..ba9975771503 100644 --- a/trunk/Documentation/DocBook/libata.tmpl +++ b/trunk/Documentation/DocBook/libata.tmpl @@ -107,6 +107,10 @@ void (*dev_config) (struct ata_port *, struct ata_device *); issue of SET FEATURES - XFER MODE, and prior to operation. + Called by ata_device_add() after ata_dev_identify() determines + a device is present. + + This entry may be specified as NULL in ata_port_operations. @@ -150,8 +154,8 @@ unsigned int (*mode_filter) (struct ata_port *, struct ata_device *, unsigned in Taskfile read/write -void (*sff_tf_load) (struct ata_port *ap, struct ata_taskfile *tf); -void (*sff_tf_read) (struct ata_port *ap, struct ata_taskfile *tf); +void (*tf_load) (struct ata_port *ap, struct ata_taskfile *tf); +void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf); @@ -160,35 +164,36 @@ void (*sff_tf_read) (struct ata_port *ap, struct ata_taskfile *tf); hardware registers / DMA buffers, to obtain the current set of taskfile register values. Most drivers for taskfile-based hardware (PIO or MMIO) use - ata_sff_tf_load() and ata_sff_tf_read() for these hooks. + ata_tf_load() and ata_tf_read() for these hooks. PIO data read/write -void (*sff_data_xfer) (struct ata_device *, unsigned char *, unsigned int, int); +void (*data_xfer) (struct ata_device *, unsigned char *, unsigned int, int); All bmdma-style drivers must implement this hook. This is the low-level operation that actually copies the data bytes during a PIO data transfer. -Typically the driver will choose one of ata_sff_data_xfer_noirq(), -ata_sff_data_xfer(), or ata_sff_data_xfer32(). +Typically the driver +will choose one of ata_pio_data_xfer_noirq(), ata_pio_data_xfer(), or +ata_mmio_data_xfer(). ATA command execute -void (*sff_exec_command)(struct ata_port *ap, struct ata_taskfile *tf); +void (*exec_command)(struct ata_port *ap, struct ata_taskfile *tf); causes an ATA command, previously loaded with ->tf_load(), to be initiated in hardware. - Most drivers for taskfile-based hardware use ata_sff_exec_command() + Most drivers for taskfile-based hardware use ata_exec_command() for this hook. @@ -213,8 +218,8 @@ command. Read specific ATA shadow registers -u8 (*sff_check_status)(struct ata_port *ap); -u8 (*sff_check_altstatus)(struct ata_port *ap); +u8 (*check_status)(struct ata_port *ap); +u8 (*check_altstatus)(struct ata_port *ap); @@ -222,14 +227,20 @@ u8 (*sff_check_altstatus)(struct ata_port *ap); hardware. On some hardware, reading the Status register has the side effect of clearing the interrupt condition. Most drivers for taskfile-based hardware use - ata_sff_check_status() for this hook. + ata_check_status() for this hook. + + + Note that because this is called from ata_device_add(), at + least a dummy function that clears device interrupts must be + provided for all drivers, even if the controller doesn't + actually have a taskfile status register. Select ATA device on bus -void (*sff_dev_select)(struct ata_port *ap, unsigned int device); +void (*dev_select)(struct ata_port *ap, unsigned int device); @@ -240,7 +251,9 @@ void (*sff_dev_select)(struct ata_port *ap, unsigned int device); Most drivers for taskfile-based hardware use - ata_sff_dev_select() for this hook. + ata_std_dev_select() for this hook. Controllers which do not + support second drives on a port (such as SATA contollers) will + use ata_noop_dev_select(). @@ -428,13 +441,13 @@ void (*irq_clear) (struct ata_port *); to struct ata_host_set. - Most legacy IDE drivers use ata_sff_interrupt() for the + Most legacy IDE drivers use ata_interrupt() for the irq_handler hook, which scans all ports in the host_set, determines which queued command was active (if any), and calls - ata_sff_host_intr(ap,qc). + ata_host_intr(ap,qc). - Most legacy IDE drivers use ata_sff_irq_clear() for the + Most legacy IDE drivers use ata_bmdma_irq_clear() for the irq_clear() hook, which simply clears the interrupt and error flags in the DMA status register. @@ -483,6 +496,10 @@ void (*host_stop) (struct ata_host_set *host_set); data from port at this time. + Many drivers use ata_port_stop() as this hook, which frees the + PRD table. + + ->host_stop() is called after all ->port_stop() calls have completed. The hook must finalize hardware shutdown, release DMA and other resources, etc. diff --git a/trunk/Documentation/DocBook/tracepoint.tmpl b/trunk/Documentation/DocBook/tracepoint.tmpl index e8473eae2a20..8bca1d5cec09 100644 --- a/trunk/Documentation/DocBook/tracepoint.tmpl +++ b/trunk/Documentation/DocBook/tracepoint.tmpl @@ -16,15 +16,6 @@ - - William - Cohen - -
- wcohen@redhat.com -
- - @@ -100,8 +91,4 @@ !Iinclude/trace/events/signal.h - - Block IO -!Iinclude/trace/events/block.h - diff --git a/trunk/Documentation/HOWTO b/trunk/Documentation/HOWTO index 40ada93b820a..f5395af88a41 100644 --- a/trunk/Documentation/HOWTO +++ b/trunk/Documentation/HOWTO @@ -234,7 +234,7 @@ process is as follows: Linus, usually the patches that have already been included in the -next kernel for a few weeks. The preferred way to submit big changes is using git (the kernel's source management tool, more information - can be found at http://git-scm.com/) but plain patches are also just + can be found at http://git.or.cz/) but plain patches are also just fine. - After two weeks a -rc1 kernel is released it is now possible to push only patches that do not include new features that could affect the diff --git a/trunk/Documentation/RCU/NMI-RCU.txt b/trunk/Documentation/RCU/NMI-RCU.txt index a8536cb88091..a6d32e65d222 100644 --- a/trunk/Documentation/RCU/NMI-RCU.txt +++ b/trunk/Documentation/RCU/NMI-RCU.txt @@ -34,7 +34,7 @@ NMI handler. cpu = smp_processor_id(); ++nmi_count(cpu); - if (!rcu_dereference_sched(nmi_callback)(regs, cpu)) + if (!rcu_dereference(nmi_callback)(regs, cpu)) default_do_nmi(regs); nmi_exit(); @@ -47,13 +47,12 @@ function pointer. If this handler returns zero, do_nmi() invokes the default_do_nmi() function to handle a machine-specific NMI. Finally, preemption is restored. -In theory, rcu_dereference_sched() is not needed, since this code runs -only on i386, which in theory does not need rcu_dereference_sched() -anyway. However, in practice it is a good documentation aid, particularly -for anyone attempting to do something similar on Alpha or on systems -with aggressive optimizing compilers. +Strictly speaking, rcu_dereference() is not needed, since this code runs +only on i386, which does not need rcu_dereference() anyway. However, +it is a good documentation aid, particularly for anyone attempting to +do something similar on Alpha. -Quick Quiz: Why might the rcu_dereference_sched() be necessary on Alpha, +Quick Quiz: Why might the rcu_dereference() be necessary on Alpha, given that the code referenced by the pointer is read-only? @@ -100,21 +99,17 @@ invoke irq_enter() and irq_exit() on NMI entry and exit, respectively. Answer to Quick Quiz - Why might the rcu_dereference_sched() be necessary on Alpha, given + Why might the rcu_dereference() be necessary on Alpha, given that the code referenced by the pointer is read-only? Answer: The caller to set_nmi_callback() might well have - initialized some data that is to be used by the new NMI - handler. In this case, the rcu_dereference_sched() would - be needed, because otherwise a CPU that received an NMI - just after the new handler was set might see the pointer - to the new NMI handler, but the old pre-initialized - version of the handler's data. - - This same sad story can happen on other CPUs when using - a compiler with aggressive pointer-value speculation - optimizations. - - More important, the rcu_dereference_sched() makes it - clear to someone reading the code that the pointer is - being protected by RCU-sched. + initialized some data that is to be used by the + new NMI handler. In this case, the rcu_dereference() + would be needed, because otherwise a CPU that received + an NMI just after the new handler was set might see + the pointer to the new NMI handler, but the old + pre-initialized version of the handler's data. + + More important, the rcu_dereference() makes it clear + to someone reading the code that the pointer is being + protected by RCU. diff --git a/trunk/Documentation/RCU/checklist.txt b/trunk/Documentation/RCU/checklist.txt index 790d1a812376..cbc180f90194 100644 --- a/trunk/Documentation/RCU/checklist.txt +++ b/trunk/Documentation/RCU/checklist.txt @@ -260,8 +260,7 @@ over a rather long period of time, but improvements are always welcome! The reason that it is permissible to use RCU list-traversal primitives when the update-side lock is held is that doing so can be quite helpful in reducing code bloat when common code is - shared between readers and updaters. Additional primitives - are provided for this case, as discussed in lockdep.txt. + shared between readers and updaters. 10. Conversely, if you are in an RCU read-side critical section, and you don't hold the appropriate update-side lock, you -must- @@ -345,8 +344,8 @@ over a rather long period of time, but improvements are always welcome! requiring SRCU's read-side deadlock immunity or low read-side realtime latency. - Note that, rcu_assign_pointer() relates to SRCU just as they do - to other forms of RCU. + Note that, rcu_assign_pointer() and rcu_dereference() relate to + SRCU just as they do to other forms of RCU. 15. The whole point of call_rcu(), synchronize_rcu(), and friends is to wait until all pre-existing readers have finished before diff --git a/trunk/Documentation/RCU/lockdep.txt b/trunk/Documentation/RCU/lockdep.txt index d7a49b2f6994..fe24b58627bd 100644 --- a/trunk/Documentation/RCU/lockdep.txt +++ b/trunk/Documentation/RCU/lockdep.txt @@ -32,20 +32,9 @@ checking of rcu_dereference() primitives: srcu_dereference(p, sp): Check for SRCU read-side critical section. rcu_dereference_check(p, c): - Use explicit check expression "c". This is useful in - code that is invoked by both readers and updaters. + Use explicit check expression "c". rcu_dereference_raw(p) Don't check. (Use sparingly, if at all.) - rcu_dereference_protected(p, c): - Use explicit check expression "c", and omit all barriers - and compiler constraints. This is useful when the data - structure cannot change, for example, in code that is - invoked only by updaters. - rcu_access_pointer(p): - Return the value of the pointer and omit all barriers, - but retain the compiler constraints that prevent duplicating - or coalescsing. This is useful when when testing the - value of the pointer itself, for example, against NULL. The rcu_dereference_check() check expression can be any boolean expression, but would normally include one of the rcu_read_lock_held() @@ -70,20 +59,7 @@ In case (1), the pointer is picked up in an RCU-safe manner for vanilla RCU read-side critical sections, in case (2) the ->file_lock prevents any change from taking place, and finally, in case (3) the current task is the only task accessing the file_struct, again preventing any change -from taking place. If the above statement was invoked only from updater -code, it could instead be written as follows: - - file = rcu_dereference_protected(fdt->fd[fd], - lockdep_is_held(&files->file_lock) || - atomic_read(&files->count) == 1); - -This would verify cases #2 and #3 above, and furthermore lockdep would -complain if this was used in an RCU read-side critical section unless one -of these two cases held. Because rcu_dereference_protected() omits all -barriers and compiler constraints, it generates better code than do the -other flavors of rcu_dereference(). On the other hand, it is illegal -to use rcu_dereference_protected() if either the RCU-protected pointer -or the RCU-protected data that it points to can change concurrently. +from taking place. There are currently only "universal" versions of the rcu_assign_pointer() and RCU list-/tree-traversal primitives, which do not (yet) check for diff --git a/trunk/Documentation/RCU/whatisRCU.txt b/trunk/Documentation/RCU/whatisRCU.txt index cfaac34c4557..1dc00ee97163 100644 --- a/trunk/Documentation/RCU/whatisRCU.txt +++ b/trunk/Documentation/RCU/whatisRCU.txt @@ -840,12 +840,6 @@ SRCU: Initialization/cleanup init_srcu_struct cleanup_srcu_struct -All: lockdep-checked RCU-protected pointer access - - rcu_dereference_check - rcu_dereference_protected - rcu_access_pointer - See the comment headers in the source code (or the docbook generated from them) for more information. diff --git a/trunk/Documentation/block/biodoc.txt b/trunk/Documentation/block/biodoc.txt index 508b5b2b0289..6fab97ea7e6b 100644 --- a/trunk/Documentation/block/biodoc.txt +++ b/trunk/Documentation/block/biodoc.txt @@ -1162,8 +1162,8 @@ where a driver received a request ala this before: As mentioned, there is no virtual mapping of a bio. For DMA, this is not a problem as the driver probably never will need a virtual mapping. -Instead it needs a bus mapping (dma_map_page for a single segment or -use dma_map_sg for scatter gather) to be able to ship it to the driver. For +Instead it needs a bus mapping (pci_map_page for a single segment or +use blk_rq_map_sg for scatter gather) to be able to ship it to the driver. For PIO drivers (or drivers that need to revert to PIO transfer once in a while (IDE for example)), where the CPU is doing the actual data transfer a virtual mapping is needed. If the driver supports highmem I/O, diff --git a/trunk/Documentation/cgroups/cgroups.txt b/trunk/Documentation/cgroups/cgroups.txt index a1ca5924faff..fd588ff0e296 100644 --- a/trunk/Documentation/cgroups/cgroups.txt +++ b/trunk/Documentation/cgroups/cgroups.txt @@ -235,7 +235,8 @@ containing the following files describing that cgroup: - cgroup.procs: list of tgids in the cgroup. This list is not guaranteed to be sorted or free of duplicate tgids, and userspace should sort/uniquify the list if this property is required. - This is a read-only file, for now. + Writing a tgid into this file moves all threads with that tgid into + this cgroup. - notify_on_release flag: run the release agent on exit? - release_agent: the path to use for release notifications (this file exists in the top cgroup only) diff --git a/trunk/Documentation/fb/efifb.txt b/trunk/Documentation/fb/imacfb.txt similarity index 66% rename from trunk/Documentation/fb/efifb.txt rename to trunk/Documentation/fb/imacfb.txt index a59916c29b33..316ec9bb7deb 100644 --- a/trunk/Documentation/fb/efifb.txt +++ b/trunk/Documentation/fb/imacfb.txt @@ -1,9 +1,9 @@ -What is efifb? +What is imacfb? =============== This is a generic EFI platform driver for Intel based Apple computers. -efifb is only for EFI booted Intel Macs. +Imacfb is only for EFI booted Intel Macs. Supported Hardware ================== @@ -16,16 +16,16 @@ MacMini How to use it? ============== -efifb does not have any kind of autodetection of your machine. +Imacfb does not have any kind of autodetection of your machine. You have to add the following kernel parameters in your elilo.conf: Macbook : - video=efifb:macbook + video=imacfb:macbook MacMini : - video=efifb:mini + video=imacfb:mini Macbook Pro 15", iMac 17" : - video=efifb:i17 + video=imacfb:i17 Macbook Pro 17", iMac 20" : - video=efifb:i20 + video=imacfb:i20 -- Edgar Hucek diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 05df0b7514b6..ed511af0f79a 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -589,26 +589,3 @@ Why: Useful in 2003, implementation is a hack. Generally invoked by accident today. Seen as doing more harm than good. Who: Len Brown - ----------------------------- - -What: video4linux /dev/vtx teletext API support -When: 2.6.35 -Files: drivers/media/video/saa5246a.c drivers/media/video/saa5249.c - include/linux/videotext.h -Why: The vtx device nodes have been superseded by vbi device nodes - for many years. No applications exist that use the vtx support. - Of the two i2c drivers that actually support this API the saa5249 - has been impossible to use for a year now and no known hardware - that supports this device exists. The saa5246a is theoretically - supported by the old mxb boards, but it never actually worked. - - In summary: there is no hardware that can use this API and there - are no applications actually implementing this API. - - The vtx support still reserves minors 192-223 and we would really - like to reuse those for upcoming new functionality. In the unlikely - event that new hardware appears that wants to use the functionality - provided by the vtx API, then that functionality should be build - around the sliced VBI API instead. -Who: Hans Verkuil diff --git a/trunk/Documentation/i2c/writing-clients b/trunk/Documentation/i2c/writing-clients index 5ebf5af1d716..3219ee0dbfef 100644 --- a/trunk/Documentation/i2c/writing-clients +++ b/trunk/Documentation/i2c/writing-clients @@ -74,11 +74,6 @@ structure at all. You should use this to keep device-specific data. /* retrieve the value */ void *i2c_get_clientdata(const struct i2c_client *client); -Note that starting with kernel 2.6.34, you don't have to set the `data' field -to NULL in remove() or if probe() failed anymore. The i2c-core does this -automatically on these occasions. Those are also the only times the core will -touch this field. - Accessing the client ==================== diff --git a/trunk/Documentation/input/elantech.txt b/trunk/Documentation/input/elantech.txt index 56941ae1f5db..a10c3b6ba7c4 100644 --- a/trunk/Documentation/input/elantech.txt +++ b/trunk/Documentation/input/elantech.txt @@ -333,14 +333,14 @@ byte 0: byte 1: bit 7 6 5 4 3 2 1 0 - . . . . . x10 x9 x8 + x15 x14 x13 x12 x11 x10 x9 x8 byte 2: bit 7 6 5 4 3 2 1 0 x7 x6 x5 x4 x4 x2 x1 x0 - x10..x0 = absolute x value (horizontal) + x15..x0 = absolute x value (horizontal) byte 3: @@ -350,14 +350,14 @@ byte 3: byte 4: bit 7 6 5 4 3 2 1 0 - . . . . . . y9 y8 + y15 y14 y13 y12 y11 y10 y8 y8 byte 5: bit 7 6 5 4 3 2 1 0 y7 y6 y5 y4 y3 y2 y1 y0 - y9..y0 = absolute y value (vertical) + y15..y0 = absolute y value (vertical) 4.2.2 Two finger touch diff --git a/trunk/Documentation/input/multi-touch-protocol.txt b/trunk/Documentation/input/multi-touch-protocol.txt index c0fc1c75fd88..8490480ce432 100644 --- a/trunk/Documentation/input/multi-touch-protocol.txt +++ b/trunk/Documentation/input/multi-touch-protocol.txt @@ -68,22 +68,6 @@ like: SYN_MT_REPORT SYN_REPORT -Here is the sequence after lifting one of the fingers: - - ABS_MT_POSITION_X - ABS_MT_POSITION_Y - SYN_MT_REPORT - SYN_REPORT - -And here is the sequence after lifting the remaining finger: - - SYN_MT_REPORT - SYN_REPORT - -If the driver reports one of BTN_TOUCH or ABS_PRESSURE in addition to the -ABS_MT events, the last SYN_MT_REPORT event may be omitted. Otherwise, the -last SYN_REPORT will be dropped by the input core, resulting in no -zero-finger event reaching userland. Event Semantics --------------- @@ -233,6 +217,11 @@ where examples can be found. difference between the contact position and the approaching tool position could be used to derive tilt. [2] The list can of course be extended. -[3] Multitouch X driver project: http://bitmath.org/code/multitouch/. +[3] The multi-touch X driver is currently in the prototyping stage. At the +time of writing (April 2009), the MT protocol is not yet merged, and the +prototype implements finger matching, basic mouse support and two-finger +scrolling. The project aims at improving the quality of current multi-touch +functionality available in the Synaptics X driver, and in addition +implement more advanced gestures. [4] See the section on event computation. [5] See the section on finger tracking. diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 839b21b0699a..e4cbca58536c 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -320,6 +320,11 @@ and is between 256 and 4096 characters. It is defined in the file amd_iommu= [HW,X86-84] Pass parameters to the AMD IOMMU driver in the system. Possible values are: + isolate - enable device isolation (each device, as far + as possible, will get its own protection + domain) [default] + share - put every device behind one IOMMU into the + same protection domain fullflush - enable flushing of IO/TLB entries when they are unmapped. Otherwise they are flushed before they will be reused, which @@ -1194,7 +1199,7 @@ and is between 256 and 4096 characters. It is defined in the file libata.force= [LIBATA] Force configurations. The format is comma separated list of "[ID:]VAL" where ID is - PORT[.DEVICE]. PORT and DEVICE are decimal numbers + PORT[:DEVICE]. PORT and DEVICE are decimal numbers matching port, link or device. Basically, it matches the ATA ID string printed on console by libata. If the whole ID part is omitted, the last PORT and DEVICE diff --git a/trunk/Documentation/networking/timestamping.txt b/trunk/Documentation/networking/timestamping.txt index e8c8f4f06c67..0e58b4539176 100644 --- a/trunk/Documentation/networking/timestamping.txt +++ b/trunk/Documentation/networking/timestamping.txt @@ -41,12 +41,11 @@ SOF_TIMESTAMPING_SOFTWARE: return system time stamp generated in SOF_TIMESTAMPING_TX/RX determine how time stamps are generated. SOF_TIMESTAMPING_RAW/SYS determine how they are reported in the following control message: - -struct scm_timestamping { - struct timespec systime; - struct timespec hwtimetrans; - struct timespec hwtimeraw; -}; + struct scm_timestamping { + struct timespec systime; + struct timespec hwtimetrans; + struct timespec hwtimeraw; + }; recvmsg() can be used to get this control message for regular incoming packets. For send time stamps the outgoing packet is looped back to @@ -88,13 +87,12 @@ by the network device and will be empty without that support. SIOCSHWTSTAMP: Hardware time stamping must also be initialized for each device driver -that is expected to do hardware time stamping. The parameter is defined in -/include/linux/net_tstamp.h as: +that is expected to do hardware time stamping. The parameter is: struct hwtstamp_config { - int flags; /* no flags defined right now, must be zero */ - int tx_type; /* HWTSTAMP_TX_* */ - int rx_filter; /* HWTSTAMP_FILTER_* */ + int flags; /* no flags defined right now, must be zero */ + int tx_type; /* HWTSTAMP_TX_* */ + int rx_filter; /* HWTSTAMP_FILTER_* */ }; Desired behavior is passed into the kernel and to a specific device by @@ -141,56 +139,42 @@ enum { /* time stamp any incoming packet */ HWTSTAMP_FILTER_ALL, - /* return value: time stamp all packets requested plus some others */ - HWTSTAMP_FILTER_SOME, + /* return value: time stamp all packets requested plus some others */ + HWTSTAMP_FILTER_SOME, /* PTP v1, UDP, any kind of event packet */ HWTSTAMP_FILTER_PTP_V1_L4_EVENT, - /* for the complete list of values, please check - * the include file /include/linux/net_tstamp.h - */ + ... }; DEVICE IMPLEMENTATION A driver which supports hardware time stamping must support the -SIOCSHWTSTAMP ioctl and update the supplied struct hwtstamp_config with -the actual values as described in the section on SIOCSHWTSTAMP. - -Time stamps for received packets must be stored in the skb. To get a pointer -to the shared time stamp structure of the skb call skb_hwtstamps(). Then -set the time stamps in the structure: - -struct skb_shared_hwtstamps { - /* hardware time stamp transformed into duration - * since arbitrary point in time - */ - ktime_t hwtstamp; - ktime_t syststamp; /* hwtstamp transformed to system time base */ -}; +SIOCSHWTSTAMP ioctl. Time stamps for received packets must be stored +in the skb with skb_hwtstamp_set(). Time stamps for outgoing packets are to be generated as follows: -- In hard_start_xmit(), check if skb_tx(skb)->hardware is set no-zero. - If yes, then the driver is expected to do hardware time stamping. +- In hard_start_xmit(), check if skb_hwtstamp_check_tx_hardware() + returns non-zero. If yes, then the driver is expected + to do hardware time stamping. - If this is possible for the skb and requested, then declare - that the driver is doing the time stamping by setting the field - skb_tx(skb)->in_progress non-zero. You might want to keep a pointer - to the associated skb for the next step and not free the skb. A driver - not supporting hardware time stamping doesn't do that. A driver must - never touch sk_buff::tstamp! It is used to store software generated - time stamps by the network subsystem. + that the driver is doing the time stamping by calling + skb_hwtstamp_tx_in_progress(). A driver not supporting + hardware time stamping doesn't do that. A driver must never + touch sk_buff::tstamp! It is used to store how time stamping + for an outgoing packets is to be done. - As soon as the driver has sent the packet and/or obtained a hardware time stamp for it, it passes the time stamp back by calling skb_hwtstamp_tx() with the original skb, the raw - hardware time stamp. skb_hwtstamp_tx() clones the original skb and - adds the timestamps, therefore the original skb has to be freed now. - If obtaining the hardware time stamp somehow fails, then the driver - should not fall back to software time stamping. The rationale is that - this would occur at a later time in the processing pipeline than other - software time stamping and therefore could lead to unexpected deltas - between time stamps. -- If the driver did not call set skb_tx(skb)->in_progress, then + hardware time stamp and a handle to the device (necessary + to convert the hardware time stamp to system time). If obtaining + the hardware time stamp somehow fails, then the driver should + not fall back to software time stamping. The rationale is that + this would occur at a later time in the processing pipeline + than other software time stamping and therefore could lead + to unexpected deltas between time stamps. +- If the driver did not call skb_hwtstamp_tx_in_progress(), then dev_hard_start_xmit() checks whether software time stamping is wanted as fallback and potentially generates the time stamp. diff --git a/trunk/Documentation/sound/alsa/HD-Audio.txt b/trunk/Documentation/sound/alsa/HD-Audio.txt index 98d14cb8a85d..f4dd3bf99d12 100644 --- a/trunk/Documentation/sound/alsa/HD-Audio.txt +++ b/trunk/Documentation/sound/alsa/HD-Audio.txt @@ -119,18 +119,10 @@ the codec slots 0 and 1 no matter what the hardware reports. Interrupt Handling ~~~~~~~~~~~~~~~~~~ -HD-audio driver uses MSI as default (if available) since 2.6.33 -kernel as MSI works better on some machines, and in general, it's -better for performance. However, Nvidia controllers showed bad -regressions with MSI (especially in a combination with AMD chipset), -thus we disabled MSI for them. - -There seem also still other devices that don't work with MSI. If you -see a regression wrt the sound quality (stuttering, etc) or a lock-up -in the recent kernel, try to pass `enable_msi=0` option to disable -MSI. If it works, you can add the known bad device to the blacklist -defined in hda_intel.c. In such a case, please report and give the -patch back to the upstream developer. +In rare but some cases, the interrupt isn't properly handled as +default. You would notice this by the DMA transfer error reported by +ALSA PCM core, for example. Using MSI might help in such a case. +Pass `enable_msi=1` option for enabling MSI. HD-AUDIO CODEC diff --git a/trunk/Documentation/spi/spidev_test.c b/trunk/Documentation/spi/spidev_test.c index 16feda901469..10abd3773e49 100644 --- a/trunk/Documentation/spi/spidev_test.c +++ b/trunk/Documentation/spi/spidev_test.c @@ -58,7 +58,7 @@ static void transfer(int fd) }; ret = ioctl(fd, SPI_IOC_MESSAGE(1), &tr); - if (ret < 1) + if (ret == 1) pabort("can't send spi message"); for (ret = 0; ret < ARRAY_SIZE(tx); ret++) { diff --git a/trunk/Documentation/stable_kernel_rules.txt b/trunk/Documentation/stable_kernel_rules.txt index e213f45cf9d7..5effa5bd993b 100644 --- a/trunk/Documentation/stable_kernel_rules.txt +++ b/trunk/Documentation/stable_kernel_rules.txt @@ -18,15 +18,16 @@ Rules on what kind of patches are accepted, and which ones are not, into the - It cannot contain any "trivial" fixes in it (spelling changes, whitespace cleanups, etc). - It must follow the Documentation/SubmittingPatches rules. - - It or an equivalent fix must already exist in Linus' tree (upstream). + - It or an equivalent fix must already exist in Linus' tree. Quote the + respective commit ID in Linus' tree in your patch submission to -stable. Procedure for submitting patches to the -stable tree: - Send the patch, after verifying that it follows the above rules, to - stable@kernel.org. You must note the upstream commit ID in the changelog - of your submission. - - To have the patch automatically included in the stable tree, add the tag + stable@kernel.org. + - To have the patch automatically included in the stable tree, add the + the tag Cc: stable@kernel.org in the sign-off area. Once the patch is merged it will be applied to the stable tree without anything else needing to be done by the author diff --git a/trunk/Documentation/watchdog/src/watchdog-simple.c b/trunk/Documentation/watchdog/src/watchdog-simple.c index ba45803a2216..4cf72f3fa8e9 100644 --- a/trunk/Documentation/watchdog/src/watchdog-simple.c +++ b/trunk/Documentation/watchdog/src/watchdog-simple.c @@ -17,6 +17,9 @@ int main(void) ret = -1; break; } + ret = fsync(fd); + if (ret) + break; sleep(10); } close(fd); diff --git a/trunk/Documentation/watchdog/src/watchdog-test.c b/trunk/Documentation/watchdog/src/watchdog-test.c index 63fdc34ceb98..a750532ffcf8 100644 --- a/trunk/Documentation/watchdog/src/watchdog-test.c +++ b/trunk/Documentation/watchdog/src/watchdog-test.c @@ -31,8 +31,6 @@ static void keep_alive(void) */ int main(int argc, char *argv[]) { - int flags; - fd = open("/dev/watchdog", O_WRONLY); if (fd == -1) { @@ -43,14 +41,12 @@ int main(int argc, char *argv[]) if (argc > 1) { if (!strncasecmp(argv[1], "-d", 2)) { - flags = WDIOS_DISABLECARD; - ioctl(fd, WDIOC_SETOPTIONS, &flags); + ioctl(fd, WDIOC_SETOPTIONS, WDIOS_DISABLECARD); fprintf(stderr, "Watchdog card disabled.\n"); fflush(stderr); exit(0); } else if (!strncasecmp(argv[1], "-e", 2)) { - flags = WDIOS_ENABLECARD; - ioctl(fd, WDIOC_SETOPTIONS, &flags); + ioctl(fd, WDIOC_SETOPTIONS, WDIOS_ENABLECARD); fprintf(stderr, "Watchdog card enabled.\n"); fflush(stderr); exit(0); diff --git a/trunk/Documentation/watchdog/watchdog-api.txt b/trunk/Documentation/watchdog/watchdog-api.txt index eb7132ed8bbc..4cc4ba9d7150 100644 --- a/trunk/Documentation/watchdog/watchdog-api.txt +++ b/trunk/Documentation/watchdog/watchdog-api.txt @@ -222,10 +222,11 @@ returned value is the temperature in degrees fahrenheit. ioctl(fd, WDIOC_GETTEMP, &temperature); Finally the SETOPTIONS ioctl can be used to control some aspects of -the cards operation. +the cards operation; right now the pcwd driver is the only one +supporting this ioctl. int options = 0; - ioctl(fd, WDIOC_SETOPTIONS, &options); + ioctl(fd, WDIOC_SETOPTIONS, options); The following options are available: diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index d5b0b1b6dc52..3d29fa389888 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -485,8 +485,8 @@ S: Maintained F: drivers/input/mouse/bcm5974.c APPLE SMC DRIVER -M: Henrik Rydberg -L: lm-sensors@lm-sensors.org +M: Nicolas Boichat +L: mactel-linux-devel@lists.sourceforge.net S: Maintained F: drivers/hwmon/applesmc.c @@ -971,16 +971,6 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.mcuos.com S: Maintained -ARM/U300 MACHINE SUPPORT -M: Linus Walleij -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Supported -F: arch/arm/mach-u300/ -F: drivers/i2c/busses/i2c-stu300.c -F: drivers/rtc/rtc-coh901331.c -F: drivers/watchdog/coh901327_wdt.c -F: drivers/dma/coh901318* - ARM/U8500 ARM ARCHITECTURE M: Srinidhi Kasagar L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -1960,7 +1950,7 @@ F: lib/kobj* DRM DRIVERS M: David Airlie -L: dri-devel@lists.freedesktop.org +L: dri-devel@lists.sourceforge.net T: git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git S: Maintained F: drivers/gpu/drm/ @@ -2484,6 +2474,12 @@ L: linuxppc-dev@ozlabs.org S: Odd Fixes F: drivers/char/hvc_* +VIRTIO CONSOLE DRIVER +M: Amit Shah +L: virtualization@lists.linux-foundation.org +S: Maintained +F: drivers/char/virtio_console.c + iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER M: Peter Jones M: Konrad Rzeszutek Wilk @@ -4482,17 +4478,17 @@ S: Maintained F: drivers/ata/sata_promise.* PS3 NETWORK SUPPORT -M: Geoff Levand +M: Geoff Levand L: netdev@vger.kernel.org L: cbe-oss-dev@ozlabs.org -S: Maintained +S: Supported F: drivers/net/ps3_gelic_net.* PS3 PLATFORM SUPPORT -M: Geoff Levand +M: Geoff Levand L: linuxppc-dev@ozlabs.org L: cbe-oss-dev@ozlabs.org -S: Maintained +S: Supported F: arch/powerpc/boot/ps3* F: arch/powerpc/include/asm/lv1call.h F: arch/powerpc/include/asm/ps3*.h @@ -4791,11 +4787,12 @@ F: drivers/s390/crypto/ S390 ZFCP DRIVER M: Christof Schmitt -M: Swen Schillig +M: Martin Peschke M: linux390@de.ibm.com L: linux-s390@vger.kernel.org W: http://www.ibm.com/developerworks/linux/linux390/ S: Supported +F: Documentation/s390/zfcpdump.txt F: drivers/s390/scsi/zfcp_* S390 IUCV NETWORK LAYER @@ -5974,13 +5971,6 @@ S: Maintained F: Documentation/filesystems/vfat.txt F: fs/fat/ -VIRTIO CONSOLE DRIVER -M: Amit Shah -L: virtualization@lists.linux-foundation.org -S: Maintained -F: drivers/char/virtio_console.c -F: include/linux/virtio_console.h - VIRTIO HOST (VHOST) M: "Michael S. Tsirkin" L: kvm@vger.kernel.org diff --git a/trunk/Makefile b/trunk/Makefile index 701bc65b3952..67c1001cfbf5 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,8 +1,8 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 34 -EXTRAVERSION = -rc7 -NAME = Sheep on Meth +EXTRAVERSION = -rc3 +NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* # To see a list of typical targets execute "make help" diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 92622eb5cc0d..c5408bf1bf43 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -253,7 +253,6 @@ config ARCH_REALVIEW select GENERIC_TIME select GENERIC_CLOCKEVENTS select ARCH_WANT_OPTIONAL_GPIOLIB - select GPIO_PL061 if GPIOLIB help This enables support for ARM Ltd RealView boards. diff --git a/trunk/arch/arm/boot/compressed/head.S b/trunk/arch/arm/boot/compressed/head.S index c5191b1532e8..0f23009170a1 100644 --- a/trunk/arch/arm/boot/compressed/head.S +++ b/trunk/arch/arm/boot/compressed/head.S @@ -172,7 +172,7 @@ not_angel: adr r0, LC0 ARM( ldmia r0, {r1, r2, r3, r4, r5, r6, r11, ip, sp}) THUMB( ldmia r0, {r1, r2, r3, r4, r5, r6, r11, ip} ) - THUMB( ldr sp, [r0, #32] ) + THUMB( ldr sp, [r0, #28] ) subs r0, r0, r1 @ calculate the delta offset @ if delta is zero, we are @@ -685,8 +685,8 @@ proc_types: W(b) __armv4_mmu_cache_off W(b) __armv4_mmu_cache_flush - .word 0x56056900 - .word 0xffffff00 @ PXA9xx + .word 0x56056930 + .word 0xff0ffff0 @ PXA935 W(b) __armv4_mmu_cache_on W(b) __armv4_mmu_cache_off W(b) __armv4_mmu_cache_flush @@ -697,6 +697,12 @@ proc_types: W(b) __armv4_mmu_cache_off W(b) __armv5tej_mmu_cache_flush + .word 0x56056930 + .word 0xff0ffff0 @ PXA935 + W(b) __armv4_mmu_cache_on + W(b) __armv4_mmu_cache_off + W(b) __armv4_mmu_cache_flush + .word 0x56050000 @ Feroceon .word 0xff0f0000 W(b) __armv4_mmu_cache_on diff --git a/trunk/arch/arm/configs/bcmring_defconfig b/trunk/arch/arm/configs/bcmring_defconfig index 6ac6693299bc..1e12167c89b7 100644 --- a/trunk/arch/arm/configs/bcmring_defconfig +++ b/trunk/arch/arm/configs/bcmring_defconfig @@ -1,13 +1,13 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.34-rc2 -# Mon Mar 29 12:01:41 2010 +# Linux kernel version: 2.6.31-rc3 +# Fri Jul 17 12:07:28 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_HAVE_PROC_CPU=y +CONFIG_MMU=y CONFIG_GENERIC_HARDIRQS=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y @@ -18,7 +18,6 @@ CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_NEED_DMA_MAP_STATE=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -33,12 +32,6 @@ CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_LZO is not set # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -50,22 +43,21 @@ CONFIG_SYSVIPC_SYSCTL=y # # RCU Subsystem # -CONFIG_TREE_RCU=y -# CONFIG_TREE_PREEMPT_RCU is not set -# CONFIG_TINY_RCU is not set -# CONFIG_RCU_TRACE is not set -CONFIG_RCU_FANOUT=32 -# CONFIG_RCU_FANOUT_EXACT is not set +CONFIG_CLASSIC_RCU=y +# CONFIG_TREE_RCU is not set +# CONFIG_PREEMPT_RCU is not set # CONFIG_TREE_RCU_TRACE is not set +# CONFIG_PREEMPT_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 +# CONFIG_GROUP_SCHED is not set +# CONFIG_CGROUPS is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set # CONFIG_BLK_DEV_INITRD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y @@ -83,21 +75,19 @@ CONFIG_FUTEX=y # CONFIG_EVENTFD is not set CONFIG_SHMEM=y # CONFIG_AIO is not set -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_PERF_USE_VMALLOC=y # -# Kernel Performance Events And Counters +# Performance Counters # -CONFIG_PERF_EVENTS=y -CONFIG_PERF_COUNTERS=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_SLUB_DEBUG is not set +# CONFIG_STRIP_ASM_SYMS is not set # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set # CONFIG_PROFILING is not set +# CONFIG_MARKERS is not set CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_HAVE_KPROBES=y @@ -125,53 +115,24 @@ CONFIG_LBDAF=y # IO Schedulers # CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set +# CONFIG_DEFAULT_AS is not set # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set CONFIG_DEFAULT_NOOP=y CONFIG_DEFAULT_IOSCHED="noop" -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -# CONFIG_INLINE_SPIN_UNLOCK is not set -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_UNLOCK is not set -# CONFIG_INLINE_READ_UNLOCK_BH is not set -# CONFIG_INLINE_READ_UNLOCK_IRQ is not set -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_UNLOCK is not set -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set # CONFIG_FREEZER is not set # # System Type # -CONFIG_MMU=y # CONFIG_ARCH_AAEC2000 is not set # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_REALVIEW is not set # CONFIG_ARCH_VERSATILE is not set # CONFIG_ARCH_AT91 is not set -CONFIG_ARCH_BCMRING=y # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_GEMINI is not set # CONFIG_ARCH_EBSA110 is not set @@ -188,7 +149,6 @@ CONFIG_ARCH_BCMRING=y # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_L7200 is not set -# CONFIG_ARCH_DOVE is not set # CONFIG_ARCH_KIRKWOOD is not set # CONFIG_ARCH_LOKI is not set # CONFIG_ARCH_MV78XX0 is not set @@ -197,26 +157,19 @@ CONFIG_ARCH_BCMRING=y # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_W90X900 is not set -# CONFIG_ARCH_NUC93X is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_MSM is not set -# CONFIG_ARCH_SHMOBILE is not set # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set # CONFIG_ARCH_S3C2410 is not set # CONFIG_ARCH_S3C64XX is not set -# CONFIG_ARCH_S5P6440 is not set -# CONFIG_ARCH_S5P6442 is not set -# CONFIG_ARCH_S5PC1XX is not set -# CONFIG_ARCH_S5PV210 is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_U300 is not set -# CONFIG_ARCH_U8500 is not set -# CONFIG_ARCH_NOMADIK is not set # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set +CONFIG_ARCH_BCMRING=y # CONFIG_ARCH_FPGA11107 is not set CONFIG_ARCH_BCM11107=y @@ -232,7 +185,7 @@ CONFIG_CPU_V6=y CONFIG_CPU_32v6K=y CONFIG_CPU_32v6=y CONFIG_CPU_ABRT_EV6=y -CONFIG_CPU_PABRT_V6=y +CONFIG_CPU_PABRT_NOIFAR=y CONFIG_CPU_CACHE_V6=y CONFIG_CPU_CACHE_VIPT=y CONFIG_CPU_COPY_V6=y @@ -248,8 +201,6 @@ CONFIG_ARM_THUMB=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set -CONFIG_ARM_L1_CACHE_SHIFT=5 -CONFIG_CPU_HAS_PMU=y # CONFIG_ARM_ERRATA_411920 is not set CONFIG_COMMON_CLKDEV=y @@ -271,8 +222,6 @@ CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_2G is not set # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 -# CONFIG_PREEMPT_NONE is not set -# CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y CONFIG_HZ=100 CONFIG_AEABI=y @@ -280,7 +229,6 @@ CONFIG_AEABI=y # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_HIGHMEM is not set -CONFIG_HW_PERF_EVENTS=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set @@ -292,7 +240,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y -# CONFIG_KSM is not set +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_ALIGNMENT_TRAP=y CONFIG_UACCESS_WITH_MEMCPY=y @@ -386,9 +335,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_CONNECTOR is not set CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set -# CONFIG_MTD_TESTS is not set CONFIG_MTD_CONCAT=y CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_TESTS is not set # CONFIG_MTD_REDBOOT_PARTS is not set CONFIG_MTD_CMDLINE_PARTS=y # CONFIG_MTD_AFS_PARTS is not set @@ -484,10 +433,6 @@ CONFIG_MTD_NAND_BCM_UMI_HWCS=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set - -# -# DRBD disabled because PROC_FS, INET or CONNECTOR not selected -# # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set @@ -499,7 +444,6 @@ CONFIG_HAVE_IDE=y # # SCSI device support # -CONFIG_SCSI_MOD=y # CONFIG_RAID_ATTRS is not set # CONFIG_SCSI is not set # CONFIG_SCSI_DMA is not set @@ -508,7 +452,6 @@ CONFIG_SCSI_MOD=y # CONFIG_MD is not set # CONFIG_NETDEVICES is not set # CONFIG_ISDN is not set -# CONFIG_PHONE is not set # # Input device support @@ -516,7 +459,6 @@ CONFIG_SCSI_MOD=y CONFIG_INPUT=y # CONFIG_INPUT_FF_MEMLESS is not set # CONFIG_INPUT_POLLDEV is not set -# CONFIG_INPUT_SPARSEKMAP is not set # # Userland interfaces @@ -566,7 +508,6 @@ CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -# CONFIG_SERIAL_TIMBERDALE is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set CONFIG_LEGACY_PTYS=y @@ -578,17 +519,13 @@ CONFIG_LEGACY_PTY_COUNT=64 # CONFIG_TCG_TPM is not set # CONFIG_I2C is not set # CONFIG_SPI is not set - -# -# PPS support -# -# CONFIG_PPS is not set CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_GPIOLIB is not set # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set +# CONFIG_THERMAL_HWMON is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y @@ -604,7 +541,6 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_PASIC3 is not set # CONFIG_MFD_TMIO is not set -# CONFIG_REGULATOR is not set # CONFIG_MEDIA_SUPPORT is not set # @@ -630,17 +566,14 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_USB_SUPPORT is not set # CONFIG_MMC is not set # CONFIG_MEMSTICK is not set -# CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set +# CONFIG_NEW_LEDS is not set CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set +# CONFIG_REGULATOR is not set # CONFIG_UIO is not set - -# -# TI VLYNQ -# # CONFIG_STAGING is not set # @@ -656,12 +589,9 @@ CONFIG_FS_POSIX_ACL=y # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set -# CONFIG_NILFS2_FS is not set # CONFIG_FILE_LOCKING is not set # CONFIG_FSNOTIFY is not set -# CONFIG_DNOTIFY is not set # CONFIG_INOTIFY is not set -# CONFIG_INOTIFY_USER is not set # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set @@ -717,7 +647,6 @@ CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set -# CONFIG_LOGFS is not set # CONFIG_CRAMFS is not set # CONFIG_SQUASHFS is not set # CONFIG_VXFS_FS is not set @@ -728,6 +657,7 @@ CONFIG_JFFS2_RTIME=y # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set +# CONFIG_NILFS2_FS is not set # CONFIG_NETWORK_FILESYSTEMS is not set # @@ -745,12 +675,11 @@ CONFIG_MSDOS_PARTITION=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y -# CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set CONFIG_HEADERS_CHECK=y # CONFIG_DEBUG_KERNEL is not set -CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_MEMORY_INIT is not set CONFIG_FRAME_POINTER=y # CONFIG_RCU_CPU_STALL_DETECTOR is not set @@ -764,7 +693,6 @@ CONFIG_TRACING_SUPPORT=y CONFIG_HAVE_ARCH_KGDB=y # CONFIG_ARM_UNWIND is not set # CONFIG_DEBUG_USER is not set -# CONFIG_OC_ETM is not set # # Security options @@ -772,11 +700,7 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KEYS is not set # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_SMACK is not set -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set -CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_DEFAULT_SECURITY="" +# CONFIG_SECURITY_FILE_CAPABILITIES is not set # CONFIG_CRYPTO is not set # CONFIG_BINARY_PRINTF is not set diff --git a/trunk/arch/arm/configs/imote2_defconfig b/trunk/arch/arm/configs/imote2_defconfig index 21f2bff8a363..95d2becfc664 100644 --- a/trunk/arch/arm/configs/imote2_defconfig +++ b/trunk/arch/arm/configs/imote2_defconfig @@ -1,14 +1,13 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.34-rc2 -# Thu Apr 8 14:49:08 2010 +# Linux kernel version: 2.6.33-rc8 +# Sat Feb 13 21:48:53 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_HAVE_PROC_CPU=y CONFIG_GENERIC_HARDIRQS=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y @@ -20,7 +19,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_ARCH_HAS_CPUFREQ=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_MTD_XIP=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_VECTORS_BASE=0xffff0000 @@ -62,6 +60,11 @@ CONFIG_RCU_FANOUT=32 # CONFIG_TREE_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set # CONFIG_CGROUPS is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y @@ -94,14 +97,10 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_PERF_USE_VMALLOC=y # # Kernel Performance Events And Counters # -# CONFIG_PERF_EVENTS is not set -# CONFIG_PERF_COUNTERS is not set CONFIG_VM_EVENT_COUNTERS=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y @@ -185,7 +184,6 @@ CONFIG_MMU=y # CONFIG_ARCH_REALVIEW is not set # CONFIG_ARCH_VERSATILE is not set # CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_BCMRING is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_GEMINI is not set # CONFIG_ARCH_EBSA110 is not set @@ -195,6 +193,7 @@ CONFIG_MMU=y # CONFIG_ARCH_STMP3XXX is not set # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_NOMADIK is not set # CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set @@ -211,26 +210,21 @@ CONFIG_MMU=y # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_W90X900 is not set -# CONFIG_ARCH_NUC93X is not set # CONFIG_ARCH_PNX4008 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_MSM is not set -# CONFIG_ARCH_SHMOBILE is not set # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set # CONFIG_ARCH_S3C2410 is not set # CONFIG_ARCH_S3C64XX is not set -# CONFIG_ARCH_S5P6440 is not set -# CONFIG_ARCH_S5P6442 is not set # CONFIG_ARCH_S5PC1XX is not set -# CONFIG_ARCH_S5PV210 is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_U300 is not set -# CONFIG_ARCH_U8500 is not set -# CONFIG_ARCH_NOMADIK is not set # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_U8500 is not set # # Intel PXA2xx/PXA3xx Implementations @@ -259,7 +253,6 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_EM_X270 is not set # CONFIG_MACH_EXEDA is not set # CONFIG_MACH_CM_X300 is not set -# CONFIG_MACH_CAPC7117 is not set # CONFIG_ARCH_GUMSTIX is not set CONFIG_MACH_INTELMOTE2=y # CONFIG_MACH_STARGATE2 is not set @@ -282,11 +275,7 @@ CONFIG_MACH_INTELMOTE2=y # CONFIG_PXA_EZX is not set # CONFIG_MACH_MP900C is not set # CONFIG_ARCH_PXA_PALM is not set -# CONFIG_MACH_RAUMFELD_RC is not set -# CONFIG_MACH_RAUMFELD_CONNECTOR is not set -# CONFIG_MACH_RAUMFELD_SPEAKER is not set # CONFIG_PXA_SHARPSL is not set -# CONFIG_MACH_ICONTROL is not set # CONFIG_ARCH_PXA_ESERIES is not set CONFIG_PXA27x=y CONFIG_PXA_SSP=y @@ -313,7 +302,6 @@ CONFIG_ARM_THUMB=y CONFIG_ARM_L1_CACHE_SHIFT=5 CONFIG_IWMMXT=y CONFIG_XSCALE_PMU=y -CONFIG_CPU_HAS_PMU=y CONFIG_COMMON_CLKDEV=y # @@ -364,7 +352,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS2,115200 mem=32M" +CONFIG_CMDLINE="console=tty1 root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=3 ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0 debug" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y @@ -372,8 +360,24 @@ CONFIG_ATAGS_PROC=y # # CPU Power Management # -# CONFIG_CPU_FREQ is not set -# CONFIG_CPU_IDLE is not set +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y # # Floating point emulation @@ -405,7 +409,6 @@ CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y CONFIG_APM_EMULATION=y CONFIG_PM_RUNTIME=y -CONFIG_PM_OPS=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y @@ -413,6 +416,7 @@ CONFIG_NET=y # Networking options # CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set @@ -502,7 +506,6 @@ CONFIG_NF_CT_NETLINK=m CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set -# CONFIG_NETFILTER_XT_TARGET_CT is not set # CONFIG_NETFILTER_XT_TARGET_DSCP is not set CONFIG_NETFILTER_XT_TARGET_HL=m CONFIG_NETFILTER_XT_TARGET_LED=m @@ -619,7 +622,6 @@ CONFIG_IP6_NF_RAW=m # CONFIG_ATM is not set CONFIG_STP=m CONFIG_BRIDGE=m -# CONFIG_BRIDGE_IGMP_SNOOPING is not set # CONFIG_NET_DSA is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set @@ -644,7 +646,32 @@ CONFIG_NET_CLS_ROUTE=y # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set -# CONFIG_BT is not set +CONFIG_BT=y +CONFIG_BT_L2CAP=y +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=y +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=y +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=y + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_H4=y +# CONFIG_BT_HCIUART_BCSP is not set +# CONFIG_BT_HCIUART_LL is not set +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +# CONFIG_BT_ATH3K is not set # CONFIG_AF_RXRPC is not set CONFIG_FIB_RULES=y # CONFIG_WIRELESS is not set @@ -660,8 +687,7 @@ CONFIG_FIB_RULES=y # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_DEVTMPFS is not set CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=m @@ -677,9 +703,9 @@ CONFIG_MTD=y # CONFIG_MTD_CONCAT is not set CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_AFS_PARTS=y -CONFIG_MTD_AR7_PARTS=y +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set # # User Modules And Translation Layers @@ -786,7 +812,6 @@ CONFIG_HAVE_IDE=y # # SCSI device support # -CONFIG_SCSI_MOD=y # CONFIG_RAID_ATTRS is not set # CONFIG_SCSI is not set # CONFIG_SCSI_DMA is not set @@ -940,7 +965,6 @@ CONFIG_SERIAL_PXA=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -# CONFIG_SERIAL_TIMBERDALE is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set CONFIG_LEGACY_PTYS=y @@ -969,7 +993,6 @@ CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_PXA=y # CONFIG_I2C_PXA_SLAVE is not set # CONFIG_I2C_SIMTEC is not set -# CONFIG_I2C_XILINX is not set # # External I2C/SMBus adapter drivers @@ -983,9 +1006,15 @@ CONFIG_I2C_PXA=y # # CONFIG_I2C_PCA_PLATFORM is not set # CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set CONFIG_SPI=y # CONFIG_SPI_DEBUG is not set CONFIG_SPI_MASTER=y @@ -1017,12 +1046,10 @@ CONFIG_GPIO_SYSFS=y # # Memory mapped GPIO expanders: # -# CONFIG_GPIO_IT8761E is not set # # I2C GPIO expanders: # -# CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX732X is not set # CONFIG_GPIO_PCA953X is not set # CONFIG_GPIO_PCF857X is not set @@ -1066,12 +1093,10 @@ CONFIG_SSB_POSSIBLE=y # Multifunction device drivers # # CONFIG_MFD_CORE is not set -# CONFIG_MFD_88PM860X is not set # CONFIG_MFD_SM501 is not set # CONFIG_MFD_ASIC3 is not set # CONFIG_HTC_EGPIO is not set # CONFIG_HTC_PASIC3 is not set -# CONFIG_HTC_I2CPLD is not set # CONFIG_TPS65010 is not set # CONFIG_TWL4030_CORE is not set # CONFIG_MFD_TMIO is not set @@ -1080,25 +1105,22 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_MFD_TC6393XB is not set CONFIG_PMIC_DA903X=y # CONFIG_PMIC_ADP5520 is not set -# CONFIG_MFD_MAX8925 is not set # CONFIG_MFD_WM8400 is not set # CONFIG_MFD_WM831X is not set # CONFIG_MFD_WM8350_I2C is not set -# CONFIG_MFD_WM8994 is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_MC13783 is not set # CONFIG_AB3100_CORE is not set # CONFIG_EZX_PCAP is not set +# CONFIG_MFD_88PM8607 is not set # CONFIG_AB4500_CORE is not set CONFIG_REGULATOR=y CONFIG_REGULATOR_DEBUG=y -# CONFIG_REGULATOR_DUMMY is not set # CONFIG_REGULATOR_FIXED_VOLTAGE is not set CONFIG_REGULATOR_VIRTUAL_CONSUMER=y CONFIG_REGULATOR_USERSPACE_CONSUMER=y # CONFIG_REGULATOR_BQ24022 is not set # CONFIG_REGULATOR_MAX1586 is not set -# CONFIG_REGULATOR_MAX8649 is not set # CONFIG_REGULATOR_MAX8660 is not set CONFIG_REGULATOR_DA903X=y # CONFIG_REGULATOR_LP3971 is not set @@ -1196,7 +1218,6 @@ CONFIG_VIDEO_IR_I2C=y # CONFIG_VIDEO_SAA7191 is not set # CONFIG_VIDEO_TVP514X is not set # CONFIG_VIDEO_TVP5150 is not set -# CONFIG_VIDEO_TVP7002 is not set # CONFIG_VIDEO_VPX3220 is not set # @@ -1243,7 +1264,15 @@ CONFIG_SOC_CAMERA_MT9M111=y CONFIG_VIDEO_PXA27x=y # CONFIG_VIDEO_SH_MOBILE_CEU is not set # CONFIG_V4L_USB_DRIVERS is not set -# CONFIG_RADIO_ADAPTERS is not set +CONFIG_RADIO_ADAPTERS=y +# CONFIG_I2C_SI4713 is not set +# CONFIG_RADIO_SI4713 is not set +# CONFIG_USB_DSBR is not set +# CONFIG_RADIO_SI470X is not set +# CONFIG_USB_MR800 is not set +CONFIG_RADIO_TEA5764=y +CONFIG_RADIO_TEA5764_XTAL=y +# CONFIG_RADIO_TEF6862 is not set # CONFIG_DAB is not set # @@ -1369,6 +1398,8 @@ CONFIG_HID=y # # Special HID drivers # +CONFIG_HID_APPLE=m +# CONFIG_HID_WACOM is not set CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -1446,6 +1477,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set # CONFIG_USB_LED is not set # CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set @@ -1457,6 +1489,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_TEST is not set # CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_VST is not set CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -1496,7 +1529,6 @@ CONFIG_USB_ETH=y # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_CDC_COMPOSITE is not set -# CONFIG_USB_G_NOKIA is not set # CONFIG_USB_G_MULTI is not set # @@ -1523,6 +1555,8 @@ CONFIG_SDIO_UART=m # CONFIG_MMC_PXA=y # CONFIG_MMC_SDHCI is not set +# CONFIG_MMC_AT91 is not set +# CONFIG_MMC_ATMELMCI is not set CONFIG_MMC_SPI=y # CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y @@ -1540,11 +1574,11 @@ CONFIG_LEDS_LP3944=y # CONFIG_LEDS_REGULATOR is not set # CONFIG_LEDS_BD2802 is not set # CONFIG_LEDS_LT3593 is not set -CONFIG_LEDS_TRIGGERS=y # # LED Triggers # +CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_BACKLIGHT=y @@ -1622,7 +1656,7 @@ CONFIG_RTC_INTF_DEV=y # on-CPU RTC drivers # # CONFIG_RTC_DRV_SA1100 is not set -CONFIG_RTC_DRV_PXA=y +# CONFIG_RTC_DRV_PXA is not set # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set @@ -1647,10 +1681,19 @@ CONFIG_EXT3_FS_XATTR=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=m -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=m +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set @@ -1673,7 +1716,9 @@ CONFIG_CUSE=m # # CD-ROM/DVD Filesystems # -# CONFIG_ISO9660_FS is not set +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y # CONFIG_UDF_FS is not set # @@ -1705,14 +1750,12 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS=m CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y -CONFIG_JFFS2_FS_WBUF_VERIFY=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_FS_XATTR=y -CONFIG_JFFS2_FS_POSIX_ACL=y -CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set CONFIG_JFFS2_COMPRESSION_OPTIONS=y CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_LZO=y @@ -1722,7 +1765,6 @@ CONFIG_JFFS2_RUBIN=y CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_JFFS2_CMODE_FAVOURLZO is not set -# CONFIG_LOGFS is not set CONFIG_CRAMFS=m CONFIG_SQUASHFS=m # CONFIG_SQUASHFS_EMBEDDED is not set @@ -1760,7 +1802,6 @@ CONFIG_SUNRPC=y # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set -# CONFIG_CEPH_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set @@ -1854,7 +1895,6 @@ CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=y -# CONFIG_PROVE_RCU is not set CONFIG_LOCKDEP=y # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_LOCKDEP is not set @@ -1878,7 +1918,6 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -# CONFIG_LKDTM is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set @@ -2022,9 +2061,9 @@ CONFIG_CRC32=y CONFIG_CRC7=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=m +CONFIG_LZO_DECOMPRESS=m CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_LZMA=y @@ -2036,4 +2075,3 @@ CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_NLATTR=y -CONFIG_GENERIC_ATOMIC64=y diff --git a/trunk/arch/arm/configs/n8x0_defconfig b/trunk/arch/arm/configs/n8x0_defconfig index 9405e32783de..216ad00948af 100644 --- a/trunk/arch/arm/configs/n8x0_defconfig +++ b/trunk/arch/arm/configs/n8x0_defconfig @@ -1058,6 +1058,7 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set +# CONFIG_NILFS2_FS is not set CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NFS_FS is not set # CONFIG_NFSD is not set diff --git a/trunk/arch/arm/configs/omap_zoom2_defconfig b/trunk/arch/arm/configs/omap_zoom2_defconfig index 881faea03d79..f5c6e11cf189 100644 --- a/trunk/arch/arm/configs/omap_zoom2_defconfig +++ b/trunk/arch/arm/configs/omap_zoom2_defconfig @@ -661,7 +661,7 @@ CONFIG_DEVKMEM=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=1 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y diff --git a/trunk/arch/arm/configs/omap_zoom3_defconfig b/trunk/arch/arm/configs/omap_zoom3_defconfig index 5e55b550a408..ea9a5012d332 100644 --- a/trunk/arch/arm/configs/omap_zoom3_defconfig +++ b/trunk/arch/arm/configs/omap_zoom3_defconfig @@ -680,7 +680,7 @@ CONFIG_DEVKMEM=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=1 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y diff --git a/trunk/arch/arm/configs/rx51_defconfig b/trunk/arch/arm/configs/rx51_defconfig index 473f9e13f08b..45135ffadc57 100644 --- a/trunk/arch/arm/configs/rx51_defconfig +++ b/trunk/arch/arm/configs/rx51_defconfig @@ -59,6 +59,8 @@ CONFIG_FAIR_GROUP_SCHED=y CONFIG_USER_SCHED=y # CONFIG_CGROUP_SCHED is not set # CONFIG_CGROUPS is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y @@ -478,6 +480,7 @@ CONFIG_BT_HIDP=m # CONFIG_BT_HCIBFUSB is not set # CONFIG_BT_HCIVHCI is not set # CONFIG_AF_RXRPC is not set +# CONFIG_PHONET is not set CONFIG_WIRELESS=y CONFIG_CFG80211=y # CONFIG_CFG80211_REG_DEBUG is not set diff --git a/trunk/arch/arm/include/asm/assembler.h b/trunk/arch/arm/include/asm/assembler.h index 6e8f05c8a1c8..00f46d9ce299 100644 --- a/trunk/arch/arm/include/asm/assembler.h +++ b/trunk/arch/arm/include/asm/assembler.h @@ -149,10 +149,10 @@ #define USER(x...) \ 9999: x; \ - .pushsection __ex_table,"a"; \ + .section __ex_table,"a"; \ .align 3; \ .long 9999b,9001f; \ - .popsection + .previous /* * SMP data memory barrier @@ -193,10 +193,10 @@ .error "Unsupported inc macro argument" .endif - .pushsection __ex_table,"a" + .section __ex_table,"a" .align 3 .long 9999b, \abort - .popsection + .previous .endm .macro usracc, instr, reg, ptr, inc, cond, rept, abort @@ -234,10 +234,10 @@ .error "Unsupported inc macro argument" .endif - .pushsection __ex_table,"a" + .section __ex_table,"a" .align 3 .long 9999b, \abort - .popsection + .previous .endr .endm diff --git a/trunk/arch/arm/include/asm/elf.h b/trunk/arch/arm/include/asm/elf.h index 51662feb9f1d..bff056489cc1 100644 --- a/trunk/arch/arm/include/asm/elf.h +++ b/trunk/arch/arm/include/asm/elf.h @@ -9,8 +9,6 @@ #include #include -struct task_struct; - typedef unsigned long elf_greg_t; typedef unsigned long elf_freg_t[3]; diff --git a/trunk/arch/arm/include/asm/futex.h b/trunk/arch/arm/include/asm/futex.h index 540a044153a5..bfcc15929a7f 100644 --- a/trunk/arch/arm/include/asm/futex.h +++ b/trunk/arch/arm/include/asm/futex.h @@ -21,14 +21,14 @@ "2: strt %0, [%2]\n" \ " mov %0, #0\n" \ "3:\n" \ - " .pushsection __ex_table,\"a\"\n" \ + " .section __ex_table,\"a\"\n" \ " .align 3\n" \ " .long 1b, 4f, 2b, 4f\n" \ - " .popsection\n" \ - " .pushsection .fixup,\"ax\"\n" \ + " .previous\n" \ + " .section .fixup,\"ax\"\n" \ "4: mov %0, %4\n" \ " b 3b\n" \ - " .popsection" \ + " .previous" \ : "=&r" (ret), "=&r" (oldval) \ : "r" (uaddr), "r" (oparg), "Ir" (-EFAULT) \ : "cc", "memory") @@ -102,14 +102,14 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval) " it eq @ explicit IT needed for the 2b label\n" "2: streqt %2, [%3]\n" "3:\n" - " .pushsection __ex_table,\"a\"\n" + " .section __ex_table,\"a\"\n" " .align 3\n" " .long 1b, 4f, 2b, 4f\n" - " .popsection\n" - " .pushsection .fixup,\"ax\"\n" + " .previous\n" + " .section .fixup,\"ax\"\n" "4: mov %0, %4\n" " b 3b\n" - " .popsection" + " .previous" : "=&r" (val) : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT) : "cc", "memory"); diff --git a/trunk/arch/arm/include/asm/highmem.h b/trunk/arch/arm/include/asm/highmem.h index feb988a7ec37..7f36d00600b4 100644 --- a/trunk/arch/arm/include/asm/highmem.h +++ b/trunk/arch/arm/include/asm/highmem.h @@ -11,11 +11,7 @@ #define kmap_prot PAGE_KERNEL -#define flush_cache_kmaps() \ - do { \ - if (cache_is_vivt()) \ - flush_cache_all(); \ - } while (0) +#define flush_cache_kmaps() flush_cache_all() extern pte_t *pkmap_page_table; @@ -25,20 +21,11 @@ extern void *kmap_high(struct page *page); extern void *kmap_high_get(struct page *page); extern void kunmap_high(struct page *page); -extern void *kmap_high_l1_vipt(struct page *page, pte_t *saved_pte); -extern void kunmap_high_l1_vipt(struct page *page, pte_t saved_pte); - -/* - * The following functions are already defined by - * when CONFIG_HIGHMEM is not set. - */ -#ifdef CONFIG_HIGHMEM extern void *kmap(struct page *page); extern void kunmap(struct page *page); extern void *kmap_atomic(struct page *page, enum km_type type); extern void kunmap_atomic(void *kvaddr, enum km_type type); extern void *kmap_atomic_pfn(unsigned long pfn, enum km_type type); extern struct page *kmap_atomic_to_page(const void *ptr); -#endif #endif diff --git a/trunk/arch/arm/include/asm/kmap_types.h b/trunk/arch/arm/include/asm/kmap_types.h index c4b2ea3fbe42..c019949a5189 100644 --- a/trunk/arch/arm/include/asm/kmap_types.h +++ b/trunk/arch/arm/include/asm/kmap_types.h @@ -18,7 +18,6 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, KM_SOFTIRQ1, - KM_L1_CACHE, KM_L2_CACHE, KM_TYPE_NR }; diff --git a/trunk/arch/arm/include/asm/uaccess.h b/trunk/arch/arm/include/asm/uaccess.h index 33e4a48fe103..1d6bd40a4322 100644 --- a/trunk/arch/arm/include/asm/uaccess.h +++ b/trunk/arch/arm/include/asm/uaccess.h @@ -229,16 +229,16 @@ do { \ __asm__ __volatile__( \ "1: ldrbt %1,[%2]\n" \ "2:\n" \ - " .pushsection .fixup,\"ax\"\n" \ + " .section .fixup,\"ax\"\n" \ " .align 2\n" \ "3: mov %0, %3\n" \ " mov %1, #0\n" \ " b 2b\n" \ - " .popsection\n" \ - " .pushsection __ex_table,\"a\"\n" \ + " .previous\n" \ + " .section __ex_table,\"a\"\n" \ " .align 3\n" \ " .long 1b, 3b\n" \ - " .popsection" \ + " .previous" \ : "+r" (err), "=&r" (x) \ : "r" (addr), "i" (-EFAULT) \ : "cc") @@ -265,16 +265,16 @@ do { \ __asm__ __volatile__( \ "1: ldrt %1,[%2]\n" \ "2:\n" \ - " .pushsection .fixup,\"ax\"\n" \ + " .section .fixup,\"ax\"\n" \ " .align 2\n" \ "3: mov %0, %3\n" \ " mov %1, #0\n" \ " b 2b\n" \ - " .popsection\n" \ - " .pushsection __ex_table,\"a\"\n" \ + " .previous\n" \ + " .section __ex_table,\"a\"\n" \ " .align 3\n" \ " .long 1b, 3b\n" \ - " .popsection" \ + " .previous" \ : "+r" (err), "=&r" (x) \ : "r" (addr), "i" (-EFAULT) \ : "cc") @@ -310,15 +310,15 @@ do { \ __asm__ __volatile__( \ "1: strbt %1,[%2]\n" \ "2:\n" \ - " .pushsection .fixup,\"ax\"\n" \ + " .section .fixup,\"ax\"\n" \ " .align 2\n" \ "3: mov %0, %3\n" \ " b 2b\n" \ - " .popsection\n" \ - " .pushsection __ex_table,\"a\"\n" \ + " .previous\n" \ + " .section __ex_table,\"a\"\n" \ " .align 3\n" \ " .long 1b, 3b\n" \ - " .popsection" \ + " .previous" \ : "+r" (err) \ : "r" (x), "r" (__pu_addr), "i" (-EFAULT) \ : "cc") @@ -343,15 +343,15 @@ do { \ __asm__ __volatile__( \ "1: strt %1,[%2]\n" \ "2:\n" \ - " .pushsection .fixup,\"ax\"\n" \ + " .section .fixup,\"ax\"\n" \ " .align 2\n" \ "3: mov %0, %3\n" \ " b 2b\n" \ - " .popsection\n" \ - " .pushsection __ex_table,\"a\"\n" \ + " .previous\n" \ + " .section __ex_table,\"a\"\n" \ " .align 3\n" \ " .long 1b, 3b\n" \ - " .popsection" \ + " .previous" \ : "+r" (err) \ : "r" (x), "r" (__pu_addr), "i" (-EFAULT) \ : "cc") @@ -371,16 +371,16 @@ do { \ THUMB( "1: strt " __reg_oper1 ", [%1]\n" ) \ THUMB( "2: strt " __reg_oper0 ", [%1, #4]\n" ) \ "3:\n" \ - " .pushsection .fixup,\"ax\"\n" \ + " .section .fixup,\"ax\"\n" \ " .align 2\n" \ "4: mov %0, %3\n" \ " b 3b\n" \ - " .popsection\n" \ - " .pushsection __ex_table,\"a\"\n" \ + " .previous\n" \ + " .section __ex_table,\"a\"\n" \ " .align 3\n" \ " .long 1b, 4b\n" \ " .long 2b, 4b\n" \ - " .popsection" \ + " .previous" \ : "+r" (err), "+r" (__pu_addr) \ : "r" (x), "i" (-EFAULT) \ : "cc") diff --git a/trunk/arch/arm/include/asm/ucontext.h b/trunk/arch/arm/include/asm/ucontext.h index 47f023aa8495..bf65e9f4525d 100644 --- a/trunk/arch/arm/include/asm/ucontext.h +++ b/trunk/arch/arm/include/asm/ucontext.h @@ -59,22 +59,23 @@ struct iwmmxt_sigframe { #endif /* CONFIG_IWMMXT */ #ifdef CONFIG_VFP +#if __LINUX_ARM_ARCH__ < 6 +/* For ARM pre-v6, we use fstmiax and fldmiax. This adds one extra + * word after the registers, and a word of padding at the end for + * alignment. */ #define VFP_MAGIC 0x56465001 +#define VFP_STORAGE_SIZE 152 +#else +#define VFP_MAGIC 0x56465002 +#define VFP_STORAGE_SIZE 144 +#endif struct vfp_sigframe { unsigned long magic; unsigned long size; - struct user_vfp ufp; - struct user_vfp_exc ufp_exc; -} __attribute__((__aligned__(8))); - -/* - * 8 byte for magic and size, 264 byte for ufp, 12 bytes for ufp_exc, - * 4 bytes padding. - */ -#define VFP_STORAGE_SIZE sizeof(struct vfp_sigframe) - + union vfp_state storage; +}; #endif /* CONFIG_VFP */ /* @@ -90,7 +91,7 @@ struct aux_sigframe { #ifdef CONFIG_IWMMXT struct iwmmxt_sigframe iwmmxt; #endif -#ifdef CONFIG_VFP +#if 0 && defined CONFIG_VFP /* Not yet saved. */ struct vfp_sigframe vfp; #endif /* Something that isn't a valid magic number for any coprocessor. */ diff --git a/trunk/arch/arm/include/asm/user.h b/trunk/arch/arm/include/asm/user.h index 05ac4b06876a..df95e050f9dd 100644 --- a/trunk/arch/arm/include/asm/user.h +++ b/trunk/arch/arm/include/asm/user.h @@ -83,21 +83,11 @@ struct user{ /* * User specific VFP registers. If only VFPv2 is present, registers 16 to 31 - * are ignored by the ptrace system call and the signal handler. + * are ignored by the ptrace system call. */ struct user_vfp { unsigned long long fpregs[32]; unsigned long fpscr; }; -/* - * VFP exception registers exposed to user space during signal delivery. - * Fields not relavant to the current VFP architecture are ignored. - */ -struct user_vfp_exc { - unsigned long fpexc; - unsigned long fpinst; - unsigned long fpinst2; -}; - #endif /* _ARM_USER_H */ diff --git a/trunk/arch/arm/kernel/entry-armv.S b/trunk/arch/arm/kernel/entry-armv.S index 7ee48e7f8f31..6c5cf369183b 100644 --- a/trunk/arch/arm/kernel/entry-armv.S +++ b/trunk/arch/arm/kernel/entry-armv.S @@ -523,16 +523,16 @@ ENDPROC(__und_usr) /* * The out of line fixup for the ldrt above. */ - .pushsection .fixup, "ax" + .section .fixup, "ax" 4: mov pc, r9 - .popsection - .pushsection __ex_table,"a" + .previous + .section __ex_table,"a" .long 1b, 4b #if __LINUX_ARM_ARCH__ >= 7 .long 2b, 4b .long 3b, 4b #endif - .popsection + .previous /* * Check whether the instruction is a co-processor instruction. @@ -676,10 +676,10 @@ do_fpe: * lr = unrecognised FP instruction return address */ - .pushsection .data + .data ENTRY(fp_enter) .word no_fp - .popsection + .previous ENTRY(no_fp) mov pc, lr diff --git a/trunk/arch/arm/kernel/ftrace.c b/trunk/arch/arm/kernel/ftrace.c index 0298286ad4ad..c63842766229 100644 --- a/trunk/arch/arm/kernel/ftrace.c +++ b/trunk/arch/arm/kernel/ftrace.c @@ -62,15 +62,15 @@ int ftrace_modify_code(unsigned long pc, unsigned char *old_code, " movne %0, #2 \n" "3:\n" - ".pushsection .fixup, \"ax\"\n" + ".section .fixup, \"ax\"\n" "4: mov %0, #1 \n" " b 3b \n" - ".popsection\n" + ".previous\n" - ".pushsection __ex_table, \"a\"\n" + ".section __ex_table, \"a\"\n" " .long 1b, 4b \n" " .long 2b, 4b \n" - ".popsection\n" + ".previous\n" : "=r"(err), "=r"(replaced) : "r"(pc), "r"(new), "r"(old), "0"(err), "1"(replaced) diff --git a/trunk/arch/arm/kernel/process.c b/trunk/arch/arm/kernel/process.c index acf5e6fdb6dc..0e12e0acbf26 100644 --- a/trunk/arch/arm/kernel/process.c +++ b/trunk/arch/arm/kernel/process.c @@ -355,7 +355,7 @@ EXPORT_SYMBOL(dump_fpu); * the thread function, and r3 points to the exit function. */ extern void kernel_thread_helper(void); -asm( ".pushsection .text\n" +asm( ".section .text\n" " .align\n" " .type kernel_thread_helper, #function\n" "kernel_thread_helper:\n" @@ -363,11 +363,11 @@ asm( ".pushsection .text\n" " mov lr, r3\n" " mov pc, r2\n" " .size kernel_thread_helper, . - kernel_thread_helper\n" -" .popsection"); +" .previous"); #ifdef CONFIG_ARM_UNWIND extern void kernel_thread_exit(long code); -asm( ".pushsection .text\n" +asm( ".section .text\n" " .align\n" " .type kernel_thread_exit, #function\n" "kernel_thread_exit:\n" @@ -377,7 +377,7 @@ asm( ".pushsection .text\n" " nop\n" " .fnend\n" " .size kernel_thread_exit, . - kernel_thread_exit\n" -" .popsection"); +" .previous"); #else #define kernel_thread_exit do_exit #endif diff --git a/trunk/arch/arm/kernel/signal.c b/trunk/arch/arm/kernel/signal.c index 907d5a620bca..e7714f367eb8 100644 --- a/trunk/arch/arm/kernel/signal.c +++ b/trunk/arch/arm/kernel/signal.c @@ -18,7 +18,6 @@ #include #include #include -#include #include "ptrace.h" #include "signal.h" @@ -176,90 +175,6 @@ static int restore_iwmmxt_context(struct iwmmxt_sigframe *frame) #endif -#ifdef CONFIG_VFP - -static int preserve_vfp_context(struct vfp_sigframe __user *frame) -{ - struct thread_info *thread = current_thread_info(); - struct vfp_hard_struct *h = &thread->vfpstate.hard; - const unsigned long magic = VFP_MAGIC; - const unsigned long size = VFP_STORAGE_SIZE; - int err = 0; - - vfp_sync_hwstate(thread); - __put_user_error(magic, &frame->magic, err); - __put_user_error(size, &frame->size, err); - - /* - * Copy the floating point registers. There can be unused - * registers see asm/hwcap.h for details. - */ - err |= __copy_to_user(&frame->ufp.fpregs, &h->fpregs, - sizeof(h->fpregs)); - /* - * Copy the status and control register. - */ - __put_user_error(h->fpscr, &frame->ufp.fpscr, err); - - /* - * Copy the exception registers. - */ - __put_user_error(h->fpexc, &frame->ufp_exc.fpexc, err); - __put_user_error(h->fpinst, &frame->ufp_exc.fpinst, err); - __put_user_error(h->fpinst2, &frame->ufp_exc.fpinst2, err); - - return err ? -EFAULT : 0; -} - -static int restore_vfp_context(struct vfp_sigframe __user *frame) -{ - struct thread_info *thread = current_thread_info(); - struct vfp_hard_struct *h = &thread->vfpstate.hard; - unsigned long magic; - unsigned long size; - unsigned long fpexc; - int err = 0; - - __get_user_error(magic, &frame->magic, err); - __get_user_error(size, &frame->size, err); - - if (err) - return -EFAULT; - if (magic != VFP_MAGIC || size != VFP_STORAGE_SIZE) - return -EINVAL; - - /* - * Copy the floating point registers. There can be unused - * registers see asm/hwcap.h for details. - */ - err |= __copy_from_user(&h->fpregs, &frame->ufp.fpregs, - sizeof(h->fpregs)); - /* - * Copy the status and control register. - */ - __get_user_error(h->fpscr, &frame->ufp.fpscr, err); - - /* - * Sanitise and restore the exception registers. - */ - __get_user_error(fpexc, &frame->ufp_exc.fpexc, err); - /* Ensure the VFP is enabled. */ - fpexc |= FPEXC_EN; - /* Ensure FPINST2 is invalid and the exception flag is cleared. */ - fpexc &= ~(FPEXC_EX | FPEXC_FP2V); - h->fpexc = fpexc; - - __get_user_error(h->fpinst, &frame->ufp_exc.fpinst, err); - __get_user_error(h->fpinst2, &frame->ufp_exc.fpinst2, err); - - if (!err) - vfp_flush_hwstate(thread); - - return err ? -EFAULT : 0; -} - -#endif - /* * Do a signal return; undo the signal stack. These are aligned to 64-bit. */ @@ -318,8 +233,8 @@ static int restore_sigframe(struct pt_regs *regs, struct sigframe __user *sf) err |= restore_iwmmxt_context(&aux->iwmmxt); #endif #ifdef CONFIG_VFP - if (err == 0) - err |= restore_vfp_context(&aux->vfp); +// if (err == 0) +// err |= vfp_restore_state(&sf->aux.vfp); #endif return err; @@ -433,8 +348,8 @@ setup_sigframe(struct sigframe __user *sf, struct pt_regs *regs, sigset_t *set) err |= preserve_iwmmxt_context(&aux->iwmmxt); #endif #ifdef CONFIG_VFP - if (err == 0) - err |= preserve_vfp_context(&aux->vfp); +// if (err == 0) +// err |= vfp_save_state(&sf->aux.vfp); #endif __put_user_error(0, &aux->end_magic, err); diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c index a01194e583ff..577543f3857f 100644 --- a/trunk/arch/arm/kernel/smp.c +++ b/trunk/arch/arm/kernel/smp.c @@ -86,12 +86,6 @@ int __cpuinit __cpu_up(unsigned int cpu) return PTR_ERR(idle); } ci->idle = idle; - } else { - /* - * Since this idle thread is being re-used, call - * init_idle() to reinitialize the thread structure. - */ - init_idle(idle, cpu); } /* diff --git a/trunk/arch/arm/lib/backtrace.S b/trunk/arch/arm/lib/backtrace.S index a673297b0cf1..aaf7220d9e30 100644 --- a/trunk/arch/arm/lib/backtrace.S +++ b/trunk/arch/arm/lib/backtrace.S @@ -110,13 +110,13 @@ no_frame: ldmfd sp!, {r4 - r8, pc} ENDPROC(__backtrace) ENDPROC(c_backtrace) - .pushsection __ex_table,"a" + .section __ex_table,"a" .align 3 .long 1001b, 1006b .long 1002b, 1006b .long 1003b, 1006b .long 1004b, 1006b - .popsection + .previous #define instr r4 #define reg r5 diff --git a/trunk/arch/arm/lib/clear_user.S b/trunk/arch/arm/lib/clear_user.S index 5e3f99620c04..1279abd8b886 100644 --- a/trunk/arch/arm/lib/clear_user.S +++ b/trunk/arch/arm/lib/clear_user.S @@ -46,8 +46,8 @@ USER( strnebt r2, [r0]) ldmfd sp!, {r1, pc} ENDPROC(__clear_user) - .pushsection .fixup,"ax" + .section .fixup,"ax" .align 0 9001: ldmfd sp!, {r0, pc} - .popsection + .previous diff --git a/trunk/arch/arm/lib/copy_from_user.S b/trunk/arch/arm/lib/copy_from_user.S index 66a477a3e3cc..e4fe124acedc 100644 --- a/trunk/arch/arm/lib/copy_from_user.S +++ b/trunk/arch/arm/lib/copy_from_user.S @@ -90,7 +90,7 @@ ENTRY(__copy_from_user) ENDPROC(__copy_from_user) - .pushsection .fixup,"ax" + .section .fixup,"ax" .align 0 copy_abort_preamble ldmfd sp!, {r1, r2} @@ -100,5 +100,5 @@ ENDPROC(__copy_from_user) bl __memzero ldr r0, [sp], #4 copy_abort_end - .popsection + .previous diff --git a/trunk/arch/arm/lib/copy_to_user.S b/trunk/arch/arm/lib/copy_to_user.S index 027b69bdbad1..1a71e1584442 100644 --- a/trunk/arch/arm/lib/copy_to_user.S +++ b/trunk/arch/arm/lib/copy_to_user.S @@ -94,12 +94,12 @@ WEAK(__copy_to_user) ENDPROC(__copy_to_user) - .pushsection .fixup,"ax" + .section .fixup,"ax" .align 0 copy_abort_preamble ldmfd sp!, {r1, r2, r3} sub r0, r0, r1 rsb r0, r0, r2 copy_abort_end - .popsection + .previous diff --git a/trunk/arch/arm/lib/csumpartialcopyuser.S b/trunk/arch/arm/lib/csumpartialcopyuser.S index 59ff6fdc1e63..fd0e9dcd9fdc 100644 --- a/trunk/arch/arm/lib/csumpartialcopyuser.S +++ b/trunk/arch/arm/lib/csumpartialcopyuser.S @@ -68,7 +68,7 @@ * so properly, we would have to add in whatever registers were loaded before * the fault, which, with the current asm above is not predictable. */ - .pushsection .fixup,"ax" + .section .fixup,"ax" .align 4 9001: mov r4, #-EFAULT ldr r5, [fp, #4] @ *err_ptr @@ -80,4 +80,4 @@ strneb r0, [r1], #1 bne 9002b load_regs - .popsection + .previous diff --git a/trunk/arch/arm/lib/getuser.S b/trunk/arch/arm/lib/getuser.S index b1631a7dbe75..a1814d927122 100644 --- a/trunk/arch/arm/lib/getuser.S +++ b/trunk/arch/arm/lib/getuser.S @@ -64,9 +64,9 @@ __get_user_bad: mov pc, lr ENDPROC(__get_user_bad) -.pushsection __ex_table, "a" +.section __ex_table, "a" .long 1b, __get_user_bad .long 2b, __get_user_bad .long 3b, __get_user_bad .long 4b, __get_user_bad -.popsection +.previous diff --git a/trunk/arch/arm/lib/putuser.S b/trunk/arch/arm/lib/putuser.S index 5a01a23c6c06..02fedbf07c0d 100644 --- a/trunk/arch/arm/lib/putuser.S +++ b/trunk/arch/arm/lib/putuser.S @@ -81,11 +81,11 @@ __put_user_bad: mov pc, lr ENDPROC(__put_user_bad) -.pushsection __ex_table, "a" +.section __ex_table, "a" .long 1b, __put_user_bad .long 2b, __put_user_bad .long 3b, __put_user_bad .long 4b, __put_user_bad .long 5b, __put_user_bad .long 6b, __put_user_bad -.popsection +.previous diff --git a/trunk/arch/arm/lib/strncpy_from_user.S b/trunk/arch/arm/lib/strncpy_from_user.S index f202d7bd1647..1c9814f346c6 100644 --- a/trunk/arch/arm/lib/strncpy_from_user.S +++ b/trunk/arch/arm/lib/strncpy_from_user.S @@ -33,11 +33,11 @@ ENTRY(__strncpy_from_user) mov pc, lr ENDPROC(__strncpy_from_user) - .pushsection .fixup,"ax" + .section .fixup,"ax" .align 0 9001: mov r3, #0 strb r3, [r0, #0] @ null terminate mov r0, #-EFAULT mov pc, lr - .popsection + .previous diff --git a/trunk/arch/arm/lib/strnlen_user.S b/trunk/arch/arm/lib/strnlen_user.S index 0ecbb459c4f1..7855b2906659 100644 --- a/trunk/arch/arm/lib/strnlen_user.S +++ b/trunk/arch/arm/lib/strnlen_user.S @@ -33,8 +33,8 @@ ENTRY(__strnlen_user) mov pc, lr ENDPROC(__strnlen_user) - .pushsection .fixup,"ax" + .section .fixup,"ax" .align 0 9001: mov r0, #0 mov pc, lr - .popsection + .previous diff --git a/trunk/arch/arm/lib/uaccess.S b/trunk/arch/arm/lib/uaccess.S index fee9f6f88adb..ffdd27498cee 100644 --- a/trunk/arch/arm/lib/uaccess.S +++ b/trunk/arch/arm/lib/uaccess.S @@ -279,10 +279,10 @@ USER( strgtbt r3, [r0], #1) @ May fault b .Lc2u_finished ENDPROC(__copy_to_user) - .pushsection .fixup,"ax" + .section .fixup,"ax" .align 0 9001: ldmfd sp!, {r0, r4 - r7, pc} - .popsection + .previous /* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n); * Purpose : copy a block from user memory to kernel memory @@ -545,7 +545,7 @@ USER( ldrgtbt r3, [r1], #1) @ May fault b .Lcfu_finished ENDPROC(__copy_from_user) - .pushsection .fixup,"ax" + .section .fixup,"ax" .align 0 /* * We took an exception. r0 contains a pointer to @@ -559,5 +559,5 @@ ENDPROC(__copy_from_user) blne __memzero mov r0, r4 ldmfd sp!, {r4 - r7, pc} - .popsection + .previous diff --git a/trunk/arch/arm/mach-at91/Makefile b/trunk/arch/arm/mach-at91/Makefile index d4004557532a..027dd570dcc3 100644 --- a/trunk/arch/arm/mach-at91/Makefile +++ b/trunk/arch/arm/mach-at91/Makefile @@ -16,8 +16,8 @@ obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261.o at91sam926x_time.o at91sam9261_d obj-$(CONFIG_ARCH_AT91SAM9G10) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o sam9_smc.o obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o sam9_smc.o -obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o -obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45.o at91sam926x_time.o at91sam9g45_devices.o sam9_smc.o +obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o + obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45.o at91sam926x_time.o at91sam9g45_devices.o sam9_smc.o obj-$(CONFIG_ARCH_AT91CAP9) += at91cap9.o at91sam926x_time.o at91cap9_devices.o sam9_smc.o obj-$(CONFIG_ARCH_AT572D940HF) += at572d940hf.o at91sam926x_time.o at572d940hf_devices.o sam9_smc.o obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o diff --git a/trunk/arch/arm/mach-at91/pm_slowclock.S b/trunk/arch/arm/mach-at91/pm_slowclock.S index 9c5b48e68a71..987fab3d846a 100644 --- a/trunk/arch/arm/mach-at91/pm_slowclock.S +++ b/trunk/arch/arm/mach-at91/pm_slowclock.S @@ -175,6 +175,8 @@ ENTRY(at91_slow_clock) orr r3, r3, #(1 << 29) /* bit 29 always set */ str r3, [r1, #(AT91_CKGR_PLLAR - AT91_PMC)] + wait_pllalock + /* Save PLLB setting and disable it */ ldr r3, [r1, #(AT91_CKGR_PLLBR - AT91_PMC)] str r3, .saved_pllbr @@ -182,6 +184,8 @@ ENTRY(at91_slow_clock) mov r3, #AT91_PMC_PLLCOUNT str r3, [r1, #(AT91_CKGR_PLLBR - AT91_PMC)] + wait_pllblock + /* Turn off the main oscillator */ ldr r3, [r1, #(AT91_CKGR_MOR - AT91_PMC)] bic r3, r3, #AT91_PMC_MOSCEN @@ -201,25 +205,13 @@ ENTRY(at91_slow_clock) ldr r3, .saved_pllbr str r3, [r1, #(AT91_CKGR_PLLBR - AT91_PMC)] - tst r3, #(AT91_PMC_MUL & 0xff0000) - bne 1f - tst r3, #(AT91_PMC_MUL & ~0xff0000) - beq 2f -1: wait_pllblock -2: /* Restore PLLA setting */ ldr r3, .saved_pllar str r3, [r1, #(AT91_CKGR_PLLAR - AT91_PMC)] - tst r3, #(AT91_PMC_MUL & 0xff0000) - bne 3f - tst r3, #(AT91_PMC_MUL & ~0xff0000) - beq 4f -3: wait_pllalock -4: #ifdef SLOWDOWN_MASTER_CLOCK /* diff --git a/trunk/arch/arm/mach-bcmring/dma.c b/trunk/arch/arm/mach-bcmring/dma.c index 29c0a911df26..2ccf670ce1ac 100644 --- a/trunk/arch/arm/mach-bcmring/dma.c +++ b/trunk/arch/arm/mach-bcmring/dma.c @@ -2221,15 +2221,11 @@ EXPORT_SYMBOL(dma_map_create_descriptor_ring); int dma_unmap(DMA_MemMap_t *memMap, /* Stores state information about the map */ int dirtied /* non-zero if any of the pages were modified */ ) { - - int rc = 0; int regionIdx; int segmentIdx; DMA_Region_t *region; DMA_Segment_t *segment; - down(&memMap->lock); - for (regionIdx = 0; regionIdx < memMap->numRegionsUsed; regionIdx++) { region = &memMap->region[regionIdx]; @@ -2243,8 +2239,7 @@ int dma_unmap(DMA_MemMap_t *memMap, /* Stores state information about the map */ printk(KERN_ERR "%s: vmalloc'd pages are not yet supported\n", __func__); - rc = -EINVAL; - goto out; + return -EINVAL; } case DMA_MEM_TYPE_KMALLOC: @@ -2281,8 +2276,7 @@ int dma_unmap(DMA_MemMap_t *memMap, /* Stores state information about the map */ printk(KERN_ERR "%s: Unsupported memory type: %d\n", __func__, region->memType); - rc = -EINVAL; - goto out; + return -EINVAL; } } @@ -2320,10 +2314,9 @@ int dma_unmap(DMA_MemMap_t *memMap, /* Stores state information about the map */ memMap->numRegionsUsed = 0; memMap->inUse = 0; -out: up(&memMap->lock); - return rc; + return 0; } EXPORT_SYMBOL(dma_unmap); diff --git a/trunk/arch/arm/mach-davinci/dm365.c b/trunk/arch/arm/mach-davinci/dm365.c index 0d6ee583f65c..27772e18e45b 100644 --- a/trunk/arch/arm/mach-davinci/dm365.c +++ b/trunk/arch/arm/mach-davinci/dm365.c @@ -758,6 +758,7 @@ static u8 dm365_default_priorities[DAVINCI_N_AINTC_IRQ] = { [IRQ_MMCINT] = 7, [IRQ_DM365_MMCINT1] = 7, [IRQ_DM365_PWMINT3] = 7, + [IRQ_DDRINT] = 4, [IRQ_AEMIFINT] = 2, [IRQ_DM365_SDIOINT1] = 2, [IRQ_TINT0_TINT12] = 7, diff --git a/trunk/arch/arm/mach-davinci/dma.c b/trunk/arch/arm/mach-davinci/dma.c index 53137387aee1..02d939853b88 100644 --- a/trunk/arch/arm/mach-davinci/dma.c +++ b/trunk/arch/arm/mach-davinci/dma.c @@ -1267,8 +1267,7 @@ int edma_start(unsigned channel) /* EDMA channel with event association */ pr_debug("EDMA: ER%d %08x\n", j, edma_shadow0_read_array(ctlr, SH_ER, j)); - /* Clear any pending event or error */ - edma_write_array(ctlr, EDMA_ECR, j, mask); + /* Clear any pending error */ edma_write_array(ctlr, EDMA_EMCR, j, mask); /* Clear any SER */ edma_shadow0_write_array(ctlr, SH_SECR, j, mask); diff --git a/trunk/arch/arm/mach-davinci/include/mach/da8xx.h b/trunk/arch/arm/mach-davinci/include/mach/da8xx.h index 03acfd39042b..cc9be7fee627 100644 --- a/trunk/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/trunk/arch/arm/mach-davinci/include/mach/da8xx.h @@ -3,7 +3,7 @@ * * Author: Mark A. Greer * - * 2007, 2009-2010 (c) MontaVista Software, Inc. This file is licensed under + * 2007, 2009 (c) MontaVista Software, Inc. This file is licensed under * the terms of the GNU General Public License version 2. This program * is licensed "as is" without any warranty of any kind, whether express * or implied. @@ -13,9 +13,7 @@ #include