From 8d8d3bc07b92cd835beda64a4f9457d6fef661cd Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 14 Jan 2011 14:30:03 +0100 Subject: [PATCH] --- yaml --- r: 233017 b: refs/heads/master c: 13be9f00c33fe69112fe6c755d6a8f3e249abbb2 h: refs/heads/master i: 233015: 1680281b3dcc9c739fee986612adf87de066e7a0 v: v3 --- [refs] | 2 +- trunk/.mailmap | 1 - .../ABI/testing/sysfs-platform-at91 | 25 - .../Documentation/DocBook/device-drivers.tmpl | 4 +- trunk/Documentation/DocBook/dvb/dvbapi.xml | 2 +- trunk/Documentation/DocBook/media.tmpl | 4 +- trunk/Documentation/DocBook/v4l/dev-rds.xml | 6 +- trunk/Documentation/DocBook/v4l/v4l2.xml | 3 +- .../feature-removal-schedule.txt | 8 + trunk/Documentation/filesystems/ntfs.txt | 2 - trunk/Documentation/kernel-parameters.txt | 4 +- trunk/Documentation/lguest/lguest.c | 73 +- trunk/Documentation/lguest/lguest.txt | 5 - trunk/Documentation/networking/bonding.txt | 83 +- trunk/Documentation/sound/alsa/soc/codec.txt | 45 +- .../Documentation/sound/alsa/soc/machine.txt | 38 +- .../Documentation/sound/alsa/soc/platform.txt | 12 +- .../video4linux/v4l2-controls.txt | 12 - trunk/MAINTAINERS | 99 +- trunk/Makefile | 2 +- trunk/arch/alpha/Kconfig | 19 +- trunk/arch/arm/configs/ag5evm_defconfig | 2 +- trunk/arch/arm/configs/am200epdkit_defconfig | 2 +- .../arch/arm/configs/at572d940hfek_defconfig | 2 +- trunk/arch/arm/configs/badge4_defconfig | 2 +- trunk/arch/arm/configs/bcmring_defconfig | 2 +- trunk/arch/arm/configs/cm_x2xx_defconfig | 2 +- .../arch/arm/configs/colibri_pxa270_defconfig | 2 +- trunk/arch/arm/configs/collie_defconfig | 2 +- trunk/arch/arm/configs/corgi_defconfig | 2 +- trunk/arch/arm/configs/da8xx_omapl_defconfig | 2 +- trunk/arch/arm/configs/davinci_all_defconfig | 2 +- trunk/arch/arm/configs/dove_defconfig | 2 +- trunk/arch/arm/configs/ebsa110_defconfig | 2 +- trunk/arch/arm/configs/edb7211_defconfig | 2 +- trunk/arch/arm/configs/em_x270_defconfig | 2 +- trunk/arch/arm/configs/ep93xx_defconfig | 2 +- trunk/arch/arm/configs/eseries_pxa_defconfig | 2 +- trunk/arch/arm/configs/ezx_defconfig | 2 +- trunk/arch/arm/configs/footbridge_defconfig | 2 +- trunk/arch/arm/configs/fortunet_defconfig | 2 +- trunk/arch/arm/configs/h5000_defconfig | 2 +- trunk/arch/arm/configs/imote2_defconfig | 2 +- trunk/arch/arm/configs/ixp2000_defconfig | 2 +- trunk/arch/arm/configs/ixp23xx_defconfig | 2 +- trunk/arch/arm/configs/ixp4xx_defconfig | 2 +- trunk/arch/arm/configs/loki_defconfig | 2 +- trunk/arch/arm/configs/lpd7a400_defconfig | 2 +- trunk/arch/arm/configs/lpd7a404_defconfig | 2 +- trunk/arch/arm/configs/magician_defconfig | 2 +- trunk/arch/arm/configs/mv78xx0_defconfig | 2 +- trunk/arch/arm/configs/mx1_defconfig | 2 +- trunk/arch/arm/configs/mx21_defconfig | 2 +- trunk/arch/arm/configs/mx27_defconfig | 2 +- trunk/arch/arm/configs/mx3_defconfig | 2 +- trunk/arch/arm/configs/mx51_defconfig | 2 +- trunk/arch/arm/configs/nhk8815_defconfig | 2 +- trunk/arch/arm/configs/omap1_defconfig | 2 +- trunk/arch/arm/configs/omap2plus_defconfig | 2 +- trunk/arch/arm/configs/orion5x_defconfig | 2 +- trunk/arch/arm/configs/pcm027_defconfig | 2 +- trunk/arch/arm/configs/pcontrol_g20_defconfig | 2 +- trunk/arch/arm/configs/pleb_defconfig | 2 +- trunk/arch/arm/configs/pnx4008_defconfig | 2 +- trunk/arch/arm/configs/simpad_defconfig | 2 +- trunk/arch/arm/configs/spitz_defconfig | 2 +- trunk/arch/arm/configs/stmp378x_defconfig | 2 +- trunk/arch/arm/configs/stmp37xx_defconfig | 2 +- trunk/arch/arm/configs/tct_hammer_defconfig | 2 +- trunk/arch/arm/configs/trizeps4_defconfig | 2 +- trunk/arch/arm/configs/u300_defconfig | 2 +- trunk/arch/arm/configs/viper_defconfig | 2 +- trunk/arch/arm/configs/xcep_defconfig | 2 +- trunk/arch/arm/include/asm/hardware/sp810.h | 6 - trunk/arch/arm/include/asm/io.h | 33 +- trunk/arch/arm/include/asm/memory.h | 2 +- trunk/arch/arm/kernel/head.S | 22 +- trunk/arch/arm/kernel/smp_twd.c | 7 +- trunk/arch/arm/mach-ep93xx/core.c | 2 +- trunk/arch/arm/mach-ep93xx/gpio.c | 7 - .../include/mach/debug-macro.S | 4 +- trunk/arch/arm/mach-msm/board-qsd8x50.c | 4 +- trunk/arch/arm/mach-mxs/clock-mx28.c | 2 +- trunk/arch/arm/mach-omap1/Kconfig | 2 - trunk/arch/arm/mach-omap1/Makefile | 3 +- .../arm/mach-omap1/include/mach/entry-macro.S | 13 + trunk/arch/arm/mach-omap1/irq.c | 2 +- trunk/arch/arm/mach-omap1/time.c | 101 +- trunk/arch/arm/mach-omap1/timer32k.c | 13 +- trunk/arch/arm/mach-omap2/board-cm-t3517.c | 29 +- trunk/arch/arm/mach-omap2/board-devkit8000.c | 3 +- trunk/arch/arm/mach-omap2/clock44xx_data.c | 1 + trunk/arch/arm/mach-omap2/clockdomain.c | 30 +- .../arm/mach-omap2/clockdomains44xx_data.c | 2 + trunk/arch/arm/mach-omap2/dma.c | 2 +- .../arm/mach-omap2/include/mach/entry-macro.S | 14 + trunk/arch/arm/mach-omap2/io.c | 6 +- trunk/arch/arm/mach-omap2/mux.c | 2 +- trunk/arch/arm/mach-omap2/pm24xx.c | 4 +- trunk/arch/arm/mach-omap2/pm34xx.c | 4 +- .../arm/mach-omap2/powerdomain2xxx_3xxx.c | 1 + trunk/arch/arm/mach-omap2/serial.c | 4 +- trunk/arch/arm/mach-omap2/timer-gp.c | 10 +- trunk/arch/arm/mach-realview/Kconfig | 49 +- trunk/arch/arm/mach-realview/platsmp.c | 2 +- trunk/arch/arm/mach-shmobile/Kconfig | 2 - trunk/arch/arm/mach-shmobile/board-ag5evm.c | 180 +--- trunk/arch/arm/mach-shmobile/board-g3evm.c | 1 + trunk/arch/arm/mach-shmobile/board-mackerel.c | 5 +- trunk/arch/arm/mach-shmobile/clock-sh7372.c | 4 +- trunk/arch/arm/mach-shmobile/clock-sh73a0.c | 29 +- trunk/arch/arm/mach-shmobile/intc-sh7372.c | 11 +- trunk/arch/arm/mach-shmobile/intc-sh73a0.c | 5 +- trunk/arch/arm/mach-tegra/gpio.c | 4 +- trunk/arch/arm/mach-tegra/include/mach/clk.h | 2 - .../arch/arm/mach-tegra/include/mach/clkdev.h | 2 - trunk/arch/arm/mach-tegra/include/mach/kbc.h | 61 -- trunk/arch/arm/mach-tegra/irq.c | 18 +- trunk/arch/arm/mach-versatile/Kconfig | 10 +- trunk/arch/arm/mach-vexpress/platsmp.c | 2 +- trunk/arch/arm/mach-vexpress/v2m.c | 9 - trunk/arch/arm/mm/init.c | 6 - trunk/arch/arm/plat-omap/Kconfig | 8 +- trunk/arch/arm/plat-omap/counter_32k.c | 22 +- trunk/arch/arm/plat-omap/dma.c | 7 +- .../arch/arm/plat-omap/include/plat/common.h | 3 - trunk/arch/avr32/Kconfig | 4 +- trunk/arch/avr32/include/asm/pgalloc.h | 1 - trunk/arch/blackfin/Kconfig | 17 +- .../blackfin/configs/BF518F-EZBRD_defconfig | 2 +- .../blackfin/configs/BF526-EZBRD_defconfig | 2 +- .../configs/BF527-AD7160-EVAL_defconfig | 2 +- .../blackfin/configs/BF527-EZKIT-V2_defconfig | 2 +- .../blackfin/configs/BF527-EZKIT_defconfig | 2 +- .../blackfin/configs/BF527-TLL6527M_defconfig | 2 +- .../blackfin/configs/BF533-EZKIT_defconfig | 2 +- .../blackfin/configs/BF533-STAMP_defconfig | 2 +- .../blackfin/configs/BF537-STAMP_defconfig | 2 +- .../blackfin/configs/BF538-EZKIT_defconfig | 2 +- .../blackfin/configs/BF548-EZKIT_defconfig | 2 +- .../blackfin/configs/BF561-ACVILON_defconfig | 2 +- .../configs/BF561-EZKIT-SMP_defconfig | 2 +- .../blackfin/configs/BF561-EZKIT_defconfig | 2 +- .../blackfin/configs/BlackStamp_defconfig | 2 +- .../arch/blackfin/configs/CM-BF527_defconfig | 2 +- .../arch/blackfin/configs/CM-BF533_defconfig | 2 +- .../arch/blackfin/configs/CM-BF537E_defconfig | 2 +- .../arch/blackfin/configs/CM-BF537U_defconfig | 2 +- .../arch/blackfin/configs/CM-BF548_defconfig | 2 +- .../arch/blackfin/configs/CM-BF561_defconfig | 2 +- trunk/arch/blackfin/configs/DNP5370_defconfig | 2 +- trunk/arch/blackfin/configs/H8606_defconfig | 2 +- trunk/arch/blackfin/configs/IP0X_defconfig | 2 +- trunk/arch/blackfin/configs/PNAV-10_defconfig | 2 +- trunk/arch/blackfin/configs/SRV1_defconfig | 2 +- .../arch/blackfin/configs/TCM-BF518_defconfig | 2 +- .../arch/blackfin/configs/TCM-BF537_defconfig | 2 +- trunk/arch/cris/Kconfig | 6 +- trunk/arch/cris/arch-v10/kernel/irq.c | 41 +- trunk/arch/cris/arch-v32/kernel/irq.c | 50 +- trunk/arch/cris/configs/artpec_3_defconfig | 2 +- .../cris/configs/etrax-100lx_v2_defconfig | 2 +- trunk/arch/cris/configs/etraxfs_defconfig | 2 +- trunk/arch/cris/kernel/irq.c | 6 +- trunk/arch/frv/Kconfig | 9 +- trunk/arch/frv/defconfig | 2 +- trunk/arch/h8300/Kconfig | 6 +- trunk/arch/h8300/defconfig | 2 +- trunk/arch/h8300/kernel/irq.c | 50 +- trunk/arch/ia64/Kconfig | 26 +- trunk/arch/m32r/Kconfig | 11 +- .../arch/m32r/configs/m32700ut.smp_defconfig | 2 +- trunk/arch/m32r/configs/m32700ut.up_defconfig | 2 +- trunk/arch/m32r/configs/mappi.nommu_defconfig | 2 +- trunk/arch/m32r/configs/mappi.smp_defconfig | 2 +- trunk/arch/m32r/configs/mappi.up_defconfig | 2 +- trunk/arch/m32r/configs/mappi2.opsp_defconfig | 2 +- .../arch/m32r/configs/mappi2.vdec2_defconfig | 2 +- trunk/arch/m32r/configs/mappi3.smp_defconfig | 2 +- trunk/arch/m32r/configs/oaks32r_defconfig | 2 +- trunk/arch/m32r/configs/opsput_defconfig | 2 +- trunk/arch/m32r/configs/usrv_defconfig | 2 +- trunk/arch/m32r/kernel/irq.c | 10 +- trunk/arch/m32r/platforms/m32104ut/setup.c | 58 +- trunk/arch/m32r/platforms/m32700ut/setup.c | 214 +++-- trunk/arch/m32r/platforms/mappi/setup.c | 78 +- trunk/arch/m32r/platforms/mappi2/setup.c | 89 +- trunk/arch/m32r/platforms/mappi3/setup.c | 92 +- trunk/arch/m32r/platforms/oaks32r/setup.c | 65 +- trunk/arch/m32r/platforms/opsput/setup.c | 220 +++-- trunk/arch/m32r/platforms/usrv/setup.c | 115 ++- trunk/arch/m68k/amiga/config.c | 16 +- trunk/arch/m68k/atari/ataints.c | 4 +- trunk/arch/m68k/atari/config.c | 2 +- trunk/arch/m68k/atari/debug.c | 14 +- trunk/arch/m68k/include/asm/atarihw.h | 2 +- trunk/arch/m68k/include/asm/string.h | 12 + trunk/arch/m68knommu/Kconfig | 9 +- .../arch/m68knommu/configs/m5208evb_defconfig | 2 +- .../arch/m68knommu/configs/m5249evb_defconfig | 2 +- .../arch/m68knommu/configs/m5272c3_defconfig | 2 +- .../arch/m68knommu/configs/m5275evb_defconfig | 2 +- .../arch/m68knommu/configs/m5307c3_defconfig | 2 +- .../arch/m68knommu/configs/m5407c3_defconfig | 2 +- trunk/arch/m68knommu/defconfig | 2 +- trunk/arch/microblaze/Kconfig | 11 +- trunk/arch/microblaze/configs/mmu_defconfig | 2 +- trunk/arch/microblaze/configs/nommu_defconfig | 2 +- trunk/arch/mips/Kconfig | 3 + trunk/arch/mips/Kconfig.debug | 2 +- trunk/arch/mips/configs/ar7_defconfig | 2 +- trunk/arch/mips/configs/bcm47xx_defconfig | 2 +- trunk/arch/mips/configs/bcm63xx_defconfig | 2 +- trunk/arch/mips/configs/bigsur_defconfig | 2 +- trunk/arch/mips/configs/capcella_defconfig | 2 +- .../arch/mips/configs/cavium-octeon_defconfig | 2 +- trunk/arch/mips/configs/cobalt_defconfig | 2 +- trunk/arch/mips/configs/db1000_defconfig | 2 +- trunk/arch/mips/configs/db1100_defconfig | 2 +- trunk/arch/mips/configs/db1200_defconfig | 2 +- trunk/arch/mips/configs/db1500_defconfig | 2 +- trunk/arch/mips/configs/db1550_defconfig | 2 +- trunk/arch/mips/configs/decstation_defconfig | 2 +- trunk/arch/mips/configs/e55_defconfig | 2 +- trunk/arch/mips/configs/fuloong2e_defconfig | 2 +- trunk/arch/mips/configs/gpr_defconfig | 2 +- trunk/arch/mips/configs/ip22_defconfig | 2 +- trunk/arch/mips/configs/ip27_defconfig | 2 +- trunk/arch/mips/configs/ip28_defconfig | 2 +- trunk/arch/mips/configs/ip32_defconfig | 2 +- trunk/arch/mips/configs/jazz_defconfig | 2 +- trunk/arch/mips/configs/jmr3927_defconfig | 2 +- trunk/arch/mips/configs/lasat_defconfig | 2 +- trunk/arch/mips/configs/lemote2f_defconfig | 2 +- trunk/arch/mips/configs/malta_defconfig | 2 +- trunk/arch/mips/configs/markeins_defconfig | 2 +- trunk/arch/mips/configs/mipssim_defconfig | 2 +- trunk/arch/mips/configs/mpc30x_defconfig | 2 +- trunk/arch/mips/configs/msp71xx_defconfig | 2 +- trunk/arch/mips/configs/mtx1_defconfig | 2 +- trunk/arch/mips/configs/pb1100_defconfig | 2 +- trunk/arch/mips/configs/pb1200_defconfig | 2 +- trunk/arch/mips/configs/pb1500_defconfig | 2 +- trunk/arch/mips/configs/pb1550_defconfig | 2 +- .../mips/configs/pnx8335-stb225_defconfig | 2 +- trunk/arch/mips/configs/pnx8550-jbs_defconfig | 2 +- .../mips/configs/pnx8550-stb810_defconfig | 2 +- trunk/arch/mips/configs/powertv_defconfig | 2 +- trunk/arch/mips/configs/rb532_defconfig | 2 +- trunk/arch/mips/configs/rbtx49xx_defconfig | 2 +- trunk/arch/mips/configs/rm200_defconfig | 2 +- .../arch/mips/configs/sb1250-swarm_defconfig | 2 +- trunk/arch/mips/configs/tb0219_defconfig | 2 +- trunk/arch/mips/configs/tb0226_defconfig | 2 +- trunk/arch/mips/configs/tb0287_defconfig | 2 +- trunk/arch/mips/configs/workpad_defconfig | 2 +- trunk/arch/mips/configs/wrppmc_defconfig | 2 +- trunk/arch/mips/configs/yosemite_defconfig | 2 +- trunk/arch/mn10300/Kconfig | 8 +- trunk/arch/mn10300/configs/asb2303_defconfig | 2 +- trunk/arch/mn10300/configs/asb2364_defconfig | 2 +- trunk/arch/parisc/Kconfig | 18 +- trunk/arch/parisc/configs/a500_defconfig | 2 +- trunk/arch/parisc/configs/c3000_defconfig | 2 +- trunk/arch/parisc/kernel/pdc_cons.c | 4 +- trunk/arch/powerpc/Kconfig | 28 +- trunk/arch/powerpc/boot/Makefile | 2 +- trunk/arch/powerpc/boot/dts/mpc8308rdb.dts | 2 +- trunk/arch/powerpc/boot/dts/p1022ds.dts | 4 +- .../arch/powerpc/configs/40x/acadia_defconfig | 2 +- .../arch/powerpc/configs/40x/ep405_defconfig | 2 +- trunk/arch/powerpc/configs/40x/hcu4_defconfig | 2 +- .../powerpc/configs/40x/kilauea_defconfig | 2 +- .../arch/powerpc/configs/40x/makalu_defconfig | 2 +- .../arch/powerpc/configs/40x/walnut_defconfig | 2 +- .../arch/powerpc/configs/44x/arches_defconfig | 2 +- .../arch/powerpc/configs/44x/bamboo_defconfig | 2 +- .../powerpc/configs/44x/bluestone_defconfig | 2 +- .../powerpc/configs/44x/canyonlands_defconfig | 2 +- .../arch/powerpc/configs/44x/ebony_defconfig | 2 +- .../arch/powerpc/configs/44x/eiger_defconfig | 2 +- trunk/arch/powerpc/configs/44x/icon_defconfig | 2 +- .../powerpc/configs/44x/iss476-smp_defconfig | 2 +- .../arch/powerpc/configs/44x/katmai_defconfig | 2 +- .../powerpc/configs/44x/rainier_defconfig | 2 +- .../powerpc/configs/44x/redwood_defconfig | 2 +- .../powerpc/configs/44x/sam440ep_defconfig | 2 +- .../powerpc/configs/44x/sequoia_defconfig | 2 +- .../powerpc/configs/44x/taishan_defconfig | 2 +- trunk/arch/powerpc/configs/44x/warp_defconfig | 2 +- .../powerpc/configs/52xx/cm5200_defconfig | 2 +- .../powerpc/configs/52xx/lite5200b_defconfig | 2 +- .../powerpc/configs/52xx/motionpro_defconfig | 2 +- .../powerpc/configs/52xx/pcm030_defconfig | 2 +- .../powerpc/configs/52xx/tqm5200_defconfig | 2 +- .../powerpc/configs/83xx/asp8347_defconfig | 2 +- .../powerpc/configs/83xx/kmeter1_defconfig | 2 +- .../configs/83xx/mpc8313_rdb_defconfig | 2 +- .../configs/83xx/mpc8315_rdb_defconfig | 2 +- .../configs/83xx/mpc832x_mds_defconfig | 2 +- .../configs/83xx/mpc832x_rdb_defconfig | 2 +- .../configs/83xx/mpc834x_itx_defconfig | 2 +- .../configs/83xx/mpc834x_itxgp_defconfig | 2 +- .../configs/83xx/mpc834x_mds_defconfig | 2 +- .../configs/83xx/mpc836x_mds_defconfig | 2 +- .../configs/83xx/mpc836x_rdk_defconfig | 2 +- .../configs/83xx/mpc837x_mds_defconfig | 2 +- .../configs/83xx/mpc837x_rdb_defconfig | 2 +- .../powerpc/configs/83xx/sbc834x_defconfig | 2 +- .../powerpc/configs/85xx/ksi8560_defconfig | 2 +- .../configs/85xx/mpc8540_ads_defconfig | 2 +- .../configs/85xx/mpc8560_ads_defconfig | 2 +- .../configs/85xx/mpc85xx_cds_defconfig | 2 +- .../powerpc/configs/85xx/sbc8548_defconfig | 2 +- .../powerpc/configs/85xx/sbc8560_defconfig | 2 +- .../powerpc/configs/85xx/socrates_defconfig | 2 +- .../powerpc/configs/85xx/stx_gp3_defconfig | 2 +- .../powerpc/configs/85xx/tqm8540_defconfig | 2 +- .../powerpc/configs/85xx/tqm8541_defconfig | 2 +- .../powerpc/configs/85xx/tqm8548_defconfig | 2 +- .../powerpc/configs/85xx/tqm8555_defconfig | 2 +- .../powerpc/configs/85xx/tqm8560_defconfig | 2 +- .../configs/85xx/xes_mpc85xx_defconfig | 2 +- .../powerpc/configs/86xx/gef_ppc9a_defconfig | 2 +- .../powerpc/configs/86xx/gef_sbc310_defconfig | 2 +- .../powerpc/configs/86xx/gef_sbc610_defconfig | 2 +- .../configs/86xx/mpc8610_hpcd_defconfig | 2 +- .../configs/86xx/mpc8641_hpcn_defconfig | 2 +- .../powerpc/configs/86xx/sbc8641d_defconfig | 2 +- trunk/arch/powerpc/configs/adder875_defconfig | 2 +- .../arch/powerpc/configs/e55xx_smp_defconfig | 2 +- trunk/arch/powerpc/configs/ep8248e_defconfig | 2 +- trunk/arch/powerpc/configs/ep88xc_defconfig | 2 +- trunk/arch/powerpc/configs/gamecube_defconfig | 2 +- trunk/arch/powerpc/configs/holly_defconfig | 2 +- trunk/arch/powerpc/configs/mgcoge_defconfig | 2 +- trunk/arch/powerpc/configs/mgsuvd_defconfig | 2 +- .../powerpc/configs/mpc7448_hpc2_defconfig | 2 +- .../powerpc/configs/mpc8272_ads_defconfig | 2 +- trunk/arch/powerpc/configs/mpc83xx_defconfig | 2 +- trunk/arch/powerpc/configs/mpc85xx_defconfig | 2 +- .../powerpc/configs/mpc85xx_smp_defconfig | 2 +- .../arch/powerpc/configs/mpc866_ads_defconfig | 2 +- trunk/arch/powerpc/configs/mpc86xx_defconfig | 2 +- .../arch/powerpc/configs/mpc885_ads_defconfig | 2 +- trunk/arch/powerpc/configs/ppc40x_defconfig | 2 +- trunk/arch/powerpc/configs/ppc44x_defconfig | 2 +- trunk/arch/powerpc/configs/pq2fads_defconfig | 2 +- trunk/arch/powerpc/configs/ps3_defconfig | 2 +- trunk/arch/powerpc/configs/pseries_defconfig | 7 +- .../arch/powerpc/configs/storcenter_defconfig | 2 +- trunk/arch/powerpc/configs/tqm8xx_defconfig | 2 +- trunk/arch/powerpc/configs/wii_defconfig | 2 +- .../arch/powerpc/include/asm/feature-fixups.h | 27 +- trunk/arch/powerpc/include/asm/immap_qe.h | 21 +- trunk/arch/powerpc/include/asm/irqflags.h | 40 +- trunk/arch/powerpc/include/asm/machdep.h | 18 +- trunk/arch/powerpc/include/asm/reg.h | 2 - trunk/arch/powerpc/include/asm/reg_booke.h | 14 - trunk/arch/powerpc/include/asm/spu.h | 8 + .../arch/powerpc/kernel/cpu_setup_fsl_booke.S | 6 - trunk/arch/powerpc/kernel/cputable.c | 23 + trunk/arch/powerpc/kernel/crash.c | 72 +- trunk/arch/powerpc/kernel/entry_32.S | 11 - trunk/arch/powerpc/kernel/machine_kexec.c | 19 +- .../arch/powerpc/kernel/perf_event_fsl_emb.c | 1 - trunk/arch/powerpc/kernel/process.c | 2 +- trunk/arch/powerpc/kernel/rtas_flash.c | 53 +- trunk/arch/powerpc/kernel/rtasd.c | 2 +- trunk/arch/powerpc/kernel/time.c | 25 +- trunk/arch/powerpc/kernel/traps.c | 12 +- trunk/arch/powerpc/lib/feature-fixups-test.S | 19 - .../arch/powerpc/platforms/83xx/mpc830x_rdb.c | 4 +- .../arch/powerpc/platforms/83xx/mpc831x_rdb.c | 4 +- trunk/arch/powerpc/platforms/83xx/mpc83xx.h | 2 - trunk/arch/powerpc/platforms/83xx/usb.c | 21 +- .../platforms/cell/cpufreq_spudemand.c | 20 +- .../arch/powerpc/platforms/cell/qpace_setup.c | 5 + trunk/arch/powerpc/platforms/cell/spu_base.c | 70 -- .../arch/powerpc/platforms/cell/spufs/file.c | 27 +- .../powerpc/platforms/embedded6xx/gamecube.c | 11 + .../arch/powerpc/platforms/embedded6xx/wii.c | 11 + trunk/arch/powerpc/platforms/iseries/Kconfig | 2 +- trunk/arch/powerpc/platforms/pseries/Kconfig | 6 +- trunk/arch/powerpc/platforms/pseries/kexec.c | 10 + trunk/arch/powerpc/platforms/pseries/ras.c | 102 +- trunk/arch/powerpc/sysdev/fsl_rio.c | 2 + trunk/arch/powerpc/sysdev/mpic.c | 6 +- trunk/arch/score/Kconfig | 10 +- trunk/arch/score/configs/spct6600_defconfig | 2 +- trunk/arch/sh/Kconfig | 3 +- trunk/arch/sh/Makefile | 3 +- trunk/arch/sh/boards/mach-ecovec24/setup.c | 2 - trunk/arch/sh/boot/Makefile | 11 +- trunk/arch/sh/boot/compressed/Makefile | 4 +- trunk/arch/sh/boot/compressed/misc.c | 4 - trunk/arch/sh/include/asm/pgtable.h | 1 - trunk/arch/sh/kernel/cpu/sh4/setup-sh7750.c | 6 +- trunk/arch/sh/kernel/topology.c | 1 - trunk/arch/sparc/Kconfig | 9 +- trunk/arch/tile/Kconfig | 55 +- trunk/arch/tile/Kconfig.debug | 2 +- trunk/arch/tile/configs/tile_defconfig | 2 +- trunk/arch/um/Kconfig.common | 6 +- trunk/arch/um/Kconfig.um | 3 + trunk/arch/um/defconfig | 2 +- trunk/arch/x86/Kconfig | 20 +- trunk/arch/x86/Kconfig.cpu | 2 +- trunk/arch/x86/Kconfig.debug | 4 +- trunk/arch/x86/include/asm/cacheflush.h | 42 +- trunk/arch/x86/include/asm/cpu.h | 1 - trunk/arch/x86/include/asm/jump_label.h | 2 +- trunk/arch/x86/include/asm/numa_32.h | 2 - trunk/arch/x86/include/asm/numa_64.h | 1 - trunk/arch/x86/include/asm/paravirt.h | 5 +- trunk/arch/x86/include/asm/percpu.h | 32 +- trunk/arch/x86/include/asm/system_64.h | 22 + trunk/arch/x86/kernel/cpu/intel_cacheinfo.c | 3 - .../arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 - trunk/arch/x86/kernel/dumpstack_64.c | 2 +- trunk/arch/x86/kernel/process.c | 3 +- trunk/arch/x86/kernel/smpboot.c | 3 +- trunk/arch/x86/kernel/vmlinux.lds.S | 11 +- trunk/arch/x86/lguest/Kconfig | 1 - trunk/arch/x86/lguest/boot.c | 2 +- trunk/arch/x86/mm/numa.c | 22 - trunk/arch/x86/mm/numa_64.c | 24 +- trunk/arch/x86/mm/srat_32.c | 1 + trunk/arch/x86/xen/enlighten.c | 2 +- trunk/arch/x86/xen/irq.c | 2 +- trunk/arch/x86/xen/p2m.c | 12 - trunk/arch/x86/xen/setup.c | 8 +- trunk/arch/xtensa/configs/common_defconfig | 2 +- trunk/arch/xtensa/configs/iss_defconfig | 2 +- trunk/arch/xtensa/configs/s6105_defconfig | 2 +- trunk/block/Kconfig | 2 +- trunk/drivers/Makefile | 3 +- trunk/drivers/acpi/Kconfig | 2 +- trunk/drivers/acpi/acpica/accommon.h | 2 +- trunk/drivers/acpi/acpica/acconfig.h | 2 +- trunk/drivers/acpi/acpica/acdebug.h | 2 +- trunk/drivers/acpi/acpica/acdispat.h | 2 +- trunk/drivers/acpi/acpica/acevents.h | 2 +- trunk/drivers/acpi/acpica/acglobal.h | 2 +- trunk/drivers/acpi/acpica/achware.h | 2 +- trunk/drivers/acpi/acpica/acinterp.h | 2 +- trunk/drivers/acpi/acpica/aclocal.h | 2 +- trunk/drivers/acpi/acpica/acmacros.h | 2 +- trunk/drivers/acpi/acpica/acnamesp.h | 2 +- trunk/drivers/acpi/acpica/acobject.h | 16 +- trunk/drivers/acpi/acpica/acopcode.h | 2 +- trunk/drivers/acpi/acpica/acparser.h | 2 +- trunk/drivers/acpi/acpica/acpredef.h | 2 +- trunk/drivers/acpi/acpica/acresrc.h | 2 +- trunk/drivers/acpi/acpica/acstruct.h | 2 +- trunk/drivers/acpi/acpica/actables.h | 2 +- trunk/drivers/acpi/acpica/acutils.h | 2 +- trunk/drivers/acpi/acpica/amlcode.h | 10 +- trunk/drivers/acpi/acpica/amlresrc.h | 2 +- trunk/drivers/acpi/acpica/dsfield.c | 2 +- trunk/drivers/acpi/acpica/dsinit.c | 2 +- trunk/drivers/acpi/acpica/dsmethod.c | 64 +- trunk/drivers/acpi/acpica/dsmthdat.c | 2 +- trunk/drivers/acpi/acpica/dsobject.c | 2 +- trunk/drivers/acpi/acpica/dsopcode.c | 2 +- trunk/drivers/acpi/acpica/dsutils.c | 2 +- trunk/drivers/acpi/acpica/dswexec.c | 2 +- trunk/drivers/acpi/acpica/dswload.c | 2 +- trunk/drivers/acpi/acpica/dswscope.c | 2 +- trunk/drivers/acpi/acpica/dswstate.c | 2 +- trunk/drivers/acpi/acpica/evevent.c | 2 +- trunk/drivers/acpi/acpica/evgpe.c | 4 +- trunk/drivers/acpi/acpica/evgpeblk.c | 2 +- trunk/drivers/acpi/acpica/evgpeinit.c | 2 +- trunk/drivers/acpi/acpica/evgpeutil.c | 2 +- trunk/drivers/acpi/acpica/evmisc.c | 2 +- trunk/drivers/acpi/acpica/evregion.c | 2 +- trunk/drivers/acpi/acpica/evrgnini.c | 6 +- trunk/drivers/acpi/acpica/evsci.c | 2 +- trunk/drivers/acpi/acpica/evxface.c | 2 +- trunk/drivers/acpi/acpica/evxfevnt.c | 2 +- trunk/drivers/acpi/acpica/evxfgpe.c | 2 +- trunk/drivers/acpi/acpica/evxfregn.c | 2 +- trunk/drivers/acpi/acpica/exconfig.c | 2 +- trunk/drivers/acpi/acpica/exconvrt.c | 2 +- trunk/drivers/acpi/acpica/excreate.c | 10 +- trunk/drivers/acpi/acpica/exdebug.c | 2 +- trunk/drivers/acpi/acpica/exdump.c | 4 +- trunk/drivers/acpi/acpica/exfield.c | 2 +- trunk/drivers/acpi/acpica/exfldio.c | 2 +- trunk/drivers/acpi/acpica/exmisc.c | 2 +- trunk/drivers/acpi/acpica/exmutex.c | 2 +- trunk/drivers/acpi/acpica/exnames.c | 2 +- trunk/drivers/acpi/acpica/exoparg1.c | 2 +- trunk/drivers/acpi/acpica/exoparg2.c | 2 +- trunk/drivers/acpi/acpica/exoparg3.c | 2 +- trunk/drivers/acpi/acpica/exoparg6.c | 2 +- trunk/drivers/acpi/acpica/exprep.c | 2 +- trunk/drivers/acpi/acpica/exregion.c | 2 +- trunk/drivers/acpi/acpica/exresnte.c | 2 +- trunk/drivers/acpi/acpica/exresolv.c | 2 +- trunk/drivers/acpi/acpica/exresop.c | 2 +- trunk/drivers/acpi/acpica/exstore.c | 2 +- trunk/drivers/acpi/acpica/exstoren.c | 2 +- trunk/drivers/acpi/acpica/exstorob.c | 2 +- trunk/drivers/acpi/acpica/exsystem.c | 2 +- trunk/drivers/acpi/acpica/exutils.c | 2 +- trunk/drivers/acpi/acpica/hwacpi.c | 2 +- trunk/drivers/acpi/acpica/hwgpe.c | 2 +- trunk/drivers/acpi/acpica/hwpci.c | 2 +- trunk/drivers/acpi/acpica/hwregs.c | 2 +- trunk/drivers/acpi/acpica/hwsleep.c | 2 +- trunk/drivers/acpi/acpica/hwtimer.c | 2 +- trunk/drivers/acpi/acpica/hwvalid.c | 2 +- trunk/drivers/acpi/acpica/hwxface.c | 2 +- trunk/drivers/acpi/acpica/nsaccess.c | 8 +- trunk/drivers/acpi/acpica/nsalloc.c | 15 +- trunk/drivers/acpi/acpica/nsdump.c | 17 +- trunk/drivers/acpi/acpica/nsdumpdv.c | 2 +- trunk/drivers/acpi/acpica/nseval.c | 4 +- trunk/drivers/acpi/acpica/nsinit.c | 2 +- trunk/drivers/acpi/acpica/nsload.c | 2 +- trunk/drivers/acpi/acpica/nsnames.c | 2 +- trunk/drivers/acpi/acpica/nsobject.c | 2 +- trunk/drivers/acpi/acpica/nsparse.c | 2 +- trunk/drivers/acpi/acpica/nspredef.c | 2 +- trunk/drivers/acpi/acpica/nsrepair.c | 2 +- trunk/drivers/acpi/acpica/nsrepair2.c | 2 +- trunk/drivers/acpi/acpica/nssearch.c | 2 +- trunk/drivers/acpi/acpica/nsutils.c | 2 +- trunk/drivers/acpi/acpica/nswalk.c | 2 +- trunk/drivers/acpi/acpica/nsxfeval.c | 2 +- trunk/drivers/acpi/acpica/nsxfname.c | 7 +- trunk/drivers/acpi/acpica/nsxfobj.c | 2 +- trunk/drivers/acpi/acpica/psargs.c | 2 +- trunk/drivers/acpi/acpica/psloop.c | 4 +- trunk/drivers/acpi/acpica/psopcode.c | 2 +- trunk/drivers/acpi/acpica/psparse.c | 27 +- trunk/drivers/acpi/acpica/psscope.c | 2 +- trunk/drivers/acpi/acpica/pstree.c | 2 +- trunk/drivers/acpi/acpica/psutils.c | 2 +- trunk/drivers/acpi/acpica/pswalk.c | 2 +- trunk/drivers/acpi/acpica/psxface.c | 9 +- trunk/drivers/acpi/acpica/rsaddr.c | 2 +- trunk/drivers/acpi/acpica/rscalc.c | 2 +- trunk/drivers/acpi/acpica/rscreate.c | 2 +- trunk/drivers/acpi/acpica/rsdump.c | 2 +- trunk/drivers/acpi/acpica/rsinfo.c | 2 +- trunk/drivers/acpi/acpica/rsio.c | 2 +- trunk/drivers/acpi/acpica/rsirq.c | 2 +- trunk/drivers/acpi/acpica/rslist.c | 2 +- trunk/drivers/acpi/acpica/rsmemory.c | 2 +- trunk/drivers/acpi/acpica/rsmisc.c | 2 +- trunk/drivers/acpi/acpica/rsutils.c | 2 +- trunk/drivers/acpi/acpica/rsxface.c | 2 +- trunk/drivers/acpi/acpica/tbfadt.c | 2 +- trunk/drivers/acpi/acpica/tbfind.c | 2 +- trunk/drivers/acpi/acpica/tbinstal.c | 2 +- trunk/drivers/acpi/acpica/tbutils.c | 2 +- trunk/drivers/acpi/acpica/tbxface.c | 2 +- trunk/drivers/acpi/acpica/tbxfroot.c | 2 +- trunk/drivers/acpi/acpica/utalloc.c | 2 +- trunk/drivers/acpi/acpica/utcopy.c | 2 +- trunk/drivers/acpi/acpica/utdebug.c | 2 +- trunk/drivers/acpi/acpica/utdelete.c | 2 +- trunk/drivers/acpi/acpica/uteval.c | 2 +- trunk/drivers/acpi/acpica/utglobal.c | 2 +- trunk/drivers/acpi/acpica/utids.c | 2 +- trunk/drivers/acpi/acpica/utinit.c | 2 +- trunk/drivers/acpi/acpica/utlock.c | 2 +- trunk/drivers/acpi/acpica/utmath.c | 2 +- trunk/drivers/acpi/acpica/utmisc.c | 2 +- trunk/drivers/acpi/acpica/utmutex.c | 2 +- trunk/drivers/acpi/acpica/utobject.c | 2 +- trunk/drivers/acpi/acpica/utosi.c | 2 +- trunk/drivers/acpi/acpica/utresrc.c | 2 +- trunk/drivers/acpi/acpica/utstate.c | 2 +- trunk/drivers/acpi/acpica/utxface.c | 2 +- trunk/drivers/acpi/acpica/utxferror.c | 2 +- trunk/drivers/acpi/battery.c | 1 + trunk/drivers/acpi/nvs.c | 7 +- trunk/drivers/acpi/osl.c | 12 +- trunk/drivers/acpi/sleep.c | 2 +- trunk/drivers/ata/Kconfig | 2 +- trunk/drivers/ata/ahci.c | 3 - trunk/drivers/ata/libata-core.c | 1 - trunk/drivers/ata/libata-scsi.c | 24 +- trunk/drivers/ata/pata_hpt366.c | 6 +- trunk/drivers/ata/pata_hpt37x.c | 112 +-- trunk/drivers/ata/pata_hpt3x2n.c | 12 +- trunk/drivers/ata/pata_mpc52xx.c | 2 +- trunk/drivers/atm/idt77105.c | 2 +- trunk/drivers/base/Kconfig | 2 +- trunk/drivers/base/power/runtime.c | 9 +- trunk/drivers/bluetooth/ath3k.c | 75 +- trunk/drivers/char/Kconfig | 12 +- trunk/drivers/char/Makefile | 13 + trunk/drivers/char/agp/intel-gtt.c | 19 +- trunk/drivers/char/bfin_jtag_comm.c | 8 +- trunk/drivers/{tty/hvc => char}/hvc_beat.c | 0 trunk/drivers/{tty/hvc => char}/hvc_console.c | 0 trunk/drivers/{tty/hvc => char}/hvc_console.h | 0 trunk/drivers/{tty/hvc => char}/hvc_dcc.c | 0 trunk/drivers/{tty/hvc => char}/hvc_irq.c | 0 trunk/drivers/{tty/hvc => char}/hvc_iseries.c | 0 trunk/drivers/{tty/hvc => char}/hvc_iucv.c | 0 trunk/drivers/{tty/hvc => char}/hvc_rtas.c | 0 trunk/drivers/{tty/hvc => char}/hvc_tile.c | 0 trunk/drivers/{tty/hvc => char}/hvc_udbg.c | 0 trunk/drivers/{tty/hvc => char}/hvc_vio.c | 0 trunk/drivers/{tty/hvc => char}/hvc_xen.c | 0 trunk/drivers/{tty/hvc => char}/hvcs.c | 0 trunk/drivers/{tty/hvc => char}/hvsi.c | 0 trunk/drivers/char/tpm/tpm.c | 10 +- trunk/drivers/char/tpm/tpm_tis.c | 6 +- .../{tty/hvc => char}/virtio_console.c | 0 trunk/drivers/clocksource/acpi_pm.c | 6 +- trunk/drivers/clocksource/tcb_clksrc.c | 4 +- trunk/drivers/cpufreq/Kconfig | 2 +- trunk/drivers/firewire/Kconfig | 6 +- trunk/drivers/firewire/core-card.c | 11 +- trunk/drivers/firewire/net.c | 9 +- trunk/drivers/firmware/Kconfig | 2 +- trunk/drivers/gpio/langwell_gpio.c | 9 +- trunk/drivers/gpu/drm/Kconfig | 5 +- trunk/drivers/gpu/drm/drm_fb_helper.c | 4 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 35 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 5 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 5 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 12 +- .../gpu/drm/i915/i915_gem_execbuffer.c | 2 +- trunk/drivers/gpu/drm/i915/i915_gem_gtt.c | 4 - trunk/drivers/gpu/drm/i915/i915_irq.c | 37 +- trunk/drivers/gpu/drm/i915/i915_reg.h | 6 - trunk/drivers/gpu/drm/i915/intel_display.c | 25 +- trunk/drivers/gpu/drm/i915/intel_opregion.c | 3 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 82 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.h | 4 +- trunk/drivers/gpu/drm/nouveau/Kconfig | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 15 - trunk/drivers/gpu/drm/nouveau/nouveau_drv.c | 8 +- trunk/drivers/gpu/drm/nouveau/nouveau_drv.h | 3 + trunk/drivers/gpu/drm/nouveau/nouveau_temp.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_graph.c | 3 - trunk/drivers/gpu/drm/nouveau/nv50_vm.c | 5 + trunk/drivers/gpu/drm/nouveau/nvc0_graph.c | 23 +- trunk/drivers/gpu/drm/nouveau/nvc0_grctx.c | 2 +- trunk/drivers/gpu/drm/radeon/atombios_crtc.c | 39 +- trunk/drivers/gpu/drm/radeon/atombios_dp.c | 4 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 3 - .../gpu/drm/radeon/evergreen_blit_kms.c | 39 +- trunk/drivers/gpu/drm/radeon/r100.c | 12 +- trunk/drivers/gpu/drm/radeon/r300.c | 7 +- trunk/drivers/gpu/drm/radeon/r420.c | 2 +- trunk/drivers/gpu/drm/radeon/r520.c | 4 +- trunk/drivers/gpu/drm/radeon/r600.c | 3 - trunk/drivers/gpu/drm/radeon/r600_reg.h | 6 +- .../drivers/gpu/drm/radeon/radeon_atombios.c | 14 +- trunk/drivers/gpu/drm/radeon/radeon_device.c | 10 +- trunk/drivers/gpu/drm/radeon/radeon_drv.c | 2 +- .../drivers/gpu/drm/radeon/radeon_encoders.c | 6 +- trunk/drivers/gpu/drm/radeon/radeon_irq_kms.c | 3 - trunk/drivers/gpu/drm/radeon/radeon_kms.c | 6 - trunk/drivers/gpu/drm/radeon/radeon_reg.h | 2 - trunk/drivers/gpu/drm/radeon/rs400.c | 15 +- trunk/drivers/gpu/drm/radeon/rv515.c | 10 +- trunk/drivers/gpu/vga/Kconfig | 2 +- trunk/drivers/gpu/vga/vgaarb.c | 2 +- trunk/drivers/hid/Kconfig | 64 +- trunk/drivers/hid/usbhid/Kconfig | 2 +- trunk/drivers/hwmon/applesmc.c | 1 - trunk/drivers/hwmon/asus_atk0110.c | 23 +- trunk/drivers/hwmon/lis3lv02d.c | 2 +- trunk/drivers/ide/Kconfig | 2 +- trunk/drivers/idle/intel_idle.c | 8 +- trunk/drivers/infiniband/hw/mthca/Kconfig | 2 +- trunk/drivers/infiniband/ulp/ipoib/Kconfig | 2 +- trunk/drivers/input/Kconfig | 6 +- trunk/drivers/input/keyboard/Kconfig | 14 +- trunk/drivers/input/keyboard/Makefile | 1 - trunk/drivers/input/keyboard/gpio_keys.c | 6 +- trunk/drivers/input/keyboard/tegra-kbc.c | 727 -------------- .../drivers/input/keyboard/tnetv107x-keypad.c | 5 +- trunk/drivers/input/mouse/Kconfig | 10 +- trunk/drivers/input/mouse/synaptics.c | 32 +- trunk/drivers/input/serio/Kconfig | 6 +- trunk/drivers/input/serio/ct82c710.c | 8 +- trunk/drivers/input/serio/serport.c | 24 +- trunk/drivers/input/sparse-keymap.c | 1 - trunk/drivers/input/tablet/wacom_wac.c | 27 +- trunk/drivers/input/touchscreen/Kconfig | 30 +- trunk/drivers/input/touchscreen/bu21013_ts.c | 39 +- .../drivers/input/touchscreen/tnetv107x-ts.c | 5 +- trunk/drivers/leds/leds-pwm.c | 1 - trunk/drivers/leds/ledtrig-gpio.c | 15 +- trunk/drivers/lguest/page_tables.c | 2 +- trunk/drivers/lguest/x86/core.c | 4 +- trunk/drivers/macintosh/therm_pm72.c | 4 +- trunk/drivers/media/common/saa7146_core.c | 2 +- trunk/drivers/media/common/saa7146_fops.c | 8 +- trunk/drivers/media/common/saa7146_vbi.c | 2 +- trunk/drivers/media/common/saa7146_video.c | 20 +- trunk/drivers/media/common/tuners/Kconfig | 2 +- trunk/drivers/media/common/tuners/tda8290.c | 130 ++- .../drivers/media/dvb/dvb-usb/dib0700_core.c | 6 +- trunk/drivers/media/dvb/firewire/firedtv-rc.c | 9 +- trunk/drivers/media/dvb/frontends/Kconfig | 2 +- trunk/drivers/media/dvb/frontends/af9013.c | 4 +- trunk/drivers/media/dvb/frontends/ix2505v.c | 2 +- trunk/drivers/media/dvb/frontends/mb86a20s.c | 36 +- trunk/drivers/media/dvb/ttpci/av7110_ca.c | 2 +- trunk/drivers/media/radio/Kconfig | 14 + trunk/drivers/media/radio/Makefile | 1 + trunk/drivers/media/radio/radio-aimslab.c | 1 - trunk/drivers/media/radio/radio-gemtek-pci.c | 478 ++++++++++ trunk/drivers/media/radio/radio-maxiradio.c | 4 +- trunk/drivers/media/radio/radio-wl1273.c | 2 +- .../media/radio/si470x/radio-si470x-common.c | 9 +- trunk/drivers/media/rc/ene_ir.c | 23 +- trunk/drivers/media/rc/ene_ir.h | 2 + trunk/drivers/media/rc/imon.c | 60 +- trunk/drivers/media/rc/ir-raw.c | 2 +- .../drivers/media/rc/keymaps/rc-dib0700-nec.c | 52 +- trunk/drivers/media/rc/mceusb.c | 3 +- trunk/drivers/media/rc/rc-main.c | 28 +- trunk/drivers/media/video/Kconfig | 11 +- trunk/drivers/media/video/Makefile | 1 + trunk/drivers/media/video/adv7175.c | 11 - trunk/drivers/media/video/bt8xx/bttv-cards.c | 39 + trunk/drivers/media/video/bt8xx/bttv.h | 1 + trunk/drivers/media/video/cafe_ccic.c | 11 +- trunk/drivers/media/video/cpia2/cpia2.h | 2 +- trunk/drivers/media/video/cpia2/cpia2_core.c | 65 +- trunk/drivers/media/video/cpia2/cpia2_v4l.c | 104 +- trunk/drivers/media/video/cx18/cx18-driver.c | 24 +- trunk/drivers/media/video/cx18/cx18-driver.h | 3 + trunk/drivers/media/video/cx18/cx18-streams.h | 3 +- .../drivers/media/video/cx231xx/cx231xx-dvb.c | 5 +- .../media/video/cx25840/cx25840-core.c | 22 +- trunk/drivers/media/video/davinci/vpif.c | 177 ---- trunk/drivers/media/video/davinci/vpif.h | 18 +- .../media/video/davinci/vpif_capture.c | 451 ++------- .../media/video/davinci/vpif_capture.h | 2 - .../media/video/davinci/vpif_display.c | 474 +++------- .../media/video/davinci/vpif_display.h | 2 - .../drivers/media/video/em28xx/em28xx-cards.c | 19 +- trunk/drivers/media/video/et61x251/et61x251.h | 24 + trunk/drivers/media/video/gspca/benq.c | 2 +- trunk/drivers/media/video/gspca/conex.c | 4 +- trunk/drivers/media/video/gspca/cpia1.c | 2 +- trunk/drivers/media/video/gspca/etoms.c | 4 +- trunk/drivers/media/video/gspca/finepix.c | 2 +- trunk/drivers/media/video/gspca/gl860/gl860.c | 2 +- trunk/drivers/media/video/gspca/gspca.c | 210 ++-- trunk/drivers/media/video/gspca/gspca.h | 2 + trunk/drivers/media/video/gspca/jeilinj.c | 2 +- trunk/drivers/media/video/gspca/jpeg.h | 4 +- trunk/drivers/media/video/gspca/konica.c | 2 +- .../media/video/gspca/m5602/m5602_core.c | 2 +- trunk/drivers/media/video/gspca/mars.c | 2 +- trunk/drivers/media/video/gspca/mr97310a.c | 2 +- trunk/drivers/media/video/gspca/ov519.c | 8 +- trunk/drivers/media/video/gspca/ov534.c | 29 +- trunk/drivers/media/video/gspca/ov534_9.c | 2 +- trunk/drivers/media/video/gspca/pac207.c | 2 +- trunk/drivers/media/video/gspca/pac7302.c | 4 +- trunk/drivers/media/video/gspca/pac7311.c | 4 +- trunk/drivers/media/video/gspca/sn9c2028.c | 2 +- trunk/drivers/media/video/gspca/sn9c20x.c | 2 +- trunk/drivers/media/video/gspca/sonixb.c | 270 +++--- trunk/drivers/media/video/gspca/sonixj.c | 155 ++- trunk/drivers/media/video/gspca/spca1528.c | 2 +- trunk/drivers/media/video/gspca/spca500.c | 2 +- trunk/drivers/media/video/gspca/spca501.c | 2 +- trunk/drivers/media/video/gspca/spca505.c | 2 +- trunk/drivers/media/video/gspca/spca508.c | 2 +- trunk/drivers/media/video/gspca/spca561.c | 2 +- trunk/drivers/media/video/gspca/sq905.c | 2 +- trunk/drivers/media/video/gspca/sq905c.c | 2 +- trunk/drivers/media/video/gspca/sq930x.c | 2 +- trunk/drivers/media/video/gspca/stk014.c | 2 +- trunk/drivers/media/video/gspca/stv0680.c | 2 +- .../media/video/gspca/stv06xx/stv06xx.c | 2 +- trunk/drivers/media/video/gspca/sunplus.c | 2 +- trunk/drivers/media/video/gspca/t613.c | 2 +- trunk/drivers/media/video/gspca/tv8532.c | 2 +- trunk/drivers/media/video/gspca/vc032x.c | 2 +- trunk/drivers/media/video/gspca/xirlink_cit.c | 2 +- trunk/drivers/media/video/gspca/zc3xx.c | 2 +- trunk/drivers/media/video/hdpvr/Makefile | 4 +- trunk/drivers/media/video/hdpvr/hdpvr-core.c | 10 +- trunk/drivers/media/video/hdpvr/hdpvr-i2c.c | 143 +-- trunk/drivers/media/video/hdpvr/hdpvr-video.c | 7 +- trunk/drivers/media/video/hdpvr/hdpvr.h | 5 +- trunk/drivers/media/video/ir-kbd-i2c.c | 12 +- trunk/drivers/media/video/ivtv/ivtv-i2c.c | 9 +- trunk/drivers/media/video/mt9v011.c | 54 +- trunk/drivers/media/video/mt9v011.h | 36 + trunk/drivers/media/video/ov7670.c | 74 +- .../video/pvrusb2/pvrusb2-hdw-internal.h | 2 - .../media/video/pvrusb2/pvrusb2-i2c-core.c | 62 +- .../media/video/saa7134/saa7134-cards.c | 51 +- .../drivers/media/video/saa7134/saa7134-dvb.c | 80 +- .../media/video/sn9c102/sn9c102_devtable.h | 74 +- trunk/drivers/media/video/sr030pc30.c | 10 + trunk/drivers/media/video/tda9875.c | 411 ++++++++ trunk/drivers/media/video/tlg2300/pd-video.c | 13 +- trunk/drivers/media/video/v4l2-common.c | 19 +- trunk/drivers/media/video/v4l2-ctrls.c | 34 +- trunk/drivers/media/video/v4l2-dev.c | 9 +- trunk/drivers/media/video/v4l2-device.c | 16 +- trunk/drivers/media/video/v4l2-ioctl.c | 20 +- trunk/drivers/media/video/w9966.c | 1 - trunk/drivers/media/video/zoran/zoran_card.c | 2 +- trunk/drivers/mmc/host/bfin_sdh.c | 2 +- trunk/drivers/mmc/host/jz4740_mmc.c | 5 +- trunk/drivers/mmc/host/mmci.c | 109 ++- trunk/drivers/mmc/host/mmci.h | 5 +- trunk/drivers/mmc/host/msm_sdcc.c | 52 +- trunk/drivers/mmc/host/sdhci-s3c.c | 36 - trunk/drivers/mmc/host/ushc.c | 1 + trunk/drivers/mtd/ubi/build.c | 28 +- trunk/drivers/net/Kconfig | 2 +- trunk/drivers/net/arm/ks8695net.c | 2 +- trunk/drivers/net/bnx2.c | 21 +- trunk/drivers/net/bnx2.h | 1 - trunk/drivers/net/bnx2x/bnx2x.h | 4 +- trunk/drivers/net/bnx2x/bnx2x_hsi.h | 4 - trunk/drivers/net/bnx2x/bnx2x_link.c | 173 +--- trunk/drivers/net/bnx2x/bnx2x_reg.h | 4 - trunk/drivers/net/bonding/bond_3ad.c | 4 - trunk/drivers/net/bonding/bond_alb.c | 4 - trunk/drivers/net/bonding/bond_main.c | 4 - trunk/drivers/net/can/Kconfig | 2 - trunk/drivers/net/can/Makefile | 1 - trunk/drivers/net/can/at91_can.c | 138 +-- trunk/drivers/net/can/softing/Kconfig | 30 - trunk/drivers/net/can/softing/Makefile | 6 - trunk/drivers/net/can/softing/softing.h | 167 ---- trunk/drivers/net/can/softing/softing_cs.c | 359 ------- trunk/drivers/net/can/softing/softing_fw.c | 691 -------------- trunk/drivers/net/can/softing/softing_main.c | 893 ------------------ .../net/can/softing/softing_platform.h | 40 - trunk/drivers/net/cnic.c | 12 +- trunk/drivers/net/cxgb4/cxgb4_main.c | 3 +- trunk/drivers/net/gianfar.c | 2 +- trunk/drivers/net/irda/sh_irda.c | 14 +- trunk/drivers/net/ns83820.c | 5 +- trunk/drivers/net/pch_gbe/pch_gbe_main.c | 2 +- trunk/drivers/net/tg3.c | 95 +- trunk/drivers/net/tg3.h | 3 + trunk/drivers/net/usb/cdc_ncm.c | 19 +- trunk/drivers/net/usb/kaweth.c | 1 - trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 93 +- trunk/drivers/net/vmxnet3/vmxnet3_ethtool.c | 274 +++--- trunk/drivers/net/vmxnet3/vmxnet3_int.h | 7 +- trunk/drivers/net/wireless/ath/ath5k/base.c | 4 - .../net/wireless/ath/ath9k/ar9002_calib.c | 10 +- .../wireless/ath/ath9k/ar9003_2p2_initvals.h | 2 +- .../net/wireless/ath/ath9k/ar9003_hw.c | 4 +- trunk/drivers/net/wireless/ath/ath9k/htc.h | 2 +- .../net/wireless/ath/ath9k/htc_drv_txrx.c | 8 +- trunk/drivers/net/wireless/ath/ath9k/hw.c | 6 +- trunk/drivers/net/wireless/ath/ath9k/hw.h | 1 - trunk/drivers/net/wireless/ath/ath9k/main.c | 8 +- trunk/drivers/net/wireless/ath/ath9k/xmit.c | 2 + trunk/drivers/net/wireless/iwlwifi/iwl-4965.c | 1 - .../net/wireless/iwlwifi/iwl-agn-eeprom.c | 13 +- .../net/wireless/iwmc3200wifi/netdev.c | 2 - .../net/wireless/rt2x00/rt2x00firmware.c | 1 - trunk/drivers/net/wireless/rt2x00/rt73usb.c | 1 - trunk/drivers/net/wireless/rtlwifi/pci.c | 11 +- trunk/drivers/parport/share.c | 4 +- trunk/drivers/pci/pcie/Kconfig | 2 +- trunk/drivers/pcmcia/Kconfig | 12 +- trunk/drivers/platform/x86/intel_scu_ipc.c | 8 +- .../drivers/platform/x86/intel_scu_ipcutil.c | 2 +- trunk/drivers/pps/clients/pps-ktimer.c | 2 + trunk/drivers/pps/clients/pps_parport.c | 2 +- .../drivers/pps/generators/pps_gen_parport.c | 2 +- trunk/drivers/rapidio/rio-scan.c | 2 - trunk/drivers/rtc/Kconfig | 12 + trunk/drivers/rtc/interface.c | 61 +- trunk/drivers/s390/net/qeth_l2_main.c | 18 +- trunk/drivers/s390/net/qeth_l3_main.c | 22 +- trunk/drivers/{tty => }/serial/21285.c | 0 trunk/drivers/{tty => }/serial/68328serial.c | 0 trunk/drivers/{tty => }/serial/68328serial.h | 0 trunk/drivers/{tty => }/serial/68360serial.c | 0 trunk/drivers/{tty => }/serial/8250.c | 3 +- trunk/drivers/{tty => }/serial/8250.h | 0 trunk/drivers/{tty => }/serial/8250_accent.c | 0 trunk/drivers/{tty => }/serial/8250_acorn.c | 0 trunk/drivers/{tty => }/serial/8250_boca.c | 0 trunk/drivers/{tty => }/serial/8250_early.c | 0 .../{tty => }/serial/8250_exar_st16c554.c | 0 .../drivers/{tty => }/serial/8250_fourport.c | 0 trunk/drivers/{tty => }/serial/8250_gsc.c | 0 trunk/drivers/{tty => }/serial/8250_hp300.c | 0 trunk/drivers/{tty => }/serial/8250_hub6.c | 0 trunk/drivers/{tty => }/serial/8250_mca.c | 0 trunk/drivers/{tty => }/serial/8250_pci.c | 0 trunk/drivers/{tty => }/serial/8250_pnp.c | 0 trunk/drivers/{tty => }/serial/Kconfig | 5 +- trunk/drivers/{tty => }/serial/Makefile | 0 .../{tty => }/serial/altera_jtaguart.c | 0 trunk/drivers/{tty => }/serial/altera_uart.c | 0 trunk/drivers/{tty => }/serial/amba-pl010.c | 0 trunk/drivers/{tty => }/serial/amba-pl011.c | 0 trunk/drivers/{tty => }/serial/apbuart.c | 0 trunk/drivers/{tty => }/serial/apbuart.h | 0 trunk/drivers/{tty => }/serial/atmel_serial.c | 0 trunk/drivers/{tty => }/serial/bcm63xx_uart.c | 0 trunk/drivers/{tty => }/serial/bfin_5xx.c | 0 .../{tty => }/serial/bfin_sport_uart.c | 0 .../{tty => }/serial/bfin_sport_uart.h | 0 trunk/drivers/{tty => }/serial/clps711x.c | 0 .../{tty => }/serial/cpm_uart/Makefile | 0 .../{tty => }/serial/cpm_uart/cpm_uart.h | 0 .../{tty => }/serial/cpm_uart/cpm_uart_core.c | 0 .../{tty => }/serial/cpm_uart/cpm_uart_cpm1.c | 0 .../{tty => }/serial/cpm_uart/cpm_uart_cpm1.h | 0 .../{tty => }/serial/cpm_uart/cpm_uart_cpm2.c | 0 .../{tty => }/serial/cpm_uart/cpm_uart_cpm2.h | 0 trunk/drivers/{tty => }/serial/crisv10.c | 0 trunk/drivers/{tty => }/serial/crisv10.h | 0 trunk/drivers/{tty => }/serial/dz.c | 0 trunk/drivers/{tty => }/serial/dz.h | 0 trunk/drivers/{tty => }/serial/icom.c | 0 trunk/drivers/{tty => }/serial/icom.h | 0 trunk/drivers/{tty => }/serial/ifx6x60.c | 0 trunk/drivers/{tty => }/serial/ifx6x60.h | 0 trunk/drivers/{tty => }/serial/imx.c | 0 trunk/drivers/{tty => }/serial/ioc3_serial.c | 0 trunk/drivers/{tty => }/serial/ioc4_serial.c | 0 trunk/drivers/{tty => }/serial/ip22zilog.c | 0 trunk/drivers/{tty => }/serial/ip22zilog.h | 0 trunk/drivers/{tty => }/serial/jsm/Makefile | 0 trunk/drivers/{tty => }/serial/jsm/jsm.h | 0 .../drivers/{tty => }/serial/jsm/jsm_driver.c | 0 trunk/drivers/{tty => }/serial/jsm/jsm_neo.c | 0 trunk/drivers/{tty => }/serial/jsm/jsm_tty.c | 0 trunk/drivers/{tty => }/serial/kgdboc.c | 0 trunk/drivers/{tty => }/serial/m32r_sio.c | 0 trunk/drivers/{tty => }/serial/m32r_sio.h | 0 trunk/drivers/{tty => }/serial/m32r_sio_reg.h | 0 trunk/drivers/{tty => }/serial/max3100.c | 0 trunk/drivers/{tty => }/serial/max3107-aava.c | 0 trunk/drivers/{tty => }/serial/max3107.c | 0 trunk/drivers/{tty => }/serial/max3107.h | 0 trunk/drivers/{tty => }/serial/mcf.c | 0 trunk/drivers/{tty => }/serial/mfd.c | 0 trunk/drivers/{tty => }/serial/mpc52xx_uart.c | 0 trunk/drivers/{tty => }/serial/mpsc.c | 0 trunk/drivers/{tty => }/serial/mrst_max3110.c | 0 trunk/drivers/{tty => }/serial/mrst_max3110.h | 0 trunk/drivers/{tty => }/serial/msm_serial.c | 0 trunk/drivers/{tty => }/serial/msm_serial.h | 0 trunk/drivers/{tty => }/serial/mux.c | 0 trunk/drivers/{tty => }/serial/netx-serial.c | 0 trunk/drivers/{tty => }/serial/nwpserial.c | 0 trunk/drivers/{tty => }/serial/of_serial.c | 0 trunk/drivers/{tty => }/serial/omap-serial.c | 0 trunk/drivers/{tty => }/serial/pch_uart.c | 0 trunk/drivers/{tty => }/serial/pmac_zilog.c | 0 trunk/drivers/{tty => }/serial/pmac_zilog.h | 0 trunk/drivers/{tty => }/serial/pnx8xxx_uart.c | 0 trunk/drivers/{tty => }/serial/pxa.c | 0 trunk/drivers/{tty => }/serial/s3c2400.c | 0 trunk/drivers/{tty => }/serial/s3c2410.c | 0 trunk/drivers/{tty => }/serial/s3c2412.c | 0 trunk/drivers/{tty => }/serial/s3c2440.c | 0 trunk/drivers/{tty => }/serial/s3c24a0.c | 0 trunk/drivers/{tty => }/serial/s3c6400.c | 0 trunk/drivers/{tty => }/serial/s5pv210.c | 0 trunk/drivers/{tty => }/serial/sa1100.c | 0 trunk/drivers/{tty => }/serial/samsung.c | 0 trunk/drivers/{tty => }/serial/samsung.h | 0 trunk/drivers/{tty => }/serial/sb1250-duart.c | 2 +- trunk/drivers/{tty => }/serial/sc26xx.c | 0 trunk/drivers/{tty => }/serial/serial_core.c | 0 trunk/drivers/{tty => }/serial/serial_cs.c | 0 .../drivers/{tty => }/serial/serial_ks8695.c | 0 .../drivers/{tty => }/serial/serial_lh7a40x.c | 0 trunk/drivers/{tty => }/serial/serial_txx9.c | 0 trunk/drivers/{tty => }/serial/sh-sci.c | 0 trunk/drivers/{tty => }/serial/sh-sci.h | 0 trunk/drivers/{tty => }/serial/sn_console.c | 0 trunk/drivers/{tty => }/serial/suncore.c | 0 trunk/drivers/{tty => }/serial/suncore.h | 0 trunk/drivers/{tty => }/serial/sunhv.c | 0 trunk/drivers/{tty => }/serial/sunsab.c | 0 trunk/drivers/{tty => }/serial/sunsab.h | 0 trunk/drivers/{tty => }/serial/sunsu.c | 0 trunk/drivers/{tty => }/serial/sunzilog.c | 0 trunk/drivers/{tty => }/serial/sunzilog.h | 0 trunk/drivers/{tty => }/serial/timbuart.c | 0 trunk/drivers/{tty => }/serial/timbuart.h | 0 trunk/drivers/{tty => }/serial/uartlite.c | 0 trunk/drivers/{tty => }/serial/ucc_uart.c | 0 trunk/drivers/{tty => }/serial/vr41xx_siu.c | 0 .../drivers/{tty => }/serial/vt8500_serial.c | 0 trunk/drivers/{tty => }/serial/zs.c | 0 trunk/drivers/{tty => }/serial/zs.h | 0 trunk/drivers/sh/intc/chip.c | 6 +- trunk/drivers/ssb/Kconfig | 2 +- .../ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 4 +- .../staging/brcm80211/sys/wl_mac80211.c | 45 +- .../staging/brcm80211/sys/wlc_mac80211.c | 1 + .../drivers/staging/comedi/drivers/ni_labpc.c | 3 +- trunk/drivers/staging/hv/blkvsc_drv.c | 1 - trunk/drivers/staging/hv/netvsc.c | 2 +- trunk/drivers/staging/hv/netvsc_drv.c | 1 + trunk/drivers/staging/iio/adc/ad7476_core.c | 2 +- trunk/drivers/staging/iio/adc/ad7887_core.c | 2 +- trunk/drivers/staging/iio/adc/ad799x_core.c | 2 +- trunk/drivers/staging/iio/dac/ad5446.c | 2 +- trunk/drivers/staging/lirc/TODO.lirc_zilog | 36 +- trunk/drivers/staging/lirc/lirc_imon.c | 1 - trunk/drivers/staging/lirc/lirc_it87.c | 1 - trunk/drivers/staging/lirc/lirc_parallel.c | 19 +- trunk/drivers/staging/lirc/lirc_sasem.c | 1 - trunk/drivers/staging/lirc/lirc_serial.c | 3 +- trunk/drivers/staging/lirc/lirc_sir.c | 1 - trunk/drivers/staging/lirc/lirc_zilog.c | 650 ++++++------- trunk/drivers/staging/msm/msm_fb.c | 8 +- trunk/drivers/staging/olpc_dcon/olpc_dcon.c | 10 +- trunk/drivers/staging/rt2860/rt_main_dev.c | 2 + trunk/drivers/staging/rt2860/usb_main_dev.c | 1 - trunk/drivers/staging/rtl8712/hal_init.c | 11 +- trunk/drivers/staging/rtl8712/usb_intf.c | 145 +-- trunk/drivers/staging/sm7xx/smtcfb.c | 8 +- trunk/drivers/staging/speakup/kobjects.c | 2 +- .../staging/ste_rmi4/synaptics_i2c_rmi4.c | 19 +- .../drivers/staging/tidspbridge/core/io_sm.c | 8 +- .../staging/tidspbridge/core/tiomap3430.c | 15 +- .../tidspbridge/include/dspbridge/io_sm.h | 21 +- trunk/drivers/staging/tm6000/tm6000-video.c | 46 +- trunk/drivers/staging/usbip/stub.h | 1 - trunk/drivers/staging/usbip/stub_dev.c | 18 +- trunk/drivers/staging/usbip/stub_rx.c | 4 +- trunk/drivers/staging/usbip/vhci.h | 6 +- trunk/drivers/staging/usbip/vhci_hcd.c | 54 +- trunk/drivers/staging/usbip/vhci_rx.c | 50 +- .../staging/vme/bridges/Module.symvers | 0 trunk/drivers/staging/xgifb/vb_setmode.c | 6 +- trunk/drivers/tty/Makefile | 2 - trunk/drivers/tty/hvc/Makefile | 13 - trunk/drivers/tty/n_hdlc.c | 90 +- trunk/drivers/tty/sysrq.c | 2 +- trunk/drivers/tty/tty_io.c | 8 +- trunk/drivers/tty/vt/selection.c | 4 +- trunk/drivers/tty/vt/vc_screen.c | 16 +- trunk/drivers/tty/vt/vt.c | 135 ++- trunk/drivers/tty/vt/vt_ioctl.c | 60 +- trunk/drivers/usb/class/cdc-wdm.c | 2 +- trunk/drivers/usb/core/Kconfig | 6 +- trunk/drivers/usb/core/endpoint.c | 2 +- trunk/drivers/usb/core/hcd-pci.c | 7 +- trunk/drivers/usb/core/hub.c | 21 - trunk/drivers/usb/gadget/Kconfig | 7 +- trunk/drivers/usb/gadget/ci13xxx_udc.c | 268 +++--- trunk/drivers/usb/gadget/ci13xxx_udc.h | 9 +- trunk/drivers/usb/gadget/composite.c | 5 +- trunk/drivers/usb/gadget/pch_udc.c | 127 +-- trunk/drivers/usb/gadget/printer.c | 19 +- trunk/drivers/usb/host/ehci-fsl.c | 13 + trunk/drivers/usb/host/ehci-fsl.h | 3 + trunk/drivers/usb/host/ehci-hcd.c | 19 +- trunk/drivers/usb/host/ehci-mxc.c | 25 +- trunk/drivers/usb/host/ehci-pci.c | 33 +- trunk/drivers/usb/host/fsl-mph-dr-of.c | 11 +- trunk/drivers/usb/host/xhci-ring.c | 91 +- trunk/drivers/usb/host/xhci.c | 60 +- trunk/drivers/usb/host/xhci.h | 16 +- trunk/drivers/usb/misc/usbled.c | 2 +- trunk/drivers/usb/misc/uss720.c | 1 + trunk/drivers/usb/otg/nop-usb-xceiv.c | 2 - trunk/drivers/usb/otg/ulpi.c | 2 +- trunk/drivers/usb/serial/ch341.c | 10 - trunk/drivers/usb/serial/cp210x.c | 16 +- trunk/drivers/usb/serial/digi_acceleport.c | 10 + trunk/drivers/usb/serial/ftdi_sio.c | 12 +- trunk/drivers/usb/serial/ftdi_sio_ids.h | 22 +- trunk/drivers/usb/serial/generic.c | 20 - trunk/drivers/usb/serial/io_tables.h | 1 - trunk/drivers/usb/serial/iuu_phoenix.c | 1 - trunk/drivers/usb/serial/keyspan.h | 4 - trunk/drivers/usb/serial/keyspan_pda.c | 17 + trunk/drivers/usb/serial/moto_modem.c | 1 - trunk/drivers/usb/serial/option.c | 23 +- trunk/drivers/usb/serial/oti6858.c | 1 - trunk/drivers/usb/serial/pl2303.c | 12 - trunk/drivers/usb/serial/pl2303.h | 1 - trunk/drivers/usb/serial/qcaux.c | 3 - trunk/drivers/usb/serial/siemens_mpi.c | 1 - trunk/drivers/usb/serial/spcp8x5.c | 7 +- trunk/drivers/usb/serial/usb-serial.c | 8 +- trunk/drivers/usb/serial/usb_debug.c | 1 - trunk/drivers/usb/storage/unusual_cypress.h | 5 - trunk/drivers/usb/storage/unusual_devs.h | 18 - trunk/drivers/video/Kconfig | 2 +- trunk/drivers/video/arkfb.c | 12 +- trunk/drivers/video/aty/aty128fb.c | 12 +- trunk/drivers/video/aty/atyfb_base.c | 10 +- trunk/drivers/video/aty/radeon_pm.c | 10 +- trunk/drivers/video/backlight/88pm860x_bl.c | 4 +- trunk/drivers/video/bf537-lq035.c | 58 +- trunk/drivers/video/chipsfb.c | 8 +- trunk/drivers/video/console/Kconfig | 2 +- trunk/drivers/video/console/fbcon.c | 42 +- trunk/drivers/video/console/vgacon.c | 6 +- trunk/drivers/video/da8xx-fb.c | 11 +- trunk/drivers/video/fbmem.c | 12 +- trunk/drivers/video/fbsysfs.c | 20 +- trunk/drivers/video/geode/gxfb_core.c | 8 +- trunk/drivers/video/geode/lxfb_core.c | 8 +- trunk/drivers/video/i810/i810_main.c | 8 +- trunk/drivers/video/jz4740_fb.c | 8 +- trunk/drivers/video/mx3fb.c | 8 +- trunk/drivers/video/nuc900fb.c | 6 +- trunk/drivers/video/nvidia/nvidia.c | 8 +- trunk/drivers/video/ps3fb.c | 16 +- trunk/drivers/video/pxa168fb.c | 6 +- trunk/drivers/video/pxa3xx-gcu.c | 4 +- trunk/drivers/video/s3fb.c | 16 +- trunk/drivers/video/savage/savagefb_driver.c | 8 +- trunk/drivers/video/sh_mobile_hdmi.c | 8 +- trunk/drivers/video/sh_mobile_lcdcfb.c | 4 +- trunk/drivers/video/sm501fb.c | 8 +- trunk/drivers/video/tmiofb.c | 10 +- trunk/drivers/video/via/viafbdev.c | 8 +- trunk/drivers/video/vt8623fb.c | 12 +- trunk/drivers/video/xen-fbfront.c | 4 +- trunk/drivers/virtio/virtio_pci.c | 20 +- trunk/drivers/xen/xenfs/xenbus.c | 31 +- trunk/fs/Kconfig | 2 +- trunk/fs/ceph/caps.c | 43 +- trunk/fs/ceph/inode.c | 10 +- trunk/fs/ceph/mds_client.c | 10 +- trunk/fs/ceph/super.c | 2 - trunk/fs/ceph/xattr.c | 3 - trunk/fs/cifs/Makefile | 2 +- trunk/fs/cifs/README | 5 - trunk/fs/cifs/cifs_debug.c | 10 +- trunk/fs/cifs/cifs_dfs_ref.c | 1 + trunk/fs/cifs/cifs_fs_sb.h | 1 - trunk/fs/cifs/cifs_unicode.c | 127 +-- trunk/fs/cifs/cifsacl.c | 13 +- trunk/fs/cifs/cifsencrypt.c | 33 +- trunk/fs/cifs/cifsencrypt.h | 33 + trunk/fs/cifs/cifsfs.c | 55 +- trunk/fs/cifs/cifsfs.h | 19 +- trunk/fs/cifs/cifsglob.h | 97 +- trunk/fs/cifs/cifspdu.h | 62 +- trunk/fs/cifs/cifsproto.h | 20 +- trunk/fs/cifs/cifssmb.c | 113 +-- trunk/fs/cifs/connect.c | 211 ++--- trunk/fs/cifs/file.c | 491 ++-------- trunk/fs/cifs/inode.c | 8 +- trunk/fs/cifs/link.c | 58 +- trunk/fs/cifs/md4.c | 205 ++++ trunk/fs/cifs/md5.c | 366 +++++++ trunk/fs/cifs/md5.h | 38 + trunk/fs/cifs/misc.c | 73 +- trunk/fs/cifs/netmisc.c | 4 +- trunk/fs/cifs/sess.c | 15 +- trunk/fs/cifs/smbdes.c | 1 + trunk/fs/cifs/smbencrypt.c | 91 +- trunk/fs/cifs/transport.c | 434 +++++---- trunk/fs/dcache.c | 4 +- trunk/fs/direct-io.c | 10 +- trunk/fs/ext3/super.c | 25 +- trunk/fs/ext4/super.c | 25 +- trunk/fs/gfs2/inode.c | 72 +- trunk/fs/gfs2/inode.h | 1 + trunk/fs/gfs2/super.c | 1 - trunk/fs/lockd/host.c | 9 +- trunk/fs/nfs/callback.c | 109 ++- trunk/fs/nfs/callback.h | 4 +- trunk/fs/nfs/callback_proc.c | 12 +- trunk/fs/nfs/callback_xdr.c | 5 +- trunk/fs/nfs/client.c | 15 +- trunk/fs/nfs/delegation.c | 6 +- trunk/fs/nfs/direct.c | 34 +- trunk/fs/nfs/inode.c | 26 +- trunk/fs/nfs/internal.h | 3 +- trunk/fs/nfs/nfs3acl.c | 4 +- trunk/fs/nfs/nfs3xdr.c | 5 +- trunk/fs/nfs/nfs4filelayoutdev.c | 9 +- trunk/fs/nfs/nfs4proc.c | 30 +- trunk/fs/nfs/nfs4state.c | 6 + trunk/fs/nfs/nfs4xdr.c | 9 +- trunk/fs/nfs/pnfs.c | 2 +- trunk/fs/nfs/write.c | 2 +- trunk/fs/nfs_common/nfsacl.c | 54 +- trunk/fs/nilfs2/super.c | 3 +- trunk/fs/ntfs/mft.c | 11 +- trunk/fs/ocfs2/super.c | 5 +- trunk/fs/pipe.c | 10 +- trunk/fs/posix_acl.c | 17 +- trunk/fs/proc/Kconfig | 6 +- trunk/fs/proc/consoles.c | 4 +- trunk/fs/quota/dquot.c | 18 +- trunk/fs/quota/quota.c | 41 +- trunk/fs/reiserfs/super.c | 17 +- trunk/fs/squashfs/block.c | 8 - trunk/fs/squashfs/xz_wrapper.c | 6 + trunk/fs/squashfs/zlib_wrapper.c | 6 + trunk/fs/sysfs/Kconfig | 2 +- trunk/fs/xfs/linux-2.6/xfs_ioctl.c | 20 +- trunk/fs/xfs/quota/xfs_qm.c | 46 +- trunk/fs/xfs/xfs_alloc.h | 16 - trunk/fs/xfs/xfs_bmap.c | 61 +- trunk/fs/xfs/xfs_buf_item.c | 12 +- trunk/fs/xfs/xfs_extfree_item.c | 3 +- trunk/fs/xfs/xfs_iomap.c | 7 +- trunk/fs/xfs/xfs_log.h | 2 +- trunk/fs/xfs/xfs_log_cil.c | 15 +- trunk/fs/xfs/xfs_trans.c | 41 +- trunk/include/acpi/acexcep.h | 2 +- trunk/include/acpi/acnames.h | 2 +- trunk/include/acpi/acoutput.h | 2 +- trunk/include/acpi/acpi.h | 2 +- trunk/include/acpi/acpiosxf.h | 2 +- trunk/include/acpi/acpixf.h | 4 +- trunk/include/acpi/acrestyp.h | 2 +- trunk/include/acpi/actbl.h | 2 +- trunk/include/acpi/actbl1.h | 2 +- trunk/include/acpi/actbl2.h | 2 +- trunk/include/acpi/actypes.h | 2 +- trunk/include/acpi/platform/acenv.h | 2 +- trunk/include/acpi/platform/acgcc.h | 2 +- trunk/include/acpi/platform/aclinux.h | 2 +- trunk/include/asm-generic/vmlinux.lds.h | 7 - trunk/include/drm/radeon_drm.h | 1 - trunk/include/linux/acpi.h | 3 + trunk/include/linux/acpi_io.h | 16 - trunk/include/linux/console.h | 6 +- trunk/include/linux/gfp.h | 2 +- trunk/include/linux/ieee80211.h | 2 +- trunk/include/linux/input/bu21013.h | 4 + trunk/include/linux/irqdesc.h | 14 + trunk/include/linux/kernel.h | 34 +- trunk/include/linux/kmemcheck.h | 2 +- trunk/include/linux/lockdep.h | 11 +- trunk/include/linux/memcontrol.h | 9 - trunk/include/linux/mm.h | 2 - trunk/include/linux/mmc/sh_mmcif.h | 4 +- trunk/include/linux/module.h | 27 - trunk/include/linux/moduleparam.h | 6 +- trunk/include/linux/nfsacl.h | 4 +- trunk/include/linux/posix_acl.h | 1 - trunk/include/linux/quota.h | 5 +- trunk/include/linux/quotaops.h | 4 +- trunk/include/linux/rtc.h | 4 + trunk/include/linux/sunrpc/bc_xprt.h | 13 + trunk/include/linux/sunrpc/svc_xprt.h | 1 + trunk/include/linux/sysrq.h | 3 - trunk/include/linux/usb/hcd.h | 1 - trunk/include/linux/usb/serial.h | 3 - trunk/include/linux/virtio_config.h | 5 +- trunk/include/media/mt9v011.h | 17 - trunk/include/media/rc-core.h | 3 - trunk/include/media/saa7146.h | 2 +- trunk/include/media/v4l2-common.h | 13 +- trunk/include/media/v4l2-ctrls.h | 7 +- trunk/include/media/v4l2-subdev.h | 23 +- trunk/include/net/bluetooth/hci_core.h | 1 - trunk/include/net/sch_generic.h | 8 +- trunk/include/net/sctp/user.h | 1 - trunk/init/Kconfig | 60 +- trunk/init/main.c | 13 +- trunk/kernel/irq/Kconfig | 3 + trunk/kernel/irq/handle.c | 111 +++ trunk/kernel/lockdep.c | 18 +- trunk/kernel/params.c | 65 +- trunk/kernel/perf_event.c | 46 +- trunk/kernel/printk.c | 100 +- trunk/kernel/sched.c | 26 +- trunk/kernel/sched_autogroup.c | 32 - trunk/kernel/sched_autogroup.h | 4 - trunk/kernel/sched_debug.c | 42 +- trunk/kernel/sched_fair.c | 126 +-- trunk/kernel/smp.c | 62 +- trunk/kernel/sys.c | 3 +- trunk/kernel/sysctl.c | 3 +- trunk/kernel/time/tick-sched.c | 7 +- trunk/kernel/trace/trace_irqsoff.c | 8 + trunk/kernel/workqueue.c | 20 +- trunk/lib/Kconfig.debug | 6 +- trunk/lib/radix-tree.c | 7 +- trunk/lib/rbtree.c | 3 - trunk/lib/textsearch.c | 10 +- trunk/lib/xz/Kconfig | 12 +- trunk/mm/Kconfig | 2 +- trunk/mm/compaction.c | 11 - trunk/mm/huge_memory.c | 5 +- trunk/mm/kmemleak-test.c | 6 +- trunk/mm/kmemleak.c | 13 +- trunk/mm/memblock.c | 8 +- trunk/mm/memcontrol.c | 199 ++-- trunk/mm/migrate.c | 2 +- trunk/mm/page_alloc.c | 18 +- trunk/mm/pgtable-generic.c | 1 - trunk/mm/truncate.c | 11 +- trunk/mm/vmscan.c | 4 +- trunk/net/batman-adv/main.h | 6 +- trunk/net/batman-adv/packet.h | 14 +- trunk/net/batman-adv/types.h | 4 +- trunk/net/batman-adv/unicast.c | 6 +- trunk/net/bluetooth/hci_conn.c | 16 +- trunk/net/bluetooth/hci_core.c | 4 - trunk/net/bluetooth/hci_event.c | 9 +- trunk/net/bluetooth/l2cap.c | 84 +- trunk/net/bluetooth/rfcomm/core.c | 3 +- trunk/net/caif/cfcnfg.c | 9 +- trunk/net/can/bcm.c | 3 - trunk/net/can/raw.c | 3 - trunk/net/core/dev.c | 9 +- trunk/net/core/ethtool.c | 2 +- trunk/net/core/rtnetlink.c | 2 +- trunk/net/core/skbuff.c | 8 +- trunk/net/dcb/dcbnl.c | 13 +- trunk/net/dsa/dsa.c | 2 +- trunk/net/ipv4/arp.c | 11 +- trunk/net/ipv4/inet_diag.c | 2 +- trunk/net/ipv4/inetpeer.c | 2 +- trunk/net/ipv4/tcp_input.c | 2 +- trunk/net/ipv4/tcp_ipv4.c | 1 + trunk/net/ipv6/addrconf.c | 84 +- trunk/net/ipv6/route.c | 9 +- trunk/net/ipv6/xfrm6_policy.c | 6 - trunk/net/mac80211/Kconfig | 6 +- trunk/net/mac80211/agg-rx.c | 11 +- trunk/net/mac80211/main.c | 12 +- trunk/net/mac80211/tx.c | 3 - trunk/net/netfilter/nf_conntrack_netlink.c | 4 +- trunk/net/netlink/genetlink.c | 2 +- trunk/net/rfkill/Kconfig | 4 +- trunk/net/sched/sch_cbq.c | 3 +- trunk/net/sched/sch_drr.c | 2 +- trunk/net/sched/sch_dsmark.c | 2 +- trunk/net/sched/sch_fifo.c | 5 +- trunk/net/sched/sch_hfsc.c | 2 +- trunk/net/sched/sch_htb.c | 12 +- trunk/net/sched/sch_multiq.c | 2 +- trunk/net/sched/sch_netem.c | 3 +- trunk/net/sched/sch_prio.c | 2 +- trunk/net/sched/sch_red.c | 11 +- trunk/net/sched/sch_sfq.c | 5 +- trunk/net/sched/sch_tbf.c | 2 +- trunk/net/sched/sch_teql.c | 3 +- trunk/net/sctp/socket.c | 4 +- trunk/net/sunrpc/svcsock.c | 4 +- trunk/net/wireless/Kconfig | 2 +- trunk/net/xfrm/xfrm_user.c | 2 +- trunk/security/keys/Makefile | 4 +- trunk/security/keys/compat.c | 17 +- .../keys/{encrypted.c => encrypted_defined.c} | 2 +- .../keys/{encrypted.h => encrypted_defined.h} | 0 trunk/security/keys/gc.c | 14 +- trunk/security/keys/internal.h | 32 +- trunk/security/keys/key.c | 328 +++---- trunk/security/keys/keyctl.c | 355 +++---- trunk/security/keys/keyring.c | 326 +++---- trunk/security/keys/permission.c | 33 +- trunk/security/keys/proc.c | 17 +- trunk/security/keys/process_keys.c | 135 ++- trunk/security/keys/request_key.c | 166 +--- trunk/security/keys/request_key_auth.c | 62 +- .../keys/{trusted.c => trusted_defined.c} | 54 +- .../keys/{trusted.h => trusted_defined.h} | 0 trunk/security/keys/user_defined.c | 32 +- trunk/security/selinux/ss/conditional.c | 2 +- trunk/security/selinux/ss/policydb.c | 4 +- trunk/sound/arm/aaci.c | 56 +- trunk/sound/atmel/ac97c.c | 5 +- trunk/sound/pci/azt3328.c | 38 +- trunk/sound/pci/hda/hda_eld.c | 2 +- trunk/sound/pci/hda/patch_realtek.c | 30 +- trunk/sound/pci/ice1712/delta.c | 7 - trunk/sound/pci/oxygen/xonar_cs43xx.c | 2 +- trunk/sound/soc/atmel/snd-soc-afeb9260.c | 2 +- trunk/sound/soc/blackfin/Kconfig | 11 +- trunk/sound/soc/blackfin/bf5xx-ac97.c | 4 +- trunk/sound/soc/blackfin/bf5xx-ssm2602.c | 2 +- trunk/sound/soc/blackfin/bf5xx-tdm.c | 10 +- trunk/sound/soc/codecs/wm8994.c | 2 +- trunk/sound/soc/codecs/wm8995.c | 2 +- trunk/sound/soc/codecs/wm_hubs.c | 15 +- trunk/sound/soc/davinci/davinci-evm.c | 2 +- trunk/sound/soc/pxa/corgi.c | 4 +- trunk/sound/soc/pxa/poodle.c | 2 +- trunk/sound/soc/pxa/spitz.c | 4 +- trunk/sound/soc/pxa/z2.c | 3 +- .../sound/soc/samsung/neo1973_gta02_wm8753.c | 6 +- trunk/sound/soc/samsung/neo1973_wm8753.c | 6 +- .../sound/soc/samsung/s3c24xx_simtec_hermes.c | 4 +- .../soc/samsung/s3c24xx_simtec_tlv320aic23.c | 4 +- trunk/sound/soc/samsung/s3c24xx_uda134x.c | 2 +- trunk/tools/perf/Makefile | 9 +- trunk/tools/perf/builtin-annotate.c | 6 +- trunk/tools/perf/builtin-kmem.c | 4 +- trunk/tools/perf/builtin-lock.c | 6 +- trunk/tools/perf/builtin-record.c | 2 +- trunk/tools/perf/builtin-report.c | 2 +- trunk/tools/perf/builtin-sched.c | 20 +- trunk/tools/perf/builtin-script.c | 6 +- trunk/tools/perf/builtin-stat.c | 4 +- trunk/tools/perf/builtin-test.c | 54 +- trunk/tools/perf/builtin-top.c | 9 +- trunk/tools/perf/util/event.c | 5 +- trunk/tools/perf/util/header.c | 4 +- trunk/tools/perf/util/hist.c | 17 +- trunk/tools/perf/util/include/linux/bitops.h | 1 - trunk/tools/perf/util/map.c | 3 +- trunk/tools/perf/util/parse-events.c | 2 +- trunk/tools/perf/util/parse-events.h | 2 +- trunk/tools/perf/util/probe-event.c | 2 +- trunk/tools/perf/util/session.c | 28 +- trunk/tools/perf/util/svghelper.c | 9 +- trunk/tools/perf/util/symbol.c | 16 +- trunk/tools/perf/util/types.h | 10 +- trunk/tools/perf/util/ui/browsers/hists.c | 2 +- trunk/tools/perf/util/ui/browsers/map.c | 5 +- trunk/tools/perf/util/values.c | 10 +- trunk/usr/Kconfig | 18 +- 1428 files changed, 10184 insertions(+), 14407 deletions(-) delete mode 100644 trunk/Documentation/ABI/testing/sysfs-platform-at91 delete mode 100644 trunk/arch/arm/mach-tegra/include/mach/kbc.h create mode 100644 trunk/arch/x86/include/asm/system_64.h rename trunk/drivers/{tty/hvc => char}/hvc_beat.c (100%) rename trunk/drivers/{tty/hvc => char}/hvc_console.c (100%) rename trunk/drivers/{tty/hvc => char}/hvc_console.h (100%) rename trunk/drivers/{tty/hvc => char}/hvc_dcc.c (100%) rename trunk/drivers/{tty/hvc => char}/hvc_irq.c (100%) rename trunk/drivers/{tty/hvc => char}/hvc_iseries.c (100%) rename trunk/drivers/{tty/hvc => char}/hvc_iucv.c (100%) rename trunk/drivers/{tty/hvc => char}/hvc_rtas.c (100%) rename trunk/drivers/{tty/hvc => char}/hvc_tile.c (100%) rename trunk/drivers/{tty/hvc => char}/hvc_udbg.c (100%) rename trunk/drivers/{tty/hvc => char}/hvc_vio.c (100%) rename trunk/drivers/{tty/hvc => char}/hvc_xen.c (100%) rename trunk/drivers/{tty/hvc => char}/hvcs.c (100%) rename trunk/drivers/{tty/hvc => char}/hvsi.c (100%) rename trunk/drivers/{tty/hvc => char}/virtio_console.c (100%) delete mode 100644 trunk/drivers/input/keyboard/tegra-kbc.c create mode 100644 trunk/drivers/media/radio/radio-gemtek-pci.c create mode 100644 trunk/drivers/media/video/mt9v011.h create mode 100644 trunk/drivers/media/video/tda9875.c delete mode 100644 trunk/drivers/net/can/softing/Kconfig delete mode 100644 trunk/drivers/net/can/softing/Makefile delete mode 100644 trunk/drivers/net/can/softing/softing.h delete mode 100644 trunk/drivers/net/can/softing/softing_cs.c delete mode 100644 trunk/drivers/net/can/softing/softing_fw.c delete mode 100644 trunk/drivers/net/can/softing/softing_main.c delete mode 100644 trunk/drivers/net/can/softing/softing_platform.h rename trunk/drivers/{tty => }/serial/21285.c (100%) rename trunk/drivers/{tty => }/serial/68328serial.c (100%) rename trunk/drivers/{tty => }/serial/68328serial.h (100%) rename trunk/drivers/{tty => }/serial/68360serial.c (100%) rename trunk/drivers/{tty => }/serial/8250.c (99%) rename trunk/drivers/{tty => }/serial/8250.h (100%) rename trunk/drivers/{tty => }/serial/8250_accent.c (100%) rename trunk/drivers/{tty => }/serial/8250_acorn.c (100%) rename trunk/drivers/{tty => }/serial/8250_boca.c (100%) rename trunk/drivers/{tty => }/serial/8250_early.c (100%) rename trunk/drivers/{tty => }/serial/8250_exar_st16c554.c (100%) rename trunk/drivers/{tty => }/serial/8250_fourport.c (100%) rename trunk/drivers/{tty => }/serial/8250_gsc.c (100%) rename trunk/drivers/{tty => }/serial/8250_hp300.c (100%) rename trunk/drivers/{tty => }/serial/8250_hub6.c (100%) rename trunk/drivers/{tty => }/serial/8250_mca.c (100%) rename trunk/drivers/{tty => }/serial/8250_pci.c (100%) rename trunk/drivers/{tty => }/serial/8250_pnp.c (100%) rename trunk/drivers/{tty => }/serial/Kconfig (99%) rename trunk/drivers/{tty => }/serial/Makefile (100%) rename trunk/drivers/{tty => }/serial/altera_jtaguart.c (100%) rename trunk/drivers/{tty => }/serial/altera_uart.c (100%) rename trunk/drivers/{tty => }/serial/amba-pl010.c (100%) rename trunk/drivers/{tty => }/serial/amba-pl011.c (100%) rename trunk/drivers/{tty => }/serial/apbuart.c (100%) rename trunk/drivers/{tty => }/serial/apbuart.h (100%) rename trunk/drivers/{tty => }/serial/atmel_serial.c (100%) rename trunk/drivers/{tty => }/serial/bcm63xx_uart.c (100%) rename trunk/drivers/{tty => }/serial/bfin_5xx.c (100%) rename trunk/drivers/{tty => }/serial/bfin_sport_uart.c (100%) rename trunk/drivers/{tty => }/serial/bfin_sport_uart.h (100%) rename trunk/drivers/{tty => }/serial/clps711x.c (100%) rename trunk/drivers/{tty => }/serial/cpm_uart/Makefile (100%) rename trunk/drivers/{tty => }/serial/cpm_uart/cpm_uart.h (100%) rename trunk/drivers/{tty => }/serial/cpm_uart/cpm_uart_core.c (100%) rename trunk/drivers/{tty => }/serial/cpm_uart/cpm_uart_cpm1.c (100%) rename trunk/drivers/{tty => }/serial/cpm_uart/cpm_uart_cpm1.h (100%) rename trunk/drivers/{tty => }/serial/cpm_uart/cpm_uart_cpm2.c (100%) rename trunk/drivers/{tty => }/serial/cpm_uart/cpm_uart_cpm2.h (100%) rename trunk/drivers/{tty => }/serial/crisv10.c (100%) rename trunk/drivers/{tty => }/serial/crisv10.h (100%) rename trunk/drivers/{tty => }/serial/dz.c (100%) rename trunk/drivers/{tty => }/serial/dz.h (100%) rename trunk/drivers/{tty => }/serial/icom.c (100%) rename trunk/drivers/{tty => }/serial/icom.h (100%) rename trunk/drivers/{tty => }/serial/ifx6x60.c (100%) rename trunk/drivers/{tty => }/serial/ifx6x60.h (100%) rename trunk/drivers/{tty => }/serial/imx.c (100%) rename trunk/drivers/{tty => }/serial/ioc3_serial.c (100%) rename trunk/drivers/{tty => }/serial/ioc4_serial.c (100%) rename trunk/drivers/{tty => }/serial/ip22zilog.c (100%) rename trunk/drivers/{tty => }/serial/ip22zilog.h (100%) rename trunk/drivers/{tty => }/serial/jsm/Makefile (100%) rename trunk/drivers/{tty => }/serial/jsm/jsm.h (100%) rename trunk/drivers/{tty => }/serial/jsm/jsm_driver.c (100%) rename trunk/drivers/{tty => }/serial/jsm/jsm_neo.c (100%) rename trunk/drivers/{tty => }/serial/jsm/jsm_tty.c (100%) rename trunk/drivers/{tty => }/serial/kgdboc.c (100%) rename trunk/drivers/{tty => }/serial/m32r_sio.c (100%) rename trunk/drivers/{tty => }/serial/m32r_sio.h (100%) rename trunk/drivers/{tty => }/serial/m32r_sio_reg.h (100%) rename trunk/drivers/{tty => }/serial/max3100.c (100%) rename trunk/drivers/{tty => }/serial/max3107-aava.c (100%) rename trunk/drivers/{tty => }/serial/max3107.c (100%) rename trunk/drivers/{tty => }/serial/max3107.h (100%) rename trunk/drivers/{tty => }/serial/mcf.c (100%) rename trunk/drivers/{tty => }/serial/mfd.c (100%) rename trunk/drivers/{tty => }/serial/mpc52xx_uart.c (100%) rename trunk/drivers/{tty => }/serial/mpsc.c (100%) rename trunk/drivers/{tty => }/serial/mrst_max3110.c (100%) rename trunk/drivers/{tty => }/serial/mrst_max3110.h (100%) rename trunk/drivers/{tty => }/serial/msm_serial.c (100%) rename trunk/drivers/{tty => }/serial/msm_serial.h (100%) rename trunk/drivers/{tty => }/serial/mux.c (100%) rename trunk/drivers/{tty => }/serial/netx-serial.c (100%) rename trunk/drivers/{tty => }/serial/nwpserial.c (100%) rename trunk/drivers/{tty => }/serial/of_serial.c (100%) rename trunk/drivers/{tty => }/serial/omap-serial.c (100%) rename trunk/drivers/{tty => }/serial/pch_uart.c (100%) rename trunk/drivers/{tty => }/serial/pmac_zilog.c (100%) rename trunk/drivers/{tty => }/serial/pmac_zilog.h (100%) rename trunk/drivers/{tty => }/serial/pnx8xxx_uart.c (100%) rename trunk/drivers/{tty => }/serial/pxa.c (100%) rename trunk/drivers/{tty => }/serial/s3c2400.c (100%) rename trunk/drivers/{tty => }/serial/s3c2410.c (100%) rename trunk/drivers/{tty => }/serial/s3c2412.c (100%) rename trunk/drivers/{tty => }/serial/s3c2440.c (100%) rename trunk/drivers/{tty => }/serial/s3c24a0.c (100%) rename trunk/drivers/{tty => }/serial/s3c6400.c (100%) rename trunk/drivers/{tty => }/serial/s5pv210.c (100%) rename trunk/drivers/{tty => }/serial/sa1100.c (100%) rename trunk/drivers/{tty => }/serial/samsung.c (100%) rename trunk/drivers/{tty => }/serial/samsung.h (100%) rename trunk/drivers/{tty => }/serial/sb1250-duart.c (99%) rename trunk/drivers/{tty => }/serial/sc26xx.c (100%) rename trunk/drivers/{tty => }/serial/serial_core.c (100%) rename trunk/drivers/{tty => }/serial/serial_cs.c (100%) rename trunk/drivers/{tty => }/serial/serial_ks8695.c (100%) rename trunk/drivers/{tty => }/serial/serial_lh7a40x.c (100%) rename trunk/drivers/{tty => }/serial/serial_txx9.c (100%) rename trunk/drivers/{tty => }/serial/sh-sci.c (100%) rename trunk/drivers/{tty => }/serial/sh-sci.h (100%) rename trunk/drivers/{tty => }/serial/sn_console.c (100%) rename trunk/drivers/{tty => }/serial/suncore.c (100%) rename trunk/drivers/{tty => }/serial/suncore.h (100%) rename trunk/drivers/{tty => }/serial/sunhv.c (100%) rename trunk/drivers/{tty => }/serial/sunsab.c (100%) rename trunk/drivers/{tty => }/serial/sunsab.h (100%) rename trunk/drivers/{tty => }/serial/sunsu.c (100%) rename trunk/drivers/{tty => }/serial/sunzilog.c (100%) rename trunk/drivers/{tty => }/serial/sunzilog.h (100%) rename trunk/drivers/{tty => }/serial/timbuart.c (100%) rename trunk/drivers/{tty => }/serial/timbuart.h (100%) rename trunk/drivers/{tty => }/serial/uartlite.c (100%) rename trunk/drivers/{tty => }/serial/ucc_uart.c (100%) rename trunk/drivers/{tty => }/serial/vr41xx_siu.c (100%) rename trunk/drivers/{tty => }/serial/vt8500_serial.c (100%) rename trunk/drivers/{tty => }/serial/zs.c (100%) rename trunk/drivers/{tty => }/serial/zs.h (100%) create mode 100644 trunk/drivers/staging/vme/bridges/Module.symvers delete mode 100644 trunk/drivers/tty/hvc/Makefile create mode 100644 trunk/fs/cifs/cifsencrypt.h create mode 100644 trunk/fs/cifs/md4.c create mode 100644 trunk/fs/cifs/md5.c create mode 100644 trunk/fs/cifs/md5.h delete mode 100644 trunk/include/linux/acpi_io.h delete mode 100644 trunk/include/media/mt9v011.h rename trunk/security/keys/{encrypted.c => encrypted_defined.c} (99%) rename trunk/security/keys/{encrypted.h => encrypted_defined.h} (100%) rename trunk/security/keys/{trusted.c => trusted_defined.c} (98%) rename trunk/security/keys/{trusted.h => trusted_defined.h} (100%) diff --git a/[refs] b/[refs] index c35dde38b60e..da027b61d174 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c289385b84d136089b8a1149321ebffa5193595 +refs/heads/master: 13be9f00c33fe69112fe6c755d6a8f3e249abbb2 diff --git a/trunk/.mailmap b/trunk/.mailmap index 1eba28acab64..581fd39193a2 100644 --- a/trunk/.mailmap +++ b/trunk/.mailmap @@ -23,7 +23,6 @@ Andy Adamson Arnaud Patard Arnd Bergmann Axel Dyks -Axel Lin Ben Gardner Ben M Cahill Björn Steinbrink diff --git a/trunk/Documentation/ABI/testing/sysfs-platform-at91 b/trunk/Documentation/ABI/testing/sysfs-platform-at91 deleted file mode 100644 index 4cc6a865ae66..000000000000 --- a/trunk/Documentation/ABI/testing/sysfs-platform-at91 +++ /dev/null @@ -1,25 +0,0 @@ -What: /sys/devices/platform/at91_can/net//mb0_id -Date: January 2011 -KernelVersion: 2.6.38 -Contact: Marc Kleine-Budde -Description: - Value representing the can_id of mailbox 0. - - Default: 0x7ff (standard frame) - - Due to a chip bug (errata 50.2.6.3 & 50.3.5.3 in - "AT91SAM9263 Preliminary 6249H-ATARM-27-Jul-09") the - contents of mailbox 0 may be send under certain - conditions (even if disabled or in rx mode). - - The workaround in the errata suggests not to use the - mailbox and load it with an unused identifier. - - In order to use an extended can_id add the - CAN_EFF_FLAG (0x80000000U) to the can_id. Example: - - - standard id 0x7ff: - echo 0x7ff > /sys/class/net/can0/mb0_id - - - extended id 0x1fffffff: - echo 0x9fffffff > /sys/class/net/can0/mb0_id diff --git a/trunk/Documentation/DocBook/device-drivers.tmpl b/trunk/Documentation/DocBook/device-drivers.tmpl index 36f63d4a0a06..35447e081736 100644 --- a/trunk/Documentation/DocBook/device-drivers.tmpl +++ b/trunk/Documentation/DocBook/device-drivers.tmpl @@ -217,8 +217,8 @@ X!Isound/sound_firmware.c 16x50 UART Driver !Iinclude/linux/serial_core.h -!Edrivers/tty/serial/serial_core.c -!Edrivers/tty/serial/8250.c +!Edrivers/serial/serial_core.c +!Edrivers/serial/8250.c diff --git a/trunk/Documentation/DocBook/dvb/dvbapi.xml b/trunk/Documentation/DocBook/dvb/dvbapi.xml index ad8678d48916..e3a97fdd62a6 100644 --- a/trunk/Documentation/DocBook/dvb/dvbapi.xml +++ b/trunk/Documentation/DocBook/dvb/dvbapi.xml @@ -28,7 +28,7 @@ Convergence GmbH - 2009-2011 + 2009-2010 Mauro Carvalho Chehab diff --git a/trunk/Documentation/DocBook/media.tmpl b/trunk/Documentation/DocBook/media.tmpl index a99088aae1aa..f11048d4053f 100644 --- a/trunk/Documentation/DocBook/media.tmpl +++ b/trunk/Documentation/DocBook/media.tmpl @@ -28,7 +28,7 @@ LINUX MEDIA INFRASTRUCTURE API - 2009-2011 + 2009-2010 LinuxTV Developers @@ -86,7 +86,7 @@ Foundation. A copy of the license is included in the chapter entitled - 2009-2011 + 2009-2010 Mauro Carvalho Chehab diff --git a/trunk/Documentation/DocBook/v4l/dev-rds.xml b/trunk/Documentation/DocBook/v4l/dev-rds.xml index 2427f54397e7..360d2737e649 100644 --- a/trunk/Documentation/DocBook/v4l/dev-rds.xml +++ b/trunk/Documentation/DocBook/v4l/dev-rds.xml @@ -75,7 +75,6 @@ as follows:
- RDS datastructures struct <structname>v4l2_rds_data</structname> @@ -130,11 +129,10 @@ as follows:
Block defines - + - - + V4L2_RDS_BLOCK_MSK diff --git a/trunk/Documentation/DocBook/v4l/v4l2.xml b/trunk/Documentation/DocBook/v4l/v4l2.xml index 9288af96de34..839e93e875ae 100644 --- a/trunk/Documentation/DocBook/v4l/v4l2.xml +++ b/trunk/Documentation/DocBook/v4l/v4l2.xml @@ -100,7 +100,6 @@ Remote Controller chapter. 2008 2009 2010 - 2011 Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab @@ -382,7 +381,7 @@ and discussions on the V4L mailing list. Video for Linux Two API Specification - Revision 2.6.38 + Revision 2.6.33 &sub-common; diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index b959659c5df4..8c594c45b6a1 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -357,6 +357,14 @@ Who: Dave Jones , Matthew Garrett ----------------------------- +What: __do_IRQ all in one fits nothing interrupt handler +When: 2.6.32 +Why: __do_IRQ was kept for easy migration to the type flow handlers. + More than two years of migration time is enough. +Who: Thomas Gleixner + +----------------------------- + What: fakephp and associated sysfs files in /sys/bus/pci/slots/ When: 2011 Why: In 2.6.27, the semantics of /sys/bus/pci/slots was redefined to diff --git a/trunk/Documentation/filesystems/ntfs.txt b/trunk/Documentation/filesystems/ntfs.txt index 933bc66ccff1..6ef8cf3bc9a3 100644 --- a/trunk/Documentation/filesystems/ntfs.txt +++ b/trunk/Documentation/filesystems/ntfs.txt @@ -460,8 +460,6 @@ Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog. 2.1.30: - Fix writev() (it kept writing the first segment over and over again instead of moving onto subsequent segments). - - Fix crash in ntfs_mft_record_alloc() when mapping the new extent mft - record failed. 2.1.29: - Fix a deadlock when mounting read-write. 2.1.28: diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 89835a4766a6..b72e071a3e5b 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -43,11 +43,11 @@ parameter is applicable: AVR32 AVR32 architecture is enabled. AX25 Appropriate AX.25 support is enabled. BLACKFIN Blackfin architecture is enabled. - DRM Direct Rendering Management support is enabled. - DYNAMIC_DEBUG Build in debug messages and enable them at runtime EDD BIOS Enhanced Disk Drive Services (EDD) is enabled EFI EFI Partitioning (GPT) is enabled EIDE EIDE/ATAPI support is enabled. + DRM Direct Rendering Management support is enabled. + DYNAMIC_DEBUG Build in debug messages and enable them at runtime FB The frame buffer device is enabled. GCOV GCOV profiling is enabled. HW Appropriate hardware is enabled. diff --git a/trunk/Documentation/lguest/lguest.c b/trunk/Documentation/lguest/lguest.c index d9da7e148538..dc73bc54cc4e 100644 --- a/trunk/Documentation/lguest/lguest.c +++ b/trunk/Documentation/lguest/lguest.c @@ -39,9 +39,6 @@ #include #include #include -#include -#include - #include #include #include @@ -301,27 +298,20 @@ static void *map_zeroed_pages(unsigned int num) /* * We use a private mapping (ie. if we write to the page, it will be - * copied). We allocate an extra two pages PROT_NONE to act as guard - * pages against read/write attempts that exceed allocated space. + * copied). */ - addr = mmap(NULL, getpagesize() * (num+2), - PROT_NONE, MAP_PRIVATE, fd, 0); - + addr = mmap(NULL, getpagesize() * num, + PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE, fd, 0); if (addr == MAP_FAILED) err(1, "Mmapping %u pages of /dev/zero", num); - if (mprotect(addr + getpagesize(), getpagesize() * num, - PROT_READ|PROT_WRITE) == -1) - err(1, "mprotect rw %u pages failed", num); - /* * One neat mmap feature is that you can close the fd, and it * stays mapped. */ close(fd); - /* Return address after PROT_NONE page */ - return addr + getpagesize(); + return addr; } /* Get some more pages for a device. */ @@ -353,7 +343,7 @@ static void map_at(int fd, void *addr, unsigned long offset, unsigned long len) * done to it. This allows us to share untouched memory between * Guests. */ - if (mmap(addr, len, PROT_READ|PROT_WRITE, + if (mmap(addr, len, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_FIXED|MAP_PRIVATE, fd, offset) != MAP_FAILED) return; @@ -583,10 +573,10 @@ static void *_check_pointer(unsigned long addr, unsigned int size, unsigned int line) { /* - * Check if the requested address and size exceeds the allocated memory, - * or addr + size wraps around. + * We have to separately check addr and addr+size, because size could + * be huge and addr + size might wrap around. */ - if ((addr + size) > guest_limit || (addr + size) < addr) + if (addr >= guest_limit || addr + size >= guest_limit) errx(1, "%s:%i: Invalid address %#lx", __FILE__, line, addr); /* * We return a pointer for the caller's convenience, now we know it's @@ -1882,8 +1872,6 @@ static struct option opts[] = { { "block", 1, NULL, 'b' }, { "rng", 0, NULL, 'r' }, { "initrd", 1, NULL, 'i' }, - { "username", 1, NULL, 'u' }, - { "chroot", 1, NULL, 'c' }, { NULL }, }; static void usage(void) @@ -1906,12 +1894,6 @@ int main(int argc, char *argv[]) /* If they specify an initrd file to load. */ const char *initrd_name = NULL; - /* Password structure for initgroups/setres[gu]id */ - struct passwd *user_details = NULL; - - /* Directory to chroot to */ - char *chroot_path = NULL; - /* Save the args: we "reboot" by execing ourselves again. */ main_args = argv; @@ -1968,14 +1950,6 @@ int main(int argc, char *argv[]) case 'i': initrd_name = optarg; break; - case 'u': - user_details = getpwnam(optarg); - if (!user_details) - err(1, "getpwnam failed, incorrect username?"); - break; - case 'c': - chroot_path = optarg; - break; default: warnx("Unknown argument %s", argv[optind]); usage(); @@ -2047,37 +2021,6 @@ int main(int argc, char *argv[]) /* If we exit via err(), this kills all the threads, restores tty. */ atexit(cleanup_devices); - /* If requested, chroot to a directory */ - if (chroot_path) { - if (chroot(chroot_path) != 0) - err(1, "chroot(\"%s\") failed", chroot_path); - - if (chdir("/") != 0) - err(1, "chdir(\"/\") failed"); - - verbose("chroot done\n"); - } - - /* If requested, drop privileges */ - if (user_details) { - uid_t u; - gid_t g; - - u = user_details->pw_uid; - g = user_details->pw_gid; - - if (initgroups(user_details->pw_name, g) != 0) - err(1, "initgroups failed"); - - if (setresgid(g, g, g) != 0) - err(1, "setresgid failed"); - - if (setresuid(u, u, u) != 0) - err(1, "setresuid failed"); - - verbose("Dropping privileges completed\n"); - } - /* Finally, run the Guest. This doesn't return. */ run_guest(); } diff --git a/trunk/Documentation/lguest/lguest.txt b/trunk/Documentation/lguest/lguest.txt index dad99978a6a8..6ccaf8e1a00e 100644 --- a/trunk/Documentation/lguest/lguest.txt +++ b/trunk/Documentation/lguest/lguest.txt @@ -117,11 +117,6 @@ Running Lguest: for general information on how to get bridging to work. -- Random number generation. Using the --rng option will provide a - /dev/hwrng in the guest that will read from the host's /dev/random. - Use this option in conjunction with rng-tools (see ../hw_random.txt) - to provide entropy to the guest kernel's /dev/random. - There is a helpful mailing list at http://ozlabs.org/mailman/listinfo/lguest Good luck! diff --git a/trunk/Documentation/networking/bonding.txt b/trunk/Documentation/networking/bonding.txt index 25d2f4141d27..5dc638791d97 100644 --- a/trunk/Documentation/networking/bonding.txt +++ b/trunk/Documentation/networking/bonding.txt @@ -49,8 +49,7 @@ Table of Contents 3.3 Configuring Bonding Manually with Ifenslave 3.3.1 Configuring Multiple Bonds Manually 3.4 Configuring Bonding Manually via Sysfs -3.5 Configuration with Interfaces Support -3.6 Overriding Configuration for Special Cases +3.5 Overriding Configuration for Special Cases 4. Querying Bonding Configuration 4.1 Bonding Configuration @@ -162,8 +161,8 @@ onwards) do not have /usr/include/linux symbolically linked to the default kernel source include directory. SECOND IMPORTANT NOTE: - If you plan to configure bonding using sysfs or using the -/etc/network/interfaces file, you do not need to use ifenslave. + If you plan to configure bonding using sysfs, you do not need +to use ifenslave. 2. Bonding Driver Options ========================= @@ -780,26 +779,22 @@ resend_igmp You can configure bonding using either your distro's network initialization scripts, or manually using either ifenslave or the -sysfs interface. Distros generally use one of three packages for the -network initialization scripts: initscripts, sysconfig or interfaces. -Recent versions of these packages have support for bonding, while older +sysfs interface. Distros generally use one of two packages for the +network initialization scripts: initscripts or sysconfig. Recent +versions of these packages have support for bonding, while older versions do not. We will first describe the options for configuring bonding for -distros using versions of initscripts, sysconfig and interfaces with full -or partial support for bonding, then provide information on enabling +distros using versions of initscripts and sysconfig with full or +partial support for bonding, then provide information on enabling bonding without support from the network initialization scripts (i.e., older versions of initscripts or sysconfig). - If you're unsure whether your distro uses sysconfig, -initscripts or interfaces, or don't know if it's new enough, have no fear. + If you're unsure whether your distro uses sysconfig or +initscripts, or don't know if it's new enough, have no fear. Determining this is fairly straightforward. - First, look for a file called interfaces in /etc/network directory. -If this file is present in your system, then your system use interfaces. See -Configuration with Interfaces Support. - - Else, issue the command: + First, issue the command: $ rpm -qf /sbin/ifup @@ -1332,62 +1327,8 @@ echo 2000 > /sys/class/net/bond1/bonding/arp_interval echo +eth2 > /sys/class/net/bond1/bonding/slaves echo +eth3 > /sys/class/net/bond1/bonding/slaves -3.5 Configuration with Interfaces Support ------------------------------------------ - - This section applies to distros which use /etc/network/interfaces file -to describe network interface configuration, most notably Debian and it's -derivatives. - - The ifup and ifdown commands on Debian don't support bonding out of -the box. The ifenslave-2.6 package should be installed to provide bonding -support. Once installed, this package will provide bond-* options to be used -into /etc/network/interfaces. - - Note that ifenslave-2.6 package will load the bonding module and use -the ifenslave command when appropriate. - -Example Configurations ----------------------- - -In /etc/network/interfaces, the following stanza will configure bond0, in -active-backup mode, with eth0 and eth1 as slaves. - -auto bond0 -iface bond0 inet dhcp - bond-slaves eth0 eth1 - bond-mode active-backup - bond-miimon 100 - bond-primary eth0 eth1 - -If the above configuration doesn't work, you might have a system using -upstart for system startup. This is most notably true for recent -Ubuntu versions. The following stanza in /etc/network/interfaces will -produce the same result on those systems. - -auto bond0 -iface bond0 inet dhcp - bond-slaves none - bond-mode active-backup - bond-miimon 100 - -auto eth0 -iface eth0 inet manual - bond-master bond0 - bond-primary eth0 eth1 - -auto eth1 -iface eth1 inet manual - bond-master bond0 - bond-primary eth0 eth1 - -For a full list of bond-* supported options in /etc/network/interfaces and some -more advanced examples tailored to you particular distros, see the files in -/usr/share/doc/ifenslave-2.6. - -3.6 Overriding Configuration for Special Cases +3.5 Overriding Configuration for Special Cases ---------------------------------------------- - When using the bonding driver, the physical port which transmits a frame is typically selected by the bonding driver, and is not relevant to the user or system administrator. The output port is simply selected using the policies of diff --git a/trunk/Documentation/sound/alsa/soc/codec.txt b/trunk/Documentation/sound/alsa/soc/codec.txt index bce23a4a7875..37ba3a72cb76 100644 --- a/trunk/Documentation/sound/alsa/soc/codec.txt +++ b/trunk/Documentation/sound/alsa/soc/codec.txt @@ -27,38 +27,42 @@ ASoC Codec driver breakdown 1 - Codec DAI and PCM configuration ----------------------------------- -Each codec driver must have a struct snd_soc_dai_driver to define its DAI and +Each codec driver must have a struct snd_soc_codec_dai to define its DAI and PCM capabilities and operations. This struct is exported so that it can be registered with the core by your machine driver. e.g. -static struct snd_soc_dai_ops wm8731_dai_ops = { - .prepare = wm8731_pcm_prepare, - .hw_params = wm8731_hw_params, - .shutdown = wm8731_shutdown, - .digital_mute = wm8731_mute, - .set_sysclk = wm8731_set_dai_sysclk, - .set_fmt = wm8731_set_dai_fmt, -}; - -struct snd_soc_dai_driver wm8731_dai = { - .name = "wm8731-hifi", +struct snd_soc_codec_dai wm8731_dai = { + .name = "WM8731", + /* playback capabilities */ .playback = { .stream_name = "Playback", .channels_min = 1, .channels_max = 2, .rates = WM8731_RATES, .formats = WM8731_FORMATS,}, + /* capture capabilities */ .capture = { .stream_name = "Capture", .channels_min = 1, .channels_max = 2, .rates = WM8731_RATES, .formats = WM8731_FORMATS,}, - .ops = &wm8731_dai_ops, - .symmetric_rates = 1, + /* pcm operations - see section 4 below */ + .ops = { + .prepare = wm8731_pcm_prepare, + .hw_params = wm8731_hw_params, + .shutdown = wm8731_shutdown, + }, + /* DAI operations - see DAI.txt */ + .dai_ops = { + .digital_mute = wm8731_mute, + .set_sysclk = wm8731_set_dai_sysclk, + .set_fmt = wm8731_set_dai_fmt, + } }; +EXPORT_SYMBOL_GPL(wm8731_dai); 2 - Codec control IO @@ -182,14 +186,13 @@ when the mute is applied or freed. i.e. -static int wm8974_mute(struct snd_soc_dai *dai, int mute) +static int wm8974_mute(struct snd_soc_codec *codec, + struct snd_soc_codec_dai *dai, int mute) { - struct snd_soc_codec *codec = dai->codec; - u16 mute_reg = snd_soc_read(codec, WM8974_DAC) & 0xffbf; - - if (mute) - snd_soc_write(codec, WM8974_DAC, mute_reg | 0x40); + u16 mute_reg = wm8974_read_reg_cache(codec, WM8974_DAC) & 0xffbf; + if(mute) + wm8974_write(codec, WM8974_DAC, mute_reg | 0x40); else - snd_soc_write(codec, WM8974_DAC, mute_reg); + wm8974_write(codec, WM8974_DAC, mute_reg); return 0; } diff --git a/trunk/Documentation/sound/alsa/soc/machine.txt b/trunk/Documentation/sound/alsa/soc/machine.txt index 3e2ec9cbf397..2524c75557df 100644 --- a/trunk/Documentation/sound/alsa/soc/machine.txt +++ b/trunk/Documentation/sound/alsa/soc/machine.txt @@ -12,8 +12,6 @@ the following struct:- struct snd_soc_card { char *name; - ... - int (*probe)(struct platform_device *pdev); int (*remove)(struct platform_device *pdev); @@ -24,13 +22,12 @@ struct snd_soc_card { int (*resume_pre)(struct platform_device *pdev); int (*resume_post)(struct platform_device *pdev); - ... + /* machine stream operations */ + struct snd_soc_ops *ops; /* CPU <--> Codec DAI links */ struct snd_soc_dai_link *dai_link; int num_links; - - ... }; probe()/remove() @@ -45,6 +42,11 @@ of any machine audio tasks that have to be done before or after the codec, DAIs and DMA is suspended and resumed. Optional. +Machine operations +------------------ +The machine specific audio operations can be set here. Again this is optional. + + Machine DAI Configuration ------------------------- The machine DAI configuration glues all the codec and CPU DAIs together. It can @@ -59,10 +61,8 @@ struct snd_soc_dai_link is used to set up each DAI in your machine. e.g. static struct snd_soc_dai_link corgi_dai = { .name = "WM8731", .stream_name = "WM8731", - .cpu_dai_name = "pxa-is2-dai", - .codec_dai_name = "wm8731-hifi", - .platform_name = "pxa-pcm-audio", - .codec_name = "wm8713-codec.0-001a", + .cpu_dai = &pxa_i2s_dai, + .codec_dai = &wm8731_dai, .init = corgi_wm8731_init, .ops = &corgi_ops, }; @@ -77,6 +77,26 @@ static struct snd_soc_card snd_soc_corgi = { }; +Machine Audio Subsystem +----------------------- + +The machine soc device glues the platform, machine and codec driver together. +Private data can also be set here. e.g. + +/* corgi audio private data */ +static struct wm8731_setup_data corgi_wm8731_setup = { + .i2c_address = 0x1b, +}; + +/* corgi audio subsystem */ +static struct snd_soc_device corgi_snd_devdata = { + .machine = &snd_soc_corgi, + .platform = &pxa2xx_soc_platform, + .codec_dev = &soc_codec_dev_wm8731, + .codec_data = &corgi_wm8731_setup, +}; + + Machine Power Map ----------------- diff --git a/trunk/Documentation/sound/alsa/soc/platform.txt b/trunk/Documentation/sound/alsa/soc/platform.txt index d57efad37e0a..06d835987c6a 100644 --- a/trunk/Documentation/sound/alsa/soc/platform.txt +++ b/trunk/Documentation/sound/alsa/soc/platform.txt @@ -20,10 +20,9 @@ struct snd_soc_ops { int (*trigger)(struct snd_pcm_substream *, int); }; -The platform driver exports its DMA functionality via struct -snd_soc_platform_driver:- +The platform driver exports its DMA functionality via struct snd_soc_platform:- -struct snd_soc_platform_driver { +struct snd_soc_platform { char *name; int (*probe)(struct platform_device *pdev); @@ -35,13 +34,6 @@ struct snd_soc_platform_driver { int (*pcm_new)(struct snd_card *, struct snd_soc_codec_dai *, struct snd_pcm *); void (*pcm_free)(struct snd_pcm *); - /* - * For platform caused delay reporting. - * Optional. - */ - snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *, - struct snd_soc_dai *); - /* platform stream ops */ struct snd_pcm_ops *pcm_ops; }; diff --git a/trunk/Documentation/video4linux/v4l2-controls.txt b/trunk/Documentation/video4linux/v4l2-controls.txt index 881e7f44491b..8773778d23fc 100644 --- a/trunk/Documentation/video4linux/v4l2-controls.txt +++ b/trunk/Documentation/video4linux/v4l2-controls.txt @@ -285,9 +285,6 @@ implement g_volatile_ctrl like this: The 'new value' union is not used in g_volatile_ctrl. In general controls that need to implement g_volatile_ctrl are read-only controls. -Note that if one or more controls in a control cluster are marked as volatile, -then all the controls in the cluster are seen as volatile. - To mark a control as volatile you have to set the is_volatile flag: ctrl = v4l2_ctrl_new_std(&sd->ctrl_handler, ...); @@ -465,15 +462,6 @@ pointer to the v4l2_ctrl_ops struct that is used for that cluster. Obviously, all controls in the cluster array must be initialized to either a valid control or to NULL. -In rare cases you might want to know which controls of a cluster actually -were set explicitly by the user. For this you can check the 'is_new' flag of -each control. For example, in the case of a volume/mute cluster the 'is_new' -flag of the mute control would be set if the user called VIDIOC_S_CTRL for -mute only. If the user would call VIDIOC_S_EXT_CTRLS for both mute and volume -controls, then the 'is_new' flag would be 1 for both controls. - -The 'is_new' flag is always 1 when called from v4l2_ctrl_handler_setup(). - VIDIOC_LOG_STATUS Support ========================= diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 445537d46e7a..1af022e63668 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -162,7 +162,7 @@ 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 -F: drivers/tty/serial/8250* +F: drivers/serial/8250* F: include/linux/serial_8250.h 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.] @@ -624,15 +624,11 @@ M: Lennert Buytenhek L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES +ARM/ATMEL AT91RM9200 ARM ARCHITECTURE M: Andrew Victor -M: Nicolas Ferre -M: Jean-Christophe Plagniol-Villard L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://maxim.org.za/at91_26.html -W: http://www.linux4sam.org -S: Supported -F: arch/arm/mach-at91/ +S: Maintained ARM/BCMRING ARM ARCHITECTURE M: Jiandong Zheng @@ -892,8 +888,8 @@ F: arch/arm/mach-msm/ F: drivers/video/msm/ F: drivers/mmc/host/msm_sdcc.c F: drivers/mmc/host/msm_sdcc.h -F: drivers/tty/serial/msm_serial.h -F: drivers/tty/serial/msm_serial.c +F: drivers/serial/msm_serial.h +F: drivers/serial/msm_serial.c T: git git://codeaurora.org/quic/kernel/davidb/linux-msm.git S: Maintained @@ -1260,7 +1256,7 @@ F: drivers/mmc/host/atmel-mci-regs.h ATMEL AT91 / AT32 SERIAL DRIVER M: Nicolas Ferre S: Supported -F: drivers/tty/serial/atmel_serial.c +F: drivers/serial/atmel_serial.c ATMEL LCDFB DRIVER M: Nicolas Ferre @@ -1416,7 +1412,7 @@ M: Sonic Zhang L: uclinux-dist-devel@blackfin.uclinux.org W: http://blackfin.uclinux.org S: Supported -F: drivers/tty/serial/bfin_5xx.c +F: drivers/serial/bfin_5xx.c BLACKFIN WATCHDOG DRIVER M: Mike Frysinger @@ -1881,7 +1877,7 @@ L: linux-cris-kernel@axis.com W: http://developer.axis.com S: Maintained F: arch/cris/ -F: drivers/tty/serial/crisv10.* +F: drivers/serial/crisv10.* CRYPTO API M: Herbert Xu @@ -2220,7 +2216,7 @@ F: drivers/net/wan/dscc4.c DZ DECSTATION DZ11 SERIAL DRIVER M: "Maciej W. Rozycki" S: Maintained -F: drivers/tty/serial/dz.* +F: drivers/serial/dz.* EATA-DMA SCSI DRIVER M: Michael Neuffer @@ -2647,7 +2643,7 @@ FREESCALE QUICC ENGINE UCC UART DRIVER M: Timur Tabi L: linuxppc-dev@lists.ozlabs.org S: Supported -F: drivers/tty/serial/ucc_uart.c +F: drivers/serial/ucc_uart.c FREESCALE SOC SOUND DRIVERS M: Timur Tabi @@ -3139,12 +3135,6 @@ S: Maintained F: net/ieee802154/ F: drivers/ieee802154/ -IKANOS/ADI EAGLE ADSL USB DRIVER -M: Matthieu Castet -M: Stanislaw Gruszka -S: Maintained -F: drivers/usb/atm/ueagle-atm.c - INTEGRITY MEASUREMENT ARCHITECTURE (IMA) M: Mimi Zohar S: Supported @@ -3156,7 +3146,7 @@ S: Orphan F: drivers/video/imsttfb.c INFINIBAND SUBSYSTEM -M: Roland Dreier +M: Roland Dreier M: Sean Hefty M: Hal Rosenstock L: linux-rdma@vger.kernel.org @@ -3333,6 +3323,7 @@ F: drivers/net/wimax/i2400m/ F: include/linux/wimax/i2400m.h INTEL WIRELESS WIFI LINK (iwlwifi) +M: Reinette Chatre M: Wey-Yi Guy M: Intel Linux Wireless L: linux-wireless@vger.kernel.org @@ -3359,7 +3350,7 @@ IOC3 SERIAL DRIVER M: Pat Gefre L: linux-serial@vger.kernel.org S: Maintained -F: drivers/tty/serial/ioc3_serial.c +F: drivers/serial/ioc3_serial.c IP MASQUERADING M: Juanjo Ciarlante @@ -3536,7 +3527,7 @@ JSM Neo PCI based serial card M: Breno Leitao L: linux-serial@vger.kernel.org S: Maintained -F: drivers/tty/serial/jsm/ +F: drivers/serial/jsm/ K10TEMP HARDWARE MONITORING DRIVER M: Clemens Ladisch @@ -3679,28 +3670,6 @@ F: include/linux/key-type.h F: include/keys/ F: security/keys/ -KEYS-TRUSTED -M: David Safford -M: Mimi Zohar -L: linux-security-module@vger.kernel.org -L: keyrings@linux-nfs.org -S: Supported -F: Documentation/keys-trusted-encrypted.txt -F: include/keys/trusted-type.h -F: security/keys/trusted.c -F: security/keys/trusted.h - -KEYS-ENCRYPTED -M: Mimi Zohar -M: David Safford -L: linux-security-module@vger.kernel.org -L: keyrings@linux-nfs.org -S: Supported -F: Documentation/keys-trusted-encrypted.txt -F: include/keys/encrypted-type.h -F: security/keys/encrypted.c -F: security/keys/encrypted.h - KGDB / KDB /debug_core M: Jason Wessel W: http://kgdb.wiki.kernel.org/ @@ -3708,7 +3677,7 @@ L: kgdb-bugreport@lists.sourceforge.net S: Maintained F: Documentation/DocBook/kgdb.tmpl F: drivers/misc/kgdbts.c -F: drivers/tty/serial/kgdboc.c +F: drivers/serial/kgdboc.c F: include/linux/kdb.h F: include/linux/kgdb.h F: kernel/debug/ @@ -5576,7 +5545,7 @@ M: Pat Gefre L: linux-ia64@vger.kernel.org S: Supported F: Documentation/ia64/serial.txt -F: drivers/tty/serial/ioc?_serial.c +F: drivers/serial/ioc?_serial.c F: include/linux/ioc?.h SGI VISUAL WORKSTATION 320 AND 540 @@ -5598,7 +5567,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen F: arch/arm/mach-lh7a40x/ -F: drivers/tty/serial/serial_lh7a40x.c +F: drivers/serial/serial_lh7a40x.c F: drivers/usb/gadget/lh7a40* F: drivers/usb/host/ohci-lh7a40* @@ -5818,14 +5787,14 @@ L: sparclinux@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git S: Maintained -F: drivers/tty/serial/suncore.c -F: drivers/tty/serial/suncore.h -F: drivers/tty/serial/sunhv.c -F: drivers/tty/serial/sunsab.c -F: drivers/tty/serial/sunsab.h -F: drivers/tty/serial/sunsu.c -F: drivers/tty/serial/sunzilog.c -F: drivers/tty/serial/sunzilog.h +F: drivers/serial/suncore.c +F: drivers/serial/suncore.h +F: drivers/serial/sunhv.c +F: drivers/serial/sunsab.c +F: drivers/serial/sunsab.h +F: drivers/serial/sunsu.c +F: drivers/serial/sunzilog.c +F: drivers/serial/sunzilog.h SPEAR PLATFORM SUPPORT M: Viresh Kumar @@ -6155,8 +6124,8 @@ TTY LAYER M: Greg Kroah-Hartman S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git -F: drivers/tty/* -F: drivers/tty/serial/serial_core.c +F: drivers/char/tty_* +F: drivers/serial/serial_core.c F: include/linux/serial_core.h F: include/linux/serial.h F: include/linux/tty.h @@ -6600,16 +6569,6 @@ S: Maintained F: drivers/char/virtio_console.c F: include/linux/virtio_console.h -VIRTIO CORE, NET AND BLOCK DRIVERS -M: Rusty Russell -M: "Michael S. Tsirkin" -L: virtualization@lists.linux-foundation.org -S: Maintained -F: drivers/virtio/ -F: drivers/net/virtio_net.c -F: drivers/block/virtio_blk.c -F: include/linux/virtio_*.h - VIRTIO HOST (VHOST) M: "Michael S. Tsirkin" L: kvm@vger.kernel.org @@ -6911,7 +6870,7 @@ XILINX UARTLITE SERIAL DRIVER M: Peter Korsgaard L: linux-serial@vger.kernel.org S: Maintained -F: drivers/tty/serial/uartlite.c +F: drivers/serial/uartlite.c YAM DRIVER FOR AX.25 M: Jean-Paul Roubelat @@ -6957,7 +6916,7 @@ F: drivers/media/video/zoran/ ZS DECSTATION Z85C30 SERIAL DRIVER M: "Maciej W. Rozycki" S: Maintained -F: drivers/tty/serial/zs.* +F: drivers/serial/zs.* GRE DEMULTIPLEXER DRIVER M: Dmitry Kozlov diff --git a/trunk/Makefile b/trunk/Makefile index 66e7e977ddc0..abb49bf8596e 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 38 -EXTRAVERSION = -rc3 +EXTRAVERSION = -rc1 NAME = Flesh-Eating Bats with Fangs # *DOCUMENTATION* diff --git a/trunk/arch/alpha/Kconfig b/trunk/arch/alpha/Kconfig index 47f63d480141..fc95ee1bcf6f 100644 --- a/trunk/arch/alpha/Kconfig +++ b/trunk/arch/alpha/Kconfig @@ -8,9 +8,6 @@ config ALPHA select HAVE_IRQ_WORK select HAVE_PERF_EVENTS select HAVE_DMA_ATTRS - select HAVE_GENERIC_HARDIRQS - select GENERIC_IRQ_PROBE - select AUTO_IRQ_AFFINITY if SMP help The Alpha is a 64-bit general-purpose processor designed and marketed by the Digital Equipment Corporation of blessed memory, @@ -71,6 +68,22 @@ config GENERIC_IOMAP bool default n +config GENERIC_HARDIRQS_NO__DO_IRQ + def_bool y + +config GENERIC_HARDIRQS + bool + default y + +config GENERIC_IRQ_PROBE + bool + default y + +config AUTO_IRQ_AFFINITY + bool + depends on SMP + default y + source "init/Kconfig" source "kernel/Kconfig.freezer" diff --git a/trunk/arch/arm/configs/ag5evm_defconfig b/trunk/arch/arm/configs/ag5evm_defconfig index 212ead354a6b..2b9cf56db363 100644 --- a/trunk/arch/arm/configs/ag5evm_defconfig +++ b/trunk/arch/arm/configs/ag5evm_defconfig @@ -10,7 +10,7 @@ CONFIG_NAMESPACES=y # CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_SLAB=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_IOSCHED_DEADLINE is not set diff --git a/trunk/arch/arm/configs/am200epdkit_defconfig b/trunk/arch/arm/configs/am200epdkit_defconfig index f0dea52e49c4..5536c488dd01 100644 --- a/trunk/arch/arm/configs/am200epdkit_defconfig +++ b/trunk/arch/arm/configs/am200epdkit_defconfig @@ -3,7 +3,7 @@ CONFIG_LOCALVERSION="gum" # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_SYSCTL_SYSCALL is not set # CONFIG_EPOLL is not set # CONFIG_SHMEM is not set diff --git a/trunk/arch/arm/configs/at572d940hfek_defconfig b/trunk/arch/arm/configs/at572d940hfek_defconfig index 1b1158ae8f82..695e32d4fb58 100644 --- a/trunk/arch/arm/configs/at572d940hfek_defconfig +++ b/trunk/arch/arm/configs/at572d940hfek_defconfig @@ -17,7 +17,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_PROFILING=y CONFIG_OPROFILE=m diff --git a/trunk/arch/arm/configs/badge4_defconfig b/trunk/arch/arm/configs/badge4_defconfig index 5b54abbeb0b3..3a1ad15a779f 100644 --- a/trunk/arch/arm/configs/badge4_defconfig +++ b/trunk/arch/arm/configs/badge4_defconfig @@ -1,6 +1,6 @@ CONFIG_EXPERIMENTAL=y CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_MODULES=y CONFIG_MODVERSIONS=y CONFIG_ARCH_SA1100=y diff --git a/trunk/arch/arm/configs/bcmring_defconfig b/trunk/arch/arm/configs/bcmring_defconfig index 795374d48f81..75984cd1e233 100644 --- a/trunk/arch/arm/configs/bcmring_defconfig +++ b/trunk/arch/arm/configs/bcmring_defconfig @@ -2,7 +2,7 @@ CONFIG_EXPERIMENTAL=y # CONFIG_LOCALVERSION_AUTO is not set # CONFIG_SWAP is not set CONFIG_SYSVIPC=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_KALLSYMS_EXTRA_PASS=y # CONFIG_HOTPLUG is not set # CONFIG_ELF_CORE is not set diff --git a/trunk/arch/arm/configs/cm_x2xx_defconfig b/trunk/arch/arm/configs/cm_x2xx_defconfig index a93ff8da5bab..dcfbcf3b6c3e 100644 --- a/trunk/arch/arm/configs/cm_x2xx_defconfig +++ b/trunk/arch/arm/configs/cm_x2xx_defconfig @@ -6,7 +6,7 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_SLUB_DEBUG is not set # CONFIG_COMPAT_BRK is not set diff --git a/trunk/arch/arm/configs/colibri_pxa270_defconfig b/trunk/arch/arm/configs/colibri_pxa270_defconfig index 2ef2c5e8aaec..f52c64e36d8d 100644 --- a/trunk/arch/arm/configs/colibri_pxa270_defconfig +++ b/trunk/arch/arm/configs/colibri_pxa270_defconfig @@ -8,7 +8,7 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_SLAB=y CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/collie_defconfig b/trunk/arch/arm/configs/collie_defconfig index 6c56ad086c7c..310f9a6270be 100644 --- a/trunk/arch/arm/configs/collie_defconfig +++ b/trunk/arch/arm/configs/collie_defconfig @@ -4,7 +4,7 @@ CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_BASE_FULL is not set # CONFIG_EPOLL is not set CONFIG_SLOB=y diff --git a/trunk/arch/arm/configs/corgi_defconfig b/trunk/arch/arm/configs/corgi_defconfig index e53c47563845..4a1fa81ed37d 100644 --- a/trunk/arch/arm/configs/corgi_defconfig +++ b/trunk/arch/arm/configs/corgi_defconfig @@ -4,7 +4,7 @@ CONFIG_BSD_PROCESS_ACCT=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_PROFILING=y CONFIG_OPROFILE=m CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/da8xx_omapl_defconfig b/trunk/arch/arm/configs/da8xx_omapl_defconfig index 88ccde058ba4..cdc40c4b8c48 100644 --- a/trunk/arch/arm/configs/da8xx_omapl_defconfig +++ b/trunk/arch/arm/configs/da8xx_omapl_defconfig @@ -6,7 +6,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y diff --git a/trunk/arch/arm/configs/davinci_all_defconfig b/trunk/arch/arm/configs/davinci_all_defconfig index 889922ad229c..2519cc5a5f8f 100644 --- a/trunk/arch/arm/configs/davinci_all_defconfig +++ b/trunk/arch/arm/configs/davinci_all_defconfig @@ -6,7 +6,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y diff --git a/trunk/arch/arm/configs/dove_defconfig b/trunk/arch/arm/configs/dove_defconfig index 54bf5eec8016..9359e1bf32c1 100644 --- a/trunk/arch/arm/configs/dove_defconfig +++ b/trunk/arch/arm/configs/dove_defconfig @@ -1,7 +1,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y diff --git a/trunk/arch/arm/configs/ebsa110_defconfig b/trunk/arch/arm/configs/ebsa110_defconfig index 14559dbb4c2c..c3194186920c 100644 --- a/trunk/arch/arm/configs/ebsa110_defconfig +++ b/trunk/arch/arm/configs/ebsa110_defconfig @@ -2,7 +2,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_MODULES=y CONFIG_ARCH_EBSA110=y CONFIG_PCCARD=m diff --git a/trunk/arch/arm/configs/edb7211_defconfig b/trunk/arch/arm/configs/edb7211_defconfig index d52ded350a12..7b62be1561ea 100644 --- a/trunk/arch/arm/configs/edb7211_defconfig +++ b/trunk/arch/arm/configs/edb7211_defconfig @@ -2,7 +2,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_HOTPLUG is not set CONFIG_ARCH_CLPS711X=y CONFIG_ARCH_EDB7211=y diff --git a/trunk/arch/arm/configs/em_x270_defconfig b/trunk/arch/arm/configs/em_x270_defconfig index 60a21e01eb70..d7db34f79702 100644 --- a/trunk/arch/arm/configs/em_x270_defconfig +++ b/trunk/arch/arm/configs/em_x270_defconfig @@ -6,7 +6,7 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_SLUB_DEBUG is not set # CONFIG_COMPAT_BRK is not set diff --git a/trunk/arch/arm/configs/ep93xx_defconfig b/trunk/arch/arm/configs/ep93xx_defconfig index 8e97b2f7ceec..6d6689cdf398 100644 --- a/trunk/arch/arm/configs/ep93xx_defconfig +++ b/trunk/arch/arm/configs/ep93xx_defconfig @@ -4,7 +4,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y diff --git a/trunk/arch/arm/configs/eseries_pxa_defconfig b/trunk/arch/arm/configs/eseries_pxa_defconfig index d68ac67c201c..1691dea582fe 100644 --- a/trunk/arch/arm/configs/eseries_pxa_defconfig +++ b/trunk/arch/arm/configs/eseries_pxa_defconfig @@ -2,7 +2,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_KALLSYMS is not set # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y diff --git a/trunk/arch/arm/configs/ezx_defconfig b/trunk/arch/arm/configs/ezx_defconfig index 227a477346ed..c4eeb6d1cbf0 100644 --- a/trunk/arch/arm/configs/ezx_defconfig +++ b/trunk/arch/arm/configs/ezx_defconfig @@ -7,7 +7,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y CONFIG_RD_BZIP2=y CONFIG_RD_LZMA=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/footbridge_defconfig b/trunk/arch/arm/configs/footbridge_defconfig index 038518ab39a8..4f925ead2617 100644 --- a/trunk/arch/arm/configs/footbridge_defconfig +++ b/trunk/arch/arm/configs/footbridge_defconfig @@ -3,7 +3,7 @@ CONFIG_SYSVIPC=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_HOTPLUG is not set CONFIG_MODULES=y CONFIG_ARCH_FOOTBRIDGE=y diff --git a/trunk/arch/arm/configs/fortunet_defconfig b/trunk/arch/arm/configs/fortunet_defconfig index 840fced7529f..e11c7eab8ed0 100644 --- a/trunk/arch/arm/configs/fortunet_defconfig +++ b/trunk/arch/arm/configs/fortunet_defconfig @@ -2,7 +2,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_HOTPLUG is not set CONFIG_ARCH_CLPS711X=y CONFIG_ARCH_FORTUNET=y diff --git a/trunk/arch/arm/configs/h5000_defconfig b/trunk/arch/arm/configs/h5000_defconfig index 37903e3f0efc..ac336f10000c 100644 --- a/trunk/arch/arm/configs/h5000_defconfig +++ b/trunk/arch/arm/configs/h5000_defconfig @@ -4,7 +4,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_UID16 is not set CONFIG_SLAB=y CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/imote2_defconfig b/trunk/arch/arm/configs/imote2_defconfig index 176ec22af034..ade55c8c408b 100644 --- a/trunk/arch/arm/configs/imote2_defconfig +++ b/trunk/arch/arm/configs/imote2_defconfig @@ -6,7 +6,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y CONFIG_RD_BZIP2=y CONFIG_RD_LZMA=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/ixp2000_defconfig b/trunk/arch/arm/configs/ixp2000_defconfig index 8405aded97a3..908324684549 100644 --- a/trunk/arch/arm/configs/ixp2000_defconfig +++ b/trunk/arch/arm/configs/ixp2000_defconfig @@ -3,7 +3,7 @@ CONFIG_SYSVIPC=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_HOTPLUG is not set CONFIG_SLAB=y CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/ixp23xx_defconfig b/trunk/arch/arm/configs/ixp23xx_defconfig index 688717612e91..7fc056a8569c 100644 --- a/trunk/arch/arm/configs/ixp23xx_defconfig +++ b/trunk/arch/arm/configs/ixp23xx_defconfig @@ -3,7 +3,7 @@ CONFIG_SYSVIPC=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y diff --git a/trunk/arch/arm/configs/ixp4xx_defconfig b/trunk/arch/arm/configs/ixp4xx_defconfig index 063e2ab2c8f1..5c5023934001 100644 --- a/trunk/arch/arm/configs/ixp4xx_defconfig +++ b/trunk/arch/arm/configs/ixp4xx_defconfig @@ -3,7 +3,7 @@ CONFIG_SYSVIPC=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_MODULES=y CONFIG_MODVERSIONS=y # CONFIG_BLK_DEV_BSG is not set diff --git a/trunk/arch/arm/configs/loki_defconfig b/trunk/arch/arm/configs/loki_defconfig index 1ba752b2dc6d..e1eaff7f5536 100644 --- a/trunk/arch/arm/configs/loki_defconfig +++ b/trunk/arch/arm/configs/loki_defconfig @@ -1,7 +1,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y diff --git a/trunk/arch/arm/configs/lpd7a400_defconfig b/trunk/arch/arm/configs/lpd7a400_defconfig index 5a48f171204c..20caaaba4a04 100644 --- a/trunk/arch/arm/configs/lpd7a400_defconfig +++ b/trunk/arch/arm/configs/lpd7a400_defconfig @@ -3,7 +3,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_IKCONFIG=y CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_HOTPLUG is not set # CONFIG_EPOLL is not set # CONFIG_IOSCHED_DEADLINE is not set diff --git a/trunk/arch/arm/configs/lpd7a404_defconfig b/trunk/arch/arm/configs/lpd7a404_defconfig index 22d0631de009..1efcce97b4a7 100644 --- a/trunk/arch/arm/configs/lpd7a404_defconfig +++ b/trunk/arch/arm/configs/lpd7a404_defconfig @@ -3,7 +3,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_IKCONFIG=y CONFIG_LOG_BUF_SHIFT=16 -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_HOTPLUG is not set # CONFIG_EPOLL is not set CONFIG_SLAB=y diff --git a/trunk/arch/arm/configs/magician_defconfig b/trunk/arch/arm/configs/magician_defconfig index a88e64d4e9a5..af805e8fd03d 100644 --- a/trunk/arch/arm/configs/magician_defconfig +++ b/trunk/arch/arm/configs/magician_defconfig @@ -4,7 +4,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_UID16 is not set CONFIG_SLAB=y CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/mv78xx0_defconfig b/trunk/arch/arm/configs/mv78xx0_defconfig index 7305ebddb510..b0d082422d46 100644 --- a/trunk/arch/arm/configs/mv78xx0_defconfig +++ b/trunk/arch/arm/configs/mv78xx0_defconfig @@ -2,7 +2,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_KALLSYMS_ALL=y # CONFIG_SLUB_DEBUG is not set CONFIG_PROFILING=y diff --git a/trunk/arch/arm/configs/mx1_defconfig b/trunk/arch/arm/configs/mx1_defconfig index b39b5ced8a10..2f38d9715437 100644 --- a/trunk/arch/arm/configs/mx1_defconfig +++ b/trunk/arch/arm/configs/mx1_defconfig @@ -4,7 +4,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y diff --git a/trunk/arch/arm/configs/mx21_defconfig b/trunk/arch/arm/configs/mx21_defconfig index 411f88dd4402..6454e18e2abe 100644 --- a/trunk/arch/arm/configs/mx21_defconfig +++ b/trunk/arch/arm/configs/mx21_defconfig @@ -4,7 +4,7 @@ CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_SLAB=y CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/mx27_defconfig b/trunk/arch/arm/configs/mx27_defconfig index 9ad4c656c9bd..813cfb366c18 100644 --- a/trunk/arch/arm/configs/mx27_defconfig +++ b/trunk/arch/arm/configs/mx27_defconfig @@ -4,7 +4,7 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_KALLSYMS_EXTRA_PASS=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y diff --git a/trunk/arch/arm/configs/mx3_defconfig b/trunk/arch/arm/configs/mx3_defconfig index 7c4b30b34952..e648ea3429be 100644 --- a/trunk/arch/arm/configs/mx3_defconfig +++ b/trunk/arch/arm/configs/mx3_defconfig @@ -4,7 +4,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y diff --git a/trunk/arch/arm/configs/mx51_defconfig b/trunk/arch/arm/configs/mx51_defconfig index 9cba68cfa51a..5c7a87260fab 100644 --- a/trunk/arch/arm/configs/mx51_defconfig +++ b/trunk/arch/arm/configs/mx51_defconfig @@ -3,7 +3,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_RELAY=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_SLUB_DEBUG is not set # CONFIG_COMPAT_BRK is not set CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/nhk8815_defconfig b/trunk/arch/arm/configs/nhk8815_defconfig index 37207d1bf44b..0e2dc26ebe66 100644 --- a/trunk/arch/arm/configs/nhk8815_defconfig +++ b/trunk/arch/arm/configs/nhk8815_defconfig @@ -7,7 +7,7 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_KALLSYMS_ALL=y CONFIG_SLAB=y CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/omap1_defconfig b/trunk/arch/arm/configs/omap1_defconfig index 7b63462b349d..a350cc6bfe6a 100644 --- a/trunk/arch/arm/configs/omap1_defconfig +++ b/trunk/arch/arm/configs/omap1_defconfig @@ -6,7 +6,7 @@ CONFIG_BSD_PROCESS_ACCT=y CONFIG_IKCONFIG=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_KALLSYMS is not set # CONFIG_ELF_CORE is not set # CONFIG_BASE_FULL is not set diff --git a/trunk/arch/arm/configs/omap2plus_defconfig b/trunk/arch/arm/configs/omap2plus_defconfig index ae890caa17a7..ccedde1371c3 100644 --- a/trunk/arch/arm/configs/omap2plus_defconfig +++ b/trunk/arch/arm/configs/omap2plus_defconfig @@ -6,7 +6,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_SLAB=y diff --git a/trunk/arch/arm/configs/orion5x_defconfig b/trunk/arch/arm/configs/orion5x_defconfig index a288d7033950..439323b3b0ed 100644 --- a/trunk/arch/arm/configs/orion5x_defconfig +++ b/trunk/arch/arm/configs/orion5x_defconfig @@ -2,7 +2,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_SLUB_DEBUG is not set CONFIG_PROFILING=y CONFIG_OPROFILE=y diff --git a/trunk/arch/arm/configs/pcm027_defconfig b/trunk/arch/arm/configs/pcm027_defconfig index 2f136c30a989..583a0610bd00 100644 --- a/trunk/arch/arm/configs/pcm027_defconfig +++ b/trunk/arch/arm/configs/pcm027_defconfig @@ -7,7 +7,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_KALLSYMS is not set CONFIG_SLAB=y CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/pcontrol_g20_defconfig b/trunk/arch/arm/configs/pcontrol_g20_defconfig index c75c9fcede58..b42ee62c4d77 100644 --- a/trunk/arch/arm/configs/pcontrol_g20_defconfig +++ b/trunk/arch/arm/configs/pcontrol_g20_defconfig @@ -10,7 +10,7 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_NAMESPACES=y CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_SYSCTL_SYSCALL is not set # CONFIG_KALLSYMS is not set # CONFIG_VM_EVENT_COUNTERS is not set diff --git a/trunk/arch/arm/configs/pleb_defconfig b/trunk/arch/arm/configs/pleb_defconfig index cb08cc561da5..d1efbdc1e6dc 100644 --- a/trunk/arch/arm/configs/pleb_defconfig +++ b/trunk/arch/arm/configs/pleb_defconfig @@ -3,7 +3,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_HOTPLUG is not set # CONFIG_SHMEM is not set CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/pnx4008_defconfig b/trunk/arch/arm/configs/pnx4008_defconfig index 35a31ccacc32..bd481f04276f 100644 --- a/trunk/arch/arm/configs/pnx4008_defconfig +++ b/trunk/arch/arm/configs/pnx4008_defconfig @@ -5,7 +5,7 @@ CONFIG_BSD_PROCESS_ACCT=y CONFIG_AUDIT=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y diff --git a/trunk/arch/arm/configs/simpad_defconfig b/trunk/arch/arm/configs/simpad_defconfig index d3358155bf8a..af3b12e3b464 100644 --- a/trunk/arch/arm/configs/simpad_defconfig +++ b/trunk/arch/arm/configs/simpad_defconfig @@ -2,7 +2,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_LOCALVERSION="oe1" CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/spitz_defconfig b/trunk/arch/arm/configs/spitz_defconfig index 70158273c6dd..aebd4bb0ad01 100644 --- a/trunk/arch/arm/configs/spitz_defconfig +++ b/trunk/arch/arm/configs/spitz_defconfig @@ -4,7 +4,7 @@ CONFIG_BSD_PROCESS_ACCT=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_PROFILING=y CONFIG_OPROFILE=m CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/stmp378x_defconfig b/trunk/arch/arm/configs/stmp378x_defconfig index 1079c2b6eb3a..94a2d904bf94 100644 --- a/trunk/arch/arm/configs/stmp378x_defconfig +++ b/trunk/arch/arm/configs/stmp378x_defconfig @@ -5,7 +5,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y diff --git a/trunk/arch/arm/configs/stmp37xx_defconfig b/trunk/arch/arm/configs/stmp37xx_defconfig index 564a5cc44085..d8ee58cfa872 100644 --- a/trunk/arch/arm/configs/stmp37xx_defconfig +++ b/trunk/arch/arm/configs/stmp37xx_defconfig @@ -5,7 +5,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y diff --git a/trunk/arch/arm/configs/tct_hammer_defconfig b/trunk/arch/arm/configs/tct_hammer_defconfig index 95c0f0d63db6..e89ca19489c2 100644 --- a/trunk/arch/arm/configs/tct_hammer_defconfig +++ b/trunk/arch/arm/configs/tct_hammer_defconfig @@ -5,7 +5,7 @@ CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_KALLSYMS is not set # CONFIG_BUG is not set # CONFIG_ELF_CORE is not set diff --git a/trunk/arch/arm/configs/trizeps4_defconfig b/trunk/arch/arm/configs/trizeps4_defconfig index 3162173fa75a..37f48342827c 100644 --- a/trunk/arch/arm/configs/trizeps4_defconfig +++ b/trunk/arch/arm/configs/trizeps4_defconfig @@ -7,7 +7,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_SLAB=y CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/u300_defconfig b/trunk/arch/arm/configs/u300_defconfig index 4a5a12681be2..c1c252cdca60 100644 --- a/trunk/arch/arm/configs/u300_defconfig +++ b/trunk/arch/arm/configs/u300_defconfig @@ -3,7 +3,7 @@ CONFIG_EXPERIMENTAL=y # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_AIO is not set # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_MODULES=y diff --git a/trunk/arch/arm/configs/viper_defconfig b/trunk/arch/arm/configs/viper_defconfig index 8b0c717378fa..9d7bf5e0d0f5 100644 --- a/trunk/arch/arm/configs/viper_defconfig +++ b/trunk/arch/arm/configs/viper_defconfig @@ -3,7 +3,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=13 CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_ELF_CORE is not set # CONFIG_SHMEM is not set CONFIG_SLAB=y diff --git a/trunk/arch/arm/configs/xcep_defconfig b/trunk/arch/arm/configs/xcep_defconfig index 5b5504143647..70d47dbae6db 100644 --- a/trunk/arch/arm/configs/xcep_defconfig +++ b/trunk/arch/arm/configs/xcep_defconfig @@ -8,7 +8,7 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y +CONFIG_EMBEDDED=y # CONFIG_UID16 is not set # CONFIG_SHMEM is not set # CONFIG_VM_EVENT_COUNTERS is not set diff --git a/trunk/arch/arm/include/asm/hardware/sp810.h b/trunk/arch/arm/include/asm/hardware/sp810.h index 721847dc68ab..a101f10bb5b1 100644 --- a/trunk/arch/arm/include/asm/hardware/sp810.h +++ b/trunk/arch/arm/include/asm/hardware/sp810.h @@ -50,12 +50,6 @@ #define SCPCELLID2 0xFF8 #define SCPCELLID3 0xFFC -#define SCCTRL_TIMEREN0SEL_REFCLK (0 << 15) -#define SCCTRL_TIMEREN0SEL_TIMCLK (1 << 15) - -#define SCCTRL_TIMEREN1SEL_REFCLK (0 << 17) -#define SCCTRL_TIMEREN1SEL_TIMCLK (1 << 17) - static inline void sysctl_soft_reset(void __iomem *base) { /* writing any value to SCSYSSTAT reg will reset system */ diff --git a/trunk/arch/arm/include/asm/io.h b/trunk/arch/arm/include/asm/io.h index d66605dea55a..20e0f7c9e03e 100644 --- a/trunk/arch/arm/include/asm/io.h +++ b/trunk/arch/arm/include/asm/io.h @@ -95,15 +95,6 @@ static inline void __iomem *__typesafe_io(unsigned long addr) return (void __iomem *)addr; } -/* IO barriers */ -#ifdef CONFIG_ARM_DMA_MEM_BUFFERABLE -#define __iormb() rmb() -#define __iowmb() wmb() -#else -#define __iormb() do { } while (0) -#define __iowmb() do { } while (0) -#endif - /* * Now, pick up the machine-defined IO definitions */ @@ -134,17 +125,17 @@ static inline void __iomem *__typesafe_io(unsigned long addr) * The {in,out}[bwl] macros are for emulating x86-style PCI/ISA IO space. */ #ifdef __io -#define outb(v,p) ({ __iowmb(); __raw_writeb(v,__io(p)); }) -#define outw(v,p) ({ __iowmb(); __raw_writew((__force __u16) \ - cpu_to_le16(v),__io(p)); }) -#define outl(v,p) ({ __iowmb(); __raw_writel((__force __u32) \ - cpu_to_le32(v),__io(p)); }) +#define outb(v,p) __raw_writeb(v,__io(p)) +#define outw(v,p) __raw_writew((__force __u16) \ + cpu_to_le16(v),__io(p)) +#define outl(v,p) __raw_writel((__force __u32) \ + cpu_to_le32(v),__io(p)) -#define inb(p) ({ __u8 __v = __raw_readb(__io(p)); __iormb(); __v; }) +#define inb(p) ({ __u8 __v = __raw_readb(__io(p)); __v; }) #define inw(p) ({ __u16 __v = le16_to_cpu((__force __le16) \ - __raw_readw(__io(p))); __iormb(); __v; }) + __raw_readw(__io(p))); __v; }) #define inl(p) ({ __u32 __v = le32_to_cpu((__force __le32) \ - __raw_readl(__io(p))); __iormb(); __v; }) + __raw_readl(__io(p))); __v; }) #define outsb(p,d,l) __raw_writesb(__io(p),d,l) #define outsw(p,d,l) __raw_writesw(__io(p),d,l) @@ -201,6 +192,14 @@ extern void _memset_io(volatile void __iomem *, int, size_t); #define writel_relaxed(v,c) ((void)__raw_writel((__force u32) \ cpu_to_le32(v),__mem_pci(c))) +#ifdef CONFIG_ARM_DMA_MEM_BUFFERABLE +#define __iormb() rmb() +#define __iowmb() wmb() +#else +#define __iormb() do { } while (0) +#define __iowmb() do { } while (0) +#endif + #define readb(c) ({ u8 __v = readb_relaxed(c); __iormb(); __v; }) #define readw(c) ({ u16 __v = readw_relaxed(c); __iormb(); __v; }) #define readl(c) ({ u32 __v = readl_relaxed(c); __iormb(); __v; }) diff --git a/trunk/arch/arm/include/asm/memory.h b/trunk/arch/arm/include/asm/memory.h index d0ee74b7cf86..23c2e8e5c0fa 100644 --- a/trunk/arch/arm/include/asm/memory.h +++ b/trunk/arch/arm/include/asm/memory.h @@ -188,7 +188,7 @@ * translation for translating DMA addresses. Use the driver * DMA support - see dma-mapping.h. */ -static inline unsigned long virt_to_phys(const volatile void *x) +static inline unsigned long virt_to_phys(void *x) { return __virt_to_phys((unsigned long)(x)); } diff --git a/trunk/arch/arm/kernel/head.S b/trunk/arch/arm/kernel/head.S index c0225da3fb21..f17d9a09e8fb 100644 --- a/trunk/arch/arm/kernel/head.S +++ b/trunk/arch/arm/kernel/head.S @@ -392,22 +392,24 @@ ENDPROC(__turn_mmu_on) #ifdef CONFIG_SMP_ON_UP __fixup_smp: - and r3, r9, #0x000f0000 @ architecture version - teq r3, #0x000f0000 @ CPU ID supported? + mov r4, #0x00070000 + orr r3, r4, #0xff000000 @ mask 0xff070000 + orr r4, r4, #0x41000000 @ val 0x41070000 + and r0, r9, r3 + teq r0, r4 @ ARM CPU and ARMv6/v7? bne __fixup_smp_on_up @ no, assume UP - bic r3, r9, #0x00ff0000 - bic r3, r3, #0x0000000f @ mask 0xff00fff0 - mov r4, #0x41000000 + orr r3, r3, #0x0000ff00 + orr r3, r3, #0x000000f0 @ mask 0xff07fff0 orr r4, r4, #0x0000b000 - orr r4, r4, #0x00000020 @ val 0x4100b020 - teq r3, r4 @ ARM 11MPCore? + orr r4, r4, #0x00000020 @ val 0x4107b020 + and r0, r9, r3 + teq r0, r4 @ ARM 11MPCore? moveq pc, lr @ yes, assume SMP mrc p15, 0, r0, c0, c0, 5 @ read MPIDR - and r0, r0, #0xc0000000 @ multiprocessing extensions and - teq r0, #0x80000000 @ not part of a uniprocessor system? - moveq pc, lr @ yes, assume SMP + tst r0, #1 << 31 + movne pc, lr @ bit 31 => SMP __fixup_smp_on_up: adr r0, 1f diff --git a/trunk/arch/arm/kernel/smp_twd.c b/trunk/arch/arm/kernel/smp_twd.c index 60636f499cb3..fd9156698ab9 100644 --- a/trunk/arch/arm/kernel/smp_twd.c +++ b/trunk/arch/arm/kernel/smp_twd.c @@ -36,7 +36,6 @@ static void twd_set_mode(enum clock_event_mode mode, /* timer load already set up */ ctrl = TWD_TIMER_CONTROL_ENABLE | TWD_TIMER_CONTROL_IT_ENABLE | TWD_TIMER_CONTROL_PERIODIC; - __raw_writel(twd_timer_rate / HZ, twd_base + TWD_TIMER_LOAD); break; case CLOCK_EVT_MODE_ONESHOT: /* period set, and timer enabled in 'next_event' hook */ @@ -82,7 +81,7 @@ int twd_timer_ack(void) static void __cpuinit twd_calibrate_rate(void) { - unsigned long count; + unsigned long load, count; u64 waitjiffies; /* @@ -117,6 +116,10 @@ static void __cpuinit twd_calibrate_rate(void) printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000, (twd_timer_rate / 1000000) % 100); } + + load = twd_timer_rate / HZ; + + __raw_writel(load, twd_base + TWD_TIMER_LOAD); } /* diff --git a/trunk/arch/arm/mach-ep93xx/core.c b/trunk/arch/arm/mach-ep93xx/core.c index 82079545adc4..ffdf87be2958 100644 --- a/trunk/arch/arm/mach-ep93xx/core.c +++ b/trunk/arch/arm/mach-ep93xx/core.c @@ -838,7 +838,7 @@ EXPORT_SYMBOL(ep93xx_i2s_release); static struct resource ep93xx_ac97_resources[] = { { .start = EP93XX_AAC_PHYS_BASE, - .end = EP93XX_AAC_PHYS_BASE + 0xac - 1, + .end = EP93XX_AAC_PHYS_BASE + 0xb0 - 1, .flags = IORESOURCE_MEM, }, { diff --git a/trunk/arch/arm/mach-ep93xx/gpio.c b/trunk/arch/arm/mach-ep93xx/gpio.c index bec34b834958..f3dc76fdcea8 100644 --- a/trunk/arch/arm/mach-ep93xx/gpio.c +++ b/trunk/arch/arm/mach-ep93xx/gpio.c @@ -427,13 +427,6 @@ void __init ep93xx_gpio_init(void) { int i; - /* Set Ports C, D, E, G, and H for GPIO use */ - ep93xx_devcfg_set_bits(EP93XX_SYSCON_DEVCFG_KEYS | - EP93XX_SYSCON_DEVCFG_GONK | - EP93XX_SYSCON_DEVCFG_EONIDE | - EP93XX_SYSCON_DEVCFG_GONIDE | - EP93XX_SYSCON_DEVCFG_HONIDE); - for (i = 0; i < ARRAY_SIZE(ep93xx_gpio_banks); i++) gpiochip_add(&ep93xx_gpio_banks[i].chip); } diff --git a/trunk/arch/arm/mach-footbridge/include/mach/debug-macro.S b/trunk/arch/arm/mach-footbridge/include/mach/debug-macro.S index 30b971d65815..3c9e0c40c679 100644 --- a/trunk/arch/arm/mach-footbridge/include/mach/debug-macro.S +++ b/trunk/arch/arm/mach-footbridge/include/mach/debug-macro.S @@ -17,8 +17,8 @@ /* For NetWinder debugging */ .macro addruart, rp, rv mov \rp, #0x000003f8 - orr \rv, \rp, #0xff000000 @ virtual - orr \rp, \rp, #0x7c000000 @ physical + orr \rv, \rp, #0x7c000000 @ physical + orr \rp, \rp, #0xff000000 @ virtual .endm #define UART_SHIFT 0 diff --git a/trunk/arch/arm/mach-msm/board-qsd8x50.c b/trunk/arch/arm/mach-msm/board-qsd8x50.c index 6dde8185205f..2e8391307f55 100644 --- a/trunk/arch/arm/mach-msm/board-qsd8x50.c +++ b/trunk/arch/arm/mach-msm/board-qsd8x50.c @@ -43,7 +43,7 @@ static const unsigned qsd8x50_surf_smc91x_gpio __initdata = 156; * at run-time: they vary from board to board, and the true * configuration won't be known until boot. */ -static struct resource smc91x_resources[] = { +static struct resource smc91x_resources[] __initdata = { [0] = { .flags = IORESOURCE_MEM, }, @@ -52,7 +52,7 @@ static struct resource smc91x_resources[] = { }, }; -static struct platform_device smc91x_device = { +static struct platform_device smc91x_device __initdata = { .name = "smc91x", .id = 0, .num_resources = ARRAY_SIZE(smc91x_resources), diff --git a/trunk/arch/arm/mach-mxs/clock-mx28.c b/trunk/arch/arm/mach-mxs/clock-mx28.c index 56312c092a9e..4146b38605de 100644 --- a/trunk/arch/arm/mach-mxs/clock-mx28.c +++ b/trunk/arch/arm/mach-mxs/clock-mx28.c @@ -355,7 +355,7 @@ static int name##_set_rate(struct clk *clk, unsigned long rate) \ } else { \ reg &= ~BM_CLKCTRL_##dr##_DIV; \ reg |= div << BP_CLKCTRL_##dr##_DIV; \ - if (reg | (1 << clk->enable_shift)) { \ + if (reg & (1 << clk->enable_shift)) { \ pr_err("%s: clock is gated\n", __func__); \ return -EINVAL; \ } \ diff --git a/trunk/arch/arm/mach-omap1/Kconfig b/trunk/arch/arm/mach-omap1/Kconfig index e0a028161dde..8d2f2daba0c0 100644 --- a/trunk/arch/arm/mach-omap1/Kconfig +++ b/trunk/arch/arm/mach-omap1/Kconfig @@ -9,7 +9,6 @@ config ARCH_OMAP730 depends on ARCH_OMAP1 bool "OMAP730 Based System" select CPU_ARM926T - select OMAP_MPU_TIMER select ARCH_OMAP_OTG config ARCH_OMAP850 @@ -23,7 +22,6 @@ config ARCH_OMAP15XX default y bool "OMAP15xx Based System" select CPU_ARM925T - select OMAP_MPU_TIMER config ARCH_OMAP16XX depends on ARCH_OMAP1 diff --git a/trunk/arch/arm/mach-omap1/Makefile b/trunk/arch/arm/mach-omap1/Makefile index ba6009f27677..6ee19504845f 100644 --- a/trunk/arch/arm/mach-omap1/Makefile +++ b/trunk/arch/arm/mach-omap1/Makefile @@ -3,11 +3,12 @@ # # Common support -obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o +obj-y := io.o id.o sram.o irq.o mux.o flash.o serial.o devices.o dma.o obj-y += clock.o clock_data.o opp_data.o obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o +obj-$(CONFIG_OMAP_MPU_TIMER) += time.o obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o # Power Management diff --git a/trunk/arch/arm/mach-omap1/include/mach/entry-macro.S b/trunk/arch/arm/mach-omap1/include/mach/entry-macro.S index bfb4fb1d7382..c9be6d4d83e2 100644 --- a/trunk/arch/arm/mach-omap1/include/mach/entry-macro.S +++ b/trunk/arch/arm/mach-omap1/include/mach/entry-macro.S @@ -14,6 +14,19 @@ #include #include +/* + * We use __glue to avoid errors with multiple definitions of + * .globl omap_irq_flags as it's included from entry-armv.S but not + * from entry-common.S. + */ +#ifdef __glue + .pushsection .data + .globl omap_irq_flags +omap_irq_flags: + .word 0 + .popsection +#endif + .macro disable_fiq .endm diff --git a/trunk/arch/arm/mach-omap1/irq.c b/trunk/arch/arm/mach-omap1/irq.c index 731dd33bff51..47701584df35 100644 --- a/trunk/arch/arm/mach-omap1/irq.c +++ b/trunk/arch/arm/mach-omap1/irq.c @@ -57,7 +57,6 @@ struct omap_irq_bank { unsigned long wake_enable; }; -u32 omap_irq_flags; static unsigned int irq_bank_count; static struct omap_irq_bank *irq_banks; @@ -177,6 +176,7 @@ static struct irq_chip omap_irq_chip = { void __init omap_init_irq(void) { + extern unsigned int omap_irq_flags; int i, j; #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) diff --git a/trunk/arch/arm/mach-omap1/time.c b/trunk/arch/arm/mach-omap1/time.c index f83fc335c613..ed7a61ff916a 100644 --- a/trunk/arch/arm/mach-omap1/time.c +++ b/trunk/arch/arm/mach-omap1/time.c @@ -44,21 +44,16 @@ #include #include #include -#include #include #include #include #include -#include - #include #include #include -#ifdef CONFIG_OMAP_MPU_TIMER - #define OMAP_MPU_TIMER_BASE OMAP_MPU_TIMER1_BASE #define OMAP_MPU_TIMER_OFFSET 0x100 @@ -72,7 +67,7 @@ typedef struct { ((volatile omap_mpu_timer_regs_t*)OMAP1_IO_ADDRESS(OMAP_MPU_TIMER_BASE + \ (n)*OMAP_MPU_TIMER_OFFSET)) -static inline unsigned long notrace omap_mpu_timer_read(int nr) +static inline unsigned long omap_mpu_timer_read(int nr) { volatile omap_mpu_timer_regs_t* timer = omap_mpu_timer_base(nr); return timer->read_tim; @@ -217,32 +212,6 @@ static struct clocksource clocksource_mpu = { .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; -static DEFINE_CLOCK_DATA(cd); - -static inline unsigned long long notrace _omap_mpu_sched_clock(void) -{ - u32 cyc = mpu_read(&clocksource_mpu); - return cyc_to_sched_clock(&cd, cyc, (u32)~0); -} - -#ifndef CONFIG_OMAP_32K_TIMER -unsigned long long notrace sched_clock(void) -{ - return _omap_mpu_sched_clock(); -} -#else -static unsigned long long notrace omap_mpu_sched_clock(void) -{ - return _omap_mpu_sched_clock(); -} -#endif - -static void notrace mpu_update_sched_clock(void) -{ - u32 cyc = mpu_read(&clocksource_mpu); - update_sched_clock(&cd, cyc, (u32)~0); -} - static void __init omap_init_clocksource(unsigned long rate) { static char err[] __initdata = KERN_ERR @@ -250,13 +219,17 @@ static void __init omap_init_clocksource(unsigned long rate) setup_irq(INT_TIMER2, &omap_mpu_timer2_irq); omap_mpu_timer_start(1, ~0, 1); - init_sched_clock(&cd, mpu_update_sched_clock, 32, rate); if (clocksource_register_hz(&clocksource_mpu, rate)) printk(err, clocksource_mpu.name); } -static void __init omap_mpu_timer_init(void) +/* + * --------------------------------------------------------------------------- + * Timer initialization + * --------------------------------------------------------------------------- + */ +static void __init omap_timer_init(void) { struct clk *ck_ref = clk_get(NULL, "ck_ref"); unsigned long rate; @@ -273,66 +246,6 @@ static void __init omap_mpu_timer_init(void) omap_init_clocksource(rate); } -#else -static inline void omap_mpu_timer_init(void) -{ - pr_err("Bogus timer, should not happen\n"); -} -#endif /* CONFIG_OMAP_MPU_TIMER */ - -#if defined(CONFIG_OMAP_MPU_TIMER) && defined(CONFIG_OMAP_32K_TIMER) -static unsigned long long (*preferred_sched_clock)(void); - -unsigned long long notrace sched_clock(void) -{ - if (!preferred_sched_clock) - return 0; - - return preferred_sched_clock(); -} - -static inline void preferred_sched_clock_init(bool use_32k_sched_clock) -{ - if (use_32k_sched_clock) - preferred_sched_clock = omap_32k_sched_clock; - else - preferred_sched_clock = omap_mpu_sched_clock; -} -#else -static inline void preferred_sched_clock_init(bool use_32k_sched_clcok) -{ -} -#endif - -static inline int omap_32k_timer_usable(void) -{ - int res = false; - - if (cpu_is_omap730() || cpu_is_omap15xx()) - return res; - -#ifdef CONFIG_OMAP_32K_TIMER - res = omap_32k_timer_init(); -#endif - - return res; -} - -/* - * --------------------------------------------------------------------------- - * Timer initialization - * --------------------------------------------------------------------------- - */ -static void __init omap_timer_init(void) -{ - if (omap_32k_timer_usable()) { - preferred_sched_clock_init(1); - } else { - omap_mpu_timer_init(); - preferred_sched_clock_init(0); - } -} - struct sys_timer omap_timer = { .init = omap_timer_init, }; diff --git a/trunk/arch/arm/mach-omap1/timer32k.c b/trunk/arch/arm/mach-omap1/timer32k.c index 13d7b8f145bd..20cfbcc6c60c 100644 --- a/trunk/arch/arm/mach-omap1/timer32k.c +++ b/trunk/arch/arm/mach-omap1/timer32k.c @@ -52,9 +52,10 @@ #include #include #include -#include #include +struct sys_timer omap_timer; + /* * --------------------------------------------------------------------------- * 32KHz OS timer @@ -180,14 +181,14 @@ static __init void omap_init_32k_timer(void) * Timer initialization * --------------------------------------------------------------------------- */ -bool __init omap_32k_timer_init(void) +static void __init omap_timer_init(void) { - omap_init_clocksource_32k(); - #ifdef CONFIG_OMAP_DM_TIMER omap_dm_timer_init(); #endif omap_init_32k_timer(); - - return true; } + +struct sys_timer omap_timer = { + .init = omap_timer_init, +}; diff --git a/trunk/arch/arm/mach-omap2/board-cm-t3517.c b/trunk/arch/arm/mach-omap2/board-cm-t3517.c index 8f9a64d650ee..5b0c77732dfc 100644 --- a/trunk/arch/arm/mach-omap2/board-cm-t3517.c +++ b/trunk/arch/arm/mach-omap2/board-cm-t3517.c @@ -124,9 +124,8 @@ static inline void cm_t3517_init_hecc(void) {} #if defined(CONFIG_RTC_DRV_V3020) || defined(CONFIG_RTC_DRV_V3020_MODULE) #define RTC_IO_GPIO (153) #define RTC_WR_GPIO (154) -#define RTC_RD_GPIO (53) +#define RTC_RD_GPIO (160) #define RTC_CS_GPIO (163) -#define RTC_CS_EN_GPIO (160) struct v3020_platform_data cm_t3517_v3020_pdata = { .use_gpio = 1, @@ -146,16 +145,6 @@ static struct platform_device cm_t3517_rtc_device = { static void __init cm_t3517_init_rtc(void) { - int err; - - err = gpio_request(RTC_CS_EN_GPIO, "rtc cs en"); - if (err) { - pr_err("CM-T3517: rtc cs en gpio request failed: %d\n", err); - return; - } - - gpio_direction_output(RTC_CS_EN_GPIO, 1); - platform_device_register(&cm_t3517_rtc_device); } #else @@ -225,12 +214,12 @@ static struct mtd_partition cm_t3517_nand_partitions[] = { }, { .name = "linux", - .offset = MTDPART_OFS_APPEND, /* Offset = 0x2A0000 */ + .offset = MTDPART_OFS_APPEND, /* Offset = 0x280000 */ .size = 32 * NAND_BLOCK_SIZE, }, { .name = "rootfs", - .offset = MTDPART_OFS_APPEND, /* Offset = 0x6A0000 */ + .offset = MTDPART_OFS_APPEND, /* Offset = 0x680000 */ .size = MTDPART_SIZ_FULL, }, }; @@ -267,19 +256,11 @@ static void __init cm_t3517_init_irq(void) static struct omap_board_mux board_mux[] __initdata = { /* GPIO186 - Green LED */ OMAP3_MUX(SYS_CLKOUT2, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT), - - /* RTC GPIOs: */ - /* IO - GPIO153 */ + /* RTC GPIOs: IO, WR#, RD#, CS# */ OMAP3_MUX(MCBSP4_DR, OMAP_MUX_MODE4 | OMAP_PIN_INPUT), - /* WR# - GPIO154 */ OMAP3_MUX(MCBSP4_DX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT), - /* RD# - GPIO53 */ - OMAP3_MUX(GPMC_NCS2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT), - /* CS# - GPIO163 */ - OMAP3_MUX(UART3_CTS_RCTX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT), - /* CS EN - GPIO160 */ OMAP3_MUX(MCBSP_CLKS, OMAP_MUX_MODE4 | OMAP_PIN_INPUT), - + OMAP3_MUX(UART3_CTS_RCTX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT), /* HSUSB1 RESET */ OMAP3_MUX(UART2_TX, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT), /* HSUSB2 RESET */ diff --git a/trunk/arch/arm/mach-omap2/board-devkit8000.c b/trunk/arch/arm/mach-omap2/board-devkit8000.c index e906e05bb41b..00bb1fc5e017 100644 --- a/trunk/arch/arm/mach-omap2/board-devkit8000.c +++ b/trunk/arch/arm/mach-omap2/board-devkit8000.c @@ -275,7 +275,8 @@ static struct twl4030_gpio_platform_data devkit8000_gpio_data = { .irq_base = TWL4030_GPIO_IRQ_BASE, .irq_end = TWL4030_GPIO_IRQ_END, .use_leds = true, - .pulldowns = BIT(1) | BIT(2) | BIT(6) | BIT(8) | BIT(13) + .pullups = BIT(1), + .pulldowns = BIT(2) | BIT(6) | BIT(7) | BIT(8) | BIT(13) | BIT(15) | BIT(16) | BIT(17), .setup = devkit8000_twl_gpio_setup, }; diff --git a/trunk/arch/arm/mach-omap2/clock44xx_data.c b/trunk/arch/arm/mach-omap2/clock44xx_data.c index de9ec8ddd2ae..e8cb32fd7f13 100644 --- a/trunk/arch/arm/mach-omap2/clock44xx_data.c +++ b/trunk/arch/arm/mach-omap2/clock44xx_data.c @@ -34,6 +34,7 @@ #include "cm2_44xx.h" #include "cm-regbits-44xx.h" #include "prm44xx.h" +#include "prm44xx.h" #include "prm-regbits-44xx.h" #include "control.h" #include "scrm44xx.h" diff --git a/trunk/arch/arm/mach-omap2/clockdomain.c b/trunk/arch/arm/mach-omap2/clockdomain.c index 58e42f76603f..e20b98636ab4 100644 --- a/trunk/arch/arm/mach-omap2/clockdomain.c +++ b/trunk/arch/arm/mach-omap2/clockdomain.c @@ -423,12 +423,6 @@ int clkdm_add_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2) { struct clkdm_dep *cd; - if (!cpu_is_omap24xx() && !cpu_is_omap34xx()) { - pr_err("clockdomain: %s/%s: %s: not yet implemented\n", - clkdm1->name, clkdm2->name, __func__); - return -EINVAL; - } - if (!clkdm1 || !clkdm2) return -EINVAL; @@ -464,12 +458,6 @@ int clkdm_del_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2) { struct clkdm_dep *cd; - if (!cpu_is_omap24xx() && !cpu_is_omap34xx()) { - pr_err("clockdomain: %s/%s: %s: not yet implemented\n", - clkdm1->name, clkdm2->name, __func__); - return -EINVAL; - } - if (!clkdm1 || !clkdm2) return -EINVAL; @@ -512,12 +500,6 @@ int clkdm_read_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2) if (!clkdm1 || !clkdm2) return -EINVAL; - if (!cpu_is_omap24xx() && !cpu_is_omap34xx()) { - pr_err("clockdomain: %s/%s: %s: not yet implemented\n", - clkdm1->name, clkdm2->name, __func__); - return -EINVAL; - } - cd = _clkdm_deps_lookup(clkdm2, clkdm1->wkdep_srcs); if (IS_ERR(cd)) { pr_debug("clockdomain: hardware cannot set/clear wake up of " @@ -545,12 +527,6 @@ int clkdm_clear_all_wkdeps(struct clockdomain *clkdm) struct clkdm_dep *cd; u32 mask = 0; - if (!cpu_is_omap24xx() && !cpu_is_omap34xx()) { - pr_err("clockdomain: %s: %s: not yet implemented\n", - clkdm->name, __func__); - return -EINVAL; - } - if (!clkdm) return -EINVAL; @@ -854,7 +830,8 @@ void omap2_clkdm_allow_idle(struct clockdomain *clkdm) * dependency code and data for OMAP4. */ if (cpu_is_omap44xx()) { - pr_err("clockdomain: %s: OMAP4 wakeup/sleep dependency support: not yet implemented\n", clkdm->name); + WARN_ONCE(1, "clockdomain: OMAP4 wakeup/sleep dependency " + "support is not yet implemented\n"); } else { if (atomic_read(&clkdm->usecount) > 0) _clkdm_add_autodeps(clkdm); @@ -895,7 +872,8 @@ void omap2_clkdm_deny_idle(struct clockdomain *clkdm) * dependency code and data for OMAP4. */ if (cpu_is_omap44xx()) { - pr_err("clockdomain: %s: OMAP4 wakeup/sleep dependency support: not yet implemented\n", clkdm->name); + WARN_ONCE(1, "clockdomain: OMAP4 wakeup/sleep dependency " + "support is not yet implemented\n"); } else { if (atomic_read(&clkdm->usecount) > 0) _clkdm_del_autodeps(clkdm); diff --git a/trunk/arch/arm/mach-omap2/clockdomains44xx_data.c b/trunk/arch/arm/mach-omap2/clockdomains44xx_data.c index 10622c914abc..51920fc7fc52 100644 --- a/trunk/arch/arm/mach-omap2/clockdomains44xx_data.c +++ b/trunk/arch/arm/mach-omap2/clockdomains44xx_data.c @@ -30,6 +30,8 @@ #include "cm1_44xx.h" #include "cm2_44xx.h" +#include "cm1_44xx.h" +#include "cm2_44xx.h" #include "cm-regbits-44xx.h" #include "prm44xx.h" #include "prcm44xx.h" diff --git a/trunk/arch/arm/mach-omap2/dma.c b/trunk/arch/arm/mach-omap2/dma.c index 34922b2d2e3f..d2f15f5cfd36 100644 --- a/trunk/arch/arm/mach-omap2/dma.c +++ b/trunk/arch/arm/mach-omap2/dma.c @@ -264,7 +264,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused) if (IS_ERR(od)) { pr_err("%s: Cant build omap_device for %s:%s.\n", __func__, name, oh->name); - return PTR_ERR(od); + return IS_ERR(od); } mem = platform_get_resource(&od->pdev, IORESOURCE_MEM, 0); diff --git a/trunk/arch/arm/mach-omap2/include/mach/entry-macro.S b/trunk/arch/arm/mach-omap2/include/mach/entry-macro.S index 81985a665cb3..befa321c4c13 100644 --- a/trunk/arch/arm/mach-omap2/include/mach/entry-macro.S +++ b/trunk/arch/arm/mach-omap2/include/mach/entry-macro.S @@ -38,6 +38,20 @@ */ #ifdef MULTI_OMAP2 + +/* + * We use __glue to avoid errors with multiple definitions of + * .globl omap_irq_base as it's included from entry-armv.S but not + * from entry-common.S. + */ +#ifdef __glue + .pushsection .data + .globl omap_irq_base +omap_irq_base: + .word 0 + .popsection +#endif + /* * Configure the interrupt base on the first interrupt. * See also omap_irq_base_init for setting omap_irq_base. diff --git a/trunk/arch/arm/mach-omap2/io.c b/trunk/arch/arm/mach-omap2/io.c index c2032041d26f..e66687b0b9de 100644 --- a/trunk/arch/arm/mach-omap2/io.c +++ b/trunk/arch/arm/mach-omap2/io.c @@ -314,13 +314,14 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) return omap_hwmod_set_postsetup_state(oh, *(u8 *)data); } -void __iomem *omap_irq_base; - /* * Initialize asm_irq_base for entry-macro.S */ static inline void omap_irq_base_init(void) { + extern void __iomem *omap_irq_base; + +#ifdef MULTI_OMAP2 if (cpu_is_omap24xx()) omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE); else if (cpu_is_omap34xx()) @@ -329,6 +330,7 @@ static inline void omap_irq_base_init(void) omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP44XX_GIC_CPU_BASE); else pr_err("Could not initialize omap_irq_base\n"); +#endif } void __init omap2_init_common_infrastructure(void) diff --git a/trunk/arch/arm/mach-omap2/mux.c b/trunk/arch/arm/mach-omap2/mux.c index fae49d12bc76..df8d2f2872c6 100644 --- a/trunk/arch/arm/mach-omap2/mux.c +++ b/trunk/arch/arm/mach-omap2/mux.c @@ -160,7 +160,7 @@ static int __init _omap_mux_get_by_name(struct omap_mux_partition *partition, struct omap_mux *mux = NULL; struct omap_mux_entry *e; const char *mode_name; - int found = 0, found_mode = 0, mode0_len = 0; + int found = 0, found_mode, mode0_len = 0; struct list_head *muxmodes = &partition->muxmodes; mode_name = strchr(muxname, '.'); diff --git a/trunk/arch/arm/mach-omap2/pm24xx.c b/trunk/arch/arm/mach-omap2/pm24xx.c index 97feb3ab6a69..9e5dc8ed51e9 100644 --- a/trunk/arch/arm/mach-omap2/pm24xx.c +++ b/trunk/arch/arm/mach-omap2/pm24xx.c @@ -134,7 +134,7 @@ static void omap2_enter_full_retention(void) /* Block console output in case it is on one of the OMAP UARTs */ if (!is_suspending()) - if (!console_trylock()) + if (try_acquire_console_sem()) goto no_sleep; omap_uart_prepare_idle(0); @@ -151,7 +151,7 @@ static void omap2_enter_full_retention(void) omap_uart_resume_idle(0); if (!is_suspending()) - console_unlock(); + release_console_sem(); no_sleep: if (omap2_pm_debug) { diff --git a/trunk/arch/arm/mach-omap2/pm34xx.c b/trunk/arch/arm/mach-omap2/pm34xx.c index a4aa1920a75c..8cbbeade4b8a 100644 --- a/trunk/arch/arm/mach-omap2/pm34xx.c +++ b/trunk/arch/arm/mach-omap2/pm34xx.c @@ -398,7 +398,7 @@ void omap_sram_idle(void) if (!is_suspending()) if (per_next_state < PWRDM_POWER_ON || core_next_state < PWRDM_POWER_ON) - if (!console_trylock()) + if (try_acquire_console_sem()) goto console_still_active; /* PER */ @@ -481,7 +481,7 @@ void omap_sram_idle(void) } if (!is_suspending()) - console_unlock(); + release_console_sem(); console_still_active: /* Disable IO-PAD and IO-CHAIN wakeup */ diff --git a/trunk/arch/arm/mach-omap2/powerdomain2xxx_3xxx.c b/trunk/arch/arm/mach-omap2/powerdomain2xxx_3xxx.c index cf600e22bf8e..d5233890370c 100644 --- a/trunk/arch/arm/mach-omap2/powerdomain2xxx_3xxx.c +++ b/trunk/arch/arm/mach-omap2/powerdomain2xxx_3xxx.c @@ -19,6 +19,7 @@ #include #include "powerdomain.h" +#include "prm-regbits-34xx.h" #include "prm.h" #include "prm-regbits-24xx.h" #include "prm-regbits-34xx.h" diff --git a/trunk/arch/arm/mach-omap2/serial.c b/trunk/arch/arm/mach-omap2/serial.c index 32e91a9c8b6b..302da7403a10 100644 --- a/trunk/arch/arm/mach-omap2/serial.c +++ b/trunk/arch/arm/mach-omap2/serial.c @@ -812,7 +812,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata) oh->dev_attr = uart; - console_lock(); /* in case the earlycon is on the UART */ + acquire_console_sem(); /* in case the earlycon is on the UART */ /* * Because of early UART probing, UART did not get idled @@ -838,7 +838,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata) omap_uart_block_sleep(uart); uart->timeout = DEFAULT_TIMEOUT; - console_unlock(); + release_console_sem(); if ((cpu_is_omap34xx() && uart->padconf) || (uart->wk_en && uart->wk_mask)) { diff --git a/trunk/arch/arm/mach-omap2/timer-gp.c b/trunk/arch/arm/mach-omap2/timer-gp.c index 7b7c2683ae7b..4e48e786bec7 100644 --- a/trunk/arch/arm/mach-omap2/timer-gp.c +++ b/trunk/arch/arm/mach-omap2/timer-gp.c @@ -42,8 +42,6 @@ #include "timer-gp.h" -#include - /* MAX_GPTIMER_ID: number of GPTIMERs on the chip */ #define MAX_GPTIMER_ID 12 @@ -178,14 +176,10 @@ static void __init omap2_gp_clockevent_init(void) /* * When 32k-timer is enabled, don't use GPTimer for clocksource * instead, just leave default clocksource which uses the 32k - * sync counter. See clocksource setup in plat-omap/counter_32k.c + * sync counter. See clocksource setup in see plat-omap/common.c. */ -static void __init omap2_gp_clocksource_init(void) -{ - omap_init_clocksource_32k(); -} - +static inline void __init omap2_gp_clocksource_init(void) {} #else /* * clocksource diff --git a/trunk/arch/arm/mach-realview/Kconfig b/trunk/arch/arm/mach-realview/Kconfig index 7ca138a943a9..b4575ae9648e 100644 --- a/trunk/arch/arm/mach-realview/Kconfig +++ b/trunk/arch/arm/mach-realview/Kconfig @@ -2,56 +2,52 @@ menu "RealView platform type" depends on ARCH_REALVIEW config MACH_REALVIEW_EB - bool "Support RealView(R) Emulation Baseboard" + bool "Support RealView/EB platform" select ARM_GIC help - Include support for the ARM(R) RealView(R) Emulation Baseboard - platform. + Include support for the ARM(R) RealView Emulation Baseboard platform. config REALVIEW_EB_A9MP - bool "Support Multicore Cortex-A9 Tile" + bool "Support Multicore Cortex-A9" depends on MACH_REALVIEW_EB select CPU_V7 help - Enable support for the Cortex-A9MPCore tile fitted to the - Realview(R) Emulation Baseboard platform. + Enable support for the Cortex-A9MPCore tile on the Realview platform. config REALVIEW_EB_ARM11MP - bool "Support ARM11MPCore Tile" + bool "Support ARM11MPCore tile" depends on MACH_REALVIEW_EB select CPU_V6 select ARCH_HAS_BARRIERS if SMP help - Enable support for the ARM11MPCore tile fitted to the Realview(R) - Emulation Baseboard platform. + Enable support for the ARM11MPCore tile on the Realview platform. config REALVIEW_EB_ARM11MP_REVB - bool "Support ARM11MPCore RevB Tile" + bool "Support ARM11MPCore RevB tile" depends on REALVIEW_EB_ARM11MP help - Enable support for the ARM11MPCore Revision B tile on the - Realview(R) Emulation Baseboard platform. Since there are device - address differences, a kernel built with this option enabled is - not compatible with other revisions of the ARM11MPCore tile. + Enable support for the ARM11MPCore RevB tile on the Realview + platform. Since there are device address differences, a + kernel built with this option enabled is not compatible with + other revisions of the ARM11MPCore tile. config MACH_REALVIEW_PB11MP - bool "Support RealView(R) Platform Baseboard for ARM11MPCore" + bool "Support RealView/PB11MPCore platform" select CPU_V6 select ARM_GIC select HAVE_PATA_PLATFORM select ARCH_HAS_BARRIERS if SMP help - Include support for the ARM(R) RealView(R) Platform Baseboard for - the ARM11MPCore. This platform has an on-board ARM11MPCore and has + Include support for the ARM(R) RealView MPCore Platform Baseboard. + PB11MPCore is a platform with an on-board ARM11MPCore and has support for PCI-E and Compact Flash. config MACH_REALVIEW_PB1176 - bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S" + bool "Support RealView/PB1176 platform" select CPU_V6 select ARM_GIC help - Include support for the ARM(R) RealView(R) Platform Baseboard for - ARM1176JZF-S. + Include support for the ARM(R) RealView ARM1176 Platform Baseboard. config REALVIEW_PB1176_SECURE_FLASH bool "Allow access to the secure flash memory block" @@ -63,24 +59,23 @@ config REALVIEW_PB1176_SECURE_FLASH block (64MB @ 0x3c000000) is required. config MACH_REALVIEW_PBA8 - bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform" + bool "Support RealView/PB-A8 platform" select CPU_V7 select ARM_GIC select HAVE_PATA_PLATFORM help - Include support for the ARM(R) RealView Platform Baseboard for - Cortex(tm)-A8. This platform has an on-board Cortex-A8 and has - support for PCI-E and Compact Flash. + Include support for the ARM(R) RealView Cortex-A8 Platform Baseboard. + PB-A8 is a platform with an on-board Cortex-A8 and has support for + PCI-E and Compact Flash. config MACH_REALVIEW_PBX - bool "Support RealView(R) Platform Baseboard Explore" + bool "Support RealView/PBX platform" select ARM_GIC select HAVE_PATA_PLATFORM select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET select ZONE_DMA if SPARSEMEM help - Include support for the ARM(R) RealView(R) Platform Baseboard - Explore. + Include support for the ARM(R) RealView PBX platform. config REALVIEW_HIGH_PHYS_OFFSET bool "High physical base address for the RealView platform" diff --git a/trunk/arch/arm/mach-realview/platsmp.c b/trunk/arch/arm/mach-realview/platsmp.c index 6959d13d908a..a22bf67f2f78 100644 --- a/trunk/arch/arm/mach-realview/platsmp.c +++ b/trunk/arch/arm/mach-realview/platsmp.c @@ -41,7 +41,7 @@ volatile int __cpuinitdata pen_release = -1; * observers, irrespective of whether they're taking part in coherency * or not. This is necessary for the hotplug code to work reliably. */ -static void __cpuinit write_pen_release(int val) +static void write_pen_release(int val) { pen_release = val; smp_wmb(); diff --git a/trunk/arch/arm/mach-shmobile/Kconfig b/trunk/arch/arm/mach-shmobile/Kconfig index 0c8f6cf3e948..4d1b4c5c9389 100644 --- a/trunk/arch/arm/mach-shmobile/Kconfig +++ b/trunk/arch/arm/mach-shmobile/Kconfig @@ -60,8 +60,6 @@ endchoice config MACH_AG5EVM bool "AG5EVM board" - select ARCH_REQUIRE_GPIOLIB - select SH_LCD_MIPI_DSI depends on ARCH_SH73A0 config MACH_MACKEREL diff --git a/trunk/arch/arm/mach-shmobile/board-ag5evm.c b/trunk/arch/arm/mach-shmobile/board-ag5evm.c index 2123b96b5638..c18a740a4159 100644 --- a/trunk/arch/arm/mach-shmobile/board-ag5evm.c +++ b/trunk/arch/arm/mach-shmobile/board-ag5evm.c @@ -34,10 +34,9 @@ #include #include #include -#include -#include