From ce03c3d6f1f4e2b9cf3a38f742ee3b2816cd5808 Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 6 Sep 2005 15:47:31 -0700 Subject: [PATCH] --- yaml --- r: 12046 b: refs/heads/master c: c08319a9d50b5c9cb4fdb33728bd16497cf4ddd3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/crypto/api-intro.txt | 1 + .../feature-removal-schedule.txt | 10 - trunk/Documentation/filesystems/proc.txt | 1 + trunk/Documentation/filesystems/sysfs.txt | 28 +- trunk/Documentation/hwmon/lm78 | 7 +- trunk/Documentation/hwmon/w83792d | 174 + trunk/Documentation/i2c/chips/max6875 | 94 +- trunk/Documentation/i2c/functionality | 2 +- trunk/Documentation/i2c/porting-clients | 25 +- trunk/Documentation/i2c/writing-clients | 114 +- trunk/Documentation/kbuild/makefiles.txt | 6 + trunk/Documentation/networking/README.ipw2100 | 246 + trunk/Documentation/networking/README.ipw2200 | 300 + trunk/Documentation/power/swsusp-dmcrypt.txt | 138 + trunk/Documentation/power/swsusp.txt | 7 + trunk/Documentation/power/video.txt | 9 +- trunk/Documentation/serial/driver | 15 +- trunk/Documentation/vm/locking | 15 +- trunk/Documentation/watchdog/watchdog-api.txt | 20 + trunk/MAINTAINERS | 21 +- trunk/Makefile | 164 +- trunk/arch/arm/Kconfig | 4 +- trunk/arch/arm/common/gic.c | 1 + trunk/arch/arm/common/locomo.c | 24 +- trunk/arch/arm/common/sa1111.c | 8 +- trunk/arch/arm/common/scoop.c | 6 + trunk/arch/arm/kernel/calls.S | 2 +- trunk/arch/arm/kernel/ecard.c | 4 +- trunk/arch/arm/kernel/entry-common.S | 4 + trunk/arch/arm/kernel/irq.c | 20 +- trunk/arch/arm/kernel/smp.c | 2 +- trunk/arch/arm/kernel/sys_arm.c | 10 + trunk/arch/arm/kernel/time.c | 10 +- trunk/arch/arm/mach-footbridge/isa-irq.c | 2 +- trunk/arch/arm/mach-h720x/common.c | 2 +- trunk/arch/arm/mach-h720x/cpu-h7202.c | 2 +- trunk/arch/arm/mach-imx/irq.c | 4 +- .../arch/arm/mach-integrator/integrator_cp.c | 2 +- trunk/arch/arm/mach-ixp2000/core.c | 10 +- trunk/arch/arm/mach-ixp2000/ixdp2x00.c | 2 +- trunk/arch/arm/mach-ixp2000/ixdp2x01.c | 2 +- trunk/arch/arm/mach-ixp4xx/common.c | 155 +- trunk/arch/arm/mach-ixp4xx/coyote-pci.c | 7 +- trunk/arch/arm/mach-ixp4xx/coyote-setup.c | 9 +- trunk/arch/arm/mach-ixp4xx/gtwx5715-pci.c | 28 +- trunk/arch/arm/mach-ixp4xx/gtwx5715-setup.c | 8 +- trunk/arch/arm/mach-ixp4xx/ixdp425-pci.c | 12 +- trunk/arch/arm/mach-ixp4xx/ixdp425-setup.c | 13 +- trunk/arch/arm/mach-ixp4xx/ixdpg425-pci.c | 4 +- trunk/arch/arm/mach-lh7a40x/common.h | 2 +- trunk/arch/arm/mach-omap1/fpga.c | 2 +- trunk/arch/arm/mach-pxa/corgi.c | 12 + trunk/arch/arm/mach-pxa/irq.c | 12 +- trunk/arch/arm/mach-pxa/lubbock.c | 2 +- trunk/arch/arm/mach-pxa/mainstone.c | 2 +- trunk/arch/arm/mach-pxa/poodle.c | 12 + trunk/arch/arm/mach-pxa/time.c | 58 +- trunk/arch/arm/mach-s3c2410/bast-irq.c | 2 +- trunk/arch/arm/mach-s3c2410/clock.c | 9 + trunk/arch/arm/mach-s3c2410/irq.c | 22 +- trunk/arch/arm/mach-s3c2410/mach-n30.c | 30 +- trunk/arch/arm/mach-s3c2410/pm.c | 6 +- trunk/arch/arm/mach-s3c2410/s3c2440-clock.c | 6 +- trunk/arch/arm/mach-s3c2410/s3c2440-irq.c | 8 +- trunk/arch/arm/mach-sa1100/irq.c | 10 +- trunk/arch/arm/mach-sa1100/neponset.c | 6 +- trunk/arch/arm/mach-sa1100/time.c | 68 +- trunk/arch/arm/mach-versatile/core.c | 2 +- trunk/arch/arm/mm/alignment.c | 70 +- trunk/arch/arm/mm/mm-armv.c | 30 +- trunk/arch/arm/mm/proc-arm6_7.S | 8 +- trunk/arch/arm/plat-omap/gpio.c | 2 +- trunk/arch/cris/Kconfig.debug | 31 +- trunk/arch/frv/kernel/frv_ksyms.c | 1 - trunk/arch/i386/Kconfig | 5 + trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/acpi/boot.c | 3 + trunk/arch/i386/kernel/cpu/common.c | 16 +- trunk/arch/i386/kernel/cpu/cpufreq/longhaul.c | 12 +- trunk/arch/i386/kernel/cpu/cyrix.c | 6 +- trunk/arch/i386/kernel/cpu/intel.c | 9 +- trunk/arch/i386/kernel/cpu/intel_cacheinfo.c | 9 +- trunk/arch/i386/kernel/cpu/mtrr/main.c | 2 +- trunk/arch/i386/kernel/crash.c | 2 +- trunk/arch/i386/kernel/doublefault.c | 2 +- trunk/arch/i386/kernel/efi.c | 110 +- trunk/arch/i386/kernel/entry.S | 9 +- trunk/arch/i386/kernel/head.S | 48 +- trunk/arch/i386/kernel/i8237.c | 67 + trunk/arch/i386/kernel/ioport.c | 7 +- trunk/arch/i386/kernel/ldt.c | 7 +- trunk/arch/i386/kernel/machine_kexec.c | 18 +- trunk/arch/i386/kernel/microcode.c | 7 +- trunk/arch/i386/kernel/mpparse.c | 17 +- trunk/arch/i386/kernel/msr.c | 31 +- trunk/arch/i386/kernel/nmi.c | 5 +- trunk/arch/i386/kernel/process.c | 43 +- trunk/arch/i386/kernel/ptrace.c | 63 +- trunk/arch/i386/kernel/reboot.c | 9 +- trunk/arch/i386/kernel/semaphore.c | 162 - trunk/arch/i386/kernel/setup.c | 22 +- trunk/arch/i386/kernel/signal.c | 8 +- trunk/arch/i386/kernel/smp.c | 2 +- trunk/arch/i386/kernel/smpboot.c | 7 +- trunk/arch/i386/kernel/time.c | 10 + trunk/arch/i386/kernel/timers/timer_hpet.c | 19 +- trunk/arch/i386/kernel/timers/timer_pit.c | 27 - trunk/arch/i386/kernel/timers/timer_pm.c | 9 + trunk/arch/i386/kernel/timers/timer_tsc.c | 14 + trunk/arch/i386/kernel/traps.c | 11 +- trunk/arch/i386/kernel/vm86.c | 10 +- trunk/arch/i386/kernel/vsyscall-sigreturn.S | 3 +- trunk/arch/i386/mach-es7000/es7000.h | 5 +- trunk/arch/i386/mach-es7000/es7000plat.c | 45 +- trunk/arch/i386/mach-generic/bigsmp.c | 5 +- trunk/arch/i386/mach-generic/probe.c | 20 + trunk/arch/i386/mach-voyager/voyager_basic.c | 14 +- trunk/arch/i386/mach-voyager/voyager_smp.c | 5 +- trunk/arch/i386/math-emu/get_address.c | 13 +- trunk/arch/i386/mm/fault.c | 37 +- trunk/arch/i386/mm/hugetlbpage.c | 27 +- trunk/arch/i386/mm/init.c | 7 +- trunk/arch/i386/mm/pageattr.c | 7 +- trunk/arch/i386/mm/pgtable.c | 10 +- trunk/arch/i386/power/cpu.c | 43 +- trunk/arch/ia64/Kconfig | 6 + trunk/arch/ia64/hp/sim/boot/fw-emu.c | 11 - trunk/arch/ia64/ia32/ia32_signal.c | 1 - trunk/arch/ia64/kernel/Makefile | 1 + trunk/arch/ia64/kernel/cpufreq/Kconfig | 29 + trunk/arch/ia64/kernel/cpufreq/Makefile | 1 + trunk/arch/ia64/kernel/cpufreq/acpi-cpufreq.c | 499 + trunk/arch/ia64/kernel/sys_ia64.c | 2 +- trunk/arch/ia64/kernel/uncached.c | 4 +- trunk/arch/ia64/lib/Makefile | 2 +- trunk/arch/ia64/lib/swiotlb.c | 5 +- trunk/arch/ia64/mm/hugetlbpage.c | 8 +- trunk/arch/ia64/pci/pci.c | 1 - trunk/arch/ia64/sn/include/tio.h | 6 +- trunk/arch/ia64/sn/include/xtalk/hubdev.h | 11 +- trunk/arch/ia64/sn/kernel/bte.c | 83 +- trunk/arch/ia64/sn/kernel/huberror.c | 2 +- trunk/arch/ia64/sn/kernel/io_init.c | 35 +- trunk/arch/ia64/sn/kernel/irq.c | 75 +- trunk/arch/ia64/sn/kernel/setup.c | 7 +- trunk/arch/ia64/sn/kernel/sn2/ptc_deadlock.S | 13 +- trunk/arch/ia64/sn/kernel/sn2/sn2_smp.c | 256 +- trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c | 313 +- trunk/arch/ia64/sn/kernel/sn2/sn_proc_fs.c | 4 +- .../arch/ia64/sn/kernel/sn2/timer_interrupt.c | 22 +- trunk/arch/ia64/sn/pci/Makefile | 2 +- trunk/arch/ia64/sn/pci/pcibr/pcibr_dma.c | 60 +- trunk/arch/ia64/sn/pci/pcibr/pcibr_provider.c | 40 +- trunk/arch/ia64/sn/pci/tioca_provider.c | 7 +- trunk/arch/ia64/sn/pci/tioce_provider.c | 771 ++ trunk/arch/m68k/kernel/m68k_ksyms.c | 4 - trunk/arch/m68k/kernel/ptrace.c | 370 +- trunk/arch/m68k/lib/Makefile | 2 +- trunk/arch/m68k/lib/memcmp.c | 11 - trunk/arch/m68k/lib/memcpy.c | 75 - trunk/arch/m68k/lib/memset.c | 68 - trunk/arch/m68k/lib/string.c | 237 + trunk/arch/m68k/mm/Makefile | 2 +- trunk/arch/m68k/mm/cache.c | 118 + trunk/arch/m68k/mm/memory.c | 104 - trunk/arch/m68knommu/Kconfig | 66 +- trunk/arch/m68knommu/Makefile | 7 +- trunk/arch/m68knommu/defconfig | 452 +- trunk/arch/m68knommu/kernel/setup.c | 25 +- trunk/arch/m68knommu/kernel/traps.c | 20 +- trunk/arch/m68knommu/kernel/vmlinux.lds.S | 23 +- trunk/arch/m68knommu/platform/523x/config.c | 82 + trunk/arch/m68knommu/platform/5307/head.S | 15 +- trunk/arch/m68knommu/platform/68328/entry.S | 4 +- trunk/arch/m68knommu/platform/68360/entry.S | 2 +- trunk/arch/mips/Kconfig | 255 +- trunk/arch/mips/Makefile | 48 +- trunk/arch/mips/au1000/common/pci.c | 8 +- trunk/arch/mips/au1000/common/setup.c | 2 +- trunk/arch/mips/au1000/common/time.c | 14 +- trunk/arch/mips/au1000/csb250/board_setup.c | 4 +- trunk/arch/mips/au1000/csb250/init.c | 2 +- trunk/arch/mips/au1000/db1x00/init.c | 2 +- trunk/arch/mips/au1000/hydrogen3/init.c | 2 +- trunk/arch/mips/au1000/pb1000/board_setup.c | 2 +- trunk/arch/mips/au1000/xxs1500/board_setup.c | 6 +- trunk/arch/mips/au1000/xxs1500/init.c | 2 +- trunk/arch/mips/au1000/xxs1500/irqmap.c | 2 +- trunk/arch/mips/configs/atlas_defconfig | 5 +- trunk/arch/mips/configs/capcella_defconfig | 5 +- trunk/arch/mips/configs/cobalt_defconfig | 5 +- trunk/arch/mips/configs/db1000_defconfig | 5 +- trunk/arch/mips/configs/db1100_defconfig | 5 +- trunk/arch/mips/configs/db1500_defconfig | 4 +- trunk/arch/mips/configs/db1550_defconfig | 4 +- trunk/arch/mips/configs/ddb5476_defconfig | 5 +- trunk/arch/mips/configs/ddb5477_defconfig | 5 +- trunk/arch/mips/configs/decstation_defconfig | 5 +- trunk/arch/mips/configs/e55_defconfig | 5 +- trunk/arch/mips/configs/ev64120_defconfig | 5 +- trunk/arch/mips/configs/ev96100_defconfig | 5 +- trunk/arch/mips/configs/ip22_defconfig | 5 +- trunk/arch/mips/configs/ip27_defconfig | 2 +- trunk/arch/mips/configs/ip32_defconfig | 3 +- trunk/arch/mips/configs/it8172_defconfig | 5 +- trunk/arch/mips/configs/ivr_defconfig | 5 +- trunk/arch/mips/configs/jaguar-atx_defconfig | 5 +- trunk/arch/mips/configs/jmr3927_defconfig | 5 +- trunk/arch/mips/configs/lasat200_defconfig | 5 +- trunk/arch/mips/configs/malta_defconfig | 5 +- trunk/arch/mips/configs/mpc30x_defconfig | 5 +- trunk/arch/mips/configs/ocelot_3_defconfig | 5 +- trunk/arch/mips/configs/ocelot_c_defconfig | 3 +- trunk/arch/mips/configs/ocelot_defconfig | 5 +- trunk/arch/mips/configs/ocelot_g_defconfig | 3 +- trunk/arch/mips/configs/pb1100_defconfig | 5 +- trunk/arch/mips/configs/pb1500_defconfig | 4 +- trunk/arch/mips/configs/pb1550_defconfig | 4 +- .../{osprey_defconfig => qemu_defconfig} | 405 +- trunk/arch/mips/configs/rm200_defconfig | 5 +- .../arch/mips/configs/sb1250-swarm_defconfig | 4 +- trunk/arch/mips/configs/sead_defconfig | 5 +- trunk/arch/mips/configs/tb0226_defconfig | 5 +- trunk/arch/mips/configs/tb0229_defconfig | 5 +- trunk/arch/mips/configs/workpad_defconfig | 5 +- trunk/arch/mips/configs/yosemite_defconfig | 4 +- trunk/arch/mips/ddb5xxx/ddb5477/irq.c | 6 +- trunk/arch/mips/ddb5xxx/ddb5477/setup.c | 22 +- trunk/arch/mips/dec/ecc-berr.c | 2 +- trunk/arch/mips/dec/int-handler.S | 6 +- trunk/arch/mips/dec/prom/Makefile | 4 +- trunk/arch/mips/defconfig | 5 +- .../mips/ite-boards/generic/it8172_setup.c | 2 +- trunk/arch/mips/ite-boards/generic/time.c | 16 +- trunk/arch/mips/kernel/Makefile | 10 +- trunk/arch/mips/kernel/binfmt_elfn32.c | 2 +- trunk/arch/mips/kernel/binfmt_elfo32.c | 2 +- trunk/arch/mips/kernel/cpu-bugs64.c | 4 +- trunk/arch/mips/kernel/cpu-probe.c | 6 - trunk/arch/mips/kernel/gdb-low.S | 4 +- trunk/arch/mips/kernel/gdb-stub.c | 12 +- trunk/arch/mips/kernel/genex.S | 14 +- trunk/arch/mips/kernel/head.S | 6 +- trunk/arch/mips/kernel/ioctl32.c | 2 +- trunk/arch/mips/kernel/irq.c | 2 +- trunk/arch/mips/kernel/linux32.c | 22 +- trunk/arch/mips/kernel/mips_ksyms.c | 2 +- trunk/arch/mips/kernel/process.c | 8 +- trunk/arch/mips/kernel/ptrace.c | 12 +- trunk/arch/mips/kernel/r2300_switch.S | 4 +- trunk/arch/mips/kernel/r4k_fpu.S | 4 +- trunk/arch/mips/kernel/r4k_switch.S | 8 +- trunk/arch/mips/kernel/setup.c | 4 +- trunk/arch/mips/kernel/signal32.c | 2 +- trunk/arch/mips/kernel/traps.c | 2 +- trunk/arch/mips/kernel/unaligned.c | 12 +- trunk/arch/mips/kernel/vmlinux.lds.S | 2 +- trunk/arch/mips/lasat/at93c.c | 16 +- trunk/arch/mips/lasat/at93c.h | 4 +- trunk/arch/mips/lasat/ds1603.c | 12 +- trunk/arch/mips/lasat/ds1603.h | 6 +- trunk/arch/mips/lasat/image/Makefile | 2 +- trunk/arch/mips/lasat/image/head.S | 2 +- trunk/arch/mips/lasat/interrupt.c | 4 +- trunk/arch/mips/lasat/lasat_board.c | 8 +- trunk/arch/mips/lasat/picvue.c | 12 +- trunk/arch/mips/lasat/picvue.h | 4 +- trunk/arch/mips/lasat/picvue_proc.c | 10 +- trunk/arch/mips/lasat/prom.c | 2 +- trunk/arch/mips/lasat/reset.c | 2 +- trunk/arch/mips/lasat/setup.c | 4 +- trunk/arch/mips/lasat/sysctl.c | 26 +- trunk/arch/mips/lib-32/Makefile | 2 +- trunk/arch/mips/lib-64/Makefile | 2 +- trunk/arch/mips/lib/memcpy.S | 6 +- trunk/arch/mips/math-emu/cp1emu.c | 12 +- trunk/arch/mips/math-emu/kernel_linkage.c | 2 +- trunk/arch/mips/mips-boards/atlas/atlas_int.c | 2 +- trunk/arch/mips/mips-boards/generic/init.c | 6 +- trunk/arch/mips/mips-boards/generic/time.c | 2 +- .../arch/mips/mips-boards/malta/malta_setup.c | 6 +- trunk/arch/mips/mm/Makefile | 4 +- trunk/arch/mips/mm/c-r4k.c | 20 +- trunk/arch/mips/mm/c-sb1.c | 2 +- trunk/arch/mips/mm/cerr-sb1.c | 24 +- trunk/arch/mips/mm/dma-noncoherent.c | 10 +- trunk/arch/mips/mm/init.c | 8 +- trunk/arch/mips/mm/pg-sb1.c | 10 +- trunk/arch/mips/mm/tlbex.c | 30 +- .../mips/momentum/jaguar_atx/int-handler.S | 12 +- trunk/arch/mips/momentum/jaguar_atx/prom.c | 12 +- trunk/arch/mips/momentum/jaguar_atx/reset.c | 2 +- trunk/arch/mips/momentum/jaguar_atx/setup.c | 4 +- trunk/arch/mips/momentum/ocelot_3/prom.c | 12 +- .../arch/mips/momentum/ocelot_c/int-handler.S | 8 +- .../mips/momentum/ocelot_c/ocelot_c_fpga.h | 2 +- trunk/arch/mips/momentum/ocelot_c/prom.c | 14 +- trunk/arch/mips/momentum/ocelot_c/reset.c | 2 +- trunk/arch/mips/momentum/ocelot_c/setup.c | 8 +- trunk/arch/mips/pci/fixup-ddb5074.c | 2 +- trunk/arch/mips/pci/fixup-ddb5477.c | 2 +- trunk/arch/mips/pci/fixup-malta.c | 2 +- trunk/arch/mips/pci/fixup-rbtx4927.c | 2 +- trunk/arch/mips/pci/fixup-sni.c | 2 +- trunk/arch/mips/pci/fixup-tb0219.c | 15 - trunk/arch/mips/pci/ops-ddb5477.c | 4 +- trunk/arch/mips/pci/ops-tx4927.c | 6 +- trunk/arch/mips/pci/pci-ddb5477.c | 8 +- trunk/arch/mips/pci/pci-ip32.c | 2 +- trunk/arch/mips/pci/pci.c | 21 +- .../pmc-sierra/yosemite/atmel_read_eeprom.c | 14 +- .../pmc-sierra/yosemite/atmel_read_eeprom.h | 4 +- trunk/arch/mips/qemu/Makefile | 5 + trunk/arch/mips/qemu/q-firmware.c | 7 + trunk/arch/mips/qemu/q-int.S | 17 + trunk/arch/mips/qemu/q-irq.c | 37 + trunk/arch/mips/qemu/q-mem.c | 6 + trunk/arch/mips/qemu/q-setup.c | 20 + trunk/arch/mips/sgi-ip22/ip22-eisa.c | 2 +- trunk/arch/mips/sgi-ip22/ip22-hpc.c | 2 +- trunk/arch/mips/sgi-ip22/ip22-int.c | 12 +- trunk/arch/mips/sgi-ip22/ip22-nvram.c | 8 +- trunk/arch/mips/sgi-ip22/ip22-reset.c | 2 +- trunk/arch/mips/sgi-ip22/ip22-time.c | 2 +- trunk/arch/mips/sgi-ip27/ip27-memory.c | 2 +- trunk/arch/mips/sgi-ip32/ip32-reset.c | 2 +- trunk/arch/mips/sibyte/cfe/cfe_error.h | 10 +- trunk/arch/mips/sibyte/cfe/console.c | 2 +- trunk/arch/mips/sibyte/cfe/setup.c | 4 +- trunk/arch/mips/sibyte/cfe/smp.c | 2 +- trunk/arch/mips/sibyte/sb1250/bus_watcher.c | 6 +- trunk/arch/mips/sibyte/sb1250/irq.c | 4 +- trunk/arch/mips/sibyte/swarm/rtc_m41t81.c | 10 +- trunk/arch/mips/sibyte/swarm/setup.c | 4 +- trunk/arch/mips/sni/irq.c | 2 +- trunk/arch/mips/sni/setup.c | 2 +- .../mips/tx4927/common/tx4927_irq_handler.S | 6 +- trunk/arch/mips/tx4927/common/tx4927_setup.c | 2 +- .../mips/tx4927/toshiba_rbtx4927/Makefile | 6 +- .../toshiba_rbtx4927/toshiba_rbtx4927_irq.c | 42 +- .../toshiba_rbtx4927/toshiba_rbtx4927_setup.c | 2 +- trunk/arch/mips/vr4181/common/Makefile | 7 - trunk/arch/mips/vr4181/common/int_handler.S | 206 - trunk/arch/mips/vr4181/common/irq.c | 239 - trunk/arch/mips/vr4181/common/serial.c | 51 - trunk/arch/mips/vr4181/common/time.c | 145 - trunk/arch/mips/vr4181/osprey/Makefile | 7 - trunk/arch/mips/vr4181/osprey/dbg_io.c | 136 - trunk/arch/mips/vr4181/osprey/prom.c | 49 - trunk/arch/mips/vr4181/osprey/reset.c | 40 - trunk/arch/mips/vr4181/osprey/setup.c | 68 - trunk/arch/mips/vr41xx/casio-e55/setup.c | 5 - trunk/arch/mips/vr41xx/common/Makefile | 2 +- trunk/arch/mips/vr41xx/common/icu.c | 270 +- trunk/arch/mips/vr41xx/common/int-handler.S | 10 +- trunk/arch/mips/vr41xx/common/irq.c | 94 + .../{tanbac-tb0226/setup.c => common/type.c} | 6 +- trunk/arch/mips/vr41xx/common/vrc4173.c | 2 +- trunk/arch/mips/vr41xx/ibm-workpad/setup.c | 5 - trunk/arch/mips/vr41xx/nec-cmbvr4133/init.c | 12 - trunk/arch/mips/vr41xx/tanbac-tb0226/Makefile | 5 - trunk/arch/mips/vr41xx/tanbac-tb0229/Makefile | 5 - trunk/arch/mips/vr41xx/tanbac-tb0229/setup.c | 27 - trunk/arch/mips/vr41xx/victor-mpc30x/Makefile | 5 - trunk/arch/mips/vr41xx/victor-mpc30x/setup.c | 24 - trunk/arch/mips/vr41xx/zao-capcella/Makefile | 5 - trunk/arch/mips/vr41xx/zao-capcella/setup.c | 24 - trunk/arch/ppc/Kconfig | 73 +- trunk/arch/ppc/Kconfig.debug | 3 +- trunk/arch/ppc/boot/simple/Makefile | 19 +- trunk/arch/ppc/boot/simple/embed_config.c | 55 +- trunk/arch/ppc/boot/simple/head.S | 9 - trunk/arch/ppc/boot/simple/misc-cpci690.c | 42 +- trunk/arch/ppc/boot/simple/misc-ev64360.c | 44 + trunk/arch/ppc/boot/simple/misc-katana.c | 8 + trunk/arch/ppc/boot/simple/misc-mv64x60.c | 27 + trunk/arch/ppc/boot/simple/mv64x60_tty.c | 7 + trunk/arch/ppc/configs/SM850_defconfig | 522 - trunk/arch/ppc/configs/SPD823TS_defconfig | 520 - trunk/arch/ppc/configs/adir_defconfig | 805 -- trunk/arch/ppc/configs/ash_defconfig | 666 -- trunk/arch/ppc/configs/beech_defconfig | 615 -- trunk/arch/ppc/configs/cedar_defconfig | 534 - trunk/arch/ppc/configs/cpci690_defconfig | 316 +- .../{k2_defconfig => ev64360_defconfig} | 616 +- trunk/arch/ppc/configs/katana_defconfig | 336 +- trunk/arch/ppc/configs/mcpn765_defconfig | 579 -- trunk/arch/ppc/configs/menf1_defconfig | 621 -- trunk/arch/ppc/configs/mpc8560_ads_defconfig | 273 +- trunk/arch/ppc/configs/oak_defconfig | 485 - trunk/arch/ppc/configs/pcore_defconfig | 716 -- trunk/arch/ppc/configs/rainier_defconfig | 599 -- trunk/arch/ppc/configs/redwood_defconfig | 540 - trunk/arch/ppc/kernel/cpu_setup_6xx.S | 9 +- trunk/arch/ppc/kernel/cputable.c | 76 +- trunk/arch/ppc/kernel/find_name.c | 48 - trunk/arch/ppc/kernel/head_44x.S | 4 + trunk/arch/ppc/kernel/head_4xx.S | 4 +- trunk/arch/ppc/kernel/head_fsl_booke.S | 5 +- trunk/arch/ppc/kernel/l2cr.S | 31 +- trunk/arch/ppc/kernel/ppc_ksyms.c | 4 +- trunk/arch/ppc/kernel/setup.c | 28 +- trunk/arch/ppc/kernel/traps.c | 19 + trunk/arch/ppc/mm/init.c | 7 +- trunk/arch/ppc/platforms/4xx/Kconfig | 15 +- trunk/arch/ppc/platforms/4xx/Makefile | 2 - trunk/arch/ppc/platforms/4xx/ash.c | 250 - trunk/arch/ppc/platforms/4xx/ash.h | 83 - trunk/arch/ppc/platforms/4xx/bamboo.c | 59 +- trunk/arch/ppc/platforms/4xx/bamboo.h | 2 +- trunk/arch/ppc/platforms/4xx/ebony.c | 7 - trunk/arch/ppc/platforms/4xx/ibm405ep.c | 1 + trunk/arch/ppc/platforms/4xx/ibm405gp.c | 1 + trunk/arch/ppc/platforms/4xx/ibm405gpr.c | 1 + trunk/arch/ppc/platforms/4xx/ibm440ep.c | 1 + trunk/arch/ppc/platforms/4xx/ibm440gp.c | 1 + trunk/arch/ppc/platforms/4xx/ibm440gx.c | 1 + trunk/arch/ppc/platforms/4xx/ibm440sp.c | 1 + trunk/arch/ppc/platforms/4xx/ibmnp405h.c | 7 +- trunk/arch/ppc/platforms/4xx/ibmstb4.c | 52 +- trunk/arch/ppc/platforms/4xx/ibmstb4.h | 4 +- trunk/arch/ppc/platforms/4xx/luan.c | 7 - trunk/arch/ppc/platforms/4xx/luan.h | 2 +- trunk/arch/ppc/platforms/4xx/oak.c | 255 - trunk/arch/ppc/platforms/4xx/oak.h | 96 - trunk/arch/ppc/platforms/4xx/oak_setup.h | 50 - trunk/arch/ppc/platforms/4xx/ocotea.c | 7 - trunk/arch/ppc/platforms/4xx/redwood5.c | 13 + trunk/arch/ppc/platforms/83xx/mpc834x_sys.c | 35 +- trunk/arch/ppc/platforms/83xx/mpc834x_sys.h | 40 +- trunk/arch/ppc/platforms/Makefile | 6 +- trunk/arch/ppc/platforms/adir.h | 95 - trunk/arch/ppc/platforms/adir_pci.c | 247 - trunk/arch/ppc/platforms/adir_pic.c | 130 - trunk/arch/ppc/platforms/adir_setup.c | 210 - trunk/arch/ppc/platforms/cpci690.c | 177 +- trunk/arch/ppc/platforms/cpci690.h | 2 - trunk/arch/ppc/platforms/ev64360.c | 510 + trunk/arch/ppc/platforms/ev64360.h | 116 + trunk/arch/ppc/platforms/k2.c | 613 -- trunk/arch/ppc/platforms/k2.h | 82 - trunk/arch/ppc/platforms/katana.c | 253 +- trunk/arch/ppc/platforms/katana.h | 16 +- trunk/arch/ppc/platforms/mcpn765.c | 527 - trunk/arch/ppc/platforms/mcpn765.h | 122 - trunk/arch/ppc/platforms/pcore.c | 352 - trunk/arch/ppc/platforms/pcore.h | 39 - trunk/arch/ppc/platforms/pmac_pic.c | 2 +- trunk/arch/ppc/platforms/spd8xx.h | 92 - trunk/arch/ppc/platforms/tqm8xx.h | 23 - trunk/arch/ppc/syslib/Makefile | 12 +- trunk/arch/ppc/syslib/mv64360_pic.c | 31 +- trunk/arch/ppc/syslib/mv64x60.c | 246 +- trunk/arch/ppc/syslib/of_device.c | 2 +- trunk/arch/ppc/syslib/open_pic.c | 2 +- trunk/arch/ppc/syslib/ppc4xx_setup.c | 27 +- trunk/arch/ppc/syslib/ppc83xx_pci.h | 151 + trunk/arch/ppc/syslib/ppc83xx_setup.c | 250 +- trunk/arch/ppc/syslib/ppc83xx_setup.h | 19 +- trunk/arch/ppc/syslib/ppc_sys.c | 52 +- trunk/arch/ppc/syslib/pq2_devices.c | 389 + trunk/arch/ppc/syslib/pq2_sys.c | 200 + trunk/arch/ppc64/Kconfig.debug | 9 + trunk/arch/ppc64/kernel/Makefile | 8 +- trunk/arch/ppc64/kernel/btext.c | 1 - trunk/arch/ppc64/kernel/cputable.c | 90 +- trunk/arch/ppc64/kernel/entry.S | 11 +- trunk/arch/ppc64/kernel/head.S | 9 +- trunk/arch/ppc64/kernel/lparcfg.c | 2 +- trunk/arch/ppc64/kernel/maple_setup.c | 3 - trunk/arch/ppc64/kernel/pSeries_lpar.c | 22 +- trunk/arch/ppc64/kernel/pSeries_setup.c | 7 +- trunk/arch/ppc64/kernel/pacaData.c | 1 + trunk/arch/ppc64/kernel/pmac_setup.c | 19 +- trunk/arch/ppc64/kernel/prom.c | 1 - trunk/arch/ppc64/kernel/prom_init.c | 1 - trunk/arch/ppc64/kernel/rtasd.c | 10 +- trunk/arch/ppc64/kernel/rtc.c | 7 +- trunk/arch/ppc64/kernel/scanlog.c | 17 +- trunk/arch/ppc64/kernel/setup.c | 44 +- trunk/arch/ppc64/kernel/sysfs.c | 48 +- trunk/arch/ppc64/kernel/time.c | 1 - trunk/arch/ppc64/kernel/udbg.c | 300 +- trunk/arch/ppc64/kernel/udbg_16550.c | 123 + trunk/arch/ppc64/kernel/udbg_scc.c | 136 + trunk/arch/ppc64/mm/hugetlbpage.c | 6 +- trunk/arch/ppc64/mm/init.c | 28 +- trunk/arch/ppc64/mm/numa.c | 43 +- trunk/arch/ppc64/mm/slb.c | 4 +- trunk/arch/ppc64/mm/slb_low.S | 22 +- trunk/arch/ppc64/oprofile/common.c | 58 +- trunk/arch/ppc64/oprofile/op_model_power4.c | 12 +- trunk/arch/ppc64/oprofile/op_model_rs64.c | 3 +- trunk/arch/ppc64/xmon/start.c | 4 +- trunk/arch/s390/kernel/debug.c | 52 +- trunk/arch/s390/kernel/entry.S | 116 +- trunk/arch/s390/kernel/entry64.S | 117 +- trunk/arch/s390/mm/fault.c | 5 +- trunk/arch/sh64/Kconfig | 4 - trunk/arch/sparc/kernel/sparc_ksyms.c | 1 - trunk/arch/sparc/mm/generic.c | 57 - trunk/arch/sparc64/Kconfig | 326 +- trunk/arch/sparc64/kernel/entry.S | 309 +- trunk/arch/sparc64/kernel/head.S | 3 +- trunk/arch/sparc64/kernel/pci.c | 3 +- trunk/arch/sparc64/kernel/rtrap.S | 13 +- trunk/arch/sparc64/kernel/setup.c | 12 - trunk/arch/sparc64/kernel/sparc64_ksyms.c | 3 - trunk/arch/sparc64/lib/PeeCeeI.c | 77 +- trunk/arch/sparc64/lib/copy_page.S | 13 +- trunk/arch/sparc64/mm/generic.c | 31 - trunk/arch/sparc64/mm/ultra.S | 39 +- trunk/arch/um/Kconfig | 10 +- trunk/arch/um/{Kconfig_char => Kconfig.char} | 0 trunk/arch/um/Kconfig.debug | 11 + trunk/arch/um/{Kconfig_i386 => Kconfig.i386} | 4 + trunk/arch/um/{Kconfig_net => Kconfig.net} | 12 +- trunk/arch/um/{Kconfig_scsi => Kconfig.scsi} | 0 .../um/{Kconfig_x86_64 => Kconfig.x86_64} | 8 + trunk/arch/um/Makefile | 9 +- trunk/arch/um/Makefile-x86_64 | 2 +- trunk/arch/um/drivers/Makefile | 2 +- trunk/arch/um/drivers/chan_user.c | 11 +- trunk/arch/um/drivers/ubd_kern.c | 570 +- trunk/arch/um/include/aio.h | 40 + trunk/arch/um/include/init.h | 10 +- trunk/arch/um/include/irq_kern.h | 3 + trunk/arch/um/include/os.h | 15 + trunk/arch/um/include/syscall.h | 12 + trunk/arch/um/include/syscall_user.h | 23 - trunk/arch/um/include/sysdep-i386/syscalls.h | 2 + trunk/arch/um/include/sysdep-x86_64/ptrace.h | 2 +- .../arch/um/include/sysdep-x86_64/syscalls.h | 2 + trunk/arch/um/include/tlb.h | 22 +- trunk/arch/um/include/user_util.h | 8 - trunk/arch/um/kernel/Makefile | 15 +- trunk/arch/um/kernel/irq.c | 41 +- trunk/arch/um/kernel/ksyms.c | 19 - trunk/arch/um/kernel/main.c | 2 +- trunk/arch/um/kernel/skas/Makefile | 2 +- trunk/arch/um/kernel/skas/include/mmu-skas.h | 4 + trunk/arch/um/kernel/skas/include/skas.h | 30 +- trunk/arch/um/kernel/skas/mem_user.c | 224 +- trunk/arch/um/kernel/skas/mmu.c | 61 +- trunk/arch/um/kernel/skas/process.c | 69 +- trunk/arch/um/kernel/skas/process_kern.c | 7 +- trunk/arch/um/kernel/skas/syscall.c | 50 + trunk/arch/um/kernel/skas/syscall_kern.c | 43 - trunk/arch/um/kernel/skas/syscall_user.c | 44 - trunk/arch/um/kernel/skas/tlb.c | 28 +- trunk/arch/um/kernel/syscall.c | 36 + trunk/arch/um/kernel/syscall_user.c | 48 - trunk/arch/um/kernel/tlb.c | 267 +- trunk/arch/um/kernel/trap_kern.c | 55 +- trunk/arch/um/kernel/trap_user.c | 21 - trunk/arch/um/kernel/tt/syscall_kern.c | 47 +- trunk/arch/um/kernel/tt/syscall_user.c | 35 +- trunk/arch/um/kernel/tt/tlb.c | 26 +- trunk/arch/um/kernel/um_arch.c | 8 +- trunk/arch/um/os-Linux/Makefile | 11 +- trunk/arch/um/os-Linux/aio.c | 414 + trunk/arch/um/os-Linux/process.c | 58 +- .../{kernel/process.c => os-Linux/start_up.c} | 224 +- trunk/arch/um/os-Linux/tt.c | 113 + trunk/arch/um/scripts/Makefile.unmap | 2 +- trunk/arch/um/sys-i386/Makefile | 8 +- trunk/arch/um/sys-i386/signal.c | 2 +- trunk/arch/um/sys-i386/stub.S | 47 +- trunk/arch/um/sys-i386/stub_segv.c | 3 +- trunk/arch/um/sys-x86_64/Makefile | 13 +- trunk/arch/um/sys-x86_64/signal.c | 41 +- trunk/arch/um/sys-x86_64/stub.S | 51 + trunk/arch/um/sys-x86_64/stub_segv.c | 3 +- trunk/arch/v850/configs/rte-ma1-cb_defconfig | 108 +- trunk/arch/v850/configs/rte-me2-cb_defconfig | 21 +- trunk/arch/v850/configs/sim_defconfig | 21 +- trunk/arch/v850/kernel/setup.c | 44 +- trunk/arch/x86_64/Kconfig | 4 + trunk/arch/x86_64/kernel/Makefile | 5 +- trunk/arch/x86_64/kernel/nmi.c | 2 +- trunk/crypto/Kconfig | 5 +- trunk/crypto/api.c | 3 +- trunk/crypto/cipher.c | 4 - trunk/crypto/internal.h | 3 +- trunk/crypto/tcrypt.c | 11 +- trunk/crypto/tcrypt.h | 138 +- trunk/crypto/tea.c | 81 +- trunk/drivers/atm/zatm.c | 4 +- trunk/drivers/base/bus.c | 8 +- trunk/drivers/base/class.c | 39 +- trunk/drivers/base/core.c | 2 +- trunk/drivers/base/dd.c | 2 +- trunk/drivers/base/node.c | 24 +- trunk/drivers/base/power/resume.c | 8 +- trunk/drivers/base/power/runtime.c | 8 +- trunk/drivers/base/power/suspend.c | 12 +- trunk/drivers/base/power/sysfs.c | 8 +- trunk/drivers/base/sys.c | 110 +- trunk/drivers/block/Kconfig | 44 +- trunk/drivers/block/cryptoloop.c | 6 +- trunk/drivers/block/floppy.c | 41 +- trunk/drivers/char/Kconfig | 5 +- trunk/drivers/char/moxa.c | 2 +- trunk/drivers/char/mwave/mwavedd.c | 21 +- trunk/drivers/char/mxser.c | 1 - trunk/drivers/char/rtc.c | 5 +- trunk/drivers/char/snsc_event.c | 11 +- trunk/drivers/char/tpm/tpm_infineon.c | 76 +- trunk/drivers/char/watchdog/Kconfig | 7 + trunk/drivers/char/watchdog/Makefile | 72 +- trunk/drivers/char/watchdog/booke_wdt.c | 192 + trunk/drivers/char/watchdog/ixp2000_wdt.c | 2 +- trunk/drivers/char/watchdog/ixp4xx_wdt.c | 2 +- trunk/drivers/char/watchdog/s3c2410_wdt.c | 87 +- trunk/drivers/char/watchdog/scx200_wdt.c | 2 +- trunk/drivers/char/watchdog/softdog.c | 13 +- trunk/drivers/char/watchdog/w83627hf_wdt.c | 6 + trunk/drivers/hwmon/Kconfig | 72 +- trunk/drivers/hwmon/Makefile | 4 + trunk/drivers/hwmon/adm1021.c | 35 +- trunk/drivers/hwmon/adm1025.c | 31 +- trunk/drivers/hwmon/adm1026.c | 25 +- trunk/drivers/hwmon/adm1031.c | 24 +- trunk/drivers/hwmon/adm9240.c | 33 +- trunk/drivers/hwmon/asb100.c | 56 +- trunk/drivers/hwmon/atxp1.c | 26 +- trunk/drivers/hwmon/ds1621.c | 29 +- trunk/drivers/hwmon/fscher.c | 27 +- trunk/drivers/hwmon/fscpos.c | 27 +- trunk/drivers/hwmon/gl518sm.c | 28 +- trunk/drivers/hwmon/gl520sm.c | 31 +- trunk/drivers/hwmon/hwmon-vid.c | 189 + trunk/drivers/hwmon/hwmon.c | 98 + trunk/drivers/hwmon/it87.c | 76 +- trunk/drivers/hwmon/lm63.c | 27 +- trunk/drivers/hwmon/lm75.c | 41 +- trunk/drivers/hwmon/lm75.h | 2 +- trunk/drivers/hwmon/lm77.c | 24 +- trunk/drivers/hwmon/lm78.c | 84 +- trunk/drivers/hwmon/lm80.c | 27 +- trunk/drivers/hwmon/lm83.c | 27 +- trunk/drivers/hwmon/lm85.c | 39 +- trunk/drivers/hwmon/lm87.c | 31 +- trunk/drivers/hwmon/lm90.c | 27 +- trunk/drivers/hwmon/lm92.c | 28 +- trunk/drivers/hwmon/max1619.c | 28 +- trunk/drivers/hwmon/pc87360.c | 852 +- trunk/drivers/hwmon/sis5595.c | 70 +- trunk/drivers/hwmon/smsc47b397.c | 74 +- trunk/drivers/hwmon/smsc47m1.c | 70 +- trunk/drivers/hwmon/via686a.c | 76 +- trunk/drivers/hwmon/w83627ehf.c | 64 +- trunk/drivers/hwmon/w83627hf.c | 80 +- trunk/drivers/hwmon/w83781d.c | 90 +- trunk/drivers/hwmon/w83792d.c | 1649 ++++ trunk/drivers/hwmon/w83l785ts.c | 27 +- trunk/drivers/i2c/Makefile | 4 - trunk/drivers/i2c/algos/i2c-algo-bit.c | 4 - trunk/drivers/i2c/algos/i2c-algo-ite.c | 4 - trunk/drivers/i2c/algos/i2c-algo-pca.c | 16 +- trunk/drivers/i2c/algos/i2c-algo-pcf.c | 4 - trunk/drivers/i2c/algos/i2c-algo-sgi.c | 5 +- trunk/drivers/i2c/algos/i2c-algo-sibyte.c | 4 - trunk/drivers/i2c/busses/Kconfig | 8 +- trunk/drivers/i2c/busses/i2c-ali1535.c | 2 - trunk/drivers/i2c/busses/i2c-ali1563.c | 2 - trunk/drivers/i2c/busses/i2c-ali15x3.c | 2 - trunk/drivers/i2c/busses/i2c-amd756.c | 2 - trunk/drivers/i2c/busses/i2c-amd8111.c | 2 - trunk/drivers/i2c/busses/i2c-au1550.c | 2 - trunk/drivers/i2c/busses/i2c-i801.c | 2 - trunk/drivers/i2c/busses/i2c-ibm_iic.c | 4 +- trunk/drivers/i2c/busses/i2c-iop3xx.c | 2 - trunk/drivers/i2c/busses/i2c-isa.c | 161 +- trunk/drivers/i2c/busses/i2c-keywest.c | 15 - trunk/drivers/i2c/busses/i2c-mpc.c | 4 +- trunk/drivers/i2c/busses/i2c-mv64xxx.c | 12 +- trunk/drivers/i2c/busses/i2c-nforce2.c | 33 +- trunk/drivers/i2c/busses/i2c-piix4.c | 2 - trunk/drivers/i2c/busses/i2c-s3c2410.c | 1 - trunk/drivers/i2c/busses/i2c-sis5595.c | 2 - trunk/drivers/i2c/busses/i2c-sis630.c | 2 - trunk/drivers/i2c/busses/i2c-sis96x.c | 2 - trunk/drivers/i2c/busses/i2c-stub.c | 2 - trunk/drivers/i2c/busses/i2c-viapro.c | 2 - trunk/drivers/i2c/busses/scx200_acb.c | 4 +- trunk/drivers/i2c/chips/Kconfig | 10 - trunk/drivers/i2c/chips/ds1337.c | 11 +- trunk/drivers/i2c/chips/ds1374.c | 3 +- trunk/drivers/i2c/chips/eeprom.c | 17 +- trunk/drivers/i2c/chips/m41t00.c | 3 +- trunk/drivers/i2c/chips/max6875.c | 462 +- trunk/drivers/i2c/chips/pca9539.c | 12 +- trunk/drivers/i2c/chips/pcf8574.c | 13 +- trunk/drivers/i2c/chips/pcf8591.c | 13 +- trunk/drivers/i2c/chips/rtc8564.c | 1 - trunk/drivers/i2c/i2c-core.c | 256 +- trunk/drivers/i2c/i2c-dev.c | 5 +- trunk/drivers/i2c/i2c-sensor-detect.c | 145 - trunk/drivers/i2c/i2c-sensor-vid.c | 98 - trunk/drivers/ide/ide-io.c | 2 +- trunk/drivers/ide/ide.c | 4 +- trunk/drivers/ide/pci/sc1200.c | 12 +- trunk/drivers/ide/ppc/pmac.c | 16 +- trunk/drivers/ieee1394/pcilynx.c | 20 - trunk/drivers/input/evdev.c | 2 + trunk/drivers/macintosh/mediabay.c | 6 +- trunk/drivers/macintosh/via-pmu.c | 2 +- trunk/drivers/md/dm-crypt.c | 7 +- trunk/drivers/media/common/saa7146_i2c.c | 4 +- trunk/drivers/media/dvb/b2c2/flexcop-i2c.c | 3 - trunk/drivers/media/dvb/cinergyT2/cinergyT2.c | 2 +- trunk/drivers/media/dvb/dvb-usb/cxusb.c | 2 - .../drivers/media/dvb/dvb-usb/dibusb-common.c | 2 - trunk/drivers/media/dvb/dvb-usb/digitv.c | 2 - trunk/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c | 1 - trunk/drivers/media/dvb/pluto2/pluto2.c | 1 - trunk/drivers/media/dvb/ttpci/Kconfig | 3 + .../media/dvb/ttusb-budget/dvb-ttusb-budget.c | 3 - trunk/drivers/media/video/Kconfig | 1 + trunk/drivers/media/video/adv7170.c | 1 - trunk/drivers/media/video/adv7175.c | 1 - trunk/drivers/media/video/bt819.c | 1 - trunk/drivers/media/video/bt832.c | 4 +- trunk/drivers/media/video/bt856.c | 1 - trunk/drivers/media/video/bttv-driver.c | 1 - trunk/drivers/media/video/bttv-i2c.c | 12 +- trunk/drivers/media/video/cx88/cx88-i2c.c | 8 +- trunk/drivers/media/video/ir-kbd-i2c.c | 6 +- trunk/drivers/media/video/msp3400.c | 8 +- trunk/drivers/media/video/ovcamchip/ov6x20.c | 6 +- trunk/drivers/media/video/ovcamchip/ov6x30.c | 4 +- .../media/video/ovcamchip/ovcamchip_core.c | 14 +- trunk/drivers/media/video/saa7110.c | 1 - trunk/drivers/media/video/saa7111.c | 1 - trunk/drivers/media/video/saa7114.c | 1 - trunk/drivers/media/video/saa7134/saa6752hs.c | 2 +- .../drivers/media/video/saa7134/saa7134-i2c.c | 10 +- trunk/drivers/media/video/saa7185.c | 1 - trunk/drivers/media/video/tda7432.c | 4 +- trunk/drivers/media/video/tda9840.c | 4 +- trunk/drivers/media/video/tda9875.c | 4 +- trunk/drivers/media/video/tda9887.c | 10 +- trunk/drivers/media/video/tea6415c.c | 4 +- trunk/drivers/media/video/tea6420.c | 4 +- trunk/drivers/media/video/tuner-3036.c | 3 +- trunk/drivers/media/video/tuner-core.c | 4 +- trunk/drivers/media/video/tvaudio.c | 51 +- trunk/drivers/media/video/tveeprom.c | 2 +- trunk/drivers/media/video/tvmixer.c | 14 +- trunk/drivers/media/video/vpx3220.c | 1 - trunk/drivers/media/video/zoran_card.c | 2 +- trunk/drivers/misc/Kconfig | 2 +- trunk/drivers/mmc/mmc.c | 12 + trunk/drivers/mmc/wbsd.c | 64 +- trunk/drivers/mmc/wbsd.h | 3 +- trunk/drivers/net/Kconfig | 11 +- trunk/drivers/net/bnx2.c | 18 +- trunk/drivers/net/chelsio/common.h | 4 +- trunk/drivers/net/chelsio/cxgb2.c | 2 +- trunk/drivers/net/e1000/e1000_hw.h | 2 +- trunk/drivers/net/e1000/e1000_main.c | 14 +- trunk/drivers/net/irda/vlsi_ir.c | 21 +- trunk/drivers/net/iseries_veth.c | 869 +- trunk/drivers/net/iseries_veth.h | 46 - trunk/drivers/net/mv643xx_eth.c | 139 +- trunk/drivers/net/mv643xx_eth.h | 4 - trunk/drivers/net/ne3210.c | 9 +- trunk/drivers/net/phy/Kconfig | 2 +- trunk/drivers/net/phy/mdio_bus.c | 4 +- trunk/drivers/net/s2io.c | 14 +- trunk/drivers/net/sis190.c | 131 +- trunk/drivers/net/sungem.c | 1 + trunk/drivers/net/sungem.h | 2 +- trunk/drivers/net/tg3.c | 202 +- trunk/drivers/net/tulip/de2104x.c | 2 +- trunk/drivers/net/tulip/tulip_core.c | 1 + trunk/drivers/net/tulip/uli526x.c | 2 +- trunk/drivers/net/tun.c | 15 + trunk/drivers/net/wireless/Kconfig | 144 +- trunk/drivers/net/wireless/Makefile | 8 + trunk/drivers/net/wireless/airo.c | 80 +- trunk/drivers/net/wireless/atmel.c | 62 +- trunk/drivers/net/wireless/hostap/Kconfig | 73 + trunk/drivers/net/wireless/hostap/Makefile | 5 + trunk/drivers/net/wireless/hostap/hostap.c | 1198 +++ trunk/drivers/net/wireless/hostap/hostap.h | 57 + .../net/wireless/hostap/hostap_80211.h | 96 + .../net/wireless/hostap/hostap_80211_rx.c | 1091 +++ .../net/wireless/hostap/hostap_80211_tx.c | 524 + trunk/drivers/net/wireless/hostap/hostap_ap.c | 3288 +++++++ trunk/drivers/net/wireless/hostap/hostap_ap.h | 261 + .../net/wireless/hostap/hostap_common.h | 435 + .../net/wireless/hostap/hostap_config.h | 55 + trunk/drivers/net/wireless/hostap/hostap_cs.c | 1030 ++ .../net/wireless/hostap/hostap_download.c | 766 ++ trunk/drivers/net/wireless/hostap/hostap_hw.c | 3445 +++++++ .../drivers/net/wireless/hostap/hostap_info.c | 499 + .../net/wireless/hostap/hostap_ioctl.c | 4102 ++++++++ .../drivers/net/wireless/hostap/hostap_pci.c | 473 + .../drivers/net/wireless/hostap/hostap_plx.c | 645 ++ .../drivers/net/wireless/hostap/hostap_proc.c | 448 + .../drivers/net/wireless/hostap/hostap_wlan.h | 1033 ++ trunk/drivers/net/wireless/ieee802_11.h | 78 - trunk/drivers/net/wireless/ipw2100.c | 8680 +++++++++++++++++ trunk/drivers/net/wireless/ipw2100.h | 1167 +++ trunk/drivers/net/wireless/ipw2200.c | 7353 ++++++++++++++ trunk/drivers/net/wireless/ipw2200.h | 1744 ++++ trunk/drivers/net/wireless/orinoco.c | 104 +- trunk/drivers/net/wireless/orinoco_cs.c | 1 - trunk/drivers/net/wireless/orinoco_nortel.c | 324 + trunk/drivers/net/wireless/orinoco_pci.c | 2 - .../net/wireless/prism54/islpci_hotplug.c | 2 - trunk/drivers/net/wireless/spectrum_cs.c | 1120 +++ trunk/drivers/net/wireless/strip.c | 2 +- trunk/drivers/net/wireless/wavelan_cs.c | 26 +- trunk/drivers/net/wireless/wavelan_cs.h | 6 +- trunk/drivers/net/wireless/wavelan_cs.p.h | 17 - trunk/drivers/net/wireless/wl3501.h | 4 +- trunk/drivers/net/wireless/wl3501_cs.c | 11 +- trunk/drivers/pci/pci.c | 14 +- trunk/drivers/pci/quirks.c | 19 + trunk/drivers/pci/rom.c | 24 +- trunk/drivers/pcmcia/pxa2xx_base.c | 2 +- trunk/drivers/pcmcia/pxa2xx_mainstone.c | 2 +- trunk/drivers/pcmcia/pxa2xx_sharpsl.c | 116 +- trunk/drivers/pcmcia/sa1100_generic.c | 2 +- trunk/drivers/pcmcia/sa1111_generic.c | 2 +- trunk/drivers/pcmcia/sa11xx_base.c | 2 +- trunk/drivers/s390/block/Kconfig | 2 +- trunk/drivers/s390/block/dasd.c | 19 +- trunk/drivers/s390/block/dasd_devmap.c | 8 +- trunk/drivers/s390/block/dasd_diag.c | 334 +- trunk/drivers/s390/block/dasd_diag.h | 105 +- trunk/drivers/s390/block/dasd_genhd.c | 10 +- trunk/drivers/s390/block/dasd_int.h | 3 +- trunk/drivers/s390/block/dasd_ioctl.c | 17 +- trunk/drivers/s390/block/dasd_proc.c | 8 +- trunk/drivers/s390/char/raw3270.c | 16 +- trunk/drivers/s390/cio/cio.c | 7 +- trunk/drivers/s390/cio/device_fsm.c | 3 +- trunk/drivers/s390/cio/device_ops.c | 4 +- trunk/drivers/s390/cio/ioasm.h | 26 +- trunk/drivers/s390/crypto/z90common.h | 3 +- trunk/drivers/s390/crypto/z90hardware.c | 127 +- trunk/drivers/s390/crypto/z90main.c | 246 +- trunk/drivers/s390/s390mach.c | 2 +- trunk/drivers/sbus/char/Kconfig | 39 +- trunk/drivers/scsi/Kconfig | 2 +- trunk/drivers/scsi/ahci.c | 52 +- trunk/drivers/scsi/ata_piix.c | 11 +- trunk/drivers/scsi/libata-core.c | 15 +- trunk/drivers/scsi/libata-scsi.c | 8 +- trunk/drivers/scsi/libata.h | 1 + trunk/drivers/scsi/mesh.c | 6 +- trunk/drivers/scsi/sata_nv.c | 9 +- trunk/drivers/scsi/sata_promise.c | 20 +- trunk/drivers/scsi/sata_qstor.c | 8 +- trunk/drivers/scsi/sata_sil.c | 12 +- trunk/drivers/scsi/sata_svw.c | 7 +- trunk/drivers/scsi/sata_sx4.c | 54 +- trunk/drivers/scsi/sata_vsc.c | 5 +- trunk/drivers/serial/21285.c | 10 +- trunk/drivers/serial/8250.c | 89 +- trunk/drivers/serial/8250.h | 6 +- trunk/drivers/serial/Kconfig | 4 +- trunk/drivers/serial/amba-pl010.c | 8 +- trunk/drivers/serial/amba-pl011.c | 8 +- trunk/drivers/serial/au1x00_uart.c | 8 +- trunk/drivers/serial/clps711x.c | 10 +- trunk/drivers/serial/cpm_uart/cpm_uart_core.c | 21 +- trunk/drivers/serial/cpm_uart/cpm_uart_cpm2.c | 11 + trunk/drivers/serial/crisv10.c | 14 - trunk/drivers/serial/dz.c | 10 +- trunk/drivers/serial/icom.c | 12 +- trunk/drivers/serial/imx.c | 28 +- trunk/drivers/serial/ioc4_serial.c | 6 +- trunk/drivers/serial/ip22zilog.c | 4 +- trunk/drivers/serial/jsm/jsm_tty.c | 4 +- trunk/drivers/serial/m32r_sio.c | 8 +- trunk/drivers/serial/mpc52xx_uart.c | 8 +- trunk/drivers/serial/mpsc.c | 8 +- trunk/drivers/serial/mux.c | 10 +- trunk/drivers/serial/pmac_zilog.c | 13 +- trunk/drivers/serial/pxa.c | 8 +- trunk/drivers/serial/s3c2410.c | 10 +- trunk/drivers/serial/sa1100.c | 8 +- trunk/drivers/serial/serial_core.c | 164 +- trunk/drivers/serial/serial_lh7a40x.c | 5 +- trunk/drivers/serial/serial_txx9.c | 8 +- trunk/drivers/serial/sh-sci.c | 12 +- trunk/drivers/serial/sn_console.c | 8 +- trunk/drivers/serial/sunsab.c | 8 +- trunk/drivers/serial/sunsu.c | 38 +- trunk/drivers/serial/sunzilog.c | 4 +- trunk/drivers/serial/uart00.c | 8 +- trunk/drivers/serial/v850e_uart.c | 6 +- trunk/drivers/serial/vr41xx_siu.c | 8 +- trunk/drivers/usb/core/hcd.c | 2 +- trunk/drivers/usb/core/hub.c | 18 +- trunk/drivers/usb/core/usb.c | 2 +- trunk/drivers/usb/host/ehci-dbg.c | 2 +- trunk/drivers/usb/host/ohci-dbg.c | 2 +- trunk/drivers/usb/host/sl811-hcd.c | 6 +- trunk/drivers/usb/media/w9968cf.c | 12 +- trunk/drivers/usb/misc/usbtest.c | 2 +- trunk/drivers/usb/net/Makefile | 2 - trunk/drivers/usb/net/zd1201.c | 16 +- trunk/drivers/video/aty/aty128fb.c | 14 +- trunk/drivers/video/aty/atyfb_base.c | 11 +- trunk/drivers/video/aty/radeon_i2c.c | 2 +- trunk/drivers/video/aty/radeon_pm.c | 12 +- trunk/drivers/video/chipsfb.c | 4 +- trunk/drivers/video/i810/i810_main.c | 6 +- trunk/drivers/video/matrox/matroxfb_maven.c | 2 +- trunk/drivers/video/nvidia/nv_i2c.c | 3 +- trunk/drivers/video/pmag-aa-fb.c | 2 +- trunk/drivers/video/pmag-ba-fb.c | 285 +- trunk/drivers/video/pmagb-b-fb.c | 417 +- trunk/drivers/video/riva/rivafb-i2c.c | 3 +- trunk/drivers/video/s1d13xxxfb.c | 2 +- trunk/drivers/video/savage/savagefb-i2c.c | 3 +- trunk/drivers/video/savage/savagefb_driver.c | 1 - trunk/fs/Kconfig | 43 - trunk/fs/aio.c | 4 + trunk/fs/binfmt_flat.c | 2 +- trunk/fs/devpts/Makefile | 1 - trunk/fs/devpts/inode.c | 21 - trunk/fs/devpts/xattr_security.c | 47 - trunk/fs/nfsd/nfs4recover.c | 5 +- trunk/fs/proc/base.c | 96 + trunk/fs/proc/task_mmu.c | 357 +- trunk/fs/xattr.c | 80 +- trunk/include/asm-alpha/page.h | 16 +- trunk/include/asm-alpha/types.h | 2 - trunk/include/asm-arm/arch-ixp4xx/io.h | 102 +- trunk/include/asm-arm/arch-ixp4xx/platform.h | 19 +- trunk/include/asm-arm/arch-pxa/pxa-regs.h | 29 + .../include/asm-arm/arch-s3c2410/regs-clock.h | 11 +- trunk/include/asm-arm/hardware/scoop.h | 13 + trunk/include/asm-arm/mach/irq.h | 12 +- trunk/include/asm-arm/mach/time.h | 2 - trunk/include/asm-arm/page.h | 16 +- trunk/include/asm-arm/types.h | 2 - trunk/include/asm-arm/unistd.h | 3 +- trunk/include/asm-arm26/page.h | 16 +- trunk/include/asm-arm26/types.h | 2 - trunk/include/asm-cris/page.h | 15 +- trunk/include/asm-cris/types.h | 2 - trunk/include/asm-frv/page.h | 17 +- trunk/include/asm-frv/types.h | 2 - trunk/include/asm-generic/page.h | 26 + trunk/include/asm-generic/pgtable.h | 16 + trunk/include/asm-generic/vmlinux.lds.h | 9 + trunk/include/asm-h8300/page.h | 16 +- trunk/include/asm-h8300/types.h | 2 - trunk/include/asm-i386/agp.h | 2 +- trunk/include/asm-i386/apicdef.h | 1 + trunk/include/asm-i386/bugs.h | 5 +- trunk/include/asm-i386/desc.h | 33 +- trunk/include/asm-i386/kdebug.h | 11 +- .../asm-i386/mach-es7000/mach_mpparse.h | 30 +- .../include/asm-i386/mach-generic/mach_apic.h | 2 + trunk/include/asm-i386/mpspec.h | 1 + trunk/include/asm-i386/msr.h | 15 + trunk/include/asm-i386/page.h | 17 +- trunk/include/asm-i386/pgtable-3level.h | 2 +- trunk/include/asm-i386/pgtable.h | 42 +- trunk/include/asm-i386/processor.h | 44 +- trunk/include/asm-i386/ptrace.h | 7 + trunk/include/asm-i386/setup.h | 2 +- trunk/include/asm-i386/smp.h | 2 +- trunk/include/asm-i386/system.h | 36 +- trunk/include/asm-i386/thread_info.h | 5 +- trunk/include/asm-i386/timer.h | 3 + trunk/include/asm-i386/types.h | 2 - trunk/include/asm-i386/xor.h | 26 +- trunk/include/asm-ia64/acpi.h | 5 + trunk/include/asm-ia64/fcntl.h | 3 +- trunk/include/asm-ia64/io.h | 4 +- trunk/include/asm-ia64/mmu.h | 8 +- trunk/include/asm-ia64/mmu_context.h | 61 +- trunk/include/asm-ia64/page.h | 27 +- trunk/include/asm-ia64/pal.h | 21 + trunk/include/asm-ia64/pgtable.h | 13 +- trunk/include/asm-ia64/rwsem.h | 35 +- trunk/include/asm-ia64/sn/addrs.h | 112 +- trunk/include/asm-ia64/sn/geo.h | 3 +- trunk/include/asm-ia64/sn/intr.h | 3 +- trunk/include/asm-ia64/sn/nodepda.h | 3 +- .../asm-ia64/sn/pcibus_provider_defs.h | 8 +- trunk/include/asm-ia64/sn/pda.h | 1 - trunk/include/asm-ia64/sn/sn2/sn_hwperf.h | 10 + trunk/include/asm-ia64/sn/sn_sal.h | 60 +- trunk/include/asm-ia64/sn/tioce.h | 740 ++ trunk/include/asm-ia64/sn/tioce_provider.h | 66 + trunk/include/asm-ia64/spinlock.h | 33 +- trunk/include/asm-ia64/system.h | 5 +- trunk/include/asm-ia64/types.h | 2 - trunk/include/asm-m32r/page.h | 21 +- trunk/include/asm-m32r/types.h | 2 - trunk/include/asm-m68k/cacheflush.h | 31 +- trunk/include/asm-m68k/page.h | 16 +- trunk/include/asm-m68k/string.h | 403 +- trunk/include/asm-m68k/types.h | 2 - trunk/include/asm-m68knommu/page.h | 21 +- trunk/include/asm-mips/a.out.h | 4 +- trunk/include/asm-mips/addrspace.h | 2 +- trunk/include/asm-mips/asmmacro.h | 8 +- trunk/include/asm-mips/atomic.h | 4 +- trunk/include/asm-mips/bitops.h | 12 +- trunk/include/asm-mips/bugs.h | 2 +- trunk/include/asm-mips/checksum.h | 4 +- trunk/include/asm-mips/cpu-features.h | 4 +- trunk/include/asm-mips/ddb5xxx/ddb5477.h | 6 +- trunk/include/asm-mips/dec/prom.h | 12 +- trunk/include/asm-mips/delay.h | 6 +- trunk/include/asm-mips/elf.h | 16 +- trunk/include/asm-mips/fpregdef.h | 4 +- trunk/include/asm-mips/fpu.h | 8 +- trunk/include/asm-mips/hp-lj/asic.h | 7 - trunk/include/asm-mips/ip32/mace.h | 8 +- trunk/include/asm-mips/lasat/serial.h | 4 +- trunk/include/asm-mips/local.h | 4 +- trunk/include/asm-mips/mach-au1x00/au1000.h | 2 +- trunk/include/asm-mips/mach-db1x00/db1x00.h | 2 +- trunk/include/asm-mips/mach-generic/spaces.h | 8 +- trunk/include/asm-mips/mach-ip22/spaces.h | 8 +- .../mach-ip32/cpu-feature-overrides.h | 2 +- trunk/include/asm-mips/mach-jazz/floppy.h | 2 +- trunk/include/asm-mips/mach-pb1x00/pb1500.h | 4 +- .../mach-qemu/cpu-feature-overrides.h | 31 + trunk/include/asm-mips/mach-qemu/param.h | 13 + trunk/include/asm-mips/mach-vr41xx/timex.h | 18 - trunk/include/asm-mips/mmu_context.h | 6 +- trunk/include/asm-mips/module.h | 4 +- trunk/include/asm-mips/msgbuf.h | 12 +- trunk/include/asm-mips/paccess.h | 4 +- trunk/include/asm-mips/page.h | 16 +- trunk/include/asm-mips/pci.h | 21 +- trunk/include/asm-mips/pgalloc.h | 4 +- trunk/include/asm-mips/pgtable.h | 4 +- trunk/include/asm-mips/processor.h | 4 +- trunk/include/asm-mips/ptrace.h | 2 +- trunk/include/asm-mips/qemu.h | 24 + trunk/include/asm-mips/r4kcache.h | 68 +- trunk/include/asm-mips/reg.h | 6 +- trunk/include/asm-mips/resource.h | 2 +- trunk/include/asm-mips/rtc.h | 2 +- trunk/include/asm-mips/sgi/gio.h | 2 +- trunk/include/asm-mips/sgi/hpc3.h | 4 +- trunk/include/asm-mips/sgi/ioc.h | 4 +- trunk/include/asm-mips/sgi/ip22.h | 2 +- trunk/include/asm-mips/sgi/mc.h | 6 +- trunk/include/asm-mips/sgiarcs.h | 8 +- trunk/include/asm-mips/sibyte/carmel.h | 12 +- trunk/include/asm-mips/sibyte/sb1250_defs.h | 38 +- trunk/include/asm-mips/sibyte/sb1250_dma.h | 42 +- trunk/include/asm-mips/sibyte/sb1250_genbus.h | 24 +- trunk/include/asm-mips/sibyte/sb1250_int.h | 24 +- trunk/include/asm-mips/sibyte/sb1250_l2c.h | 22 +- trunk/include/asm-mips/sibyte/sb1250_ldt.h | 32 +- trunk/include/asm-mips/sibyte/sb1250_mac.h | 26 +- trunk/include/asm-mips/sibyte/sb1250_mc.h | 28 +- trunk/include/asm-mips/sibyte/sb1250_regs.h | 68 +- trunk/include/asm-mips/sibyte/sb1250_scd.h | 36 +- trunk/include/asm-mips/sibyte/sb1250_smbus.h | 24 +- .../include/asm-mips/sibyte/sb1250_syncser.h | 12 +- trunk/include/asm-mips/sibyte/sb1250_uart.h | 30 +- trunk/include/asm-mips/sigcontext.h | 4 +- trunk/include/asm-mips/siginfo.h | 4 +- trunk/include/asm-mips/sim.h | 8 +- trunk/include/asm-mips/socket.h | 2 +- trunk/include/asm-mips/stackframe.h | 22 +- trunk/include/asm-mips/statfs.h | 2 +- trunk/include/asm-mips/string.h | 8 +- trunk/include/asm-mips/system.h | 4 +- trunk/include/asm-mips/thread_info.h | 4 +- trunk/include/asm-mips/titan_dep.h | 2 +- trunk/include/asm-mips/tx4927/tx4927.h | 52 +- trunk/include/asm-mips/tx4927/tx4927_pci.h | 4 +- trunk/include/asm-mips/types.h | 4 +- trunk/include/asm-mips/uaccess.h | 8 +- trunk/include/asm-mips/unistd.h | 2 +- trunk/include/asm-mips/vr4181/irq.h | 122 - trunk/include/asm-mips/vr4181/vr4181.h | 413 - trunk/include/asm-mips/vr41xx/vr41xx.h | 16 +- trunk/include/asm-mips/vr41xx/vrc4173.h | 4 +- trunk/include/asm-mips/war.h | 4 +- trunk/include/asm-mips/xxs1500.h | 2 +- trunk/include/asm-parisc/page.h | 16 +- trunk/include/asm-parisc/types.h | 2 - trunk/include/asm-powerpc/bugs.h | 18 + .../{asm-ppc64 => asm-powerpc}/mc146818rtc.h | 10 +- .../include/{asm-ppc64 => asm-powerpc}/mman.h | 6 +- trunk/include/asm-powerpc/module.h | 77 + .../{asm-ppc64 => asm-powerpc}/sembuf.h | 31 +- .../{asm-ppc64 => asm-powerpc}/shmbuf.h | 42 +- .../{asm-ppc64 => asm-powerpc}/siginfo.h | 12 +- .../{asm-ppc64 => asm-powerpc}/socket.h | 12 +- .../{asm-ppc64 => asm-powerpc}/sockios.h | 6 +- .../{asm-ppc64 => asm-powerpc}/termbits.h | 8 +- .../{asm-ppc64 => asm-powerpc}/termios.h | 7 +- trunk/include/asm-ppc/bugs.h | 6 - trunk/include/asm-ppc/dma-mapping.h | 3 +- trunk/include/asm-ppc/ibm4xx.h | 12 - trunk/include/asm-ppc/ibm_ocp.h | 17 + trunk/include/asm-ppc/irq.h | 1 + trunk/include/asm-ppc/kmap_types.h | 1 + trunk/include/asm-ppc/mc146818rtc.h | 31 - trunk/include/asm-ppc/mman.h | 44 - trunk/include/asm-ppc/module.h | 44 - trunk/include/asm-ppc/mpc8260.h | 18 + trunk/include/asm-ppc/mpc8xx.h | 4 - trunk/include/asm-ppc/mv64x60.h | 7 + trunk/include/asm-ppc/mv64x60_defs.h | 9 +- trunk/include/asm-ppc/param.h | 4 +- trunk/include/asm-ppc/pmac_feature.h | 1 + trunk/include/asm-ppc/ppc_sys.h | 5 +- trunk/include/asm-ppc/sembuf.h | 19 - trunk/include/asm-ppc/serial.h | 2 - trunk/include/asm-ppc/shmbuf.h | 37 - trunk/include/asm-ppc/siginfo.h | 6 - trunk/include/asm-ppc/socket.h | 58 - trunk/include/asm-ppc/sockios.h | 17 - trunk/include/asm-ppc/system.h | 5 + trunk/include/asm-ppc/termbits.h | 185 - trunk/include/asm-ppc/termios.h | 232 - trunk/include/asm-ppc/types.h | 2 - trunk/include/asm-ppc64/bugs.h | 12 - trunk/include/asm-ppc64/cputable.h | 12 +- trunk/include/asm-ppc64/lmb.h | 22 + trunk/include/asm-ppc64/lppaca.h | 2 +- trunk/include/asm-ppc64/machdep.h | 5 - trunk/include/asm-ppc64/mmu.h | 6 +- trunk/include/asm-ppc64/module.h | 36 - .../asm-ppc64/oprofile_impl.h} | 3 + trunk/include/asm-ppc64/page.h | 17 +- trunk/include/asm-ppc64/system.h | 19 +- trunk/include/asm-ppc64/types.h | 1 - trunk/include/asm-ppc64/udbg.h | 27 +- trunk/include/asm-s390/debug.h | 2 - trunk/include/asm-s390/lowcore.h | 8 +- trunk/include/asm-s390/page.h | 16 +- trunk/include/asm-s390/spinlock.h | 4 +- trunk/include/asm-s390/types.h | 2 - trunk/include/asm-sh/page.h | 20 +- trunk/include/asm-sh/types.h | 2 - trunk/include/asm-sh64/page.h | 20 +- trunk/include/asm-sh64/types.h | 2 - trunk/include/asm-sparc/page.h | 16 +- trunk/include/asm-sparc/pgtable.h | 3 - trunk/include/asm-sparc/types.h | 2 - trunk/include/asm-sparc64/cpudata.h | 4 +- trunk/include/asm-sparc64/hardirq.h | 16 +- trunk/include/asm-sparc64/io.h | 47 +- trunk/include/asm-sparc64/page.h | 16 +- trunk/include/asm-sparc64/pgtable.h | 3 - trunk/include/asm-sparc64/types.h | 2 - trunk/include/asm-um/mmu_context.h | 10 +- trunk/include/asm-um/page.h | 16 +- trunk/include/asm-um/pgalloc.h | 12 +- trunk/include/asm-um/pgtable-2level.h | 27 - trunk/include/asm-um/pgtable-3level.h | 45 +- trunk/include/asm-um/pgtable.h | 54 +- trunk/include/asm-v850/page.h | 21 +- trunk/include/asm-v850/types.h | 2 - trunk/include/asm-x86_64/page.h | 17 +- trunk/include/asm-x86_64/pgtable.h | 19 +- trunk/include/asm-x86_64/processor.h | 5 + trunk/include/asm-x86_64/types.h | 2 - trunk/include/asm-xtensa/atomic.h | 12 +- trunk/include/asm-xtensa/checksum.h | 4 +- trunk/include/asm-xtensa/delay.h | 2 +- trunk/include/asm-xtensa/io.h | 14 +- trunk/include/asm-xtensa/mmu_context.h | 18 +- trunk/include/asm-xtensa/page.h | 2 +- trunk/include/asm-xtensa/page.h.n | 135 - trunk/include/asm-xtensa/pci.h | 4 +- trunk/include/asm-xtensa/pgtable.h | 6 +- trunk/include/asm-xtensa/semaphore.h | 10 +- trunk/include/asm-xtensa/string.h | 8 +- trunk/include/asm-xtensa/system.h | 10 +- trunk/include/asm-xtensa/tlbflush.h | 40 +- trunk/include/asm-xtensa/types.h | 2 - trunk/include/asm-xtensa/uaccess.h | 10 +- trunk/include/linux/capability.h | 1 + trunk/include/linux/cpu.h | 2 +- trunk/include/linux/crypto.h | 1 + trunk/include/linux/efi.h | 14 +- trunk/include/linux/etherdevice.h | 6 + trunk/include/linux/hugetlb.h | 6 - trunk/include/linux/hwmon-sysfs.h | 15 + trunk/include/linux/hwmon-vid.h | 45 + trunk/include/linux/hwmon.h | 35 + trunk/include/linux/i2c-id.h | 192 +- trunk/include/linux/i2c-isa.h | 36 + trunk/include/linux/i2c-sensor.h | 263 - trunk/include/linux/i2c-vid.h | 111 - trunk/include/linux/i2c.h | 206 +- trunk/include/linux/if_tun.h | 1 + trunk/include/linux/klist.h | 8 +- trunk/include/linux/libata.h | 2 +- trunk/include/linux/mempolicy.h | 3 + trunk/include/linux/mmc/host.h | 6 + trunk/include/linux/mmzone.h | 25 +- trunk/include/linux/mv643xx.h | 2 +- trunk/include/linux/page-flags.h | 2 + trunk/include/linux/pci_ids.h | 3 + trunk/include/linux/pm.h | 14 +- trunk/include/linux/ptrace.h | 2 + trunk/include/linux/serial.h | 4 - trunk/include/linux/serial_8250.h | 16 + trunk/include/linux/serial_core.h | 10 +- trunk/include/linux/swap.h | 22 +- trunk/include/linux/swapops.h | 2 +- trunk/include/linux/vmalloc.h | 8 + trunk/include/media/id.h | 5 - trunk/include/net/ieee80211.h | 265 +- trunk/include/net/ieee80211_crypt.h | 86 + trunk/include/net/ip_vs.h | 2 +- trunk/include/net/irda/irlan_filter.h | 2 +- trunk/include/net/sock.h | 18 +- trunk/include/net/tcp.h | 1 + trunk/include/video/pmag-ba-fb.h | 41 +- trunk/include/video/pmagb-b-fb.h | 74 +- trunk/init/Kconfig | 22 +- trunk/init/Makefile | 3 +- trunk/init/do_mounts.c | 6 +- trunk/kernel/fork.c | 3 + trunk/kernel/power/Kconfig | 12 + trunk/kernel/power/disk.c | 55 +- trunk/kernel/power/main.c | 5 +- trunk/kernel/power/process.c | 29 +- trunk/kernel/power/swsusp.c | 201 +- trunk/lib/Makefile | 1 + trunk/lib/klist.c | 8 +- .../semaphore.c => lib/semaphore-sleepers.c} | 15 +- trunk/mm/Kconfig | 22 + trunk/mm/filemap.c | 14 +- trunk/mm/hugetlb.c | 2 - trunk/mm/madvise.c | 9 +- trunk/mm/memory.c | 7 +- trunk/mm/mempolicy.c | 12 +- trunk/mm/mremap.c | 4 + trunk/mm/page_alloc.c | 29 +- trunk/mm/rmap.c | 29 +- trunk/mm/shmem.c | 91 +- trunk/mm/slab.c | 33 +- trunk/mm/sparse.c | 75 +- trunk/mm/swap_state.c | 6 +- trunk/mm/swapfile.c | 412 +- trunk/mm/vmalloc.c | 2 - trunk/mm/vmscan.c | 12 +- trunk/net/Kconfig | 1 + trunk/net/Makefile | 1 + trunk/net/atm/ioctl.c | 1 + trunk/net/core/ethtool.c | 2 +- trunk/net/core/filter.c | 6 +- trunk/net/core/sock.c | 2 +- trunk/net/decnet/af_decnet.c | 40 +- trunk/net/decnet/dn_nsp_out.c | 63 - trunk/net/ieee80211/Kconfig | 69 + trunk/net/ieee80211/Makefile | 11 + trunk/net/ieee80211/ieee80211_crypt.c | 259 + trunk/net/ieee80211/ieee80211_crypt_ccmp.c | 470 + trunk/net/ieee80211/ieee80211_crypt_tkip.c | 708 ++ trunk/net/ieee80211/ieee80211_crypt_wep.c | 272 + trunk/net/ieee80211/ieee80211_module.c | 299 + trunk/net/ieee80211/ieee80211_rx.c | 1189 +++ trunk/net/ieee80211/ieee80211_tx.c | 438 + trunk/net/ieee80211/ieee80211_wx.c | 471 + trunk/net/ipv4/ah4.c | 18 +- trunk/net/ipv4/esp4.c | 24 +- trunk/net/ipv4/ipcomp.c | 3 +- trunk/net/ipv4/ipconfig.c | 1 + trunk/net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- trunk/net/ipv4/tcp.c | 17 +- trunk/net/ipv4/tcp_input.c | 36 +- trunk/net/ipv4/tcp_output.c | 55 +- trunk/net/ipv6/addrconf.c | 6 +- trunk/net/ipv6/ah6.c | 18 +- trunk/net/ipv6/esp6.c | 24 +- trunk/net/ipv6/icmp.c | 2 +- trunk/net/ipv6/ipcomp6.c | 3 +- trunk/net/ipv6/raw.c | 4 +- trunk/net/irda/irlan/irlan_filter.c | 1 + trunk/net/irda/qos.c | 1 + trunk/net/netfilter/nfnetlink.c | 4 +- trunk/net/netfilter/nfnetlink_queue.c | 15 +- trunk/net/sctp/endpointola.c | 3 +- trunk/net/sctp/socket.c | 3 +- trunk/net/sctp/sysctl.c | 1 + trunk/net/sunrpc/auth_gss/gss_krb5_crypto.c | 5 +- trunk/net/sunrpc/auth_gss/gss_krb5_mech.c | 9 +- trunk/net/sunrpc/auth_gss/gss_spkm3_mech.c | 12 +- trunk/net/sunrpc/rpc_pipe.c | 2 +- trunk/scripts/Kbuild.include | 96 + trunk/scripts/Makefile.build | 7 +- trunk/scripts/Makefile.clean | 14 +- trunk/scripts/Makefile.host | 3 +- trunk/scripts/Makefile.lib | 99 - trunk/scripts/Makefile.modinst | 2 +- trunk/scripts/Makefile.modpost | 1 + trunk/scripts/conmakehash.c | 2 +- trunk/scripts/kallsyms.c | 6 +- trunk/scripts/kconfig/Makefile | 16 +- trunk/scripts/kconfig/kxgettext.c | 16 +- trunk/scripts/kconfig/lkc.h | 2 +- trunk/scripts/kconfig/menu.c | 4 +- trunk/scripts/kconfig/zconf.tab.c_shipped | 8 +- trunk/scripts/kconfig/zconf.y | 8 +- trunk/scripts/kernel-doc | 8 +- trunk/scripts/lxdialog/dialog.h | 2 +- trunk/scripts/lxdialog/inputbox.c | 4 +- trunk/scripts/mkcompile_h | 12 +- trunk/scripts/mod/sumversion.c | 8 +- trunk/scripts/package/Makefile | 24 +- trunk/scripts/package/builddeb | 56 +- trunk/scripts/package/buildtar | 111 + trunk/scripts/package/mkspec | 9 + trunk/scripts/reference_discarded.pl | 1 + trunk/scripts/reference_init.pl | 1 + trunk/scripts/setlocalversion | 56 + trunk/security/seclvl.c | 2 +- trunk/security/selinux/avc.c | 4 +- trunk/security/selinux/include/security.h | 3 +- trunk/security/selinux/ss/avtab.c | 196 +- trunk/security/selinux/ss/avtab.h | 37 +- trunk/security/selinux/ss/conditional.c | 215 +- trunk/security/selinux/ss/ebitmap.c | 5 +- trunk/security/selinux/ss/ebitmap.h | 30 + trunk/security/selinux/ss/mls.c | 42 +- trunk/security/selinux/ss/policydb.c | 107 +- trunk/security/selinux/ss/policydb.h | 3 + trunk/security/selinux/ss/services.c | 76 +- trunk/sound/pci/atiixp.c | 4 +- trunk/usr/Kconfig | 46 + trunk/usr/Makefile | 2 +- 1340 files changed, 69981 insertions(+), 27883 deletions(-) create mode 100644 trunk/Documentation/hwmon/w83792d create mode 100644 trunk/Documentation/networking/README.ipw2100 create mode 100644 trunk/Documentation/networking/README.ipw2200 create mode 100644 trunk/Documentation/power/swsusp-dmcrypt.txt create mode 100644 trunk/arch/i386/kernel/i8237.c create mode 100644 trunk/arch/ia64/kernel/cpufreq/Kconfig create mode 100644 trunk/arch/ia64/kernel/cpufreq/Makefile create mode 100644 trunk/arch/ia64/kernel/cpufreq/acpi-cpufreq.c create mode 100644 trunk/arch/ia64/sn/pci/tioce_provider.c delete mode 100644 trunk/arch/m68k/lib/memcmp.c delete mode 100644 trunk/arch/m68k/lib/memcpy.c delete mode 100644 trunk/arch/m68k/lib/memset.c create mode 100644 trunk/arch/m68k/lib/string.c create mode 100644 trunk/arch/m68k/mm/cache.c create mode 100644 trunk/arch/m68knommu/platform/523x/config.c rename trunk/arch/mips/configs/{osprey_defconfig => qemu_defconfig} (66%) create mode 100644 trunk/arch/mips/qemu/Makefile create mode 100644 trunk/arch/mips/qemu/q-firmware.c create mode 100644 trunk/arch/mips/qemu/q-int.S create mode 100644 trunk/arch/mips/qemu/q-irq.c create mode 100644 trunk/arch/mips/qemu/q-mem.c create mode 100644 trunk/arch/mips/qemu/q-setup.c delete mode 100644 trunk/arch/mips/vr4181/common/Makefile delete mode 100644 trunk/arch/mips/vr4181/common/int_handler.S delete mode 100644 trunk/arch/mips/vr4181/common/irq.c delete mode 100644 trunk/arch/mips/vr4181/common/serial.c delete mode 100644 trunk/arch/mips/vr4181/common/time.c delete mode 100644 trunk/arch/mips/vr4181/osprey/Makefile delete mode 100644 trunk/arch/mips/vr4181/osprey/dbg_io.c delete mode 100644 trunk/arch/mips/vr4181/osprey/prom.c delete mode 100644 trunk/arch/mips/vr4181/osprey/reset.c delete mode 100644 trunk/arch/mips/vr4181/osprey/setup.c create mode 100644 trunk/arch/mips/vr41xx/common/irq.c rename trunk/arch/mips/vr41xx/{tanbac-tb0226/setup.c => common/type.c} (85%) delete mode 100644 trunk/arch/mips/vr41xx/tanbac-tb0226/Makefile delete mode 100644 trunk/arch/mips/vr41xx/tanbac-tb0229/Makefile delete mode 100644 trunk/arch/mips/vr41xx/tanbac-tb0229/setup.c delete mode 100644 trunk/arch/mips/vr41xx/victor-mpc30x/Makefile delete mode 100644 trunk/arch/mips/vr41xx/victor-mpc30x/setup.c delete mode 100644 trunk/arch/mips/vr41xx/zao-capcella/Makefile delete mode 100644 trunk/arch/mips/vr41xx/zao-capcella/setup.c create mode 100644 trunk/arch/ppc/boot/simple/misc-ev64360.c delete mode 100644 trunk/arch/ppc/configs/SM850_defconfig delete mode 100644 trunk/arch/ppc/configs/SPD823TS_defconfig delete mode 100644 trunk/arch/ppc/configs/adir_defconfig delete mode 100644 trunk/arch/ppc/configs/ash_defconfig delete mode 100644 trunk/arch/ppc/configs/beech_defconfig delete mode 100644 trunk/arch/ppc/configs/cedar_defconfig rename trunk/arch/ppc/configs/{k2_defconfig => ev64360_defconfig} (53%) delete mode 100644 trunk/arch/ppc/configs/mcpn765_defconfig delete mode 100644 trunk/arch/ppc/configs/menf1_defconfig delete mode 100644 trunk/arch/ppc/configs/oak_defconfig delete mode 100644 trunk/arch/ppc/configs/pcore_defconfig delete mode 100644 trunk/arch/ppc/configs/rainier_defconfig delete mode 100644 trunk/arch/ppc/configs/redwood_defconfig delete mode 100644 trunk/arch/ppc/kernel/find_name.c delete mode 100644 trunk/arch/ppc/platforms/4xx/ash.c delete mode 100644 trunk/arch/ppc/platforms/4xx/ash.h delete mode 100644 trunk/arch/ppc/platforms/4xx/oak.c delete mode 100644 trunk/arch/ppc/platforms/4xx/oak.h delete mode 100644 trunk/arch/ppc/platforms/4xx/oak_setup.h delete mode 100644 trunk/arch/ppc/platforms/adir.h delete mode 100644 trunk/arch/ppc/platforms/adir_pci.c delete mode 100644 trunk/arch/ppc/platforms/adir_pic.c delete mode 100644 trunk/arch/ppc/platforms/adir_setup.c create mode 100644 trunk/arch/ppc/platforms/ev64360.c create mode 100644 trunk/arch/ppc/platforms/ev64360.h delete mode 100644 trunk/arch/ppc/platforms/k2.c delete mode 100644 trunk/arch/ppc/platforms/k2.h delete mode 100644 trunk/arch/ppc/platforms/mcpn765.c delete mode 100644 trunk/arch/ppc/platforms/mcpn765.h delete mode 100644 trunk/arch/ppc/platforms/pcore.c delete mode 100644 trunk/arch/ppc/platforms/pcore.h delete mode 100644 trunk/arch/ppc/platforms/spd8xx.h create mode 100644 trunk/arch/ppc/syslib/ppc83xx_pci.h create mode 100644 trunk/arch/ppc/syslib/pq2_devices.c create mode 100644 trunk/arch/ppc/syslib/pq2_sys.c create mode 100644 trunk/arch/ppc64/kernel/udbg_16550.c create mode 100644 trunk/arch/ppc64/kernel/udbg_scc.c rename trunk/arch/um/{Kconfig_char => Kconfig.char} (100%) rename trunk/arch/um/{Kconfig_i386 => Kconfig.i386} (93%) rename trunk/arch/um/{Kconfig_net => Kconfig.net} (98%) rename trunk/arch/um/{Kconfig_scsi => Kconfig.scsi} (100%) rename trunk/arch/um/{Kconfig_x86_64 => Kconfig.x86_64} (83%) create mode 100644 trunk/arch/um/include/aio.h create mode 100644 trunk/arch/um/include/syscall.h delete mode 100644 trunk/arch/um/include/syscall_user.h create mode 100644 trunk/arch/um/kernel/skas/syscall.c delete mode 100644 trunk/arch/um/kernel/skas/syscall_kern.c delete mode 100644 trunk/arch/um/kernel/skas/syscall_user.c create mode 100644 trunk/arch/um/kernel/syscall.c delete mode 100644 trunk/arch/um/kernel/syscall_user.c create mode 100644 trunk/arch/um/os-Linux/aio.c rename trunk/arch/um/{kernel/process.c => os-Linux/start_up.c} (61%) create mode 100644 trunk/arch/um/os-Linux/tt.c create mode 100644 trunk/drivers/char/watchdog/booke_wdt.c create mode 100644 trunk/drivers/hwmon/hwmon-vid.c create mode 100644 trunk/drivers/hwmon/hwmon.c create mode 100644 trunk/drivers/hwmon/w83792d.c delete mode 100644 trunk/drivers/i2c/i2c-sensor-detect.c delete mode 100644 trunk/drivers/i2c/i2c-sensor-vid.c delete mode 100644 trunk/drivers/net/iseries_veth.h create mode 100644 trunk/drivers/net/wireless/hostap/Kconfig create mode 100644 trunk/drivers/net/wireless/hostap/Makefile create mode 100644 trunk/drivers/net/wireless/hostap/hostap.c create mode 100644 trunk/drivers/net/wireless/hostap/hostap.h create mode 100644 trunk/drivers/net/wireless/hostap/hostap_80211.h create mode 100644 trunk/drivers/net/wireless/hostap/hostap_80211_rx.c create mode 100644 trunk/drivers/net/wireless/hostap/hostap_80211_tx.c create mode 100644 trunk/drivers/net/wireless/hostap/hostap_ap.c create mode 100644 trunk/drivers/net/wireless/hostap/hostap_ap.h create mode 100644 trunk/drivers/net/wireless/hostap/hostap_common.h create mode 100644 trunk/drivers/net/wireless/hostap/hostap_config.h create mode 100644 trunk/drivers/net/wireless/hostap/hostap_cs.c create mode 100644 trunk/drivers/net/wireless/hostap/hostap_download.c create mode 100644 trunk/drivers/net/wireless/hostap/hostap_hw.c create mode 100644 trunk/drivers/net/wireless/hostap/hostap_info.c create mode 100644 trunk/drivers/net/wireless/hostap/hostap_ioctl.c create mode 100644 trunk/drivers/net/wireless/hostap/hostap_pci.c create mode 100644 trunk/drivers/net/wireless/hostap/hostap_plx.c create mode 100644 trunk/drivers/net/wireless/hostap/hostap_proc.c create mode 100644 trunk/drivers/net/wireless/hostap/hostap_wlan.h delete mode 100644 trunk/drivers/net/wireless/ieee802_11.h create mode 100644 trunk/drivers/net/wireless/ipw2100.c create mode 100644 trunk/drivers/net/wireless/ipw2100.h create mode 100644 trunk/drivers/net/wireless/ipw2200.c create mode 100644 trunk/drivers/net/wireless/ipw2200.h create mode 100644 trunk/drivers/net/wireless/orinoco_nortel.c create mode 100644 trunk/drivers/net/wireless/spectrum_cs.c delete mode 100644 trunk/fs/devpts/xattr_security.c create mode 100644 trunk/include/asm-generic/page.h create mode 100644 trunk/include/asm-ia64/sn/tioce.h create mode 100644 trunk/include/asm-ia64/sn/tioce_provider.h delete mode 100644 trunk/include/asm-mips/hp-lj/asic.h create mode 100644 trunk/include/asm-mips/mach-qemu/cpu-feature-overrides.h create mode 100644 trunk/include/asm-mips/mach-qemu/param.h delete mode 100644 trunk/include/asm-mips/mach-vr41xx/timex.h create mode 100644 trunk/include/asm-mips/qemu.h delete mode 100644 trunk/include/asm-mips/vr4181/irq.h delete mode 100644 trunk/include/asm-mips/vr4181/vr4181.h create mode 100644 trunk/include/asm-powerpc/bugs.h rename trunk/include/{asm-ppc64 => asm-powerpc}/mc146818rtc.h (84%) rename trunk/include/{asm-ppc64 => asm-powerpc}/mman.h (96%) create mode 100644 trunk/include/asm-powerpc/module.h rename trunk/include/{asm-ppc64 => asm-powerpc}/sembuf.h (62%) rename trunk/include/{asm-ppc64 => asm-powerpc}/shmbuf.h (72%) rename trunk/include/{asm-ppc64 => asm-powerpc}/siginfo.h (56%) rename trunk/include/{asm-ppc64 => asm-powerpc}/socket.h (88%) rename trunk/include/{asm-ppc64 => asm-powerpc}/sockios.h (83%) rename trunk/include/{asm-ppc64 => asm-powerpc}/termbits.h (97%) rename trunk/include/{asm-ppc64 => asm-powerpc}/termios.h (98%) delete mode 100644 trunk/include/asm-ppc/bugs.h delete mode 100644 trunk/include/asm-ppc/mc146818rtc.h delete mode 100644 trunk/include/asm-ppc/mman.h delete mode 100644 trunk/include/asm-ppc/module.h delete mode 100644 trunk/include/asm-ppc/sembuf.h delete mode 100644 trunk/include/asm-ppc/shmbuf.h delete mode 100644 trunk/include/asm-ppc/siginfo.h delete mode 100644 trunk/include/asm-ppc/socket.h delete mode 100644 trunk/include/asm-ppc/sockios.h delete mode 100644 trunk/include/asm-ppc/termbits.h delete mode 100644 trunk/include/asm-ppc/termios.h delete mode 100644 trunk/include/asm-ppc64/bugs.h delete mode 100644 trunk/include/asm-ppc64/module.h rename trunk/{arch/ppc64/oprofile/op_impl.h => include/asm-ppc64/oprofile_impl.h} (95%) delete mode 100644 trunk/include/asm-xtensa/page.h.n create mode 100644 trunk/include/linux/hwmon-vid.h create mode 100644 trunk/include/linux/hwmon.h create mode 100644 trunk/include/linux/i2c-isa.h delete mode 100644 trunk/include/linux/i2c-sensor.h delete mode 100644 trunk/include/linux/i2c-vid.h create mode 100644 trunk/include/net/ieee80211_crypt.h rename trunk/{arch/x86_64/kernel/semaphore.c => lib/semaphore-sleepers.c} (94%) create mode 100644 trunk/net/ieee80211/Kconfig create mode 100644 trunk/net/ieee80211/Makefile create mode 100644 trunk/net/ieee80211/ieee80211_crypt.c create mode 100644 trunk/net/ieee80211/ieee80211_crypt_ccmp.c create mode 100644 trunk/net/ieee80211/ieee80211_crypt_tkip.c create mode 100644 trunk/net/ieee80211/ieee80211_crypt_wep.c create mode 100644 trunk/net/ieee80211/ieee80211_module.c create mode 100644 trunk/net/ieee80211/ieee80211_rx.c create mode 100644 trunk/net/ieee80211/ieee80211_tx.c create mode 100644 trunk/net/ieee80211/ieee80211_wx.c create mode 100644 trunk/scripts/Kbuild.include create mode 100644 trunk/scripts/package/buildtar create mode 100644 trunk/scripts/setlocalversion create mode 100644 trunk/usr/Kconfig diff --git a/[refs] b/[refs] index 4d9eac0bec8e..7f0ef81c8f70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfa0d75a1eee59f0577e3c1697ff570b77581a35 +refs/heads/master: c08319a9d50b5c9cb4fdb33728bd16497cf4ddd3 diff --git a/trunk/Documentation/crypto/api-intro.txt b/trunk/Documentation/crypto/api-intro.txt index a2d5b4900772..74dffc68ff9f 100644 --- a/trunk/Documentation/crypto/api-intro.txt +++ b/trunk/Documentation/crypto/api-intro.txt @@ -223,6 +223,7 @@ CAST5 algorithm contributors: TEA/XTEA algorithm contributors: Aaron Grothe + Michael Ringe Khazad algorithm contributors: Aaron Grothe diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 0665cb12bd66..363909056e46 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -102,16 +102,6 @@ Who: Jody McIntyre --------------------------- -What: register_serial/unregister_serial -When: September 2005 -Why: This interface does not allow serial ports to be registered against - a struct device, and as such does not allow correct power management - of such ports. 8250-based ports should use serial8250_register_port - and serial8250_unregister_port, or platform devices instead. -Who: Russell King - ---------------------------- - What: i2c sysfs name change: in1_ref, vid deprecated in favour of cpu0_vid When: November 2005 Files: drivers/i2c/chips/adm1025.c, drivers/i2c/chips/adm1026.c diff --git a/trunk/Documentation/filesystems/proc.txt b/trunk/Documentation/filesystems/proc.txt index 6c98f2bd421e..5024ba7a592c 100644 --- a/trunk/Documentation/filesystems/proc.txt +++ b/trunk/Documentation/filesystems/proc.txt @@ -133,6 +133,7 @@ Table 1-1: Process specific entries in /proc statm Process memory status information status Process status in human readable form wchan If CONFIG_KALLSYMS is set, a pre-decoded wchan + smaps Extension based on maps, presenting the rss size for each mapped file .............................................................................. For example, to get the status information of a process, all you have to do is diff --git a/trunk/Documentation/filesystems/sysfs.txt b/trunk/Documentation/filesystems/sysfs.txt index dc276598a65a..c8bce82ddcac 100644 --- a/trunk/Documentation/filesystems/sysfs.txt +++ b/trunk/Documentation/filesystems/sysfs.txt @@ -90,7 +90,7 @@ void device_remove_file(struct device *, struct device_attribute *); It also defines this helper for defining device attributes: -#define DEVICE_ATTR(_name,_mode,_show,_store) \ +#define DEVICE_ATTR(_name, _mode, _show, _store) \ struct device_attribute dev_attr_##_name = { \ .attr = {.name = __stringify(_name) , .mode = _mode }, \ .show = _show, \ @@ -99,14 +99,14 @@ struct device_attribute dev_attr_##_name = { \ For example, declaring -static DEVICE_ATTR(foo,0644,show_foo,store_foo); +static DEVICE_ATTR(foo, S_IWUSR | S_IRUGO, show_foo, store_foo); is equivalent to doing: static struct device_attribute dev_attr_foo = { .attr = { .name = "foo", - .mode = 0644, + .mode = S_IWUSR | S_IRUGO, }, .show = show_foo, .store = store_foo, @@ -121,8 +121,8 @@ set of sysfs operations for forwarding read and write calls to the show and store methods of the attribute owners. struct sysfs_ops { - ssize_t (*show)(struct kobject *, struct attribute *,char *); - ssize_t (*store)(struct kobject *,struct attribute *,const char *); + ssize_t (*show)(struct kobject *, struct attribute *, char *); + ssize_t (*store)(struct kobject *, struct attribute *, const char *); }; [ Subsystems should have already defined a struct kobj_type as a @@ -137,7 +137,7 @@ calls the associated methods. To illustrate: -#define to_dev_attr(_attr) container_of(_attr,struct device_attribute,attr) +#define to_dev_attr(_attr) container_of(_attr, struct device_attribute, attr) #define to_dev(d) container_of(d, struct device, kobj) static ssize_t @@ -148,7 +148,7 @@ dev_attr_show(struct kobject * kobj, struct attribute * attr, char * buf) ssize_t ret = 0; if (dev_attr->show) - ret = dev_attr->show(dev,buf); + ret = dev_attr->show(dev, buf); return ret; } @@ -216,16 +216,16 @@ A very simple (and naive) implementation of a device attribute is: static ssize_t show_name(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf,"%s\n",dev->name); + return snprintf(buf, PAGE_SIZE, "%s\n", dev->name); } static ssize_t store_name(struct device * dev, const char * buf) { - sscanf(buf,"%20s",dev->name); - return strlen(buf); + sscanf(buf, "%20s", dev->name); + return strnlen(buf, PAGE_SIZE); } -static DEVICE_ATTR(name,S_IRUGO,show_name,store_name); +static DEVICE_ATTR(name, S_IRUGO, show_name, store_name); (Note that the real implementation doesn't allow userspace to set the @@ -290,7 +290,7 @@ struct device_attribute { Declaring: -DEVICE_ATTR(_name,_str,_mode,_show,_store); +DEVICE_ATTR(_name, _str, _mode, _show, _store); Creation/Removal: @@ -310,7 +310,7 @@ struct bus_attribute { Declaring: -BUS_ATTR(_name,_mode,_show,_store) +BUS_ATTR(_name, _mode, _show, _store) Creation/Removal: @@ -331,7 +331,7 @@ struct driver_attribute { Declaring: -DRIVER_ATTR(_name,_mode,_show,_store) +DRIVER_ATTR(_name, _mode, _show, _store) Creation/Removal: diff --git a/trunk/Documentation/hwmon/lm78 b/trunk/Documentation/hwmon/lm78 index 357086ed7f64..fd5dc7a19f0e 100644 --- a/trunk/Documentation/hwmon/lm78 +++ b/trunk/Documentation/hwmon/lm78 @@ -2,16 +2,11 @@ Kernel driver lm78 ================== Supported chips: - * National Semiconductor LM78 + * National Semiconductor LM78 / LM78-J Prefix: 'lm78' Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports) Datasheet: Publicly available at the National Semiconductor website http://www.national.com/ - * National Semiconductor LM78-J - Prefix: 'lm78-j' - Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports) - Datasheet: Publicly available at the National Semiconductor website - http://www.national.com/ * National Semiconductor LM79 Prefix: 'lm79' Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports) diff --git a/trunk/Documentation/hwmon/w83792d b/trunk/Documentation/hwmon/w83792d new file mode 100644 index 000000000000..8171c285bb55 --- /dev/null +++ b/trunk/Documentation/hwmon/w83792d @@ -0,0 +1,174 @@ +Kernel driver w83792d +===================== + +Supported chips: + * Winbond W83792D + Prefix: 'w83792d' + Addresses scanned: I2C 0x2c - 0x2f + Datasheet: http://www.winbond.com.tw/E-WINBONDHTM/partner/PDFresult.asp?Pname=1035 + +Author: Chunhao Huang +Contact: DZShen + + +Module Parameters +----------------- + +* init int + (default 1) + Use 'init=0' to bypass initializing the chip. + Try this if your computer crashes when you load the module. + +* force_subclients=bus,caddr,saddr,saddr + This is used to force the i2c addresses for subclients of + a certain chip. Example usage is `force_subclients=0,0x2f,0x4a,0x4b' + to force the subclients of chip 0x2f on bus 0 to i2c addresses + 0x4a and 0x4b. + + +Description +----------- + +This driver implements support for the Winbond W83792AD/D. + +Detection of the chip can sometimes be foiled because it can be in an +internal state that allows no clean access (Bank with ID register is not +currently selected). If you know the address of the chip, use a 'force' +parameter; this will put it into a more well-behaved state first. + +The driver implements three temperature sensors, seven fan rotation speed +sensors, nine voltage sensors, and two automatic fan regulation +strategies called: Smart Fan I (Thermal Cruise mode) and Smart Fan II. +Automatic fan control mode is possible only for fan1-fan3. Fan4-fan7 can run +synchronized with selected fan (fan1-fan3). This functionality and manual PWM +control for fan4-fan7 is not yet implemented. + +Temperatures are measured in degrees Celsius and measurement resolution is 1 +degC for temp1 and 0.5 degC for temp2 and temp3. An alarm is triggered when +the temperature gets higher than the Overtemperature Shutdown value; it stays +on until the temperature falls below the Hysteresis value. + +Fan rotation speeds are reported in RPM (rotations per minute). An alarm is +triggered if the rotation speed has dropped below a programmable limit. Fan +readings can be divided by a programmable divider (1, 2, 4, 8, 16, 32, 64 or +128) to give the readings more range or accuracy. + +Voltage sensors (also known as IN sensors) report their values in millivolts. +An alarm is triggered if the voltage has crossed a programmable minimum +or maximum limit. + +Alarms are provided as output from "realtime status register". Following bits +are defined: + +bit - alarm on: +0 - in0 +1 - in1 +2 - temp1 +3 - temp2 +4 - temp3 +5 - fan1 +6 - fan2 +7 - fan3 +8 - in2 +9 - in3 +10 - in4 +11 - in5 +12 - in6 +13 - VID change +14 - chassis +15 - fan7 +16 - tart1 +17 - tart2 +18 - tart3 +19 - in7 +20 - in8 +21 - fan4 +22 - fan5 +23 - fan6 + +Tart will be asserted while target temperature cannot be achieved after 3 minutes +of full speed rotation of corresponding fan. + +In addition to the alarms described above, there is a CHAS alarm on the chips +which triggers if your computer case is open (This one is latched, contrary +to realtime alarms). + +The chips only update values each 3 seconds; reading them more often will +do no harm, but will return 'old' values. + + +W83792D PROBLEMS +---------------- +Known problems: + - This driver is only for Winbond W83792D C version device, there + are also some motherboards with B version W83792D device. The + calculation method to in6-in7(measured value, limits) is a little + different between C and B version. C or B version can be identified + by CR[0x49h]. + - The function of vid and vrm has not been finished, because I'm NOT + very familiar with them. Adding support is welcome. +  - The function of chassis open detection needs more tests. + - If you have ASUS server board and chip was not found: Then you will + need to upgrade to latest (or beta) BIOS. If it does not help please + contact us. + +Fan control +----------- + +Manual mode +----------- + +Works as expected. You just need to specify desired PWM/DC value (fan speed) +in appropriate pwm# file. + +Thermal cruise +-------------- + +In this mode, W83792D provides the Smart Fan system to automatically control +fan speed to keep the temperatures of CPU and the system within specific +range. At first a wanted temperature and interval must be set. This is done +via thermal_cruise# file. The tolerance# file serves to create T +- tolerance +interval. The fan speed will be lowered as long as the current temperature +remains below the thermal_cruise# +- tolerance# value. Once the temperature +exceeds the high limit (T+tolerance), the fan will be turned on with a +specific speed set by pwm# and automatically controlled its PWM duty cycle +with the temperature varying. Three conditions may occur: + +(1) If the temperature still exceeds the high limit, PWM duty +cycle will increase slowly. + +(2) If the temperature goes below the high limit, but still above the low +limit (T-tolerance), the fan speed will be fixed at the current speed because +the temperature is in the target range. + +(3) If the temperature goes below the low limit, PWM duty cycle will decrease +slowly to 0 or a preset stop value until the temperature exceeds the low +limit. (The preset stop value handling is not yet implemented in driver) + +Smart Fan II +------------ + +W83792D also provides a special mode for fan. Four temperature points are +available. When related temperature sensors detects the temperature in preset +temperature region (sf2_point@_fan# +- tolerance#) it will cause fans to run +on programmed value from sf2_level@_fan#. You need to set four temperatures +for each fan. + + +/sys files +---------- + +pwm[1-3] - this file stores PWM duty cycle or DC value (fan speed) in range: + 0 (stop) to 255 (full) +pwm[1-3]_enable - this file controls mode of fan/temperature control: + * 0 Disabled + * 1 Manual mode + * 2 Smart Fan II + * 3 Thermal Cruise +pwm[1-3]_mode - Select PWM of DC mode + * 0 DC + * 1 PWM +thermal_cruise[1-3] - Selects the desired temperature for cruise (degC) +tolerance[1-3] - Value in degrees of Celsius (degC) for +- T +sf2_point[1-4]_fan[1-3] - four temperature points for each fan for Smart Fan II +sf2_level[1-3]_fan[1-3] - three PWM/DC levels for each fan for Smart Fan II diff --git a/trunk/Documentation/i2c/chips/max6875 b/trunk/Documentation/i2c/chips/max6875 index b02002898a09..96fec562a8e9 100644 --- a/trunk/Documentation/i2c/chips/max6875 +++ b/trunk/Documentation/i2c/chips/max6875 @@ -4,22 +4,13 @@ Kernel driver max6875 Supported chips: * Maxim MAX6874, MAX6875 Prefix: 'max6875' - Addresses scanned: 0x50, 0x52 + Addresses scanned: None (see below) Datasheet: http://pdfserv.maxim-ic.com/en/ds/MAX6874-MAX6875.pdf Author: Ben Gardner -Module Parameters ------------------ - -* allow_write int - Set to non-zero to enable write permission: - *0: Read only - 1: Read and write - - Description ----------- @@ -33,34 +24,85 @@ registers. The Maxim MAX6874 is a similar, mostly compatible device, with more intputs and outputs: - vin gpi vout MAX6874 6 4 8 MAX6875 4 3 5 -MAX6874 chips can have four different addresses (as opposed to only two for -the MAX6875). The additional addresses (0x54 and 0x56) are not probed by -this driver by default, but the probe module parameter can be used if -needed. - -See the datasheet for details on how to program the EEPROM. +See the datasheet for more information. Sysfs entries ------------- -eeprom_user - 512 bytes of user-defined EEPROM space. Only writable if - allow_write was set and register 0x43 is 0. - -eeprom_config - 70 bytes of config EEPROM. Note that changes will not get - loaded into register space until a power cycle or device reset. - -reg_config - 70 bytes of register space. Any changes take affect immediately. +eeprom - 512 bytes of user-defined EEPROM space. General Remarks --------------- -A typical application will require that the EEPROMs be programmed once and -never altered afterwards. +Valid addresses for the MAX6875 are 0x50 and 0x52. +Valid addresses for the MAX6874 are 0x50, 0x52, 0x54 and 0x56. +The driver does not probe any address, so you must force the address. + +Example: +$ modprobe max6875 force=0,0x50 + +The MAX6874/MAX6875 ignores address bit 0, so this driver attaches to multiple +addresses. For example, for address 0x50, it also reserves 0x51. +The even-address instance is called 'max6875', the odd one is 'max6875 subclient'. + + +Programming the chip using i2c-dev +---------------------------------- + +Use the i2c-dev interface to access and program the chips. +Reads and writes are performed differently depending on the address range. + +The configuration registers are at addresses 0x00 - 0x45. +Use i2c_smbus_write_byte_data() to write a register and +i2c_smbus_read_byte_data() to read a register. +The command is the register number. + +Examples: +To write a 1 to register 0x45: + i2c_smbus_write_byte_data(fd, 0x45, 1); + +To read register 0x45: + value = i2c_smbus_read_byte_data(fd, 0x45); + + +The configuration EEPROM is at addresses 0x8000 - 0x8045. +The user EEPROM is at addresses 0x8100 - 0x82ff. + +Use i2c_smbus_write_word_data() to write a byte to EEPROM. + +The command is the upper byte of the address: 0x80, 0x81, or 0x82. +The data word is the lower part of the address or'd with data << 8. + cmd = address >> 8; + val = (address & 0xff) | (data << 8); + +Example: +To write 0x5a to address 0x8003: + i2c_smbus_write_word_data(fd, 0x80, 0x5a03); + + +Reading data from the EEPROM is a little more complicated. +Use i2c_smbus_write_byte_data() to set the read address and then +i2c_smbus_read_byte() or i2c_smbus_read_i2c_block_data() to read the data. + +Example: +To read data starting at offset 0x8100, first set the address: + i2c_smbus_write_byte_data(fd, 0x81, 0x00); + +And then read the data + value = i2c_smbus_read_byte(fd); + + or + + count = i2c_smbus_read_i2c_block_data(fd, 0x84, buffer); + +The block read should read 16 bytes. +0x84 is the block read command. + +See the datasheet for more details. diff --git a/trunk/Documentation/i2c/functionality b/trunk/Documentation/i2c/functionality index 8a78a95ae04e..41ffefbdc60c 100644 --- a/trunk/Documentation/i2c/functionality +++ b/trunk/Documentation/i2c/functionality @@ -115,7 +115,7 @@ CHECKING THROUGH /DEV If you try to access an adapter from a userspace program, you will have to use the /dev interface. You will still have to check whether the functionality you need is supported, of course. This is done using -the I2C_FUNCS ioctl. An example, adapted from the lm_sensors i2c_detect +the I2C_FUNCS ioctl. An example, adapted from the lm_sensors i2cdetect program, is below: int file; diff --git a/trunk/Documentation/i2c/porting-clients b/trunk/Documentation/i2c/porting-clients index a7adbdd9ea8a..4849dfd6961c 100644 --- a/trunk/Documentation/i2c/porting-clients +++ b/trunk/Documentation/i2c/porting-clients @@ -1,4 +1,4 @@ -Revision 4, 2004-03-30 +Revision 5, 2005-07-29 Jean Delvare Greg KH @@ -17,20 +17,22 @@ yours for best results. Technical changes: -* [Includes] Get rid of "version.h". Replace with - . Includes typically look like that: +* [Includes] Get rid of "version.h" and . + Includes typically look like that: #include #include #include #include - #include - #include /* if you need VRM support */ + #include /* for hardware monitoring drivers */ + #include + #include /* if you need VRM support */ #include /* if you have I/O operations */ Please respect this inclusion order. Some extra headers may be required for a given driver (e.g. "lm75.h"). -* [Addresses] SENSORS_I2C_END becomes I2C_CLIENT_END, SENSORS_ISA_END - becomes I2C_CLIENT_ISA_END. +* [Addresses] SENSORS_I2C_END becomes I2C_CLIENT_END, ISA addresses + are no more handled by the i2c core. + SENSORS_INSMOD_ becomes I2C_CLIENT_INSMOD_. * [Client data] Get rid of sysctl_id. Try using standard names for register values (for example, temp_os becomes temp_max). You're @@ -66,13 +68,15 @@ Technical changes: if (!(adapter->class & I2C_CLASS_HWMON)) return 0; ISA-only drivers of course don't need this. + Call i2c_probe() instead of i2c_detect(). * [Detect] As mentioned earlier, the flags parameter is gone. The type_name and client_name strings are replaced by a single name string, which will be filled with a lowercase, short string (typically the driver name, e.g. "lm75"). In i2c-only drivers, drop the i2c_is_isa_adapter check, it's - useless. + useless. Same for isa-only drivers, as the test would always be + true. Only hybrid drivers (which are quite rare) still need it. The errorN labels are reduced to the number needed. If that number is 2 (i2c-only drivers), it is advised that the labels are named exit and exit_free. For i2c+isa drivers, labels should be named @@ -86,6 +90,8 @@ Technical changes: device_create_file. Move the driver initialization before any sysfs file creation. Drop client->id. + Drop any 24RF08 corruption prevention you find, as this is now done + at the i2c-core level, and doing it twice voids it. * [Init] Limits must not be set by the driver (can be done later in user-space). Chip should not be reset default (although a module @@ -93,7 +99,8 @@ Technical changes: limited to the strictly necessary steps. * [Detach] Get rid of data, remove the call to - i2c_deregister_entry. + i2c_deregister_entry. Do not log an error message if + i2c_detach_client fails, as i2c-core will now do it for you. * [Update] Don't access client->data directly, use i2c_get_clientdata(client) instead. diff --git a/trunk/Documentation/i2c/writing-clients b/trunk/Documentation/i2c/writing-clients index 91664be91ffc..077275722a7c 100644 --- a/trunk/Documentation/i2c/writing-clients +++ b/trunk/Documentation/i2c/writing-clients @@ -148,15 +148,15 @@ are defined in i2c.h to help you support them, as well as a generic detection algorithm. You do not have to use this parameter interface; but don't try to use -function i2c_probe() (or i2c_detect()) if you don't. +function i2c_probe() if you don't. NOTE: If you want to write a `sensors' driver, the interface is slightly different! See below. -Probing classes (i2c) ---------------------- +Probing classes +--------------- All parameters are given as lists of unsigned 16-bit integers. Lists are terminated by I2C_CLIENT_END. @@ -171,12 +171,18 @@ The following lists are used internally: ignore: insmod parameter. A list of pairs. The first value is a bus number (-1 for any I2C bus), the second is the I2C address. These addresses are never probed. - This parameter overrules 'normal' and 'probe', but not the 'force' lists. + This parameter overrules the 'normal_i2c' list only. force: insmod parameter. A list of pairs. The first value is a bus number (-1 for any I2C bus), the second is the I2C address. A device is blindly assumed to be on the given address, no probing is done. +Additionally, kind-specific force lists may optionally be defined if +the driver supports several chip kinds. They are grouped in a +NULL-terminated list of pointers named forces, those first element if the +generic force list mentioned above. Each additional list correspond to an +insmod parameter of the form force_. + Fortunately, as a module writer, you just have to define the `normal_i2c' parameter. The complete declaration could look like this: @@ -186,66 +192,17 @@ parameter. The complete declaration could look like this: /* Magic definition of all other variables and things */ I2C_CLIENT_INSMOD; + /* Or, if your driver supports, say, 2 kind of devices: */ + I2C_CLIENT_INSMOD_2(foo, bar); + +If you use the multi-kind form, an enum will be defined for you: + enum chips { any_chip, foo, bar, ... } +You can then (and certainly should) use it in the driver code. Note that you *have* to call the defined variable `normal_i2c', without any prefix! -Probing classes (sensors) -------------------------- - -If you write a `sensors' driver, you use a slightly different interface. -As well as I2C addresses, we have to cope with ISA addresses. Also, we -use a enum of chip types. Don't forget to include `sensors.h'. - -The following lists are used internally. They are all lists of integers. - - normal_i2c: filled in by the module writer. Terminated by SENSORS_I2C_END. - A list of I2C addresses which should normally be examined. - normal_isa: filled in by the module writer. Terminated by SENSORS_ISA_END. - A list of ISA addresses which should normally be examined. - probe: insmod parameter. Initialize this list with SENSORS_I2C_END values. - A list of pairs. The first value is a bus number (SENSORS_ISA_BUS for - the ISA bus, -1 for any I2C bus), the second is the address. These - addresses are also probed, as if they were in the 'normal' list. - ignore: insmod parameter. Initialize this list with SENSORS_I2C_END values. - A list of pairs. The first value is a bus number (SENSORS_ISA_BUS for - the ISA bus, -1 for any I2C bus), the second is the I2C address. These - addresses are never probed. This parameter overrules 'normal' and - 'probe', but not the 'force' lists. - -Also used is a list of pointers to sensors_force_data structures: - force_data: insmod parameters. A list, ending with an element of which - the force field is NULL. - Each element contains the type of chip and a list of pairs. - The first value is a bus number (SENSORS_ISA_BUS for the ISA bus, - -1 for any I2C bus), the second is the address. - These are automatically translated to insmod variables of the form - force_foo. - -So we have a generic insmod variabled `force', and chip-specific variables -`force_CHIPNAME'. - -Fortunately, as a module writer, you just have to define the `normal_i2c' -and `normal_isa' parameters, and define what chip names are used. -The complete declaration could look like this: - /* Scan i2c addresses 0x37, and 0x48 to 0x4f */ - static unsigned short normal_i2c[] = { 0x37, 0x48, 0x49, 0x4a, 0x4b, 0x4c, - 0x4d, 0x4e, 0x4f, I2C_CLIENT_END }; - /* Scan ISA address 0x290 */ - static unsigned int normal_isa[] = {0x0290,SENSORS_ISA_END}; - - /* Define chips foo and bar, as well as all module parameters and things */ - SENSORS_INSMOD_2(foo,bar); - -If you have one chip, you use macro SENSORS_INSMOD_1(chip), if you have 2 -you use macro SENSORS_INSMOD_2(chip1,chip2), etc. If you do not want to -bother with chip types, you can use SENSORS_INSMOD_0. - -A enum is automatically defined as follows: - enum chips { any_chip, chip1, chip2, ... } - - Attaching to an adapter ----------------------- @@ -264,17 +221,10 @@ detected at a specific address, another callback is called. return i2c_probe(adapter,&addr_data,&foo_detect_client); } -For `sensors' drivers, use the i2c_detect function instead: - - int foo_attach_adapter(struct i2c_adapter *adapter) - { - return i2c_detect(adapter,&addr_data,&foo_detect_client); - } - Remember, structure `addr_data' is defined by the macros explained above, so you do not have to define it yourself. -The i2c_probe or i2c_detect function will call the foo_detect_client +The i2c_probe function will call the foo_detect_client function only for those i2c addresses that actually have a device on them (unless a `force' parameter was used). In addition, addresses that are already in use (by some other registered client) are skipped. @@ -283,19 +233,18 @@ are already in use (by some other registered client) are skipped. The detect client function -------------------------- -The detect client function is called by i2c_probe or i2c_detect. -The `kind' parameter contains 0 if this call is due to a `force' -parameter, and -1 otherwise (for i2c_detect, it contains 0 if -this call is due to the generic `force' parameter, and the chip type -number if it is due to a specific `force' parameter). +The detect client function is called by i2c_probe. The `kind' parameter +contains -1 for a probed detection, 0 for a forced detection, or a positive +number for a forced detection with a chip type forced. Below, some things are only needed if this is a `sensors' driver. Those parts are between /* SENSORS ONLY START */ and /* SENSORS ONLY END */ markers. -This function should only return an error (any value != 0) if there is -some reason why no more detection should be done anymore. If the -detection just fails for this address, return 0. +Returning an error different from -ENODEV in a detect function will cause +the detection to stop: other addresses and adapters won't be scanned. +This should only be done on fatal or internal errors, such as a memory +shortage or i2c_attach_client failing. For now, you can ignore the `flags' parameter. It is there for future use. @@ -320,11 +269,10 @@ For now, you can ignore the `flags' parameter. It is there for future use. const char *type_name = ""; int is_isa = i2c_is_isa_adapter(adapter); - if (is_isa) { + /* Do this only if the chip can additionally be found on the ISA bus + (hybrid chip). */ - /* If this client can't be on the ISA bus at all, we can stop now - (call `goto ERROR0'). But for kicks, we will assume it is all - right. */ + if (is_isa) { /* Discard immediately if this ISA range is already used */ if (check_region(address,FOO_EXTENT)) @@ -495,15 +443,13 @@ much simpler than the attachment code, fortunately! /* SENSORS ONLY END */ /* Try to detach the client from i2c space */ - if ((err = i2c_detach_client(client))) { - printk("foo.o: Client deregistration failed, client not detached.\n"); + if ((err = i2c_detach_client(client))) return err; - } - /* SENSORS ONLY START */ + /* HYBRID SENSORS CHIP ONLY START */ if i2c_is_isa_client(client) release_region(client->addr,LM78_EXTENT); - /* SENSORS ONLY END */ + /* HYBRID SENSORS CHIP ONLY END */ kfree(client); /* Frees client data too, if allocated at the same time */ return 0; diff --git a/trunk/Documentation/kbuild/makefiles.txt b/trunk/Documentation/kbuild/makefiles.txt index 2616a58a5a4b..9a1586590d82 100644 --- a/trunk/Documentation/kbuild/makefiles.txt +++ b/trunk/Documentation/kbuild/makefiles.txt @@ -872,7 +872,13 @@ When kbuild executes the following steps are followed (roughly): Assignments to $(targets) are without $(obj)/ prefix. if_changed may be used in conjunction with custom commands as defined in 6.7 "Custom kbuild commands". + Note: It is a typical mistake to forget the FORCE prerequisite. + Another common pitfall is that whitespace is sometimes + significant; for instance, the below will fail (note the extra space + after the comma): + target: source(s) FORCE + #WRONG!# $(call if_changed, ld/objcopy/gzip) ld Link target. Often LDFLAGS_$@ is used to set specific options to ld. diff --git a/trunk/Documentation/networking/README.ipw2100 b/trunk/Documentation/networking/README.ipw2100 new file mode 100644 index 000000000000..2046948b020d --- /dev/null +++ b/trunk/Documentation/networking/README.ipw2100 @@ -0,0 +1,246 @@ + +=========================== +Intel(R) PRO/Wireless 2100 Network Connection Driver for Linux +README.ipw2100 + +March 14, 2005 + +=========================== +Index +--------------------------- +0. Introduction +1. Release 1.1.0 Current Features +2. Command Line Parameters +3. Sysfs Helper Files +4. Radio Kill Switch +5. Dynamic Firmware +6. Power Management +7. Support +8. License + + +=========================== +0. Introduction +------------ ----- ----- ---- --- -- - + +This document provides a brief overview of the features supported by the +IPW2100 driver project. The main project website, where the latest +development version of the driver can be found, is: + + http://ipw2100.sourceforge.net + +There you can find the not only the latest releases, but also information about +potential fixes and patches, as well as links to the development mailing list +for the driver project. + + +=========================== +1. Release 1.1.0 Current Supported Features +--------------------------- +- Managed (BSS) and Ad-Hoc (IBSS) +- WEP (shared key and open) +- Wireless Tools support +- 802.1x (tested with XSupplicant 1.0.1) + +Enabled (but not supported) features: +- Monitor/RFMon mode +- WPA/WPA2 + +The distinction between officially supported and enabled is a reflection +on the amount of validation and interoperability testing that has been +performed on a given feature. + + +=========================== +2. Command Line Parameters +--------------------------- + +If the driver is built as a module, the following optional parameters are used +by entering them on the command line with the modprobe command using this +syntax: + + modprobe ipw2100 [