Commit 226528c6100e4191842e61997110c8ace40605f7

Authored by Amerigo Wang
Committed by Dave Jones
1 parent 00e299fff3

[CPUFREQ] unexport (un)lock_policy_rwsem* functions

lock_policy_rwsem_* and unlock_policy_rwsem_* functions are scheduled
to be unexported when 2.6.33. Now there are no other callers of them
out of cpufreq.c, unexport them and make them static.

Signed-off-by: WANG Cong <amwang@redhat.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Dave Jones <davej@redhat.com>

Showing 3 changed files with 3 additions and 22 deletions Side-by-side Diff

Documentation/feature-removal-schedule.txt
... ... @@ -377,16 +377,6 @@
377 377  
378 378 ----------------------------
379 379  
380   -What: lock_policy_rwsem_* and unlock_policy_rwsem_* will not be
381   - exported interface anymore.
382   -When: 2.6.33
383   -Why: cpu_policy_rwsem has a new cleaner definition making it local to
384   - cpufreq core and contained inside cpufreq.c. Other dependent
385   - drivers should not use it in order to safely avoid lockdep issues.
386   -Who: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
387   -
388   -----------------------------
389   -
390 380 What: sound-slot/service-* module aliases and related clutters in
391 381 sound/sound_core.c
392 382 When: August 2010
drivers/cpufreq/cpufreq.c
... ... @@ -68,7 +68,7 @@
68 68 static DEFINE_PER_CPU(struct rw_semaphore, cpu_policy_rwsem);
69 69  
70 70 #define lock_policy_rwsem(mode, cpu) \
71   -int lock_policy_rwsem_##mode \
  71 +static int lock_policy_rwsem_##mode \
72 72 (int cpu) \
73 73 { \
74 74 int policy_cpu = per_cpu(cpufreq_policy_cpu, cpu); \
75 75  
76 76  
77 77  
78 78  
79 79  
... ... @@ -83,26 +83,22 @@
83 83 }
84 84  
85 85 lock_policy_rwsem(read, cpu);
86   -EXPORT_SYMBOL_GPL(lock_policy_rwsem_read);
87 86  
88 87 lock_policy_rwsem(write, cpu);
89   -EXPORT_SYMBOL_GPL(lock_policy_rwsem_write);
90 88  
91   -void unlock_policy_rwsem_read(int cpu)
  89 +static void unlock_policy_rwsem_read(int cpu)
92 90 {
93 91 int policy_cpu = per_cpu(cpufreq_policy_cpu, cpu);
94 92 BUG_ON(policy_cpu == -1);
95 93 up_read(&per_cpu(cpu_policy_rwsem, policy_cpu));
96 94 }
97   -EXPORT_SYMBOL_GPL(unlock_policy_rwsem_read);
98 95  
99   -void unlock_policy_rwsem_write(int cpu)
  96 +static void unlock_policy_rwsem_write(int cpu)
100 97 {
101 98 int policy_cpu = per_cpu(cpufreq_policy_cpu, cpu);
102 99 BUG_ON(policy_cpu == -1);
103 100 up_write(&per_cpu(cpu_policy_rwsem, policy_cpu));
104 101 }
105   -EXPORT_SYMBOL_GPL(unlock_policy_rwsem_write);
106 102  
107 103  
108 104 /* internal prototypes */
include/linux/cpufreq.h
... ... @@ -196,11 +196,6 @@
196 196 int cpufreq_register_governor(struct cpufreq_governor *governor);
197 197 void cpufreq_unregister_governor(struct cpufreq_governor *governor);
198 198  
199   -int lock_policy_rwsem_read(int cpu);
200   -int lock_policy_rwsem_write(int cpu);
201   -void unlock_policy_rwsem_read(int cpu);
202   -void unlock_policy_rwsem_write(int cpu);
203   -
204 199  
205 200 /*********************************************************************
206 201 * CPUFREQ DRIVER INTERFACE *