From bec21e069414ce81e87f25e973a5f935eeabe6d1 Mon Sep 17 00:00:00 2001 From: Mayuresh Janorkar Date: Tue, 17 May 2011 17:49:40 +0530 Subject: [PATCH] --- yaml --- r: 271358 b: refs/heads/master c: 24305db864cd62bf4279f745528c3238cbaf1c12 h: refs/heads/master v: v3 --- [refs] | 2 +- .../ABI/testing/sysfs-class-scsi_host | 13 - trunk/Documentation/cgroups/memory.txt | 85 +- trunk/Documentation/fb/udlfb.txt | 39 +- trunk/Documentation/hwmon/coretemp | 14 +- trunk/Documentation/kernel-parameters.txt | 9 +- trunk/Documentation/networking/dmfe.txt | 3 +- trunk/Documentation/networking/ip-sysctl.txt | 4 +- trunk/Documentation/networking/scaling.txt | 2 +- trunk/Documentation/vm/transhuge.txt | 7 +- trunk/MAINTAINERS | 30 +- trunk/Makefile | 2 +- trunk/arch/alpha/Kconfig | 2 +- trunk/arch/arm/Kconfig | 14 - trunk/arch/arm/boot/dts/tegra-harmony.dts | 12 +- trunk/arch/arm/boot/dts/tegra-seaboard.dts | 6 +- trunk/arch/arm/include/asm/futex.h | 34 +- trunk/arch/arm/include/asm/unistd.h | 4 +- trunk/arch/arm/kernel/smp_scu.c | 10 - trunk/arch/arm/kernel/vmlinux.lds.S | 15 +- trunk/arch/arm/mach-dove/common.c | 2 +- trunk/arch/arm/mach-exynos4/clock.c | 8 +- trunk/arch/arm/mach-exynos4/mct.c | 10 +- trunk/arch/arm/mach-exynos4/platsmp.c | 2 - trunk/arch/arm/mach-exynos4/setup-keypad.c | 11 +- .../arch/arm/mach-integrator/integrator_ap.c | 2 - trunk/arch/arm/mach-integrator/pci_v3.c | 2 + trunk/arch/arm/mach-s3c2443/clock.c | 2 +- trunk/arch/arm/mach-s3c64xx/mach-smdk6410.c | 39 + trunk/arch/arm/mach-s5pv210/clock.c | 6 +- trunk/arch/arm/mach-shmobile/board-mackerel.c | 1 - trunk/arch/arm/mm/cache-v7.S | 20 - trunk/arch/arm/mm/dma-mapping.c | 2 - trunk/arch/arm/plat-s5p/irq-gpioint.c | 9 +- trunk/arch/arm/plat-samsung/clock.c | 11 - .../arm/plat-samsung/include/plat/clock.h | 8 - .../include/plat/watchdog-reset.h | 10 +- .../powerpc/platforms/512x/mpc512x_shared.c | 24 +- trunk/arch/powerpc/platforms/85xx/p1022_ds.c | 47 +- .../powerpc/platforms/86xx/mpc8610_hpcd.c | 55 +- trunk/arch/powerpc/platforms/powermac/pci.c | 14 - trunk/arch/powerpc/sysdev/fsl_soc.h | 25 +- trunk/arch/s390/include/asm/elf.h | 3 +- trunk/arch/s390/include/asm/pgtable.h | 2 - trunk/arch/s390/kernel/asm-offsets.c | 3 - trunk/arch/s390/kernel/entry64.S | 6 - trunk/arch/s390/kvm/kvm-s390.c | 5 +- trunk/arch/s390/mm/pgtable.c | 17 +- trunk/arch/sparc/include/asm/spitfire.h | 2 - trunk/arch/sparc/include/asm/xor_64.h | 4 +- trunk/arch/sparc/kernel/cpu.c | 12 - trunk/arch/sparc/kernel/cpumap.c | 2 - trunk/arch/sparc/kernel/head_64.S | 25 +- trunk/arch/sparc/kernel/process_32.c | 3 +- trunk/arch/sparc/kernel/process_64.c | 3 + trunk/arch/sparc/kernel/setup_32.c | 2 +- trunk/arch/sparc/kernel/setup_64.c | 18 +- trunk/arch/sparc/mm/init_64.c | 5 - trunk/arch/um/Kconfig.x86 | 4 - trunk/arch/um/Makefile | 2 +- trunk/arch/um/drivers/line.c | 61 +- trunk/arch/um/drivers/xterm.c | 1 - trunk/arch/um/include/asm/ptrace-generic.h | 4 + trunk/arch/um/include/shared/line.h | 1 - trunk/arch/um/include/shared/registers.h | 2 +- trunk/arch/um/kernel/process.c | 2 +- trunk/arch/um/kernel/ptrace.c | 28 + trunk/arch/um/os-Linux/registers.c | 9 +- trunk/arch/um/os-Linux/skas/mem.c | 2 +- trunk/arch/um/os-Linux/skas/process.c | 19 +- trunk/arch/um/sys-i386/asm/ptrace.h | 5 + trunk/arch/um/sys-i386/ptrace.c | 28 +- trunk/arch/um/sys-i386/shared/sysdep/ptrace.h | 1 - trunk/arch/um/sys-x86_64/ptrace.c | 12 +- .../arch/um/sys-x86_64/shared/sysdep/ptrace.h | 1 - trunk/arch/x86/include/asm/alternative-asm.h | 1 + trunk/arch/x86/include/asm/alternative.h | 4 + trunk/arch/x86/include/asm/cpufeature.h | 2 + trunk/arch/x86/kernel/rtc.c | 23 +- trunk/arch/x86/kvm/emulate.c | 2 +- trunk/arch/x86/kvm/mmu.c | 3 +- trunk/arch/x86/platform/mrst/vrtc.c | 9 - trunk/arch/x86/xen/mmu.c | 6 +- trunk/arch/x86/xen/setup.c | 10 +- trunk/arch/x86/xen/smp.c | 1 + trunk/arch/x86/xen/time.c | 5 +- trunk/block/blk-cgroup.c | 37 +- trunk/block/blk-core.c | 28 +- trunk/block/blk-softirq.c | 2 +- trunk/block/blk-sysfs.c | 15 +- trunk/block/cfq-iosched.c | 20 +- trunk/drivers/acpi/acpica/acconfig.h | 2 +- trunk/drivers/acpi/apei/Kconfig | 1 - trunk/drivers/acpi/apei/apei-base.c | 2 +- trunk/drivers/base/power/clock_ops.c | 75 +- trunk/drivers/block/floppy.c | 8 +- trunk/drivers/block/xen-blkback/common.h | 2 +- trunk/drivers/block/xen-blkback/xenbus.c | 6 +- trunk/drivers/bluetooth/btusb.c | 6 - trunk/drivers/bluetooth/btwilink.c | 16 +- trunk/drivers/char/tpm/Kconfig | 1 - trunk/drivers/char/tpm/tpm.c | 9 +- trunk/drivers/char/tpm/tpm_nsc.c | 2 + trunk/drivers/cpufreq/pcc-cpufreq.c | 3 - trunk/drivers/firewire/ohci.c | 3 - trunk/drivers/gpio/gpio-generic.c | 15 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 4 +- trunk/drivers/gpu/drm/i915/intel_display.c | 22 +- trunk/drivers/gpu/drm/i915/intel_drv.h | 3 + trunk/drivers/gpu/drm/i915/intel_sdvo.c | 88 +- trunk/drivers/gpu/drm/radeon/atombios_dp.c | 16 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 58 +- trunk/drivers/gpu/drm/radeon/ni.c | 44 +- trunk/drivers/gpu/drm/radeon/r100.c | 22 +- trunk/drivers/gpu/drm/radeon/r200.c | 4 +- trunk/drivers/gpu/drm/radeon/r600.c | 14 +- trunk/drivers/gpu/drm/radeon/radeon.h | 7 +- trunk/drivers/gpu/drm/radeon/radeon_asic.h | 8 +- .../gpu/drm/radeon/radeon_connectors.c | 8 +- trunk/drivers/gpu/drm/radeon/radeon_cursor.c | 40 +- trunk/drivers/gpu/drm/radeon/radeon_display.c | 2 +- .../drivers/gpu/drm/radeon/radeon_encoders.c | 9 +- trunk/drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- trunk/drivers/gpu/drm/radeon/rv770.c | 51 + trunk/drivers/gpu/drm/ttm/ttm_bo.c | 3 +- trunk/drivers/hid/hid-wacom.c | 2 - trunk/drivers/hwmon/coretemp.c | 216 +- trunk/drivers/hwmon/ds620.c | 2 +- trunk/drivers/hwmon/pmbus/pmbus_core.c | 9 +- trunk/drivers/hwmon/w83791d.c | 4 +- trunk/drivers/ide/ide-disk.c | 7 +- trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c | 10 +- trunk/drivers/input/keyboard/adp5588-keys.c | 1 + trunk/drivers/input/misc/cm109.c | 2 +- trunk/drivers/input/mouse/bcm5974.c | 20 - trunk/drivers/input/tablet/wacom_sys.c | 14 + trunk/drivers/input/tablet/wacom_wac.c | 45 +- trunk/drivers/input/touchscreen/wacom_w8001.c | 2 - trunk/drivers/iommu/dmar.c | 2 +- trunk/drivers/leds/ledtrig-timer.c | 2 - trunk/drivers/media/video/omap/omap_vout.c | 13 + trunk/drivers/media/video/omap3isp/ispccdc.c | 1 - trunk/drivers/media/video/uvc/uvc_driver.c | 2 +- trunk/drivers/media/video/uvc/uvc_entity.c | 2 +- trunk/drivers/media/video/uvc/uvc_video.c | 10 +- trunk/drivers/media/video/uvc/uvcvideo.h | 2 +- trunk/drivers/media/video/v4l2-dev.c | 11 - trunk/drivers/media/video/v4l2-device.c | 2 - trunk/drivers/mfd/jz4740-adc.c | 2 +- trunk/drivers/mfd/max8997.c | 5 - trunk/drivers/mfd/omap-usb-host.c | 2 +- trunk/drivers/mfd/tps65910-irq.c | 2 - trunk/drivers/mfd/twl4030-madc.c | 5 +- trunk/drivers/mfd/wm8350-gpio.c | 4 +- trunk/drivers/misc/lis3lv02d/lis3lv02d.c | 14 +- trunk/drivers/misc/pti.c | 12 +- trunk/drivers/mmc/card/block.c | 3 - trunk/drivers/net/Kconfig | 11 +- trunk/drivers/net/bnx2x/bnx2x.h | 124 +- trunk/drivers/net/bnx2x/bnx2x_cmn.c | 27 +- trunk/drivers/net/bnx2x/bnx2x_dcb.c | 1 - trunk/drivers/net/bnx2x/bnx2x_ethtool.c | 48 +- trunk/drivers/net/bnx2x/bnx2x_link.c | 46 +- trunk/drivers/net/bnx2x/bnx2x_main.c | 178 +- trunk/drivers/net/bnx2x/bnx2x_reg.h | 19 +- trunk/drivers/net/bnx2x/bnx2x_stats.c | 7 +- trunk/drivers/net/bonding/bond_3ad.c | 3 +- trunk/drivers/net/bonding/bond_alb.c | 3 +- trunk/drivers/net/bonding/bond_main.c | 13 +- trunk/drivers/net/can/ti_hecc.c | 1 - trunk/drivers/net/cxgb3/cxgb3_offload.c | 23 +- trunk/drivers/net/cxgb3/l2t.c | 15 +- trunk/drivers/net/cxgb3/l2t.h | 16 +- trunk/drivers/net/cxgb4/cxgb4_main.c | 3 - trunk/drivers/net/e1000/e1000_hw.c | 6 - trunk/drivers/net/gianfar_ethtool.c | 8 +- trunk/drivers/net/greth.c | 12 +- trunk/drivers/net/greth.h | 1 - trunk/drivers/net/ibmveth.c | 52 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 4 +- trunk/drivers/net/netconsole.c | 8 +- trunk/drivers/net/pch_gbe/pch_gbe.h | 12 +- trunk/drivers/net/pch_gbe/pch_gbe_main.c | 346 ++- trunk/drivers/net/phy/dp83640.c | 4 +- trunk/drivers/net/ppp_generic.c | 7 +- trunk/drivers/net/pxa168_eth.c | 1 - trunk/drivers/net/r8169.c | 32 +- trunk/drivers/net/sfc/efx.c | 18 +- trunk/drivers/net/sfc/io.h | 6 + trunk/drivers/net/sfc/mcdi.c | 46 +- trunk/drivers/net/sfc/nic.c | 7 + trunk/drivers/net/sfc/nic.h | 2 + trunk/drivers/net/sfc/siena.c | 25 +- trunk/drivers/net/sfc/workarounds.h | 2 + trunk/drivers/net/tg3.c | 2 + trunk/drivers/net/usb/ipheth.c | 5 - .../net/wireless/ath/ath9k/ar9002_calib.c | 3 +- .../wireless/ath/ath9k/ar9003_2p2_initvals.h | 2 +- .../net/wireless/ath/ath9k/ar9003_phy.c | 2 +- trunk/drivers/net/wireless/ath/ath9k/main.c | 6 - trunk/drivers/net/wireless/ath/ath9k/recv.c | 10 +- trunk/drivers/net/wireless/b43/main.c | 3 +- trunk/drivers/net/wireless/ipw2x00/ipw2100.c | 21 +- trunk/drivers/net/wireless/ipw2x00/ipw2200.c | 39 +- .../net/wireless/iwlegacy/iwl-3945-rs.c | 13 +- .../drivers/net/wireless/iwlegacy/iwl-core.c | 4 +- .../drivers/net/wireless/iwlegacy/iwl-hcmd.c | 2 +- trunk/drivers/net/wireless/iwlegacy/iwl-tx.c | 4 +- .../net/wireless/iwlegacy/iwl3945-base.c | 8 +- .../net/wireless/iwlegacy/iwl4965-base.c | 10 +- .../net/wireless/iwlwifi/iwl-agn-ucode.c | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 5 - trunk/drivers/net/wireless/iwlwifi/iwl-scan.c | 30 +- .../net/wireless/iwlwifi/iwl-trans-tx-pcie.c | 2 - trunk/drivers/net/wireless/rt2x00/rt2800lib.c | 47 +- trunk/drivers/net/wireless/rtlwifi/core.c | 8 - .../net/wireless/rtlwifi/rtl8192cu/trx.c | 11 +- trunk/drivers/net/wireless/rtlwifi/usb.c | 1 - trunk/drivers/net/xen-netback/interface.c | 4 +- trunk/drivers/pci/pci.c | 6 +- trunk/drivers/pci/probe.c | 17 +- trunk/drivers/rtc/rtc-imxdi.c | 1 - trunk/drivers/rtc/rtc-s3c.c | 26 - trunk/drivers/s390/cio/cio.c | 8 +- trunk/drivers/scsi/3w-9xxx.c | 2 - trunk/drivers/scsi/Kconfig | 1 - trunk/drivers/scsi/Makefile | 2 +- trunk/drivers/scsi/aacraid/commsup.c | 2 - trunk/drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- trunk/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 2 +- trunk/drivers/scsi/fcoe/fcoe.c | 13 +- trunk/drivers/scsi/hpsa.c | 57 +- trunk/drivers/scsi/isci/host.c | 13 +- trunk/drivers/scsi/isci/host.h | 3 - trunk/drivers/scsi/isci/init.c | 47 +- trunk/drivers/scsi/isci/phy.c | 13 - trunk/drivers/scsi/isci/registers.h | 12 - trunk/drivers/scsi/isci/request.c | 30 +- .../scsi/isci/unsolicited_frame_control.c | 2 +- .../scsi/isci/unsolicited_frame_control.h | 2 +- trunk/drivers/scsi/libfc/fc_exch.c | 59 +- trunk/drivers/scsi/libfc/fc_fcp.c | 11 +- trunk/drivers/scsi/libfc/fc_lport.c | 11 +- trunk/drivers/scsi/libsas/sas_expander.c | 2 +- trunk/drivers/scsi/qla2xxx/qla_attr.c | 7 +- trunk/drivers/scsi/qla2xxx/qla_dbg.c | 36 +- trunk/drivers/scsi/qla2xxx/qla_def.h | 2 - trunk/drivers/scsi/qla2xxx/qla_fw.h | 5 - trunk/drivers/scsi/qla2xxx/qla_init.c | 3 + trunk/drivers/scsi/qla2xxx/qla_inline.h | 29 - trunk/drivers/scsi/qla2xxx/qla_iocb.c | 282 +-- trunk/drivers/scsi/qla2xxx/qla_isr.c | 109 +- trunk/drivers/scsi/qla2xxx/qla_mid.c | 2 +- trunk/drivers/scsi/qla2xxx/qla_nx.c | 25 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 30 +- trunk/drivers/scsi/qla2xxx/qla_version.h | 2 +- trunk/drivers/spi/spi-fsl-spi.c | 3 - trunk/drivers/spi/spi-imx.c | 4 +- trunk/drivers/spi/spi-topcliff-pch.c | 93 +- .../drivers/staging/comedi/drivers/ni_labpc.c | 4 +- trunk/drivers/staging/xgifb/XGI_main_26.c | 22 +- trunk/drivers/staging/zcache/zcache-main.c | 2 +- .../target/iscsi/iscsi_target_parameters.c | 2 +- .../drivers/target/iscsi/iscsi_target_util.c | 270 ++- trunk/drivers/target/target_core_cdb.c | 35 +- trunk/drivers/target/target_core_transport.c | 9 +- trunk/drivers/target/tcm_fc/tcm_fc.h | 12 +- trunk/drivers/target/tcm_fc/tfc_cmd.c | 90 +- trunk/drivers/target/tcm_fc/tfc_conf.c | 7 +- trunk/drivers/target/tcm_fc/tfc_io.c | 62 +- trunk/drivers/tty/serial/crisv10.c | 4 +- trunk/drivers/usb/host/xhci-hub.c | 2 +- trunk/drivers/usb/host/xhci-ring.c | 19 - trunk/drivers/video/68328fb.c | 4 +- trunk/drivers/video/Kconfig | 34 +- trunk/drivers/video/Makefile | 2 - trunk/drivers/video/acornfb.c | 5 +- trunk/drivers/video/arkfb.c | 9 +- trunk/drivers/video/atmel_lcdfb.c | 15 +- trunk/drivers/video/aty/radeon_base.c | 10 +- trunk/drivers/video/au1100fb.c | 181 +- trunk/drivers/video/au1100fb.h | 6 +- trunk/drivers/video/au1200fb.c | 299 +-- trunk/drivers/video/backlight/adp8860_bl.c | 1 + trunk/drivers/video/backlight/adp8870_bl.c | 1 + trunk/drivers/video/bf54x-lq043fb.c | 2 +- trunk/drivers/video/bfin-lq035q1-fb.c | 2 +- trunk/drivers/video/bfin-t350mcqb-fb.c | 2 +- trunk/drivers/video/bfin_adv7393fb.c | 2 +- trunk/drivers/video/carminefb.c | 6 +- trunk/drivers/video/controlfb.c | 2 +- trunk/drivers/video/da8xx-fb.c | 186 +- trunk/drivers/video/fb-puv3.c | 4 +- trunk/drivers/video/fb_defio.c | 3 +- trunk/drivers/video/fbmem.c | 3 + trunk/drivers/video/fbmon.c | 21 +- trunk/drivers/video/fbsysfs.c | 3 - trunk/drivers/video/fsl-diu-fb.c | 992 ++++---- trunk/drivers/video/g364fb.c | 5 +- trunk/drivers/video/grvga.c | 579 ----- trunk/drivers/video/gxt4500.c | 4 +- trunk/drivers/video/hgafb.c | 4 +- trunk/drivers/video/imsttfb.c | 2 +- trunk/drivers/video/intelfb/intelfbhw.c | 6 +- trunk/drivers/video/mb862xx/mb862xx-i2c.c | 2 +- trunk/drivers/video/mb862xx/mb862xxfbdrv.c | 6 +- trunk/drivers/video/modedb.c | 444 ++-- trunk/drivers/video/msm/mddi.c | 2 +- trunk/drivers/video/msm/mdp.c | 6 +- trunk/drivers/video/mx3fb.c | 19 +- trunk/drivers/video/mxsfb.c | 1 - trunk/drivers/video/neofb.c | 4 +- trunk/drivers/video/nuc900fb.c | 3 +- trunk/drivers/video/omap2/displays/Kconfig | 7 + trunk/drivers/video/omap2/displays/Makefile | 1 + .../video/omap2/displays/panel-picodlp.c | 591 +++++ .../video/omap2/displays/panel-picodlp.h | 288 +++ .../drivers/video/omap2/displays/panel-taal.c | 2 +- trunk/drivers/video/platinumfb.c | 2 +- trunk/drivers/video/pm2fb.c | 6 +- trunk/drivers/video/pm3fb.c | 6 +- trunk/drivers/video/ps3fb.c | 2 +- trunk/drivers/video/pxa3xx-gcu.c | 4 +- trunk/drivers/video/pxafb.c | 2 +- trunk/drivers/video/s3c-fb.c | 117 +- trunk/drivers/video/s3c2410fb.c | 3 +- trunk/drivers/video/s3fb.c | 9 +- trunk/drivers/video/sa1100fb.c | 3 +- trunk/drivers/video/savage/savagefb_driver.c | 16 +- trunk/drivers/video/sh_mobile_hdmi.c | 47 +- trunk/drivers/video/sh_mobile_lcdcfb.c | 1162 +++++----- trunk/drivers/video/sh_mobile_lcdcfb.h | 12 +- trunk/drivers/video/sh_mobile_meram.c | 208 +- trunk/drivers/video/sh_mobile_meram.h | 41 + trunk/drivers/video/sis/sis_main.c | 30 +- trunk/drivers/video/skeletonfb.c | 2 +- trunk/drivers/video/sm501fb.c | 6 +- trunk/drivers/video/smscufx.c | 1994 ----------------- trunk/drivers/video/tmiofb.c | 2 +- trunk/drivers/video/tridentfb.c | 4 +- trunk/drivers/video/udlfb.c | 187 +- trunk/drivers/video/valkyriefb.c | 2 +- trunk/drivers/video/vfb.c | 4 +- trunk/drivers/video/vga16fb.c | 2 +- trunk/drivers/video/via/dvi.c | 34 +- trunk/drivers/video/via/dvi.h | 3 +- trunk/drivers/video/via/global.c | 2 - trunk/drivers/video/via/global.h | 2 - trunk/drivers/video/via/hw.c | 544 ++++- trunk/drivers/video/via/hw.h | 285 ++- trunk/drivers/video/via/lcd.c | 53 +- trunk/drivers/video/via/lcd.h | 7 +- trunk/drivers/video/via/share.h | 23 +- trunk/drivers/video/via/via-core.c | 2 +- trunk/drivers/video/via/via_modesetting.c | 104 - trunk/drivers/video/via/via_modesetting.h | 23 - trunk/drivers/video/via/viafbdev.c | 182 +- trunk/drivers/video/via/viamode.c | 60 +- trunk/drivers/video/via/viamode.h | 4 +- trunk/drivers/video/vt8500lcdfb.c | 6 +- trunk/drivers/video/vt8623fb.c | 9 +- trunk/drivers/video/xilinxfb.c | 1 + trunk/drivers/watchdog/hpwdt.c | 9 +- trunk/drivers/watchdog/lantiq_wdt.c | 8 +- trunk/drivers/watchdog/sbc_epx_c3.c | 2 +- trunk/drivers/watchdog/watchdog_dev.c | 14 +- trunk/drivers/xen/events.c | 40 +- trunk/drivers/zorro/zorro.c | 7 +- trunk/fs/btrfs/file.c | 33 +- trunk/fs/btrfs/inode.c | 18 +- trunk/fs/btrfs/ioctl.c | 21 +- trunk/fs/cifs/cifsencrypt.c | 54 +- trunk/fs/cifs/cifsfs.c | 10 +- trunk/fs/cifs/cifssmb.c | 3 +- trunk/fs/cifs/connect.c | 4 +- trunk/fs/ext3/inode.c | 4 +- trunk/fs/ext3/namei.c | 3 +- trunk/fs/ext4/inode.c | 4 +- trunk/fs/ext4/namei.c | 3 +- trunk/fs/gfs2/log.c | 4 +- trunk/fs/gfs2/meta_io.c | 6 +- trunk/fs/gfs2/ops_fstype.c | 2 +- trunk/fs/gfs2/quota.c | 2 +- trunk/fs/hfsplus/super.c | 15 +- trunk/fs/hfsplus/wrapper.c | 4 +- trunk/fs/namei.c | 12 +- trunk/fs/namespace.c | 2 +- trunk/fs/nfs/nfs4_fs.h | 8 +- trunk/fs/nfs/nfs4proc.c | 20 +- trunk/fs/nfs/nfs4renewd.c | 12 +- trunk/fs/nfs/nfs4state.c | 6 - trunk/fs/nfs/super.c | 25 +- trunk/fs/nfs/write.c | 2 +- trunk/fs/proc/task_mmu.c | 80 +- trunk/fs/quota/quota.c | 2 +- trunk/fs/stat.c | 2 + trunk/fs/xfs/xfs_aops.c | 3 +- trunk/include/linux/basic_mmio_gpio.h | 15 +- trunk/include/linux/blk_types.h | 6 +- trunk/include/linux/blkdev.h | 1 + trunk/include/linux/fs.h | 2 + trunk/include/linux/fsl-diu-fb.h | 92 +- trunk/include/linux/irqdomain.h | 1 - trunk/include/linux/kvm.h | 1 - trunk/include/linux/memcontrol.h | 19 + trunk/include/linux/mfd/wm8994/pdata.h | 2 +- trunk/include/linux/namei.h | 3 +- trunk/include/linux/pci.h | 3 +- trunk/include/linux/ptp_classify.h | 13 +- trunk/include/linux/sched.h | 1 + trunk/include/linux/skbuff.h | 1 - trunk/include/linux/snmp.h | 2 - trunk/include/linux/swap.h | 6 - trunk/include/net/flow.h | 25 +- trunk/include/net/request_sock.h | 3 +- trunk/include/net/sctp/command.h | 1 - trunk/include/net/tcp.h | 22 +- trunk/include/net/transp_v6.h | 1 - trunk/include/trace/events/writeback.h | 10 +- trunk/include/video/omap-panel-picodlp.h | 23 + trunk/include/video/sh_mobile_lcdc.h | 135 +- trunk/include/video/udlfb.h | 1 - trunk/init/main.c | 19 +- trunk/kernel/irq/chip.c | 2 +- trunk/kernel/irq/irqdomain.c | 6 +- trunk/kernel/posix-cpu-timers.c | 5 +- trunk/kernel/ptrace.c | 23 +- trunk/kernel/resource.c | 7 +- trunk/kernel/sched.c | 26 +- trunk/kernel/sched_rt.c | 4 +- trunk/kernel/taskstats.c | 1 - trunk/kernel/tsacct.c | 15 +- trunk/kernel/workqueue.c | 7 +- trunk/lib/sha1.c | 1 - trunk/lib/xz/xz_dec_bcj.c | 27 +- trunk/mm/backing-dev.c | 30 +- trunk/mm/filemap.c | 6 +- trunk/mm/memcontrol.c | 172 +- trunk/mm/mempolicy.c | 9 +- trunk/mm/slub.c | 2 +- trunk/mm/vmalloc.c | 8 - trunk/mm/vmscan.c | 66 +- trunk/mm/vmstat.c | 4 +- trunk/net/batman-adv/soft-interface.c | 10 +- trunk/net/bluetooth/hci_event.c | 17 +- trunk/net/bridge/netfilter/Kconfig | 2 +- trunk/net/caif/caif_dev.c | 6 +- trunk/net/can/af_can.c | 2 +- trunk/net/can/bcm.c | 53 +- trunk/net/ceph/ceph_common.c | 1 - trunk/net/ceph/messenger.c | 1 - trunk/net/ceph/osd_client.c | 4 +- trunk/net/ceph/osdmap.c | 84 +- trunk/net/core/dev.c | 8 - trunk/net/core/fib_rules.c | 4 +- trunk/net/core/flow.c | 36 +- trunk/net/core/skbuff.c | 22 +- trunk/net/ethernet/eth.c | 2 +- trunk/net/ipv4/af_inet.c | 7 +- trunk/net/ipv4/fib_semantics.c | 10 +- trunk/net/ipv4/netfilter/ip_queue.c | 12 +- trunk/net/ipv4/proc.c | 2 - trunk/net/ipv4/tcp_input.c | 2 +- trunk/net/ipv4/tcp_ipv4.c | 49 +- trunk/net/ipv6/addrconf.c | 4 +- trunk/net/ipv6/datagram.c | 5 +- trunk/net/ipv6/ip6_flowlabel.c | 8 +- trunk/net/ipv6/ip6mr.c | 8 +- trunk/net/ipv6/ipv6_sockglue.c | 2 +- trunk/net/ipv6/netfilter/ip6_queue.c | 12 +- trunk/net/ipv6/raw.c | 4 +- trunk/net/ipv6/route.c | 37 +- trunk/net/ipv6/tcp_ipv6.c | 34 +- trunk/net/ipv6/udp.c | 4 +- trunk/net/irda/irsysctl.c | 6 +- trunk/net/irda/qos.c | 6 +- trunk/net/mac80211/sta_info.c | 2 +- trunk/net/netfilter/nf_conntrack_pptp.c | 1 - trunk/net/netfilter/nf_conntrack_proto_tcp.c | 6 +- trunk/net/netfilter/nfnetlink_queue.c | 4 +- trunk/net/netfilter/xt_rateest.c | 9 +- trunk/net/packet/af_packet.c | 5 +- trunk/net/rds/iw_rdma.c | 13 +- trunk/net/sched/cls_rsvp.h | 27 +- trunk/net/sctp/sm_sideeffect.c | 5 - trunk/net/sctp/sm_statefuns.c | 6 - trunk/net/wireless/nl80211.c | 5 +- trunk/net/wireless/reg.c | 1 - trunk/net/wireless/sme.c | 2 - trunk/net/xfrm/xfrm_input.c | 5 - trunk/net/xfrm/xfrm_policy.c | 10 +- trunk/sound/core/pcm_lib.c | 33 +- trunk/sound/pci/fm801.c | 15 +- trunk/sound/pci/hda/hda_codec.c | 6 +- trunk/sound/pci/hda/hda_intel.c | 9 +- trunk/sound/pci/hda/patch_cirrus.c | 2 +- trunk/sound/pci/hda/patch_realtek.c | 17 +- trunk/sound/pci/hda/patch_sigmatel.c | 2 - trunk/sound/soc/blackfin/bf5xx-ad193x.c | 4 +- trunk/sound/soc/blackfin/bf5xx-ad73311.c | 2 +- trunk/sound/soc/codecs/ssm2602.c | 3 +- trunk/sound/soc/codecs/wm8753.c | 4 +- trunk/sound/soc/codecs/wm8962.c | 26 + trunk/sound/soc/fsl/mpc5200_dma.c | 6 +- trunk/sound/soc/imx/imx-pcm-fiq.c | 1 + trunk/sound/soc/kirkwood/kirkwood-i2s.c | 2 +- trunk/sound/soc/omap/mcpdm.c | 2 +- trunk/sound/soc/omap/mcpdm.h | 2 +- trunk/sound/soc/omap/omap-mcbsp.c | 6 - trunk/sound/soc/pxa/zylonite.c | 8 +- trunk/sound/soc/soc-cache.c | 12 +- trunk/sound/soc/soc-core.c | 22 +- trunk/sound/soc/soc-dapm.c | 2 +- trunk/sound/soc/soc-jack.c | 2 +- trunk/sound/usb/card.c | 7 +- trunk/tools/perf/Makefile | 9 +- trunk/tools/perf/builtin-record.c | 3 - trunk/tools/perf/builtin-test.c | 2 +- trunk/tools/perf/builtin-top.c | 9 +- trunk/tools/perf/util/event.c | 5 - trunk/tools/perf/util/event.h | 2 +- trunk/tools/perf/util/evlist.c | 13 - trunk/tools/perf/util/evlist.h | 1 - trunk/tools/perf/util/evsel.c | 57 +- trunk/tools/perf/util/probe-finder.c | 2 +- trunk/tools/perf/util/python.c | 2 +- trunk/tools/perf/util/session.h | 3 +- trunk/tools/perf/util/sort.c | 10 +- trunk/tools/perf/util/symbol.c | 153 +- 529 files changed, 6940 insertions(+), 9319 deletions(-) delete mode 100644 trunk/Documentation/ABI/testing/sysfs-class-scsi_host delete mode 100644 trunk/drivers/video/grvga.c create mode 100644 trunk/drivers/video/omap2/displays/panel-picodlp.c create mode 100644 trunk/drivers/video/omap2/displays/panel-picodlp.h create mode 100644 trunk/drivers/video/sh_mobile_meram.h delete mode 100644 trunk/drivers/video/smscufx.c create mode 100644 trunk/include/video/omap-panel-picodlp.h diff --git a/[refs] b/[refs] index fc448cc292a7..421ad90a19a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07aaae44f5a3962c3a410a6dd7936dfa7dece2b9 +refs/heads/master: 24305db864cd62bf4279f745528c3238cbaf1c12 diff --git a/trunk/Documentation/ABI/testing/sysfs-class-scsi_host b/trunk/Documentation/ABI/testing/sysfs-class-scsi_host deleted file mode 100644 index 29a4f892e433..000000000000 --- a/trunk/Documentation/ABI/testing/sysfs-class-scsi_host +++ /dev/null @@ -1,13 +0,0 @@ -What: /sys/class/scsi_host/hostX/isci_id -Date: June 2011 -Contact: Dave Jiang -Description: - This file contains the enumerated host ID for the Intel - SCU controller. The Intel(R) C600 Series Chipset SATA/SAS - Storage Control Unit embeds up to two 4-port controllers in - a single PCI device. The controllers are enumerated in order - which usually means the lowest number scsi_host corresponds - with the first controller, but this association is not - guaranteed. The 'isci_id' attribute unambiguously identifies - the controller index: '0' for the first controller, - '1' for the second. diff --git a/trunk/Documentation/cgroups/memory.txt b/trunk/Documentation/cgroups/memory.txt index 06eb6d957c83..6f3c598971fc 100644 --- a/trunk/Documentation/cgroups/memory.txt +++ b/trunk/Documentation/cgroups/memory.txt @@ -380,7 +380,7 @@ will be charged as a new owner of it. 5.2 stat file -memory.stat file includes following statistics +5.2.1 memory.stat file includes following statistics # per-memory cgroup local status cache - # of bytes of page cache memory. @@ -438,6 +438,89 @@ Note: file_mapped is accounted only when the memory cgroup is owner of page cache.) +5.2.2 memory.vmscan_stat + +memory.vmscan_stat includes statistics information for memory scanning and +freeing, reclaiming. The statistics shows memory scanning information since +memory cgroup creation and can be reset to 0 by writing 0 as + + #echo 0 > ../memory.vmscan_stat + +This file contains following statistics. + +[param]_[file_or_anon]_pages_by_[reason]_[under_heararchy] +[param]_elapsed_ns_by_[reason]_[under_hierarchy] + +For example, + + scanned_file_pages_by_limit indicates the number of scanned + file pages at vmscan. + +Now, 3 parameters are supported + + scanned - the number of pages scanned by vmscan + rotated - the number of pages activated at vmscan + freed - the number of pages freed by vmscan + +If "rotated" is high against scanned/freed, the memcg seems busy. + +Now, 2 reason are supported + + limit - the memory cgroup's limit + system - global memory pressure + softlimit + (global memory pressure not under softlimit is not handled now) + +When under_hierarchy is added in the tail, the number indicates the +total memcg scan of its children and itself. + +elapsed_ns is a elapsed time in nanosecond. This may include sleep time +and not indicates CPU usage. So, please take this as just showing +latency. + +Here is an example. + +# cat /cgroup/memory/A/memory.vmscan_stat +scanned_pages_by_limit 9471864 +scanned_anon_pages_by_limit 6640629 +scanned_file_pages_by_limit 2831235 +rotated_pages_by_limit 4243974 +rotated_anon_pages_by_limit 3971968 +rotated_file_pages_by_limit 272006 +freed_pages_by_limit 2318492 +freed_anon_pages_by_limit 962052 +freed_file_pages_by_limit 1356440 +elapsed_ns_by_limit 351386416101 +scanned_pages_by_system 0 +scanned_anon_pages_by_system 0 +scanned_file_pages_by_system 0 +rotated_pages_by_system 0 +rotated_anon_pages_by_system 0 +rotated_file_pages_by_system 0 +freed_pages_by_system 0 +freed_anon_pages_by_system 0 +freed_file_pages_by_system 0 +elapsed_ns_by_system 0 +scanned_pages_by_limit_under_hierarchy 9471864 +scanned_anon_pages_by_limit_under_hierarchy 6640629 +scanned_file_pages_by_limit_under_hierarchy 2831235 +rotated_pages_by_limit_under_hierarchy 4243974 +rotated_anon_pages_by_limit_under_hierarchy 3971968 +rotated_file_pages_by_limit_under_hierarchy 272006 +freed_pages_by_limit_under_hierarchy 2318492 +freed_anon_pages_by_limit_under_hierarchy 962052 +freed_file_pages_by_limit_under_hierarchy 1356440 +elapsed_ns_by_limit_under_hierarchy 351386416101 +scanned_pages_by_system_under_hierarchy 0 +scanned_anon_pages_by_system_under_hierarchy 0 +scanned_file_pages_by_system_under_hierarchy 0 +rotated_pages_by_system_under_hierarchy 0 +rotated_anon_pages_by_system_under_hierarchy 0 +rotated_file_pages_by_system_under_hierarchy 0 +freed_pages_by_system_under_hierarchy 0 +freed_anon_pages_by_system_under_hierarchy 0 +freed_file_pages_by_system_under_hierarchy 0 +elapsed_ns_by_system_under_hierarchy 0 + 5.3 swappiness Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only. diff --git a/trunk/Documentation/fb/udlfb.txt b/trunk/Documentation/fb/udlfb.txt index 57d2f2908b12..7fdde2a02a27 100644 --- a/trunk/Documentation/fb/udlfb.txt +++ b/trunk/Documentation/fb/udlfb.txt @@ -87,38 +87,23 @@ Special configuration for udlfb is usually unnecessary. There are a few options, however. From the command line, pass options to modprobe -modprobe udlfb fb_defio=0 console=1 shadow=1 +modprobe udlfb defio=1 console=1 -Or modify options on the fly at /sys/module/udlfb/parameters directory via -sudo nano fb_defio -change the parameter in place, and save the file. +Or for permanent option, create file like /etc/modprobe.d/options with text +options udlfb defio=1 console=1 -Unplug/replug USB device to apply with new settings - -Or for permanent option, create file like /etc/modprobe.d/udlfb.conf with text -options udlfb fb_defio=0 console=1 shadow=1 - -Accepted boolean options: +Accepted options: fb_defio Make use of the fb_defio (CONFIG_FB_DEFERRED_IO) kernel module to track changed areas of the framebuffer by page faults. - Standard fbdev applications that use mmap but that do not - report damage, should be able to work with this enabled. - Disable when running with X server that supports reporting - changed regions via ioctl, as this method is simpler, - more stable, and higher performance. - default: fb_defio=1 - -console Allow fbcon to attach to udlfb provided framebuffers. - Can be disabled if fbcon and other clients - (e.g. X with --shared-vt) are in conflict. - default: console=1 - -shadow Allocate a 2nd framebuffer to shadow what's currently across - the USB bus in device memory. If any pixels are unchanged, - do not transmit. Spends host memory to save USB transfers. - Enabled by default. Only disable on very low memory systems. - default: shadow=1 + Standard fbdev applications that use mmap but that do not + report damage, may be able to work with this enabled. + Disabled by default because of overhead and other issues. + +console Allow fbcon to attach to udlfb provided framebuffers. This + is disabled by default because fbcon will aggressively consume + the first framebuffer it finds, which isn't usually what the + user wants in the case of USB displays. Sysfs Attributes ================ diff --git a/trunk/Documentation/hwmon/coretemp b/trunk/Documentation/hwmon/coretemp index 84d46c0c71a3..fa8776ab9b18 100644 --- a/trunk/Documentation/hwmon/coretemp +++ b/trunk/Documentation/hwmon/coretemp @@ -35,6 +35,13 @@ the Out-Of-Spec bit. Following table summarizes the exported sysfs files: All Sysfs entries are named with their core_id (represented here by 'X'). tempX_input - Core temperature (in millidegrees Celsius). tempX_max - All cooling devices should be turned on (on Core2). + Initialized with IA32_THERM_INTERRUPT. When the CPU + temperature reaches this temperature, an interrupt is + generated and tempX_max_alarm is set. +tempX_max_hyst - If the CPU temperature falls below than temperature, + an interrupt is generated and tempX_max_alarm is reset. +tempX_max_alarm - Set if the temperature reaches or exceeds tempX_max. + Reset if the temperature drops to or below tempX_max_hyst. tempX_crit - Maximum junction temperature (in millidegrees Celsius). tempX_crit_alarm - Set when Out-of-spec bit is set, never clears. Correct CPU operation is no longer guaranteed. @@ -42,10 +49,9 @@ tempX_label - Contains string "Core X", where X is processor number. For Package temp, this will be "Physical id Y", where Y is the package number. -On CPU models which support it, TjMax is read from a model-specific register. -On other models, it is set to an arbitrary value based on weak heuristics. -If these heuristics don't work for you, you can pass the correct TjMax value -as a module parameter (tjmax). +The TjMax temperature is set to 85 degrees C if undocumented model specific +register (UMSR) 0xee has bit 30 set. If not the TjMax is 100 degrees C as +(sometimes) documented in processor datasheet. Appendix A. Known TjMax lists (TBD): Some information comes from ark.intel.com diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 854ed5ca7e3f..614d0382e2cb 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -2086,12 +2086,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. Override pmtimer IOPort with a hex value. e.g. pmtmr=0x508 - pnp.debug=1 [PNP] - Enable PNP debug messages (depends on the - CONFIG_PNP_DEBUG_MESSAGES option). Change at run-time - via /sys/module/pnp/parameters/debug. We always show - current resource usage; turning this on also shows - possible settings and some assignment information. + pnp.debug [PNP] + Enable PNP debug messages. This depends on the + CONFIG_PNP_DEBUG_MESSAGES option. pnpacpi= [ACPI] { off } diff --git a/trunk/Documentation/networking/dmfe.txt b/trunk/Documentation/networking/dmfe.txt index 25320bf19c86..8006c227fda2 100644 --- a/trunk/Documentation/networking/dmfe.txt +++ b/trunk/Documentation/networking/dmfe.txt @@ -1,5 +1,3 @@ -Note: This driver doesn't have a maintainer. - Davicom DM9102(A)/DM9132/DM9801 fast ethernet driver for Linux. This program is free software; you can redistribute it and/or @@ -57,6 +55,7 @@ Test and make sure PCI latency is now correct for all cases. Authors: Sten Wang : Original Author +Tobias Ringstrom : Current Maintainer Contributors: diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt index ca5cdcd0f0e3..81546990f41c 100644 --- a/trunk/Documentation/networking/ip-sysctl.txt +++ b/trunk/Documentation/networking/ip-sysctl.txt @@ -1042,7 +1042,7 @@ conf/interface/*: The functional behaviour for certain settings is different depending on whether local forwarding is enabled or not. -accept_ra - INTEGER +accept_ra - BOOLEAN Accept Router Advertisements; autoconfigure using them. Possible values are: @@ -1106,7 +1106,7 @@ dad_transmits - INTEGER The amount of Duplicate Address Detection probes to send. Default: 1 -forwarding - INTEGER +forwarding - BOOLEAN Configure interface-specific Host/Router behaviour. Note: It is recommended to have the same setting on all diff --git a/trunk/Documentation/networking/scaling.txt b/trunk/Documentation/networking/scaling.txt index 8ce7c30e7230..58fd7414e6c0 100644 --- a/trunk/Documentation/networking/scaling.txt +++ b/trunk/Documentation/networking/scaling.txt @@ -243,7 +243,7 @@ configured. The number of entries in the global flow table is set through: The number of entries in the per-queue flow table are set through: - /sys/class/net//queues/rx-/rps_flow_cnt + /sys/class/net//queues/tx-/rps_flow_cnt == Suggested Configuration diff --git a/trunk/Documentation/vm/transhuge.txt b/trunk/Documentation/vm/transhuge.txt index 29bdf62aac09..0924aaca3302 100644 --- a/trunk/Documentation/vm/transhuge.txt +++ b/trunk/Documentation/vm/transhuge.txt @@ -123,11 +123,10 @@ be automatically shutdown if it's set to "never". khugepaged runs usually at low frequency so while one may not want to invoke defrag algorithms synchronously during the page faults, it should be worth invoking defrag at least in khugepaged. However it's -also possible to disable defrag in khugepaged by writing 0 or enable -defrag in khugepaged by writing 1: +also possible to disable defrag in khugepaged: -echo 0 >/sys/kernel/mm/transparent_hugepage/khugepaged/defrag -echo 1 >/sys/kernel/mm/transparent_hugepage/khugepaged/defrag +echo yes >/sys/kernel/mm/transparent_hugepage/khugepaged/defrag +echo no >/sys/kernel/mm/transparent_hugepage/khugepaged/defrag You can also control how many pages khugepaged should scan at each pass: diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 5f57e66ed072..28f65c249b97 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1278,6 +1278,7 @@ F: drivers/input/misc/ati_remote2.c ATLX ETHERNET DRIVERS M: Jay Cliburn M: Chris Snook +M: Jie Yang L: netdev@vger.kernel.org W: http://sourceforge.net/projects/atl1 W: http://atl1.sourceforge.net @@ -1573,6 +1574,7 @@ F: drivers/scsi/bfa/ BROCADE BNA 10 GIGABIT ETHERNET DRIVER M: Rasesh Mody +M: Debashis Dutt L: netdev@vger.kernel.org S: Supported F: drivers/net/bna/ @@ -1756,6 +1758,7 @@ F: Documentation/zh_CN/ CISCO VIC ETHERNET NIC DRIVER M: Christian Benvenuti +M: Vasanthy Kolluri M: Roopa Prabhu M: David Wang S: Supported @@ -3259,17 +3262,6 @@ F: Documentation/input/multi-touch-protocol.txt F: drivers/input/input-mt.c K: \b(ABS|SYN)_MT_ -INTEL C600 SERIES SAS CONTROLLER DRIVER -M: Intel SCU Linux support -M: Dan Williams -M: Dave Jiang -M: Ed Nadolski -L: linux-scsi@vger.kernel.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git -S: Maintained -F: drivers/scsi/isci/ -F: firmware/isci/ - INTEL IDLE DRIVER M: Len Brown L: linux-pm@lists.linux-foundation.org @@ -4412,8 +4404,7 @@ L: netfilter@vger.kernel.org L: coreteam@netfilter.org W: http://www.netfilter.org/ W: http://www.iptables.org/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git -T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git S: Supported F: include/linux/netfilter* F: include/linux/netfilter/ @@ -4783,7 +4774,7 @@ F: drivers/net/wireless/orinoco/ OSD LIBRARY and FILESYSTEM M: Boaz Harrosh -M: Benny Halevy +M: Benny Halevy L: osd-dev@open-osd.org W: http://open-osd.org T: git git://git.open-osd.org/open-osd.git @@ -5930,12 +5921,6 @@ L: netdev@vger.kernel.org S: Supported F: drivers/net/smsc9420.* -SMSC UFX6000 and UFX7000 USB to VGA DRIVER -M: Steve Glendinning -L: linux-fbdev@vger.kernel.org -S: Supported -F: drivers/video/smscufx.c - SN-IA64 (Itanium) SUB-PLATFORM M: Jes Sorensen L: linux-altix@sgi.com @@ -6380,6 +6365,7 @@ S: Supported F: arch/arm/mach-tegra TEHUTI ETHERNET DRIVER +M: Alexander Indenbaum M: Andy Gospodarek L: netdev@vger.kernel.org S: Supported @@ -7214,9 +7200,6 @@ W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices S: Supported F: Documentation/hwmon/wm83?? F: drivers/leds/leds-wm83*.c -F: drivers/input/misc/wm831x-on.c -F: drivers/input/touchscreen/wm831x-ts.c -F: drivers/input/touchscreen/wm97*.c F: drivers/mfd/wm8*.c F: drivers/power/wm83*.c F: drivers/rtc/rtc-wm83*.c @@ -7226,7 +7209,6 @@ F: drivers/watchdog/wm83*_wdt.c F: include/linux/mfd/wm831x/ F: include/linux/mfd/wm8350/ F: include/linux/mfd/wm8400* -F: include/linux/wm97xx.h F: include/sound/wm????.h F: sound/soc/codecs/wm* diff --git a/trunk/Makefile b/trunk/Makefile index 31f967c31e7f..522fa4784e69 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -rc9 +EXTRAVERSION = -rc6 NAME = "Divemaster Edition" # *DOCUMENTATION* diff --git a/trunk/arch/alpha/Kconfig b/trunk/arch/alpha/Kconfig index 8bb936226dee..60cde53d266c 100644 --- a/trunk/arch/alpha/Kconfig +++ b/trunk/arch/alpha/Kconfig @@ -51,7 +51,7 @@ config GENERIC_CMOS_UPDATE def_bool y config GENERIC_GPIO - bool + def_bool y config ZONE_DMA bool diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 3146ed3f6eca..3269576dbfa8 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -1283,20 +1283,6 @@ config ARM_ERRATA_364296 processor into full low interrupt latency mode. ARM11MPCore is not affected. -config ARM_ERRATA_764369 - bool "ARM errata: Data cache line maintenance operation by MVA may not succeed" - depends on CPU_V7 && SMP - help - This option enables the workaround for erratum 764369 - affecting Cortex-A9 MPCore with two or more processors (all - current revisions). Under certain timing circumstances, a data - cache line maintenance operation by MVA targeting an Inner - Shareable memory region may fail to proceed up to either the - Point of Coherency or to the Point of Unification of the - system. This workaround adds a DSB instruction before the - relevant cache maintenance functions and sets a specific bit - in the diagnostic control register of the SCU. - endmenu source "arch/arm/common/Kconfig" diff --git a/trunk/arch/arm/boot/dts/tegra-harmony.dts b/trunk/arch/arm/boot/dts/tegra-harmony.dts index e5818668d091..4c053340ce33 100644 --- a/trunk/arch/arm/boot/dts/tegra-harmony.dts +++ b/trunk/arch/arm/boot/dts/tegra-harmony.dts @@ -57,14 +57,14 @@ }; sdhci@c8000200 { - cd-gpios = <&gpio 69 0>; /* gpio PI5 */ - wp-gpios = <&gpio 57 0>; /* gpio PH1 */ - power-gpios = <&gpio 155 0>; /* gpio PT3 */ + gpios = <&gpio 69 0>, /* cd, gpio PI5 */ + <&gpio 57 0>, /* wp, gpio PH1 */ + <&gpio 155 0>; /* power, gpio PT3 */ }; sdhci@c8000600 { - cd-gpios = <&gpio 58 0>; /* gpio PH2 */ - wp-gpios = <&gpio 59 0>; /* gpio PH3 */ - power-gpios = <&gpio 70 0>; /* gpio PI6 */ + gpios = <&gpio 58 0>, /* cd, gpio PH2 */ + <&gpio 59 0>, /* wp, gpio PH3 */ + <&gpio 70 0>; /* power, gpio PI6 */ }; }; diff --git a/trunk/arch/arm/boot/dts/tegra-seaboard.dts b/trunk/arch/arm/boot/dts/tegra-seaboard.dts index 64cedca6fc79..1940cae00748 100644 --- a/trunk/arch/arm/boot/dts/tegra-seaboard.dts +++ b/trunk/arch/arm/boot/dts/tegra-seaboard.dts @@ -21,8 +21,8 @@ }; sdhci@c8000400 { - cd-gpios = <&gpio 69 0>; /* gpio PI5 */ - wp-gpios = <&gpio 57 0>; /* gpio PH1 */ - power-gpios = <&gpio 70 0>; /* gpio PI6 */ + gpios = <&gpio 69 0>, /* cd, gpio PI5 */ + <&gpio 57 0>, /* wp, gpio PH1 */ + <&gpio 70 0>; /* power, gpio PI6 */ }; }; diff --git a/trunk/arch/arm/include/asm/futex.h b/trunk/arch/arm/include/asm/futex.h index 253cc86318bf..8c73900da9ed 100644 --- a/trunk/arch/arm/include/asm/futex.h +++ b/trunk/arch/arm/include/asm/futex.h @@ -25,17 +25,17 @@ #ifdef CONFIG_SMP -#define __futex_atomic_op(insn, ret, oldval, tmp, uaddr, oparg) \ +#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \ smp_mb(); \ __asm__ __volatile__( \ - "1: ldrex %1, [%3]\n" \ + "1: ldrex %1, [%2]\n" \ " " insn "\n" \ - "2: strex %2, %0, [%3]\n" \ - " teq %2, #0\n" \ + "2: strex %1, %0, [%2]\n" \ + " teq %1, #0\n" \ " bne 1b\n" \ " mov %0, #0\n" \ - __futex_atomic_ex_table("%5") \ - : "=&r" (ret), "=&r" (oldval), "=&r" (tmp) \ + __futex_atomic_ex_table("%4") \ + : "=&r" (ret), "=&r" (oldval) \ : "r" (uaddr), "r" (oparg), "Ir" (-EFAULT) \ : "cc", "memory") @@ -73,14 +73,14 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, #include #include -#define __futex_atomic_op(insn, ret, oldval, tmp, uaddr, oparg) \ +#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \ __asm__ __volatile__( \ - "1: " T(ldr) " %1, [%3]\n" \ + "1: " T(ldr) " %1, [%2]\n" \ " " insn "\n" \ - "2: " T(str) " %0, [%3]\n" \ + "2: " T(str) " %0, [%2]\n" \ " mov %0, #0\n" \ - __futex_atomic_ex_table("%5") \ - : "=&r" (ret), "=&r" (oldval), "=&r" (tmp) \ + __futex_atomic_ex_table("%4") \ + : "=&r" (ret), "=&r" (oldval) \ : "r" (uaddr), "r" (oparg), "Ir" (-EFAULT) \ : "cc", "memory") @@ -117,7 +117,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) int cmp = (encoded_op >> 24) & 15; int oparg = (encoded_op << 8) >> 20; int cmparg = (encoded_op << 20) >> 20; - int oldval = 0, ret, tmp; + int oldval = 0, ret; if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) oparg = 1 << oparg; @@ -129,19 +129,19 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) switch (op) { case FUTEX_OP_SET: - __futex_atomic_op("mov %0, %4", ret, oldval, tmp, uaddr, oparg); + __futex_atomic_op("mov %0, %3", ret, oldval, uaddr, oparg); break; case FUTEX_OP_ADD: - __futex_atomic_op("add %0, %1, %4", ret, oldval, tmp, uaddr, oparg); + __futex_atomic_op("add %0, %1, %3", ret, oldval, uaddr, oparg); break; case FUTEX_OP_OR: - __futex_atomic_op("orr %0, %1, %4", ret, oldval, tmp, uaddr, oparg); + __futex_atomic_op("orr %0, %1, %3", ret, oldval, uaddr, oparg); break; case FUTEX_OP_ANDN: - __futex_atomic_op("and %0, %1, %4", ret, oldval, tmp, uaddr, ~oparg); + __futex_atomic_op("and %0, %1, %3", ret, oldval, uaddr, ~oparg); break; case FUTEX_OP_XOR: - __futex_atomic_op("eor %0, %1, %4", ret, oldval, tmp, uaddr, oparg); + __futex_atomic_op("eor %0, %1, %3", ret, oldval, uaddr, oparg); break; default: ret = -ENOSYS; diff --git a/trunk/arch/arm/include/asm/unistd.h b/trunk/arch/arm/include/asm/unistd.h index c60a2944f95b..2c04ed5efeb5 100644 --- a/trunk/arch/arm/include/asm/unistd.h +++ b/trunk/arch/arm/include/asm/unistd.h @@ -478,8 +478,8 @@ /* * Unimplemented (or alternatively implemented) syscalls */ -#define __IGNORE_fadvise64_64 -#define __IGNORE_migrate_pages +#define __IGNORE_fadvise64_64 1 +#define __IGNORE_migrate_pages 1 #endif /* __KERNEL__ */ #endif /* __ASM_ARM_UNISTD_H */ diff --git a/trunk/arch/arm/kernel/smp_scu.c b/trunk/arch/arm/kernel/smp_scu.c index 7fcddb75c877..79ed5e7f204a 100644 --- a/trunk/arch/arm/kernel/smp_scu.c +++ b/trunk/arch/arm/kernel/smp_scu.c @@ -13,7 +13,6 @@ #include #include -#include #define SCU_CTRL 0x00 #define SCU_CONFIG 0x04 @@ -38,15 +37,6 @@ void __init scu_enable(void __iomem *scu_base) { u32 scu_ctrl; -#ifdef CONFIG_ARM_ERRATA_764369 - /* Cortex-A9 only */ - if ((read_cpuid(CPUID_ID) & 0xff0ffff0) == 0x410fc090) { - scu_ctrl = __raw_readl(scu_base + 0x30); - if (!(scu_ctrl & 1)) - __raw_writel(scu_ctrl | 0x1, scu_base + 0x30); - } -#endif - scu_ctrl = __raw_readl(scu_base + SCU_CTRL); /* already enabled? */ if (scu_ctrl & 1) diff --git a/trunk/arch/arm/kernel/vmlinux.lds.S b/trunk/arch/arm/kernel/vmlinux.lds.S index 4e66f62b8d41..bf977f8514f6 100644 --- a/trunk/arch/arm/kernel/vmlinux.lds.S +++ b/trunk/arch/arm/kernel/vmlinux.lds.S @@ -23,10 +23,8 @@ #if defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK) #define ARM_EXIT_KEEP(x) x -#define ARM_EXIT_DISCARD(x) #else #define ARM_EXIT_KEEP(x) -#define ARM_EXIT_DISCARD(x) x #endif OUTPUT_ARCH(arm) @@ -41,11 +39,6 @@ jiffies = jiffies_64 + 4; SECTIONS { /* - * XXX: The linker does not define how output sections are - * assigned to input sections when there are multiple statements - * matching the same input section name. There is no documented - * order of matching. - * * unwind exit sections must be discarded before the rest of the * unwind sections get included. */ @@ -54,9 +47,6 @@ SECTIONS *(.ARM.extab.exit.text) ARM_CPU_DISCARD(*(.ARM.exidx.cpuexit.text)) ARM_CPU_DISCARD(*(.ARM.extab.cpuexit.text)) - ARM_EXIT_DISCARD(EXIT_TEXT) - ARM_EXIT_DISCARD(EXIT_DATA) - EXIT_CALL #ifndef CONFIG_HOTPLUG *(.ARM.exidx.devexit.text) *(.ARM.extab.devexit.text) @@ -68,8 +58,6 @@ SECTIONS #ifndef CONFIG_SMP_ON_UP *(.alt.smp.init) #endif - *(.discard) - *(.discard.*) } #ifdef CONFIG_XIP_KERNEL @@ -291,6 +279,9 @@ SECTIONS STABS_DEBUG .comment 0 : { *(.comment) } + + /* Default discards */ + DISCARDS } /* diff --git a/trunk/arch/arm/mach-dove/common.c b/trunk/arch/arm/mach-dove/common.c index a9e0dae86a26..83dce859886d 100644 --- a/trunk/arch/arm/mach-dove/common.c +++ b/trunk/arch/arm/mach-dove/common.c @@ -158,7 +158,7 @@ void __init dove_spi0_init(void) void __init dove_spi1_init(void) { - orion_spi_1_init(DOVE_SPI1_PHYS_BASE, get_tclk()); + orion_spi_init(DOVE_SPI1_PHYS_BASE, get_tclk()); } /***************************************************************************** diff --git a/trunk/arch/arm/mach-exynos4/clock.c b/trunk/arch/arm/mach-exynos4/clock.c index 86964d2e9e1b..1561b036a9bf 100644 --- a/trunk/arch/arm/mach-exynos4/clock.c +++ b/trunk/arch/arm/mach-exynos4/clock.c @@ -899,7 +899,8 @@ static struct clksrc_clk clksrcs[] = { .reg_div = { .reg = S5P_CLKDIV_CAM, .shift = 28, .size = 4 }, }, { .clk = { - .name = "sclk_cam0", + .name = "sclk_cam", + .devname = "exynos4-fimc.0", .enable = exynos4_clksrc_mask_cam_ctrl, .ctrlbit = (1 << 16), }, @@ -908,7 +909,8 @@ static struct clksrc_clk clksrcs[] = { .reg_div = { .reg = S5P_CLKDIV_CAM, .shift = 16, .size = 4 }, }, { .clk = { - .name = "sclk_cam1", + .name = "sclk_cam", + .devname = "exynos4-fimc.1", .enable = exynos4_clksrc_mask_cam_ctrl, .ctrlbit = (1 << 20), }, @@ -1158,7 +1160,7 @@ void __init_or_cpufreq exynos4_setup_clocks(void) vpllsrc = clk_get_rate(&clk_vpllsrc.clk); vpll = s5p_get_pll46xx(vpllsrc, __raw_readl(S5P_VPLL_CON0), - __raw_readl(S5P_VPLL_CON1), pll_4650c); + __raw_readl(S5P_VPLL_CON1), pll_4650); clk_fout_apll.ops = &exynos4_fout_apll_ops; clk_fout_mpll.rate = mpll; diff --git a/trunk/arch/arm/mach-exynos4/mct.c b/trunk/arch/arm/mach-exynos4/mct.c index ddd86864fb83..1ae059b7ad7b 100644 --- a/trunk/arch/arm/mach-exynos4/mct.c +++ b/trunk/arch/arm/mach-exynos4/mct.c @@ -132,18 +132,12 @@ static cycle_t exynos4_frc_read(struct clocksource *cs) return ((cycle_t)hi << 32) | lo; } -static void exynos4_frc_resume(struct clocksource *cs) -{ - exynos4_mct_frc_start(0, 0); -} - struct clocksource mct_frc = { .name = "mct-frc", .rating = 400, .read = exynos4_frc_read, .mask = CLOCKSOURCE_MASK(64), .flags = CLOCK_SOURCE_IS_CONTINUOUS, - .resume = exynos4_frc_resume, }; static void __init exynos4_clocksource_init(void) @@ -395,11 +389,9 @@ static void exynos4_mct_tick_init(struct clock_event_device *evt) } /* Setup the local clock events for a CPU */ -int __cpuinit local_timer_setup(struct clock_event_device *evt) +void __cpuinit local_timer_setup(struct clock_event_device *evt) { exynos4_mct_tick_init(evt); - - return 0; } int local_timer_ack(void) diff --git a/trunk/arch/arm/mach-exynos4/platsmp.c b/trunk/arch/arm/mach-exynos4/platsmp.c index df6ef1b2f98b..7c2282c6ba81 100644 --- a/trunk/arch/arm/mach-exynos4/platsmp.c +++ b/trunk/arch/arm/mach-exynos4/platsmp.c @@ -106,8 +106,6 @@ void __cpuinit platform_secondary_init(unsigned int cpu) */ spin_lock(&boot_lock); spin_unlock(&boot_lock); - - set_cpu_online(cpu, true); } int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) diff --git a/trunk/arch/arm/mach-exynos4/setup-keypad.c b/trunk/arch/arm/mach-exynos4/setup-keypad.c index 7862bfb5933d..1ee0ebff111f 100644 --- a/trunk/arch/arm/mach-exynos4/setup-keypad.c +++ b/trunk/arch/arm/mach-exynos4/setup-keypad.c @@ -19,16 +19,15 @@ void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols) if (rows > 8) { /* Set all the necessary GPX2 pins: KP_ROW[0~7] */ - s3c_gpio_cfgall_range(EXYNOS4_GPX2(0), 8, S3C_GPIO_SFN(3), - S3C_GPIO_PULL_UP); + s3c_gpio_cfgrange_nopull(EXYNOS4_GPX2(0), 8, S3C_GPIO_SFN(3)); /* Set all the necessary GPX3 pins: KP_ROW[8~] */ - s3c_gpio_cfgall_range(EXYNOS4_GPX3(0), (rows - 8), - S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP); + s3c_gpio_cfgrange_nopull(EXYNOS4_GPX3(0), (rows - 8), + S3C_GPIO_SFN(3)); } else { /* Set all the necessary GPX2 pins: KP_ROW[x] */ - s3c_gpio_cfgall_range(EXYNOS4_GPX2(0), rows, S3C_GPIO_SFN(3), - S3C_GPIO_PULL_UP); + s3c_gpio_cfgrange_nopull(EXYNOS4_GPX2(0), rows, + S3C_GPIO_SFN(3)); } /* Set all the necessary GPX1 pins to special-function 3: KP_COL[x] */ diff --git a/trunk/arch/arm/mach-integrator/integrator_ap.c b/trunk/arch/arm/mach-integrator/integrator_ap.c index 8cdc730dcb3a..fcf0ae95651f 100644 --- a/trunk/arch/arm/mach-integrator/integrator_ap.c +++ b/trunk/arch/arm/mach-integrator/integrator_ap.c @@ -32,7 +32,6 @@ #include #include #include -#include