From 97da38c49be3b8c67355b0b84ab9da2d50963ab5 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 19 Oct 2010 12:39:48 +0100 Subject: [PATCH] --- yaml --- r: 225776 b: refs/heads/master c: 2686b4b408c25349aee7b35558722d5730d67224 h: refs/heads/master v: v3 --- [refs] | 2 +- .../ABI/obsolete/proc-pid-oom_adj | 22 - trunk/Documentation/ABI/testing/sysfs-bus-rbd | 83 - .../ABI/testing/sysfs-platform-asus-laptop | 16 +- .../ABI/testing/sysfs-platform-eeepc-wmi | 10 - trunk/Documentation/DocBook/sh.tmpl | 4 + trunk/Documentation/DocBook/uio-howto.tmpl | 6 +- trunk/Documentation/accounting/getdelays.c | 1 - trunk/Documentation/arm/OMAP/DSS | 7 +- trunk/Documentation/block/switching-sched.txt | 8 +- .../development-process/2.Process | 33 +- .../Documentation/driver-model/interface.txt | 129 + trunk/Documentation/edac.txt | 8 +- trunk/Documentation/fb/00-INDEX | 32 +- .../feature-removal-schedule.txt | 10 - trunk/Documentation/filesystems/Locking | 219 +- .../configfs/configfs_example_explicit.c | 2 +- trunk/Documentation/filesystems/vfs.txt | 16 +- .../xfs-delayed-logging-design.txt | 11 + trunk/Documentation/gpio.txt | 10 - trunk/Documentation/hwmon/lm93 | 2 +- trunk/Documentation/hwmon/max6650 | 2 +- trunk/Documentation/kernel-parameters.txt | 14 +- trunk/Documentation/leds-class.txt | 21 +- trunk/Documentation/leds/leds-lp5521.txt | 88 - trunk/Documentation/leds/leds-lp5523.txt | 83 - trunk/Documentation/networking/ip-sysctl.txt | 10 - trunk/Documentation/power/opp.txt | 3 - trunk/Documentation/power/runtime_pm.txt | 4 +- trunk/Documentation/rbtree.txt | 4 +- trunk/Documentation/scsi/scsi_mid_low_api.txt | 59 +- trunk/Documentation/sh/clk.txt | 32 + trunk/Documentation/sysctl/kernel.txt | 14 - .../postprocess/trace-vmscan-postprocess.pl | 11 +- trunk/MAINTAINERS | 80 +- trunk/Makefile | 2 +- trunk/arch/arm/Kconfig | 62 +- trunk/arch/arm/boot/Makefile | 5 + trunk/arch/arm/boot/bootp/init.S | 2 - trunk/arch/arm/boot/compressed/Makefile | 4 - .../arch/arm/boot/compressed/head-shmobile.S | 53 - trunk/arch/arm/boot/compressed/head.S | 15 +- trunk/arch/arm/boot/compressed/vmlinux.lds.in | 2 +- trunk/arch/arm/common/Makefile | 1 - trunk/arch/arm/common/gic.c | 119 +- trunk/arch/arm/common/it8152.c | 1 - trunk/arch/arm/configs/at91rm9200_defconfig | 341 -- trunk/arch/arm/configs/at91rm9200dk_defconfig | 72 + trunk/arch/arm/configs/at91rm9200ek_defconfig | 73 + trunk/arch/arm/configs/ateb9200_defconfig | 131 + trunk/arch/arm/configs/carmeva_defconfig | 47 + trunk/arch/arm/configs/cpuat91_defconfig | 112 + trunk/arch/arm/configs/csb337_defconfig | 104 + trunk/arch/arm/configs/csb637_defconfig | 98 + trunk/arch/arm/configs/ecbat91_defconfig | 99 + trunk/arch/arm/configs/kafa_defconfig | 61 + trunk/arch/arm/configs/kb9202_defconfig | 127 + trunk/arch/arm/configs/onearm_defconfig | 80 + trunk/arch/arm/configs/picotux200_defconfig | 242 ++ trunk/arch/arm/configs/yl9200_defconfig | 137 + trunk/arch/arm/include/asm/assembler.h | 2 +- trunk/arch/arm/include/asm/elf.h | 2 - .../include/asm/hardware/entry-macro-gic.S | 75 - trunk/arch/arm/include/asm/hardware/gic.h | 7 +- trunk/arch/arm/include/asm/hardware/it8152.h | 3 +- trunk/arch/arm/include/asm/highmem.h | 3 + trunk/arch/arm/include/asm/io.h | 13 +- trunk/arch/arm/include/asm/kexec.h | 18 +- trunk/arch/arm/include/asm/mmu.h | 4 - trunk/arch/arm/include/asm/module.h | 15 +- trunk/arch/arm/include/asm/pgtable.h | 3 - trunk/arch/arm/include/asm/sizes.h | 6 +- trunk/arch/arm/include/asm/system.h | 1 - trunk/arch/arm/kernel/entry-armv.S | 2 +- trunk/arch/arm/kernel/entry-common.S | 6 - trunk/arch/arm/kernel/head.S | 7 - trunk/arch/arm/kernel/hw_breakpoint.c | 3 +- trunk/arch/arm/kernel/machine_kexec.c | 30 - trunk/arch/arm/kernel/module.c | 109 +- trunk/arch/arm/kernel/perf_event.c | 2 +- trunk/arch/arm/kernel/relocate_kernel.S | 2 - trunk/arch/arm/kernel/smp.c | 1 + trunk/arch/arm/kernel/smp_twd.c | 7 +- trunk/arch/arm/kernel/stacktrace.c | 2 +- trunk/arch/arm/kernel/traps.c | 5 +- trunk/arch/arm/kernel/unwind.c | 2 +- trunk/arch/arm/lib/findbit.S | 6 +- .../arm/mach-aaec2000/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-at91/Makefile | 6 +- trunk/arch/arm/mach-at91/at91rm9200_devices.c | 45 + trunk/arch/arm/mach-at91/board-1arm.c | 26 +- .../{board-rm9200dk.c => board-dk.c} | 4 +- .../{board-rm9200ek.c => board-ek.c} | 4 +- trunk/arch/arm/mach-at91/board-kafa.c | 21 +- trunk/arch/arm/mach-at91/board-pcontrol-g20.c | 98 +- trunk/arch/arm/mach-at91/board-picotux200.c | 53 +- trunk/arch/arm/mach-at91/board-stamp9g20.c | 82 +- trunk/arch/arm/mach-at91/board-yl-9200.c | 2 +- trunk/arch/arm/mach-at91/clock.c | 2 +- .../arm/mach-at91/include/mach/at91_mci.h | 2 - trunk/arch/arm/mach-at91/include/mach/board.h | 6 + .../arm/mach-at91/include/mach/stamp9g20.h | 7 - .../arm/mach-bcmring/include/mach/vmalloc.h | 2 +- .../arm/mach-clps711x/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-cns3xxx/core.c | 7 +- trunk/arch/arm/mach-cns3xxx/core.h | 1 + .../mach-cns3xxx/include/mach/entry-macro.S | 66 +- trunk/arch/arm/mach-cns3xxx/pcie.c | 2 +- trunk/arch/arm/mach-davinci/dm355.c | 6 +- trunk/arch/arm/mach-davinci/dm365.c | 6 +- trunk/arch/arm/mach-davinci/dm644x.c | 4 +- trunk/arch/arm/mach-davinci/include/mach/io.h | 4 +- .../arm/mach-ebsa110/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-ep93xx/include/mach/dma.h | 111 +- .../mach-footbridge/include/mach/vmalloc.h | 2 +- .../arm/mach-h720x/include/mach/vmalloc.h | 2 +- .../arm/mach-imx/eukrea_mbimx27-baseboard.c | 6 + .../mach-integrator/include/mach/vmalloc.h | 2 +- .../arch/arm/mach-integrator/integrator_cp.c | 2 +- trunk/arch/arm/mach-iop13xx/include/mach/io.h | 4 +- trunk/arch/arm/mach-iop32x/include/mach/io.h | 4 +- trunk/arch/arm/mach-iop33x/include/mach/io.h | 4 +- trunk/arch/arm/mach-ixp23xx/include/mach/io.h | 4 +- trunk/arch/arm/mach-ixp4xx/common-pci.c | 2 +- trunk/arch/arm/mach-ixp4xx/include/mach/io.h | 4 +- trunk/arch/arm/mach-kirkwood/common.c | 7 +- trunk/arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +- .../arch/arm/mach-kirkwood/include/mach/io.h | 4 +- .../arch/arm/mach-kirkwood/lacie_v2-common.c | 14 + .../arch/arm/mach-kirkwood/lacie_v2-common.h | 2 + trunk/arch/arm/mach-kirkwood/mpp.c | 4 +- .../arm/mach-kirkwood/netspace_v2-setup.c | 6 +- .../arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 +- trunk/arch/arm/mach-kirkwood/ts41x-setup.c | 14 +- .../arch/arm/mach-mmp/include/mach/cputype.h | 3 +- trunk/arch/arm/mach-mmp/mmp2.c | 1 + trunk/arch/arm/mach-msm/board-msm8x60.c | 7 +- .../arch/arm/mach-msm/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-mv78xx0/mpp.c | 4 +- trunk/arch/arm/mach-mx25/devices-imx25.h | 4 +- trunk/arch/arm/mach-mx3/mach-pcm037_eet.c | 5 +- .../arch/arm/mach-netx/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-omap1/devices.c | 5 +- .../arch/arm/mach-omap1/include/mach/camera.h | 2 - .../arm/mach-omap1/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-omap2/board-devkit8000.c | 3 + .../arm/mach-omap2/board-zoom-peripherals.c | 2 +- .../arm/mach-omap2/include/mach/entry-macro.S | 93 +- .../mach-omap2/include/mach/omap4-common.h | 1 + .../arm/mach-omap2/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-omap2/io.c | 2 +- trunk/arch/arm/mach-omap2/omap-smp.c | 2 +- trunk/arch/arm/mach-omap2/omap4-common.c | 11 +- trunk/arch/arm/mach-omap2/pm-debug.c | 34 +- trunk/arch/arm/mach-omap2/pm24xx.c | 35 - trunk/arch/arm/mach-omap2/pm34xx.c | 27 +- trunk/arch/arm/mach-omap2/prcm-common.h | 11 +- trunk/arch/arm/mach-omap2/serial.c | 7 +- trunk/arch/arm/mach-orion5x/include/mach/io.h | 4 +- trunk/arch/arm/mach-orion5x/mpp.c | 4 +- trunk/arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- .../arm/mach-pnx4008/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-pxa/Kconfig | 1 - trunk/arch/arm/mach-pxa/cm-x2xx.c | 2 + trunk/arch/arm/mach-pxa/palmtx.c | 3 +- trunk/arch/arm/mach-pxa/saar.c | 2 +- trunk/arch/arm/mach-pxa/sleep.S | 4 +- trunk/arch/arm/mach-realview/core.c | 5 +- trunk/arch/arm/mach-realview/core.h | 1 + trunk/arch/arm/mach-realview/headsmp.S | 1 - .../mach-realview/include/mach/entry-macro.S | 65 +- trunk/arch/arm/mach-realview/platsmp.c | 2 +- trunk/arch/arm/mach-realview/realview_eb.c | 14 +- .../arch/arm/mach-realview/realview_pb1176.c | 11 +- .../arch/arm/mach-realview/realview_pb11mp.c | 10 +- trunk/arch/arm/mach-realview/realview_pba8.c | 6 +- trunk/arch/arm/mach-realview/realview_pbx.c | 13 +- .../arch/arm/mach-rpc/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-s3c2410/h1940-bluetooth.c | 8 +- trunk/arch/arm/mach-s3c2412/Kconfig | 9 +- trunk/arch/arm/mach-s3c2412/Makefile | 3 +- trunk/arch/arm/mach-s3c2416/Kconfig | 4 - trunk/arch/arm/mach-s3c2416/irq.c | 5 +- trunk/arch/arm/mach-s3c2440/Kconfig | 4 - trunk/arch/arm/mach-s3c2440/s3c2440.c | 11 +- trunk/arch/arm/mach-s3c2440/s3c2442.c | 14 - trunk/arch/arm/mach-s3c2443/Kconfig | 1 - trunk/arch/arm/mach-s3c2443/irq.c | 5 +- trunk/arch/arm/mach-s3c64xx/Kconfig | 2 +- trunk/arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- trunk/arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- trunk/arch/arm/mach-s5pv210/mach-aquila.c | 6 - trunk/arch/arm/mach-s5pv210/mach-goni.c | 6 - trunk/arch/arm/mach-s5pv210/mach-smdkc110.c | 1 - trunk/arch/arm/mach-s5pv210/mach-smdkv210.c | 1 - trunk/arch/arm/mach-s5pv310/cpu.c | 6 +- .../arch/arm/mach-s5pv310/include/mach/smp.h | 2 + trunk/arch/arm/mach-s5pv310/platsmp.c | 2 +- trunk/arch/arm/mach-sa1100/Kconfig | 10 - trunk/arch/arm/mach-sa1100/Makefile | 3 - trunk/arch/arm/mach-sa1100/cpu-sa1100.c | 51 +- trunk/arch/arm/mach-sa1100/cpu-sa1110.c | 57 +- trunk/arch/arm/mach-sa1100/generic.c | 41 +- .../arm/mach-sa1100/include/mach/hardware.h | 8 - .../arm/mach-sa1100/include/mach/nanoengine.h | 52 - trunk/arch/arm/mach-sa1100/nanoengine.c | 119 - trunk/arch/arm/mach-sa1100/pci-nanoengine.c | 284 -- trunk/arch/arm/mach-sa1100/simpad.c | 7 +- .../arm/mach-shark/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-shmobile/board-ap4evb.c | 150 +- trunk/arch/arm/mach-shmobile/clock-sh7372.c | 39 +- .../mach-shmobile/include/mach/entry-macro.S | 30 +- .../include/mach/head-ap4evb.txt | 87 - .../arm/mach-shmobile/include/mach/vmalloc.h | 2 +- .../arm/mach-shmobile/include/mach/zboot.h | 20 - .../mach-shmobile/include/mach/zboot_macros.h | 65 - trunk/arch/arm/mach-shmobile/intc-sh7372.c | 2 +- .../arm/mach-tegra/include/mach/debug-macro.S | 4 +- .../arm/mach-tegra/include/mach/entry-macro.S | 66 +- trunk/arch/arm/mach-tegra/include/mach/io.h | 4 +- trunk/arch/arm/mach-tegra/irq.c | 4 +- trunk/arch/arm/mach-tegra/platsmp.c | 2 +- trunk/arch/arm/mach-ux500/cpu.c | 10 +- .../arm/mach-ux500/include/mach/entry-macro.S | 68 +- trunk/arch/arm/mach-ux500/platsmp.c | 2 +- trunk/arch/arm/mach-versatile/core.c | 2 +- .../arm/mach-versatile/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-vexpress/core.h | 2 + trunk/arch/arm/mach-vexpress/ct-ca9x4.c | 11 +- trunk/arch/arm/mach-vexpress/headsmp.S | 1 - .../mach-vexpress/include/mach/entry-macro.S | 62 +- trunk/arch/arm/mach-vexpress/platsmp.c | 2 +- trunk/arch/arm/mach-vexpress/v2m.c | 2 +- trunk/arch/arm/mm/cache-feroceon-l2.c | 37 +- trunk/arch/arm/mm/cache-v6.S | 28 +- trunk/arch/arm/mm/cache-v7.S | 27 +- trunk/arch/arm/mm/cache-xsc3l2.c | 57 +- trunk/arch/arm/mm/dma-mapping.c | 9 +- trunk/arch/arm/mm/flush.c | 7 +- trunk/arch/arm/mm/highmem.c | 87 + trunk/arch/arm/mm/ioremap.c | 4 +- trunk/arch/arm/mm/proc-macros.S | 22 +- trunk/arch/arm/mm/proc-v7.S | 4 +- trunk/arch/arm/plat-iop/time.c | 3 +- .../arm/plat-mxc/devices/platform-imx-dma.c | 8 + .../arm/plat-mxc/devices/platform-spi_imx.c | 1 - trunk/arch/arm/plat-nomadik/timer.c | 89 +- trunk/arch/arm/plat-omap/counter_32k.c | 3 +- trunk/arch/arm/plat-omap/devices.c | 4 +- trunk/arch/arm/plat-omap/dma.c | 2 - trunk/arch/arm/plat-omap/include/plat/io.h | 4 +- trunk/arch/arm/plat-omap/sram.c | 2 +- trunk/arch/arm/plat-orion/include/plat/pcie.h | 3 - trunk/arch/arm/plat-orion/pcie.c | 5 + trunk/arch/arm/plat-pxa/include/plat/sdhci.h | 3 - trunk/arch/arm/plat-s3c24xx/Kconfig | 2 +- trunk/arch/arm/plat-s3c24xx/cpu.c | 8 +- trunk/arch/arm/plat-s3c24xx/gpiolib.c | 2 + .../arm/plat-s3c24xx/include/plat/s3c244x.h | 7 +- .../arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c | 6 +- .../arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c | 6 +- .../arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c | 6 +- trunk/arch/arm/plat-samsung/gpio-config.c | 47 +- .../include/plat/gpio-cfg-helpers.h | 11 - trunk/arch/arm/plat-versatile/Makefile | 1 + .../include/plat}/timer-sp.h | 0 .../arm/{common => plat-versatile}/timer-sp.c | 4 +- trunk/arch/arm/tools/mach-types | 183 +- trunk/arch/arm/vfp/vfphw.S | 1 - trunk/arch/blackfin/kernel/process.c | 1 + trunk/arch/frv/kernel/process.c | 1 + trunk/arch/h8300/kernel/process.c | 1 + trunk/arch/ia64/hp/sim/simscsi.c | 4 +- trunk/arch/m68k/kernel/process.c | 1 + trunk/arch/m68knommu/kernel/process.c | 1 + trunk/arch/mips/Kconfig | 38 +- trunk/arch/mips/alchemy/common/platform.c | 2 - trunk/arch/mips/alchemy/devboards/prom.c | 5 +- trunk/arch/mips/ar7/clock.c | 9 +- trunk/arch/mips/ar7/time.c | 3 - trunk/arch/mips/bcm47xx/setup.c | 153 +- trunk/arch/mips/include/asm/cpu.h | 4 +- trunk/arch/mips/include/asm/elf.h | 8 +- trunk/arch/mips/include/asm/io.h | 12 +- trunk/arch/mips/include/asm/mach-ar7/ar7.h | 3 +- .../mips/include/asm/mach-bcm47xx/nvram.h | 7 - trunk/arch/mips/jz4740/board-qi_lb60.c | 4 +- trunk/arch/mips/jz4740/platform.c | 2 +- trunk/arch/mips/jz4740/prom.c | 2 +- trunk/arch/mips/kernel/cevt-r4k.c | 2 +- trunk/arch/mips/kernel/cpu-probe.c | 7 +- trunk/arch/mips/kernel/linux32.c | 13 +- trunk/arch/mips/kernel/process.c | 1 + trunk/arch/mips/kernel/prom.c | 2 +- trunk/arch/mips/kernel/smp-mt.c | 2 +- trunk/arch/mips/kernel/traps.c | 44 +- trunk/arch/mips/kernel/vpe.c | 14 +- trunk/arch/mips/lib/memset.S | 4 +- trunk/arch/mips/loongson/common/env.c | 4 +- trunk/arch/mips/math-emu/cp1emu.c | 116 +- trunk/arch/mips/mm/dma-default.c | 4 +- trunk/arch/mips/mm/sc-mips.c | 4 - .../mips/pmc-sierra/yosemite/py-console.c | 12 +- trunk/arch/mips/sibyte/swarm/setup.c | 8 +- trunk/arch/mn10300/include/asm/syscall.h | 117 - trunk/arch/mn10300/kernel/gdb-io-serial.c | 3 +- trunk/arch/mn10300/kernel/gdb-io-ttysm.c | 3 +- trunk/arch/mn10300/kernel/gdb-stub.c | 3 +- trunk/arch/mn10300/kernel/irq.c | 2 +- trunk/arch/mn10300/kernel/process.c | 1 + trunk/arch/mn10300/kernel/time.c | 10 +- trunk/arch/parisc/hpux/sys_hpux.c | 1 + trunk/arch/parisc/kernel/irq.c | 7 +- trunk/arch/parisc/kernel/signal.c | 9 +- trunk/arch/parisc/kernel/sys_parisc32.c | 1 + trunk/arch/powerpc/Kconfig | 4 - trunk/arch/powerpc/boot/div64.S | 3 +- trunk/arch/powerpc/kernel/kgdb.c | 4 +- trunk/arch/powerpc/kernel/setup_64.c | 5 +- trunk/arch/powerpc/kernel/sys_ppc32.c | 1 + trunk/arch/powerpc/mm/hash_utils_64.c | 2 +- trunk/arch/powerpc/mm/pgtable.c | 2 +- trunk/arch/powerpc/mm/tlb_low_64e.S | 5 +- trunk/arch/powerpc/mm/tlb_nohash.c | 2 +- .../arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 - trunk/arch/powerpc/platforms/pseries/Kconfig | 6 - trunk/arch/powerpc/platforms/pseries/eeh.c | 2 + .../powerpc/platforms/pseries/pci_dlpar.c | 2 + trunk/arch/s390/Kconfig.debug | 12 - trunk/arch/s390/include/asm/page.h | 5 - trunk/arch/s390/kernel/compat_linux.c | 1 + trunk/arch/s390/kernel/kprobes.c | 70 +- trunk/arch/s390/kernel/nmi.c | 10 +- trunk/arch/s390/kernel/vtime.c | 19 - trunk/arch/s390/lib/delay.c | 14 +- trunk/arch/s390/mm/gup.c | 7 +- trunk/arch/sh/Kconfig | 3 +- trunk/arch/sh/boards/mach-ecovec24/setup.c | 34 +- trunk/arch/sh/boards/mach-se/7206/irq.c | 2 +- trunk/arch/sh/boards/mach-se/7724/setup.c | 47 +- trunk/arch/sh/include/asm/cacheflush.h | 2 +- trunk/arch/sh/include/asm/processor_32.h | 7 +- trunk/arch/sh/include/asm/unistd_32.h | 3 +- trunk/arch/sh/include/cpu-sh4/cpu/sh7724.h | 3 - trunk/arch/sh/kernel/cpu/sh2a/clock-sh7201.c | 2 +- trunk/arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 5 +- trunk/arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 44 +- trunk/arch/sh/kernel/sys_sh.c | 2 +- trunk/arch/sh/kernel/syscalls_32.S | 1 - .../arch/sh/kernel/vsyscall/vsyscall-trapa.S | 2 +- trunk/arch/sh/mm/cache-sh4.c | 4 +- trunk/arch/sh/mm/cache-sh7705.c | 2 +- trunk/arch/sh/mm/cache.c | 14 +- trunk/arch/sh/mm/kmap.c | 2 +- trunk/arch/sparc/include/asm/openprom.h | 2 +- trunk/arch/sparc/include/asm/oplib_32.h | 35 +- trunk/arch/sparc/include/asm/oplib_64.h | 46 +- trunk/arch/sparc/kernel/leon_kernel.c | 4 +- trunk/arch/sparc/kernel/leon_smp.c | 1 + trunk/arch/sparc/kernel/sys_sparc32.c | 1 + trunk/arch/sparc/kernel/sys_sparc_32.c | 1 + trunk/arch/sparc/kernel/unaligned_32.c | 1 + trunk/arch/sparc/kernel/windows.c | 1 + trunk/arch/sparc/prom/Makefile | 1 + trunk/arch/sparc/prom/console_32.c | 65 +- trunk/arch/sparc/prom/console_64.c | 81 +- trunk/arch/sparc/prom/devops_32.c | 87 + trunk/arch/sparc/prom/devops_64.c | 67 + trunk/arch/sparc/prom/misc_64.c | 16 +- trunk/arch/sparc/prom/printf.c | 35 +- trunk/arch/sparc/prom/tree_32.c | 16 + trunk/arch/sparc/prom/tree_64.c | 18 + trunk/arch/tile/Kconfig | 12 - trunk/arch/tile/include/asm/cacheflush.h | 52 - trunk/arch/tile/include/asm/io.h | 15 +- trunk/arch/tile/include/asm/pci-bridge.h | 117 + trunk/arch/tile/include/asm/pci.h | 107 +- trunk/arch/tile/include/asm/processor.h | 10 - trunk/arch/tile/include/asm/signal.h | 2 +- trunk/arch/tile/include/hv/drv_xgbe_impl.h | 300 -- trunk/arch/tile/include/hv/drv_xgbe_intf.h | 615 ---- trunk/arch/tile/include/hv/netio_errors.h | 122 - trunk/arch/tile/include/hv/netio_intf.h | 2975 ----------------- trunk/arch/tile/kernel/Makefile | 1 - trunk/arch/tile/kernel/compat.c | 1 + trunk/arch/tile/kernel/compat_signal.c | 7 +- trunk/arch/tile/kernel/intvec_32.S | 24 +- trunk/arch/tile/kernel/pci.c | 621 ---- trunk/arch/tile/kernel/process.c | 8 - trunk/arch/tile/kernel/setup.c | 2 +- trunk/arch/tile/kernel/signal.c | 11 +- trunk/arch/tile/kernel/smpboot.c | 1 + trunk/arch/tile/kernel/sys.c | 1 + trunk/arch/tile/lib/memchr_32.c | 35 +- trunk/arch/tile/lib/spinlock_32.c | 29 +- trunk/arch/tile/mm/fault.c | 1 + trunk/arch/tile/mm/hugetlbpage.c | 1 + trunk/arch/um/drivers/line.c | 5 +- trunk/arch/um/include/asm/ptrace-generic.h | 4 +- trunk/arch/um/kernel/exec.c | 1 + trunk/arch/um/kernel/ptrace.c | 2 +- trunk/arch/x86/Kconfig | 2 +- trunk/arch/x86/boot/compressed/misc.c | 2 +- .../x86/crypto/ghash-clmulni-intel_glue.c | 1 - trunk/arch/x86/ia32/sys_ia32.c | 1 + trunk/arch/x86/include/asm/apic.h | 10 +- trunk/arch/x86/include/asm/e820.h | 3 - trunk/arch/x86/include/asm/fixmap.h | 4 +- trunk/arch/x86/include/asm/kvm_host.h | 2 +- trunk/arch/x86/include/asm/msr-index.h | 2 +- trunk/arch/x86/include/asm/paravirt.h | 10 +- trunk/arch/x86/include/asm/pvclock.h | 1 - trunk/arch/x86/include/asm/uv/uv_hub.h | 4 - trunk/arch/x86/include/asm/uv/uv_mmrs.h | 208 +- trunk/arch/x86/include/asm/xen/interface.h | 6 +- trunk/arch/x86/include/asm/xen/interface_32.h | 5 - trunk/arch/x86/include/asm/xen/interface_64.h | 13 +- trunk/arch/x86/include/asm/xen/page.h | 7 +- trunk/arch/x86/kernel/Makefile | 1 - trunk/arch/x86/kernel/apic/apic.c | 9 +- trunk/arch/x86/kernel/apic/hw_nmi.c | 7 +- trunk/arch/x86/kernel/apic/io_apic.c | 4 +- trunk/arch/x86/kernel/apic/probe_64.c | 7 + trunk/arch/x86/kernel/apic/x2apic_uv_x.c | 37 +- trunk/arch/x86/kernel/cpu/perf_event.c | 20 - trunk/arch/x86/kernel/cpu/perf_event_amd.c | 4 +- trunk/arch/x86/kernel/cpuid.c | 1 + trunk/arch/x86/kernel/entry_32.S | 2 +- trunk/arch/x86/kernel/entry_64.S | 2 - trunk/arch/x86/kernel/head_32.S | 16 +- trunk/arch/x86/kernel/hpet.c | 26 +- trunk/arch/x86/kernel/hw_breakpoint.c | 4 - trunk/arch/x86/kernel/kgdb.c | 12 +- trunk/arch/x86/kernel/microcode_amd.c | 2 +- trunk/arch/x86/kernel/microcode_intel.c | 16 +- trunk/arch/x86/kernel/mmconf-fam10h_64.c | 71 +- trunk/arch/x86/kernel/msr.c | 1 + trunk/arch/x86/kernel/pvclock.c | 43 +- trunk/arch/x86/kernel/resource.c | 48 - trunk/arch/x86/kernel/setup.c | 18 +- trunk/arch/x86/kernel/xsave.c | 3 +- trunk/arch/x86/kvm/i8259.c | 2 - trunk/arch/x86/kvm/mmu.c | 3 +- trunk/arch/x86/kvm/svm.c | 6 +- trunk/arch/x86/kvm/vmx.c | 24 +- trunk/arch/x86/kvm/x86.c | 11 +- trunk/arch/x86/kvm/x86.h | 5 - trunk/arch/x86/lguest/boot.c | 16 +- trunk/arch/x86/lguest/i386_head.S | 105 - trunk/arch/x86/mm/tlb.c | 7 +- trunk/arch/x86/oprofile/op_model_amd.c | 24 +- trunk/arch/x86/pci/acpi.c | 103 +- trunk/arch/x86/pci/i386.c | 18 +- trunk/arch/x86/pci/xen.c | 35 +- trunk/arch/x86/platform/uv/tlb_uv.c | 15 +- trunk/arch/x86/platform/uv/uv_time.c | 4 +- trunk/arch/x86/vdso/Makefile | 4 +- trunk/arch/x86/xen/enlighten.c | 25 +- trunk/arch/x86/xen/mmu.c | 88 +- trunk/arch/x86/xen/platform-pci-unplug.c | 2 +- trunk/arch/x86/xen/setup.c | 71 +- trunk/arch/x86/xen/suspend.c | 1 - trunk/arch/x86/xen/time.c | 2 - trunk/arch/x86/xen/xen-ops.h | 2 +- trunk/block/blk-core.c | 11 +- trunk/block/blk-ioc.c | 14 + trunk/block/blk-map.c | 3 - trunk/block/blk-merge.c | 6 +- trunk/block/blk-settings.c | 51 +- trunk/block/blk-sysfs.c | 2 +- trunk/block/blk-throttle.c | 41 +- trunk/block/bsg.c | 8 - trunk/block/compat_ioctl.c | 5 +- trunk/block/elevator.c | 4 +- trunk/block/ioctl.c | 8 +- trunk/block/scsi_ioctl.c | 34 +- trunk/crypto/pcrypt.c | 1 + trunk/drivers/acpi/ac.c | 46 +- trunk/drivers/acpi/acpica/evgpeinit.c | 3 - trunk/drivers/acpi/apei/erst.c | 34 +- trunk/drivers/acpi/apei/hest.c | 10 +- trunk/drivers/acpi/debugfs.c | 2 +- trunk/drivers/acpi/ec.c | 3 - trunk/drivers/acpi/osl.c | 113 +- trunk/drivers/acpi/power.c | 12 +- trunk/drivers/acpi/processor_thermal.c | 9 + trunk/drivers/acpi/scan.c | 97 +- trunk/drivers/acpi/sleep.c | 12 +- trunk/drivers/ata/Kconfig | 22 +- trunk/drivers/ata/Makefile | 2 +- trunk/drivers/ata/libata-core.c | 24 +- trunk/drivers/ata/libata-eh.c | 17 +- trunk/drivers/ata/libata-scsi.c | 24 +- trunk/drivers/ata/libata-sff.c | 7 +- trunk/drivers/ata/pata_cs5536.c | 20 +- trunk/drivers/ata/pata_legacy.c | 2 +- trunk/drivers/ata/pata_octeon_cf.c | 2 + trunk/drivers/ata/sata_via.c | 9 +- trunk/drivers/atm/adummy.c | 2 +- trunk/drivers/atm/ambassador.c | 3 +- trunk/drivers/atm/atmtcp.c | 7 +- trunk/drivers/atm/eni.c | 2 +- trunk/drivers/atm/firestream.c | 2 +- trunk/drivers/atm/fore200e.c | 14 +- trunk/drivers/atm/he.c | 2 +- trunk/drivers/atm/horizon.c | 3 +- trunk/drivers/atm/idt77252.c | 3 +- trunk/drivers/atm/iphase.c | 2 +- trunk/drivers/atm/lanai.c | 2 +- trunk/drivers/atm/nicstar.c | 3 +- trunk/drivers/atm/solos-attrlist.c | 1 - trunk/drivers/atm/solos-pci.c | 16 +- trunk/drivers/atm/zatm.c | 2 +- trunk/drivers/base/power/main.c | 34 +- trunk/drivers/block/amiflop.c | 2 +- trunk/drivers/block/aoe/aoeblk.c | 3 + trunk/drivers/block/ataflop.c | 2 +- trunk/drivers/block/cciss.c | 136 +- trunk/drivers/block/cciss.h | 4 - trunk/drivers/block/cciss_scsi.c | 8 +- trunk/drivers/block/drbd/drbd_actlog.c | 42 +- trunk/drivers/block/drbd/drbd_int.h | 52 +- trunk/drivers/block/drbd/drbd_main.c | 148 +- trunk/drivers/block/drbd/drbd_nl.c | 25 +- trunk/drivers/block/drbd/drbd_proc.c | 1 + trunk/drivers/block/drbd/drbd_receiver.c | 232 +- trunk/drivers/block/drbd/drbd_req.c | 38 +- trunk/drivers/block/drbd/drbd_req.h | 3 +- trunk/drivers/block/drbd/drbd_worker.c | 34 +- trunk/drivers/block/loop.c | 6 + trunk/drivers/block/rbd.c | 748 ++--- trunk/drivers/block/xen-blkfront.c | 57 +- trunk/drivers/bluetooth/ath3k.c | 4 - trunk/drivers/bluetooth/btusb.c | 17 +- trunk/drivers/bluetooth/hci_ldisc.c | 6 +- trunk/drivers/char/agp/frontend.c | 1 + trunk/drivers/char/agp/intel-gtt.c | 23 +- trunk/drivers/char/amiserial.c | 2 + trunk/drivers/char/briq_panel.c | 1 + trunk/drivers/char/hpet.c | 1 + trunk/drivers/char/hw_random/core.c | 1 + trunk/drivers/char/i8k.c | 7 +- trunk/drivers/char/istallion.c | 1 + trunk/drivers/char/nozomi.c | 1 + trunk/drivers/char/pcmcia/cm4000_cs.c | 3 +- trunk/drivers/char/pcmcia/synclink_cs.c | 1 - trunk/drivers/char/ramoops.c | 12 +- trunk/drivers/char/serial167.c | 1 + trunk/drivers/char/specialix.c | 1 + trunk/drivers/char/stallion.c | 1 + trunk/drivers/char/sx.c | 1 + trunk/drivers/char/tpm/tpm_tis.c | 24 - trunk/drivers/char/uv_mmtimer.c | 1 + trunk/drivers/char/virtio_console.c | 37 +- trunk/drivers/clocksource/sh_cmt.c | 17 +- trunk/drivers/connector/connector.c | 1 - trunk/drivers/crypto/n2_core.c | 2 +- trunk/drivers/crypto/padlock-aes.c | 2 +- trunk/drivers/dma/Makefile | 4 +- trunk/drivers/dma/at_hdmac.c | 2 +- trunk/drivers/dma/fsldma.c | 6 +- trunk/drivers/dma/fsldma.h | 9 +- trunk/drivers/dma/imx-dma.c | 2 +- trunk/drivers/dma/imx-sdma.c | 4 +- trunk/drivers/dma/intel_mid_dma.c | 8 +- trunk/drivers/dma/ioat/Makefile | 2 +- trunk/drivers/dma/mv_xor.c | 2 +- trunk/drivers/dma/pch_dma.c | 15 +- trunk/drivers/dma/ppc4xx/adma.c | 5 +- trunk/drivers/dma/shdma.c | 1 - trunk/drivers/edac/Makefile | 8 +- trunk/drivers/edac/amd64_edac.c | 2 +- trunk/drivers/edac/edac_core.h | 6 +- trunk/drivers/edac/edac_mc.c | 10 +- trunk/drivers/edac/mce_amd_inj.c | 2 +- trunk/drivers/firewire/net.c | 160 +- trunk/drivers/firewire/ohci.c | 47 +- trunk/drivers/firewire/sbp2.c | 4 +- trunk/drivers/gpio/cs5535-gpio.c | 27 +- trunk/drivers/gpio/gpiolib.c | 3 - trunk/drivers/gpio/rdc321x-gpio.c | 2 +- trunk/drivers/gpu/drm/drm_crtc.c | 10 +- trunk/drivers/gpu/drm/drm_crtc_helper.c | 19 +- trunk/drivers/gpu/drm/drm_edid.c | 26 +- trunk/drivers/gpu/drm/drm_fops.c | 1 + trunk/drivers/gpu/drm/drm_irq.c | 21 +- trunk/drivers/gpu/drm/i915/dvo_ch7017.c | 2 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 26 - trunk/drivers/gpu/drm/i915/i915_drv.c | 5 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 3 - trunk/drivers/gpu/drm/i915/i915_gem.c | 720 ++-- trunk/drivers/gpu/drm/i915/i915_gem_evict.c | 8 +- trunk/drivers/gpu/drm/i915/i915_reg.h | 11 - trunk/drivers/gpu/drm/i915/i915_suspend.c | 44 +- trunk/drivers/gpu/drm/i915/intel_acpi.c | 34 + trunk/drivers/gpu/drm/i915/intel_crt.c | 159 +- trunk/drivers/gpu/drm/i915/intel_display.c | 186 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 210 +- trunk/drivers/gpu/drm/i915/intel_drv.h | 3 +- trunk/drivers/gpu/drm/i915/intel_i2c.c | 11 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 133 +- trunk/drivers/gpu/drm/i915/intel_opregion.c | 2 +- trunk/drivers/gpu/drm/i915/intel_overlay.c | 4 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 158 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.h | 8 +- trunk/drivers/gpu/drm/i915/intel_sdvo.c | 94 +- .../gpu/drm/nouveau/nouveau_backlight.c | 9 - trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_bo.c | 43 +- .../gpu/drm/nouveau/nouveau_connector.c | 77 +- .../gpu/drm/nouveau/nouveau_connector.h | 3 + trunk/drivers/gpu/drm/nouveau/nouveau_drv.h | 55 +- trunk/drivers/gpu/drm/nouveau/nouveau_fence.c | 7 +- trunk/drivers/gpu/drm/nouveau/nouveau_gem.c | 36 +- trunk/drivers/gpu/drm/nouveau/nouveau_hw.c | 8 +- trunk/drivers/gpu/drm/nouveau/nouveau_hw.h | 19 - trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_irq.c | 42 +- trunk/drivers/gpu/drm/nouveau/nouveau_mem.c | 49 +- .../drivers/gpu/drm/nouveau/nouveau_object.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_pm.c | 7 +- trunk/drivers/gpu/drm/nouveau/nouveau_ramht.c | 71 +- trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c | 14 +- trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 17 +- trunk/drivers/gpu/drm/nouveau/nouveau_temp.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv04_crtc.c | 7 +- trunk/drivers/gpu/drm/nouveau/nv04_dfp.c | 13 +- trunk/drivers/gpu/drm/nouveau/nv04_pm.c | 9 - trunk/drivers/gpu/drm/nouveau/nv50_calc.c | 16 +- trunk/drivers/gpu/drm/nouveau/nv50_crtc.c | 4 +- trunk/drivers/gpu/drm/nouveau/nv50_display.c | 35 +- trunk/drivers/gpu/drm/nouveau/nv50_fifo.c | 5 - trunk/drivers/gpu/drm/nouveau/nv50_graph.c | 52 - trunk/drivers/gpu/drm/nouveau/nv50_instmem.c | 1 + trunk/drivers/gpu/drm/radeon/atom.c | 1 - trunk/drivers/gpu/drm/radeon/atombios_crtc.c | 7 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 66 +- .../gpu/drm/radeon/evergreen_blit_kms.c | 2 +- trunk/drivers/gpu/drm/radeon/evergreend.h | 1 - trunk/drivers/gpu/drm/radeon/r100.c | 4 +- trunk/drivers/gpu/drm/radeon/r300.c | 2 +- trunk/drivers/gpu/drm/radeon/r600.c | 41 +- trunk/drivers/gpu/drm/radeon/r600_blit_kms.c | 2 +- trunk/drivers/gpu/drm/radeon/r600_cs.c | 318 +- trunk/drivers/gpu/drm/radeon/r600_reg.h | 1 - trunk/drivers/gpu/drm/radeon/r600d.h | 6 - trunk/drivers/gpu/drm/radeon/radeon.h | 4 - .../drivers/gpu/drm/radeon/radeon_atombios.c | 43 +- .../drivers/gpu/drm/radeon/radeon_benchmark.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_bios.c | 13 +- trunk/drivers/gpu/drm/radeon/radeon_combios.c | 15 +- .../gpu/drm/radeon/radeon_connectors.c | 68 +- trunk/drivers/gpu/drm/radeon/radeon_device.c | 15 +- trunk/drivers/gpu/drm/radeon/radeon_display.c | 18 +- trunk/drivers/gpu/drm/radeon/radeon_drv.c | 19 - .../drivers/gpu/drm/radeon/radeon_encoders.c | 382 +-- trunk/drivers/gpu/drm/radeon/radeon_fb.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_fence.c | 3 +- trunk/drivers/gpu/drm/radeon/radeon_gart.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_gem.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_i2c.c | 49 +- trunk/drivers/gpu/drm/radeon/radeon_irq.c | 4 +- .../gpu/drm/radeon/radeon_legacy_encoders.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_mode.h | 22 +- trunk/drivers/gpu/drm/radeon/radeon_object.c | 22 +- trunk/drivers/gpu/drm/radeon/radeon_object.h | 7 +- trunk/drivers/gpu/drm/radeon/radeon_ring.c | 6 +- trunk/drivers/gpu/drm/radeon/radeon_test.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_ttm.c | 5 +- trunk/drivers/gpu/drm/radeon/rs400.c | 2 +- trunk/drivers/gpu/drm/radeon/rs600.c | 4 +- trunk/drivers/gpu/drm/radeon/rv770.c | 4 +- trunk/drivers/gpu/drm/ttm/ttm_bo.c | 97 +- trunk/drivers/gpu/drm/ttm/ttm_bo_manager.c | 81 +- trunk/drivers/gpu/drm/ttm/ttm_tt.c | 4 +- trunk/drivers/gpu/drm/via/via_dmablit.c | 4 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 1 - trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 5 - trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +- .../drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 14 +- trunk/drivers/gpu/stub/Kconfig | 3 - trunk/drivers/hid/hid-core.c | 1 - trunk/drivers/hid/hid-egalax.c | 2 +- trunk/drivers/hid/hid-input.c | 21 +- trunk/drivers/hid/hid-tmff.c | 2 - trunk/drivers/hid/hidraw.c | 1 + trunk/drivers/hid/usbhid/hiddev.c | 1 + trunk/drivers/hwmon/ad7414.c | 6 +- trunk/drivers/hwmon/adm1026.c | 20 +- trunk/drivers/hwmon/adt7470.c | 4 +- trunk/drivers/hwmon/amc6821.c | 2 +- trunk/drivers/hwmon/gpio-fan.c | 8 +- trunk/drivers/hwmon/i5k_amb.c | 2 - trunk/drivers/hwmon/it87.c | 61 +- trunk/drivers/hwmon/lis3lv02d_i2c.c | 10 +- trunk/drivers/hwmon/lm93.c | 4 +- trunk/drivers/hwmon/lm95241.c | 19 +- trunk/drivers/hwmon/ltc4215.c | 4 +- trunk/drivers/hwmon/max6650.c | 2 +- trunk/drivers/hwmon/s3c-hwmon.c | 2 + trunk/drivers/hwmon/w83795.c | 207 +- trunk/drivers/i2c/Kconfig | 3 +- trunk/drivers/i2c/algos/Kconfig | 14 +- trunk/drivers/i2c/busses/i2c-intel-mid.c | 2 +- trunk/drivers/i2c/i2c-core.c | 12 - trunk/drivers/i2c/i2c-mux.c | 1 + trunk/drivers/idle/intel_idle.c | 12 +- trunk/drivers/infiniband/core/ud_header.c | 30 + trunk/drivers/infiniband/core/uverbs_cmd.c | 99 +- .../drivers/infiniband/core/uverbs_marshall.c | 4 - .../infiniband/hw/ipath/ipath_file_ops.c | 1 + trunk/drivers/infiniband/hw/mlx4/main.c | 4 +- trunk/drivers/infiniband/hw/mlx4/qp.c | 10 +- trunk/drivers/infiniband/ulp/srp/ib_srp.c | 4 +- trunk/drivers/input/evdev.c | 113 +- trunk/drivers/input/input.c | 90 +- trunk/drivers/input/joystick/turbografx.c | 1 - trunk/drivers/input/keyboard/Kconfig | 16 - trunk/drivers/input/keyboard/Makefile | 1 - trunk/drivers/input/keyboard/adp5588-keys.c | 74 +- trunk/drivers/input/keyboard/atkbd.c | 12 +- .../drivers/input/keyboard/gpio_keys_polled.c | 261 -- trunk/drivers/input/misc/pcf8574_keypad.c | 23 +- trunk/drivers/input/mouse/synaptics.h | 3 +- trunk/drivers/input/serio/gscps2.c | 2 +- trunk/drivers/input/serio/i8042-x86ia64io.h | 11 - trunk/drivers/input/serio/serio_raw.c | 1 + trunk/drivers/input/tablet/acecad.c | 3 +- trunk/drivers/input/tablet/aiptek.c | 28 +- trunk/drivers/input/tablet/wacom_wac.c | 12 - .../input/touchscreen/usbtouchscreen.c | 1 - trunk/drivers/isdn/gigaset/capi.c | 1 - trunk/drivers/isdn/icn/icn.c | 7 +- trunk/drivers/leds/Kconfig | 70 +- trunk/drivers/leds/Makefile | 2 - trunk/drivers/leds/led-class.c | 105 +- trunk/drivers/leds/led-triggers.c | 2 +- trunk/drivers/leds/leds-gpio.c | 2 +- trunk/drivers/leds/leds-lp5521.c | 837 ----- trunk/drivers/leds/leds-lp5523.c | 1069 ------ trunk/drivers/leds/leds-ss4200.c | 1 - trunk/drivers/leds/ledtrig-timer.c | 124 +- trunk/drivers/macintosh/Kconfig | 1 - trunk/drivers/macintosh/adb-iop.c | 4 +- trunk/drivers/md/dm-table.c | 10 +- trunk/drivers/md/md.c | 68 +- trunk/drivers/md/raid1.c | 1 - trunk/drivers/md/raid10.c | 2 +- trunk/drivers/media/IR/keymaps/rc-rc6-mce.c | 21 +- trunk/drivers/media/IR/lirc_dev.c | 29 +- trunk/drivers/media/IR/mceusb.c | 174 +- trunk/drivers/media/IR/nuvoton-cir.c | 10 +- trunk/drivers/media/IR/streamzap.c | 21 +- trunk/drivers/media/Kconfig | 1 + trunk/drivers/media/common/saa7146_hlp.c | 8 +- trunk/drivers/media/common/saa7146_i2c.c | 1 + trunk/drivers/media/common/saa7146_video.c | 16 +- trunk/drivers/media/common/tuners/Kconfig | 8 +- .../media/dvb/dvb-core/dvb_ca_en50221.c | 1 + .../drivers/media/dvb/dvb-core/dvb_frontend.c | 1 + trunk/drivers/media/dvb/frontends/Kconfig | 5 +- .../media/dvb/frontends/dibx000_common.c | 1 - trunk/drivers/media/dvb/ngene/ngene-core.c | 1 + trunk/drivers/media/dvb/ngene/ngene-dvb.c | 1 + trunk/drivers/media/dvb/ngene/ngene-i2c.c | 1 + trunk/drivers/media/radio/radio-aimslab.c | 16 +- trunk/drivers/media/radio/radio-aztech.c | 6 +- trunk/drivers/media/radio/radio-cadet.c | 12 +- trunk/drivers/media/radio/radio-gemtek-pci.c | 6 +- trunk/drivers/media/radio/radio-gemtek.c | 14 +- trunk/drivers/media/radio/radio-maestro.c | 14 +- trunk/drivers/media/radio/radio-maxiradio.c | 2 +- trunk/drivers/media/radio/radio-miropcm20.c | 6 +- trunk/drivers/media/radio/radio-mr800.c | 1 + trunk/drivers/media/radio/radio-rtrack2.c | 10 +- trunk/drivers/media/radio/radio-sf16fmi.c | 7 +- trunk/drivers/media/radio/radio-sf16fmr2.c | 11 +- trunk/drivers/media/radio/radio-si4713.c | 5 +- trunk/drivers/media/radio/radio-tea5764.c | 49 +- trunk/drivers/media/radio/radio-terratec.c | 8 +- trunk/drivers/media/radio/radio-timb.c | 5 +- trunk/drivers/media/radio/radio-trust.c | 18 +- trunk/drivers/media/radio/radio-typhoon.c | 16 +- trunk/drivers/media/radio/radio-zoltrix.c | 30 +- .../drivers/media/radio/si470x/radio-si470x.h | 1 + trunk/drivers/media/video/Kconfig | 2 +- trunk/drivers/media/video/arv.c | 2 +- .../drivers/media/video/au0828/au0828-cards.c | 4 +- trunk/drivers/media/video/bt8xx/bttv-cards.c | 22 +- trunk/drivers/media/video/bt8xx/bttv-driver.c | 118 +- trunk/drivers/media/video/bw-qcam.c | 2 +- trunk/drivers/media/video/c-qcam.c | 2 +- trunk/drivers/media/video/cafe_ccic.c | 6 +- .../drivers/media/video/cx18/cx18-alsa-pcm.c | 8 +- trunk/drivers/media/video/cx18/cx18-i2c.c | 8 +- trunk/drivers/media/video/cx18/cx18-streams.c | 2 +- .../drivers/media/video/cx231xx/cx231xx-417.c | 6 +- .../media/video/cx231xx/cx231xx-cards.c | 4 +- .../drivers/media/video/cx23885/cx23885-417.c | 9 +- .../media/video/cx23885/cx23885-cards.c | 2 +- .../media/video/cx23885/cx23885-video.c | 9 +- .../media/video/cx25840/cx25840-core.c | 19 +- trunk/drivers/media/video/cx88/cx88-alsa.c | 99 +- .../drivers/media/video/cx88/cx88-blackbird.c | 1 + trunk/drivers/media/video/cx88/cx88-cards.c | 16 +- trunk/drivers/media/video/cx88/cx88-video.c | 35 +- trunk/drivers/media/video/cx88/cx88.h | 6 +- .../media/video/davinci/vpfe_capture.c | 1 + .../media/video/davinci/vpif_capture.c | 1 + .../media/video/davinci/vpif_display.c | 2 +- .../drivers/media/video/em28xx/em28xx-cards.c | 18 +- .../drivers/media/video/em28xx/em28xx-video.c | 2 +- .../media/video/et61x251/et61x251_core.c | 2 +- trunk/drivers/media/video/fsl-viu.c | 2 +- trunk/drivers/media/video/gspca/sonixj.c | 416 ++- trunk/drivers/media/video/imx074.c | 2 + trunk/drivers/media/video/ir-kbd-i2c.c | 1 + trunk/drivers/media/video/ivtv/ivtv-i2c.c | 22 +- trunk/drivers/media/video/meye.c | 14 +- trunk/drivers/media/video/mx2_camera.c | 15 +- trunk/drivers/media/video/mx3_camera.c | 4 - trunk/drivers/media/video/mxb.c | 12 +- trunk/drivers/media/video/omap1_camera.c | 16 +- trunk/drivers/media/video/ov6650.c | 6 +- trunk/drivers/media/video/pms.c | 2 +- .../drivers/media/video/pvrusb2/pvrusb2-hdw.c | 6 +- trunk/drivers/media/video/pwc/pwc-if.c | 1 + trunk/drivers/media/video/s2255drv.c | 1 + .../media/video/s5p-fimc/fimc-capture.c | 53 +- .../drivers/media/video/s5p-fimc/fimc-core.c | 54 +- .../drivers/media/video/s5p-fimc/fimc-core.h | 24 +- .../drivers/media/video/s5p-fimc/regs-fimc.h | 3 - .../media/video/saa7134/saa7134-cards.c | 32 +- .../media/video/saa7134/saa7134-core.c | 4 +- .../media/video/saa7134/saa7134-empress.c | 1 + trunk/drivers/media/video/saa7164/saa7164.h | 1 + trunk/drivers/media/video/se401.c | 7 +- .../media/video/sh_mobile_ceu_camera.c | 2 +- trunk/drivers/media/video/sh_vou.c | 15 +- .../media/video/sn9c102/sn9c102_core.c | 2 +- trunk/drivers/media/video/soc_camera.c | 6 +- trunk/drivers/media/video/stk-webcam.c | 4 + trunk/drivers/media/video/tlg2300/pd-main.c | 13 +- trunk/drivers/media/video/usbvideo/vicam.c | 29 +- .../media/video/usbvision/usbvision-i2c.c | 6 +- .../media/video/usbvision/usbvision-video.c | 1 + trunk/drivers/media/video/uvc/uvc_ctrl.c | 48 +- trunk/drivers/media/video/uvc/uvc_queue.c | 133 +- trunk/drivers/media/video/uvc/uvc_v4l2.c | 185 +- trunk/drivers/media/video/uvc/uvc_video.c | 3 + trunk/drivers/media/video/uvc/uvcvideo.h | 10 +- trunk/drivers/media/video/v4l2-common.c | 15 +- .../drivers/media/video/v4l2-compat-ioctl32.c | 1 + trunk/drivers/media/video/v4l2-dev.c | 72 +- trunk/drivers/media/video/v4l2-device.c | 1 - trunk/drivers/media/video/via-camera.c | 2 +- trunk/drivers/media/video/vino.c | 4 +- trunk/drivers/media/video/w9966.c | 2 +- trunk/drivers/media/video/wm8775.c | 104 +- trunk/drivers/media/video/zoran/zoran.h | 1 - trunk/drivers/media/video/zoran/zoran_card.c | 6 +- .../drivers/media/video/zoran/zoran_driver.c | 27 +- trunk/drivers/message/fusion/mptfc.c | 7 +- trunk/drivers/message/fusion/mptsas.c | 4 +- trunk/drivers/message/fusion/mptspi.c | 4 +- trunk/drivers/message/i2o/i2o_scsi.c | 6 +- trunk/drivers/mfd/ab8500-core.c | 2 +- trunk/drivers/mfd/wm831x-core.c | 8 +- trunk/drivers/misc/apds9802als.c | 3 +- trunk/drivers/misc/bh1770glc.c | 8 +- trunk/drivers/misc/isl29020.c | 8 +- trunk/drivers/misc/sgi-xp/xpc_partition.c | 25 +- trunk/drivers/mmc/core/core.c | 3 +- trunk/drivers/mmc/core/mmc.c | 8 +- trunk/drivers/mmc/core/sdio.c | 51 +- trunk/drivers/mmc/core/sdio_bus.c | 33 +- trunk/drivers/mmc/host/at91_mci.c | 13 +- trunk/drivers/mmc/host/atmel-mci.c | 18 +- trunk/drivers/mmc/host/mmci.c | 50 +- trunk/drivers/mmc/host/mmci.h | 6 + trunk/drivers/mmc/host/omap_hsmmc.c | 2 +- trunk/drivers/mmc/host/sdhci-esdhc-imx.c | 12 +- trunk/drivers/mmc/host/sdhci-pci.c | 31 +- trunk/drivers/mmc/host/sdhci-pxa.c | 4 - trunk/drivers/mmc/host/sdhci.c | 54 +- trunk/drivers/mmc/host/sdhci.h | 9 +- trunk/drivers/mmc/host/ushc.c | 30 +- trunk/drivers/mtd/maps/pxa2xx-flash.c | 2 +- trunk/drivers/mtd/nand/omap2.c | 1 + trunk/drivers/mtd/ubi/io.c | 37 +- trunk/drivers/mtd/ubi/scan.c | 20 +- trunk/drivers/net/3c59x.c | 6 +- trunk/drivers/net/8139cp.c | 10 +- trunk/drivers/net/Kconfig | 18 +- trunk/drivers/net/Makefile | 1 - trunk/drivers/net/atl1c/atl1c_hw.c | 2 +- trunk/drivers/net/atl1c/atl1c_main.c | 39 +- trunk/drivers/net/atlx/atl1.c | 10 - trunk/drivers/net/au1000_eth.c | 10 +- trunk/drivers/net/b44.c | 11 +- trunk/drivers/net/benet/be.h | 2 +- trunk/drivers/net/benet/be_cmds.c | 77 +- trunk/drivers/net/benet/be_main.c | 8 +- trunk/drivers/net/bnx2x/bnx2x.h | 4 +- trunk/drivers/net/bnx2x/bnx2x_cmn.c | 44 +- trunk/drivers/net/bnx2x/bnx2x_init_ops.h | 4 +- trunk/drivers/net/bnx2x/bnx2x_main.c | 2 +- trunk/drivers/net/bonding/bond_ipv6.c | 7 +- trunk/drivers/net/bonding/bond_main.c | 63 +- trunk/drivers/net/bonding/bonding.h | 16 +- trunk/drivers/net/caif/caif_shm_u5500.c | 2 +- trunk/drivers/net/caif/caif_shmcore.c | 2 +- trunk/drivers/net/caif/caif_spi.c | 4 +- trunk/drivers/net/cnic.c | 10 +- trunk/drivers/net/cxgb4/t4_hw.c | 2 +- trunk/drivers/net/cxgb4vf/cxgb4vf_main.c | 130 +- trunk/drivers/net/cxgb4vf/sge.c | 122 +- trunk/drivers/net/cxgb4vf/t4vf_common.h | 1 - trunk/drivers/net/cxgb4vf/t4vf_hw.c | 113 +- trunk/drivers/net/e1000/e1000_main.c | 12 +- trunk/drivers/net/ehea/ehea_ethtool.c | 16 - trunk/drivers/net/ehea/ehea_main.c | 25 +- trunk/drivers/net/enic/enic_main.c | 3 +- trunk/drivers/net/epic100.c | 4 +- trunk/drivers/net/gianfar.c | 7 +- trunk/drivers/net/gianfar_ethtool.c | 5 +- trunk/drivers/net/hamachi.c | 4 +- trunk/drivers/net/ifb.c | 2 - trunk/drivers/net/ipg.c | 6 +- trunk/drivers/net/irda/sh_sir.c | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 63 +- trunk/drivers/net/mlx4/fw.c | 4 - trunk/drivers/net/pch_gbe/pch_gbe_main.c | 6 +- trunk/drivers/net/pch_gbe/pch_gbe_param.c | 8 +- trunk/drivers/net/pcmcia/axnet_cs.c | 31 +- trunk/drivers/net/pcmcia/pcnet_cs.c | 1 + trunk/drivers/net/phy/Kconfig | 2 +- trunk/drivers/net/phy/icplus.c | 59 +- trunk/drivers/net/phy/marvell.c | 164 +- trunk/drivers/net/ppp_generic.c | 52 +- trunk/drivers/net/pppoe.c | 2 +- trunk/drivers/net/qlge/qlge.h | 1 - trunk/drivers/net/qlge/qlge_main.c | 7 +- trunk/drivers/net/qlge/qlge_mpi.c | 12 +- trunk/drivers/net/r8169.c | 38 +- trunk/drivers/net/sfc/efx.c | 43 +- trunk/drivers/net/sfc/net_driver.h | 2 - trunk/drivers/net/sfc/nic.c | 6 - trunk/drivers/net/skfp/skfddi.c | 2 +- trunk/drivers/net/skge.c | 1 + trunk/drivers/net/starfire.c | 2 +- trunk/drivers/net/stmmac/stmmac_main.c | 4 +- trunk/drivers/net/sundance.c | 4 +- trunk/drivers/net/tehuti.c | 4 +- trunk/drivers/net/tg3.c | 2 +- trunk/drivers/net/tile/Makefile | 10 - trunk/drivers/net/tile/tilepro.c | 2406 ------------- trunk/drivers/net/tulip/dmfe.c | 6 +- trunk/drivers/net/typhoon.c | 1 + trunk/drivers/net/ucc_geth.c | 25 +- trunk/drivers/net/ucc_geth.h | 3 +- trunk/drivers/net/usb/asix.c | 4 - trunk/drivers/net/usb/hso.c | 14 +- trunk/drivers/net/usb/mcs7830.c | 14 +- trunk/drivers/net/veth.c | 4 +- trunk/drivers/net/virtio_net.c | 12 +- trunk/drivers/net/wan/hd64572.c | 5 +- trunk/drivers/net/wan/x25_asy.c | 13 +- trunk/drivers/net/wireless/ath/ath5k/base.c | 13 +- .../net/wireless/ath/ath9k/ar9002_hw.c | 3 - .../net/wireless/ath/ath9k/ar9003_eeprom.c | 73 +- .../net/wireless/ath/ath9k/ar9003_eeprom.h | 9 +- trunk/drivers/net/wireless/ath/ath9k/ath9k.h | 5 +- trunk/drivers/net/wireless/ath/ath9k/eeprom.c | 6 +- trunk/drivers/net/wireless/ath/ath9k/eeprom.h | 27 +- .../net/wireless/ath/ath9k/eeprom_9287.c | 2 +- .../net/wireless/ath/ath9k/eeprom_def.c | 23 +- .../drivers/net/wireless/ath/ath9k/hif_usb.c | 47 +- trunk/drivers/net/wireless/ath/ath9k/htc.h | 3 - .../net/wireless/ath/ath9k/htc_drv_init.c | 8 - .../net/wireless/ath/ath9k/htc_drv_main.c | 4 +- .../net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +- trunk/drivers/net/wireless/ath/ath9k/hw.c | 18 +- trunk/drivers/net/wireless/ath/ath9k/hw.h | 1 - trunk/drivers/net/wireless/ath/ath9k/init.c | 6 - trunk/drivers/net/wireless/ath/ath9k/mac.c | 3 +- trunk/drivers/net/wireless/ath/ath9k/main.c | 51 +- trunk/drivers/net/wireless/ath/ath9k/recv.c | 15 +- trunk/drivers/net/wireless/ath/ath9k/reg.h | 15 +- trunk/drivers/net/wireless/ath/ath9k/xmit.c | 22 +- trunk/drivers/net/wireless/ath/carl9170/fw.c | 3 +- .../drivers/net/wireless/ath/carl9170/main.c | 5 +- trunk/drivers/net/wireless/ath/carl9170/tx.c | 2 +- trunk/drivers/net/wireless/ath/carl9170/usb.c | 8 +- trunk/drivers/net/wireless/b43/sdio.c | 1 - .../drivers/net/wireless/hostap/hostap_main.c | 1 + trunk/drivers/net/wireless/iwlwifi/iwl-1000.c | 2 - trunk/drivers/net/wireless/iwlwifi/iwl-6000.c | 12 - .../net/wireless/iwlwifi/iwl-agn-eeprom.c | 88 +- .../net/wireless/iwlwifi/iwl-agn-lib.c | 6 - trunk/drivers/net/wireless/iwlwifi/iwl-core.h | 1 - .../drivers/net/wireless/iwlwifi/iwl-eeprom.h | 25 +- .../net/wireless/iwlwifi/iwl3945-base.c | 3 +- trunk/drivers/net/wireless/libertas/cfg.c | 7 +- trunk/drivers/net/wireless/libertas/dev.h | 1 - trunk/drivers/net/wireless/libertas/if_sdio.c | 1 + trunk/drivers/net/wireless/libertas/if_spi.c | 1 + trunk/drivers/net/wireless/libertas/main.c | 9 +- trunk/drivers/net/wireless/orinoco/main.c | 18 +- .../drivers/net/wireless/orinoco/orinoco_cs.c | 14 +- .../net/wireless/orinoco/orinoco_usb.c | 1 + trunk/drivers/net/wireless/orinoco/scan.c | 8 - trunk/drivers/net/wireless/orinoco/scan.h | 1 - .../net/wireless/orinoco/spectrum_cs.c | 14 +- trunk/drivers/net/wireless/orinoco/wext.c | 4 +- trunk/drivers/net/wireless/p54/p54usb.c | 6 - trunk/drivers/net/wireless/rt2x00/Kconfig | 3 + trunk/drivers/net/wireless/rt2x00/rt2800pci.c | 1 - trunk/drivers/net/wireless/rt2x00/rt2x00.h | 1 - trunk/drivers/net/wireless/rt2x00/rt2x00dev.c | 9 +- trunk/drivers/net/xen-netfront.c | 4 +- trunk/drivers/net/yellowfin.c | 4 +- trunk/drivers/of/of_i2c.c | 2 +- trunk/drivers/parisc/dino.c | 1 + trunk/drivers/parisc/eisa.c | 3 +- trunk/drivers/parisc/eisa_eeprom.c | 1 + trunk/drivers/parisc/gsc.c | 3 +- trunk/drivers/parisc/iosapic.c | 8 - trunk/drivers/parisc/led.c | 17 +- trunk/drivers/parisc/superio.c | 3 +- trunk/drivers/pci/Makefile | 1 - trunk/drivers/pci/bus.c | 53 +- trunk/drivers/pci/dmar.c | 5 - trunk/drivers/pci/hotplug/ibmphp_ebda.c | 6 - trunk/drivers/pci/hotplug/pciehp_acpi.c | 3 +- trunk/drivers/pci/pci-sysfs.c | 23 +- trunk/drivers/pci/pci.c | 12 - trunk/drivers/pci/pci.h | 7 +- trunk/drivers/pci/proc.c | 3 +- trunk/drivers/pci/quirks.c | 44 - trunk/drivers/pci/xen-pcifront.c | 6 +- trunk/drivers/pcmcia/Makefile | 3 +- trunk/drivers/pcmcia/pd6729.c | 8 +- trunk/drivers/pcmcia/pd6729.h | 2 +- trunk/drivers/pcmcia/pxa2xx_sharpsl.c | 2 +- trunk/drivers/pcmcia/sa1100_assabet.c | 2 +- trunk/drivers/pcmcia/sa1100_cerf.c | 2 +- trunk/drivers/pcmcia/sa1100_generic.c | 5 +- trunk/drivers/pcmcia/sa1100_generic.h | 1 - trunk/drivers/pcmcia/sa1100_h3600.c | 2 +- trunk/drivers/pcmcia/sa1100_nanoengine.c | 219 -- trunk/drivers/pcmcia/sa1100_shannon.c | 2 +- trunk/drivers/pcmcia/sa1100_simpad.c | 2 +- trunk/drivers/pcmcia/soc_common.c | 138 +- trunk/drivers/platform/x86/asus-laptop.c | 97 +- trunk/drivers/platform/x86/eeepc-wmi.c | 4 +- trunk/drivers/platform/x86/hp-wmi.c | 2 - trunk/drivers/platform/x86/ibm_rtl.c | 34 +- trunk/drivers/platform/x86/intel_ips.c | 36 +- trunk/drivers/platform/x86/intel_ips.h | 21 - trunk/drivers/platform/x86/msi-wmi.c | 16 +- trunk/drivers/platform/x86/thinkpad_acpi.c | 1 + trunk/drivers/platform/x86/toshiba_acpi.c | 1 - trunk/drivers/platform/x86/wmi.c | 2 +- trunk/drivers/pnp/isapnp/proc.c | 1 + trunk/drivers/pnp/pnpacpi/core.c | 2 +- trunk/drivers/rapidio/rio.c | 4 +- trunk/drivers/regulator/core.c | 30 +- trunk/drivers/regulator/mc13783-regulator.c | 4 +- trunk/drivers/regulator/tps6586x-regulator.c | 33 +- trunk/drivers/regulator/twl-regulator.c | 6 +- trunk/drivers/rtc/rtc-rs5c372.c | 2 +- trunk/drivers/rtc/rtc-sa1100.c | 161 +- trunk/drivers/rtc/rtc-sh.c | 4 +- trunk/drivers/s390/block/dasd_eer.c | 1 + trunk/drivers/s390/char/fs3270.c | 1 + trunk/drivers/s390/char/tape_char.c | 1 + trunk/drivers/s390/char/tape_core.c | 68 +- trunk/drivers/s390/char/vmlogrdr.c | 37 +- trunk/drivers/s390/char/vmur.c | 1 + trunk/drivers/s390/cio/css.c | 2 +- trunk/drivers/s390/cio/device.c | 11 +- trunk/drivers/s390/cio/qdio_thinint.c | 2 +- trunk/drivers/s390/crypto/zcrypt_api.c | 1 + trunk/drivers/s390/net/qeth_core.h | 9 + trunk/drivers/s390/net/qeth_core_main.c | 55 +- trunk/drivers/s390/scsi/zfcp_erp.c | 11 +- trunk/drivers/s390/scsi/zfcp_fsf.c | 11 +- trunk/drivers/s390/scsi/zfcp_scsi.c | 5 +- trunk/drivers/scsi/3w-9xxx.c | 4 +- trunk/drivers/scsi/3w-sas.c | 4 +- trunk/drivers/scsi/3w-xxxx.c | 4 +- trunk/drivers/scsi/53c700.c | 8 +- trunk/drivers/scsi/BusLogic.c | 3 +- trunk/drivers/scsi/BusLogic.h | 2 +- trunk/drivers/scsi/NCR5380.c | 3 +- trunk/drivers/scsi/NCR5380.h | 2 +- trunk/drivers/scsi/NCR53c406a.c | 4 +- trunk/drivers/scsi/a100u2w.c | 4 +- trunk/drivers/scsi/aacraid/linit.c | 4 +- trunk/drivers/scsi/advansys.c | 4 +- trunk/drivers/scsi/aha152x.c | 4 +- trunk/drivers/scsi/aha1542.c | 4 +- trunk/drivers/scsi/aha1542.h | 2 +- trunk/drivers/scsi/aha1740.c | 4 +- trunk/drivers/scsi/aic7xxx/aic79xx_osm.c | 4 +- trunk/drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 +- trunk/drivers/scsi/aic7xxx_old.c | 4 +- trunk/drivers/scsi/arcmsr/arcmsr_hba.c | 7 +- trunk/drivers/scsi/arm/acornscsi.c | 4 +- trunk/drivers/scsi/arm/fas216.c | 10 +- trunk/drivers/scsi/arm/fas216.h | 18 +- trunk/drivers/scsi/atari_NCR5380.c | 4 +- trunk/drivers/scsi/atari_scsi.c | 17 + trunk/drivers/scsi/atp870u.c | 4 +- trunk/drivers/scsi/bfa/bfa_fcs.c | 4 +- trunk/drivers/scsi/bfa/bfa_fcs_fcpim.c | 6 +- trunk/drivers/scsi/bfa/bfa_fcs_lport.c | 10 +- trunk/drivers/scsi/bfa/bfa_fcs_rport.c | 6 +- trunk/drivers/scsi/bfa/bfa_ioc.c | 8 +- trunk/drivers/scsi/bfa/bfa_svc.c | 28 +- trunk/drivers/scsi/bfa/bfad.c | 8 +- trunk/drivers/scsi/bfa/bfad_drv.h | 2 +- trunk/drivers/scsi/bfa/bfad_im.c | 28 +- trunk/drivers/scsi/dc395x.c | 3 +- trunk/drivers/scsi/dpt_i2o.c | 4 +- trunk/drivers/scsi/dpti.h | 2 +- trunk/drivers/scsi/dtc.h | 2 +- trunk/drivers/scsi/eata.c | 7 +- trunk/drivers/scsi/eata_pio.c | 4 +- trunk/drivers/scsi/esp_scsi.c | 4 +- trunk/drivers/scsi/fd_mcs.c | 4 +- trunk/drivers/scsi/fdomain.c | 4 +- trunk/drivers/scsi/fnic/fnic.h | 2 +- trunk/drivers/scsi/fnic/fnic_scsi.c | 4 +- trunk/drivers/scsi/g_NCR5380.h | 2 +- trunk/drivers/scsi/gdth.c | 6 +- trunk/drivers/scsi/hpsa.c | 16 +- trunk/drivers/scsi/hptiop.c | 4 +- trunk/drivers/scsi/ibmmca.c | 6 +- trunk/drivers/scsi/ibmvscsi/ibmvfc.c | 4 +- trunk/drivers/scsi/ibmvscsi/ibmvscsi.c | 4 +- trunk/drivers/scsi/imm.c | 4 +- trunk/drivers/scsi/in2000.c | 4 +- trunk/drivers/scsi/in2000.h | 2 +- trunk/drivers/scsi/initio.c | 4 +- trunk/drivers/scsi/ipr.c | 4 +- trunk/drivers/scsi/ips.c | 6 +- trunk/drivers/scsi/libfc/fc_fcp.c | 4 +- trunk/drivers/scsi/libiscsi.c | 4 +- trunk/drivers/scsi/libsas/sas_scsi_host.c | 4 +- trunk/drivers/scsi/lpfc/lpfc_scsi.c | 4 +- trunk/drivers/scsi/mac53c94.c | 4 +- trunk/drivers/scsi/megaraid.c | 6 +- trunk/drivers/scsi/megaraid.h | 2 +- trunk/drivers/scsi/megaraid/megaraid_mbox.c | 7 +- trunk/drivers/scsi/megaraid/megaraid_sas.c | 4 +- trunk/drivers/scsi/mesh.c | 4 +- trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c | 4 +- trunk/drivers/scsi/ncr53c8xx.c | 4 +- trunk/drivers/scsi/nsp32.c | 7 +- trunk/drivers/scsi/osd/osd_initiator.c | 4 +- trunk/drivers/scsi/pas16.h | 2 +- trunk/drivers/scsi/pcmcia/nsp_cs.c | 4 +- trunk/drivers/scsi/pcmcia/nsp_cs.h | 3 +- trunk/drivers/scsi/pcmcia/sym53c500_cs.c | 4 +- trunk/drivers/scsi/pm8001/pm8001_sas.h | 1 + trunk/drivers/scsi/pmcraid.c | 8 +- trunk/drivers/scsi/pmcraid.h | 6 +- trunk/drivers/scsi/ppa.c | 4 +- trunk/drivers/scsi/ps3rom.c | 4 +- trunk/drivers/scsi/qla1280.c | 4 +- trunk/drivers/scsi/qla2xxx/qla_def.h | 1 + trunk/drivers/scsi/qla2xxx/qla_iocb.c | 1 - trunk/drivers/scsi/qla2xxx/qla_isr.c | 5 +- trunk/drivers/scsi/qla2xxx/qla_nx.c | 1 - trunk/drivers/scsi/qla2xxx/qla_os.c | 10 +- trunk/drivers/scsi/qla2xxx/qla_version.h | 4 +- trunk/drivers/scsi/qla4xxx/ql4_os.c | 7 +- trunk/drivers/scsi/qlogicfas408.c | 4 +- trunk/drivers/scsi/qlogicfas408.h | 3 +- trunk/drivers/scsi/qlogicpti.c | 4 +- trunk/drivers/scsi/scsi.c | 18 +- trunk/drivers/scsi/scsi_debug.c | 4 +- trunk/drivers/scsi/scsi_error.c | 50 +- trunk/drivers/scsi/scsi_lib.c | 8 +- trunk/drivers/scsi/sd.c | 1 + trunk/drivers/scsi/stex.c | 4 +- trunk/drivers/scsi/sun3_NCR5380.c | 4 +- trunk/drivers/scsi/sun3_scsi.h | 3 +- trunk/drivers/scsi/sym53c416.c | 4 +- trunk/drivers/scsi/sym53c416.h | 2 +- trunk/drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +- trunk/drivers/scsi/t128.h | 3 +- trunk/drivers/scsi/tmscsim.c | 4 +- trunk/drivers/scsi/u14-34f.c | 6 +- trunk/drivers/scsi/ultrastor.c | 4 +- trunk/drivers/scsi/ultrastor.h | 3 +- trunk/drivers/scsi/vmw_pvscsi.c | 4 +- trunk/drivers/scsi/wd33c93.c | 6 +- trunk/drivers/scsi/wd33c93.h | 3 +- trunk/drivers/scsi/wd7000.c | 4 +- trunk/drivers/serial/8250.c | 2 +- trunk/drivers/serial/8250_pci.c | 5 - trunk/drivers/serial/bfin_5xx.c | 31 +- trunk/drivers/serial/crisv10.c | 1 + trunk/drivers/serial/kgdboc.c | 60 - trunk/drivers/serial/mfd.c | 24 +- trunk/drivers/serial/serial_core.c | 1 + trunk/drivers/sh/clk/core.c | 20 +- trunk/drivers/sh/clk/cpg.c | 7 +- trunk/drivers/sh/intc/core.c | 1 - trunk/drivers/sh/intc/virq.c | 2 +- trunk/drivers/spi/atmel_spi.c | 6 +- trunk/drivers/spi/coldfire_qspi.c | 2 +- trunk/drivers/spi/dw_spi.c | 5 - trunk/drivers/spi/mpc52xx_spi.c | 2 +- trunk/drivers/spi/omap2_mcspi.c | 39 - trunk/drivers/spi/spi.c | 3 +- trunk/drivers/spi/spi_fsl_espi.c | 35 +- trunk/drivers/ssb/b43_pci_bridge.c | 1 - trunk/drivers/staging/asus_oled/asus_oled.c | 8 +- trunk/drivers/staging/ath6kl/Kconfig | 2 +- .../staging/ath6kl/os/linux/ar6000_drv.c | 5 +- .../staging/ath6kl/os/linux/cfg80211.c | 7 +- .../staging/batman-adv/hard-interface.c | 34 +- trunk/drivers/staging/batman-adv/routing.c | 12 +- trunk/drivers/staging/batman-adv/routing.h | 4 +- .../staging/batman-adv/soft-interface.c | 14 +- trunk/drivers/staging/batman-adv/unicast.c | 2 +- trunk/drivers/staging/bcm/Bcmchar.c | 49 +- trunk/drivers/staging/brcm80211/README | 8 +- trunk/drivers/staging/brcm80211/TODO | 4 +- .../staging/brcm80211/brcmfmac/dhd_linux.c | 2 + .../staging/brcm80211/brcmfmac/wl_cfg80211.c | 12 +- trunk/drivers/staging/comedi/drivers/usbdux.c | 4 +- trunk/drivers/staging/cpia/cpia.c | 6 +- trunk/drivers/staging/cx25821/cx25821-video.c | 8 +- trunk/drivers/staging/cx25821/cx25821-video.h | 2 +- trunk/drivers/staging/easycap/easycap.h | 2 +- trunk/drivers/staging/frontier/tranzport.c | 2 +- .../staging/ft1000/ft1000-usb/ft1000_chdev.c | 1 + trunk/drivers/staging/go7007/go7007-driver.c | 2 +- trunk/drivers/staging/hv/hv_utils.c | 3 + trunk/drivers/staging/hv/storvsc_drv.c | 7 +- .../staging/iio/accel/adis16220_core.c | 2 +- .../intel_sst/intel_sst_app_interface.c | 285 +- .../staging/intel_sst/intel_sst_common.h | 4 +- .../intel_sst/intel_sst_stream_encoded.c | 2 +- trunk/drivers/staging/keucr/init.c | 18 +- trunk/drivers/staging/keucr/ms.c | 14 +- trunk/drivers/staging/keucr/msscsi.c | 6 +- trunk/drivers/staging/keucr/scsiglue.c | 4 +- trunk/drivers/staging/keucr/sdscsi.c | 4 +- trunk/drivers/staging/keucr/smilsub.c | 18 +- trunk/drivers/staging/keucr/transport.c | 2 +- trunk/drivers/staging/line6/control.c | 204 +- trunk/drivers/staging/line6/midi.c | 4 +- trunk/drivers/staging/line6/pcm.c | 4 +- trunk/drivers/staging/line6/pod.c | 32 +- trunk/drivers/staging/line6/toneport.c | 4 +- trunk/drivers/staging/line6/variax.c | 12 +- trunk/drivers/staging/olpc_dcon/olpc_dcon.c | 4 + trunk/drivers/staging/quickstart/quickstart.c | 10 +- trunk/drivers/staging/rt2860/common/cmm_aes.c | 2 + trunk/drivers/staging/rt2860/usb_main_dev.c | 2 - trunk/drivers/staging/rtl8187se/r8185b_init.c | 30 +- trunk/drivers/staging/rtl8192e/r8192E_core.c | 3 - trunk/drivers/staging/rtl8712/osdep_service.h | 1 + trunk/drivers/staging/rtl8712/usb_halinit.c | 2 +- .../staging/samsung-laptop/samsung-laptop.c | 2 +- trunk/drivers/staging/speakup/buffers.c | 1 + trunk/drivers/staging/speakup/fakekey.c | 1 + trunk/drivers/staging/spectra/ffsport.c | 2 +- trunk/drivers/staging/stradis/Kconfig | 2 +- trunk/drivers/staging/stradis/stradis.c | 11 +- trunk/drivers/staging/tidspbridge/Kconfig | 1 + trunk/drivers/staging/tidspbridge/Makefile | 7 +- trunk/drivers/staging/tidspbridge/core/_deh.h | 5 +- .../staging/tidspbridge/core/_tiomap.h | 19 +- .../staging/tidspbridge/core/dsp-mmu.c | 317 ++ .../drivers/staging/tidspbridge/core/io_sm.c | 180 +- .../staging/tidspbridge/core/tiomap3430.c | 1083 +----- .../staging/tidspbridge/core/tiomap3430_pwr.c | 4 - .../staging/tidspbridge/core/tiomap_io.c | 17 +- .../drivers/staging/tidspbridge/core/ue_deh.c | 115 +- .../staging/tidspbridge/hw/EasiGlobal.h | 41 - .../staging/tidspbridge/hw/MMUAccInt.h | 76 - .../staging/tidspbridge/hw/MMURegAcM.h | 225 -- .../drivers/staging/tidspbridge/hw/hw_defs.h | 58 - trunk/drivers/staging/tidspbridge/hw/hw_mmu.c | 562 ---- trunk/drivers/staging/tidspbridge/hw/hw_mmu.h | 163 - .../tidspbridge/include/dspbridge/cfgdefs.h | 1 - .../tidspbridge/include/dspbridge/dev.h | 24 - .../tidspbridge/include/dspbridge/dmm.h | 75 - .../tidspbridge/include/dspbridge/drv.h | 10 - .../tidspbridge/include/dspbridge/dsp-mmu.h | 67 + .../tidspbridge/include/dspbridge/dspdefs.h | 44 - .../tidspbridge/include/dspbridge/dspioctl.h | 7 - .../tidspbridge/include/dspbridge/proc.h | 46 - trunk/drivers/staging/tidspbridge/pmgr/dev.c | 63 +- trunk/drivers/staging/tidspbridge/pmgr/dmm.c | 533 --- .../drivers/staging/tidspbridge/pmgr/dspapi.c | 34 +- trunk/drivers/staging/tidspbridge/rmgr/drv.c | 15 - .../staging/tidspbridge/rmgr/drv_interface.c | 2 - trunk/drivers/staging/tidspbridge/rmgr/node.c | 48 +- trunk/drivers/staging/tidspbridge/rmgr/proc.c | 197 +- trunk/drivers/staging/tm6000/tm6000-cards.c | 4 +- trunk/drivers/staging/tm6000/tm6000-video.c | 1 - trunk/drivers/staging/udlfb/udlfb.c | 4 +- trunk/drivers/staging/vt6656/main_usb.c | 3 +- .../westbridge/astoria/api/src/cyasusb.c | 1 + trunk/drivers/staging/winbond/sysdef.h | 3 - trunk/drivers/staging/wlan-ng/cfg80211.c | 6 +- trunk/drivers/staging/wlan-ng/p80211netdev.c | 2 +- trunk/drivers/staging/zram/zram_drv.c | 6 + trunk/drivers/staging/zram/zram_sysfs.c | 4 +- trunk/drivers/tty/n_gsm.c | 7 +- trunk/drivers/tty/sysrq.c | 169 +- trunk/drivers/tty/tty_buffer.c | 14 +- trunk/drivers/tty/tty_io.c | 13 +- trunk/drivers/tty/tty_ldisc.c | 51 +- trunk/drivers/tty/vt/vc_screen.c | 6 +- trunk/drivers/uio/uio.c | 2 +- trunk/drivers/uio/uio_cif.c | 2 +- trunk/drivers/uio/uio_netx.c | 2 +- trunk/drivers/usb/atm/ueagle-atm.c | 29 +- trunk/drivers/usb/atm/usbatm.c | 15 +- trunk/drivers/usb/core/Kconfig | 12 +- trunk/drivers/usb/core/devices.c | 1 + trunk/drivers/usb/core/devio.c | 8 +- trunk/drivers/usb/core/file.c | 1 + trunk/drivers/usb/core/hcd.c | 2 - trunk/drivers/usb/core/inode.c | 1 + trunk/drivers/usb/gadget/Kconfig | 2 +- trunk/drivers/usb/gadget/atmel_usba_udc.c | 2 +- trunk/drivers/usb/gadget/composite.c | 18 +- trunk/drivers/usb/gadget/f_fs.c | 1 + trunk/drivers/usb/gadget/f_hid.c | 1 + trunk/drivers/usb/gadget/goku_udc.h | 3 +- trunk/drivers/usb/gadget/u_serial.c | 54 +- trunk/drivers/usb/host/Kconfig | 2 +- trunk/drivers/usb/host/ehci-dbg.c | 2 +- trunk/drivers/usb/host/ehci-hcd.c | 10 +- trunk/drivers/usb/host/ehci-mem.c | 26 +- trunk/drivers/usb/host/ehci-mxc.c | 14 +- trunk/drivers/usb/host/ehci-pci.c | 25 - trunk/drivers/usb/host/ehci-sched.c | 21 +- trunk/drivers/usb/host/ehci.h | 2 - trunk/drivers/usb/host/isp1362-hcd.c | 3 +- trunk/drivers/usb/host/ohci-jz4740.c | 2 +- trunk/drivers/usb/host/uhci-debug.c | 1 + trunk/drivers/usb/host/xhci-hub.c | 7 - trunk/drivers/usb/host/xhci-mem.c | 173 +- trunk/drivers/usb/host/xhci-ring.c | 1 + trunk/drivers/usb/host/xhci.c | 91 +- trunk/drivers/usb/host/xhci.h | 31 - trunk/drivers/usb/image/microtek.c | 6 +- trunk/drivers/usb/misc/cypress_cy7c63.c | 6 +- trunk/drivers/usb/misc/iowarrior.c | 1 - trunk/drivers/usb/misc/sisusbvga/sisusb.c | 1 - trunk/drivers/usb/misc/trancevibrator.c | 2 +- trunk/drivers/usb/misc/usbled.c | 2 +- trunk/drivers/usb/misc/usbsevseg.c | 10 +- trunk/drivers/usb/misc/uss720.c | 4 +- trunk/drivers/usb/misc/yurex.c | 1 - trunk/drivers/usb/mon/mon_bin.c | 1 + trunk/drivers/usb/mon/mon_stat.c | 1 + trunk/drivers/usb/musb/blackfin.c | 80 +- trunk/drivers/usb/musb/musb_core.c | 44 +- trunk/drivers/usb/musb/musb_core.h | 2 +- trunk/drivers/usb/musb/musb_gadget.c | 165 +- trunk/drivers/usb/musb/musb_regs.h | 3 +- trunk/drivers/usb/musb/musbhsdma.c | 14 - trunk/drivers/usb/otg/langwell_otg.c | 9 +- trunk/drivers/usb/serial/ftdi_sio.c | 5 - trunk/drivers/usb/serial/ftdi_sio_ids.h | 16 - trunk/drivers/usb/serial/option.c | 2 +- trunk/drivers/usb/serial/usb-serial.c | 4 +- trunk/drivers/usb/storage/scsiglue.c | 4 +- trunk/drivers/usb/storage/sierra_ms.c | 2 +- trunk/drivers/usb/storage/uas.c | 9 +- trunk/drivers/usb/storage/unusual_devs.h | 7 - trunk/drivers/uwb/allocator.c | 3 +- trunk/drivers/vhost/net.c | 5 +- trunk/drivers/vhost/vhost.c | 3 +- trunk/drivers/video/backlight/adp8860_bl.c | 8 +- trunk/drivers/video/backlight/backlight.c | 12 +- trunk/drivers/video/backlight/cr_bllcd.c | 1 - trunk/drivers/video/backlight/l4f00242t03.c | 2 +- trunk/drivers/video/backlight/lms283gf05.c | 2 +- trunk/drivers/video/backlight/mbp_nvidia_bl.c | 18 - trunk/drivers/video/backlight/pwm_bl.c | 7 +- trunk/drivers/video/backlight/s6e63m0.c | 7 +- trunk/drivers/video/console/vgacon.c | 1 + trunk/drivers/video/da8xx-fb.c | 14 +- trunk/drivers/video/fbcmap.c | 69 +- trunk/drivers/video/fbmem.c | 2 +- trunk/drivers/video/geode/lxfb.h | 4 +- trunk/drivers/video/geode/lxfb_ops.c | 24 +- trunk/drivers/video/imxfb.c | 9 +- trunk/drivers/video/modedb.c | 1 - trunk/drivers/video/mx3fb.c | 4 - trunk/drivers/video/omap/Kconfig | 4 +- trunk/drivers/video/omap2/vram.c | 19 +- trunk/drivers/video/riva/rivafb-i2c.c | 1 + trunk/drivers/video/sh_mobile_hdmi.c | 21 +- trunk/drivers/video/sh_mobile_lcdcfb.c | 53 +- trunk/drivers/video/sis/init.c | 685 +++- trunk/drivers/video/sis/init.h | 63 +- trunk/drivers/video/sis/init301.c | 467 ++- trunk/drivers/video/sis/init301.h | 43 +- trunk/drivers/video/sis/initextlfb.c | 7 +- trunk/drivers/video/sis/osdef.h | 133 + trunk/drivers/video/sis/sis.h | 1 + trunk/drivers/video/sis/sis_main.c | 38 +- trunk/drivers/video/sis/vgatypes.h | 11 + trunk/drivers/video/sis/vstruct.h | 12 + trunk/drivers/virtio/virtio.c | 6 +- trunk/drivers/virtio/virtio_ring.c | 3 + trunk/drivers/watchdog/Kconfig | 3 - trunk/drivers/watchdog/bcm63xx_wdt.c | 42 +- trunk/drivers/watchdog/gef_wdt.c | 1 - trunk/drivers/watchdog/iTCO_wdt.c | 8 +- trunk/drivers/watchdog/rdc321x_wdt.c | 2 +- trunk/drivers/xen/Makefile | 5 +- trunk/drivers/xen/balloon.c | 42 +- trunk/drivers/xen/events.c | 147 +- trunk/drivers/xen/evtchn.c | 100 +- trunk/drivers/xen/manage.c | 1 - trunk/drivers/xen/xenfs/privcmd.c | 14 +- trunk/drivers/xen/xenfs/super.c | 46 +- trunk/drivers/zorro/proc.c | 1 + trunk/fs/autofs4/root.c | 12 +- trunk/fs/bio.c | 23 +- trunk/fs/block_dev.c | 1 + trunk/fs/btrfs/compression.c | 15 +- trunk/fs/btrfs/ctree.h | 6 +- trunk/fs/btrfs/disk-io.c | 41 +- trunk/fs/btrfs/export.c | 78 +- trunk/fs/btrfs/extent-tree.c | 77 +- trunk/fs/btrfs/extent_io.c | 77 +- trunk/fs/btrfs/extent_io.h | 3 - trunk/fs/btrfs/file.c | 99 +- trunk/fs/btrfs/free-space-cache.c | 12 +- trunk/fs/btrfs/inode.c | 299 +- trunk/fs/btrfs/ioctl.c | 87 +- trunk/fs/btrfs/ioctl.h | 14 +- trunk/fs/btrfs/ordered-data.c | 67 - trunk/fs/btrfs/ordered-data.h | 3 - trunk/fs/btrfs/orphan.c | 6 +- trunk/fs/btrfs/super.c | 43 +- trunk/fs/btrfs/transaction.c | 5 +- trunk/fs/btrfs/tree-log.c | 21 +- trunk/fs/btrfs/volumes.c | 20 +- trunk/fs/btrfs/volumes.h | 2 - trunk/fs/ceph/addr.c | 6 +- trunk/fs/ceph/caps.c | 17 +- trunk/fs/ceph/dir.c | 23 +- trunk/fs/ceph/file.c | 65 +- trunk/fs/ceph/inode.c | 50 +- trunk/fs/ceph/ioctl.h | 2 +- trunk/fs/ceph/locks.c | 94 +- trunk/fs/ceph/mds_client.c | 49 +- trunk/fs/ceph/mds_client.h | 33 +- trunk/fs/ceph/super.h | 4 +- trunk/fs/cifs/Kconfig | 8 - trunk/fs/cifs/Makefile | 4 +- trunk/fs/cifs/README | 9 - trunk/fs/cifs/cifs_fs_sb.h | 1 - trunk/fs/cifs/cifsacl.c | 51 +- trunk/fs/cifs/cifsacl.h | 4 + trunk/fs/cifs/cifsfs.c | 5 +- trunk/fs/cifs/cifsglob.h | 12 +- trunk/fs/cifs/cifsproto.h | 11 +- trunk/fs/cifs/cifssmb.c | 183 +- trunk/fs/cifs/connect.c | 47 +- trunk/fs/cifs/dns_resolve.c | 2 +- trunk/fs/cifs/file.c | 6 +- trunk/fs/cifs/fscache.c | 12 +- trunk/fs/cifs/inode.c | 57 +- trunk/fs/cifs/readdir.c | 41 +- trunk/fs/cifs/xattr.c | 55 +- trunk/fs/compat.c | 28 +- trunk/fs/compat_ioctl.c | 1 + trunk/fs/ecryptfs/super.c | 1 + trunk/fs/exec.c | 41 +- trunk/fs/ext3/super.c | 1 + trunk/fs/ext4/ext4.h | 1 - trunk/fs/ext4/inode.c | 5 +- trunk/fs/ext4/ioctl.c | 24 - trunk/fs/ext4/namei.c | 2 +- trunk/fs/ext4/page-io.c | 4 +- trunk/fs/ext4/resize.c | 5 - trunk/fs/ext4/super.c | 23 +- trunk/fs/fuse/file.c | 82 +- trunk/fs/gfs2/export.c | 46 +- trunk/fs/gfs2/glock.c | 21 +- trunk/fs/gfs2/inode.c | 152 +- trunk/fs/gfs2/inode.h | 4 +- trunk/fs/gfs2/quota.c | 15 +- trunk/fs/gfs2/rgrp.c | 91 +- trunk/fs/hugetlbfs/inode.c | 3 +- trunk/fs/ioctl.c | 40 + trunk/fs/ioprio.c | 13 +- trunk/fs/jbd2/journal.c | 16 +- trunk/fs/lockd/clntlock.c | 1 + trunk/fs/lockd/clntproc.c | 1 + trunk/fs/lockd/host.c | 11 +- trunk/fs/lockd/svc4proc.c | 1 + trunk/fs/lockd/svclock.c | 1 + trunk/fs/lockd/svcproc.c | 1 + trunk/fs/locks.c | 20 +- trunk/fs/logfs/journal.c | 2 +- trunk/fs/logfs/readwrite.c | 3 - trunk/fs/namei.c | 3 - trunk/fs/namespace.c | 1 + trunk/fs/ncpfs/dir.c | 1 + trunk/fs/ncpfs/file.c | 1 + trunk/fs/ncpfs/inode.c | 1 + trunk/fs/ncpfs/ioctl.c | 1 + trunk/fs/nfs/callback.c | 1 + trunk/fs/nfs/delegation.c | 1 + trunk/fs/nfs/dir.c | 220 +- trunk/fs/nfs/direct.c | 2 +- trunk/fs/nfs/file.c | 2 - trunk/fs/nfs/inode.c | 1 - trunk/fs/nfs/internal.h | 9 - trunk/fs/nfs/mount_clnt.c | 4 +- trunk/fs/nfs/nfs2xdr.c | 8 +- trunk/fs/nfs/nfs3xdr.c | 8 +- trunk/fs/nfs/nfs4proc.c | 13 +- trunk/fs/nfs/nfs4xdr.c | 8 +- trunk/fs/nfs/pagelist.c | 4 +- trunk/fs/nfs/read.c | 1 + trunk/fs/nfs/super.c | 13 +- trunk/fs/nfs/write.c | 3 +- trunk/fs/nfsd/nfs3xdr.c | 6 +- trunk/fs/nfsd/nfs4state.c | 24 +- trunk/fs/nfsd/xdr4.h | 21 +- trunk/fs/nilfs2/dat.c | 2 +- trunk/fs/nilfs2/gcinode.c | 9 + trunk/fs/nilfs2/ioctl.c | 16 +- trunk/fs/notify/fanotify/fanotify.c | 6 +- trunk/fs/notify/fanotify/fanotify_user.c | 81 +- trunk/fs/notify/inotify/inotify_user.c | 1 - trunk/fs/ocfs2/aops.c | 7 +- trunk/fs/ocfs2/aops.h | 23 +- trunk/fs/ocfs2/cluster/heartbeat.c | 14 +- trunk/fs/ocfs2/cluster/masklog.c | 3 +- trunk/fs/ocfs2/cluster/masklog.h | 15 +- trunk/fs/ocfs2/dcache.c | 1 + trunk/fs/ocfs2/dir.c | 4 - trunk/fs/ocfs2/dlm/dlmdomain.c | 2 +- trunk/fs/ocfs2/dlm/dlmmaster.c | 40 +- trunk/fs/ocfs2/file.c | 15 +- trunk/fs/ocfs2/ocfs2.h | 6 +- trunk/fs/ocfs2/ocfs2_fs.h | 2 +- trunk/fs/ocfs2/stack_user.c | 2 +- trunk/fs/ocfs2/super.c | 1 + trunk/fs/pipe.c | 14 +- trunk/fs/proc/base.c | 2 +- trunk/fs/proc/inode.c | 1 + trunk/fs/proc/task_mmu.c | 3 +- trunk/fs/proc/vmcore.c | 2 +- trunk/fs/read_write.c | 1 + trunk/fs/reiserfs/inode.c | 1 + trunk/fs/reiserfs/ioctl.c | 8 +- trunk/fs/reiserfs/journal.c | 1 + trunk/fs/reiserfs/super.c | 1 + trunk/fs/reiserfs/xattr_acl.c | 6 +- trunk/fs/splice.c | 24 +- trunk/fs/xfs/linux-2.6/xfs_aops.c | 101 +- trunk/fs/xfs/linux-2.6/xfs_buf.c | 37 +- trunk/fs/xfs/linux-2.6/xfs_ioctl.c | 2 +- trunk/fs/xfs/linux-2.6/xfs_iops.c | 3 +- trunk/fs/xfs/linux-2.6/xfs_super.c | 3 + trunk/fs/xfs/linux-2.6/xfs_sync.c | 1 - trunk/fs/xfs/xfs_bmap.c | 85 +- trunk/fs/xfs/xfs_bmap.h | 5 - trunk/fs/xfs/xfs_dfrag.c | 13 - trunk/fs/xfs/xfs_error.c | 3 - trunk/fs/xfs/xfs_error.h | 5 +- trunk/fs/xfs/xfs_filestream.c | 8 +- trunk/fs/xfs/xfs_inode_item.c | 31 +- trunk/fs/xfs/xfs_mount.c | 1 - trunk/fs/xfs/xfs_quota.h | 20 +- trunk/fs/xfs/xfs_rename.c | 1 - trunk/include/acpi/video.h | 5 +- trunk/include/drm/i915_drm.h | 2 - trunk/include/drm/nouveau_drm.h | 7 - trunk/include/drm/ttm/ttm_bo_api.h | 4 - trunk/include/drm/ttm/ttm_bo_driver.h | 79 +- trunk/include/linux/acpi.h | 2 +- trunk/include/linux/atmdev.h | 6 +- trunk/include/linux/atomic.h | 37 - trunk/include/linux/binfmts.h | 5 - trunk/include/linux/bio.h | 4 + trunk/include/linux/blk_types.h | 6 +- trunk/include/linux/blkdev.h | 13 +- trunk/include/linux/bootmem.h | 2 - trunk/include/linux/ceph/libceph.h | 7 +- trunk/include/linux/ceph/messenger.h | 1 - trunk/include/linux/ceph/osd_client.h | 7 +- trunk/include/linux/cnt32_to_63.h | 20 +- trunk/include/linux/cpu.h | 5 + trunk/include/linux/crash_dump.h | 9 +- trunk/include/linux/dmaengine.h | 13 +- trunk/include/linux/dmar.h | 17 +- trunk/include/linux/drbd.h | 2 +- trunk/include/linux/fanotify.h | 10 +- trunk/include/linux/fb.h | 1 - trunk/include/linux/fs.h | 8 +- trunk/include/linux/fsl-diu-fb.h | 1 + trunk/include/linux/fsnotify.h | 3 + trunk/include/linux/fsnotify_backend.h | 2 +- trunk/include/linux/gfp.h | 4 +- trunk/include/linux/gpio_keys.h | 2 - trunk/include/linux/hardirq.h | 6 +- trunk/include/linux/highmem.h | 1 - trunk/include/linux/hw_breakpoint.h | 4 - trunk/include/linux/i2c-id.h | 22 + trunk/include/linux/i2c.h | 2 +- trunk/include/linux/i2c/adp5588.h | 15 +- trunk/include/linux/if_vlan.h | 25 - trunk/include/linux/input.h | 35 +- trunk/include/linux/iocontext.h | 1 + trunk/include/linux/ioport.h | 2 +- trunk/include/linux/kernel.h | 244 +- trunk/include/linux/kthread.h | 45 +- trunk/include/linux/leds-lp5521.h | 47 - trunk/include/linux/leds-lp5523.h | 47 - trunk/include/linux/leds.h | 47 +- trunk/include/linux/libata.h | 2 +- trunk/include/linux/lockd/lockd.h | 1 - trunk/include/linux/marvell_phy.h | 1 - trunk/include/linux/memory_hotplug.h | 6 - trunk/include/linux/mfd/wm8350/audio.h | 3 + trunk/include/linux/mfd/wm8994/pdata.h | 2 +- trunk/include/linux/mmc/host.h | 1 - trunk/include/linux/module.h | 2 +- trunk/include/linux/netdevice.h | 5 - trunk/include/linux/netfilter.h | 2 +- trunk/include/linux/netlink.h | 2 +- trunk/include/linux/nfs_fs.h | 7 +- trunk/include/linux/nfs_page.h | 1 - trunk/include/linux/nfs_xdr.h | 1 - trunk/include/linux/node.h | 5 + trunk/include/linux/page_cgroup.h | 7 +- trunk/include/linux/pci_ids.h | 2 - trunk/include/linux/perf_event.h | 41 +- trunk/include/linux/pipe_fs_i.h | 1 - trunk/include/linux/pm_runtime.h | 3 +- trunk/include/linux/printk.h | 248 -- trunk/include/linux/pwm_backlight.h | 1 - trunk/include/linux/radix-tree.h | 39 +- trunk/include/linux/reiserfs_fs.h | 1 + trunk/include/linux/resource.h | 1 - trunk/include/linux/rtnetlink.h | 2 +- trunk/include/linux/sched.h | 3 +- trunk/include/linux/security.h | 9 +- trunk/include/linux/sh_clk.h | 34 +- trunk/include/linux/sh_intc.h | 2 +- trunk/include/linux/smp_lock.h | 3 + trunk/include/linux/snmp.h | 1 - trunk/include/linux/ssb/ssb_driver_gige.h | 17 +- trunk/include/linux/sunrpc/svc_xprt.h | 18 +- trunk/include/linux/taskstats.h | 3 +- trunk/include/linux/tty.h | 4 +- trunk/include/linux/uio_driver.h | 2 +- trunk/include/linux/unaligned/packed_struct.h | 6 +- trunk/include/linux/usb.h | 6 +- trunk/include/linux/usb/musb.h | 2 - trunk/include/linux/video_output.h | 15 - trunk/include/linux/vmalloc.h | 2 + trunk/include/media/saa7146.h | 2 +- trunk/include/media/v4l2-common.h | 16 +- trunk/include/media/v4l2-device.h | 2 - trunk/include/media/wm8775.h | 3 + trunk/include/net/af_unix.h | 2 - trunk/include/net/cfg80211.h | 2 +- trunk/include/net/dn.h | 2 +- trunk/include/net/dst_ops.h | 1 - trunk/include/net/flow.h | 1 + trunk/include/net/ip6_route.h | 10 - trunk/include/net/mac80211.h | 28 +- trunk/include/net/neighbour.h | 2 +- trunk/include/net/pkt_cls.h | 4 +- trunk/include/net/sch_generic.h | 6 +- trunk/include/net/sock.h | 11 +- trunk/include/net/tcp.h | 6 +- trunk/include/net/udp.h | 4 +- trunk/include/scsi/libfc.h | 3 +- trunk/include/scsi/libiscsi.h | 3 +- trunk/include/scsi/libsas.h | 3 +- trunk/include/scsi/scsi_host.h | 23 +- trunk/include/sound/sh_fsi.h | 6 +- trunk/include/video/da8xx-fb.h | 1 + trunk/include/xen/events.h | 7 +- trunk/include/xen/interface/io/ring.h | 11 +- trunk/include/xen/interface/memory.h | 13 - trunk/include/xen/interface/physdev.h | 10 - trunk/include/xen/page.h | 7 - trunk/include/xen/privcmd.h | 5 +- trunk/init/Kconfig | 13 - trunk/init/do_mounts.c | 2 +- trunk/init/main.c | 1 + trunk/kernel/debug/kdb/kdb_main.c | 21 +- trunk/kernel/exit.c | 9 - trunk/kernel/fork.c | 1 - trunk/kernel/futex.c | 3 +- trunk/kernel/futex_compat.c | 3 +- trunk/kernel/hw_breakpoint.c | 3 +- trunk/kernel/irq/proc.c | 2 +- trunk/kernel/irq_work.c | 4 +- trunk/kernel/kthread.c | 11 - trunk/kernel/latencytop.c | 17 +- trunk/kernel/module.c | 12 - trunk/kernel/perf_event.c | 172 +- trunk/kernel/pm_qos_params.c | 4 +- trunk/kernel/posix-cpu-timers.c | 12 +- trunk/kernel/power/Kconfig | 4 - trunk/kernel/power/hibernate.c | 22 +- trunk/kernel/power/suspend.c | 5 +- trunk/kernel/power/swap.c | 55 +- trunk/kernel/power/user.c | 4 +- trunk/kernel/printk.c | 25 +- trunk/kernel/range.c | 2 +- trunk/kernel/resource.c | 104 +- trunk/kernel/sched.c | 324 +- trunk/kernel/sched_fair.c | 48 +- trunk/kernel/sched_stoptask.c | 4 +- trunk/kernel/sysctl.c | 9 - trunk/kernel/taskstats.c | 57 +- trunk/kernel/timer.c | 8 +- trunk/kernel/trace/Kconfig | 2 +- trunk/kernel/trace/blktrace.c | 4 + trunk/kernel/trace/ring_buffer.c | 9 +- trunk/kernel/trace/trace.c | 30 +- trunk/kernel/user.c | 1 - trunk/kernel/watchdog.c | 3 +- trunk/kernel/workqueue.c | 7 +- trunk/lib/debug_locks.c | 2 + trunk/lib/radix-tree.c | 83 +- trunk/mm/compaction.c | 1 + trunk/mm/filemap.c | 34 +- trunk/mm/hugetlb.c | 3 +- trunk/mm/ksm.c | 7 +- trunk/mm/memcontrol.c | 101 +- trunk/mm/memory-failure.c | 8 +- trunk/mm/memory_hotplug.c | 31 +- trunk/mm/mempolicy.c | 3 - trunk/mm/migrate.c | 2 - trunk/mm/mmap.c | 16 +- trunk/mm/nommu.c | 29 +- trunk/mm/page-writeback.c | 2 +- trunk/mm/page_alloc.c | 33 +- trunk/mm/pagewalk.c | 5 +- trunk/mm/percpu.c | 2 +- trunk/mm/slub.c | 7 +- trunk/mm/truncate.c | 4 - trunk/mm/vmalloc.c | 28 +- trunk/mm/vmscan.c | 9 +- trunk/mm/vmstat.c | 4 +- trunk/net/atm/atm_sysfs.c | 3 +- trunk/net/atm/resources.c | 7 +- trunk/net/atm/resources.h | 2 +- trunk/net/ax25/af_ax25.c | 2 +- trunk/net/bluetooth/hci_event.c | 6 - trunk/net/bluetooth/hidp/Kconfig | 2 +- trunk/net/bluetooth/l2cap.c | 8 +- trunk/net/bluetooth/rfcomm/core.c | 14 +- trunk/net/bluetooth/sco.c | 6 +- trunk/net/bridge/br_multicast.c | 30 +- trunk/net/bridge/br_stp_bpdu.c | 2 - trunk/net/can/bcm.c | 4 +- trunk/net/ceph/Makefile | 22 + trunk/net/ceph/buffer.c | 2 +- trunk/net/ceph/messenger.c | 21 +- trunk/net/ceph/osd_client.c | 25 +- trunk/net/ceph/pagevec.c | 16 +- trunk/net/core/dst.c | 1 - trunk/net/core/fib_rules.c | 3 +- trunk/net/core/filter.c | 83 +- trunk/net/core/net-sysfs.c | 10 +- trunk/net/core/pktgen.c | 6 +- trunk/net/core/request_sock.c | 4 +- trunk/net/core/rtnetlink.c | 9 +- trunk/net/core/sock.c | 61 +- trunk/net/core/timestamping.c | 6 +- trunk/net/dccp/input.c | 3 +- trunk/net/decnet/af_decnet.c | 4 +- trunk/net/decnet/sysctl_net_decnet.c | 4 +- trunk/net/econet/af_econet.c | 99 +- trunk/net/ipv4/fib_frontend.c | 10 +- trunk/net/ipv4/fib_trie.c | 2 +- trunk/net/ipv4/icmp.c | 3 - trunk/net/ipv4/igmp.c | 4 +- trunk/net/ipv4/inet_hashtables.c | 3 +- trunk/net/ipv4/proc.c | 9 +- trunk/net/ipv4/route.c | 15 +- trunk/net/ipv4/sysctl_net_ipv4.c | 11 +- trunk/net/ipv4/tcp.c | 6 +- trunk/net/ipv4/tcp_input.c | 11 +- trunk/net/ipv4/tcp_ipv4.c | 16 +- trunk/net/ipv4/tcp_minisocks.c | 2 +- trunk/net/ipv4/tcp_output.c | 42 +- trunk/net/ipv4/udp.c | 5 +- trunk/net/ipv4/udplite.c | 1 - trunk/net/ipv6/addrconf.c | 60 +- trunk/net/ipv6/ip6_output.c | 12 +- trunk/net/ipv6/ip6_tunnel.c | 7 - trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- trunk/net/ipv6/reassembly.c | 2 +- trunk/net/ipv6/route.c | 13 +- trunk/net/ipv6/sit.c | 3 +- trunk/net/ipv6/udp.c | 1 - trunk/net/ipv6/udplite.c | 1 - trunk/net/ipv6/xfrm6_output.c | 16 +- trunk/net/irda/af_irda.c | 19 +- trunk/net/irda/irnet/irnet_ppp.c | 1 + trunk/net/irda/irttp.c | 30 +- trunk/net/l2tp/l2tp_ip.c | 6 +- trunk/net/llc/af_llc.c | 5 +- trunk/net/mac80211/Kconfig | 2 +- trunk/net/mac80211/ibss.c | 4 - trunk/net/mac80211/iface.c | 6 +- trunk/net/mac80211/rx.c | 11 +- trunk/net/mac80211/tx.c | 28 +- trunk/net/mac80211/work.c | 5 +- trunk/net/netfilter/ipvs/Kconfig | 1 - trunk/net/packet/af_packet.c | 7 +- trunk/net/rds/message.c | 4 +- trunk/net/rds/rdma.c | 2 +- trunk/net/sched/cls_basic.c | 4 - trunk/net/sched/sch_sfq.c | 20 +- trunk/net/sctp/protocol.c | 2 +- trunk/net/sctp/socket.c | 14 +- trunk/net/sctp/sysctl.c | 4 +- trunk/net/socket.c | 15 - trunk/net/sunrpc/clnt.c | 24 +- trunk/net/sunrpc/stats.c | 4 +- trunk/net/sunrpc/svc_xprt.c | 10 +- trunk/net/tipc/socket.c | 1 - trunk/net/unix/af_unix.c | 37 +- trunk/net/unix/garbage.c | 9 +- trunk/net/wireless/chan.c | 54 - trunk/net/wireless/nl80211.c | 4 +- trunk/net/x25/x25_facilities.c | 12 +- trunk/net/x25/x25_link.c | 1 - trunk/net/xfrm/xfrm_hash.c | 2 +- trunk/net/xfrm/xfrm_state.c | 2 +- trunk/scripts/gfp-translate | 7 +- trunk/scripts/kconfig/expr.h | 1 - trunk/scripts/kconfig/lkc.h | 1 - trunk/scripts/kconfig/menu.c | 25 - trunk/scripts/kconfig/zconf.gperf | 1 - trunk/scripts/kconfig/zconf.hash.c_shipped | 122 +- trunk/scripts/kconfig/zconf.tab.c_shipped | 570 ++-- trunk/scripts/kconfig/zconf.y | 21 +- trunk/scripts/kernel-doc | 12 +- trunk/scripts/recordmcount.c | 7 +- trunk/scripts/recordmcount.h | 7 +- trunk/scripts/tags.sh | 4 +- trunk/security/Kconfig | 12 - trunk/security/apparmor/lsm.c | 6 +- trunk/security/apparmor/policy.c | 2 +- trunk/security/capability.c | 5 - trunk/security/commoncap.c | 19 + trunk/security/integrity/ima/ima_policy.c | 2 - trunk/security/keys/request_key.c | 1 + trunk/security/security.c | 4 +- trunk/security/selinux/hooks.c | 6 +- trunk/security/smack/smack_lsm.c | 8 +- trunk/sound/atmel/abdac.c | 4 +- trunk/sound/core/info.c | 1 + trunk/sound/core/oss/pcm_oss.c | 19 +- trunk/sound/core/pcm_lib.c | 12 +- trunk/sound/core/pcm_native.c | 1 + trunk/sound/core/sound.c | 1 + trunk/sound/oss/dev_table.c | 6 +- trunk/sound/oss/midibuf.c | 4 +- trunk/sound/oss/pss.c | 6 +- trunk/sound/oss/sequencer.c | 4 +- trunk/sound/oss/soundcard.c | 4 +- trunk/sound/pci/asihpi/hpioctl.c | 2 +- trunk/sound/pci/azt3328.c | 26 +- trunk/sound/pci/ctxfi/ctpcm.c | 16 +- trunk/sound/pci/hda/hda_codec.c | 57 +- trunk/sound/pci/hda/hda_eld.c | 24 +- trunk/sound/pci/hda/hda_intel.c | 2 - trunk/sound/pci/hda/patch_conexant.c | 37 +- trunk/sound/pci/hda/patch_hdmi.c | 1 + trunk/sound/pci/hda/patch_realtek.c | 146 +- trunk/sound/pci/hda/patch_sigmatel.c | 23 +- trunk/sound/pci/intel8x0.c | 6 - trunk/sound/pci/mixart/mixart_hwdep.h | 10 - trunk/sound/ppc/pmac.c | 12 +- trunk/sound/soc/atmel/Kconfig | 5 +- trunk/sound/soc/atmel/sam9g20_wm8731.c | 9 +- trunk/sound/soc/atmel/snd-soc-afeb9260.c | 1 + trunk/sound/soc/codecs/max98088.c | 24 +- trunk/sound/soc/codecs/stac9766.c | 1 - trunk/sound/soc/codecs/tlv320aic3x.c | 6 +- trunk/sound/soc/codecs/tpa6130a2.c | 4 +- trunk/sound/soc/codecs/uda134x.c | 1 - trunk/sound/soc/codecs/wm8350.c | 9 +- trunk/sound/soc/codecs/wm8523.c | 10 +- trunk/sound/soc/codecs/wm8580.c | 10 +- trunk/sound/soc/codecs/wm8731.c | 2 +- trunk/sound/soc/codecs/wm8741.c | 10 +- trunk/sound/soc/codecs/wm8753.c | 226 +- trunk/sound/soc/codecs/wm8776.c | 1 + trunk/sound/soc/codecs/wm8904.c | 42 +- trunk/sound/soc/codecs/wm8940.c | 1 - trunk/sound/soc/codecs/wm8955.c | 34 +- trunk/sound/soc/codecs/wm8960.c | 4 +- trunk/sound/soc/codecs/wm8961.c | 4 +- trunk/sound/soc/codecs/wm8962.c | 52 +- trunk/sound/soc/codecs/wm8971.c | 1 - trunk/sound/soc/codecs/wm8994.c | 6 - trunk/sound/soc/codecs/wm9081.c | 1 - trunk/sound/soc/codecs/wm9090.c | 18 +- trunk/sound/soc/codecs/wm_hubs.c | 2 +- trunk/sound/soc/davinci/davinci-evm.c | 40 +- trunk/sound/soc/davinci/davinci-i2s.c | 15 +- trunk/sound/soc/davinci/davinci-mcasp.c | 13 +- trunk/sound/soc/davinci/davinci-sffsdr.c | 2 +- trunk/sound/soc/davinci/davinci-vcif.c | 16 +- trunk/sound/soc/ep93xx/simone.c | 18 +- trunk/sound/soc/fsl/efika-audio-fabric.c | 1 - trunk/sound/soc/fsl/mpc5200_dma.c | 1 + trunk/sound/soc/fsl/mpc5200_psc_i2s.c | 2 +- trunk/sound/soc/fsl/mpc8610_hpcd.c | 1 - trunk/sound/soc/fsl/p1022_ds.c | 1 - trunk/sound/soc/fsl/pcm030-audio-fabric.c | 1 - trunk/sound/soc/imx/eukrea-tlv320.c | 8 +- trunk/sound/soc/imx/imx-pcm-dma-mx2.c | 221 +- trunk/sound/soc/imx/imx-ssi.c | 57 +- trunk/sound/soc/imx/imx-ssi.h | 4 - trunk/sound/soc/imx/phycore-ac97.c | 33 +- trunk/sound/soc/nuc900/nuc900-ac97.c | 17 +- trunk/sound/soc/nuc900/nuc900-audio.h | 2 - trunk/sound/soc/nuc900/nuc900-pcm.c | 11 +- trunk/sound/soc/omap/Kconfig | 2 +- trunk/sound/soc/omap/omap-mcbsp.c | 8 - trunk/sound/soc/omap/omap3pandora.c | 1 - trunk/sound/soc/omap/osk5912.c | 11 +- trunk/sound/soc/pxa/Kconfig | 1 - trunk/sound/soc/pxa/corgi.c | 5 - trunk/sound/soc/pxa/magician.c | 4 - trunk/sound/soc/pxa/poodle.c | 5 - trunk/sound/soc/pxa/spitz.c | 5 - trunk/sound/soc/pxa/tosa.c | 5 - trunk/sound/soc/s3c24xx/Kconfig | 1 - trunk/sound/soc/s3c24xx/rx1950_uda1380.c | 20 +- trunk/sound/soc/s3c24xx/smdk_spdif.c | 4 +- trunk/sound/soc/s6000/s6000-i2s.c | 2 +- trunk/sound/soc/s6000/s6000-pcm.c | 2 +- trunk/sound/soc/s6000/s6105-ipcam.c | 2 +- trunk/sound/soc/sh/fsi.c | 25 +- trunk/sound/soc/sh/ssi.c | 2 +- trunk/sound/soc/soc-core.c | 23 +- trunk/sound/soc/soc-dapm.c | 7 +- trunk/sound/sound_core.c | 1 + trunk/sound/spi/at73c213.c | 2 +- trunk/tools/perf/Documentation/perf-trace.txt | 57 +- trunk/tools/perf/builtin-buildid-list.c | 3 +- trunk/tools/perf/builtin-probe.c | 5 - trunk/tools/perf/builtin-record.c | 33 +- trunk/tools/perf/builtin-top.c | 12 +- trunk/tools/perf/builtin-trace.c | 209 +- .../scripts/perl/bin/failed-syscalls-record | 2 +- .../perf/scripts/perl/bin/rw-by-file-record | 2 +- .../perf/scripts/perl/bin/rw-by-pid-record | 2 +- .../tools/perf/scripts/perl/bin/rwtop-record | 2 +- .../scripts/perl/bin/wakeup-latency-record | 2 +- .../scripts/perl/bin/workqueue-stats-record | 2 +- .../python/bin/failed-syscalls-by-pid-record | 2 +- .../python/bin/futex-contention-record | 2 +- .../scripts/python/bin/netdev-times-record | 2 +- .../scripts/python/bin/sched-migration-record | 2 +- .../perf/scripts/python/bin/sctop-record | 2 +- .../python/bin/syscall-counts-by-pid-record | 2 +- .../scripts/python/bin/syscall-counts-record | 2 +- trunk/tools/perf/util/header.c | 21 +- trunk/tools/perf/util/hist.c | 2 +- trunk/tools/perf/util/probe-event.c | 15 +- trunk/tools/perf/util/probe-finder.c | 85 +- trunk/tools/perf/util/string.c | 2 +- trunk/tools/perf/util/symbol.c | 67 +- trunk/tools/perf/util/symbol.h | 2 - trunk/tools/perf/util/ui/util.c | 5 +- trunk/usr/initramfs_data.S | 5 +- 1995 files changed, 17141 insertions(+), 35603 deletions(-) delete mode 100644 trunk/Documentation/ABI/obsolete/proc-pid-oom_adj delete mode 100644 trunk/Documentation/ABI/testing/sysfs-bus-rbd delete mode 100644 trunk/Documentation/ABI/testing/sysfs-platform-eeepc-wmi create mode 100644 trunk/Documentation/driver-model/interface.txt delete mode 100644 trunk/Documentation/leds/leds-lp5521.txt delete mode 100644 trunk/Documentation/leds/leds-lp5523.txt create mode 100644 trunk/Documentation/sh/clk.txt delete mode 100644 trunk/arch/arm/boot/compressed/head-shmobile.S delete mode 100644 trunk/arch/arm/configs/at91rm9200_defconfig create mode 100644 trunk/arch/arm/configs/at91rm9200dk_defconfig create mode 100644 trunk/arch/arm/configs/at91rm9200ek_defconfig create mode 100644 trunk/arch/arm/configs/ateb9200_defconfig create mode 100644 trunk/arch/arm/configs/carmeva_defconfig create mode 100644 trunk/arch/arm/configs/cpuat91_defconfig create mode 100644 trunk/arch/arm/configs/csb337_defconfig create mode 100644 trunk/arch/arm/configs/csb637_defconfig create mode 100644 trunk/arch/arm/configs/ecbat91_defconfig create mode 100644 trunk/arch/arm/configs/kafa_defconfig create mode 100644 trunk/arch/arm/configs/kb9202_defconfig create mode 100644 trunk/arch/arm/configs/onearm_defconfig create mode 100644 trunk/arch/arm/configs/picotux200_defconfig create mode 100644 trunk/arch/arm/configs/yl9200_defconfig delete mode 100644 trunk/arch/arm/include/asm/hardware/entry-macro-gic.S rename trunk/arch/arm/mach-at91/{board-rm9200dk.c => board-dk.c} (98%) rename trunk/arch/arm/mach-at91/{board-rm9200ek.c => board-ek.c} (98%) delete mode 100644 trunk/arch/arm/mach-at91/include/mach/stamp9g20.h delete mode 100644 trunk/arch/arm/mach-sa1100/include/mach/nanoengine.h delete mode 100644 trunk/arch/arm/mach-sa1100/nanoengine.c delete mode 100644 trunk/arch/arm/mach-sa1100/pci-nanoengine.c delete mode 100644 trunk/arch/arm/mach-shmobile/include/mach/head-ap4evb.txt delete mode 100644 trunk/arch/arm/mach-shmobile/include/mach/zboot.h delete mode 100644 trunk/arch/arm/mach-shmobile/include/mach/zboot_macros.h rename trunk/arch/arm/{include/asm/hardware => plat-versatile/include/plat}/timer-sp.h (100%) rename trunk/arch/arm/{common => plat-versatile}/timer-sp.c (98%) delete mode 100644 trunk/arch/mn10300/include/asm/syscall.h create mode 100644 trunk/arch/sparc/prom/devops_32.c create mode 100644 trunk/arch/sparc/prom/devops_64.c create mode 100644 trunk/arch/tile/include/asm/pci-bridge.h delete mode 100644 trunk/arch/tile/include/hv/drv_xgbe_impl.h delete mode 100644 trunk/arch/tile/include/hv/drv_xgbe_intf.h delete mode 100644 trunk/arch/tile/include/hv/netio_errors.h delete mode 100644 trunk/arch/tile/include/hv/netio_intf.h delete mode 100644 trunk/arch/tile/kernel/pci.c delete mode 100644 trunk/arch/x86/kernel/resource.c delete mode 100644 trunk/drivers/input/keyboard/gpio_keys_polled.c delete mode 100644 trunk/drivers/leds/leds-lp5521.c delete mode 100644 trunk/drivers/leds/leds-lp5523.c delete mode 100644 trunk/drivers/net/tile/Makefile delete mode 100644 trunk/drivers/net/tile/tilepro.c delete mode 100644 trunk/drivers/pcmcia/sa1100_nanoengine.c delete mode 100644 trunk/drivers/platform/x86/intel_ips.h create mode 100644 trunk/drivers/staging/tidspbridge/core/dsp-mmu.c delete mode 100644 trunk/drivers/staging/tidspbridge/hw/EasiGlobal.h delete mode 100644 trunk/drivers/staging/tidspbridge/hw/MMUAccInt.h delete mode 100644 trunk/drivers/staging/tidspbridge/hw/MMURegAcM.h delete mode 100644 trunk/drivers/staging/tidspbridge/hw/hw_defs.h delete mode 100644 trunk/drivers/staging/tidspbridge/hw/hw_mmu.c delete mode 100644 trunk/drivers/staging/tidspbridge/hw/hw_mmu.h delete mode 100644 trunk/drivers/staging/tidspbridge/include/dspbridge/dmm.h create mode 100644 trunk/drivers/staging/tidspbridge/include/dspbridge/dsp-mmu.h delete mode 100644 trunk/drivers/staging/tidspbridge/pmgr/dmm.c create mode 100644 trunk/drivers/video/sis/osdef.h delete mode 100644 trunk/include/linux/atomic.h delete mode 100644 trunk/include/linux/leds-lp5521.h delete mode 100644 trunk/include/linux/leds-lp5523.h delete mode 100644 trunk/include/linux/printk.h diff --git a/[refs] b/[refs] index 4dbff779e8e5..d1463be2cfa9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31edf274f9aff1ccd39934a0b2fce38f4405c656 +refs/heads/master: 2686b4b408c25349aee7b35558722d5730d67224 diff --git a/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj b/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj deleted file mode 100644 index cf63f264ce0f..000000000000 --- a/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj +++ /dev/null @@ -1,22 +0,0 @@ -What: /proc//oom_adj -When: August 2012 -Why: /proc//oom_adj allows userspace to influence the oom killer's - badness heuristic used to determine which task to kill when the kernel - is out of memory. - - The badness heuristic has since been rewritten since the introduction of - this tunable such that its meaning is deprecated. The value was - implemented as a bitshift on a score generated by the badness() - function that did not have any precise units of measure. With the - rewrite, the score is given as a proportion of available memory to the - task allocating pages, so using a bitshift which grows the score - exponentially is, thus, impossible to tune with fine granularity. - - A much more powerful interface, /proc//oom_score_adj, was - introduced with the oom killer rewrite that allows users to increase or - decrease the badness() score linearly. This interface will replace - /proc//oom_adj. - - A warning will be emitted to the kernel log if an application uses this - deprecated interface. After it is printed once, future warnings will be - suppressed until the kernel is rebooted. diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-rbd b/trunk/Documentation/ABI/testing/sysfs-bus-rbd deleted file mode 100644 index 90a87e2a572b..000000000000 --- a/trunk/Documentation/ABI/testing/sysfs-bus-rbd +++ /dev/null @@ -1,83 +0,0 @@ -What: /sys/bus/rbd/ -Date: November 2010 -Contact: Yehuda Sadeh , - Sage Weil -Description: - -Being used for adding and removing rbd block devices. - -Usage: [snap name] - - $ echo "192.168.0.1 name=admin rbd foo" > /sys/bus/rbd/add - -The snapshot name can be "-" or omitted to map the image read/write. A -will be assigned for any registered block device. If snapshot is used, it will -be mapped read-only. - -Removal of a device: - - $ echo > /sys/bus/rbd/remove - -Entries under /sys/bus/rbd/devices// --------------------------------------------- - -client_id - - The ceph unique client id that was assigned for this specific session. - -major - - The block device major number. - -name - - The name of the rbd image. - -pool - - The pool where this rbd image resides. The pool-name pair is unique - per rados system. - -size - - The size (in bytes) of the mapped block device. - -refresh - - Writing to this file will reread the image header data and set - all relevant datastructures accordingly. - -current_snap - - The current snapshot for which the device is mapped. - -create_snap - - Create a snapshot: - - $ echo > /sys/bus/rbd/devices//snap_create - -rollback_snap - - Rolls back data to the specified snapshot. This goes over the entire - list of rados blocks and sends a rollback command to each. - - $ echo > /sys/bus/rbd/devices//snap_rollback - -snap_* - - A directory per each snapshot - - -Entries under /sys/bus/rbd/devices//snap_ -------------------------------------------------------------- - -id - - The rados internal snapshot id assigned for this snapshot - -size - - The size of the image when this snapshot was taken. - - diff --git a/trunk/Documentation/ABI/testing/sysfs-platform-asus-laptop b/trunk/Documentation/ABI/testing/sysfs-platform-asus-laptop index 41ff8ae4dee0..1d775390e856 100644 --- a/trunk/Documentation/ABI/testing/sysfs-platform-asus-laptop +++ b/trunk/Documentation/ABI/testing/sysfs-platform-asus-laptop @@ -47,20 +47,6 @@ Date: January 2007 KernelVersion: 2.6.20 Contact: "Corentin Chary" Description: - Control the wlan device. 1 means on, 0 means off. + Control the bluetooth device. 1 means on, 0 means off. This may control the led, the device or both. Users: Lapsus - -What: /sys/devices/platform/asus_laptop/wimax -Date: October 2010 -KernelVersion: 2.6.37 -Contact: "Corentin Chary" -Description: - Control the wimax device. 1 means on, 0 means off. - -What: /sys/devices/platform/asus_laptop/wwan -Date: October 2010 -KernelVersion: 2.6.37 -Contact: "Corentin Chary" -Description: - Control the wwan (3G) device. 1 means on, 0 means off. diff --git a/trunk/Documentation/ABI/testing/sysfs-platform-eeepc-wmi b/trunk/Documentation/ABI/testing/sysfs-platform-eeepc-wmi deleted file mode 100644 index e4b5fef5fadd..000000000000 --- a/trunk/Documentation/ABI/testing/sysfs-platform-eeepc-wmi +++ /dev/null @@ -1,10 +0,0 @@ -What: /sys/devices/platform/eeepc-wmi/cpufv -Date: Oct 2010 -KernelVersion: 2.6.37 -Contact: "Corentin Chary" -Description: - Change CPU clock configuration (write-only). - There are three available clock configuration: - * 0 -> Super Performance Mode - * 1 -> High Performance Mode - * 2 -> Power Saving Mode diff --git a/trunk/Documentation/DocBook/sh.tmpl b/trunk/Documentation/DocBook/sh.tmpl index 4a38f604fa66..d858d92cf6d9 100644 --- a/trunk/Documentation/DocBook/sh.tmpl +++ b/trunk/Documentation/DocBook/sh.tmpl @@ -79,6 +79,10 @@ + + Clock Framework Extensions +!Iinclude/linux/sh_clk.h + Machine Specific Interfaces diff --git a/trunk/Documentation/DocBook/uio-howto.tmpl b/trunk/Documentation/DocBook/uio-howto.tmpl index b4665b9c40b0..4d4ce0e61e42 100644 --- a/trunk/Documentation/DocBook/uio-howto.tmpl +++ b/trunk/Documentation/DocBook/uio-howto.tmpl @@ -16,7 +16,7 @@
- hjk@hansjkoch.de + hjk@linutronix.de
@@ -114,7 +114,7 @@ GPL version 2. If you know of any translations for this document, or you are interested in translating it, please email me -hjk@hansjkoch.de. +hjk@linutronix.de. @@ -171,7 +171,7 @@ interested in translating it, please email me Feedback Find something wrong with this document? (Or perhaps something right?) I would love to hear from you. Please email me at - hjk@hansjkoch.de. + hjk@linutronix.de. diff --git a/trunk/Documentation/accounting/getdelays.c b/trunk/Documentation/accounting/getdelays.c index e9c77788a39d..a2976a6de033 100644 --- a/trunk/Documentation/accounting/getdelays.c +++ b/trunk/Documentation/accounting/getdelays.c @@ -516,7 +516,6 @@ int main(int argc, char *argv[]) default: fprintf(stderr, "Unknown nla_type %d\n", na->nla_type); - case TASKSTATS_TYPE_NULL: break; } na = (struct nlattr *) (GENLMSG_DATA(&msg) + len); diff --git a/trunk/Documentation/arm/OMAP/DSS b/trunk/Documentation/arm/OMAP/DSS index 888ae7b83ae4..0af0e9eed5d6 100644 --- a/trunk/Documentation/arm/OMAP/DSS +++ b/trunk/Documentation/arm/OMAP/DSS @@ -255,10 +255,9 @@ framebuffer parameters. Kernel boot arguments --------------------- -vram=[,] - - Amount of total VRAM to preallocate and optionally a physical start - memory address. For example, "10M". omapfb allocates memory for - framebuffers from VRAM. +vram= + - Amount of total VRAM to preallocate. For example, "10M". omapfb + allocates memory for framebuffers from VRAM. omapfb.mode=:[,...] - Default video mode for specified displays. For example, diff --git a/trunk/Documentation/block/switching-sched.txt b/trunk/Documentation/block/switching-sched.txt index 71cfbdc0f74d..d5af3f630814 100644 --- a/trunk/Documentation/block/switching-sched.txt +++ b/trunk/Documentation/block/switching-sched.txt @@ -16,7 +16,7 @@ you can do so by typing: As of the Linux 2.6.10 kernel, it is now possible to change the IO scheduler for a given block device on the fly (thus making it possible, for instance, to set the CFQ scheduler for the system default, but -set a specific device to use the deadline or noop schedulers - which +set a specific device to use the anticipatory or noop schedulers - which can improve that device's throughput). To set a specific scheduler, simply do this: @@ -31,7 +31,7 @@ a "cat /sys/block/DEV/queue/scheduler" - the list of valid names will be displayed, with the currently selected scheduler in brackets: # cat /sys/block/hda/queue/scheduler -noop deadline [cfq] -# echo deadline > /sys/block/hda/queue/scheduler +noop anticipatory deadline [cfq] +# echo anticipatory > /sys/block/hda/queue/scheduler # cat /sys/block/hda/queue/scheduler -noop [deadline] cfq +noop [anticipatory] deadline cfq diff --git a/trunk/Documentation/development-process/2.Process b/trunk/Documentation/development-process/2.Process index 911a45186340..97726eba6102 100644 --- a/trunk/Documentation/development-process/2.Process +++ b/trunk/Documentation/development-process/2.Process @@ -154,7 +154,7 @@ The stages that a patch goes through are, generally: inclusion, it should be accepted by a relevant subsystem maintainer - though this acceptance is not a guarantee that the patch will make it all the way to the mainline. The patch will show up in the maintainer's - subsystem tree and into the -next trees (described below). When the + subsystem tree and into the staging trees (described below). When the process works, this step leads to more extensive review of the patch and the discovery of any problems resulting from the integration of this patch with work being done by others. @@ -236,7 +236,7 @@ finding the right maintainer. Sending patches directly to Linus is not normally the right way to go. -2.4: NEXT TREES +2.4: STAGING TREES The chain of subsystem trees guides the flow of patches into the kernel, but it also raises an interesting question: what if somebody wants to look @@ -250,7 +250,7 @@ changes land in the mainline kernel. One could pull changes from all of the interesting subsystem trees, but that would be a big and error-prone job. -The answer comes in the form of -next trees, where subsystem trees are +The answer comes in the form of staging trees, where subsystem trees are collected for testing and review. The older of these trees, maintained by Andrew Morton, is called "-mm" (for memory management, which is how it got started). The -mm tree integrates patches from a long list of subsystem @@ -275,7 +275,7 @@ directory at: Use of the MMOTM tree is likely to be a frustrating experience, though; there is a definite chance that it will not even compile. -The other -next tree, started more recently, is linux-next, maintained by +The other staging tree, started more recently, is linux-next, maintained by Stephen Rothwell. The linux-next tree is, by design, a snapshot of what the mainline is expected to look like after the next merge window closes. Linux-next trees are announced on the linux-kernel and linux-next mailing @@ -303,25 +303,12 @@ volatility of linux-next tends to make it a difficult development target. See http://lwn.net/Articles/289013/ for more information on this topic, and stay tuned; much is still in flux where linux-next is involved. -2.4.1: STAGING TREES - -The kernel source tree now contains the drivers/staging/ directory, where -many sub-directories for drivers or filesystems that are on their way to -being added to the kernel tree live. They remain in drivers/staging while -they still need more work; once complete, they can be moved into the -kernel proper. This is a way to keep track of drivers that aren't -up to Linux kernel coding or quality standards, but people may want to use -them and track development. - -Greg Kroah-Hartman currently (as of 2.6.36) maintains the staging tree. -Drivers that still need work are sent to him, with each driver having -its own subdirectory in drivers/staging/. Along with the driver source -files, a TODO file should be present in the directory as well. The TODO -file lists the pending work that the driver needs for acceptance into -the kernel proper, as well as a list of people that should be Cc'd for any -patches to the driver. Staging drivers that don't currently build should -have their config entries depend upon CONFIG_BROKEN. Once they can -be successfully built without outside patches, CONFIG_BROKEN can be removed. +Besides the mmotm and linux-next trees, the kernel source tree now contains +the drivers/staging/ directory and many sub-directories for drivers or +filesystems that are on their way to being added to the kernel tree +proper, but they remain in drivers/staging/ while they still need more +work. + 2.5: TOOLS diff --git a/trunk/Documentation/driver-model/interface.txt b/trunk/Documentation/driver-model/interface.txt new file mode 100644 index 000000000000..c66912bfe866 --- /dev/null +++ b/trunk/Documentation/driver-model/interface.txt @@ -0,0 +1,129 @@ + +Device Interfaces + +Introduction +~~~~~~~~~~~~ + +Device interfaces are the logical interfaces of device classes that correlate +directly to userspace interfaces, like device nodes. + +Each device class may have multiple interfaces through which you can +access the same device. An input device may support the mouse interface, +the 'evdev' interface, and the touchscreen interface. A SCSI disk would +support the disk interface, the SCSI generic interface, and possibly a raw +device interface. + +Device interfaces are registered with the class they belong to. As devices +are added to the class, they are added to each interface registered with +the class. The interface is responsible for determining whether the device +supports the interface or not. + + +Programming Interface +~~~~~~~~~~~~~~~~~~~~~ + +struct device_interface { + char * name; + rwlock_t lock; + u32 devnum; + struct device_class * devclass; + + struct list_head node; + struct driver_dir_entry dir; + + int (*add_device)(struct device *); + int (*add_device)(struct intf_data *); +}; + +int interface_register(struct device_interface *); +void interface_unregister(struct device_interface *); + + +An interface must specify the device class it belongs to. It is added +to that class's list of interfaces on registration. + + +Interfaces can be added to a device class at any time. Whenever it is +added, each device in the class is passed to the interface's +add_device callback. When an interface is removed, each device is +removed from the interface. + + +Devices +~~~~~~~ +Once a device is added to a device class, it is added to each +interface that is registered with the device class. The class +is expected to place a class-specific data structure in +struct device::class_data. The interface can use that (along with +other fields of struct device) to determine whether or not the driver +and/or device support that particular interface. + + +Data +~~~~ + +struct intf_data { + struct list_head node; + struct device_interface * intf; + struct device * dev; + u32 intf_num; +}; + +int interface_add_data(struct interface_data *); + +The interface is responsible for allocating and initializing a struct +intf_data and calling interface_add_data() to add it to the device's list +of interfaces it belongs to. This list will be iterated over when the device +is removed from the class (instead of all possible interfaces for a class). +This structure should probably be embedded in whatever per-device data +structure the interface is allocating anyway. + +Devices are enumerated within the interface. This happens in interface_add_data() +and the enumerated value is stored in the struct intf_data for that device. + +sysfs +~~~~~ +Each interface is given a directory in the directory of the device +class it belongs to: + +Interfaces get a directory in the class's directory as well: + + class/ + `-- input + |-- devices + |-- drivers + |-- mouse + `-- evdev + +When a device is added to the interface, a symlink is created that points +to the device's directory in the physical hierarchy: + + class/ + `-- input + |-- devices + | `-- 1 -> ../../../root/pci0/00:1f.0/usb_bus/00:1f.2-1:0/ + |-- drivers + | `-- usb:usb_mouse -> ../../../bus/drivers/usb_mouse/ + |-- mouse + | `-- 1 -> ../../../root/pci0/00:1f.0/usb_bus/00:1f.2-1:0/ + `-- evdev + `-- 1 -> ../../../root/pci0/00:1f.0/usb_bus/00:1f.2-1:0/ + + +Future Plans +~~~~~~~~~~~~ +A device interface is correlated directly with a userspace interface +for a device, specifically a device node. For instance, a SCSI disk +exposes at least two interfaces to userspace: the standard SCSI disk +interface and the SCSI generic interface. It might also export a raw +device interface. + +Many interfaces have a major number associated with them and each +device gets a minor number. Or, multiple interfaces might share one +major number, and each will receive a range of minor numbers (like in +the case of input devices). + +These major and minor numbers could be stored in the interface +structure. Major and minor allocations could happen when the interface +is registered with the class, or via a helper function. + diff --git a/trunk/Documentation/edac.txt b/trunk/Documentation/edac.txt index 9ee774de57cd..0b875e8da969 100644 --- a/trunk/Documentation/edac.txt +++ b/trunk/Documentation/edac.txt @@ -196,7 +196,7 @@ csrow3. The representation of the above is reflected in the directory tree in EDAC's sysfs interface. Starting in directory /sys/devices/system/edac/mc each memory controller will be represented -by its own 'mcX' directory, where 'X' is the index of the MC. +by its own 'mcX' directory, where 'X" is the index of the MC. ..../edac/mc/ @@ -207,7 +207,7 @@ by its own 'mcX' directory, where 'X' is the index of the MC. .... Under each 'mcX' directory each 'csrowX' is again represented by a -'csrowX', where 'X' is the csrow index: +'csrowX', where 'X" is the csrow index: .../mc/mc0/ @@ -232,7 +232,7 @@ EDAC control and attribute files. In 'mcX' directories are EDAC control and attribute files for -this 'X' instance of the memory controllers: +this 'X" instance of the memory controllers: Counter reset control file: @@ -343,7 +343,7 @@ Sdram memory scrubbing rate: 'csrowX' DIRECTORIES In the 'csrowX' directories are EDAC control and attribute files for -this 'X' instance of csrow: +this 'X" instance of csrow: Total Uncorrectable Errors count attribute file: diff --git a/trunk/Documentation/fb/00-INDEX b/trunk/Documentation/fb/00-INDEX index 30a70542e823..a618fd99c9f0 100644 --- a/trunk/Documentation/fb/00-INDEX +++ b/trunk/Documentation/fb/00-INDEX @@ -4,41 +4,33 @@ please mail me. Geert Uytterhoeven 00-INDEX - - this file. + - this file arkfb.txt - info on the fbdev driver for ARK Logic chips. aty128fb.txt - info on the ATI Rage128 frame buffer driver. cirrusfb.txt - info on the driver for Cirrus Logic chipsets. -cmap_xfbdev.txt - - an introduction to fbdev's cmap structures. deferred_io.txt - an introduction to deferred IO. -efifb.txt - - info on the EFI platform driver for Intel based Apple computers. -ep93xx-fb.txt - - info on the driver for EP93xx LCD controller. fbcon.txt - intro to and usage guide for the framebuffer console (fbcon). framebuffer.txt - introduction to frame buffer devices. -gxfb.txt - - info on the framebuffer driver for AMD Geode GX2 based processors. +imacfb.txt + - info on the generic EFI platform driver for Intel based Macs. intel810.txt - documentation for the Intel 810/815 framebuffer driver. intelfb.txt - docs for Intel 830M/845G/852GM/855GM/865G/915G/945G fb driver. internals.txt - quick overview of frame buffer device internals. -lxfb.txt - - info on the framebuffer driver for AMD Geode LX based processors. matroxfb.txt - info on the Matrox framebuffer driver for Alpha, Intel and PPC. -metronomefb.txt - - info on the driver for the Metronome display controller. modedb.txt - info on the video mode database. +matroxfb.txt + - info on the Matrox frame buffer driver. pvr2fb.txt - info on the PowerVR 2 frame buffer driver. pxafb.txt @@ -47,23 +39,13 @@ s3fb.txt - info on the fbdev driver for S3 Trio/Virge chips. sa1100fb.txt - information about the driver for the SA-1100 LCD controller. -sh7760fb.txt - - info on the SH7760/SH7763 integrated LCDC Framebuffer driver. sisfb.txt - info on the framebuffer device driver for various SiS chips. sstfb.txt - info on the frame buffer driver for 3dfx' Voodoo Graphics boards. tgafb.txt - - info on the TGA (DECChip 21030) frame buffer driver. -tridentfb.txt - info on the framebuffer driver for some Trident chip based cards. -uvesafb.txt - - info on the userspace VESA (VBE2+ compliant) frame buffer device. + - info on the TGA (DECChip 21030) frame buffer driver vesafb.txt - - info on the VESA frame buffer device. -viafb.modes - - list of modes for VIA Integration Graphic Chip. -viafb.txt - - info on the VIA Integration Graphic Chip console framebuffer driver. + - info on the VESA frame buffer device vt8623fb.txt - info on the fb driver for the graphics core in VIA VT8623 chipsets. diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 6c2f55e05f13..d8f36f984faa 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -554,13 +554,3 @@ Why: This is a legacy interface which have been replaced by a more Who: NeilBrown ---------------------------- - -What: i2c_adapter.id -When: June 2011 -Why: This field is deprecated. I2C device drivers shouldn't change their - behavior based on the underlying I2C adapter. Instead, the I2C - adapter driver should instantiate the I2C devices and provide the - needed platform-specific information. -Who: Jean Delvare - ----------------------------- diff --git a/trunk/Documentation/filesystems/Locking b/trunk/Documentation/filesystems/Locking index 33fa3e5d38fd..a91f30890011 100644 --- a/trunk/Documentation/filesystems/Locking +++ b/trunk/Documentation/filesystems/Locking @@ -18,6 +18,7 @@ prototypes: char *(*d_dname)((struct dentry *dentry, char *buffer, int buflen); locking rules: + none have BKL dcache_lock rename_lock ->d_lock may block d_revalidate: no no no yes d_hash no no no yes @@ -41,23 +42,18 @@ ata *); int (*rename) (struct inode *, struct dentry *, struct inode *, struct dentry *); int (*readlink) (struct dentry *, char __user *,int); - void * (*follow_link) (struct dentry *, struct nameidata *); - void (*put_link) (struct dentry *, struct nameidata *, void *); + int (*follow_link) (struct dentry *, struct nameidata *); void (*truncate) (struct inode *); int (*permission) (struct inode *, int, struct nameidata *); - int (*check_acl)(struct inode *, int); int (*setattr) (struct dentry *, struct iattr *); int (*getattr) (struct vfsmount *, struct dentry *, struct kstat *); int (*setxattr) (struct dentry *, const char *,const void *,size_t,int); ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t); ssize_t (*listxattr) (struct dentry *, char *, size_t); int (*removexattr) (struct dentry *, const char *); - void (*truncate_range)(struct inode *, loff_t, loff_t); - long (*fallocate)(struct inode *inode, int mode, loff_t offset, loff_t len); - int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len); locking rules: - all may block + all may block, none have BKL i_mutex(inode) lookup: yes create: yes @@ -70,24 +66,19 @@ rmdir: yes (both) (see below) rename: yes (all) (see below) readlink: no follow_link: no -put_link: no truncate: yes (see below) setattr: yes permission: no -check_acl: no getattr: no setxattr: yes getxattr: no listxattr: no removexattr: yes -truncate_range: yes -fallocate: no -fiemap: no Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on victim. cross-directory ->rename() has (per-superblock) ->s_vfs_rename_sem. ->truncate() is never called directly - it's a callback, not a -method. It's called by vmtruncate() - deprecated library function used by +method. It's called by vmtruncate() - library function normally used by ->setattr(). Locking information above applies to that call (i.e. is inherited from ->setattr() - vmtruncate() is used when ATTR_SIZE had been passed). @@ -100,7 +91,7 @@ prototypes: struct inode *(*alloc_inode)(struct super_block *sb); void (*destroy_inode)(struct inode *); void (*dirty_inode) (struct inode *); - int (*write_inode) (struct inode *, struct writeback_control *wbc); + int (*write_inode) (struct inode *, int); int (*drop_inode) (struct inode *); void (*evict_inode) (struct inode *); void (*put_super) (struct super_block *); @@ -114,10 +105,10 @@ prototypes: int (*show_options)(struct seq_file *, struct vfsmount *); ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t); ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t); - int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t); locking rules: All may block [not true, see below] + None have BKL s_umount alloc_inode: destroy_inode: @@ -136,7 +127,6 @@ umount_begin: no show_options: no (namespace_sem) quota_read: no (see below) quota_write: no (see below) -bdev_try_to_free_page: no (see below) ->statfs() has s_umount (shared) when called by ustat(2) (native or compat), but that's an accident of bad API; s_umount is used to pin @@ -149,25 +139,19 @@ be the only ones operating on the quota file by the quota code (via dqio_sem) (unless an admin really wants to screw up something and writes to quota files with quotas on). For other details about locking see also dquot_operations section. -->bdev_try_to_free_page is called from the ->releasepage handler of -the block device inode. See there for more details. --------------------------- file_system_type --------------------------- prototypes: int (*get_sb) (struct file_system_type *, int, const char *, void *, struct vfsmount *); - struct dentry *(*mount) (struct file_system_type *, int, - const char *, void *); void (*kill_sb) (struct super_block *); locking rules: - may block -get_sb yes -mount yes -kill_sb yes + may block BKL +get_sb yes no +kill_sb yes no ->get_sb() returns error or 0 with locked superblock attached to the vfsmount (exclusive on ->s_umount). -->mount() returns ERR_PTR or the root dentry. ->kill_sb() takes a write-locked superblock, does all shutdown work on it, unlocks and drops the reference. @@ -189,38 +173,28 @@ prototypes: sector_t (*bmap)(struct address_space *, sector_t); int (*invalidatepage) (struct page *, unsigned long); int (*releasepage) (struct page *, int); - void (*freepage)(struct page *); int (*direct_IO)(int, struct kiocb *, const struct iovec *iov, loff_t offset, unsigned long nr_segs); - int (*get_xip_mem)(struct address_space *, pgoff_t, int, void **, - unsigned long *); - int (*migratepage)(struct address_space *, struct page *, struct page *); - int (*launder_page)(struct page *); - int (*is_partially_uptodate)(struct page *, read_descriptor_t *, unsigned long); - int (*error_remove_page)(struct address_space *, struct page *); + int (*launder_page) (struct page *); locking rules: - All except set_page_dirty and freepage may block - - PageLocked(page) i_mutex -writepage: yes, unlocks (see below) -readpage: yes, unlocks -sync_page: maybe -writepages: -set_page_dirty no -readpages: -write_begin: locks the page yes -write_end: yes, unlocks yes -bmap: -invalidatepage: yes -releasepage: yes -freepage: yes -direct_IO: -get_xip_mem: maybe -migratepage: yes (both) -launder_page: yes -is_partially_uptodate: yes -error_remove_page: yes + All except set_page_dirty may block + + BKL PageLocked(page) i_mutex +writepage: no yes, unlocks (see below) +readpage: no yes, unlocks +sync_page: no maybe +writepages: no +set_page_dirty no no +readpages: no +write_begin: no locks the page yes +write_end: no yes, unlocks yes +perform_write: no n/a yes +bmap: no +invalidatepage: no yes +releasepage: no yes +direct_IO: no +launder_page: no yes ->write_begin(), ->write_end(), ->sync_page() and ->readpage() may be called from the request handler (/dev/loop). @@ -300,8 +274,9 @@ under spinlock (it cannot block) and is sometimes called with the page not locked. ->bmap() is currently used by legacy ioctl() (FIBMAP) provided by some -filesystems and by the swapper. The latter will eventually go away. Please, -keep it that way and don't breed new callers. +filesystems and by the swapper. The latter will eventually go away. All +instances do not actually need the BKL. Please, keep it that way and don't +breed new callers. ->invalidatepage() is called when the filesystem must attempt to drop some or all of the buffers from the page when it is being truncated. It @@ -313,46 +288,53 @@ buffers from the page in preparation for freeing it. It returns zero to indicate that the buffers are (or may be) freeable. If ->releasepage is zero, the kernel assumes that the fs has no private interest in the buffers. - ->freepage() is called when the kernel is done dropping the page -from the page cache. - ->launder_page() may be called prior to releasing a page if it is still found to be dirty. It returns zero if the page was successfully cleaned, or an error value if not. Note that in order to prevent the page getting mapped back in and redirtied, it needs to be kept locked across the entire operation. + Note: currently almost all instances of address_space methods are +using BKL for internal serialization and that's one of the worst sources +of contention. Normally they are calling library functions (in fs/buffer.c) +and pass foo_get_block() as a callback (on local block-based filesystems, +indeed). BKL is not needed for library stuff and is usually taken by +foo_get_block(). It's an overkill, since block bitmaps can be protected by +internal fs locking and real critical areas are much smaller than the areas +filesystems protect now. + ----------------------- file_lock_operations ------------------------------ prototypes: + void (*fl_insert)(struct file_lock *); /* lock insertion callback */ + void (*fl_remove)(struct file_lock *); /* lock removal callback */ void (*fl_copy_lock)(struct file_lock *, struct file_lock *); void (*fl_release_private)(struct file_lock *); locking rules: - file_lock_lock may block -fl_copy_lock: yes no -fl_release_private: maybe no + BKL may block +fl_insert: yes no +fl_remove: yes no +fl_copy_lock: yes no +fl_release_private: yes yes ----------------------- lock_manager_operations --------------------------- prototypes: int (*fl_compare_owner)(struct file_lock *, struct file_lock *); void (*fl_notify)(struct file_lock *); /* unblock callback */ - int (*fl_grant)(struct file_lock *, struct file_lock *, int); void (*fl_release_private)(struct file_lock *); void (*fl_break)(struct file_lock *); /* break_lease callback */ - int (*fl_mylease)(struct file_lock *, struct file_lock *); - int (*fl_change)(struct file_lock **, int); locking rules: - file_lock_lock may block -fl_compare_owner: yes no -fl_notify: yes no -fl_grant: no no -fl_release_private: maybe no -fl_break: yes no -fl_mylease: yes no -fl_change yes no - + BKL may block +fl_compare_owner: yes no +fl_notify: yes no +fl_release_private: yes yes +fl_break: yes no + + Currently only NFSD and NLM provide instances of this class. None of the +them block. If you have out-of-tree instances - please, show up. Locking +in that area will change. --------------------------- buffer_head ----------------------------------- prototypes: void (*b_end_io)(struct buffer_head *bh, int uptodate); @@ -377,17 +359,17 @@ prototypes: void (*swap_slot_free_notify) (struct block_device *, unsigned long); locking rules: - bd_mutex -open: yes -release: yes -ioctl: no -compat_ioctl: no -direct_access: no -media_changed: no -unlock_native_capacity: no -revalidate_disk: no -getgeo: no -swap_slot_free_notify: no (see below) + BKL bd_mutex +open: no yes +release: no yes +ioctl: no no +compat_ioctl: no no +direct_access: no no +media_changed: no no +unlock_native_capacity: no no +revalidate_disk: no no +getgeo: no no +swap_slot_free_notify: no no (see below) media_changed, unlock_native_capacity and revalidate_disk are called only from check_disk_change(). @@ -426,21 +408,34 @@ prototypes: unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); int (*check_flags)(int); - int (*flock) (struct file *, int, struct file_lock *); - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, - size_t, unsigned int); - ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, - size_t, unsigned int); - int (*setlease)(struct file *, long, struct file_lock **); }; locking rules: - All may block except for ->setlease. - No VFS locks held on entry except for ->fsync and ->setlease. - -->fsync() has i_mutex on inode. - -->setlease has the file_list_lock held and must not sleep. + All may block. + BKL +llseek: no (see below) +read: no +aio_read: no +write: no +aio_write: no +readdir: no +poll: no +unlocked_ioctl: no +compat_ioctl: no +mmap: no +open: no +flush: no +release: no +fsync: no (see below) +aio_fsync: no +fasync: no +lock: yes +readv: no +writev: no +sendfile: no +sendpage: no +get_unmapped_area: no +check_flags: no ->llseek() locking has moved from llseek to the individual llseek implementations. If your fs is not using generic_file_llseek, you @@ -450,10 +445,17 @@ mutex or just to use i_size_read() instead. Note: this does not protect the file->f_pos against concurrent modifications since this is something the userspace has to take care about. -->fasync() is responsible for maintaining the FASYNC bit in filp->f_flags. -Most instances call fasync_helper(), which does that maintenance, so it's -not normally something one needs to worry about. Return values > 0 will be -mapped to zero in the VFS layer. +Note: ext2_release() was *the* source of contention on fs-intensive +loads and dropping BKL on ->release() helps to get rid of that (we still +grab BKL for cases when we close a file that had been opened r/w, but that +can and should be done using the internal locking with smaller critical areas). +Current worst offender is ext2_get_block()... + +->fasync() is called without BKL protection, and is responsible for +maintaining the FASYNC bit in filp->f_flags. Most instances call +fasync_helper(), which does that maintenance, so it's not normally +something one needs to worry about. Return values > 0 will be mapped to +zero in the VFS layer. ->readdir() and ->ioctl() on directories must be changed. Ideally we would move ->readdir() to inode_operations and use a separate method for directory @@ -464,6 +466,8 @@ components. And there are other reasons why the current interface is a mess... ->read on directories probably must go away - we should just enforce -EISDIR in sys_read() and friends. +->fsync() has i_mutex on inode. + --------------------------- dquot_operations ------------------------------- prototypes: int (*write_dquot) (struct dquot *); @@ -498,12 +502,12 @@ prototypes: int (*access)(struct vm_area_struct *, unsigned long, void*, int, int); locking rules: - mmap_sem PageLocked(page) -open: yes -close: yes -fault: yes can return with page locked -page_mkwrite: yes can return with page locked -access: yes + BKL mmap_sem PageLocked(page) +open: no yes +close: no yes +fault: no yes can return with page locked +page_mkwrite: no yes can return with page locked +access: no yes ->fault() is called when a previously not present pte is about to be faulted in. The filesystem must find and return the page associated @@ -530,3 +534,6 @@ VM_IO | VM_PFNMAP VMAs. (if you break something or notice that it is broken and do not fix it yourself - at least put it here) + +ipc/shm.c::shm_delete() - may need BKL. +->read() and ->write() in many drivers are (probably) missing BKL. diff --git a/trunk/Documentation/filesystems/configfs/configfs_example_explicit.c b/trunk/Documentation/filesystems/configfs/configfs_example_explicit.c index fd53869f5633..d428cc9f07f3 100644 --- a/trunk/Documentation/filesystems/configfs/configfs_example_explicit.c +++ b/trunk/Documentation/filesystems/configfs/configfs_example_explicit.c @@ -89,7 +89,7 @@ static ssize_t childless_storeme_write(struct childless *childless, char *p = (char *) page; tmp = simple_strtoul(p, &p, 10); - if ((*p != '\0') && (*p != '\n')) + if (!p || (*p && (*p != '\n'))) return -EINVAL; if (tmp > INT_MAX) diff --git a/trunk/Documentation/filesystems/vfs.txt b/trunk/Documentation/filesystems/vfs.txt index 20899e095e7e..ed7e5efc06d8 100644 --- a/trunk/Documentation/filesystems/vfs.txt +++ b/trunk/Documentation/filesystems/vfs.txt @@ -534,7 +534,6 @@ struct address_space_operations { sector_t (*bmap)(struct address_space *, sector_t); int (*invalidatepage) (struct page *, unsigned long); int (*releasepage) (struct page *, int); - void (*freepage)(struct page *); ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov, loff_t offset, unsigned long nr_segs); struct page* (*get_xip_page)(struct address_space *, sector_t, @@ -661,10 +660,11 @@ struct address_space_operations { releasepage: releasepage is called on PagePrivate pages to indicate that the page should be freed if possible. ->releasepage should remove any private data from the page and clear the - PagePrivate flag. If releasepage() fails for some reason, it must - indicate failure with a 0 return value. - releasepage() is used in two distinct though related cases. The - first is when the VM finds a clean page with no active users and + PagePrivate flag. It may also remove the page from the + address_space. If this fails for some reason, it may indicate + failure with a 0 return value. + This is used in two distinct though related cases. The first + is when the VM finds a clean page with no active users and wants to make it a free page. If ->releasepage succeeds, the page will be removed from the address_space and become free. @@ -679,12 +679,6 @@ struct address_space_operations { need to ensure this. Possibly it can clear the PageUptodate bit if it cannot free private data yet. - freepage: freepage is called once the page is no longer visible in - the page cache in order to allow the cleanup of any private - data. Since it may be called by the memory reclaimer, it - should not assume that the original address_space mapping still - exists, and it should not block. - direct_IO: called by the generic read/write routines to perform direct_IO - that is IO requests which bypass the page cache and transfer data directly between the storage and the diff --git a/trunk/Documentation/filesystems/xfs-delayed-logging-design.txt b/trunk/Documentation/filesystems/xfs-delayed-logging-design.txt index 7445bf335dae..96d0df28bed3 100644 --- a/trunk/Documentation/filesystems/xfs-delayed-logging-design.txt +++ b/trunk/Documentation/filesystems/xfs-delayed-logging-design.txt @@ -794,6 +794,17 @@ designed. Roadmap: +2.6.37 Remove experimental tag from mount option + => should be roughly 6 months after initial merge + => enough time to: + => gain confidence and fix problems reported by early + adopters (a.k.a. guinea pigs) + => address worst performance regressions and undesired + behaviours + => start tuning/optimising code for parallelism + => start tuning/optimising algorithms consuming + excessive CPU time + 2.6.39 Switch default mount option to use delayed logging => should be roughly 12 months after initial merge => enough time to shake out remaining problems before next round of diff --git a/trunk/Documentation/gpio.txt b/trunk/Documentation/gpio.txt index 792faa3c06cf..9633da01ff46 100644 --- a/trunk/Documentation/gpio.txt +++ b/trunk/Documentation/gpio.txt @@ -617,16 +617,6 @@ and have the following read/write attributes: is configured as an output, this value may be written; any nonzero value is treated as high. - If the pin can be configured as interrupt-generating interrupt - and if it has been configured to generate interrupts (see the - description of "edge"), you can poll(2) on that file and - poll(2) will return whenever the interrupt was triggered. If - you use poll(2), set the events POLLPRI and POLLERR. If you - use select(2), set the file descriptor in exceptfds. After - poll(2) returns, either lseek(2) to the beginning of the sysfs - file and read the new value or close the file and re-open it - to read the value. - "edge" ... reads as either "none", "rising", "falling", or "both". Write these strings to select the signal edge(s) that will make poll(2) on the "value" file return. diff --git a/trunk/Documentation/hwmon/lm93 b/trunk/Documentation/hwmon/lm93 index 7a10616d0b44..ac711f357faf 100644 --- a/trunk/Documentation/hwmon/lm93 +++ b/trunk/Documentation/hwmon/lm93 @@ -11,7 +11,7 @@ Authors: Mark M. Hoffman Ported to 2.6 by Eric J. Bowersox Adapted to 2.6.20 by Carsten Emde - Modified for mainline integration by Hans J. Koch + Modified for mainline integration by Hans J. Koch Module Parameters ----------------- diff --git a/trunk/Documentation/hwmon/max6650 b/trunk/Documentation/hwmon/max6650 index c565650fcfc6..8be7beb9e3e8 100644 --- a/trunk/Documentation/hwmon/max6650 +++ b/trunk/Documentation/hwmon/max6650 @@ -8,7 +8,7 @@ Supported chips: Datasheet: http://pdfserv.maxim-ic.com/en/ds/MAX6650-MAX6651.pdf Authors: - Hans J. Koch + Hans J. Koch John Morris Claus Gindhart diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 01ece1b9213e..ed45e9802aa8 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -706,7 +706,7 @@ and is between 256 and 4096 characters. It is defined in the file arch/x86/kernel/cpu/cpufreq/elanfreq.c. elevator= [IOSCHED] - Format: {"cfq" | "deadline" | "noop"} + Format: {"anticipatory" | "cfq" | "deadline" | "noop"} See Documentation/block/as-iosched.txt and Documentation/block/deadline-iosched.txt for details. @@ -1759,7 +1759,7 @@ and is between 256 and 4096 characters. It is defined in the file nousb [USB] Disable the USB subsystem - nowatchdog [KNL] Disable the lockup detector (NMI watchdog). + nowatchdog [KNL] Disable the lockup detector. nowb [ARM] @@ -2175,6 +2175,11 @@ and is between 256 and 4096 characters. It is defined in the file reset_devices [KNL] Force drivers to reset the underlying device during initialization. + resource_alloc_from_bottom + Allocate new resources from the beginning of available + space, not the end. If you need to use this, please + report a bug. + resume= [SWSUSP] Specify the partition device for software suspend @@ -2380,11 +2385,6 @@ and is between 256 and 4096 characters. It is defined in the file improve throughput, but will also increase the amount of memory reserved for use by the client. - swapaccount[=0|1] - [KNL] Enable accounting of swap in memory resource - controller if no parameter or 1 is given or disable - it if 0 is given (See Documentation/cgroups/memory.txt) - swiotlb= [IA-64] Number of I/O TLB slabs switches= [HW,M68k] diff --git a/trunk/Documentation/leds-class.txt b/trunk/Documentation/leds-class.txt index 58b266bd1846..8fd5ca2ae32d 100644 --- a/trunk/Documentation/leds-class.txt +++ b/trunk/Documentation/leds-class.txt @@ -60,18 +60,15 @@ Hardware accelerated blink of LEDs Some LEDs can be programmed to blink without any CPU interaction. To support this feature, a LED driver can optionally implement the -blink_set() function (see ). To set an LED to blinking, -however, it is better to use use the API function led_blink_set(), -as it will check and implement software fallback if necessary. - -To turn off blinking again, use the API function led_brightness_set() -as that will not just set the LED brightness but also stop any software -timers that may have been required for blinking. - -The blink_set() function should choose a user friendly blinking value -if it is called with *delay_on==0 && *delay_off==0 parameters. In this -case the driver should give back the chosen value through delay_on and -delay_off parameters to the leds subsystem. +blink_set() function (see ). If implemented, triggers can +attempt to use it before falling back to software timers. The blink_set() +function should return 0 if the blink setting is supported, or -EINVAL +otherwise, which means that LED blinking will be handled by software. + +The blink_set() function should choose a user friendly blinking +value if it is called with *delay_on==0 && *delay_off==0 parameters. In +this case the driver should give back the chosen value through delay_on +and delay_off parameters to the leds subsystem. Setting the brightness to zero with brightness_set() callback function should completely turn off the LED and cancel the previously programmed diff --git a/trunk/Documentation/leds/leds-lp5521.txt b/trunk/Documentation/leds/leds-lp5521.txt deleted file mode 100644 index c4d8d151e0fe..000000000000 --- a/trunk/Documentation/leds/leds-lp5521.txt +++ /dev/null @@ -1,88 +0,0 @@ -Kernel driver for lp5521 -======================== - -* National Semiconductor LP5521 led driver chip -* Datasheet: http://www.national.com/pf/LP/LP5521.html - -Authors: Mathias Nyman, Yuri Zaporozhets, Samu Onkalo -Contact: Samu Onkalo (samu.p.onkalo-at-nokia.com) - -Description ------------ - -LP5521 can drive up to 3 channels. Leds can be controlled directly via -the led class control interface. Channels have generic names: -lp5521:channelx, where x is 0 .. 2 - -All three channels can be also controlled using the engine micro programs. -More details of the instructions can be found from the public data sheet. - -Control interface for the engines: -x is 1 .. 3 -enginex_mode : disabled, load, run -enginex_load : store program (visible only in engine load mode) - -Example (start to blink the channel 2 led): -cd /sys/class/leds/lp5521:channel2/device -echo "load" > engine3_mode -echo "037f4d0003ff6000" > engine3_load -echo "run" > engine3_mode - -stop the engine: -echo "disabled" > engine3_mode - -sysfs contains a selftest entry. -The test communicates with the chip and checks that -the clock mode is automatically set to the requested one. - -Each channel has its own led current settings. -/sys/class/leds/lp5521:channel0/led_current - RW -/sys/class/leds/lp5521:channel0/max_current - RO -Format: 10x mA i.e 10 means 1.0 mA - -example platform data: - -Note: chan_nr can have values between 0 and 2. - -static struct lp5521_led_config lp5521_led_config[] = { - { - .chan_nr = 0, - .led_current = 50, - .max_current = 130, - }, { - .chan_nr = 1, - .led_current = 0, - .max_current = 130, - }, { - .chan_nr = 2, - .led_current = 0, - .max_current = 130, - } -}; - -static int lp5521_setup(void) -{ - /* setup HW resources */ -} - -static void lp5521_release(void) -{ - /* Release HW resources */ -} - -static void lp5521_enable(bool state) -{ - /* Control of chip enable signal */ -} - -static struct lp5521_platform_data lp5521_platform_data = { - .led_config = lp5521_led_config, - .num_channels = ARRAY_SIZE(lp5521_led_config), - .clock_mode = LP5521_CLOCK_EXT, - .setup_resources = lp5521_setup, - .release_resources = lp5521_release, - .enable = lp5521_enable, -}; - -If the current is set to 0 in the platform data, that channel is -disabled and it is not visible in the sysfs. diff --git a/trunk/Documentation/leds/leds-lp5523.txt b/trunk/Documentation/leds/leds-lp5523.txt deleted file mode 100644 index fad2feb8b7ce..000000000000 --- a/trunk/Documentation/leds/leds-lp5523.txt +++ /dev/null @@ -1,83 +0,0 @@ -Kernel driver for lp5523 -======================== - -* National Semiconductor LP5523 led driver chip -* Datasheet: http://www.national.com/pf/LP/LP5523.html - -Authors: Mathias Nyman, Yuri Zaporozhets, Samu Onkalo -Contact: Samu Onkalo (samu.p.onkalo-at-nokia.com) - -Description ------------ -LP5523 can drive up to 9 channels. Leds can be controlled directly via -the led class control interface. Channels have generic names: -lp5523:channelx where x is 0...8 - -The chip provides 3 engines. Each engine can control channels without -interaction from the main CPU. Details of the micro engine code can be found -from the public data sheet. Leds can be muxed to different channels. - -Control interface for the engines: -x is 1 .. 3 -enginex_mode : disabled, load, run -enginex_load : microcode load (visible only in load mode) -enginex_leds : led mux control (visible only in load mode) - -cd /sys/class/leds/lp5523:channel2/device -echo "load" > engine3_mode -echo "9d80400004ff05ff437f0000" > engine3_load -echo "111111111" > engine3_leds -echo "run" > engine3_mode - -sysfs contains a selftest entry. It measures each channel -voltage level and checks if it looks reasonable. If the level is too high, -the led is missing; if the level is too low, there is a short circuit. - -Selftest uses always the current from the platform data. - -Each channel contains led current settings. -/sys/class/leds/lp5523:channel2/led_current - RW -/sys/class/leds/lp5523:channel2/max_current - RO -Format: 10x mA i.e 10 means 1.0 mA - -Example platform data: - -Note - chan_nr can have values between 0 and 8. - -static struct lp5523_led_config lp5523_led_config[] = { - { - .chan_nr = 0, - .led_current = 50, - .max_current = 130, - }, -... - }, { - .chan_nr = 8, - .led_current = 50, - .max_current = 130, - } -}; - -static int lp5523_setup(void) -{ - /* Setup HW resources */ -} - -static void lp5523_release(void) -{ - /* Release HW resources */ -} - -static void lp5523_enable(bool state) -{ - /* Control chip enable signal */ -} - -static struct lp5523_platform_data lp5523_platform_data = { - .led_config = lp5523_led_config, - .num_channels = ARRAY_SIZE(lp5523_led_config), - .clock_mode = LP5523_CLOCK_EXT, - .setup_resources = lp5523_setup, - .release_resources = lp5523_release, - .enable = lp5523_enable, -}; diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt index 3c5e465296e1..c7165f4cb792 100644 --- a/trunk/Documentation/networking/ip-sysctl.txt +++ b/trunk/Documentation/networking/ip-sysctl.txt @@ -20,15 +20,6 @@ ip_no_pmtu_disc - BOOLEAN min_pmtu - INTEGER default 562 - minimum discovered Path MTU -route/max_size - INTEGER - Maximum number of routes allowed in the kernel. Increase - this when using large numbers of interfaces and/or routes. - -neigh/default/gc_thresh3 - INTEGER - Maximum number of neighbor entries allowed. Increase this - when using large numbers of interfaces and when communicating - with large numbers of directly-connected peers. - mtu_expires - INTEGER Time, in seconds, that cached PMTU information is kept. @@ -144,7 +135,6 @@ tcp_adv_win_scale - INTEGER Count buffering overhead as bytes/2^tcp_adv_win_scale (if tcp_adv_win_scale > 0) or bytes-bytes/2^(-tcp_adv_win_scale), if it is <= 0. - Possible values are [-31, 31], inclusive. Default: 2 tcp_allowed_congestion_control - STRING diff --git a/trunk/Documentation/power/opp.txt b/trunk/Documentation/power/opp.txt index cd445582d1f8..44d87ad3cea9 100644 --- a/trunk/Documentation/power/opp.txt +++ b/trunk/Documentation/power/opp.txt @@ -37,9 +37,6 @@ Typical usage of the OPP library is as follows: SoC framework -> modifies on required cases certain OPPs -> OPP layer -> queries to search/retrieve information -> -Architectures that provide a SoC framework for OPP should select ARCH_HAS_OPP -to make the OPP layer available. - OPP layer expects each domain to be represented by a unique device pointer. SoC framework registers a set of initial OPPs per device with the OPP layer. This list is expected to be an optimally small number typically around 5 per device. diff --git a/trunk/Documentation/power/runtime_pm.txt b/trunk/Documentation/power/runtime_pm.txt index 41cc7b30d7dd..489e9bacd165 100644 --- a/trunk/Documentation/power/runtime_pm.txt +++ b/trunk/Documentation/power/runtime_pm.txt @@ -379,8 +379,8 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: zero) bool pm_runtime_suspended(struct device *dev); - - return true if the device's runtime PM status is 'suspended' and its - 'power.disable_depth' field is equal to zero, or false otherwise + - return true if the device's runtime PM status is 'suspended', or false + otherwise void pm_runtime_allow(struct device *dev); - set the power.runtime_auto flag for the device and decrease its usage diff --git a/trunk/Documentation/rbtree.txt b/trunk/Documentation/rbtree.txt index 19f8278c3854..221f38be98f4 100644 --- a/trunk/Documentation/rbtree.txt +++ b/trunk/Documentation/rbtree.txt @@ -21,8 +21,8 @@ three rotations, respectively, to balance the tree), with slightly slower To quote Linux Weekly News: There are a number of red-black trees in use in the kernel. - The deadline and CFQ I/O schedulers employ rbtrees to - track requests; the packet CD/DVD driver does the same. + The anticipatory, deadline, and CFQ I/O schedulers all employ + rbtrees to track requests; the packet CD/DVD driver does the same. The high-resolution timer code uses an rbtree to organize outstanding timer requests. The ext3 filesystem tracks directory entries in a red-black tree. Virtual memory areas (VMAs) are tracked with red-black diff --git a/trunk/Documentation/scsi/scsi_mid_low_api.txt b/trunk/Documentation/scsi/scsi_mid_low_api.txt index df322c103466..570ef2b3d79b 100644 --- a/trunk/Documentation/scsi/scsi_mid_low_api.txt +++ b/trunk/Documentation/scsi/scsi_mid_low_api.txt @@ -1044,9 +1044,9 @@ Details: /** - * queuecommand - queue scsi command, invoke scp->scsi_done on completion - * @shost: pointer to the scsi host object + * queuecommand - queue scsi command, invoke 'done' on completion * @scp: pointer to scsi command object + * @done: function pointer to be invoked on completion * * Returns 0 on success. * @@ -1074,45 +1074,42 @@ Details: * * Other types of errors that are detected immediately may be * flagged by setting scp->result to an appropriate value, - * invoking the scp->scsi_done callback, and then returning 0 - * from this function. If the command is not performed - * immediately (and the LLD is starting (or will start) the given - * command) then this function should place 0 in scp->result and - * return 0. + * invoking the 'done' callback, and then returning 0 from this + * function. If the command is not performed immediately (and the + * LLD is starting (or will start) the given command) then this + * function should place 0 in scp->result and return 0. * * Command ownership. If the driver returns zero, it owns the - * command and must take responsibility for ensuring the - * scp->scsi_done callback is executed. Note: the driver may - * call scp->scsi_done before returning zero, but after it has - * called scp->scsi_done, it may not return any value other than - * zero. If the driver makes a non-zero return, it must not - * execute the command's scsi_done callback at any time. - * - * Locks: up to and including 2.6.36, struct Scsi_Host::host_lock - * held on entry (with "irqsave") and is expected to be - * held on return. From 2.6.37 onwards, queuecommand is - * called without any locks held. + * command and must take responsibility for ensuring the 'done' + * callback is executed. Note: the driver may call done before + * returning zero, but after it has called done, it may not + * return any value other than zero. If the driver makes a + * non-zero return, it must not execute the command's done + * callback at any time. + * + * Locks: struct Scsi_Host::host_lock held on entry (with "irqsave") + * and is expected to be held on return. * * Calling context: in interrupt (soft irq) or process context * - * Notes: This function should be relatively fast. Normally it - * will not wait for IO to complete. Hence the scp->scsi_done - * callback is invoked (often directly from an interrupt service - * routine) some time after this function has returned. In some - * cases (e.g. pseudo adapter drivers that manufacture the - * response to a SCSI INQUIRY) the scp->scsi_done callback may be - * invoked before this function returns. If the scp->scsi_done - * callback is not invoked within a certain period the SCSI mid - * level will commence error processing. If a status of CHECK - * CONDITION is placed in "result" when the scp->scsi_done - * callback is invoked, then the LLD driver should perform - * autosense and fill in the struct scsi_cmnd::sense_buffer + * Notes: This function should be relatively fast. Normally it will + * not wait for IO to complete. Hence the 'done' callback is invoked + * (often directly from an interrupt service routine) some time after + * this function has returned. In some cases (e.g. pseudo adapter + * drivers that manufacture the response to a SCSI INQUIRY) + * the 'done' callback may be invoked before this function returns. + * If the 'done' callback is not invoked within a certain period + * the SCSI mid level will commence error processing. + * If a status of CHECK CONDITION is placed in "result" when the + * 'done' callback is invoked, then the LLD driver should + * perform autosense and fill in the struct scsi_cmnd::sense_buffer * array. The scsi_cmnd::sense_buffer array is zeroed prior to * the mid level queuing a command to an LLD. * * Defined in: LLD **/ - int queuecommand(struct Scsi_Host *shost, struct scsi_cmnd * scp) + int queuecommand(struct scsi_cmnd * scp, + void (*done)(struct scsi_cmnd *)) /** diff --git a/trunk/Documentation/sh/clk.txt b/trunk/Documentation/sh/clk.txt new file mode 100644 index 000000000000..114b595cfa97 --- /dev/null +++ b/trunk/Documentation/sh/clk.txt @@ -0,0 +1,32 @@ +Clock framework on SuperH architecture + +The framework on SH extends existing API by the function clk_set_rate_ex, +which prototype is as follows: + + clk_set_rate_ex (struct clk *clk, unsigned long rate, int algo_id) + +The algo_id parameter is used to specify algorithm used to recalculate clocks, +adjanced to clock, specified as first argument. It is assumed that algo_id==0 +means no changes to adjanced clock + +Internally, the clk_set_rate_ex forwards request to clk->ops->set_rate method, +if it is present in ops structure. The method should set the clock rate and adjust +all needed clocks according to the passed algo_id. +Exact values for algo_id are machine-dependent. For the sh7722, the following +values are defined: + + NO_CHANGE = 0, + IUS_N1_N1, /* I:U = N:1, U:Sh = N:1 */ + IUS_322, /* I:U:Sh = 3:2:2 */ + IUS_522, /* I:U:Sh = 5:2:2 */ + IUS_N11, /* I:U:Sh = N:1:1 */ + SB_N1, /* Sh:B = N:1 */ + SB3_N1, /* Sh:B3 = N:1 */ + SB3_32, /* Sh:B3 = 3:2 */ + SB3_43, /* Sh:B3 = 4:3 */ + SB3_54, /* Sh:B3 = 5:4 */ + BP_N1, /* B:P = N:1 */ + IP_N1 /* I:P = N:1 */ + +Each of these constants means relation between clocks that can be set via the FRQCR +register diff --git a/trunk/Documentation/sysctl/kernel.txt b/trunk/Documentation/sysctl/kernel.txt index 209e1584c3dc..3894eaa23486 100644 --- a/trunk/Documentation/sysctl/kernel.txt +++ b/trunk/Documentation/sysctl/kernel.txt @@ -28,7 +28,6 @@ show up in /proc/sys/kernel: - core_uses_pid - ctrl-alt-del - dentry-state -- dmesg_restrict - domainname - hostname - hotplug @@ -214,19 +213,6 @@ to decide what to do with it. ============================================================== -dmesg_restrict: - -This toggle indicates whether unprivileged users are prevented from using -dmesg(8) to view messages from the kernel's log buffer. When -dmesg_restrict is set to (0) there are no restrictions. When -dmesg_restrict is set set to (1), users must have CAP_SYS_ADMIN to use -dmesg(8). - -The kernel config option CONFIG_SECURITY_DMESG_RESTRICT sets the default -value of dmesg_restrict. - -============================================================== - domainname & hostname: These files can be used to set the NIS/YP domainname and the diff --git a/trunk/Documentation/trace/postprocess/trace-vmscan-postprocess.pl b/trunk/Documentation/trace/postprocess/trace-vmscan-postprocess.pl index 12cecc83cd91..b3e73ddb1567 100644 --- a/trunk/Documentation/trace/postprocess/trace-vmscan-postprocess.pl +++ b/trunk/Documentation/trace/postprocess/trace-vmscan-postprocess.pl @@ -373,18 +373,9 @@ sub process_events { print " $regex_lru_isolate/o\n"; next; } - my $isolate_mode = $1; my $nr_scanned = $4; my $nr_contig_dirty = $7; - - # To closer match vmstat scanning statistics, only count isolate_both - # and isolate_inactive as scanning. isolate_active is rotation - # isolate_inactive == 0 - # isolate_active == 1 - # isolate_both == 2 - if ($isolate_mode != 1) { - $perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned; - } + $perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned; $perprocesspid{$process_pid}->{HIGH_NR_CONTIG_DIRTY} += $nr_contig_dirty; } elsif ($tracepoint eq "mm_vmscan_lru_shrink_inactive") { $details = $5; diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 7585e9dd835b..0094224ca79b 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -161,7 +161,7 @@ M: Greg Kroah-Hartman L: linux-serial@vger.kernel.org W: http://serial.sourceforge.net S: Maintained -T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git +T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ F: drivers/serial/8250* F: include/linux/serial_8250.h @@ -405,7 +405,7 @@ S: Supported F: drivers/usb/gadget/amd5536udc.* AMD GEODE PROCESSOR/CHIPSET SUPPORT -P: Andres Salomon +P: Jordan Crouse L: linux-geode@lists.infradead.org (moderated for non-subscribers) W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html S: Supported @@ -559,14 +559,14 @@ W: http://maxim.org.za/at91_26.html S: Maintained ARM/BCMRING ARM ARCHITECTURE -M: Jiandong Zheng +M: Leo Chen M: Scott Branden L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-bcmring ARM/BCMRING MTD NAND DRIVER -M: Jiandong Zheng +M: Leo Chen M: Scott Branden L: linux-mtd@lists.infradead.org S: Maintained @@ -792,14 +792,11 @@ S: Maintained ARM/NOMADIK ARCHITECTURE M: Alessandro Rubini -M: Linus Walleij M: STEricsson L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-nomadik/ F: arch/arm/plat-nomadik/ -F: drivers/i2c/busses/i2c-nomadik.c -T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT M: Nelson Castillo @@ -818,7 +815,7 @@ F: drivers/mmc/host/msm_sdcc.c F: drivers/mmc/host/msm_sdcc.h F: drivers/serial/msm_serial.h F: drivers/serial/msm_serial.c -T: git git://codeaurora.org/quic/kernel/davidb/linux-msm.git +T: git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git S: Maintained ARM/TOSA MACHINE SUPPORT @@ -948,7 +945,7 @@ M: Magnus Damm L: linux-sh@vger.kernel.org W: http://oss.renesas.com Q: http://patchwork.kernel.org/project/linux-sh/list/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-latest +T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git S: Supported F: arch/arm/mach-shmobile/ F: drivers/sh/ @@ -1001,24 +998,12 @@ F: drivers/i2c/busses/i2c-stu300.c F: drivers/rtc/rtc-coh901331.c F: drivers/watchdog/coh901327_wdt.c F: drivers/dma/coh901318* -F: drivers/mfd/ab3100* -F: drivers/rtc/rtc-ab3100.c -F: drivers/rtc/rtc-coh901331.c -T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git -ARM/Ux500 ARM ARCHITECTURE +ARM/U8500 ARM ARCHITECTURE M: Srinidhi Kasagar -M: Linus Walleij L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-ux500/ -F: drivers/dma/ste_dma40* -F: drivers/mfd/ab3550* -F: drivers/mfd/abx500* -F: drivers/mfd/ab8500* -F: drivers/mfd/stmpe* -F: drivers/rtc/rtc-ab8500.c -T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ARM/VFP SUPPORT M: Russell King @@ -1374,7 +1359,7 @@ F: include/net/bluetooth/ BONDING DRIVER M: Jay Vosburgh -L: netdev@vger.kernel.org +L: bonding-devel@lists.sourceforge.net W: http://sourceforge.net/projects/bonding/ S: Supported F: drivers/net/bonding/ @@ -1844,13 +1829,6 @@ W: http://www.chelsio.com S: Supported F: drivers/net/cxgb4vf/ -STMMAC ETHERNET DRIVER -M: Giuseppe Cavallaro -L: netdev@vger.kernel.org -W: http://www.stlinux.com -S: Supported -F: drivers/net/stmmac/ - CYBERPRO FB DRIVER M: Russell King L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -2030,7 +2008,6 @@ F: drivers/hwmon/dme1737.c DOCBOOK FOR DOCUMENTATION M: Randy Dunlap S: Maintained -F: scripts/kernel-doc DOCKING STATION DRIVER M: Shaohua Li @@ -2041,7 +2018,6 @@ F: drivers/acpi/dock.c DOCUMENTATION M: Randy Dunlap L: linux-doc@vger.kernel.org -T: quilt oss.oracle.com/~rdunlap/kernel-doc-patches/current/ S: Maintained F: Documentation/ @@ -2075,7 +2051,7 @@ F: Documentation/blockdev/drbd/ DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS M: Greg Kroah-Hartman -T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git +T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ S: Supported F: Documentation/kobject.txt F: drivers/base/ @@ -2095,7 +2071,7 @@ F: include/drm/ INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets) M: Chris Wilson -L: intel-gfx@lists.freedesktop.org (subscribers-only) +L: intel-gfx@lists.freedesktop.org L: dri-devel@lists.freedesktop.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git S: Supported @@ -2459,12 +2435,9 @@ F: drivers/net/wan/sdla.c FRAMEBUFFER LAYER L: linux-fbdev@vger.kernel.org W: http://linux-fbdev.sourceforge.net/ -Q: http://patchwork.kernel.org/project/linux-fbdev/list/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git S: Orphan F: Documentation/fb/ -F: drivers/video/ -F: include/video/ +F: drivers/video/fb* F: include/linux/fb.h FREESCALE DMA DRIVER @@ -4079,8 +4052,9 @@ F: drivers/scsi/NCR_D700.* NETEFFECT IWARP RNIC DRIVER (IW_NES) M: Faisal Latif +M: Chien Tung L: linux-rdma@vger.kernel.org -W: http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm +W: http://www.neteffect.com S: Supported F: drivers/infiniband/hw/nes/ @@ -4605,7 +4579,7 @@ F: drivers/pcmcia/ F: include/pcmcia/ PCNET32 NETWORK DRIVER -M: Don Fry +M: Don Fry L: netdev@vger.kernel.org S: Maintained F: drivers/net/pcnet32.c @@ -5702,7 +5676,7 @@ S: Maintained STAGING SUBSYSTEM M: Greg Kroah-Hartman -T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git L: devel@driverdev.osuosl.org S: Maintained F: drivers/staging/ @@ -5731,7 +5705,7 @@ M: Paul Mundt L: linux-sh@vger.kernel.org W: http://www.linux-sh.org Q: http://patchwork.kernel.org/project/linux-sh/list/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git sh-latest +T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git S: Supported F: Documentation/sh/ F: arch/sh/ @@ -5853,8 +5827,6 @@ M: Chris Metcalf W: http://www.tilera.com/scm/ S: Supported F: arch/tile/ -F: drivers/char/hvc_tile.c -F: drivers/net/tile/ TLAN NETWORK DRIVER M: Samuel Chessman @@ -5938,7 +5910,7 @@ S: Maintained TTY LAYER M: Greg Kroah-Hartman S: Maintained -T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git +T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ F: drivers/char/tty_* F: drivers/serial/serial_core.c F: include/linux/serial_core.h @@ -5947,6 +5919,7 @@ F: include/linux/tty.h TULIP NETWORK DRIVERS M: Grant Grundler +M: Kyle McMartin L: netdev@vger.kernel.org S: Maintained F: drivers/net/tulip/ @@ -6260,7 +6233,7 @@ USB SUBSYSTEM M: Greg Kroah-Hartman L: linux-usb@vger.kernel.org W: http://www.linux-usb.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git +T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ S: Supported F: Documentation/usb/ F: drivers/net/usb/ @@ -6598,15 +6571,6 @@ F: include/linux/mfd/wm8400* F: include/sound/wm????.h F: sound/soc/codecs/wm* -WORKQUEUE -M: Tejun Heo -L: linux-kernel@vger.kernel.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git -S: Maintained -F: include/linux/workqueue.h -F: kernel/workqueue.c -F: Documentation/workqueue.txt - X.25 NETWORK LAYER M: Andrew Hendry L: linux-x25@vger.kernel.org @@ -6634,14 +6598,14 @@ F: drivers/platform/x86 XEN PCI SUBSYSTEM M: Konrad Rzeszutek Wilk -L: xen-devel@lists.xensource.com (moderated for non-subscribers) +L: xen-devel@lists.xensource.com S: Supported F: arch/x86/pci/*xen* F: drivers/pci/*xen* XEN SWIOTLB SUBSYSTEM M: Konrad Rzeszutek Wilk -L: xen-devel@lists.xensource.com (moderated for non-subscribers) +L: xen-devel@lists.xensource.com S: Supported F: arch/x86/xen/*swiotlb* F: drivers/xen/*swiotlb* @@ -6649,7 +6613,7 @@ F: drivers/xen/*swiotlb* XEN HYPERVISOR INTERFACE M: Jeremy Fitzhardinge M: Konrad Rzeszutek Wilk -L: xen-devel@lists.xensource.com (moderated for non-subscribers) +L: xen-devel@lists.xen.org L: virtualization@lists.osdl.org S: Supported F: arch/x86/xen/ diff --git a/trunk/Makefile b/trunk/Makefile index 74b25559f831..6619720f50dd 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 37 -EXTRAVERSION = +EXTRAVERSION = -rc1 NAME = Flesh-Eating Bats with Fangs # *DOCUMENTATION* diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 9d2608363390..a19a5266d5fc 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -6,10 +6,10 @@ config ARM select HAVE_MEMBLOCK select RTC_LIB select SYS_SUPPORTS_APM_EMULATION - select GENERIC_ATOMIC64 if (!CPU_32v6K || !AEABI) + select GENERIC_ATOMIC64 if (!CPU_32v6K) select HAVE_OPROFILE if (HAVE_PERF_EVENTS) select HAVE_ARCH_KGDB - select HAVE_KPROBES if (!XIP_KERNEL && !THUMB2_KERNEL) + select HAVE_KPROBES if (!XIP_KERNEL) select HAVE_KRETPROBES if (HAVE_KPROBES) select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL) @@ -23,7 +23,6 @@ config ARM select PERF_USE_VMALLOC select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V7)) - select HAVE_C_RECORDMCOUNT help The ARM series is a line of low-power-consumption RISC chip designs licensed by ARM Ltd and targeted at embedded applications and @@ -647,7 +646,7 @@ config ARCH_S3C2410 select ARCH_HAS_CPUFREQ select HAVE_CLK select ARCH_USES_GETTIMEOFFSET - select HAVE_S3C2410_I2C if I2C + select HAVE_S3C2410_I2C help Samsung S3C2410X CPU based systems, such as the Simtec Electronics BAST (), the IPAQ 1940 or @@ -677,8 +676,8 @@ config ARCH_S3C64XX select S3C_DEV_NAND select USB_ARCH_HAS_OHCI select SAMSUNG_GPIOLIB_4BIT - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C2410_I2C + select HAVE_S3C2410_WATCHDOG help Samsung S3C64XX series based systems @@ -687,10 +686,10 @@ config ARCH_S5P64X0 select CPU_V6 select GENERIC_GPIO select HAVE_CLK - select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C2410_WATCHDOG select ARCH_USES_GETTIMEOFFSET - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C_RTC if RTC_CLASS + select HAVE_S3C2410_I2C + select HAVE_S3C_RTC help Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440, SMDK6450. @@ -701,7 +700,7 @@ config ARCH_S5P6442 select GENERIC_GPIO select HAVE_CLK select ARCH_USES_GETTIMEOFFSET - select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C2410_WATCHDOG help Samsung S5P6442 CPU based systems @@ -712,9 +711,9 @@ config ARCH_S5PC100 select CPU_V7 select ARM_L1_CACHE_SHIFT_6 select ARCH_USES_GETTIMEOFFSET - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C_RTC if RTC_CLASS - select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C2410_I2C + select HAVE_S3C_RTC + select HAVE_S3C2410_WATCHDOG help Samsung S5PC100 series based systems @@ -727,9 +726,9 @@ config ARCH_S5PV210 select ARM_L1_CACHE_SHIFT_6 select ARCH_HAS_CPUFREQ select ARCH_USES_GETTIMEOFFSET - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C_RTC if RTC_CLASS - select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C2410_I2C + select HAVE_S3C_RTC + select HAVE_S3C2410_WATCHDOG help Samsung S5PV210/S5PC110 series based systems @@ -740,9 +739,9 @@ config ARCH_S5PV310 select GENERIC_GPIO select HAVE_CLK select GENERIC_CLOCKEVENTS - select HAVE_S3C_RTC if RTC_CLASS - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C_RTC + select HAVE_S3C2410_I2C + select HAVE_S3C2410_WATCHDOG help Samsung S5PV310 series based systems @@ -1165,7 +1164,7 @@ config ISA_DMA_API bool config PCI - bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE || ARCH_CNS3XXX || SA1100_NANOENGINE + bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE || ARCH_CNS3XXX help Find out whether you have a PCI motherboard. PCI is the name of a bus system, i.e. the way the CPU talks to the other stuff inside @@ -1176,12 +1175,6 @@ config PCI_DOMAINS bool depends on PCI -config PCI_NANOENGINE - bool "BSE nanoEngine PCI support" - depends on SA1100_NANOENGINE - help - Enable PCI on the BSE nanoEngine board. - config PCI_SYSCALL def_bool PCI @@ -1318,7 +1311,7 @@ config HZ config THUMB2_KERNEL bool "Compile the kernel in Thumb-2 mode" - depends on CPU_V7 && !CPU_V6 && EXPERIMENTAL + depends on CPU_V7 && EXPERIMENTAL select AEABI select ARM_ASM_UNIFIED help @@ -1657,19 +1650,6 @@ config ATAGS_PROC Should the atags used to boot the kernel be exported in an "atags" file in procfs. Useful with kexec. -config CRASH_DUMP - bool "Build kdump crash kernel (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - Generate crash dump after being started by kexec. This should - be normally only set in special crash dump kernels which are - loaded in the main kernel with kexec-tools into a specially - reserved region and then later executed after a crash by - kdump/kexec. The crash dump kernel must be compiled to a - memory address not used by the main kernel - - For more details see Documentation/kdump/kdump.txt - config AUTO_ZRELADDR bool "Auto calculation of the decompressed kernel image address" depends on !ZBOOT_ROM && !ARCH_U300 @@ -1779,7 +1759,7 @@ comment "At least one emulation must be selected" config FPE_NWFPE bool "NWFPE math emulation" - depends on (!AEABI || OABI_COMPAT) && !THUMB2_KERNEL + depends on !AEABI || OABI_COMPAT ---help--- Say Y to include the NWFPE floating point emulator in the kernel. This is necessary to run most binaries. Linux does not currently diff --git a/trunk/arch/arm/boot/Makefile b/trunk/arch/arm/boot/Makefile index 4d26f2c52a75..4a590f4113e2 100644 --- a/trunk/arch/arm/boot/Makefile +++ b/trunk/arch/arm/boot/Makefile @@ -70,7 +70,12 @@ else $(obj)/uImage: LOADADDR=$(ZRELADDR) endif +ifeq ($(CONFIG_THUMB2_KERNEL),y) +# Set bit 0 to 1 so that "mov pc, rx" switches to Thumb-2 mode +$(obj)/uImage: STARTADDR=$(shell echo $(LOADADDR) | sed -e "s/.$$/1/") +else $(obj)/uImage: STARTADDR=$(LOADADDR) +endif $(obj)/uImage: $(obj)/zImage FORCE $(call if_changed,uimage) diff --git a/trunk/arch/arm/boot/bootp/init.S b/trunk/arch/arm/boot/bootp/init.S index 78b508075161..8b0de41c3dcb 100644 --- a/trunk/arch/arm/boot/bootp/init.S +++ b/trunk/arch/arm/boot/bootp/init.S @@ -73,8 +73,6 @@ move: ldmia r4!, {r7 - r10} @ move 32-bytes at a time .size _start, . - _start - .align - .type data,#object data: .word initrd_start @ source initrd address .word initrd_phys @ destination initrd address diff --git a/trunk/arch/arm/boot/compressed/Makefile b/trunk/arch/arm/boot/compressed/Makefile index 0a8f748e506a..65a7c1c588a9 100644 --- a/trunk/arch/arm/boot/compressed/Makefile +++ b/trunk/arch/arm/boot/compressed/Makefile @@ -45,10 +45,6 @@ else endif endif -ifeq ($(CONFIG_ARCH_SHMOBILE),y) -OBJS += head-shmobile.o -endif - # # We now have a PIC decompressor implementation. Decompressors running # from RAM should not define ZTEXTADDR. Decompressors running directly diff --git a/trunk/arch/arm/boot/compressed/head-shmobile.S b/trunk/arch/arm/boot/compressed/head-shmobile.S deleted file mode 100644 index 30973b76e6ae..000000000000 --- a/trunk/arch/arm/boot/compressed/head-shmobile.S +++ /dev/null @@ -1,53 +0,0 @@ -/* - * The head-file for SH-Mobile ARM platforms - * - * Kuninori Morimoto - * Simon Horman - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifdef CONFIG_ZBOOT_ROM - - .section ".start", "ax" - - /* load board-specific initialization code */ -#include - - b 1f -__atags:@ tag #1 - .long 12 @ tag->hdr.size = tag_size(tag_core); - .long 0x54410001 @ tag->hdr.tag = ATAG_CORE; - .long 0 @ tag->u.core.flags = 0; - .long 0 @ tag->u.core.pagesize = 0; - .long 0 @ tag->u.core.rootdev = 0; - @ tag #2 - .long 8 @ tag->hdr.size = tag_size(tag_mem32); - .long 0x54410002 @ tag->hdr.tag = ATAG_MEM; - .long CONFIG_MEMORY_SIZE @ tag->u.mem.size = CONFIG_MEMORY_SIZE; - .long CONFIG_MEMORY_START @ @ tag->u.mem.start = CONFIG_MEMORY_START; - @ tag #3 - .long 0 @ tag->hdr.size = 0 - .long 0 @ tag->hdr.tag = ATAG_NONE; -1: - - /* Set board ID necessary for boot */ - ldr r7, 1f @ Set machine type register - adr r8, __atags @ Set atag register - b 2f - -1 : .long MACH_TYPE -2 : - -#endif /* CONFIG_ZBOOT_ROM */ diff --git a/trunk/arch/arm/boot/compressed/head.S b/trunk/arch/arm/boot/compressed/head.S index 7193884ed8b0..6825c34646d4 100644 --- a/trunk/arch/arm/boot/compressed/head.S +++ b/trunk/arch/arm/boot/compressed/head.S @@ -125,13 +125,9 @@ wait: mrc p14, 0, pc, c0, c1, 0 * sort out different calling conventions */ .align - .arm @ Always enter in ARM state start: .type start,#function - THUMB( adr r12, BSYM(1f) ) - THUMB( bx r12 ) - THUMB( .rept 6 ) - ARM( .rept 8 ) + .rept 8 mov r0, r0 .endr @@ -139,7 +135,6 @@ start: .word 0x016f2818 @ Magic numbers to help the loader .word start @ absolute load/run zImage address .word _edata @ zImage end address - THUMB( .thumb ) 1: mov r7, r1 @ save architecture ID mov r8, r2 @ save atags pointer @@ -179,8 +174,7 @@ not_angel: ldr sp, [r0, #28] #ifdef CONFIG_AUTO_ZRELADDR @ determine final kernel image address - mov r4, pc - and r4, r4, #0xf8000000 + and r4, pc, #0xf8000000 add r4, r4, #TEXT_OFFSET #else ldr r4, =zreladdr @@ -451,8 +445,7 @@ __setup_mmu: sub r3, r4, #16384 @ Page directory size */ mov r1, #0x1e orr r1, r1, #3 << 10 - mov r2, pc - mov r2, r2, lsr #20 + mov r2, pc, lsr #20 orr r1, r1, r2, lsl #20 add r0, r3, r2, lsl #2 str r1, [r0], #4 @@ -1091,6 +1084,6 @@ memdump: mov r12, r0 reloc_end: .align - .section ".stack", "aw", %nobits + .section ".stack", "w" user_stack: .space 4096 user_stack_end: diff --git a/trunk/arch/arm/boot/compressed/vmlinux.lds.in b/trunk/arch/arm/boot/compressed/vmlinux.lds.in index 366a924019ac..d08168941bd6 100644 --- a/trunk/arch/arm/boot/compressed/vmlinux.lds.in +++ b/trunk/arch/arm/boot/compressed/vmlinux.lds.in @@ -57,7 +57,7 @@ SECTIONS .bss : { *(.bss) } _end = .; - .stack : { *(.stack) } + .stack (NOLOAD) : { *(.stack) } .stab 0 : { *(.stab) } .stabstr 0 : { *(.stabstr) } diff --git a/trunk/arch/arm/common/Makefile b/trunk/arch/arm/common/Makefile index e7521bca2c35..e6e8664a9413 100644 --- a/trunk/arch/arm/common/Makefile +++ b/trunk/arch/arm/common/Makefile @@ -17,4 +17,3 @@ obj-$(CONFIG_ARCH_IXP2000) += uengine.o obj-$(CONFIG_ARCH_IXP23XX) += uengine.o obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o obj-$(CONFIG_COMMON_CLKDEV) += clkdev.o -obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o diff --git a/trunk/arch/arm/common/gic.c b/trunk/arch/arm/common/gic.c index 0b89ef001330..ada6359160eb 100644 --- a/trunk/arch/arm/common/gic.c +++ b/trunk/arch/arm/common/gic.c @@ -35,9 +35,6 @@ static DEFINE_SPINLOCK(irq_controller_lock); -/* Address of GIC 0 CPU interface */ -void __iomem *gic_cpu_base_addr __read_mostly; - struct gic_chip_data { unsigned int irq_offset; void __iomem *dist_base; @@ -48,7 +45,7 @@ struct gic_chip_data { #define MAX_GIC_NR 1 #endif -static struct gic_chip_data gic_data[MAX_GIC_NR] __read_mostly; +static struct gic_chip_data gic_data[MAX_GIC_NR]; static inline void __iomem *gic_dist_base(unsigned int irq) { @@ -149,15 +146,9 @@ static int gic_set_cpu(unsigned int irq, const struct cpumask *mask_val) unsigned int shift = (irq % 4) * 8; unsigned int cpu = cpumask_first(mask_val); u32 val; - struct irq_desc *desc; spin_lock(&irq_controller_lock); - desc = irq_to_desc(irq); - if (desc == NULL) { - spin_unlock(&irq_controller_lock); - return -EINVAL; - } - desc->node = cpu; + irq_desc[irq].node = cpu; val = readl(reg) & ~(0xff << shift); val |= 1 << (cpu + shift); writel(val, reg); @@ -216,65 +207,67 @@ void __init gic_cascade_irq(unsigned int gic_nr, unsigned int irq) set_irq_chained_handler(irq, gic_handle_cascade_irq); } -static void __init gic_dist_init(struct gic_chip_data *gic, - unsigned int irq_start) +void __init gic_dist_init(unsigned int gic_nr, void __iomem *base, + unsigned int irq_start) { - unsigned int gic_irqs, irq_limit, i; - void __iomem *base = gic->dist_base; + unsigned int max_irq, i; u32 cpumask = 1 << smp_processor_id(); + if (gic_nr >= MAX_GIC_NR) + BUG(); + cpumask |= cpumask << 8; cpumask |= cpumask << 16; + gic_data[gic_nr].dist_base = base; + gic_data[gic_nr].irq_offset = (irq_start - 1) & ~31; + writel(0, base + GIC_DIST_CTRL); /* * Find out how many interrupts are supported. + */ + max_irq = readl(base + GIC_DIST_CTR) & 0x1f; + max_irq = (max_irq + 1) * 32; + + /* * The GIC only supports up to 1020 interrupt sources. + * Limit this to either the architected maximum, or the + * platform maximum. */ - gic_irqs = readl(base + GIC_DIST_CTR) & 0x1f; - gic_irqs = (gic_irqs + 1) * 32; - if (gic_irqs > 1020) - gic_irqs = 1020; + if (max_irq > max(1020, NR_IRQS)) + max_irq = max(1020, NR_IRQS); /* * Set all global interrupts to be level triggered, active low. */ - for (i = 32; i < gic_irqs; i += 16) + for (i = 32; i < max_irq; i += 16) writel(0, base + GIC_DIST_CONFIG + i * 4 / 16); /* * Set all global interrupts to this CPU only. */ - for (i = 32; i < gic_irqs; i += 4) + for (i = 32; i < max_irq; i += 4) writel(cpumask, base + GIC_DIST_TARGET + i * 4 / 4); /* - * Set priority on all global interrupts. + * Set priority on all interrupts. */ - for (i = 32; i < gic_irqs; i += 4) + for (i = 0; i < max_irq; i += 4) writel(0xa0a0a0a0, base + GIC_DIST_PRI + i * 4 / 4); /* - * Disable all interrupts. Leave the PPI and SGIs alone - * as these enables are banked registers. + * Disable all interrupts. */ - for (i = 32; i < gic_irqs; i += 32) + for (i = 0; i < max_irq; i += 32) writel(0xffffffff, base + GIC_DIST_ENABLE_CLEAR + i * 4 / 32); - /* - * Limit number of interrupts registered to the platform maximum - */ - irq_limit = gic->irq_offset + gic_irqs; - if (WARN_ON(irq_limit > NR_IRQS)) - irq_limit = NR_IRQS; - /* * Setup the Linux IRQ subsystem. */ - for (i = irq_start; i < irq_limit; i++) { + for (i = irq_start; i < gic_data[gic_nr].irq_offset + max_irq; i++) { set_irq_chip(i, &gic_chip); - set_irq_chip_data(i, gic); + set_irq_chip_data(i, &gic_data[gic_nr]); set_irq_handler(i, handle_level_irq); set_irq_flags(i, IRQF_VALID | IRQF_PROBE); } @@ -282,65 +275,17 @@ static void __init gic_dist_init(struct gic_chip_data *gic, writel(1, base + GIC_DIST_CTRL); } -static void __cpuinit gic_cpu_init(struct gic_chip_data *gic) +void __cpuinit gic_cpu_init(unsigned int gic_nr, void __iomem *base) { - void __iomem *dist_base = gic->dist_base; - void __iomem *base = gic->cpu_base; - int i; + if (gic_nr >= MAX_GIC_NR) + BUG(); - /* - * Deal with the banked PPI and SGI interrupts - disable all - * PPI interrupts, ensure all SGI interrupts are enabled. - */ - writel(0xffff0000, dist_base + GIC_DIST_ENABLE_CLEAR); - writel(0x0000ffff, dist_base + GIC_DIST_ENABLE_SET); - - /* - * Set priority on PPI and SGI interrupts - */ - for (i = 0; i < 32; i += 4) - writel(0xa0a0a0a0, dist_base + GIC_DIST_PRI + i * 4 / 4); + gic_data[gic_nr].cpu_base = base; writel(0xf0, base + GIC_CPU_PRIMASK); writel(1, base + GIC_CPU_CTRL); } -void __init gic_init(unsigned int gic_nr, unsigned int irq_start, - void __iomem *dist_base, void __iomem *cpu_base) -{ - struct gic_chip_data *gic; - - BUG_ON(gic_nr >= MAX_GIC_NR); - - gic = &gic_data[gic_nr]; - gic->dist_base = dist_base; - gic->cpu_base = cpu_base; - gic->irq_offset = (irq_start - 1) & ~31; - - if (gic_nr == 0) - gic_cpu_base_addr = cpu_base; - - gic_dist_init(gic, irq_start); - gic_cpu_init(gic); -} - -void __cpuinit gic_secondary_init(unsigned int gic_nr) -{ - BUG_ON(gic_nr >= MAX_GIC_NR); - - gic_cpu_init(&gic_data[gic_nr]); -} - -void __cpuinit gic_enable_ppi(unsigned int irq) -{ - unsigned long flags; - - local_irq_save(flags); - irq_to_desc(irq)->status |= IRQ_NOPROBE; - gic_unmask_irq(irq); - local_irq_restore(flags); -} - #ifdef CONFIG_SMP void gic_raise_softirq(const struct cpumask *mask, unsigned int irq) { diff --git a/trunk/arch/arm/common/it8152.c b/trunk/arch/arm/common/it8152.c index 42ff90b46dfb..1bec96e85196 100644 --- a/trunk/arch/arm/common/it8152.c +++ b/trunk/arch/arm/common/it8152.c @@ -352,4 +352,3 @@ struct pci_bus * __init it8152_pci_scan_bus(int nr, struct pci_sys_data *sys) return pci_scan_bus(nr, &it8152_ops, sys); } -EXPORT_SYMBOL(dma_set_coherent_mask); diff --git a/trunk/arch/arm/configs/at91rm9200_defconfig b/trunk/arch/arm/configs/at91rm9200_defconfig deleted file mode 100644 index 38cb7c985426..000000000000 --- a/trunk/arch/arm/configs/at91rm9200_defconfig +++ /dev/null @@ -1,341 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_MACH_ONEARM=y -CONFIG_ARCH_AT91RM9200DK=y -CONFIG_MACH_AT91RM9200EK=y -CONFIG_MACH_CSB337=y -CONFIG_MACH_CSB637=y -CONFIG_MACH_CARMEVA=y -CONFIG_MACH_ATEB9200=y -CONFIG_MACH_KB9200=y -CONFIG_MACH_PICOTUX2XX=y -CONFIG_MACH_KAFA=y -CONFIG_MACH_ECBAT91=y -CONFIG_MACH_YL9200=y -CONFIG_MACH_CPUAT91=y -CONFIG_MACH_ECO920=y -CONFIG_MTD_AT91_DATAFLASH_CARD=y -CONFIG_AT91_PROGRAMMABLE_CLOCKS=y -CONFIG_AT91_TIMER_HZ=100 -# CONFIG_ARM_THUMB is not set -CONFIG_PCCARD=y -CONFIG_AT91_CF=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x10000000 -CONFIG_ZBOOT_ROM_BSS=0x20040000 -CONFIG_KEXEC=y -CONFIG_FPE_NWFPE=y -CONFIG_BINFMT_MISC=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=m -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE=m -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_TUNNEL=m -CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_AFS_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_PLATRAM=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_NAND_PLATFORM=y -CONFIG_MTD_UBI=y -CONFIG_MTD_UBI_GLUEBI=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_ATMEL_TCLIB=y -CONFIG_EEPROM_LEGACY=m -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=m -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_TUN=m -CONFIG_PHYLIB=y -CONFIG_DAVICOM_PHY=y -CONFIG_SMSC_PHY=y -CONFIG_MICREL_PHY=y -CONFIG_NET_ETHERNET=y -CONFIG_ARM_AT91_ETHER=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_EPSON2888=y -CONFIG_PPP=y -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=y -CONFIG_PPP_DEFLATE=y -CONFIG_PPP_BSDCOMP=y -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=32 -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -CONFIG_SPI_BITBANG=y -CONFIG_GPIO_SYSFS=y -CONFIG_HWMON=m -CONFIG_SENSORS_ADM1021=m -CONFIG_SENSORS_ADM1025=m -CONFIG_SENSORS_ADM1026=m -CONFIG_SENSORS_ADM1029=m -CONFIG_SENSORS_ADM1031=m -CONFIG_SENSORS_ADM9240=m -CONFIG_SENSORS_DS1621=m -CONFIG_SENSORS_GL518SM=m -CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_LM63=m -CONFIG_SENSORS_LM73=m -CONFIG_SENSORS_LM75=m -CONFIG_SENSORS_LM77=m -CONFIG_SENSORS_LM78=m -CONFIG_SENSORS_LM80=m -CONFIG_SENSORS_LM83=m -CONFIG_SENSORS_LM85=m -CONFIG_SENSORS_LM87=m -CONFIG_SENSORS_LM90=m -CONFIG_SENSORS_LM92=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_PCF8591=m -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_W83781D=m -CONFIG_SENSORS_W83791D=m -CONFIG_SENSORS_W83792D=m -CONFIG_SENSORS_W83793=m -CONFIG_SENSORS_W83L785TS=m -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -CONFIG_AT91RM9200_WATCHDOG=y -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y -CONFIG_FB_S1D13XXX=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_DISPLAY_SUPPORT=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONTS=y -CONFIG_FONT_MINI_4x6=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_STORAGE=y -CONFIG_USB_SERIAL=y -CONFIG_USB_SERIAL_CONSOLE=y -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_FTDI_SIO=y -CONFIG_USB_SERIAL_KEYSPAN=y -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y -CONFIG_USB_SERIAL_MCT_U232=y -CONFIG_USB_SERIAL_PL2303=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_USB_MASS_STORAGE=m -CONFIG_MMC=y -CONFIG_MMC_AT91=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -# CONFIG_RTC_HCTOSYS is not set -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_PCF8563=y -CONFIG_RTC_DRV_AT91RM9200=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_REISERFS_FS=y -CONFIG_AUTOFS4_FS=y -CONFIG_ISO9660_FS=y -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_NTFS_FS=m -CONFIG_TMPFS=y -CONFIG_CONFIGFS_FS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_RUBIN=y -CONFIG_CRAMFS=y -CONFIG_MINIX_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_SMB_FS=m -CONFIG_CIFS=m -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_FTRACE is not set -CONFIG_CRYPTO_PCBC=y -CONFIG_CRYPTO_SHA1=y diff --git a/trunk/arch/arm/configs/at91rm9200dk_defconfig b/trunk/arch/arm/configs/at91rm9200dk_defconfig new file mode 100644 index 000000000000..4438e64f3bfb --- /dev/null +++ b/trunk/arch/arm/configs/at91rm9200dk_defconfig @@ -0,0 +1,72 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_BLK_DEV_INITRD=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_AT91=y +CONFIG_ARCH_AT91RM9200DK=y +CONFIG_MACH_ECO920=y +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y +# CONFIG_ARM_THUMB is not set +CONFIG_PCCARD=y +CONFIG_AT91_CF=y +CONFIG_LEDS=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev/ram0 rw" +CONFIG_FPE_NWFPE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IPV6 is not set +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_PHYSMAP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_NETDEVICES=y +CONFIG_NET_ETHERNET=y +CONFIG_ARM_AT91_ETHER=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_GPIO=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y +CONFIG_AT91RM9200_WATCHDOG=y +# CONFIG_VGA_CONSOLE is not set +# CONFIG_USB_HID is not set +CONFIG_USB=y +CONFIG_USB_DEBUG=y +CONFIG_USB_DEVICEFS=y +CONFIG_USB_MON=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_GADGET=y +CONFIG_MMC=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_AT91RM9200=y +CONFIG_EXT2_FS=y +CONFIG_INOTIFY=y +CONFIG_TMPFS=y +CONFIG_CRAMFS=y +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_LL=y diff --git a/trunk/arch/arm/configs/at91rm9200ek_defconfig b/trunk/arch/arm/configs/at91rm9200ek_defconfig new file mode 100644 index 000000000000..ccd517c64bc7 --- /dev/null +++ b/trunk/arch/arm/configs/at91rm9200ek_defconfig @@ -0,0 +1,73 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_BLK_DEV_INITRD=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_AT91=y +CONFIG_MACH_AT91RM9200EK=y +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y +# CONFIG_ARM_THUMB is not set +CONFIG_LEDS=y +CONFIG_LEDS_CPU=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev/ram0 rw" +CONFIG_FPE_NWFPE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IPV6 is not set +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_PHYSMAP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_NETDEVICES=y +CONFIG_NET_ETHERNET=y +CONFIG_ARM_AT91_ETHER=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_GPIO=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y +CONFIG_AT91RM9200_WATCHDOG=y +CONFIG_FB=y +CONFIG_FB_S1D13XXX=y +# CONFIG_VGA_CONSOLE is not set +# CONFIG_USB_HID is not set +CONFIG_USB=y +CONFIG_USB_DEBUG=y +CONFIG_USB_DEVICEFS=y +CONFIG_USB_MON=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_GADGET=y +CONFIG_MMC=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_AT91RM9200=y +CONFIG_EXT2_FS=y +CONFIG_INOTIFY=y +CONFIG_TMPFS=y +CONFIG_CRAMFS=y +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_LL=y diff --git a/trunk/arch/arm/configs/ateb9200_defconfig b/trunk/arch/arm/configs/ateb9200_defconfig new file mode 100644 index 000000000000..1b0e9a1689bb --- /dev/null +++ b/trunk/arch/arm/configs/ateb9200_defconfig @@ -0,0 +1,131 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_EMBEDDED=y +CONFIG_SLAB=y +CONFIG_PROFILING=y +CONFIG_OPROFILE=m +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_ARCH_AT91=y +CONFIG_MACH_ATEB9200=y +CONFIG_PCCARD=m +CONFIG_AT91_CF=m +CONFIG_PREEMPT=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_FPE_NWFPE=y +CONFIG_PM=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_NET_KEY=y +CONFIG_INET=y +# CONFIG_IPV6 is not set +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK_RO=y +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_SCSI=m +CONFIG_BLK_DEV_SD=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_SCSI_MULTI_LUN=y +CONFIG_NETDEVICES=y +CONFIG_DUMMY=m +CONFIG_TUN=m +CONFIG_PHYLIB=y +CONFIG_DAVICOM_PHY=y +CONFIG_NET_ETHERNET=y +CONFIG_ARM_AT91_ETHER=y +CONFIG_USB_USBNET=y +CONFIG_USB_NET_GL620A=y +CONFIG_USB_NET_PLUSB=y +CONFIG_USB_NET_RNDIS_HOST=y +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_EPSON2888=y +CONFIG_PPP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPPOE=m +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_I2C=m +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_GPIO=m +# CONFIG_VGA_CONSOLE is not set +CONFIG_SOUND=y +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y +CONFIG_USB=y +CONFIG_USB_DEVICEFS=y +CONFIG_USB_MON=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_STORAGE=m +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_GADGET=m +CONFIG_USB_ETH=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +CONFIG_USB_G_SERIAL=m +CONFIG_MMC=m +CONFIG_MMC_DEBUG=y +CONFIG_RTC_CLASS=y +# CONFIG_RTC_HCTOSYS is not set +CONFIG_RTC_DRV_AT91RM9200=y +CONFIG_EXT2_FS=m +CONFIG_EXT3_FS=m +CONFIG_REISERFS_FS=m +CONFIG_INOTIFY=y +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_NTFS_FS=m +CONFIG_NTFS_RW=y +CONFIG_TMPFS=y +CONFIG_CRAMFS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFSD=m +CONFIG_NFSD_V4=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_MAC_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_UTF8=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRC16=m +CONFIG_LIBCRC32C=m diff --git a/trunk/arch/arm/configs/carmeva_defconfig b/trunk/arch/arm/configs/carmeva_defconfig new file mode 100644 index 000000000000..ac64dbd8a49c --- /dev/null +++ b/trunk/arch/arm/configs/carmeva_defconfig @@ -0,0 +1,47 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_BLK_DEV_INITRD=y +CONFIG_EMBEDDED=y +# CONFIG_HOTPLUG is not set +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_ARCH_AT91=y +CONFIG_MACH_CARMEVA=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_FPE_NWFPE=y +CONFIG_NET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_PNP=y +# CONFIG_IPV6 is not set +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_BLK_DEV_RAM=y +CONFIG_NETDEVICES=y +CONFIG_NET_ETHERNET=y +CONFIG_ARM_AT91_ETHER=y +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +CONFIG_SERIO=m +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +# CONFIG_VGA_CONSOLE is not set +CONFIG_MMC=m +CONFIG_MMC_DEBUG=y +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +# CONFIG_DNOTIFY is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y +CONFIG_NFSD=y diff --git a/trunk/arch/arm/configs/cpuat91_defconfig b/trunk/arch/arm/configs/cpuat91_defconfig new file mode 100644 index 000000000000..022aeb55b676 --- /dev/null +++ b/trunk/arch/arm/configs/cpuat91_defconfig @@ -0,0 +1,112 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_AT91=y +CONFIG_MACH_CPUAT91=y +CONFIG_AT91_TIMER_HZ=100 +# CONFIG_ARM_THUMB is not set +CONFIG_PREEMPT=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_IPV6 is not set +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PLATRAM=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_NBD=y +CONFIG_BLK_DEV_RAM=y +# CONFIG_MISC_DEVICES is not set +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_NETDEVICES=y +CONFIG_PHYLIB=y +CONFIG_NET_ETHERNET=y +CONFIG_ARM_AT91_ETHER=y +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +CONFIG_PPP=y +CONFIG_PPP_ASYNC=y +CONFIG_PPP_DEFLATE=y +CONFIG_PPP_BSDCOMP=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_LEGACY_PTY_COUNT=32 +# CONFIG_HW_RANDOM is not set +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_GPIO=y +CONFIG_GPIO_SYSFS=y +# CONFIG_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y +CONFIG_AT91RM9200_WATCHDOG=y +# CONFIG_VGA_CONSOLE is not set +# CONFIG_HID_SUPPORT is not set +CONFIG_USB=y +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_USB_ETH=m +CONFIG_MMC=y +CONFIG_MMC_AT91=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_GPIO=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_RTC_CLASS=y +# CONFIG_RTC_HCTOSYS is not set +CONFIG_RTC_DRV_DS1307=y +CONFIG_RTC_DRV_PCF8563=y +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_INOTIFY=y +CONFIG_AUTOFS4_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_SUMMARY=y +CONFIG_CRAMFS=y +CONFIG_MINIX_FS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_ROOT_NFS=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_UTF8=y +# CONFIG_RCU_CPU_STALL_DETECTOR is not set diff --git a/trunk/arch/arm/configs/csb337_defconfig b/trunk/arch/arm/configs/csb337_defconfig new file mode 100644 index 000000000000..a24c448840c4 --- /dev/null +++ b/trunk/arch/arm/configs/csb337_defconfig @@ -0,0 +1,104 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_BLK_DEV_INITRD=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_BLK_DEV_BSG is not set +CONFIG_ARCH_AT91=y +CONFIG_MACH_CSB337=y +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y +# CONFIG_ARM_THUMB is not set +CONFIG_PCCARD=y +CONFIG_AT91_CF=y +CONFIG_LEDS=y +CONFIG_LEDS_CPU=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=32M console=ttyS0,38400 initrd=0x20410000,3145728 root=/dev/ram0 rw" +CONFIG_FPE_NWFPE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_INET_LRO is not set +# CONFIG_IPV6 is not set +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_PHYSMAP=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_ATMEL_SSC=y +CONFIG_SCSI=y +CONFIG_NETDEVICES=y +CONFIG_NET_ETHERNET=y +CONFIG_ARM_AT91_ETHER=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +# CONFIG_HW_RANDOM is not set +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_GPIO=y +# CONFIG_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y +CONFIG_AT91RM9200_WATCHDOG=y +# CONFIG_VGA_CONSOLE is not set +# CONFIG_USB_HID is not set +CONFIG_USB=y +CONFIG_USB_DEBUG=y +CONFIG_USB_DEVICEFS=y +CONFIG_USB_MON=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_FTDI_SIO=y +CONFIG_USB_SERIAL_KEYSPAN=y +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_MCT_U232=y +CONFIG_USB_GADGET=y +CONFIG_MMC=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc1" +# CONFIG_RTC_INTF_SYSFS is not set +CONFIG_RTC_DRV_DS1307=y +CONFIG_RTC_DRV_AT91RM9200=y +CONFIG_EXT2_FS=y +CONFIG_INOTIFY=y +CONFIG_TMPFS=y +CONFIG_CRAMFS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_LL=y diff --git a/trunk/arch/arm/configs/csb637_defconfig b/trunk/arch/arm/configs/csb637_defconfig new file mode 100644 index 000000000000..98552adac5fb --- /dev/null +++ b/trunk/arch/arm/configs/csb637_defconfig @@ -0,0 +1,98 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_BLK_DEV_BSG is not set +CONFIG_ARCH_AT91=y +CONFIG_MACH_CSB637=y +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y +# CONFIG_ARM_THUMB is not set +CONFIG_PCCARD=y +CONFIG_AT91_CF=y +CONFIG_LEDS=y +CONFIG_LEDS_CPU=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=32M console=ttyS0,38400 initrd=0x20410000,3145728 root=/dev/ram0 rw" +CONFIG_FPE_NWFPE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_INET_LRO is not set +# CONFIG_IPV6 is not set +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_PHYSMAP=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_SCSI=y +CONFIG_NETDEVICES=y +CONFIG_NET_ETHERNET=y +CONFIG_ARM_AT91_ETHER=y +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y +CONFIG_AT91RM9200_WATCHDOG=y +# CONFIG_VGA_CONSOLE is not set +# CONFIG_USB_HID is not set +CONFIG_USB=y +CONFIG_USB_DEBUG=y +CONFIG_USB_DEVICEFS=y +CONFIG_USB_MON=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_FTDI_SIO=y +CONFIG_USB_SERIAL_KEYSPAN=y +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_MCT_U232=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_EXT2_FS=y +CONFIG_INOTIFY=y +CONFIG_TMPFS=y +CONFIG_CRAMFS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_LL=y diff --git a/trunk/arch/arm/configs/ecbat91_defconfig b/trunk/arch/arm/configs/ecbat91_defconfig new file mode 100644 index 000000000000..6bb6abdcea8c --- /dev/null +++ b/trunk/arch/arm/configs/ecbat91_defconfig @@ -0,0 +1,99 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_SYSVIPC=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SLAB=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_AT91=y +CONFIG_MACH_ECBAT91=y +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y +CONFIG_PCCARD=y +CONFIG_AT91_CF=y +CONFIG_PREEMPT=y +CONFIG_LEDS=y +CONFIG_LEDS_CPU=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="rootfstype=reiserfs root=/dev/mmcblk0p1 console=ttyS0,115200n8 rootdelay=1" +CONFIG_FPE_NWFPE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IPV6 is not set +CONFIG_CFG80211=y +CONFIG_MAC80211=y +# CONFIG_STANDALONE is not set +# CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_AFS_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_DATAFLASH=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_SG=y +CONFIG_NETDEVICES=y +CONFIG_NET_ETHERNET=y +CONFIG_ARM_AT91_ETHER=y +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +CONFIG_PPP=y +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_HW_RANDOM=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_SPI=y +CONFIG_SPI_BITBANG=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y +# CONFIG_VGA_CONSOLE is not set +# CONFIG_USB_HID is not set +CONFIG_USB=y +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_PRINTER=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_MMC=y +CONFIG_MMC_DEBUG=y +CONFIG_MMC_AT91=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_RTC_CLASS=y +# CONFIG_RTC_HCTOSYS is not set +CONFIG_RTC_DRV_AT91RM9200=y +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +CONFIG_REISERFS_FS=y +CONFIG_INOTIFY=y +CONFIG_TMPFS=y +CONFIG_CONFIGFS_FS=y +CONFIG_CRAMFS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_DEBUG_USER=y +CONFIG_CRYPTO_PCBC=y +CONFIG_CRYPTO_SHA1=y diff --git a/trunk/arch/arm/configs/kafa_defconfig b/trunk/arch/arm/configs/kafa_defconfig new file mode 100644 index 000000000000..896dbe00dc6e --- /dev/null +++ b/trunk/arch/arm/configs/kafa_defconfig @@ -0,0 +1,61 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SLAB=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_AT91=y +CONFIG_MACH_KAFA=y +# CONFIG_ARM_THUMB is not set +CONFIG_PREEMPT=y +CONFIG_LEDS=y +CONFIG_LEDS_CPU=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20800000,10M root=/dev/ram0 rw" +CONFIG_FPE_NWFPE=y +CONFIG_BINFMT_MISC=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +# CONFIG_INET_DIAG is not set +# CONFIG_IPV6 is not set +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK_RO=y +CONFIG_NETDEVICES=y +CONFIG_PHYLIB=y +CONFIG_DAVICOM_PHY=y +CONFIG_NET_ETHERNET=y +CONFIG_ARM_AT91_ETHER=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_LEGACY_PTY_COUNT=32 +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_GPIO=y +# CONFIG_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y +CONFIG_AT91RM9200_WATCHDOG=y +# CONFIG_VGA_CONSOLE is not set +CONFIG_RTC_CLASS=y +# CONFIG_RTC_HCTOSYS is not set +CONFIG_RTC_DRV_AT91RM9200=y +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_TMPFS=y +CONFIG_CRAMFS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_DES=y diff --git a/trunk/arch/arm/configs/kb9202_defconfig b/trunk/arch/arm/configs/kb9202_defconfig new file mode 100644 index 000000000000..9f906a85f5c2 --- /dev/null +++ b/trunk/arch/arm/configs/kb9202_defconfig @@ -0,0 +1,127 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_AUDIT=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_IOSCHED_DEADLINE is not set +CONFIG_ARCH_AT91=y +CONFIG_MACH_KB9200=y +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y +CONFIG_AEABI=y +CONFIG_ZBOOT_ROM_TEXT=0x10000000 +CONFIG_ZBOOT_ROM_BSS=0x20040000 +CONFIG_CMDLINE="noinitrd root=/dev/mtdblock0 rootfstype=jffs2 mem=64M" +CONFIG_KEXEC=y +CONFIG_FPE_NWFPE=y +CONFIG_BINFMT_MISC=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +# CONFIG_INET_DIAG is not set +# CONFIG_IPV6 is not set +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_MTD=y +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ATMEL=y +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_GLUEBI=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_ATMEL_TCLIB=y +CONFIG_ATMEL_SSC=y +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_SG=y +CONFIG_SCSI_MULTI_LUN=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SPI_ATTRS=m +# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_NETDEVICES=y +CONFIG_NET_ETHERNET=y +CONFIG_ARM_AT91_ETHER=y +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +# CONFIG_LEGACY_PTYS is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_AT91RM9200_WATCHDOG=y +CONFIG_FB=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +# CONFIG_VGA_CONSOLE is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FONTS=y +CONFIG_FONT_MINI_4x6=y +# CONFIG_HID_SUPPORT is not set +CONFIG_USB=y +CONFIG_USB_DEVICEFS=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_LIBUSUAL=y +CONFIG_MMC=y +CONFIG_MMC_AT91=m +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_AT91RM9200=y +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +# CONFIG_DNOTIFY is not set +CONFIG_INOTIFY=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_CONFIGFS_FS=y +CONFIG_JFFS2_FS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_UTF8=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_KERNEL=y +# CONFIG_SCHED_DEBUG is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set diff --git a/trunk/arch/arm/configs/onearm_defconfig b/trunk/arch/arm/configs/onearm_defconfig new file mode 100644 index 000000000000..1579857aeeaa --- /dev/null +++ b/trunk/arch/arm/configs/onearm_defconfig @@ -0,0 +1,80 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_BLK_DEV_INITRD=y +CONFIG_EMBEDDED=y +CONFIG_SLAB=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_AT91=y +CONFIG_MACH_ONEARM=y +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y +# CONFIG_ARM_THUMB is not set +CONFIG_PCCARD=y +CONFIG_AT91_CF=y +CONFIG_LEDS=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp mem=64M" +CONFIG_FPE_NWFPE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IPV6=y +# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET6_XFRM_MODE_TUNNEL is not set +# CONFIG_INET6_XFRM_MODE_BEET is not set +# CONFIG_IPV6_SIT is not set +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_PHYSMAP=y +CONFIG_BLK_DEV_NBD=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_NETDEVICES=y +CONFIG_NET_ETHERNET=y +CONFIG_ARM_AT91_ETHER=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +# CONFIG_VT is not set +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +# CONFIG_HW_RANDOM is not set +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y +CONFIG_AT91RM9200_WATCHDOG=y +# CONFIG_USB_HID is not set +CONFIG_USB=y +CONFIG_USB_DEBUG=y +CONFIG_USB_DEVICEFS=y +CONFIG_USB_MON=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_GADGET=y +CONFIG_MMC=y +CONFIG_EXT2_FS=y +CONFIG_INOTIFY=y +CONFIG_TMPFS=y +CONFIG_CRAMFS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_ROOT_NFS=y +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_LL=y diff --git a/trunk/arch/arm/configs/picotux200_defconfig b/trunk/arch/arm/configs/picotux200_defconfig new file mode 100644 index 000000000000..4c9afa478d57 --- /dev/null +++ b/trunk/arch/arm/configs/picotux200_defconfig @@ -0,0 +1,242 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_SYSVIPC=y +CONFIG_IKCONFIG=m +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_EMBEDDED=y +# CONFIG_KALLSYMS is not set +CONFIG_SLAB=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_AT91=y +CONFIG_MACH_PICOTUX2XX=y +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y +CONFIG_AEABI=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_KEXEC=y +CONFIG_FPE_NWFPE=y +CONFIG_BINFMT_MISC=m +CONFIG_NET=y +CONFIG_PACKET=m +CONFIG_UNIX=y +CONFIG_XFRM_USER=m +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_DIAG=m +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_TUNNEL=m +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m +CONFIG_FW_LOADER=m +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_PHYSMAP=y +CONFIG_BLK_DEV_LOOP=m +CONFIG_EEPROM_LEGACY=m +CONFIG_SCSI=m +CONFIG_BLK_DEV_SD=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_NETDEVICES=y +CONFIG_TUN=m +CONFIG_NET_ETHERNET=y +CONFIG_ARM_AT91_ETHER=y +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_PPP=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +CONFIG_SLIP_MODE_SLIP6=y +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +# CONFIG_VT is not set +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_I2C=m +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_GPIO=m +CONFIG_HWMON=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83L785TS=m +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y +CONFIG_AT91RM9200_WATCHDOG=m +CONFIG_HID=m +CONFIG_USB=m +CONFIG_USB_DEVICEFS=y +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_STORAGE=m +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_PL2303=m +CONFIG_MMC=m +CONFIG_MMC_AT91=m +CONFIG_RTC_CLASS=m +CONFIG_RTC_DRV_AT91RM9200=m +CONFIG_EXT2_FS=m +CONFIG_EXT3_FS=m +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_INOTIFY=y +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_UDF_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_NTFS_FS=m +CONFIG_TMPFS=y +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_NFS_FS=m +CONFIG_SMB_FS=m +CONFIG_CIFS=m +CONFIG_PARTITION_ADVANCED=y +CONFIG_AMIGA_PARTITION=y +CONFIG_NLS_DEFAULT="utf-8" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_LL=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_LIBCRC32C=m diff --git a/trunk/arch/arm/configs/yl9200_defconfig b/trunk/arch/arm/configs/yl9200_defconfig new file mode 100644 index 000000000000..30c537f61089 --- /dev/null +++ b/trunk/arch/arm/configs/yl9200_defconfig @@ -0,0 +1,137 @@ +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_AT91=y +CONFIG_ARCH_AT91RM9200DK=y +CONFIG_MACH_YL9200=y +# CONFIG_ARM_THUMB is not set +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev/ram0 rw" +CONFIG_FPE_NWFPE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +# CONFIG_INET_DIAG is not set +# CONFIG_IPV6 is not set +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_MTD=y +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PLATRAM=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ATMEL=y +CONFIG_MTD_NAND_PLATFORM=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=3 +CONFIG_BLK_DEV_RAM_SIZE=8192 +# CONFIG_MISC_DEVICES is not set +CONFIG_BLK_DEV_SD=y +CONFIG_ATA=y +CONFIG_NETDEVICES=y +CONFIG_PHYLIB=y +CONFIG_DAVICOM_PHY=y +CONFIG_NET_ETHERNET=y +CONFIG_ARM_AT91_ETHER=y +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 +CONFIG_INPUT_EVDEV=y +# CONFIG_KEYBOARD_ATKBD is not set +CONFIG_KEYBOARD_GPIO=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=y +# CONFIG_SERIO_SERPORT is not set +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +# CONFIG_HW_RANDOM is not set +CONFIG_I2C=y +CONFIG_SPI=y +CONFIG_SPI_DEBUG=y +CONFIG_SPI_ATMEL=y +CONFIG_FB=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_DISPLAY_SUPPORT=y +# CONFIG_VGA_CONSOLE is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_USB=y +CONFIG_USB_DEBUG=y +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_MON=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_M66592=y +CONFIG_USB_FILE_STORAGE=m +CONFIG_MMC=y +CONFIG_MMC_DEBUG=y +# CONFIG_MMC_BLOCK_BOUNCE is not set +CONFIG_MMC_AT91=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_AT91RM9200=y +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT3_FS=y +CONFIG_REISERFS_FS=y +CONFIG_INOTIFY=y +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=1 +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_RUBIN=y +CONFIG_CRAMFS=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_MAC_PARTITION=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_KERNEL=y +CONFIG_SLUB_DEBUG_ON=y +CONFIG_DEBUG_KOBJECT=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_LIST=y +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_ERRORS=y +CONFIG_DEBUG_LL=y diff --git a/trunk/arch/arm/include/asm/assembler.h b/trunk/arch/arm/include/asm/assembler.h index 749bb6622404..062b58c029ab 100644 --- a/trunk/arch/arm/include/asm/assembler.h +++ b/trunk/arch/arm/include/asm/assembler.h @@ -238,7 +238,7 @@ @ Slightly optimised to avoid incrementing the pointer twice usraccoff \instr, \reg, \ptr, \inc, 0, \cond, \abort .if \rept == 2 - usraccoff \instr, \reg, \ptr, \inc, \inc, \cond, \abort + usraccoff \instr, \reg, \ptr, \inc, 4, \cond, \abort .endif add\cond \ptr, #\rept * \inc diff --git a/trunk/arch/arm/include/asm/elf.h b/trunk/arch/arm/include/asm/elf.h index c3cd8755e648..8bb66bca2e3e 100644 --- a/trunk/arch/arm/include/asm/elf.h +++ b/trunk/arch/arm/include/asm/elf.h @@ -99,8 +99,6 @@ struct elf32_hdr; extern int elf_check_arch(const struct elf32_hdr *); #define elf_check_arch elf_check_arch -#define vmcore_elf64_check_arch(x) (0) - extern int arm_elf_read_implies_exec(const struct elf32_hdr *, int); #define elf_read_implies_exec(ex,stk) arm_elf_read_implies_exec(&(ex), stk) diff --git a/trunk/arch/arm/include/asm/hardware/entry-macro-gic.S b/trunk/arch/arm/include/asm/hardware/entry-macro-gic.S deleted file mode 100644 index c115b82fe80a..000000000000 --- a/trunk/arch/arm/include/asm/hardware/entry-macro-gic.S +++ /dev/null @@ -1,75 +0,0 @@ -/* - * arch/arm/include/asm/hardware/entry-macro-gic.S - * - * Low-level IRQ helper macros for GIC - * - * 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. - */ - -#include - -#ifndef HAVE_GET_IRQNR_PREAMBLE - .macro get_irqnr_preamble, base, tmp - ldr \base, =gic_cpu_base_addr - ldr \base, [\base] - .endm -#endif - -/* - * The interrupt numbering scheme is defined in the - * interrupt controller spec. To wit: - * - * Interrupts 0-15 are IPI - * 16-28 are reserved - * 29-31 are local. We allow 30 to be used for the watchdog. - * 32-1020 are global - * 1021-1022 are reserved - * 1023 is "spurious" (no interrupt) - * - * For now, we ignore all local interrupts so only return an interrupt if it's - * between 30 and 1020. The test_for_ipi routine below will pick up on IPIs. - * - * A simple read from the controller will tell us the number of the highest - * priority enabled interrupt. We then just need to check whether it is in the - * valid range for an IRQ (30-1020 inclusive). - */ - - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - - ldr \irqstat, [\base, #GIC_CPU_INTACK] - /* bits 12-10 = src CPU, 9-0 = int # */ - - ldr \tmp, =1021 - bic \irqnr, \irqstat, #0x1c00 - cmp \irqnr, #29 - cmpcc \irqnr, \irqnr - cmpne \irqnr, \tmp - cmpcs \irqnr, \irqnr - .endm - -/* We assume that irqstat (the raw value of the IRQ acknowledge - * register) is preserved from the macro above. - * If there is an IPI, we immediately signal end of interrupt on the - * controller, since this requires the original irqstat value which - * we won't easily be able to recreate later. - */ - - .macro test_for_ipi, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - cmp \irqnr, #16 - strcc \irqstat, [\base, #GIC_CPU_EOI] - cmpcs \irqnr, \irqnr - .endm - -/* As above, this assumes that irqstat and base are preserved.. */ - - .macro test_for_ltirq, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - mov \tmp, #0 - cmp \irqnr, #29 - moveq \tmp, #1 - streq \irqstat, [\base, #GIC_CPU_EOI] - cmp \tmp, #0 - .endm diff --git a/trunk/arch/arm/include/asm/hardware/gic.h b/trunk/arch/arm/include/asm/hardware/gic.h index 84557d321001..7f34333bb545 100644 --- a/trunk/arch/arm/include/asm/hardware/gic.h +++ b/trunk/arch/arm/include/asm/hardware/gic.h @@ -33,13 +33,10 @@ #define GIC_DIST_SOFTINT 0xf00 #ifndef __ASSEMBLY__ -extern void __iomem *gic_cpu_base_addr; - -void gic_init(unsigned int, unsigned int, void __iomem *, void __iomem *); -void gic_secondary_init(unsigned int); +void gic_dist_init(unsigned int gic_nr, void __iomem *base, unsigned int irq_start); +void gic_cpu_init(unsigned int gic_nr, void __iomem *base); void gic_cascade_irq(unsigned int gic_nr, unsigned int irq); void gic_raise_softirq(const struct cpumask *mask, unsigned int irq); -void gic_enable_ppi(unsigned int); #endif #endif diff --git a/trunk/arch/arm/include/asm/hardware/it8152.h b/trunk/arch/arm/include/asm/hardware/it8152.h index b2f95c72287c..6700c7fc7ebd 100644 --- a/trunk/arch/arm/include/asm/hardware/it8152.h +++ b/trunk/arch/arm/include/asm/hardware/it8152.h @@ -75,8 +75,7 @@ extern unsigned long it8152_base_address; IT8152_PD_IRQ(1) USB (USBR) IT8152_PD_IRQ(0) Audio controller (ACR) */ -#define IT8152_IRQ(x) (IRQ_BOARD_START + (x)) -#define IT8152_LAST_IRQ (IRQ_BOARD_START + 40) +#define IT8152_IRQ(x) (IRQ_BOARD_END + (x)) /* IRQ-sources in 3 groups - local devices, LPC (serial), and external PCI */ #define IT8152_LD_IRQ_COUNT 9 diff --git a/trunk/arch/arm/include/asm/highmem.h b/trunk/arch/arm/include/asm/highmem.h index 7080e2c8fa62..1fc684e70ab6 100644 --- a/trunk/arch/arm/include/asm/highmem.h +++ b/trunk/arch/arm/include/asm/highmem.h @@ -25,6 +25,9 @@ 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. diff --git a/trunk/arch/arm/include/asm/io.h b/trunk/arch/arm/include/asm/io.h index 20e0f7c9e03e..815efa2d4e07 100644 --- a/trunk/arch/arm/include/asm/io.h +++ b/trunk/arch/arm/include/asm/io.h @@ -241,15 +241,18 @@ extern void _memset_io(volatile void __iomem *, int, size_t); * */ #ifndef __arch_ioremap -#define __arch_ioremap __arm_ioremap -#define __arch_iounmap __iounmap -#endif - +#define ioremap(cookie,size) __arm_ioremap(cookie, size, MT_DEVICE) +#define ioremap_nocache(cookie,size) __arm_ioremap(cookie, size, MT_DEVICE) +#define ioremap_cached(cookie,size) __arm_ioremap(cookie, size, MT_DEVICE_CACHED) +#define ioremap_wc(cookie,size) __arm_ioremap(cookie, size, MT_DEVICE_WC) +#define iounmap(cookie) __iounmap(cookie) +#else #define ioremap(cookie,size) __arch_ioremap((cookie), (size), MT_DEVICE) #define ioremap_nocache(cookie,size) __arch_ioremap((cookie), (size), MT_DEVICE) #define ioremap_cached(cookie,size) __arch_ioremap((cookie), (size), MT_DEVICE_CACHED) #define ioremap_wc(cookie,size) __arch_ioremap((cookie), (size), MT_DEVICE_WC) -#define iounmap __arch_iounmap +#define iounmap(cookie) __arch_iounmap(cookie) +#endif /* * io{read,write}{8,16,32} macros diff --git a/trunk/arch/arm/include/asm/kexec.h b/trunk/arch/arm/include/asm/kexec.h index c0094d8edae4..8ec9ef5c3c7b 100644 --- a/trunk/arch/arm/include/asm/kexec.h +++ b/trunk/arch/arm/include/asm/kexec.h @@ -33,20 +33,10 @@ static inline void crash_setup_regs(struct pt_regs *newregs, if (oldregs) { memcpy(newregs, oldregs, sizeof(*newregs)); } else { - __asm__ __volatile__ ( - "stmia %[regs_base], {r0-r12}\n\t" - "mov %[_ARM_sp], sp\n\t" - "str lr, %[_ARM_lr]\n\t" - "adr %[_ARM_pc], 1f\n\t" - "mrs %[_ARM_cpsr], cpsr\n\t" - "1:" - : [_ARM_pc] "=r" (newregs->ARM_pc), - [_ARM_cpsr] "=r" (newregs->ARM_cpsr), - [_ARM_sp] "=r" (newregs->ARM_sp), - [_ARM_lr] "=o" (newregs->ARM_lr) - : [regs_base] "r" (&newregs->ARM_r0) - : "memory" - ); + __asm__ __volatile__ ("stmia %0, {r0 - r15}" + : : "r" (&newregs->ARM_r0)); + __asm__ __volatile__ ("mrs %0, cpsr" + : "=r" (newregs->ARM_cpsr)); } } diff --git a/trunk/arch/arm/include/asm/mmu.h b/trunk/arch/arm/include/asm/mmu.h index b4ffe9d5b526..68870c776671 100644 --- a/trunk/arch/arm/include/asm/mmu.h +++ b/trunk/arch/arm/include/asm/mmu.h @@ -13,10 +13,6 @@ typedef struct { #ifdef CONFIG_CPU_HAS_ASID #define ASID(mm) ((mm)->context.id & 255) - -/* init_mm.context.id_lock should be initialized. */ -#define INIT_MM_CONTEXT(name) \ - .context.id_lock = __SPIN_LOCK_UNLOCKED(name.context.id_lock), #else #define ASID(mm) (0) #endif diff --git a/trunk/arch/arm/include/asm/module.h b/trunk/arch/arm/include/asm/module.h index 12c8e680cbff..cbb0bc295d2b 100644 --- a/trunk/arch/arm/include/asm/module.h +++ b/trunk/arch/arm/include/asm/module.h @@ -8,6 +8,11 @@ struct unwind_table; #ifdef CONFIG_ARM_UNWIND +struct arm_unwind_mapping { + Elf_Shdr *unw_sec; + Elf_Shdr *sec_text; + struct unwind_table *unwind; +}; enum { ARM_SEC_INIT, ARM_SEC_DEVINIT, @@ -16,13 +21,13 @@ enum { ARM_SEC_DEVEXIT, ARM_SEC_MAX, }; -#endif - struct mod_arch_specific { -#ifdef CONFIG_ARM_UNWIND - struct unwind_table *unwind[ARM_SEC_MAX]; -#endif + struct arm_unwind_mapping map[ARM_SEC_MAX]; +}; +#else +struct mod_arch_specific { }; +#endif /* * Include the ARM architecture version. diff --git a/trunk/arch/arm/include/asm/pgtable.h b/trunk/arch/arm/include/asm/pgtable.h index 53d1d5deb111..b155414192da 100644 --- a/trunk/arch/arm/include/asm/pgtable.h +++ b/trunk/arch/arm/include/asm/pgtable.h @@ -374,9 +374,6 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd) #define pmd_page(pmd) pfn_to_page(__phys_to_pfn(pmd_val(pmd))) -/* we don't need complex calculations here as the pmd is folded into the pgd */ -#define pmd_addr_end(addr,end) (end) - /* * Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to. diff --git a/trunk/arch/arm/include/asm/sizes.h b/trunk/arch/arm/include/asm/sizes.h index 316bb2b2be3d..4fc1565e4f93 100644 --- a/trunk/arch/arm/include/asm/sizes.h +++ b/trunk/arch/arm/include/asm/sizes.h @@ -13,6 +13,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* DO NOT EDIT!! - this file automatically generated + * from .s file by awk -f s2h.awk + */ /* Size definitions * Copyright (C) ARM Limited 1998. All rights reserved. */ @@ -22,9 +25,6 @@ /* handy sizes */ #define SZ_16 0x00000010 -#define SZ_32 0x00000020 -#define SZ_64 0x00000040 -#define SZ_128 0x00000080 #define SZ_256 0x00000100 #define SZ_512 0x00000200 diff --git a/trunk/arch/arm/include/asm/system.h b/trunk/arch/arm/include/asm/system.h index 80025948b8ad..1120f18a6b17 100644 --- a/trunk/arch/arm/include/asm/system.h +++ b/trunk/arch/arm/include/asm/system.h @@ -150,7 +150,6 @@ extern unsigned int user_debug; #define rmb() dmb() #define wmb() mb() #else -#include #define mb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0) #define rmb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0) #define wmb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0) diff --git a/trunk/arch/arm/kernel/entry-armv.S b/trunk/arch/arm/kernel/entry-armv.S index bb96a7d4bbf5..c09e3573c5de 100644 --- a/trunk/arch/arm/kernel/entry-armv.S +++ b/trunk/arch/arm/kernel/entry-armv.S @@ -911,7 +911,7 @@ __kuser_cmpxchg: @ 0xffff0fc0 * A special ghost syscall is used for that (see traps.c). */ stmfd sp!, {r7, lr} - ldr r7, 1f @ it's 20 bits + ldr r7, =1f @ it's 20 bits swi __ARM_NR_cmpxchg ldmfd sp!, {r7, pc} 1: .word __ARM_NR_cmpxchg diff --git a/trunk/arch/arm/kernel/entry-common.S b/trunk/arch/arm/kernel/entry-common.S index 80bf8cd88d7c..8bfa98757cd2 100644 --- a/trunk/arch/arm/kernel/entry-common.S +++ b/trunk/arch/arm/kernel/entry-common.S @@ -29,9 +29,6 @@ ret_fast_syscall: ldr r1, [tsk, #TI_FLAGS] tst r1, #_TIF_WORK_MASK bne fast_work_pending -#if defined(CONFIG_IRQSOFF_TRACER) - asm_trace_hardirqs_on -#endif /* perform architecture specific actions before user return */ arch_ret_to_user r1, lr @@ -68,9 +65,6 @@ ret_slow_syscall: tst r1, #_TIF_WORK_MASK bne work_pending no_work_pending: -#if defined(CONFIG_IRQSOFF_TRACER) - asm_trace_hardirqs_on -#endif /* perform architecture specific actions before user return */ arch_ret_to_user r1, lr diff --git a/trunk/arch/arm/kernel/head.S b/trunk/arch/arm/kernel/head.S index 6bd82d25683c..dd6b369ac69c 100644 --- a/trunk/arch/arm/kernel/head.S +++ b/trunk/arch/arm/kernel/head.S @@ -85,11 +85,9 @@ ENTRY(stext) mrc p15, 0, r9, c0, c0 @ get processor id bl __lookup_processor_type @ r5=procinfo r9=cpuid movs r10, r5 @ invalid processor (r5=0)? - THUMB( it eq ) @ force fixup-able long branch encoding beq __error_p @ yes, error 'p' bl __lookup_machine_type @ r5=machinfo movs r8, r5 @ invalid machine (r5=0)? - THUMB( it eq ) @ force fixup-able long branch encoding beq __error_a @ yes, error 'a' bl __vet_atags #ifdef CONFIG_SMP_ON_UP @@ -264,7 +262,6 @@ __create_page_tables: mov pc, lr ENDPROC(__create_page_tables) .ltorg - .align __enable_mmu_loc: .long . .long __enable_mmu @@ -285,7 +282,6 @@ ENTRY(secondary_startup) bl __lookup_processor_type movs r10, r5 @ invalid processor? moveq r0, #'p' @ yes, error 'p' - THUMB( it eq ) @ force fixup-able long branch encoding beq __error_p /* @@ -312,8 +308,6 @@ ENTRY(__secondary_switched) b secondary_start_kernel ENDPROC(__secondary_switched) - .align - .type __secondary_data, %object __secondary_data: .long . @@ -419,7 +413,6 @@ __fixup_smp_on_up: mov pc, lr ENDPROC(__fixup_smp) - .align 1: .word . .word __smpalt_begin .word __smpalt_end diff --git a/trunk/arch/arm/kernel/hw_breakpoint.c b/trunk/arch/arm/kernel/hw_breakpoint.c index 21e3a4ab3b8c..54593b0c241b 100644 --- a/trunk/arch/arm/kernel/hw_breakpoint.c +++ b/trunk/arch/arm/kernel/hw_breakpoint.c @@ -748,7 +748,8 @@ static int hw_breakpoint_pending(unsigned long addr, unsigned int fsr, breakpoint_handler(addr, regs); break; case ARM_ENTRY_ASYNC_WATCHPOINT: - WARN(1, "Asynchronous watchpoint exception taken. Debugging results may be unreliable\n"); + WARN_ON("Asynchronous watchpoint exception taken. " + "Debugging results may be unreliable"); case ARM_ENTRY_SYNC_WATCHPOINT: watchpoint_handler(addr, regs); break; diff --git a/trunk/arch/arm/kernel/machine_kexec.c b/trunk/arch/arm/kernel/machine_kexec.c index 30ead135ff5f..3a8fd5140d7a 100644 --- a/trunk/arch/arm/kernel/machine_kexec.c +++ b/trunk/arch/arm/kernel/machine_kexec.c @@ -23,8 +23,6 @@ extern unsigned long kexec_indirection_page; extern unsigned long kexec_mach_type; extern unsigned long kexec_boot_atags; -static atomic_t waiting_for_crash_ipi; - /* * Provide a dummy crash_notes definition while crash dump arrives to arm. * This prevents breakage of crash_notes attribute in kernel/ksysfs.c. @@ -39,37 +37,9 @@ void machine_kexec_cleanup(struct kimage *image) { } -void machine_crash_nonpanic_core(void *unused) -{ - struct pt_regs regs; - - crash_setup_regs(®s, NULL); - printk(KERN_DEBUG "CPU %u will stop doing anything useful since another CPU has crashed\n", - smp_processor_id()); - crash_save_cpu(®s, smp_processor_id()); - flush_cache_all(); - - atomic_dec(&waiting_for_crash_ipi); - while (1) - cpu_relax(); -} - void machine_crash_shutdown(struct pt_regs *regs) { - unsigned long msecs; - local_irq_disable(); - - atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1); - smp_call_function(machine_crash_nonpanic_core, NULL, false); - msecs = 1000; /* Wait at most a second for the other cpus to stop */ - while ((atomic_read(&waiting_for_crash_ipi) > 0) && msecs) { - mdelay(1); - msecs--; - } - if (atomic_read(&waiting_for_crash_ipi) > 0) - printk(KERN_WARNING "Non-crashing CPUs did not react to IPI\n"); - crash_save_cpu(regs, smp_processor_id()); printk(KERN_INFO "Loading crashdump kernel...\n"); diff --git a/trunk/arch/arm/kernel/module.c b/trunk/arch/arm/kernel/module.c index 0c1bb68ff4a8..d9bd786ce23d 100644 --- a/trunk/arch/arm/kernel/module.c +++ b/trunk/arch/arm/kernel/module.c @@ -67,6 +67,35 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, char *secstrings, struct module *mod) { +#ifdef CONFIG_ARM_UNWIND + Elf_Shdr *s, *sechdrs_end = sechdrs + hdr->e_shnum; + struct arm_unwind_mapping *maps = mod->arch.map; + + for (s = sechdrs; s < sechdrs_end; s++) { + char const *secname = secstrings + s->sh_name; + + if (strcmp(".ARM.exidx.init.text", secname) == 0) + maps[ARM_SEC_INIT].unw_sec = s; + else if (strcmp(".ARM.exidx.devinit.text", secname) == 0) + maps[ARM_SEC_DEVINIT].unw_sec = s; + else if (strcmp(".ARM.exidx", secname) == 0) + maps[ARM_SEC_CORE].unw_sec = s; + else if (strcmp(".ARM.exidx.exit.text", secname) == 0) + maps[ARM_SEC_EXIT].unw_sec = s; + else if (strcmp(".ARM.exidx.devexit.text", secname) == 0) + maps[ARM_SEC_DEVEXIT].unw_sec = s; + else if (strcmp(".init.text", secname) == 0) + maps[ARM_SEC_INIT].sec_text = s; + else if (strcmp(".devinit.text", secname) == 0) + maps[ARM_SEC_DEVINIT].sec_text = s; + else if (strcmp(".text", secname) == 0) + maps[ARM_SEC_CORE].sec_text = s; + else if (strcmp(".exit.text", secname) == 0) + maps[ARM_SEC_EXIT].sec_text = s; + else if (strcmp(".devexit.text", secname) == 0) + maps[ARM_SEC_DEVEXIT].sec_text = s; + } +#endif return 0; } @@ -271,69 +300,41 @@ apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab, return -ENOEXEC; } -struct mod_unwind_map { - const Elf_Shdr *unw_sec; - const Elf_Shdr *txt_sec; -}; - -int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs, - struct module *mod) -{ #ifdef CONFIG_ARM_UNWIND - const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; - const Elf_Shdr *s, *sechdrs_end = sechdrs + hdr->e_shnum; - struct mod_unwind_map maps[ARM_SEC_MAX]; +static void register_unwind_tables(struct module *mod) +{ int i; - - memset(maps, 0, sizeof(maps)); - - for (s = sechdrs; s < sechdrs_end; s++) { - const char *secname = secstrs + s->sh_name; - - if (!(s->sh_flags & SHF_ALLOC)) - continue; - - if (strcmp(".ARM.exidx.init.text", secname) == 0) - maps[ARM_SEC_INIT].unw_sec = s; - else if (strcmp(".ARM.exidx.devinit.text", secname) == 0) - maps[ARM_SEC_DEVINIT].unw_sec = s; - else if (strcmp(".ARM.exidx", secname) == 0) - maps[ARM_SEC_CORE].unw_sec = s; - else if (strcmp(".ARM.exidx.exit.text", secname) == 0) - maps[ARM_SEC_EXIT].unw_sec = s; - else if (strcmp(".ARM.exidx.devexit.text", secname) == 0) - maps[ARM_SEC_DEVEXIT].unw_sec = s; - else if (strcmp(".init.text", secname) == 0) - maps[ARM_SEC_INIT].txt_sec = s; - else if (strcmp(".devinit.text", secname) == 0) - maps[ARM_SEC_DEVINIT].txt_sec = s; - else if (strcmp(".text", secname) == 0) - maps[ARM_SEC_CORE].txt_sec = s; - else if (strcmp(".exit.text", secname) == 0) - maps[ARM_SEC_EXIT].txt_sec = s; - else if (strcmp(".devexit.text", secname) == 0) - maps[ARM_SEC_DEVEXIT].txt_sec = s; + for (i = 0; i < ARM_SEC_MAX; ++i) { + struct arm_unwind_mapping *map = &mod->arch.map[i]; + if (map->unw_sec && map->sec_text) + map->unwind = unwind_table_add(map->unw_sec->sh_addr, + map->unw_sec->sh_size, + map->sec_text->sh_addr, + map->sec_text->sh_size); } +} - for (i = 0; i < ARM_SEC_MAX; i++) - if (maps[i].unw_sec && maps[i].txt_sec) - mod->arch.unwind[i] = - unwind_table_add(maps[i].unw_sec->sh_addr, - maps[i].unw_sec->sh_size, - maps[i].txt_sec->sh_addr, - maps[i].txt_sec->sh_size); +static void unregister_unwind_tables(struct module *mod) +{ + int i = ARM_SEC_MAX; + while (--i >= 0) + unwind_table_del(mod->arch.map[i].unwind); +} +#else +static inline void register_unwind_tables(struct module *mod) { } +static inline void unregister_unwind_tables(struct module *mod) { } #endif + +int +module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs, + struct module *module) +{ + register_unwind_tables(module); return 0; } void module_arch_cleanup(struct module *mod) { -#ifdef CONFIG_ARM_UNWIND - int i; - - for (i = 0; i < ARM_SEC_MAX; i++) - if (mod->arch.unwind[i]) - unwind_table_del(mod->arch.unwind[i]); -#endif + unregister_unwind_tables(mod); } diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c index 07a50357492a..49643b1467e6 100644 --- a/trunk/arch/arm/kernel/perf_event.c +++ b/trunk/arch/arm/kernel/perf_event.c @@ -1749,7 +1749,7 @@ static inline int armv7_pmnc_has_overflowed(unsigned long pmnc) static inline int armv7_pmnc_counter_has_overflowed(unsigned long pmnc, enum armv7_counters counter) { - int ret = 0; + int ret; if (counter == ARMV7_CYCLE_COUNTER) ret = pmnc & ARMV7_FLAG_C; diff --git a/trunk/arch/arm/kernel/relocate_kernel.S b/trunk/arch/arm/kernel/relocate_kernel.S index 9cf4cbf8f95b..fd26f8d65151 100644 --- a/trunk/arch/arm/kernel/relocate_kernel.S +++ b/trunk/arch/arm/kernel/relocate_kernel.S @@ -59,8 +59,6 @@ relocate_new_kernel: ldr r2,kexec_boot_atags mov pc,lr - .align - .globl kexec_start_address kexec_start_address: .long 0x0 diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c index 9066473c0ebc..8c1959590252 100644 --- a/trunk/arch/arm/kernel/smp.c +++ b/trunk/arch/arm/kernel/smp.c @@ -310,6 +310,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void) * All kernel threads share the same mm context; grab a * reference and switch to it. */ + atomic_inc(&mm->mm_users); atomic_inc(&mm->mm_count); current->active_mm = mm; cpumask_set_cpu(cpu, mm_cpumask(mm)); diff --git a/trunk/arch/arm/kernel/smp_twd.c b/trunk/arch/arm/kernel/smp_twd.c index 67f933ec4177..35882fbf37f9 100644 --- a/trunk/arch/arm/kernel/smp_twd.c +++ b/trunk/arch/arm/kernel/smp_twd.c @@ -127,6 +127,8 @@ static void __cpuinit twd_calibrate_rate(void) */ void __cpuinit twd_timer_setup(struct clock_event_device *clk) { + unsigned long flags; + twd_calibrate_rate(); clk->name = "local_timer"; @@ -141,7 +143,10 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk) clk->min_delta_ns = clockevent_delta2ns(0xf, clk); /* Make sure our local interrupt controller has this enabled */ - gic_enable_ppi(clk->irq); + local_irq_save(flags); + irq_to_desc(clk->irq)->status |= IRQ_NOPROBE; + get_irq_chip(clk->irq)->unmask(clk->irq); + local_irq_restore(flags); clockevents_register_device(clk); } diff --git a/trunk/arch/arm/kernel/stacktrace.c b/trunk/arch/arm/kernel/stacktrace.c index c2e112e1a05f..20b7411e47fd 100644 --- a/trunk/arch/arm/kernel/stacktrace.c +++ b/trunk/arch/arm/kernel/stacktrace.c @@ -28,7 +28,7 @@ int notrace unwind_frame(struct stackframe *frame) /* only go to a higher address on the stack */ low = frame->sp; - high = ALIGN(low, THREAD_SIZE); + high = ALIGN(low, THREAD_SIZE) + THREAD_SIZE; /* check current frame pointer is within bounds */ if (fp < (low + 12) || fp + 4 >= high) diff --git a/trunk/arch/arm/kernel/traps.c b/trunk/arch/arm/kernel/traps.c index 446aee97436f..cda78d59aa31 100644 --- a/trunk/arch/arm/kernel/traps.c +++ b/trunk/arch/arm/kernel/traps.c @@ -53,7 +53,10 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long); void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame) { #ifdef CONFIG_KALLSYMS - printk("[<%08lx>] (%pS) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from); + char sym1[KSYM_SYMBOL_LEN], sym2[KSYM_SYMBOL_LEN]; + sprint_symbol(sym1, where); + sprint_symbol(sym2, from); + printk("[<%08lx>] (%s) from [<%08lx>] (%s)\n", where, sym1, from, sym2); #else printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from); #endif diff --git a/trunk/arch/arm/kernel/unwind.c b/trunk/arch/arm/kernel/unwind.c index d2cb0b3c9872..2a161765f6d5 100644 --- a/trunk/arch/arm/kernel/unwind.c +++ b/trunk/arch/arm/kernel/unwind.c @@ -279,7 +279,7 @@ int unwind_frame(struct stackframe *frame) /* only go to a higher address on the stack */ low = frame->sp; - high = ALIGN(low, THREAD_SIZE); + high = ALIGN(low, THREAD_SIZE) + THREAD_SIZE; pr_debug("%s(pc = %08lx lr = %08lx sp = %08lx)\n", __func__, frame->pc, frame->lr, frame->sp); diff --git a/trunk/arch/arm/lib/findbit.S b/trunk/arch/arm/lib/findbit.S index 64f6bc1a9132..1e4cbd4e7be9 100644 --- a/trunk/arch/arm/lib/findbit.S +++ b/trunk/arch/arm/lib/findbit.S @@ -174,8 +174,8 @@ ENDPROC(_find_next_bit_be) */ .L_found: #if __LINUX_ARM_ARCH__ >= 5 - rsb r0, r3, #0 - and r3, r3, r0 + rsb r1, r3, #0 + and r3, r3, r1 clz r3, r3 rsb r3, r3, #31 add r0, r2, r3 @@ -190,7 +190,5 @@ ENDPROC(_find_next_bit_be) addeq r2, r2, #1 mov r0, r2 #endif - cmp r1, r0 @ Clamp to maxbit - movlo r0, r1 mov pc, lr diff --git a/trunk/arch/arm/mach-aaec2000/include/mach/vmalloc.h b/trunk/arch/arm/mach-aaec2000/include/mach/vmalloc.h index a6299e8321bd..cff4e0a996ce 100644 --- a/trunk/arch/arm/mach-aaec2000/include/mach/vmalloc.h +++ b/trunk/arch/arm/mach-aaec2000/include/mach/vmalloc.h @@ -11,6 +11,6 @@ #ifndef __ASM_ARCH_VMALLOC_H #define __ASM_ARCH_VMALLOC_H -#define VMALLOC_END 0xd0000000UL +#define VMALLOC_END 0xd0000000 #endif /* __ASM_ARCH_VMALLOC_H */ diff --git a/trunk/arch/arm/mach-at91/Makefile b/trunk/arch/arm/mach-at91/Makefile index d13add71f72a..821eb842795f 100644 --- a/trunk/arch/arm/mach-at91/Makefile +++ b/trunk/arch/arm/mach-at91/Makefile @@ -24,8 +24,8 @@ obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o # AT91RM9200 board-specific support obj-$(CONFIG_MACH_ONEARM) += board-1arm.o -obj-$(CONFIG_ARCH_AT91RM9200DK) += board-rm9200dk.o -obj-$(CONFIG_MACH_AT91RM9200EK) += board-rm9200ek.o +obj-$(CONFIG_ARCH_AT91RM9200DK) += board-dk.o +obj-$(CONFIG_MACH_AT91RM9200EK) += board-ek.o obj-$(CONFIG_MACH_CSB337) += board-csb337.o obj-$(CONFIG_MACH_CSB637) += board-csb637.o obj-$(CONFIG_MACH_CARMEVA) += board-carmeva.o @@ -65,7 +65,7 @@ obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o obj-$(CONFIG_MACH_CPU9G20) += board-cpu9krea.o obj-$(CONFIG_MACH_STAMP9G20) += board-stamp9g20.o obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o -obj-$(CONFIG_MACH_PCONTROL_G20) += board-pcontrol-g20.o board-stamp9g20.o +obj-$(CONFIG_MACH_PCONTROL_G20) += board-pcontrol-g20.o # AT91SAM9260/AT91SAM9G20 board-specific support obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o diff --git a/trunk/arch/arm/mach-at91/at91rm9200_devices.c b/trunk/arch/arm/mach-at91/at91rm9200_devices.c index 7b539228e0ef..9338825cfcd7 100644 --- a/trunk/arch/arm/mach-at91/at91rm9200_devices.c +++ b/trunk/arch/arm/mach-at91/at91rm9200_devices.c @@ -1106,6 +1106,51 @@ static inline void configure_usart3_pins(unsigned pins) static struct platform_device *__initdata at91_uarts[ATMEL_MAX_UART]; /* the UARTs to use */ struct platform_device *atmel_default_console_device; /* the serial console device */ +void __init __deprecated at91_init_serial(struct at91_uart_config *config) +{ + int i; + + /* Fill in list of supported UARTs */ + for (i = 0; i < config->nr_tty; i++) { + switch (config->tty_map[i]) { + case 0: + configure_usart0_pins(ATMEL_UART_CTS | ATMEL_UART_RTS); + at91_uarts[i] = &at91rm9200_uart0_device; + at91_clock_associate("usart0_clk", &at91rm9200_uart0_device.dev, "usart"); + break; + case 1: + configure_usart1_pins(ATMEL_UART_CTS | ATMEL_UART_RTS | ATMEL_UART_DSR | ATMEL_UART_DTR | ATMEL_UART_DCD | ATMEL_UART_RI); + at91_uarts[i] = &at91rm9200_uart1_device; + at91_clock_associate("usart1_clk", &at91rm9200_uart1_device.dev, "usart"); + break; + case 2: + configure_usart2_pins(0); + at91_uarts[i] = &at91rm9200_uart2_device; + at91_clock_associate("usart2_clk", &at91rm9200_uart2_device.dev, "usart"); + break; + case 3: + configure_usart3_pins(0); + at91_uarts[i] = &at91rm9200_uart3_device; + at91_clock_associate("usart3_clk", &at91rm9200_uart3_device.dev, "usart"); + break; + case 4: + configure_dbgu_pins(); + at91_uarts[i] = &at91rm9200_dbgu_device; + at91_clock_associate("mck", &at91rm9200_dbgu_device.dev, "usart"); + break; + default: + continue; + } + at91_uarts[i]->id = i; /* update ID number to mapped ID */ + } + + /* Set serial console device */ + if (config->console_tty < ATMEL_MAX_UART) + atmel_default_console_device = at91_uarts[config->console_tty]; + if (!atmel_default_console_device) + printk(KERN_INFO "AT91: No default serial console defined.\n"); +} + void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) { struct platform_device *pdev; diff --git a/trunk/arch/arm/mach-at91/board-1arm.c b/trunk/arch/arm/mach-at91/board-1arm.c index 8a3fc84847c1..46bdc82d3fbf 100644 --- a/trunk/arch/arm/mach-at91/board-1arm.c +++ b/trunk/arch/arm/mach-at91/board-1arm.c @@ -39,24 +39,24 @@ #include "generic.h" +/* + * Serial port configuration. + * 0 .. 3 = USART0 .. USART3 + * 4 = DBGU + */ +static struct at91_uart_config __initdata onearm_uart_config = { + .console_tty = 0, /* ttyS0 */ + .nr_tty = 3, + .tty_map = { 4, 0, 1, -1, -1 }, /* ttyS0, ..., ttyS4 */ +}; + static void __init onearm_map_io(void) { /* Initialize processor: 18.432 MHz crystal */ at91rm9200_initialize(18432000, AT91RM9200_PQFP); - /* DBGU on ttyS0. (Rx & Tx only) */ - at91_register_uart(0, 0, 0); - - /* USART0 on ttyS1 (Rx, Tx, CTS, RTS) */ - at91_register_uart(AT91RM9200_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS); - - /* USART1 on ttyS2 (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ - at91_register_uart(AT91RM9200_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS - | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD - | ATMEL_UART_RI); - - /* set serial console to ttyS0 (ie, DBGU) */ - at91_set_serial_console(0); + /* Setup the serial ports and console */ + at91_init_serial(&onearm_uart_config); } static void __init onearm_init_irq(void) diff --git a/trunk/arch/arm/mach-at91/board-rm9200dk.c b/trunk/arch/arm/mach-at91/board-dk.c similarity index 98% rename from trunk/arch/arm/mach-at91/board-rm9200dk.c rename to trunk/arch/arm/mach-at91/board-dk.c index 4c1047c8200d..e14f0e165680 100644 --- a/trunk/arch/arm/mach-at91/board-rm9200dk.c +++ b/trunk/arch/arm/mach-at91/board-dk.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91/board-rm9200dk.c + * linux/arch/arm/mach-at91/board-dk.c * * Copyright (C) 2005 SAN People * @@ -91,12 +91,10 @@ static struct at91_cf_data __initdata dk_cf_data = { // .vcc_pin = ... always powered }; -#ifndef CONFIG_MTD_AT91_DATAFLASH_CARD static struct at91_mmc_data __initdata dk_mmc_data = { .slot_b = 0, .wire4 = 1, }; -#endif static struct spi_board_info dk_spi_devices[] = { { /* DataFlash chip */ diff --git a/trunk/arch/arm/mach-at91/board-rm9200ek.c b/trunk/arch/arm/mach-at91/board-ek.c similarity index 98% rename from trunk/arch/arm/mach-at91/board-rm9200ek.c rename to trunk/arch/arm/mach-at91/board-ek.c index 9df1be8818c0..56e92c4bbc2a 100644 --- a/trunk/arch/arm/mach-at91/board-rm9200ek.c +++ b/trunk/arch/arm/mach-at91/board-ek.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-at91/board-rm9200ek.c + * linux/arch/arm/mach-at91/board-ek.c * * Copyright (C) 2005 SAN People * @@ -84,14 +84,12 @@ static struct at91_udc_data __initdata ek_udc_data = { .pullup_pin = AT91_PIN_PD5, }; -#ifndef CONFIG_MTD_AT91_DATAFLASH_CARD static struct at91_mmc_data __initdata ek_mmc_data = { .det_pin = AT91_PIN_PB27, .slot_b = 0, .wire4 = 1, .wp_pin = AT91_PIN_PA17, }; -#endif static struct spi_board_info ek_spi_devices[] = { { /* DataFlash chip */ diff --git a/trunk/arch/arm/mach-at91/board-kafa.c b/trunk/arch/arm/mach-at91/board-kafa.c index d2e1f4ec1fcc..c0ce79d431a0 100644 --- a/trunk/arch/arm/mach-at91/board-kafa.c +++ b/trunk/arch/arm/mach-at91/board-kafa.c @@ -39,6 +39,17 @@ #include "generic.h" +/* + * Serial port configuration. + * 0 .. 3 = USART0 .. USART3 + * 4 = DBGU + */ +static struct at91_uart_config __initdata kafa_uart_config = { + .console_tty = 0, /* ttyS0 */ + .nr_tty = 2, + .tty_map = { 4, 0, -1, -1, -1 } /* ttyS0, ..., ttyS4 */ +}; + static void __init kafa_map_io(void) { /* Initialize processor: 18.432 MHz crystal */ @@ -47,14 +58,8 @@ static void __init kafa_map_io(void) /* Set up the LEDs */ at91_init_leds(AT91_PIN_PB4, AT91_PIN_PB4); - /* DBGU on ttyS0. (Rx & Tx only) */ - at91_register_uart(0, 0, 0); - - /* USART0 on ttyS1 (Rx, Tx, CTS, RTS) */ - at91_register_uart(AT91RM9200_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS); - - /* set serial console to ttyS0 (ie, DBGU) */ - at91_set_serial_console(0); + /* Setup the serial ports and console */ + at91_init_serial(&kafa_uart_config); } static void __init kafa_init_irq(void) diff --git a/trunk/arch/arm/mach-at91/board-pcontrol-g20.c b/trunk/arch/arm/mach-at91/board-pcontrol-g20.c index feb65787c30b..bba5a560e02b 100644 --- a/trunk/arch/arm/mach-at91/board-pcontrol-g20.c +++ b/trunk/arch/arm/mach-at91/board-pcontrol-g20.c @@ -31,7 +31,6 @@ #include #include -#include #include "sam9_smc.h" #include "generic.h" @@ -39,7 +38,11 @@ static void __init pcontrol_g20_map_io(void) { - stamp9g20_map_io(); + /* Initialize processor: 18.432 MHz crystal */ + at91sam9260_initialize(18432000); + + /* DGBU on ttyS0. (Rx, Tx) only TTL -> JTAG connector X7 17,19 ) */ + at91_register_uart(0, 0, 0); /* USART0 on ttyS1. (Rx, Tx, CTS, RTS) piggyback A2 */ at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS @@ -51,6 +54,9 @@ static void __init pcontrol_g20_map_io(void) /* USART2 on ttyS3. (Rx, Tx) 9bit-Bus Multidrop-mode X4 */ at91_register_uart(AT91SAM9260_ID_US4, 3, 0); + + /* set serial console to ttyS0 (ie, DBGU) */ + at91_set_serial_console(0); } @@ -60,6 +66,38 @@ static void __init init_irq(void) } +/* + * NAND flash 512MiB 1,8V 8-bit, sector size 128 KiB + */ +static struct atmel_nand_data __initdata nand_data = { + .ale = 21, + .cle = 22, + .rdy_pin = AT91_PIN_PC13, + .enable_pin = AT91_PIN_PC14, +}; + +/* + * Bus timings; unit = 7.57ns + */ +static struct sam9_smc_config __initdata nand_smc_config = { + .ncs_read_setup = 0, + .nrd_setup = 2, + .ncs_write_setup = 0, + .nwe_setup = 2, + + .ncs_read_pulse = 4, + .nrd_pulse = 4, + .ncs_write_pulse = 4, + .nwe_pulse = 4, + + .read_cycle = 7, + .write_cycle = 7, + + .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE + | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8, + .tdf_cycles = 3, +}; + static struct sam9_smc_config __initdata pcontrol_smc_config[2] = { { .ncs_read_setup = 16, .nrd_setup = 18, @@ -100,6 +138,14 @@ static struct sam9_smc_config __initdata pcontrol_smc_config[2] = { { .tdf_cycles = 1, } }; +static void __init add_device_nand(void) +{ + /* configure chip-select 3 (NAND) */ + sam9_smc_configure(3, &nand_smc_config); + at91_add_device_nand(&nand_data); +} + + static void __init add_device_pcontrol(void) { /* configure chip-select 4 (IO compatible to 8051 X4 ) */ @@ -109,6 +155,23 @@ static void __init add_device_pcontrol(void) } +/* + * MCI (SD/MMC) + * det_pin, wp_pin and vcc_pin are not connected + */ +#if defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_ATMELMCI_MODULE) +static struct mci_platform_data __initdata mmc_data = { + .slot[0] = { + .bus_width = 4, + }, +}; +#else +static struct at91_mmc_data __initdata mmc_data = { + .wire4 = 1, +}; +#endif + + /* * USB Host port */ @@ -202,13 +265,42 @@ static struct spi_board_info pcontrol_g20_spi_devices[] = { }; +/* + * Dallas 1-Wire DS2431 + */ +static struct w1_gpio_platform_data w1_gpio_pdata = { + .pin = AT91_PIN_PA29, + .is_open_drain = 1, +}; + +static struct platform_device w1_device = { + .name = "w1-gpio", + .id = -1, + .dev.platform_data = &w1_gpio_pdata, +}; + +static void add_wire1(void) +{ + at91_set_GPIO_periph(w1_gpio_pdata.pin, 1); + at91_set_multi_drive(w1_gpio_pdata.pin, 1); + platform_device_register(&w1_device); +} + + static void __init pcontrol_g20_board_init(void) { - stamp9g20_board_init(); + at91_add_device_serial(); + add_device_nand(); +#if defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_ATMELMCI_MODULE) + at91_add_device_mci(0, &mmc_data); +#else + at91_add_device_mmc(0, &mmc_data); +#endif at91_add_device_usbh(&usbh_data); at91_add_device_eth(&macb_data); at91_add_device_i2c(pcontrol_g20_i2c_devices, ARRAY_SIZE(pcontrol_g20_i2c_devices)); + add_wire1(); add_device_pcontrol(); at91_add_device_spi(pcontrol_g20_spi_devices, ARRAY_SIZE(pcontrol_g20_spi_devices)); diff --git a/trunk/arch/arm/mach-at91/board-picotux200.c b/trunk/arch/arm/mach-at91/board-picotux200.c index 55dad3a46547..9d833bbc592d 100644 --- a/trunk/arch/arm/mach-at91/board-picotux200.c +++ b/trunk/arch/arm/mach-at91/board-picotux200.c @@ -43,21 +43,24 @@ #include "generic.h" +/* + * Serial port configuration. + * 0 .. 3 = USART0 .. USART3 + * 4 = DBGU + */ +static struct at91_uart_config __initdata picotux200_uart_config = { + .console_tty = 0, /* ttyS0 */ + .nr_tty = 2, + .tty_map = { 4, 1, -1, -1, -1 } /* ttyS0, ..., ttyS4 */ +}; + static void __init picotux200_map_io(void) { /* Initialize processor: 18.432 MHz crystal */ at91rm9200_initialize(18432000, AT91RM9200_BGA); - /* DBGU on ttyS0. (Rx & Tx only) */ - at91_register_uart(0, 0, 0); - - /* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ - at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS - | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD - | ATMEL_UART_RI); - - /* set serial console to ttyS0 (ie, DBGU) */ - at91_set_serial_console(0); + /* Setup the serial ports and console */ + at91_init_serial(&picotux200_uart_config); } static void __init picotux200_init_irq(void) @@ -74,6 +77,11 @@ static struct at91_usbh_data __initdata picotux200_usbh_data = { .ports = 1, }; +// static struct at91_udc_data __initdata picotux200_udc_data = { +// .vbus_pin = AT91_PIN_PD4, +// .pullup_pin = AT91_PIN_PD5, +// }; + static struct at91_mmc_data __initdata picotux200_mmc_data = { .det_pin = AT91_PIN_PB27, .slot_b = 0, @@ -81,6 +89,21 @@ static struct at91_mmc_data __initdata picotux200_mmc_data = { .wp_pin = AT91_PIN_PA17, }; +// static struct spi_board_info picotux200_spi_devices[] = { +// { /* DataFlash chip */ +// .modalias = "mtd_dataflash", +// .chip_select = 0, +// .max_speed_hz = 15 * 1000 * 1000, +// }, +// #ifdef CONFIG_MTD_AT91_DATAFLASH_CARD +// { /* DataFlash card */ +// .modalias = "mtd_dataflash", +// .chip_select = 3, +// .max_speed_hz = 15 * 1000 * 1000, +// }, +// #endif +// }; + #define PICOTUX200_FLASH_BASE AT91_CHIPSELECT_0 #define PICOTUX200_FLASH_SIZE SZ_4M @@ -112,11 +135,21 @@ static void __init picotux200_board_init(void) at91_add_device_eth(&picotux200_eth_data); /* USB Host */ at91_add_device_usbh(&picotux200_usbh_data); + /* USB Device */ + // at91_add_device_udc(&picotux200_udc_data); + // at91_set_multi_drive(picotux200_udc_data.pullup_pin, 1); /* pullup_pin is connected to reset */ /* I2C */ at91_add_device_i2c(NULL, 0); + /* SPI */ + // at91_add_device_spi(picotux200_spi_devices, ARRAY_SIZE(picotux200_spi_devices)); +#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD + /* DataFlash card */ + at91_set_gpio_output(AT91_PIN_PB22, 0); +#else /* MMC */ at91_set_gpio_output(AT91_PIN_PB22, 1); /* this MMC card slot can optionally use SPI signaling (CS3). */ at91_add_device_mmc(0, &picotux200_mmc_data); +#endif /* NOR Flash */ platform_device_register(&picotux200_flash); } diff --git a/trunk/arch/arm/mach-at91/board-stamp9g20.c b/trunk/arch/arm/mach-at91/board-stamp9g20.c index f8902b118960..5206eef4a67e 100644 --- a/trunk/arch/arm/mach-at91/board-stamp9g20.c +++ b/trunk/arch/arm/mach-at91/board-stamp9g20.c @@ -32,7 +32,7 @@ #include "generic.h" -void __init stamp9g20_map_io(void) +static void __init portuxg20_map_io(void) { /* Initialize processor: 18.432 MHz crystal */ at91sam9260_initialize(18432000); @@ -40,24 +40,6 @@ void __init stamp9g20_map_io(void) /* DGBU on ttyS0. (Rx & Tx only) */ at91_register_uart(0, 0, 0); - /* set serial console to ttyS0 (ie, DBGU) */ - at91_set_serial_console(0); -} - -static void __init stamp9g20evb_map_io(void) -{ - stamp9g20_map_io(); - - /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ - at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS - | ATMEL_UART_DTR | ATMEL_UART_DSR - | ATMEL_UART_DCD | ATMEL_UART_RI); -} - -static void __init portuxg20_map_io(void) -{ - stamp9g20_map_io(); - /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS | ATMEL_UART_DTR | ATMEL_UART_DSR @@ -74,6 +56,26 @@ static void __init portuxg20_map_io(void) /* USART5 on ttyS6. (Rx, Tx only) */ at91_register_uart(AT91SAM9260_ID_US5, 6, 0); + + /* set serial console to ttyS0 (ie, DBGU) */ + at91_set_serial_console(0); +} + +static void __init stamp9g20_map_io(void) +{ + /* Initialize processor: 18.432 MHz crystal */ + at91sam9260_initialize(18432000); + + /* DGBU on ttyS0. (Rx & Tx only) */ + at91_register_uart(0, 0, 0); + + /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ + at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS + | ATMEL_UART_DTR | ATMEL_UART_DSR + | ATMEL_UART_DCD | ATMEL_UART_RI); + + /* set serial console to ttyS0 (ie, DBGU) */ + at91_set_serial_console(0); } static void __init init_irq(void) @@ -154,7 +156,7 @@ static struct at91_udc_data __initdata portuxg20_udc_data = { .pullup_pin = 0, /* pull-up driven by UDC */ }; -static struct at91_udc_data __initdata stamp9g20evb_udc_data = { +static struct at91_udc_data __initdata stamp9g20_udc_data = { .vbus_pin = AT91_PIN_PA22, .pullup_pin = 0, /* pull-up driven by UDC */ }; @@ -188,7 +190,7 @@ static struct gpio_led portuxg20_leds[] = { } }; -static struct gpio_led stamp9g20evb_leds[] = { +static struct gpio_led stamp9g20_leds[] = { { .name = "D8", .gpio = AT91_PIN_PB18, @@ -248,7 +250,7 @@ void add_w1(void) } -void __init stamp9g20_board_init(void) +static void __init generic_board_init(void) { /* Serial */ at91_add_device_serial(); @@ -260,40 +262,34 @@ void __init stamp9g20_board_init(void) #else at91_add_device_mmc(0, &mmc_data); #endif - /* W1 */ - add_w1(); -} - -static void __init portuxg20_board_init(void) -{ - stamp9g20_board_init(); /* USB Host */ at91_add_device_usbh(&usbh_data); - /* USB Device */ - at91_add_device_udc(&portuxg20_udc_data); /* Ethernet */ at91_add_device_eth(&macb_data); /* I2C */ at91_add_device_i2c(NULL, 0); + /* W1 */ + add_w1(); +} + +static void __init portuxg20_board_init(void) +{ + generic_board_init(); /* SPI */ at91_add_device_spi(portuxg20_spi_devices, ARRAY_SIZE(portuxg20_spi_devices)); + /* USB Device */ + at91_add_device_udc(&portuxg20_udc_data); /* LEDs */ at91_gpio_leds(portuxg20_leds, ARRAY_SIZE(portuxg20_leds)); } -static void __init stamp9g20evb_board_init(void) +static void __init stamp9g20_board_init(void) { - stamp9g20_board_init(); - /* USB Host */ - at91_add_device_usbh(&usbh_data); + generic_board_init(); /* USB Device */ - at91_add_device_udc(&stamp9g20evb_udc_data); - /* Ethernet */ - at91_add_device_eth(&macb_data); - /* I2C */ - at91_add_device_i2c(NULL, 0); + at91_add_device_udc(&stamp9g20_udc_data); /* LEDs */ - at91_gpio_leds(stamp9g20evb_leds, ARRAY_SIZE(stamp9g20evb_leds)); + at91_gpio_leds(stamp9g20_leds, ARRAY_SIZE(stamp9g20_leds)); } MACHINE_START(PORTUXG20, "taskit PortuxG20") @@ -309,7 +305,7 @@ MACHINE_START(STAMP9G20, "taskit Stamp9G20") /* Maintainer: taskit GmbH */ .boot_params = AT91_SDRAM_BASE + 0x100, .timer = &at91sam926x_timer, - .map_io = stamp9g20evb_map_io, + .map_io = stamp9g20_map_io, .init_irq = init_irq, - .init_machine = stamp9g20evb_board_init, + .init_machine = stamp9g20_board_init, MACHINE_END diff --git a/trunk/arch/arm/mach-at91/board-yl-9200.c b/trunk/arch/arm/mach-at91/board-yl-9200.c index e0f0080eb639..89df00a9d2f7 100644 --- a/trunk/arch/arm/mach-at91/board-yl-9200.c +++ b/trunk/arch/arm/mach-at91/board-yl-9200.c @@ -387,7 +387,7 @@ static struct spi_board_info yl9200_spi_devices[] = { * EPSON S1D13806 FB (discontinued chip) * EPSON S1D13506 FB */ -#if defined(CONFIG_FB_S1D13XXX) || defined(CONFIG_FB_S1D13XXX_MODULE) +#if defined(CONFIG_FB_S1D135XX) || defined(CONFIG_FB_S1D13XXX_MODULE) #include