samba: remove MAPTOGUEST="Never".
[people/teissler/ipfire-2.x.git] / src / patches / compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch
CommitLineData
91b86890
AF
1diff -Naur compat-wireless-3.6.8-1-snp.org/compat/compat-3.1.c compat-wireless-3.6.8-1-snp/compat/compat-3.1.c
2--- compat-wireless-3.6.8-1-snp.org/compat/compat-3.1.c 2012-11-29 06:03:45.000000000 +0100
3+++ compat-wireless-3.6.8-1-snp/compat/compat-3.1.c 2013-01-18 16:50:08.799491784 +0100
4@@ -9,30 +9,6 @@
5 */
6
7 #include <linux/idr.h>
8-#include <linux/cpufreq.h>
9-
10-/* This backports:
11- * commit 3d73710880afa3d61cf57b5d4eb192e812eb7e4f
12- * Author: Jesse Barnes <jbarnes@virtuousgeek.org>
13- * Date: Tue Jun 28 10:59:12 2011 -0700
14- *
15- * cpufreq: expose a cpufreq_quick_get_max routine
16- */
17-
18-unsigned int compat_cpufreq_quick_get_max(unsigned int cpu)
19-{
20- struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
21- unsigned int ret_freq = 0;
22-
23- if (policy) {
24- ret_freq = policy->max;
25- cpufreq_cpu_put(policy);
26- }
27-
28- return ret_freq;
29-}
30-EXPORT_SYMBOL(compat_cpufreq_quick_get_max);
31-
32
33 static DEFINE_SPINLOCK(compat_simple_ida_lock);
34
35diff -Naur compat-wireless-3.6.8-1-snp.org/include/linux/compat-3.1.h compat-wireless-3.6.8-1-snp/include/linux/compat-3.1.h
36--- compat-wireless-3.6.8-1-snp.org/include/linux/compat-3.1.h 2012-10-24 15:22:50.000000000 +0200
37+++ compat-wireless-3.6.8-1-snp/include/linux/compat-3.1.h 2013-01-18 16:52:04.106154741 +0100
38@@ -111,10 +111,6 @@
39
40 void ida_simple_remove(struct ida *ida, unsigned int id);
41
42-/* mask cpufreq_quick_get_max as RHEL6 backports this */
43-#define cpufreq_quick_get_max(a) compat_cpufreq_quick_get_max(a)
44-
45-unsigned int cpufreq_quick_get_max(unsigned int cpu);
46 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)) */
47
48 #endif /* LINUX_3_1_COMPAT_H */