From ce660f3b72cd3f8e3023e7a56d748ad3c891f4fd Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 14 Jul 2008 13:40:42 -0700 Subject: [PATCH] --- yaml --- r: 99306 b: refs/heads/master c: 3b23e665b68387f5ee7b21f7b75ceea4d9acae4a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/ABI/testing/sysfs-block | 34 + trunk/Documentation/ABI/testing/sysfs-bus-css | 35 + trunk/Documentation/HOWTO | 2 +- trunk/Documentation/block/data-integrity.txt | 327 ++++ trunk/Documentation/ftrace.txt | 1353 ++++++++++++++ trunk/Documentation/ioctl-number.txt | 1 + trunk/Documentation/networking/ip-sysctl.txt | 256 ++- .../sound/alsa/ALSA-Configuration.txt | 17 +- .../alsa/DocBook/writing-an-alsa-driver.tmpl | 4 +- trunk/MAINTAINERS | 4 +- trunk/Makefile | 2 +- trunk/arch/avr32/Kconfig | 9 + trunk/arch/avr32/boards/atngw100/setup.c | 29 + trunk/arch/avr32/boards/atstk1000/atstk1002.c | 8 +- trunk/arch/avr32/boards/atstk1000/atstk1003.c | 7 + trunk/arch/avr32/boards/atstk1000/atstk1004.c | 9 +- trunk/arch/avr32/kernel/entry-avr32b.S | 88 +- trunk/arch/avr32/kernel/signal.c | 3 + trunk/arch/avr32/kernel/time.c | 14 +- trunk/arch/avr32/kernel/vmlinux.lds.S | 12 +- trunk/arch/avr32/lib/io-readsb.S | 2 +- trunk/arch/avr32/mach-at32ap/Makefile | 7 +- trunk/arch/avr32/mach-at32ap/at32ap700x.c | 252 ++- trunk/arch/avr32/mach-at32ap/intc.c | 80 +- .../avr32/mach-at32ap/{at32ap.c => pdc.c} | 8 - trunk/arch/avr32/mach-at32ap/pio.c | 2 + trunk/arch/avr32/mach-at32ap/pio.h | 2 +- trunk/arch/avr32/mach-at32ap/pm-at32ap700x.S | 108 ++ trunk/arch/avr32/mach-at32ap/pm.c | 245 +++ trunk/arch/avr32/mach-at32ap/sdramc.h | 76 + trunk/arch/avr32/mm/init.c | 22 +- trunk/arch/avr32/mm/tlb.c | 175 +- trunk/arch/s390/Kconfig | 21 + trunk/arch/s390/appldata/appldata.h | 10 +- trunk/arch/s390/appldata/appldata_base.c | 41 +- trunk/arch/s390/appldata/appldata_mem.c | 43 +- trunk/arch/s390/appldata/appldata_net_sum.c | 39 +- trunk/arch/s390/appldata/appldata_os.c | 57 +- trunk/arch/s390/crypto/prng.c | 5 +- trunk/arch/s390/hypfs/inode.c | 29 +- trunk/arch/s390/kernel/Makefile | 9 +- trunk/arch/s390/kernel/binfmt_elf32.c | 214 --- trunk/arch/s390/kernel/compat_ptrace.h | 4 +- trunk/arch/s390/kernel/debug.c | 9 - trunk/arch/s390/kernel/early.c | 211 +-- trunk/arch/s390/kernel/ipl.c | 462 ++++- trunk/arch/s390/kernel/kprobes.c | 4 +- trunk/arch/s390/kernel/machine_kexec.c | 1 - trunk/arch/s390/kernel/mem_detect.c | 100 + trunk/arch/s390/kernel/process.c | 32 +- trunk/arch/s390/kernel/ptrace.c | 363 +++- trunk/arch/s390/kernel/setup.c | 51 +- trunk/arch/s390/kernel/time.c | 634 +++++-- trunk/arch/s390/kernel/topology.c | 2 - trunk/arch/s390/kernel/vtime.c | 81 +- trunk/arch/s390/mm/init.c | 19 + trunk/arch/x86/kernel/.gitignore | 1 + trunk/arch/x86/kernel/traps_64.c | 25 +- trunk/arch/x86/mm/ioremap.c | 25 +- trunk/block/Kconfig | 12 + trunk/block/Makefile | 4 +- trunk/block/as-iosched.c | 18 +- trunk/block/blk-core.c | 19 +- trunk/block/blk-integrity.c | 381 ++++ trunk/block/blk-map.c | 6 + trunk/block/blk-merge.c | 3 + trunk/block/blk-settings.c | 24 +- trunk/block/blk.h | 8 + trunk/block/blktrace.c | 45 + trunk/block/bsg.c | 41 +- trunk/block/cfq-iosched.c | 83 +- trunk/block/cmd-filter.c | 334 ++++ trunk/block/elevator.c | 8 +- trunk/block/genhd.c | 12 + trunk/block/scsi_ioctl.c | 121 +- trunk/drivers/Makefile | 1 + trunk/drivers/ata/libata-acpi.c | 19 +- trunk/drivers/ata/libata-scsi.c | 3 +- trunk/drivers/ata/pata_sis.c | 1 + trunk/drivers/block/DAC960.c | 157 +- trunk/drivers/block/aoe/aoecmd.c | 2 +- trunk/drivers/block/paride/pt.c | 20 +- trunk/drivers/block/pktcdvd.c | 46 +- trunk/drivers/block/xen-blkfront.c | 48 +- trunk/drivers/cdrom/cdrom.c | 274 +-- trunk/drivers/char/Makefile | 1 - trunk/drivers/char/drm/Makefile | 40 - trunk/drivers/char/ipmi/ipmi_watchdog.c | 3 +- trunk/drivers/char/pcmcia/cm4000_cs.c | 118 +- trunk/drivers/char/pcmcia/cm4040_cs.c | 23 +- .../drivers/char/pcmcia/ipwireless/hardware.c | 4 +- trunk/drivers/char/pcmcia/ipwireless/main.c | 1 - trunk/drivers/char/rtc.c | 3 +- trunk/drivers/char/tpm/tpm_tis.c | 1 + trunk/drivers/gpu/Makefile | 1 + trunk/drivers/{char => gpu}/drm/Kconfig | 0 trunk/drivers/gpu/drm/Makefile | 26 + trunk/drivers/{char => gpu}/drm/README.drm | 0 trunk/drivers/{char => gpu}/drm/ati_pcigart.c | 0 .../{char => gpu}/drm/drm_agpsupport.c | 0 trunk/drivers/{char => gpu}/drm/drm_auth.c | 0 trunk/drivers/{char => gpu}/drm/drm_bufs.c | 0 trunk/drivers/{char => gpu}/drm/drm_context.c | 0 trunk/drivers/{char => gpu}/drm/drm_dma.c | 0 .../drivers/{char => gpu}/drm/drm_drawable.c | 0 trunk/drivers/{char => gpu}/drm/drm_drv.c | 0 trunk/drivers/{char => gpu}/drm/drm_fops.c | 0 trunk/drivers/{char => gpu}/drm/drm_hashtab.c | 0 trunk/drivers/{char => gpu}/drm/drm_ioc32.c | 0 trunk/drivers/{char => gpu}/drm/drm_ioctl.c | 0 trunk/drivers/{char => gpu}/drm/drm_irq.c | 0 trunk/drivers/{char => gpu}/drm/drm_lock.c | 0 trunk/drivers/{char => gpu}/drm/drm_memory.c | 0 trunk/drivers/{char => gpu}/drm/drm_mm.c | 0 trunk/drivers/{char => gpu}/drm/drm_pci.c | 0 trunk/drivers/{char => gpu}/drm/drm_proc.c | 0 trunk/drivers/{char => gpu}/drm/drm_scatter.c | 0 trunk/drivers/{char => gpu}/drm/drm_sman.c | 0 trunk/drivers/{char => gpu}/drm/drm_stub.c | 0 trunk/drivers/{char => gpu}/drm/drm_sysfs.c | 0 trunk/drivers/{char => gpu}/drm/drm_vm.c | 0 trunk/drivers/gpu/drm/i810/Makefile | 8 + .../{char/drm => gpu/drm/i810}/i810_dma.c | 0 .../{char/drm => gpu/drm/i810}/i810_drv.c | 0 .../{char/drm => gpu/drm/i810}/i810_drv.h | 0 trunk/drivers/gpu/drm/i830/Makefile | 8 + .../{char/drm => gpu/drm/i830}/i830_dma.c | 0 .../{char/drm => gpu/drm/i830}/i830_drv.c | 0 .../{char/drm => gpu/drm/i830}/i830_drv.h | 0 .../{char/drm => gpu/drm/i830}/i830_irq.c | 0 trunk/drivers/gpu/drm/i915/Makefile | 10 + .../{char/drm => gpu/drm/i915}/i915_dma.c | 0 .../{char/drm => gpu/drm/i915}/i915_drv.c | 0 .../{char/drm => gpu/drm/i915}/i915_drv.h | 0 .../{char/drm => gpu/drm/i915}/i915_ioc32.c | 0 .../{char/drm => gpu/drm/i915}/i915_irq.c | 0 .../{char/drm => gpu/drm/i915}/i915_mem.c | 0 trunk/drivers/gpu/drm/mga/Makefile | 11 + .../{char/drm => gpu/drm/mga}/mga_dma.c | 0 .../{char/drm => gpu/drm/mga}/mga_drv.c | 0 .../{char/drm => gpu/drm/mga}/mga_drv.h | 0 .../{char/drm => gpu/drm/mga}/mga_ioc32.c | 0 .../{char/drm => gpu/drm/mga}/mga_irq.c | 0 .../{char/drm => gpu/drm/mga}/mga_state.c | 0 .../{char/drm => gpu/drm/mga}/mga_ucode.h | 0 .../{char/drm => gpu/drm/mga}/mga_warp.c | 0 trunk/drivers/gpu/drm/r128/Makefile | 10 + .../{char/drm => gpu/drm/r128}/r128_cce.c | 0 .../{char/drm => gpu/drm/r128}/r128_drv.c | 0 .../{char/drm => gpu/drm/r128}/r128_drv.h | 0 .../{char/drm => gpu/drm/r128}/r128_ioc32.c | 0 .../{char/drm => gpu/drm/r128}/r128_irq.c | 0 .../{char/drm => gpu/drm/r128}/r128_state.c | 0 trunk/drivers/gpu/drm/radeon/Makefile | 10 + .../drm => gpu/drm/radeon}/r300_cmdbuf.c | 0 .../{char/drm => gpu/drm/radeon}/r300_reg.h | 0 .../{char/drm => gpu/drm/radeon}/radeon_cp.c | 0 .../{char/drm => gpu/drm/radeon}/radeon_drv.c | 0 .../{char/drm => gpu/drm/radeon}/radeon_drv.h | 0 .../drm => gpu/drm/radeon}/radeon_ioc32.c | 0 .../{char/drm => gpu/drm/radeon}/radeon_irq.c | 0 .../{char/drm => gpu/drm/radeon}/radeon_mem.c | 0 .../drm => gpu/drm/radeon}/radeon_microcode.h | 0 .../drm => gpu/drm/radeon}/radeon_state.c | 0 trunk/drivers/gpu/drm/savage/Makefile | 9 + .../{char/drm => gpu/drm/savage}/savage_bci.c | 0 .../{char/drm => gpu/drm/savage}/savage_drv.c | 0 .../{char/drm => gpu/drm/savage}/savage_drv.h | 0 .../drm => gpu/drm/savage}/savage_state.c | 0 trunk/drivers/gpu/drm/sis/Makefile | 10 + .../{char/drm => gpu/drm/sis}/sis_drv.c | 0 .../{char/drm => gpu/drm/sis}/sis_drv.h | 0 .../{char/drm => gpu/drm/sis}/sis_mm.c | 0 trunk/drivers/gpu/drm/tdfx/Makefile | 8 + .../{char/drm => gpu/drm/tdfx}/tdfx_drv.c | 0 .../{char/drm => gpu/drm/tdfx}/tdfx_drv.h | 0 trunk/drivers/gpu/drm/via/Makefile | 8 + .../{char/drm => gpu/drm/via}/via_3d_reg.h | 0 .../{char/drm => gpu/drm/via}/via_dma.c | 0 .../{char/drm => gpu/drm/via}/via_dmablit.c | 0 .../{char/drm => gpu/drm/via}/via_dmablit.h | 0 .../{char/drm => gpu/drm/via}/via_drv.c | 0 .../{char/drm => gpu/drm/via}/via_drv.h | 0 .../{char/drm => gpu/drm/via}/via_irq.c | 0 .../{char/drm => gpu/drm/via}/via_map.c | 0 .../{char/drm => gpu/drm/via}/via_mm.c | 0 .../{char/drm => gpu/drm/via}/via_verifier.c | 0 .../{char/drm => gpu/drm/via}/via_verifier.h | 0 .../{char/drm => gpu/drm/via}/via_video.c | 0 trunk/drivers/ide/legacy/ide-cs.c | 10 +- trunk/drivers/isdn/i4l/isdn_common.c | 4 +- trunk/drivers/md/linear.c | 10 +- trunk/drivers/md/raid0.c | 10 +- trunk/drivers/md/raid10.c | 15 +- trunk/drivers/md/raid5.c | 17 +- trunk/drivers/media/video/ov7670.c | 4 +- trunk/drivers/message/fusion/mptbase.c | 11 +- trunk/drivers/message/fusion/mptspi.c | 9 +- trunk/drivers/misc/atmel_pwm.c | 2 +- trunk/drivers/mtd/ftl.c | 4 - trunk/drivers/mtd/maps/pcmciamtd.c | 9 +- trunk/drivers/net/irda/nsc-ircc.c | 1 + trunk/drivers/net/irda/via-ircc.c | 3 + trunk/drivers/net/macb.c | 37 + trunk/drivers/net/tun.c | 6 + trunk/drivers/net/wireless/hostap/hostap_cs.c | 12 +- trunk/drivers/net/wireless/iwlwifi/iwl-3945.c | 4 +- trunk/drivers/net/wireless/libertas/scan.c | 4 +- trunk/drivers/net/wireless/rt2x00/rt2400pci.c | 11 + trunk/drivers/net/wireless/rt2x00/rt2500pci.c | 11 + trunk/drivers/net/wireless/rt2x00/rt2500usb.c | 7 + trunk/drivers/net/wireless/rt2x00/rt61pci.c | 9 + trunk/drivers/net/wireless/rt2x00/rt73usb.c | 9 + trunk/drivers/net/wireless/zd1211rw/zd_mac.c | 1 + trunk/drivers/net/wireless/zd1211rw/zd_usb.c | 1 + trunk/drivers/net/xen-netfront.c | 4 +- trunk/drivers/pcmcia/Kconfig | 7 + trunk/drivers/pcmcia/Makefile | 1 + trunk/drivers/pcmcia/au1000_generic.h | 27 +- trunk/drivers/pcmcia/au1000_pb1x00.c | 1 - trunk/drivers/pcmcia/au1000_xxs1500.c | 1 - trunk/drivers/pcmcia/bfin_cf_pcmcia.c | 339 ++++ trunk/drivers/pcmcia/cardbus.c | 2 - trunk/drivers/pcmcia/cistpl.c | 16 +- trunk/drivers/pcmcia/cs.c | 14 +- trunk/drivers/pcmcia/cs_internal.h | 13 - trunk/drivers/pcmcia/ds.c | 12 +- trunk/drivers/pcmcia/hd64465_ss.c | 3 - trunk/drivers/pcmcia/i82092.c | 2 - trunk/drivers/pcmcia/i82092aa.h | 2 - trunk/drivers/pcmcia/i82365.c | 39 +- trunk/drivers/pcmcia/m8xx_pcmcia.c | 3 +- trunk/drivers/pcmcia/pcmcia_ioctl.c | 154 +- trunk/drivers/pcmcia/pcmcia_resource.c | 81 +- trunk/drivers/pcmcia/pxa2xx_base.c | 1 - trunk/drivers/pcmcia/rsrc_mgr.c | 86 +- trunk/drivers/pcmcia/rsrc_nonstatic.c | 57 +- trunk/drivers/pcmcia/soc_common.h | 1 - trunk/drivers/pcmcia/socket_sysfs.c | 8 +- trunk/drivers/pcmcia/ti113x.h | 4 +- trunk/drivers/rapidio/rio-driver.c | 2 +- trunk/drivers/rtc/rtc-at32ap700x.c | 3 + trunk/drivers/rtc/rtc-fm3130.c | 2 +- trunk/drivers/rtc/rtc-pcf8563.c | 1 + trunk/drivers/s390/block/dasd.c | 18 +- trunk/drivers/s390/block/dasd_3990_erp.c | 15 +- trunk/drivers/s390/block/dasd_eckd.c | 12 +- trunk/drivers/s390/block/dasd_fba.c | 12 +- trunk/drivers/s390/block/dcssblk.c | 22 +- trunk/drivers/s390/block/xpram.c | 18 +- trunk/drivers/s390/char/con3215.c | 38 +- trunk/drivers/s390/char/con3270.c | 6 +- trunk/drivers/s390/char/fs3270.c | 11 +- trunk/drivers/s390/char/monreader.c | 74 +- trunk/drivers/s390/char/raw3270.c | 28 +- trunk/drivers/s390/char/sclp.c | 12 +- trunk/drivers/s390/char/sclp_cmd.c | 343 +++- trunk/drivers/s390/char/sclp_con.c | 5 +- trunk/drivers/s390/char/sclp_config.c | 17 +- trunk/drivers/s390/char/sclp_cpi_sys.c | 57 +- trunk/drivers/s390/char/sclp_quiesce.c | 8 +- trunk/drivers/s390/char/sclp_rw.c | 2 - trunk/drivers/s390/char/sclp_sdias.c | 4 +- trunk/drivers/s390/char/sclp_tty.c | 261 +-- trunk/drivers/s390/char/sclp_tty.h | 53 - trunk/drivers/s390/char/sclp_vt220.c | 62 +- trunk/drivers/s390/char/tape_34xx.c | 12 +- trunk/drivers/s390/char/tape_3590.c | 21 +- trunk/drivers/s390/char/tape_core.c | 15 +- trunk/drivers/s390/char/tty3270.c | 9 +- trunk/drivers/s390/char/vmcp.c | 37 +- trunk/drivers/s390/char/vmlogrdr.c | 29 +- trunk/drivers/s390/char/vmur.c | 5 +- trunk/drivers/s390/char/vmwatchdog.c | 16 +- trunk/drivers/s390/char/zcore.c | 31 +- trunk/drivers/s390/cio/Makefile | 4 +- trunk/drivers/s390/cio/airq.c | 45 +- trunk/drivers/s390/cio/chp.c | 116 +- trunk/drivers/s390/cio/chp.h | 15 +- trunk/drivers/s390/cio/chsc.c | 379 ++-- trunk/drivers/s390/cio/chsc.h | 26 +- trunk/drivers/s390/cio/chsc_sch.c | 820 +++++++++ trunk/drivers/s390/cio/chsc_sch.h | 13 + trunk/drivers/s390/cio/cio.c | 282 +-- trunk/drivers/s390/cio/cio.h | 14 +- trunk/drivers/s390/cio/cmf.c | 20 +- trunk/drivers/s390/cio/css.c | 283 ++- trunk/drivers/s390/cio/css.h | 49 +- trunk/drivers/s390/cio/device.c | 476 +++-- trunk/drivers/s390/cio/device.h | 7 +- trunk/drivers/s390/cio/device_fsm.c | 210 +-- trunk/drivers/s390/cio/device_id.c | 16 +- trunk/drivers/s390/cio/device_ops.c | 134 +- trunk/drivers/s390/cio/device_pgid.c | 26 +- trunk/drivers/s390/cio/device_status.c | 133 +- trunk/drivers/s390/cio/fcx.c | 350 ++++ trunk/drivers/s390/cio/idset.h | 2 +- trunk/drivers/s390/cio/io_sch.h | 48 +- trunk/drivers/s390/cio/ioasm.h | 2 +- trunk/drivers/s390/cio/isc.c | 68 + trunk/drivers/s390/cio/itcw.c | 327 ++++ trunk/drivers/s390/cio/qdio.c | 35 +- trunk/drivers/s390/cio/qdio.h | 6 +- trunk/drivers/s390/cio/scsw.c | 843 +++++++++ trunk/drivers/s390/crypto/ap_bus.c | 63 +- trunk/drivers/s390/crypto/ap_bus.h | 2 + trunk/drivers/s390/crypto/zcrypt_api.c | 24 +- trunk/drivers/s390/crypto/zcrypt_api.h | 28 - trunk/drivers/s390/crypto/zcrypt_cex2a.c | 4 +- trunk/drivers/s390/crypto/zcrypt_error.h | 6 - trunk/drivers/s390/crypto/zcrypt_pcica.c | 3 - trunk/drivers/s390/crypto/zcrypt_pcicc.c | 15 +- trunk/drivers/s390/crypto/zcrypt_pcixcc.c | 69 +- trunk/drivers/s390/net/claw.c | 77 +- trunk/drivers/s390/net/ctcm_fsms.c | 12 +- trunk/drivers/s390/net/ctcm_main.c | 28 +- trunk/drivers/s390/net/cu3088.c | 2 - trunk/drivers/s390/net/cu3088.h | 3 - trunk/drivers/s390/net/lcs.c | 44 +- trunk/drivers/s390/net/netiucv.c | 61 +- trunk/drivers/s390/net/qeth_core_main.c | 15 +- trunk/drivers/s390/net/qeth_l3_main.c | 9 +- trunk/drivers/s390/net/smsgiucv.c | 10 +- trunk/drivers/s390/s390mach.c | 106 +- trunk/drivers/s390/s390mach.h | 10 + trunk/drivers/scsi/ipr.c | 6 +- trunk/drivers/scsi/scsi_lib.c | 9 + trunk/drivers/scsi/sg.c | 44 +- trunk/drivers/scsi/sr.c | 20 +- trunk/drivers/serial/8250.c | 3 + trunk/drivers/serial/atmel_serial.c | 17 +- trunk/drivers/ssb/driver_pcicore.c | 7 + trunk/drivers/usb/host/ohci-au1xxx.c | 2 +- trunk/drivers/usb/host/ohci-lh7a404.c | 2 +- trunk/drivers/usb/host/ohci-s3c2410.c | 2 +- trunk/drivers/usb/host/ohci-sa1111.c | 2 +- trunk/drivers/video/Kconfig | 2 +- trunk/drivers/video/fb_defio.c | 20 +- trunk/drivers/xen/xenbus/xenbus_client.c | 2 +- trunk/drivers/xen/xenbus/xenbus_xs.c | 10 +- trunk/fs/Makefile | 1 + trunk/fs/bio-integrity.c | 719 ++++++++ trunk/fs/bio.c | 88 +- trunk/fs/cifs/cifsacl.c | 10 +- trunk/fs/cifs/inode.c | 20 +- trunk/fs/exec.c | 2 +- trunk/fs/namespace.c | 14 +- trunk/fs/ocfs2/dlmglue.c | 14 +- trunk/fs/proc/base.c | 9 +- trunk/fs/proc/task_mmu.c | 6 +- trunk/fs/proc/task_nommu.c | 2 +- trunk/fs/ramfs/file-mmu.c | 1 + trunk/fs/ramfs/file-nommu.c | 1 + trunk/fs/splice.c | 17 +- trunk/fs/xfs/xfs_log.c | 15 +- trunk/include/Kbuild | 1 + trunk/include/asm-avr32/arch-at32ap/board.h | 10 +- trunk/include/asm-avr32/arch-at32ap/init.h | 4 - trunk/include/asm-avr32/arch-at32ap/pm.h | 3 + trunk/include/asm-avr32/arch-at32ap/sram.h | 30 + trunk/include/asm-avr32/mmu_context.h | 1 - trunk/include/asm-avr32/pci.h | 2 + trunk/include/asm-avr32/pgalloc.h | 68 +- trunk/include/asm-avr32/pgtable.h | 34 +- trunk/include/asm-avr32/setup.h | 2 +- trunk/include/asm-avr32/thread_info.h | 1 + trunk/include/asm-avr32/tlbflush.h | 1 - trunk/include/asm-frv/system.h | 2 +- .../include/asm-mips/mach-au1x00/au1xxx_psc.h | 8 + trunk/include/asm-s390/Kbuild | 3 + trunk/include/asm-s390/airq.h | 4 +- trunk/include/asm-s390/ccwdev.h | 12 + trunk/include/asm-s390/chpid.h | 5 +- trunk/include/asm-s390/chsc.h | 127 ++ trunk/include/asm-s390/cio.h | 114 +- trunk/include/asm-s390/elf.h | 51 +- trunk/include/asm-s390/etr.h | 45 +- trunk/include/asm-s390/fcx.h | 311 ++++ trunk/include/asm-s390/ipl.h | 17 +- trunk/include/asm-s390/isc.h | 25 + trunk/include/asm-s390/itcw.h | 30 + trunk/include/asm-s390/pgtable.h | 1 + trunk/include/asm-s390/processor.h | 24 +- trunk/include/asm-s390/ptrace.h | 15 + .../s390/cio => include/asm-s390}/schid.h | 18 +- trunk/include/asm-s390/sclp.h | 4 +- trunk/include/asm-s390/setup.h | 12 +- trunk/include/asm-s390/sparsemem.h | 4 +- trunk/include/asm-s390/timer.h | 12 + trunk/include/asm-s390/zcrypt.h | 2 +- trunk/include/asm-x86/desc.h | 4 +- trunk/include/drm/Kbuild | 10 + trunk/{drivers/char => include}/drm/drm.h | 0 trunk/{drivers/char => include}/drm/drmP.h | 0 .../{drivers/char => include}/drm/drm_core.h | 0 .../char => include}/drm/drm_hashtab.h | 0 .../char => include}/drm/drm_memory.h | 0 .../char => include}/drm/drm_memory_debug.h | 0 .../char => include}/drm/drm_os_linux.h | 0 .../char => include}/drm/drm_pciids.h | 0 .../{drivers/char => include}/drm/drm_sarea.h | 0 .../{drivers/char => include}/drm/drm_sman.h | 0 .../{drivers/char => include}/drm/i810_drm.h | 0 .../{drivers/char => include}/drm/i830_drm.h | 0 .../{drivers/char => include}/drm/i915_drm.h | 0 trunk/{drivers/char => include}/drm/mga_drm.h | 0 .../{drivers/char => include}/drm/r128_drm.h | 0 .../char => include}/drm/radeon_drm.h | 0 .../char => include}/drm/savage_drm.h | 0 trunk/{drivers/char => include}/drm/sis_drm.h | 0 trunk/{drivers/char => include}/drm/via_drm.h | 0 trunk/include/linux/bio.h | 130 +- trunk/include/linux/blkdev.h | 163 +- trunk/include/linux/blktrace_api.h | 1 + trunk/include/linux/genhd.h | 12 + trunk/include/linux/iocontext.h | 18 + trunk/include/linux/mod_devicetable.h | 9 + trunk/include/linux/ptrace.h | 8 +- trunk/include/linux/security.h | 49 +- trunk/include/linux/xfrm.h | 1 + trunk/include/pcmcia/bulkmem.h | 41 - trunk/include/pcmcia/cistpl.h | 2 +- trunk/include/pcmcia/cs.h | 3 - trunk/include/pcmcia/cs_types.h | 6 +- trunk/include/pcmcia/ds.h | 19 +- trunk/include/pcmcia/ss.h | 12 +- trunk/include/pcmcia/version.h | 3 - trunk/include/sound/ad1843.h | 46 + trunk/include/sound/control.h | 3 - trunk/include/sound/core.h | 8 +- trunk/include/sound/cs4231-regs.h | 8 + trunk/include/sound/cs4231.h | 3 + trunk/include/sound/emu10k1.h | 1 + trunk/include/sound/seq_kernel.h | 2 +- trunk/include/sound/soc-dapm.h | 42 +- trunk/include/sound/soc.h | 175 +- trunk/include/sound/uda1341.h | 2 - trunk/include/sound/version.h | 4 +- trunk/kernel/cpuset.c | 24 +- trunk/kernel/exit.c | 1 + trunk/kernel/fork.c | 1 + trunk/kernel/kprobes.c | 2 +- trunk/kernel/ptrace.c | 15 +- trunk/kernel/rcupreempt.c | 20 +- trunk/kernel/sched.c | 7 +- trunk/mm/Kconfig | 4 +- trunk/mm/slub.c | 9 +- trunk/net/ipv4/fib_trie.c | 17 +- trunk/net/ipv4/netfilter/nf_nat_snmp_basic.c | 2 +- trunk/net/ipv4/tcp_probe.c | 2 +- trunk/net/ipv6/addrconf.c | 4 +- trunk/net/ipv6/exthdrs.c | 2 +- trunk/net/irda/irnetlink.c | 4 +- trunk/net/iucv/af_iucv.c | 8 +- trunk/net/iucv/iucv.c | 9 +- trunk/net/mac80211/main.c | 4 +- trunk/net/mac80211/mlme.c | 13 +- trunk/net/mac80211/rc80211_pid.h | 5 - trunk/net/mac80211/rc80211_pid_algo.c | 31 +- trunk/net/netfilter/nf_conntrack_proto_tcp.c | 10 +- trunk/net/netlabel/netlabel_cipso_v4.c | 7 +- trunk/net/netlabel/netlabel_mgmt.c | 12 +- trunk/net/netlabel/netlabel_unlabeled.c | 6 +- trunk/net/sctp/sm_statefuns.c | 9 +- trunk/net/sctp/ulpevent.c | 5 + trunk/net/xfrm/xfrm_user.c | 3 +- trunk/scripts/mod/file2alias.c | 12 + trunk/security/Kconfig | 10 +- trunk/security/Makefile | 11 +- trunk/security/capability.c | 1043 ++++++++++- trunk/security/commoncap.c | 3 +- trunk/security/device_cgroup.c | 6 +- trunk/security/dummy.c | 1251 ------------- trunk/security/root_plug.c | 9 - trunk/security/security.c | 66 +- trunk/security/selinux/hooks.c | 244 ++- trunk/security/selinux/include/audit.h | 4 +- trunk/security/selinux/include/avc.h | 15 +- trunk/security/selinux/include/objsec.h | 1 - trunk/security/selinux/include/security.h | 7 +- trunk/security/selinux/netnode.c | 1 - trunk/security/selinux/netport.c | 3 +- trunk/security/selinux/selinuxfs.c | 15 +- trunk/security/selinux/ss/avtab.c | 2 +- trunk/security/selinux/ss/context.h | 27 +- trunk/security/selinux/ss/mls.c | 19 +- trunk/security/selinux/ss/mls.h | 3 +- trunk/security/selinux/ss/policydb.c | 15 +- trunk/security/selinux/ss/services.c | 450 +++-- trunk/security/selinux/ss/sidtab.c | 76 +- trunk/security/selinux/ss/sidtab.h | 7 +- trunk/security/smack/smack_lsm.c | 28 +- trunk/sound/Kconfig | 34 +- trunk/sound/aoa/Kconfig | 11 +- trunk/sound/aoa/codecs/Kconfig | 4 - trunk/sound/aoa/fabrics/Kconfig | 1 - trunk/sound/aoa/soundbus/Kconfig | 1 - trunk/sound/arm/Kconfig | 21 +- trunk/sound/arm/sa11xx-uda1341.c | 2 - trunk/sound/core/Kconfig | 29 +- trunk/sound/core/control.c | 7 +- trunk/sound/core/init.c | 67 +- trunk/sound/core/memalloc.c | 62 - trunk/sound/core/seq/seq_clientmgr.c | 2 +- trunk/sound/core/seq/seq_device.c | 6 +- trunk/sound/core/sound.c | 8 +- trunk/sound/core/timer.c | 6 +- trunk/sound/drivers/Kconfig | 91 +- trunk/sound/drivers/vx/vx_hwdep.c | 2 +- trunk/sound/i2c/cs8427.c | 6 +- trunk/sound/i2c/l3/uda1341.c | 2 - trunk/sound/isa/Kconfig | 61 +- trunk/sound/isa/cs423x/cs4231_lib.c | 118 +- trunk/sound/isa/opti9xx/opti92x-ad1848.c | 1126 +----------- trunk/sound/isa/sb/Makefile | 2 - trunk/sound/isa/wavefront/wavefront_synth.c | 2 +- trunk/sound/mips/Kconfig | 27 +- trunk/sound/mips/Makefile | 4 + trunk/sound/mips/ad1843.c | 561 ++++++ trunk/sound/mips/hal2.c | 947 ++++++++++ trunk/sound/mips/hal2.h | 245 +++ trunk/sound/mips/sgio2audio.c | 1006 ++++++++++ trunk/sound/oss/Kconfig | 49 +- trunk/sound/oss/dmasound/dmasound_core.c | 7 +- trunk/sound/oss/dmasound/dmasound_paula.c | 2 +- trunk/sound/oss/dmasound/dmasound_q40.c | 2 +- trunk/sound/oss/msnd.c | 2 - trunk/sound/oss/msnd.h | 2 - trunk/sound/oss/msnd_classic.h | 2 - trunk/sound/oss/msnd_pinnacle.c | 5 - trunk/sound/oss/msnd_pinnacle.h | 2 - trunk/sound/parisc/Kconfig | 13 +- trunk/sound/pci/Kconfig | 104 +- trunk/sound/pci/Makefile | 2 +- trunk/sound/pci/ac97/Makefile | 12 +- trunk/sound/pci/ac97/ac97_codec.c | 11 +- trunk/sound/pci/ac97/ac97_patch.c | 81 +- trunk/sound/pci/{ac97 => }/ak4531_codec.c | 34 +- trunk/sound/pci/au88x0/au88x0_game.c | 2 - trunk/sound/pci/azt3328.c | 1235 ++++++++----- trunk/sound/pci/azt3328.h | 207 ++- trunk/sound/pci/ca0106/ca0106_main.c | 5 + trunk/sound/pci/emu10k1/emu10k1_main.c | 1 + trunk/sound/pci/emu10k1/emumixer.c | 13 +- trunk/sound/pci/emu10k1/memory.c | 69 +- trunk/sound/pci/hda/hda_codec.c | 2 +- trunk/sound/pci/hda/hda_codec.h | 2 +- trunk/sound/pci/hda/hda_hwdep.c | 2 +- trunk/sound/pci/hda/hda_intel.c | 306 +++- trunk/sound/pci/hda/hda_proc.c | 5 +- trunk/sound/pci/hda/patch_analog.c | 38 +- trunk/sound/pci/hda/patch_conexant.c | 33 +- trunk/sound/pci/hda/patch_realtek.c | 548 +++++- trunk/sound/pci/hda/patch_sigmatel.c | 71 +- trunk/sound/pci/ice1712/envy24ht.h | 10 +- trunk/sound/pci/ice1712/ice1712.h | 2 + trunk/sound/pci/ice1712/ice1724.c | 213 ++- trunk/sound/pci/maestro3.c | 42 +- trunk/sound/pci/nm256/nm256.c | 4 +- trunk/sound/pci/oxygen/hifier.c | 33 +- trunk/sound/pci/oxygen/oxygen.c | 76 +- trunk/sound/pci/oxygen/oxygen.h | 14 + trunk/sound/pci/oxygen/oxygen_io.c | 22 +- trunk/sound/pci/oxygen/oxygen_lib.c | 106 +- trunk/sound/pci/oxygen/oxygen_pcm.c | 53 +- trunk/sound/pci/oxygen/virtuoso.c | 252 +-- trunk/sound/pci/pcxhr/pcxhr.c | 4 +- trunk/sound/pci/pcxhr/pcxhr_core.c | 18 +- trunk/sound/pci/trident/trident_main.c | 5 +- trunk/sound/pci/trident/trident_memory.c | 178 -- trunk/sound/pci/via82xx.c | 6 + trunk/sound/pci/ymfpci/ymfpci_main.c | 2 + trunk/sound/pcmcia/Kconfig | 15 +- trunk/sound/pcmcia/vx/vxp_ops.c | 2 +- trunk/sound/ppc/Kconfig | 26 +- trunk/sound/ppc/daca.c | 2 - trunk/sound/ppc/tumbler.c | 2 - trunk/sound/sh/Kconfig | 16 +- trunk/sound/soc/Kconfig | 19 +- trunk/sound/soc/Makefile | 3 +- trunk/sound/soc/at32/Kconfig | 34 + trunk/sound/soc/at32/Makefile | 11 + trunk/sound/soc/at32/at32-pcm.c | 491 +++++ trunk/sound/soc/at32/at32-pcm.h | 79 + trunk/sound/soc/at32/at32-ssc.c | 849 +++++++++ trunk/sound/soc/at32/at32-ssc.h | 59 + trunk/sound/soc/at32/playpaq_wm8510.c | 522 ++++++ trunk/sound/soc/at91/Kconfig | 2 +- trunk/sound/soc/at91/at91-pcm.c | 6 +- trunk/sound/soc/at91/at91-ssc.c | 12 +- trunk/sound/soc/at91/at91-ssc.h | 2 +- trunk/sound/soc/at91/eti_b1_wm8731.c | 53 +- trunk/sound/soc/au1x/Kconfig | 32 + trunk/sound/soc/au1x/Makefile | 13 + trunk/sound/soc/au1x/dbdma2.c | 421 +++++ trunk/sound/soc/au1x/psc-ac97.c | 387 ++++ trunk/sound/soc/au1x/psc-i2s.c | 414 +++++ trunk/sound/soc/au1x/psc.h | 53 + trunk/sound/soc/au1x/sample-ac97.c | 144 ++ trunk/sound/soc/codecs/Kconfig | 22 +- trunk/sound/soc/codecs/Makefile | 8 + trunk/sound/soc/codecs/ac97.c | 31 +- trunk/sound/soc/codecs/ac97.h | 2 +- trunk/sound/soc/codecs/ak4535.c | 696 +++++++ trunk/sound/soc/codecs/ak4535.h | 46 + trunk/sound/soc/codecs/cs4270.c | 8 +- trunk/sound/soc/codecs/cs4270.h | 2 +- trunk/sound/soc/codecs/tlv320aic3x.c | 384 ++-- trunk/sound/soc/codecs/tlv320aic3x.h | 55 +- trunk/sound/soc/codecs/uda1380.c | 852 +++++++++ trunk/sound/soc/codecs/uda1380.h | 89 + trunk/sound/soc/codecs/wm8510.c | 817 +++++++++ trunk/sound/soc/codecs/wm8510.h | 103 ++ trunk/sound/soc/codecs/wm8731.c | 79 +- trunk/sound/soc/codecs/wm8731.h | 2 +- trunk/sound/soc/codecs/wm8750.c | 87 +- trunk/sound/soc/codecs/wm8750.h | 2 +- trunk/sound/soc/codecs/wm8753.c | 183 +- trunk/sound/soc/codecs/wm8753.h | 2 +- trunk/sound/soc/codecs/wm8990.c | 1626 +++++++++++++++++ trunk/sound/soc/codecs/wm8990.h | 832 +++++++++ trunk/sound/soc/codecs/wm9712.c | 53 +- trunk/sound/soc/codecs/wm9712.h | 2 +- trunk/sound/soc/codecs/wm9713.c | 79 +- trunk/sound/soc/codecs/wm9713.h | 2 +- trunk/sound/soc/davinci/Kconfig | 2 +- trunk/sound/soc/davinci/davinci-evm.c | 40 +- trunk/sound/soc/davinci/davinci-i2s.c | 16 +- trunk/sound/soc/davinci/davinci-i2s.h | 2 +- trunk/sound/soc/davinci/davinci-pcm.c | 2 +- trunk/sound/soc/fsl/Kconfig | 6 +- trunk/sound/soc/fsl/fsl_dma.c | 2 +- trunk/sound/soc/fsl/fsl_dma.h | 2 +- trunk/sound/soc/fsl/fsl_ssi.c | 24 +- trunk/sound/soc/fsl/fsl_ssi.h | 4 +- trunk/sound/soc/fsl/mpc8610_hpcd.c | 72 +- trunk/sound/soc/omap/Kconfig | 4 - trunk/sound/soc/omap/n810.c | 106 +- trunk/sound/soc/omap/omap-mcbsp.c | 16 +- trunk/sound/soc/omap/omap-mcbsp.h | 2 +- trunk/sound/soc/omap/omap-pcm.c | 2 +- trunk/sound/soc/pxa/Kconfig | 11 +- trunk/sound/soc/pxa/Makefile | 3 +- trunk/sound/soc/pxa/corgi.c | 70 +- trunk/sound/soc/pxa/em-x270.c | 102 ++ trunk/sound/soc/pxa/poodle.c | 50 +- trunk/sound/soc/pxa/pxa2xx-ac97.c | 18 +- trunk/sound/soc/pxa/pxa2xx-ac97.h | 2 +- trunk/sound/soc/pxa/pxa2xx-i2s.c | 17 +- trunk/sound/soc/pxa/pxa2xx-i2s.h | 2 +- trunk/sound/soc/pxa/pxa2xx-pcm.c | 2 +- trunk/sound/soc/pxa/spitz.c | 91 +- trunk/sound/soc/pxa/tosa.c | 47 +- trunk/sound/soc/s3c24xx/Kconfig | 4 +- trunk/sound/soc/s3c24xx/neo1973_wm8753.c | 237 ++- trunk/sound/soc/s3c24xx/s3c2412-i2s.c | 15 +- trunk/sound/soc/s3c24xx/s3c2412-i2s.h | 2 +- trunk/sound/soc/s3c24xx/s3c2443-ac97.c | 15 +- trunk/sound/soc/s3c24xx/s3c24xx-ac97.h | 2 +- trunk/sound/soc/s3c24xx/s3c24xx-i2s.c | 25 +- trunk/sound/soc/s3c24xx/s3c24xx-i2s.h | 2 +- trunk/sound/soc/s3c24xx/s3c24xx-pcm.c | 6 +- trunk/sound/soc/s3c24xx/smdk2443_wm9710.c | 3 - trunk/sound/soc/sh/Kconfig | 5 +- trunk/sound/soc/sh/dma-sh7760.c | 2 +- trunk/sound/soc/sh/hac.c | 2 +- trunk/sound/soc/sh/sh7760-ac97.c | 4 +- trunk/sound/soc/sh/ssi.c | 8 +- trunk/sound/soc/soc-core.c | 443 ++++- trunk/sound/soc/soc-dapm.c | 344 +++- trunk/sound/sparc/Kconfig | 17 +- trunk/sound/sparc/dbri.c | 2 +- trunk/sound/spi/Kconfig | 13 +- trunk/sound/usb/Kconfig | 16 +- trunk/sound/usb/caiaq/caiaq-audio.c | 1 + trunk/sound/usb/caiaq/caiaq-device.c | 12 +- trunk/sound/usb/caiaq/caiaq-device.h | 1 + trunk/sound/usb/usbaudio.c | 4 - trunk/sound/usb/usbquirks.h | 38 + 680 files changed, 31516 insertions(+), 10336 deletions(-) create mode 100644 trunk/Documentation/ABI/testing/sysfs-bus-css create mode 100644 trunk/Documentation/block/data-integrity.txt create mode 100644 trunk/Documentation/ftrace.txt rename trunk/arch/avr32/mach-at32ap/{at32ap.c => pdc.c} (90%) create mode 100644 trunk/arch/avr32/mach-at32ap/pm.c create mode 100644 trunk/arch/avr32/mach-at32ap/sdramc.h delete mode 100644 trunk/arch/s390/kernel/binfmt_elf32.c create mode 100644 trunk/arch/s390/kernel/mem_detect.c create mode 100644 trunk/block/blk-integrity.c create mode 100644 trunk/block/cmd-filter.c delete mode 100644 trunk/drivers/char/drm/Makefile create mode 100644 trunk/drivers/gpu/Makefile rename trunk/drivers/{char => gpu}/drm/Kconfig (100%) create mode 100644 trunk/drivers/gpu/drm/Makefile rename trunk/drivers/{char => gpu}/drm/README.drm (100%) rename trunk/drivers/{char => gpu}/drm/ati_pcigart.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_agpsupport.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_auth.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_bufs.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_context.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_dma.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_drawable.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_drv.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_fops.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_hashtab.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_ioc32.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_ioctl.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_irq.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_lock.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_memory.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_mm.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_pci.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_proc.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_scatter.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_sman.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_stub.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_sysfs.c (100%) rename trunk/drivers/{char => gpu}/drm/drm_vm.c (100%) create mode 100644 trunk/drivers/gpu/drm/i810/Makefile rename trunk/drivers/{char/drm => gpu/drm/i810}/i810_dma.c (100%) rename trunk/drivers/{char/drm => gpu/drm/i810}/i810_drv.c (100%) rename trunk/drivers/{char/drm => gpu/drm/i810}/i810_drv.h (100%) create mode 100644 trunk/drivers/gpu/drm/i830/Makefile rename trunk/drivers/{char/drm => gpu/drm/i830}/i830_dma.c (100%) rename trunk/drivers/{char/drm => gpu/drm/i830}/i830_drv.c (100%) rename trunk/drivers/{char/drm => gpu/drm/i830}/i830_drv.h (100%) rename trunk/drivers/{char/drm => gpu/drm/i830}/i830_irq.c (100%) create mode 100644 trunk/drivers/gpu/drm/i915/Makefile rename trunk/drivers/{char/drm => gpu/drm/i915}/i915_dma.c (100%) rename trunk/drivers/{char/drm => gpu/drm/i915}/i915_drv.c (100%) rename trunk/drivers/{char/drm => gpu/drm/i915}/i915_drv.h (100%) rename trunk/drivers/{char/drm => gpu/drm/i915}/i915_ioc32.c (100%) rename trunk/drivers/{char/drm => gpu/drm/i915}/i915_irq.c (100%) rename trunk/drivers/{char/drm => gpu/drm/i915}/i915_mem.c (100%) create mode 100644 trunk/drivers/gpu/drm/mga/Makefile rename trunk/drivers/{char/drm => gpu/drm/mga}/mga_dma.c (100%) rename trunk/drivers/{char/drm => gpu/drm/mga}/mga_drv.c (100%) rename trunk/drivers/{char/drm => gpu/drm/mga}/mga_drv.h (100%) rename trunk/drivers/{char/drm => gpu/drm/mga}/mga_ioc32.c (100%) rename trunk/drivers/{char/drm => gpu/drm/mga}/mga_irq.c (100%) rename trunk/drivers/{char/drm => gpu/drm/mga}/mga_state.c (100%) rename trunk/drivers/{char/drm => gpu/drm/mga}/mga_ucode.h (100%) rename trunk/drivers/{char/drm => gpu/drm/mga}/mga_warp.c (100%) create mode 100644 trunk/drivers/gpu/drm/r128/Makefile rename trunk/drivers/{char/drm => gpu/drm/r128}/r128_cce.c (100%) rename trunk/drivers/{char/drm => gpu/drm/r128}/r128_drv.c (100%) rename trunk/drivers/{char/drm => gpu/drm/r128}/r128_drv.h (100%) rename trunk/drivers/{char/drm => gpu/drm/r128}/r128_ioc32.c (100%) rename trunk/drivers/{char/drm => gpu/drm/r128}/r128_irq.c (100%) rename trunk/drivers/{char/drm => gpu/drm/r128}/r128_state.c (100%) create mode 100644 trunk/drivers/gpu/drm/radeon/Makefile rename trunk/drivers/{char/drm => gpu/drm/radeon}/r300_cmdbuf.c (100%) rename trunk/drivers/{char/drm => gpu/drm/radeon}/r300_reg.h (100%) rename trunk/drivers/{char/drm => gpu/drm/radeon}/radeon_cp.c (100%) rename trunk/drivers/{char/drm => gpu/drm/radeon}/radeon_drv.c (100%) rename trunk/drivers/{char/drm => gpu/drm/radeon}/radeon_drv.h (100%) rename trunk/drivers/{char/drm => gpu/drm/radeon}/radeon_ioc32.c (100%) rename trunk/drivers/{char/drm => gpu/drm/radeon}/radeon_irq.c (100%) rename trunk/drivers/{char/drm => gpu/drm/radeon}/radeon_mem.c (100%) rename trunk/drivers/{char/drm => gpu/drm/radeon}/radeon_microcode.h (100%) rename trunk/drivers/{char/drm => gpu/drm/radeon}/radeon_state.c (100%) create mode 100644 trunk/drivers/gpu/drm/savage/Makefile rename trunk/drivers/{char/drm => gpu/drm/savage}/savage_bci.c (100%) rename trunk/drivers/{char/drm => gpu/drm/savage}/savage_drv.c (100%) rename trunk/drivers/{char/drm => gpu/drm/savage}/savage_drv.h (100%) rename trunk/drivers/{char/drm => gpu/drm/savage}/savage_state.c (100%) create mode 100644 trunk/drivers/gpu/drm/sis/Makefile rename trunk/drivers/{char/drm => gpu/drm/sis}/sis_drv.c (100%) rename trunk/drivers/{char/drm => gpu/drm/sis}/sis_drv.h (100%) rename trunk/drivers/{char/drm => gpu/drm/sis}/sis_mm.c (100%) create mode 100644 trunk/drivers/gpu/drm/tdfx/Makefile rename trunk/drivers/{char/drm => gpu/drm/tdfx}/tdfx_drv.c (100%) rename trunk/drivers/{char/drm => gpu/drm/tdfx}/tdfx_drv.h (100%) create mode 100644 trunk/drivers/gpu/drm/via/Makefile rename trunk/drivers/{char/drm => gpu/drm/via}/via_3d_reg.h (100%) rename trunk/drivers/{char/drm => gpu/drm/via}/via_dma.c (100%) rename trunk/drivers/{char/drm => gpu/drm/via}/via_dmablit.c (100%) rename trunk/drivers/{char/drm => gpu/drm/via}/via_dmablit.h (100%) rename trunk/drivers/{char/drm => gpu/drm/via}/via_drv.c (100%) rename trunk/drivers/{char/drm => gpu/drm/via}/via_drv.h (100%) rename trunk/drivers/{char/drm => gpu/drm/via}/via_irq.c (100%) rename trunk/drivers/{char/drm => gpu/drm/via}/via_map.c (100%) rename trunk/drivers/{char/drm => gpu/drm/via}/via_mm.c (100%) rename trunk/drivers/{char/drm => gpu/drm/via}/via_verifier.c (100%) rename trunk/drivers/{char/drm => gpu/drm/via}/via_verifier.h (100%) rename trunk/drivers/{char/drm => gpu/drm/via}/via_video.c (100%) create mode 100644 trunk/drivers/pcmcia/bfin_cf_pcmcia.c create mode 100644 trunk/drivers/s390/cio/chsc_sch.c create mode 100644 trunk/drivers/s390/cio/chsc_sch.h create mode 100644 trunk/drivers/s390/cio/fcx.c create mode 100644 trunk/drivers/s390/cio/isc.c create mode 100644 trunk/drivers/s390/cio/itcw.c create mode 100644 trunk/drivers/s390/cio/scsw.c create mode 100644 trunk/fs/bio-integrity.c create mode 100644 trunk/include/asm-avr32/arch-at32ap/sram.h create mode 100644 trunk/include/asm-s390/chsc.h create mode 100644 trunk/include/asm-s390/fcx.h create mode 100644 trunk/include/asm-s390/isc.h create mode 100644 trunk/include/asm-s390/itcw.h rename trunk/{drivers/s390/cio => include/asm-s390}/schid.h (65%) create mode 100644 trunk/include/drm/Kbuild rename trunk/{drivers/char => include}/drm/drm.h (100%) rename trunk/{drivers/char => include}/drm/drmP.h (100%) rename trunk/{drivers/char => include}/drm/drm_core.h (100%) rename trunk/{drivers/char => include}/drm/drm_hashtab.h (100%) rename trunk/{drivers/char => include}/drm/drm_memory.h (100%) rename trunk/{drivers/char => include}/drm/drm_memory_debug.h (100%) rename trunk/{drivers/char => include}/drm/drm_os_linux.h (100%) rename trunk/{drivers/char => include}/drm/drm_pciids.h (100%) rename trunk/{drivers/char => include}/drm/drm_sarea.h (100%) rename trunk/{drivers/char => include}/drm/drm_sman.h (100%) rename trunk/{drivers/char => include}/drm/i810_drm.h (100%) rename trunk/{drivers/char => include}/drm/i830_drm.h (100%) rename trunk/{drivers/char => include}/drm/i915_drm.h (100%) rename trunk/{drivers/char => include}/drm/mga_drm.h (100%) rename trunk/{drivers/char => include}/drm/r128_drm.h (100%) rename trunk/{drivers/char => include}/drm/radeon_drm.h (100%) rename trunk/{drivers/char => include}/drm/savage_drm.h (100%) rename trunk/{drivers/char => include}/drm/sis_drm.h (100%) rename trunk/{drivers/char => include}/drm/via_drm.h (100%) delete mode 100644 trunk/include/pcmcia/bulkmem.h delete mode 100644 trunk/include/pcmcia/version.h create mode 100644 trunk/include/sound/ad1843.h delete mode 100644 trunk/security/dummy.c create mode 100644 trunk/sound/mips/ad1843.c create mode 100644 trunk/sound/mips/hal2.c create mode 100644 trunk/sound/mips/hal2.h create mode 100644 trunk/sound/mips/sgio2audio.c rename trunk/sound/pci/{ac97 => }/ak4531_codec.c (96%) create mode 100644 trunk/sound/soc/at32/Kconfig create mode 100644 trunk/sound/soc/at32/Makefile create mode 100644 trunk/sound/soc/at32/at32-pcm.c create mode 100644 trunk/sound/soc/at32/at32-pcm.h create mode 100644 trunk/sound/soc/at32/at32-ssc.c create mode 100644 trunk/sound/soc/at32/at32-ssc.h create mode 100644 trunk/sound/soc/at32/playpaq_wm8510.c create mode 100644 trunk/sound/soc/au1x/Kconfig create mode 100644 trunk/sound/soc/au1x/Makefile create mode 100644 trunk/sound/soc/au1x/dbdma2.c create mode 100644 trunk/sound/soc/au1x/psc-ac97.c create mode 100644 trunk/sound/soc/au1x/psc-i2s.c create mode 100644 trunk/sound/soc/au1x/psc.h create mode 100644 trunk/sound/soc/au1x/sample-ac97.c create mode 100644 trunk/sound/soc/codecs/ak4535.c create mode 100644 trunk/sound/soc/codecs/ak4535.h create mode 100644 trunk/sound/soc/codecs/uda1380.c create mode 100644 trunk/sound/soc/codecs/uda1380.h create mode 100644 trunk/sound/soc/codecs/wm8510.c create mode 100644 trunk/sound/soc/codecs/wm8510.h create mode 100644 trunk/sound/soc/codecs/wm8990.c create mode 100644 trunk/sound/soc/codecs/wm8990.h create mode 100644 trunk/sound/soc/pxa/em-x270.c diff --git a/[refs] b/[refs] index 33e0dc7f7274..009885d71707 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 090657e423f45a77151943f50165ae9565bfbf33 +refs/heads/master: 3b23e665b68387f5ee7b21f7b75ceea4d9acae4a diff --git a/trunk/Documentation/ABI/testing/sysfs-block b/trunk/Documentation/ABI/testing/sysfs-block index 4bd9ea539129..44f52a4f5903 100644 --- a/trunk/Documentation/ABI/testing/sysfs-block +++ b/trunk/Documentation/ABI/testing/sysfs-block @@ -26,3 +26,37 @@ Description: I/O statistics of partition . The format is the same as the above-written /sys/block//stat format. + + +What: /sys/block//integrity/format +Date: June 2008 +Contact: Martin K. Petersen +Description: + Metadata format for integrity capable block device. + E.g. T10-DIF-TYPE1-CRC. + + +What: /sys/block//integrity/read_verify +Date: June 2008 +Contact: Martin K. Petersen +Description: + Indicates whether the block layer should verify the + integrity of read requests serviced by devices that + support sending integrity metadata. + + +What: /sys/block//integrity/tag_size +Date: June 2008 +Contact: Martin K. Petersen +Description: + Number of bytes of integrity tag space available per + 512 bytes of data. + + +What: /sys/block//integrity/write_generate +Date: June 2008 +Contact: Martin K. Petersen +Description: + Indicates whether the block layer should automatically + generate checksums for write requests bound for + devices that support receiving integrity metadata. diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-css b/trunk/Documentation/ABI/testing/sysfs-bus-css new file mode 100644 index 000000000000..b585ec258a08 --- /dev/null +++ b/trunk/Documentation/ABI/testing/sysfs-bus-css @@ -0,0 +1,35 @@ +What: /sys/bus/css/devices/.../type +Date: March 2008 +Contact: Cornelia Huck + linux-s390@vger.kernel.org +Description: Contains the subchannel type, as reported by the hardware. + This attribute is present for all subchannel types. + +What: /sys/bus/css/devices/.../modalias +Date: March 2008 +Contact: Cornelia Huck + linux-s390@vger.kernel.org +Description: Contains the module alias as reported with uevents. + It is of the format css:t and present for all + subchannel types. + +What: /sys/bus/css/drivers/io_subchannel/.../chpids +Date: December 2002 +Contact: Cornelia Huck + linux-s390@vger.kernel.org +Description: Contains the ids of the channel paths used by this + subchannel, as reported by the channel subsystem + during subchannel recognition. + Note: This is an I/O-subchannel specific attribute. +Users: s390-tools, HAL + +What: /sys/bus/css/drivers/io_subchannel/.../pimpampom +Date: December 2002 +Contact: Cornelia Huck + linux-s390@vger.kernel.org +Description: Contains the PIM/PAM/POM values, as reported by the + channel subsystem when last queried by the common I/O + layer (this implies that this attribute is not neccessarily + in sync with the values current in the channel subsystem). + Note: This is an I/O-subchannel specific attribute. +Users: s390-tools, HAL diff --git a/trunk/Documentation/HOWTO b/trunk/Documentation/HOWTO index 0291ade44c17..619e8caf30db 100644 --- a/trunk/Documentation/HOWTO +++ b/trunk/Documentation/HOWTO @@ -377,7 +377,7 @@ Bug Reporting bugzilla.kernel.org is where the Linux kernel developers track kernel bugs. Users are encouraged to report all bugs that they find in this tool. For details on how to use the kernel bugzilla, please see: - http://test.kernel.org/bugzilla/faq.html + http://bugzilla.kernel.org/page.cgi?id=faq.html The file REPORTING-BUGS in the main kernel source directory has a good template for how to report a possible kernel bug, and details what kind diff --git a/trunk/Documentation/block/data-integrity.txt b/trunk/Documentation/block/data-integrity.txt new file mode 100644 index 000000000000..e9dc8d86adc7 --- /dev/null +++ b/trunk/Documentation/block/data-integrity.txt @@ -0,0 +1,327 @@ +---------------------------------------------------------------------- +1. INTRODUCTION + +Modern filesystems feature checksumming of data and metadata to +protect against data corruption. However, the detection of the +corruption is done at read time which could potentially be months +after the data was written. At that point the original data that the +application tried to write is most likely lost. + +The solution is to ensure that the disk is actually storing what the +application meant it to. Recent additions to both the SCSI family +protocols (SBC Data Integrity Field, SCC protection proposal) as well +as SATA/T13 (External Path Protection) try to remedy this by adding +support for appending integrity metadata to an I/O. The integrity +metadata (or protection information in SCSI terminology) includes a +checksum for each sector as well as an incrementing counter that +ensures the individual sectors are written in the right order. And +for some protection schemes also that the I/O is written to the right +place on disk. + +Current storage controllers and devices implement various protective +measures, for instance checksumming and scrubbing. But these +technologies are working in their own isolated domains or at best +between adjacent nodes in the I/O path. The interesting thing about +DIF and the other integrity extensions is that the protection format +is well defined and every node in the I/O path can verify the +integrity of the I/O and reject it if corruption is detected. This +allows not only corruption prevention but also isolation of the point +of failure. + +---------------------------------------------------------------------- +2. THE DATA INTEGRITY EXTENSIONS + +As written, the protocol extensions only protect the path between +controller and storage device. However, many controllers actually +allow the operating system to interact with the integrity metadata +(IMD). We have been working with several FC/SAS HBA vendors to enable +the protection information to be transferred to and from their +controllers. + +The SCSI Data Integrity Field works by appending 8 bytes of protection +information to each sector. The data + integrity metadata is stored +in 520 byte sectors on disk. Data + IMD are interleaved when +transferred between the controller and target. The T13 proposal is +similar. + +Because it is highly inconvenient for operating systems to deal with +520 (and 4104) byte sectors, we approached several HBA vendors and +encouraged them to allow separation of the data and integrity metadata +scatter-gather lists. + +The controller will interleave the buffers on write and split them on +read. This means that the Linux can DMA the data buffers to and from +host memory without changes to the page cache. + +Also, the 16-bit CRC checksum mandated by both the SCSI and SATA specs +is somewhat heavy to compute in software. Benchmarks found that +calculating this checksum had a significant impact on system +performance for a number of workloads. Some controllers allow a +lighter-weight checksum to be used when interfacing with the operating +system. Emulex, for instance, supports the TCP/IP checksum instead. +The IP checksum received from the OS is converted to the 16-bit CRC +when writing and vice versa. This allows the integrity metadata to be +generated by Linux or the application at very low cost (comparable to +software RAID5). + +The IP checksum is weaker than the CRC in terms of detecting bit +errors. However, the strength is really in the separation of the data +buffers and the integrity metadata. These two distinct buffers much +match up for an I/O to complete. + +The separation of the data and integrity metadata buffers as well as +the choice in checksums is referred to as the Data Integrity +Extensions. As these extensions are outside the scope of the protocol +bodies (T10, T13), Oracle and its partners are trying to standardize +them within the Storage Networking Industry Association. + +---------------------------------------------------------------------- +3. KERNEL CHANGES + +The data integrity framework in Linux enables protection information +to be pinned to I/Os and sent to/received from controllers that +support it. + +The advantage to the integrity extensions in SCSI and SATA is that +they enable us to protect the entire path from application to storage +device. However, at the same time this is also the biggest +disadvantage. It means that the protection information must be in a +format that can be understood by the disk. + +Generally Linux/POSIX applications are agnostic to the intricacies of +the storage devices they are accessing. The virtual filesystem switch +and the block layer make things like hardware sector size and +transport protocols completely transparent to the application. + +However, this level of detail is required when preparing the +protection information to send to a disk. Consequently, the very +concept of an end-to-end protection scheme is a layering violation. +It is completely unreasonable for an application to be aware whether +it is accessing a SCSI or SATA disk. + +The data integrity support implemented in Linux attempts to hide this +from the application. As far as the application (and to some extent +the kernel) is concerned, the integrity metadata is opaque information +that's attached to the I/O. + +The current implementation allows the block layer to automatically +generate the protection information for any I/O. Eventually the +intent is to move the integrity metadata calculation to userspace for +user data. Metadata and other I/O that originates within the kernel +will still use the automatic generation interface. + +Some storage devices allow each hardware sector to be tagged with a +16-bit value. The owner of this tag space is the owner of the block +device. I.e. the filesystem in most cases. The filesystem can use +this extra space to tag sectors as they see fit. Because the tag +space is limited, the block interface allows tagging bigger chunks by +way of interleaving. This way, 8*16 bits of information can be +attached to a typical 4KB filesystem block. + +This also means that applications such as fsck and mkfs will need +access to manipulate the tags from user space. A passthrough +interface for this is being worked on. + + +---------------------------------------------------------------------- +4. BLOCK LAYER IMPLEMENTATION DETAILS + +4.1 BIO + +The data integrity patches add a new field to struct bio when +CONFIG_BLK_DEV_INTEGRITY is enabled. bio->bi_integrity is a pointer +to a struct bip which contains the bio integrity payload. Essentially +a bip is a trimmed down struct bio which holds a bio_vec containing +the integrity metadata and the required housekeeping information (bvec +pool, vector count, etc.) + +A kernel subsystem can enable data integrity protection on a bio by +calling bio_integrity_alloc(bio). This will allocate and attach the +bip to the bio. + +Individual pages containing integrity metadata can subsequently be +attached using bio_integrity_add_page(). + +bio_free() will automatically free the bip. + + +4.2 BLOCK DEVICE + +Because the format of the protection data is tied to the physical +disk, each block device has been extended with a block integrity +profile (struct blk_integrity). This optional profile is registered +with the block layer using blk_integrity_register(). + +The profile contains callback functions for generating and verifying +the protection data, as well as getting and setting application tags. +The profile also contains a few constants to aid in completing, +merging and splitting the integrity metadata. + +Layered block devices will need to pick a profile that's appropriate +for all subdevices. blk_integrity_compare() can help with that. DM +and MD linear, RAID0 and RAID1 are currently supported. RAID4/5/6 +will require extra work due to the application tag. + + +---------------------------------------------------------------------- +5.0 BLOCK LAYER INTEGRITY API + +5.1 NORMAL FILESYSTEM + + The normal filesystem is unaware that the underlying block device + is capable of sending/receiving integrity metadata. The IMD will + be automatically generated by the block layer at submit_bio() time + in case of a WRITE. A READ request will cause the I/O integrity + to be verified upon completion. + + IMD generation and verification can be toggled using the + + /sys/block//integrity/write_generate + + and + + /sys/block//integrity/read_verify + + flags. + + +5.2 INTEGRITY-AWARE FILESYSTEM + + A filesystem that is integrity-aware can prepare I/Os with IMD + attached. It can also use the application tag space if this is + supported by the block device. + + + int bdev_integrity_enabled(block_device, int rw); + + bdev_integrity_enabled() will return 1 if the block device + supports integrity metadata transfer for the data direction + specified in 'rw'. + + bdev_integrity_enabled() honors the write_generate and + read_verify flags in sysfs and will respond accordingly. + + + int bio_integrity_prep(bio); + + To generate IMD for WRITE and to set up buffers for READ, the + filesystem must call bio_integrity_prep(bio). + + Prior to calling this function, the bio data direction and start + sector must be set, and the bio should have all data pages + added. It is up to the caller to ensure that the bio does not + change while I/O is in progress. + + bio_integrity_prep() should only be called if + bio_integrity_enabled() returned 1. + + + int bio_integrity_tag_size(bio); + + If the filesystem wants to use the application tag space it will + first have to find out how much storage space is available. + Because tag space is generally limited (usually 2 bytes per + sector regardless of sector size), the integrity framework + supports interleaving the information between the sectors in an + I/O. + + Filesystems can call bio_integrity_tag_size(bio) to find out how + many bytes of storage are available for that particular bio. + + Another option is bdev_get_tag_size(block_device) which will + return the number of available bytes per hardware sector. + + + int bio_integrity_set_tag(bio, void *tag_buf, len); + + After a successful return from bio_integrity_prep(), + bio_integrity_set_tag() can be used to attach an opaque tag + buffer to a bio. Obviously this only makes sense if the I/O is + a WRITE. + + + int bio_integrity_get_tag(bio, void *tag_buf, len); + + Similarly, at READ I/O completion time the filesystem can + retrieve the tag buffer using bio_integrity_get_tag(). + + +6.3 PASSING EXISTING INTEGRITY METADATA + + Filesystems that either generate their own integrity metadata or + are capable of transferring IMD from user space can use the + following calls: + + + struct bip * bio_integrity_alloc(bio, gfp_mask, nr_pages); + + Allocates the bio integrity payload and hangs it off of the bio. + nr_pages indicate how many pages of protection data need to be + stored in the integrity bio_vec list (similar to bio_alloc()). + + The integrity payload will be freed at bio_free() time. + + + int bio_integrity_add_page(bio, page, len, offset); + + Attaches a page containing integrity metadata to an existing + bio. The bio must have an existing bip, + i.e. bio_integrity_alloc() must have been called. For a WRITE, + the integrity metadata in the pages must be in a format + understood by the target device with the notable exception that + the sector numbers will be remapped as the request traverses the + I/O stack. This implies that the pages added using this call + will be modified during I/O! The first reference tag in the + integrity metadata must have a value of bip->bip_sector. + + Pages can be added using bio_integrity_add_page() as long as + there is room in the bip bio_vec array (nr_pages). + + Upon completion of a READ operation, the attached pages will + contain the integrity metadata received from the storage device. + It is up to the receiver to process them and verify data + integrity upon completion. + + +6.4 REGISTERING A BLOCK DEVICE AS CAPABLE OF EXCHANGING INTEGRITY + METADATA + + To enable integrity exchange on a block device the gendisk must be + registered as capable: + + int blk_integrity_register(gendisk, blk_integrity); + + The blk_integrity struct is a template and should contain the + following: + + static struct blk_integrity my_profile = { + .name = "STANDARDSBODY-TYPE-VARIANT-CSUM", + .generate_fn = my_generate_fn, + .verify_fn = my_verify_fn, + .get_tag_fn = my_get_tag_fn, + .set_tag_fn = my_set_tag_fn, + .tuple_size = sizeof(struct my_tuple_size), + .tag_size = , + }; + + 'name' is a text string which will be visible in sysfs. This is + part of the userland API so chose it carefully and never change + it. The format is standards body-type-variant. + E.g. T10-DIF-TYPE1-IP or T13-EPP-0-CRC. + + 'generate_fn' generates appropriate integrity metadata (for WRITE). + + 'verify_fn' verifies that the data buffer matches the integrity + metadata. + + 'tuple_size' must be set to match the size of the integrity + metadata per sector. I.e. 8 for DIF and EPP. + + 'tag_size' must be set to identify how many bytes of tag space + are available per hardware sector. For DIF this is either 2 or + 0 depending on the value of the Control Mode Page ATO bit. + + See 6.2 for a description of get_tag_fn and set_tag_fn. + +---------------------------------------------------------------------- +2007-12-24 Martin K. Petersen diff --git a/trunk/Documentation/ftrace.txt b/trunk/Documentation/ftrace.txt new file mode 100644 index 000000000000..13e4bf054c38 --- /dev/null +++ b/trunk/Documentation/ftrace.txt @@ -0,0 +1,1353 @@ + ftrace - Function Tracer + ======================== + +Copyright 2008 Red Hat Inc. +Author: Steven Rostedt + + +Introduction +------------ + +Ftrace is an internal tracer designed to help out developers and +designers of systems to find what is going on inside the kernel. +It can be used for debugging or analyzing latencies and performance +issues that take place outside of user-space. + +Although ftrace is the function tracer, it also includes an +infrastructure that allows for other types of tracing. Some of the +tracers that are currently in ftrace is a tracer to trace +context switches, the time it takes for a high priority task to +run after it was woken up, the time interrupts are disabled, and +more. + + +The File System +--------------- + +Ftrace uses the debugfs file system to hold the control files as well +as the files to display output. + +To mount the debugfs system: + + # mkdir /debug + # mount -t debugfs nodev /debug + + +That's it! (assuming that you have ftrace configured into your kernel) + +After mounting the debugfs, you can see a directory called +"tracing". This directory contains the control and output files +of ftrace. Here is a list of some of the key files: + + + Note: all time values are in microseconds. + + current_tracer : This is used to set or display the current tracer + that is configured. + + available_tracers : This holds the different types of tracers that + has been compiled into the kernel. The tracers + listed here can be configured by echoing in their + name into current_tracer. + + tracing_enabled : This sets or displays whether the current_tracer + is activated and tracing or not. Echo 0 into this + file to disable the tracer or 1 (or non-zero) to + enable it. + + trace : This file holds the output of the trace in a human readable + format. + + latency_trace : This file shows the same trace but the information + is organized more to display possible latencies + in the system. + + trace_pipe : The output is the same as the "trace" file but this + file is meant to be streamed with live tracing. + Reads from this file will block until new data + is retrieved. Unlike the "trace" and "latency_trace" + files, this file is a consumer. This means reading + from this file causes sequential reads to display + more current data. Once data is read from this + file, it is consumed, and will not be read + again with a sequential read. The "trace" and + "latency_trace" files are static, and if the + tracer isn't adding more data, they will display + the same information every time they are read. + + iter_ctrl : This file lets the user control the amount of data + that is displayed in one of the above output + files. + + trace_max_latency : Some of the tracers record the max latency. + For example, the time interrupts are disabled. + This time is saved in this file. The max trace + will also be stored, and displayed by either + "trace" or "latency_trace". A new max trace will + only be recorded if the latency is greater than + the value in this file. (in microseconds) + + trace_entries : This sets or displays the number of trace + entries each CPU buffer can hold. The tracer buffers + are the same size for each CPU, so care must be + taken when modifying the trace_entries. The number + of actually entries will be the number given + times the number of possible CPUS. The buffers + are saved as individual pages, and the actual entries + will always be rounded up to entries per page. + + This can only be updated when the current_tracer + is set to "none". + + NOTE: It is planned on changing the allocated buffers + from being the number of possible CPUS to + the number of online CPUS. + + tracing_cpumask : This is a mask that lets the user only trace + on specified CPUS. The format is a hex string + representing the CPUS. + + set_ftrace_filter : When dynamic ftrace is configured in, the + code is dynamically modified to disable calling + of the function profiler (mcount). This lets + tracing be configured in with practically no overhead + in performance. This also has a side effect of + enabling or disabling specific functions to be + traced. Echoing in names of functions into this + file will limit the trace to only those files. + + set_ftrace_notrace: This has the opposite effect that + set_ftrace_filter has. Any function that is added + here will not be traced. If a function exists + in both set_ftrace_filter and set_ftrace_notrace + the function will _not_ bet traced. + + available_filter_functions : When a function is encountered the first + time by the dynamic tracer, it is recorded and + later the call is converted into a nop. This file + lists the functions that have been recorded + by the dynamic tracer and these functions can + be used to set the ftrace filter by the above + "set_ftrace_filter" file. + + +The Tracers +----------- + +Here are the list of current tracers that can be configured. + + ftrace - function tracer that uses mcount to trace all functions. + It is possible to filter out which functions that are + traced when dynamic ftrace is configured in. + + sched_switch - traces the context switches between tasks. + + irqsoff - traces the areas that disable interrupts and saves off + the trace with the longest max latency. + See tracing_max_latency. When a new max is recorded, + it replaces the old trace. It is best to view this + trace with the latency_trace file. + + preemptoff - Similar to irqsoff but traces and records the time + preemption is disabled. + + preemptirqsoff - Similar to irqsoff and preemptoff, but traces and + records the largest time irqs and/or preemption is + disabled. + + wakeup - Traces and records the max latency that it takes for + the highest priority task to get scheduled after + it has been woken up. + + none - This is not a tracer. To remove all tracers from tracing + simply echo "none" into current_tracer. + + +Examples of using the tracer +---------------------------- + +Here are typical examples of using the tracers with only controlling +them with the debugfs interface (without using any user-land utilities). + +Output format: +-------------- + +Here's an example of the output format of the file "trace" + + -------- +# tracer: ftrace +# +# TASK-PID CPU# TIMESTAMP FUNCTION +# | | | | | + bash-4251 [01] 10152.583854: path_put <-path_walk + bash-4251 [01] 10152.583855: dput <-path_put + bash-4251 [01] 10152.583855: _atomic_dec_and_lock <-dput + -------- + +A header is printed with the trace that is represented. In this case +the tracer is "ftrace". Then a header showing the format. Task name +"bash", the task PID "4251", the CPU that it was running on +"01", the timestamp in . format, the function name that was +traced "path_put" and the parent function that called this function +"path_walk". + +The sched_switch tracer also includes tracing of task wake ups and +context switches. + + ksoftirqd/1-7 [01] 1453.070013: 7:115:R + 2916:115:S + ksoftirqd/1-7 [01] 1453.070013: 7:115:R + 10:115:S + ksoftirqd/1-7 [01] 1453.070013: 7:115:R ==> 10:115:R + events/1-10 [01] 1453.070013: 10:115:S ==> 2916:115:R + kondemand/1-2916 [01] 1453.070013: 2916:115:S ==> 7:115:R + ksoftirqd/1-7 [01] 1453.070013: 7:115:S ==> 0:140:R + +Wake ups are represented by a "+" and the context switches show +"==>". The format is: + + Context switches: + + Previous task Next Task + + :: ==> :: + + Wake ups: + + Current task Task waking up + + :: + :: + +The prio is the internal kernel priority, which is inverse to the +priority that is usually displayed by user-space tools. Zero represents +the highest priority (99). Prio 100 starts the "nice" priorities with +100 being equal to nice -20 and 139 being nice 19. The prio "140" is +reserved for the idle task which is the lowest priority thread (pid 0). + + +Latency trace format +-------------------- + +For traces that display latency times, the latency_trace file gives +a bit more information to see why a latency happened. Here's a typical +trace. + +# tracer: irqsoff +# +irqsoff latency trace v1.1.5 on 2.6.26-rc8 +-------------------------------------------------------------------- + latency: 97 us, #3/3, CPU#0 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2) + ----------------- + | task: swapper-0 (uid:0 nice:0 policy:0 rt_prio:0) + ----------------- + => started at: apic_timer_interrupt + => ended at: do_softirq + +# _------=> CPU# +# / _-----=> irqs-off +# | / _----=> need-resched +# || / _---=> hardirq/softirq +# ||| / _--=> preempt-depth +# |||| / +# ||||| delay +# cmd pid ||||| time | caller +# \ / ||||| \ | / + -0 0d..1 0us+: trace_hardirqs_off_thunk (apic_timer_interrupt) + -0 0d.s. 97us : __do_softirq (do_softirq) + -0 0d.s1 98us : trace_hardirqs_on (do_softirq) + + +vim:ft=help + + +This shows that the current tracer is "irqsoff" tracing the time +interrupts are disabled. It gives the trace version and the kernel +this was executed on (2.6.26-rc8). Then it displays the max latency +in microsecs (97 us). The number of trace entries displayed +by the total number recorded (both are three: #3/3). The type of +preemption that was used (PREEMPT). VP, KP, SP, and HP are always zero +and reserved for later use. #P is the number of online CPUS (#P:2). + +The task is the process that was running when the latency happened. +(swapper pid: 0). + +The start and stop that caused the latencies: + + apic_timer_interrupt is where the interrupts were disabled. + do_softirq is where they were enabled again. + +The next lines after the header are the trace itself. The header +explains which is which. + + cmd: The name of the process in the trace. + + pid: The PID of that process. + + CPU#: The CPU that the process was running on. + + irqs-off: 'd' interrupts are disabled. '.' otherwise. + + need-resched: 'N' task need_resched is set, '.' otherwise. + + hardirq/softirq: + 'H' - hard irq happened inside a softirq. + 'h' - hard irq is running + 's' - soft irq is running + '.' - normal context. + + preempt-depth: The level of preempt_disabled + +The above is mostly meaningful for kernel developers. + + time: This differs from the trace output where as the trace output + contained a absolute timestamp. This timestamp is relative + to the start of the first entry in the the trace. + + delay: This is just to help catch your eye a bit better. And + needs to be fixed to be only relative to the same CPU. + The marks is determined by the difference between this + current trace and the next trace. + '!' - greater than preempt_mark_thresh (default 100) + '+' - greater than 1 microsecond + ' ' - less than or equal to 1 microsecond. + + The rest is the same as the 'trace' file. + + +iter_ctrl +--------- + +The iter_ctrl file is used to control what gets printed in the trace +output. To see what is available, simply cat the file: + + cat /debug/tracing/iter_ctrl + print-parent nosym-offset nosym-addr noverbose noraw nohex nobin \ + noblock nostacktrace nosched-tree + +To disable one of the options, echo in the option appended with "no". + + echo noprint-parent > /debug/tracing/iter_ctrl + +To enable an option, leave off the "no". + + echo sym-offest > /debug/tracing/iter_ctrl + +Here are the available options: + + print-parent - On function traces, display the calling function + as well as the function being traced. + + print-parent: + bash-4000 [01] 1477.606694: simple_strtoul <-strict_strtoul + + noprint-parent: + bash-4000 [01] 1477.606694: simple_strtoul + + + sym-offset - Display not only the function name, but also the offset + in the function. For example, instead of seeing just + "ktime_get" you will see "ktime_get+0xb/0x20" + + sym-offset: + bash-4000 [01] 1477.606694: simple_strtoul+0x6/0xa0 + + sym-addr - this will also display the function address as well as + the function name. + + sym-addr: + bash-4000 [01] 1477.606694: simple_strtoul + + verbose - This deals with the latency_trace file. + + bash 4000 1 0 00000000 00010a95 [58127d26] 1720.415ms \ + (+0.000ms): simple_strtoul (strict_strtoul) + + raw - This will display raw numbers. This option is best for use with + user applications that can translate the raw numbers better than + having it done in the kernel. + + hex - similar to raw, but the numbers will be in a hexadecimal format. + + bin - This will print out the formats in raw binary. + + block - TBD (needs update) + + stacktrace - This is one of the options that changes the trace itself. + When a trace is recorded, so is the stack of functions. + This allows for back traces of trace sites. + + sched-tree - TBD (any users??) + + +sched_switch +------------ + +This tracer simply records schedule switches. Here's an example +on how to implement it. + + # echo sched_switch > /debug/tracing/current_tracer + # echo 1 > /debug/tracing/tracing_enabled + # sleep 1 + # echo 0 > /debug/tracing/tracing_enabled + # cat /debug/tracing/trace + +# tracer: sched_switch +# +# TASK-PID CPU# TIMESTAMP FUNCTION +# | | | | | + bash-3997 [01] 240.132281: 3997:120:R + 4055:120:R + bash-3997 [01] 240.132284: 3997:120:R ==> 4055:120:R + sleep-4055 [01] 240.132371: 4055:120:S ==> 3997:120:R + bash-3997 [01] 240.132454: 3997:120:R + 4055:120:S + bash-3997 [01] 240.132457: 3997:120:R ==> 4055:120:R + sleep-4055 [01] 240.132460: 4055:120:D ==> 3997:120:R + bash-3997 [01] 240.132463: 3997:120:R + 4055:120:D + bash-3997 [01] 240.132465: 3997:120:R ==> 4055:120:R + -0 [00] 240.132589: 0:140:R + 4:115:S + -0 [00] 240.132591: 0:140:R ==> 4:115:R + ksoftirqd/0-4 [00] 240.132595: 4:115:S ==> 0:140:R + -0 [00] 240.132598: 0:140:R + 4:115:S + -0 [00] 240.132599: 0:140:R ==> 4:115:R + ksoftirqd/0-4 [00] 240.132603: 4:115:S ==> 0:140:R + sleep-4055 [01] 240.133058: 4055:120:S ==> 3997:120:R + [...] + + +As we have discussed previously about this format, the header shows +the name of the trace and points to the options. The "FUNCTION" +is a misnomer since here it represents the wake ups and context +switches. + +The sched_switch only lists the wake ups (represented with '+') +and context switches ('==>') with the previous task or current +first followed by the next task or task waking up. The format for both +of these is PID:KERNEL-PRIO:TASK-STATE. Remember that the KERNEL-PRIO +is the inverse of the actual priority with zero (0) being the highest +priority and the nice values starting at 100 (nice -20). Below is +a quick chart to map the kernel priority to user land priorities. + + Kernel priority: 0 to 99 ==> user RT priority 99 to 0 + Kernel priority: 100 to 139 ==> user nice -20 to 19 + Kernel priority: 140 ==> idle task priority + +The task states are: + + R - running : wants to run, may not actually be running + S - sleep : process is waiting to be woken up (handles signals) + D - deep sleep : process must be woken up (ignores signals) + T - stopped : process suspended + t - traced : process is being traced (with something like gdb) + Z - zombie : process waiting to be cleaned up + X - unknown + + +ftrace_enabled +-------------- + +The following tracers give different output depending on whether +or not the sysctl ftrace_enabled is set. To set ftrace_enabled, +one can either use the sysctl function or set it via the proc +file system interface. + + sysctl kernel.ftrace_enabled=1 + + or + + echo 1 > /proc/sys/kernel/ftrace_enabled + +To disable ftrace_enabled simply replace the '1' with '0' in +the above commands. + +When ftrace_enabled is set the tracers will also record the functions +that are within the trace. The descriptions of the tracers +will also show an example with ftrace enabled. + + +irqsoff +------- + +When interrupts are disabled, the CPU can not react to any other +external event (besides NMIs and SMIs). This prevents the timer +interrupt from triggering or the mouse interrupt from letting the +kernel know of a new mouse event. The result is a latency with the +reaction time. + +The irqsoff tracer tracks the time interrupts are disabled and when +they are re-enabled. When a new maximum latency is hit, it saves off +the trace so that it may be retrieved at a later time. Every time a +new maximum in reached, the old saved trace is discarded and the new +trace is saved. + +To reset the maximum, echo 0 into tracing_max_latency. Here's an +example: + + # echo irqsoff > /debug/tracing/current_tracer + # echo 0 > /debug/tracing/tracing_max_latency + # echo 1 > /debug/tracing/tracing_enabled + # ls -ltr + [...] + # echo 0 > /debug/tracing/tracing_enabled + # cat /debug/tracing/latency_trace +# tracer: irqsoff +# +irqsoff latency trace v1.1.5 on 2.6.26-rc8 +-------------------------------------------------------------------- + latency: 6 us, #3/3, CPU#1 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2) + ----------------- + | task: bash-4269 (uid:0 nice:0 policy:0 rt_prio:0) + ----------------- + => started at: copy_page_range + => ended at: copy_page_range + +# _------=> CPU# +# / _-----=> irqs-off +# | / _----=> need-resched +# || / _---=> hardirq/softirq +# ||| / _--=> preempt-depth +# |||| / +# ||||| delay +# cmd pid ||||| time | caller +# \ / ||||| \ | / + bash-4269 1...1 0us+: _spin_lock (copy_page_range) + bash-4269 1...1 7us : _spin_unlock (copy_page_range) + bash-4269 1...2 7us : trace_preempt_on (copy_page_range) + + +vim:ft=help + +Here we see that that we had a latency of 6 microsecs (which is +very good). The spin_lock in copy_page_range disabled interrupts. +The difference between the 6 and the displayed timestamp 7us is +because the clock must have incremented between the time of recording +the max latency and recording the function that had that latency. + +Note the above had ftrace_enabled not set. If we set the ftrace_enabled +we get a much larger output: + +# tracer: irqsoff +# +irqsoff latency trace v1.1.5 on 2.6.26-rc8 +-------------------------------------------------------------------- + latency: 50 us, #101/101, CPU#0 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2) + ----------------- + | task: ls-4339 (uid:0 nice:0 policy:0 rt_prio:0) + ----------------- + => started at: __alloc_pages_internal + => ended at: __alloc_pages_internal + +# _------=> CPU# +# / _-----=> irqs-off +# | / _----=> need-resched +# || / _---=> hardirq/softirq +# ||| / _--=> preempt-depth +# |||| / +# ||||| delay +# cmd pid ||||| time | caller +# \ / ||||| \ | / + ls-4339 0...1 0us+: get_page_from_freelist (__alloc_pages_internal) + ls-4339 0d..1 3us : rmqueue_bulk (get_page_from_freelist) + ls-4339 0d..1 3us : _spin_lock (rmqueue_bulk) + ls-4339 0d..1 4us : add_preempt_count (_spin_lock) + ls-4339 0d..2 4us : __rmqueue (rmqueue_bulk) + ls-4339 0d..2 5us : __rmqueue_smallest (__rmqueue) + ls-4339 0d..2 5us : __mod_zone_page_state (__rmqueue_smallest) + ls-4339 0d..2 6us : __rmqueue (rmqueue_bulk) + ls-4339 0d..2 6us : __rmqueue_smallest (__rmqueue) + ls-4339 0d..2 7us : __mod_zone_page_state (__rmqueue_smallest) + ls-4339 0d..2 7us : __rmqueue (rmqueue_bulk) + ls-4339 0d..2 8us : __rmqueue_smallest (__rmqueue) +[...] + ls-4339 0d..2 46us : __rmqueue_smallest (__rmqueue) + ls-4339 0d..2 47us : __mod_zone_page_state (__rmqueue_smallest) + ls-4339 0d..2 47us : __rmqueue (rmqueue_bulk) + ls-4339 0d..2 48us : __rmqueue_smallest (__rmqueue) + ls-4339 0d..2 48us : __mod_zone_page_state (__rmqueue_smallest) + ls-4339 0d..2 49us : _spin_unlock (rmqueue_bulk) + ls-4339 0d..2 49us : sub_preempt_count (_spin_unlock) + ls-4339 0d..1 50us : get_page_from_freelist (__alloc_pages_internal) + ls-4339 0d..2 51us : trace_hardirqs_on (__alloc_pages_internal) + + +vim:ft=help + + +Here we traced a 50 microsecond latency. But we also see all the +functions that were called during that time. Note that enabling +function tracing we endure an added overhead. This overhead may +extend the latency times. But never the less, this trace has provided +some very helpful debugging. + + +preemptoff +---------- + +When preemption is disabled we may be able to receive interrupts but +the task can not be preempted and a higher priority task must wait +for preemption to be enabled again before it can preempt a lower +priority task. + +The preemptoff tracer traces the places that disables preemption. +Like the irqsoff, it records the maximum latency that preemption +was disabled. The control of preemptoff is much like the irqsoff. + + # echo preemptoff > /debug/tracing/current_tracer + # echo 0 > /debug/tracing/tracing_max_latency + # echo 1 > /debug/tracing/tracing_enabled + # ls -ltr + [...] + # echo 0 > /debug/tracing/tracing_enabled + # cat /debug/tracing/latency_trace +# tracer: preemptoff +# +preemptoff latency trace v1.1.5 on 2.6.26-rc8 +-------------------------------------------------------------------- + latency: 29 us, #3/3, CPU#0 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2) + ----------------- + | task: sshd-4261 (uid:0 nice:0 policy:0 rt_prio:0) + ----------------- + => started at: do_IRQ + => ended at: __do_softirq + +# _------=> CPU# +# / _-----=> irqs-off +# | / _----=> need-resched +# || / _---=> hardirq/softirq +# ||| / _--=> preempt-depth +# |||| / +# ||||| delay +# cmd pid ||||| time | caller +# \ / ||||| \ | / + sshd-4261 0d.h. 0us+: irq_enter (do_IRQ) + sshd-4261 0d.s. 29us : _local_bh_enable (__do_softirq) + sshd-4261 0d.s1 30us : trace_preempt_on (__do_softirq) + + +vim:ft=help + +This has some more changes. Preemption was disabled when an interrupt +came in (notice the 'h'), and was enabled while doing a softirq. +(notice the 's'). But we also see that interrupts have been disabled +when entering the preempt off section and leaving it (the 'd'). +We do not know if interrupts were enabled in the mean time. + +# tracer: preemptoff +# +preemptoff latency trace v1.1.5 on 2.6.26-rc8 +-------------------------------------------------------------------- + latency: 63 us, #87/87, CPU#0 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2) + ----------------- + | task: sshd-4261 (uid:0 nice:0 policy:0 rt_prio:0) + ----------------- + => started at: remove_wait_queue + => ended at: __do_softirq + +# _------=> CPU# +# / _-----=> irqs-off +# | / _----=> need-resched +# || / _---=> hardirq/softirq +# ||| / _--=> preempt-depth +# |||| / +# ||||| delay +# cmd pid ||||| time | caller +# \ / ||||| \ | / + sshd-4261 0d..1 0us : _spin_lock_irqsave (remove_wait_queue) + sshd-4261 0d..1 1us : _spin_unlock_irqrestore (remove_wait_queue) + sshd-4261 0d..1 2us : do_IRQ (common_interrupt) + sshd-4261 0d..1 2us : irq_enter (do_IRQ) + sshd-4261 0d..1 2us : idle_cpu (irq_enter) + sshd-4261 0d..1 3us : add_preempt_count (irq_enter) + sshd-4261 0d.h1 3us : idle_cpu (irq_enter) + sshd-4261 0d.h. 4us : handle_fasteoi_irq (do_IRQ) +[...] + sshd-4261 0d.h. 12us : add_preempt_count (_spin_lock) + sshd-4261 0d.h1 12us : ack_ioapic_quirk_irq (handle_fasteoi_irq) + sshd-4261 0d.h1 13us : move_native_irq (ack_ioapic_quirk_irq) + sshd-4261 0d.h1 13us : _spin_unlock (handle_fasteoi_irq) + sshd-4261 0d.h1 14us : sub_preempt_count (_spin_unlock) + sshd-4261 0d.h1 14us : irq_exit (do_IRQ) + sshd-4261 0d.h1 15us : sub_preempt_count (irq_exit) + sshd-4261 0d..2 15us : do_softirq (irq_exit) + sshd-4261 0d... 15us : __do_softirq (do_softirq) + sshd-4261 0d... 16us : __local_bh_disable (__do_softirq) + sshd-4261 0d... 16us+: add_preempt_count (__local_bh_disable) + sshd-4261 0d.s4 20us : add_preempt_count (__local_bh_disable) + sshd-4261 0d.s4 21us : sub_preempt_count (local_bh_enable) + sshd-4261 0d.s5 21us : sub_preempt_count (local_bh_enable) +[...] + sshd-4261 0d.s6 41us : add_preempt_count (__local_bh_disable) + sshd-4261 0d.s6 42us : sub_preempt_count (local_bh_enable) + sshd-4261 0d.s7 42us : sub_preempt_count (local_bh_enable) + sshd-4261 0d.s5 43us : add_preempt_count (__local_bh_disable) + sshd-4261 0d.s5 43us : sub_preempt_count (local_bh_enable_ip) + sshd-4261 0d.s6 44us : sub_preempt_count (local_bh_enable_ip) + sshd-4261 0d.s5 44us : add_preempt_count (__local_bh_disable) + sshd-4261 0d.s5 45us : sub_preempt_count (local_bh_enable) +[...] + sshd-4261 0d.s. 63us : _local_bh_enable (__do_softirq) + sshd-4261 0d.s1 64us : trace_preempt_on (__do_softirq) + + +The above is an example of the preemptoff trace with ftrace_enabled +set. Here we see that interrupts were disabled the entire time. +The irq_enter code lets us know that we entered an interrupt 'h'. +Before that, the functions being traced still show that it is not +in an interrupt, but we can see by the functions themselves that +this is not the case. + +Notice that the __do_softirq when called doesn't have a preempt_count. +It may seem that we missed a preempt enabled. What really happened +is that the preempt count is held on the threads stack and we +switched to the softirq stack (4K stacks in effect). The code +does not copy the preempt count, but because interrupts are disabled +we don't need to worry about it. Having a tracer like this is good +to let people know what really happens inside the kernel. + + +preemptirqsoff +-------------- + +Knowing the locations that have interrupts disabled or preemption +disabled for the longest times is helpful. But sometimes we would +like to know when either preemption and/or interrupts are disabled. + +The following code: + + local_irq_disable(); + call_function_with_irqs_off(); + preempt_disable(); + call_function_with_irqs_and_preemption_off(); + local_irq_enable(); + call_function_with_preemption_off(); + preempt_enable(); + +The irqsoff tracer will record the total length of +call_function_with_irqs_off() and +call_function_with_irqs_and_preemption_off(). + +The preemptoff tracer will record the total length of +call_function_with_irqs_and_preemption_off() and +call_function_with_preemption_off(). + +But neither will trace the time that interrupts and/or preemption +is disabled. This total time is the time that we can not schedule. +To record this time, use the preemptirqsoff tracer. + +Again, using this trace is much like the irqsoff and preemptoff tracers. + + # echo preemptoff > /debug/tracing/current_tracer + # echo 0 > /debug/tracing/tracing_max_latency + # echo 1 > /debug/tracing/tracing_enabled + # ls -ltr + [...] + # echo 0 > /debug/tracing/tracing_enabled + # cat /debug/tracing/latency_trace +# tracer: preemptirqsoff +# +preemptirqsoff latency trace v1.1.5 on 2.6.26-rc8 +-------------------------------------------------------------------- + latency: 293 us, #3/3, CPU#0 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2) + ----------------- + | task: ls-4860 (uid:0 nice:0 policy:0 rt_prio:0) + ----------------- + => started at: apic_timer_interrupt + => ended at: __do_softirq + +# _------=> CPU# +# / _-----=> irqs-off +# | / _----=> need-resched +# || / _---=> hardirq/softirq +# ||| / _--=> preempt-depth +# |||| / +# ||||| delay +# cmd pid ||||| time | caller +# \ / ||||| \ | / + ls-4860 0d... 0us!: trace_hardirqs_off_thunk (apic_timer_interrupt) + ls-4860 0d.s. 294us : _local_bh_enable (__do_softirq) + ls-4860 0d.s1 294us : trace_preempt_on (__do_softirq) + + +vim:ft=help + + +The trace_hardirqs_off_thunk is called from assembly on x86 when +interrupts are disabled in the assembly code. Without the function +tracing, we don't know if interrupts were enabled within the preemption +points. We do see that it started with preemption enabled. + +Here is a trace with ftrace_enabled set: + + +# tracer: preemptirqsoff +# +preemptirqsoff latency trace v1.1.5 on 2.6.26-rc8 +-------------------------------------------------------------------- + latency: 105 us, #183/183, CPU#0 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2) + ----------------- + | task: sshd-4261 (uid:0 nice:0 policy:0 rt_prio:0) + ----------------- + => started at: write_chan + => ended at: __do_softirq + +# _------=> CPU# +# / _-----=> irqs-off +# | / _----=> need-resched +# || / _---=> hardirq/softirq +# ||| / _--=> preempt-depth +# |||| / +# ||||| delay +# cmd pid ||||| time | caller +# \ / ||||| \ | / + ls-4473 0.N.. 0us : preempt_schedule (write_chan) + ls-4473 0dN.1 1us : _spin_lock (schedule) + ls-4473 0dN.1 2us : add_preempt_count (_spin_lock) + ls-4473 0d..2 2us : put_prev_task_fair (schedule) +[...] + ls-4473 0d..2 13us : set_normalized_timespec (ktime_get_ts) + ls-4473 0d..2 13us : __switch_to (schedule) + sshd-4261 0d..2 14us : finish_task_switch (schedule) + sshd-4261 0d..2 14us : _spin_unlock_irq (finish_task_switch) + sshd-4261 0d..1 15us : add_preempt_count (_spin_lock_irqsave) + sshd-4261 0d..2 16us : _spin_unlock_irqrestore (hrtick_set) + sshd-4261 0d..2 16us : do_IRQ (common_interrupt) + sshd-4261 0d..2 17us : irq_enter (do_IRQ) + sshd-4261 0d..2 17us : idle_cpu (irq_enter) + sshd-4261 0d..2 18us : add_preempt_count (irq_enter) + sshd-4261 0d.h2 18us : idle_cpu (irq_enter) + sshd-4261 0d.h. 18us : handle_fasteoi_irq (do_IRQ) + sshd-4261 0d.h. 19us : _spin_lock (handle_fasteoi_irq) + sshd-4261 0d.h. 19us : add_preempt_count (_spin_lock) + sshd-4261 0d.h1 20us : _spin_unlock (handle_fasteoi_irq) + sshd-4261 0d.h1 20us : sub_preempt_count (_spin_unlock) +[...] + sshd-4261 0d.h1 28us : _spin_unlock (handle_fasteoi_irq) + sshd-4261 0d.h1 29us : sub_preempt_count (_spin_unlock) + sshd-4261 0d.h2 29us : irq_exit (do_IRQ) + sshd-4261 0d.h2 29us : sub_preempt_count (irq_exit) + sshd-4261 0d..3 30us : do_softirq (irq_exit) + sshd-4261 0d... 30us : __do_softirq (do_softirq) + sshd-4261 0d... 31us : __local_bh_disable (__do_softirq) + sshd-4261 0d... 31us+: add_preempt_count (__local_bh_disable) + sshd-4261 0d.s4 34us : add_preempt_count (__local_bh_disable) +[...] + sshd-4261 0d.s3 43us : sub_preempt_count (local_bh_enable_ip) + sshd-4261 0d.s4 44us : sub_preempt_count (local_bh_enable_ip) + sshd-4261 0d.s3 44us : smp_apic_timer_interrupt (apic_timer_interrupt) + sshd-4261 0d.s3 45us : irq_enter (smp_apic_timer_interrupt) + sshd-4261 0d.s3 45us : idle_cpu (irq_enter) + sshd-4261 0d.s3 46us : add_preempt_count (irq_enter) + sshd-4261 0d.H3 46us : idle_cpu (irq_enter) + sshd-4261 0d.H3 47us : hrtimer_interrupt (smp_apic_timer_interrupt) + sshd-4261 0d.H3 47us : ktime_get (hrtimer_interrupt) +[...] + sshd-4261 0d.H3 81us : tick_program_event (hrtimer_interrupt) + sshd-4261 0d.H3 82us : ktime_get (tick_program_event) + sshd-4261 0d.H3 82us : ktime_get_ts (ktime_get) + sshd-4261 0d.H3 83us : getnstimeofday (ktime_get_ts) + sshd-4261 0d.H3 83us : set_normalized_timespec (ktime_get_ts) + sshd-4261 0d.H3 84us : clockevents_program_event (tick_program_event) + sshd-4261 0d.H3 84us : lapic_next_event (clockevents_program_event) + sshd-4261 0d.H3 85us : irq_exit (smp_apic_timer_interrupt) + sshd-4261 0d.H3 85us : sub_preempt_count (irq_exit) + sshd-4261 0d.s4 86us : sub_preempt_count (irq_exit) + sshd-4261 0d.s3 86us : add_preempt_count (__local_bh_disable) +[...] + sshd-4261 0d.s1 98us : sub_preempt_count (net_rx_action) + sshd-4261 0d.s. 99us : add_preempt_count (_spin_lock_irq) + sshd-4261 0d.s1 99us+: _spin_unlock_irq (run_timer_softirq) + sshd-4261 0d.s. 104us : _local_bh_enable (__do_softirq) + sshd-4261 0d.s. 104us : sub_preempt_count (_local_bh_enable) + sshd-4261 0d.s. 105us : _local_bh_enable (__do_softirq) + sshd-4261 0d.s1 105us : trace_preempt_on (__do_softirq) + + +This is a very interesting trace. It started with the preemption of +the ls task. We see that the task had the "need_resched" bit set +with the 'N' in the trace. Interrupts are disabled in the spin_lock +and the trace started. We see that a schedule took place to run +sshd. When the interrupts were enabled we took an interrupt. +On return of the interrupt the softirq ran. We took another interrupt +while running the softirq as we see with the capital 'H'. + + +wakeup +------ + +In Real-Time environment it is very important to know the wakeup +time it takes for the highest priority task that wakes up to the +time it executes. This is also known as "schedule latency". +I stress the point that this is about RT tasks. It is also important +to know the scheduling latency of non-RT tasks, but the average +schedule latency is better for non-RT tasks. Tools like +LatencyTop is more appropriate for such measurements. + +Real-Time environments is interested in the worst case latency. +That is the longest latency it takes for something to happen, and +not the average. We can have a very fast scheduler that may only +have a large latency once in a while, but that would not work well +with Real-Time tasks. The wakeup tracer was designed to record +the worst case wakeups of RT tasks. Non-RT tasks are not recorded +because the tracer only records one worst case and tracing non-RT +tasks that are unpredictable will overwrite the worst case latency +of RT tasks. + +Since this tracer only deals with RT tasks, we will run this slightly +different than we did with the previous tracers. Instead of performing +an 'ls' we will run 'sleep 1' under 'chrt' which changes the +priority of the task. + + # echo wakeup > /debug/tracing/current_tracer + # echo 0 > /debug/tracing/tracing_max_latency + # echo 1 > /debug/tracing/tracing_enabled + # chrt -f 5 sleep 1 + # echo 0 > /debug/tracing/tracing_enabled + # cat /debug/tracing/latency_trace +# tracer: wakeup +# +wakeup latency trace v1.1.5 on 2.6.26-rc8 +-------------------------------------------------------------------- + latency: 4 us, #2/2, CPU#1 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2) + ----------------- + | task: sleep-4901 (uid:0 nice:0 policy:1 rt_prio:5) + ----------------- + +# _------=> CPU# +# / _-----=> irqs-off +# | / _----=> need-resched +# || / _---=> hardirq/softirq +# ||| / _--=> preempt-depth +# |||| / +# ||||| delay +# cmd pid ||||| time | caller +# \ / ||||| \ | / + -0 1d.h4 0us+: try_to_wake_up (wake_up_process) + -0 1d..4 4us : schedule (cpu_idle) + + +vim:ft=help + + +Running this on an idle system we see that it only took 4 microseconds +to perform the task switch. Note, since the trace marker in the +schedule is before the actual "switch" we stop the tracing when +the recorded task is about to schedule in. This may change if +we add a new marker at the end of the scheduler. + +Notice that the recorded task is 'sleep' with the PID of 4901 and it +has an rt_prio of 5. This priority is user-space priority and not +the internal kernel priority. The policy is 1 for SCHED_FIFO and 2 +for SCHED_RR. + +Doing the same with chrt -r 5 and ftrace_enabled set. + +# tracer: wakeup +# +wakeup latency trace v1.1.5 on 2.6.26-rc8 +-------------------------------------------------------------------- + latency: 50 us, #60/60, CPU#1 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2) + ----------------- + | task: sleep-4068 (uid:0 nice:0 policy:2 rt_prio:5) + ----------------- + +# _------=> CPU# +# / _-----=> irqs-off +# | / _----=> need-resched +# || / _---=> hardirq/softirq +# ||| / _--=> preempt-depth +# |||| / +# ||||| delay +# cmd pid ||||| time | caller +# \ / ||||| \ | / +ksoftirq-7 1d.H3 0us : try_to_wake_up (wake_up_process) +ksoftirq-7 1d.H4 1us : sub_preempt_count (marker_probe_cb) +ksoftirq-7 1d.H3 2us : check_preempt_wakeup (try_to_wake_up) +ksoftirq-7 1d.H3 3us : update_curr (check_preempt_wakeup) +ksoftirq-7 1d.H3 4us : calc_delta_mine (update_curr) +ksoftirq-7 1d.H3 5us : __resched_task (check_preempt_wakeup) +ksoftirq-7 1d.H3 6us : task_wake_up_rt (try_to_wake_up) +ksoftirq-7 1d.H3 7us : _spin_unlock_irqrestore (try_to_wake_up) +[...] +ksoftirq-7 1d.H2 17us : irq_exit (smp_apic_timer_interrupt) +ksoftirq-7 1d.H2 18us : sub_preempt_count (irq_exit) +ksoftirq-7 1d.s3 19us : sub_preempt_count (irq_exit) +ksoftirq-7 1..s2 20us : rcu_process_callbacks (__do_softirq) +[...] +ksoftirq-7 1..s2 26us : __rcu_process_callbacks (rcu_process_callbacks) +ksoftirq-7 1d.s2 27us : _local_bh_enable (__do_softirq) +ksoftirq-7 1d.s2 28us : sub_preempt_count (_local_bh_enable) +ksoftirq-7 1.N.3 29us : sub_preempt_count (ksoftirqd) +ksoftirq-7 1.N.2 30us : _cond_resched (ksoftirqd) +ksoftirq-7 1.N.2 31us : __cond_resched (_cond_resched) +ksoftirq-7 1.N.2 32us : add_preempt_count (__cond_resched) +ksoftirq-7 1.N.2 33us : schedule (__cond_resched) +ksoftirq-7 1.N.2 33us : add_preempt_count (schedule) +ksoftirq-7 1.N.3 34us : hrtick_clear (schedule) +ksoftirq-7 1dN.3 35us : _spin_lock (schedule) +ksoftirq-7 1dN.3 36us : add_preempt_count (_spin_lock) +ksoftirq-7 1d..4 37us : put_prev_task_fair (schedule) +ksoftirq-7 1d..4 38us : update_curr (put_prev_task_fair) +[...] +ksoftirq-7 1d..5 47us : _spin_trylock (tracing_record_cmdline) +ksoftirq-7 1d..5 48us : add_preempt_count (_spin_trylock) +ksoftirq-7 1d..6 49us : _spin_unlock (tracing_record_cmdline) +ksoftirq-7 1d..6 49us : sub_preempt_count (_spin_unlock) +ksoftirq-7 1d..4 50us : schedule (__cond_resched) + +The interrupt went off while running ksoftirqd. This task runs at +SCHED_OTHER. Why didn't we see the 'N' set early? This may be +a harmless bug with x86_32 and 4K stacks. The need_reched() function +that tests if we need to reschedule looks on the actual stack. +Where as the setting of the NEED_RESCHED bit happens on the +task's stack. But because we are in a hard interrupt, the test +is with the interrupts stack which has that to be false. We don't +see the 'N' until we switch back to the task's stack. + +ftrace +------ + +ftrace is not only the name of the tracing infrastructure, but it +is also a name of one of the tracers. The tracer is the function +tracer. Enabling the function tracer can be done from the +debug file system. Make sure the ftrace_enabled is set otherwise +this tracer is a nop. + + # sysctl kernel.ftrace_enabled=1 + # echo ftrace > /debug/tracing/current_tracer + # echo 1 > /debug/tracing/tracing_enabled + # usleep 1 + # echo 0 > /debug/tracing/tracing_enabled + # cat /debug/tracing/trace +# tracer: ftrace +# +# TASK-PID CPU# TIMESTAMP FUNCTION +# | | | | | + bash-4003 [00] 123.638713: finish_task_switch <-schedule + bash-4003 [00] 123.638714: _spin_unlock_irq <-finish_task_switch + bash-4003 [00] 123.638714: sub_preempt_count <-_spin_unlock_irq + bash-4003 [00] 123.638715: hrtick_set <-schedule + bash-4003 [00] 123.638715: _spin_lock_irqsave <-hrtick_set + bash-4003 [00] 123.638716: add_preempt_count <-_spin_lock_irqsave + bash-4003 [00] 123.638716: _spin_unlock_irqrestore <-hrtick_set + bash-4003 [00] 123.638717: sub_preempt_count <-_spin_unlock_irqrestore + bash-4003 [00] 123.638717: hrtick_clear <-hrtick_set + bash-4003 [00] 123.638718: sub_preempt_count <-schedule + bash-4003 [00] 123.638718: sub_preempt_count <-preempt_schedule + bash-4003 [00] 123.638719: wait_for_completion <-__stop_machine_run + bash-4003 [00] 123.638719: wait_for_common <-wait_for_completion + bash-4003 [00] 123.638720: _spin_lock_irq <-wait_for_common + bash-4003 [00] 123.638720: add_preempt_count <-_spin_lock_irq +[...] + + +Note: It is sometimes better to enable or disable tracing directly from +a program, because the buffer may be overflowed by the echo commands +before you get to the point you want to trace. It is also easier to +stop the tracing at the point that you hit the part that you are +interested in. Since the ftrace buffer is a ring buffer with the +oldest data being overwritten, usually it is sufficient to start the +tracer with an echo command but have you code stop it. Something +like the following is usually appropriate for this. + +int trace_fd; +[...] +int main(int argc, char *argv[]) { + [...] + trace_fd = open("/debug/tracing/tracing_enabled", O_WRONLY); + [...] + if (condition_hit()) { + write(trace_fd, "0", 1); + } + [...] +} + + +dynamic ftrace +-------------- + +If CONFIG_DYNAMIC_FTRACE is set, then the system will run with +virtually no overhead when function tracing is disabled. The way +this works is the mcount function call (placed at the start of +every kernel function, produced by the -pg switch in gcc), starts +of pointing to a simple return. + +When dynamic ftrace is initialized, it calls kstop_machine to make it +act like a uniprocessor so that it can freely modify code without +worrying about other processors executing that same code. At +initialization, the mcount calls are change to call a "record_ip" +function. After this, the first time a kernel function is called, +it has the calling address saved in a hash table. + +Later on the ftraced kernel thread is awoken and will again call +kstop_machine if new functions have been recorded. The ftraced thread +will change all calls to mcount to "nop". Just calling mcount +and having mcount return has shown a 10% overhead. By converting +it to a nop, there is no recordable overhead to the system. + +One special side-effect to the recording of the functions being +traced, is that we can now selectively choose which functions we +want to trace and which ones we want the mcount calls to remain as +nops. + +Two files that contain to the enabling and disabling of recorded +functions are: + + set_ftrace_filter + +and + + set_ftrace_notrace + +A list of available functions that you can add to this files is listed +in: + + available_filter_functions + + # cat /debug/tracing/available_filter_functions +put_prev_task_idle +kmem_cache_create +pick_next_task_rt +get_online_cpus +pick_next_task_fair +mutex_lock +[...] + +If I'm only interested in sys_nanosleep and hrtimer_interrupt: + + # echo sys_nanosleep hrtimer_interrupt \ + > /debug/tracing/set_ftrace_filter + # echo ftrace > /debug/tracing/current_tracer + # echo 1 > /debug/tracing/tracing_enabled + # usleep 1 + # echo 0 > /debug/tracing/tracing_enabled + # cat /debug/tracing/trace +# tracer: ftrace +# +# TASK-PID CPU# TIMESTAMP FUNCTION +# | | | | | + usleep-4134 [00] 1317.070017: hrtimer_interrupt <-smp_apic_timer_interrupt + usleep-4134 [00] 1317.070111: sys_nanosleep <-syscall_call + -0 [00] 1317.070115: hrtimer_interrupt <-smp_apic_timer_interrupt + +To see what functions are being traced, you can cat the file: + + # cat /debug/tracing/set_ftrace_filter +hrtimer_interrupt +sys_nanosleep + + +Perhaps this isn't enough. The filters also allow simple wild cards. +Only the following is currently available + + * - will match functions that begins with + * - will match functions that end with + ** - will match functions that have in it + +Thats all the wild cards that are allowed. + + * will not work. + + # echo hrtimer_* > /debug/tracing/set_ftrace_filter + +Produces: + +# tracer: ftrace +# +# TASK-PID CPU# TIMESTAMP FUNCTION +# | | | | | + bash-4003 [00] 1480.611794: hrtimer_init <-copy_process + bash-4003 [00] 1480.611941: hrtimer_start <-hrtick_set + bash-4003 [00] 1480.611956: hrtimer_cancel <-hrtick_clear + bash-4003 [00] 1480.611956: hrtimer_try_to_cancel <-hrtimer_cancel + -0 [00] 1480.612019: hrtimer_get_next_event <-get_next_timer_interrupt + -0 [00] 1480.612025: hrtimer_get_next_event <-get_next_timer_interrupt + -0 [00] 1480.612032: hrtimer_get_next_event <-get_next_timer_interrupt + -0 [00] 1480.612037: hrtimer_get_next_event <-get_next_timer_interrupt + -0 [00] 1480.612382: hrtimer_get_next_event <-get_next_timer_interrupt + + +Notice that we lost the sys_nanosleep. + + # cat /debug/tracing/set_ftrace_filter +hrtimer_run_queues +hrtimer_run_pending +hrtimer_init +hrtimer_cancel +hrtimer_try_to_cancel +hrtimer_forward +hrtimer_start +hrtimer_reprogram +hrtimer_force_reprogram +hrtimer_get_next_event +hrtimer_interrupt +hrtimer_nanosleep +hrtimer_wakeup +hrtimer_get_remaining +hrtimer_get_res +hrtimer_init_sleeper + + +This is because the '>' and '>>' act just like they do in bash. +To rewrite the filters, use '>' +To append to the filters, use '>>' + +To clear out a filter so that all functions will be recorded again. + + # echo > /debug/tracing/set_ftrace_filter + # cat /debug/tracing/set_ftrace_filter + # + +Again, now we want to append. + + # echo sys_nanosleep > /debug/tracing/set_ftrace_filter + # cat /debug/tracing/set_ftrace_filter +sys_nanosleep + # echo hrtimer_* >> /debug/tracing/set_ftrace_filter + # cat /debug/tracing/set_ftrace_filter +hrtimer_run_queues +hrtimer_run_pending +hrtimer_init +hrtimer_cancel +hrtimer_try_to_cancel +hrtimer_forward +hrtimer_start +hrtimer_reprogram +hrtimer_force_reprogram +hrtimer_get_next_event +hrtimer_interrupt +sys_nanosleep +hrtimer_nanosleep +hrtimer_wakeup +hrtimer_get_remaining +hrtimer_get_res +hrtimer_init_sleeper + + +The set_ftrace_notrace prevents those functions from being traced. + + # echo '*preempt*' '*lock*' > /debug/tracing/set_ftrace_notrace + +Produces: + +# tracer: ftrace +# +# TASK-PID CPU# TIMESTAMP FUNCTION +# | | | | | + bash-4043 [01] 115.281644: finish_task_switch <-schedule + bash-4043 [01] 115.281645: hrtick_set <-schedule + bash-4043 [01] 115.281645: hrtick_clear <-hrtick_set + bash-4043 [01] 115.281646: wait_for_completion <-__stop_machine_run + bash-4043 [01] 115.281647: wait_for_common <-wait_for_completion + bash-4043 [01] 115.281647: kthread_stop <-stop_machine_run + bash-4043 [01] 115.281648: init_waitqueue_head <-kthread_stop + bash-4043 [01] 115.281648: wake_up_process <-kthread_stop + bash-4043 [01] 115.281649: try_to_wake_up <-wake_up_process + +We can see that there's no more lock or preempt tracing. + +ftraced +------- + +As mentioned above, when dynamic ftrace is configured in, a kernel +thread wakes up once a second and checks to see if there are mcount +calls that need to be converted into nops. If there is not, then +it simply goes back to sleep. But if there is, it will call +kstop_machine to convert the calls to nops. + +There may be a case that you do not want this added latency. +Perhaps you are doing some audio recording and this activity might +cause skips in the playback. There is an interface to disable +and enable the ftraced kernel thread. + + # echo 0 > /debug/tracing/ftraced_enabled + +This will disable the calling of the kstop_machine to update the +mcount calls to nops. Remember that there's a large overhead +to calling mcount. Without this kernel thread, that overhead will +exist. + +Any write to the ftraced_enabled file will cause the kstop_machine +to run if there are recorded calls to mcount. This means that a +user can manually perform the updates when they want to by simply +echoing a '0' into the ftraced_enabled file. + +The updates are also done at the beginning of enabling a tracer +that uses ftrace function recording. + + +trace_pipe +---------- + +The trace_pipe outputs the same as trace, but the effect on the +tracing is different. Every read from trace_pipe is consumed. +This means that subsequent reads will be different. The trace +is live. + + # echo ftrace > /debug/tracing/current_tracer + # cat /debug/tracing/trace_pipe > /tmp/trace.out & +[1] 4153 + # echo 1 > /debug/tracing/tracing_enabled + # usleep 1 + # echo 0 > /debug/tracing/tracing_enabled + # cat /debug/tracing/trace +# tracer: ftrace +# +# TASK-PID CPU# TIMESTAMP FUNCTION +# | | | | | + + # + # cat /tmp/trace.out + bash-4043 [00] 41.267106: finish_task_switch <-schedule + bash-4043 [00] 41.267106: hrtick_set <-schedule + bash-4043 [00] 41.267107: hrtick_clear <-hrtick_set + bash-4043 [00] 41.267108: wait_for_completion <-__stop_machine_run + bash-4043 [00] 41.267108: wait_for_common <-wait_for_completion + bash-4043 [00] 41.267109: kthread_stop <-stop_machine_run + bash-4043 [00] 41.267109: init_waitqueue_head <-kthread_stop + bash-4043 [00] 41.267110: wake_up_process <-kthread_stop + bash-4043 [00] 41.267110: try_to_wake_up <-wake_up_process + bash-4043 [00] 41.267111: select_task_rq_rt <-try_to_wake_up + + +Note, reading the trace_pipe will block until more input is added. +By changing the tracer, trace_pipe will issue an EOF. We needed +to set the ftrace tracer _before_ cating the trace_pipe file. + + +trace entries +------------- + +Having too much or not enough data can be troublesome in diagnosing +some issue in the kernel. The file trace_entries is used to modify +the size of the internal trace buffers. The numbers listed +is the number of entries that can be recorded per CPU. To know +the full size, multiply the number of possible CPUS with the +number of entries. + + # cat /debug/tracing/trace_entries +65620 + +Note, to modify this you must have tracing fulling disabled. To do that, +echo "none" into the current_tracer. + + # echo none > /debug/tracing/current_tracer + # echo 100000 > /debug/tracing/trace_entries + # cat /debug/tracing/trace_entries +100045 + + +Notice that we echoed in 100,000 but the size is 100,045. The entries +are held by individual pages. It allocates the number of pages it takes +to fulfill the request. If more entries may fit on the last page +it will add them. + + # echo 1 > /debug/tracing/trace_entries + # cat /debug/tracing/trace_entries +85 + +This shows us that 85 entries can fit on a single page. + +The number of pages that will be allocated is a percentage of available +memory. Allocating too much will produces an error. + + # echo 1000000000000 > /debug/tracing/trace_entries +-bash: echo: write error: Cannot allocate memory + # cat /debug/tracing/trace_entries +85 + diff --git a/trunk/Documentation/ioctl-number.txt b/trunk/Documentation/ioctl-number.txt index 240ce7a56c40..3bb5f466a90d 100644 --- a/trunk/Documentation/ioctl-number.txt +++ b/trunk/Documentation/ioctl-number.txt @@ -117,6 +117,7 @@ Code Seq# Include File Comments 'c' 00-7F linux/comstats.h conflict! 'c' 00-7F linux/coda.h conflict! +'c' 80-9F asm-s390/chsc.h 'd' 00-FF linux/char/drm/drm/h conflict! 'd' 00-DF linux/video_decoder.h conflict! 'd' F0-FF linux/digi1.h diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt index 17f1f91af35c..946b66e1b652 100644 --- a/trunk/Documentation/networking/ip-sysctl.txt +++ b/trunk/Documentation/networking/ip-sysctl.txt @@ -148,9 +148,9 @@ tcp_available_congestion_control - STRING but not loaded. tcp_base_mss - INTEGER - The initial value of search_low to be used by Packetization Layer - Path MTU Discovery (MTU probing). If MTU probing is enabled, - this is the inital MSS used by the connection. + The initial value of search_low to be used by the packetization layer + Path MTU discovery (MTU probing). If MTU probing is enabled, + this is the initial MSS used by the connection. tcp_congestion_control - STRING Set the congestion control algorithm to be used for new @@ -185,10 +185,9 @@ tcp_frto - INTEGER timeouts. It is particularly beneficial in wireless environments where packet loss is typically due to random radio interference rather than intermediate router congestion. F-RTO is sender-side - only modification. Therefore it does not require any support from - the peer, but in a typical case, however, where wireless link is - the local access link and most of the data flows downlink, the - faraway servers should have F-RTO enabled to take advantage of it. + only modification. Therefore it does not require any support from + the peer. + If set to 1, basic version is enabled. 2 enables SACK enhanced F-RTO if flow uses SACK. The basic version can be used also when SACK is in use though scenario(s) with it exists where F-RTO @@ -276,7 +275,7 @@ tcp_mem - vector of 3 INTEGERs: min, pressure, max memory. tcp_moderate_rcvbuf - BOOLEAN - If set, TCP performs receive buffer autotuning, attempting to + If set, TCP performs receive buffer auto-tuning, attempting to automatically size the buffer (no greater than tcp_rmem[2]) to match the size required by the path for full throughput. Enabled by default. @@ -336,7 +335,7 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max pressure. Default: 8K - default: default size of receive buffer used by TCP sockets. + default: initial size of receive buffer used by TCP sockets. This value overrides net.core.rmem_default used by other protocols. Default: 87380 bytes. This value results in window of 65535 with default setting of tcp_adv_win_scale and tcp_app_win:0 and a bit @@ -344,8 +343,10 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max max: maximal size of receive buffer allowed for automatically selected receiver buffers for TCP socket. This value does not override - net.core.rmem_max, "static" selection via SO_RCVBUF does not use this. - Default: 87380*2 bytes. + net.core.rmem_max. Calling setsockopt() with SO_RCVBUF disables + automatic tuning of that socket's receive buffer size, in which + case this value is ignored. + Default: between 87380B and 4MB, depending on RAM size. tcp_sack - BOOLEAN Enable select acknowledgments (SACKS). @@ -358,7 +359,7 @@ tcp_slow_start_after_idle - BOOLEAN Default: 1 tcp_stdurg - BOOLEAN - Use the Host requirements interpretation of the TCP urg pointer field. + Use the Host requirements interpretation of the TCP urgent pointer field. Most hosts use the older BSD interpretation, so if you turn this on Linux might not communicate correctly with them. Default: FALSE @@ -371,12 +372,12 @@ tcp_synack_retries - INTEGER tcp_syncookies - BOOLEAN Only valid when the kernel was compiled with CONFIG_SYNCOOKIES Send out syncookies when the syn backlog queue of a socket - overflows. This is to prevent against the common 'syn flood attack' + overflows. This is to prevent against the common 'SYN flood attack' Default: FALSE Note, that syncookies is fallback facility. It MUST NOT be used to help highly loaded servers to stand - against legal connection rate. If you see synflood warnings + against legal connection rate. If you see SYN flood warnings in your logs, but investigation shows that they occur because of overload with legal connections, you should tune another parameters until this warning disappear. @@ -386,7 +387,7 @@ tcp_syncookies - BOOLEAN to use TCP extensions, can result in serious degradation of some services (f.e. SMTP relaying), visible not by you, but your clients and relays, contacting you. While you see - synflood warnings in logs not being really flooded, your server + SYN flood warnings in logs not being really flooded, your server is seriously misconfigured. tcp_syn_retries - INTEGER @@ -419,19 +420,21 @@ tcp_window_scaling - BOOLEAN Enable window scaling as defined in RFC1323. tcp_wmem - vector of 3 INTEGERs: min, default, max - min: Amount of memory reserved for send buffers for TCP socket. + min: Amount of memory reserved for send buffers for TCP sockets. Each TCP socket has rights to use it due to fact of its birth. Default: 4K - default: Amount of memory allowed for send buffers for TCP socket - by default. This value overrides net.core.wmem_default used - by other protocols, it is usually lower than net.core.wmem_default. + default: initial size of send buffer used by TCP sockets. This + value overrides net.core.wmem_default used by other protocols. + It is usually lower than net.core.wmem_default. Default: 16K - max: Maximal amount of memory allowed for automatically selected - send buffers for TCP socket. This value does not override - net.core.wmem_max, "static" selection via SO_SNDBUF does not use this. - Default: 128K + max: Maximal amount of memory allowed for automatically tuned + send buffers for TCP sockets. This value does not override + net.core.wmem_max. Calling setsockopt() with SO_SNDBUF disables + automatic tuning of that socket's send buffer size, in which case + this value is ignored. + Default: between 64K and 4MB, depending on RAM size. tcp_workaround_signed_windows - BOOLEAN If set, assume no receipt of a window scaling option means the @@ -1060,24 +1063,193 @@ bridge-nf-filter-pppoe-tagged - BOOLEAN Default: 1 -UNDOCUMENTED: +proc/sys/net/sctp/* Variables: + +addip_enable - BOOLEAN + Enable or disable extension of Dynamic Address Reconfiguration + (ADD-IP) functionality specified in RFC5061. This extension provides + the ability to dynamically add and remove new addresses for the SCTP + associations. + + 1: Enable extension. + + 0: Disable extension. + + Default: 0 + +addip_noauth_enable - BOOLEAN + Dynamic Address Reconfiguration (ADD-IP) requires the use of + authentication to protect the operations of adding or removing new + addresses. This requirement is mandated so that unauthorized hosts + would not be able to hijack associations. However, older + implementations may not have implemented this requirement while + allowing the ADD-IP extension. For reasons of interoperability, + we provide this variable to control the enforcement of the + authentication requirement. + + 1: Allow ADD-IP extension to be used without authentication. This + should only be set in a closed environment for interoperability + with older implementations. + + 0: Enforce the authentication requirement + + Default: 0 + +auth_enable - BOOLEAN + Enable or disable Authenticated Chunks extension. This extension + provides the ability to send and receive authenticated chunks and is + required for secure operation of Dynamic Address Reconfiguration + (ADD-IP) extension. + + 1: Enable this extension. + 0: Disable this extension. + + Default: 0 + +prsctp_enable - BOOLEAN + Enable or disable the Partial Reliability extension (RFC3758) which + is used to notify peers that a given DATA should no longer be expected. + + 1: Enable extension + 0: Disable + + Default: 1 + +max_burst - INTEGER + The limit of the number of new packets that can be initially sent. It + controls how bursty the generated traffic can be. + + Default: 4 + +association_max_retrans - INTEGER + Set the maximum number for retransmissions that an association can + attempt deciding that the remote end is unreachable. If this value + is exceeded, the association is terminated. + + Default: 10 + +max_init_retransmits - INTEGER + The maximum number of retransmissions of INIT and COOKIE-ECHO chunks + that an association will attempt before declaring the destination + unreachable and terminating. + + Default: 8 + +path_max_retrans - INTEGER + The maximum number of retransmissions that will be attempted on a given + path. Once this threshold is exceeded, the path is considered + unreachable, and new traffic will use a different path when the + association is multihomed. + + Default: 5 + +rto_initial - INTEGER + The initial round trip timeout value in milliseconds that will be used + in calculating round trip times. This is the initial time interval + for retransmissions. + + Default: 3000 -dev_weight FIXME -discovery_slots FIXME -discovery_timeout FIXME -fast_poll_increase FIXME -ip6_queue_maxlen FIXME -lap_keepalive_time FIXME -lo_cong FIXME -max_baud_rate FIXME -max_dgram_qlen FIXME -max_noreply_time FIXME -max_tx_data_size FIXME -max_tx_window FIXME -min_tx_turn_time FIXME -mod_cong FIXME -no_cong FIXME -no_cong_thresh FIXME -slot_timeout FIXME -warn_noreply_time FIXME +rto_max - INTEGER + The maximum value (in milliseconds) of the round trip timeout. This + is the largest time interval that can elapse between retransmissions. + + Default: 60000 + +rto_min - INTEGER + The minimum value (in milliseconds) of the round trip timeout. This + is the smallest time interval the can elapse between retransmissions. + + Default: 1000 + +hb_interval - INTEGER + The interval (in milliseconds) between HEARTBEAT chunks. These chunks + are sent at the specified interval on idle paths to probe the state of + a given path between 2 associations. + + Default: 30000 + +sack_timeout - INTEGER + The amount of time (in milliseconds) that the implementation will wait + to send a SACK. + + Default: 200 + +valid_cookie_life - INTEGER + The default lifetime of the SCTP cookie (in milliseconds). The cookie + is used during association establishment. + + Default: 60000 + +cookie_preserve_enable - BOOLEAN + Enable or disable the ability to extend the lifetime of the SCTP cookie + that is used during the establishment phase of SCTP association + + 1: Enable cookie lifetime extension. + 0: Disable + + Default: 1 + +rcvbuf_policy - INTEGER + Determines if the receive buffer is attributed to the socket or to + association. SCTP supports the capability to create multiple + associations on a single socket. When using this capability, it is + possible that a single stalled association that's buffering a lot + of data may block other associations from delivering their data by + consuming all of the receive buffer space. To work around this, + the rcvbuf_policy could be set to attribute the receiver buffer space + to each association instead of the socket. This prevents the described + blocking. + + 1: rcvbuf space is per association + 0: recbuf space is per socket + + Default: 0 + +sndbuf_policy - INTEGER + Similar to rcvbuf_policy above, this applies to send buffer space. + + 1: Send buffer is tracked per association + 0: Send buffer is tracked per socket. + + Default: 0 + +sctp_mem - vector of 3 INTEGERs: min, pressure, max + Number of pages allowed for queueing by all SCTP sockets. + + min: Below this number of pages SCTP is not bothered about its + memory appetite. When amount of memory allocated by SCTP exceeds + this number, SCTP starts to moderate memory usage. + + pressure: This value was introduced to follow format of tcp_mem. + + max: Number of pages allowed for queueing by all SCTP sockets. + + Default is calculated at boot time from amount of available memory. + +sctp_rmem - vector of 3 INTEGERs: min, default, max + See tcp_rmem for a description. + +sctp_wmem - vector of 3 INTEGERs: min, default, max + See tcp_wmem for a description. + +UNDOCUMENTED: +/proc/sys/net/core/* + dev_weight FIXME + +/proc/sys/net/unix/* + max_dgram_qlen FIXME + +/proc/sys/net/irda/* + fast_poll_increase FIXME + warn_noreply_time FIXME + discovery_slots FIXME + slot_timeout FIXME + max_baud_rate FIXME + discovery_timeout FIXME + lap_keepalive_time FIXME + max_noreply_time FIXME + max_tx_data_size FIXME + max_tx_window FIXME + min_tx_turn_time FIXME diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt index 0bbee38acd26..72aff61e7315 100644 --- a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt @@ -753,8 +753,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. [Multiple options for each card instance] model - force the model name - position_fix - Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size) + position_fix - Fix DMA pointer (0 = auto, 1 = use LPIB, 2 = POSBUF) probe_mask - Bitmask to probe codecs (default = -1, meaning all slots) + bdl_pos_adj - Specifies the DMA IRQ timing delay in samples. + Passing -1 will make the driver to choose the appropriate + value based on the controller chip. [Single (global) options] single_cmd - Use single immediate commands to communicate with @@ -845,7 +848,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. ALC269 basic Basic preset - ALC662 + ALC662/663 3stack-dig 3-stack (2-channel) with SPDIF 3stack-6ch 3-stack (6-channel) 3stack-6ch-dig 3-stack (6-channel) with SPDIF @@ -853,6 +856,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. lenovo-101e Lenovo laptop eeepc-p701 ASUS Eeepc P701 eeepc-ep20 ASUS Eeepc EP20 + m51va ASUS M51VA + g71v ASUS G71V + h13 ASUS H13 + g50v ASUS G50V auto auto-config reading BIOS (default) ALC882/885 @@ -1091,7 +1098,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. This occurs when the access to non-existing or non-working codec slot (likely a modem one) causes a stall of the communication via HD-audio bus. You can see which codec slots are probed by enabling - CONFIG_SND_DEBUG_DETECT, or simply from the file name of the codec + CONFIG_SND_DEBUG_VERBOSE, or simply from the file name of the codec proc files. Then limit the slots to probe by probe_mask option. For example, probe_mask=1 means to probe only the first slot, and probe_mask=4 means only the third slot. @@ -2267,6 +2274,10 @@ case above again, the first two slots are already reserved. If any other driver (e.g. snd-usb-audio) is loaded before snd-interwave or snd-ens1371, it will be assigned to the third or later slot. +When a module name is given with '!', the slot will be given for any +modules but that name. For example, "slots=!snd-pcsp" will reserve +the first slot for any modules but snd-pcsp. + ALSA PCM devices to OSS devices mapping ======================================= diff --git a/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl index b03df4d4795c..e13c4e67029f 100644 --- a/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl +++ b/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl @@ -6127,8 +6127,8 @@ struct _snd_pcm_runtime { snd_printdd() is compiled in only when - CONFIG_SND_DEBUG_DETECT is set. Please note - that DEBUG_DETECT is not set as default + CONFIG_SND_DEBUG_VERBOSE is set. Please note + that CONFIG_SND_DEBUG_VERBOSE is not set as default even if you configure the alsa-driver with option. You need to give explicitly option instead. diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6476125363e0..56a2f678019e 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3082,8 +3082,8 @@ L: linux-scsi@vger.kernel.org S: Maintained OPROFILE -P: Philippe Elie -M: phil.el@wanadoo.fr +P: Robert Richter +M: robert.richter@amd.com L: oprofile-list@lists.sf.net S: Maintained diff --git a/trunk/Makefile b/trunk/Makefile index 6315424a00b9..e3c5eb66ec52 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 26 -EXTRAVERSION = -rc9 +EXTRAVERSION = NAME = Rotary Wombat # *DOCUMENTATION* diff --git a/trunk/arch/avr32/Kconfig b/trunk/arch/avr32/Kconfig index 09ad7995080c..45d63c986015 100644 --- a/trunk/arch/avr32/Kconfig +++ b/trunk/arch/avr32/Kconfig @@ -88,6 +88,7 @@ config PLATFORM_AT32AP select MMU select PERFORMANCE_COUNTERS select HAVE_GPIO_LIB + select GENERIC_ALLOCATOR # # CPU types @@ -147,6 +148,9 @@ config PHYS_OFFSET source "kernel/Kconfig.preempt" +config QUICKLIST + def_bool y + config HAVE_ARCH_BOOTMEM_NODE def_bool n @@ -201,6 +205,11 @@ endmenu menu "Power management options" +source "kernel/power/Kconfig" + +config ARCH_SUSPEND_POSSIBLE + def_bool y + menu "CPU Frequency scaling" source "drivers/cpufreq/Kconfig" diff --git a/trunk/arch/avr32/boards/atngw100/setup.c b/trunk/arch/avr32/boards/atngw100/setup.c index a398be284966..a51bb9fb3c89 100644 --- a/trunk/arch/avr32/boards/atngw100/setup.c +++ b/trunk/arch/avr32/boards/atngw100/setup.c @@ -9,6 +9,8 @@ */ #include #include +#include +#include #include #include #include @@ -25,6 +27,13 @@ #include #include +/* Oscillator frequencies. These are board-specific */ +unsigned long at32_board_osc_rates[3] = { + [0] = 32768, /* 32.768 kHz on RTC osc */ + [1] = 20000000, /* 20 MHz on osc0 */ + [2] = 12000000, /* 12 MHz on osc1 */ +}; + /* Initialized by bootloader-specific startup code. */ struct tag *bootloader_tags __initdata; @@ -140,6 +149,10 @@ static struct platform_device i2c_gpio_device = { }, }; +static struct i2c_board_info __initdata i2c_info[] = { + /* NOTE: original ATtiny24 firmware is at address 0x0b */ +}; + static int __init atngw100_init(void) { unsigned i; @@ -165,12 +178,28 @@ static int __init atngw100_init(void) } platform_device_register(&ngw_gpio_leds); + /* all these i2c/smbus pins should have external pullups for + * open-drain sharing among all I2C devices. SDA and SCL do; + * PB28/EXTINT3 doesn't; it should be SMBALERT# (for PMBus), + * but it's not available off-board. + */ + at32_select_periph(GPIO_PIN_PB(28), 0, AT32_GPIOF_PULLUP); at32_select_gpio(i2c_gpio_data.sda_pin, AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH); at32_select_gpio(i2c_gpio_data.scl_pin, AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH); platform_device_register(&i2c_gpio_device); + i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info)); return 0; } postcore_initcall(atngw100_init); + +static int __init atngw100_arch_init(void) +{ + /* set_irq_type() after the arch_initcall for EIC has run, and + * before the I2C subsystem could try using this IRQ. + */ + return set_irq_type(AT32_EXTINT(3), IRQ_TYPE_EDGE_FALLING); +} +arch_initcall(atngw100_arch_init); diff --git a/trunk/arch/avr32/boards/atstk1000/atstk1002.c b/trunk/arch/avr32/boards/atstk1000/atstk1002.c index 000eb4220a12..86b363c1c25b 100644 --- a/trunk/arch/avr32/boards/atstk1000/atstk1002.c +++ b/trunk/arch/avr32/boards/atstk1000/atstk1002.c @@ -28,6 +28,12 @@ #include "atstk1000.h" +/* Oscillator frequencies. These are board specific */ +unsigned long at32_board_osc_rates[3] = { + [0] = 32768, /* 32.768 kHz on RTC osc */ + [1] = 20000000, /* 20 MHz on osc0 */ + [2] = 12000000, /* 12 MHz on osc1 */ +}; struct eth_addr { u8 addr[6]; @@ -232,7 +238,7 @@ static int __init atstk1002_init(void) set_hw_addr(at32_add_device_eth(1, ð_data[1])); #else at32_add_device_lcdc(0, &atstk1000_lcdc_data, - fbmem_start, fbmem_size); + fbmem_start, fbmem_size, 0); #endif at32_add_device_usba(0, NULL); #ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM diff --git a/trunk/arch/avr32/boards/atstk1000/atstk1003.c b/trunk/arch/avr32/boards/atstk1000/atstk1003.c index a0b223df35a2..ea109f435a83 100644 --- a/trunk/arch/avr32/boards/atstk1000/atstk1003.c +++ b/trunk/arch/avr32/boards/atstk1000/atstk1003.c @@ -27,6 +27,13 @@ #include "atstk1000.h" +/* Oscillator frequencies. These are board specific */ +unsigned long at32_board_osc_rates[3] = { + [0] = 32768, /* 32.768 kHz on RTC osc */ + [1] = 20000000, /* 20 MHz on osc0 */ + [2] = 12000000, /* 12 MHz on osc1 */ +}; + #ifdef CONFIG_BOARD_ATSTK1000_EXTDAC static struct at73c213_board_info at73c213_data = { .ssc_id = 0, diff --git a/trunk/arch/avr32/boards/atstk1000/atstk1004.c b/trunk/arch/avr32/boards/atstk1000/atstk1004.c index e765a8652b3e..c7236df74d74 100644 --- a/trunk/arch/avr32/boards/atstk1000/atstk1004.c +++ b/trunk/arch/avr32/boards/atstk1000/atstk1004.c @@ -29,6 +29,13 @@ #include "atstk1000.h" +/* Oscillator frequencies. These are board specific */ +unsigned long at32_board_osc_rates[3] = { + [0] = 32768, /* 32.768 kHz on RTC osc */ + [1] = 20000000, /* 20 MHz on osc0 */ + [2] = 12000000, /* 12 MHz on osc1 */ +}; + #ifdef CONFIG_BOARD_ATSTK1000_EXTDAC static struct at73c213_board_info at73c213_data = { .ssc_id = 0, @@ -133,7 +140,7 @@ static int __init atstk1004_init(void) at32_add_device_mci(0); #endif at32_add_device_lcdc(0, &atstk1000_lcdc_data, - fbmem_start, fbmem_size); + fbmem_start, fbmem_size, 0); at32_add_device_usba(0, NULL); #ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM at32_add_device_ssc(0, ATMEL_SSC_TX); diff --git a/trunk/arch/avr32/kernel/entry-avr32b.S b/trunk/arch/avr32/kernel/entry-avr32b.S index 5f31702d6b1c..2b398cae110c 100644 --- a/trunk/arch/avr32/kernel/entry-avr32b.S +++ b/trunk/arch/avr32/kernel/entry-avr32b.S @@ -74,50 +74,41 @@ exception_vectors: .align 2 bral do_dtlb_modified - /* - * r0 : PGD/PT/PTE - * r1 : Offending address - * r2 : Scratch register - * r3 : Cause (5, 12 or 13) - */ #define tlbmiss_save pushm r0-r3 #define tlbmiss_restore popm r0-r3 - .section .tlbx.ex.text,"ax",@progbits + .org 0x50 .global itlb_miss itlb_miss: tlbmiss_save rjmp tlb_miss_common - .section .tlbr.ex.text,"ax",@progbits + .org 0x60 dtlb_miss_read: tlbmiss_save rjmp tlb_miss_common - .section .tlbw.ex.text,"ax",@progbits + .org 0x70 dtlb_miss_write: tlbmiss_save .global tlb_miss_common + .align 2 tlb_miss_common: mfsr r0, SYSREG_TLBEAR mfsr r1, SYSREG_PTBR - /* Is it the vmalloc space? */ - bld r0, 31 - brcs handle_vmalloc_miss - - /* First level lookup */ + /* + * First level lookup: The PGD contains virtual pointers to + * the second-level page tables, but they may be NULL if not + * present. + */ pgtbl_lookup: lsr r2, r0, PGDIR_SHIFT ld.w r3, r1[r2 << 2] bfextu r1, r0, PAGE_SHIFT, PGDIR_SHIFT - PAGE_SHIFT - bld r3, _PAGE_BIT_PRESENT - brcc page_table_not_present - - /* Translate to virtual address in P1. */ - andl r3, 0xf000 - sbr r3, 31 + cp.w r3, 0 + breq page_table_not_present /* Second level lookup */ ld.w r2, r3[r1 << 2] @@ -148,16 +139,55 @@ pgtbl_lookup: tlbmiss_restore rete -handle_vmalloc_miss: - /* Simply do the lookup in init's page table */ + /* The slow path of the TLB miss handler */ + .align 2 +page_table_not_present: + /* Do we need to synchronize with swapper_pg_dir? */ + bld r0, 31 + brcs sync_with_swapper_pg_dir + +page_not_present: + tlbmiss_restore + sub sp, 4 + stmts --sp, r0-lr + rcall save_full_context_ex + mfsr r12, SYSREG_ECR + mov r11, sp + rcall do_page_fault + rjmp ret_from_exception + + .align 2 +sync_with_swapper_pg_dir: + /* + * If swapper_pg_dir contains a non-NULL second-level page + * table pointer, copy it into the current PGD. If not, we + * must handle it as a full-blown page fault. + * + * Jumping back to pgtbl_lookup causes an unnecessary lookup, + * but it is guaranteed to be a cache hit, it won't happen + * very often, and we absolutely do not want to sacrifice any + * performance in the fast path in order to improve this. + */ mov r1, lo(swapper_pg_dir) orh r1, hi(swapper_pg_dir) + ld.w r3, r1[r2 << 2] + cp.w r3, 0 + breq page_not_present + mfsr r1, SYSREG_PTBR + st.w r1[r2 << 2], r3 rjmp pgtbl_lookup + /* + * We currently have two bytes left at this point until we + * crash into the system call handler... + * + * Don't worry, the assembler will let us know. + */ + /* --- System Call --- */ - .section .scall.text,"ax",@progbits + .org 0x100 system_call: #ifdef CONFIG_PREEMPT mask_interrupts @@ -266,18 +296,6 @@ syscall_exit_work: brcc syscall_exit_cont rjmp enter_monitor_mode - /* The slow path of the TLB miss handler */ -page_table_not_present: -page_not_present: - tlbmiss_restore - sub sp, 4 - stmts --sp, r0-lr - rcall save_full_context_ex - mfsr r12, SYSREG_ECR - mov r11, sp - rcall do_page_fault - rjmp ret_from_exception - /* This function expects to find offending PC in SYSREG_RAR_EX */ .type save_full_context_ex, @function .align 2 diff --git a/trunk/arch/avr32/kernel/signal.c b/trunk/arch/avr32/kernel/signal.c index 5616a00c10ba..c5b11f9067f1 100644 --- a/trunk/arch/avr32/kernel/signal.c +++ b/trunk/arch/avr32/kernel/signal.c @@ -93,6 +93,9 @@ asmlinkage int sys_rt_sigreturn(struct pt_regs *regs) if (restore_sigcontext(regs, &frame->uc.uc_mcontext)) goto badframe; + if (do_sigaltstack(&frame->uc.uc_stack, NULL, regs->sp) == -EFAULT) + goto badframe; + pr_debug("Context restored: pc = %08lx, lr = %08lx, sp = %08lx\n", regs->pc, regs->lr, regs->sp); diff --git a/trunk/arch/avr32/kernel/time.c b/trunk/arch/avr32/kernel/time.c index 00a9862380ff..abd954fb7ba0 100644 --- a/trunk/arch/avr32/kernel/time.c +++ b/trunk/arch/avr32/kernel/time.c @@ -7,21 +7,13 @@ */ #include #include -#include -#include +#include #include #include -#include -#include -#include -#include -#include -#include +#include +#include -#include #include -#include -#include #include diff --git a/trunk/arch/avr32/kernel/vmlinux.lds.S b/trunk/arch/avr32/kernel/vmlinux.lds.S index 481cfd40c053..5d25d8eeb750 100644 --- a/trunk/arch/avr32/kernel/vmlinux.lds.S +++ b/trunk/arch/avr32/kernel/vmlinux.lds.S @@ -68,14 +68,6 @@ SECTIONS _evba = .; _text = .; *(.ex.text) - . = 0x50; - *(.tlbx.ex.text) - . = 0x60; - *(.tlbr.ex.text) - . = 0x70; - *(.tlbw.ex.text) - . = 0x100; - *(.scall.text) *(.irq.text) KPROBES_TEXT TEXT_TEXT @@ -107,6 +99,10 @@ SECTIONS */ *(.data.init_task) + /* Then, the page-aligned data */ + . = ALIGN(PAGE_SIZE); + *(.data.page_aligned) + /* Then, the cacheline aligned data */ . = ALIGN(L1_CACHE_BYTES); *(.data.cacheline_aligned) diff --git a/trunk/arch/avr32/lib/io-readsb.S b/trunk/arch/avr32/lib/io-readsb.S index 2be5da7ed26b..cb2d86945559 100644 --- a/trunk/arch/avr32/lib/io-readsb.S +++ b/trunk/arch/avr32/lib/io-readsb.S @@ -41,7 +41,7 @@ __raw_readsb: 2: sub r10, -4 reteq r12 -3: ld.uh r8, r12[0] +3: ld.ub r8, r12[0] sub r10, 1 st.b r11++, r8 brne 3b diff --git a/trunk/arch/avr32/mach-at32ap/Makefile b/trunk/arch/avr32/mach-at32ap/Makefile index e89009439e4a..d5018e2eed25 100644 --- a/trunk/arch/avr32/mach-at32ap/Makefile +++ b/trunk/arch/avr32/mach-at32ap/Makefile @@ -1,3 +1,8 @@ -obj-y += at32ap.o clock.o intc.o extint.o pio.o hsmc.o +obj-y += pdc.o clock.o intc.o extint.o pio.o hsmc.o obj-$(CONFIG_CPU_AT32AP700X) += at32ap700x.o pm-at32ap700x.o obj-$(CONFIG_CPU_FREQ_AT32AP) += cpufreq.o +obj-$(CONFIG_PM) += pm.o + +ifeq ($(CONFIG_PM_DEBUG),y) +CFLAGS_pm.o += -DDEBUG +endif diff --git a/trunk/arch/avr32/mach-at32ap/at32ap700x.c b/trunk/arch/avr32/mach-at32ap/at32ap700x.c index 0f24b4f85c17..07b21b121eef 100644 --- a/trunk/arch/avr32/mach-at32ap/at32ap700x.c +++ b/trunk/arch/avr32/mach-at32ap/at32ap700x.c @@ -20,6 +20,7 @@ #include #include #include +#include #include