← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to debian/patches/features/all/rt/acpi-make-gbl-hardware-lock-raw.patch

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings, Bastian Blank, Ben Hutchings, Uwe Kleine-König
  • Date: 2012-03-04 15:32:20 UTC
  • mfrom: (43.1.29 sid)
  • Revision ID: package-import@ubuntu.com-20120304153220-r171jd27k3dd3639
Tags: 3.2.9-1
http://bugs.debian.org/658736
http://bugs.debian.org/658912
http://bugs.debian.org/609455
http://bugs.debian.org/651199
* New upstream stable update:
  http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.8
  - [i386] i387: move TS_USEDFPU flag from thread_info to task_struct
  - [x86] additional refactoring of FPU/SSE state save and restore
  http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.9
  - vfs: fix d_inode_lookup() dentry ref leak
  - target: Allow control CDBs with data > 1 page
  - epoll: introduce POLLFREE to flush ->signalfd_wqh before kfree()
  - epoll: ep_unregister_pollwait() can use the freed pwq->whead
  - epoll: limit paths (CVE-2011-1083)
  - cdrom: use copy_to_user() without the underscores

[ Bastian Blank ]
* [mips,mipsel] Also remove ext4 modules from installer.

[ Ben Hutchings ]
* Update debconf template translations:
  - Update Dutch (Willem Kuyn) (Closes: #658736)
  - Add Polish (Michał Kułach) (Closes: #658912)
* Bump ABI to 2
* fs: Introduce and enable security restrictions on links:
  - Do not follow symlinks in /tmp that are owned by other users
    (sysctl: fs.protected_symlinks)
  - Do not allow unprivileged users to create hard links to sensitive files
    (sysctl: fs.protected_hardlinks) (Closes: #609455)
    + This breaks the 'at' package in stable, which will be fixed shortly
      (see #597130)
  The precise restrictions are specified in Documentation/sysctl/fs.txt in
  the linux-doc-3.2 and linux-source-3.2 packages.
* iwlwifi: fix key removal (Closes: #651199)
* cgroups: Set CGROUP_PERF
* hid: Enable HID_HOLTEK, HID_PRIMAX, HID_SPEEDLINK, HID_WIIMOTE as modules,
  HID_ACRUX_FF
* media/rc: Enable RC_ATI_REMOTE as module
* gspca: Enable USB_GSPCA_TOPRO as module
* dvb-usb: Enable DVB_USB_PCTV452E, DVB_USB_MXL111SF as modules

[ Uwe Kleine-König ]
* [x86] Update rt featureset to 3.2.9-rt15

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/features/all/rt/acpi-make-gbl-hardware-lock-raw.patch
1
 
Subject: acpi: Make gbl_[hardware|gpe]_lock raw
2
 
From: Thomas Gleixner <tglx@linutronix.de>
3
 
Date: Mon, 28 Nov 2011 17:09:54 +0100
4
 
 
5
 
These locks are taken in the guts of the idle code and cannot be
6
 
converted to "sleeping" spinlocks on RT
7
 
 
8
 
Cc: stable-rt@vger.kernel.org
9
 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
10
 
---
11
 
 drivers/acpi/acpica/acglobal.h  |    4 ++--
12
 
 drivers/acpi/acpica/evgpe.c     |    4 ++--
13
 
 drivers/acpi/acpica/evgpeblk.c  |    8 ++++----
14
 
 drivers/acpi/acpica/evgpeutil.c |   12 ++++++------
15
 
 drivers/acpi/acpica/evxface.c   |   10 +++++-----
16
 
 drivers/acpi/acpica/evxfgpe.c   |   24 ++++++++++++------------
17
 
 drivers/acpi/acpica/hwregs.c    |    4 ++--
18
 
 drivers/acpi/acpica/hwxface.c   |    4 ++--
19
 
 drivers/acpi/acpica/utmutex.c   |   21 +++------------------
20
 
 9 files changed, 38 insertions(+), 53 deletions(-)
21
 
 
22
 
Index: linux-3.2/drivers/acpi/acpica/acglobal.h
23
 
===================================================================
24
 
--- linux-3.2.orig/drivers/acpi/acpica/acglobal.h
25
 
+++ linux-3.2/drivers/acpi/acpica/acglobal.h
26
 
@@ -235,8 +235,8 @@ ACPI_EXTERN u8 acpi_gbl_global_lock_pend
27
 
  * Spinlocks are used for interfaces that can be possibly called at
28
 
  * interrupt level
29
 
  */
30
 
-ACPI_EXTERN acpi_spinlock acpi_gbl_gpe_lock;   /* For GPE data structs and registers */
31
 
-ACPI_EXTERN acpi_spinlock acpi_gbl_hardware_lock;      /* For ACPI H/W except GPE registers */
32
 
+extern raw_spinlock_t acpi_gbl_gpe_lock;       /* For GPE data structs and registers */
33
 
+extern raw_spinlock_t acpi_gbl_hardware_lock;  /* For ACPI H/W except GPE registers */
34
 
 
35
 
 /*****************************************************************************
36
 
  *
37
 
Index: linux-3.2/drivers/acpi/acpica/evgpe.c
38
 
===================================================================
39
 
--- linux-3.2.orig/drivers/acpi/acpica/evgpe.c
40
 
+++ linux-3.2/drivers/acpi/acpica/evgpe.c
41
 
@@ -357,7 +357,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_x
42
 
         * Note: Not necessary to obtain the hardware lock, since the GPE
43
 
         * registers are owned by the gpe_lock.
44
 
         */
45
 
-       flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
46
 
+       raw_spin_lock_irqsave(&acpi_gbl_gpe_lock, flags);
47
 
 
48
 
        /* Examine all GPE blocks attached to this interrupt level */
49
 
 
50
 
@@ -440,7 +440,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_x
51
 
 
52
 
       unlock_and_exit:
53
 
 
54
 
-       acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
55
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
56
 
        return (int_status);
57
 
 }
58
 
 
59
 
Index: linux-3.2/drivers/acpi/acpica/evgpeblk.c
60
 
===================================================================
61
 
--- linux-3.2.orig/drivers/acpi/acpica/evgpeblk.c
62
 
+++ linux-3.2/drivers/acpi/acpica/evgpeblk.c
63
 
@@ -95,7 +95,7 @@ acpi_ev_install_gpe_block(struct acpi_gp
64
 
 
65
 
        /* Install the new block at the end of the list with lock */
66
 
 
67
 
-       flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
68
 
+       raw_spin_lock_irqsave(&acpi_gbl_gpe_lock, flags);
69
 
        if (gpe_xrupt_block->gpe_block_list_head) {
70
 
                next_gpe_block = gpe_xrupt_block->gpe_block_list_head;
71
 
                while (next_gpe_block->next) {
72
 
@@ -109,7 +109,7 @@ acpi_ev_install_gpe_block(struct acpi_gp
73
 
        }
74
 
 
75
 
        gpe_block->xrupt_block = gpe_xrupt_block;
76
 
-       acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
77
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
78
 
 
79
 
       unlock_and_exit:
80
 
        status = acpi_ut_release_mutex(ACPI_MTX_EVENTS);
81
 
@@ -156,7 +156,7 @@ acpi_status acpi_ev_delete_gpe_block(str
82
 
        } else {
83
 
                /* Remove the block on this interrupt with lock */
84
 
 
85
 
-               flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
86
 
+               raw_spin_lock_irqsave(&acpi_gbl_gpe_lock, flags);
87
 
                if (gpe_block->previous) {
88
 
                        gpe_block->previous->next = gpe_block->next;
89
 
                } else {
90
 
@@ -167,7 +167,7 @@ acpi_status acpi_ev_delete_gpe_block(str
91
 
                if (gpe_block->next) {
92
 
                        gpe_block->next->previous = gpe_block->previous;
93
 
                }
94
 
-               acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
95
 
+               raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
96
 
        }
97
 
 
98
 
        acpi_current_gpe_count -= gpe_block->gpe_count;
99
 
Index: linux-3.2/drivers/acpi/acpica/evgpeutil.c
100
 
===================================================================
101
 
--- linux-3.2.orig/drivers/acpi/acpica/evgpeutil.c
102
 
+++ linux-3.2/drivers/acpi/acpica/evgpeutil.c
103
 
@@ -70,7 +70,7 @@ acpi_ev_walk_gpe_list(acpi_gpe_callback 
104
 
 
105
 
        ACPI_FUNCTION_TRACE(ev_walk_gpe_list);
106
 
 
107
 
-       flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
108
 
+       raw_spin_lock_irqsave(&acpi_gbl_gpe_lock, flags);
109
 
 
110
 
        /* Walk the interrupt level descriptor list */
111
 
 
112
 
@@ -101,7 +101,7 @@ acpi_ev_walk_gpe_list(acpi_gpe_callback 
113
 
        }
114
 
 
115
 
       unlock_and_exit:
116
 
-       acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
117
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
118
 
        return_ACPI_STATUS(status);
119
 
 }
120
 
 
121
 
@@ -237,7 +237,7 @@ struct acpi_gpe_xrupt_info *acpi_ev_get_
122
 
 
123
 
        /* Install new interrupt descriptor with spin lock */
124
 
 
125
 
-       flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
126
 
+       raw_spin_lock_irqsave(&acpi_gbl_gpe_lock, flags);
127
 
        if (acpi_gbl_gpe_xrupt_list_head) {
128
 
                next_gpe_xrupt = acpi_gbl_gpe_xrupt_list_head;
129
 
                while (next_gpe_xrupt->next) {
130
 
@@ -249,7 +249,7 @@ struct acpi_gpe_xrupt_info *acpi_ev_get_
131
 
        } else {
132
 
                acpi_gbl_gpe_xrupt_list_head = gpe_xrupt;
133
 
        }
134
 
-       acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
135
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
136
 
 
137
 
        /* Install new interrupt handler if not SCI_INT */
138
 
 
139
 
@@ -306,7 +306,7 @@ acpi_status acpi_ev_delete_gpe_xrupt(str
140
 
 
141
 
        /* Unlink the interrupt block with lock */
142
 
 
143
 
-       flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
144
 
+       raw_spin_lock_irqsave(&acpi_gbl_gpe_lock, flags);
145
 
        if (gpe_xrupt->previous) {
146
 
                gpe_xrupt->previous->next = gpe_xrupt->next;
147
 
        } else {
148
 
@@ -318,7 +318,7 @@ acpi_status acpi_ev_delete_gpe_xrupt(str
149
 
        if (gpe_xrupt->next) {
150
 
                gpe_xrupt->next->previous = gpe_xrupt->previous;
151
 
        }
152
 
-       acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
153
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
154
 
 
155
 
        /* Free the block */
156
 
 
157
 
Index: linux-3.2/drivers/acpi/acpica/evxface.c
158
 
===================================================================
159
 
--- linux-3.2.orig/drivers/acpi/acpica/evxface.c
160
 
+++ linux-3.2/drivers/acpi/acpica/evxface.c
161
 
@@ -751,7 +751,7 @@ acpi_install_gpe_handler(acpi_handle gpe
162
 
                goto unlock_and_exit;
163
 
        }
164
 
 
165
 
-       flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
166
 
+       raw_spin_lock_irqsave(&acpi_gbl_gpe_lock, flags);
167
 
 
168
 
        /* Ensure that we have a valid GPE number */
169
 
 
170
 
@@ -799,14 +799,14 @@ acpi_install_gpe_handler(acpi_handle gpe
171
 
            ~(ACPI_GPE_XRUPT_TYPE_MASK | ACPI_GPE_DISPATCH_MASK);
172
 
        gpe_event_info->flags |= (u8) (type | ACPI_GPE_DISPATCH_HANDLER);
173
 
 
174
 
-       acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
175
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
176
 
 
177
 
 unlock_and_exit:
178
 
        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
179
 
        return_ACPI_STATUS(status);
180
 
 
181
 
 free_and_exit:
182
 
-       acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
183
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
184
 
        ACPI_FREE(handler);
185
 
        goto unlock_and_exit;
186
 
 }
187
 
@@ -853,7 +853,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_
188
 
                return_ACPI_STATUS(status);
189
 
        }
190
 
 
191
 
-       flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
192
 
+       raw_spin_lock_irqsave(&acpi_gbl_gpe_lock, flags);
193
 
 
194
 
        /* Ensure that we have a valid GPE number */
195
 
 
196
 
@@ -904,7 +904,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_
197
 
        ACPI_FREE(handler);
198
 
 
199
 
 unlock_and_exit:
200
 
-       acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
201
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
202
 
 
203
 
        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
204
 
        return_ACPI_STATUS(status);
205
 
Index: linux-3.2/drivers/acpi/acpica/evxfgpe.c
206
 
===================================================================
207
 
--- linux-3.2.orig/drivers/acpi/acpica/evxfgpe.c
208
 
+++ linux-3.2/drivers/acpi/acpica/evxfgpe.c
209
 
@@ -122,7 +122,7 @@ acpi_status acpi_enable_gpe(acpi_handle 
210
 
 
211
 
        ACPI_FUNCTION_TRACE(acpi_enable_gpe);
212
 
 
213
 
-       flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
214
 
+       raw_spin_lock_irqsave(&acpi_gbl_gpe_lock, flags);
215
 
 
216
 
        /* Ensure that we have a valid GPE number */
217
 
 
218
 
@@ -131,7 +131,7 @@ acpi_status acpi_enable_gpe(acpi_handle 
219
 
                status = acpi_ev_add_gpe_reference(gpe_event_info);
220
 
        }
221
 
 
222
 
-       acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
223
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
224
 
        return_ACPI_STATUS(status);
225
 
 }
226
 
 ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
227
 
@@ -159,7 +159,7 @@ acpi_status acpi_disable_gpe(acpi_handle
228
 
 
229
 
        ACPI_FUNCTION_TRACE(acpi_disable_gpe);
230
 
 
231
 
-       flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
232
 
+       raw_spin_lock_irqsave(&acpi_gbl_gpe_lock, flags);
233
 
 
234
 
        /* Ensure that we have a valid GPE number */
235
 
 
236
 
@@ -168,7 +168,7 @@ acpi_status acpi_disable_gpe(acpi_handle
237
 
                status = acpi_ev_remove_gpe_reference(gpe_event_info) ;
238
 
        }
239
 
 
240
 
-       acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
241
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
242
 
        return_ACPI_STATUS(status);
243
 
 }
244
 
 ACPI_EXPORT_SYMBOL(acpi_disable_gpe)
245
 
@@ -215,7 +215,7 @@ acpi_setup_gpe_for_wake(acpi_handle wake
246
 
                return_ACPI_STATUS(AE_BAD_PARAMETER);
247
 
        }
248
 
 
249
 
-       flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
250
 
+       raw_spin_lock_irqsave(&acpi_gbl_gpe_lock, flags);
251
 
 
252
 
        /* Ensure that we have a valid GPE number */
253
 
 
254
 
@@ -271,7 +271,7 @@ acpi_setup_gpe_for_wake(acpi_handle wake
255
 
        status = AE_OK;
256
 
 
257
 
  unlock_and_exit:
258
 
-       acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
259
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
260
 
        return_ACPI_STATUS(status);
261
 
 }
262
 
 ACPI_EXPORT_SYMBOL(acpi_setup_gpe_for_wake)
263
 
@@ -301,7 +301,7 @@ acpi_status acpi_set_gpe_wake_mask(acpi_
264
 
 
265
 
        ACPI_FUNCTION_TRACE(acpi_set_gpe_wake_mask);
266
 
 
267
 
-       flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
268
 
+       raw_spin_lock_irqsave(&acpi_gbl_gpe_lock, flags);
269
 
 
270
 
        /*
271
 
         * Ensure that we have a valid GPE number and that this GPE is in
272
 
@@ -347,7 +347,7 @@ acpi_status acpi_set_gpe_wake_mask(acpi_
273
 
        }
274
 
 
275
 
 unlock_and_exit:
276
 
-       acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
277
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
278
 
        return_ACPI_STATUS(status);
279
 
 }
280
 
 
281
 
@@ -373,7 +373,7 @@ acpi_status acpi_clear_gpe(acpi_handle g
282
 
 
283
 
        ACPI_FUNCTION_TRACE(acpi_clear_gpe);
284
 
 
285
 
-       flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
286
 
+       raw_spin_lock_irqsave(&acpi_gbl_gpe_lock, flags);
287
 
 
288
 
        /* Ensure that we have a valid GPE number */
289
 
 
290
 
@@ -386,7 +386,7 @@ acpi_status acpi_clear_gpe(acpi_handle g
291
 
        status = acpi_hw_clear_gpe(gpe_event_info);
292
 
 
293
 
       unlock_and_exit:
294
 
-       acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
295
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
296
 
        return_ACPI_STATUS(status);
297
 
 }
298
 
 
299
 
@@ -416,7 +416,7 @@ acpi_get_gpe_status(acpi_handle gpe_devi
300
 
 
301
 
        ACPI_FUNCTION_TRACE(acpi_get_gpe_status);
302
 
 
303
 
-       flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
304
 
+       raw_spin_lock_irqsave(&acpi_gbl_gpe_lock, flags);
305
 
 
306
 
        /* Ensure that we have a valid GPE number */
307
 
 
308
 
@@ -434,7 +434,7 @@ acpi_get_gpe_status(acpi_handle gpe_devi
309
 
                *event_status |= ACPI_EVENT_FLAG_HANDLE;
310
 
 
311
 
       unlock_and_exit:
312
 
-       acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
313
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_gpe_lock, flags);
314
 
        return_ACPI_STATUS(status);
315
 
 }
316
 
 
317
 
Index: linux-3.2/drivers/acpi/acpica/hwregs.c
318
 
===================================================================
319
 
--- linux-3.2.orig/drivers/acpi/acpica/hwregs.c
320
 
+++ linux-3.2/drivers/acpi/acpica/hwregs.c
321
 
@@ -263,14 +263,14 @@ acpi_status acpi_hw_clear_acpi_status(vo
322
 
                          ACPI_BITMASK_ALL_FIXED_STATUS,
323
 
                          ACPI_FORMAT_UINT64(acpi_gbl_xpm1a_status.address)));
324
 
 
325
 
-       lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
326
 
+       raw_spin_lock_irqsave(&acpi_gbl_hardware_lock, lock_flags);
327
 
 
328
 
        /* Clear the fixed events in PM1 A/B */
329
 
 
330
 
        status = acpi_hw_register_write(ACPI_REGISTER_PM1_STATUS,
331
 
                                        ACPI_BITMASK_ALL_FIXED_STATUS);
332
 
 
333
 
-       acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
334
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_hardware_lock, lock_flags);
335
 
 
336
 
        if (ACPI_FAILURE(status))
337
 
                goto exit;
338
 
Index: linux-3.2/drivers/acpi/acpica/hwxface.c
339
 
===================================================================
340
 
--- linux-3.2.orig/drivers/acpi/acpica/hwxface.c
341
 
+++ linux-3.2/drivers/acpi/acpica/hwxface.c
342
 
@@ -387,7 +387,7 @@ acpi_status acpi_write_bit_register(u32 
343
 
                return_ACPI_STATUS(AE_BAD_PARAMETER);
344
 
        }
345
 
 
346
 
-       lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
347
 
+       raw_spin_lock_irqsave(&acpi_gbl_hardware_lock, lock_flags);
348
 
 
349
 
        /*
350
 
         * At this point, we know that the parent register is one of the
351
 
@@ -448,7 +448,7 @@ acpi_status acpi_write_bit_register(u32 
352
 
 
353
 
 unlock_and_exit:
354
 
 
355
 
-       acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
356
 
+       raw_spin_unlock_irqrestore(&acpi_gbl_hardware_lock, lock_flags);
357
 
        return_ACPI_STATUS(status);
358
 
 }
359
 
 
360
 
Index: linux-3.2/drivers/acpi/acpica/utmutex.c
361
 
===================================================================
362
 
--- linux-3.2.orig/drivers/acpi/acpica/utmutex.c
363
 
+++ linux-3.2/drivers/acpi/acpica/utmutex.c
364
 
@@ -52,6 +52,9 @@ static acpi_status acpi_ut_create_mutex(
365
 
 
366
 
 static void acpi_ut_delete_mutex(acpi_mutex_handle mutex_id);
367
 
 
368
 
+DEFINE_RAW_SPINLOCK(acpi_gbl_gpe_lock);
369
 
+DEFINE_RAW_SPINLOCK(acpi_gbl_hardware_lock);
370
 
+
371
 
 /*******************************************************************************
372
 
  *
373
 
  * FUNCTION:    acpi_ut_mutex_initialize
374
 
@@ -81,18 +84,6 @@ acpi_status acpi_ut_mutex_initialize(voi
375
 
                }
376
 
        }
377
 
 
378
 
-       /* Create the spinlocks for use at interrupt level */
379
 
-
380
 
-       status = acpi_os_create_lock (&acpi_gbl_gpe_lock);
381
 
-       if (ACPI_FAILURE (status)) {
382
 
-               return_ACPI_STATUS (status);
383
 
-       }
384
 
-
385
 
-       status = acpi_os_create_lock (&acpi_gbl_hardware_lock);
386
 
-       if (ACPI_FAILURE (status)) {
387
 
-               return_ACPI_STATUS (status);
388
 
-       }
389
 
-
390
 
        /* Mutex for _OSI support */
391
 
        status = acpi_os_create_mutex(&acpi_gbl_osi_mutex);
392
 
        if (ACPI_FAILURE(status)) {
393
 
@@ -132,13 +123,7 @@ void acpi_ut_mutex_terminate(void)
394
 
 
395
 
        acpi_os_delete_mutex(acpi_gbl_osi_mutex);
396
 
 
397
 
-       /* Delete the spinlocks */
398
 
-
399
 
-       acpi_os_delete_lock(acpi_gbl_gpe_lock);
400
 
-       acpi_os_delete_lock(acpi_gbl_hardware_lock);
401
 
-
402
 
        /* Delete the reader/writer lock */
403
 
-
404
 
        acpi_ut_delete_rw_lock(&acpi_gbl_namespace_rw_lock);
405
 
        return_VOID;
406
 
 }