From 66fd1e14332f1b661707df87ca0103d39272f42a Mon Sep 17 00:00:00 2001 From: Jonathan Corbet Date: Thu, 15 May 2008 09:09:23 -0600 Subject: [PATCH] --- yaml --- r: 100263 b: refs/heads/master c: 75bd2ef1457998791cfc89cd59927574488fc22a h: refs/heads/master i: 100261: f163d2adcb5ba5c305ef7c60984a4fbef254f74d 100259: 756cae7e4e72465830d086e84cac0e92fca59679 100255: a70c45d3c9336532e324d8a619f6b66bfa06cdd0 v: v3 --- [refs] | 2 +- trunk/.gitignore | 13 +- trunk/CREDITS | 5 +- trunk/Documentation/ABI/testing/sysfs-block | 34 - trunk/Documentation/ABI/testing/sysfs-bus-css | 35 - .../Documentation/ABI/testing/sysfs-class-bdi | 4 - .../ABI/testing/sysfs-firmware-memmap | 71 - .../Documentation/DocBook/kernel-locking.tmpl | 25 - trunk/Documentation/DocBook/kgdb.tmpl | 20 +- trunk/Documentation/HOWTO | 2 +- trunk/Documentation/SubmittingPatches | 46 - .../accounting/taskstats-struct.txt | 6 - trunk/Documentation/auxdisplay/cfag12864b | 4 +- .../auxdisplay/cfag12864b-example.c | 2 +- trunk/Documentation/auxdisplay/ks0108 | 4 +- trunk/Documentation/block/data-integrity.txt | 327 --- trunk/Documentation/cciss.txt | 5 - trunk/Documentation/cgroups.txt | 4 - trunk/Documentation/controllers/devices.txt | 8 +- trunk/Documentation/cpu-freq/governors.txt | 8 + trunk/Documentation/cpusets.txt | 20 +- .../feature-removal-schedule.txt | 9 - trunk/Documentation/filesystems/ext4.txt | 12 +- trunk/Documentation/filesystems/sysfs-pci.txt | 1 - trunk/Documentation/ftrace.txt | 1361 ------------ trunk/Documentation/hwmon/ibmaem | 37 - trunk/Documentation/hwmon/sysfs-interface | 33 +- trunk/Documentation/i2c/writing-clients | 18 +- .../Documentation/{x86 => }/i386/IO-APIC.txt | 0 trunk/Documentation/{x86 => }/i386/boot.txt | 79 +- .../{x86 => }/i386/usb-legacy-support.txt | 0 .../{x86 => }/i386/zero-page.txt | 0 trunk/Documentation/ioctl-number.txt | 1 - trunk/Documentation/kdump/kdump.txt | 2 +- trunk/Documentation/kernel-doc-nano-HOWTO.txt | 99 - trunk/Documentation/kernel-docs.txt | 8 +- trunk/Documentation/kernel-parameters.txt | 45 +- trunk/Documentation/kobject.txt | 2 +- trunk/Documentation/laptops/thinkpad-acpi.txt | 2 +- trunk/Documentation/lguest/lguest.c | 12 +- trunk/Documentation/networking/arcnet.txt | 2 +- trunk/Documentation/networking/bridge.txt | 2 +- trunk/Documentation/networking/ip-sysctl.txt | 268 +-- trunk/Documentation/networking/s2io.txt | 6 +- trunk/Documentation/nmi_watchdog.txt | 16 +- .../Documentation/scheduler/sched-domains.txt | 7 +- .../scheduler/sched-rt-group.txt | 4 +- .../sound/alsa/ALSA-Configuration.txt | 17 +- .../alsa/DocBook/writing-an-alsa-driver.tmpl | 4 +- .../Documentation/video4linux/CARDLIST.au0828 | 2 +- trunk/Documentation/video4linux/CARDLIST.cx88 | 2 +- trunk/Documentation/video4linux/cx18.txt | 4 +- trunk/Documentation/vm/pagemap.txt | 77 - trunk/Documentation/vm/slabinfo.c | 4 +- trunk/Documentation/vm/slub.txt | 2 +- trunk/Documentation/{x86 => }/x86_64/00-INDEX | 0 .../{x86 => }/x86_64/boot-options.txt | 0 .../{x86 => }/x86_64/cpu-hotplug-spec | 0 .../{x86 => }/x86_64/fake-numa-for-cpusets | 0 .../{x86 => }/x86_64/kernel-stacks | 0 .../{x86 => }/x86_64/machinecheck | 0 trunk/Documentation/{x86 => }/x86_64/mm.txt | 5 +- trunk/Documentation/{x86 => }/x86_64/uefi.txt | 4 - trunk/Kbuild | 3 +- trunk/MAINTAINERS | 302 ++- trunk/Makefile | 7 +- trunk/arch/alpha/Makefile | 1 - trunk/arch/alpha/kernel/core_t2.c | 2 - trunk/arch/alpha/kernel/init_task.c | 1 + trunk/arch/alpha/kernel/pci.c | 17 - trunk/arch/alpha/kernel/traps.c | 3 +- trunk/arch/alpha/kernel/vmlinux.lds.S | 14 +- trunk/arch/arm/boot/compressed/head-xscale.S | 4 + trunk/arch/arm/common/dmabounce.c | 3 +- trunk/arch/arm/kernel/init_task.c | 1 + trunk/arch/arm/mach-at91/at91x40.c | 18 +- trunk/arch/arm/mach-integrator/impd1.c | 3 +- trunk/arch/arm/mach-integrator/pci_v3.c | 2 +- trunk/arch/arm/mach-omap1/board-palmte.c | 10 + trunk/arch/arm/mach-omap2/gpmc.c | 2 +- trunk/arch/arm/mach-pxa/cm-x270.c | 2 +- trunk/arch/arm/mach-pxa/em-x270.c | 2 +- trunk/arch/arm/mach-pxa/spitz.c | 1 + trunk/arch/arm/mach-pxa/ssp.c | 2 +- trunk/arch/arm/mach-pxa/tosa.c | 4 +- trunk/arch/arm/mach-realview/platsmp.c | 2 - trunk/arch/arm/mach-s3c2410/mach-bast.c | 2 +- trunk/arch/arm/mach-s3c2410/mach-vr1000.c | 4 +- trunk/arch/arm/mach-sa1100/collie.c | 42 +- trunk/arch/arm/plat-omap/clock.c | 1 - trunk/arch/arm/plat-omap/dma.c | 2 + trunk/arch/arm/plat-s3c24xx/s3c244x.c | 1 - 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/configs/atngw100_defconfig | 336 ++- trunk/arch/avr32/configs/atstk1002_defconfig | 241 +- trunk/arch/avr32/configs/atstk1003_defconfig | 158 +- trunk/arch/avr32/configs/atstk1004_defconfig | 110 +- trunk/arch/avr32/kernel/avr32_ksyms.c | 4 - trunk/arch/avr32/kernel/entry-avr32b.S | 88 +- trunk/arch/avr32/kernel/init_task.c | 1 + 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 +- .../avr32/mach-at32ap/{pdc.c => at32ap.c} | 8 + trunk/arch/avr32/mach-at32ap/at32ap700x.c | 252 +-- trunk/arch/avr32/mach-at32ap/cpufreq.c | 3 +- trunk/arch/avr32/mach-at32ap/intc.c | 80 +- 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/blackfin/Kconfig | 12 +- .../blackfin/configs/BF527-EZKIT_defconfig | 348 ++- .../blackfin/configs/BF548-EZKIT_defconfig | 416 ++-- trunk/arch/blackfin/configs/IP0X_defconfig | 2 +- trunk/arch/blackfin/kernel/bfin_dma_5xx.c | 11 - trunk/arch/blackfin/kernel/bfin_gpio.c | 19 - trunk/arch/blackfin/kernel/bfin_ksyms.c | 2 - .../blackfin/kernel/cplb-nompu/cplbinit.c | 6 +- trunk/arch/blackfin/kernel/gptimers.c | 2 +- trunk/arch/blackfin/kernel/init_task.c | 1 + trunk/arch/blackfin/kernel/irqchip.c | 5 - trunk/arch/blackfin/kernel/traps.c | 24 +- trunk/arch/blackfin/lib/checksum.c | 21 +- trunk/arch/blackfin/lib/ins.S | 21 +- trunk/arch/blackfin/lib/outs.S | 16 +- trunk/arch/blackfin/mach-bf527/boards/ezkit.c | 13 +- trunk/arch/blackfin/mach-bf533/boards/ezkit.c | 6 +- trunk/arch/blackfin/mach-bf533/boards/stamp.c | 34 +- .../arch/blackfin/mach-bf537/boards/Makefile | 2 +- trunk/arch/blackfin/mach-bf537/boards/led.S | 183 ++ trunk/arch/blackfin/mach-bf537/boards/stamp.c | 9 +- .../arch/blackfin/mach-bf548/boards/Makefile | 2 +- .../blackfin/mach-bf548/boards/cm_bf548.c | 2 +- trunk/arch/blackfin/mach-bf548/boards/ezkit.c | 10 +- trunk/arch/blackfin/mach-bf548/boards/led.S | 172 ++ trunk/arch/blackfin/mach-bf561/boards/ezkit.c | 9 +- trunk/arch/cris/kernel/process.c | 1 + trunk/arch/frv/kernel/cmode.S | 2 +- trunk/arch/frv/kernel/init_task.c | 1 + trunk/arch/frv/kernel/sleep.S | 2 +- trunk/arch/frv/mb93090-mb00/pci-dma-nommu.c | 2 +- trunk/arch/frv/mm/init.c | 3 - trunk/arch/h8300/kernel/init_task.c | 1 + trunk/arch/ia64/Makefile | 1 - trunk/arch/ia64/kernel/acpi.c | 9 +- trunk/arch/ia64/kernel/init_task.c | 1 + trunk/arch/ia64/kernel/iosapic.c | 2 + trunk/arch/ia64/kernel/ivt.S | 84 +- trunk/arch/ia64/kernel/minstate.h | 46 +- trunk/arch/ia64/kernel/patch.c | 23 - trunk/arch/ia64/kernel/perfmon.c | 10 +- trunk/arch/ia64/kernel/sal.c | 7 +- trunk/arch/ia64/kernel/setup.c | 17 +- trunk/arch/ia64/kernel/time.c | 1 - trunk/arch/ia64/kernel/vmlinux.lds.S | 7 - trunk/arch/ia64/kvm/Makefile | 3 +- trunk/arch/ia64/kvm/memcpy.S | 1 - trunk/arch/ia64/kvm/memset.S | 1 - trunk/arch/ia64/kvm/mmio.c | 3 +- trunk/arch/ia64/sn/kernel/sn2/sn2_smp.c | 2 - trunk/arch/ia64/uv/kernel/setup.c | 12 - trunk/arch/m32r/kernel/init_task.c | 1 + trunk/arch/m68k/configs/amiga_defconfig | 6 +- trunk/arch/m68k/configs/apollo_defconfig | 6 +- trunk/arch/m68k/configs/atari_defconfig | 6 +- trunk/arch/m68k/configs/bvme6000_defconfig | 6 +- trunk/arch/m68k/configs/hp300_defconfig | 6 +- trunk/arch/m68k/configs/mac_defconfig | 6 +- trunk/arch/m68k/configs/multi_defconfig | 6 +- trunk/arch/m68k/configs/mvme147_defconfig | 6 +- trunk/arch/m68k/configs/mvme16x_defconfig | 6 +- trunk/arch/m68k/configs/q40_defconfig | 6 +- trunk/arch/m68k/configs/sun3_defconfig | 6 +- trunk/arch/m68k/configs/sun3x_defconfig | 6 +- trunk/arch/m68k/kernel/process.c | 1 + trunk/arch/m68k/lib/string.c | 6 - trunk/arch/m68knommu/kernel/init_task.c | 1 + .../arch/m68knommu/platform/coldfire/timers.c | 8 +- trunk/arch/mips/Kconfig | 2 +- trunk/arch/mips/Makefile | 18 +- trunk/arch/mips/au1000/common/clocks.c | 1 - trunk/arch/mips/au1000/common/dbdma.c | 11 - trunk/arch/mips/au1000/common/platform.c | 4 +- .../arch/mips/configs/sb1250-swarm_defconfig | 676 +++--- trunk/arch/mips/configs/tb0219_defconfig | 192 +- trunk/arch/mips/configs/tb0226_defconfig | 192 +- trunk/arch/mips/configs/tb0287_defconfig | 207 +- trunk/arch/mips/fw/arc/identify.c | 5 - trunk/arch/mips/kernel/Makefile | 1 + trunk/arch/mips/kernel/cevt-txx9.c | 3 - trunk/arch/mips/kernel/init_task.c | 1 + trunk/arch/mips/kernel/smp.c | 2 - trunk/arch/mips/kernel/traps.c | 16 +- trunk/arch/mips/lasat/interrupt.c | 2 - trunk/arch/mips/lasat/lasat_board.c | 13 +- trunk/arch/mips/lasat/sysctl.c | 172 +- trunk/arch/mips/lasat/sysctl.h | 24 + trunk/arch/mips/mips-boards/generic/amon.c | 4 +- trunk/arch/mips/mips-boards/generic/time.c | 19 + trunk/arch/mips/mips-boards/malta/Makefile | 3 +- trunk/arch/mips/mm/c-r3k.c | 6 +- trunk/arch/mips/mm/c-r4k.c | 33 +- trunk/arch/mips/mm/init.c | 1 - trunk/arch/mips/mm/page.c | 71 +- trunk/arch/mips/mm/sc-rm7k.c | 4 +- trunk/arch/mips/mm/tlbex.c | 3 +- trunk/arch/mips/nxp/pnx8550/jbs/board_setup.c | 11 +- .../mips/nxp/pnx8550/stb810/board_setup.c | 10 +- trunk/arch/mips/pci/ops-bridge.c | 20 +- trunk/arch/mips/pci/pci-ip27.c | 8 - trunk/arch/mips/pci/pci-sb1250.c | 8 +- trunk/arch/mips/pci/pci-vr41xx.c | 14 +- trunk/arch/mips/sgi-ip27/ip27-init.c | 22 + trunk/arch/mips/sgi-ip27/ip27-memory.c | 117 +- trunk/arch/mips/sgi-ip27/ip27-smp.c | 5 +- trunk/arch/mips/sgi-ip27/ip27-timer.c | 27 +- trunk/arch/mips/sgi-ip32/ip32-irq.c | 5 - trunk/arch/mips/sibyte/swarm/Makefile | 4 +- trunk/arch/mn10300/kernel/init_task.c | 1 + trunk/arch/mn10300/kernel/mn10300_ksyms.c | 5 - trunk/arch/mn10300/kernel/process.c | 2 +- trunk/arch/mn10300/kernel/setup.c | 1 + trunk/arch/mn10300/lib/Makefile | 2 +- trunk/arch/mn10300/lib/__ucmpdi2.S | 43 - trunk/arch/parisc/hpux/gate.S | 3 +- trunk/arch/parisc/hpux/wrappers.S | 3 +- trunk/arch/parisc/kernel/entry.S | 3 +- trunk/arch/parisc/kernel/head.S | 1 - trunk/arch/parisc/kernel/hpmc.S | 3 +- trunk/arch/parisc/kernel/init_task.c | 1 + trunk/arch/parisc/kernel/pacache.S | 3 +- trunk/arch/parisc/kernel/parisc_ksyms.c | 3 - trunk/arch/parisc/kernel/perf_asm.S | 2 +- trunk/arch/parisc/kernel/real2.S | 13 +- trunk/arch/parisc/kernel/signal32.c | 4 +- trunk/arch/parisc/kernel/syscall.S | 5 +- trunk/arch/parisc/kernel/vmlinux.lds.S | 1 - trunk/arch/parisc/lib/fixup.S | 3 +- trunk/arch/parisc/lib/lusercopy.S | 5 +- trunk/arch/parisc/mm/init.c | 1 - trunk/arch/powerpc/Makefile | 4 +- trunk/arch/powerpc/boot/.gitignore | 8 +- trunk/arch/powerpc/boot/4xx.c | 21 - trunk/arch/powerpc/boot/Makefile | 15 +- trunk/arch/powerpc/boot/crtsavres.S | 233 -- trunk/arch/powerpc/boot/dts/mpc8377_mds.dts | 18 +- trunk/arch/powerpc/boot/dts/mpc8377_rdb.dts | 8 +- trunk/arch/powerpc/boot/dts/mpc8378_rdb.dts | 8 +- trunk/arch/powerpc/boot/dts/mpc8379_rdb.dts | 8 +- trunk/arch/powerpc/boot/dts/mpc8548cds.dts | 4 +- trunk/arch/powerpc/boot/dts/mpc8610_hpcd.dts | 10 +- .../configs/83xx/mpc8313_rdb_defconfig | 155 +- .../configs/83xx/mpc8315_rdb_defconfig | 162 +- .../configs/83xx/mpc832x_mds_defconfig | 146 +- .../configs/83xx/mpc832x_rdb_defconfig | 150 +- .../configs/83xx/mpc834x_itx_defconfig | 157 +- .../configs/83xx/mpc834x_itxgp_defconfig | 150 +- .../configs/83xx/mpc834x_mds_defconfig | 146 +- .../configs/83xx/mpc836x_mds_defconfig | 146 +- .../configs/83xx/mpc837x_mds_defconfig | 146 +- .../configs/83xx/mpc837x_rdb_defconfig | 224 +- .../powerpc/configs/83xx/sbc834x_defconfig | 140 +- .../powerpc/configs/85xx/ksi8560_defconfig | 168 +- .../configs/85xx/mpc8540_ads_defconfig | 133 +- .../powerpc/configs/85xx/mpc8544_ds_defconfig | 210 +- .../configs/85xx/mpc8560_ads_defconfig | 135 +- .../powerpc/configs/85xx/mpc8568mds_defconfig | 150 +- .../powerpc/configs/85xx/mpc8572_ds_defconfig | 210 +- .../configs/85xx/mpc85xx_cds_defconfig | 137 +- .../powerpc/configs/85xx/sbc8548_defconfig | 131 +- .../powerpc/configs/85xx/sbc8560_defconfig | 135 +- .../powerpc/configs/85xx/stx_gp3_defconfig | 152 +- .../powerpc/configs/85xx/tqm8540_defconfig | 147 +- .../powerpc/configs/85xx/tqm8541_defconfig | 146 +- .../powerpc/configs/85xx/tqm8555_defconfig | 146 +- .../powerpc/configs/85xx/tqm8560_defconfig | 146 +- trunk/arch/powerpc/configs/adder875_defconfig | 52 +- trunk/arch/powerpc/configs/chrp32_defconfig | 164 +- trunk/arch/powerpc/configs/ep8248e_defconfig | 124 +- trunk/arch/powerpc/configs/ep88xc_defconfig | 47 +- trunk/arch/powerpc/configs/g5_defconfig | 178 +- trunk/arch/powerpc/configs/iseries_defconfig | 146 +- .../powerpc/configs/linkstation_defconfig | 172 +- .../powerpc/configs/mpc7448_hpc2_defconfig | 136 +- .../powerpc/configs/mpc8272_ads_defconfig | 126 +- trunk/arch/powerpc/configs/mpc83xx_defconfig | 151 +- trunk/arch/powerpc/configs/mpc85xx_defconfig | 230 +- .../powerpc/configs/mpc8610_hpcd_defconfig | 316 ++- .../powerpc/configs/mpc8641_hpcn_defconfig | 210 +- .../arch/powerpc/configs/mpc866_ads_defconfig | 128 +- .../arch/powerpc/configs/mpc885_ads_defconfig | 47 +- trunk/arch/powerpc/configs/pasemi_defconfig | 172 +- trunk/arch/powerpc/configs/pmac32_defconfig | 174 +- trunk/arch/powerpc/configs/ppc64_defconfig | 198 +- trunk/arch/powerpc/configs/pq2fads_defconfig | 133 +- .../arch/powerpc/configs/prpmc2800_defconfig | 153 +- trunk/arch/powerpc/configs/pseries_defconfig | 224 +- trunk/arch/powerpc/configs/sbc8641d_defconfig | 150 +- .../arch/powerpc/configs/storcenter_defconfig | 71 +- trunk/arch/powerpc/kernel/head_44x.S | 7 +- trunk/arch/powerpc/kernel/init_task.c | 1 + trunk/arch/powerpc/kernel/irq.c | 2 +- trunk/arch/powerpc/kernel/legacy_serial.c | 10 +- trunk/arch/powerpc/kernel/of_platform.c | 2 - trunk/arch/powerpc/kernel/pci_64.c | 2 +- trunk/arch/powerpc/kernel/ppc_ksyms.c | 2 + trunk/arch/powerpc/kernel/prom_init_check.sh | 16 +- trunk/arch/powerpc/kernel/signal_64.c | 4 +- trunk/arch/powerpc/kernel/vdso.c | 2 +- trunk/arch/powerpc/kvm/44x_tlb.c | 9 +- trunk/arch/powerpc/kvm/booke_guest.c | 33 + trunk/arch/powerpc/kvm/emulate.c | 12 - trunk/arch/powerpc/lib/Makefile | 2 +- trunk/arch/powerpc/lib/crtsavres.S | 229 -- trunk/arch/powerpc/mm/hash_low_32.S | 2 + trunk/arch/powerpc/mm/hash_low_64.S | 4 - trunk/arch/powerpc/mm/mem.c | 3 +- trunk/arch/powerpc/mm/pgtable_32.c | 2 +- .../arch/powerpc/platforms/52xx/lite5200_pm.c | 14 +- .../powerpc/platforms/52xx/mpc52xx_gpio.c | 14 +- trunk/arch/powerpc/platforms/85xx/Kconfig | 1 - .../powerpc/platforms/cell/celleb_scc_pciex.c | 5 +- trunk/arch/powerpc/platforms/cell/spu_base.c | 44 +- trunk/arch/powerpc/platforms/cell/spufs/run.c | 21 +- .../arch/powerpc/platforms/cell/spufs/sched.c | 19 +- trunk/arch/powerpc/platforms/ps3/mm.c | 3 - .../powerpc/platforms/pseries/eeh_driver.c | 11 +- trunk/arch/powerpc/platforms/pseries/nvram.c | 4 +- trunk/arch/powerpc/sysdev/fsl_soc.c | 2 +- trunk/arch/powerpc/sysdev/mpic.c | 20 +- trunk/arch/powerpc/xmon/xmon.c | 1 + trunk/arch/ppc/kernel/ppc_ksyms.c | 2 - trunk/arch/s390/Kconfig | 25 - trunk/arch/s390/appldata/appldata.h | 10 +- trunk/arch/s390/appldata/appldata_base.c | 49 +- 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/crypt_s390.h | 4 - trunk/arch/s390/crypto/prng.c | 5 +- trunk/arch/s390/defconfig | 11 +- 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/dis.c | 2 +- trunk/arch/s390/kernel/early.c | 211 +- trunk/arch/s390/kernel/init_task.c | 1 + 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/smp.c | 4 +- trunk/arch/s390/kernel/time.c | 634 ++---- trunk/arch/s390/kernel/topology.c | 2 + trunk/arch/s390/kernel/vtime.c | 81 +- trunk/arch/s390/kvm/diag.c | 2 +- trunk/arch/s390/kvm/interrupt.c | 7 +- trunk/arch/s390/kvm/kvm-s390.c | 13 +- trunk/arch/s390/mm/init.c | 68 +- trunk/arch/s390/mm/pgtable.c | 44 +- trunk/arch/s390/mm/vmem.c | 20 +- trunk/arch/sh/Kconfig | 1 + trunk/arch/sh/Kconfig.debug | 2 +- trunk/arch/sh/Makefile | 2 - .../arch/sh/boards/renesas/rts7751r2d/setup.c | 39 +- trunk/arch/sh/configs/migor_defconfig | 294 +-- trunk/arch/sh/configs/rsk7203_defconfig | 841 ------- trunk/arch/sh/configs/se7206_defconfig | 475 ++-- trunk/arch/sh/drivers/heartbeat.c | 2 +- trunk/arch/sh/kernel/cpu/irq/intc-sh5.c | 1 - trunk/arch/sh/kernel/cpu/sh4/probe.c | 1 - trunk/arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 2 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 49 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 9 +- trunk/arch/sh/kernel/entry-common.S | 12 +- trunk/arch/sh/kernel/head_32.S | 4 +- trunk/arch/sh/kernel/init_task.c | 1 + trunk/arch/sh/kernel/kgdb_stub.c | 11 +- trunk/arch/sh/kernel/module.c | 39 +- trunk/arch/sh/kernel/setup.c | 11 - trunk/arch/sh/kernel/traps.c | 10 +- trunk/arch/sh/lib/memcpy-sh4.S | 22 +- trunk/arch/sparc/Kconfig | 1 + trunk/arch/sparc/boot/Makefile | 1 + trunk/arch/sparc/boot/btfixupprep.c | 2 +- trunk/arch/sparc/boot/piggyback.c | 2 +- trunk/arch/sparc/kernel/ebus.c | 2 +- trunk/arch/sparc/kernel/etrap.S | 2 +- trunk/arch/sparc/kernel/head.S | 2 +- trunk/arch/sparc/kernel/idprom.c | 2 +- trunk/arch/sparc/kernel/init_task.c | 1 + trunk/arch/sparc/kernel/ioport.c | 2 +- trunk/arch/sparc/kernel/irq.c | 2 +- trunk/arch/sparc/kernel/led.c | 34 +- trunk/arch/sparc/kernel/muldiv.c | 2 +- trunk/arch/sparc/kernel/rtrap.S | 2 +- trunk/arch/sparc/kernel/setup.c | 2 +- trunk/arch/sparc/kernel/sparc_ksyms.c | 2 +- trunk/arch/sparc/kernel/sun4d_irq.c | 2 +- trunk/arch/sparc/kernel/trampoline.S | 2 +- trunk/arch/sparc/kernel/traps.c | 2 +- trunk/arch/sparc/kernel/unaligned.c | 2 +- trunk/arch/sparc/kernel/wof.S | 2 +- trunk/arch/sparc/kernel/wuf.S | 2 +- trunk/arch/sparc/lib/Makefile | 1 + trunk/arch/sparc/lib/ashldi3.S | 2 +- trunk/arch/sparc/lib/ashrdi3.S | 2 +- trunk/arch/sparc/lib/blockops.S | 2 +- trunk/arch/sparc/lib/locks.S | 2 +- trunk/arch/sparc/lib/lshrdi3.S | 1 + trunk/arch/sparc/lib/memscan.S | 2 +- trunk/arch/sparc/lib/mul.S | 2 +- trunk/arch/sparc/lib/rem.S | 2 +- trunk/arch/sparc/lib/rwsem.S | 2 +- trunk/arch/sparc/lib/sdiv.S | 2 +- trunk/arch/sparc/lib/strncmp.S | 2 +- trunk/arch/sparc/lib/udiv.S | 2 +- trunk/arch/sparc/lib/umul.S | 2 +- trunk/arch/sparc/lib/urem.S | 2 +- trunk/arch/sparc/math-emu/ashldi3.S | 2 +- trunk/arch/sparc/mm/Makefile | 1 + trunk/arch/sparc/mm/fault.c | 2 +- trunk/arch/sparc/mm/generic.c | 2 +- trunk/arch/sparc/mm/hypersparc.S | 2 +- trunk/arch/sparc/mm/init.c | 2 +- trunk/arch/sparc/mm/io-unit.c | 2 +- trunk/arch/sparc/mm/loadmmu.c | 2 +- trunk/arch/sparc/mm/nosrmmu.c | 2 +- trunk/arch/sparc/mm/nosun4c.c | 2 +- trunk/arch/sparc/mm/swift.S | 2 +- trunk/arch/sparc/mm/tsunami.S | 2 +- trunk/arch/sparc/mm/viking.S | 2 +- trunk/arch/sparc/prom/Makefile | 1 + trunk/arch/sparc/prom/bootstr.c | 2 +- trunk/arch/sparc/prom/console.c | 2 +- trunk/arch/sparc/prom/devmap.c | 2 +- trunk/arch/sparc/prom/devops.c | 2 +- trunk/arch/sparc/prom/init.c | 2 +- trunk/arch/sparc/prom/misc.c | 2 +- trunk/arch/sparc/prom/mp.c | 2 +- trunk/arch/sparc/prom/palloc.c | 2 +- trunk/arch/sparc/prom/ranges.c | 2 +- trunk/arch/sparc/prom/segment.c | 2 +- trunk/arch/sparc/prom/tree.c | 2 +- trunk/arch/sparc64/Makefile | 1 + trunk/arch/sparc64/boot/Makefile | 1 + trunk/arch/sparc64/boot/piggyback.c | 2 +- trunk/arch/sparc64/kernel/dtlb_prot.S | 2 +- trunk/arch/sparc64/kernel/ebus.c | 2 +- trunk/arch/sparc64/kernel/etrap.S | 2 +- trunk/arch/sparc64/kernel/idprom.c | 2 +- trunk/arch/sparc64/kernel/init_task.c | 1 + trunk/arch/sparc64/kernel/process.c | 153 +- trunk/arch/sparc64/kernel/rtrap.S | 3 +- trunk/arch/sparc64/kernel/sbus.c | 2 +- trunk/arch/sparc64/kernel/setup.c | 2 +- trunk/arch/sparc64/kernel/signal.c | 2 +- trunk/arch/sparc64/kernel/smp.c | 10 - trunk/arch/sparc64/kernel/stacktrace.c | 12 +- trunk/arch/sparc64/kernel/starfire.c | 2 +- trunk/arch/sparc64/kernel/sys32.S | 2 +- trunk/arch/sparc64/kernel/trampoline.S | 2 +- trunk/arch/sparc64/kernel/traps.c | 12 +- trunk/arch/sparc64/kernel/unaligned.c | 2 +- trunk/arch/sparc64/lib/PeeCeeI.c | 2 +- trunk/arch/sparc64/lib/VISsave.S | 2 +- trunk/arch/sparc64/lib/memcmp.S | 2 +- trunk/arch/sparc64/lib/memscan.S | 2 +- trunk/arch/sparc64/lib/strncmp.S | 2 +- trunk/arch/sparc64/lib/strncpy_from_user.S | 2 +- trunk/arch/sparc64/math-emu/math.c | 2 +- trunk/arch/sparc64/math-emu/sfp-util.h | 2 +- trunk/arch/sparc64/mm/Makefile | 1 + trunk/arch/sparc64/mm/fault.c | 2 +- trunk/arch/sparc64/mm/generic.c | 2 +- trunk/arch/sparc64/mm/init.c | 2 +- trunk/arch/sparc64/mm/ultra.S | 31 +- trunk/arch/sparc64/prom/Makefile | 1 + trunk/arch/sparc64/prom/bootstr.c | 2 +- trunk/arch/sparc64/prom/devops.c | 2 +- trunk/arch/sparc64/prom/init.c | 2 +- trunk/arch/sparc64/prom/misc.c | 2 +- trunk/arch/sparc64/prom/p1275.c | 2 +- trunk/arch/sparc64/prom/tree.c | 2 +- trunk/arch/um/Kconfig | 2 - trunk/arch/um/Makefile | 1 + trunk/arch/um/Makefile-i386 | 7 - trunk/arch/um/Makefile-x86_64 | 3 - trunk/arch/um/drivers/pcap_user.c | 2 +- trunk/arch/um/drivers/ubd_kern.c | 1 + trunk/arch/um/include/os.h | 2 +- trunk/arch/um/kernel/init_task.c | 1 + trunk/arch/um/kernel/ksyms.c | 5 - trunk/arch/um/kernel/um_arch.c | 2 +- trunk/arch/um/os-Linux/helper.c | 1 - trunk/arch/um/os-Linux/skas/process.c | 2 +- trunk/arch/um/os-Linux/start_up.c | 25 +- trunk/arch/um/os-Linux/sys-i386/registers.c | 5 +- trunk/arch/um/os-Linux/sys-i386/task_size.c | 31 +- trunk/arch/um/os-Linux/sys-x86_64/task_size.c | 2 +- trunk/arch/um/os-Linux/time.c | 7 - trunk/arch/um/sys-x86_64/ksyms.c | 10 +- trunk/arch/v850/kernel/init_task.c | 1 + trunk/arch/x86/Kconfig | 309 +-- trunk/arch/x86/Kconfig.cpu | 6 +- trunk/arch/x86/Kconfig.debug | 39 +- trunk/arch/x86/Makefile | 27 +- trunk/arch/x86/boot/a20.c | 8 +- trunk/arch/x86/boot/compressed/head_64.S | 5 +- trunk/arch/x86/boot/compressed/misc.c | 59 +- trunk/arch/x86/boot/compressed/relocs.c | 198 +- trunk/arch/x86/boot/cpu.c | 2 - trunk/arch/x86/boot/main.c | 4 - trunk/arch/x86/boot/memory.c | 3 +- trunk/arch/x86/boot/pmjump.S | 4 +- trunk/arch/x86/boot/printf.c | 2 +- trunk/arch/x86/boot/video-vga.c | 3 +- trunk/arch/x86/configs/i386_defconfig | 1711 ++++----------- trunk/arch/x86/configs/x86_64_defconfig | 1735 ++++----------- trunk/arch/x86/ia32/ia32entry.S | 68 +- trunk/arch/x86/kernel/.gitignore | 1 - trunk/arch/x86/kernel/Makefile | 22 +- trunk/arch/x86/kernel/acpi/boot.c | 458 +--- trunk/arch/x86/kernel/acpi/realmode/wakeup.S | 38 +- trunk/arch/x86/kernel/acpi/realmode/wakeup.h | 5 - trunk/arch/x86/kernel/acpi/sleep.c | 20 +- trunk/arch/x86/kernel/amd_iommu.c | 962 -------- trunk/arch/x86/kernel/amd_iommu_init.c | 875 -------- trunk/arch/x86/kernel/aperture_64.c | 313 +-- trunk/arch/x86/kernel/apic_32.c | 123 +- trunk/arch/x86/kernel/apic_64.c | 70 +- trunk/arch/x86/kernel/apm_32.c | 25 +- trunk/arch/x86/kernel/asm-offsets_32.c | 2 +- trunk/arch/x86/kernel/asm-offsets_64.c | 7 +- trunk/arch/x86/kernel/{cpu => }/bugs_64.c | 0 trunk/arch/x86/kernel/cpu/Makefile | 4 - .../x86/kernel/cpu/addon_cpuid_features.c | 17 +- trunk/arch/x86/kernel/cpu/amd.c | 42 + trunk/arch/x86/kernel/cpu/amd_64.c | 222 -- trunk/arch/x86/kernel/cpu/bugs.c | 27 +- trunk/arch/x86/kernel/cpu/centaur_64.c | 35 - trunk/arch/x86/kernel/cpu/common.c | 2 +- trunk/arch/x86/kernel/cpu/common_64.c | 681 ------ trunk/arch/x86/kernel/cpu/cpu.h | 5 - .../x86/kernel/cpu/cpufreq/cpufreq-nforce2.c | 44 +- trunk/arch/x86/kernel/cpu/cpufreq/longrun.c | 2 +- .../arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 15 +- trunk/arch/x86/kernel/cpu/intel.c | 4 - trunk/arch/x86/kernel/cpu/intel_64.c | 95 - trunk/arch/x86/kernel/cpu/intel_cacheinfo.c | 1 - trunk/arch/x86/kernel/cpu/mcheck/k7.c | 36 +- trunk/arch/x86/kernel/cpu/mcheck/mce_64.c | 24 +- trunk/arch/x86/kernel/cpu/mcheck/p4.c | 90 +- trunk/arch/x86/kernel/cpu/mtrr/generic.c | 38 +- trunk/arch/x86/kernel/cpu/mtrr/main.c | 901 +------- trunk/arch/x86/kernel/cpu/mtrr/mtrr.h | 3 - trunk/arch/x86/kernel/cpu/perfctr-watchdog.c | 206 +- trunk/arch/x86/kernel/e820.c | 1390 ------------ trunk/arch/x86/kernel/e820_32.c | 775 +++++++ trunk/arch/x86/kernel/e820_64.c | 952 ++++++++ trunk/arch/x86/kernel/early-quirks.c | 15 +- trunk/arch/x86/kernel/efi.c | 67 +- trunk/arch/x86/kernel/efi_32.c | 8 +- trunk/arch/x86/kernel/efi_64.c | 8 +- trunk/arch/x86/kernel/entry_32.S | 12 +- trunk/arch/x86/kernel/entry_64.S | 61 +- trunk/arch/x86/kernel/genapic_64.c | 2 +- trunk/arch/x86/kernel/genx2apic_uv_x.c | 214 +- trunk/arch/x86/kernel/geode_32.c | 5 +- trunk/arch/x86/kernel/head.c | 55 - trunk/arch/x86/kernel/head32.c | 27 - trunk/arch/x86/kernel/head64.c | 96 +- trunk/arch/x86/kernel/head_32.S | 15 +- trunk/arch/x86/kernel/head_64.S | 101 +- trunk/arch/x86/kernel/hpet.c | 63 +- trunk/arch/x86/kernel/i387.c | 44 +- trunk/arch/x86/kernel/{i8259.c => i8259_32.c} | 136 +- trunk/arch/x86/kernel/i8259_64.c | 512 +++++ trunk/arch/x86/kernel/init_task.c | 1 + trunk/arch/x86/kernel/io_apic_32.c | 676 +++--- trunk/arch/x86/kernel/io_apic_64.c | 280 +-- trunk/arch/x86/kernel/ipi.c | 1 + trunk/arch/x86/kernel/irq_32.c | 254 +-- trunk/arch/x86/kernel/irq_64.c | 28 - trunk/arch/x86/kernel/irqinit_32.c | 114 - trunk/arch/x86/kernel/irqinit_64.c | 217 -- trunk/arch/x86/kernel/kvmclock.c | 93 +- trunk/arch/x86/kernel/ldt.c | 6 +- trunk/arch/x86/kernel/machine_kexec_32.c | 4 +- trunk/arch/x86/kernel/machine_kexec_64.c | 2 +- trunk/arch/x86/kernel/mfgpt_32.c | 2 - trunk/arch/x86/kernel/microcode.c | 29 +- trunk/arch/x86/kernel/mmconf-fam10h_64.c | 1 - trunk/arch/x86/kernel/mpparse.c | 847 +++---- trunk/arch/x86/kernel/{nmi.c => nmi_32.c} | 222 +- trunk/arch/x86/kernel/nmi_64.c | 482 ++++ trunk/arch/x86/kernel/numaq_32.c | 32 +- trunk/arch/x86/kernel/paravirt.c | 36 +- trunk/arch/x86/kernel/paravirt_patch_32.c | 4 +- trunk/arch/x86/kernel/paravirt_patch_64.c | 9 +- trunk/arch/x86/kernel/pci-calgary_64.c | 4 +- trunk/arch/x86/kernel/pci-dma.c | 36 +- trunk/arch/x86/kernel/pci-gart_64.c | 120 +- trunk/arch/x86/kernel/pci-swiotlb_64.c | 2 +- trunk/arch/x86/kernel/probe_roms_32.c | 166 -- trunk/arch/x86/kernel/process.c | 190 +- trunk/arch/x86/kernel/process_32.c | 71 +- trunk/arch/x86/kernel/process_64.c | 91 +- trunk/arch/x86/kernel/ptrace.c | 4 +- trunk/arch/x86/kernel/pvclock.c | 141 -- trunk/arch/x86/kernel/quirks.c | 58 +- trunk/arch/x86/kernel/reboot.c | 18 +- trunk/arch/x86/kernel/reboot_fixups_32.c | 4 +- trunk/arch/x86/kernel/rtc.c | 34 - trunk/arch/x86/kernel/setup.c | 924 +------- trunk/arch/x86/kernel/setup64.c | 287 +++ trunk/arch/x86/kernel/setup_32.c | 958 ++++++++ trunk/arch/x86/kernel/setup_64.c | 1194 ++++++++++ trunk/arch/x86/kernel/setup_percpu.c | 399 ---- trunk/arch/x86/kernel/smpboot.c | 218 +- trunk/arch/x86/{mm => kernel}/srat_32.c | 222 +- trunk/arch/x86/kernel/summit_32.c | 2 - trunk/arch/x86/kernel/sys_i386_32.c | 64 +- trunk/arch/x86/kernel/time_32.c | 6 +- trunk/arch/x86/kernel/time_64.c | 16 +- trunk/arch/x86/kernel/tlb_64.c | 5 - trunk/arch/x86/kernel/tlb_uv.c | 792 ------- trunk/arch/x86/kernel/trampoline.c | 2 +- trunk/arch/x86/kernel/traps_32.c | 191 +- trunk/arch/x86/kernel/traps_64.c | 541 ++--- trunk/arch/x86/kernel/tsc.c | 533 ----- trunk/arch/x86/kernel/tsc_32.c | 448 ++++ trunk/arch/x86/kernel/tsc_64.c | 356 +++ trunk/arch/x86/kernel/visws_quirks.c | 709 ------ trunk/arch/x86/kernel/vmi_32.c | 6 +- trunk/arch/x86/kernel/vmiclock_32.c | 7 +- trunk/arch/x86/kernel/vmlinux_32.lds.S | 7 + trunk/arch/x86/kernel/vmlinux_64.lds.S | 8 +- trunk/arch/x86/kernel/vsmp_64.c | 3 - trunk/arch/x86/kernel/vsyscall_64.c | 12 +- trunk/arch/x86/kernel/x8664_ksyms_64.c | 5 + trunk/arch/x86/kvm/i8254.c | 25 +- trunk/arch/x86/kvm/irq.c | 6 - trunk/arch/x86/kvm/irq.h | 2 - trunk/arch/x86/kvm/lapic.c | 3 +- trunk/arch/x86/kvm/mmu.c | 24 +- trunk/arch/x86/kvm/paging_tmpl.h | 2 +- trunk/arch/x86/kvm/svm.c | 2 +- trunk/arch/x86/kvm/vmx.c | 22 +- trunk/arch/x86/kvm/x86.c | 93 +- trunk/arch/x86/kvm/x86_emulate.c | 10 +- trunk/arch/x86/lguest/Kconfig | 2 +- trunk/arch/x86/lguest/boot.c | 16 +- trunk/arch/x86/lib/Makefile | 4 +- trunk/arch/x86/lib/copy_user_64.S | 432 ++-- trunk/arch/x86/lib/copy_user_nocache_64.S | 286 ++- trunk/arch/x86/lib/{delay.c => delay_32.c} | 69 +- trunk/arch/x86/lib/delay_64.c | 63 + trunk/arch/x86/lib/getuser_32.S | 78 + .../arch/x86/lib/{getuser.S => getuser_64.S} | 87 +- .../arch/x86/lib/{putuser.S => putuser_32.S} | 73 +- trunk/arch/x86/lib/putuser_64.S | 106 + trunk/arch/x86/lib/usercopy_64.c | 23 - trunk/arch/x86/mach-default/setup.c | 74 +- trunk/arch/x86/mach-es7000/Makefile | 1 + trunk/arch/x86/mach-es7000/es7000plat.c | 49 +- trunk/arch/x86/mach-generic/Makefile | 10 +- trunk/arch/x86/mach-generic/bigsmp.c | 4 +- trunk/arch/x86/mach-generic/numaq.c | 41 - trunk/arch/x86/mach-generic/probe.c | 15 +- trunk/arch/x86/mach-visws/Makefile | 8 + trunk/arch/x86/mach-visws/mpparse.c | 88 + trunk/arch/x86/mach-visws/reboot.c | 55 + trunk/arch/x86/mach-visws/setup.c | 183 ++ trunk/arch/x86/mach-visws/traps.c | 69 + trunk/arch/x86/mach-visws/visws_apic.c | 297 +++ trunk/arch/x86/mach-voyager/setup.c | 37 +- trunk/arch/x86/mach-voyager/voyager_smp.c | 14 + trunk/arch/x86/math-emu/fpu_entry.c | 13 +- trunk/arch/x86/math-emu/reg_constant.c | 8 +- trunk/arch/x86/mm/Makefile | 3 +- trunk/arch/x86/mm/discontig_32.c | 285 +-- trunk/arch/x86/mm/dump_pagetables.c | 2 +- trunk/arch/x86/mm/fault.c | 102 +- trunk/arch/x86/mm/init_32.c | 523 +---- trunk/arch/x86/mm/init_64.c | 561 ++--- trunk/arch/x86/mm/ioremap.c | 54 +- trunk/arch/x86/mm/k8topology_64.c | 21 +- trunk/arch/x86/mm/numa_64.c | 93 +- trunk/arch/x86/mm/pageattr-test.c | 21 +- trunk/arch/x86/mm/pageattr.c | 62 +- trunk/arch/x86/mm/pat.c | 395 ++-- trunk/arch/x86/mm/pgtable.c | 190 +- trunk/arch/x86/mm/pgtable_32.c | 56 +- trunk/arch/x86/mm/srat_64.c | 48 +- trunk/arch/x86/oprofile/nmi_int.c | 3 +- trunk/arch/x86/pci/Makefile | 22 +- trunk/arch/x86/pci/Makefile_32 | 24 + trunk/arch/x86/pci/Makefile_64 | 17 + trunk/arch/x86/pci/acpi.c | 21 +- trunk/arch/x86/pci/common.c | 12 +- trunk/arch/x86/pci/direct.c | 25 +- trunk/arch/x86/pci/i386.c | 8 +- trunk/arch/x86/pci/init.c | 7 +- trunk/arch/x86/pci/irq.c | 273 +-- trunk/arch/x86/pci/{amd_bus.c => k8-bus_64.c} | 108 +- trunk/arch/x86/pci/legacy.c | 16 +- trunk/arch/x86/pci/mmconfig-shared.c | 2 +- trunk/arch/x86/pci/mp_bus_to_node.c | 23 + trunk/arch/x86/pci/numa.c | 33 +- trunk/arch/x86/pci/olpc.c | 5 +- trunk/arch/x86/pci/pci.h | 15 +- trunk/arch/x86/pci/visws.c | 28 +- trunk/arch/x86/power/hibernate_64.c | 2 +- trunk/arch/x86/vdso/vclock_gettime.c | 6 +- trunk/arch/x86/vdso/vdso32-setup.c | 11 +- trunk/arch/x86/vdso/vma.c | 2 +- trunk/arch/x86/xen/Kconfig | 13 +- trunk/arch/x86/xen/Makefile | 2 +- trunk/arch/x86/xen/enlighten.c | 228 +- trunk/arch/x86/xen/manage.c | 143 ++ trunk/arch/x86/xen/mmu.c | 345 +-- trunk/arch/x86/xen/mmu.h | 34 +- trunk/arch/x86/xen/multicalls.c | 40 +- trunk/arch/x86/xen/multicalls.h | 12 - trunk/arch/x86/xen/setup.c | 30 +- trunk/arch/x86/xen/smp.c | 8 +- trunk/arch/x86/xen/suspend.c | 45 - trunk/arch/x86/xen/time.c | 162 +- trunk/arch/x86/xen/xen-head.S | 11 +- trunk/arch/x86/xen/xen-ops.h | 13 +- trunk/arch/xtensa/kernel/init_task.c | 1 + trunk/block/Kconfig | 12 - trunk/block/Makefile | 4 +- trunk/block/as-iosched.c | 20 +- trunk/block/blk-core.c | 56 +- 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 | 74 +- trunk/block/bsg.c | 48 +- trunk/block/cfq-iosched.c | 119 +- trunk/block/cmd-filter.c | 334 --- trunk/block/elevator.c | 10 +- trunk/block/genhd.c | 14 - trunk/block/scsi_ioctl.c | 121 +- trunk/crypto/Kconfig | 63 +- trunk/crypto/Makefile | 7 +- trunk/crypto/ahash.c | 194 -- trunk/crypto/api.c | 8 +- trunk/crypto/camellia.c | 84 +- trunk/crypto/chainiv.c | 10 +- trunk/crypto/crc32c.c | 128 +- trunk/crypto/cryptd.c | 253 +-- trunk/crypto/cts.c | 6 - trunk/crypto/digest.c | 83 +- trunk/crypto/hash.c | 102 +- trunk/crypto/hmac.c | 16 +- trunk/crypto/internal.h | 1 - trunk/crypto/prng.c | 410 ---- trunk/crypto/prng.h | 27 - trunk/crypto/ripemd.h | 43 - trunk/crypto/rmd128.c | 325 --- trunk/crypto/rmd160.c | 369 ---- trunk/crypto/rmd256.c | 344 --- trunk/crypto/rmd320.c | 393 ---- trunk/crypto/tcrypt.c | 198 +- trunk/crypto/tcrypt.h | 526 +---- trunk/drivers/Makefile | 1 - trunk/drivers/acpi/Kconfig | 2 + trunk/drivers/acpi/ac.c | 8 +- trunk/drivers/acpi/bay.c | 19 +- trunk/drivers/acpi/dispatcher/dsfield.c | 5 +- trunk/drivers/acpi/dispatcher/dsmethod.c | 2 +- trunk/drivers/acpi/dock.c | 5 +- trunk/drivers/acpi/ec.c | 2 +- trunk/drivers/acpi/executer/exconfig.c | 10 +- trunk/drivers/acpi/executer/exmutex.c | 4 +- trunk/drivers/acpi/glue.c | 9 - trunk/drivers/acpi/hardware/hwsleep.c | 8 +- trunk/drivers/acpi/numa.c | 31 +- trunk/drivers/acpi/parser/psargs.c | 4 +- trunk/drivers/acpi/processor_core.c | 1 + trunk/drivers/acpi/processor_idle.c | 13 +- trunk/drivers/acpi/sleep/main.c | 5 +- trunk/drivers/acpi/sleep/proc.c | 11 +- trunk/drivers/acpi/system.c | 15 +- trunk/drivers/acpi/tables/tbinstal.c | 25 +- trunk/drivers/acpi/tables/tbxface.c | 2 +- trunk/drivers/acpi/thermal.c | 11 +- trunk/drivers/acpi/utilities/utmisc.c | 2 +- trunk/drivers/acpi/video.c | 3 +- trunk/drivers/ata/Kconfig | 10 +- trunk/drivers/ata/ahci.c | 191 +- trunk/drivers/ata/ata_piix.c | 16 +- trunk/drivers/ata/libata-acpi.c | 167 +- trunk/drivers/ata/libata-core.c | 46 +- trunk/drivers/ata/libata-eh.c | 207 +- trunk/drivers/ata/libata-pmp.c | 51 +- trunk/drivers/ata/libata-scsi.c | 28 +- trunk/drivers/ata/libata-sff.c | 145 +- trunk/drivers/ata/libata.h | 2 +- trunk/drivers/ata/pata_ali.c | 10 +- trunk/drivers/ata/pata_amd.c | 14 +- trunk/drivers/ata/pata_at32.c | 2 + trunk/drivers/ata/pata_bf54x.c | 5 +- trunk/drivers/ata/pata_cypress.c | 8 +- trunk/drivers/ata/pata_icside.c | 2 +- trunk/drivers/ata/pata_legacy.c | 50 +- trunk/drivers/ata/pata_ns87410.c | 6 +- trunk/drivers/ata/pata_ns87415.c | 4 +- trunk/drivers/ata/pata_pcmcia.c | 2 - trunk/drivers/ata/pata_qdi.c | 16 +- trunk/drivers/ata/pata_rb532_cf.c | 4 +- trunk/drivers/ata/pata_scc.c | 5 +- trunk/drivers/ata/pata_sis.c | 1 - trunk/drivers/ata/pata_sl82c105.c | 2 +- trunk/drivers/ata/pata_via.c | 14 +- trunk/drivers/ata/pata_winbond.c | 6 +- trunk/drivers/ata/sata_fsl.c | 224 +- trunk/drivers/ata/sata_mv.c | 279 +-- trunk/drivers/ata/sata_promise.c | 148 +- trunk/drivers/ata/sata_sil24.c | 12 - trunk/drivers/ata/sata_uli.c | 1 - trunk/drivers/atm/eni.h | 1 + trunk/drivers/atm/fore200e.h | 1 + trunk/drivers/atm/fore200e_mkfirm.c | 2 + trunk/drivers/atm/he.c | 11 +- trunk/drivers/atm/he.h | 15 +- trunk/drivers/atm/idt77252.c | 7 + trunk/drivers/atm/idt77252.h | 4 + trunk/drivers/atm/iphase.c | 27 +- trunk/drivers/atm/iphase.h | 3 +- trunk/drivers/atm/nicstarmac.copyright | 2 +- trunk/drivers/auxdisplay/Kconfig | 2 +- trunk/drivers/auxdisplay/cfag12864b.c | 4 +- trunk/drivers/auxdisplay/cfag12864bfb.c | 4 +- trunk/drivers/auxdisplay/ks0108.c | 4 +- trunk/drivers/base/core.c | 109 +- trunk/drivers/base/node.c | 4 +- trunk/drivers/base/power/trace.c | 2 +- trunk/drivers/base/topology.c | 25 +- trunk/drivers/block/DAC960.c | 157 +- trunk/drivers/block/aoe/aoecmd.c | 2 +- trunk/drivers/block/brd.c | 2 - trunk/drivers/block/cciss.c | 81 +- trunk/drivers/block/paride/pt.c | 20 +- trunk/drivers/block/pktcdvd.c | 46 +- trunk/drivers/block/viodasd.c | 2 +- trunk/drivers/block/virtio_blk.c | 7 +- trunk/drivers/block/xen-blkfront.c | 48 +- trunk/drivers/cdrom/cdrom.c | 274 ++- trunk/drivers/cdrom/viocd.c | 2 +- trunk/drivers/char/Kconfig | 12 +- trunk/drivers/char/Makefile | 1 + trunk/drivers/char/agp/agp.h | 6 +- trunk/drivers/char/agp/alpha-agp.c | 4 +- trunk/drivers/char/agp/amd-k7-agp.c | 4 +- trunk/drivers/char/agp/amd64-agp.c | 89 +- trunk/drivers/char/agp/ati-agp.c | 8 +- trunk/drivers/char/agp/backend.c | 16 +- trunk/drivers/char/agp/compat_ioctl.c | 2 +- trunk/drivers/char/agp/efficeon-agp.c | 6 +- trunk/drivers/char/agp/frontend.c | 12 +- trunk/drivers/char/agp/generic.c | 35 +- trunk/drivers/char/agp/hp-agp.c | 6 +- trunk/drivers/char/agp/i460-agp.c | 2 +- trunk/drivers/char/agp/intel-agp.c | 239 +- trunk/drivers/char/agp/nvidia-agp.c | 4 +- trunk/drivers/char/agp/parisc-agp.c | 6 +- trunk/drivers/char/agp/sgi-agp.c | 8 +- trunk/drivers/char/agp/sworks-agp.c | 6 +- trunk/drivers/char/agp/uninorth-agp.c | 10 +- trunk/drivers/char/agp/via-agp.c | 13 +- trunk/drivers/{gpu => char}/drm/Kconfig | 0 trunk/drivers/char/drm/Makefile | 40 + trunk/drivers/{gpu => char}/drm/README.drm | 0 trunk/drivers/{gpu => char}/drm/ati_pcigart.c | 8 +- trunk/{include => drivers/char}/drm/drm.h | 19 +- trunk/{include => drivers/char}/drm/drmP.h | 91 +- .../{gpu => char}/drm/drm_agpsupport.c | 0 trunk/drivers/{gpu => char}/drm/drm_auth.c | 0 trunk/drivers/{gpu => char}/drm/drm_bufs.c | 0 trunk/drivers/{gpu => char}/drm/drm_context.c | 0 .../{include => drivers/char}/drm/drm_core.h | 0 trunk/drivers/{gpu => char}/drm/drm_dma.c | 0 .../drivers/{gpu => char}/drm/drm_drawable.c | 0 trunk/drivers/{gpu => char}/drm/drm_drv.c | 7 +- trunk/drivers/{gpu => char}/drm/drm_fops.c | 7 +- trunk/drivers/{gpu => char}/drm/drm_hashtab.c | 0 .../char}/drm/drm_hashtab.h | 0 trunk/drivers/{gpu => char}/drm/drm_ioc32.c | 0 trunk/drivers/{gpu => char}/drm/drm_ioctl.c | 0 trunk/drivers/{gpu => char}/drm/drm_irq.c | 381 +++- trunk/drivers/{gpu => char}/drm/drm_lock.c | 35 +- trunk/drivers/{gpu => char}/drm/drm_memory.c | 0 .../char}/drm/drm_memory.h | 0 .../char}/drm/drm_memory_debug.h | 0 trunk/drivers/{gpu => char}/drm/drm_mm.c | 0 .../char}/drm/drm_os_linux.h | 0 trunk/drivers/{gpu => char}/drm/drm_pci.c | 0 .../char}/drm/drm_pciids.h | 17 +- trunk/drivers/{gpu => char}/drm/drm_proc.c | 0 .../{include => drivers/char}/drm/drm_sarea.h | 0 trunk/drivers/{gpu => char}/drm/drm_scatter.c | 0 trunk/drivers/{gpu => char}/drm/drm_sman.c | 0 .../{include => drivers/char}/drm/drm_sman.h | 0 trunk/drivers/{gpu => char}/drm/drm_stub.c | 0 trunk/drivers/{gpu => char}/drm/drm_sysfs.c | 2 + trunk/drivers/{gpu => char}/drm/drm_vm.c | 0 .../{gpu/drm/i810 => char/drm}/i810_dma.c | 0 .../{include => drivers/char}/drm/i810_drm.h | 0 .../{gpu/drm/i810 => char/drm}/i810_drv.c | 0 .../{gpu/drm/i810 => char/drm}/i810_drv.h | 0 .../{gpu/drm/i830 => char/drm}/i830_dma.c | 0 .../{include => drivers/char}/drm/i830_drm.h | 0 .../{gpu/drm/i830 => char/drm}/i830_drv.c | 0 .../{gpu/drm/i830 => char/drm}/i830_drv.h | 0 .../{gpu/drm/i830 => char/drm}/i830_irq.c | 0 .../{gpu/drm/i915 => char/drm}/i915_dma.c | 160 +- .../{include => drivers/char}/drm/i915_drm.h | 45 +- .../{gpu/drm/i915 => char/drm}/i915_drv.c | 24 +- .../{gpu/drm/i915 => char/drm}/i915_drv.h | 126 +- .../{gpu/drm/i915 => char/drm}/i915_ioc32.c | 0 trunk/drivers/char/drm/i915_irq.c | 916 ++++++++ .../{gpu/drm/i915 => char/drm}/i915_mem.c | 0 .../{gpu/drm/mga => char/drm}/mga_dma.c | 0 trunk/{include => drivers/char}/drm/mga_drm.h | 0 .../{gpu/drm/mga => char/drm}/mga_drv.c | 7 +- .../{gpu/drm/mga => char/drm}/mga_drv.h | 6 +- .../{gpu/drm/mga => char/drm}/mga_ioc32.c | 0 .../{gpu/drm/mga => char/drm}/mga_irq.c | 69 +- .../{gpu/drm/mga => char/drm}/mga_state.c | 0 .../{gpu/drm/mga => char/drm}/mga_ucode.h | 0 .../{gpu/drm/mga => char/drm}/mga_warp.c | 0 .../{gpu/drm/r128 => char/drm}/r128_cce.c | 0 .../{include => drivers/char}/drm/r128_drm.h | 0 .../{gpu/drm/r128 => char/drm}/r128_drv.c | 7 +- .../{gpu/drm/r128 => char/drm}/r128_drv.h | 9 +- .../{gpu/drm/r128 => char/drm}/r128_ioc32.c | 0 .../{gpu/drm/r128 => char/drm}/r128_irq.c | 55 +- .../{gpu/drm/r128 => char/drm}/r128_state.c | 0 .../drm/radeon => char/drm}/r300_cmdbuf.c | 117 +- .../{gpu/drm/radeon => char/drm}/r300_reg.h | 242 +- .../{gpu/drm/radeon => char/drm}/radeon_cp.c | 1148 ++++++++-- .../char}/drm/radeon_drm.h | 8 - .../{gpu/drm/radeon => char/drm}/radeon_drv.c | 8 +- .../{gpu/drm/radeon => char/drm}/radeon_drv.h | 270 +-- .../drm/radeon => char/drm}/radeon_ioc32.c | 0 .../{gpu/drm/radeon => char/drm}/radeon_irq.c | 171 +- .../{gpu/drm/radeon => char/drm}/radeon_mem.c | 0 .../drm/radeon => char/drm}/radeon_state.c | 17 +- .../{gpu/drm/savage => char/drm}/savage_bci.c | 0 .../char}/drm/savage_drm.h | 0 .../{gpu/drm/savage => char/drm}/savage_drv.c | 0 .../{gpu/drm/savage => char/drm}/savage_drv.h | 0 .../drm/savage => char/drm}/savage_state.c | 0 trunk/{include => drivers/char}/drm/sis_drm.h | 0 .../{gpu/drm/sis => char/drm}/sis_drv.c | 0 .../{gpu/drm/sis => char/drm}/sis_drv.h | 0 .../{gpu/drm/sis => char/drm}/sis_mm.c | 0 .../{gpu/drm/tdfx => char/drm}/tdfx_drv.c | 0 .../{gpu/drm/tdfx => char/drm}/tdfx_drv.h | 0 .../{gpu/drm/via => char/drm}/via_3d_reg.h | 0 .../{gpu/drm/via => char/drm}/via_dma.c | 0 .../{gpu/drm/via => char/drm}/via_dmablit.c | 0 .../{gpu/drm/via => char/drm}/via_dmablit.h | 0 trunk/{include => drivers/char}/drm/via_drm.h | 0 .../{gpu/drm/via => char/drm}/via_drv.c | 6 +- .../{gpu/drm/via => char/drm}/via_drv.h | 7 +- .../{gpu/drm/via => char/drm}/via_irq.c | 81 +- .../{gpu/drm/via => char/drm}/via_map.c | 0 .../{gpu/drm/via => char/drm}/via_mm.c | 0 .../{gpu/drm/via => char/drm}/via_verifier.c | 0 .../{gpu/drm/via => char/drm}/via_verifier.h | 0 .../{gpu/drm/via => char/drm}/via_video.c | 0 trunk/drivers/char/generic_nvram.c | 2 +- trunk/drivers/char/hvc_xen.c | 61 +- trunk/drivers/char/hw_random/Kconfig | 9 - trunk/drivers/char/hw_random/Makefile | 1 - trunk/drivers/char/hw_random/intel-rng.c | 2 +- trunk/drivers/char/hw_random/virtio-rng.c | 155 -- trunk/drivers/char/ip2/Makefile | 4 +- trunk/drivers/char/ip2/ip2main.c | 23 + trunk/drivers/char/ipmi/ipmi_watchdog.c | 3 +- trunk/drivers/char/keyboard.c | 7 +- trunk/drivers/char/pcmcia/cm4000_cs.c | 118 +- trunk/drivers/char/pcmcia/cm4040_cs.c | 23 +- .../drivers/char/pcmcia/ipwireless/hardware.c | 24 +- trunk/drivers/char/pcmcia/ipwireless/main.c | 1 + trunk/drivers/char/rtc.c | 3 +- trunk/drivers/char/sysrq.c | 1 - trunk/drivers/char/tpm/tpm_tis.c | 1 - trunk/drivers/char/tty_io.c | 2 +- trunk/drivers/char/tty_ioctl.c | 7 + trunk/drivers/char/viocons.c | 2 +- trunk/drivers/char/viotape.c | 2 +- trunk/drivers/char/vt.c | 15 +- trunk/drivers/connector/connector.c | 40 - trunk/drivers/cpufreq/cpufreq.c | 10 +- trunk/drivers/cpufreq/freq_table.c | 5 - trunk/drivers/cpuidle/cpuidle.c | 40 +- trunk/drivers/crypto/Kconfig | 26 - trunk/drivers/crypto/Makefile | 2 - trunk/drivers/crypto/hifn_795x.c | 367 ++-- trunk/drivers/crypto/ixp4xx_crypto.c | 1506 ------------- trunk/drivers/crypto/padlock-aes.c | 4 +- trunk/drivers/crypto/padlock-sha.c | 4 +- trunk/drivers/crypto/talitos.c | 1597 -------------- trunk/drivers/crypto/talitos.h | 199 -- trunk/drivers/dma/iop-adma.c | 6 +- trunk/drivers/edac/mpc85xx_edac.c | 3 + trunk/drivers/firewire/Kconfig | 32 +- trunk/drivers/firewire/fw-cdev.c | 23 +- trunk/drivers/firewire/fw-ohci.c | 110 +- trunk/drivers/firewire/fw-sbp2.c | 3 +- trunk/drivers/firewire/fw-transaction.c | 52 +- trunk/drivers/firmware/Kconfig | 10 - trunk/drivers/firmware/Makefile | 1 - trunk/drivers/firmware/dmi_scan.c | 5 - trunk/drivers/firmware/edd.c | 2 +- trunk/drivers/firmware/memmap.c | 205 -- trunk/drivers/gpio/Kconfig | 14 +- trunk/drivers/gpio/gpiolib.c | 6 +- trunk/drivers/gpio/mcp23s08.c | 2 +- trunk/drivers/gpio/pca953x.c | 3 +- trunk/drivers/gpu/Makefile | 1 - trunk/drivers/gpu/drm/Makefile | 26 - trunk/drivers/gpu/drm/i810/Makefile | 8 - trunk/drivers/gpu/drm/i830/Makefile | 8 - trunk/drivers/gpu/drm/i915/Makefile | 10 - trunk/drivers/gpu/drm/i915/i915_irq.c | 623 ------ trunk/drivers/gpu/drm/mga/Makefile | 11 - trunk/drivers/gpu/drm/r128/Makefile | 10 - trunk/drivers/gpu/drm/radeon/Makefile | 10 - .../drivers/gpu/drm/radeon/radeon_microcode.h | 1844 ---------------- trunk/drivers/gpu/drm/savage/Makefile | 9 - trunk/drivers/gpu/drm/sis/Makefile | 10 - trunk/drivers/gpu/drm/tdfx/Makefile | 8 - trunk/drivers/gpu/drm/via/Makefile | 8 - trunk/drivers/hid/hid-debug.c | 2 + trunk/drivers/hid/hid-input.c | 7 +- trunk/drivers/hid/usbhid/hid-quirks.c | 49 +- trunk/drivers/hid/usbhid/usbkbd.c | 2 + trunk/drivers/hid/usbhid/usbmouse.c | 2 + trunk/drivers/hwmon/Kconfig | 14 - trunk/drivers/hwmon/Makefile | 1 - trunk/drivers/hwmon/abituguru3.c | 18 +- trunk/drivers/hwmon/adt7473.c | 3 - trunk/drivers/hwmon/hdaps.c | 8 - trunk/drivers/hwmon/i5k_amb.c | 39 +- trunk/drivers/hwmon/ibmaem.c | 1111 ---------- trunk/drivers/hwmon/lm75.c | 20 +- trunk/drivers/hwmon/lm85.c | 25 +- trunk/drivers/i2c/busses/i2c-s3c2410.c | 28 +- trunk/drivers/ide/Kconfig | 1 - trunk/drivers/ide/arm/bast-ide.c | 1 - trunk/drivers/ide/arm/ide_arm.c | 1 - trunk/drivers/ide/arm/palm_bk3710.c | 61 +- trunk/drivers/ide/ide-generic.c | 10 +- trunk/drivers/ide/ide-pnp.c | 1 - trunk/drivers/ide/ide-probe.c | 21 +- trunk/drivers/ide/ide-proc.c | 3 +- trunk/drivers/ide/ide-taskfile.c | 6 +- trunk/drivers/ide/ide.c | 24 +- trunk/drivers/ide/legacy/buddha.c | 2 - trunk/drivers/ide/legacy/falconide.c | 2 - trunk/drivers/ide/legacy/gayle.c | 6 - trunk/drivers/ide/legacy/ide-cs.c | 54 +- trunk/drivers/ide/legacy/macide.c | 2 - trunk/drivers/ide/legacy/q40ide.c | 2 - trunk/drivers/ide/pci/cmd640.c | 2 - trunk/drivers/ide/pci/delkin_cb.c | 28 +- trunk/drivers/ide/pci/it8213.c | 3 +- trunk/drivers/ide/pci/ns87415.c | 6 +- trunk/drivers/ide/pci/opti621.c | 221 +- trunk/drivers/ide/pci/sis5513.c | 5 - trunk/drivers/ide/ppc/mpc8xx.c | 4 - trunk/drivers/ide/ppc/pmac.c | 60 +- trunk/drivers/ieee1394/Kconfig | 118 +- trunk/drivers/ieee1394/sbp2.c | 20 +- trunk/drivers/infiniband/core/mad.c | 4 +- trunk/drivers/infiniband/core/umem.c | 2 +- trunk/drivers/infiniband/core/user_mad.c | 14 +- trunk/drivers/infiniband/core/uverbs_main.c | 13 +- .../drivers/infiniband/hw/amso1100/c2_rnic.c | 3 +- .../infiniband/hw/cxgb3/iwch_provider.c | 4 - trunk/drivers/infiniband/hw/cxgb3/iwch_qp.c | 2 +- trunk/drivers/infiniband/hw/ehca/ehca_reqs.c | 6 +- .../infiniband/hw/ipath/ipath_kernel.h | 5 - trunk/drivers/infiniband/hw/ipath/ipath_mad.c | 4 - .../drivers/infiniband/hw/ipath/ipath_sdma.c | 16 +- trunk/drivers/infiniband/hw/ipath/ipath_uc.c | 4 +- .../drivers/infiniband/hw/ipath/ipath_verbs.c | 3 +- trunk/drivers/infiniband/hw/mlx4/qp.c | 15 +- .../drivers/infiniband/hw/mthca/mthca_main.c | 14 +- .../infiniband/hw/mthca/mthca_memfree.c | 6 +- trunk/drivers/infiniband/hw/nes/nes_verbs.c | 4 +- .../infiniband/ulp/ipoib/ipoib_multicast.c | 6 - trunk/drivers/input/ff-core.c | 18 +- trunk/drivers/input/keyboard/aaed2000_kbd.c | 2 +- trunk/drivers/input/keyboard/atkbd.c | 2 - trunk/drivers/input/keyboard/corgikbd.c | 2 +- trunk/drivers/input/keyboard/jornada680_kbd.c | 2 +- trunk/drivers/input/keyboard/jornada720_kbd.c | 2 +- trunk/drivers/input/keyboard/pxa27x_keypad.c | 38 +- trunk/drivers/input/keyboard/spitzkbd.c | 2 +- trunk/drivers/input/misc/Kconfig | 1 + trunk/drivers/input/misc/apanel.c | 1 + trunk/drivers/input/mouse/appletouch.c | 49 +- trunk/drivers/input/serio/i8042-x86ia64io.h | 14 - trunk/drivers/input/serio/i8042.c | 41 +- trunk/drivers/input/tablet/gtco.c | 17 +- .../drivers/input/touchscreen/jornada720_ts.c | 2 +- trunk/drivers/input/touchscreen/wm9713.c | 22 - trunk/drivers/input/touchscreen/wm97xx-core.c | 25 +- trunk/drivers/input/xen-kbdfront.c | 20 +- trunk/drivers/isdn/capi/capiutil.c | 6 +- trunk/drivers/isdn/hardware/eicon/divasmain.c | 1 + trunk/drivers/isdn/hardware/eicon/divasproc.c | 4 +- trunk/drivers/isdn/hysdn/Kconfig | 2 +- trunk/drivers/isdn/hysdn/boardergo.c | 14 +- trunk/drivers/isdn/hysdn/hycapi.c | 6 +- trunk/drivers/isdn/hysdn/hysdn_procconf.c | 29 +- trunk/drivers/isdn/i4l/isdn_common.c | 4 +- trunk/drivers/isdn/sc/ioctl.c | 1 - trunk/drivers/leds/led-class.c | 6 +- trunk/drivers/lguest/Kconfig | 2 +- trunk/drivers/lguest/lg.h | 1 + trunk/drivers/lguest/lguest_device.c | 25 +- trunk/drivers/lguest/x86/core.c | 15 +- trunk/drivers/macintosh/mediabay.c | 7 +- trunk/drivers/macintosh/smu.c | 5 +- trunk/drivers/macintosh/therm_adt746x.c | 13 +- trunk/drivers/md/bitmap.c | 17 +- trunk/drivers/md/dm-crypt.c | 1 - trunk/drivers/md/linear.c | 10 +- trunk/drivers/md/md.c | 87 +- trunk/drivers/md/multipath.c | 3 +- trunk/drivers/md/raid0.c | 10 +- trunk/drivers/md/raid1.c | 29 +- trunk/drivers/md/raid10.c | 31 +- trunk/drivers/md/raid5.c | 78 +- trunk/drivers/media/Makefile | 7 +- trunk/drivers/media/common/ir-keymaps.c | 38 - trunk/drivers/media/common/tuners/Kconfig | 1 - trunk/drivers/media/common/tuners/mxl5005s.c | 4 +- .../media/common/tuners/tda18271-common.c | 14 +- .../drivers/media/common/tuners/tda18271-fe.c | 53 +- trunk/drivers/media/common/tuners/tda827x.c | 4 +- trunk/drivers/media/common/tuners/tea5761.c | 2 +- trunk/drivers/media/common/tuners/tuner-i2c.h | 8 - .../media/common/tuners/tuner-simple.c | 6 +- .../media/common/tuners/tuner-xc2028.c | 87 +- trunk/drivers/media/common/tuners/xc5000.c | 30 +- .../drivers/media/common/tuners/xc5000_priv.h | 1 + trunk/drivers/media/dvb/b2c2/flexcop-usb.c | 2 +- trunk/drivers/media/dvb/cinergyT2/cinergyT2.c | 46 +- trunk/drivers/media/dvb/dvb-core/dvb_net.c | 12 +- trunk/drivers/media/dvb/dvb-usb/Kconfig | 2 +- .../media/dvb/dvb-usb/dib0700_devices.c | 21 +- .../media/dvb/dvb-usb/dvb-usb-firmware.c | 2 +- trunk/drivers/media/dvb/dvb-usb/gl861.c | 27 +- trunk/drivers/media/dvb/dvb-usb/gp8psk.c | 10 +- trunk/drivers/media/dvb/dvb-usb/m920x.c | 7 +- trunk/drivers/media/dvb/dvb-usb/umt-010.c | 2 +- trunk/drivers/media/dvb/frontends/au8522.c | 29 +- trunk/drivers/media/dvb/frontends/dib0070.h | 15 +- trunk/drivers/media/dvb/frontends/dib7000p.h | 15 +- trunk/drivers/media/dvb/frontends/or51132.c | 6 +- trunk/drivers/media/dvb/frontends/stv0299.c | 15 +- trunk/drivers/media/dvb/frontends/tda10023.c | 20 +- trunk/drivers/media/dvb/frontends/tda1004x.c | 29 +- trunk/drivers/media/dvb/ttpci/Kconfig | 1 - trunk/drivers/media/dvb/ttpci/av7110.c | 9 +- trunk/drivers/media/dvb/ttpci/av7110_av.c | 34 +- trunk/drivers/media/dvb/ttpci/av7110_hw.c | 5 +- .../media/dvb/ttusb-budget/dvb-ttusb-budget.c | 2 +- trunk/drivers/media/dvb/ttusb-dec/Kconfig | 2 +- trunk/drivers/media/dvb/ttusb-dec/ttusb_dec.c | 25 +- .../drivers/media/dvb/ttusb-dec/ttusbdecfe.c | 10 +- trunk/drivers/media/video/Kconfig | 10 +- trunk/drivers/media/video/Makefile | 2 - trunk/drivers/media/video/au0828/Kconfig | 2 +- .../drivers/media/video/au0828/au0828-cards.c | 18 - trunk/drivers/media/video/au0828/au0828-dvb.c | 6 + trunk/drivers/media/video/bt8xx/bttv-cards.c | 5 +- trunk/drivers/media/video/bt8xx/bttv-driver.c | 2 +- trunk/drivers/media/video/bt8xx/bttv-risc.c | 8 +- trunk/drivers/media/video/btcx-risc.c | 2 +- trunk/drivers/media/video/btcx-risc.h | 4 +- trunk/drivers/media/video/cx18/Kconfig | 4 +- trunk/drivers/media/video/cx18/cx18-av-core.c | 154 +- trunk/drivers/media/video/cx18/cx18-av-core.h | 16 +- trunk/drivers/media/video/cx18/cx18-cards.c | 88 +- trunk/drivers/media/video/cx18/cx18-cards.h | 50 +- .../drivers/media/video/cx18/cx18-controls.c | 6 +- trunk/drivers/media/video/cx18/cx18-driver.c | 26 +- trunk/drivers/media/video/cx18/cx18-driver.h | 9 +- trunk/drivers/media/video/cx18/cx18-dvb.c | 17 +- trunk/drivers/media/video/cx18/cx18-fileops.c | 13 +- trunk/drivers/media/video/cx18/cx18-gpio.c | 57 +- trunk/drivers/media/video/cx18/cx18-gpio.h | 1 - trunk/drivers/media/video/cx18/cx18-i2c.c | 2 - trunk/drivers/media/video/cx18/cx18-ioctl.c | 12 +- trunk/drivers/media/video/cx18/cx18-irq.c | 12 +- trunk/drivers/media/video/cx18/cx18-mailbox.c | 8 +- trunk/drivers/media/video/cx18/cx18-streams.c | 37 +- .../media/video/cx23885/cx23885-core.c | 8 +- .../media/video/cx25840/cx25840-core.c | 2 +- trunk/drivers/media/video/cx88/cx88-alsa.c | 6 - trunk/drivers/media/video/cx88/cx88-cards.c | 13 +- trunk/drivers/media/video/cx88/cx88-core.c | 8 +- .../drivers/media/video/em28xx/em28xx-audio.c | 18 - .../drivers/media/video/em28xx/em28xx-cards.c | 4 - trunk/drivers/media/video/em28xx/em28xx-dvb.c | 10 - trunk/drivers/media/video/em28xx/em28xx-reg.h | 1 - .../drivers/media/video/em28xx/em28xx-video.c | 32 +- trunk/drivers/media/video/ivtv/ivtv-driver.h | 10 +- trunk/drivers/media/video/ivtv/ivtv-fileops.c | 2 +- trunk/drivers/media/video/ivtv/ivtv-irq.c | 8 +- trunk/drivers/media/video/ivtv/ivtv-queue.c | 2 +- trunk/drivers/media/video/ivtv/ivtv-streams.c | 30 +- trunk/drivers/media/video/ivtv/ivtv-version.h | 4 +- trunk/drivers/media/video/ivtv/ivtv-yuv.c | 2 +- trunk/drivers/media/video/ivtv/ivtv-yuv.h | 2 +- trunk/drivers/media/video/ov7670.c | 4 +- trunk/drivers/media/video/pxa_camera.c | 4 +- .../media/video/saa7134/saa7134-alsa.c | 8 +- .../media/video/saa7134/saa7134-cards.c | 56 +- .../drivers/media/video/saa7134/saa7134-dvb.c | 43 +- .../media/video/saa7134/saa7134-empress.c | 40 +- .../media/video/saa7134/saa7134-input.c | 9 - trunk/drivers/media/video/soc_camera.c | 16 + trunk/drivers/media/video/tuner-core.c | 60 +- .../media/video/usbvideo/quickcam_messenger.c | 2 +- trunk/drivers/media/video/uvc/Makefile | 3 - trunk/drivers/media/video/uvc/uvc_ctrl.c | 1256 ----------- trunk/drivers/media/video/uvc/uvc_driver.c | 1955 ----------------- trunk/drivers/media/video/uvc/uvc_isight.c | 134 -- trunk/drivers/media/video/uvc/uvc_queue.c | 477 ---- trunk/drivers/media/video/uvc/uvc_status.c | 207 -- trunk/drivers/media/video/uvc/uvc_v4l2.c | 1105 ---------- trunk/drivers/media/video/uvc/uvc_video.c | 934 -------- trunk/drivers/media/video/uvc/uvcvideo.h | 796 ------- trunk/drivers/media/video/videobuf-core.c | 3 +- trunk/drivers/media/video/videodev.c | 245 ++- trunk/drivers/media/video/vivi.c | 7 +- trunk/drivers/media/video/zoran.h | 4 +- trunk/drivers/media/video/zoran_device.c | 2 +- trunk/drivers/media/video/zoran_driver.c | 10 +- trunk/drivers/message/fusion/mptbase.c | 11 +- trunk/drivers/message/fusion/mptfc.c | 2 + trunk/drivers/message/fusion/mptsas.c | 2 + trunk/drivers/message/fusion/mptscsih.c | 8 + trunk/drivers/message/fusion/mptspi.c | 9 +- trunk/drivers/mfd/Kconfig | 2 +- trunk/drivers/misc/atmel_pwm.c | 2 +- trunk/drivers/misc/fujitsu-laptop.c | 6 - trunk/drivers/misc/kgdbts.c | 33 +- trunk/drivers/misc/thinkpad_acpi.c | 496 ++--- trunk/drivers/mmc/card/Kconfig | 12 - trunk/drivers/mmc/card/Makefile | 1 - trunk/drivers/mmc/card/block.c | 2 +- trunk/drivers/mmc/card/mmc_test.c | 892 -------- trunk/drivers/mmc/host/Kconfig | 2 +- trunk/drivers/mmc/host/at91_mci.c | 5 +- trunk/drivers/mmc/host/omap.c | 12 +- trunk/drivers/mmc/host/pxamci.c | 13 - trunk/drivers/mmc/host/sdhci.c | 34 +- trunk/drivers/mmc/host/wbsd.c | 21 +- trunk/drivers/mtd/devices/m25p80.c | 4 +- trunk/drivers/mtd/ftl.c | 4 + trunk/drivers/mtd/maps/ck804xrom.c | 18 +- trunk/drivers/mtd/maps/omap_nor.c | 2 +- trunk/drivers/mtd/maps/pcmciamtd.c | 9 +- trunk/drivers/mtd/nand/pxa3xx_nand.c | 2 +- trunk/drivers/mtd/onenand/generic.c | 2 +- trunk/drivers/mtd/redboot.c | 2 +- trunk/drivers/net/3c509.c | 17 +- trunk/drivers/net/3c59x.c | 5 +- trunk/drivers/net/7990.c | 6 +- trunk/drivers/net/Kconfig | 4 +- trunk/drivers/net/atlx/atl1.c | 21 +- trunk/drivers/net/au1000_eth.c | 7 +- trunk/drivers/net/bfin_mac.c | 1 + trunk/drivers/net/bnx2.c | 9 +- trunk/drivers/net/bnx2.h | 1 + trunk/drivers/net/bnx2x.c | 5 +- trunk/drivers/net/bnx2x.h | 3 +- trunk/drivers/net/bnx2x_init.h | 3 +- trunk/drivers/net/bonding/bond_sysfs.c | 12 +- trunk/drivers/net/cassini.c | 11 +- trunk/drivers/net/cpmac.c | 234 +- trunk/drivers/net/cs89x0.c | 10 +- trunk/drivers/net/dm9000.c | 2 +- trunk/drivers/net/e100.c | 2 - trunk/drivers/net/e1000/e1000_ethtool.c | 2 +- trunk/drivers/net/e1000e/netdev.c | 7 +- trunk/drivers/net/ehea/ehea.h | 8 +- trunk/drivers/net/ehea/ehea_main.c | 64 +- trunk/drivers/net/enc28j60.c | 87 +- trunk/drivers/net/fec_mpc52xx.c | 2 +- trunk/drivers/net/forcedeth.c | 36 +- trunk/drivers/net/fs_enet/fs_enet-main.c | 2 +- trunk/drivers/net/fs_enet/mac-fcc.c | 3 - trunk/drivers/net/hamradio/baycom_epp.c | 2 +- trunk/drivers/net/hamradio/dmascc.c | 2 + trunk/drivers/net/hamradio/scc.c | 3 +- trunk/drivers/net/ibm_newemac/Kconfig | 1 - trunk/drivers/net/ibm_newemac/core.c | 8 - trunk/drivers/net/igb/igb_main.c | 3 +- trunk/drivers/net/ipg.c | 20 +- trunk/drivers/net/irda/Kconfig | 1 - trunk/drivers/net/irda/irda-usb.c | 2 +- trunk/drivers/net/irda/irda-usb.h | 4 +- trunk/drivers/net/irda/nsc-ircc.c | 1 - trunk/drivers/net/irda/via-ircc.c | 3 - trunk/drivers/net/ixgbe/ixgbe_82598.c | 4 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 3 +- trunk/drivers/net/macb.c | 37 - trunk/drivers/net/myri10ge/myri10ge.c | 4 +- trunk/drivers/net/netxen/netxen_nic.h | 18 +- trunk/drivers/net/netxen/netxen_nic_ethtool.c | 6 +- trunk/drivers/net/netxen/netxen_nic_hw.c | 112 +- trunk/drivers/net/netxen/netxen_nic_init.c | 46 +- trunk/drivers/net/netxen/netxen_nic_isr.c | 4 +- trunk/drivers/net/netxen/netxen_nic_main.c | 137 +- trunk/drivers/net/netxen/netxen_nic_niu.c | 22 +- trunk/drivers/net/pasemi_mac.c | 2 +- trunk/drivers/net/pcmcia/axnet_cs.c | 2 - trunk/drivers/net/pcmcia/fmvj18x_cs.c | 4 +- trunk/drivers/net/pcmcia/pcnet_cs.c | 3 - trunk/drivers/net/pcmcia/xirc2ps_cs.c | 12 +- trunk/drivers/net/pcnet32.c | 4 +- trunk/drivers/net/phy/Kconfig | 2 +- trunk/drivers/net/phy/phy_device.c | 1 - trunk/drivers/net/pppoe.c | 37 +- trunk/drivers/net/pppol2tp.c | 144 +- trunk/drivers/net/qla3xxx.c | 2 - trunk/drivers/net/r6040.c | 4 +- trunk/drivers/net/s2io-regs.h | 2 +- trunk/drivers/net/s2io.c | 531 ++--- trunk/drivers/net/s2io.h | 26 +- trunk/drivers/net/sb1250-mac.c | 67 +- trunk/drivers/net/sc92031.c | 8 +- trunk/drivers/net/sfc/bitfield.h | 7 +- trunk/drivers/net/sfc/boards.c | 9 +- trunk/drivers/net/sfc/efx.c | 84 +- trunk/drivers/net/sfc/falcon.c | 91 +- trunk/drivers/net/sfc/falcon.h | 5 +- trunk/drivers/net/sfc/falcon_hwdefs.h | 4 +- trunk/drivers/net/sfc/falcon_io.h | 29 +- trunk/drivers/net/sfc/falcon_xmac.c | 12 +- trunk/drivers/net/sfc/net_driver.h | 44 +- trunk/drivers/net/sfc/rx.c | 48 +- trunk/drivers/net/sfc/selftest.c | 14 +- trunk/drivers/net/sfc/sfe4001.c | 14 +- trunk/drivers/net/sfc/tenxpress.c | 4 +- trunk/drivers/net/sfc/tx.c | 11 +- trunk/drivers/net/sfc/workarounds.h | 2 +- trunk/drivers/net/sfc/xfp_phy.c | 4 +- trunk/drivers/net/sky2.c | 32 +- trunk/drivers/net/smc911x.c | 24 +- trunk/drivers/net/smc91x.c | 17 +- trunk/drivers/net/smc91x.h | 8 +- trunk/drivers/net/sunhme.c | 4 +- trunk/drivers/net/tc35815.c | 4 +- trunk/drivers/net/tg3.c | 33 +- trunk/drivers/net/tokenring/3c359.h | 2 +- trunk/drivers/net/tokenring/olympic.h | 2 +- trunk/drivers/net/tulip/tulip_core.c | 12 +- trunk/drivers/net/tulip/uli526x.c | 16 +- trunk/drivers/net/tun.c | 21 - trunk/drivers/net/ucc_geth.c | 9 +- trunk/drivers/net/ucc_geth_ethtool.c | 3 +- trunk/drivers/net/usb/asix.c | 4 - trunk/drivers/net/usb/catc.c | 5 +- trunk/drivers/net/usb/cdc_subset.c | 2 +- trunk/drivers/net/usb/kaweth.c | 2 +- trunk/drivers/net/usb/rndis_host.c | 6 +- trunk/drivers/net/virtio_net.c | 91 +- trunk/drivers/net/wan/hdlc.c | 19 +- trunk/drivers/net/wan/hdlc_cisco.c | 82 +- trunk/drivers/net/wan/hdlc_fr.c | 1 - trunk/drivers/net/wan/x25_asy.c | 3 - trunk/drivers/net/wireless/airo.c | 3 +- trunk/drivers/net/wireless/ath5k/base.c | 2 - trunk/drivers/net/wireless/ath5k/hw.c | 6 +- trunk/drivers/net/wireless/b43/Kconfig | 2 +- trunk/drivers/net/wireless/b43/b43.h | 2 +- trunk/drivers/net/wireless/b43/dma.c | 65 +- trunk/drivers/net/wireless/b43/leds.c | 3 - trunk/drivers/net/wireless/b43/main.c | 98 +- trunk/drivers/net/wireless/b43legacy/Kconfig | 2 +- trunk/drivers/net/wireless/b43legacy/dma.c | 2 +- trunk/drivers/net/wireless/b43legacy/main.c | 23 +- .../net/wireless/hostap/hostap_80211_rx.c | 8 +- trunk/drivers/net/wireless/hostap/hostap_ap.c | 2 +- trunk/drivers/net/wireless/hostap/hostap_cs.c | 21 +- trunk/drivers/net/wireless/hostap/hostap_hw.c | 19 +- .../drivers/net/wireless/hostap/hostap_main.c | 13 +- trunk/drivers/net/wireless/ipw2200.c | 204 +- trunk/drivers/net/wireless/ipw2200.h | 6 +- .../net/wireless/iwlwifi/iwl-3945-led.c | 5 +- trunk/drivers/net/wireless/iwlwifi/iwl-3945.c | 10 +- .../net/wireless/iwlwifi/iwl-4965-rs.c | 3 +- trunk/drivers/net/wireless/iwlwifi/iwl-4965.c | 6 +- .../net/wireless/iwlwifi/iwl3945-base.c | 36 +- .../net/wireless/iwlwifi/iwl4965-base.c | 42 +- trunk/drivers/net/wireless/libertas/cmd.c | 5 +- trunk/drivers/net/wireless/libertas/debugfs.c | 4 +- trunk/drivers/net/wireless/libertas/ethtool.c | 27 +- trunk/drivers/net/wireless/libertas/if_usb.c | 1 - trunk/drivers/net/wireless/libertas/main.c | 4 +- trunk/drivers/net/wireless/libertas/scan.c | 4 +- trunk/drivers/net/wireless/orinoco_cs.c | 1 - trunk/drivers/net/wireless/p54/p54usb.c | 1 - .../drivers/net/wireless/prism54/islpci_eth.c | 2 +- trunk/drivers/net/wireless/rndis_wlan.c | 65 +- trunk/drivers/net/wireless/rt2x00/Kconfig | 19 +- trunk/drivers/net/wireless/rt2x00/rt2400pci.c | 11 - trunk/drivers/net/wireless/rt2x00/rt2500pci.c | 11 - trunk/drivers/net/wireless/rt2x00/rt2500usb.c | 43 +- trunk/drivers/net/wireless/rt2x00/rt2x00.h | 6 - .../net/wireless/rt2x00/rt2x00config.c | 1 - trunk/drivers/net/wireless/rt2x00/rt2x00dev.c | 46 +- trunk/drivers/net/wireless/rt2x00/rt2x00mac.c | 5 +- trunk/drivers/net/wireless/rt2x00/rt2x00pci.c | 3 +- trunk/drivers/net/wireless/rt2x00/rt2x00usb.c | 6 - trunk/drivers/net/wireless/rt2x00/rt61pci.c | 9 - trunk/drivers/net/wireless/rt2x00/rt73usb.c | 46 +- trunk/drivers/net/wireless/rtl8180_grf5101.c | 2 +- trunk/drivers/net/wireless/rtl8180_max2820.c | 5 +- trunk/drivers/net/wireless/rtl8180_sa2400.c | 2 +- trunk/drivers/net/wireless/rtl8187_dev.c | 14 +- trunk/drivers/net/wireless/zd1211rw/zd_mac.c | 5 +- trunk/drivers/net/wireless/zd1211rw/zd_usb.c | 3 +- trunk/drivers/net/xen-netfront.c | 10 +- trunk/drivers/of/of_i2c.c | 1 + trunk/drivers/pci/access.c | 14 +- trunk/drivers/pci/hotplug/acpiphp_glue.c | 17 +- trunk/drivers/pci/hotplug/pci_hotplug_core.c | 7 +- trunk/drivers/pci/hotplug/pciehp.h | 11 +- trunk/drivers/pci/hotplug/pciehp_core.c | 6 +- trunk/drivers/pci/hotplug/pciehp_ctrl.c | 36 +- trunk/drivers/pci/hotplug/pciehp_hpc.c | 129 +- trunk/drivers/pci/hotplug/rpadlpar_sysfs.c | 8 +- trunk/drivers/pci/hotplug/shpchp_core.c | 4 - trunk/drivers/pci/intel-iommu.c | 51 +- trunk/drivers/pci/pci-driver.c | 2 +- trunk/drivers/pci/pci-sysfs.c | 89 +- trunk/drivers/pci/pci.h | 2 +- trunk/drivers/pci/pcie/aspm.c | 20 - trunk/drivers/pci/quirks.c | 43 - 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/electra_cf.c | 1 - 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/pnp/pnpacpi/rsparser.c | 46 +- trunk/drivers/pnp/quirks.c | 2 +- trunk/drivers/pnp/system.c | 2 +- trunk/drivers/power/power_supply_core.c | 6 +- trunk/drivers/power/power_supply_sysfs.c | 2 +- trunk/drivers/rapidio/rio-driver.c | 2 +- trunk/drivers/rtc/Kconfig | 19 - trunk/drivers/rtc/Makefile | 2 - trunk/drivers/rtc/interface.c | 102 +- trunk/drivers/rtc/rtc-at32ap700x.c | 10 +- trunk/drivers/rtc/rtc-cmos.c | 31 +- trunk/drivers/rtc/rtc-ds1374.c | 2 +- trunk/drivers/rtc/rtc-fm3130.c | 501 ----- trunk/drivers/rtc/rtc-pcf8563.c | 1 - trunk/drivers/rtc/rtc-ppc.c | 69 - trunk/drivers/rtc/rtc-sa1100.c | 4 +- trunk/drivers/rtc/rtc-x1205.c | 111 +- trunk/drivers/s390/block/dasd.c | 46 +- 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 | 37 +- 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 | 88 +- trunk/drivers/s390/char/tape.h | 3 - trunk/drivers/s390/char/tape_34xx.c | 12 +- trunk/drivers/s390/char/tape_3590.c | 23 +- trunk/drivers/s390/char/tape_block.c | 4 +- trunk/drivers/s390/char/tape_core.c | 31 +- trunk/drivers/s390/char/tty3270.c | 9 +- trunk/drivers/s390/char/vmcp.c | 37 +- trunk/drivers/s390/char/vmlogrdr.c | 38 +- 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/blacklist.c | 6 +- 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 | 280 +-- 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 +- .../asm-s390 => drivers/s390/cio}/schid.h | 18 +- 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/kvm/kvm_virtio.c | 58 +- 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 | 64 +- trunk/drivers/s390/net/qeth_core_offl.c | 6 +- trunk/drivers/s390/net/qeth_core_sys.c | 12 + trunk/drivers/s390/net/qeth_l2_main.c | 41 +- trunk/drivers/s390/net/qeth_l3_main.c | 84 +- trunk/drivers/s390/net/qeth_l3_sys.c | 24 + trunk/drivers/s390/net/smsgiucv.c | 10 +- trunk/drivers/s390/s390mach.c | 107 +- trunk/drivers/s390/s390mach.h | 10 - trunk/drivers/sbus/char/bpp.c | 6 +- trunk/drivers/scsi/3w-9xxx.c | 6 +- trunk/drivers/scsi/aha152x.c | 4 +- trunk/drivers/scsi/atp870u.c | 2 +- trunk/drivers/scsi/ch.c | 7 +- trunk/drivers/scsi/dpt/dptsig.h | 3 +- trunk/drivers/scsi/esp_scsi.c | 22 +- trunk/drivers/scsi/hosts.c | 9 +- trunk/drivers/scsi/hptiop.c | 12 +- trunk/drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- trunk/drivers/scsi/ibmvscsi/viosrp.h | 3 +- trunk/drivers/scsi/ipr.c | 6 +- trunk/drivers/scsi/mac_esp.c | 2 +- trunk/drivers/scsi/osst.c | 3 +- trunk/drivers/scsi/qla1280.c | 2 +- trunk/drivers/scsi/qla2xxx/qla_attr.c | 13 +- trunk/drivers/scsi/qla2xxx/qla_def.h | 2 +- trunk/drivers/scsi/qla2xxx/qla_gbl.h | 3 - trunk/drivers/scsi/qla2xxx/qla_inline.h | 4 - trunk/drivers/scsi/qla2xxx/qla_isr.c | 63 +- trunk/drivers/scsi/qla2xxx/qla_mbx.c | 12 +- trunk/drivers/scsi/qla2xxx/qla_mid.c | 19 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 30 +- trunk/drivers/scsi/qla2xxx/qla_version.h | 2 +- trunk/drivers/scsi/scsi_lib.c | 9 - trunk/drivers/scsi/scsi_sysfs.c | 7 +- trunk/drivers/scsi/ses.c | 2 +- trunk/drivers/scsi/sg.c | 55 +- trunk/drivers/scsi/sr.c | 23 +- trunk/drivers/scsi/st.c | 12 +- trunk/drivers/serial/8250.c | 4 +- trunk/drivers/serial/8250_pci.c | 7 +- trunk/drivers/serial/Kconfig | 2 +- trunk/drivers/serial/atmel_serial.c | 19 +- trunk/drivers/serial/bfin_5xx.c | 80 +- trunk/drivers/serial/sb1250-duart.c | 2 +- trunk/drivers/serial/serial_core.c | 19 +- trunk/drivers/serial/sh-sci.c | 8 +- trunk/drivers/serial/sunhv.c | 1 + trunk/drivers/serial/ucc_uart.c | 2 +- trunk/drivers/spi/spidev.c | 176 +- trunk/drivers/ssb/driver_pcicore.c | 9 +- trunk/drivers/ssb/main.c | 12 +- trunk/drivers/thermal/Kconfig | 9 - trunk/drivers/thermal/thermal_sys.c | 4 +- trunk/drivers/uio/uio.c | 7 +- trunk/drivers/usb/c67x00/c67x00-ll-hpi.c | 12 +- trunk/drivers/usb/class/Kconfig | 11 - trunk/drivers/usb/class/Makefile | 1 - trunk/drivers/usb/class/cdc-acm.c | 3 + trunk/drivers/usb/class/cdc-wdm.c | 740 ------- trunk/drivers/usb/core/generic.c | 5 + trunk/drivers/usb/core/hcd.c | 53 +- trunk/drivers/usb/core/hcd.h | 4 - trunk/drivers/usb/core/hub.c | 85 +- trunk/drivers/usb/core/quirks.c | 7 - trunk/drivers/usb/core/sysfs.c | 44 +- trunk/drivers/usb/gadget/fsl_usb2_udc.c | 2 - trunk/drivers/usb/gadget/pxa27x_udc.c | 3 +- trunk/drivers/usb/host/Kconfig | 8 +- trunk/drivers/usb/host/ehci-au1xxx.c | 1 - trunk/drivers/usb/host/ehci-fsl.c | 7 +- trunk/drivers/usb/host/ehci-hub.c | 16 +- trunk/drivers/usb/host/ehci-ixp4xx.c | 4 +- trunk/drivers/usb/host/ehci-orion.c | 10 +- trunk/drivers/usb/host/ehci-pci.c | 4 +- trunk/drivers/usb/host/ehci-ppc-of.c | 2 - trunk/drivers/usb/host/ehci-ppc-soc.c | 1 - trunk/drivers/usb/host/ehci-ps3.c | 1 - trunk/drivers/usb/host/ehci-sched.c | 67 +- trunk/drivers/usb/host/ehci.h | 24 +- trunk/drivers/usb/host/isp1760-hcd.c | 8 +- trunk/drivers/usb/host/isp1760-if.c | 4 +- trunk/drivers/usb/host/ohci-at91.c | 1 - trunk/drivers/usb/host/ohci-au1xxx.c | 3 +- trunk/drivers/usb/host/ohci-ep93xx.c | 1 - trunk/drivers/usb/host/ohci-hcd.c | 15 +- trunk/drivers/usb/host/ohci-hub.c | 53 +- trunk/drivers/usb/host/ohci-lh7a404.c | 3 +- trunk/drivers/usb/host/ohci-omap.c | 1 - trunk/drivers/usb/host/ohci-pci.c | 1 - trunk/drivers/usb/host/ohci-pnx4008.c | 1 - trunk/drivers/usb/host/ohci-pnx8550.c | 1 - trunk/drivers/usb/host/ohci-ppc-of.c | 1 - trunk/drivers/usb/host/ohci-ppc-soc.c | 1 - trunk/drivers/usb/host/ohci-ps3.c | 1 - trunk/drivers/usb/host/ohci-pxa27x.c | 1 - trunk/drivers/usb/host/ohci-q.c | 12 - trunk/drivers/usb/host/ohci-s3c2410.c | 3 +- trunk/drivers/usb/host/ohci-sa1111.c | 3 +- trunk/drivers/usb/host/ohci-sh.c | 1 - trunk/drivers/usb/host/ohci-sm501.c | 1 - trunk/drivers/usb/host/ohci-ssb.c | 1 - trunk/drivers/usb/host/u132-hcd.c | 11 - trunk/drivers/usb/misc/Kconfig | 12 - trunk/drivers/usb/misc/Makefile | 1 - trunk/drivers/usb/misc/isight_firmware.c | 140 -- trunk/drivers/usb/misc/phidgetkit.c | 6 +- trunk/drivers/usb/misc/phidgetmotorcontrol.c | 7 +- trunk/drivers/usb/misc/phidgetservo.c | 6 +- trunk/drivers/usb/misc/sisusbvga/sisusb.c | 2 + trunk/drivers/usb/serial/ch341.c | 1 - trunk/drivers/usb/serial/ftdi_sio.c | 266 +-- trunk/drivers/usb/serial/ftdi_sio.h | 276 +-- trunk/drivers/usb/serial/ipaq.c | 7 +- trunk/drivers/usb/serial/option.c | 42 +- trunk/drivers/usb/serial/pl2303.c | 3 +- trunk/drivers/usb/serial/pl2303.h | 3 +- trunk/drivers/usb/storage/unusual_devs.h | 18 +- trunk/drivers/video/Kconfig | 5 +- trunk/drivers/video/aty/atyfb_base.c | 2 +- trunk/drivers/video/aty/radeon_base.c | 4 +- trunk/drivers/video/cirrusfb.c | 6 +- trunk/drivers/video/console/fbcon.c | 4 +- trunk/drivers/video/display/display-sysfs.c | 10 +- trunk/drivers/video/fb_defio.c | 20 +- trunk/drivers/video/fsl-diu-fb.c | 29 +- trunk/drivers/video/hgafb.c | 26 +- trunk/drivers/video/leo.c | 58 +- trunk/drivers/video/matrox/matroxfb_base.h | 2 +- trunk/drivers/video/modedb.c | 2 - trunk/drivers/video/pxafb.c | 59 +- trunk/drivers/video/s3c2410fb.c | 130 +- trunk/drivers/video/s3c2410fb.h | 20 +- trunk/drivers/video/sgivwfb.c | 3 +- trunk/drivers/video/sis/sis_main.c | 2 +- trunk/drivers/video/sm501fb.c | 8 +- trunk/drivers/video/w100fb.c | 1 - trunk/drivers/video/xen-fbfront.c | 211 +- trunk/drivers/virtio/virtio.c | 10 +- trunk/drivers/virtio/virtio_pci.c | 7 + trunk/drivers/virtio/virtio_ring.c | 8 + trunk/drivers/watchdog/Kconfig | 13 - trunk/drivers/watchdog/Makefile | 1 - trunk/drivers/watchdog/bfin_wdt.c | 111 +- trunk/drivers/watchdog/booke_wdt.c | 88 +- trunk/drivers/watchdog/geodewdt.c | 308 --- trunk/drivers/watchdog/hpwdt.c | 155 +- trunk/drivers/watchdog/iTCO_wdt.c | 14 +- trunk/drivers/watchdog/w83697hf_wdt.c | 38 +- trunk/drivers/xen/Makefile | 2 +- trunk/drivers/xen/balloon.c | 10 +- trunk/drivers/xen/events.c | 116 +- trunk/drivers/xen/grant-table.c | 4 +- trunk/drivers/xen/manage.c | 252 --- trunk/drivers/xen/xenbus/xenbus_client.c | 2 +- trunk/drivers/xen/xenbus/xenbus_comms.c | 23 +- trunk/drivers/xen/xenbus/xenbus_xs.c | 10 +- trunk/fs/9p/v9fs_vfs.h | 2 +- trunk/fs/9p/vfs_file.c | 4 +- trunk/fs/9p/vfs_inode.c | 18 +- trunk/fs/Kconfig | 4 +- trunk/fs/Kconfig.binfmt | 2 +- trunk/fs/Makefile | 1 - trunk/fs/afs/callback.c | 2 +- trunk/fs/afs/inode.c | 2 +- trunk/fs/afs/super.c | 2 +- trunk/fs/aio.c | 4 + trunk/fs/binfmt_elf.c | 12 +- trunk/fs/binfmt_elf_fdpic.c | 2 +- trunk/fs/binfmt_flat.c | 8 +- trunk/fs/bio-integrity.c | 719 ------ trunk/fs/bio.c | 88 +- trunk/fs/block_dev.c | 16 +- trunk/fs/buffer.c | 13 +- trunk/fs/cifs/AUTHORS | 1 - trunk/fs/cifs/CHANGES | 10 +- trunk/fs/cifs/README | 5 - trunk/fs/cifs/TODO | 15 +- trunk/fs/cifs/asn1.c | 14 - trunk/fs/cifs/cifs_dfs_ref.c | 49 +- trunk/fs/cifs/cifs_fs_sb.h | 1 - trunk/fs/cifs/cifs_spnego.c | 3 - trunk/fs/cifs/cifsacl.c | 10 +- trunk/fs/cifs/cifsfs.c | 65 +- trunk/fs/cifs/cifsfs.h | 3 +- trunk/fs/cifs/cifsglob.h | 4 +- trunk/fs/cifs/cifspdu.h | 48 +- trunk/fs/cifs/cifsproto.h | 13 +- trunk/fs/cifs/cifssmb.c | 339 ++- trunk/fs/cifs/connect.c | 73 +- trunk/fs/cifs/dir.c | 34 +- trunk/fs/cifs/dns_resolve.c | 9 +- trunk/fs/cifs/file.c | 13 +- trunk/fs/cifs/inode.c | 573 +++-- trunk/fs/cifs/ioctl.c | 4 +- trunk/fs/cifs/link.c | 43 +- trunk/fs/cifs/misc.c | 3 +- trunk/fs/cifs/netmisc.c | 6 +- trunk/fs/cifs/ntlmssp.h | 4 +- trunk/fs/cifs/readdir.c | 84 +- trunk/fs/compat.c | 4 +- trunk/fs/dcache.c | 68 +- trunk/fs/dlm/lowcomms.c | 27 +- trunk/fs/dlm/netlink.c | 2 +- trunk/fs/dlm/plock.c | 2 +- trunk/fs/ecryptfs/crypto.c | 2 +- trunk/fs/ecryptfs/ecryptfs_kernel.h | 2 + trunk/fs/ecryptfs/miscdev.c | 28 +- trunk/fs/ecryptfs/read_write.c | 22 + trunk/fs/exec.c | 23 +- trunk/fs/ext3/resize.c | 3 +- trunk/fs/ext3/super.c | 4 +- trunk/fs/ext4/balloc.c | 71 +- trunk/fs/ext4/mballoc.c | 8 +- trunk/fs/ext4/resize.c | 6 +- trunk/fs/ext4/super.c | 40 +- trunk/fs/fat/file.c | 44 +- trunk/fs/file.c | 152 +- trunk/fs/fuse/inode.c | 11 +- trunk/fs/gfs2/bmap.c | 23 +- trunk/fs/gfs2/glops.c | 2 +- trunk/fs/gfs2/incore.h | 1 - trunk/fs/gfs2/inode.c | 10 +- trunk/fs/gfs2/meta_io.c | 6 +- trunk/fs/gfs2/ops_fstype.c | 4 +- trunk/fs/gfs2/ops_super.c | 16 +- trunk/fs/gfs2/rgrp.c | 4 +- trunk/fs/hppfs/Makefile | 5 +- trunk/fs/jbd2/commit.c | 1 - trunk/fs/jbd2/recovery.c | 12 +- trunk/fs/libfs.c | 46 - trunk/fs/locks.c | 6 + trunk/fs/namei.c | 38 +- trunk/fs/namespace.c | 14 +- trunk/fs/nfs/callback.c | 2 +- trunk/fs/nfs/callback_proc.c | 4 +- trunk/fs/nfs/callback_xdr.c | 40 +- trunk/fs/nfs/client.c | 8 +- trunk/fs/nfs/delegation.c | 4 +- trunk/fs/nfs/dir.c | 20 +- trunk/fs/nfs/file.c | 2 +- trunk/fs/nfs/inode.c | 14 +- trunk/fs/nfs/mount_clnt.c | 5 +- trunk/fs/nfs/namespace.c | 11 +- trunk/fs/nfs/nfs3proc.c | 6 +- trunk/fs/nfs/nfs4_fs.h | 1 + trunk/fs/nfs/nfs4namespace.c | 12 +- trunk/fs/nfs/nfs4proc.c | 38 +- trunk/fs/nfs/nfs4renewd.c | 10 +- trunk/fs/nfs/nfs4state.c | 8 +- trunk/fs/nfs/nfs4xdr.c | 100 +- trunk/fs/nfs/proc.c | 8 +- trunk/fs/nfs/read.c | 2 +- trunk/fs/nfs/super.c | 86 +- trunk/fs/nfs/write.c | 9 +- trunk/fs/nfsd/nfs4callback.c | 2 +- trunk/fs/ntfs/upcase.c | 5 +- trunk/fs/ocfs2/alloc.c | 4 +- trunk/fs/ocfs2/cluster/nodemanager.c | 74 +- trunk/fs/ocfs2/cluster/nodemanager.h | 4 + trunk/fs/ocfs2/cluster/tcp.c | 28 +- trunk/fs/ocfs2/cluster/tcp.h | 12 +- trunk/fs/ocfs2/cluster/tcp_internal.h | 32 - trunk/fs/ocfs2/dlm/dlmdebug.h | 12 +- trunk/fs/ocfs2/dlm/dlmmaster.c | 2 - trunk/fs/ocfs2/dlmglue.c | 14 +- trunk/fs/ocfs2/stack_o2cb.c | 41 +- trunk/fs/ocfs2/stack_user.c | 37 +- trunk/fs/ocfs2/stackglue.c | 119 +- trunk/fs/ocfs2/stackglue.h | 19 +- trunk/fs/open.c | 37 +- trunk/fs/pipe.c | 10 +- trunk/fs/proc/array.c | 2 +- trunk/fs/proc/base.c | 44 +- trunk/fs/proc/inode.c | 3 +- trunk/fs/proc/proc_misc.c | 24 +- trunk/fs/proc/task_mmu.c | 181 +- trunk/fs/proc/task_nommu.c | 2 +- trunk/fs/ramfs/file-mmu.c | 1 - trunk/fs/ramfs/file-nommu.c | 1 - trunk/fs/reiserfs/inode.c | 2 - trunk/fs/reiserfs/super.c | 4 +- trunk/fs/select.c | 2 +- trunk/fs/splice.c | 34 +- trunk/fs/sysfs/dir.c | 6 +- trunk/fs/udf/super.c | 57 +- trunk/fs/udf/udfdecl.h | 2 +- trunk/fs/utimes.c | 59 +- trunk/fs/xfs/linux-2.6/xfs_buf.c | 24 +- trunk/fs/xfs/linux-2.6/xfs_buf.h | 19 - trunk/fs/xfs/linux-2.6/xfs_file.c | 17 +- trunk/fs/xfs/linux-2.6/xfs_vnode.h | 8 + trunk/fs/xfs/xfs_inode.c | 9 +- trunk/fs/xfs/xfs_log.c | 15 +- trunk/fs/xfs/xfs_vnodeops.c | 112 +- trunk/fs/xfs/xfs_vnodeops.h | 3 +- trunk/include/Kbuild | 1 - trunk/include/acpi/processor.h | 1 - trunk/include/asm-alpha/core_mcpcia.h | 2 +- trunk/include/asm-alpha/core_t2.h | 14 +- trunk/include/asm-alpha/io.h | 6 +- trunk/include/asm-alpha/mmu_context.h | 6 +- trunk/include/asm-alpha/percpu.h | 74 +- trunk/include/asm-alpha/system.h | 10 +- trunk/include/asm-alpha/vga.h | 6 +- trunk/include/asm-arm/arch-at91/io.h | 2 + .../include/asm-arm/arch-omap/board-palmte.h | 2 + trunk/include/asm-arm/arch-omap/clock.h | 5 - trunk/include/asm-arm/arch-omap/entry-macro.S | 1 - trunk/include/asm-arm/arch-omap/gpio.h | 1 + trunk/include/asm-arm/arch-omap/hardware.h | 1 + trunk/include/asm-arm/arch-pxa/mfp-pxa27x.h | 1 - trunk/include/asm-arm/arch-pxa/pxa2xx-gpio.h | 9 - trunk/include/asm-arm/arch-pxa/regs-lcd.h | 5 +- trunk/include/asm-arm/arch-sa1100/collie.h | 4 - trunk/include/asm-arm/page.h | 4 +- trunk/include/asm-arm/pgtable-nommu.h | 1 + trunk/include/asm-arm/spinlock.h | 2 +- trunk/include/asm-arm/system.h | 29 +- 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-blackfin/bfin-global.h | 11 +- trunk/include/asm-blackfin/checksum.h | 29 +- trunk/include/asm-blackfin/gpio.h | 1 + trunk/include/asm-blackfin/io.h | 2 - .../include/asm-blackfin/mach-bf527/anomaly.h | 5 +- .../asm-blackfin/mach-bf527/bfin_serial_5xx.h | 8 +- .../asm-blackfin/mach-bf527/blackfin.h | 8 +- .../include/asm-blackfin/mach-bf533/anomaly.h | 31 +- .../asm-blackfin/mach-bf533/bfin_serial_5xx.h | 8 +- .../include/asm-blackfin/mach-bf537/anomaly.h | 10 +- .../asm-blackfin/mach-bf537/bfin_serial_5xx.h | 8 +- .../include/asm-blackfin/mach-bf548/anomaly.h | 2 - .../asm-blackfin/mach-bf548/bfin_serial_5xx.h | 12 +- .../include/asm-blackfin/mach-bf561/anomaly.h | 2 +- .../asm-blackfin/mach-bf561/bfin_serial_5xx.h | 8 +- trunk/include/asm-blackfin/mach-bf561/dma.h | 8 +- trunk/include/asm-blackfin/serial.h | 5 - trunk/include/asm-frv/checksum.h | 2 +- trunk/include/asm-frv/mem-layout.h | 7 - trunk/include/asm-frv/system.h | 2 +- trunk/include/asm-generic/Kbuild.asm | 2 +- trunk/include/asm-generic/atomic.h | 2 +- trunk/include/asm-generic/gpio.h | 6 +- trunk/include/asm-generic/pgtable.h | 57 - trunk/include/asm-generic/topology.h | 3 +- trunk/include/asm-generic/vmlinux.lds.h | 14 - trunk/include/asm-h8300/cacheflush.h | 2 +- trunk/include/asm-ia64/kvm.h | 12 +- trunk/include/asm-ia64/patch.h | 1 - trunk/include/asm-ia64/ptrace.h | 2 +- trunk/include/asm-ia64/sections.h | 1 - trunk/include/asm-ia64/sn/simulator.h | 7 +- trunk/include/asm-m32r/uaccess.h | 2 +- trunk/include/asm-m68k/bitops.h | 45 +- trunk/include/asm-mips/atomic.h | 4 +- trunk/include/asm-mips/cpu-info.h | 4 +- trunk/include/asm-mips/gic.h | 6 +- trunk/include/asm-mips/lasat/serial.h | 4 +- trunk/include/asm-mips/mach-au1x00/au1000.h | 3 +- .../asm-mips/mach-au1x00/au1xxx_dbdma.h | 1 - .../include/asm-mips/mach-au1x00/au1xxx_psc.h | 8 - trunk/include/asm-mips/mipsregs.h | 3 - trunk/include/asm-mips/pgtable-bits.h | 2 + trunk/include/asm-mips/pgtable.h | 3 +- trunk/include/asm-mips/rtlx.h | 2 +- trunk/include/asm-mn10300/ipcbuf.h | 2 +- trunk/include/asm-parisc/checksum.h | 2 +- trunk/include/asm-powerpc/Kbuild | 1 + trunk/include/asm-powerpc/hugetlb.h | 6 + trunk/include/asm-powerpc/io.h | 12 +- trunk/include/asm-powerpc/kvm_ppc.h | 1 - trunk/include/asm-powerpc/mediabay.h | 12 +- trunk/include/asm-powerpc/mpic.h | 3 +- trunk/include/asm-powerpc/pgtable-ppc64.h | 10 - trunk/include/asm-powerpc/spu.h | 1 + trunk/include/asm-powerpc/spu_csa.h | 2 +- trunk/include/asm-powerpc/system.h | 2 +- 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 | 6 +- trunk/include/asm-s390/processor.h | 24 +- trunk/include/asm-s390/ptrace.h | 15 - 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/system.h | 8 +- trunk/include/asm-s390/timer.h | 12 - trunk/include/asm-s390/types.h | 6 - trunk/include/asm-s390/zcrypt.h | 2 +- trunk/include/asm-sh/checksum_32.h | 2 +- trunk/include/asm-sh/kgdb.h | 14 + trunk/include/asm-sparc/asi.h | 1 + trunk/include/asm-sparc/auxio.h | 2 +- trunk/include/asm-sparc/bitops.h | 2 +- trunk/include/asm-sparc/btfixup.h | 2 +- trunk/include/asm-sparc/checksum.h | 1 + trunk/include/asm-sparc/clock.h | 2 +- trunk/include/asm-sparc/contregs.h | 1 + trunk/include/asm-sparc/cypress.h | 2 +- trunk/include/asm-sparc/delay.h | 2 +- trunk/include/asm-sparc/ebus.h | 2 +- trunk/include/asm-sparc/ecc.h | 2 +- trunk/include/asm-sparc/eeprom.h | 2 +- trunk/include/asm-sparc/elf.h | 1 + trunk/include/asm-sparc/fcntl.h | 1 + trunk/include/asm-sparc/head.h | 1 + trunk/include/asm-sparc/idprom.h | 2 +- trunk/include/asm-sparc/io.h | 3 + trunk/include/asm-sparc/ioctl.h | 1 + trunk/include/asm-sparc/kdebug.h | 2 +- trunk/include/asm-sparc/machines.h | 2 +- trunk/include/asm-sparc/mbus.h | 2 +- trunk/include/asm-sparc/memreg.h | 1 + trunk/include/asm-sparc/mman.h | 1 + trunk/include/asm-sparc/mostek.h | 2 +- trunk/include/asm-sparc/mpmbox.h | 2 +- trunk/include/asm-sparc/msi.h | 2 +- trunk/include/asm-sparc/mxcc.h | 2 +- trunk/include/asm-sparc/namei.h | 2 +- trunk/include/asm-sparc/obio.h | 2 +- trunk/include/asm-sparc/openprom.h | 1 + trunk/include/asm-sparc/oplib.h | 2 +- trunk/include/asm-sparc/page.h | 2 +- trunk/include/asm-sparc/param.h | 1 + trunk/include/asm-sparc/pbm.h | 2 +- trunk/include/asm-sparc/pcic.h | 2 +- trunk/include/asm-sparc/pgalloc.h | 1 + trunk/include/asm-sparc/pgtable.h | 1 + trunk/include/asm-sparc/pgtsrmmu.h | 2 +- trunk/include/asm-sparc/pgtsun4.h | 2 +- trunk/include/asm-sparc/pgtsun4c.h | 2 +- trunk/include/asm-sparc/psr.h | 2 +- trunk/include/asm-sparc/ptrace.h | 1 + trunk/include/asm-sparc/resource.h | 2 +- trunk/include/asm-sparc/ross.h | 2 +- trunk/include/asm-sparc/rtc.h | 3 +- trunk/include/asm-sparc/sbi.h | 2 +- trunk/include/asm-sparc/sbus.h | 2 +- trunk/include/asm-sparc/scatterlist.h | 1 + trunk/include/asm-sparc/shmparam.h | 1 + trunk/include/asm-sparc/sigcontext.h | 1 + trunk/include/asm-sparc/siginfo.h | 4 + trunk/include/asm-sparc/signal.h | 1 + trunk/include/asm-sparc/smpprim.h | 2 +- trunk/include/asm-sparc/socket.h | 1 + trunk/include/asm-sparc/stat.h | 1 + trunk/include/asm-sparc/statfs.h | 1 + trunk/include/asm-sparc/string.h | 2 +- trunk/include/asm-sparc/sun4paddr.h | 2 +- trunk/include/asm-sparc/sunbpp.h | 2 +- trunk/include/asm-sparc/sysen.h | 2 +- trunk/include/asm-sparc/termios.h | 1 + trunk/include/asm-sparc/timer.h | 2 +- trunk/include/asm-sparc/traps.h | 2 +- trunk/include/asm-sparc/tsunami.h | 2 +- trunk/include/asm-sparc/turbosparc.h | 2 +- trunk/include/asm-sparc/types.h | 1 + trunk/include/asm-sparc/uaccess.h | 2 +- trunk/include/asm-sparc/vac-ops.h | 1 + trunk/include/asm-sparc/vaddrs.h | 1 + trunk/include/asm-sparc/viking.h | 2 +- trunk/include/asm-sparc/winmacro.h | 2 +- trunk/include/asm-sparc64/apb.h | 2 +- trunk/include/asm-sparc64/asi.h | 1 + trunk/include/asm-sparc64/auxio.h | 2 +- trunk/include/asm-sparc64/bbc.h | 2 +- trunk/include/asm-sparc64/bitops.h | 2 +- trunk/include/asm-sparc64/chafsr.h | 1 + trunk/include/asm-sparc64/checksum.h | 1 + trunk/include/asm-sparc64/chmctrl.h | 1 + trunk/include/asm-sparc64/dcr.h | 1 + trunk/include/asm-sparc64/display7seg.h | 2 +- trunk/include/asm-sparc64/dma.h | 2 +- trunk/include/asm-sparc64/ebus.h | 2 +- trunk/include/asm-sparc64/elf.h | 1 + trunk/include/asm-sparc64/envctrl.h | 2 +- trunk/include/asm-sparc64/estate.h | 1 + trunk/include/asm-sparc64/fcntl.h | 1 + trunk/include/asm-sparc64/fhc.h | 2 +- trunk/include/asm-sparc64/head.h | 1 + trunk/include/asm-sparc64/ide.h | 2 +- trunk/include/asm-sparc64/idprom.h | 2 +- trunk/include/asm-sparc64/io.h | 66 +- trunk/include/asm-sparc64/ioctl.h | 1 + trunk/include/asm-sparc64/ioctls.h | 1 + trunk/include/asm-sparc64/lsu.h | 1 + trunk/include/asm-sparc64/mman.h | 1 + trunk/include/asm-sparc64/mmu_context.h | 1 + trunk/include/asm-sparc64/namei.h | 2 +- trunk/include/asm-sparc64/openprom.h | 1 + trunk/include/asm-sparc64/page.h | 2 + trunk/include/asm-sparc64/pgalloc.h | 1 + trunk/include/asm-sparc64/pgtable.h | 2 +- trunk/include/asm-sparc64/pil.h | 1 + trunk/include/asm-sparc64/processor.h | 2 +- trunk/include/asm-sparc64/psrcompat.h | 1 + trunk/include/asm-sparc64/pstate.h | 1 + trunk/include/asm-sparc64/ptrace.h | 25 - trunk/include/asm-sparc64/reg.h | 2 +- trunk/include/asm-sparc64/resource.h | 2 +- trunk/include/asm-sparc64/rtc.h | 3 +- trunk/include/asm-sparc64/rwsem.h | 2 +- trunk/include/asm-sparc64/scatterlist.h | 1 + trunk/include/asm-sparc64/shmparam.h | 1 + trunk/include/asm-sparc64/sigcontext.h | 1 + trunk/include/asm-sparc64/signal.h | 1 + trunk/include/asm-sparc64/smp.h | 5 +- trunk/include/asm-sparc64/socket.h | 1 + trunk/include/asm-sparc64/starfire.h | 2 +- trunk/include/asm-sparc64/stat.h | 1 + trunk/include/asm-sparc64/statfs.h | 1 + trunk/include/asm-sparc64/string.h | 2 +- trunk/include/asm-sparc64/sunbpp.h | 2 +- trunk/include/asm-sparc64/termios.h | 1 + trunk/include/asm-sparc64/ttable.h | 1 + trunk/include/asm-sparc64/types.h | 1 + trunk/include/asm-sparc64/uaccess.h | 1 + trunk/include/asm-sparc64/uctx.h | 2 +- trunk/include/asm-sparc64/utrap.h | 2 +- trunk/include/asm-sparc64/watchdog.h | 2 +- trunk/include/asm-um/mmu_context.h | 12 +- trunk/include/asm-v850/clinkage.h | 2 +- trunk/include/asm-x86/acpi.h | 5 +- trunk/include/asm-x86/amd_iommu.h | 32 - trunk/include/asm-x86/amd_iommu_types.h | 244 -- trunk/include/asm-x86/apic.h | 14 +- trunk/include/asm-x86/asm.h | 55 +- trunk/include/asm-x86/atomic_64.h | 32 +- trunk/include/asm-x86/bios_ebda.h | 2 - trunk/include/asm-x86/bitops.h | 68 +- trunk/include/asm-x86/bootparam.h | 2 - trunk/include/asm-x86/cmpxchg_64.h | 37 - trunk/include/asm-x86/cpufeature.h | 9 +- trunk/include/asm-x86/current.h | 42 +- trunk/include/asm-x86/current_32.h | 17 + trunk/include/asm-x86/current_64.h | 27 + trunk/include/asm-x86/desc.h | 50 +- trunk/include/asm-x86/desc_defs.h | 4 - trunk/include/asm-x86/dmi.h | 8 + trunk/include/asm-x86/dwarf2.h | 62 +- trunk/include/asm-x86/dwarf2_32.h | 61 + trunk/include/asm-x86/dwarf2_64.h | 56 + trunk/include/asm-x86/e820.h | 107 +- trunk/include/asm-x86/e820_32.h | 50 + trunk/include/asm-x86/e820_64.h | 56 + trunk/include/asm-x86/efi.h | 2 +- trunk/include/asm-x86/elf.h | 2 +- trunk/include/asm-x86/fixmap.h | 55 - trunk/include/asm-x86/fixmap_32.h | 50 +- trunk/include/asm-x86/fixmap_64.h | 59 +- trunk/include/asm-x86/gart.h | 84 +- trunk/include/asm-x86/genapic_64.h | 2 - trunk/include/asm-x86/geode.h | 4 +- trunk/include/asm-x86/hardirq.h | 6 - trunk/include/asm-x86/highmem.h | 3 - trunk/include/asm-x86/hpet.h | 2 +- trunk/include/asm-x86/hw_irq.h | 105 +- trunk/include/asm-x86/hw_irq_32.h | 66 + trunk/include/asm-x86/hw_irq_64.h | 173 ++ trunk/include/asm-x86/i387.h | 2 - trunk/include/asm-x86/i8259.h | 2 - trunk/include/asm-x86/io.h | 83 - trunk/include/asm-x86/io_32.h | 61 + trunk/include/asm-x86/io_64.h | 71 + trunk/include/asm-x86/io_apic.h | 39 +- trunk/include/asm-x86/iommu.h | 31 +- trunk/include/asm-x86/ipi.h | 1 - trunk/include/asm-x86/irq.h | 51 +- trunk/include/asm-x86/irq_32.h | 51 + trunk/include/asm-x86/irq_64.h | 51 + trunk/include/asm-x86/irq_vectors.h | 169 -- trunk/include/asm-x86/irqflags.h | 41 +- trunk/include/asm-x86/kvm_host.h | 4 +- trunk/include/asm-x86/kvm_para.h | 33 +- trunk/include/asm-x86/kvm_x86_emulate.h | 1 - trunk/include/asm-x86/mach-bigsmp/mach_apic.h | 2 +- .../include/asm-x86/mach-bigsmp/mach_mpspec.h | 8 + .../asm-x86/mach-default/irq_vectors.h | 96 + .../asm-x86/mach-default/irq_vectors_limits.h | 16 + .../include/asm-x86/mach-default/mach_apic.h | 4 - .../include/asm-x86/mach-default/setup_arch.h | 4 + .../asm-x86/mach-default/smpboot_hooks.h | 10 +- .../include/asm-x86/mach-es7000/mach_mpspec.h | 8 + .../asm-x86/mach-generic/mach_mpparse.h | 7 +- trunk/include/asm-x86/mach-numaq/mach_apic.h | 39 +- .../include/asm-x86/mach-numaq/mach_mpparse.h | 11 +- .../include/asm-x86/mach-numaq/mach_mpspec.h | 8 + .../include/asm-x86/mach-summit/mach_mpspec.h | 9 + .../asm-x86/{visws => mach-visws}/cobalt.h | 0 .../include/asm-x86/mach-visws/irq_vectors.h | 62 + .../asm-x86/{visws => mach-visws}/lithium.h | 0 trunk/include/asm-x86/mach-visws/mach_apic.h | 104 +- .../include/asm-x86/mach-visws/mach_apicdef.h | 13 +- .../asm-x86/{visws => mach-visws}/piix4.h | 0 trunk/include/asm-x86/mach-visws/setup_arch.h | 9 +- .../asm-x86/mach-visws/smpboot_hooks.h | 29 +- .../asm-x86/mach-voyager/irq_vectors.h | 79 + trunk/include/asm-x86/mmconfig.h | 12 - trunk/include/asm-x86/mmu_context.h | 32 - trunk/include/asm-x86/mmu_context_32.h | 28 + trunk/include/asm-x86/mmu_context_64.h | 18 + trunk/include/asm-x86/mmzone_32.h | 26 +- trunk/include/asm-x86/mpspec.h | 36 +- trunk/include/asm-x86/mpspec_def.h | 9 +- trunk/include/asm-x86/msr-index.h | 4 +- trunk/include/asm-x86/msr.h | 7 +- trunk/include/asm-x86/nmi.h | 47 +- trunk/include/asm-x86/numa_32.h | 8 +- trunk/include/asm-x86/numa_64.h | 20 +- trunk/include/asm-x86/numaq.h | 8 +- trunk/include/asm-x86/page.h | 27 +- trunk/include/asm-x86/page_32.h | 18 +- trunk/include/asm-x86/page_64.h | 18 +- trunk/include/asm-x86/paravirt.h | 197 +- trunk/include/asm-x86/pat.h | 8 +- trunk/include/asm-x86/pci.h | 2 - trunk/include/asm-x86/pci_32.h | 14 +- trunk/include/asm-x86/pda.h | 5 +- trunk/include/asm-x86/percpu.h | 46 - trunk/include/asm-x86/pgalloc.h | 4 - trunk/include/asm-x86/pgtable-3level.h | 6 +- trunk/include/asm-x86/pgtable.h | 142 +- trunk/include/asm-x86/pgtable_32.h | 24 +- trunk/include/asm-x86/pgtable_64.h | 20 +- trunk/include/asm-x86/processor-flags.h | 6 - trunk/include/asm-x86/processor.h | 9 +- trunk/include/asm-x86/proto.h | 2 + trunk/include/asm-x86/ptrace.h | 8 +- trunk/include/asm-x86/pvclock-abi.h | 42 - trunk/include/asm-x86/pvclock.h | 13 - trunk/include/asm-x86/reboot.h | 2 +- trunk/include/asm-x86/required-features.h | 8 +- trunk/include/asm-x86/resume-trace.h | 2 +- trunk/include/asm-x86/seccomp_32.h | 1 - trunk/include/asm-x86/seccomp_64.h | 1 - trunk/include/asm-x86/segment.h | 23 +- trunk/include/asm-x86/setup.h | 37 +- trunk/include/asm-x86/smp.h | 27 +- trunk/include/asm-x86/srat.h | 12 +- trunk/include/asm-x86/string_32.h | 323 ++- trunk/include/asm-x86/suspend_32.h | 5 - trunk/include/asm-x86/system.h | 10 +- trunk/include/asm-x86/thread_info.h | 248 +-- trunk/include/asm-x86/thread_info_32.h | 205 ++ trunk/include/asm-x86/thread_info_64.h | 195 ++ trunk/include/asm-x86/time.h | 2 - trunk/include/asm-x86/timer.h | 4 +- trunk/include/asm-x86/tlbflush.h | 13 +- trunk/include/asm-x86/topology.h | 157 +- trunk/include/asm-x86/tsc.h | 2 + trunk/include/asm-x86/uaccess.h | 448 ---- trunk/include/asm-x86/uaccess_32.h | 422 ++++ trunk/include/asm-x86/uaccess_64.h | 263 ++- trunk/include/asm-x86/unistd_64.h | 2 +- trunk/include/asm-x86/uv/uv_bau.h | 337 --- trunk/include/asm-x86/uv/uv_hub.h | 190 +- trunk/include/asm-x86/uv/uv_mmrs.h | 954 +------- trunk/include/asm-x86/visws/sgivw.h | 5 - trunk/include/asm-x86/vm86.h | 11 +- trunk/include/asm-x86/vmi_time.h | 2 +- trunk/include/asm-x86/xen/hypercall.h | 11 +- trunk/include/asm-x86/xen/page.h | 31 +- trunk/include/asm-x86/xor_32.h | 5 - trunk/include/asm-x86/xor_64.h | 5 - trunk/include/crypto/hash.h | 154 -- trunk/include/crypto/internal/hash.h | 78 - trunk/include/drm/Kbuild | 10 - trunk/include/linux/Kbuild | 7 +- trunk/include/linux/a.out.h | 8 + trunk/include/linux/acpi.h | 6 - trunk/include/linux/agp_backend.h | 16 +- trunk/include/linux/agpgart.h | 4 +- trunk/include/linux/atm.h | 7 +- trunk/include/linux/atm_tcp.h | 12 +- trunk/include/linux/audit.h | 2 +- trunk/include/linux/binfmts.h | 1 - trunk/include/linux/bio.h | 130 +- trunk/include/linux/bitrev.h | 1 - trunk/include/linux/blkdev.h | 163 +- trunk/include/linux/blktrace_api.h | 27 - trunk/include/linux/bootmem.h | 4 +- trunk/include/linux/capability.h | 31 +- trunk/include/linux/cfag12864b.h | 2 +- trunk/include/linux/console.h | 2 - trunk/include/linux/cpuidle.h | 1 - trunk/include/linux/cpumask.h | 4 - trunk/include/linux/crypto.h | 48 +- trunk/include/linux/dcache.h | 2 +- trunk/include/linux/debug_locks.h | 10 +- trunk/include/linux/delay.h | 1 - trunk/include/linux/device.h | 15 - trunk/include/linux/efi.h | 4 + trunk/include/linux/fdtable.h | 1 - trunk/include/linux/firmware-map.h | 74 - trunk/include/linux/firmware.h | 2 +- trunk/include/linux/fs.h | 8 +- trunk/include/linux/genhd.h | 12 - trunk/include/linux/gpio.h | 3 - trunk/include/linux/hid.h | 3 +- trunk/include/linux/hiddev.h | 2 + trunk/include/linux/i2c.h | 2 +- trunk/include/linux/ide.h | 17 +- trunk/include/linux/if_tunnel.h | 2 +- trunk/include/linux/in_route.h | 12 +- trunk/include/linux/inet_lro.h | 6 +- trunk/include/linux/inetdevice.h | 1 + trunk/include/linux/init_task.h | 23 +- trunk/include/linux/input.h | 6 +- trunk/include/linux/iocontext.h | 18 - trunk/include/linux/ioport.h | 6 +- trunk/include/linux/ipv6.h | 4 +- trunk/include/linux/jbd2.h | 3 - trunk/include/linux/kernel.h | 3 - trunk/include/linux/kernel_stat.h | 2 +- trunk/include/linux/ks0108.h | 2 +- trunk/include/linux/kvm_host.h | 3 +- trunk/include/linux/libata.h | 25 +- trunk/include/linux/linkage.h | 4 - trunk/include/linux/math64.h | 21 - trunk/include/linux/memory_hotplug.h | 16 +- trunk/include/linux/mm.h | 24 +- trunk/include/linux/mman.h | 4 +- trunk/include/linux/mmzone.h | 2 +- trunk/include/linux/mod_devicetable.h | 12 +- trunk/include/linux/msdos_fs.h | 12 +- trunk/include/linux/msg.h | 4 +- trunk/include/linux/mtd/nand.h | 2 +- trunk/include/linux/netdevice.h | 7 - trunk/include/linux/netfilter.h | 2 +- .../include/linux/netfilter_arp/arp_tables.h | 2 +- .../include/linux/netfilter_ipv4/ip_tables.h | 2 +- .../include/linux/netfilter_ipv6/ip6_tables.h | 2 +- trunk/include/linux/page-flags.h | 25 - trunk/include/linux/pageblock-flags.h | 8 +- trunk/include/linux/pci.h | 1 - trunk/include/linux/pci_ids.h | 6 - trunk/include/linux/proc_fs.h | 4 +- trunk/include/linux/ptrace.h | 8 +- trunk/include/linux/raid/bitmap.h | 1 + trunk/include/linux/raid/md.h | 2 - trunk/include/linux/raid/md_k.h | 7 +- trunk/include/linux/rculist.h | 6 - trunk/include/linux/resume-trace.h | 2 +- trunk/include/linux/rtnetlink.h | 5 +- trunk/include/linux/sched.h | 75 +- trunk/include/linux/securebits.h | 15 +- trunk/include/linux/security.h | 49 +- trunk/include/linux/serial_core.h | 1 - trunk/include/linux/slab.h | 13 +- trunk/include/linux/slub_def.h | 4 +- trunk/include/linux/sm501.h | 4 +- trunk/include/linux/spi/mmc_spi.h | 2 - trunk/include/linux/ssb/ssb_driver_gige.h | 2 +- trunk/include/linux/sunrpc/svc_rdma.h | 12 +- trunk/include/linux/tcp.h | 9 +- trunk/include/linux/thermal.h | 6 +- trunk/include/linux/time.h | 16 +- trunk/include/linux/topology.h | 4 +- trunk/include/linux/tty.h | 2 +- trunk/include/linux/tty_driver.h | 5 +- trunk/include/linux/types.h | 4 +- trunk/include/linux/usb/cdc.h | 9 - trunk/include/linux/videodev2.h | 6 +- trunk/include/linux/virtio_blk.h | 9 +- trunk/include/linux/virtio_config.h | 6 +- trunk/include/linux/virtio_net.h | 2 +- trunk/include/linux/virtio_rng.h | 8 - trunk/include/linux/wm97xx.h | 1 - trunk/include/linux/xfrm.h | 1 - trunk/include/media/cx25840.h | 6 +- trunk/include/media/ir-common.h | 1 - trunk/include/media/v4l2-dev.h | 5 +- trunk/include/media/videobuf-core.h | 3 - trunk/include/net/addrconf.h | 22 - trunk/include/net/genetlink.h | 4 +- trunk/include/net/inet_sock.h | 10 - trunk/include/net/ipv6.h | 6 - trunk/include/net/mac80211.h | 34 +- trunk/include/net/ndisc.h | 4 - trunk/include/net/net_namespace.h | 11 - .../net/netfilter/nf_conntrack_extend.h | 1 - trunk/include/net/netlink.h | 31 +- trunk/include/net/request_sock.h | 4 +- trunk/include/net/sch_generic.h | 2 +- trunk/include/net/sctp/structs.h | 17 +- trunk/include/net/tcp.h | 2 + trunk/include/net/transp_v6.h | 3 +- trunk/include/net/udp.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/rdma/ib_verbs.h | 1 + trunk/include/sound/ac97_codec.h | 1 - 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/include/xen/events.h | 4 - trunk/include/xen/grant_table.h | 3 - trunk/include/xen/hvc-console.h | 9 - trunk/include/xen/interface/elfnote.h | 20 - trunk/include/xen/interface/features.h | 3 - trunk/include/xen/interface/io/fbif.h | 29 +- trunk/include/xen/interface/io/kbdif.h | 2 - trunk/include/xen/interface/memory.h | 12 +- trunk/include/xen/interface/xen.h | 16 +- trunk/include/xen/xen-ops.h | 6 - trunk/init/Kconfig | 1 - trunk/init/calibrate.c | 60 +- trunk/init/do_mounts_md.c | 1 + trunk/ipc/msg.c | 13 +- trunk/ipc/shm.c | 18 +- trunk/kernel/Makefile | 5 +- trunk/kernel/audit.c | 17 +- trunk/kernel/audit_tree.c | 5 +- trunk/kernel/auditfilter.c | 3 +- trunk/kernel/capability.c | 132 +- trunk/kernel/cgroup.c | 2 +- trunk/kernel/cpu.c | 24 - trunk/kernel/cpuset.c | 56 +- trunk/kernel/exit.c | 8 +- trunk/kernel/fork.c | 131 +- trunk/kernel/futex.c | 93 +- trunk/kernel/hrtimer.c | 8 - trunk/kernel/kgdb.c | 19 +- trunk/kernel/kprobes.c | 17 +- trunk/kernel/kthread.c | 1 - trunk/kernel/module.c | 18 +- trunk/kernel/printk.c | 7 +- trunk/kernel/ptrace.c | 15 +- trunk/kernel/rcuclassic.c | 16 +- trunk/kernel/rcupreempt.c | 22 +- trunk/kernel/relay.c | 2 +- trunk/kernel/sched.c | 867 ++++---- trunk/kernel/sched_clock.c | 153 +- trunk/kernel/sched_cpupri.c | 174 -- trunk/kernel/sched_cpupri.h | 36 - trunk/kernel/sched_debug.c | 59 +- trunk/kernel/sched_fair.c | 247 +-- trunk/kernel/sched_features.h | 7 +- trunk/kernel/sched_rt.c | 457 ++-- trunk/kernel/sched_stats.h | 49 +- trunk/kernel/signal.c | 51 +- trunk/kernel/softlockup.c | 16 +- trunk/kernel/stop_machine.c | 7 +- trunk/kernel/sys.c | 6 +- trunk/kernel/sysctl.c | 13 +- trunk/kernel/time/tick-broadcast.c | 6 +- trunk/kernel/time/tick-sched.c | 2 - trunk/kernel/workqueue.c | 2 +- trunk/lib/bitrev.c | 3 +- trunk/lib/bug.c | 2 - trunk/lib/debugobjects.c | 15 +- trunk/lib/div64.c | 10 - trunk/lib/lmb.c | 3 +- trunk/lib/radix-tree.c | 122 +- trunk/lib/ts_bm.c | 2 +- trunk/lib/vsprintf.c | 128 +- trunk/mm/Kconfig | 4 +- trunk/mm/allocpercpu.c | 2 +- trunk/mm/backing-dev.c | 12 +- trunk/mm/bootmem.c | 6 +- trunk/mm/hugetlb.c | 2 +- trunk/mm/memory.c | 85 +- trunk/mm/mempolicy.c | 6 +- trunk/mm/migrate.c | 12 +- trunk/mm/mmap.c | 12 +- trunk/mm/mprotect.c | 10 +- trunk/mm/nommu.c | 21 +- trunk/mm/page_alloc.c | 137 +- trunk/mm/pagewalk.c | 42 +- trunk/mm/slab.c | 5 +- trunk/mm/slob.c | 5 +- trunk/mm/slub.c | 28 +- trunk/mm/sparse-vmemmap.c | 2 +- trunk/mm/swap.c | 4 +- trunk/mm/vmscan.c | 2 +- trunk/net/8021q/vlan.c | 28 +- trunk/net/8021q/vlan_dev.c | 2 - trunk/net/atm/br2684.c | 78 +- trunk/net/ax25/ax25_subr.c | 11 +- trunk/net/bluetooth/rfcomm/core.c | 2 +- trunk/net/bluetooth/rfcomm/tty.c | 13 +- trunk/net/bridge/br_if.c | 10 +- trunk/net/can/af_can.c | 10 - trunk/net/can/bcm.c | 23 +- trunk/net/can/raw.c | 3 - trunk/net/core/dev.c | 52 +- trunk/net/core/fib_rules.c | 4 +- trunk/net/core/filter.c | 1 + trunk/net/core/neighbour.c | 9 +- trunk/net/core/net_namespace.c | 3 - trunk/net/core/pktgen.c | 4 - trunk/net/core/rtnetlink.c | 3 +- trunk/net/core/skbuff.c | 22 +- trunk/net/core/user_dma.c | 2 +- trunk/net/dccp/ackvec.c | 29 +- trunk/net/dccp/ccids/ccid3.c | 27 +- trunk/net/dccp/ccids/lib/tfrc.c | 8 + trunk/net/dccp/ccids/lib/tfrc.h | 25 +- trunk/net/dccp/ccids/lib/tfrc_equation.c | 8 +- trunk/net/dccp/ipv4.c | 7 +- trunk/net/dccp/ipv6.c | 1 + trunk/net/dccp/minisocks.c | 8 +- trunk/net/dccp/options.c | 4 +- trunk/net/dccp/output.c | 2 - trunk/net/dccp/probe.c | 2 +- trunk/net/ipv4/arp.c | 5 +- trunk/net/ipv4/devinet.c | 9 + trunk/net/ipv4/fib_frontend.c | 1 + trunk/net/ipv4/fib_semantics.c | 5 +- trunk/net/ipv4/fib_trie.c | 17 +- trunk/net/ipv4/inet_connection_sock.c | 11 +- trunk/net/ipv4/inet_fragment.c | 16 +- trunk/net/ipv4/inet_lro.c | 3 +- trunk/net/ipv4/ip_fragment.c | 2 - trunk/net/ipv4/ip_gre.c | 146 +- trunk/net/ipv4/ipip.c | 130 +- trunk/net/ipv4/netfilter/nf_nat_core.c | 3 +- trunk/net/ipv4/netfilter/nf_nat_snmp_basic.c | 16 +- trunk/net/ipv4/raw.c | 11 +- trunk/net/ipv4/route.c | 4 +- trunk/net/ipv4/syncookies.c | 3 +- trunk/net/ipv4/tcp.c | 40 +- trunk/net/ipv4/tcp_input.c | 80 +- trunk/net/ipv4/tcp_ipv4.c | 20 +- trunk/net/ipv4/tcp_minisocks.c | 32 +- trunk/net/ipv4/tcp_output.c | 12 +- trunk/net/ipv4/tcp_probe.c | 2 +- trunk/net/ipv4/tcp_timer.c | 5 + trunk/net/ipv4/tunnel4.c | 2 +- trunk/net/ipv4/udp.c | 3 +- trunk/net/ipv4/xfrm4_mode_tunnel.c | 2 +- trunk/net/ipv6/addrconf.c | 146 +- trunk/net/ipv6/af_inet6.c | 2 +- trunk/net/ipv6/datagram.c | 50 +- trunk/net/ipv6/exthdrs.c | 2 +- trunk/net/ipv6/ip6_flowlabel.c | 2 +- trunk/net/ipv6/ip6_input.c | 9 - trunk/net/ipv6/ip6mr.c | 2 +- trunk/net/ipv6/ipv6_sockglue.c | 44 +- trunk/net/ipv6/ndisc.c | 8 +- trunk/net/ipv6/netfilter/ip6table_mangle.c | 2 +- trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 9 +- trunk/net/ipv6/raw.c | 13 +- trunk/net/ipv6/reassembly.c | 2 - trunk/net/ipv6/route.c | 32 +- trunk/net/ipv6/sit.c | 133 +- trunk/net/ipv6/syncookies.c | 1 + trunk/net/ipv6/tcp_ipv6.c | 7 +- trunk/net/ipv6/tunnel6.c | 2 +- trunk/net/ipv6/udp.c | 8 +- trunk/net/irda/af_irda.c | 12 +- trunk/net/irda/irnetlink.c | 4 +- trunk/net/iucv/af_iucv.c | 8 +- trunk/net/iucv/iucv.c | 9 +- trunk/net/key/af_key.c | 5 +- trunk/net/llc/llc_sap.c | 10 +- trunk/net/mac80211/cfg.c | 4 +- trunk/net/mac80211/ieee80211_i.h | 2 +- trunk/net/mac80211/key.c | 9 - trunk/net/mac80211/main.c | 7 +- trunk/net/mac80211/mlme.c | 87 +- trunk/net/mac80211/rc80211_pid.h | 5 + trunk/net/mac80211/rc80211_pid_algo.c | 31 +- trunk/net/mac80211/rx.c | 4 +- trunk/net/mac80211/tx.c | 13 +- trunk/net/mac80211/util.c | 41 +- trunk/net/mac80211/wext.c | 35 +- trunk/net/mac80211/wme.c | 5 +- trunk/net/netfilter/nf_conntrack_core.c | 3 +- trunk/net/netfilter/nf_conntrack_expect.c | 4 +- trunk/net/netfilter/nf_conntrack_extend.c | 9 +- trunk/net/netfilter/nf_conntrack_h323_main.c | 22 +- trunk/net/netfilter/nf_conntrack_proto_tcp.c | 23 +- trunk/net/netfilter/nf_log.c | 4 + trunk/net/netfilter/xt_connlimit.c | 3 +- trunk/net/netlabel/netlabel_cipso_v4.c | 7 +- trunk/net/netlabel/netlabel_mgmt.c | 12 +- trunk/net/netlabel/netlabel_unlabeled.c | 8 +- trunk/net/netlink/af_netlink.c | 2 +- trunk/net/netlink/attr.c | 19 +- trunk/net/netlink/genetlink.c | 21 +- trunk/net/sched/Kconfig | 11 + trunk/net/sched/cls_api.c | 2 +- trunk/net/sched/sch_api.c | 6 +- trunk/net/sched/sch_atm.c | 7 +- trunk/net/sched/sch_cbq.c | 8 +- trunk/net/sched/sch_dsmark.c | 8 +- trunk/net/sched/sch_generic.c | 2 +- trunk/net/sched/sch_gred.c | 3 +- trunk/net/sched/sch_hfsc.c | 8 +- trunk/net/sched/sch_htb.c | 27 +- trunk/net/sched/sch_ingress.c | 2 +- trunk/net/sched/sch_prio.c | 2 +- trunk/net/sched/sch_red.c | 3 +- trunk/net/sched/sch_sfq.c | 2 +- trunk/net/sctp/associola.c | 34 +- trunk/net/sctp/ipv6.c | 11 +- trunk/net/sctp/output.c | 2 +- trunk/net/sctp/outqueue.c | 120 +- trunk/net/sctp/protocol.c | 26 +- trunk/net/sctp/sm_statefuns.c | 9 +- trunk/net/sctp/socket.c | 4 +- trunk/net/sctp/transport.c | 50 +- trunk/net/sctp/ulpevent.c | 5 - trunk/net/sunrpc/auth_generic.c | 8 +- trunk/net/sunrpc/auth_gss/svcauth_gss.c | 12 +- trunk/net/sunrpc/rpcb_clnt.c | 23 +- trunk/net/sunrpc/svc_xprt.c | 23 + trunk/net/sunrpc/svcauth_unix.c | 4 +- trunk/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 102 +- trunk/net/sunrpc/xprtrdma/svc_rdma_sendto.c | 11 - .../net/sunrpc/xprtrdma/svc_rdma_transport.c | 290 +-- trunk/net/unix/af_unix.c | 75 +- trunk/net/wireless/nl80211.c | 12 +- trunk/net/wireless/reg.c | 18 - trunk/net/xfrm/xfrm_algo.c | 4 +- trunk/net/xfrm/xfrm_user.c | 14 +- trunk/scripts/Makefile.modpost | 6 - trunk/scripts/checkpatch.pl | 284 +-- trunk/scripts/decodecode | 0 trunk/scripts/kallsyms.c | 3 - trunk/scripts/kconfig/util.c | 2 +- trunk/scripts/kernel-doc | 4 +- trunk/scripts/mksysmap | 3 +- trunk/scripts/mod/file2alias.c | 12 - trunk/scripts/mod/modpost.c | 27 +- trunk/scripts/ver_linux | 5 +- trunk/security/Kconfig | 10 +- trunk/security/Makefile | 11 +- trunk/security/capability.c | 1043 +-------- trunk/security/commoncap.c | 16 +- trunk/security/device_cgroup.c | 44 +- trunk/security/dummy.c | 1229 +++++++++++ trunk/security/keys/internal.h | 1 + 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 | 40 +- trunk/sound/Kconfig | 37 +- 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 | 16 +- trunk/sound/core/timer.c | 6 +- trunk/sound/drivers/Kconfig | 98 +- trunk/sound/drivers/pcsp/pcsp.c | 2 +- trunk/sound/drivers/pcsp/pcsp.h | 6 +- trunk/sound/drivers/pcsp/pcsp_lib.c | 58 +- trunk/sound/drivers/pcsp/pcsp_mixer.c | 3 +- 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/sb/sb_mixer.c | 4 +- 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/oss/vwsnd.c | 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 | 129 +- trunk/sound/pci/{ => ac97}/ak4531_codec.c | 34 +- trunk/sound/pci/au88x0/au88x0_game.c | 2 + trunk/sound/pci/aw2/aw2-alsa.c | 4 +- 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 | 16 +- 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 | 89 +- trunk/sound/pci/hda/patch_cmedia.c | 1 - trunk/sound/pci/hda/patch_conexant.c | 33 +- trunk/sound/pci/hda/patch_realtek.c | 602 +---- trunk/sound/pci/hda/patch_sigmatel.c | 73 +- trunk/sound/pci/hda/patch_via.c | 20 - 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_mixer.c | 12 +- 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 | 16 +- trunk/sound/usb/caiaq/caiaq-device.h | 1 - trunk/sound/usb/usbaudio.c | 4 + trunk/sound/usb/usbquirks.h | 38 - trunk/virt/kvm/ioapic.c | 54 +- trunk/virt/kvm/kvm_main.c | 29 +- 2881 files changed, 47225 insertions(+), 104485 deletions(-) delete mode 100644 trunk/Documentation/ABI/testing/sysfs-bus-css delete mode 100644 trunk/Documentation/ABI/testing/sysfs-firmware-memmap delete mode 100644 trunk/Documentation/block/data-integrity.txt delete mode 100644 trunk/Documentation/ftrace.txt delete mode 100644 trunk/Documentation/hwmon/ibmaem rename trunk/Documentation/{x86 => }/i386/IO-APIC.txt (100%) rename trunk/Documentation/{x86 => }/i386/boot.txt (96%) rename trunk/Documentation/{x86 => }/i386/usb-legacy-support.txt (100%) rename trunk/Documentation/{x86 => }/i386/zero-page.txt (100%) delete mode 100644 trunk/Documentation/vm/pagemap.txt rename trunk/Documentation/{x86 => }/x86_64/00-INDEX (100%) rename trunk/Documentation/{x86 => }/x86_64/boot-options.txt (100%) rename trunk/Documentation/{x86 => }/x86_64/cpu-hotplug-spec (100%) rename trunk/Documentation/{x86 => }/x86_64/fake-numa-for-cpusets (100%) rename trunk/Documentation/{x86 => }/x86_64/kernel-stacks (100%) rename trunk/Documentation/{x86 => }/x86_64/machinecheck (100%) rename trunk/Documentation/{x86 => }/x86_64/mm.txt (87%) rename trunk/Documentation/{x86 => }/x86_64/uefi.txt (84%) rename trunk/arch/avr32/mach-at32ap/{pdc.c => at32ap.c} (90%) delete mode 100644 trunk/arch/avr32/mach-at32ap/pm.c delete mode 100644 trunk/arch/avr32/mach-at32ap/sdramc.h create mode 100644 trunk/arch/blackfin/mach-bf537/boards/led.S create mode 100644 trunk/arch/blackfin/mach-bf548/boards/led.S delete mode 100644 trunk/arch/ia64/kvm/memcpy.S delete mode 100644 trunk/arch/ia64/kvm/memset.S create mode 100644 trunk/arch/mips/lasat/sysctl.h delete mode 100644 trunk/arch/mn10300/lib/__ucmpdi2.S delete mode 100644 trunk/arch/powerpc/boot/crtsavres.S delete mode 100644 trunk/arch/powerpc/lib/crtsavres.S create mode 100644 trunk/arch/s390/kernel/binfmt_elf32.c delete mode 100644 trunk/arch/s390/kernel/mem_detect.c delete mode 100644 trunk/arch/sh/configs/rsk7203_defconfig delete mode 100644 trunk/arch/x86/kernel/amd_iommu.c delete mode 100644 trunk/arch/x86/kernel/amd_iommu_init.c rename trunk/arch/x86/kernel/{cpu => }/bugs_64.c (100%) delete mode 100644 trunk/arch/x86/kernel/cpu/amd_64.c delete mode 100644 trunk/arch/x86/kernel/cpu/centaur_64.c delete mode 100644 trunk/arch/x86/kernel/cpu/common_64.c delete mode 100644 trunk/arch/x86/kernel/cpu/intel_64.c delete mode 100644 trunk/arch/x86/kernel/e820.c create mode 100644 trunk/arch/x86/kernel/e820_32.c create mode 100644 trunk/arch/x86/kernel/e820_64.c delete mode 100644 trunk/arch/x86/kernel/head.c rename trunk/arch/x86/kernel/{i8259.c => i8259_32.c} (70%) create mode 100644 trunk/arch/x86/kernel/i8259_64.c delete mode 100644 trunk/arch/x86/kernel/irqinit_32.c delete mode 100644 trunk/arch/x86/kernel/irqinit_64.c rename trunk/arch/x86/kernel/{nmi.c => nmi_32.c} (69%) create mode 100644 trunk/arch/x86/kernel/nmi_64.c delete mode 100644 trunk/arch/x86/kernel/probe_roms_32.c delete mode 100644 trunk/arch/x86/kernel/pvclock.c create mode 100644 trunk/arch/x86/kernel/setup64.c create mode 100644 trunk/arch/x86/kernel/setup_32.c create mode 100644 trunk/arch/x86/kernel/setup_64.c delete mode 100644 trunk/arch/x86/kernel/setup_percpu.c rename trunk/arch/x86/{mm => kernel}/srat_32.c (56%) delete mode 100644 trunk/arch/x86/kernel/tlb_uv.c delete mode 100644 trunk/arch/x86/kernel/tsc.c create mode 100644 trunk/arch/x86/kernel/tsc_32.c create mode 100644 trunk/arch/x86/kernel/tsc_64.c delete mode 100644 trunk/arch/x86/kernel/visws_quirks.c rename trunk/arch/x86/lib/{delay.c => delay_32.c} (64%) create mode 100644 trunk/arch/x86/lib/delay_64.c create mode 100644 trunk/arch/x86/lib/getuser_32.S rename trunk/arch/x86/lib/{getuser.S => getuser_64.S} (53%) rename trunk/arch/x86/lib/{putuser.S => putuser_32.S} (54%) create mode 100644 trunk/arch/x86/lib/putuser_64.S delete mode 100644 trunk/arch/x86/mach-generic/numaq.c create mode 100644 trunk/arch/x86/mach-visws/Makefile create mode 100644 trunk/arch/x86/mach-visws/mpparse.c create mode 100644 trunk/arch/x86/mach-visws/reboot.c create mode 100644 trunk/arch/x86/mach-visws/setup.c create mode 100644 trunk/arch/x86/mach-visws/traps.c create mode 100644 trunk/arch/x86/mach-visws/visws_apic.c create mode 100644 trunk/arch/x86/pci/Makefile_32 create mode 100644 trunk/arch/x86/pci/Makefile_64 rename trunk/arch/x86/pci/{amd_bus.c => k8-bus_64.c} (91%) create mode 100644 trunk/arch/x86/pci/mp_bus_to_node.c create mode 100644 trunk/arch/x86/xen/manage.c delete mode 100644 trunk/arch/x86/xen/suspend.c delete mode 100644 trunk/block/blk-integrity.c delete mode 100644 trunk/block/cmd-filter.c delete mode 100644 trunk/crypto/ahash.c delete mode 100644 trunk/crypto/prng.c delete mode 100644 trunk/crypto/prng.h delete mode 100644 trunk/crypto/ripemd.h delete mode 100644 trunk/crypto/rmd128.c delete mode 100644 trunk/crypto/rmd160.c delete mode 100644 trunk/crypto/rmd256.c delete mode 100644 trunk/crypto/rmd320.c rename trunk/drivers/{gpu => char}/drm/Kconfig (100%) create mode 100644 trunk/drivers/char/drm/Makefile rename trunk/drivers/{gpu => char}/drm/README.drm (100%) rename trunk/drivers/{gpu => char}/drm/ati_pcigart.c (96%) rename trunk/{include => drivers/char}/drm/drm.h (97%) rename trunk/{include => drivers/char}/drm/drmP.h (91%) rename trunk/drivers/{gpu => char}/drm/drm_agpsupport.c (100%) rename trunk/drivers/{gpu => char}/drm/drm_auth.c (100%) rename trunk/drivers/{gpu => char}/drm/drm_bufs.c (100%) rename trunk/drivers/{gpu => char}/drm/drm_context.c (100%) rename trunk/{include => drivers/char}/drm/drm_core.h (100%) rename trunk/drivers/{gpu => char}/drm/drm_dma.c (100%) rename trunk/drivers/{gpu => char}/drm/drm_drawable.c (100%) rename trunk/drivers/{gpu => char}/drm/drm_drv.c (99%) rename trunk/drivers/{gpu => char}/drm/drm_fops.c (98%) rename trunk/drivers/{gpu => char}/drm/drm_hashtab.c (100%) rename trunk/{include => drivers/char}/drm/drm_hashtab.h (100%) rename trunk/drivers/{gpu => char}/drm/drm_ioc32.c (100%) rename trunk/drivers/{gpu => char}/drm/drm_ioctl.c (100%) rename trunk/drivers/{gpu => char}/drm/drm_irq.c (53%) rename trunk/drivers/{gpu => char}/drm/drm_lock.c (91%) rename trunk/drivers/{gpu => char}/drm/drm_memory.c (100%) rename trunk/{include => drivers/char}/drm/drm_memory.h (100%) rename trunk/{include => drivers/char}/drm/drm_memory_debug.h (100%) rename trunk/drivers/{gpu => char}/drm/drm_mm.c (100%) rename trunk/{include => drivers/char}/drm/drm_os_linux.h (100%) rename trunk/drivers/{gpu => char}/drm/drm_pci.c (100%) rename trunk/{include => drivers/char}/drm/drm_pciids.h (97%) rename trunk/drivers/{gpu => char}/drm/drm_proc.c (100%) rename trunk/{include => drivers/char}/drm/drm_sarea.h (100%) rename trunk/drivers/{gpu => char}/drm/drm_scatter.c (100%) rename trunk/drivers/{gpu => char}/drm/drm_sman.c (100%) rename trunk/{include => drivers/char}/drm/drm_sman.h (100%) rename trunk/drivers/{gpu => char}/drm/drm_stub.c (100%) rename trunk/drivers/{gpu => char}/drm/drm_sysfs.c (99%) rename trunk/drivers/{gpu => char}/drm/drm_vm.c (100%) rename trunk/drivers/{gpu/drm/i810 => char/drm}/i810_dma.c (100%) rename trunk/{include => drivers/char}/drm/i810_drm.h (100%) rename trunk/drivers/{gpu/drm/i810 => char/drm}/i810_drv.c (100%) rename trunk/drivers/{gpu/drm/i810 => char/drm}/i810_drv.h (100%) rename trunk/drivers/{gpu/drm/i830 => char/drm}/i830_dma.c (100%) rename trunk/{include => drivers/char}/drm/i830_drm.h (100%) rename trunk/drivers/{gpu/drm/i830 => char/drm}/i830_drv.c (100%) rename trunk/drivers/{gpu/drm/i830 => char/drm}/i830_drv.h (100%) rename trunk/drivers/{gpu/drm/i830 => char/drm}/i830_irq.c (100%) rename trunk/drivers/{gpu/drm/i915 => char/drm}/i915_dma.c (86%) rename trunk/{include => drivers/char}/drm/i915_drm.h (90%) rename trunk/drivers/{gpu/drm/i915 => char/drm}/i915_drv.c (97%) rename trunk/drivers/{gpu/drm/i915 => char/drm}/i915_drv.h (89%) rename trunk/drivers/{gpu/drm/i915 => char/drm}/i915_ioc32.c (100%) create mode 100644 trunk/drivers/char/drm/i915_irq.c rename trunk/drivers/{gpu/drm/i915 => char/drm}/i915_mem.c (100%) rename trunk/drivers/{gpu/drm/mga => char/drm}/mga_dma.c (100%) rename trunk/{include => drivers/char}/drm/mga_drm.h (100%) rename trunk/drivers/{gpu/drm/mga => char/drm}/mga_drv.c (95%) rename trunk/drivers/{gpu/drm/mga => char/drm}/mga_drv.h (98%) rename trunk/drivers/{gpu/drm/mga => char/drm}/mga_ioc32.c (100%) rename trunk/drivers/{gpu/drm/mga => char/drm}/mga_irq.c (74%) rename trunk/drivers/{gpu/drm/mga => char/drm}/mga_state.c (100%) rename trunk/drivers/{gpu/drm/mga => char/drm}/mga_ucode.h (100%) rename trunk/drivers/{gpu/drm/mga => char/drm}/mga_warp.c (100%) rename trunk/drivers/{gpu/drm/r128 => char/drm}/r128_cce.c (100%) rename trunk/{include => drivers/char}/drm/r128_drm.h (100%) rename trunk/drivers/{gpu/drm/r128 => char/drm}/r128_drv.c (94%) rename trunk/drivers/{gpu/drm/r128 => char/drm}/r128_drv.h (98%) rename trunk/drivers/{gpu/drm/r128 => char/drm}/r128_ioc32.c (100%) rename trunk/drivers/{gpu/drm/r128 => char/drm}/r128_irq.c (74%) rename trunk/drivers/{gpu/drm/r128 => char/drm}/r128_state.c (100%) rename trunk/drivers/{gpu/drm/radeon => char/drm}/r300_cmdbuf.c (90%) rename trunk/drivers/{gpu/drm/radeon => char/drm}/r300_reg.h (89%) rename trunk/drivers/{gpu/drm/radeon => char/drm}/radeon_cp.c (61%) rename trunk/{include => drivers/char}/drm/radeon_drm.h (99%) rename trunk/drivers/{gpu/drm/radeon => char/drm}/radeon_drv.c (94%) rename trunk/drivers/{gpu/drm/radeon => char/drm}/radeon_drv.h (84%) rename trunk/drivers/{gpu/drm/radeon => char/drm}/radeon_ioc32.c (100%) rename trunk/drivers/{gpu/drm/radeon => char/drm}/radeon_irq.c (68%) rename trunk/drivers/{gpu/drm/radeon => char/drm}/radeon_mem.c (100%) rename trunk/drivers/{gpu/drm/radeon => char/drm}/radeon_state.c (99%) rename trunk/drivers/{gpu/drm/savage => char/drm}/savage_bci.c (100%) rename trunk/{include => drivers/char}/drm/savage_drm.h (100%) rename trunk/drivers/{gpu/drm/savage => char/drm}/savage_drv.c (100%) rename trunk/drivers/{gpu/drm/savage => char/drm}/savage_drv.h (100%) rename trunk/drivers/{gpu/drm/savage => char/drm}/savage_state.c (100%) rename trunk/{include => drivers/char}/drm/sis_drm.h (100%) rename trunk/drivers/{gpu/drm/sis => char/drm}/sis_drv.c (100%) rename trunk/drivers/{gpu/drm/sis => char/drm}/sis_drv.h (100%) rename trunk/drivers/{gpu/drm/sis => char/drm}/sis_mm.c (100%) rename trunk/drivers/{gpu/drm/tdfx => char/drm}/tdfx_drv.c (100%) rename trunk/drivers/{gpu/drm/tdfx => char/drm}/tdfx_drv.h (100%) rename trunk/drivers/{gpu/drm/via => char/drm}/via_3d_reg.h (100%) rename trunk/drivers/{gpu/drm/via => char/drm}/via_dma.c (100%) rename trunk/drivers/{gpu/drm/via => char/drm}/via_dmablit.c (100%) rename trunk/drivers/{gpu/drm/via => char/drm}/via_dmablit.h (100%) rename trunk/{include => drivers/char}/drm/via_drm.h (100%) rename trunk/drivers/{gpu/drm/via => char/drm}/via_drv.c (95%) rename trunk/drivers/{gpu/drm/via => char/drm}/via_drv.h (95%) rename trunk/drivers/{gpu/drm/via => char/drm}/via_irq.c (86%) rename trunk/drivers/{gpu/drm/via => char/drm}/via_map.c (100%) rename trunk/drivers/{gpu/drm/via => char/drm}/via_mm.c (100%) rename trunk/drivers/{gpu/drm/via => char/drm}/via_verifier.c (100%) rename trunk/drivers/{gpu/drm/via => char/drm}/via_verifier.h (100%) rename trunk/drivers/{gpu/drm/via => char/drm}/via_video.c (100%) delete mode 100644 trunk/drivers/char/hw_random/virtio-rng.c delete mode 100644 trunk/drivers/crypto/ixp4xx_crypto.c delete mode 100644 trunk/drivers/crypto/talitos.c delete mode 100644 trunk/drivers/crypto/talitos.h delete mode 100644 trunk/drivers/firmware/memmap.c delete mode 100644 trunk/drivers/gpu/Makefile delete mode 100644 trunk/drivers/gpu/drm/Makefile delete mode 100644 trunk/drivers/gpu/drm/i810/Makefile delete mode 100644 trunk/drivers/gpu/drm/i830/Makefile delete mode 100644 trunk/drivers/gpu/drm/i915/Makefile delete mode 100644 trunk/drivers/gpu/drm/i915/i915_irq.c delete mode 100644 trunk/drivers/gpu/drm/mga/Makefile delete mode 100644 trunk/drivers/gpu/drm/r128/Makefile delete mode 100644 trunk/drivers/gpu/drm/radeon/Makefile delete mode 100644 trunk/drivers/gpu/drm/radeon/radeon_microcode.h delete mode 100644 trunk/drivers/gpu/drm/savage/Makefile delete mode 100644 trunk/drivers/gpu/drm/sis/Makefile delete mode 100644 trunk/drivers/gpu/drm/tdfx/Makefile delete mode 100644 trunk/drivers/gpu/drm/via/Makefile delete mode 100644 trunk/drivers/hwmon/ibmaem.c delete mode 100644 trunk/drivers/media/video/uvc/Makefile delete mode 100644 trunk/drivers/media/video/uvc/uvc_ctrl.c delete mode 100644 trunk/drivers/media/video/uvc/uvc_driver.c delete mode 100644 trunk/drivers/media/video/uvc/uvc_isight.c delete mode 100644 trunk/drivers/media/video/uvc/uvc_queue.c delete mode 100644 trunk/drivers/media/video/uvc/uvc_status.c delete mode 100644 trunk/drivers/media/video/uvc/uvc_v4l2.c delete mode 100644 trunk/drivers/media/video/uvc/uvc_video.c delete mode 100644 trunk/drivers/media/video/uvc/uvcvideo.h delete mode 100644 trunk/drivers/mmc/card/mmc_test.c delete mode 100644 trunk/drivers/pcmcia/bfin_cf_pcmcia.c delete mode 100644 trunk/drivers/rtc/rtc-fm3130.c delete mode 100644 trunk/drivers/rtc/rtc-ppc.c delete mode 100644 trunk/drivers/s390/cio/chsc_sch.c delete mode 100644 trunk/drivers/s390/cio/chsc_sch.h delete mode 100644 trunk/drivers/s390/cio/fcx.c delete mode 100644 trunk/drivers/s390/cio/isc.c delete mode 100644 trunk/drivers/s390/cio/itcw.c rename trunk/{include/asm-s390 => drivers/s390/cio}/schid.h (65%) delete mode 100644 trunk/drivers/s390/cio/scsw.c delete mode 100644 trunk/drivers/usb/class/cdc-wdm.c delete mode 100644 trunk/drivers/usb/misc/isight_firmware.c delete mode 100644 trunk/drivers/watchdog/geodewdt.c delete mode 100644 trunk/drivers/xen/manage.c delete mode 100644 trunk/fs/bio-integrity.c delete mode 100644 trunk/include/asm-avr32/arch-at32ap/sram.h delete mode 100644 trunk/include/asm-blackfin/serial.h delete mode 100644 trunk/include/asm-s390/chsc.h delete mode 100644 trunk/include/asm-s390/fcx.h delete mode 100644 trunk/include/asm-s390/isc.h delete mode 100644 trunk/include/asm-s390/itcw.h delete mode 100644 trunk/include/asm-x86/amd_iommu.h delete mode 100644 trunk/include/asm-x86/amd_iommu_types.h create mode 100644 trunk/include/asm-x86/current_32.h create mode 100644 trunk/include/asm-x86/current_64.h create mode 100644 trunk/include/asm-x86/dwarf2_32.h create mode 100644 trunk/include/asm-x86/dwarf2_64.h create mode 100644 trunk/include/asm-x86/e820_32.h create mode 100644 trunk/include/asm-x86/e820_64.h create mode 100644 trunk/include/asm-x86/hw_irq_32.h create mode 100644 trunk/include/asm-x86/hw_irq_64.h create mode 100644 trunk/include/asm-x86/irq_32.h create mode 100644 trunk/include/asm-x86/irq_64.h delete mode 100644 trunk/include/asm-x86/irq_vectors.h create mode 100644 trunk/include/asm-x86/mach-bigsmp/mach_mpspec.h create mode 100644 trunk/include/asm-x86/mach-default/irq_vectors.h create mode 100644 trunk/include/asm-x86/mach-default/irq_vectors_limits.h create mode 100644 trunk/include/asm-x86/mach-es7000/mach_mpspec.h create mode 100644 trunk/include/asm-x86/mach-numaq/mach_mpspec.h create mode 100644 trunk/include/asm-x86/mach-summit/mach_mpspec.h rename trunk/include/asm-x86/{visws => mach-visws}/cobalt.h (100%) create mode 100644 trunk/include/asm-x86/mach-visws/irq_vectors.h rename trunk/include/asm-x86/{visws => mach-visws}/lithium.h (100%) rename trunk/include/asm-x86/{visws => mach-visws}/piix4.h (100%) create mode 100644 trunk/include/asm-x86/mach-voyager/irq_vectors.h delete mode 100644 trunk/include/asm-x86/mmconfig.h delete mode 100644 trunk/include/asm-x86/pvclock-abi.h delete mode 100644 trunk/include/asm-x86/pvclock.h create mode 100644 trunk/include/asm-x86/thread_info_32.h create mode 100644 trunk/include/asm-x86/thread_info_64.h delete mode 100644 trunk/include/asm-x86/uv/uv_bau.h delete mode 100644 trunk/include/asm-x86/visws/sgivw.h delete mode 100644 trunk/include/crypto/hash.h delete mode 100644 trunk/include/crypto/internal/hash.h delete mode 100644 trunk/include/drm/Kbuild delete mode 100644 trunk/include/linux/firmware-map.h delete mode 100644 trunk/include/linux/rculist.h delete mode 100644 trunk/include/linux/virtio_rng.h create mode 100644 trunk/include/pcmcia/bulkmem.h create mode 100644 trunk/include/pcmcia/version.h delete mode 100644 trunk/include/sound/ad1843.h delete mode 100644 trunk/kernel/sched_cpupri.c delete mode 100644 trunk/kernel/sched_cpupri.h mode change 100755 => 100644 trunk/scripts/decodecode create mode 100644 trunk/security/dummy.c delete mode 100644 trunk/sound/mips/ad1843.c delete mode 100644 trunk/sound/mips/hal2.c delete mode 100644 trunk/sound/mips/hal2.h delete mode 100644 trunk/sound/mips/sgio2audio.c rename trunk/sound/pci/{ => ac97}/ak4531_codec.c (96%) delete mode 100644 trunk/sound/soc/at32/Kconfig delete mode 100644 trunk/sound/soc/at32/Makefile delete mode 100644 trunk/sound/soc/at32/at32-pcm.c delete mode 100644 trunk/sound/soc/at32/at32-pcm.h delete mode 100644 trunk/sound/soc/at32/at32-ssc.c delete mode 100644 trunk/sound/soc/at32/at32-ssc.h delete mode 100644 trunk/sound/soc/at32/playpaq_wm8510.c delete mode 100644 trunk/sound/soc/au1x/Kconfig delete mode 100644 trunk/sound/soc/au1x/Makefile delete mode 100644 trunk/sound/soc/au1x/dbdma2.c delete mode 100644 trunk/sound/soc/au1x/psc-ac97.c delete mode 100644 trunk/sound/soc/au1x/psc-i2s.c delete mode 100644 trunk/sound/soc/au1x/psc.h delete mode 100644 trunk/sound/soc/au1x/sample-ac97.c delete mode 100644 trunk/sound/soc/codecs/ak4535.c delete mode 100644 trunk/sound/soc/codecs/ak4535.h delete mode 100644 trunk/sound/soc/codecs/uda1380.c delete mode 100644 trunk/sound/soc/codecs/uda1380.h delete mode 100644 trunk/sound/soc/codecs/wm8510.c delete mode 100644 trunk/sound/soc/codecs/wm8510.h delete mode 100644 trunk/sound/soc/codecs/wm8990.c delete mode 100644 trunk/sound/soc/codecs/wm8990.h delete mode 100644 trunk/sound/soc/pxa/em-x270.c diff --git a/[refs] b/[refs] index bf0d1e89710d..05245526cbe1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a41eebab7537890409ea9dfe0fcda9b5fbdb090d +refs/heads/master: 75bd2ef1457998791cfc89cd59927574488fc22a diff --git a/trunk/.gitignore b/trunk/.gitignore index 869e1a3b64b6..090b293b8779 100644 --- a/trunk/.gitignore +++ b/trunk/.gitignore @@ -3,10 +3,6 @@ # subdirectories here. Add them in the ".gitignore" file # in that subdirectory instead. # -# NOTE! Please use 'git-ls-files -i --exclude-standard' -# command after changing this file, to see if there are -# any tracked files which get ignored after the change. -# # Normal rules # .* @@ -22,21 +18,18 @@ *.lst *.symtypes *.order -*.elf -*.bin -*.gz # # Top-level generic files # tags TAGS -vmlinux +vmlinux* +!vmlinux.lds.S System.map Module.markers Module.symvers !.gitignore -!.mailmap # # Generated include files @@ -59,8 +52,8 @@ series # cscope files cscope.* -ncscope.* *.orig +*.rej *~ \#*# diff --git a/trunk/CREDITS b/trunk/CREDITS index e97bea06b59f..8fec7b3f96d5 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -2611,9 +2611,8 @@ S: Perth, Western Australia S: Australia N: Miguel Ojeda Sandonis -E: miguel.ojeda.sandonis@gmail.com -W: http://miguelojeda.es -W: http://jair.lab.fi.uva.es/~migojed/ +E: maxextreme@gmail.com +W: http://maxextreme.googlepages.com/ D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers. D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*) S: C/ Mieses 20, 9-B diff --git a/trunk/Documentation/ABI/testing/sysfs-block b/trunk/Documentation/ABI/testing/sysfs-block index 44f52a4f5903..4bd9ea539129 100644 --- a/trunk/Documentation/ABI/testing/sysfs-block +++ b/trunk/Documentation/ABI/testing/sysfs-block @@ -26,37 +26,3 @@ 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 deleted file mode 100644 index b585ec258a08..000000000000 --- a/trunk/Documentation/ABI/testing/sysfs-bus-css +++ /dev/null @@ -1,35 +0,0 @@ -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/ABI/testing/sysfs-class-bdi b/trunk/Documentation/ABI/testing/sysfs-class-bdi index 5f500977b42f..5ac1e01bbd48 100644 --- a/trunk/Documentation/ABI/testing/sysfs-class-bdi +++ b/trunk/Documentation/ABI/testing/sysfs-class-bdi @@ -14,10 +14,6 @@ MAJOR:MINOR non-block filesystems which provide their own BDI, such as NFS and FUSE. -MAJOR:MINOR-fuseblk - - Value of st_dev on fuseblk filesystems. - default The default backing dev, used for non-block device backed diff --git a/trunk/Documentation/ABI/testing/sysfs-firmware-memmap b/trunk/Documentation/ABI/testing/sysfs-firmware-memmap deleted file mode 100644 index 0d99ee6ae02e..000000000000 --- a/trunk/Documentation/ABI/testing/sysfs-firmware-memmap +++ /dev/null @@ -1,71 +0,0 @@ -What: /sys/firmware/memmap/ -Date: June 2008 -Contact: Bernhard Walle -Description: - On all platforms, the firmware provides a memory map which the - kernel reads. The resources from that memory map are registered - in the kernel resource tree and exposed to userspace via - /proc/iomem (together with other resources). - - However, on most architectures that firmware-provided memory - map is modified afterwards by the kernel itself, either because - the kernel merges that memory map with other information or - just because the user overwrites that memory map via command - line. - - kexec needs the raw firmware-provided memory map to setup the - parameter segment of the kernel that should be booted with - kexec. Also, the raw memory map is useful for debugging. For - that reason, /sys/firmware/memmap is an interface that provides - the raw memory map to userspace. - - The structure is as follows: Under /sys/firmware/memmap there - are subdirectories with the number of the entry as their name: - - /sys/firmware/memmap/0 - /sys/firmware/memmap/1 - /sys/firmware/memmap/2 - /sys/firmware/memmap/3 - ... - - The maximum depends on the number of memory map entries provided - by the firmware. The order is just the order that the firmware - provides. - - Each directory contains three files: - - start : The start address (as hexadecimal number with the - '0x' prefix). - end : The end address, inclusive (regardless whether the - firmware provides inclusive or exclusive ranges). - type : Type of the entry as string. See below for a list of - valid types. - - So, for example: - - /sys/firmware/memmap/0/start - /sys/firmware/memmap/0/end - /sys/firmware/memmap/0/type - /sys/firmware/memmap/1/start - ... - - Currently following types exist: - - - System RAM - - ACPI Tables - - ACPI Non-volatile Storage - - reserved - - Following shell snippet can be used to display that memory - map in a human-readable format: - - -------------------- 8< ---------------------------------------- - #!/bin/bash - cd /sys/firmware/memmap - for dir in * ; do - start=$(cat $dir/start) - end=$(cat $dir/end) - type=$(cat $dir/type) - printf "%016x-%016x (%s)\n" $start $[ $end +1] "$type" - done - -------------------- >8 ---------------------------------------- diff --git a/trunk/Documentation/DocBook/kernel-locking.tmpl b/trunk/Documentation/DocBook/kernel-locking.tmpl index 2510763295d0..77c42f40be5d 100644 --- a/trunk/Documentation/DocBook/kernel-locking.tmpl +++ b/trunk/Documentation/DocBook/kernel-locking.tmpl @@ -703,31 +703,6 @@ - - The trylock Functions - - There are functions that try to acquire a lock only once and immediately - return a value telling about success or failure to acquire the lock. - They can be used if you need no access to the data protected with the lock - when some other thread is holding the lock. You should acquire the lock - later if you then need access to the data protected with the lock. - - - - spin_trylock() does not spin but returns non-zero if - it acquires the spinlock on the first try or 0 if not. This function can - be used in all contexts like spin_lock: you must have - disabled the contexts that might interrupt you and acquire the spin lock. - - - - mutex_trylock() does not suspend your task - but returns non-zero if it could lock the mutex on the first try - or 0 if not. This function cannot be safely used in hardware or software - interrupt contexts despite not sleeping. - - - Common Examples diff --git a/trunk/Documentation/DocBook/kgdb.tmpl b/trunk/Documentation/DocBook/kgdb.tmpl index e8acd1f03456..028a8444d95e 100644 --- a/trunk/Documentation/DocBook/kgdb.tmpl +++ b/trunk/Documentation/DocBook/kgdb.tmpl @@ -84,9 +84,10 @@ runs an instance of gdb against the vmlinux file which contains the symbols (not boot image such as bzImage, zImage, uImage...). In gdb the developer specifies the connection parameters and - connects to kgdb. The type of connection a developer makes with - gdb depends on the availability of kgdb I/O modules compiled as - builtin's or kernel modules in the test machine's kernel. + connects to kgdb. Depending on which kgdb I/O modules exist in + the kernel for a given architecture, it may be possible to debug + the test machine's kernel with the development machine using a + rs232 or ethernet connection. @@ -222,7 +223,7 @@ IMPORTANT NOTE: Using this option with kgdb over the console - (kgdboc) is not supported. + (kgdboc) or kgdb over ethernet (kgdboe) is not supported. @@ -248,11 +249,18 @@ (gdb) target remote /dev/ttyS0 - Example (kgdb to a terminal server on tcp port 2012): + Example (kgdb to a terminal server): % gdb ./vmlinux - (gdb) target remote 192.168.2.2:2012 + (gdb) target remote udp:192.168.2.2:6443 + + + Example (kgdb over ethernet): + + + % gdb ./vmlinux + (gdb) target remote udp:192.168.2.2:6443 Once connected, you can debug a kernel the way you would debug an diff --git a/trunk/Documentation/HOWTO b/trunk/Documentation/HOWTO index 619e8caf30db..0291ade44c17 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://bugzilla.kernel.org/page.cgi?id=faq.html + http://test.kernel.org/bugzilla/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/SubmittingPatches b/trunk/Documentation/SubmittingPatches index 118ca6e9404f..9c93a03ea33b 100644 --- a/trunk/Documentation/SubmittingPatches +++ b/trunk/Documentation/SubmittingPatches @@ -327,52 +327,6 @@ Some people also put extra tags at the end. They'll just be ignored for now, but you can do this to mark internal company procedures or just point out some special detail about the sign-off. -If you are a subsystem or branch maintainer, sometimes you need to slightly -modify patches you receive in order to merge them, because the code is not -exactly the same in your tree and the submitters'. If you stick strictly to -rule (c), you should ask the submitter to rediff, but this is a totally -counter-productive waste of time and energy. Rule (b) allows you to adjust -the code, but then it is very impolite to change one submitter's code and -make him endorse your bugs. To solve this problem, it is recommended that -you add a line between the last Signed-off-by header and yours, indicating -the nature of your changes. While there is nothing mandatory about this, it -seems like prepending the description with your mail and/or name, all -enclosed in square brackets, is noticeable enough to make it obvious that -you are responsible for last-minute changes. Example : - - Signed-off-by: Random J Developer - [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h] - Signed-off-by: Lucky K Maintainer - -This practise is particularly helpful if you maintain a stable branch and -want at the same time to credit the author, track changes, merge the fix, -and protect the submitter from complaints. Note that under no circumstances -can you change the author's identity (the From header), as it is the one -which appears in the changelog. - -Special note to back-porters: It seems to be a common and useful practise -to insert an indication of the origin of a patch at the top of the commit -message (just after the subject line) to facilitate tracking. For instance, -here's what we see in 2.6-stable : - - Date: Tue May 13 19:10:30 2008 +0000 - - SCSI: libiscsi regression in 2.6.25: fix nop timer handling - - commit 4cf1043593db6a337f10e006c23c69e5fc93e722 upstream - -And here's what appears in 2.4 : - - Date: Tue May 13 22:12:27 2008 +0200 - - wireless, airo: waitbusy() won't delay - - [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a] - -Whatever the format, this information provides a valuable help to people -tracking your trees, and to people trying to trouble-shoot bugs in your -tree. - 13) When to use Acked-by: and Cc: diff --git a/trunk/Documentation/accounting/taskstats-struct.txt b/trunk/Documentation/accounting/taskstats-struct.txt index cd784f46bf8a..8aa7529f8258 100644 --- a/trunk/Documentation/accounting/taskstats-struct.txt +++ b/trunk/Documentation/accounting/taskstats-struct.txt @@ -24,8 +24,6 @@ There are three different groups of fields in the struct taskstats: 4) Per-task and per-thread context switch count statistics -5) Time accounting for SMT machines - Future extension should add fields to the end of the taskstats struct, and should not change the relative position of each field within the struct. @@ -166,8 +164,4 @@ struct taskstats { __u64 nvcsw; /* Context voluntary switch counter */ __u64 nivcsw; /* Context involuntary switch counter */ -5) Time accounting for SMT machines - __u64 ac_utimescaled; /* utime scaled on frequency etc */ - __u64 ac_stimescaled; /* stime scaled on frequency etc */ - __u64 cpu_scaled_run_real_total; /* scaled cpu_run_real_total */ } diff --git a/trunk/Documentation/auxdisplay/cfag12864b b/trunk/Documentation/auxdisplay/cfag12864b index eb7be393a510..b714183d4125 100644 --- a/trunk/Documentation/auxdisplay/cfag12864b +++ b/trunk/Documentation/auxdisplay/cfag12864b @@ -3,7 +3,7 @@ =================================== License: GPLv2 -Author & Maintainer: Miguel Ojeda Sandonis +Author & Maintainer: Miguel Ojeda Sandonis Date: 2006-10-27 @@ -22,7 +22,7 @@ Date: 2006-10-27 1. DRIVER INFORMATION --------------------- -This driver supports a cfag12864b LCD. +This driver support one cfag12864b display at time. --------------------- diff --git a/trunk/Documentation/auxdisplay/cfag12864b-example.c b/trunk/Documentation/auxdisplay/cfag12864b-example.c index 2caeea5e4993..7bfac354d4c9 100644 --- a/trunk/Documentation/auxdisplay/cfag12864b-example.c +++ b/trunk/Documentation/auxdisplay/cfag12864b-example.c @@ -4,7 +4,7 @@ * Description: cfag12864b LCD userspace example program * License: GPLv2 * - * Author: Copyright (C) Miguel Ojeda Sandonis + * Author: Copyright (C) Miguel Ojeda Sandonis * Date: 2006-10-31 * * This program is free software; you can redistribute it and/or modify diff --git a/trunk/Documentation/auxdisplay/ks0108 b/trunk/Documentation/auxdisplay/ks0108 index 8ddda0c8ceef..92b03b60c613 100644 --- a/trunk/Documentation/auxdisplay/ks0108 +++ b/trunk/Documentation/auxdisplay/ks0108 @@ -3,7 +3,7 @@ ========================================== License: GPLv2 -Author & Maintainer: Miguel Ojeda Sandonis +Author & Maintainer: Miguel Ojeda Sandonis Date: 2006-10-27 @@ -21,7 +21,7 @@ Date: 2006-10-27 1. DRIVER INFORMATION --------------------- -This driver supports the ks0108 LCD controller. +This driver support the ks0108 LCD controller. --------------------- diff --git a/trunk/Documentation/block/data-integrity.txt b/trunk/Documentation/block/data-integrity.txt deleted file mode 100644 index e9dc8d86adc7..000000000000 --- a/trunk/Documentation/block/data-integrity.txt +++ /dev/null @@ -1,327 +0,0 @@ ----------------------------------------------------------------------- -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/cciss.txt b/trunk/Documentation/cciss.txt index 63e59b8847c5..e65736c6b8bc 100644 --- a/trunk/Documentation/cciss.txt +++ b/trunk/Documentation/cciss.txt @@ -21,11 +21,6 @@ This driver is known to work with the following cards: * SA E200 * SA E200i * SA E500 - * SA P212 - * SA P410 - * SA P410i - * SA P411 - * SA P812 Detecting drive failures: ------------------------- diff --git a/trunk/Documentation/cgroups.txt b/trunk/Documentation/cgroups.txt index d9014aa0eb68..824fc0274471 100644 --- a/trunk/Documentation/cgroups.txt +++ b/trunk/Documentation/cgroups.txt @@ -390,10 +390,6 @@ If you have several tasks to attach, you have to do it one after another: ... # /bin/echo PIDn > tasks -You can attach the current shell task by echoing 0: - -# echo 0 > tasks - 3. Kernel API ============= diff --git a/trunk/Documentation/controllers/devices.txt b/trunk/Documentation/controllers/devices.txt index 7cc6e6a60672..4dcea42432c2 100644 --- a/trunk/Documentation/controllers/devices.txt +++ b/trunk/Documentation/controllers/devices.txt @@ -13,7 +13,7 @@ either an integer or * for all. Access is a composition of r The root device cgroup starts with rwm to 'all'. A child device cgroup gets a copy of the parent. Administrators can then remove devices from the whitelist or add new entries. A child cgroup can -never receive a device access which is denied by its parent. However +never receive a device access which is denied its parent. However when a device access is removed from a parent it will not also be removed from the child(ren). @@ -29,11 +29,7 @@ allows cgroup 1 to read and mknod the device usually known as echo a > /cgroups/1/devices.deny -will remove the default 'a *:* rwm' entry. Doing - - echo a > /cgroups/1/devices.allow - -will add the 'a *:* rwm' entry to the whitelist. +will remove the default 'a *:* mrw' entry. 3. Security diff --git a/trunk/Documentation/cpu-freq/governors.txt b/trunk/Documentation/cpu-freq/governors.txt index dcec0564d040..6a9c55bd556b 100644 --- a/trunk/Documentation/cpu-freq/governors.txt +++ b/trunk/Documentation/cpu-freq/governors.txt @@ -129,6 +129,14 @@ to its default value of '80' it means that between the checking intervals the CPU needs to be on average more than 80% in use to then decide that the CPU frequency needs to be increased. +sampling_down_factor: this parameter controls the rate that the CPU +makes a decision on when to decrease the frequency. When set to its +default value of '5' it means that at 1/5 the sampling_rate the kernel +makes a decision to lower the frequency. Five "lower rate" decisions +have to be made in a row before the CPU frequency is actually lower. +If set to '1' then the frequency decreases as quickly as it increases, +if set to '2' it decreases at half the rate of the increase. + ignore_nice_load: this parameter takes a value of '0' or '1'. When set to '0' (its default), all processes are counted towards the 'cpu utilisation' value. When set to '1', the processes that are diff --git a/trunk/Documentation/cpusets.txt b/trunk/Documentation/cpusets.txt index 1f5a924d1e56..fb7b361e6eea 100644 --- a/trunk/Documentation/cpusets.txt +++ b/trunk/Documentation/cpusets.txt @@ -154,15 +154,13 @@ browsing and modifying the cpusets presently known to the kernel. No new system calls are added for cpusets - all support for querying and modifying cpusets is via this cpuset file system. -The /proc//status file for each task has four added lines, +The /proc//status file for each task has two added lines, displaying the tasks cpus_allowed (on which CPUs it may be scheduled) and mems_allowed (on which Memory Nodes it may obtain memory), -in the two formats seen in the following example: +in the format seen in the following example: Cpus_allowed: ffffffff,ffffffff,ffffffff,ffffffff - Cpus_allowed_list: 0-127 Mems_allowed: ffffffff,ffffffff - Mems_allowed_list: 0-63 Each cpuset is represented by a directory in the cgroup file system containing (on top of the standard cgroup files) the following @@ -201,7 +199,7 @@ using the sched_setaffinity, mbind and set_mempolicy system calls. The following rules apply to each cpuset: - Its CPUs and Memory Nodes must be a subset of its parents. - - It can't be marked exclusive unless its parent is. + - It can only be marked exclusive if its parent is. - If its cpu or memory is exclusive, they may not overlap any sibling. These rules, and the natural hierarchy of cpusets, enable efficient @@ -347,7 +345,7 @@ is modified to perform an inline check for this PF_SPREAD_PAGE task flag, and if set, a call to a new routine cpuset_mem_spread_node() returns the node to prefer for the allocation. -Similarly, setting 'memory_spread_slab' turns on the flag +Similarly, setting 'memory_spread_cache' turns on the flag PF_SPREAD_SLAB, and appropriately marked slab caches will allocate pages from the node returned by cpuset_mem_spread_node(). @@ -544,10 +542,7 @@ otherwise initial value -1 that indicates the cpuset has no request. 2 : search cores in a package. 3 : search cpus in a node [= system wide on non-NUMA system] ( 4 : search nodes in a chunk of node [on NUMA system] ) - ( 5 : search system wide [on NUMA system] ) - -The system default is architecture dependent. The system default -can be changed using the relax_domain_level= boot parameter. + ( 5~ : search system wide [on NUMA system]) This file is per-cpuset and affect the sched domain where the cpuset belongs to. Therefore if the flag 'sched_load_balance' of a cpuset @@ -714,10 +709,7 @@ Now you want to do something with this cpuset. In this directory you can find several files: # ls -cpu_exclusive memory_migrate mems tasks -cpus memory_pressure notify_on_release -mem_exclusive memory_spread_page sched_load_balance -mem_hardwall memory_spread_slab sched_relax_domain_level +cpus cpu_exclusive mems mem_exclusive mem_hardwall tasks Reading them will give you information about the state of this cpuset: the CPUs and Memory Nodes it can use, the processes that are using diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 46ece3fba6f9..5b3f31faed56 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -312,12 +312,3 @@ When: 2.6.26 Why: Implementation became generic; users should now include linux/semaphore.h instead. Who: Matthew Wilcox - ---------------------------- - -What: CONFIG_THERMAL_HWMON -When: January 2009 -Why: This option was introduced just to allow older lm-sensors userspace - to keep working over the upgrade to 2.6.26. At the scheduled time of - removal fixed lm-sensors (2.x or 3.x) should be readily available. -Who: Rene Herman diff --git a/trunk/Documentation/filesystems/ext4.txt b/trunk/Documentation/filesystems/ext4.txt index 0c5086db8352..560f88dc7090 100644 --- a/trunk/Documentation/filesystems/ext4.txt +++ b/trunk/Documentation/filesystems/ext4.txt @@ -139,16 +139,8 @@ commit=nrsec (*) Ext4 can be told to sync all its data and metadata Setting it to very large values will improve performance. -barrier=<0|1(*)> This enables/disables the use of write barriers in - the jbd code. barrier=0 disables, barrier=1 enables. - This also requires an IO stack which can support - barriers, and if jbd gets an error on a barrier - write, it will disable again with a warning. - Write barriers enforce proper on-disk ordering - of journal commits, making volatile disk write caches - safe to use, at some performance penalty. If - your disks are battery-backed in one way or another, - disabling barriers may safely improve performance. +barrier=1 This enables/disables barriers. barrier=0 disables + it, barrier=1 enables it. orlov (*) This enables the new Orlov block allocator. It is enabled by default. diff --git a/trunk/Documentation/filesystems/sysfs-pci.txt b/trunk/Documentation/filesystems/sysfs-pci.txt index 68ef48839c04..5daa2aaec2c5 100644 --- a/trunk/Documentation/filesystems/sysfs-pci.txt +++ b/trunk/Documentation/filesystems/sysfs-pci.txt @@ -36,7 +36,6 @@ files, each with their own function. local_cpus nearby CPU mask (cpumask, ro) resource PCI resource host addresses (ascii, ro) resource0..N PCI resource N, if present (binary, mmap) - resource0_wc..N_wc PCI WC map resource N, if prefetchable (binary, mmap) rom PCI ROM resource, if present (binary, ro) subsystem_device PCI subsystem device (ascii, ro) subsystem_vendor PCI subsystem vendor (ascii, ro) diff --git a/trunk/Documentation/ftrace.txt b/trunk/Documentation/ftrace.txt deleted file mode 100644 index 77d3faa1a611..000000000000 --- a/trunk/Documentation/ftrace.txt +++ /dev/null @@ -1,1361 +0,0 @@ - ftrace - Function Tracer - ======================== - -Copyright 2008 Red Hat Inc. - Author: Steven Rostedt - License: The GNU Free Documentation License, Version 1.2 -Reviewers: Elias Oltmanns and Randy Dunlap - -Writen for: 2.6.26-rc8 linux-2.6-tip.git tip/tracing/ftrace branch - -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 - have 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 trace - buffers are allocated in pages (blocks of memory that - the kernel uses for allocation, usually 4 KB in size). - Since each entry is smaller than a page, if the last - allocated page has room for more entries than were - requested, the rest of the page is used to allocate - entries. - - 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 these functions. - - 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_ be 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 - to be 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 file output. The trace file output - included an absolute timestamp. The timestamp used by the - latency_trace file is relative to the start of 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 are 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 prepended with "no". - - echo noprint-parent > /debug/tracing/iter_ctrl - -To enable an option, leave off the "no". - - echo sym-offset > /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 -of how to use 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 to the time -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 by enabling -function tracing, we endure an added overhead. This overhead may -extend the latency times. But nevertheless, this trace has provided -some very helpful debugging information. - - -preemptoff ----------- - -When preemption is disabled, we may be able to receive interrupts but -the task cannot 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 disable 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 preemptirqsoff > /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 from the interrupt handler, 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 are more appropriate for such measurements. - -Real-Time environments are 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 -differently 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. On x86_32 with 4K stacks -configured, the interrupt and softirq runs with their own stack. -Some information is held on the top of the task's stack (need_resched -and preempt_count are both stored there). The setting of the NEED_RESCHED -bit is done directly to the task's stack, but the reading of the -NEED_RESCHED is done by looking at the current stack, which in this case -is the stack for the hard interrupt. This hides the fact that NEED_RESCHED -has been set. We don't see the 'N' until we switch back to the task's -assigned 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 -the machine 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 changed 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 are used, one for enabling and one for disabling the tracing -of recorded functions. They are: - - set_ftrace_filter - -and - - set_ftrace_notrace - -A list of available functions that you can add to these 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 are currently available - - * - will match functions that begin 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 are not any, then -it simply goes back to sleep. But if there are some, 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. - -If there are recorded calls to mcount, any write to the ftraced_enabled -file will cause the kstop_machine to run. 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 number 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 completely 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 produce 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/hwmon/ibmaem b/trunk/Documentation/hwmon/ibmaem deleted file mode 100644 index 2fefaf582a43..000000000000 --- a/trunk/Documentation/hwmon/ibmaem +++ /dev/null @@ -1,37 +0,0 @@ -Kernel driver ibmaem -====================== - -Supported systems: - * Any recent IBM System X server with Active Energy Manager support. - This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2, - x3950 M2, and certain HS2x/LS2x/QS2x blades. The IPMI host interface - driver ("ipmi-si") needs to be loaded for this driver to do anything. - Prefix: 'ibmaem' - Datasheet: Not available - -Author: Darrick J. Wong - -Description ------------ - -This driver implements sensor reading support for the energy and power -meters available on various IBM System X hardware through the BMC. All -sensor banks will be exported as platform devices; this driver can talk -to both v1 and v2 interfaces. This driver is completely separate from the -older ibmpex driver. - -The v1 AEM interface has a simple set of features to monitor energy use. -There is a register that displays an estimate of raw energy consumption -since the last BMC reset, and a power sensor that returns average power -use over a configurable interval. - -The v2 AEM interface is a bit more sophisticated, being able to present -a wider range of energy and power use registers, the power cap as -set by the AEM software, and temperature sensors. - -Special Features ----------------- - -The "power_cap" value displays the current system power cap, as set by -the Active Energy Manager software. Setting the power cap from the host -is not currently supported. diff --git a/trunk/Documentation/hwmon/sysfs-interface b/trunk/Documentation/hwmon/sysfs-interface index 2d845730d4e0..f4a8ebc1ef1a 100644 --- a/trunk/Documentation/hwmon/sysfs-interface +++ b/trunk/Documentation/hwmon/sysfs-interface @@ -2,12 +2,17 @@ Naming and data format standards for sysfs files ------------------------------------------------ The libsensors library offers an interface to the raw sensors data -through the sysfs interface. Since lm-sensors 3.0.0, libsensors is -completely chip-independent. It assumes that all the kernel drivers -implement the standard sysfs interface described in this document. -This makes adding or updating support for any given chip very easy, as -libsensors, and applications using it, do not need to be modified. -This is a major improvement compared to lm-sensors 2. +through the sysfs interface. See libsensors documentation and source for +further information. As of writing this document, libsensors +(from lm_sensors 2.8.3) is heavily chip-dependent. Adding or updating +support for any given chip requires modifying the library's code. +This is because libsensors was written for the procfs interface +older kernel modules were using, which wasn't standardized enough. +Recent versions of libsensors (from lm_sensors 2.8.2 and later) have +support for the sysfs interface, though. + +The new sysfs interface was designed to be as chip-independent as +possible. Note that motherboards vary widely in the connections to sensor chips. There is no standard that ensures, for example, that the second @@ -30,17 +35,19 @@ access this data in a simple and consistent way. That said, such programs will have to implement conversion, labeling and hiding of inputs. For this reason, it is still not recommended to bypass the library. +If you are developing a userspace application please send us feedback on +this standard. + +Note that this standard isn't completely established yet, so it is subject +to changes. If you are writing a new hardware monitoring driver those +features can't seem to fit in this interface, please contact us with your +extension proposal. Keep in mind that backward compatibility must be +preserved. + Each chip gets its own directory in the sysfs /sys/devices tree. To find all sensor chips, it is easier to follow the device symlinks from /sys/class/hwmon/hwmon*. -Up to lm-sensors 3.0.0, libsensors looks for hardware monitoring attributes -in the "physical" device directory. Since lm-sensors 3.0.1, attributes found -in the hwmon "class" device directory are also supported. Complex drivers -(e.g. drivers for multifunction chips) may want to use this possibility to -avoid namespace pollution. The only drawback will be that older versions of -libsensors won't support the driver in question. - All sysfs values are fixed point numbers. There is only one value per file, unlike the older /proc specification. diff --git a/trunk/Documentation/i2c/writing-clients b/trunk/Documentation/i2c/writing-clients index d4cd4126d1ad..ee75cbace28d 100644 --- a/trunk/Documentation/i2c/writing-clients +++ b/trunk/Documentation/i2c/writing-clients @@ -25,23 +25,12 @@ routines, and should be zero-initialized except for fields with data you provide. A client structure holds device-specific information like the driver model device node, and its I2C address. -/* iff driver uses driver model ("new style") binding model: */ - -static struct i2c_device_id foo_idtable[] = { - { "foo", my_id_for_foo }, - { "bar", my_id_for_bar }, - { } -}; - -MODULE_DEVICE_TABLE(i2c, foo_idtable); - static struct i2c_driver foo_driver = { .driver = { .name = "foo", }, /* iff driver uses driver model ("new style") binding model: */ - .id_table = foo_ids, .probe = foo_probe, .remove = foo_remove, @@ -184,9 +173,10 @@ handle may be used during foo_probe(). If foo_probe() reports success (zero not a negative status code) it may save the handle and use it until foo_remove() returns. That binding model is used by most Linux drivers. -The probe function is called when an entry in the id_table name field -matches the device's name. It is passed the entry that was matched so -the driver knows which one in the table matched. +Drivers match devices when i2c_client.driver_name and the driver name are +the same; this approach is used in several other busses that don't have +device typing support in the hardware. The driver and module name should +match, so hotplug/coldplug mechanisms will modprobe the driver. Device Creation (Standard driver model) diff --git a/trunk/Documentation/x86/i386/IO-APIC.txt b/trunk/Documentation/i386/IO-APIC.txt similarity index 100% rename from trunk/Documentation/x86/i386/IO-APIC.txt rename to trunk/Documentation/i386/IO-APIC.txt diff --git a/trunk/Documentation/x86/i386/boot.txt b/trunk/Documentation/i386/boot.txt similarity index 96% rename from trunk/Documentation/x86/i386/boot.txt rename to trunk/Documentation/i386/boot.txt index 147bfe511cdd..95ad15c3b01f 100644 --- a/trunk/Documentation/x86/i386/boot.txt +++ b/trunk/Documentation/i386/boot.txt @@ -1,14 +1,17 @@ - THE LINUX/x86 BOOT PROTOCOL - --------------------------- + THE LINUX/I386 BOOT PROTOCOL + ---------------------------- -On the x86 platform, the Linux kernel uses a rather complicated boot + H. Peter Anvin + Last update 2007-05-23 + +On the i386 platform, the Linux kernel uses a rather complicated boot convention. This has evolved partially due to historical aspects, as well as the desire in the early days to have the kernel itself be a bootable image, the complicated PC memory model and due to changed expectations in the PC industry caused by the effective demise of real-mode DOS as a mainstream operating system. -Currently, the following versions of the Linux/x86 boot protocol exist. +Currently, the following versions of the Linux/i386 boot protocol exist. Old kernels: zImage/Image support only. Some very early kernels may not even support a command line. @@ -369,17 +372,10 @@ Protocol: 2.00+ - If 0, the protected-mode code is loaded at 0x10000. - If 1, the protected-mode code is loaded at 0x100000. - Bit 5 (write): QUIET_FLAG - - If 0, print early messages. - - If 1, suppress early messages. - This requests to the kernel (decompressor and early - kernel) to not write early messages that require - accessing the display hardware directly. - Bit 6 (write): KEEP_SEGMENTS Protocol: 2.07+ - - If 0, reload the segment registers in the 32bit entry point. - - If 1, do not reload the segment registers in the 32bit entry point. + - if 0, reload the segment registers in the 32bit entry point. + - if 1, do not reload the segment registers in the 32bit entry point. Assume that %cs %ds %ss %es are all set to flat segments with a base of 0 (or the equivalent for their environment). @@ -508,7 +504,7 @@ Protocol: 2.06+ maximum size was 255. Field name: hardware_subarch -Type: write (optional, defaults to x86/PC) +Type: write Offset/size: 0x23c/4 Protocol: 2.07+ @@ -524,13 +520,11 @@ Protocol: 2.07+ 0x00000002 Xen Field name: hardware_subarch_data -Type: write (subarch-dependent) +Type: write Offset/size: 0x240/8 Protocol: 2.07+ A pointer to data that is specific to hardware subarch - This field is currently unused for the default x86/PC environment, - do not modify. Field name: payload_offset Type: read @@ -551,34 +545,6 @@ Protocol: 2.08+ The length of the payload. -Field name: setup_data -Type: write (special) -Offset/size: 0x250/8 -Protocol: 2.09+ - - The 64-bit physical pointer to NULL terminated single linked list of - struct setup_data. This is used to define a more extensible boot - parameters passing mechanism. The definition of struct setup_data is - as follow: - - struct setup_data { - u64 next; - u32 type; - u32 len; - u8 data[0]; - }; - - Where, the next is a 64-bit physical pointer to the next node of - linked list, the next field of the last node is 0; the type is used - to identify the contents of data; the len is the length of data - field; the data holds the real payload. - - This list may be modified at a number of points during the bootup - process. Therefore, when modifying this list one should always make - sure to consider the case where the linked list already contains - entries. - - **** THE IMAGE CHECKSUM From boot protocol version 2.08 onwards the CRC-32 is calculated over @@ -587,7 +553,6 @@ initial remainder of 0xffffffff. The checksum is appended to the file; therefore the CRC of the file up to the limit specified in the syssize field of the header is always 0. - **** THE KERNEL COMMAND LINE The kernel command line has become an important way for the boot @@ -619,6 +584,28 @@ command line is entered using the following protocol: covered by setup_move_size, so you may need to adjust this field. +Field name: setup_data +Type: write (obligatory) +Offset/size: 0x250/8 +Protocol: 2.09+ + + The 64-bit physical pointer to NULL terminated single linked list of + struct setup_data. This is used to define a more extensible boot + parameters passing mechanism. The definition of struct setup_data is + as follow: + + struct setup_data { + u64 next; + u32 type; + u32 len; + u8 data[0]; + }; + + Where, the next is a 64-bit physical pointer to the next node of + linked list, the next field of the last node is 0; the type is used + to identify the contents of data; the len is the length of data + field; the data holds the real payload. + **** MEMORY LAYOUT OF THE REAL-MODE CODE diff --git a/trunk/Documentation/x86/i386/usb-legacy-support.txt b/trunk/Documentation/i386/usb-legacy-support.txt similarity index 100% rename from trunk/Documentation/x86/i386/usb-legacy-support.txt rename to trunk/Documentation/i386/usb-legacy-support.txt diff --git a/trunk/Documentation/x86/i386/zero-page.txt b/trunk/Documentation/i386/zero-page.txt similarity index 100% rename from trunk/Documentation/x86/i386/zero-page.txt rename to trunk/Documentation/i386/zero-page.txt diff --git a/trunk/Documentation/ioctl-number.txt b/trunk/Documentation/ioctl-number.txt index 3bb5f466a90d..240ce7a56c40 100644 --- a/trunk/Documentation/ioctl-number.txt +++ b/trunk/Documentation/ioctl-number.txt @@ -117,7 +117,6 @@ 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/kdump/kdump.txt b/trunk/Documentation/kdump/kdump.txt index 9691c7f5166c..b8e52c0355d3 100644 --- a/trunk/Documentation/kdump/kdump.txt +++ b/trunk/Documentation/kdump/kdump.txt @@ -109,7 +109,7 @@ There are two possible methods of using Kdump. 2) Or use the system kernel binary itself as dump-capture kernel and there is no need to build a separate dump-capture kernel. This is possible only with the architecutres which support a relocatable kernel. As - of today, i386, x86_64 and ia64 architectures support relocatable kernel. + of today i386 and ia64 architectures support relocatable kernel. Building a relocatable kernel is advantageous from the point of view that one does not have to build a second kernel for capturing the dump. But diff --git a/trunk/Documentation/kernel-doc-nano-HOWTO.txt b/trunk/Documentation/kernel-doc-nano-HOWTO.txt index 0bd32748a467..2075c0658bf5 100644 --- a/trunk/Documentation/kernel-doc-nano-HOWTO.txt +++ b/trunk/Documentation/kernel-doc-nano-HOWTO.txt @@ -1,105 +1,6 @@ kernel-doc nano-HOWTO ===================== -How to format kernel-doc comments ---------------------------------- - -In order to provide embedded, 'C' friendly, easy to maintain, -but consistent and extractable documentation of the functions and -data structures in the Linux kernel, the Linux kernel has adopted -a consistent style for documenting functions and their parameters, -and structures and their members. - -The format for this documentation is called the kernel-doc format. -It is documented in this Documentation/kernel-doc-nano-HOWTO.txt file. - -This style embeds the documentation within the source files, using -a few simple conventions. The scripts/kernel-doc perl script, some -SGML templates in Documentation/DocBook, and other tools understand -these conventions, and are used to extract this embedded documentation -into various documents. - -In order to provide good documentation of kernel functions and data -structures, please use the following conventions to format your -kernel-doc comments in Linux kernel source. - -We definitely need kernel-doc formatted documentation for functions -that are exported to loadable modules using EXPORT_SYMBOL. - -We also look to provide kernel-doc formatted documentation for -functions externally visible to other kernel files (not marked -"static"). - -We also recommend providing kernel-doc formatted documentation -for private (file "static") routines, for consistency of kernel -source code layout. But this is lower priority and at the -discretion of the MAINTAINER of that kernel source file. - -Data structures visible in kernel include files should also be -documented using kernel-doc formatted comments. - -The opening comment mark "/**" is reserved for kernel-doc comments. -Only comments so marked will be considered by the kernel-doc scripts, -and any comment so marked must be in kernel-doc format. Do not use -"/**" to be begin a comment block unless the comment block contains -kernel-doc formatted comments. The closing comment marker for -kernel-doc comments can be either "*/" or "**/". - -Kernel-doc comments should be placed just before the function -or data structure being described. - -Example kernel-doc function comment: - -/** - * foobar() - short function description of foobar - * @arg1: Describe the first argument to foobar. - * @arg2: Describe the second argument to foobar. - * One can provide multiple line descriptions - * for arguments. - * - * A longer description, with more discussion of the function foobar() - * that might be useful to those using or modifying it. Begins with - * empty comment line, and may include additional embedded empty - * comment lines. - * - * The longer description can have multiple paragraphs. - **/ - -The first line, with the short description, must be on a single line. - -The @argument descriptions must begin on the very next line following -this opening short function description line, with no intervening -empty comment lines. - -Example kernel-doc data structure comment. - -/** - * struct blah - the basic blah structure - * @mem1: describe the first member of struct blah - * @mem2: describe the second member of struct blah, - * perhaps with more lines and words. - * - * Longer description of this structure. - **/ - -The kernel-doc function comments describe each parameter to the -function, in order, with the @name lines. - -The kernel-doc data structure comments describe each structure member -in the data structure, with the @name lines. - -The longer description formatting is "reflowed", losing your line -breaks. So presenting carefully formatted lists within these -descriptions won't work so well; derived documentation will lose -the formatting. - -See the section below "How to add extractable documentation to your -source files" for more details and notes on how to format kernel-doc -comments. - -Components of the kernel-doc system ------------------------------------ - Many places in the source tree have extractable documentation in the form of block comments above functions. The components of this system are: diff --git a/trunk/Documentation/kernel-docs.txt b/trunk/Documentation/kernel-docs.txt index 28cdc2af2131..5a4ef48224ae 100644 --- a/trunk/Documentation/kernel-docs.txt +++ b/trunk/Documentation/kernel-docs.txt @@ -715,14 +715,14 @@ * Name: "Gary's Encyclopedia - The Linux Kernel" Author: Gary (I suppose...). - URL: http://slencyclopedia.berlios.de/index.html - Keywords: linux, community, everything! + URL: http://www.lisoleg.net/cgi-bin/lisoleg.pl?view=kernel.htm + Keywords: links, not found here?. Description: Gary's Encyclopedia exists to allow the rapid finding of documentation and other information of interest to GNU/Linux users. It has about 4000 links to external pages in 150 major categories. This link is for kernel-specific links, documents, - sites... This list is now hosted by developer.Berlios.de, - but seems not to have been updated since sometime in 1999. + sites... Look there if you could not find here what you were + looking for. * Name: "The home page of Linux-MM" Author: The Linux-MM team. diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 795c487af8e4..e07c432c731f 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -271,17 +271,6 @@ and is between 256 and 4096 characters. It is defined in the file aic79xx= [HW,SCSI] See Documentation/scsi/aic79xx.txt. - amd_iommu= [HW,X86-84] - Pass parameters to the AMD IOMMU driver in the system. - Possible values are: - isolate - enable device isolation (each device, as far - as possible, will get its own protection - domain) - amd_iommu_size= [HW,X86-64] - Define the size of the aperture for the AMD IOMMU - driver. Possible values are: - '32M', '64M' (default), '128M', '256M', '512M', '1G' - amijoy.map= [HW,JOY] Amiga joystick support Map of devices attached to JOY0DAT and JOY1DAT Format: , @@ -306,7 +295,7 @@ and is between 256 and 4096 characters. It is defined in the file when initialising the APIC and IO-APIC components. apm= [APM] Advanced Power Management - See header of arch/x86/kernel/apm_32.c. + See header of arch/i386/kernel/apm.c. arcrimi= [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards Format: ,, @@ -610,29 +599,6 @@ and is between 256 and 4096 characters. It is defined in the file See drivers/char/README.epca and Documentation/digiepca.txt. - disable_mtrr_cleanup [X86] - enable_mtrr_cleanup [X86] - The kernel tries to adjust MTRR layout from continuous - to discrete, to make X server driver able to add WB - entry later. This parameter enables/disables that. - - mtrr_chunk_size=nn[KMG] [X86] - used for mtrr cleanup. It is largest continous chunk - that could hold holes aka. UC entries. - - mtrr_gran_size=nn[KMG] [X86] - Used for mtrr cleanup. It is granularity of mtrr block. - Default is 1. - Large value could prevent small alignment from - using up MTRRs. - - mtrr_spare_reg_nr=n [X86] - Format: - Range: 0,7 : spare reg number - Default : 1 - Used for mtrr cleanup. It is spare mtrr entries number. - Set to 2 or more if your graphical card needs more. - disable_mtrr_trim [X86, Intel and AMD only] By default the kernel will trim any uncacheable memory out of your available memory pool based on @@ -672,7 +638,7 @@ and is between 256 and 4096 characters. It is defined in the file elanfreq= [X86-32] See comment before function elanfreq_setup() in - arch/x86/kernel/cpu/cpufreq/elanfreq.c. + arch/i386/kernel/cpu/cpufreq/elanfreq.c. elevator= [IOSCHED] Format: {"anticipatory" | "cfq" | "deadline" | "noop"} @@ -1713,10 +1679,6 @@ and is between 256 and 4096 characters. It is defined in the file Format: [,[,...]] See arch/*/kernel/reboot.c or arch/*/kernel/process.c - relax_domain_level= - [KNL, SMP] Set scheduler's default relax_domain_level. - See Documentation/cpusets.txt. - reserve= [KNL,BUGS] Force the kernel to ignore some iomem area reservetop= [X86-32] @@ -2150,9 +2112,6 @@ and is between 256 and 4096 characters. It is defined in the file usbhid.mousepoll= [USBHID] The interval which mice are to be polled at. - add_efi_memmap [EFI; x86-32,X86-64] Include EFI memory map in - kernel's map of available physical RAM. - vdso= [X86-32,SH,x86-64] vdso=2: enable compat VDSO (default with COMPAT_VDSO) vdso=1: enable VDSO (default) diff --git a/trunk/Documentation/kobject.txt b/trunk/Documentation/kobject.txt index 51a8021ee532..bf3256e04027 100644 --- a/trunk/Documentation/kobject.txt +++ b/trunk/Documentation/kobject.txt @@ -305,7 +305,7 @@ should not be manipulated by any other user. A kset keeps its children in a standard kernel linked list. Kobjects point back to their containing kset via their kset field. In almost all cases, -the kobjects belonging to a kset have that kset (or, strictly, its embedded +the kobjects belonging to a ket have that kset (or, strictly, its embedded kobject) in their parent. As a kset contains a kobject within it, it should always be dynamically diff --git a/trunk/Documentation/laptops/thinkpad-acpi.txt b/trunk/Documentation/laptops/thinkpad-acpi.txt index 64b3f146e4b0..01c6c3d8a7e3 100644 --- a/trunk/Documentation/laptops/thinkpad-acpi.txt +++ b/trunk/Documentation/laptops/thinkpad-acpi.txt @@ -503,7 +503,7 @@ generate input device EV_KEY events. In addition to the EV_KEY events, thinkpad-acpi may also issue EV_SW events for switches: -SW_RFKILL_ALL T60 and later hardare rfkill rocker switch +SW_RADIO T60 and later hardare rfkill rocker switch SW_TABLET_MODE Tablet ThinkPads HKEY events 0x5009 and 0x500A Non hot-key ACPI HKEY event map: diff --git a/trunk/Documentation/lguest/lguest.c b/trunk/Documentation/lguest/lguest.c index 82fafe0429fe..3be8ab2a886a 100644 --- a/trunk/Documentation/lguest/lguest.c +++ b/trunk/Documentation/lguest/lguest.c @@ -157,9 +157,6 @@ struct virtqueue /* The routine to call when the Guest pings us. */ void (*handle_output)(int fd, struct virtqueue *me); - - /* Outstanding buffers */ - unsigned int inflight; }; /* Remember the arguments to the program so we can "reboot" */ @@ -705,7 +702,6 @@ static unsigned get_vq_desc(struct virtqueue *vq, errx(1, "Looped descriptor"); } while ((i = next_desc(vq, i)) != vq->vring.num); - vq->inflight++; return head; } @@ -723,7 +719,6 @@ static void add_used(struct virtqueue *vq, unsigned int head, int len) /* Make sure buffer is written before we update index. */ wmb(); vq->vring.used->idx++; - vq->inflight--; } /* This actually sends the interrupt for this virtqueue */ @@ -731,9 +726,8 @@ static void trigger_irq(int fd, struct virtqueue *vq) { unsigned long buf[] = { LHREQ_IRQ, vq->config.irq }; - /* If they don't want an interrupt, don't send one, unless empty. */ - if ((vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT) - && vq->inflight) + /* If they don't want an interrupt, don't send one. */ + if (vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT) return; /* Send the Guest an interrupt tell them we used something up. */ @@ -1113,7 +1107,6 @@ static void add_virtqueue(struct device *dev, unsigned int num_descs, vq->next = NULL; vq->last_avail_idx = 0; vq->dev = dev; - vq->inflight = 0; /* Initialize the configuration. */ vq->config.num = num_descs; @@ -1375,7 +1368,6 @@ static void setup_tun_net(const char *arg) /* Tell Guest what MAC address to use. */ add_feature(dev, VIRTIO_NET_F_MAC); - add_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY); set_config(dev, sizeof(conf), &conf); /* We don't need the socket any more; setup is done. */ diff --git a/trunk/Documentation/networking/arcnet.txt b/trunk/Documentation/networking/arcnet.txt index 796012540386..770fc41a78e8 100644 --- a/trunk/Documentation/networking/arcnet.txt +++ b/trunk/Documentation/networking/arcnet.txt @@ -46,7 +46,7 @@ These are the ARCnet drivers for Linux. This new release (2.91) has been put together by David Woodhouse -, in an attempt to tidy up the driver after adding support +, in an attempt to tidy up the driver after adding support for yet another chipset. Now the generic support has been separated from the individual chipset drivers, and the source files aren't quite so packed with #ifdefs! I've changed this file a bit, but kept it in the first person from diff --git a/trunk/Documentation/networking/bridge.txt b/trunk/Documentation/networking/bridge.txt index bec69a8a1697..bdae2db4119c 100644 --- a/trunk/Documentation/networking/bridge.txt +++ b/trunk/Documentation/networking/bridge.txt @@ -1,6 +1,6 @@ In order to use the Ethernet bridging functionality, you'll need the userspace tools. These programs and documentation are available -at http://www.linux-foundation.org/en/Net:Bridge. The download page is +at http://bridge.sourceforge.net. The download page is http://prdownloads.sourceforge.net/bridge. If you still have questions, don't hesitate to post to the mailing list diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt index 946b66e1b652..17a6e46fbd43 100644 --- a/trunk/Documentation/networking/ip-sysctl.txt +++ b/trunk/Documentation/networking/ip-sysctl.txt @@ -81,23 +81,23 @@ inet_peer_minttl - INTEGER Minimum time-to-live of entries. Should be enough to cover fragment time-to-live on the reassembling side. This minimum time-to-live is guaranteed if the pool size is less than inet_peer_threshold. - Measured in seconds. + Measured in jiffies(1). inet_peer_maxttl - INTEGER Maximum time-to-live of entries. Unused entries will expire after this period of time if there is no memory pressure on the pool (i.e. when the number of entries in the pool is very small). - Measured in seconds. + Measured in jiffies(1). inet_peer_gc_mintime - INTEGER Minimum interval between garbage collection passes. This interval is in effect under high memory pressure on the pool. - Measured in seconds. + Measured in jiffies(1). inet_peer_gc_maxtime - INTEGER Minimum interval between garbage collection passes. This interval is in effect under low (or absent) memory pressure on the pool. - Measured in seconds. + Measured in jiffies(1). TCP variables: @@ -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 the packetization layer - Path MTU discovery (MTU probing). If MTU probing is enabled, - this is the initial MSS used by the connection. + 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. tcp_congestion_control - STRING Set the congestion control algorithm to be used for new @@ -185,9 +185,10 @@ 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. - + 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. 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 @@ -275,7 +276,7 @@ tcp_mem - vector of 3 INTEGERs: min, pressure, max memory. tcp_moderate_rcvbuf - BOOLEAN - If set, TCP performs receive buffer auto-tuning, attempting to + If set, TCP performs receive buffer autotuning, 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. @@ -335,7 +336,7 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max pressure. Default: 8K - default: initial size of receive buffer used by TCP sockets. + default: default 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 @@ -343,10 +344,8 @@ 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. 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. + net.core.rmem_max, "static" selection via SO_RCVBUF does not use this. + Default: 87380*2 bytes. tcp_sack - BOOLEAN Enable select acknowledgments (SACKS). @@ -359,7 +358,7 @@ tcp_slow_start_after_idle - BOOLEAN Default: 1 tcp_stdurg - BOOLEAN - Use the Host requirements interpretation of the TCP urgent pointer field. + Use the Host requirements interpretation of the TCP urg pointer field. Most hosts use the older BSD interpretation, so if you turn this on Linux might not communicate correctly with them. Default: FALSE @@ -372,12 +371,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 SYN flood warnings + against legal connection rate. If you see synflood 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. @@ -387,7 +386,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 - SYN flood warnings in logs not being really flooded, your server + synflood warnings in logs not being really flooded, your server is seriously misconfigured. tcp_syn_retries - INTEGER @@ -420,21 +419,19 @@ 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 sockets. + min: Amount of memory reserved for send buffers for TCP socket. Each TCP socket has rights to use it due to fact of its birth. Default: 4K - 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: 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: 16K - 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. + 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 tcp_workaround_signed_windows - BOOLEAN If set, assume no receipt of a window scaling option means the @@ -797,6 +794,10 @@ tag - INTEGER Allows you to write a number, which can be used as required. Default value is 0. +(1) Jiffie: internal timeunit for the kernel. On the i386 1/100s, on the +Alpha 1/1024s. See the HZ define in /usr/include/asm/param.h for the exact +value on your system. + Alexey Kuznetsov. kuznet@ms2.inr.ac.ru @@ -1063,193 +1064,24 @@ bridge-nf-filter-pppoe-tagged - BOOLEAN Default: 1 -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 - -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 +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 + diff --git a/trunk/Documentation/networking/s2io.txt b/trunk/Documentation/networking/s2io.txt index 1e28e2ddb90a..4bde53e85f3f 100644 --- a/trunk/Documentation/networking/s2io.txt +++ b/trunk/Documentation/networking/s2io.txt @@ -83,9 +83,9 @@ Valid range: Limited by memory on system Default: 30 e. intr_type -Specifies interrupt type. Possible values 0(INTA), 2(MSI-X) -Valid values: 0, 2 -Default: 2 +Specifies interrupt type. Possible values 1(INTA), 2(MSI), 3(MSI-X) +Valid range: 1-3 +Default: 1 5. Performance suggestions General: diff --git a/trunk/Documentation/nmi_watchdog.txt b/trunk/Documentation/nmi_watchdog.txt index 90aa4531cb67..757c729ee42e 100644 --- a/trunk/Documentation/nmi_watchdog.txt +++ b/trunk/Documentation/nmi_watchdog.txt @@ -10,7 +10,7 @@ us to generate 'watchdog NMI interrupts'. (NMI: Non Maskable Interrupt which get executed even if the system is otherwise locked up hard). This can be used to debug hard kernel lockups. By executing periodic NMI interrupts, the kernel can monitor whether any CPU has locked up, -and print out debugging messages if so. +and print out debugging messages if so. In order to use the NMI watchdog, you need to have APIC support in your kernel. For SMP kernels, APIC support gets compiled in automatically. For @@ -22,7 +22,8 @@ CONFIG_X86_UP_IOAPIC is for uniprocessor with an IO-APIC. [Note: certain kernel debugging options, such as Kernel Stack Meter or Kernel Tracer, may implicitly disable the NMI watchdog.] -For x86-64, the needed APIC is always compiled in. +For x86-64, the needed APIC is always compiled in, and the NMI watchdog is +always enabled with I/O-APIC mode (nmi_watchdog=1). Using local APIC (nmi_watchdog=2) needs the first performance register, so you can't use it for other purposes (such as high precision performance @@ -62,15 +63,16 @@ when the system is idle), but if your system locks up on anything but the "hlt", then you are out of luck -- the event will not happen at all and the watchdog won't trigger. This is a shortcoming of the local APIC watchdog -- unfortunately there is no "clock ticks" event that would work all the -time. The I/O APIC watchdog is driven externally and has no such shortcoming. +time. The I/O APIC watchdog is driven externally and has no such shortcoming. But its NMI frequency is much higher, resulting in a more significant hit to the overall system performance. -On x86 nmi_watchdog is disabled by default so you have to enable it with -a boot time parameter. +NOTE: starting with 2.4.2-ac18 the NMI-oopser is disabled by default, +you have to enable it with a boot time parameter. Prior to 2.4.2-ac18 +the NMI-oopser is enabled unconditionally on x86 SMP boxes. -NOTE: In kernels prior to 2.4.2-ac18 the NMI-oopser is enabled unconditionally -on x86 SMP boxes. +On x86-64 the NMI oopser is on by default. On 64bit Intel CPUs +it uses IO-APIC by default and on AMD it uses local APIC. [ feel free to send bug reports, suggestions and patches to Ingo Molnar or the Linux SMP mailing diff --git a/trunk/Documentation/scheduler/sched-domains.txt b/trunk/Documentation/scheduler/sched-domains.txt index 373ceacc367e..a9e990ab980f 100644 --- a/trunk/Documentation/scheduler/sched-domains.txt +++ b/trunk/Documentation/scheduler/sched-domains.txt @@ -61,7 +61,10 @@ builder by #define'ing ARCH_HASH_SCHED_DOMAIN, and exporting your arch_init_sched_domains function. This function will attach domains to all CPUs using cpu_attach_domain. -The sched-domains debugging infrastructure can be enabled by enabling -CONFIG_SCHED_DEBUG. This enables an error checking parse of the sched domains +Implementors should change the line +#undef SCHED_DOMAIN_DEBUG +to +#define SCHED_DOMAIN_DEBUG +in kernel/sched.c as this enables an error checking parse of the sched domains which should catch most possible errors (described above). It also prints out the domain structure in a visual format. diff --git a/trunk/Documentation/scheduler/sched-rt-group.txt b/trunk/Documentation/scheduler/sched-rt-group.txt index 3ef339f491e0..14f901f639ee 100644 --- a/trunk/Documentation/scheduler/sched-rt-group.txt +++ b/trunk/Documentation/scheduler/sched-rt-group.txt @@ -51,9 +51,9 @@ needs only about 3% CPU time to do so, it can do with a 0.03 * 0.005s = 0.00015s. So this group can be scheduled with a period of 0.005s and a run time of 0.00015s. -The remaining CPU time will be used for user input and other tasks. Because +The remaining CPU time will be used for user input and other tass. Because realtime tasks have explicitly allocated the CPU time they need to perform -their tasks, buffer underruns in the graphics or audio can be eliminated. +their tasks, buffer underruns in the graphocs or audio can be eliminated. NOTE: the above example is not fully implemented as of yet (2.6.25). We still lack an EDF scheduler to make non-uniform periods usable. diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt index 72aff61e7315..0bbee38acd26 100644 --- a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt @@ -753,11 +753,8 @@ 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 = use LPIB, 2 = POSBUF) + position_fix - Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size) 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 @@ -848,7 +845,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. ALC269 basic Basic preset - ALC662/663 + ALC662 3stack-dig 3-stack (2-channel) with SPDIF 3stack-6ch 3-stack (6-channel) 3stack-6ch-dig 3-stack (6-channel) with SPDIF @@ -856,10 +853,6 @@ 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 @@ -1098,7 +1091,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_VERBOSE, or simply from the file name of the codec + CONFIG_SND_DEBUG_DETECT, 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. @@ -2274,10 +2267,6 @@ 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 e13c4e67029f..b03df4d4795c 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_VERBOSE is set. Please note - that CONFIG_SND_DEBUG_VERBOSE is not set as default + CONFIG_SND_DEBUG_DETECT is set. Please note + that DEBUG_DETECT 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/Documentation/video4linux/CARDLIST.au0828 b/trunk/Documentation/video4linux/CARDLIST.au0828 index 86d1c8e7b18f..aaae360312e4 100644 --- a/trunk/Documentation/video4linux/CARDLIST.au0828 +++ b/trunk/Documentation/video4linux/CARDLIST.au0828 @@ -1,4 +1,4 @@ 0 -> Unknown board (au0828) - 1 -> Hauppauge HVR950Q (au0828) [2040:7200,2040:7210,2040:7217,2040:721b,2040:721f,2040:7280,0fd9:0008] + 1 -> Hauppauge HVR950Q (au0828) [2040:7200] 2 -> Hauppauge HVR850 (au0828) [2040:7240] 3 -> DViCO FusionHDTV USB (au0828) [0fe9:d620] diff --git a/trunk/Documentation/video4linux/CARDLIST.cx88 b/trunk/Documentation/video4linux/CARDLIST.cx88 index 7cf5685d3645..543957346469 100644 --- a/trunk/Documentation/video4linux/CARDLIST.cx88 +++ b/trunk/Documentation/video4linux/CARDLIST.cx88 @@ -60,7 +60,7 @@ 59 -> DViCO FusionHDTV 5 PCI nano [18ac:d530] 60 -> Pinnacle Hybrid PCTV [12ab:1788] 61 -> Winfast TV2000 XP Global [107d:6f18] - 62 -> PowerColor RA330 [14f1:ea3d] + 62 -> PowerColor Real Angel 330 [14f1:ea3d] 63 -> Geniatech X8000-MT DVBT [14f1:8852] 64 -> DViCO FusionHDTV DVB-T PRO [18ac:db30] 65 -> DViCO FusionHDTV 7 Gold [18ac:d610] diff --git a/trunk/Documentation/video4linux/cx18.txt b/trunk/Documentation/video4linux/cx18.txt index 6842c262890f..077d56ec3f3d 100644 --- a/trunk/Documentation/video4linux/cx18.txt +++ b/trunk/Documentation/video4linux/cx18.txt @@ -1,9 +1,7 @@ Some notes regarding the cx18 driver for the Conexant CX23418 MPEG encoder chip: -1) The only hardware currently supported is the Hauppauge HVR-1600 - card and the Compro VideoMate H900 (note that this card only - supports analog input, it has no digital tuner!). +1) The only hardware currently supported is the Hauppauge HVR-1600. 2) Some people have problems getting the i2c bus to work. Cause unknown. The symptom is that the eeprom cannot be read and the card is diff --git a/trunk/Documentation/vm/pagemap.txt b/trunk/Documentation/vm/pagemap.txt deleted file mode 100644 index ce72c0fe6177..000000000000 --- a/trunk/Documentation/vm/pagemap.txt +++ /dev/null @@ -1,77 +0,0 @@ -pagemap, from the userspace perspective ---------------------------------------- - -pagemap is a new (as of 2.6.25) set of interfaces in the kernel that allow -userspace programs to examine the page tables and related information by -reading files in /proc. - -There are three components to pagemap: - - * /proc/pid/pagemap. This file lets a userspace process find out which - physical frame each virtual page is mapped to. It contains one 64-bit - value for each virtual page, containing the following data (from - fs/proc/task_mmu.c, above pagemap_read): - - * Bits 0-55 page frame number (PFN) if present - * Bits 0-4 swap type if swapped - * Bits 5-55 swap offset if swapped - * Bits 55-60 page shift (page size = 1< * * Compile by: * @@ -99,7 +99,7 @@ void fatal(const char *x, ...) void usage(void) { - printf("slabinfo 5/7/2007. (c) 2007 sgi.\n\n" + printf("slabinfo 5/7/2007. (c) 2007 sgi. clameter@sgi.com\n\n" "slabinfo [-ahnpvtsz] [-d debugopts] [slab-regexp]\n" "-a|--aliases Show aliases\n" "-A|--activity Most active slabs first\n" diff --git a/trunk/Documentation/vm/slub.txt b/trunk/Documentation/vm/slub.txt index bb1f5c6e28b3..7c13f22a0c9e 100644 --- a/trunk/Documentation/vm/slub.txt +++ b/trunk/Documentation/vm/slub.txt @@ -266,4 +266,4 @@ of other objects. slub_debug=FZ,dentry -Christoph Lameter, May 30, 2007 +Christoph Lameter, , May 30, 2007 diff --git a/trunk/Documentation/x86/x86_64/00-INDEX b/trunk/Documentation/x86_64/00-INDEX similarity index 100% rename from trunk/Documentation/x86/x86_64/00-INDEX rename to trunk/Documentation/x86_64/00-INDEX diff --git a/trunk/Documentation/x86/x86_64/boot-options.txt b/trunk/Documentation/x86_64/boot-options.txt similarity index 100% rename from trunk/Documentation/x86/x86_64/boot-options.txt rename to trunk/Documentation/x86_64/boot-options.txt diff --git a/trunk/Documentation/x86/x86_64/cpu-hotplug-spec b/trunk/Documentation/x86_64/cpu-hotplug-spec similarity index 100% rename from trunk/Documentation/x86/x86_64/cpu-hotplug-spec rename to trunk/Documentation/x86_64/cpu-hotplug-spec diff --git a/trunk/Documentation/x86/x86_64/fake-numa-for-cpusets b/trunk/Documentation/x86_64/fake-numa-for-cpusets similarity index 100% rename from trunk/Documentation/x86/x86_64/fake-numa-for-cpusets rename to trunk/Documentation/x86_64/fake-numa-for-cpusets diff --git a/trunk/Documentation/x86/x86_64/kernel-stacks b/trunk/Documentation/x86_64/kernel-stacks similarity index 100% rename from trunk/Documentation/x86/x86_64/kernel-stacks rename to trunk/Documentation/x86_64/kernel-stacks diff --git a/trunk/Documentation/x86/x86_64/machinecheck b/trunk/Documentation/x86_64/machinecheck similarity index 100% rename from trunk/Documentation/x86/x86_64/machinecheck rename to trunk/Documentation/x86_64/machinecheck diff --git a/trunk/Documentation/x86/x86_64/mm.txt b/trunk/Documentation/x86_64/mm.txt similarity index 87% rename from trunk/Documentation/x86/x86_64/mm.txt rename to trunk/Documentation/x86_64/mm.txt index efce75097369..b89b6d2bebfa 100644 --- a/trunk/Documentation/x86/x86_64/mm.txt +++ b/trunk/Documentation/x86_64/mm.txt @@ -11,8 +11,9 @@ ffffc10000000000 - ffffc1ffffffffff (=40 bits) hole ffffc20000000000 - ffffe1ffffffffff (=45 bits) vmalloc/ioremap space ffffe20000000000 - ffffe2ffffffffff (=40 bits) virtual memory map (1TB) ... unused hole ... -ffffffff80000000 - ffffffffa0000000 (=512 MB) kernel text mapping, from phys 0 -ffffffffa0000000 - fffffffffff00000 (=1536 MB) module mapping space +ffffffff80000000 - ffffffff82800000 (=40 MB) kernel text mapping, from phys 0 +... unused hole ... +ffffffff88000000 - fffffffffff00000 (=1919 MB) module mapping space The direct mapping covers all memory in the system up to the highest memory address (this means in some cases it can also include PCI memory diff --git a/trunk/Documentation/x86/x86_64/uefi.txt b/trunk/Documentation/x86_64/uefi.txt similarity index 84% rename from trunk/Documentation/x86/x86_64/uefi.txt rename to trunk/Documentation/x86_64/uefi.txt index a5e2b4fdb170..7d77120a5184 100644 --- a/trunk/Documentation/x86/x86_64/uefi.txt +++ b/trunk/Documentation/x86_64/uefi.txt @@ -36,7 +36,3 @@ Mechanics: services. noefi turn off all EFI runtime services reboot_type=k turn off EFI reboot runtime service -- If the EFI memory map has additional entries not in the E820 map, - you can include those entries in the kernels memory map of available - physical RAM by using the following kernel command line parameter. - add_efi_memmap include EFI memory map of available physical RAM diff --git a/trunk/Kbuild b/trunk/Kbuild index e750e9c3fe59..32f19c5c9bb0 100644 --- a/trunk/Kbuild +++ b/trunk/Kbuild @@ -96,4 +96,5 @@ missing-syscalls: scripts/checksyscalls.sh FORCE $(call cmd,syscalls) # Delete all targets during make clean -clean-files := $(addprefix $(objtree)/,$(filter-out $(bounds-file) $(offsets-file),$(targets))) +clean-files := $(addprefix $(objtree)/,$(targets)) + diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 1528e58b5408..c68a1189140c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -228,21 +228,21 @@ ACPI BATTERY DRIVERS P: Alexey Starikovskiy M: astarikovskiy@suse.de L: linux-acpi@vger.kernel.org -W: http://www.lesswatts.org/projects/acpi/ +W: http://acpi.sourceforge.net/ S: Supported ACPI EC DRIVER P: Alexey Starikovskiy M: astarikovskiy@suse.de L: linux-acpi@vger.kernel.org -W: http://www.lesswatts.org/projects/acpi/ +W: http://acpi.sourceforge.net/ S: Supported ACPI FAN DRIVER P: Len Brown M: len.brown@intel.com L: linux-acpi@vger.kernel.org -W: http://www.lesswatts.org/projects/acpi/ +W: http://acpi.sourceforge.net/ S: Supported ACPI PCI HOTPLUG DRIVER @@ -255,14 +255,14 @@ ACPI THERMAL DRIVER P: Len Brown M: len.brown@intel.com L: linux-acpi@vger.kernel.org -W: http://www.lesswatts.org/projects/acpi/ +W: http://acpi.sourceforge.net/ S: Supported ACPI VIDEO DRIVER P: Rui Zhang M: rui.zhang@intel.com L: linux-acpi@vger.kernel.org -W: http://www.lesswatts.org/projects/acpi/ +W: http://acpi.sourceforge.net/ S: Supported ACPI WMI DRIVER @@ -274,7 +274,7 @@ S: Maintained AD1889 ALSA SOUND DRIVER P: Kyle McMartin -M: kyle@mcmartin.ca +M: kyle@parisc-linux.org P: Thibaut Varene M: T-Bone@parisc-linux.org W: http://wiki.parisc-linux.org/AD1889 @@ -376,12 +376,6 @@ L: linux-geode@lists.infradead.org (moderated for non-subscribers) W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html S: Supported -AMD IOMMU (AMD-VI) -P: Joerg Roedel -M: joerg.roedel@amd.com -L: iommu@lists.linux-foundation.org -S: Supported - AMS (Apple Motion Sensor) DRIVER P: Stelian Pop M: stelian@popies.net @@ -769,10 +763,9 @@ S: Maintained AUXILIARY DISPLAY DRIVERS P: Miguel Ojeda Sandonis -M: miguel.ojeda.sandonis@gmail.com +M: maxextreme@gmail.com L: linux-kernel@vger.kernel.org -W: http://miguelojeda.es/auxdisplay.htm -W: http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm +W: http://auxdisplay.googlepages.com/ S: Maintained AVR32 ARCHITECTURE @@ -989,6 +982,13 @@ L: bonding-devel@lists.sourceforge.net W: http://sourceforge.net/projects/bonding/ S: Supported +BROADBAND PROCESSOR ARCHITECTURE +P: Arnd Bergmann +M: arnd@arndb.de +L: linuxppc-dev@ozlabs.org +W: http://www.penguinppc.org/ppc64/ +S: Supported + BROADCOM B44 10/100 ETHERNET DRIVER P: Gary Zambrano M: zambrano@broadcom.com @@ -1002,8 +1002,8 @@ L: netdev@vger.kernel.org S: Supported BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER -P: Eilon Greenstein -M: eilong@broadcom.com +P: Eliezer Tamir +M: eliezert@broadcom.com L: netdev@vger.kernel.org S: Supported @@ -1052,28 +1052,18 @@ L: linux-kernel@vger.kernel.org L: discuss@x86-64.org S: Maintained -CELL BROADBAND ENGINE ARCHITECTURE -P: Arnd Bergmann -M: arnd@arndb.de -L: linuxppc-dev@ozlabs.org -L: cbe-oss-dev@ozlabs.org -W: http://www.ibm.com/developerworks/power/cell/ -S: Supported - CFAG12864B LCD DRIVER P: Miguel Ojeda Sandonis -M: miguel.ojeda.sandonis@gmail.com +M: maxextreme@gmail.com L: linux-kernel@vger.kernel.org -W: http://miguelojeda.es/auxdisplay.htm -W: http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm +W: http://auxdisplay.googlepages.com/ S: Maintained CFAG12864BFB LCD FRAMEBUFFER DRIVER P: Miguel Ojeda Sandonis -M: miguel.ojeda.sandonis@gmail.com +M: maxextreme@gmail.com L: linux-kernel@vger.kernel.org -W: http://miguelojeda.es/auxdisplay.htm -W: http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm +W: http://auxdisplay.googlepages.com/ S: Maintained CFG80211 and NL80211 @@ -1211,7 +1201,6 @@ M: pj@sgi.com M: menage@google.com L: linux-kernel@vger.kernel.org W: http://www.bullopensource.org/cpuset/ -W: http://oss.sgi.com/projects/cpusets/ S: Supported CRAMFS FILESYSTEM @@ -1250,20 +1239,6 @@ L: video4linux-list@redhat.com W: http://linuxtv.org S: Maintained -CXGB3 ETHERNET DRIVER (CXGB3) -P: Divy Le Ray -M: divy@chelsio.com -L: netdev@vger.kernel.org -W: http://www.chelsio.com -S: Supported - -CXGB3 IWARP RNIC DRIVER (IW_CXGB3) -P: Steve Wise -M: swise@chelsio.com -L: general@lists.openfabrics.org -W: http://www.openfabrics.org -S: Supported - CYBERPRO FB DRIVER P: Russell King M: rmk@arm.linux.org.uk @@ -1429,14 +1404,6 @@ M: kristen.c.accardi@intel.com L: linux-acpi@vger.kernel.org S: Supported -DOCUMENTATION (/Documentation directory) -P: Michael Kerrisk -M: mtk.manpages@gmail.com -P: Randy Dunlap -M: rdunlap@xenotime.net -L: linux-doc@vger.kernel.org -S: Maintained - DOUBLETALK DRIVER P: James R. Van Zandt M: jrv@vanzandt.mv.com @@ -1629,7 +1596,7 @@ ETHERNET BRIDGE P: Stephen Hemminger M: shemminger@linux-foundation.org L: bridge@lists.linux-foundation.org -W: http://www.linux-foundation.org/en/Net:Bridge +W: http://bridge.sourceforge.net/ S: Maintained ETHERTEAM 16I DRIVER @@ -1643,13 +1610,13 @@ S: Maintained EXT3 FILE SYSTEM P: Stephen Tweedie, Andrew Morton -M: sct@redhat.com, akpm@linux-foundation.org, adilger@sun.com +M: sct@redhat.com, akpm@linux-foundation.org, adilger@clusterfs.com L: linux-ext4@vger.kernel.org S: Maintained EXT4 FILE SYSTEM P: Stephen Tweedie, Andrew Morton -M: sct@redhat.com, akpm@linux-foundation.org, adilger@sun.com +M: sct@redhat.com, akpm@linux-foundation.org, adilger@clusterfs.com L: linux-ext4@vger.kernel.org S: Maintained @@ -1678,10 +1645,8 @@ W: http://linux-fbdev.sourceforge.net/ S: Maintained FREESCALE DMA DRIVER -P: Li Yang -M: leoli@freescale.com -P: Zhang Wei -M: zw@zh-kernel.org +P; Zhang Wei +M: wei.zhang@freescale.com L: linuxppc-embedded@ozlabs.org L: linux-kernel@vger.kernel.org S: Maintained @@ -1845,7 +1810,7 @@ S: Maintained HARMONY SOUND DRIVER P: Kyle McMartin -M: kyle@mcmartin.ca +M: kyle@parisc-linux.org L: linux-parisc@vger.kernel.org S: Maintained @@ -2364,8 +2329,7 @@ S: Maintained KERNEL BUILD (kbuild: Makefile, scripts/Makefile.*) P: Sam Ravnborg M: sam@ravnborg.org -T: git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild-next.git -T: git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild-fixes.git +T: git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git L: linux-kbuild@vger.kernel.org S: Maintained @@ -2387,24 +2351,24 @@ S: Supported KERNEL VIRTUAL MACHINE (KVM) P: Avi Kivity M: avi@qumranet.com -L: kvm@vger.kernel.org -W: http://kvm.qumranet.com +L: kvm-devel@lists.sourceforge.net +W: kvm.sourceforge.net S: Supported KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC P: Hollis Blanchard M: hollisb@us.ibm.com -L: kvm-ppc@vger.kernel.org -W: http://kvm.qumranet.com +L: kvm-ppc-devel@lists.sourceforge.net +W: kvm.sourceforge.net S: Supported -KERNEL VIRTUAL MACHINE For Itanium (KVM/IA64) +KERNEL VIRTUAL MACHINE For Itanium(KVM/IA64) P: Anthony Xu M: anthony.xu@intel.com P: Xiantao Zhang M: xiantao.zhang@intel.com -L: kvm-ia64@vger.kernel.org -W: http://kvm.qumranet.com +L: kvm-ia64-devel@lists.sourceforge.net +W: kvm.sourceforge.net S: Supported KERNEL VIRTUAL MACHINE for s390 (KVM/s390) @@ -2445,10 +2409,9 @@ S: Maintained KS0108 LCD CONTROLLER DRIVER P: Miguel Ojeda Sandonis -M: miguel.ojeda.sandonis@gmail.com +M: maxextreme@gmail.com L: linux-kernel@vger.kernel.org -W: http://miguelojeda.es/auxdisplay.htm -W: http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm +W: http://auxdisplay.googlepages.com/ S: Maintained LAPB module @@ -2492,11 +2455,9 @@ M: James.Bottomley@HansenPartnership.com W: http://www.hansenpartnership.com/voyager S: Maintained -LINUX FOR POWERPC (32-BIT AND 64-BIT) +LINUX FOR POWERPC P: Paul Mackerras M: paulus@samba.org -P: Benjamin Herrenschmidt -M: benh@kernel.crashing.org W: http://www.penguinppc.org/ L: linuxppc-dev@ozlabs.org T: git kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git @@ -2536,6 +2497,13 @@ W: http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex L: linuxppc-dev@ozlabs.org S: Maintained +LINUX FOR POWERPC BOOT CODE +P: Tom Rini +M: trini@kernel.crashing.org +W: http://www.penguinppc.org/ +L: linuxppc-dev@ozlabs.org +S: Maintained + LINUX FOR POWERPC EMBEDDED PPC8XX P: Vitaly Bordug M: vitb@kernel.crashing.org @@ -2564,10 +2532,22 @@ P: Arnaldo Carvalho de Melo M: acme@ghostprotocols.net S: Maintained +LINUX FOR 64BIT POWERPC +P: Paul Mackerras +M: paulus@samba.org +M: paulus@au.ibm.com +P: Anton Blanchard +M: anton@samba.org +M: anton@au.ibm.com +W: http://www.penguinppc.org/ppc64/ +L: linuxppc-dev@ozlabs.org +S: Supported + LINUX SECURITY MODULE (LSM) FRAMEWORK P: Chris Wright M: chrisw@sous-sol.org L: linux-security-module@vger.kernel.org +W: http://lsm.immunix.org T: git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git S: Supported @@ -2682,8 +2662,8 @@ S: Supported MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7 P: Michael Kerrisk M: mtk.manpages@gmail.com -W: http://www.kernel.org/doc/man-pages -S: Supported +W: ftp://ftp.kernel.org/pub/linux/docs/manpages +S: Maintained MARVELL LIBERTAS WIRELESS DRIVER P: Dan Williams @@ -2816,12 +2796,6 @@ W: https://tango.0pointer.de/mailman/listinfo/s270-linux W: http://0pointer.de/lennart/tchibo.html S: Maintained -MULTIFUNCTION DEVICES (MFD) -P: Samuel Ortiz -M: sameo@openedhand.com -L: linux-kernel@vger.kernel.org -S: Supported - MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM P: Pierre Ossman M: drzeus-mmc@drzeus.cx @@ -2845,15 +2819,6 @@ M: jirislaby@gmail.com L: linux-kernel@vger.kernel.org S: Maintained -MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE) -P: Andrew Gallatin -M: gallatin@myri.com -P: Brice Goglin -M: brice@myri.com -L: netdev@vger.kernel.org -W: http://www.myri.com/scs/download-Myri10GE.html -S: Supported - NATSEMI ETHERNET DRIVER (DP8381x) P: Tim Hockin M: thockin@hockin.org @@ -2874,8 +2839,8 @@ S: Maintained NETEFFECT IWARP RNIC DRIVER (IW_NES) P: Faisal Latif M: flatif@neteffect.com -P: Chien Tung -M: ctung@neteffect.com +P: Nishi Gupta +M: ngupta@neteffect.com P: Glenn Streiff M: gstreiff@neteffect.com L: general@lists.openfabrics.org @@ -3088,8 +3053,8 @@ L: linux-scsi@vger.kernel.org S: Maintained OPROFILE -P: Robert Richter -M: robert.richter@amd.com +P: Philippe Elie +M: phil.el@wanadoo.fr L: oprofile-list@lists.sf.net S: Maintained @@ -3129,7 +3094,7 @@ S: Maintained PARISC ARCHITECTURE P: Kyle McMartin -M: kyle@mcmartin.ca +M: kyle@parisc-linux.org P: Matthew Wilcox M: matthew@wil.cx P: Grant Grundler @@ -3167,7 +3132,7 @@ PCI ERROR RECOVERY P: Linas Vepstas M: linas@austin.ibm.com L: linux-kernel@vger.kernel.org -L: linux-pci@vger.kernel.org +L: linux-pci@atrey.karlin.mff.cuni.cz S: Supported PCI SUBSYSTEM @@ -3203,8 +3168,8 @@ L: netdev@vger.kernel.org S: Maintained PER-TASK DELAY ACCOUNTING -P: Balbir Singh -M: balbir@linux.vnet.ibm.com +P: Shailabh Nagar +M: nagar@watson.ibm.com L: linux-kernel@vger.kernel.org S: Maintained @@ -3273,7 +3238,7 @@ S: Maintained PPP OVER ETHERNET P: Michal Ostrowski -M: mostrows@earthlink.net +M: mostrows@speakeasy.net S: Maintained PPP OVER L2TP @@ -3338,11 +3303,9 @@ L: video4linux-list@redhat.com W: http://www.isely.net/pvrusb2/ S: Maintained -PXA2xx/PXA3xx SUPPORT -P: Eric Miao -M: eric.miao@marvell.com -P: Russell King -M: linux@arm.linux.org.uk +PXA2xx SUPPORT +P: Nicolas Pitre +M: nico@cam.org L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) S: Maintained @@ -3449,7 +3412,10 @@ L: rtc-linux@googlegroups.com S: Maintained REISERFS FILE SYSTEM +P: Hans Reiser +M: reiserfs-dev@namesys.com L: reiserfs-devel@vger.kernel.org +W: http://www.namesys.com S: Supported RFKILL @@ -3669,6 +3635,13 @@ M: romieu@fr.zoreil.com L: netdev@vger.kernel.org S: Maintained +SIS 5513 IDE CONTROLLER DRIVER +P: Lionel Bouton +M: Lionel.Bouton@inet6.fr +W: http://inet6.dyn.dhs.org/sponsoring/sis5513/index.html +W: http://gyver.homeip.net/sis5513/index.html +S: Maintained + SIS 900/7016 FAST ETHERNET DRIVER P: Daniele Venzano M: venza@brownhat.org @@ -3696,7 +3669,7 @@ S: Maintained SLAB ALLOCATOR P: Christoph Lameter -M: cl@linux-foundation.org +M: clameter@sgi.com P: Pekka Enberg M: penberg@cs.helsinki.fi P: Matt Mackall @@ -3793,14 +3766,6 @@ M: dbrownell@users.sourceforge.net L: spi-devel-general@lists.sourceforge.net S: Maintained -SPU FILE SYSTEM -P: Jeremy Kerr -M: jk@ozlabs.org -L: linuxppc-dev@ozlabs.org -L: cbe-oss-dev@ozlabs.org -W: http://www.ibm.com/developerworks/power/cell/ -S: Supported - STABLE BRANCH: P: Greg Kroah-Hartman M: greg@kroah.com @@ -3906,8 +3871,8 @@ M: hch@infradead.org S: Maintained TASKSTATS STATISTICS INTERFACE -P: Balbir Singh -M: balbir@linux.vnet.ibm.com +P: Shailabh Nagar +M: nagar@watson.ibm.com L: linux-kernel@vger.kernel.org S: Maintained @@ -4003,8 +3968,7 @@ W: http://www.buzzard.org.uk/toshiba/ S: Maintained TPM DEVICE DRIVER -P: Debora Velarde -P: Rajiv Andrade +P: Kylene Hall M: tpmdd-devel@lists.sourceforge.net W: http://tpmdd.sourceforge.net P: Marcel Selhorst @@ -4035,7 +3999,7 @@ TULIP NETWORK DRIVERS P: Grant Grundler M: grundler@parisc-linux.org P: Kyle McMartin -M: kyle@mcmartin.ca +M: kyle@parisc-linux.org L: netdev@vger.kernel.org S: Maintained @@ -4057,41 +4021,12 @@ M: ballabio_dario@emc.com L: linux-scsi@vger.kernel.org S: Maintained -UCLINUX (AND M68KNOMMU) -P: Greg Ungerer -M: gerg@uclinux.org -W: http://www.uclinux.org/ -L: uclinux-dev@uclinux.org (subscribers-only) -S: Maintained - -UCLINUX FOR NEC V850 -P: Miles Bader - -UCLINUX FOR RENESAS H8/300 -P: Yoshinori Sato -M: ysato@users.sourceforge.jp -W: http://uclinux-h8.sourceforge.jp/ -S: Supported - UDF FILESYSTEM P: Jan Kara M: jack@suse.cz W: http://linux-udf.sourceforge.net S: Maintained -UFS FILESYSTEM -P: Evgeniy Dushistov -M: dushistov@mail.ru -L: linux-kernel@vger.kernel.org -S: Maintained - -UltraSPARC (sparc64): -P: David S. Miller -M: davem@davemloft.net -L: sparclinux@vger.kernel.org -T: git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git -S: Maintained - UNIFORM CDROM DRIVER P: Jens Axboe M: axboe@kernel.dk @@ -4138,13 +4073,6 @@ L: netdev@vger.kernel.org W: http://www.linux-usb.org/usbnet S: Maintained -USB DIAMOND RIO500 DRIVER -P: Cesar Miquel -M: miquel@df.uba.ar -L: rio500-users@lists.sourceforge.net -W: http://rio500.sourceforge.net -S: Maintained - USB EHCI DRIVER P: David Brownell M: dbrownell@users.sourceforge.net @@ -4323,14 +4251,6 @@ L: netdev@vger.kernel.org W: http://www.linux-usb.org/usbnet S: Maintained -USB VIDEO CLASS -P: Laurent Pinchart -M: laurent.pinchart@skynet.be -L: linx-uvc-devel@berlios.de -L: video4linux-list@redhat.com -W: http://linux-uvc.berlios.de -S: Maintained - USB W996[87]CF DRIVER P: Luca Risolia M: luca.risolia@studio.unibo.it @@ -4384,14 +4304,6 @@ M: gregkh@suse.de L: linux-kernel@vger.kernel.org S: Maintained -UTIL-LINUX-NG PACKAGE -P: Karel Zak -M: kzak@redhat.com -L: util-linux-ng@vger.kernel.org -W: http://kernel.org/~kzak/util-linux-ng/ -T: git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git -S: Maintained - VFAT/FAT/MSDOS FILESYSTEM: P: OGAWA Hirofumi M: hirofumi@mail.parknet.co.jp @@ -4415,6 +4327,42 @@ M: romieu@fr.zoreil.com L: netdev@vger.kernel.org S: Maintained +UCLINUX (AND M68KNOMMU) +P: Greg Ungerer +M: gerg@uclinux.org +W: http://www.uclinux.org/ +L: uclinux-dev@uclinux.org (subscribers-only) +S: Maintained + +UCLINUX FOR NEC V850 +P: Miles Bader + +UCLINUX FOR RENESAS H8/300 +P: Yoshinori Sato +M: ysato@users.sourceforge.jp +W: http://uclinux-h8.sourceforge.jp/ +S: Supported + +UFS FILESYSTEM +P: Evgeniy Dushistov +M: dushistov@mail.ru +L: linux-kernel@vger.kernel.org +S: Maintained + +UltraSPARC (sparc64): +P: David S. Miller +M: davem@davemloft.net +L: sparclinux@vger.kernel.org +T: git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git +S: Maintained + +USB DIAMOND RIO500 DRIVER +P: Cesar Miquel +M: miquel@df.uba.ar +L: rio500-users@lists.sourceforge.net +W: http://rio500.sourceforge.net +S: Maintained + VIDEO FOR LINUX P: Mauro Carvalho Chehab M: mchehab@infradead.org @@ -4448,10 +4396,10 @@ M: johnpol@2ka.mipt.ru S: Maintained W83791D HARDWARE MONITORING DRIVER -P: Marc Hulsman -M: m.hulsman@tudelft.nl +P: Charles Spirakis +M: bezaur@gmail.com L: lm-sensors@lm-sensors.org -S: Maintained +S: Odd Fixes W83793 HARDWARE MONITORING DRIVER P: Rudolf Marek diff --git a/trunk/Makefile b/trunk/Makefile index e3c5eb66ec52..f63884258ae6 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,8 +1,8 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 26 -EXTRAVERSION = -NAME = Rotary Wombat +EXTRAVERSION = -rc3 +NAME = Funky Weasel is Jiggy wit it # *DOCUMENTATION* # To see a list of typical targets execute "make help" @@ -1114,7 +1114,6 @@ MRPROPER_DIRS += include/config include2 usr/include MRPROPER_FILES += .config .config.old include/asm .version .old_version \ include/linux/autoconf.h include/linux/version.h \ include/linux/utsrelease.h \ - include/linux/bounds.h include/asm*/asm-offsets.h \ Module.symvers tags TAGS cscope* # clean - Delete most, but leave enough to build external modules @@ -1432,7 +1431,7 @@ define xtags elif $1 --version 2>&1 | grep -iq emacs; then \ $(all-sources) | xargs $1 -a; \ $(all-kconfigs) | xargs $1 -a \ - --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'; \ + --regex='/^[ \t]*(menu|)config[ \t]+\([a-zA-Z0-9_]+\)/\2/'; \ $(all-defconfigs) | xargs -r $1 -a \ --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \ else \ diff --git a/trunk/arch/alpha/Makefile b/trunk/arch/alpha/Makefile index 4759fe751aa1..4e1a8e2c4541 100644 --- a/trunk/arch/alpha/Makefile +++ b/trunk/arch/alpha/Makefile @@ -13,7 +13,6 @@ NM := $(NM) -B LDFLAGS_vmlinux := -static -N #-relax CHECKFLAGS += -D__alpha__ -m64 cflags-y := -pipe -mno-fp-regs -ffixed-8 -msmall-data -cflags-y += $(call cc-option, -fno-jump-tables) cpuflags-$(CONFIG_ALPHA_EV4) := -mcpu=ev4 cpuflags-$(CONFIG_ALPHA_EV5) := -mcpu=ev5 diff --git a/trunk/arch/alpha/kernel/core_t2.c b/trunk/arch/alpha/kernel/core_t2.c index d9980d47ab81..c0750291b44a 100644 --- a/trunk/arch/alpha/kernel/core_t2.c +++ b/trunk/arch/alpha/kernel/core_t2.c @@ -74,8 +74,6 @@ # define DBG(args) #endif -DEFINE_SPINLOCK(t2_hae_lock); - static volatile unsigned int t2_mcheck_any_expected; static volatile unsigned int t2_mcheck_last_taken; diff --git a/trunk/arch/alpha/kernel/init_task.c b/trunk/arch/alpha/kernel/init_task.c index 1f762189fa64..835d09a7b332 100644 --- a/trunk/arch/alpha/kernel/init_task.c +++ b/trunk/arch/alpha/kernel/init_task.c @@ -9,6 +9,7 @@ static struct fs_struct init_fs = INIT_FS; +static struct files_struct init_files = INIT_FILES; static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); struct mm_struct init_mm = INIT_MM(init_mm); diff --git a/trunk/arch/alpha/kernel/pci.c b/trunk/arch/alpha/kernel/pci.c index 5cf45fc51343..36ab22a7ea12 100644 --- a/trunk/arch/alpha/kernel/pci.c +++ b/trunk/arch/alpha/kernel/pci.c @@ -71,23 +71,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_i static void __init quirk_cypress(struct pci_dev *dev) { - /* The Notorious Cy82C693 chip. */ - - /* The generic legacy mode IDE fixup in drivers/pci/probe.c - doesn't work correctly with the Cypress IDE controller as - it has non-standard register layout. Fix that. */ - if (dev->class >> 8 == PCI_CLASS_STORAGE_IDE) { - dev->resource[2].start = dev->resource[3].start = 0; - dev->resource[2].end = dev->resource[3].end = 0; - dev->resource[2].flags = dev->resource[3].flags = 0; - if (PCI_FUNC(dev->devfn) == 2) { - dev->resource[0].start = 0x170; - dev->resource[0].end = 0x177; - dev->resource[1].start = 0x376; - dev->resource[1].end = 0x376; - } - } - /* The Cypress bridge responds on the PCI bus in the address range 0xffff0000-0xffffffff (conventional x86 BIOS ROM). There is no way to turn this off. The bridge also supports several extended diff --git a/trunk/arch/alpha/kernel/traps.c b/trunk/arch/alpha/kernel/traps.c index c778779007fc..dc57790250d2 100644 --- a/trunk/arch/alpha/kernel/traps.c +++ b/trunk/arch/alpha/kernel/traps.c @@ -447,7 +447,7 @@ struct unaligned_stat { /* Macro for exception fixup code to access integer registers. */ -#define una_reg(r) (_regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)]) +#define una_reg(r) (regs->regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)]) asmlinkage void @@ -456,7 +456,6 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg, { long error, tmp1, tmp2, tmp3, tmp4; unsigned long pc = regs->pc - 4; - unsigned long *_regs = regs->regs; const struct exception_table_entry *fixup; unaligned[0].count++; diff --git a/trunk/arch/alpha/kernel/vmlinux.lds.S b/trunk/arch/alpha/kernel/vmlinux.lds.S index ef37fc1acaea..f13249be17c5 100644 --- a/trunk/arch/alpha/kernel/vmlinux.lds.S +++ b/trunk/arch/alpha/kernel/vmlinux.lds.S @@ -25,13 +25,6 @@ SECTIONS } :kernel _etext = .; /* End of text section */ - NOTES :kernel :note - .dummy : { - *(.dummy) - } :kernel - - RODATA - /* Exception table */ . = ALIGN(16); __ex_table : { @@ -40,6 +33,13 @@ SECTIONS __stop___ex_table = .; } + NOTES :kernel :note + .dummy : { + *(.dummy) + } :kernel + + RODATA + /* Will be freed after init */ . = ALIGN(PAGE_SIZE); /* Init code and data */ diff --git a/trunk/arch/arm/boot/compressed/head-xscale.S b/trunk/arch/arm/boot/compressed/head-xscale.S index dd3fbd6766e1..67ea99ef6521 100644 --- a/trunk/arch/arm/boot/compressed/head-xscale.S +++ b/trunk/arch/arm/boot/compressed/head-xscale.S @@ -33,6 +33,10 @@ __XScale_start: bic r0, r0, #0x1000 @ clear Icache mcr p15, 0, r0, c1, c0, 0 +#ifdef CONFIG_ARCH_COTULLA_IDP + mov r7, #MACH_TYPE_COTULLA_IDP +#endif + #ifdef CONFIG_ARCH_IXP2000 mov r1, #-1 mov r0, #0xd6000000 diff --git a/trunk/arch/arm/common/dmabounce.c b/trunk/arch/arm/common/dmabounce.c index 2744673314b4..52fc6a883281 100644 --- a/trunk/arch/arm/common/dmabounce.c +++ b/trunk/arch/arm/common/dmabounce.c @@ -650,8 +650,7 @@ EXPORT_SYMBOL(dma_map_sg); EXPORT_SYMBOL(dma_unmap_sg); EXPORT_SYMBOL(dma_sync_single_for_cpu); EXPORT_SYMBOL(dma_sync_single_for_device); -EXPORT_SYMBOL(dma_sync_sg_for_cpu); -EXPORT_SYMBOL(dma_sync_sg_for_device); +EXPORT_SYMBOL(dma_sync_sg); EXPORT_SYMBOL(dmabounce_register_dev); EXPORT_SYMBOL(dmabounce_unregister_dev); diff --git a/trunk/arch/arm/kernel/init_task.c b/trunk/arch/arm/kernel/init_task.c index 8b8c9d38a761..bd4ef53bc6b9 100644 --- a/trunk/arch/arm/kernel/init_task.c +++ b/trunk/arch/arm/kernel/init_task.c @@ -13,6 +13,7 @@ #include static struct fs_struct init_fs = INIT_FS; +static struct files_struct init_files = INIT_FILES; static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); struct mm_struct init_mm = INIT_MM(init_mm); diff --git a/trunk/arch/arm/mach-at91/at91x40.c b/trunk/arch/arm/mach-at91/at91x40.c index f44647738ee4..1de121fc55f4 100644 --- a/trunk/arch/arm/mach-at91/at91x40.c +++ b/trunk/arch/arm/mach-at91/at91x40.c @@ -16,32 +16,16 @@ #include #include #include -#include #include "generic.h" /* - * Export the clock functions for the AT91X40. Some external code common - * to all AT91 family parts relys on this, like the gpio and serial support. + * This is used in the gpio code, stub locally. */ int clk_enable(struct clk *clk) { return 0; } -void clk_disable(struct clk *clk) -{ -} - -unsigned long clk_get_rate(struct clk *clk) -{ - return AT91X40_MASTER_CLOCK; -} - -struct clk *clk_get(struct device *dev, const char *id) -{ - return NULL; -} - void __init at91x40_initialize(unsigned long main_clock) { at91_extern_irq = (1 << AT91X40_ID_IRQ0) | (1 << AT91X40_ID_IRQ1) diff --git a/trunk/arch/arm/mach-integrator/impd1.c b/trunk/arch/arm/mach-integrator/impd1.c index 62e653a3ea1a..92d79fb39311 100644 --- a/trunk/arch/arm/mach-integrator/impd1.c +++ b/trunk/arch/arm/mach-integrator/impd1.c @@ -369,8 +369,7 @@ static int impd1_probe(struct lm_device *dev) lm_set_drvdata(dev, impd1); - printk("IM-PD1 found at 0x%08lx\n", - (unsigned long)dev->resource.start); + printk("IM-PD1 found at 0x%08lx\n", dev->resource.start); for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++) { impd1->vcos[i].owner = THIS_MODULE, diff --git a/trunk/arch/arm/mach-integrator/pci_v3.c b/trunk/arch/arm/mach-integrator/pci_v3.c index c07f497000ca..d55fa4e9bb43 100644 --- a/trunk/arch/arm/mach-integrator/pci_v3.c +++ b/trunk/arch/arm/mach-integrator/pci_v3.c @@ -405,6 +405,7 @@ v3_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) addr, fsr, pc, instr, __raw_readl(SC_LBFADDR), __raw_readl(SC_LBFCODE) & 255, v3_readb(V3_LB_ISTAT)); printk(KERN_DEBUG "%s", buf); + printascii(buf); #endif v3_writeb(V3_LB_ISTAT, 0); @@ -446,7 +447,6 @@ static irqreturn_t v3_irq(int dummy, void *devid) unsigned long pc = instruction_pointer(regs); unsigned long instr = *(unsigned long *)pc; char buf[128]; - extern void printascii(const char *); sprintf(buf, "V3 int %d: pc=0x%08lx [%08lx] LBFADDR=%08x LBFCODE=%02x " "ISTAT=%02x\n", IRQ_AP_V3INT, pc, instr, diff --git a/trunk/arch/arm/mach-omap1/board-palmte.c b/trunk/arch/arm/mach-omap1/board-palmte.c index a4d20127a60e..a0b16a7e8a04 100644 --- a/trunk/arch/arm/mach-omap1/board-palmte.c +++ b/trunk/arch/arm/mach-omap1/board-palmte.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -314,6 +315,14 @@ static void palmte_get_power_status(struct apm_power_info *info, int *battery) #define palmte_get_power_status NULL #endif +static struct tsc2102_config palmte_tsc2102_config = { + .use_internal = 0, + .monitor = TSC_BAT1 | TSC_AUX | TSC_TEMP, + .temp_at25c = { 2200, 2615 }, + .apm_report = palmte_get_power_status, + .alsa_config = &palmte_alsa_config, +}; + static struct omap_board_config_kernel palmte_config[] __initdata = { { OMAP_TAG_USB, &palmte_usb_config }, { OMAP_TAG_MMC, &palmte_mmc_config }, @@ -327,6 +336,7 @@ static struct spi_board_info palmte_spi_info[] __initdata = { .bus_num = 2, /* uWire (officially) */ .chip_select = 0, /* As opposed to 3 */ .irq = OMAP_GPIO_IRQ(PALMTE_PINTDAV_GPIO), + .platform_data = &palmte_tsc2102_config, .max_speed_hz = 8000000, }, }; diff --git a/trunk/arch/arm/mach-omap2/gpmc.c b/trunk/arch/arm/mach-omap2/gpmc.c index dbf68dc50ae2..02cede295e89 100644 --- a/trunk/arch/arm/mach-omap2/gpmc.c +++ b/trunk/arch/arm/mach-omap2/gpmc.c @@ -42,7 +42,7 @@ #define GPMC_STATUS 0x54 #define GPMC_PREFETCH_CONFIG1 0x1e0 #define GPMC_PREFETCH_CONFIG2 0x1e4 -#define GPMC_PREFETCH_CONTROL 0x1ec +#define GPMC_PREFETCH_CONTROL 0x1e8 #define GPMC_PREFETCH_STATUS 0x1f0 #define GPMC_ECC_CONFIG 0x1f4 #define GPMC_ECC_CONTROL 0x1f8 diff --git a/trunk/arch/arm/mach-pxa/cm-x270.c b/trunk/arch/arm/mach-pxa/cm-x270.c index f5851d1adc25..6d4416a4f378 100644 --- a/trunk/arch/arm/mach-pxa/cm-x270.c +++ b/trunk/arch/arm/mach-pxa/cm-x270.c @@ -59,7 +59,7 @@ static struct resource cmx270_dm9k_resource[] = { [2] = { .start = CMX270_ETHIRQ, .end = CMX270_ETHIRQ, - .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, + .flags = IORESOURCE_IRQ, } }; diff --git a/trunk/arch/arm/mach-pxa/em-x270.c b/trunk/arch/arm/mach-pxa/em-x270.c index 9c57700ee5c2..edc4f07a230d 100644 --- a/trunk/arch/arm/mach-pxa/em-x270.c +++ b/trunk/arch/arm/mach-pxa/em-x270.c @@ -50,7 +50,7 @@ static struct resource em_x270_dm9k_resource[] = { [2] = { .start = EM_X270_ETHIRQ, .end = EM_X270_ETHIRQ, - .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, + .flags = IORESOURCE_IRQ, } }; diff --git a/trunk/arch/arm/mach-pxa/spitz.c b/trunk/arch/arm/mach-pxa/spitz.c index e7d0fcd9b43f..dace3820f1ee 100644 --- a/trunk/arch/arm/mach-pxa/spitz.c +++ b/trunk/arch/arm/mach-pxa/spitz.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include diff --git a/trunk/arch/arm/mach-pxa/ssp.c b/trunk/arch/arm/mach-pxa/ssp.c index 0bb31982fb6f..00af7f2fed66 100644 --- a/trunk/arch/arm/mach-pxa/ssp.c +++ b/trunk/arch/arm/mach-pxa/ssp.c @@ -330,7 +330,7 @@ struct ssp_device *ssp_request(int port, const char *label) mutex_unlock(&ssp_lock); - if (&ssp->node == &ssp_list) + if (ssp->port_id != port) return NULL; return ssp; diff --git a/trunk/arch/arm/mach-pxa/tosa.c b/trunk/arch/arm/mach-pxa/tosa.c index ab4a9f579913..c2cbd66db814 100644 --- a/trunk/arch/arm/mach-pxa/tosa.c +++ b/trunk/arch/arm/mach-pxa/tosa.c @@ -467,8 +467,8 @@ static struct platform_device *devices[] __initdata = { static void tosa_poweroff(void) { - gpio_direction_output(TOSA_GPIO_ON_RESET, 0); - gpio_set_value(TOSA_GPIO_ON_RESET, 1); + pxa_gpio_mode(TOSA_GPIO_ON_RESET | GPIO_OUT); + GPSR(TOSA_GPIO_ON_RESET) = GPIO_bit(TOSA_GPIO_ON_RESET); mdelay(1000); arm_machine_restart('h'); diff --git a/trunk/arch/arm/mach-realview/platsmp.c b/trunk/arch/arm/mach-realview/platsmp.c index 8e813ed57519..3e57428affee 100644 --- a/trunk/arch/arm/mach-realview/platsmp.c +++ b/trunk/arch/arm/mach-realview/platsmp.c @@ -74,8 +74,6 @@ static DEFINE_SPINLOCK(boot_lock); void __cpuinit platform_secondary_init(unsigned int cpu) { - trace_hardirqs_off(); - /* * the primary core may have used a "cross call" soft interrupt * to get this processor out of WFI in the BootMonitor - make diff --git a/trunk/arch/arm/mach-s3c2410/mach-bast.c b/trunk/arch/arm/mach-s3c2410/mach-bast.c index 27f63d5d3a7b..661a2358ac22 100644 --- a/trunk/arch/arm/mach-s3c2410/mach-bast.c +++ b/trunk/arch/arm/mach-s3c2410/mach-bast.c @@ -374,7 +374,7 @@ static struct resource bast_dm9k_resource[] = { [2] = { .start = IRQ_DM9000, .end = IRQ_DM9000, - .flags = IORESOURCE_IRQ | IRQF_TRIGGER_HIGH, + .flags = IORESOURCE_IRQ, } }; diff --git a/trunk/arch/arm/mach-s3c2410/mach-vr1000.c b/trunk/arch/arm/mach-s3c2410/mach-vr1000.c index 4c4b5c4207c4..c56423373ff3 100644 --- a/trunk/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/trunk/arch/arm/mach-s3c2410/mach-vr1000.c @@ -263,7 +263,7 @@ static struct resource vr1000_dm9k0_resource[] = { [2] = { .start = IRQ_VR1000_DM9000A, .end = IRQ_VR1000_DM9000A, - .flags = IORESOURCE_IRQ | IRQF_TRIGGER_HIGH, + .flags = IORESOURCE_IRQ } }; @@ -282,7 +282,7 @@ static struct resource vr1000_dm9k1_resource[] = { [2] = { .start = IRQ_VR1000_DM9000N, .end = IRQ_VR1000_DM9000N, - .flags = IORESOURCE_IRQ | IRQF_TRIGGER_HIGH, + .flags = IORESOURCE_IRQ } }; diff --git a/trunk/arch/arm/mach-sa1100/collie.c b/trunk/arch/arm/mach-sa1100/collie.c index 2f772a3965c4..6496eb645cee 100644 --- a/trunk/arch/arm/mach-sa1100/collie.c +++ b/trunk/arch/arm/mach-sa1100/collie.c @@ -225,28 +225,26 @@ static void __init collie_init(void) int ret = 0; /* cpu initialize */ - GAFR = GPIO_SSP_TXD | GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SSP_CLK | - GPIO_MCP_CLK | GPIO_32_768kHz; - - GPDR = GPIO_LDD8 | GPIO_LDD9 | GPIO_LDD10 | GPIO_LDD11 | GPIO_LDD12 | - GPIO_LDD13 | GPIO_LDD14 | GPIO_LDD15 | GPIO_SSP_TXD | - GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SDLC_SCLK | - COLLIE_GPIO_UCB1x00_RESET | COLLIE_GPIO_nMIC_ON | - COLLIE_GPIO_nREMOCON_ON | GPIO_32_768kHz; - - PPDR = PPC_LDD0 | PPC_LDD1 | PPC_LDD2 | PPC_LDD3 | PPC_LDD4 | PPC_LDD5 | - PPC_LDD6 | PPC_LDD7 | PPC_L_PCLK | PPC_L_LCLK | PPC_L_FCLK | PPC_L_BIAS | - PPC_TXD1 | PPC_TXD2 | PPC_TXD3 | PPC_TXD4 | PPC_SCLK | PPC_SFRM; - - PWER = COLLIE_GPIO_AC_IN | COLLIE_GPIO_CO | COLLIE_GPIO_ON_KEY | - COLLIE_GPIO_WAKEUP | COLLIE_GPIO_nREMOCON_INT | PWER_RTC; - - PGSR = COLLIE_GPIO_nREMOCON_ON; - - PSDR = PPC_RXD1 | PPC_RXD2 | PPC_RXD3 | PPC_RXD4; - - PCFR = PCFR_OPDE; - + GAFR = ( GPIO_SSP_TXD | \ + GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SSP_CLK | GPIO_TIC_ACK | \ + GPIO_32_768kHz ); + + GPDR = ( GPIO_LDD8 | GPIO_LDD9 | GPIO_LDD10 | GPIO_LDD11 | GPIO_LDD12 | \ + GPIO_LDD13 | GPIO_LDD14 | GPIO_LDD15 | GPIO_SSP_TXD | \ + GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SDLC_SCLK | \ + GPIO_SDLC_AAF | GPIO_UART_SCLK1 | GPIO_32_768kHz ); + GPLR = GPIO_GPIO18; + + // PPC pin setting + PPDR = ( PPC_LDD0 | PPC_LDD1 | PPC_LDD2 | PPC_LDD3 | PPC_LDD4 | PPC_LDD5 | \ + PPC_LDD6 | PPC_LDD7 | PPC_L_PCLK | PPC_L_LCLK | PPC_L_FCLK | PPC_L_BIAS | \ + PPC_TXD1 | PPC_TXD2 | PPC_RXD2 | PPC_TXD3 | PPC_TXD4 | PPC_SCLK | PPC_SFRM ); + + PSDR = ( PPC_RXD1 | PPC_RXD2 | PPC_RXD3 | PPC_RXD4 ); + + GAFR |= GPIO_32_768kHz; + GPDR |= GPIO_32_768kHz; + TUCR = TUCR_32_768kHz; platform_scoop_config = &collie_pcmcia_config; diff --git a/trunk/arch/arm/plat-omap/clock.c b/trunk/arch/arm/plat-omap/clock.c index 2db5580048d8..2946c193a7d6 100644 --- a/trunk/arch/arm/plat-omap/clock.c +++ b/trunk/arch/arm/plat-omap/clock.c @@ -21,7 +21,6 @@ #include #include #include -#include #include diff --git a/trunk/arch/arm/plat-omap/dma.c b/trunk/arch/arm/plat-omap/dma.c index 39c637b0ffea..c00eda588cd8 100644 --- a/trunk/arch/arm/plat-omap/dma.c +++ b/trunk/arch/arm/plat-omap/dma.c @@ -501,6 +501,8 @@ static inline void omap_enable_channel_irq(int lch) /* Enable some nice interrupts. */ OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs; + + dma_chan[lch].flags |= OMAP_DMA_ACTIVE; } static void omap_disable_channel_irq(int lch) diff --git a/trunk/arch/arm/plat-s3c24xx/s3c244x.c b/trunk/arch/arm/plat-s3c24xx/s3c244x.c index 2f01af5f64c4..f197bb3a2366 100644 --- a/trunk/arch/arm/plat-s3c24xx/s3c244x.c +++ b/trunk/arch/arm/plat-s3c24xx/s3c244x.c @@ -65,7 +65,6 @@ void __init s3c244x_map_io(struct map_desc *mach_desc, int size) /* rename any peripherals used differing from the s3c2410 */ - s3c_device_sdi.name = "s3c2440-sdi"; s3c_device_i2c.name = "s3c2440-i2c"; s3c_device_nand.name = "s3c2440-nand"; s3c_device_usbgadget.name = "s3c2440-usbgadget"; diff --git a/trunk/arch/avr32/Kconfig b/trunk/arch/avr32/Kconfig index 45d63c986015..09ad7995080c 100644 --- a/trunk/arch/avr32/Kconfig +++ b/trunk/arch/avr32/Kconfig @@ -88,7 +88,6 @@ config PLATFORM_AT32AP select MMU select PERFORMANCE_COUNTERS select HAVE_GPIO_LIB - select GENERIC_ALLOCATOR # # CPU types @@ -148,9 +147,6 @@ config PHYS_OFFSET source "kernel/Kconfig.preempt" -config QUICKLIST - def_bool y - config HAVE_ARCH_BOOTMEM_NODE def_bool n @@ -205,11 +201,6 @@ 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 a51bb9fb3c89..a398be284966 100644 --- a/trunk/arch/avr32/boards/atngw100/setup.c +++ b/trunk/arch/avr32/boards/atngw100/setup.c @@ -9,8 +9,6 @@ */ #include #include -#include -#include #include #include #include @@ -27,13 +25,6 @@ #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; @@ -149,10 +140,6 @@ 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; @@ -178,28 +165,12 @@ 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 86b363c1c25b..000eb4220a12 100644 --- a/trunk/arch/avr32/boards/atstk1000/atstk1002.c +++ b/trunk/arch/avr32/boards/atstk1000/atstk1002.c @@ -28,12 +28,6 @@ #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]; @@ -238,7 +232,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, 0); + fbmem_start, fbmem_size); #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 ea109f435a83..a0b223df35a2 100644 --- a/trunk/arch/avr32/boards/atstk1000/atstk1003.c +++ b/trunk/arch/avr32/boards/atstk1000/atstk1003.c @@ -27,13 +27,6 @@ #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 c7236df74d74..e765a8652b3e 100644 --- a/trunk/arch/avr32/boards/atstk1000/atstk1004.c +++ b/trunk/arch/avr32/boards/atstk1000/atstk1004.c @@ -29,13 +29,6 @@ #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, @@ -140,7 +133,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, 0); + fbmem_start, fbmem_size); 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/configs/atngw100_defconfig b/trunk/arch/avr32/configs/atngw100_defconfig index 119edb839ac3..06046074d68b 100644 --- a/trunk/arch/avr32/configs/atngw100_defconfig +++ b/trunk/arch/avr32/configs/atngw100_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.26-rc3 -# Mon May 26 13:30:59 2008 +# Linux kernel version: 2.6.24-rc7 +# Wed Jan 9 23:20:41 2008 # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y @@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_TIME=y -CONFIG_GENERIC_CLOCKEVENTS=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_ARCH_SUPPORTS_OPROFILE=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_BUG=y @@ -37,15 +37,17 @@ CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y # CONFIG_TASKSTATS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set -# CONFIG_GROUP_SCHED is not set +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_FAIR_USER_SCHED=y +# CONFIG_FAIR_CGROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y -CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set -# CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -59,13 +61,11 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y -# CONFIG_COMPAT_BRK is not set # CONFIG_BASE_FULL is not set CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y @@ -73,21 +73,11 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set -CONFIG_PROFILING=y -# CONFIG_MARKERS is not set -CONFIG_OPROFILE=m -CONFIG_HAVE_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_HAVE_KPROBES=y -# CONFIG_HAVE_KRETPROBES is not set -# CONFIG_HAVE_DMA_ATTRS is not set -CONFIG_PROC_PAGE_MONITOR=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=1 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set @@ -111,15 +101,10 @@ CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_CLASSIC_RCU=y # # System Type and features # -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SUBARCH_AVR32B=y CONFIG_MMU=y CONFIG_PERFORMANCE_COUNTERS=y @@ -156,19 +141,16 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set -CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y # CONFIG_OWNERSHIP_TRACE is not set -CONFIG_NMI_DEBUGGING=y # CONFIG_HZ_100 is not set CONFIG_HZ_250=y # CONFIG_HZ_300 is not set # CONFIG_HZ_1000 is not set CONFIG_HZ=250 -# CONFIG_SCHED_HRTICK is not set CONFIG_CMDLINE="" # @@ -182,10 +164,9 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set # CONFIG_CPU_FREQ_STAT is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set @@ -221,7 +202,6 @@ CONFIG_XFRM=y CONFIG_XFRM_USER=y # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set -# CONFIG_XFRM_STATISTICS is not set CONFIG_NET_KEY=y # CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y @@ -275,40 +255,87 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y CONFIG_INET6_XFRM_MODE_BEET=y # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set CONFIG_IPV6_SIT=y -CONFIG_IPV6_NDISC_NODETYPE=y # CONFIG_IPV6_TUNNEL is not set # CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set # CONFIG_NETWORK_SECMARK is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set -# CONFIG_NETFILTER_ADVANCED is not set +CONFIG_BRIDGE_NETFILTER=y # # Core Netfilter Configuration # -CONFIG_NETFILTER_NETLINK=m -CONFIG_NETFILTER_NETLINK_LOG=m +# CONFIG_NETFILTER_NETLINK is not set +CONFIG_NF_CONNTRACK_ENABLED=m CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_EVENTS is not set +CONFIG_NF_CT_PROTO_GRE=m +# CONFIG_NF_CT_PROTO_SCTP is not set +# CONFIG_NF_CT_PROTO_UDPLITE is not set +CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NETFILTER_XTABLES=y +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m CONFIG_NETFILTER_XT_MATCH_MARK=m CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +# CONFIG_NETFILTER_XT_MATCH_TIME is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m # # IP: Netfilter Configuration # CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_PROC_COMPAT=y +# CONFIG_IP_NF_QUEUE is not set CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_LOG=m @@ -316,25 +343,54 @@ CONFIG_IP_NF_TARGET_LOG=m CONFIG_NF_NAT=m CONFIG_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_SAME=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m CONFIG_NF_NAT_FTP=m CONFIG_NF_NAT_IRC=m -# CONFIG_NF_NAT_TFTP is not set -# CONFIG_NF_NAT_AMANDA is not set -# CONFIG_NF_NAT_PPTP is not set -# CONFIG_NF_NAT_H323 is not set +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m # -# IPv6: Netfilter Configuration +# IPv6: Netfilter Configuration (EXPERIMENTAL) # CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_OWNER=m CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_LOG=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m + +# +# Bridge: Netfilter Configuration +# +# CONFIG_BRIDGE_NF_EBTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_TIPC is not set @@ -351,6 +407,7 @@ CONFIG_LLC=m # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_NET_SCHED is not set +CONFIG_NET_CLS_ROUTE=y # # Network testing @@ -358,7 +415,6 @@ CONFIG_LLC=m # CONFIG_NET_PKTGEN is not set # CONFIG_NET_TCPPROBE is not set # CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set @@ -394,7 +450,6 @@ CONFIG_MTD=y CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set CONFIG_MTD_CMDLINE_PARTS=y -# CONFIG_MTD_AR7_PARTS is not set # # User Modules And Translation Layers @@ -476,18 +531,11 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 -# CONFIG_BLK_DEV_XIP is not set +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set -CONFIG_MISC_DEVICES=y -# CONFIG_ATMEL_PWM is not set -CONFIG_ATMEL_TCLIB=y -CONFIG_ATMEL_TCB_CLKSRC=y -CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 -# CONFIG_EEPROM_93CX6 is not set -# CONFIG_ATMEL_SSC is not set -# CONFIG_ENCLOSURE_SERVICES is not set -# CONFIG_HAVE_IDE is not set +# CONFIG_MISC_DEVICES is not set +# CONFIG_IDE is not set # # SCSI device support @@ -520,13 +568,11 @@ CONFIG_PHYLIB=y # CONFIG_SMSC_PHY is not set # CONFIG_BROADCOM_PHY is not set # CONFIG_ICPLUS_PHY is not set -# CONFIG_REALTEK_PHY is not set # CONFIG_FIXED_PHY is not set # CONFIG_MDIO_BITBANG is not set CONFIG_NET_ETHERNET=y # CONFIG_MII is not set CONFIG_MACB=y -# CONFIG_ENC28J60 is not set # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set @@ -540,7 +586,6 @@ CONFIG_MACB=y # # CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set -# CONFIG_IWLWIFI_LEDS is not set # CONFIG_WAN is not set CONFIG_PPP=m # CONFIG_PPP_MULTILINK is not set @@ -554,6 +599,7 @@ CONFIG_PPPOE=m # CONFIG_PPPOL2TP is not set # CONFIG_SLIP is not set CONFIG_SLHC=m +# CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -575,7 +621,6 @@ CONFIG_SLHC=m # Character devices # # CONFIG_VT is not set -# CONFIG_DEVKMEM is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -588,7 +633,6 @@ CONFIG_SLHC=m # CONFIG_SERIAL_ATMEL=y CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_SERIAL_ATMEL_PDC=y # CONFIG_SERIAL_ATMEL_TTYAT is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y @@ -596,13 +640,21 @@ CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set +# CONFIG_RTC is not set +# CONFIG_GEN_RTC is not set # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# CONFIG_I2C_ALGOBIT=m +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set # # I2C Hardware Bus support @@ -613,23 +665,27 @@ CONFIG_I2C_GPIO=m # CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set -# CONFIG_I2C_PCA_PLATFORM is not set # # Miscellaneous I2C Chip support # +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set # CONFIG_DS1682 is not set # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set -# CONFIG_PCF8575 is not set +# CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set -# CONFIG_TPS65010 is not set # CONFIG_SENSORS_MAX6875 is not set # CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# CONFIG_SPI=y # CONFIG_SPI_DEBUG is not set CONFIG_SPI_MASTER=y @@ -646,27 +702,9 @@ CONFIG_SPI_ATMEL=y # CONFIG_SPI_AT25 is not set CONFIG_SPI_SPIDEV=m # CONFIG_SPI_TLE62X0 is not set -CONFIG_HAVE_GPIO_LIB=y - -# -# GPIO Support -# -# CONFIG_DEBUG_GPIO is not set - -# -# I2C GPIO expanders: -# -# CONFIG_GPIO_PCA953X is not set -# CONFIG_GPIO_PCF857X is not set - -# -# SPI GPIO expanders: -# -# CONFIG_GPIO_MCP23S08 is not set # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set -# CONFIG_THERMAL is not set CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -686,22 +724,12 @@ CONFIG_SSB_POSSIBLE=y # Multifunction device drivers # # CONFIG_MFD_SM501 is not set -# CONFIG_HTC_PASIC3 is not set # # Multimedia devices # - -# -# Multimedia core support -# # CONFIG_VIDEO_DEV is not set # CONFIG_DVB_CORE is not set -# CONFIG_VIDEO_MEDIA is not set - -# -# Multimedia drivers -# # CONFIG_DAB is not set # @@ -725,12 +753,14 @@ CONFIG_USB_SUPPORT=y # CONFIG_USB_ARCH_HAS_HCD is not set # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OTG_BLACKLIST_HUB is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # + +# +# USB Gadget Support +# CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -742,7 +772,6 @@ CONFIG_USB_ATMEL_USBA=y # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_M66592 is not set -# CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set @@ -758,7 +787,6 @@ CONFIG_USB_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set -# CONFIG_USB_G_PRINTER is not set CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set @@ -769,13 +797,11 @@ CONFIG_MMC=m CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set -# CONFIG_MMC_TEST is not set # # MMC/SD Host Controller Drivers # CONFIG_MMC_SPI=m -# CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -790,8 +816,6 @@ CONFIG_LEDS_GPIO=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -# CONFIG_ACCESSIBILITY is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y @@ -820,22 +844,19 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_S35390A is not set # # SPI RTC drivers # -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_R9701 is not set # CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_MAX6902 is not set # # Platform RTC drivers # -# CONFIG_RTC_DRV_DS1511 is not set # CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_V3020 is not set @@ -844,6 +865,10 @@ CONFIG_RTC_INTF_DEV=y # on-CPU RTC drivers # CONFIG_RTC_DRV_AT32AP700X=y + +# +# Userspace I/O +# # CONFIG_UIO is not set # @@ -860,11 +885,14 @@ CONFIG_JBD=m # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set -# CONFIG_DNOTIFY is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set +# CONFIG_DNOTIFY is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=m @@ -920,10 +948,8 @@ CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set -# CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y @@ -931,10 +957,12 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set CONFIG_NFSD=m CONFIG_NFSD_V3=y # CONFIG_NFSD_V3_ACL is not set # CONFIG_NFSD_V4 is not set +CONFIG_NFSD_TCP=y CONFIG_ROOT_NFS=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y @@ -1002,6 +1030,11 @@ CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=m # CONFIG_DLM is not set +CONFIG_INSTRUMENTATION=y +CONFIG_PROFILING=y +CONFIG_OPROFILE=m +CONFIG_KPROBES=y +# CONFIG_MARKERS is not set # # Kernel hacking @@ -1009,7 +1042,6 @@ CONFIG_NLS_UTF8=m # CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y -CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set @@ -1020,9 +1052,7 @@ CONFIG_DETECT_SOFTLOCKUP=y CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set -# CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -1036,14 +1066,12 @@ CONFIG_SCHED_DEBUG=y CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set -# CONFIG_DEBUG_WRITECOUNT is not set # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SG is not set CONFIG_FRAME_POINTER=y +# CONFIG_FORCED_INLINING is not set # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set -# CONFIG_KPROBES_SANITY_TEST is not set -# CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_LKDTM is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_SAMPLES is not set @@ -1055,90 +1083,52 @@ CONFIG_FRAME_POINTER=y # CONFIG_SECURITY is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set CONFIG_CRYPTO=y - -# -# Crypto core or helper -# CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_BLKCIPHER=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y -# CONFIG_CRYPTO_GF128MUL is not set -# CONFIG_CRYPTO_NULL is not set -# CONFIG_CRYPTO_CRYPTD is not set -CONFIG_CRYPTO_AUTHENC=y -# CONFIG_CRYPTO_TEST is not set - -# -# Authenticated Encryption with Associated Data -# -# CONFIG_CRYPTO_CCM is not set -# CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_SEQIV is not set - -# -# Block modes -# -CONFIG_CRYPTO_CBC=y -# CONFIG_CRYPTO_CTR is not set -# CONFIG_CRYPTO_CTS is not set -CONFIG_CRYPTO_ECB=m -# CONFIG_CRYPTO_LRW is not set -CONFIG_CRYPTO_PCBC=m -# CONFIG_CRYPTO_XTS is not set - -# -# Hash modes -# CONFIG_CRYPTO_HMAC=y # CONFIG_CRYPTO_XCBC is not set - -# -# Digest -# -# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set CONFIG_CRYPTO_MD5=y -# CONFIG_CRYPTO_MICHAEL_MIC is not set CONFIG_CRYPTO_SHA1=y # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_TGR192 is not set # CONFIG_CRYPTO_WP512 is not set - -# -# Ciphers -# -# CONFIG_CRYPTO_AES is not set -# CONFIG_CRYPTO_ANUBIS is not set -CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_XTS is not set +# CONFIG_CRYPTO_CRYPTD is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set -CONFIG_CRYPTO_DES=y -# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=m # CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_ANUBIS is not set # CONFIG_CRYPTO_SEED is not set -# CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set - -# -# Compression -# CONFIG_CRYPTO_DEFLATE=y -# CONFIG_CRYPTO_LZO is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_TEST is not set +# CONFIG_CRYPTO_AUTHENC is not set CONFIG_CRYPTO_HW=y # # Library routines # CONFIG_BITREVERSE=y -# CONFIG_GENERIC_FIND_FIRST_BIT is not set -# CONFIG_GENERIC_FIND_NEXT_BIT is not set CONFIG_CRC_CCITT=m # CONFIG_CRC16 is not set CONFIG_CRC_ITU_T=m @@ -1147,6 +1137,10 @@ CONFIG_CRC7=m # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y diff --git a/trunk/arch/avr32/configs/atstk1002_defconfig b/trunk/arch/avr32/configs/atstk1002_defconfig index c6d02eac8791..2fb2ede5f2b4 100644 --- a/trunk/arch/avr32/configs/atstk1002_defconfig +++ b/trunk/arch/avr32/configs/atstk1002_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.26-rc3 -# Mon May 26 13:30:20 2008 +# Linux kernel version: 2.6.24-rc7 +# Wed Jan 9 23:07:43 2008 # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y @@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_TIME=y -CONFIG_GENERIC_CLOCKEVENTS=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_ARCH_SUPPORTS_OPROFILE=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_BUG=y @@ -36,15 +36,15 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set -# CONFIG_GROUP_SCHED is not set +# CONFIG_FAIR_GROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y -CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_RELAY=y -# CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -58,13 +58,11 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y -# CONFIG_COMPAT_BRK is not set # CONFIG_BASE_FULL is not set CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y @@ -72,21 +70,11 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set -CONFIG_PROFILING=y -# CONFIG_MARKERS is not set -CONFIG_OPROFILE=m -CONFIG_HAVE_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_HAVE_KPROBES=y -# CONFIG_HAVE_KRETPROBES is not set -# CONFIG_HAVE_DMA_ATTRS is not set -CONFIG_PROC_PAGE_MONITOR=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=1 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODVERSIONS is not set @@ -110,15 +98,10 @@ CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_CLASSIC_RCU=y # # System Type and features # -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SUBARCH_AVR32B=y CONFIG_MMU=y CONFIG_PERFORMANCE_COUNTERS=y @@ -164,19 +147,16 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set -CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y # CONFIG_OWNERSHIP_TRACE is not set -CONFIG_NMI_DEBUGGING=y # CONFIG_HZ_100 is not set CONFIG_HZ_250=y # CONFIG_HZ_300 is not set # CONFIG_HZ_1000 is not set CONFIG_HZ=250 -# CONFIG_SCHED_HRTICK is not set CONFIG_CMDLINE="" # @@ -190,10 +170,9 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set # CONFIG_CPU_FREQ_STAT is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set @@ -229,7 +208,6 @@ CONFIG_XFRM=y CONFIG_XFRM_USER=m # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set -# CONFIG_XFRM_STATISTICS is not set CONFIG_NET_KEY=m # CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y @@ -274,10 +252,8 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET6_XFRM_MODE_BEET=m # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set CONFIG_IPV6_SIT=m -CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m # CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set # CONFIG_IP_DCCP is not set @@ -303,7 +279,6 @@ CONFIG_LLC=m # CONFIG_NET_PKTGEN is not set # CONFIG_NET_TCPPROBE is not set # CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set @@ -339,7 +314,6 @@ CONFIG_MTD=y CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set CONFIG_MTD_CMDLINE_PARTS=y -# CONFIG_MTD_AR7_PARTS is not set # # User Modules And Translation Layers @@ -394,7 +368,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # CONFIG_MTD_DATAFLASH=m CONFIG_MTD_M25P80=m -CONFIG_M25PXX_USE_FAST_READ=y # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_MTDRAM is not set @@ -422,18 +395,13 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 -# CONFIG_BLK_DEV_XIP is not set +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set CONFIG_MISC_DEVICES=y -CONFIG_ATMEL_PWM=m -CONFIG_ATMEL_TCLIB=y -CONFIG_ATMEL_TCB_CLKSRC=y -CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 # CONFIG_EEPROM_93CX6 is not set CONFIG_ATMEL_SSC=m -# CONFIG_ENCLOSURE_SERVICES is not set -# CONFIG_HAVE_IDE is not set +# CONFIG_IDE is not set # # SCSI device support @@ -476,9 +444,6 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_LOWLEVEL is not set CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set -# CONFIG_SATA_PMP is not set -CONFIG_ATA_SFF=y -# CONFIG_SATA_MV is not set CONFIG_PATA_AT32=m # CONFIG_PATA_PLATFORM is not set # CONFIG_MD is not set @@ -504,13 +469,11 @@ CONFIG_PHYLIB=y # CONFIG_SMSC_PHY is not set # CONFIG_BROADCOM_PHY is not set # CONFIG_ICPLUS_PHY is not set -# CONFIG_REALTEK_PHY is not set # CONFIG_FIXED_PHY is not set # CONFIG_MDIO_BITBANG is not set CONFIG_NET_ETHERNET=y # CONFIG_MII is not set CONFIG_MACB=y -# CONFIG_ENC28J60 is not set # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set @@ -524,7 +487,6 @@ CONFIG_MACB=y # # CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set -# CONFIG_IWLWIFI_LEDS is not set # CONFIG_WAN is not set CONFIG_PPP=m # CONFIG_PPP_MULTILINK is not set @@ -538,6 +500,7 @@ CONFIG_PPP_BSDCOMP=m # CONFIG_PPPOL2TP is not set # CONFIG_SLIP is not set CONFIG_SLHC=m +# CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -593,7 +556,6 @@ CONFIG_MOUSE_GPIO=m # Character devices # # CONFIG_VT is not set -# CONFIG_DEVKMEM is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -606,7 +568,6 @@ CONFIG_MOUSE_GPIO=m # CONFIG_SERIAL_ATMEL=y CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_SERIAL_ATMEL_PDC=y # CONFIG_SERIAL_ATMEL_TTYAT is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y @@ -614,13 +575,21 @@ CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set +# CONFIG_RTC is not set +# CONFIG_GEN_RTC is not set # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# CONFIG_I2C_ALGOBIT=m +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set # # I2C Hardware Bus support @@ -631,23 +600,27 @@ CONFIG_I2C_GPIO=m # CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set -# CONFIG_I2C_PCA_PLATFORM is not set # # Miscellaneous I2C Chip support # +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set # CONFIG_DS1682 is not set # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set -# CONFIG_PCF8575 is not set +# CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set -# CONFIG_TPS65010 is not set # CONFIG_SENSORS_MAX6875 is not set # CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# CONFIG_SPI=y # CONFIG_SPI_DEBUG is not set CONFIG_SPI_MASTER=y @@ -664,27 +637,9 @@ CONFIG_SPI_ATMEL=y # CONFIG_SPI_AT25 is not set CONFIG_SPI_SPIDEV=m # CONFIG_SPI_TLE62X0 is not set -CONFIG_HAVE_GPIO_LIB=y - -# -# GPIO Support -# -# CONFIG_DEBUG_GPIO is not set - -# -# I2C GPIO expanders: -# -# CONFIG_GPIO_PCA953X is not set -# CONFIG_GPIO_PCF857X is not set - -# -# SPI GPIO expanders: -# -# CONFIG_GPIO_MCP23S08 is not set # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set -# CONFIG_THERMAL is not set CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -704,22 +659,12 @@ CONFIG_SSB_POSSIBLE=y # Multifunction device drivers # # CONFIG_MFD_SM501 is not set -# CONFIG_HTC_PASIC3 is not set # # Multimedia devices # - -# -# Multimedia core support -# # CONFIG_VIDEO_DEV is not set # CONFIG_DVB_CORE is not set -# CONFIG_VIDEO_MEDIA is not set - -# -# Multimedia drivers -# # CONFIG_DAB is not set # @@ -737,8 +682,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_SYS_FILLRECT is not set # CONFIG_FB_SYS_COPYAREA is not set # CONFIG_FB_SYS_IMAGEBLIT is not set -# CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set @@ -804,11 +749,7 @@ CONFIG_SND_AT73C213_TARGET_BITRATE=48000 # CONFIG_SND_SOC is not set # -# ALSA SoC audio for Freescale SOCs -# - -# -# SoC Audio for the Texas Instruments OMAP +# SoC Audio support for SuperH # # @@ -820,12 +761,14 @@ CONFIG_USB_SUPPORT=y # CONFIG_USB_ARCH_HAS_HCD is not set # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OTG_BLACKLIST_HUB is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # + +# +# USB Gadget Support +# CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -838,7 +781,6 @@ CONFIG_USB_ATMEL_USBA=y # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_M66592 is not set -# CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set @@ -854,7 +796,6 @@ CONFIG_USB_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set -# CONFIG_USB_G_PRINTER is not set CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set @@ -865,20 +806,17 @@ CONFIG_MMC=m CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_SDIO_UART is not set -CONFIG_MMC_TEST=m # # MMC/SD Host Controller Drivers # CONFIG_MMC_SPI=m -# CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m # # LED drivers # -CONFIG_LEDS_ATMEL_PWM=m CONFIG_LEDS_GPIO=m # @@ -887,8 +825,6 @@ CONFIG_LEDS_GPIO=m CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m -# CONFIG_ACCESSIBILITY is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y @@ -917,22 +853,19 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_S35390A is not set # # SPI RTC drivers # -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_R9701 is not set # CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_MAX6902 is not set # # Platform RTC drivers # -# CONFIG_RTC_DRV_DS1511 is not set # CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_V3020 is not set @@ -941,6 +874,10 @@ CONFIG_RTC_INTF_DEV=y # on-CPU RTC drivers # CONFIG_RTC_DRV_AT32AP700X=y + +# +# Userspace I/O +# # CONFIG_UIO is not set # @@ -958,11 +895,14 @@ CONFIG_JBD=m # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set -# CONFIG_DNOTIFY is not set +CONFIG_MINIX_FS=m +# CONFIG_ROMFS_FS is not set CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set +# CONFIG_DNOTIFY is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=m @@ -1017,10 +957,8 @@ CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set -CONFIG_MINIX_FS=m # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set -# CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y @@ -1028,6 +966,7 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set CONFIG_ROOT_NFS=y CONFIG_LOCKD=y @@ -1089,6 +1028,11 @@ CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=m # CONFIG_DLM is not set +CONFIG_INSTRUMENTATION=y +CONFIG_PROFILING=y +CONFIG_OPROFILE=m +CONFIG_KPROBES=y +# CONFIG_MARKERS is not set # # Kernel hacking @@ -1096,7 +1040,6 @@ CONFIG_NLS_UTF8=m # CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y -CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y @@ -1107,9 +1050,7 @@ CONFIG_DETECT_SOFTLOCKUP=y CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set -# CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -1123,14 +1064,12 @@ CONFIG_SCHED_DEBUG=y CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set -# CONFIG_DEBUG_WRITECOUNT is not set # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SG is not set CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set -# CONFIG_KPROBES_SANITY_TEST is not set -# CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_LKDTM is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_SAMPLES is not set @@ -1142,90 +1081,52 @@ CONFIG_FRAME_POINTER=y # CONFIG_SECURITY is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set CONFIG_CRYPTO=y - -# -# Crypto core or helper -# CONFIG_CRYPTO_ALGAPI=m -CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_HASH=m CONFIG_CRYPTO_MANAGER=m -# CONFIG_CRYPTO_GF128MUL is not set -# CONFIG_CRYPTO_NULL is not set -# CONFIG_CRYPTO_CRYPTD is not set -CONFIG_CRYPTO_AUTHENC=m -# CONFIG_CRYPTO_TEST is not set - -# -# Authenticated Encryption with Associated Data -# -# CONFIG_CRYPTO_CCM is not set -# CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_SEQIV is not set - -# -# Block modes -# -CONFIG_CRYPTO_CBC=m -# CONFIG_CRYPTO_CTR is not set -# CONFIG_CRYPTO_CTS is not set -# CONFIG_CRYPTO_ECB is not set -# CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_PCBC is not set -# CONFIG_CRYPTO_XTS is not set - -# -# Hash modes -# CONFIG_CRYPTO_HMAC=m # CONFIG_CRYPTO_XCBC is not set - -# -# Digest -# -# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set CONFIG_CRYPTO_MD5=m -# CONFIG_CRYPTO_MICHAEL_MIC is not set CONFIG_CRYPTO_SHA1=m # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_TGR192 is not set # CONFIG_CRYPTO_WP512 is not set - -# -# Ciphers -# -# CONFIG_CRYPTO_AES is not set -# CONFIG_CRYPTO_ANUBIS is not set -# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_ECB is not set +CONFIG_CRYPTO_CBC=m +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_XTS is not set +# CONFIG_CRYPTO_CRYPTD is not set +CONFIG_CRYPTO_DES=m +# CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set -CONFIG_CRYPTO_DES=m -# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_ARC4 is not set # CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_ANUBIS is not set # CONFIG_CRYPTO_SEED is not set -# CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set - -# -# Compression -# CONFIG_CRYPTO_DEFLATE=m -# CONFIG_CRYPTO_LZO is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_TEST is not set +# CONFIG_CRYPTO_AUTHENC is not set # CONFIG_CRYPTO_HW is not set # # Library routines # CONFIG_BITREVERSE=y -# CONFIG_GENERIC_FIND_FIRST_BIT is not set -# CONFIG_GENERIC_FIND_NEXT_BIT is not set CONFIG_CRC_CCITT=m # CONFIG_CRC16 is not set CONFIG_CRC_ITU_T=m diff --git a/trunk/arch/avr32/configs/atstk1003_defconfig b/trunk/arch/avr32/configs/atstk1003_defconfig index 5a4ae6b5d28f..45e23e03f074 100644 --- a/trunk/arch/avr32/configs/atstk1003_defconfig +++ b/trunk/arch/avr32/configs/atstk1003_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.26-rc3 -# Mon May 26 13:33:05 2008 +# Linux kernel version: 2.6.24-rc7 +# Wed Jan 9 22:54:34 2008 # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y @@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_TIME=y -CONFIG_GENERIC_CLOCKEVENTS=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_ARCH_SUPPORTS_OPROFILE=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_BUG=y @@ -39,15 +39,17 @@ CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y # CONFIG_TASK_XACCT is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set CONFIG_AUDIT=y # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set -# CONFIG_GROUP_SCHED is not set +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_FAIR_USER_SCHED=y +# CONFIG_FAIR_CGROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y -CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_RELAY=y -# CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -61,13 +63,11 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y -# CONFIG_COMPAT_BRK is not set # CONFIG_BASE_FULL is not set CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y @@ -75,20 +75,11 @@ CONFIG_VM_EVENT_COUNTERS=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set -CONFIG_PROFILING=y -# CONFIG_MARKERS is not set -CONFIG_OPROFILE=m -CONFIG_HAVE_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_HAVE_KPROBES=y -# CONFIG_HAVE_KRETPROBES is not set -# CONFIG_HAVE_DMA_ATTRS is not set -CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=1 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODVERSIONS is not set @@ -112,15 +103,10 @@ CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_CLASSIC_RCU=y # # System Type and features # -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SUBARCH_AVR32B=y CONFIG_MMU=y CONFIG_PERFORMANCE_COUNTERS=y @@ -166,19 +152,16 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set -CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y # CONFIG_OWNERSHIP_TRACE is not set -CONFIG_NMI_DEBUGGING=y # CONFIG_HZ_100 is not set CONFIG_HZ_250=y # CONFIG_HZ_300 is not set # CONFIG_HZ_1000 is not set CONFIG_HZ=250 -# CONFIG_SCHED_HRTICK is not set CONFIG_CMDLINE="" # @@ -192,10 +175,9 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set # CONFIG_CPU_FREQ_STAT is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set @@ -252,6 +234,8 @@ CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set # CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set # CONFIG_IP_DCCP is not set @@ -276,7 +260,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_NET_PKTGEN is not set # CONFIG_NET_TCPPROBE is not set # CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set @@ -312,7 +295,6 @@ CONFIG_MTD=y CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set CONFIG_MTD_CMDLINE_PARTS=y -# CONFIG_MTD_AR7_PARTS is not set # # User Modules And Translation Layers @@ -367,7 +349,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # CONFIG_MTD_DATAFLASH=m CONFIG_MTD_M25P80=m -CONFIG_M25PXX_USE_FAST_READ=y # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_MTDRAM is not set @@ -395,18 +376,13 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 -# CONFIG_BLK_DEV_XIP is not set +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set CONFIG_MISC_DEVICES=y -CONFIG_ATMEL_PWM=m -CONFIG_ATMEL_TCLIB=y -CONFIG_ATMEL_TCB_CLKSRC=y -CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 # CONFIG_EEPROM_93CX6 is not set CONFIG_ATMEL_SSC=m -# CONFIG_ENCLOSURE_SERVICES is not set -# CONFIG_HAVE_IDE is not set +# CONFIG_IDE is not set # # SCSI device support @@ -451,9 +427,6 @@ CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_DEBUG is not set CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set -# CONFIG_SATA_PMP is not set -CONFIG_ATA_SFF=y -# CONFIG_SATA_MV is not set CONFIG_PATA_AT32=m # CONFIG_PATA_PLATFORM is not set # CONFIG_MD is not set @@ -474,7 +447,6 @@ CONFIG_NETDEVICES=y # # CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set -# CONFIG_IWLWIFI_LEDS is not set # CONFIG_WAN is not set CONFIG_PPP=m # CONFIG_PPP_MULTILINK is not set @@ -488,6 +460,7 @@ CONFIG_PPP_BSDCOMP=m # CONFIG_PPPOL2TP is not set # CONFIG_SLIP is not set CONFIG_SLHC=m +# CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -543,7 +516,6 @@ CONFIG_MOUSE_GPIO=m # Character devices # # CONFIG_VT is not set -# CONFIG_DEVKMEM is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -556,7 +528,6 @@ CONFIG_MOUSE_GPIO=m # CONFIG_SERIAL_ATMEL=y CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_SERIAL_ATMEL_PDC=y # CONFIG_SERIAL_ATMEL_TTYAT is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y @@ -564,13 +535,21 @@ CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set +# CONFIG_RTC is not set +# CONFIG_GEN_RTC is not set # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# CONFIG_I2C_ALGOBIT=m +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set # # I2C Hardware Bus support @@ -581,23 +560,27 @@ CONFIG_I2C_GPIO=m # CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set -# CONFIG_I2C_PCA_PLATFORM is not set # # Miscellaneous I2C Chip support # +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set # CONFIG_DS1682 is not set # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set -# CONFIG_PCF8575 is not set +# CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set -# CONFIG_TPS65010 is not set # CONFIG_SENSORS_MAX6875 is not set # CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# CONFIG_SPI=y # CONFIG_SPI_DEBUG is not set CONFIG_SPI_MASTER=y @@ -614,27 +597,9 @@ CONFIG_SPI_ATMEL=y # CONFIG_SPI_AT25 is not set CONFIG_SPI_SPIDEV=m # CONFIG_SPI_TLE62X0 is not set -CONFIG_HAVE_GPIO_LIB=y - -# -# GPIO Support -# -# CONFIG_DEBUG_GPIO is not set - -# -# I2C GPIO expanders: -# -# CONFIG_GPIO_PCA953X is not set -# CONFIG_GPIO_PCF857X is not set - -# -# SPI GPIO expanders: -# -# CONFIG_GPIO_MCP23S08 is not set # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set -# CONFIG_THERMAL is not set CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -654,22 +619,12 @@ CONFIG_SSB_POSSIBLE=y # Multifunction device drivers # # CONFIG_MFD_SM501 is not set -# CONFIG_HTC_PASIC3 is not set # # Multimedia devices # - -# -# Multimedia core support -# # CONFIG_VIDEO_DEV is not set # CONFIG_DVB_CORE is not set -# CONFIG_VIDEO_MEDIA is not set - -# -# Multimedia drivers -# # CONFIG_DAB is not set # @@ -727,11 +682,7 @@ CONFIG_SND_AT73C213_TARGET_BITRATE=48000 # CONFIG_SND_SOC is not set # -# ALSA SoC audio for Freescale SOCs -# - -# -# SoC Audio for the Texas Instruments OMAP +# SoC Audio support for SuperH # # @@ -743,12 +694,14 @@ CONFIG_USB_SUPPORT=y # CONFIG_USB_ARCH_HAS_HCD is not set # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OTG_BLACKLIST_HUB is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # + +# +# USB Gadget Support +# CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set @@ -761,7 +714,6 @@ CONFIG_USB_ATMEL_USBA=y # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_M66592 is not set -# CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set @@ -777,7 +729,6 @@ CONFIG_USB_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set -# CONFIG_USB_G_PRINTER is not set CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set @@ -788,20 +739,17 @@ CONFIG_MMC=m CONFIG_MMC_BLOCK=m # CONFIG_MMC_BLOCK_BOUNCE is not set # CONFIG_SDIO_UART is not set -# CONFIG_MMC_TEST is not set # # MMC/SD Host Controller Drivers # CONFIG_MMC_SPI=m -# CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y # # LED drivers # -CONFIG_LEDS_ATMEL_PWM=m CONFIG_LEDS_GPIO=y # @@ -810,8 +758,6 @@ CONFIG_LEDS_GPIO=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -# CONFIG_ACCESSIBILITY is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y @@ -840,22 +786,19 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_S35390A is not set # # SPI RTC drivers # -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_R9701 is not set # CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_MAX6902 is not set # # Platform RTC drivers # -# CONFIG_RTC_DRV_DS1511 is not set # CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_V3020 is not set @@ -864,8 +807,11 @@ CONFIG_RTC_INTF_DEV=y # on-CPU RTC drivers # CONFIG_RTC_DRV_AT32AP700X=y + +# +# Userspace I/O +# CONFIG_UIO=m -# CONFIG_UIO_SMX is not set # # File systems @@ -882,11 +828,14 @@ CONFIG_JBD=m # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set -# CONFIG_DNOTIFY is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set +# CONFIG_DNOTIFY is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=m @@ -942,10 +891,8 @@ CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set -# CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set # CONFIG_NETWORK_FILESYSTEMS is not set @@ -996,6 +943,11 @@ CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=m # CONFIG_DLM is not set +CONFIG_INSTRUMENTATION=y +CONFIG_PROFILING=y +CONFIG_OPROFILE=m +CONFIG_KPROBES=y +# CONFIG_MARKERS is not set # # Kernel hacking @@ -1003,7 +955,6 @@ CONFIG_NLS_UTF8=m # CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y -CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y @@ -1014,7 +965,6 @@ CONFIG_DETECT_SOFTLOCKUP=y CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set -# CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -1028,14 +978,12 @@ CONFIG_SCHED_DEBUG=y CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set -# CONFIG_DEBUG_WRITECOUNT is not set # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SG is not set CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set -# CONFIG_KPROBES_SANITY_TEST is not set -# CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_LKDTM is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_SAMPLES is not set @@ -1052,8 +1000,6 @@ CONFIG_FRAME_POINTER=y # Library routines # CONFIG_BITREVERSE=y -# CONFIG_GENERIC_FIND_FIRST_BIT is not set -# CONFIG_GENERIC_FIND_NEXT_BIT is not set CONFIG_CRC_CCITT=m # CONFIG_CRC16 is not set CONFIG_CRC_ITU_T=m diff --git a/trunk/arch/avr32/configs/atstk1004_defconfig b/trunk/arch/avr32/configs/atstk1004_defconfig index a0912fb7c92e..634c52760349 100644 --- a/trunk/arch/avr32/configs/atstk1004_defconfig +++ b/trunk/arch/avr32/configs/atstk1004_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.26-rc3 -# Mon May 26 13:34:57 2008 +# Linux kernel version: 2.6.24-rc7 +# Wed Jan 9 23:04:20 2008 # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y @@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_TIME=y -CONFIG_GENERIC_CLOCKEVENTS=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_ARCH_SUPPORTS_OPROFILE=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_BUG=y @@ -34,15 +34,15 @@ CONFIG_LOCALVERSION="" # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set -# CONFIG_GROUP_SCHED is not set +# CONFIG_FAIR_GROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y -CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set -# CONFIG_NAMESPACES is not set # CONFIG_BLK_DEV_INITRD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y @@ -54,38 +54,24 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y -# CONFIG_COMPAT_BRK is not set # CONFIG_BASE_FULL is not set # CONFIG_FUTEX is not set # CONFIG_EPOLL is not set # CONFIG_SIGNALFD is not set -# CONFIG_TIMERFD is not set # CONFIG_EVENTFD is not set CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y # CONFIG_SLAB is not set # CONFIG_SLUB is not set CONFIG_SLOB=y -# CONFIG_PROFILING is not set -# CONFIG_MARKERS is not set -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_KPROBES=y -# CONFIG_HAVE_KRETPROBES is not set -# CONFIG_HAVE_DMA_ATTRS is not set -# CONFIG_PROC_PAGE_MONITOR is not set # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=1 # CONFIG_MODULES is not set # CONFIG_BLOCK is not set -CONFIG_CLASSIC_RCU=y # # System Type and features # -# CONFIG_TICK_ONESHOT is not set -# CONFIG_NO_HZ is not set -# CONFIG_HIGH_RES_TIMERS is not set -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SUBARCH_AVR32B=y CONFIG_MMU=y CONFIG_PERFORMANCE_COUNTERS=y @@ -129,19 +115,16 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set -CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y # CONFIG_OWNERSHIP_TRACE is not set -# CONFIG_NMI_DEBUGGING is not set # CONFIG_HZ_100 is not set CONFIG_HZ_250=y # CONFIG_HZ_300 is not set # CONFIG_HZ_1000 is not set CONFIG_HZ=250 -# CONFIG_SCHED_HRTICK is not set CONFIG_CMDLINE="" # @@ -151,7 +134,20 @@ CONFIG_CMDLINE="" # # CPU Frequency scaling # -# CONFIG_CPU_FREQ is not set +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +# CONFIG_CPU_FREQ_DEBUG is not set +# CONFIG_CPU_FREQ_STAT is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_AT32AP=y # # Bus options @@ -201,6 +197,8 @@ CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set # CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set # CONFIG_IP_DCCP is not set @@ -224,7 +222,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set @@ -258,7 +255,6 @@ CONFIG_MTD=y CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set CONFIG_MTD_CMDLINE_PARTS=y -# CONFIG_MTD_AR7_PARTS is not set # # User Modules And Translation Layers @@ -325,7 +321,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # CONFIG_MTD_UBI is not set # CONFIG_PARPORT is not set # CONFIG_MISC_DEVICES is not set -# CONFIG_HAVE_IDE is not set # # SCSI device support @@ -351,7 +346,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # Character devices # # CONFIG_VT is not set -# CONFIG_DEVKMEM is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -364,7 +358,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # CONFIG_SERIAL_ATMEL=y CONFIG_SERIAL_ATMEL_CONSOLE=y -# CONFIG_SERIAL_ATMEL_PDC is not set # CONFIG_SERIAL_ATMEL_TTYAT is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y @@ -372,9 +365,15 @@ CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set +# CONFIG_RTC is not set +# CONFIG_GEN_RTC is not set # CONFIG_R3964 is not set # CONFIG_TCG_TPM is not set # CONFIG_I2C is not set + +# +# SPI support +# CONFIG_SPI=y CONFIG_SPI_MASTER=y @@ -390,24 +389,9 @@ CONFIG_SPI_ATMEL=y # CONFIG_SPI_AT25 is not set # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_TLE62X0 is not set -CONFIG_HAVE_GPIO_LIB=y - -# -# GPIO Support -# - -# -# I2C GPIO expanders: -# - -# -# SPI GPIO expanders: -# -# CONFIG_GPIO_MCP23S08 is not set # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set -# CONFIG_THERMAL is not set CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -427,22 +411,12 @@ CONFIG_SSB_POSSIBLE=y # Multifunction device drivers # # CONFIG_MFD_SM501 is not set -# CONFIG_HTC_PASIC3 is not set # # Multimedia devices # - -# -# Multimedia core support -# # CONFIG_VIDEO_DEV is not set # CONFIG_DVB_CORE is not set -# CONFIG_VIDEO_MEDIA is not set - -# -# Multimedia drivers -# # CONFIG_DAB is not set # @@ -460,8 +434,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_SYS_FILLRECT is not set # CONFIG_FB_SYS_COPYAREA is not set # CONFIG_FB_SYS_IMAGEBLIT is not set -# CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set @@ -493,12 +467,14 @@ CONFIG_USB_SUPPORT=y # CONFIG_USB_ARCH_HAS_HCD is not set # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OTG_BLACKLIST_HUB is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # + +# +# USB Gadget Support +# CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y @@ -509,7 +485,6 @@ CONFIG_USB_ATMEL_USBA=y # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_M66592 is not set -# CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set @@ -524,11 +499,8 @@ CONFIG_USB_ETH=y # CONFIG_USB_FILE_STORAGE is not set # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set -# CONFIG_USB_G_PRINTER is not set # CONFIG_MMC is not set -# CONFIG_MEMSTICK is not set # CONFIG_NEW_LEDS is not set -# CONFIG_ACCESSIBILITY is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y @@ -547,17 +519,15 @@ CONFIG_RTC_INTF_DEV=y # # SPI RTC drivers # -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_R9701 is not set # CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_MAX6902 is not set # # Platform RTC drivers # -# CONFIG_RTC_DRV_DS1511 is not set # CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_V3020 is not set @@ -566,14 +536,18 @@ CONFIG_RTC_INTF_DEV=y # on-CPU RTC drivers # CONFIG_RTC_DRV_AT32AP700X=y + +# +# Userspace I/O +# # CONFIG_UIO is not set # # File systems # -# CONFIG_DNOTIFY is not set # CONFIG_INOTIFY is not set # CONFIG_QUOTA is not set +# CONFIG_DNOTIFY is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set # CONFIG_FUSE_FS is not set @@ -606,6 +580,7 @@ CONFIG_JFFS2_RTIME=y # CONFIG_NETWORK_FILESYSTEMS is not set # CONFIG_NLS is not set # CONFIG_DLM is not set +# CONFIG_INSTRUMENTATION is not set # # Kernel hacking @@ -613,7 +588,6 @@ CONFIG_JFFS2_RTIME=y # CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y -CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set @@ -634,8 +608,6 @@ CONFIG_MAGIC_SYSRQ=y # Library routines # CONFIG_BITREVERSE=y -# CONFIG_GENERIC_FIND_FIRST_BIT is not set -# CONFIG_GENERIC_FIND_NEXT_BIT is not set # CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set # CONFIG_CRC_ITU_T is not set diff --git a/trunk/arch/avr32/kernel/avr32_ksyms.c b/trunk/arch/avr32/kernel/avr32_ksyms.c index 84a7d44edc67..80f55f8dbf1c 100644 --- a/trunk/arch/avr32/kernel/avr32_ksyms.c +++ b/trunk/arch/avr32/kernel/avr32_ksyms.c @@ -29,9 +29,7 @@ EXPORT_SYMBOL(__avr32_asr64); */ EXPORT_SYMBOL(memset); EXPORT_SYMBOL(memcpy); - EXPORT_SYMBOL(clear_page); -EXPORT_SYMBOL(copy_page); /* * Userspace access stuff. @@ -43,8 +41,6 @@ EXPORT_SYMBOL(strncpy_from_user); EXPORT_SYMBOL(__strncpy_from_user); EXPORT_SYMBOL(clear_user); EXPORT_SYMBOL(__clear_user); -EXPORT_SYMBOL(strnlen_user); - EXPORT_SYMBOL(csum_partial); EXPORT_SYMBOL(csum_partial_copy_generic); diff --git a/trunk/arch/avr32/kernel/entry-avr32b.S b/trunk/arch/avr32/kernel/entry-avr32b.S index 2b398cae110c..5f31702d6b1c 100644 --- a/trunk/arch/avr32/kernel/entry-avr32b.S +++ b/trunk/arch/avr32/kernel/entry-avr32b.S @@ -74,41 +74,50 @@ 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 - .org 0x50 + .section .tlbx.ex.text,"ax",@progbits .global itlb_miss itlb_miss: tlbmiss_save rjmp tlb_miss_common - .org 0x60 + .section .tlbr.ex.text,"ax",@progbits dtlb_miss_read: tlbmiss_save rjmp tlb_miss_common - .org 0x70 + .section .tlbw.ex.text,"ax",@progbits dtlb_miss_write: tlbmiss_save .global tlb_miss_common - .align 2 tlb_miss_common: mfsr r0, SYSREG_TLBEAR mfsr r1, SYSREG_PTBR - /* - * First level lookup: The PGD contains virtual pointers to - * the second-level page tables, but they may be NULL if not - * present. - */ + /* Is it the vmalloc space? */ + bld r0, 31 + brcs handle_vmalloc_miss + + /* First level lookup */ pgtbl_lookup: lsr r2, r0, PGDIR_SHIFT ld.w r3, r1[r2 << 2] bfextu r1, r0, PAGE_SHIFT, PGDIR_SHIFT - PAGE_SHIFT - cp.w r3, 0 - breq page_table_not_present + bld r3, _PAGE_BIT_PRESENT + brcc page_table_not_present + + /* Translate to virtual address in P1. */ + andl r3, 0xf000 + sbr r3, 31 /* Second level lookup */ ld.w r2, r3[r1 << 2] @@ -139,55 +148,16 @@ pgtbl_lookup: tlbmiss_restore rete - /* 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. - */ +handle_vmalloc_miss: + /* Simply do the lookup in init's page table */ 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 --- */ - .org 0x100 + .section .scall.text,"ax",@progbits system_call: #ifdef CONFIG_PREEMPT mask_interrupts @@ -296,6 +266,18 @@ 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/init_task.c b/trunk/arch/avr32/kernel/init_task.c index 44058469c6ec..effcacf9d1a2 100644 --- a/trunk/arch/avr32/kernel/init_task.c +++ b/trunk/arch/avr32/kernel/init_task.c @@ -14,6 +14,7 @@ #include static struct fs_struct init_fs = INIT_FS; +static struct files_struct init_files = INIT_FILES; static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); struct mm_struct init_mm = INIT_MM(init_mm); diff --git a/trunk/arch/avr32/kernel/signal.c b/trunk/arch/avr32/kernel/signal.c index c5b11f9067f1..5616a00c10ba 100644 --- a/trunk/arch/avr32/kernel/signal.c +++ b/trunk/arch/avr32/kernel/signal.c @@ -93,9 +93,6 @@ 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 abd954fb7ba0..00a9862380ff 100644 --- a/trunk/arch/avr32/kernel/time.c +++ b/trunk/arch/avr32/kernel/time.c @@ -7,13 +7,21 @@ */ #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 5d25d8eeb750..481cfd40c053 100644 --- a/trunk/arch/avr32/kernel/vmlinux.lds.S +++ b/trunk/arch/avr32/kernel/vmlinux.lds.S @@ -68,6 +68,14 @@ 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 @@ -99,10 +107,6 @@ 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 cb2d86945559..2be5da7ed26b 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.ub r8, r12[0] +3: ld.uh 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 d5018e2eed25..e89009439e4a 100644 --- a/trunk/arch/avr32/mach-at32ap/Makefile +++ b/trunk/arch/avr32/mach-at32ap/Makefile @@ -1,8 +1,3 @@ -obj-y += pdc.o clock.o intc.o extint.o pio.o hsmc.o +obj-y += at32ap.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/pdc.c b/trunk/arch/avr32/mach-at32ap/at32ap.c similarity index 90% rename from trunk/arch/avr32/mach-at32ap/pdc.c rename to trunk/arch/avr32/mach-at32ap/at32ap.c index 1040bda4fda7..7c4987f3287a 100644 --- a/trunk/arch/avr32/mach-at32ap/pdc.c +++ b/trunk/arch/avr32/mach-at32ap/at32ap.c @@ -11,6 +11,14 @@ #include #include +#include + +void __init setup_platform(void) +{ + at32_clock_init(); + at32_portmux_init(); +} + static int __init pdc_probe(struct platform_device *pdev) { struct clk *pclk, *hclk; diff --git a/trunk/arch/avr32/mach-at32ap/at32ap700x.c b/trunk/arch/avr32/mach-at32ap/at32ap700x.c index 07b21b121eef..0f24b4f85c17 100644 --- a/trunk/arch/avr32/mach-at32ap/at32ap700x.c +++ b/trunk/arch/avr32/mach-at32ap/at32ap700x.c @@ -20,7 +20,6 @@ #include #include #include -#include #include