- Update to kernel version 3.7

* IvyBridge support integrated

OBS-URL: https://build.opensuse.org/package/show/hardware/cpupower?expand=0&rev=21

cpupower-3.4.rc6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf5228cfeac92570fbad56c6135462841cdf6c14c99d239370add35c7263c009
-size 68532

cpupower-3.7.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f7a05b0026ff6ca37400f8c2dc1e282b6d26439bdca087fa11885f18cc0edec
+size 68302

cpupower-ivy_bridge_support.patch

@@ -1,66 +0,0 @@
-From: Thomas Renninger <trenn@suse.de>
-Subject: cpupower: IvyBridge (0x3a and 0x3e models) support
-References: fate#313856
-Patch-Mainline: Queued in subsystem tree (see Git-Repo:)
-Git-commit: 7f163b1bd6e3f7bfa648069770acf2c8fe3d9097
-Git-repo: gitolite@ra.kernel.org:/pub/scm/linux/kernel/git/trenn/cpupower
-
-Signed-off-by: Thomas Renninger <trenn@suse.de>
-
----
- man/cpupower-monitor.1        |    2 +-
- utils/helpers/cpuid.c         |    2 ++
- utils/idle_monitor/snb_idle.c |   13 +++++++++++--
- 3 files changed, 14 insertions(+), 3 deletions(-)
-
-Index: cpupower-3.4.rc6/utils/helpers/cpuid.c
-===================================================================
---- cpupower-3.4.rc6.orig/utils/helpers/cpuid.c
-+++ cpupower-3.4.rc6/utils/helpers/cpuid.c
-@@ -158,6 +158,8 @@ out:
- 				cpu_info->caps |= CPUPOWER_CAP_HAS_TURBO_RATIO;
- 			case 0x2A:	/* SNB */
- 			case 0x2D:	/* SNB Xeon */
-+			case 0x3A:	/* IVB */
-+			case 0x3E:	/* IVB Xeon */
- 				cpu_info->caps |= CPUPOWER_CAP_HAS_TURBO_RATIO;
- 				cpu_info->caps |= CPUPOWER_CAP_IS_SNB;
- 				break;
-Index: cpupower-3.4.rc6/utils/idle_monitor/snb_idle.c
-===================================================================
---- cpupower-3.4.rc6.orig/utils/idle_monitor/snb_idle.c
-+++ cpupower-3.4.rc6/utils/idle_monitor/snb_idle.c
-@@ -150,9 +150,18 @@ static struct cpuidle_monitor *snb_regis
- 	    || cpupower_cpu_info.family != 6)
- 		return NULL;
- 
--	if (cpupower_cpu_info.model != 0x2A
--	    && cpupower_cpu_info.model != 0x2D)
-+	switch (cpupower_cpu_info.model) {
-+	case 0x2A: /* SNB */
-+	case 0x2D: /* SNB Xeon */
-+		/* Monitor named SandyBridge by default */
-+		break;
-+	case 0x3A: /* IVB */
-+	case 0x3E: /* IVB Xeon */
-+		strcpy(intel_snb_monitor.name, "IvyBridge");
-+		break;
-+	default:
- 		return NULL;
-+	}
- 
- 	is_valid = calloc(cpu_count, sizeof(int));
- 	for (num = 0; num < SNB_CSTATE_COUNT; num++) {
-Index: cpupower-3.4.rc6/man/cpupower-monitor.1
-===================================================================
---- cpupower-3.4.rc6.orig/man/cpupower-monitor.1
-+++ cpupower-3.4.rc6/man/cpupower-monitor.1
-@@ -99,7 +99,7 @@ May work poorly on Linux-2.6.20 through
- kernel frequency driver periodically cleared aperf/mperf registers in those
- kernels.
- 
--.SS "Nehalem" "SandyBridge"
-+.SS "Nehalem" "SandyBridge" "IvyBridge"
- Intel Core and Package sleep state counters.
- Threads (hyperthreaded cores) may not be able to enter deeper core states if
- its sibling is utilized.

cpupower.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 23 10:49:30 UTC 2013 - trenn@suse.de
+
+- Update to kernel version 3.7
+  * IvyBridge support integrated
+
 -------------------------------------------------------------------
 Tue Nov 13 11:26:27 UTC 2012 - trenn@suse.de
 

cpupower.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cpupower
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Author: Thomas Renninger <trenn@suse.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,18 +17,18 @@
 #
 
 
+
 Name:           cpupower
 Url:            http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html
 # Use this as version when things are in mainline kernel
 %define version %(rpm -q --qf '%{VERSION}' kernel-source)
-Version:        3.4.rc6
+Version:        3.7
 Release:        0
 Summary:        Tools to determine and set CPU Power related Settings
 License:        GPL-2.0
 Group:          System/Base
 Source:         %{name}-%{version}.tar.bz2
 Source1:        cpupower_export_tarball_from_git.sh
-Patch0:         cpupower-ivy_bridge_support.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gettext-tools
 BuildRequires:  pciutils
@@ -72,7 +72,6 @@ powersave module.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.