From d2532c61ba92d68092e1a77e44f8dc2928afdc54 Mon Sep 17 00:00:00 2001 From: Dave Kleikamp Date: Thu, 2 Jun 2005 12:12:57 -0500 Subject: [PATCH] --- yaml --- r: 2409 b: refs/heads/master c: 7078253c085c037c070ca4e8bc9e9e7f18aa1e84 h: refs/heads/master i: 2407: ca57c06aeab33a238d1462267ac09bc6c75794cf v: v3 --- [refs] | 2 +- trunk/CREDITS | 7 +- trunk/Documentation/00-INDEX | 2 - trunk/Documentation/BK-usage/00-INDEX | 51 - .../BK-usage/bk-kernel-howto.txt | 283 - trunk/Documentation/BK-usage/bk-make-sum | 34 - trunk/Documentation/BK-usage/bksend | 36 - trunk/Documentation/BK-usage/bz64wrap | 41 - trunk/Documentation/BK-usage/cpcset | 36 - trunk/Documentation/BK-usage/cset-to-linus | 49 - trunk/Documentation/BK-usage/csets-to-patches | 44 - trunk/Documentation/BK-usage/gcapatch | 8 - trunk/Documentation/BK-usage/unbz64wrap | 25 - .../Documentation/cpu-freq/cpufreq-stats.txt | 128 + trunk/Documentation/cpusets.txt | 3 +- trunk/Documentation/dontdiff | 3 + trunk/Documentation/dvb/README.flexcop | 205 + trunk/Documentation/dvb/bt8xx.txt | 69 +- trunk/Documentation/dvb/ci.txt | 219 + trunk/Documentation/dvb/get_dvb_firmware | 4 +- .../feature-removal-schedule.txt | 20 + trunk/Documentation/filesystems/sysfs-pci.txt | 6 +- trunk/Documentation/networking/DLINK.txt | 7 +- trunk/Documentation/power/devices.txt | 21 - trunk/Documentation/powerpc/hvcs.txt | 4 +- trunk/Documentation/x86_64/boot-options.txt | 3 + trunk/MAINTAINERS | 14 +- trunk/Makefile | 4 +- trunk/arch/alpha/kernel/osf_sys.c | 7 +- trunk/arch/arm/Kconfig | 20 +- trunk/arch/arm/kernel/entry-armv.S | 14 +- trunk/arch/arm/kernel/head.S | 3 +- trunk/arch/arm/kernel/process.c | 25 +- trunk/arch/arm/kernel/sys_arm.c | 2 +- trunk/arch/arm/kernel/traps.c | 14 +- trunk/arch/arm/kernel/vmlinux.lds.S | 3 +- trunk/arch/arm/mach-clps711x/Kconfig | 3 + trunk/arch/arm/mach-footbridge/Kconfig | 12 + trunk/arch/arm/mach-imx/Kconfig | 1 + trunk/arch/arm/mach-s3c2410/clock.c | 2 +- trunk/arch/arm/mach-s3c2410/s3c2440.c | 6 +- trunk/arch/arm/mm/Kconfig | 23 +- trunk/arch/arm/mm/copypage-v4mc.S | 80 - trunk/arch/arm/mm/copypage-v4mc.c | 111 + trunk/arch/arm/mm/copypage-v6.c | 28 +- trunk/arch/arm/mm/flush.c | 37 +- trunk/arch/arm/mm/mm-armv.c | 27 +- trunk/arch/h8300/kernel/process.c | 2 +- trunk/arch/i386/Kconfig | 22 +- trunk/arch/i386/Makefile | 6 +- trunk/arch/i386/boot/bootsect.S | 2 +- trunk/arch/i386/boot/video.S | 18 +- trunk/arch/i386/kernel/acpi/boot.c | 2 +- trunk/arch/i386/kernel/cpu/amd.c | 12 +- trunk/arch/i386/kernel/cpu/common.c | 4 + trunk/arch/i386/kernel/cpu/cpufreq/Kconfig | 14 +- trunk/arch/i386/kernel/cpu/cpufreq/Makefile | 1 + trunk/arch/i386/kernel/cpu/cpufreq/longhaul.c | 58 +- .../i386/kernel/cpu/cpufreq/powernow-k7.c | 11 +- .../i386/kernel/cpu/cpufreq/powernow-k8.c | 113 +- .../i386/kernel/cpu/cpufreq/powernow-k8.h | 15 + .../arch/i386/kernel/cpu/cpufreq/sc520_freq.c | 186 + .../kernel/cpu/cpufreq/speedstep-centrino.c | 6 + .../i386/kernel/cpu/cpufreq/speedstep-lib.c | 6 +- .../i386/kernel/cpu/cpufreq/speedstep-smi.c | 3 + trunk/arch/i386/kernel/cpu/intel_cacheinfo.c | 2 +- trunk/arch/i386/kernel/cpu/mtrr/cyrix.c | 4 +- trunk/arch/i386/kernel/i386_ksyms.c | 4 - trunk/arch/i386/kernel/kprobes.c | 7 + trunk/arch/i386/kernel/process.c | 13 +- trunk/arch/i386/kernel/setup.c | 2 + trunk/arch/i386/kernel/smpboot.c | 5 +- trunk/arch/i386/kernel/timers/common.c | 6 +- trunk/arch/i386/kernel/timers/timer_tsc.c | 20 + trunk/arch/i386/mach-voyager/voyager_smp.c | 17 +- trunk/arch/i386/mm/ioremap.c | 10 +- trunk/arch/i386/pci/fixup.c | 2 +- trunk/arch/i386/pci/irq.c | 5 - trunk/arch/ia64/Kconfig | 4 + trunk/arch/ia64/ia32/ia32_ioctl.c | 1 - trunk/arch/ia64/ia32/sys_ia32.c | 2 +- trunk/arch/ia64/kernel/entry.S | 4 +- trunk/arch/ia64/kernel/mca.c | 8 +- trunk/arch/ia64/kernel/minstate.h | 3 +- trunk/arch/ia64/kernel/perfmon.c | 175 +- trunk/arch/ia64/kernel/ptrace.c | 20 +- trunk/arch/ia64/kernel/smpboot.c | 2 +- trunk/arch/ia64/kernel/sys_ia64.c | 7 - trunk/arch/ia64/sn/kernel/setup.c | 2 + trunk/arch/mips/vr41xx/common/pmu.c | 55 +- trunk/arch/ppc/Kconfig | 10 +- trunk/arch/ppc/boot/images/Makefile | 3 +- trunk/arch/ppc/configs/mpc8555_cds_defconfig | 117 +- trunk/arch/ppc/kernel/head_44x.S | 15 +- trunk/arch/ppc/kernel/head_fsl_booke.S | 15 +- trunk/arch/ppc/kernel/setup.c | 41 +- trunk/arch/ppc/kernel/traps.c | 7 +- trunk/arch/ppc/kernel/vmlinux.lds.S | 2 + trunk/arch/ppc/lib/string.S | 7 +- trunk/arch/ppc/mm/init.c | 1 + trunk/arch/ppc/platforms/83xx/mpc834x_sys.c | 1 - trunk/arch/ppc/platforms/83xx/mpc834x_sys.h | 7 +- trunk/arch/ppc/platforms/85xx/mpc8540_ads.c | 3 + .../ppc/platforms/85xx/mpc85xx_cds_common.c | 143 +- .../ppc/platforms/85xx/mpc85xx_cds_common.h | 3 + trunk/arch/ppc/platforms/85xx/sbc8560.c | 3 + trunk/arch/ppc/platforms/pmac_cpufreq.c | 36 +- trunk/arch/ppc/platforms/pq2ads.h | 41 +- trunk/arch/ppc/syslib/Makefile | 4 +- trunk/arch/ppc/syslib/ipic.c | 2 +- trunk/arch/ppc/syslib/m8260_pci.c | 193 - trunk/arch/ppc/syslib/m8260_pci.h | 76 - trunk/arch/ppc/syslib/m8260_pci_erratum9.c | 10 +- trunk/arch/ppc/syslib/m8260_setup.c | 11 +- trunk/arch/ppc/syslib/m82xx_pci.c | 383 ++ trunk/arch/ppc/syslib/m82xx_pci.h | 92 + trunk/arch/ppc/syslib/mpc83xx_devices.c | 1 + trunk/arch/ppc/syslib/mpc85xx_devices.c | 1 + trunk/arch/ppc/syslib/open_pic.c | 6 +- trunk/arch/ppc/syslib/ppc83xx_setup.c | 28 + trunk/arch/ppc/syslib/ppc85xx_setup.c | 16 + trunk/arch/ppc/syslib/prom_init.c | 10 + trunk/arch/ppc64/Kconfig | 5 + trunk/arch/ppc64/Kconfig.debug | 3 + trunk/arch/ppc64/boot/main.c | 1 - trunk/arch/ppc64/boot/start.c | 654 -- trunk/arch/ppc64/kernel/mf.c | 85 +- trunk/arch/ppc64/kernel/misc.S | 2 +- trunk/arch/ppc64/kernel/pSeries_reconfig.c | 8 - trunk/arch/ppc64/kernel/pSeries_smp.c | 7 - trunk/arch/ppc64/kernel/pci.c | 2 +- trunk/arch/ppc64/kernel/pmac_smp.c | 28 +- trunk/arch/ppc64/kernel/prom.c | 2 +- trunk/arch/ppc64/kernel/prom_init.c | 154 +- trunk/arch/ppc64/kernel/rtc.c | 39 +- trunk/arch/ppc64/kernel/signal.c | 6 +- trunk/arch/ppc64/kernel/time.c | 3 +- trunk/arch/ppc64/kernel/xics.c | 16 +- trunk/arch/ppc64/mm/hash_native.c | 3 +- trunk/arch/ppc64/mm/hash_utils.c | 11 +- trunk/arch/ppc64/mm/imalloc.c | 5 +- trunk/arch/ppc64/mm/init.c | 3 +- trunk/arch/ppc64/mm/stab.c | 5 + trunk/arch/sparc/kernel/process.c | 5 - trunk/arch/sparc64/kernel/pci_iommu.c | 221 +- trunk/arch/sparc64/kernel/pci_psycho.c | 2 +- trunk/arch/sparc64/kernel/pci_sabre.c | 2 +- trunk/arch/sparc64/kernel/pci_schizo.c | 2 +- trunk/arch/sparc64/kernel/process.c | 4 - trunk/arch/sparc64/kernel/sbus.c | 41 +- trunk/arch/sparc64/kernel/setup.c | 11 + trunk/arch/sparc64/kernel/smp.c | 3 + trunk/arch/sparc64/kernel/sparc64_ksyms.c | 2 +- trunk/arch/sparc64/kernel/traps.c | 19 + trunk/arch/sparc64/mm/init.c | 2 +- trunk/arch/um/Kconfig.debug | 4 - trunk/arch/um/Kconfig_x86_64 | 4 + trunk/arch/um/Makefile | 80 +- trunk/arch/um/Makefile-i386 | 4 +- trunk/arch/um/Makefile-x86_64 | 4 +- trunk/arch/um/drivers/chan_kern.c | 22 +- trunk/arch/um/drivers/line.c | 41 +- trunk/arch/um/drivers/mcast_kern.c | 4 +- trunk/arch/um/drivers/mcast_user.c | 47 +- trunk/arch/um/drivers/random.c | 16 +- trunk/arch/um/drivers/ssl.c | 1 - trunk/arch/um/drivers/stdio_console.c | 1 - trunk/arch/um/drivers/ubd_kern.c | 303 +- trunk/arch/um/drivers/xterm_kern.c | 1 - trunk/arch/um/include/2_5compat.h | 24 - trunk/arch/um/include/common-offsets.h | 14 + trunk/arch/um/include/kern_util.h | 7 +- trunk/arch/um/include/os.h | 1 + trunk/arch/um/include/skas_ptrace.h | 15 +- trunk/arch/um/include/sysdep-i386/checksum.h | 39 +- trunk/arch/um/include/sysdep-i386/faultinfo.h | 29 + trunk/arch/um/include/sysdep-i386/ptrace.h | 23 +- .../arch/um/include/sysdep-i386/sigcontext.h | 19 +- trunk/arch/um/include/sysdep-i386/signal.h | 2 + .../arch/um/include/sysdep-i386/skas_ptrace.h | 22 + .../arch/um/include/sysdep-ia64/skas_ptrace.h | 22 + .../arch/um/include/sysdep-ppc/skas_ptrace.h | 22 + .../arch/um/include/sysdep-x86_64/checksum.h | 26 +- .../arch/um/include/sysdep-x86_64/faultinfo.h | 29 + trunk/arch/um/include/sysdep-x86_64/ptrace.h | 78 +- .../um/include/sysdep-x86_64/sigcontext.h | 15 +- trunk/arch/um/include/sysdep-x86_64/signal.h | 2 + .../um/include/sysdep-x86_64/skas_ptrace.h | 22 + trunk/arch/um/include/sysrq.h | 3 +- trunk/arch/um/include/user_util.h | 1 - trunk/arch/um/kernel/Makefile | 14 +- trunk/arch/um/kernel/checksum.c | 36 - trunk/arch/um/kernel/exec_kern.c | 1 - .../um/kernel/{initrd_kern.c => initrd.c} | 21 +- trunk/arch/um/kernel/initrd_user.c | 46 - trunk/arch/um/kernel/irq.c | 1 - trunk/arch/um/kernel/irq_user.c | 10 +- trunk/arch/um/kernel/ksyms.c | 4 +- trunk/arch/um/kernel/main.c | 40 +- trunk/arch/um/kernel/mem.c | 40 +- trunk/arch/um/kernel/process.c | 2 - trunk/arch/um/kernel/process_kern.c | 56 +- trunk/arch/um/kernel/ptrace.c | 117 +- trunk/arch/um/kernel/sigio_user.c | 1 + .../um/kernel/skas/include/mode_kern-skas.h | 1 - trunk/arch/um/kernel/skas/include/skas.h | 3 +- .../um/kernel/skas/include/uaccess-skas.h | 4 +- trunk/arch/um/kernel/skas/process.c | 68 +- trunk/arch/um/kernel/skas/process_kern.c | 4 - trunk/arch/um/kernel/skas/trap_user.c | 24 +- trunk/arch/um/kernel/skas/uaccess.c | 7 +- trunk/arch/um/kernel/skas/util/Makefile | 1 + .../arch/um/kernel/skas/util/mk_ptregs-i386.c | 46 +- .../um/kernel/skas/util/mk_ptregs-x86_64.c | 60 +- trunk/arch/um/kernel/syscall_kern.c | 1 - trunk/arch/um/kernel/sysrq.c | 21 +- trunk/arch/um/kernel/time_kern.c | 18 - trunk/arch/um/kernel/trap_kern.c | 64 +- trunk/arch/um/kernel/trap_user.c | 13 +- trunk/arch/um/kernel/tt/Makefile | 1 + .../arch/um/kernel/tt/include/mode_kern-tt.h | 1 - trunk/arch/um/kernel/tt/include/uaccess-tt.h | 4 +- trunk/arch/um/kernel/tt/ksyms.c | 1 + trunk/arch/um/kernel/tt/mem.c | 8 +- trunk/arch/um/kernel/tt/process_kern.c | 26 +- trunk/arch/um/kernel/tt/syscall_user.c | 4 + trunk/arch/um/kernel/tt/tracer.c | 8 +- trunk/arch/um/kernel/tt/trap_user.c | 6 + trunk/arch/um/kernel/um_arch.c | 13 +- trunk/arch/um/kernel/uml.lds.S | 2 + trunk/arch/um/kernel/vmlinux.lds.S | 6 + trunk/arch/um/os-Linux/process.c | 5 + trunk/arch/um/os-Linux/signal.c | 4 +- trunk/arch/um/os-Linux/util/Makefile | 2 +- .../arch/um/os-Linux/util/mk_user_constants.c | 10 +- trunk/arch/um/scripts/Makefile.rules | 25 +- trunk/arch/um/sys-i386/Makefile | 13 +- trunk/arch/um/sys-i386/checksum.S | 6 +- trunk/arch/um/sys-i386/delay.c | 26 + trunk/arch/um/sys-i386/kernel-offsets.c | 25 + trunk/arch/um/sys-i386/ksyms.c | 8 +- trunk/arch/um/sys-i386/ldt.c | 5 +- trunk/arch/um/sys-i386/ptrace.c | 40 + trunk/arch/um/sys-i386/signal.c | 17 +- trunk/arch/um/sys-i386/sysrq.c | 80 +- trunk/arch/um/sys-i386/user-offsets.c | 69 + trunk/arch/um/sys-i386/util/Makefile | 7 +- trunk/arch/um/sys-i386/util/mk_sc.c | 75 +- trunk/arch/um/sys-i386/util/mk_thread.c | 22 + trunk/arch/um/sys-i386/util/mk_thread_kern.c | 22 - trunk/arch/um/sys-i386/util/mk_thread_user.c | 30 - trunk/arch/um/sys-ppc/ptrace.c | 40 + trunk/arch/um/sys-ppc/sysrq.c | 14 +- trunk/arch/um/sys-x86_64/Makefile | 22 +- trunk/arch/um/sys-x86_64/delay.c | 39 +- trunk/arch/um/sys-x86_64/kernel-offsets.c | 24 + trunk/arch/um/sys-x86_64/ksyms.c | 19 + trunk/arch/um/sys-x86_64/ptrace.c | 53 +- trunk/arch/um/sys-x86_64/signal.c | 12 +- trunk/arch/um/sys-x86_64/syscalls.c | 21 +- trunk/arch/um/sys-x86_64/sysrq.c | 11 +- trunk/arch/um/sys-x86_64/um_module.c | 19 + trunk/arch/um/sys-x86_64/user-offsets.c | 86 + trunk/arch/um/sys-x86_64/util/Makefile | 6 +- trunk/arch/um/sys-x86_64/util/mk_sc.c | 79 +- trunk/arch/um/sys-x86_64/util/mk_thread.c | 20 + .../arch/um/sys-x86_64/util/mk_thread_kern.c | 21 - .../arch/um/sys-x86_64/util/mk_thread_user.c | 30 - trunk/arch/um/util/Makefile | 7 +- trunk/arch/um/util/mk_constants.c | 32 + trunk/arch/um/util/mk_constants_kern.c | 28 - trunk/arch/um/util/mk_constants_user.c | 28 - .../um/util/{mk_task_user.c => mk_task.c} | 18 +- trunk/arch/um/util/mk_task_kern.c | 17 - trunk/arch/x86_64/Kconfig | 17 +- trunk/arch/x86_64/boot/bootsect.S | 4 +- trunk/arch/x86_64/defconfig | 58 +- trunk/arch/x86_64/kernel/Makefile | 1 + trunk/arch/x86_64/kernel/apic.c | 5 +- trunk/arch/x86_64/kernel/entry.S | 11 +- trunk/arch/x86_64/kernel/io_apic.c | 82 +- trunk/arch/x86_64/kernel/kprobes.c | 7 + trunk/arch/x86_64/kernel/module.c | 4 + trunk/arch/x86_64/kernel/mpparse.c | 23 +- trunk/arch/x86_64/kernel/nmi.c | 248 +- trunk/arch/x86_64/kernel/pmtimer.c | 101 + trunk/arch/x86_64/kernel/ptrace.c | 17 +- trunk/arch/x86_64/kernel/setup.c | 30 +- trunk/arch/x86_64/kernel/signal.c | 5 +- trunk/arch/x86_64/kernel/smpboot.c | 263 +- trunk/arch/x86_64/kernel/time.c | 64 +- trunk/arch/x86_64/kernel/traps.c | 2 + trunk/arch/x86_64/kernel/vsyscall.c | 5 +- trunk/arch/x86_64/kernel/x8664_ksyms.c | 16 +- trunk/arch/x86_64/mm/fault.c | 11 +- trunk/arch/x86_64/mm/ioremap.c | 29 +- trunk/crypto/crypto_null.c | 28 +- trunk/crypto/internal.h | 2 +- trunk/drivers/acpi/Kconfig | 5 +- trunk/drivers/acpi/pci_irq.c | 4 - trunk/drivers/base/Makefile | 2 +- trunk/drivers/base/bus.c | 1 - trunk/drivers/base/core.c | 7 +- trunk/drivers/base/interface.c | 51 - trunk/drivers/base/power/power.h | 11 - trunk/drivers/base/power/resume.c | 11 +- trunk/drivers/base/power/shutdown.c | 23 +- trunk/drivers/base/power/suspend.c | 17 +- trunk/drivers/block/DAC960.c | 132 + trunk/drivers/block/DAC960.h | 317 +- trunk/drivers/block/floppy.c | 2 +- trunk/drivers/block/genhd.c | 4 +- trunk/drivers/block/ioctl.c | 2 + trunk/drivers/block/pktcdvd.c | 16 +- trunk/drivers/cdrom/cdu31a.c | 6 +- trunk/drivers/cdrom/mcdx.c | 28 +- trunk/drivers/cdrom/sbpcd.c | 2 +- trunk/drivers/cdrom/viocd.c | 14 + trunk/drivers/char/ipmi/ipmi_devintf.c | 20 +- trunk/drivers/char/keyboard.c | 3 +- trunk/drivers/char/raw.c | 2 +- trunk/drivers/char/tty_io.c | 2 +- trunk/drivers/char/watchdog/i8xx_tco.c | 1 + trunk/drivers/cpufreq/Kconfig | 24 + trunk/drivers/cpufreq/Makefile | 1 + trunk/drivers/cpufreq/cpufreq.c | 8 +- trunk/drivers/cpufreq/cpufreq_conservative.c | 586 ++ trunk/drivers/cpufreq/cpufreq_ondemand.c | 180 +- trunk/drivers/cpufreq/cpufreq_stats.c | 47 +- trunk/drivers/firmware/pcdp.c | 1 + trunk/drivers/i2c/busses/i2c-ali1563.c | 46 +- trunk/drivers/i2c/busses/i2c-keywest.c | 5 + trunk/drivers/ide/ide-cd.c | 52 +- trunk/drivers/ide/ide-disk.c | 41 +- trunk/drivers/ide/ide-floppy.c | 42 +- trunk/drivers/ide/ide-probe.c | 51 +- trunk/drivers/ide/ide-proc.c | 54 +- trunk/drivers/ide/ide-tape.c | 51 +- trunk/drivers/ide/ide.c | 307 +- trunk/drivers/ide/pci/amd74xx.c | 3 + trunk/drivers/ide/pci/sis5513.c | 6 +- trunk/drivers/ieee1394/Kconfig | 5 - trunk/drivers/ieee1394/ieee1394_core.c | 3 +- .../drivers/ieee1394/ieee1394_transactions.c | 3 + .../drivers/ieee1394/ieee1394_transactions.h | 7 - trunk/drivers/ieee1394/nodemgr.c | 3 +- trunk/drivers/ieee1394/ohci1394.c | 2 +- trunk/drivers/ieee1394/ohci1394.h | 3 + trunk/drivers/ieee1394/pcilynx.c | 394 +- trunk/drivers/ieee1394/pcilynx.h | 49 +- trunk/drivers/ieee1394/video1394.c | 139 +- trunk/drivers/infiniband/core/sa_query.c | 35 +- trunk/drivers/infiniband/core/user_mad.c | 4 + trunk/drivers/infiniband/include/ib_sa.h | 4 +- trunk/drivers/input/gameport/Kconfig | 20 - trunk/drivers/input/joydev.c | 2 +- trunk/drivers/input/keyboard/atkbd.c | 12 +- trunk/drivers/input/mouse/alps.c | 4 +- trunk/drivers/input/mouse/psmouse-base.c | 7 +- trunk/drivers/input/mouse/synaptics.c | 39 +- trunk/drivers/input/mousedev.c | 15 +- trunk/drivers/input/serio/i8042-x86ia64io.h | 32 +- trunk/drivers/input/serio/i8042.c | 50 +- trunk/drivers/input/serio/serio.c | 25 +- trunk/drivers/input/serio/serport.c | 98 +- trunk/drivers/input/touchscreen/gunze.c | 3 +- trunk/drivers/macintosh/therm_adt746x.c | 125 +- trunk/drivers/macintosh/via-pmu.c | 8 +- trunk/drivers/md/dm-emc.c | 6 +- trunk/drivers/md/dm-hw-handler.c | 2 +- trunk/drivers/md/dm-mpath.c | 32 +- trunk/drivers/md/dm-path-selector.c | 2 +- trunk/drivers/md/dm-table.c | 2 +- trunk/drivers/md/dm-zero.c | 4 +- trunk/drivers/md/dm.c | 96 +- trunk/drivers/md/linear.c | 5 +- trunk/drivers/md/md.c | 14 +- trunk/drivers/md/multipath.c | 11 +- trunk/drivers/md/raid1.c | 7 +- trunk/drivers/md/raid10.c | 6 +- trunk/drivers/md/raid5.c | 7 +- trunk/drivers/md/raid6main.c | 6 +- trunk/drivers/media/common/saa7146_core.c | 4 +- trunk/drivers/media/dvb/Kconfig | 2 +- trunk/drivers/media/dvb/b2c2/Kconfig | 50 +- trunk/drivers/media/dvb/b2c2/Makefile | 12 +- trunk/drivers/media/dvb/b2c2/b2c2-common.c | 214 - trunk/drivers/media/dvb/b2c2/b2c2-usb-core.c | 549 -- trunk/drivers/media/dvb/b2c2/flexcop-common.h | 164 + trunk/drivers/media/dvb/b2c2/flexcop-dma.c | 149 + trunk/drivers/media/dvb/b2c2/flexcop-eeprom.c | 153 + .../drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 403 ++ .../media/dvb/b2c2/flexcop-hw-filter.c | 204 + trunk/drivers/media/dvb/b2c2/flexcop-i2c.c | 210 + trunk/drivers/media/dvb/b2c2/flexcop-misc.c | 66 + trunk/drivers/media/dvb/b2c2/flexcop-pci.c | 381 ++ trunk/drivers/media/dvb/b2c2/flexcop-reg.h | 701 +++ trunk/drivers/media/dvb/b2c2/flexcop-sram.c | 403 ++ trunk/drivers/media/dvb/b2c2/flexcop-usb.c | 577 ++ trunk/drivers/media/dvb/b2c2/flexcop-usb.h | 119 + trunk/drivers/media/dvb/b2c2/flexcop.c | 286 + trunk/drivers/media/dvb/b2c2/flexcop.h | 30 + trunk/drivers/media/dvb/b2c2/skystar2.c | 20 +- trunk/drivers/media/dvb/bt8xx/Kconfig | 3 +- trunk/drivers/media/dvb/bt8xx/Makefile | 4 +- trunk/drivers/media/dvb/bt8xx/bt878.c | 54 +- trunk/drivers/media/dvb/bt8xx/bt878.h | 6 +- trunk/drivers/media/dvb/bt8xx/dst.c | 969 ++- trunk/drivers/media/dvb/bt8xx/dst.h | 40 - trunk/drivers/media/dvb/bt8xx/dst_ca.c | 861 +++ trunk/drivers/media/dvb/bt8xx/dst_ca.h | 58 + trunk/drivers/media/dvb/bt8xx/dst_common.h | 153 + trunk/drivers/media/dvb/bt8xx/dst_priv.h | 1 - trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c | 121 +- trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h | 4 +- trunk/drivers/media/dvb/cinergyT2/cinergyT2.c | 12 +- .../drivers/media/dvb/dibusb/dvb-dibusb-dvb.c | 10 +- .../media/dvb/dibusb/dvb-dibusb-fe-i2c.c | 4 +- trunk/drivers/media/dvb/dibusb/dvb-dibusb.h | 2 +- trunk/drivers/media/dvb/dvb-core/dmxdev.c | 32 +- .../media/dvb/dvb-core/dvb_ca_en50221.c | 38 +- .../drivers/media/dvb/dvb-core/dvb_frontend.c | 36 +- trunk/drivers/media/dvb/dvb-core/dvb_net.c | 75 +- trunk/drivers/media/dvb/dvb-core/dvbdev.c | 9 +- trunk/drivers/media/dvb/dvb-core/dvbdev.h | 2 +- trunk/drivers/media/dvb/frontends/Kconfig | 22 +- trunk/drivers/media/dvb/frontends/at76c651.c | 18 +- trunk/drivers/media/dvb/frontends/cx22700.c | 20 +- trunk/drivers/media/dvb/frontends/cx22702.c | 20 +- trunk/drivers/media/dvb/frontends/cx24110.c | 31 +- trunk/drivers/media/dvb/frontends/dib3000mb.c | 28 +- trunk/drivers/media/dvb/frontends/dib3000mc.c | 26 +- trunk/drivers/media/dvb/frontends/dvb-pll.h | 10 +- .../media/dvb/frontends/dvb_dummy_fe.c | 8 +- trunk/drivers/media/dvb/frontends/l64781.c | 22 +- trunk/drivers/media/dvb/frontends/mt312.c | 32 +- trunk/drivers/media/dvb/frontends/mt352.c | 40 +- trunk/drivers/media/dvb/frontends/mt352.h | 7 - trunk/drivers/media/dvb/frontends/nxt2002.c | 22 +- trunk/drivers/media/dvb/frontends/nxt6000.c | 56 +- .../media/dvb/frontends/nxt6000_priv.h | 21 + trunk/drivers/media/dvb/frontends/or51132.c | 14 +- trunk/drivers/media/dvb/frontends/sp8870.c | 20 +- trunk/drivers/media/dvb/frontends/sp887x.c | 22 +- trunk/drivers/media/dvb/frontends/stv0297.c | 24 +- trunk/drivers/media/dvb/frontends/stv0299.c | 114 +- trunk/drivers/media/dvb/frontends/tda10021.c | 22 +- trunk/drivers/media/dvb/frontends/tda1004x.c | 284 +- trunk/drivers/media/dvb/frontends/tda1004x.h | 7 +- trunk/drivers/media/dvb/frontends/tda8083.c | 26 +- trunk/drivers/media/dvb/frontends/tda80xx.c | 36 +- trunk/drivers/media/dvb/frontends/ves1820.c | 23 +- trunk/drivers/media/dvb/frontends/ves1x93.c | 24 +- trunk/drivers/media/dvb/ttpci/av7110.c | 144 +- trunk/drivers/media/dvb/ttpci/av7110.h | 3 +- trunk/drivers/media/dvb/ttpci/av7110_av.c | 12 +- trunk/drivers/media/dvb/ttpci/av7110_ca.c | 4 +- trunk/drivers/media/dvb/ttpci/av7110_hw.c | 20 +- trunk/drivers/media/dvb/ttpci/av7110_hw.h | 5 - trunk/drivers/media/dvb/ttpci/av7110_ir.c | 2 +- trunk/drivers/media/dvb/ttpci/av7110_v4l.c | 16 +- trunk/drivers/media/dvb/ttpci/budget-av.c | 226 +- trunk/drivers/media/dvb/ttpci/budget-ci.c | 6 +- trunk/drivers/media/dvb/ttpci/budget-core.c | 12 +- trunk/drivers/media/dvb/ttpci/budget-patch.c | 4 +- trunk/drivers/media/dvb/ttpci/budget.c | 4 +- trunk/drivers/media/dvb/ttpci/budget.h | 5 +- .../media/dvb/ttusb-budget/dvb-ttusb-budget.c | 22 +- trunk/drivers/media/dvb/ttusb-dec/ttusb_dec.c | 28 +- trunk/drivers/media/video/Kconfig | 1 + trunk/drivers/media/video/bttv-cards.c | 1 - trunk/drivers/media/video/bttv-i2c.c | 17 +- trunk/drivers/media/video/saa7134/saa6752hs.c | 89 +- .../media/video/saa7134/saa7134-empress.c | 20 +- trunk/drivers/media/video/tuner-core.c | 14 +- trunk/drivers/media/video/video-buf-dvb.c | 12 +- trunk/drivers/mmc/Kconfig | 2 +- trunk/drivers/mmc/mmc_block.c | 5 +- trunk/drivers/mmc/wbsd.c | 716 ++- trunk/drivers/mmc/wbsd.h | 12 + trunk/drivers/net/3c59x.c | 9 +- trunk/drivers/net/Kconfig | 10 + trunk/drivers/net/Makefile | 3 +- trunk/drivers/net/Space.c | 2 +- trunk/drivers/net/amd8111e.c | 24 +- trunk/drivers/net/appletalk/cops.c | 4 +- trunk/drivers/net/appletalk/cops_ffdrv.h | 2 +- trunk/drivers/net/appletalk/cops_ltdrv.h | 2 +- trunk/drivers/net/appletalk/ltpc.c | 2 +- trunk/drivers/net/arcnet/capmode.c | 2 +- trunk/drivers/net/bnx2.c | 5530 +++++++++++++++++ trunk/drivers/net/bnx2.h | 4352 +++++++++++++ trunk/drivers/net/bnx2_fw.h | 2468 ++++++++ trunk/drivers/net/bonding/bond_main.c | 2 +- trunk/drivers/net/e100.c | 165 +- trunk/drivers/net/e1000/e1000.h | 37 +- trunk/drivers/net/e1000/e1000_ethtool.c | 105 +- trunk/drivers/net/e1000/e1000_hw.c | 2133 +++++-- trunk/drivers/net/e1000/e1000_hw.h | 570 +- trunk/drivers/net/e1000/e1000_main.c | 1147 +++- trunk/drivers/net/e1000/e1000_osdep.h | 32 +- trunk/drivers/net/e1000/e1000_param.c | 3 +- trunk/drivers/net/forcedeth.c | 103 +- trunk/drivers/net/ibm_emac/ibm_emac_core.c | 2 +- trunk/drivers/net/iseries_veth.c | 32 +- trunk/drivers/net/ixgb/ixgb.h | 2 +- trunk/drivers/net/ixgb/ixgb_ee.c | 24 +- trunk/drivers/net/ixgb/ixgb_ethtool.c | 4 +- trunk/drivers/net/ixgb/ixgb_main.c | 153 +- trunk/drivers/net/ixgb/ixgb_osdep.h | 3 +- trunk/drivers/net/loopback.c | 2 +- trunk/drivers/net/natsemi.c | 6 +- trunk/drivers/net/ns83820.c | 69 +- trunk/drivers/net/pcnet32.c | 7 +- trunk/drivers/net/sis900.c | 52 +- trunk/drivers/net/tg3.c | 1116 +++- trunk/drivers/net/tg3.h | 8 +- trunk/drivers/net/tlan.c | 12 + trunk/drivers/net/tulip/media.c | 1 + trunk/drivers/net/tulip/tulip_core.c | 2 +- trunk/drivers/net/wireless/Kconfig | 2 +- trunk/drivers/net/wireless/airo.c | 150 +- trunk/drivers/net/wireless/atmel_cs.c | 1 + trunk/drivers/pci/hotplug.c | 119 +- trunk/drivers/pci/hotplug/cpci_hotplug.h | 2 +- trunk/drivers/pci/hotplug/cpci_hotplug_core.c | 427 +- trunk/drivers/pci/hotplug/cpci_hotplug_pci.c | 480 +- trunk/drivers/pci/hotplug/pciehp.h | 1 + trunk/drivers/pci/hotplug/pciehp_core.c | 2 +- trunk/drivers/pci/hotplug/pciehp_hpc.c | 156 +- trunk/drivers/pci/hotplug/shpchp_core.c | 2 +- trunk/drivers/pci/hotplug/shpchp_ctrl.c | 30 +- trunk/drivers/pci/hotplug/shpchprm_acpi.c | 4 +- trunk/drivers/pci/pci-sysfs.c | 12 + trunk/drivers/pci/pci.h | 27 - trunk/drivers/pci/pcie/portdrv_bus.c | 3 +- trunk/drivers/pci/quirks.c | 40 +- trunk/drivers/pcmcia/ds.c | 4 +- trunk/drivers/pcmcia/pd6729.c | 2 +- trunk/drivers/pcmcia/ti113x.h | 40 +- trunk/drivers/s390/block/dasd.c | 16 +- trunk/drivers/s390/net/Makefile | 3 +- trunk/drivers/s390/net/ctcdbug.h | 12 +- trunk/drivers/s390/net/ctcmain.c | 616 +- trunk/drivers/s390/net/ctcmain.h | 276 + trunk/drivers/s390/net/ctctty.c | 5 +- trunk/drivers/s390/net/cu3088.c | 4 +- trunk/drivers/s390/net/cu3088.h | 3 + trunk/drivers/s390/net/iucv.c | 10 +- trunk/drivers/s390/net/lcs.c | 33 +- trunk/drivers/s390/net/qeth.h | 35 +- trunk/drivers/s390/net/qeth_eddp.c | 51 +- trunk/drivers/s390/net/qeth_main.c | 316 +- trunk/drivers/s390/net/qeth_tso.c | 285 - trunk/drivers/s390/net/qeth_tso.h | 166 +- trunk/drivers/s390/scsi/zfcp_aux.c | 2 +- trunk/drivers/s390/scsi/zfcp_def.h | 1 - trunk/drivers/sbus/char/aurora.c | 8 +- trunk/drivers/scsi/NCR53C9x.c | 5 +- trunk/drivers/scsi/aacraid/linit.c | 2 +- trunk/drivers/scsi/ahci.c | 3 + trunk/drivers/scsi/aic7xxx/aic7770_osm.c | 52 +- trunk/drivers/scsi/aic7xxx/aic79xx_osm.c | 2 +- trunk/drivers/scsi/aic7xxx/aic7xxx_osm.c | 1405 +---- trunk/drivers/scsi/aic7xxx/aic7xxx_osm.h | 175 +- trunk/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 11 +- trunk/drivers/scsi/aic7xxx/aic7xxx_proc.c | 13 - trunk/drivers/scsi/aic7xxx/aiclib.c | 1 - trunk/drivers/scsi/ata_piix.c | 2 + trunk/drivers/scsi/ide-scsi.c | 86 +- trunk/drivers/scsi/libata-core.c | 40 +- trunk/drivers/scsi/libata-scsi.c | 5 +- trunk/drivers/scsi/libata.h | 2 +- trunk/drivers/scsi/qla2xxx/qla_attr.c | 8 +- trunk/drivers/scsi/qla2xxx/qla_gbl.h | 4 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 3 +- trunk/drivers/scsi/sata_nv.c | 2 + trunk/drivers/scsi/sata_promise.c | 3 + trunk/drivers/scsi/sata_qstor.c | 2 + trunk/drivers/scsi/sata_sil.c | 2 + trunk/drivers/scsi/sata_sis.c | 1 + trunk/drivers/scsi/sata_svw.c | 3 +- trunk/drivers/scsi/sata_sx4.c | 2 + trunk/drivers/scsi/sata_uli.c | 1 + trunk/drivers/scsi/sata_via.c | 1 + trunk/drivers/scsi/sata_vsc.c | 2 + trunk/drivers/scsi/scsi.c | 2 +- trunk/drivers/scsi/scsi_transport_spi.c | 237 +- trunk/drivers/scsi/sr_ioctl.c | 3 + trunk/drivers/scsi/sym53c416.c | 2 +- trunk/drivers/scsi/sym53c8xx_2/sym_glue.c | 5 +- trunk/drivers/serial/21285.c | 14 +- trunk/drivers/serial/8250.c | 32 +- trunk/drivers/serial/8250_pci.c | 2 + trunk/drivers/serial/amba-pl010.c | 14 +- trunk/drivers/serial/amba-pl011.c | 14 +- trunk/drivers/serial/clps711x.c | 5 +- trunk/drivers/serial/pxa.c | 16 +- trunk/drivers/serial/s3c2410.c | 15 +- trunk/drivers/serial/sa1100.c | 5 +- trunk/drivers/serial/serial_cs.c | 4 +- trunk/drivers/serial/serial_lh7a40x.c | 13 +- trunk/drivers/serial/serial_txx9.c | 15 +- trunk/drivers/serial/sunsab.c | 109 +- trunk/drivers/serial/sunsab.h | 1 + trunk/drivers/serial/vr41xx_siu.c | 6 +- trunk/drivers/telephony/ixj.c | 18 +- trunk/drivers/telephony/ixj.h | 2 - trunk/drivers/usb/atm/speedtch.c | 2 + trunk/drivers/usb/core/sysfs.c | 34 + trunk/drivers/usb/host/Kconfig | 11 + trunk/drivers/usb/host/Makefile | 1 + trunk/drivers/usb/host/ehci-hub.c | 1 + trunk/drivers/usb/host/sl811-hcd.c | 146 +- trunk/drivers/usb/host/sl811_cs.c | 442 ++ trunk/drivers/usb/media/pwc/Makefile | 2 +- trunk/drivers/usb/media/pwc/pwc-ctrl.c | 14 +- trunk/drivers/usb/media/pwc/pwc-dec1.c | 42 - trunk/drivers/usb/media/pwc/pwc-dec1.h | 36 - trunk/drivers/usb/media/pwc/pwc-dec23.c | 623 -- trunk/drivers/usb/media/pwc/pwc-dec23.h | 58 - trunk/drivers/usb/media/pwc/pwc-if.c | 9 +- trunk/drivers/usb/media/pwc/pwc-kiara.c | 573 -- trunk/drivers/usb/media/pwc/pwc-timon.c | 1130 ---- trunk/drivers/usb/media/pwc/pwc-uncompress.c | 4 +- trunk/drivers/usb/net/Kconfig | 14 +- trunk/drivers/usb/net/usbnet.c | 53 +- trunk/drivers/usb/serial/cypress_m8.c | 2 + trunk/drivers/usb/serial/cypress_m8.h | 1 + trunk/drivers/usb/serial/ftdi_sio.c | 3 + trunk/drivers/usb/serial/ftdi_sio.h | 2 + trunk/drivers/usb/serial/usb-serial.c | 20 +- trunk/drivers/video/fbmem.c | 2 +- trunk/drivers/video/fbsysfs.c | 2 +- trunk/drivers/video/intelfb/intelfbdrv.c | 22 +- trunk/drivers/video/sis/init.c | 4 +- trunk/drivers/video/sis/init.h | 3 - trunk/drivers/video/sis/init301.c | 9 +- trunk/drivers/video/sis/init301.h | 4 - trunk/drivers/video/sis/sis_main.c | 5 +- trunk/fs/bad_inode.c | 2 +- trunk/fs/binfmt_elf.c | 4 +- trunk/fs/block_dev.c | 2 +- trunk/fs/buffer.c | 28 +- trunk/fs/char_dev.c | 2 +- trunk/fs/cifs/README | 10 +- trunk/fs/cifs/cifsproto.h | 2 +- trunk/fs/cifs/cifssmb.c | 56 +- trunk/fs/cifs/dir.c | 3 +- trunk/fs/cifs/inode.c | 24 +- trunk/fs/cifs/misc.c | 1 + trunk/fs/dcache.c | 2 +- trunk/fs/eventpoll.c | 2 +- trunk/fs/exec.c | 7 +- trunk/fs/ext3/inode.c | 46 - trunk/fs/ext3/super.c | 10 +- trunk/fs/hostfs/hostfs_kern.c | 11 +- trunk/fs/inode.c | 23 +- trunk/fs/jffs2/compr_rubin.c | 18 +- trunk/fs/jffs2/compr_zlib.c | 12 +- trunk/fs/locks.c | 6 +- trunk/fs/mbcache.c | 2 +- trunk/fs/mpage.c | 14 +- trunk/fs/namei.c | 9 +- trunk/fs/nfs/idmap.c | 4 +- trunk/fs/nfs/inode.c | 4 +- trunk/fs/nls/nls_base.c | 2 +- trunk/fs/partitions/msdos.c | 5 - trunk/fs/proc/mmu.c | 14 +- trunk/fs/proc/proc_devtree.c | 105 +- trunk/fs/reiserfs/namei.c | 2 +- trunk/fs/reiserfs/stree.c | 1 - trunk/fs/reiserfs/super.c | 4 +- trunk/fs/select.c | 6 +- trunk/fs/udf/udftime.c | 4 +- trunk/fs/xfs/Makefile | 2 +- trunk/fs/xfs/linux-2.6/xfs_aops.c | 80 +- trunk/fs/xfs/linux-2.6/xfs_buf.c | 11 +- trunk/fs/xfs/linux-2.6/xfs_file.c | 50 +- trunk/fs/xfs/linux-2.6/xfs_ioctl32.c | 29 +- trunk/fs/xfs/linux-2.6/xfs_ioctl32.h | 6 +- trunk/fs/xfs/linux-2.6/xfs_lrw.c | 3 + trunk/fs/xfs/linux-2.6/xfs_super.c | 3 +- trunk/fs/xfs/linux-2.6/xfs_vnode.c | 5 +- trunk/fs/xfs/linux-2.6/xfs_vnode.h | 10 +- trunk/fs/xfs/xfs_dfrag.c | 2 +- trunk/fs/xfs/xfs_iget.c | 51 +- trunk/fs/xfs/xfs_inode.c | 2 +- trunk/fs/xfs/xfs_inode.h | 6 +- trunk/fs/xfs/xfs_iomap.c | 30 +- trunk/fs/xfs/xfs_iomap.h | 25 +- trunk/fs/xfs/xfs_mount.c | 9 + trunk/fs/xfs/xfs_mount.h | 19 +- trunk/fs/xfs/xfs_types.h | 1 + trunk/fs/xfs/xfs_utils.c | 2 +- trunk/fs/xfs/xfs_utils.h | 2 +- trunk/fs/xfs/xfs_vfsops.c | 67 +- trunk/fs/xfs/xfs_vnodeops.c | 11 +- trunk/include/asm-arm/arch-imx/imx-regs.h | 24 + trunk/include/asm-arm/arch-imx/imxfb.h | 35 + .../include/asm-arm/arch-s3c2410/regs-nand.h | 44 +- trunk/include/asm-arm/page.h | 18 +- trunk/include/asm-arm/processor.h | 7 +- trunk/include/asm-arm/thread_info.h | 6 +- trunk/include/asm-generic/sections.h | 2 + trunk/include/asm-i386/floppy.h | 2 +- trunk/include/asm-i386/linkage.h | 4 +- trunk/include/asm-i386/module.h | 4 +- trunk/include/asm-i386/timer.h | 1 + trunk/include/asm-ia64/ioctl32.h | 1 - trunk/include/asm-ia64/perfmon.h | 8 + trunk/include/asm-ia64/sn/sn_sal.h | 28 +- trunk/include/asm-parisc/floppy.h | 2 +- trunk/include/asm-ppc/cpm2.h | 46 + trunk/include/asm-ppc/m8260_pci.h | 1 + trunk/include/asm-ppc/mpc8260.h | 2 +- trunk/include/asm-ppc64/iSeries/mf.h | 1 + trunk/include/asm-ppc64/imalloc.h | 24 + trunk/include/asm-ppc64/mmu.h | 193 +- trunk/include/asm-ppc64/mmu_context.h | 82 - trunk/include/asm-ppc64/page.h | 15 +- trunk/include/asm-ppc64/pgtable.h | 117 +- trunk/include/asm-ppc64/prom.h | 13 +- trunk/include/asm-ppc64/xics.h | 3 - trunk/include/asm-sh/floppy.h | 2 +- trunk/include/asm-sh/thread_info.h | 2 +- trunk/include/asm-sh64/thread_info.h | 2 +- trunk/include/asm-sparc64/iommu.h | 2 + trunk/include/asm-sparc64/pbm.h | 8 +- trunk/include/asm-sparc64/pgalloc.h | 9 +- trunk/include/asm-sparc64/spitfire.h | 3 + trunk/include/asm-um/arch-signal-i386.h | 24 - trunk/include/asm-um/archparam-i386.h | 137 - trunk/include/asm-um/archparam-ppc.h | 20 - trunk/include/asm-um/archparam-x86_64.h | 36 - trunk/include/asm-um/delay.h | 2 + trunk/include/asm-um/elf-i386.h | 169 + trunk/include/asm-um/{elf.h => elf-ppc.h} | 25 +- trunk/include/asm-um/elf-x86_64.h | 95 + trunk/include/asm-um/fixmap.h | 1 + trunk/include/asm-um/ipc.h | 7 +- trunk/include/asm-um/linkage.h | 7 +- trunk/include/asm-um/page.h | 11 +- trunk/include/asm-um/pgtable-3level.h | 2 +- trunk/include/asm-um/pgtable.h | 10 +- trunk/include/asm-um/processor-generic.h | 5 - trunk/include/asm-um/processor-i386.h | 7 +- trunk/include/asm-um/processor-x86_64.h | 12 +- trunk/include/asm-um/setup.h | 3 +- trunk/include/asm-um/thread_info.h | 9 +- trunk/include/asm-x86_64/apicdef.h | 2 +- trunk/include/asm-x86_64/bug.h | 2 + trunk/include/asm-x86_64/floppy.h | 2 +- trunk/include/asm-x86_64/io_apic.h | 1 - trunk/include/asm-x86_64/ioctl32.h | 1 - trunk/include/asm-x86_64/nmi.h | 2 + trunk/include/asm-x86_64/processor.h | 5 +- trunk/include/asm-x86_64/proto.h | 5 + trunk/include/asm-x86_64/vsyscall.h | 3 + trunk/include/linux/acpi.h | 5 +- trunk/include/linux/awe_voice.h | 6 +- trunk/include/linux/binfmts.h | 1 - trunk/include/linux/cpufreq.h | 2 +- trunk/include/linux/device.h | 3 - trunk/include/linux/err.h | 4 +- trunk/include/linux/etherdevice.h | 24 +- trunk/include/linux/ethtool.h | 1 + trunk/include/linux/fddidevice.h | 2 +- trunk/include/linux/fs.h | 2 +- trunk/include/linux/gameport.h | 28 +- trunk/include/linux/hardirq.h | 6 +- trunk/include/linux/hippidevice.h | 2 +- trunk/include/linux/ide.h | 20 +- trunk/include/linux/if.h | 2 +- trunk/include/linux/if_arp.h | 2 +- trunk/include/linux/if_ltalk.h | 2 +- trunk/include/linux/if_tr.h | 45 +- trunk/include/linux/inetdevice.h | 2 + trunk/include/linux/ixjuser.h | 2 - trunk/include/linux/kprobes.h | 3 + trunk/include/linux/libata.h | 8 + trunk/include/linux/mii.h | 8 + trunk/include/linux/mm.h | 4 +- trunk/include/linux/mmc/protocol.h | 27 + trunk/include/linux/mpage.h | 3 - trunk/include/linux/net.h | 3 +- trunk/include/linux/netdevice.h | 7 +- trunk/include/linux/notifier.h | 1 + trunk/include/linux/patchkey.h | 45 + trunk/include/linux/pci_ids.h | 10 + trunk/include/linux/pkt_sched.h | 9 +- trunk/include/linux/sched.h | 7 +- trunk/include/linux/serial_core.h | 19 + trunk/include/linux/sockios.h | 2 +- trunk/include/linux/soundcard.h | 34 +- trunk/include/linux/spinlock.h | 8 +- trunk/include/linux/sysctl.h | 1 + trunk/include/linux/trdevice.h | 2 +- trunk/include/linux/vmalloc.h | 1 + trunk/include/linux/wait.h | 4 +- trunk/include/media/video-buf-dvb.h | 2 +- trunk/include/net/act_generic.h | 4 +- trunk/include/net/icmp.h | 2 +- trunk/include/net/ip.h | 2 +- trunk/include/net/route.h | 5 +- trunk/include/net/sock.h | 4 +- trunk/include/net/tcp.h | 2 +- trunk/include/net/udp.h | 2 +- trunk/include/net/xfrm.h | 2 + trunk/include/scsi/scsi_transport_spi.h | 6 + trunk/init/Kconfig | 2 +- trunk/kernel/Makefile | 2 +- trunk/kernel/cpuset.c | 24 +- trunk/kernel/irq/handle.c | 3 +- trunk/kernel/itimer.c | 6 +- trunk/kernel/kallsyms.c | 13 +- trunk/kernel/kprobes.c | 142 +- trunk/kernel/module.c | 6 + trunk/kernel/power/main.c | 6 +- trunk/kernel/printk.c | 72 +- trunk/kernel/profile.c | 16 +- trunk/kernel/sched.c | 2 +- trunk/kernel/signal.c | 11 +- trunk/kernel/spinlock.c | 8 +- trunk/kernel/sys.c | 2 +- trunk/lib/Kconfig.debug | 3 +- trunk/lib/sort.c | 2 +- trunk/lib/string.c | 8 + trunk/mm/filemap.c | 7 +- trunk/mm/memory.c | 17 +- trunk/mm/mmap.c | 63 +- trunk/mm/mremap.c | 7 +- trunk/mm/nommu.c | 3 +- trunk/mm/rmap.c | 8 +- trunk/mm/swapfile.c | 2 +- trunk/mm/vmalloc.c | 33 +- trunk/net/802/fddi.c | 2 +- trunk/net/802/hippi.c | 2 +- trunk/net/802/tr.c | 26 +- trunk/net/appletalk/dev.c | 22 +- trunk/net/bridge/br_device.c | 15 +- trunk/net/bridge/br_if.c | 23 + trunk/net/bridge/br_input.c | 8 +- trunk/net/bridge/br_notify.c | 9 + trunk/net/bridge/br_private.h | 1 + trunk/net/bridge/br_stp_bpdu.c | 3 + trunk/net/core/dev.c | 14 +- trunk/net/core/ethtool.c | 20 +- trunk/net/core/net-sysfs.c | 3 +- trunk/net/core/sock.c | 14 +- trunk/net/decnet/dn_dev.c | 2 +- trunk/net/ethernet/eth.c | 2 +- trunk/net/ipv4/af_inet.c | 2 +- trunk/net/ipv4/devinet.c | 36 +- trunk/net/ipv4/esp4.c | 2 +- trunk/net/ipv4/ip_input.c | 2 +- trunk/net/ipv4/ip_output.c | 10 +- trunk/net/ipv4/ipvs/ip_vs_xmit.c | 1 - trunk/net/ipv4/multipath_drr.c | 18 +- trunk/net/ipv4/multipath_rr.c | 20 - trunk/net/ipv4/multipath_wrandom.c | 6 +- trunk/net/ipv4/netfilter/ip_conntrack_core.c | 28 +- trunk/net/ipv4/netfilter/ip_queue.c | 10 + trunk/net/ipv4/protocol.c | 2 +- trunk/net/ipv4/raw.c | 2 +- trunk/net/ipv4/route.c | 2 +- trunk/net/ipv4/tcp.c | 2 +- trunk/net/ipv4/tcp_input.c | 13 +- trunk/net/ipv4/tcp_minisocks.c | 2 +- trunk/net/ipv4/tcp_output.c | 2 +- trunk/net/ipv4/tcp_timer.c | 2 +- trunk/net/ipv4/udp.c | 14 +- trunk/net/ipv6/ip6_flowlabel.c | 10 +- trunk/net/ipv6/ip6_output.c | 14 +- trunk/net/ipv6/xfrm6_output.c | 1 + trunk/net/ipv6/xfrm6_policy.c | 4 + trunk/net/netlink/af_netlink.c | 13 +- trunk/net/packet/af_packet.c | 2 +- trunk/net/sched/sch_dsmark.c | 16 +- trunk/net/sched/sch_netem.c | 209 +- trunk/net/socket.c | 2 +- trunk/net/unix/af_unix.c | 28 +- trunk/net/xfrm/xfrm_algo.c | 2 +- trunk/net/xfrm/xfrm_policy.c | 4 +- trunk/net/xfrm/xfrm_user.c | 15 +- trunk/scripts/kallsyms.c | 20 +- trunk/scripts/kconfig/Makefile | 14 +- trunk/scripts/kconfig/POTFILES.in | 5 + trunk/scripts/kconfig/conf.c | 20 +- trunk/scripts/kconfig/confdata.c | 16 +- trunk/scripts/kconfig/gconf.c | 52 +- trunk/scripts/kconfig/kxgettext.c | 221 + trunk/scripts/kconfig/lkc.h | 8 + trunk/scripts/kconfig/mconf.c | 120 +- trunk/scripts/kconfig/menu.c | 4 +- trunk/scripts/kconfig/qconf.cc | 59 +- trunk/scripts/patch-kernel | 131 +- trunk/security/selinux/ss/services.c | 8 +- trunk/sound/isa/Kconfig | 1 + trunk/sound/oss/Kconfig | 12 +- trunk/sound/oss/ac97_codec.c | 1 + trunk/sound/pci/intel8x0.c | 6 +- trunk/sound/pci/via82xx.c | 2 +- trunk/sound/ppc/pmac.c | 30 +- 904 files changed, 37256 insertions(+), 16628 deletions(-) delete mode 100644 trunk/Documentation/BK-usage/00-INDEX delete mode 100644 trunk/Documentation/BK-usage/bk-kernel-howto.txt delete mode 100755 trunk/Documentation/BK-usage/bk-make-sum delete mode 100755 trunk/Documentation/BK-usage/bksend delete mode 100755 trunk/Documentation/BK-usage/bz64wrap delete mode 100755 trunk/Documentation/BK-usage/cpcset delete mode 100755 trunk/Documentation/BK-usage/cset-to-linus delete mode 100755 trunk/Documentation/BK-usage/csets-to-patches delete mode 100755 trunk/Documentation/BK-usage/gcapatch delete mode 100755 trunk/Documentation/BK-usage/unbz64wrap create mode 100644 trunk/Documentation/cpu-freq/cpufreq-stats.txt create mode 100644 trunk/Documentation/dvb/README.flexcop create mode 100644 trunk/Documentation/dvb/ci.txt delete mode 100644 trunk/arch/arm/mm/copypage-v4mc.S create mode 100644 trunk/arch/arm/mm/copypage-v4mc.c create mode 100644 trunk/arch/i386/kernel/cpu/cpufreq/sc520_freq.c delete mode 100644 trunk/arch/ppc/syslib/m8260_pci.c delete mode 100644 trunk/arch/ppc/syslib/m8260_pci.h create mode 100644 trunk/arch/ppc/syslib/m82xx_pci.c create mode 100644 trunk/arch/ppc/syslib/m82xx_pci.h delete mode 100644 trunk/arch/ppc64/boot/start.c delete mode 100644 trunk/arch/um/include/2_5compat.h create mode 100644 trunk/arch/um/include/common-offsets.h create mode 100644 trunk/arch/um/include/sysdep-i386/faultinfo.h create mode 100644 trunk/arch/um/include/sysdep-i386/skas_ptrace.h create mode 100644 trunk/arch/um/include/sysdep-ia64/skas_ptrace.h create mode 100644 trunk/arch/um/include/sysdep-ppc/skas_ptrace.h create mode 100644 trunk/arch/um/include/sysdep-x86_64/faultinfo.h create mode 100644 trunk/arch/um/include/sysdep-x86_64/skas_ptrace.h delete mode 100644 trunk/arch/um/kernel/checksum.c rename trunk/arch/um/kernel/{initrd_kern.c => initrd.c} (75%) delete mode 100644 trunk/arch/um/kernel/initrd_user.c create mode 100644 trunk/arch/um/kernel/vmlinux.lds.S create mode 100644 trunk/arch/um/sys-i386/kernel-offsets.c create mode 100644 trunk/arch/um/sys-i386/user-offsets.c create mode 100644 trunk/arch/um/sys-i386/util/mk_thread.c delete mode 100644 trunk/arch/um/sys-i386/util/mk_thread_kern.c delete mode 100644 trunk/arch/um/sys-i386/util/mk_thread_user.c create mode 100644 trunk/arch/um/sys-x86_64/kernel-offsets.c create mode 100644 trunk/arch/um/sys-x86_64/ksyms.c create mode 100644 trunk/arch/um/sys-x86_64/um_module.c create mode 100644 trunk/arch/um/sys-x86_64/user-offsets.c create mode 100644 trunk/arch/um/sys-x86_64/util/mk_thread.c delete mode 100644 trunk/arch/um/sys-x86_64/util/mk_thread_kern.c delete mode 100644 trunk/arch/um/sys-x86_64/util/mk_thread_user.c create mode 100644 trunk/arch/um/util/mk_constants.c delete mode 100644 trunk/arch/um/util/mk_constants_kern.c delete mode 100644 trunk/arch/um/util/mk_constants_user.c rename trunk/arch/um/util/{mk_task_user.c => mk_task.c} (75%) delete mode 100644 trunk/arch/um/util/mk_task_kern.c create mode 100644 trunk/arch/x86_64/kernel/pmtimer.c delete mode 100644 trunk/drivers/base/interface.c create mode 100644 trunk/drivers/cpufreq/cpufreq_conservative.c delete mode 100644 trunk/drivers/media/dvb/b2c2/b2c2-common.c delete mode 100644 trunk/drivers/media/dvb/b2c2/b2c2-usb-core.c create mode 100644 trunk/drivers/media/dvb/b2c2/flexcop-common.h create mode 100644 trunk/drivers/media/dvb/b2c2/flexcop-dma.c create mode 100644 trunk/drivers/media/dvb/b2c2/flexcop-eeprom.c create mode 100644 trunk/drivers/media/dvb/b2c2/flexcop-fe-tuner.c create mode 100644 trunk/drivers/media/dvb/b2c2/flexcop-hw-filter.c create mode 100644 trunk/drivers/media/dvb/b2c2/flexcop-i2c.c create mode 100644 trunk/drivers/media/dvb/b2c2/flexcop-misc.c create mode 100644 trunk/drivers/media/dvb/b2c2/flexcop-pci.c create mode 100644 trunk/drivers/media/dvb/b2c2/flexcop-reg.h create mode 100644 trunk/drivers/media/dvb/b2c2/flexcop-sram.c create mode 100644 trunk/drivers/media/dvb/b2c2/flexcop-usb.c create mode 100644 trunk/drivers/media/dvb/b2c2/flexcop-usb.h create mode 100644 trunk/drivers/media/dvb/b2c2/flexcop.c create mode 100644 trunk/drivers/media/dvb/b2c2/flexcop.h delete mode 100644 trunk/drivers/media/dvb/bt8xx/dst.h create mode 100644 trunk/drivers/media/dvb/bt8xx/dst_ca.c create mode 100644 trunk/drivers/media/dvb/bt8xx/dst_ca.h create mode 100644 trunk/drivers/media/dvb/bt8xx/dst_common.h create mode 100644 trunk/drivers/net/bnx2.c create mode 100644 trunk/drivers/net/bnx2.h create mode 100644 trunk/drivers/net/bnx2_fw.h create mode 100644 trunk/drivers/s390/net/ctcmain.h delete mode 100644 trunk/drivers/s390/net/qeth_tso.c create mode 100644 trunk/drivers/usb/host/sl811_cs.c delete mode 100644 trunk/drivers/usb/media/pwc/pwc-dec1.c delete mode 100644 trunk/drivers/usb/media/pwc/pwc-dec1.h delete mode 100644 trunk/drivers/usb/media/pwc/pwc-dec23.c delete mode 100644 trunk/drivers/usb/media/pwc/pwc-dec23.h create mode 100644 trunk/include/asm-arm/arch-imx/imxfb.h delete mode 100644 trunk/include/asm-ia64/ioctl32.h create mode 100644 trunk/include/asm-ppc64/imalloc.h delete mode 100644 trunk/include/asm-um/arch-signal-i386.h create mode 100644 trunk/include/asm-um/elf-i386.h rename trunk/include/asm-um/{elf.h => elf-ppc.h} (51%) create mode 100644 trunk/include/asm-um/elf-x86_64.h delete mode 100644 trunk/include/asm-x86_64/ioctl32.h create mode 100644 trunk/include/linux/patchkey.h create mode 100644 trunk/scripts/kconfig/POTFILES.in create mode 100644 trunk/scripts/kconfig/kxgettext.c diff --git a/[refs] b/[refs] index 5aaaf4a34fb9..954c87f7a8e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 259692bd5a2b2c2d351dd90748ba4126bc2a21b9 +refs/heads/master: 7078253c085c037c070ca4e8bc9e9e7f18aa1e84 diff --git a/trunk/CREDITS b/trunk/CREDITS index c9068febcffc..9bd099d960f3 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -339,7 +339,7 @@ W: http://tomas.nocrew.org/ D: dsp56k device driver N: Ross Biro -E: bir7@leland.Stanford.Edu +E: ross.biro@gmail.com D: Original author of the Linux networking code N: Anton Blanchard @@ -882,13 +882,12 @@ S: Blacksburg, Virginia 24061 S: USA N: Randy Dunlap -E: rddunlap@osdl.org +E: rdunlap@xenotime.net W: http://www.xenotime.net/linux/linux.html W: http://www.linux-usb.org D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers D: x86 SMP, ACPI, bootflag hacking -S: 12725 SW Millikan Way, Suite 400 -S: Beaverton, Oregon 97005 +S: (ask for current address) S: USA N: Bob Dunlop diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX index 72dc90f8f4a7..8de8a01a2474 100644 --- a/trunk/Documentation/00-INDEX +++ b/trunk/Documentation/00-INDEX @@ -12,8 +12,6 @@ Following translations are available on the WWW: 00-INDEX - this file. -BK-usage/ - - directory with info on BitKeeper. BUG-HUNTING - brute force method of doing binary search of patches to find bug. Changes diff --git a/trunk/Documentation/BK-usage/00-INDEX b/trunk/Documentation/BK-usage/00-INDEX deleted file mode 100644 index 82768784ea52..000000000000 --- a/trunk/Documentation/BK-usage/00-INDEX +++ /dev/null @@ -1,51 +0,0 @@ -bk-kernel-howto.txt: Description of kernel workflow under BitKeeper - -bk-make-sum: Create summary of changesets in one repository and not -another, typically in preparation to be sent to an upstream maintainer. -Typical usage: - cd my-updated-repo - bk-make-sum ~/repo/original-repo - mv /tmp/linus.txt ../original-repo.txt - -bksend: Create readable text output containing summary of changes, GNU -patch of the changes, and BK metadata of changes (as needed for proper -importing into BitKeeper by an upstream maintainer). This output is -suitable for emailing BitKeeper changes. The recipient of this output -may pipe it directly to 'bk receive'. - -bz64wrap: helper script. Uncompressed input is piped to this script, -which compresses its input, and then outputs the uu-/base64-encoded -version of the compressed input. - -cpcset: Copy changeset between unrelated repositories. -Attempts to preserve changeset user, user address, description, in -addition to the changeset (the patch) itself. -Typical usage: - cd my-updated-repo - bk changes # looking for a changeset... - cpcset 1.1511 . ../another-repo - -csets-to-patches: Produces a delta of two BK repositories, in the form -of individual files, each containing a single cset as a GNU patch. -Output is several files, each with the filename "/tmp/rev-$REV.patch" -Typical usage: - cd my-updated-repo - bk changes -L ~/repo/original-repo 2>&1 | \ - perl csets-to-patches - -cset-to-linus: Produces a delta of two BK repositories, in the form of -changeset descriptions, with 'diffstat' output created for each -individual changset. -Typical usage: - cd my-updated-repo - bk changes -L ~/repo/original-repo 2>&1 | \ - perl cset-to-linus > summary.txt - -gcapatch: Generates patch containing changes in local repository. -Typical usage: - cd my-updated-repo - gcapatch > foo.patch - -unbz64wrap: Reverse an encoded, compressed data stream created by -bz64wrap into an uncompressed, typically text/plain output. - diff --git a/trunk/Documentation/BK-usage/bk-kernel-howto.txt b/trunk/Documentation/BK-usage/bk-kernel-howto.txt deleted file mode 100644 index b7b9075d2910..000000000000 --- a/trunk/Documentation/BK-usage/bk-kernel-howto.txt +++ /dev/null @@ -1,283 +0,0 @@ - - Doing the BK Thing, Penguin-Style - - - - -This set of notes is intended mainly for kernel developers, occasional -or full-time, but sysadmins and power users may find parts of it useful -as well. It assumes at least a basic familiarity with CVS, both at a -user level (use on the cmd line) and at a higher level (client-server model). -Due to the author's background, an operation may be described in terms -of CVS, or in terms of how that operation differs from CVS. - -This is -not- intended to be BitKeeper documentation. Always run -"bk help " or in X "bk helptool " for reference -documentation. - - -BitKeeper Concepts ------------------- - -In the true nature of the Internet itself, BitKeeper is a distributed -system. When applied to revision control, this means doing away with -client-server, and changing to a parent-child model... essentially -peer-to-peer. On the developer's end, this also represents a -fundamental disruption in the standard workflow of changes, commits, -and merges. You will need to take a few minutes to think about -how to best work under BitKeeper, and re-optimize things a bit. -In some sense it is a bit radical, because it might described as -tossing changes out into a maelstrom and having them magically -land at the right destination... but I'm getting ahead of myself. - -Let's start with this progression: -Each BitKeeper source tree on disk is a repository unto itself. -Each repository has a parent (except the root/original, of course). -Each repository contains a set of a changesets ("csets"). -Each cset is one or more changed files, bundled together. - -Each tree is a repository, so all changes are checked into the local -tree. When a change is checked in, all modified files are grouped -into a logical unit, the changeset. Internally, BK links these -changesets in a tree, representing various converging and diverging -lines of development. These changesets are the bread and butter of -the BK system. - -After the concept of changesets, the next thing you need to get used -to is having multiple copies of source trees lying around. This -really- -takes some getting used to, for some people. Separate source trees -are the means in BitKeeper by which you delineate parallel lines -of development, both minor and major. What would be branches in -CVS become separate source trees, or "clones" in BitKeeper [heh, -or Star Wars] terminology. - -Clones and changesets are the tools from which most of the power of -BitKeeper is derived. As mentioned earlier, each clone has a parent, -the tree used as the source when the new clone was created. In a -CVS-like setup, the parent would be a remote server on the Internet, -and the child is your local clone of that tree. - -Once you have established a common baseline between two source trees -- -a common parent -- then you can merge changesets between those two -trees with ease. Merging changes into a tree is called a "pull", and -is analagous to 'cvs update'. A pull downloads all the changesets in -the remote tree you do not have, and merges them. Sending changes in -one tree to another tree is called a "push". Push sends all changes -in the local tree the remote does not yet have, and merges them. - -From these concepts come some initial command examples: - -1) bk clone -q http://linux.bkbits.net/linux-2.5 linus-2.5 -Download a 2.5 stock kernel tree, naming it "linus-2.5" in the local dir. -The "-q" disables listing every single file as it is downloaded. - -2) bk clone -ql linus-2.5 alpha-2.5 -Create a separate source tree for the Alpha AXP architecture. -The "-l" uses hard links instead of copying data, since both trees are -on the local disk. You can also replace the above with "bk lclone -q ..." - -You only clone a tree -once-. After cloning the tree lives a long time -on disk, being updating by pushes and pulls. - -3) cd alpha-2.5 ; bk pull http://gkernel.bkbits.net/alpha-2.5 -Download changes in "alpha-2.5" repository which are not present -in the local repository, and merge them into the source tree. - -4) bk -r co -q -Because every tree is a repository, files must be checked out before -they will be in their standard places in the source tree. - -5) bk vi fs/inode.c # example change... - bk citool # checkin, using X tool - bk push bk://gkernel@bkbits.net/alpha-2.5 # upload change -Typical example of a BK sequence that would replace the analagous CVS -situation, - vi fs/inode.c - cvs commit - -As this is just supposed to be a quick BK intro, for more in-depth -tutorials, live working demos, and docs, see http://www.bitkeeper.com/ - - - -BK and Kernel Development Workflow ----------------------------------- -Currently the latest 2.5 tree is available via "bk clone $URL" -and "bk pull $URL" at http://linux.bkbits.net/linux-2.5 -This should change in a few weeks to a kernel.org URL. - - -A big part of using BitKeeper is organizing the various trees you have -on your local disk, and organizing the flow of changes among those -trees, and remote trees. If one were to graph the relationships between -a desired BK setup, you are likely to see a few-many-few graph, like -this: - - linux-2.5 - | - merge-to-linus-2.5 - / | | - / | | - vm-hacks bugfixes filesys personal-hacks - \ | | / - \ | | / - \ | | / - testing-and-validation - -Since a "bk push" sends all changes not in the target tree, and -since a "bk pull" receives all changes not in the source tree, you want -to make sure you are only pushing specific changes to the desired tree, -not all changes from "peer parent" trees. For example, pushing a change -from the testing-and-validation tree would probably be a bad idea, -because it will push all changes from vm-hacks, bugfixes, filesys, and -personal-hacks trees into the target tree. - -One would typically work on only one "theme" at a time, either -vm-hacks or bugfixes or filesys, keeping those changes isolated in -their own tree during development, and only merge the isolated with -other changes when going upstream (to Linus or other maintainers) or -downstream (to your "union" trees, like testing-and-validation above). - -It should be noted that some of this separation is not just recommended -practice, it's actually [for now] -enforced- by BitKeeper. BitKeeper -requires that changesets maintain a certain order, which is the reason -that "bk push" sends all local changesets the remote doesn't have. This -separation may look like a lot of wasted disk space at first, but it -helps when two unrelated changes may "pollute" the same area of code, or -don't follow the same pace of development, or any other of the standard -reasons why one creates a development branch. - -Small development branches (clones) will appear and disappear: - - -------- A --------- B --------- C --------- D ------- - \ / - -----short-term devel branch----- - -While long-term branches will parallel a tree (or trees), with period -merge points. In this first example, we pull from a tree (pulls, -"\") periodically, such as what occurs when tracking changes in a -vendor tree, never pushing changes back up the line: - - -------- A --------- B --------- C --------- D ------- - \ \ \ - ----long-term devel branch----------------- - -And then a more common case in Linux kernel development, a long term -branch with periodic merges back into the tree (pushes, "/"): - - -------- A --------- B --------- C --------- D ------- - \ \ / \ - ----long-term devel branch----------------- - - - - - -Submitting Changes to Linus ---------------------------- -There's a bit of an art, or style, of submitting changes to Linus. -Since Linus's tree is now (you might say) fully integrated into the -distributed BitKeeper system, there are several prerequisites to -properly submitting a BitKeeper change. All these prereq's are just -general cleanliness of BK usage, so as people become experts at BK, feel -free to optimize this process further (assuming Linus agrees, of -course). - - - -0) Make sure your tree was originally cloned from the linux-2.5 tree -created by Linus. If your tree does not have this as its ancestor, it -is impossible to reliably exchange changesets. - - - -1) Pay attention to your commit text. The commit message that -accompanies each changeset you submit will live on forever in history, -and is used by Linus to accurately summarize the changes in each -pre-patch. Remember that there is no context, so - "fix for new scheduler changes" -would be too vague, but - "fix mips64 arch for new scheduler switch_to(), TIF_xxx semantics" -would be much better. - -You can and should use the command "bk comment -C" to update the -commit text, and improve it after the fact. This is very useful for -development: poor, quick descriptions during development, which get -cleaned up using "bk comment" before issuing the "bk push" to submit the -changes. - - - -2) Include an Internet-available URL for Linus to pull from, such as - - Pull from: http://gkernel.bkbits.net/net-drivers-2.5 - - - -3) Include a summary and "diffstat -p1" of each changeset that will be -downloaded, when Linus issues a "bk pull". The author auto-generates -these summaries using "bk changes -L ", to obtain a listing -of all the pending-to-send changesets, and their commit messages. - -It is important to show Linus what he will be downloading when he issues -a "bk pull", to reduce the time required to sift the changes once they -are downloaded to Linus's local machine. - -IMPORTANT NOTE: One of the features of BK is that your repository does -not have to be up to date, in order for Linus to receive your changes. -It is considered a courtesy to keep your repository fairly recent, to -lessen any potential merge work Linus may need to do. - - -4) Split up your changes. Each maintainer<->Linus situation is likely -to be slightly different here, so take this just as general advice. The -author splits up changes according to "themes" when merging with Linus. -Simultaneous pushes from local development go to special trees which -exist solely to house changes "queued" for Linus. Example of the trees: - - net-drivers-2.5 -- on-going net driver maintenance - vm-2.5 -- VM-related changes - fs-2.5 -- filesystem-related changes - -Linus then has much more freedom for pulling changes. He could (for -example) issue a "bk pull" on vm-2.5 and fs-2.5 trees, to merge their -changes, but hold off net-drivers-2.5 because of a change that needs -more discussion. - -Other maintainers may find that a single linus-pull-from tree is -adequate for passing BK changesets to him. - - - -Frequently Answered Questions ------------------------------ -1) How do I change the e-mail address shown in the changelog? -A. When you run "bk citool" or "bk commit", set environment - variables BK_USER and BK_HOST to the desired username - and host/domain name. - - -2) How do I use tags / get a diff between two kernel versions? -A. Pass the tags Linus uses to 'bk export'. - -ChangeSets are in a forward-progressing order, so it's pretty easy -to get a snapshot starting and ending at any two points in time. -Linus puts tags on each release and pre-release, so you could use -these two examples: - - bk export -tpatch -hdu -rv2.5.4,v2.5.5 | less - # creates patch-2.5.5 essentially - bk export -tpatch -du -rv2.5.5-pre1,v2.5.5 | less - # changes from pre1 to final - -A tag is just an alias for a specific changeset... and since changesets -are ordered, a tag is thus a marker for a specific point in time (or -specific state of the tree). - - -3) Is there an easy way to generate One Big Patch versus mainline, - for my long-lived kernel branch? -A. Yes. This requires BK 3.x, though. - - bk export -tpatch -r`bk repogca bk://linux.bkbits.net/linux-2.5`,+ - diff --git a/trunk/Documentation/BK-usage/bk-make-sum b/trunk/Documentation/BK-usage/bk-make-sum deleted file mode 100755 index 58ca46a0fcc6..000000000000 --- a/trunk/Documentation/BK-usage/bk-make-sum +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -e -# DIR=$HOME/BK/axp-2.5 -# cd $DIR - -LINUS_REPO=$1 -DIRBASE=`basename $PWD` - -{ -cat </dev/null - -cat < (:D: :I:)\n$each(:C:){ (:C:)\n}\n}' - - -} > /tmp/linus.txt - -cat < 13/02/2002 -# -# Add diffstat output after Changelog 21/02/2002 - -PROG=bksend - -usage() { - echo "usage: $PROG -r" - echo -e "\twhere is of the form '1.23', '1.23..', '1.23..1.27'," - echo -e "\tor '+' to indicate the most recent revision" - - exit 1 -} - -case $1 in --r) REV=$2; shift ;; --r*) REV=`echo $1 | sed 's/^-r//'` ;; -*) echo "$PROG: no revision given, you probably don't want that";; -esac - -[ -z "$REV" ] && usage - -echo "You can import this changeset into BK by piping this whole message to:" -echo "'| bk receive [path to repository]' or apply the patch as usual." - -SEP="\n===================================================================\n\n" -echo -e $SEP -env PAGER=/bin/cat bk changes -r$REV -echo -bk export -tpatch -du -h -r$REV | diffstat -echo; echo -bk export -tpatch -du -h -r$REV -echo -e $SEP -bk send -wgzip_uu -r$REV - diff --git a/trunk/Documentation/BK-usage/bz64wrap b/trunk/Documentation/BK-usage/bz64wrap deleted file mode 100755 index be780876849f..000000000000 --- a/trunk/Documentation/BK-usage/bz64wrap +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -# bz64wrap - the sending side of a bzip2 | base64 stream -# Andreas Dilger Jan 2002 - - -PATH=$PATH:/usr/bin:/usr/local/bin:/usr/freeware/bin - -# A program to generate base64 encoding on stdout -BASE64_ENCODE="uuencode -m /dev/stdout" -BASE64_BEGIN= -BASE64_END= - -BZIP=NO -BASE64=NO - -# Test if we have the bzip program installed -bzip2 -c /dev/null > /dev/null 2>&1 && BZIP=YES - -# Test if uuencode can handle the -m (MIME) encoding option -$BASE64_ENCODE < /dev/null > /dev/null 2>&1 && BASE64=YES - -if [ $BASE64 = NO ]; then - BASE64_ENCODE=mimencode - BASE64_BEGIN="begin-base64 644 -" - BASE64_END="====" - - $BASE64_ENCODE < /dev/null > /dev/null 2>&1 && BASE64=YES -fi - -if [ $BZIP = NO -o $BASE64 = NO ]; then - echo "$0: can't use bz64 encoding: bzip2=$BZIP, $BASE64_ENCODE=$BASE64" - exit 1 -fi - -# Sadly, mimencode does not appear to have good "begin" and "end" markers -# like uuencode does, and it is picky about getting the right start/end of -# the base64 stream, so we handle this internally. -echo "$BASE64_BEGIN" -bzip2 -9 | $BASE64_ENCODE -echo "$BASE64_END" diff --git a/trunk/Documentation/BK-usage/cpcset b/trunk/Documentation/BK-usage/cpcset deleted file mode 100755 index b8faca97dab9..000000000000 --- a/trunk/Documentation/BK-usage/cpcset +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Purpose: Copy changeset patch and description from one -# repository to another, unrelated one. -# -# usage: cpcset [revision] [from-repository] [to-repository] -# - -REV=$1 -FROM=$2 -TO=$3 -TMPF=/tmp/cpcset.$$ - -rm -f $TMPF* - -CWD_SAVE=`pwd` -cd $FROM -bk changes -r$REV | \ - grep -v '^ChangeSet' | \ - sed -e 's/^ //g' > $TMPF.log - -USERHOST=`bk changes -r$REV | grep '^ChangeSet' | awk '{print $4}'` -export BK_USER=`echo $USERHOST | awk '-F@' '{print $1}'` -export BK_HOST=`echo $USERHOST | awk '-F@' '{print $2}'` - -bk export -tpatch -hdu -r$REV > $TMPF.patch && \ -cd $CWD_SAVE && \ -cd $TO && \ -bk import -tpatch -CFR -y"`cat $TMPF.log`" $TMPF.patch . && \ -bk commit -y"`cat $TMPF.log`" - -rm -f $TMPF* - -echo changeset $REV copied. -echo "" - diff --git a/trunk/Documentation/BK-usage/cset-to-linus b/trunk/Documentation/BK-usage/cset-to-linus deleted file mode 100755 index d28a96f8c618..000000000000 --- a/trunk/Documentation/BK-usage/cset-to-linus +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -my ($lhs, $rev, $tmp, $rhs, $s); -my @cset_text = (); -my @pipe_text = (); -my $have_cset = 0; - -while (<>) { - next if /^---/; - - if (($lhs, $tmp, $rhs) = (/^(ChangeSet\@)([^,]+)(, .*)$/)) { - &cset_rev if ($have_cset); - - $rev = $tmp; - $have_cset = 1; - - push(@cset_text, $_); - } - - elsif ($have_cset) { - push(@cset_text, $_); - } -} -&cset_rev if ($have_cset); -exit(0); - - -sub cset_rev { - my $empty_cset = 0; - - open PIPE, "bk export -tpatch -hdu -r $rev | diffstat -p1 2>/dev/null |" or die; - while ($s = ) { - $empty_cset = 1 if ($s =~ /0 files changed/); - push(@pipe_text, $s); - } - close(PIPE); - - if (! $empty_cset) { - print @cset_text; - print @pipe_text; - print "\n\n"; - } - - @pipe_text = (); - @cset_text = (); -} - diff --git a/trunk/Documentation/BK-usage/csets-to-patches b/trunk/Documentation/BK-usage/csets-to-patches deleted file mode 100755 index e2b81c35883f..000000000000 --- a/trunk/Documentation/BK-usage/csets-to-patches +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -my ($lhs, $rev, $tmp, $rhs, $s); -my @cset_text = (); -my @pipe_text = (); -my $have_cset = 0; - -while (<>) { - next if /^---/; - - if (($lhs, $tmp, $rhs) = (/^(ChangeSet\@)([^,]+)(, .*)$/)) { - &cset_rev if ($have_cset); - - $rev = $tmp; - $have_cset = 1; - - push(@cset_text, $_); - } - - elsif ($have_cset) { - push(@cset_text, $_); - } -} -&cset_rev if ($have_cset); -exit(0); - - -sub cset_rev { - my $empty_cset = 0; - - system("bk export -tpatch -du -r $rev > /tmp/rev-$rev.patch"); - - if (! $empty_cset) { - print @cset_text; - print @pipe_text; - print "\n\n"; - } - - @pipe_text = (); - @cset_text = (); -} - diff --git a/trunk/Documentation/BK-usage/gcapatch b/trunk/Documentation/BK-usage/gcapatch deleted file mode 100755 index aaeb17dc7c7f..000000000000 --- a/trunk/Documentation/BK-usage/gcapatch +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# Purpose: Generate GNU diff of local changes versus canonical top-of-tree -# -# Usage: gcapatch > foo.patch -# - -bk export -tpatch -hdu -r`bk repogca bk://linux.bkbits.net/linux-2.5`,+ diff --git a/trunk/Documentation/BK-usage/unbz64wrap b/trunk/Documentation/BK-usage/unbz64wrap deleted file mode 100755 index 4fc3e73e9a81..000000000000 --- a/trunk/Documentation/BK-usage/unbz64wrap +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# unbz64wrap - the receiving side of a bzip2 | base64 stream -# Andreas Dilger Jan 2002 - -# Sadly, mimencode does not appear to have good "begin" and "end" markers -# like uuencode does, and it is picky about getting the right start/end of -# the base64 stream, so we handle this explicitly here. - -PATH=$PATH:/usr/bin:/usr/local/bin:/usr/freeware/bin - -if mimencode -u < /dev/null > /dev/null 2>&1 ; then - SHOW= - while read LINE; do - case $LINE in - begin-base64*) SHOW=YES ;; - ====) SHOW= ;; - *) [ "$SHOW" ] && echo "$LINE" ;; - esac - done | mimencode -u | bunzip2 - exit $? -else - cat - | uudecode -o /dev/stdout | bunzip2 - exit $? -fi diff --git a/trunk/Documentation/cpu-freq/cpufreq-stats.txt b/trunk/Documentation/cpu-freq/cpufreq-stats.txt new file mode 100644 index 000000000000..e2d1e760b4ba --- /dev/null +++ b/trunk/Documentation/cpu-freq/cpufreq-stats.txt @@ -0,0 +1,128 @@ + + CPU frequency and voltage scaling statictics in the Linux(TM) kernel + + + L i n u x c p u f r e q - s t a t s d r i v e r + + - information for users - + + + Venkatesh Pallipadi + +Contents +1. Introduction +2. Statistics Provided (with example) +3. Configuring cpufreq-stats + + +1. Introduction + +cpufreq-stats is a driver that provices CPU frequency statistics for each CPU. +This statistics is provided in /sysfs as a bunch of read_only interfaces. This +interface (when configured) will appear in a seperate directory under cpufreq +in /sysfs (/devices/system/cpu/cpuX/cpufreq/stats/) for each CPU. +Various statistics will form read_only files under this directory. + +This driver is designed to be independent of any particular cpufreq_driver +that may be running on your CPU. So, it will work with any cpufreq_driver. + + +2. Statistics Provided (with example) + +cpufreq stats provides following statistics (explained in detail below). +- time_in_state +- total_trans +- trans_table + +All the statistics will be from the time the stats driver has been inserted +to the time when a read of a particular statistic is done. Obviously, stats +driver will not have any information about the the frequcny transitions before +the stats driver insertion. + +-------------------------------------------------------------------------------- +:/sys/devices/system/cpu/cpu0/cpufreq/stats # ls -l +total 0 +drwxr-xr-x 2 root root 0 May 14 16:06 . +drwxr-xr-x 3 root root 0 May 14 15:58 .. +-r--r--r-- 1 root root 4096 May 14 16:06 time_in_state +-r--r--r-- 1 root root 4096 May 14 16:06 total_trans +-r--r--r-- 1 root root 4096 May 14 16:06 trans_table +-------------------------------------------------------------------------------- + +- time_in_state +This gives the amount of time spent in each of the frequencies supported by +this CPU. The cat output will have "