diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2006-10-01 02:28:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:24 -0400 |
commit | 6e9a4738c9fadb7cbdcabc1e3b415159f3741ed9 (patch) | |
tree | 0e470bb8cd431d59698da5a6999ff35a347619a3 /arch/powerpc/platforms/powermac | |
parent | 397d6140e93156ecb9cafcd9be0db10ff3c12ab3 (diff) |
[PATCH] completions: lockdep annotate on stack completions
All on stack DECLARE_COMPLETIONs should be replaced by:
DECLARE_COMPLETION_ONSTACK
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/powerpc/platforms/powermac')
-rw-r--r-- | arch/powerpc/platforms/powermac/cpufreq_64.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/powermac/nvram.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c index d30466d74194..9d22361a26d6 100644 --- a/arch/powerpc/platforms/powermac/cpufreq_64.c +++ b/arch/powerpc/platforms/powermac/cpufreq_64.c | |||
@@ -104,7 +104,7 @@ static void g5_smu_switch_volt(int speed_mode) | |||
104 | { | 104 | { |
105 | struct smu_simple_cmd cmd; | 105 | struct smu_simple_cmd cmd; |
106 | 106 | ||
107 | DECLARE_COMPLETION(comp); | 107 | DECLARE_COMPLETION_ONSTACK(comp); |
108 | smu_queue_simple(&cmd, SMU_CMD_POWER_COMMAND, 8, smu_done_complete, | 108 | smu_queue_simple(&cmd, SMU_CMD_POWER_COMMAND, 8, smu_done_complete, |
109 | &comp, 'V', 'S', 'L', 'E', 'W', | 109 | &comp, 'V', 'S', 'L', 'E', 'W', |
110 | 0xff, g5_fvt_cur+1, speed_mode); | 110 | 0xff, g5_fvt_cur+1, speed_mode); |
diff --git a/arch/powerpc/platforms/powermac/nvram.c b/arch/powerpc/platforms/powermac/nvram.c index 6a36ea9bf673..692945c14919 100644 --- a/arch/powerpc/platforms/powermac/nvram.c +++ b/arch/powerpc/platforms/powermac/nvram.c | |||
@@ -195,7 +195,7 @@ static void pmu_nvram_complete(struct adb_request *req) | |||
195 | static unsigned char pmu_nvram_read_byte(int addr) | 195 | static unsigned char pmu_nvram_read_byte(int addr) |
196 | { | 196 | { |
197 | struct adb_request req; | 197 | struct adb_request req; |
198 | DECLARE_COMPLETION(req_complete); | 198 | DECLARE_COMPLETION_ONSTACK(req_complete); |
199 | 199 | ||
200 | req.arg = system_state == SYSTEM_RUNNING ? &req_complete : NULL; | 200 | req.arg = system_state == SYSTEM_RUNNING ? &req_complete : NULL; |
201 | if (pmu_request(&req, pmu_nvram_complete, 3, PMU_READ_NVRAM, | 201 | if (pmu_request(&req, pmu_nvram_complete, 3, PMU_READ_NVRAM, |
@@ -211,7 +211,7 @@ static unsigned char pmu_nvram_read_byte(int addr) | |||
211 | static void pmu_nvram_write_byte(int addr, unsigned char val) | 211 | static void pmu_nvram_write_byte(int addr, unsigned char val) |
212 | { | 212 | { |
213 | struct adb_request req; | 213 | struct adb_request req; |
214 | DECLARE_COMPLETION(req_complete); | 214 | DECLARE_COMPLETION_ONSTACK(req_complete); |
215 | 215 | ||
216 | req.arg = system_state == SYSTEM_RUNNING ? &req_complete : NULL; | 216 | req.arg = system_state == SYSTEM_RUNNING ? &req_complete : NULL; |
217 | if (pmu_request(&req, pmu_nvram_complete, 4, PMU_WRITE_NVRAM, | 217 | if (pmu_request(&req, pmu_nvram_complete, 4, PMU_WRITE_NVRAM, |