From f6161bc20ddfab3c8121d3e05b3b139d53121402 Mon Sep 17 00:00:00 2001 From: Paul Zimmerman Date: Wed, 17 Nov 2010 16:26:50 -0800 Subject: [PATCH] --- yaml --- r: 222813 b: refs/heads/master c: 7a3783efffc7bc2e702d774e47fad5b8e37e9ad1 h: refs/heads/master i: 222811: 5db87070ebef906683c6ce3c2c325098b590060d v: v3 --- [refs] | 2 +- trunk/Documentation/DocBook/sh.tmpl | 4 + trunk/Documentation/DocBook/uio-howto.tmpl | 6 +- trunk/Documentation/arm/OMAP/DSS | 7 +- .../development-process/2.Process | 33 +- trunk/Documentation/fb/00-INDEX | 32 +- .../feature-removal-schedule.txt | 10 - .../configfs/configfs_example_explicit.c | 2 +- trunk/Documentation/gpio.txt | 10 - trunk/Documentation/hwmon/lm93 | 2 +- trunk/Documentation/hwmon/max6650 | 2 +- trunk/Documentation/kernel-parameters.txt | 5 - trunk/Documentation/power/opp.txt | 3 - trunk/Documentation/sh/clk.txt | 32 + trunk/MAINTAINERS | 22 +- trunk/Makefile | 2 +- trunk/arch/arm/Kconfig | 32 +- trunk/arch/arm/boot/compressed/head.S | 2 +- trunk/arch/arm/boot/compressed/vmlinux.lds.in | 2 +- trunk/arch/arm/include/asm/assembler.h | 2 +- trunk/arch/arm/include/asm/mmu.h | 4 - trunk/arch/arm/include/asm/pgtable.h | 3 - trunk/arch/arm/lib/findbit.S | 6 +- .../arm/mach-aaec2000/include/mach/vmalloc.h | 2 +- .../arm/mach-bcmring/include/mach/vmalloc.h | 2 +- .../arm/mach-clps711x/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-davinci/dm355.c | 6 +- trunk/arch/arm/mach-davinci/dm365.c | 6 +- trunk/arch/arm/mach-davinci/dm644x.c | 4 +- .../arm/mach-ebsa110/include/mach/vmalloc.h | 2 +- .../mach-footbridge/include/mach/vmalloc.h | 2 +- .../arm/mach-h720x/include/mach/vmalloc.h | 2 +- .../arm/mach-imx/eukrea_mbimx27-baseboard.c | 6 + .../mach-integrator/include/mach/vmalloc.h | 2 +- .../arch/arm/mach-msm/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-mx25/devices-imx25.h | 4 +- trunk/arch/arm/mach-mx3/mach-pcm037_eet.c | 5 +- .../arch/arm/mach-netx/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-omap1/devices.c | 5 +- .../arch/arm/mach-omap1/include/mach/camera.h | 2 - .../arm/mach-omap1/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-omap2/board-devkit8000.c | 3 + .../arm/mach-omap2/include/mach/vmalloc.h | 2 +- .../arm/mach-pnx4008/include/mach/vmalloc.h | 2 +- .../arch/arm/mach-rpc/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-s3c2410/h1940-bluetooth.c | 8 +- trunk/arch/arm/mach-s3c2416/irq.c | 5 +- trunk/arch/arm/mach-s3c2443/irq.c | 5 +- trunk/arch/arm/mach-s3c64xx/Kconfig | 2 +- trunk/arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- trunk/arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- trunk/arch/arm/mach-s5pv210/mach-smdkc110.c | 1 - trunk/arch/arm/mach-s5pv210/mach-smdkv210.c | 1 - .../arm/mach-shark/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-shmobile/board-ap4evb.c | 149 +- trunk/arch/arm/mach-shmobile/clock-sh7372.c | 39 +- trunk/arch/arm/mach-shmobile/intc-sh7372.c | 2 +- trunk/arch/arm/mach-ux500/cpu.c | 6 +- .../arm/mach-versatile/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mm/ioremap.c | 4 +- .../arm/plat-mxc/devices/platform-imx-dma.c | 8 + .../arm/plat-mxc/devices/platform-spi_imx.c | 1 - trunk/arch/arm/plat-nomadik/timer.c | 89 +- trunk/arch/arm/plat-omap/dma.c | 2 - trunk/arch/arm/plat-pxa/include/plat/sdhci.h | 3 - .../arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c | 6 +- .../arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c | 6 +- .../arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c | 6 +- trunk/arch/blackfin/kernel/process.c | 1 + trunk/arch/frv/kernel/process.c | 1 + trunk/arch/h8300/kernel/process.c | 1 + trunk/arch/ia64/hp/sim/simscsi.c | 4 +- trunk/arch/m68k/kernel/process.c | 1 + trunk/arch/m68knommu/kernel/process.c | 1 + trunk/arch/mn10300/kernel/process.c | 1 + trunk/arch/parisc/hpux/sys_hpux.c | 1 + trunk/arch/parisc/kernel/sys_parisc32.c | 1 + trunk/arch/powerpc/Kconfig | 4 - trunk/arch/powerpc/boot/div64.S | 3 +- trunk/arch/powerpc/kernel/kgdb.c | 4 +- trunk/arch/powerpc/kernel/setup_64.c | 5 +- trunk/arch/powerpc/kernel/sys_ppc32.c | 1 + trunk/arch/powerpc/mm/hash_utils_64.c | 2 +- trunk/arch/powerpc/mm/tlb_low_64e.S | 5 +- trunk/arch/powerpc/mm/tlb_nohash.c | 2 +- trunk/arch/powerpc/platforms/pseries/Kconfig | 6 - trunk/arch/powerpc/platforms/pseries/eeh.c | 2 + .../powerpc/platforms/pseries/pci_dlpar.c | 2 + trunk/arch/s390/Kconfig.debug | 12 - trunk/arch/s390/include/asm/page.h | 5 - trunk/arch/s390/kernel/compat_linux.c | 1 + trunk/arch/s390/kernel/kprobes.c | 70 +- trunk/arch/s390/kernel/nmi.c | 10 +- trunk/arch/s390/lib/delay.c | 14 +- trunk/arch/s390/mm/gup.c | 7 +- trunk/arch/sh/include/asm/processor_32.h | 7 +- trunk/arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 2 +- trunk/arch/sh/kernel/sys_sh.c | 2 +- .../arch/sh/kernel/vsyscall/vsyscall-trapa.S | 2 +- trunk/arch/sparc/kernel/leon_smp.c | 1 + trunk/arch/sparc/kernel/sys_sparc32.c | 1 + trunk/arch/sparc/kernel/sys_sparc_32.c | 1 + trunk/arch/sparc/kernel/unaligned_32.c | 1 + trunk/arch/sparc/kernel/windows.c | 1 + trunk/arch/tile/Kconfig | 12 - trunk/arch/tile/include/asm/cacheflush.h | 52 - trunk/arch/tile/include/asm/io.h | 15 +- trunk/arch/tile/include/asm/pci-bridge.h | 117 + trunk/arch/tile/include/asm/pci.h | 107 +- trunk/arch/tile/include/asm/processor.h | 10 - trunk/arch/tile/include/hv/drv_xgbe_impl.h | 300 -- trunk/arch/tile/include/hv/drv_xgbe_intf.h | 615 ---- trunk/arch/tile/include/hv/netio_errors.h | 122 - trunk/arch/tile/include/hv/netio_intf.h | 2975 ----------------- trunk/arch/tile/kernel/Makefile | 1 - trunk/arch/tile/kernel/compat.c | 1 + trunk/arch/tile/kernel/compat_signal.c | 1 + trunk/arch/tile/kernel/pci.c | 621 ---- trunk/arch/tile/kernel/setup.c | 2 +- trunk/arch/tile/kernel/signal.c | 1 + trunk/arch/tile/kernel/smpboot.c | 1 + trunk/arch/tile/kernel/sys.c | 1 + trunk/arch/tile/lib/memchr_32.c | 35 +- trunk/arch/tile/lib/spinlock_32.c | 29 +- trunk/arch/tile/mm/fault.c | 1 + trunk/arch/tile/mm/hugetlbpage.c | 1 + trunk/arch/um/drivers/line.c | 5 +- trunk/arch/um/kernel/exec.c | 1 + trunk/arch/x86/Kconfig | 2 +- trunk/arch/x86/ia32/sys_ia32.c | 1 + trunk/arch/x86/include/asm/fixmap.h | 4 +- trunk/arch/x86/include/asm/msr-index.h | 2 +- trunk/arch/x86/include/asm/paravirt.h | 10 +- trunk/arch/x86/include/asm/uv/uv_hub.h | 4 - trunk/arch/x86/include/asm/uv/uv_mmrs.h | 19 +- trunk/arch/x86/include/asm/xen/interface.h | 6 +- trunk/arch/x86/include/asm/xen/interface_32.h | 5 - trunk/arch/x86/include/asm/xen/interface_64.h | 13 +- trunk/arch/x86/include/asm/xen/page.h | 7 +- trunk/arch/x86/kernel/apic/hw_nmi.c | 7 +- trunk/arch/x86/kernel/apic/x2apic_uv_x.c | 25 +- trunk/arch/x86/kernel/cpu/perf_event.c | 20 - trunk/arch/x86/kernel/cpuid.c | 1 + trunk/arch/x86/kernel/entry_32.S | 2 +- trunk/arch/x86/kernel/entry_64.S | 2 - trunk/arch/x86/kernel/hw_breakpoint.c | 4 - trunk/arch/x86/kernel/kgdb.c | 12 +- trunk/arch/x86/kernel/mmconf-fam10h_64.c | 64 +- trunk/arch/x86/kernel/msr.c | 1 + trunk/arch/x86/kvm/svm.c | 2 +- trunk/arch/x86/kvm/vmx.c | 19 +- trunk/arch/x86/mm/tlb.c | 5 +- trunk/arch/x86/pci/acpi.c | 103 +- trunk/arch/x86/platform/uv/tlb_uv.c | 2 +- trunk/arch/x86/platform/uv/uv_time.c | 4 +- trunk/arch/x86/xen/enlighten.c | 21 +- trunk/arch/x86/xen/mmu.c | 86 +- trunk/arch/x86/xen/setup.c | 12 +- trunk/block/blk-throttle.c | 2 +- trunk/block/compat_ioctl.c | 1 + trunk/block/ioctl.c | 1 + trunk/drivers/ata/libata-scsi.c | 19 +- trunk/drivers/ata/sata_via.c | 9 +- trunk/drivers/base/power/main.c | 34 +- trunk/drivers/block/amiflop.c | 2 +- trunk/drivers/block/ataflop.c | 2 +- trunk/drivers/block/cciss.c | 3 +- trunk/drivers/block/cciss_scsi.c | 8 +- trunk/drivers/block/drbd/drbd_receiver.c | 1 + trunk/drivers/block/drbd/drbd_worker.c | 1 + trunk/drivers/block/xen-blkfront.c | 55 +- trunk/drivers/char/agp/frontend.c | 1 + trunk/drivers/char/amiserial.c | 1 + trunk/drivers/char/briq_panel.c | 1 + trunk/drivers/char/hpet.c | 1 + trunk/drivers/char/hw_random/core.c | 1 + trunk/drivers/char/i8k.c | 8 +- trunk/drivers/char/istallion.c | 1 + trunk/drivers/char/serial167.c | 1 + trunk/drivers/char/specialix.c | 1 + trunk/drivers/char/stallion.c | 1 + trunk/drivers/char/sx.c | 1 + trunk/drivers/char/uv_mmtimer.c | 1 + trunk/drivers/char/virtio_console.c | 37 +- trunk/drivers/firewire/net.c | 160 +- trunk/drivers/firewire/sbp2.c | 4 +- trunk/drivers/gpu/drm/drm_fops.c | 1 + trunk/drivers/gpu/drm/i915/i915_drv.c | 3 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 2 - trunk/drivers/gpu/drm/i915/i915_gem.c | 77 +- trunk/drivers/gpu/drm/i915/intel_crt.c | 159 +- trunk/drivers/gpu/drm/i915/intel_display.c | 12 - trunk/drivers/gpu/drm/i915/intel_i2c.c | 11 +- .../gpu/drm/nouveau/nouveau_backlight.c | 9 - trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_bo.c | 43 +- .../gpu/drm/nouveau/nouveau_connector.c | 77 +- .../gpu/drm/nouveau/nouveau_connector.h | 3 + trunk/drivers/gpu/drm/nouveau/nouveau_drv.h | 55 +- trunk/drivers/gpu/drm/nouveau/nouveau_fence.c | 7 +- trunk/drivers/gpu/drm/nouveau/nouveau_gem.c | 36 +- trunk/drivers/gpu/drm/nouveau/nouveau_hw.c | 8 +- trunk/drivers/gpu/drm/nouveau/nouveau_hw.h | 19 - trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_irq.c | 42 +- trunk/drivers/gpu/drm/nouveau/nouveau_mem.c | 49 +- .../drivers/gpu/drm/nouveau/nouveau_object.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_pm.c | 7 +- trunk/drivers/gpu/drm/nouveau/nouveau_ramht.c | 71 +- trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c | 14 +- trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 17 +- trunk/drivers/gpu/drm/nouveau/nouveau_temp.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv04_crtc.c | 7 +- trunk/drivers/gpu/drm/nouveau/nv04_dfp.c | 13 +- trunk/drivers/gpu/drm/nouveau/nv04_pm.c | 9 - trunk/drivers/gpu/drm/nouveau/nv50_calc.c | 16 +- trunk/drivers/gpu/drm/nouveau/nv50_crtc.c | 4 +- trunk/drivers/gpu/drm/nouveau/nv50_display.c | 35 +- trunk/drivers/gpu/drm/nouveau/nv50_fifo.c | 5 - trunk/drivers/gpu/drm/nouveau/nv50_graph.c | 52 - trunk/drivers/gpu/drm/nouveau/nv50_instmem.c | 1 + trunk/drivers/gpu/drm/radeon/evergreen.c | 31 +- .../gpu/drm/radeon/evergreen_blit_kms.c | 2 +- trunk/drivers/gpu/drm/radeon/r600.c | 2 +- trunk/drivers/gpu/drm/radeon/r600_blit_kms.c | 2 +- trunk/drivers/gpu/drm/radeon/r600_cs.c | 311 +- trunk/drivers/gpu/drm/radeon/r600d.h | 6 - trunk/drivers/gpu/drm/radeon/radeon.h | 4 - .../drivers/gpu/drm/radeon/radeon_benchmark.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_combios.c | 13 - .../gpu/drm/radeon/radeon_connectors.c | 18 - trunk/drivers/gpu/drm/radeon/radeon_device.c | 2 +- .../drivers/gpu/drm/radeon/radeon_encoders.c | 356 +- trunk/drivers/gpu/drm/radeon/radeon_gart.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_gem.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_i2c.c | 8 +- trunk/drivers/gpu/drm/radeon/radeon_irq.c | 4 +- .../gpu/drm/radeon/radeon_legacy_encoders.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_mode.h | 5 +- trunk/drivers/gpu/drm/radeon/radeon_object.c | 7 +- trunk/drivers/gpu/drm/radeon/radeon_object.h | 7 +- trunk/drivers/gpu/drm/radeon/radeon_ring.c | 6 +- trunk/drivers/gpu/drm/radeon/radeon_test.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- trunk/drivers/gpu/drm/radeon/rv770.c | 4 +- trunk/drivers/gpu/drm/ttm/ttm_bo.c | 11 - .../drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 14 +- trunk/drivers/hid/hidraw.c | 1 + trunk/drivers/hid/usbhid/hiddev.c | 1 + trunk/drivers/hwmon/amc6821.c | 2 +- trunk/drivers/hwmon/i5k_amb.c | 2 - trunk/drivers/hwmon/lis3lv02d_i2c.c | 10 +- trunk/drivers/hwmon/lm93.c | 4 +- trunk/drivers/hwmon/lm95241.c | 19 +- trunk/drivers/hwmon/max6650.c | 2 +- trunk/drivers/hwmon/w83795.c | 207 +- trunk/drivers/i2c/i2c-core.c | 12 - trunk/drivers/i2c/i2c-mux.c | 1 + .../infiniband/hw/ipath/ipath_file_ops.c | 1 + trunk/drivers/infiniband/ulp/srp/ib_srp.c | 4 +- trunk/drivers/input/input.c | 3 +- trunk/drivers/input/serio/serio_raw.c | 1 + trunk/drivers/input/tablet/aiptek.c | 28 +- trunk/drivers/leds/leds-lp5521.c | 50 +- trunk/drivers/leds/leds-lp5523.c | 44 +- trunk/drivers/leds/leds-ss4200.c | 1 - trunk/drivers/md/md.c | 6 +- trunk/drivers/md/raid1.c | 1 - trunk/drivers/media/common/saa7146_i2c.c | 1 + .../media/dvb/dvb-core/dvb_ca_en50221.c | 1 + .../drivers/media/dvb/dvb-core/dvb_frontend.c | 1 + trunk/drivers/media/dvb/ngene/ngene-core.c | 1 + trunk/drivers/media/dvb/ngene/ngene-dvb.c | 1 + trunk/drivers/media/dvb/ngene/ngene-i2c.c | 1 + trunk/drivers/media/radio/radio-mr800.c | 1 + .../drivers/media/radio/si470x/radio-si470x.h | 1 + trunk/drivers/media/video/bt8xx/bttv-driver.c | 1 + .../drivers/media/video/cx88/cx88-blackbird.c | 1 + trunk/drivers/media/video/cx88/cx88-video.c | 1 + trunk/drivers/media/video/imx074.c | 2 + trunk/drivers/media/video/ir-kbd-i2c.c | 1 + trunk/drivers/media/video/ov6650.c | 2 + trunk/drivers/media/video/pwc/pwc-if.c | 1 + trunk/drivers/media/video/s2255drv.c | 1 + .../media/video/saa7134/saa7134-empress.c | 1 + trunk/drivers/media/video/saa7164/saa7164.h | 1 + .../media/video/usbvision/usbvision-video.c | 1 + .../drivers/media/video/v4l2-compat-ioctl32.c | 1 + trunk/drivers/message/fusion/mptfc.c | 7 +- trunk/drivers/message/fusion/mptsas.c | 4 +- trunk/drivers/message/fusion/mptspi.c | 4 +- trunk/drivers/message/i2o/i2o_scsi.c | 6 +- trunk/drivers/misc/apds9802als.c | 1 + trunk/drivers/misc/isl29020.c | 4 +- trunk/drivers/misc/sgi-xp/xpc_partition.c | 25 +- trunk/drivers/mmc/core/core.c | 2 +- trunk/drivers/mmc/core/mmc.c | 8 +- trunk/drivers/mmc/core/sdio.c | 51 +- trunk/drivers/mmc/core/sdio_bus.c | 33 +- trunk/drivers/mmc/host/omap_hsmmc.c | 2 +- trunk/drivers/mmc/host/sdhci-esdhc-imx.c | 12 +- trunk/drivers/mmc/host/sdhci-pci.c | 31 +- trunk/drivers/mmc/host/sdhci-pxa.c | 4 - trunk/drivers/mmc/host/sdhci.c | 54 +- trunk/drivers/mmc/host/sdhci.h | 9 +- trunk/drivers/mmc/host/ushc.c | 30 +- trunk/drivers/mtd/ubi/scan.c | 16 +- trunk/drivers/net/3c59x.c | 6 +- trunk/drivers/net/8139cp.c | 10 +- trunk/drivers/net/Kconfig | 12 - trunk/drivers/net/Makefile | 1 - trunk/drivers/net/atl1c/atl1c_hw.c | 2 +- trunk/drivers/net/benet/be_main.c | 6 - trunk/drivers/net/bnx2x/bnx2x_main.c | 2 +- trunk/drivers/net/bonding/bond_main.c | 2 - trunk/drivers/net/caif/caif_spi.c | 4 +- trunk/drivers/net/e1000/e1000_main.c | 12 +- trunk/drivers/net/gianfar.c | 7 +- trunk/drivers/net/ipg.c | 6 +- trunk/drivers/net/irda/sh_sir.c | 2 +- trunk/drivers/net/phy/marvell.c | 164 +- trunk/drivers/net/qlge/qlge_main.c | 6 +- trunk/drivers/net/r8169.c | 3 +- trunk/drivers/net/tile/Makefile | 10 - trunk/drivers/net/tile/tilepro.c | 2406 ------------- .../net/wireless/ath/ath9k/eeprom_9287.c | 2 +- .../drivers/net/wireless/ath/ath9k/hif_usb.c | 9 - .../net/wireless/ath/ath9k/htc_drv_init.c | 2 - .../net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +- trunk/drivers/net/wireless/ath/ath9k/init.c | 3 +- trunk/drivers/net/wireless/ath/ath9k/reg.h | 8 +- trunk/drivers/net/wireless/ath/carl9170/usb.c | 4 +- .../net/wireless/orinoco/orinoco_usb.c | 1 + trunk/drivers/parisc/eisa_eeprom.c | 1 + trunk/drivers/pci/Makefile | 1 - trunk/drivers/pci/bus.c | 70 +- trunk/drivers/pci/hotplug/ibmphp_ebda.c | 6 - trunk/drivers/pci/pci-sysfs.c | 23 +- trunk/drivers/pci/pci.c | 12 - trunk/drivers/pci/pci.h | 7 +- trunk/drivers/pci/proc.c | 3 +- trunk/drivers/pci/quirks.c | 18 - trunk/drivers/pnp/isapnp/proc.c | 1 + trunk/drivers/rtc/rtc-sh.c | 4 +- trunk/drivers/s390/block/dasd_eer.c | 1 + trunk/drivers/s390/char/fs3270.c | 1 + trunk/drivers/s390/char/tape_char.c | 1 + trunk/drivers/s390/char/tape_core.c | 68 +- trunk/drivers/s390/char/vmlogrdr.c | 37 +- trunk/drivers/s390/char/vmur.c | 1 + trunk/drivers/s390/cio/device.c | 11 +- trunk/drivers/s390/cio/qdio_thinint.c | 2 +- trunk/drivers/s390/crypto/zcrypt_api.c | 1 + trunk/drivers/s390/scsi/zfcp_scsi.c | 4 +- trunk/drivers/scsi/3w-9xxx.c | 4 +- trunk/drivers/scsi/3w-sas.c | 4 +- trunk/drivers/scsi/3w-xxxx.c | 4 +- trunk/drivers/scsi/53c700.c | 8 +- trunk/drivers/scsi/BusLogic.c | 3 +- trunk/drivers/scsi/BusLogic.h | 2 +- trunk/drivers/scsi/NCR5380.c | 3 +- trunk/drivers/scsi/NCR5380.h | 2 +- trunk/drivers/scsi/NCR53c406a.c | 4 +- trunk/drivers/scsi/a100u2w.c | 4 +- trunk/drivers/scsi/aacraid/linit.c | 4 +- trunk/drivers/scsi/advansys.c | 4 +- trunk/drivers/scsi/aha152x.c | 4 +- trunk/drivers/scsi/aha1542.c | 4 +- trunk/drivers/scsi/aha1542.h | 2 +- trunk/drivers/scsi/aha1740.c | 4 +- trunk/drivers/scsi/aic7xxx/aic79xx_osm.c | 4 +- trunk/drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 +- trunk/drivers/scsi/aic7xxx_old.c | 4 +- trunk/drivers/scsi/arcmsr/arcmsr_hba.c | 7 +- trunk/drivers/scsi/arm/acornscsi.c | 4 +- trunk/drivers/scsi/arm/fas216.c | 10 +- trunk/drivers/scsi/arm/fas216.h | 18 +- trunk/drivers/scsi/atari_NCR5380.c | 4 +- trunk/drivers/scsi/atari_scsi.c | 17 + trunk/drivers/scsi/atp870u.c | 4 +- trunk/drivers/scsi/bfa/bfad_im.c | 7 +- trunk/drivers/scsi/dc395x.c | 3 +- trunk/drivers/scsi/dpt_i2o.c | 4 +- trunk/drivers/scsi/dpti.h | 2 +- trunk/drivers/scsi/dtc.h | 2 +- trunk/drivers/scsi/eata.c | 7 +- trunk/drivers/scsi/eata_pio.c | 4 +- trunk/drivers/scsi/esp_scsi.c | 4 +- trunk/drivers/scsi/fd_mcs.c | 4 +- trunk/drivers/scsi/fdomain.c | 4 +- trunk/drivers/scsi/fnic/fnic.h | 2 +- trunk/drivers/scsi/fnic/fnic_scsi.c | 4 +- trunk/drivers/scsi/g_NCR5380.h | 2 +- trunk/drivers/scsi/gdth.c | 6 +- trunk/drivers/scsi/hpsa.c | 8 +- trunk/drivers/scsi/hptiop.c | 4 +- trunk/drivers/scsi/ibmmca.c | 6 +- trunk/drivers/scsi/ibmvscsi/ibmvfc.c | 4 +- trunk/drivers/scsi/ibmvscsi/ibmvscsi.c | 4 +- trunk/drivers/scsi/imm.c | 4 +- trunk/drivers/scsi/in2000.c | 4 +- trunk/drivers/scsi/in2000.h | 2 +- trunk/drivers/scsi/initio.c | 4 +- trunk/drivers/scsi/ipr.c | 4 +- trunk/drivers/scsi/ips.c | 6 +- trunk/drivers/scsi/libfc/fc_fcp.c | 4 +- trunk/drivers/scsi/libiscsi.c | 4 +- trunk/drivers/scsi/libsas/sas_scsi_host.c | 4 +- trunk/drivers/scsi/lpfc/lpfc_scsi.c | 4 +- trunk/drivers/scsi/mac53c94.c | 4 +- trunk/drivers/scsi/megaraid.c | 6 +- trunk/drivers/scsi/megaraid.h | 2 +- trunk/drivers/scsi/megaraid/megaraid_mbox.c | 7 +- trunk/drivers/scsi/megaraid/megaraid_sas.c | 4 +- trunk/drivers/scsi/mesh.c | 4 +- trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c | 4 +- trunk/drivers/scsi/ncr53c8xx.c | 4 +- trunk/drivers/scsi/nsp32.c | 7 +- trunk/drivers/scsi/pas16.h | 2 +- trunk/drivers/scsi/pcmcia/nsp_cs.c | 4 +- trunk/drivers/scsi/pcmcia/nsp_cs.h | 3 +- trunk/drivers/scsi/pcmcia/sym53c500_cs.c | 4 +- trunk/drivers/scsi/pm8001/pm8001_sas.h | 1 + trunk/drivers/scsi/pmcraid.c | 4 +- trunk/drivers/scsi/ppa.c | 4 +- trunk/drivers/scsi/ps3rom.c | 4 +- trunk/drivers/scsi/qla1280.c | 4 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 7 +- trunk/drivers/scsi/qla4xxx/ql4_os.c | 7 +- trunk/drivers/scsi/qlogicfas408.c | 4 +- trunk/drivers/scsi/qlogicfas408.h | 3 +- trunk/drivers/scsi/qlogicpti.c | 4 +- trunk/drivers/scsi/scsi.c | 18 +- trunk/drivers/scsi/scsi_debug.c | 4 +- trunk/drivers/scsi/scsi_error.c | 6 +- trunk/drivers/scsi/sd.c | 1 + trunk/drivers/scsi/stex.c | 4 +- trunk/drivers/scsi/sun3_NCR5380.c | 4 +- trunk/drivers/scsi/sun3_scsi.h | 3 +- trunk/drivers/scsi/sym53c416.c | 4 +- trunk/drivers/scsi/sym53c416.h | 2 +- trunk/drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +- trunk/drivers/scsi/t128.h | 3 +- trunk/drivers/scsi/tmscsim.c | 4 +- trunk/drivers/scsi/u14-34f.c | 6 +- trunk/drivers/scsi/ultrastor.c | 4 +- trunk/drivers/scsi/ultrastor.h | 3 +- trunk/drivers/scsi/vmw_pvscsi.c | 4 +- trunk/drivers/scsi/wd33c93.c | 6 +- trunk/drivers/scsi/wd33c93.h | 3 +- trunk/drivers/scsi/wd7000.c | 4 +- trunk/drivers/serial/crisv10.c | 1 + trunk/drivers/serial/serial_core.c | 1 + trunk/drivers/sh/clk/core.c | 20 +- trunk/drivers/sh/clk/cpg.c | 7 +- trunk/drivers/sh/intc/virq.c | 2 +- trunk/drivers/staging/easycap/easycap.h | 1 + trunk/drivers/staging/hv/storvsc_drv.c | 7 +- .../intel_sst/intel_sst_app_interface.c | 1 + trunk/drivers/staging/keucr/scsiglue.c | 4 +- trunk/drivers/staging/olpc_dcon/olpc_dcon.c | 4 + trunk/drivers/staging/rtl8712/osdep_service.h | 1 + trunk/drivers/staging/speakup/buffers.c | 1 + trunk/drivers/staging/stradis/Kconfig | 2 +- trunk/drivers/tty/sysrq.c | 169 +- trunk/drivers/usb/core/devices.c | 1 + trunk/drivers/usb/core/devio.c | 1 + trunk/drivers/usb/core/file.c | 1 + trunk/drivers/usb/core/inode.c | 1 + trunk/drivers/usb/gadget/f_fs.c | 1 + trunk/drivers/usb/gadget/f_hid.c | 1 + trunk/drivers/usb/host/ehci-pci.c | 12 - trunk/drivers/usb/host/isp1362-hcd.c | 1 + trunk/drivers/usb/host/uhci-debug.c | 1 + trunk/drivers/usb/host/xhci.c | 18 + trunk/drivers/usb/image/microtek.c | 6 +- trunk/drivers/usb/misc/yurex.c | 1 - trunk/drivers/usb/mon/mon_bin.c | 1 + trunk/drivers/usb/mon/mon_stat.c | 1 + trunk/drivers/usb/serial/ftdi_sio.c | 2 - trunk/drivers/usb/serial/ftdi_sio_ids.h | 4 - trunk/drivers/usb/serial/usb-serial.c | 4 +- trunk/drivers/usb/storage/scsiglue.c | 4 +- trunk/drivers/usb/storage/uas.c | 4 +- trunk/drivers/video/backlight/backlight.c | 12 +- trunk/drivers/video/console/vgacon.c | 1 + trunk/drivers/video/fbcmap.c | 68 +- trunk/drivers/video/geode/lxfb_ops.c | 4 +- trunk/drivers/video/mx3fb.c | 4 - trunk/drivers/video/omap2/vram.c | 17 +- trunk/drivers/video/riva/rivafb-i2c.c | 1 + trunk/drivers/video/sh_mobile_hdmi.c | 5 +- trunk/drivers/video/sh_mobile_lcdcfb.c | 25 +- trunk/drivers/video/sis/init.c | 685 +++- trunk/drivers/video/sis/init.h | 63 +- trunk/drivers/video/sis/init301.c | 467 ++- trunk/drivers/video/sis/init301.h | 43 +- trunk/drivers/video/sis/initextlfb.c | 7 +- trunk/drivers/video/sis/osdef.h | 133 + trunk/drivers/video/sis/sis.h | 1 + trunk/drivers/video/sis/sis_main.c | 38 +- trunk/drivers/video/sis/vgatypes.h | 11 + trunk/drivers/video/sis/vstruct.h | 12 + trunk/drivers/virtio/virtio.c | 6 +- trunk/drivers/virtio/virtio_ring.c | 3 + trunk/drivers/xen/Makefile | 5 +- trunk/drivers/xen/balloon.c | 32 +- trunk/drivers/xen/events.c | 13 +- trunk/drivers/xen/evtchn.c | 100 +- trunk/drivers/xen/xenfs/privcmd.c | 14 +- trunk/drivers/xen/xenfs/super.c | 46 +- trunk/drivers/zorro/proc.c | 1 + trunk/fs/block_dev.c | 1 + trunk/fs/ceph/addr.c | 6 +- trunk/fs/ceph/caps.c | 17 +- trunk/fs/ceph/dir.c | 16 +- trunk/fs/ceph/file.c | 52 +- trunk/fs/ceph/inode.c | 50 +- trunk/fs/ceph/mds_client.c | 8 +- trunk/fs/ceph/mds_client.h | 2 - trunk/fs/ceph/super.h | 4 +- trunk/fs/compat_ioctl.c | 1 + trunk/fs/ecryptfs/super.c | 1 + trunk/fs/ext3/super.c | 1 + trunk/fs/ext4/ioctl.c | 24 - trunk/fs/ext4/page-io.c | 4 +- trunk/fs/ext4/super.c | 9 +- trunk/fs/fuse/file.c | 10 - trunk/fs/gfs2/export.c | 46 +- trunk/fs/gfs2/glock.c | 21 +- trunk/fs/gfs2/inode.c | 152 +- trunk/fs/gfs2/inode.h | 4 +- trunk/fs/gfs2/rgrp.c | 91 +- trunk/fs/ioctl.c | 40 + trunk/fs/ioprio.c | 31 +- trunk/fs/jbd2/journal.c | 16 +- trunk/fs/lockd/clntlock.c | 1 + trunk/fs/lockd/clntproc.c | 1 + trunk/fs/lockd/host.c | 11 +- trunk/fs/lockd/svc4proc.c | 1 + trunk/fs/lockd/svclock.c | 1 + trunk/fs/lockd/svcproc.c | 1 + trunk/fs/locks.c | 1 + trunk/fs/namespace.c | 1 + trunk/fs/ncpfs/dir.c | 1 + trunk/fs/ncpfs/file.c | 1 + trunk/fs/ncpfs/inode.c | 1 + trunk/fs/ncpfs/ioctl.c | 1 + trunk/fs/nfs/callback.c | 1 + trunk/fs/nfs/delegation.c | 1 + trunk/fs/nfs/dir.c | 156 +- trunk/fs/nfs/direct.c | 2 +- trunk/fs/nfs/internal.h | 9 - trunk/fs/nfs/nfs2xdr.c | 8 +- trunk/fs/nfs/nfs3xdr.c | 8 +- trunk/fs/nfs/nfs4proc.c | 4 +- trunk/fs/nfs/nfs4xdr.c | 8 +- trunk/fs/nfs/super.c | 9 +- trunk/fs/nfsd/nfs4state.c | 8 +- trunk/fs/nilfs2/dat.c | 2 +- trunk/fs/nilfs2/ioctl.c | 4 +- trunk/fs/ocfs2/ocfs2.h | 6 +- trunk/fs/ocfs2/super.c | 1 + trunk/fs/pipe.c | 14 +- trunk/fs/proc/inode.c | 1 + trunk/fs/proc/task_mmu.c | 3 +- trunk/fs/read_write.c | 1 + trunk/fs/reiserfs/inode.c | 1 + trunk/fs/reiserfs/ioctl.c | 8 +- trunk/fs/reiserfs/journal.c | 1 + trunk/fs/reiserfs/super.c | 1 + trunk/fs/splice.c | 24 +- trunk/include/drm/nouveau_drm.h | 7 - trunk/include/linux/ceph/libceph.h | 3 +- trunk/include/linux/ceph/messenger.h | 1 - trunk/include/linux/ceph/osd_client.h | 7 +- trunk/include/linux/dmar.h | 17 +- trunk/include/linux/fb.h | 1 - trunk/include/linux/fs.h | 7 +- trunk/include/linux/fsl-diu-fb.h | 1 + trunk/include/linux/hardirq.h | 6 +- trunk/include/linux/hw_breakpoint.h | 4 - trunk/include/linux/i2c-id.h | 22 + trunk/include/linux/i2c.h | 2 +- trunk/include/linux/kernel.h | 245 +- trunk/include/linux/libata.h | 2 +- trunk/include/linux/lockd/lockd.h | 1 - trunk/include/linux/marvell_phy.h | 1 - trunk/include/linux/mfd/wm8350/audio.h | 3 + trunk/include/linux/mmc/host.h | 1 - trunk/include/linux/module.h | 2 +- trunk/include/linux/nfs_fs.h | 6 + trunk/include/linux/nfs_xdr.h | 1 - trunk/include/linux/page_cgroup.h | 7 +- trunk/include/linux/pci_ids.h | 1 - trunk/include/linux/perf_event.h | 30 +- trunk/include/linux/pipe_fs_i.h | 1 - trunk/include/linux/printk.h | 248 -- trunk/include/linux/reiserfs_fs.h | 1 + trunk/include/linux/rtnetlink.h | 2 +- trunk/include/linux/sched.h | 1 - trunk/include/linux/security.h | 9 +- trunk/include/linux/sh_clk.h | 34 +- trunk/include/linux/sh_intc.h | 2 +- trunk/include/linux/smp_lock.h | 3 + trunk/include/linux/tty.h | 1 + trunk/include/net/cfg80211.h | 2 +- trunk/include/net/neighbour.h | 2 +- trunk/include/scsi/libfc.h | 3 +- trunk/include/scsi/libiscsi.h | 3 +- trunk/include/scsi/libsas.h | 3 +- trunk/include/scsi/scsi_host.h | 23 +- trunk/include/sound/sh_fsi.h | 6 +- trunk/include/video/da8xx-fb.h | 1 + trunk/include/xen/interface/memory.h | 13 - trunk/include/xen/page.h | 7 - trunk/include/xen/privcmd.h | 5 +- trunk/init/Kconfig | 13 - trunk/init/main.c | 1 + trunk/kernel/debug/kdb/kdb_main.c | 21 +- trunk/kernel/futex.c | 3 +- trunk/kernel/futex_compat.c | 3 +- trunk/kernel/hw_breakpoint.c | 3 +- trunk/kernel/irq_work.c | 4 +- trunk/kernel/module.c | 12 - trunk/kernel/perf_event.c | 93 +- trunk/kernel/pm_qos_params.c | 4 +- trunk/kernel/posix-cpu-timers.c | 12 +- trunk/kernel/power/Kconfig | 4 - trunk/kernel/printk.c | 15 +- trunk/kernel/sched.c | 39 +- trunk/kernel/sched_fair.c | 48 +- trunk/kernel/sched_stoptask.c | 4 +- trunk/kernel/sysctl.c | 2 +- trunk/kernel/trace/Kconfig | 2 +- trunk/kernel/trace/trace.c | 20 +- trunk/mm/memcontrol.c | 66 +- trunk/mm/nommu.c | 1 - trunk/mm/page_alloc.c | 14 +- trunk/mm/pagewalk.c | 5 +- trunk/mm/slub.c | 3 +- trunk/net/ceph/buffer.c | 2 +- trunk/net/ceph/messenger.c | 13 +- trunk/net/ceph/osd_client.c | 25 +- trunk/net/ceph/pagevec.c | 3 +- trunk/net/core/filter.c | 2 +- trunk/net/core/net-sysfs.c | 10 +- trunk/net/core/request_sock.c | 4 +- trunk/net/ipv4/fib_trie.c | 2 +- trunk/net/ipv4/icmp.c | 3 - trunk/net/ipv6/addrconf.c | 34 +- trunk/net/irda/af_irda.c | 1 + trunk/net/irda/irnet/irnet_ppp.c | 1 + trunk/net/irda/irttp.c | 30 +- trunk/net/netfilter/ipvs/Kconfig | 1 - trunk/net/rds/rdma.c | 2 +- trunk/net/sunrpc/clnt.c | 24 +- trunk/net/sunrpc/stats.c | 4 +- trunk/net/sunrpc/svc_xprt.c | 1 + trunk/net/wireless/chan.c | 54 - trunk/net/xfrm/xfrm_hash.c | 2 +- trunk/scripts/gfp-translate | 7 +- trunk/scripts/kernel-doc | 12 +- trunk/security/capability.c | 5 - trunk/security/commoncap.c | 21 + trunk/security/security.c | 4 +- trunk/security/selinux/hooks.c | 6 +- trunk/security/smack/smack_lsm.c | 8 +- trunk/sound/atmel/abdac.c | 4 +- trunk/sound/core/info.c | 1 + trunk/sound/core/pcm_lib.c | 2 +- trunk/sound/core/pcm_native.c | 1 + trunk/sound/core/sound.c | 1 + trunk/sound/oss/dev_table.c | 6 +- trunk/sound/oss/midibuf.c | 4 +- trunk/sound/oss/pss.c | 6 +- trunk/sound/oss/sequencer.c | 4 +- trunk/sound/pci/asihpi/hpioctl.c | 2 +- trunk/sound/pci/azt3328.c | 26 +- trunk/sound/pci/ctxfi/ctpcm.c | 16 +- trunk/sound/pci/hda/patch_conexant.c | 2 - trunk/sound/pci/hda/patch_realtek.c | 84 +- trunk/sound/pci/hda/patch_sigmatel.c | 18 +- trunk/sound/pci/intel8x0.c | 6 - trunk/sound/pci/mixart/mixart_hwdep.h | 10 - trunk/sound/ppc/pmac.c | 12 +- trunk/sound/soc/atmel/Kconfig | 5 +- trunk/sound/soc/atmel/sam9g20_wm8731.c | 9 +- trunk/sound/soc/atmel/snd-soc-afeb9260.c | 1 + trunk/sound/soc/codecs/max98088.c | 14 +- trunk/sound/soc/codecs/stac9766.c | 1 - trunk/sound/soc/codecs/tlv320aic3x.c | 6 +- trunk/sound/soc/codecs/tpa6130a2.c | 4 +- trunk/sound/soc/codecs/uda134x.c | 1 - trunk/sound/soc/codecs/wm8350.c | 9 +- trunk/sound/soc/codecs/wm8523.c | 1 + trunk/sound/soc/codecs/wm8776.c | 1 + trunk/sound/soc/codecs/wm8904.c | 2 - trunk/sound/soc/codecs/wm8961.c | 4 +- trunk/sound/soc/codecs/wm8962.c | 5 +- trunk/sound/soc/codecs/wm8994.c | 6 - trunk/sound/soc/davinci/davinci-evm.c | 40 +- trunk/sound/soc/davinci/davinci-i2s.c | 15 +- trunk/sound/soc/davinci/davinci-mcasp.c | 13 +- trunk/sound/soc/davinci/davinci-sffsdr.c | 2 +- trunk/sound/soc/davinci/davinci-vcif.c | 16 +- trunk/sound/soc/ep93xx/simone.c | 18 +- trunk/sound/soc/fsl/efika-audio-fabric.c | 1 - trunk/sound/soc/fsl/mpc5200_dma.c | 1 + trunk/sound/soc/fsl/mpc5200_psc_i2s.c | 2 +- trunk/sound/soc/fsl/pcm030-audio-fabric.c | 1 - trunk/sound/soc/imx/eukrea-tlv320.c | 8 +- trunk/sound/soc/imx/imx-pcm-dma-mx2.c | 221 +- trunk/sound/soc/imx/imx-ssi.c | 57 +- trunk/sound/soc/imx/imx-ssi.h | 4 - trunk/sound/soc/imx/phycore-ac97.c | 33 +- trunk/sound/soc/nuc900/nuc900-ac97.c | 2 +- trunk/sound/soc/omap/omap-mcbsp.c | 8 - trunk/sound/soc/omap/omap3pandora.c | 1 - trunk/sound/soc/omap/osk5912.c | 11 +- trunk/sound/soc/pxa/Kconfig | 1 - trunk/sound/soc/pxa/corgi.c | 5 - trunk/sound/soc/pxa/magician.c | 4 - trunk/sound/soc/pxa/poodle.c | 5 - trunk/sound/soc/pxa/spitz.c | 5 - trunk/sound/soc/pxa/tosa.c | 5 - trunk/sound/soc/s3c24xx/Kconfig | 1 - trunk/sound/soc/s3c24xx/rx1950_uda1380.c | 20 +- trunk/sound/soc/s3c24xx/smdk_spdif.c | 4 +- trunk/sound/soc/sh/fsi.c | 25 +- trunk/sound/soc/sh/ssi.c | 2 +- trunk/sound/soc/soc-core.c | 9 +- trunk/sound/soc/soc-dapm.c | 4 +- trunk/sound/sound_core.c | 1 + trunk/sound/spi/at73c213.c | 2 +- trunk/tools/perf/builtin-record.c | 17 +- trunk/tools/perf/util/symbol.c | 4 +- 737 files changed, 4759 insertions(+), 13028 deletions(-) create mode 100644 trunk/Documentation/sh/clk.txt create mode 100644 trunk/arch/tile/include/asm/pci-bridge.h delete mode 100644 trunk/arch/tile/include/hv/drv_xgbe_impl.h delete mode 100644 trunk/arch/tile/include/hv/drv_xgbe_intf.h delete mode 100644 trunk/arch/tile/include/hv/netio_errors.h delete mode 100644 trunk/arch/tile/include/hv/netio_intf.h delete mode 100644 trunk/arch/tile/kernel/pci.c delete mode 100644 trunk/drivers/net/tile/Makefile delete mode 100644 trunk/drivers/net/tile/tilepro.c create mode 100644 trunk/drivers/video/sis/osdef.h delete mode 100644 trunk/include/linux/printk.h diff --git a/[refs] b/[refs] index c73311a1ed19..9a32cd6960d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abf03184a31a3286fc0ab30f838ddee8ba9f9b7b +refs/heads/master: 7a3783efffc7bc2e702d774e47fad5b8e37e9ad1 diff --git a/trunk/Documentation/DocBook/sh.tmpl b/trunk/Documentation/DocBook/sh.tmpl index 4a38f604fa66..d858d92cf6d9 100644 --- a/trunk/Documentation/DocBook/sh.tmpl +++ b/trunk/Documentation/DocBook/sh.tmpl @@ -79,6 +79,10 @@ + + Clock Framework Extensions +!Iinclude/linux/sh_clk.h + Machine Specific Interfaces diff --git a/trunk/Documentation/DocBook/uio-howto.tmpl b/trunk/Documentation/DocBook/uio-howto.tmpl index b4665b9c40b0..4d4ce0e61e42 100644 --- a/trunk/Documentation/DocBook/uio-howto.tmpl +++ b/trunk/Documentation/DocBook/uio-howto.tmpl @@ -16,7 +16,7 @@
- hjk@hansjkoch.de + hjk@linutronix.de
@@ -114,7 +114,7 @@ GPL version 2. If you know of any translations for this document, or you are interested in translating it, please email me -hjk@hansjkoch.de. +hjk@linutronix.de. @@ -171,7 +171,7 @@ interested in translating it, please email me Feedback Find something wrong with this document? (Or perhaps something right?) I would love to hear from you. Please email me at - hjk@hansjkoch.de. + hjk@linutronix.de. diff --git a/trunk/Documentation/arm/OMAP/DSS b/trunk/Documentation/arm/OMAP/DSS index 888ae7b83ae4..0af0e9eed5d6 100644 --- a/trunk/Documentation/arm/OMAP/DSS +++ b/trunk/Documentation/arm/OMAP/DSS @@ -255,10 +255,9 @@ framebuffer parameters. Kernel boot arguments --------------------- -vram=[,] - - Amount of total VRAM to preallocate and optionally a physical start - memory address. For example, "10M". omapfb allocates memory for - framebuffers from VRAM. +vram= + - Amount of total VRAM to preallocate. For example, "10M". omapfb + allocates memory for framebuffers from VRAM. omapfb.mode=:[,...] - Default video mode for specified displays. For example, diff --git a/trunk/Documentation/development-process/2.Process b/trunk/Documentation/development-process/2.Process index 911a45186340..97726eba6102 100644 --- a/trunk/Documentation/development-process/2.Process +++ b/trunk/Documentation/development-process/2.Process @@ -154,7 +154,7 @@ The stages that a patch goes through are, generally: inclusion, it should be accepted by a relevant subsystem maintainer - though this acceptance is not a guarantee that the patch will make it all the way to the mainline. The patch will show up in the maintainer's - subsystem tree and into the -next trees (described below). When the + subsystem tree and into the staging trees (described below). When the process works, this step leads to more extensive review of the patch and the discovery of any problems resulting from the integration of this patch with work being done by others. @@ -236,7 +236,7 @@ finding the right maintainer. Sending patches directly to Linus is not normally the right way to go. -2.4: NEXT TREES +2.4: STAGING TREES The chain of subsystem trees guides the flow of patches into the kernel, but it also raises an interesting question: what if somebody wants to look @@ -250,7 +250,7 @@ changes land in the mainline kernel. One could pull changes from all of the interesting subsystem trees, but that would be a big and error-prone job. -The answer comes in the form of -next trees, where subsystem trees are +The answer comes in the form of staging trees, where subsystem trees are collected for testing and review. The older of these trees, maintained by Andrew Morton, is called "-mm" (for memory management, which is how it got started). The -mm tree integrates patches from a long list of subsystem @@ -275,7 +275,7 @@ directory at: Use of the MMOTM tree is likely to be a frustrating experience, though; there is a definite chance that it will not even compile. -The other -next tree, started more recently, is linux-next, maintained by +The other staging tree, started more recently, is linux-next, maintained by Stephen Rothwell. The linux-next tree is, by design, a snapshot of what the mainline is expected to look like after the next merge window closes. Linux-next trees are announced on the linux-kernel and linux-next mailing @@ -303,25 +303,12 @@ volatility of linux-next tends to make it a difficult development target. See http://lwn.net/Articles/289013/ for more information on this topic, and stay tuned; much is still in flux where linux-next is involved. -2.4.1: STAGING TREES - -The kernel source tree now contains the drivers/staging/ directory, where -many sub-directories for drivers or filesystems that are on their way to -being added to the kernel tree live. They remain in drivers/staging while -they still need more work; once complete, they can be moved into the -kernel proper. This is a way to keep track of drivers that aren't -up to Linux kernel coding or quality standards, but people may want to use -them and track development. - -Greg Kroah-Hartman currently (as of 2.6.36) maintains the staging tree. -Drivers that still need work are sent to him, with each driver having -its own subdirectory in drivers/staging/. Along with the driver source -files, a TODO file should be present in the directory as well. The TODO -file lists the pending work that the driver needs for acceptance into -the kernel proper, as well as a list of people that should be Cc'd for any -patches to the driver. Staging drivers that don't currently build should -have their config entries depend upon CONFIG_BROKEN. Once they can -be successfully built without outside patches, CONFIG_BROKEN can be removed. +Besides the mmotm and linux-next trees, the kernel source tree now contains +the drivers/staging/ directory and many sub-directories for drivers or +filesystems that are on their way to being added to the kernel tree +proper, but they remain in drivers/staging/ while they still need more +work. + 2.5: TOOLS diff --git a/trunk/Documentation/fb/00-INDEX b/trunk/Documentation/fb/00-INDEX index 30a70542e823..a618fd99c9f0 100644 --- a/trunk/Documentation/fb/00-INDEX +++ b/trunk/Documentation/fb/00-INDEX @@ -4,41 +4,33 @@ please mail me. Geert Uytterhoeven 00-INDEX - - this file. + - this file arkfb.txt - info on the fbdev driver for ARK Logic chips. aty128fb.txt - info on the ATI Rage128 frame buffer driver. cirrusfb.txt - info on the driver for Cirrus Logic chipsets. -cmap_xfbdev.txt - - an introduction to fbdev's cmap structures. deferred_io.txt - an introduction to deferred IO. -efifb.txt - - info on the EFI platform driver for Intel based Apple computers. -ep93xx-fb.txt - - info on the driver for EP93xx LCD controller. fbcon.txt - intro to and usage guide for the framebuffer console (fbcon). framebuffer.txt - introduction to frame buffer devices. -gxfb.txt - - info on the framebuffer driver for AMD Geode GX2 based processors. +imacfb.txt + - info on the generic EFI platform driver for Intel based Macs. intel810.txt - documentation for the Intel 810/815 framebuffer driver. intelfb.txt - docs for Intel 830M/845G/852GM/855GM/865G/915G/945G fb driver. internals.txt - quick overview of frame buffer device internals. -lxfb.txt - - info on the framebuffer driver for AMD Geode LX based processors. matroxfb.txt - info on the Matrox framebuffer driver for Alpha, Intel and PPC. -metronomefb.txt - - info on the driver for the Metronome display controller. modedb.txt - info on the video mode database. +matroxfb.txt + - info on the Matrox frame buffer driver. pvr2fb.txt - info on the PowerVR 2 frame buffer driver. pxafb.txt @@ -47,23 +39,13 @@ s3fb.txt - info on the fbdev driver for S3 Trio/Virge chips. sa1100fb.txt - information about the driver for the SA-1100 LCD controller. -sh7760fb.txt - - info on the SH7760/SH7763 integrated LCDC Framebuffer driver. sisfb.txt - info on the framebuffer device driver for various SiS chips. sstfb.txt - info on the frame buffer driver for 3dfx' Voodoo Graphics boards. tgafb.txt - - info on the TGA (DECChip 21030) frame buffer driver. -tridentfb.txt - info on the framebuffer driver for some Trident chip based cards. -uvesafb.txt - - info on the userspace VESA (VBE2+ compliant) frame buffer device. + - info on the TGA (DECChip 21030) frame buffer driver vesafb.txt - - info on the VESA frame buffer device. -viafb.modes - - list of modes for VIA Integration Graphic Chip. -viafb.txt - - info on the VIA Integration Graphic Chip console framebuffer driver. + - info on the VESA frame buffer device vt8623fb.txt - info on the fb driver for the graphics core in VIA VT8623 chipsets. diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 6c2f55e05f13..d8f36f984faa 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -554,13 +554,3 @@ Why: This is a legacy interface which have been replaced by a more Who: NeilBrown ---------------------------- - -What: i2c_adapter.id -When: June 2011 -Why: This field is deprecated. I2C device drivers shouldn't change their - behavior based on the underlying I2C adapter. Instead, the I2C - adapter driver should instantiate the I2C devices and provide the - needed platform-specific information. -Who: Jean Delvare - ----------------------------- diff --git a/trunk/Documentation/filesystems/configfs/configfs_example_explicit.c b/trunk/Documentation/filesystems/configfs/configfs_example_explicit.c index fd53869f5633..d428cc9f07f3 100644 --- a/trunk/Documentation/filesystems/configfs/configfs_example_explicit.c +++ b/trunk/Documentation/filesystems/configfs/configfs_example_explicit.c @@ -89,7 +89,7 @@ static ssize_t childless_storeme_write(struct childless *childless, char *p = (char *) page; tmp = simple_strtoul(p, &p, 10); - if ((*p != '\0') && (*p != '\n')) + if (!p || (*p && (*p != '\n'))) return -EINVAL; if (tmp > INT_MAX) diff --git a/trunk/Documentation/gpio.txt b/trunk/Documentation/gpio.txt index 792faa3c06cf..9633da01ff46 100644 --- a/trunk/Documentation/gpio.txt +++ b/trunk/Documentation/gpio.txt @@ -617,16 +617,6 @@ and have the following read/write attributes: is configured as an output, this value may be written; any nonzero value is treated as high. - If the pin can be configured as interrupt-generating interrupt - and if it has been configured to generate interrupts (see the - description of "edge"), you can poll(2) on that file and - poll(2) will return whenever the interrupt was triggered. If - you use poll(2), set the events POLLPRI and POLLERR. If you - use select(2), set the file descriptor in exceptfds. After - poll(2) returns, either lseek(2) to the beginning of the sysfs - file and read the new value or close the file and re-open it - to read the value. - "edge" ... reads as either "none", "rising", "falling", or "both". Write these strings to select the signal edge(s) that will make poll(2) on the "value" file return. diff --git a/trunk/Documentation/hwmon/lm93 b/trunk/Documentation/hwmon/lm93 index 7a10616d0b44..ac711f357faf 100644 --- a/trunk/Documentation/hwmon/lm93 +++ b/trunk/Documentation/hwmon/lm93 @@ -11,7 +11,7 @@ Authors: Mark M. Hoffman Ported to 2.6 by Eric J. Bowersox Adapted to 2.6.20 by Carsten Emde - Modified for mainline integration by Hans J. Koch + Modified for mainline integration by Hans J. Koch Module Parameters ----------------- diff --git a/trunk/Documentation/hwmon/max6650 b/trunk/Documentation/hwmon/max6650 index c565650fcfc6..8be7beb9e3e8 100644 --- a/trunk/Documentation/hwmon/max6650 +++ b/trunk/Documentation/hwmon/max6650 @@ -8,7 +8,7 @@ Supported chips: Datasheet: http://pdfserv.maxim-ic.com/en/ds/MAX6650-MAX6651.pdf Authors: - Hans J. Koch + Hans J. Koch John Morris Claus Gindhart diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index cdd2a6e8a3b7..92e83e53148f 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -2385,11 +2385,6 @@ and is between 256 and 4096 characters. It is defined in the file improve throughput, but will also increase the amount of memory reserved for use by the client. - swapaccount[=0|1] - [KNL] Enable accounting of swap in memory resource - controller if no parameter or 1 is given or disable - it if 0 is given (See Documentation/cgroups/memory.txt) - swiotlb= [IA-64] Number of I/O TLB slabs switches= [HW,M68k] diff --git a/trunk/Documentation/power/opp.txt b/trunk/Documentation/power/opp.txt index cd445582d1f8..44d87ad3cea9 100644 --- a/trunk/Documentation/power/opp.txt +++ b/trunk/Documentation/power/opp.txt @@ -37,9 +37,6 @@ Typical usage of the OPP library is as follows: SoC framework -> modifies on required cases certain OPPs -> OPP layer -> queries to search/retrieve information -> -Architectures that provide a SoC framework for OPP should select ARCH_HAS_OPP -to make the OPP layer available. - OPP layer expects each domain to be represented by a unique device pointer. SoC framework registers a set of initial OPPs per device with the OPP layer. This list is expected to be an optimally small number typically around 5 per device. diff --git a/trunk/Documentation/sh/clk.txt b/trunk/Documentation/sh/clk.txt new file mode 100644 index 000000000000..114b595cfa97 --- /dev/null +++ b/trunk/Documentation/sh/clk.txt @@ -0,0 +1,32 @@ +Clock framework on SuperH architecture + +The framework on SH extends existing API by the function clk_set_rate_ex, +which prototype is as follows: + + clk_set_rate_ex (struct clk *clk, unsigned long rate, int algo_id) + +The algo_id parameter is used to specify algorithm used to recalculate clocks, +adjanced to clock, specified as first argument. It is assumed that algo_id==0 +means no changes to adjanced clock + +Internally, the clk_set_rate_ex forwards request to clk->ops->set_rate method, +if it is present in ops structure. The method should set the clock rate and adjust +all needed clocks according to the passed algo_id. +Exact values for algo_id are machine-dependent. For the sh7722, the following +values are defined: + + NO_CHANGE = 0, + IUS_N1_N1, /* I:U = N:1, U:Sh = N:1 */ + IUS_322, /* I:U:Sh = 3:2:2 */ + IUS_522, /* I:U:Sh = 5:2:2 */ + IUS_N11, /* I:U:Sh = N:1:1 */ + SB_N1, /* Sh:B = N:1 */ + SB3_N1, /* Sh:B3 = N:1 */ + SB3_32, /* Sh:B3 = 3:2 */ + SB3_43, /* Sh:B3 = 4:3 */ + SB3_54, /* Sh:B3 = 5:4 */ + BP_N1, /* B:P = N:1 */ + IP_N1 /* I:P = N:1 */ + +Each of these constants means relation between clocks that can be set via the FRQCR +register diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index b3be8b3d0437..88b74a75d932 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -945,7 +945,7 @@ M: Magnus Damm L: linux-sh@vger.kernel.org W: http://oss.renesas.com Q: http://patchwork.kernel.org/project/linux-sh/list/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-latest +T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git S: Supported F: arch/arm/mach-shmobile/ F: drivers/sh/ @@ -1359,7 +1359,7 @@ F: include/net/bluetooth/ BONDING DRIVER M: Jay Vosburgh -L: netdev@vger.kernel.org +L: bonding-devel@lists.sourceforge.net W: http://sourceforge.net/projects/bonding/ S: Supported F: drivers/net/bonding/ @@ -1829,13 +1829,6 @@ W: http://www.chelsio.com S: Supported F: drivers/net/cxgb4vf/ -STMMAC ETHERNET DRIVER -M: Giuseppe Cavallaro -L: netdev@vger.kernel.org -W: http://www.stlinux.com -S: Supported -F: drivers/net/stmmac/ - CYBERPRO FB DRIVER M: Russell King L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -2015,7 +2008,6 @@ F: drivers/hwmon/dme1737.c DOCBOOK FOR DOCUMENTATION M: Randy Dunlap S: Maintained -F: scripts/kernel-doc DOCKING STATION DRIVER M: Shaohua Li @@ -2026,7 +2018,6 @@ F: drivers/acpi/dock.c DOCUMENTATION M: Randy Dunlap L: linux-doc@vger.kernel.org -T: quilt oss.oracle.com/~rdunlap/kernel-doc-patches/current/ S: Maintained F: Documentation/ @@ -2444,12 +2435,9 @@ F: drivers/net/wan/sdla.c FRAMEBUFFER LAYER L: linux-fbdev@vger.kernel.org W: http://linux-fbdev.sourceforge.net/ -Q: http://patchwork.kernel.org/project/linux-fbdev/list/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git S: Orphan F: Documentation/fb/ -F: drivers/video/ -F: include/video/ +F: drivers/video/fb* F: include/linux/fb.h FREESCALE DMA DRIVER @@ -5717,7 +5705,7 @@ M: Paul Mundt L: linux-sh@vger.kernel.org W: http://www.linux-sh.org Q: http://patchwork.kernel.org/project/linux-sh/list/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git sh-latest +T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git S: Supported F: Documentation/sh/ F: arch/sh/ @@ -5839,8 +5827,6 @@ M: Chris Metcalf W: http://www.tilera.com/scm/ S: Supported F: arch/tile/ -F: drivers/char/hvc_tile.c -F: drivers/net/tile/ TLAN NETWORK DRIVER M: Samuel Chessman diff --git a/trunk/Makefile b/trunk/Makefile index b31d21377e4c..6619720f50dd 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 37 -EXTRAVERSION = -rc3 +EXTRAVERSION = -rc1 NAME = Flesh-Eating Bats with Fangs # *DOCUMENTATION* diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index db524e75c4a2..8ae3d48d504c 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -646,7 +646,7 @@ config ARCH_S3C2410 select ARCH_HAS_CPUFREQ select HAVE_CLK select ARCH_USES_GETTIMEOFFSET - select HAVE_S3C2410_I2C if I2C + select HAVE_S3C2410_I2C help Samsung S3C2410X CPU based systems, such as the Simtec Electronics BAST (), the IPAQ 1940 or @@ -676,8 +676,8 @@ config ARCH_S3C64XX select S3C_DEV_NAND select USB_ARCH_HAS_OHCI select SAMSUNG_GPIOLIB_4BIT - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C2410_I2C + select HAVE_S3C2410_WATCHDOG help Samsung S3C64XX series based systems @@ -686,10 +686,10 @@ config ARCH_S5P64X0 select CPU_V6 select GENERIC_GPIO select HAVE_CLK - select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C2410_WATCHDOG select ARCH_USES_GETTIMEOFFSET - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C_RTC if RTC_CLASS + select HAVE_S3C2410_I2C + select HAVE_S3C_RTC help Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440, SMDK6450. @@ -700,7 +700,7 @@ config ARCH_S5P6442 select GENERIC_GPIO select HAVE_CLK select ARCH_USES_GETTIMEOFFSET - select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C2410_WATCHDOG help Samsung S5P6442 CPU based systems @@ -711,9 +711,9 @@ config ARCH_S5PC100 select CPU_V7 select ARM_L1_CACHE_SHIFT_6 select ARCH_USES_GETTIMEOFFSET - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C_RTC if RTC_CLASS - select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C2410_I2C + select HAVE_S3C_RTC + select HAVE_S3C2410_WATCHDOG help Samsung S5PC100 series based systems @@ -726,9 +726,9 @@ config ARCH_S5PV210 select ARM_L1_CACHE_SHIFT_6 select ARCH_HAS_CPUFREQ select ARCH_USES_GETTIMEOFFSET - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C_RTC if RTC_CLASS - select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C2410_I2C + select HAVE_S3C_RTC + select HAVE_S3C2410_WATCHDOG help Samsung S5PV210/S5PC110 series based systems @@ -739,9 +739,9 @@ config ARCH_S5PV310 select GENERIC_GPIO select HAVE_CLK select GENERIC_CLOCKEVENTS - select HAVE_S3C_RTC if RTC_CLASS - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C_RTC + select HAVE_S3C2410_I2C + select HAVE_S3C2410_WATCHDOG help Samsung S5PV310 series based systems diff --git a/trunk/arch/arm/boot/compressed/head.S b/trunk/arch/arm/boot/compressed/head.S index 9be21ba648cd..6825c34646d4 100644 --- a/trunk/arch/arm/boot/compressed/head.S +++ b/trunk/arch/arm/boot/compressed/head.S @@ -1084,6 +1084,6 @@ memdump: mov r12, r0 reloc_end: .align - .section ".stack", "aw", %nobits + .section ".stack", "w" user_stack: .space 4096 user_stack_end: diff --git a/trunk/arch/arm/boot/compressed/vmlinux.lds.in b/trunk/arch/arm/boot/compressed/vmlinux.lds.in index 366a924019ac..d08168941bd6 100644 --- a/trunk/arch/arm/boot/compressed/vmlinux.lds.in +++ b/trunk/arch/arm/boot/compressed/vmlinux.lds.in @@ -57,7 +57,7 @@ SECTIONS .bss : { *(.bss) } _end = .; - .stack : { *(.stack) } + .stack (NOLOAD) : { *(.stack) } .stab 0 : { *(.stab) } .stabstr 0 : { *(.stabstr) } diff --git a/trunk/arch/arm/include/asm/assembler.h b/trunk/arch/arm/include/asm/assembler.h index 749bb6622404..062b58c029ab 100644 --- a/trunk/arch/arm/include/asm/assembler.h +++ b/trunk/arch/arm/include/asm/assembler.h @@ -238,7 +238,7 @@ @ Slightly optimised to avoid incrementing the pointer twice usraccoff \instr, \reg, \ptr, \inc, 0, \cond, \abort .if \rept == 2 - usraccoff \instr, \reg, \ptr, \inc, \inc, \cond, \abort + usraccoff \instr, \reg, \ptr, \inc, 4, \cond, \abort .endif add\cond \ptr, #\rept * \inc diff --git a/trunk/arch/arm/include/asm/mmu.h b/trunk/arch/arm/include/asm/mmu.h index b4ffe9d5b526..68870c776671 100644 --- a/trunk/arch/arm/include/asm/mmu.h +++ b/trunk/arch/arm/include/asm/mmu.h @@ -13,10 +13,6 @@ typedef struct { #ifdef CONFIG_CPU_HAS_ASID #define ASID(mm) ((mm)->context.id & 255) - -/* init_mm.context.id_lock should be initialized. */ -#define INIT_MM_CONTEXT(name) \ - .context.id_lock = __SPIN_LOCK_UNLOCKED(name.context.id_lock), #else #define ASID(mm) (0) #endif diff --git a/trunk/arch/arm/include/asm/pgtable.h b/trunk/arch/arm/include/asm/pgtable.h index 53d1d5deb111..b155414192da 100644 --- a/trunk/arch/arm/include/asm/pgtable.h +++ b/trunk/arch/arm/include/asm/pgtable.h @@ -374,9 +374,6 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd) #define pmd_page(pmd) pfn_to_page(__phys_to_pfn(pmd_val(pmd))) -/* we don't need complex calculations here as the pmd is folded into the pgd */ -#define pmd_addr_end(addr,end) (end) - /* * Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to. diff --git a/trunk/arch/arm/lib/findbit.S b/trunk/arch/arm/lib/findbit.S index 64f6bc1a9132..1e4cbd4e7be9 100644 --- a/trunk/arch/arm/lib/findbit.S +++ b/trunk/arch/arm/lib/findbit.S @@ -174,8 +174,8 @@ ENDPROC(_find_next_bit_be) */ .L_found: #if __LINUX_ARM_ARCH__ >= 5 - rsb r0, r3, #0 - and r3, r3, r0 + rsb r1, r3, #0 + and r3, r3, r1 clz r3, r3 rsb r3, r3, #31 add r0, r2, r3 @@ -190,7 +190,5 @@ ENDPROC(_find_next_bit_be) addeq r2, r2, #1 mov r0, r2 #endif - cmp r1, r0 @ Clamp to maxbit - movlo r0, r1 mov pc, lr diff --git a/trunk/arch/arm/mach-aaec2000/include/mach/vmalloc.h b/trunk/arch/arm/mach-aaec2000/include/mach/vmalloc.h index a6299e8321bd..cff4e0a996ce 100644 --- a/trunk/arch/arm/mach-aaec2000/include/mach/vmalloc.h +++ b/trunk/arch/arm/mach-aaec2000/include/mach/vmalloc.h @@ -11,6 +11,6 @@ #ifndef __ASM_ARCH_VMALLOC_H #define __ASM_ARCH_VMALLOC_H -#define VMALLOC_END 0xd0000000UL +#define VMALLOC_END 0xd0000000 #endif /* __ASM_ARCH_VMALLOC_H */ diff --git a/trunk/arch/arm/mach-bcmring/include/mach/vmalloc.h b/trunk/arch/arm/mach-bcmring/include/mach/vmalloc.h index 7397bd7817d9..3db3a09fd398 100644 --- a/trunk/arch/arm/mach-bcmring/include/mach/vmalloc.h +++ b/trunk/arch/arm/mach-bcmring/include/mach/vmalloc.h @@ -22,4 +22,4 @@ * 0xe0000000 to 0xefffffff. This gives us 256 MB of vm space and handles * larger physical memory designs better. */ -#define VMALLOC_END 0xf0000000UL +#define VMALLOC_END 0xf0000000 diff --git a/trunk/arch/arm/mach-clps711x/include/mach/vmalloc.h b/trunk/arch/arm/mach-clps711x/include/mach/vmalloc.h index 467b96137e47..30b3a287ed88 100644 --- a/trunk/arch/arm/mach-clps711x/include/mach/vmalloc.h +++ b/trunk/arch/arm/mach-clps711x/include/mach/vmalloc.h @@ -17,4 +17,4 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define VMALLOC_END 0xd0000000UL +#define VMALLOC_END 0xd0000000 diff --git a/trunk/arch/arm/mach-davinci/dm355.c b/trunk/arch/arm/mach-davinci/dm355.c index 2652af124acd..9be261beae7d 100644 --- a/trunk/arch/arm/mach-davinci/dm355.c +++ b/trunk/arch/arm/mach-davinci/dm355.c @@ -359,8 +359,8 @@ static struct clk_lookup dm355_clks[] = { CLK(NULL, "uart1", &uart1_clk), CLK(NULL, "uart2", &uart2_clk), CLK("i2c_davinci.1", NULL, &i2c_clk), - CLK("davinci-mcbsp.0", NULL, &asp0_clk), - CLK("davinci-mcbsp.1", NULL, &asp1_clk), + CLK("davinci-asp.0", NULL, &asp0_clk), + CLK("davinci-asp.1", NULL, &asp1_clk), CLK("davinci_mmc.0", NULL, &mmcsd0_clk), CLK("davinci_mmc.1", NULL, &mmcsd1_clk), CLK("spi_davinci.0", NULL, &spi0_clk), @@ -664,7 +664,7 @@ static struct resource dm355_asp1_resources[] = { }; static struct platform_device dm355_asp1_device = { - .name = "davinci-mcbsp", + .name = "davinci-asp", .id = 1, .num_resources = ARRAY_SIZE(dm355_asp1_resources), .resource = dm355_asp1_resources, diff --git a/trunk/arch/arm/mach-davinci/dm365.c b/trunk/arch/arm/mach-davinci/dm365.c index c466d710d3c1..a12065e87266 100644 --- a/trunk/arch/arm/mach-davinci/dm365.c +++ b/trunk/arch/arm/mach-davinci/dm365.c @@ -459,7 +459,7 @@ static struct clk_lookup dm365_clks[] = { CLK(NULL, "usb", &usb_clk), CLK("davinci_emac.1", NULL, &emac_clk), CLK("davinci_voicecodec", NULL, &voicecodec_clk), - CLK("davinci-mcbsp", NULL, &asp0_clk), + CLK("davinci-asp.0", NULL, &asp0_clk), CLK(NULL, "rto", &rto_clk), CLK(NULL, "mjcp", &mjcp_clk), CLK(NULL, NULL, NULL), @@ -922,8 +922,8 @@ static struct resource dm365_asp_resources[] = { }; static struct platform_device dm365_asp_device = { - .name = "davinci-mcbsp", - .id = -1, + .name = "davinci-asp", + .id = 0, .num_resources = ARRAY_SIZE(dm365_asp_resources), .resource = dm365_asp_resources, }; diff --git a/trunk/arch/arm/mach-davinci/dm644x.c b/trunk/arch/arm/mach-davinci/dm644x.c index 9a2376b3137c..0608dd776a16 100644 --- a/trunk/arch/arm/mach-davinci/dm644x.c +++ b/trunk/arch/arm/mach-davinci/dm644x.c @@ -302,7 +302,7 @@ static struct clk_lookup dm644x_clks[] = { CLK("davinci_emac.1", NULL, &emac_clk), CLK("i2c_davinci.1", NULL, &i2c_clk), CLK("palm_bk3710", NULL, &ide_clk), - CLK("davinci-mcbsp", NULL, &asp_clk), + CLK("davinci-asp", NULL, &asp_clk), CLK("davinci_mmc.0", NULL, &mmcsd_clk), CLK(NULL, "spi", &spi_clk), CLK(NULL, "gpio", &gpio_clk), @@ -580,7 +580,7 @@ static struct resource dm644x_asp_resources[] = { }; static struct platform_device dm644x_asp_device = { - .name = "davinci-mcbsp", + .name = "davinci-asp", .id = -1, .num_resources = ARRAY_SIZE(dm644x_asp_resources), .resource = dm644x_asp_resources, diff --git a/trunk/arch/arm/mach-ebsa110/include/mach/vmalloc.h b/trunk/arch/arm/mach-ebsa110/include/mach/vmalloc.h index ea141b7a3e03..60bde56fba4c 100644 --- a/trunk/arch/arm/mach-ebsa110/include/mach/vmalloc.h +++ b/trunk/arch/arm/mach-ebsa110/include/mach/vmalloc.h @@ -7,4 +7,4 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#define VMALLOC_END 0xdf000000UL +#define VMALLOC_END 0xdf000000 diff --git a/trunk/arch/arm/mach-footbridge/include/mach/vmalloc.h b/trunk/arch/arm/mach-footbridge/include/mach/vmalloc.h index 40ba78e5782b..0ffbb7c85e59 100644 --- a/trunk/arch/arm/mach-footbridge/include/mach/vmalloc.h +++ b/trunk/arch/arm/mach-footbridge/include/mach/vmalloc.h @@ -7,4 +7,4 @@ */ -#define VMALLOC_END 0xf0000000UL +#define VMALLOC_END 0xf0000000 diff --git a/trunk/arch/arm/mach-h720x/include/mach/vmalloc.h b/trunk/arch/arm/mach-h720x/include/mach/vmalloc.h index 8520b4a4d4e6..a45915b88756 100644 --- a/trunk/arch/arm/mach-h720x/include/mach/vmalloc.h +++ b/trunk/arch/arm/mach-h720x/include/mach/vmalloc.h @@ -5,6 +5,6 @@ #ifndef __ARCH_ARM_VMALLOC_H #define __ARCH_ARM_VMALLOC_H -#define VMALLOC_END 0xd0000000UL +#define VMALLOC_END 0xd0000000 #endif diff --git a/trunk/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/trunk/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c index 7e1e9dc2c8fc..026263c665ca 100644 --- a/trunk/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +++ b/trunk/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c @@ -250,6 +250,9 @@ static const struct imxuart_platform_data uart_pdata __initconst = { .flags = IMXUART_HAVE_RTSCTS, }; +#if defined(CONFIG_TOUCHSCREEN_ADS7846) \ + || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) + #define ADS7846_PENDOWN (GPIO_PORTD | 25) static void ads7846_dev_init(void) @@ -270,7 +273,9 @@ static struct ads7846_platform_data ads7846_config __initdata = { .get_pendown_state = ads7846_get_pendown_state, .keep_vref_on = 1, }; +#endif +#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE) static struct spi_board_info eukrea_mbimx27_spi_board_info[] __initdata = { [0] = { .modalias = "ads7846", @@ -289,6 +294,7 @@ static const struct spi_imx_master eukrea_mbimx27_spi0_data __initconst = { .chipselect = eukrea_mbimx27_spi_cs, .num_chipselect = ARRAY_SIZE(eukrea_mbimx27_spi_cs), }; +#endif static struct i2c_board_info eukrea_mbimx27_i2c_devices[] = { { diff --git a/trunk/arch/arm/mach-integrator/include/mach/vmalloc.h b/trunk/arch/arm/mach-integrator/include/mach/vmalloc.h index 2f5a2bafb11f..e056e7cf5645 100644 --- a/trunk/arch/arm/mach-integrator/include/mach/vmalloc.h +++ b/trunk/arch/arm/mach-integrator/include/mach/vmalloc.h @@ -17,4 +17,4 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define VMALLOC_END 0xd0000000UL +#define VMALLOC_END 0xd0000000 diff --git a/trunk/arch/arm/mach-msm/include/mach/vmalloc.h b/trunk/arch/arm/mach-msm/include/mach/vmalloc.h index d138448eff16..31a32ad062dc 100644 --- a/trunk/arch/arm/mach-msm/include/mach/vmalloc.h +++ b/trunk/arch/arm/mach-msm/include/mach/vmalloc.h @@ -16,7 +16,7 @@ #ifndef __ASM_ARCH_MSM_VMALLOC_H #define __ASM_ARCH_MSM_VMALLOC_H -#define VMALLOC_END 0xd0000000UL +#define VMALLOC_END 0xd0000000 #endif diff --git a/trunk/arch/arm/mach-mx25/devices-imx25.h b/trunk/arch/arm/mach-mx25/devices-imx25.h index d94d282fa676..93afa10b13cf 100644 --- a/trunk/arch/arm/mach-mx25/devices-imx25.h +++ b/trunk/arch/arm/mach-mx25/devices-imx25.h @@ -42,9 +42,9 @@ extern const struct imx_mxc_nand_data imx25_mxc_nand_data __initconst; #define imx25_add_mxc_nand(pdata) \ imx_add_mxc_nand(&imx25_mxc_nand_data, pdata) -extern const struct imx_spi_imx_data imx25_cspi_data[] __initconst; +extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst; #define imx25_add_spi_imx(id, pdata) \ - imx_add_spi_imx(&imx25_cspi_data[id], pdata) + imx_add_spi_imx(&imx25_spi_imx_data[id], pdata) #define imx25_add_spi_imx0(pdata) imx25_add_spi_imx(0, pdata) #define imx25_add_spi_imx1(pdata) imx25_add_spi_imx(1, pdata) #define imx25_add_spi_imx2(pdata) imx25_add_spi_imx(2, pdata) diff --git a/trunk/arch/arm/mach-mx3/mach-pcm037_eet.c b/trunk/arch/arm/mach-mx3/mach-pcm037_eet.c index fda56545d2fd..99e0894e07db 100644 --- a/trunk/arch/arm/mach-mx3/mach-pcm037_eet.c +++ b/trunk/arch/arm/mach-mx3/mach-pcm037_eet.c @@ -14,7 +14,6 @@ #include #include -#include #include @@ -60,12 +59,14 @@ static struct spi_board_info pcm037_spi_dev[] = { }; /* Platform Data for MXC CSPI */ +#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE) static int pcm037_spi1_cs[] = {MXC_SPI_CS(1), IOMUX_TO_GPIO(MX31_PIN_KEY_COL7)}; static const struct spi_imx_master pcm037_spi1_pdata __initconst = { .chipselect = pcm037_spi1_cs, .num_chipselect = ARRAY_SIZE(pcm037_spi1_cs), }; +#endif /* GPIO-keys input device */ static struct gpio_keys_button pcm037_gpio_keys[] = { @@ -170,7 +171,7 @@ static struct platform_device pcm037_gpio_keys_device = { }, }; -static int __init eet_init_devices(void) +static int eet_init_devices(void) { if (!machine_is_pcm037() || pcm037_variant() != PCM037_EET) return 0; diff --git a/trunk/arch/arm/mach-netx/include/mach/vmalloc.h b/trunk/arch/arm/mach-netx/include/mach/vmalloc.h index 871f1ef7bff5..7cca3574308f 100644 --- a/trunk/arch/arm/mach-netx/include/mach/vmalloc.h +++ b/trunk/arch/arm/mach-netx/include/mach/vmalloc.h @@ -16,4 +16,4 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define VMALLOC_END 0xd0000000UL +#define VMALLOC_END 0xd0000000 diff --git a/trunk/arch/arm/mach-omap1/devices.c b/trunk/arch/arm/mach-omap1/devices.c index e7f9ee63dce5..ea0d80a89da7 100644 --- a/trunk/arch/arm/mach-omap1/devices.c +++ b/trunk/arch/arm/mach-omap1/devices.c @@ -321,9 +321,10 @@ static struct platform_device omap_wdt_device = { static int __init omap_init_wdt(void) { if (!cpu_is_omap16xx()) - return -ENODEV; + return; - return platform_device_register(&omap_wdt_device); + platform_device_register(&omap_wdt_device); + return 0; } subsys_initcall(omap_init_wdt); #endif diff --git a/trunk/arch/arm/mach-omap1/include/mach/camera.h b/trunk/arch/arm/mach-omap1/include/mach/camera.h index 847d00f0bb0a..fd54b452eb22 100644 --- a/trunk/arch/arm/mach-omap1/include/mach/camera.h +++ b/trunk/arch/arm/mach-omap1/include/mach/camera.h @@ -1,8 +1,6 @@ #ifndef __ASM_ARCH_CAMERA_H_ #define __ASM_ARCH_CAMERA_H_ -#include - void omap1_camera_init(void *); static inline void omap1_set_camera_info(struct omap1_cam_platform_data *info) diff --git a/trunk/arch/arm/mach-omap1/include/mach/vmalloc.h b/trunk/arch/arm/mach-omap1/include/mach/vmalloc.h index 22ec4a479577..b001f67d695b 100644 --- a/trunk/arch/arm/mach-omap1/include/mach/vmalloc.h +++ b/trunk/arch/arm/mach-omap1/include/mach/vmalloc.h @@ -17,4 +17,4 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define VMALLOC_END 0xd8000000UL +#define VMALLOC_END 0xd8000000 diff --git a/trunk/arch/arm/mach-omap2/board-devkit8000.c b/trunk/arch/arm/mach-omap2/board-devkit8000.c index 53ac762518bd..067f4379c87f 100644 --- a/trunk/arch/arm/mach-omap2/board-devkit8000.c +++ b/trunk/arch/arm/mach-omap2/board-devkit8000.c @@ -242,6 +242,9 @@ static int devkit8000_twl_gpio_setup(struct device *dev, mmc[0].gpio_cd = gpio + 0; omap2_hsmmc_init(mmc); + /* link regulators to MMC adapters */ + devkit8000_vmmc1_supply.dev = mmc[0].dev; + /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; diff --git a/trunk/arch/arm/mach-omap2/include/mach/vmalloc.h b/trunk/arch/arm/mach-omap2/include/mach/vmalloc.h index 866319947760..4da31e997efe 100644 --- a/trunk/arch/arm/mach-omap2/include/mach/vmalloc.h +++ b/trunk/arch/arm/mach-omap2/include/mach/vmalloc.h @@ -17,4 +17,4 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define VMALLOC_END 0xf8000000UL +#define VMALLOC_END 0xf8000000 diff --git a/trunk/arch/arm/mach-pnx4008/include/mach/vmalloc.h b/trunk/arch/arm/mach-pnx4008/include/mach/vmalloc.h index 184913c71141..31b65ee07b0b 100644 --- a/trunk/arch/arm/mach-pnx4008/include/mach/vmalloc.h +++ b/trunk/arch/arm/mach-pnx4008/include/mach/vmalloc.h @@ -17,4 +17,4 @@ * The vmalloc() routines leaves a hole of 4kB between each vmalloced * area for the same reason. ;) */ -#define VMALLOC_END 0xd0000000UL +#define VMALLOC_END 0xd0000000 diff --git a/trunk/arch/arm/mach-rpc/include/mach/vmalloc.h b/trunk/arch/arm/mach-rpc/include/mach/vmalloc.h index fb700228637a..3bcd86fadb81 100644 --- a/trunk/arch/arm/mach-rpc/include/mach/vmalloc.h +++ b/trunk/arch/arm/mach-rpc/include/mach/vmalloc.h @@ -7,4 +7,4 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#define VMALLOC_END 0xdc000000UL +#define VMALLOC_END 0xdc000000 diff --git a/trunk/arch/arm/mach-s3c2410/h1940-bluetooth.c b/trunk/arch/arm/mach-s3c2410/h1940-bluetooth.c index 6b86a722a7db..8aa2f1902a94 100644 --- a/trunk/arch/arm/mach-s3c2410/h1940-bluetooth.c +++ b/trunk/arch/arm/mach-s3c2410/h1940-bluetooth.c @@ -77,13 +77,13 @@ static int __devinit h1940bt_probe(struct platform_device *pdev) /* Configures BT serial port GPIOs */ s3c_gpio_cfgpin(S3C2410_GPH(0), S3C2410_GPH0_nCTS0); - s3c_gpio_setpull(S3C2410_GPH(0), S3C_GPIO_PULL_NONE); + s3c_gpio_cfgpull(S3C2410_GPH(0), S3C_GPIO_PULL_NONE); s3c_gpio_cfgpin(S3C2410_GPH(1), S3C2410_GPIO_OUTPUT); - s3c_gpio_setpull(S3C2410_GPH(1), S3C_GPIO_PULL_NONE); + s3c_gpio_cfgpull(S3C2410_GPH(1), S3C_GPIO_PULL_NONE); s3c_gpio_cfgpin(S3C2410_GPH(2), S3C2410_GPH2_TXD0); - s3c_gpio_setpull(S3C2410_GPH(2), S3C_GPIO_PULL_NONE); + s3c_gpio_cfgpull(S3C2410_GPH(2), S3C_GPIO_PULL_NONE); s3c_gpio_cfgpin(S3C2410_GPH(3), S3C2410_GPH3_RXD0); - s3c_gpio_setpull(S3C2410_GPH(3), S3C_GPIO_PULL_NONE); + s3c_gpio_cfgpull(S3C2410_GPH(3), S3C_GPIO_PULL_NONE); rfk = rfkill_alloc(DRV_NAME, &pdev->dev, RFKILL_TYPE_BLUETOOTH, diff --git a/trunk/arch/arm/mach-s3c2416/irq.c b/trunk/arch/arm/mach-s3c2416/irq.c index 00174daf1526..084d121f368c 100644 --- a/trunk/arch/arm/mach-s3c2416/irq.c +++ b/trunk/arch/arm/mach-s3c2416/irq.c @@ -168,11 +168,12 @@ static struct irq_chip s3c2416_irq_dma = { static void s3c2416_irq_demux_uart3(unsigned int irq, struct irq_desc *desc) { - s3c2416_irq_demux(IRQ_S3C2443_RX3, 3); + s3c2416_irq_demux(IRQ_S3C2443_UART3, 3); } #define INTMSK_UART3 (1UL << (IRQ_S3C2443_UART3 - IRQ_EINT0)) -#define SUBMSK_UART3 (0x7 << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0))) +#define SUBMSK_UART3 (0xf << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0))) + static void s3c2416_irq_uart3_mask(unsigned int irqno) { diff --git a/trunk/arch/arm/mach-s3c2443/irq.c b/trunk/arch/arm/mach-s3c2443/irq.c index 893424767ce1..0e0d693f3974 100644 --- a/trunk/arch/arm/mach-s3c2443/irq.c +++ b/trunk/arch/arm/mach-s3c2443/irq.c @@ -166,11 +166,12 @@ static struct irq_chip s3c2443_irq_dma = { static void s3c2443_irq_demux_uart3(unsigned int irq, struct irq_desc *desc) { - s3c2443_irq_demux(IRQ_S3C2443_RX3, 3); + s3c2443_irq_demux(IRQ_S3C2443_UART3, 3); } #define INTMSK_UART3 (1UL << (IRQ_S3C2443_UART3 - IRQ_EINT0)) -#define SUBMSK_UART3 (0x7 << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0))) +#define SUBMSK_UART3 (0xf << (IRQ_S3C2443_RX3 - S3C2410_IRQSUB(0))) + static void s3c2443_irq_uart3_mask(unsigned int irqno) { diff --git a/trunk/arch/arm/mach-s3c64xx/Kconfig b/trunk/arch/arm/mach-s3c64xx/Kconfig index 579d2f0f4dd0..1ca7bdc6485c 100644 --- a/trunk/arch/arm/mach-s3c64xx/Kconfig +++ b/trunk/arch/arm/mach-s3c64xx/Kconfig @@ -143,7 +143,7 @@ config MACH_SMDK6410 select S3C_DEV_USB_HSOTG select S3C_DEV_WDT select SAMSUNG_DEV_KEYPAD - select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C2410_WATCHDOG select S3C64XX_SETUP_SDHCI select S3C64XX_SETUP_I2C1 select S3C64XX_SETUP_IDE diff --git a/trunk/arch/arm/mach-s3c64xx/mach-mini6410.c b/trunk/arch/arm/mach-s3c64xx/mach-mini6410.c index 89f35e02e883..249c62956471 100644 --- a/trunk/arch/arm/mach-s3c64xx/mach-mini6410.c +++ b/trunk/arch/arm/mach-s3c64xx/mach-mini6410.c @@ -45,7 +45,7 @@ #include