From 6148c033cdf01552aa6ff5cc458930553863ed1e Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 30 May 2005 15:35:26 -0700 Subject: [PATCH] --- yaml --- r: 1771 b: refs/heads/master c: 9bb7bc942d3da606f184ac6a4dfc7e4d470c831b h: refs/heads/master i: 1769: a7b0e1090c956d432788b060e23e20c621261df8 1767: fa5a2bf0f0d5648e26340a431cc4ddc2629b4801 v: v3 --- [refs] | 2 +- .../Documentation/cpu-freq/cpufreq-stats.txt | 128 ---- trunk/MAINTAINERS | 10 +- trunk/arch/h8300/kernel/process.c | 2 +- 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/setup.c | 2 - trunk/arch/i386/kernel/timers/common.c | 6 +- trunk/arch/i386/kernel/timers/timer_tsc.c | 20 - trunk/arch/ia64/kernel/entry.S | 4 +- trunk/arch/ia64/kernel/mca.c | 4 +- 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/ppc/syslib/prom_init.c | 10 - trunk/arch/ppc64/kernel/pSeries_reconfig.c | 8 + trunk/arch/ppc64/kernel/prom_init.c | 16 +- trunk/arch/ppc64/kernel/time.c | 2 + trunk/arch/sparc64/kernel/pci_iommu.c | 88 +-- 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/sbus.c | 20 +- trunk/arch/x86_64/Kconfig | 1 - trunk/arch/x86_64/kernel/io_apic.c | 1 - trunk/arch/x86_64/kernel/mpparse.c | 1 - trunk/arch/x86_64/kernel/time.c | 2 - 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/ide/ide-cd.c | 2 +- trunk/drivers/ide/pci/amd74xx.c | 3 - trunk/drivers/pci/hotplug/cpci_hotplug_core.c | 302 ++++----- trunk/drivers/pci/hotplug/cpci_hotplug_pci.c | 144 +++-- trunk/drivers/pci/hotplug/shpchprm_acpi.c | 4 +- trunk/drivers/usb/host/Kconfig | 11 - trunk/drivers/usb/host/Makefile | 1 - trunk/drivers/usb/host/sl811-hcd.c | 146 ++--- trunk/drivers/usb/host/sl811_cs.c | 442 ------------- 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/fs/proc/proc_devtree.c | 105 ++-- trunk/fs/udf/udftime.c | 2 +- trunk/include/asm-i386/timer.h | 1 - trunk/include/asm-ia64/perfmon.h | 8 - trunk/include/asm-ia64/sn/sn_sal.h | 28 +- trunk/include/asm-ppc64/prom.h | 13 +- trunk/include/asm-sparc64/iommu.h | 2 - trunk/include/asm-sparc64/pbm.h | 8 +- trunk/include/linux/cpufreq.h | 2 +- trunk/include/linux/pci_ids.h | 6 - trunk/kernel/module.c | 6 - trunk/net/ipv4/netfilter/ip_queue.c | 10 + 70 files changed, 679 insertions(+), 2440 deletions(-) delete mode 100644 trunk/Documentation/cpu-freq/cpufreq-stats.txt delete mode 100644 trunk/arch/i386/kernel/cpu/cpufreq/sc520_freq.c delete mode 100644 trunk/drivers/cpufreq/cpufreq_conservative.c delete mode 100644 trunk/drivers/usb/host/sl811_cs.c diff --git a/[refs] b/[refs] index 9d1822602fb3..a8cff79cfa47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9a22239257561df80ef54fc8f31880e2fb2a27b +refs/heads/master: 9bb7bc942d3da606f184ac6a4dfc7e4d470c831b diff --git a/trunk/Documentation/cpu-freq/cpufreq-stats.txt b/trunk/Documentation/cpu-freq/cpufreq-stats.txt deleted file mode 100644 index e2d1e760b4ba..000000000000 --- a/trunk/Documentation/cpu-freq/cpufreq-stats.txt +++ /dev/null @@ -1,128 +0,0 @@ - - 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 "